openapi-gen-typescript - npm Package Compare versions

Comparing version 0.3.0 to 0.3.1

dist/index.js

@@ -124,9 +124,9 @@ "use strict";
         let openApiData;
-        if (url || filePath) {
+        if (url || filePath || object) {
             const { dereference, parse } = swaggerParser;
-            let params = url || filePath;
+            // convertUrl响应速度很慢，改为使用convertObj
+            const { convertObj, convertFile } = swagger2openapi;
+            let params;
+            let openapi;
             if (version === '2') {
-                // convertUrl响应速度很慢，改为使用convertObj
-                const { convertObj, convertFile } = swagger2openapi;
-                const openapiConvert = url ? convertObj : convertFile;
                 if (url) {
@@ -143,6 +143,18 @@ try {
                     }
+                    openapi = yield convertObj(params, {
+                        patch: true,
+                    });
                 }
-                const openapi = yield openapiConvert(params, {
-                    patch: true,
-                });
+                if (filePath) {
+                    params = filePath;
+                    openapi = yield convertFile(params, {
+                        patch: true,
+                    });
+                }
+                if (object) {
+                    params = object;
+                    openapi = yield convertObj(params, {
+                        patch: true,
+                    });
+                }
                 openApiData = openapi.openapi || (yield dereference(openapi.openapi));
@@ -154,7 +166,4 @@ }
         }
-        else if (!object) {
-            throw 'option: url or object must be specified one';
-        }
         else {
-            openApiData = object;
+            throw 'option: url or filePath or object must be specified one';
         }
@@ -161,0 +170,0 @@ let baseUrl = '';

package.json

 {
   "name": "openapi-gen-typescript",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "main": "dist/index.js",
@@ -5,0 +5,0 @@ "types": "dist/index.d.ts",

src/index.ts

@@ -186,9 +186,9 @@ // @ts-ignore
   let openApiData: OpenAPIV3.Document;
-  if (url || filePath) {
+  if (url || filePath || object) {
     const { dereference, parse } = swaggerParser;
-    let params: any = url || filePath;
+    // convertUrl响应速度很慢，改为使用convertObj
+    const { convertObj, convertFile } = swagger2openapi;
+    let params: any;
+    let openapi: any;
     if (version === '2') {
-      // convertUrl响应速度很慢，改为使用convertObj
-      const { convertObj, convertFile } = swagger2openapi;
-      const openapiConvert = url ? convertObj : convertFile;
       if (url) {
@@ -204,6 +204,18 @@ try {
         }
+        openapi = await convertObj(params, {
+          patch: true,
+        });
       }
-      const openapi = await openapiConvert(params, {
-        patch: true,
-      });
+      if (filePath) {
+        params = filePath;
+        openapi = await convertFile(params, {
+          patch: true,
+        });
+      }
+      if (object) {
+        params = object;
+        openapi = await convertObj(params, {
+          patch: true,
+        });
+      }
       openApiData = openapi.openapi || (await dereference(openapi.openapi));
@@ -213,6 +225,4 @@ } else {
     }
-  } else if (!object) {
-    throw 'option: url or object must be specified one';
   } else {
-    openApiData = object as OpenAPIV3.Document;
+    throw 'option: url or filePath or object must be specified one';
   }
@@ -219,0 +229,0 @@

No alert changes

Improved metrics

Total package byte prevSize

70443

increased by0.64%

Lines of code

1543

increased by1.25%

No dependency changes