echoapi-converter 0.0.6 → 0.0.8

package/dist/index.d.ts

@@ -185,6 +185,7 @@ declare class InsomniaToApipost {
     private completionWsRequest;
     private completionWsTarget;
     private completionApiTarget;
+    private getEnvVarList;
     private completionApis;
     private initApis;
     private initFolders;

package/dist/index.js

@@ -634,6 +634,28 @@ const yapiGenRestfulByUrl = (url, oldParameter) => {
     catch (error) { }
     return restfulList;
 };
+const fixUrlPath = (url) => {
+    try {
+        const index = url.indexOf('://');
+        let path;
+        let protocolAndDomain = '';
+        if (index === -1) {
+            path = url;
+        }
+        else {
+            // 分开协议和路径部分
+            protocolAndDomain = url.slice(0, index + 3);
+            path = url.slice(index + 3);
+        }
+        // 修正路径中的 '//'
+        const fixedPath = path.replace(/\/\/+/g, '/');
+        // 拼接返回
+        return `${protocolAndDomain}${fixedPath}`;
+    }
+    catch (err) {
+        return url;
+    }
+};
 
 class ApipostToSwagger {
     constructor() {
@@ -1844,6 +1866,7 @@ class SwaggerToApipost {
         return __awaiter(this, void 0, void 0, function* () {
             let url = path;
             url = decodeURI(this.basePath + url);
+            url = fixUrlPath(url);
             for (const method in pathItem) {
                 const swaggerApi = pathItem[method];
                 if (Object.prototype.toString.call(swaggerApi) !== '[object Object]')
@@ -4144,6 +4167,21 @@ class InsomniaToApipost {
             is_force: -1,
         };
     }
+    getEnvVarList(data) {
+        if (lodash.isObject(data) && lodash.keys(data).length) {
+            return lodash.keys(data).reduce((pre, key) => {
+                pre[key] = {
+                    current_value: lodash.isNil(data === null || data === void 0 ? void 0 : data[key]) ? '' : data === null || data === void 0 ? void 0 : data[key],
+                    description: '',
+                    key,
+                    value: lodash.isNil(data === null || data === void 0 ? void 0 : data[key]) ? '' : data === null || data === void 0 ? void 0 : data[key],
+                };
+                return pre;
+            }, {});
+        }
+        return {};
+    }
+    ;
     completionApis(resources) {
         return resources === null || resources === void 0 ? void 0 : resources.reduce((pre, item) => {
             if ((item === null || item === void 0 ? void 0 : item._type) === 'request_group' && lodash.has(this.foldersMap, item === null || item === void 0 ? void 0 : item._id)) {
@@ -4171,14 +4209,14 @@ class InsomniaToApipost {
                 const wsTarget = this.completionWsTarget(item, resources);
                 pre.push(wsTarget);
             }
-            if ((item === null || item === void 0 ? void 0 : item._type) === 'environment') {
+            if ((item === null || item === void 0 ? void 0 : item._type) === 'environment' && (item === null || item === void 0 ? void 0 : item.name)) {
                 this.envs = this.envs.concat([
                     {
                         env_id: ATools.snowflakeId(),
                         name: item === null || item === void 0 ? void 0 : item.name,
-                        is_private: -1,
-                        server_list: {},
-                        env_var_list: {},
+                        is_private: (item === null || item === void 0 ? void 0 : item.isPrivate) ? 1 : -1,
+                        server_list: [],
+                        env_var_list: this.getEnvVarList(item === null || item === void 0 ? void 0 : item.data),
                     },
                 ]);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echoapi-converter",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "echoapi to swagger",
   "main": "dist/index.js",
   "files": [