echoapi-converter 0.0.32 → 0.0.34

package/dist/index.js

@@ -4,14 +4,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var lodash = require('lodash');
 var ATools = require('apipost-tools');
+var urlParse = require('url-parse');
 var MockSchema = require('apipost-mock-schema');
 var axios = require('axios');
 var SwaggerClient = require('swagger-client');
-require('url-parse');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var ATools__default = /*#__PURE__*/_interopDefaultLegacy(ATools);
+var urlParse__default = /*#__PURE__*/_interopDefaultLegacy(urlParse);
 var MockSchema__default = /*#__PURE__*/_interopDefaultLegacy(MockSchema);
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 var SwaggerClient__default = /*#__PURE__*/_interopDefaultLegacy(SwaggerClient);
@@ -739,6 +740,31 @@ const completionMethod = (method) => {
     }
     return method;
 };
+// 根据query数组生成新的url
+const genUrlByQuery = (url, parameter, query_add_equal = 1) => {
+    var _a;
+    let paramsStr = '';
+    let newUrl = url || '';
+    const handleEncode = (value = '') => {
+        let _value = lodash.cloneDeep(value);
+        try {
+            // 将#符号encode
+            _value = _value.replace(/#/g, encodeURIComponent('#'));
+            // 将&符号encode
+            _value = _value.replace(/&/g, encodeURIComponent('&'));
+        }
+        catch (e) { }
+        return _value;
+    };
+    lodash.forEach(parameter, (item) => {
+        if (item.key && lodash.isEqual(item.is_checked, 1)) {
+            paramsStr += `${paramsStr ? '&' : ''}${handleEncode(item.key)}${lodash.isEqual(query_add_equal, -1) && !item.value ? '' : '='}${handleEncode(item.value)}`;
+        }
+    });
+    // NOTE 原地址有hash的话，需拼接回去
+    newUrl = `${lodash.head(newUrl.split('?'))}${paramsStr ? '?' : ''}${paramsStr}${((_a = urlParse__default["default"](newUrl)) === null || _a === void 0 ? void 0 : _a.hash) || ''}`;
+    return newUrl;
+};
 
 // @ts-nocheck
 class ApipostToSwagger {
@@ -4252,12 +4278,12 @@ class InsomniaToApipost {
             request.auth["type"] = "basic";
             request.auth["basic"] = {
                 username: (authentication === null || authentication === void 0 ? void 0 : authentication.username) || "",
-                password: (authentication === null || authentication === void 0 ? void 0 : authentication.username) || "",
+                password: (authentication === null || authentication === void 0 ? void 0 : authentication.password) || "",
             };
         }
         else if ((authentication === null || authentication === void 0 ? void 0 : authentication.type) === "digest") {
             request.auth["type"] = "digest";
-            request.auth["digest"] = Object.assign(Object.assign({}, request.auth.digest), { username: (authentication === null || authentication === void 0 ? void 0 : authentication.username) || "", password: (authentication === null || authentication === void 0 ? void 0 : authentication.username) || "" });
+            request.auth["digest"] = Object.assign(Object.assign({}, request.auth.digest), { username: (authentication === null || authentication === void 0 ? void 0 : authentication.username) || "", password: (authentication === null || authentication === void 0 ? void 0 : authentication.password) || "" });
         }
         else if ((authentication === null || authentication === void 0 ? void 0 : authentication.type) === "oauth1") {
             request.auth["type"] = "oauth1";
@@ -4271,7 +4297,7 @@ class InsomniaToApipost {
         }
         else if ((authentication === null || authentication === void 0 ? void 0 : authentication.type) === "ntlm") {
             request.auth["type"] = "ntlm";
-            request.auth["ntlm"] = Object.assign(Object.assign({}, request.auth.ntlm), { username: (authentication === null || authentication === void 0 ? void 0 : authentication.username) || "", password: (authentication === null || authentication === void 0 ? void 0 : authentication.username) || "" });
+            request.auth["ntlm"] = Object.assign(Object.assign({}, request.auth.ntlm), { username: (authentication === null || authentication === void 0 ? void 0 : authentication.username) || "", password: (authentication === null || authentication === void 0 ? void 0 : authentication.password) || "" });
         }
         else if ((authentication === null || authentication === void 0 ? void 0 : authentication.type) === "iam") {
             request.auth["type"] = "awsv4";
@@ -4538,7 +4564,7 @@ class InsomniaToApipost {
     }
     completionApis(resources) {
         return resources === null || resources === void 0 ? void 0 : resources.reduce((pre, item) => {
-            var _a;
+            var _a, _b;
             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)) {
                 pre.push({
                     target_id: this.foldersMap[item === null || item === void 0 ? void 0 : item._id] || ATools.snowflakeId(),
@@ -4563,6 +4589,7 @@ class InsomniaToApipost {
                 }
                 else {
                     const target = this.completionApiTarget(item);
+                    target.url = genUrlByQuery(lodash.cloneDeep(target.url), (_b = target.request.query) === null || _b === void 0 ? void 0 : _b.parameter);
                     pre.push(target);
                 }
             }

package/package.json

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