echoapi-converter 0.0.86 → 0.0.88

package/dist/index.d.ts

@@ -205,6 +205,7 @@ declare class PostmanToApipost {
     apis: any;
     project: any;
     source: 'vscode' | 'workbench' | string;
+    file_parsing_rules: 'normal' | 'use_case' | string;
     constructor();
     private clear;
     private completionApiRequestAuth;
@@ -214,12 +215,14 @@ declare class PostmanToApipost {
     private completionApiRequest;
     private completionApiResponse;
     private completionApiFolder;
+    private completionApiCase;
     private completionApiTarget;
     private completionApis;
     private initApis;
     private initProject;
     convert(json: any, project_id: string, option?: {
-        source: string;
+        source?: string;
+        file_parsing_rules?: string;
     }): {
         status: "error" | "success";
         message: string;

package/dist/index.js

@@ -2145,6 +2145,7 @@ const deepModelRef = (originSchema, schemaMap, startSchema, count = 0) => {
                                     if (!lodash.includes(lastRequired, item)) {
                                         lastRequired.push(item);
                                     }
+                                    return lastRequired;
                                 }, (schema === null || schema === void 0 ? void 0 : schema.required) || []);
                             }
                             pre = Object.assign(Object.assign({}, pre), ((mapSchema === null || mapSchema === void 0 ? void 0 : mapSchema.properties) || {}));
@@ -6944,6 +6945,13 @@ class PostmanToApipost {
             writable: true,
             value: void 0
         });
+        // 文件解析规则
+        Object.defineProperty(this, "file_parsing_rules", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.apis = [];
         this.project = {
             name: "",
@@ -7469,6 +7477,24 @@ class PostmanToApipost {
             is_socket: 1,
         };
     }
+    completionApiCase(item, caseTarget) {
+        const sample_id = apipostTools.snowflakeId();
+        return {
+            sample_id: sample_id,
+            parent_id: item === null || item === void 0 ? void 0 : item.target_id,
+            target_id: sample_id,
+            project_id: this.project.project_id || "",
+            name: caseTarget === null || caseTarget === void 0 ? void 0 : caseTarget.name,
+            type: 'sample',
+            target_type: "sample",
+            method: caseTarget === null || caseTarget === void 0 ? void 0 : caseTarget.method,
+            url: caseTarget === null || caseTarget === void 0 ? void 0 : caseTarget.url,
+            sort: 0,
+            description: caseTarget === null || caseTarget === void 0 ? void 0 : caseTarget.description,
+            protocol: (caseTarget === null || caseTarget === void 0 ? void 0 : caseTarget.protocol) || "http/1.1",
+            request: caseTarget === null || caseTarget === void 0 ? void 0 : caseTarget.request,
+        };
+    }
     completionApiTarget(item, parentInfo) {
         var _a, _b, _c;
         const { request, response } = item || {};
@@ -7521,19 +7547,30 @@ class PostmanToApipost {
             is_force: -1,
         };
     }
-    completionApis(item, parentInfo) {
+    completionApis(item, parentInfo, targetObj) {
         if (item === null || item === void 0 ? void 0 : item.length) {
             return item === null || item === void 0 ? void 0 : item.reduce((pre, targetItem) => {
                 if (!lodash.has(targetItem, "item")) {
                     // 接口
-                    const target = this.completionApiTarget(targetItem, parentInfo);
+                    let target = this.completionApiTarget(targetItem, parentInfo);
+                    // 文件解析规则为同接口转用例 记录同mtehod和同url的接口
+                    if (this.file_parsing_rules === 'use_case' && target.target_type === 'api') {
+                        if (lodash.has(targetObj, `${target.method}:${target.url}`)) {
+                            // 有重复改为用例 并把parent_id 改掉
+                            target = this.completionApiCase(targetObj[`${target.method}:${target.url}`], target);
+                            // console.log(target,"case-target");
+                        }
+                        else {
+                            targetObj[`${target.method}:${target.url}`] = target;
+                        }
+                    }
                     pre.push(target);
                 }
                 else {
                     // 目录
                     const parent = this.completionApiFolder(targetItem, parentInfo);
                     pre.push(parent);
-                    pre = pre.concat(this.completionApis(targetItem === null || targetItem === void 0 ? void 0 : targetItem.item, parent));
+                    pre = pre.concat(this.completionApis(targetItem === null || targetItem === void 0 ? void 0 : targetItem.item, parent, targetObj));
                 }
                 return pre;
             }, []);
@@ -7542,7 +7579,8 @@ class PostmanToApipost {
     }
     initApis(item) {
         if (isArray(item)) {
-            this.apis = this.completionApis(item);
+            const targetObj = {};
+            this.apis = this.completionApis(item, null, targetObj);
         }
     }
     initProject(json, project_id) {
@@ -7555,6 +7593,7 @@ class PostmanToApipost {
         this.clear();
         try {
             this.source = (option === null || option === void 0 ? void 0 : option.source) || 'workbench';
+            this.file_parsing_rules = (option === null || option === void 0 ? void 0 : option.file_parsing_rules) || 'normal';
             this.initProject(json, project_id);
             this.initApis(json === null || json === void 0 ? void 0 : json.item);
             const data = Object.assign(Object.assign({}, this.project), { apis: this.apis });

package/package.json

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