echoapi-converter 0.0.33 → 0.0.35

package/dist/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var lodash = require('lodash');
 var ATools = require('apipost-tools');
-require('url-parse');
+var urlParse = require('url-parse');
 var MockSchema = require('apipost-mock-schema');
 var axios = require('axios');
 var SwaggerClient = require('swagger-client');
@@ -12,6 +12,7 @@ var SwaggerClient = require('swagger-client');
 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 {
@@ -3596,6 +3622,12 @@ class ApifoxToApipost {
                     name: 'New Query',
                     query: lodash.isString((_a = requestBody === null || requestBody === void 0 ? void 0 : requestBody.graphql) === null || _a === void 0 ? void 0 : _a.query) ? (_b = requestBody === null || requestBody === void 0 ? void 0 : requestBody.graphql) === null || _b === void 0 ? void 0 : _b.query : '',
                     variables: lodash.isString((_c = requestBody === null || requestBody === void 0 ? void 0 : requestBody.graphql) === null || _c === void 0 ? void 0 : _c.variables) ? (_d = requestBody === null || requestBody === void 0 ? void 0 : requestBody.graphql) === null || _d === void 0 ? void 0 : _d.variables : '',
+                    response: {
+                        mode: 'json',
+                        raw: '',
+                        raw_parameter: [],
+                        raw_schema: { type: 'object' },
+                    },
                 }],
         };
     }
@@ -4399,7 +4431,12 @@ class InsomniaToApipost {
     completionGraphqlRequestBody(body) {
         return {
             query_schema: {},
-            query_list: [Object.assign({ param_id: ATools.snowflakeId(), name: 'New Query' }, this.getGraphQLQuery(body === null || body === void 0 ? void 0 : body.text))],
+            query_list: [Object.assign(Object.assign({ param_id: ATools.snowflakeId(), name: 'New Query' }, this.getGraphQLQuery(body === null || body === void 0 ? void 0 : body.text)), { response: {
+                        mode: 'json',
+                        raw: '',
+                        raw_parameter: [],
+                        raw_schema: { type: 'object' },
+                    } })],
         };
     }
     completionGraphqlTarget(item) {
@@ -4917,6 +4954,12 @@ class PostmanToApipost {
                         name: 'New Query',
                         query: lodash.isString((_k = (_j = request === null || request === void 0 ? void 0 : request.body) === null || _j === void 0 ? void 0 : _j.graphql) === null || _k === void 0 ? void 0 : _k.query) ? (_m = (_l = request === null || request === void 0 ? void 0 : request.body) === null || _l === void 0 ? void 0 : _l.graphql) === null || _m === void 0 ? void 0 : _m.query : '',
                         variables: lodash.isString((_p = (_o = request === null || request === void 0 ? void 0 : request.body) === null || _o === void 0 ? void 0 : _o.graphql) === null || _p === void 0 ? void 0 : _p.variables) ? (_r = (_q = request === null || request === void 0 ? void 0 : request.body) === null || _q === void 0 ? void 0 : _q.graphql) === null || _r === void 0 ? void 0 : _r.variables : '',
+                        response: {
+                            mode: 'json',
+                            raw: '',
+                            raw_parameter: [],
+                            raw_schema: { type: 'object' },
+                        },
                     }],
             },
         };

package/package.json

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