echoapi-converter 0.0.4 → 0.0.5

package/dist/index.js

@@ -514,7 +514,7 @@ const createUrl = (_url) => {
     return urls;
 };
 // 根据url生成新的restful数组
-const genRestfulByUrl = (url, oldParameter) => {
+const genRestfulByUrl = (url, oldParameter, key = 'key') => {
     const restfulList = [];
     // 自动拼接url http://
     if (!isURL(url)) {
@@ -526,7 +526,7 @@ const genRestfulByUrl = (url, oldParameter) => {
         if (pathsItem.substring(0, 1) === ':' && pathsItem.length > 1) {
             let obj = null;
             const oldIndex = lodash.findIndex(oldParameter, {
-                key: pathsItem.substring(1, pathsItem.length),
+                [key]: pathsItem.substring(1, pathsItem.length),
             });
             if (oldIndex !== -1) {
                 obj = oldParameter[oldIndex];
@@ -551,7 +551,7 @@ const genRestfulByUrl = (url, oldParameter) => {
                     matchesItem = matchesItem.replace(/^{|}$/g, '');
                     let obj = null;
                     const oldIndex = lodash.findIndex(oldParameter, {
-                        key: matchesItem,
+                        [key]: matchesItem,
                     });
                     if (oldIndex !== -1) {
                         obj = oldParameter[oldIndex];
@@ -3982,6 +3982,7 @@ class InsomniaToApipost {
             request.auth['kv'] = {
                 key: (authentication === null || authentication === void 0 ? void 0 : authentication.key) || '',
                 value: (authentication === null || authentication === void 0 ? void 0 : authentication.value) || '',
+                in: (authentication === null || authentication === void 0 ? void 0 : authentication.addTo) === 'queryParams' ? 'query' : 'header',
             };
         }
         else if ((authentication === null || authentication === void 0 ? void 0 : authentication.type) === 'basic') {
@@ -4027,6 +4028,8 @@ class InsomniaToApipost {
                 parameter: this.completionParameter(item === null || item === void 0 ? void 0 : item.parameters),
             }, cookie: {
                 parameter: [],
+            }, restful: {
+                parameter: genRestfulByUrl((item === null || item === void 0 ? void 0 : item.url) || '', item === null || item === void 0 ? void 0 : item.pathParameters, 'name')
             } }, request);
     }
     completionWsRequest(item, resources) {
@@ -4441,7 +4444,7 @@ class PostmanToApipost {
             }, binary: {} }, params);
     }
     completionApiRequest(item, { request, auth }) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const prerequest = (_a = item === null || item === void 0 ? void 0 : item.event) === null || _a === void 0 ? void 0 : _a.find((e) => (e === null || e === void 0 ? void 0 : e.listen) === 'prerequest');
         const test = (_b = item === null || item === void 0 ? void 0 : item.event) === null || _b === void 0 ? void 0 : _b.find((e) => (e === null || e === void 0 ? void 0 : e.listen) === 'test');
         const pre_tasks = prerequest
@@ -4469,7 +4472,7 @@ class PostmanToApipost {
         const queryParameter = this.completionApiRequestParameter((_j = request === null || request === void 0 ? void 0 : request.url) === null || _j === void 0 ? void 0 : _j.query);
         const headerParameter = this.completionApiRequestParameter(request === null || request === void 0 ? void 0 : request.header);
         const body = this.completionApiRequestBody(request === null || request === void 0 ? void 0 : request.body);
-        const restfulParameter = genRestfulByUrl(`${((_k = request === null || request === void 0 ? void 0 : request.url) === null || _k === void 0 ? void 0 : _k.raw) || ''}`, []);
+        const restfulParameter = genRestfulByUrl(`${((_k = request === null || request === void 0 ? void 0 : request.url) === null || _k === void 0 ? void 0 : _k.raw) || ''}`, (_l = request === null || request === void 0 ? void 0 : request.url) === null || _l === void 0 ? void 0 : _l.variable);
         return {
             auth: this.completionApiRequestAuth(auth),
             body,

package/package.json

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