echoapi-converter 0.0.90 → 1.0.1

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { ApipostObj } from '@/types/index';
 declare class ApipostToSwagger {
     apiToSwaggerOrigin: Partial<ApipostObj>;
     apiToSwaggerResult: any;
-    apiToSwaggerVersion: "2.0" | "3.0";
+    apiToSwaggerVersion: "2.0" | "3.0" | "3.1";
     constructor();
     private handleProject;
     private handleModels;
@@ -13,7 +13,12 @@ declare class ApipostToSwagger {
     private array2NamePathObj;
     private array2TreeExport;
     private handleApis;
-    apiToswagger(apipostObj: ApipostObj, version: "2.0" | "3.0", language?: 'en' | 'zh-cn' | 'ja' | 'zh-hant' | 'id'): Promise<{
+    private sortApiNodes;
+    private sortByXSortPreserveStructure;
+    apiToswagger(apipostObj: ApipostObj, version: "2.0" | "3.0" | "3.1", language?: "en" | "zh-cn" | "ja" | "zh-hant" | "id", options?: {
+        includeExt?: boolean;
+        dirAsTags?: boolean;
+    }): Promise<{
         status: "error" | "success";
         message: string;
         data: any;

package/dist/index.js

@@ -2170,7 +2170,7 @@ const t = (key, data) => {
 // @ts-nocheck
 const MAX_DEEP_COUNT = 10;
 const schemaPath = (name, version) => {
-    if (version === '2.0') {
+    if (version === "2.0") {
         return `#/definitions/${name}`;
     }
     return `#/components/schemas/${name}`;
@@ -2179,18 +2179,19 @@ const deepModelRef = (originSchema, schemaMap, startSchema, count = 0) => {
     try {
         let deepCount = lodash.cloneDeep(count);
         const schema = lodash.cloneDeep(originSchema);
-        if (lodash.has(schema, 'x-schema-refs')) {
-            const refsValue = schema?.['x-schema-refs'];
+        if (lodash.has(schema, "x-schema-refs")) {
+            const refsValue = schema?.["x-schema-refs"];
             if (!lodash.isEmpty(refsValue) &&
-                Object.prototype.toString.call(schema?.properties) === '[object Object]') {
-                const properties = Object.prototype.toString.call(schema?.properties) === '[object Object]'
+                Object.prototype.toString.call(schema?.properties) === "[object Object]") {
+                const properties = Object.prototype.toString.call(schema?.properties) ===
+                    "[object Object]"
                     ? schema?.properties
                     : {};
-                schema['properties'] = lodash.values(refsValue)?.reduce((pre, item) => {
-                    let refId = '';
+                schema["properties"] = lodash.values(refsValue)?.reduce((pre, item) => {
+                    let refId = "";
                     let refPath = item?.$ref;
                     if (lodash.isString(refPath)) {
-                        refId = refPath.split('/').pop() || '';
+                        refId = refPath.split("/").pop() || "";
                     }
                     if (refId &&
                         lodash.has(schemaMap, refId) &&
@@ -2202,7 +2203,7 @@ const deepModelRef = (originSchema, schemaMap, startSchema, count = 0) => {
                             //   $ref: mapValue?.path,
                             // };
                             let mapSchema = mapValue?.schema;
-                            if (lodash.has(mapValue?.schema, 'x-schema-refs')) {
+                            if (lodash.has(mapValue?.schema, "x-schema-refs")) {
                                 if (deepCount > MAX_DEEP_COUNT) {
                                     mapSchema = mapValue?.schema;
                                 }
@@ -2233,17 +2234,17 @@ const deepModelRef = (originSchema, schemaMap, startSchema, count = 0) => {
                 }, properties);
             }
         }
-        if (lodash.has(schema, 'properties') &&
-            Object.prototype.toString.call(schema?.properties) === '[object Object]') {
+        if (lodash.has(schema, "properties") &&
+            Object.prototype.toString.call(schema?.properties) === "[object Object]") {
             let properties_keys = lodash.keys(schema?.properties);
             if (
             // 优化展示顺序
-            schema?.['x-schema-orders'] &&
-                lodash.isArray(schema?.['x-schema-orders']) &&
-                lodash.isEqual(lodash.sortBy(schema?.['x-schema-orders']), lodash.sortBy(lodash.keys(schema?.properties)))) {
-                properties_keys = schema?.['x-schema-orders'];
+            schema?.["x-schema-orders"] &&
+                lodash.isArray(schema?.["x-schema-orders"]) &&
+                lodash.isEqual(lodash.sortBy(schema?.["x-schema-orders"]), lodash.sortBy(lodash.keys(schema?.properties)))) {
+                properties_keys = schema?.["x-schema-orders"];
             }
-            schema['properties'] = properties_keys?.reduce((pre, key) => {
+            schema["properties"] = properties_keys?.reduce((pre, key) => {
                 if (key && !lodash.isEmpty(schema?.properties[key])) {
                     if (deepCount > MAX_DEEP_COUNT) {
                         pre[key] = schema?.properties[key];
@@ -2257,30 +2258,35 @@ const deepModelRef = (originSchema, schemaMap, startSchema, count = 0) => {
         }
         if (lodash.isString(schema?.$ref) && schema.$ref.length > 0) {
             let refPath = schema?.$ref;
-            const parts = refPath.split('/');
+            const parts = refPath.split("/");
             if (parts.length > 0) {
-                let refId = parts[parts.length - 1] || '';
+                let refId = parts[parts.length - 1] || "";
                 if (lodash.has(schemaMap, refId)) {
                     parts[parts.length - 1] = schemaMap[refId]?.name || refId; // 替换最后一部分
-                    schema.$ref = parts.join('/');
+                    schema.$ref = parts.join("/");
                 }
             }
         }
         // 特殊处理properties为数组的情况
-        if (lodash.has(schema, 'properties') && Object.prototype.toString.call(schema?.properties) !== '[object Object]') {
+        if (lodash.has(schema, "properties") &&
+            Object.prototype.toString.call(schema?.properties) !== "[object Object]") {
             schema.properties = {};
         }
-        if (schema?.type === 'array' && lodash.has(schema, 'items')) {
-            if (lodash.has(schema?.items, 'properties') &&
-                Object.prototype.toString.call(schema?.items?.properties) === '[object Object]') {
+        if (schema?.type === "array" && lodash.has(schema, "items")) {
+            if (lodash.has(schema?.items, "properties") &&
+                Object.prototype.toString.call(schema?.items?.properties) ===
+                    "[object Object]") {
                 if (deepCount <= MAX_DEEP_COUNT) {
                     schema.items = deepModelRef(schema?.items, schemaMap, startSchema || originSchema, ++deepCount);
                 }
             }
+            else if (lodash.has(schema?.items, "$ref")) {
+                schema.items = deepModelRef(schema?.items, schemaMap, startSchema || originSchema, deepCount);
+            }
         }
         // 处理数组的引用
-        delete schema?.['x-schema-orders'];
-        delete schema?.['x-schema-refs'];
+        delete schema?.["x-schema-orders"];
+        delete schema?.["x-schema-refs"];
         return schema;
     }
     catch (err) {
@@ -2409,10 +2415,10 @@ const handlePathItemParameters = (type, arr, pathItem) => {
                     example: String(item?.value || ""),
                     schema: {
                         type: item?.field_type?.toLowerCase(),
-                        ...(item?.schema || {})
+                        ...(item?.schema || {}),
                     },
                 };
-                const oldFiledObj = OLD_FIELD_TYPES?.[param?.schema?.type || ''];
+                const oldFiledObj = OLD_FIELD_TYPES?.[param?.schema?.type || ""];
                 if (oldFiledObj) {
                     param.field_type = oldFiledObj.type;
                     param.schema.type = oldFiledObj.type;
@@ -2444,7 +2450,7 @@ const handlePathItemBodyParameters = (body, pathItem, modelsObj) => {
                     name: "body",
                     description: "",
                     schema: deepModelRef(body?.raw_schema || {
-                        type: 'object'
+                        type: "object",
                     }, modelsObj),
                     type: "string",
                     example: body?.raw || "",
@@ -2477,22 +2483,22 @@ const handleGraphqlRequestBody = (query_list, query_schema, pathItem, modelsObj)
         if (!lodash.has(pathItem, "requestBody")) {
             pathItem.requestBody = {
                 content: {},
-                'x-schema': query_schema || {}
+                "x-schema": query_schema || {},
             };
         }
-        query_list.forEach(m => {
+        query_list.forEach((m) => {
             const mode = `x-${m?.param_id}`;
             pathItem.requestBody.content[mode] = {
-                'x-query': m?.query || '',
-                'x-variables': m?.variables || '',
-                'x-summary': m?.name || '',
-                'x-response': {
-                    'x-mode': m?.response?.mode || '',
+                "x-query": m?.query || "",
+                "x-variables": m?.variables || "",
+                "x-summary": m?.name || "",
+                "x-response": {
+                    "x-mode": m?.response?.mode || "",
                     example: m?.response?.raw || "",
                     schema: deepModelRef(m?.response?.raw_schema || {
                         type: "object",
                     }, modelsObj),
-                }
+                },
             };
         });
     }
@@ -2500,16 +2506,22 @@ const handleGraphqlRequestBody = (query_list, query_schema, pathItem, modelsObj)
 const handleSocketMethodParameterDescription = (item, mode) => {
     let description = item?.description;
     let rules = item?.rules;
-    if (mode == 'fixed_message') {
-        return `${description}\n${t('tcpMethodMessage', {
-            direction: rules?.fill_type == 'left' ? t('left') : rules?.fill_type == 'right' ? t('right') : '',
+    if (mode == "fixed_message") {
+        return `${description}\n${t("tcpMethodMessage", {
+            direction: rules?.fill_type == "left"
+                ? t("left")
+                : rules?.fill_type == "right"
+                    ? t("right")
+                    : "",
             size: rules?.length,
-            str: rules?.content_type == 'common' ? RULE_TYPES[rules?.common] : rules?.custom
+            str: rules?.content_type == "common"
+                ? RULE_TYPES[rules?.common]
+                : rules?.custom,
         })}`;
     }
-    else if (mode == 'delimiter_message') {
-        return `${description}\n${t('tcpMethodDelimiterMessage', {
-            str: RULE_TYPES_ICON[rules?.delimiter]
+    else if (mode == "delimiter_message") {
+        return `${description}\n${t("tcpMethodDelimiterMessage", {
+            str: RULE_TYPES_ICON[rules?.delimiter],
         })}`;
     }
     return description;
@@ -2523,9 +2535,9 @@ const handleSocketMethodRequestBody = (body, pathItem) => {
         }
         const mode = MODE_TYPE[body?.mode];
         const parameter = body?.parameter || [];
-        if (['delimiter_message', 'fixed_message'].includes(body?.mode)) {
+        if (["delimiter_message", "fixed_message"].includes(body?.mode)) {
             pathItem.requestBody.content[body?.mode] = {
-                'x-mode': body?.mode || '',
+                "x-mode": body?.mode || "",
                 schema: {
                     type: "object",
                     properties: parameter.reduce((lastData, item) => {
@@ -2547,10 +2559,12 @@ const handleSocketMethodRequestBody = (body, pathItem) => {
         else {
             if (mode) {
                 pathItem.requestBody.content[mode] = {
-                    'x-mode': mode || '',
-                    schema: lodash.isPlainObject(body?.raw_schema) && !lodash.isEmpty(body?.raw_schema) ? body?.raw_schema : {
-                        type: "object",
-                    },
+                    "x-mode": mode || "",
+                    schema: lodash.isPlainObject(body?.raw_schema) && !lodash.isEmpty(body?.raw_schema)
+                        ? body?.raw_schema
+                        : {
+                            type: "object",
+                        },
                     example: body?.raw || "",
                 };
             }
@@ -2564,22 +2578,22 @@ const handleMessagePathItemrequestBody = (message, pathItem, modelsObj) => {
                 content: {},
             };
         }
-        message.forEach(m => {
+        message.forEach((m) => {
             const mode = `x-${m?.param_id}`;
             pathItem.requestBody.content[mode] = {
-                'x-mode': m?.request?.mode || '',
-                'x-summary': m?.name || '',
+                "x-mode": m?.request?.mode || "",
+                "x-summary": m?.name || "",
                 schema: deepModelRef(m?.request?.raw_schema || {
                     type: "object",
                 }, modelsObj),
                 example: m?.request?.raw || "",
-                'x-response': {
-                    'x-mode': m?.response?.mode || '',
+                "x-response": {
+                    "x-mode": m?.response?.mode || "",
                     example: m?.response?.raw || "",
                     schema: deepModelRef(m?.response?.raw_schema || {
                         type: "object",
                     }, modelsObj),
-                }
+                },
             };
         });
     }
@@ -2596,7 +2610,7 @@ const handlePathItemResponse = (response, modelsObj) => {
                     content: {
                         [MODE_TYPE?.[expect?.content_type] || "*/*"]: {
                             schema: deepModelRef(expect?.schema || {}, modelsObj),
-                            example: raw || '',
+                            example: raw || "",
                         },
                     },
                 };
@@ -2639,20 +2653,21 @@ const handlePathItemRequestBody = (body, pathItem, modelsObj) => {
                                     item.key.length > 0 &&
                                     (!lodash.has(item, "is_checked") || item?.is_checked > 0)) {
                                     lastData[item.key] = {
-                                        type: item?.field_type?.toLowerCase() || 'string',
+                                        type: item?.field_type?.toLowerCase() || "string",
                                         description: item?.description || "",
                                         example: item?.value || "",
-                                        ...(lodash.isPlainObject(item?.schema) ? item.schema : {})
+                                        ...(lodash.isPlainObject(item?.schema) ? item.schema : {}),
                                     };
                                 }
                                 return lastData;
                             }, {}),
                             required: parameter.reduce((lastArr, item) => {
-                                if (lodash.isEqual(item?.not_null, 1) && !lodash.includes(lastArr, item.key)) {
+                                if (lodash.isEqual(item?.not_null, 1) &&
+                                    !lodash.includes(lastArr, item.key)) {
                                     lastArr.push(item.key);
                                 }
                                 return lastArr;
-                            }, [])
+                            }, []),
                         },
                     };
                 }
@@ -2670,39 +2685,40 @@ const getUserShowName = (data) => {
     if (lodash.isString(data?.nick_name) && data?.nick_name.length > 0) {
         return data?.nick_name;
     }
-    return '';
+    return "";
 };
 const createPathItem = (item, sourceObj, pid, pidName, modelsObj, apiVersion, target_type) => {
     const path = recursiveFolderPath("", sourceObj, pid, pidName);
     const pathItem = {
-        'x-target-id': item?.target_id || '',
-        'x-protocol': target_type || '',
+        "x-target-id": item?.target_id || "",
+        "x-protocol": target_type || "",
+        "x-sort": item?.sort || 0,
         summary: item?.name || "",
         description: item?.description || "",
-        tags: []
+        tags: [],
     };
-    if (lodash.has(item, 'mock_server_enable')) {
-        pathItem['x-mock-server-enable'] = item?.mock_server_enable;
+    if (lodash.has(item, "mock_server_enable")) {
+        pathItem["x-mock-server-enable"] = item?.mock_server_enable;
     }
     if (lodash.isArray(item?.tags) && item?.tags.length > 0) {
-        pathItem['x-tags'] = item?.tags;
+        pathItem["x-tags"] = item?.tags;
     }
     if (lodash.isString(item?.mark_id)) {
-        pathItem['x-mark-id'] = item?.mark_id;
+        pathItem["x-mark-id"] = item?.mark_id;
     }
     if (lodash.isString(item?.updated_at)) {
-        pathItem['x-updated-at'] = item?.updated_at;
+        pathItem["x-updated-at"] = item?.updated_at;
     }
     if (lodash.isString(item?.updated_user?.nick_name)) {
-        pathItem['x-updated-user-name'] = getUserShowName(item?.updated_user);
+        pathItem["x-updated-user-name"] = getUserShowName(item?.updated_user);
     }
     if (lodash.isPlainObject(item?.attribute_info) && !lodash.isEmpty(item?.attribute_info)) {
-        pathItem['x-attribute-info'] = item?.attribute_info;
+        pathItem["x-attribute-info"] = item?.attribute_info;
     }
     if (item?.is_exampled === 1) {
-        pathItem['x-exampled'] = item?.is_exampled;
+        pathItem["x-exampled"] = item?.is_exampled;
     }
-    if (['http', 'sse'].includes(target_type)) {
+    if (["http", "sse"].includes(target_type)) {
         // 处理 Query 和 Header 参数
         handlePathItemParameters("query", item?.request?.query?.parameter || [], pathItem);
         handlePathItemParameters("header", item?.request?.header?.parameter || [], pathItem);
@@ -2723,27 +2739,37 @@ const createPathItem = (item, sourceObj, pid, pidName, modelsObj, apiVersion, ta
         // 处理响应
         pathItem.responses = handlePathItemResponse(item?.response || {}, modelsObj);
     }
-    else if (['websocket2', 'socketio', 'graphql'].includes(target_type)) {
+    else if (["websocket2", "socketio", "graphql"].includes(target_type)) {
         // 拼接description
         if (lodash.isPlainObject(item?.config)) {
             switch (target_type) {
-                case 'socketio':
+                case "socketio":
                     pathItem.description = `${pathItem.description}
-${item?.config?.shake_hands_path ? t('securityConnectionMessage', {
-                        enable: item?.config?.certificate_verification == -1 ? t('notNeedEnable') : t('needEnable'),
-                        version: item?.config?.socket_version || 'v4',
-                        path: item?.config?.shake_hands_path
-                    }) : t('securityConnectionMessageNoPath', {
-                        enable: item?.config?.certificate_verification == -1 ? t('notNeedEnable') : t('needEnable'),
-                        version: item?.config?.socket_version || 'v4',
-                    })}
+${item?.config?.shake_hands_path
+                        ? t("securityConnectionMessage", {
+                            enable: item?.config?.certificate_verification == -1
+                                ? t("notNeedEnable")
+                                : t("needEnable"),
+                            version: item?.config?.socket_version || "v4",
+                            path: item?.config?.shake_hands_path,
+                        })
+                        : t("securityConnectionMessageNoPath", {
+                            enable: item?.config?.certificate_verification == -1
+                                ? t("notNeedEnable")
+                                : t("needEnable"),
+                            version: item?.config?.socket_version || "v4",
+                        })}
 `;
                     break;
-                case 'websocket2':
+                case "websocket2":
                     pathItem.description = `${pathItem.description}
-${t('wsConfigMessage', {
-                        enable: item?.config?.certificate_verification == -1 ? t('notNeedEnable') : t('needEnable'),
-                        content: !item?.config?.information_size || item?.config?.information_size == 0 ? t('unlimited') : `${item?.config?.information_size}M`
+${t("wsConfigMessage", {
+                        enable: item?.config?.certificate_verification == -1
+                            ? t("notNeedEnable")
+                            : t("needEnable"),
+                        content: !item?.config?.information_size || item?.config?.information_size == 0
+                            ? t("unlimited")
+                            : `${item?.config?.information_size}M`,
                     })}
 `;
                     break;
@@ -2753,10 +2779,10 @@ ${t('wsConfigMessage', {
         handlePathItemParameters("header", item?.request?.header?.parameter || [], pathItem);
         handlePathItemParameters("cookie", item?.request?.cookie?.parameter || [], pathItem);
         handlePathItemParameters("path", item?.request?.restful?.parameter || [], pathItem);
-        if (target_type == 'socketio')
+        if (target_type == "socketio")
             handlePathItemParameters("event", item?.request?.event?.parameter || [], pathItem);
         // 处理请体
-        if (target_type == 'graphql') {
+        if (target_type == "graphql") {
             handleGraphqlRequestBody(item?.request?.body?.query_list || [], item?.request?.body?.query_schema || {}, pathItem, modelsObj);
         }
         else {
@@ -2767,22 +2793,24 @@ ${t('wsConfigMessage', {
             pathItem.tags = [...pathItem.tags, path];
         }
     }
-    else if (target_type == 'socket_method') {
+    else if (target_type == "socket_method") {
         // 拼接description
         const configs = item?.request?.configs;
         if (lodash.isPlainObject(configs)) {
-            let requestString = `${t('requestEncodingFormat', { format: configs?.charset })} ${lodash.isArray(configs?.func?.request) && configs?.func?.request.length > 0 ?
-                `\n${t('needAddRequestDataHandleFunction')}\n${configs?.func?.request.map((r, index) => {
+            let requestString = `${t("requestEncodingFormat", {
+                format: configs?.charset,
+            })} ${lodash.isArray(configs?.func?.request) && configs?.func?.request.length > 0
+                ? `\n${t("needAddRequestDataHandleFunction")}\n${configs?.func?.request.map((r, index) => {
                     let str = getTcpMethodFucString(r);
                     return str;
                 })}`
-                : ''}`;
-            let responseString = lodash.isArray(configs?.func?.response) && configs?.func?.response.length > 0 ?
-                `${t('needAddResponseDataHandleFunction')}\n${configs?.func?.response.map((r, index) => {
+                : ""}`;
+            let responseString = lodash.isArray(configs?.func?.response) && configs?.func?.response.length > 0
+                ? `${t("needAddResponseDataHandleFunction")}\n${configs?.func?.response.map((r, index) => {
                     let str = getTcpMethodFucString(r);
                     return str;
                 })}`
-                : '';
+                : "";
             pathItem.description = `${pathItem.description}\n${requestString}\n${responseString}`;
         }
         handleSocketMethodRequestBody(item?.request?.body || {}, pathItem);
@@ -2793,7 +2821,7 @@ ${t('wsConfigMessage', {
             pathItem.tags = [...pathItem.tags, path];
         }
     }
-    else if (target_type == 'doc') {
+    else if (target_type == "doc") {
         // 添加路径标签
         if (path?.length > 0 && !pathItem.tags.includes(path)) {
             pathItem.tags = [...pathItem.tags, path];
@@ -2803,33 +2831,47 @@ ${t('wsConfigMessage', {
 };
 const getTcpMethodFucString = (func) => {
     switch (func?.id) {
-        case 'addCharToPacketEnd':
-            return t('addNewline', { str: func?.option });
-        case 'calcLengthToPacketHeader':
-            return t('addContentLength', { size: func?.option });
-        case 'removePacketHeader':
-            return t('removeResponseHeader', { size: func?.option });
-        case 'removeWrapChar':
-            return t('trimTrailingNewline', { str: func?.option });
-        case 'parseXmlToJson':
-            return t('convertXmlToJson');
-    }
-    return '';
+        case "addCharToPacketEnd":
+            return t("addNewline", { str: func?.option });
+        case "calcLengthToPacketHeader":
+            return t("addContentLength", { size: func?.option });
+        case "removePacketHeader":
+            return t("removeResponseHeader", { size: func?.option });
+        case "removeWrapChar":
+            return t("trimTrailingNewline", { str: func?.option });
+        case "parseXmlToJson":
+            return t("convertXmlToJson");
+    }
+    return "";
 };
 const getSocketRequestStr = (end_func) => {
     switch (end_func?.name) {
-        case 'none':
-            return t('completeOnReceive');
-        case 'endedChar':
-            return t('specialCharText', { str: end_func?.option });
-        case 'endedHexChar':
-            return t('specialCharBinary', { str: end_func?.option });
-        case 'endedHeaderByteLength':
-            return t('headerBodyFormat', { size: end_func?.option });
-        case 'endedContentByteLength':
-            return t('fixedLength', { size: end_func?.option });
-    }
-    return '';
+        case "none":
+            return t("completeOnReceive");
+        case "endedChar":
+            return t("specialCharText", { str: end_func?.option });
+        case "endedHexChar":
+            return t("specialCharBinary", { str: end_func?.option });
+        case "endedHeaderByteLength":
+            return t("headerBodyFormat", { size: end_func?.option });
+        case "endedContentByteLength":
+            return t("fixedLength", { size: end_func?.option });
+    }
+    return "";
+};
+const stripExtensions = (obj) => {
+    if (Array.isArray(obj))
+        return obj.map(stripExtensions);
+    if (obj && typeof obj === "object") {
+        const result = {};
+        for (const key of Object.keys(obj)) {
+            if (!key.startsWith("x-")) {
+                result[key] = stripExtensions(obj[key]);
+            }
+        }
+        return result;
+    }
+    return obj;
 };
 
 // @ts-nocheck
@@ -2860,24 +2902,27 @@ class ApipostToSwagger {
     handleProject() {
         const { name, intro, marks, attributes, project_id } = this.apiToSwaggerOrigin.project || {};
         this.apiToSwaggerResult.info = {
-            title: name || t('createProj'),
+            title: name || t("createProj"),
             description: intro || "",
             version: "1.0.0",
         };
         if (lodash.isString(project_id)) {
-            this.apiToSwaggerResult.info['x-project-id'] = project_id;
+            this.apiToSwaggerResult.info["x-project-id"] = project_id;
         }
         if (this.apiToSwaggerVersion == "2.0") {
             this.apiToSwaggerResult.swagger = "2.0";
         }
-        else if (this.apiToSwaggerVersion == "3.0") {
+        else if (this.apiToSwaggerVersion == "3.1") {
+            this.apiToSwaggerResult.openapi = "3.1.0";
+        }
+        else {
             this.apiToSwaggerResult.openapi = "3.0.0";
         }
         if (lodash.isArray(marks) && marks.length > 0) {
-            this.apiToSwaggerResult.info['x-marks'] = marks;
+            this.apiToSwaggerResult.info["x-marks"] = marks;
         }
         if (lodash.isArray(attributes) && attributes.length > 0) {
-            this.apiToSwaggerResult.info['x-attributes'] = attributes;
+            this.apiToSwaggerResult.info["x-attributes"] = attributes;
         }
     }
     handleModels() {
@@ -2887,9 +2932,9 @@ class ApipostToSwagger {
         const schemaMap = childModels?.reduce((pre, item) => {
             if (item?.model_id && item?.name) {
                 pre[item?.model_id] = {
-                    schema: item?.schema || { type: 'object', properties: {} },
+                    schema: item?.schema || { type: "object", properties: {} },
                     path: schemaPath(item?.name, version),
-                    name: item?.name || '',
+                    name: item?.name || "",
                 };
             }
             return pre;
@@ -2902,10 +2947,10 @@ class ApipostToSwagger {
                 return pre;
             }, {});
             // 先不区分目录概念 把所有的schema都放在schemas目录下 后期加上schemas生成多目录
-            if (version === '2.0') {
+            if (version === "2.0") {
                 this.apiToSwaggerResult.definitions = schemas;
             }
-            if (lodash.isEqual(version, '3.0') || lodash.isEqual(version, '3.0.0')) {
+            if (version === "3.1" || lodash.isEqual(version, "3.0") || lodash.isEqual(version, "3.0.0")) {
                 this.apiToSwaggerResult.components = { schemas };
             }
         }
@@ -2918,9 +2963,9 @@ class ApipostToSwagger {
             for (const env of envs) {
                 const servers = {
                     url: env?.url || "",
-                    description: env?.name || t('createEnv'),
-                    "x-env-id": env?.env_id || '',
-                    "x-selected": env?.is_selected
+                    description: env?.name || t("createEnv"),
+                    "x-env-id": env?.env_id || "",
+                    "x-selected": env?.is_selected,
                 };
                 if (lodash.isPlainObject(env?.env_var_list)) {
                     servers.variables = {};
@@ -3001,17 +3046,18 @@ class ApipostToSwagger {
                 if (!id || id == undefined) {
                     continue;
                 }
-                if (['sse', 'api'].includes(item.target_type)) {
+                console.log(item.url, item.sort, "itemitem");
+                if (["sse", "api"].includes(item.target_type)) {
                     const temp_url = removeQuery(item?.url);
                     const targetMethod = item?.method?.toLowerCase();
-                    const pathItem = createPathItem(item, sourceObj, pid, pidName, modelsObj, this.apiToSwaggerVersion, item.target_type == 'api' ? 'http' : item.target_type);
+                    const pathItem = createPathItem(item, sourceObj, pid, pidName, modelsObj, this.apiToSwaggerVersion, item.target_type == "api" ? "http" : item.target_type);
                     if (!paths[temp_url])
                         paths[temp_url] = {};
                     if (!paths[temp_url][targetMethod]) {
                         paths[temp_url][targetMethod] = pathItem;
                     }
                     else if (pathItem.tags.length > 0) {
-                        lodash.forEach(pathItem.tags, tag => {
+                        lodash.forEach(pathItem.tags, (tag) => {
                             if (!paths[temp_url][targetMethod].tags.includes(tag)) {
                                 // 排除重复目录
                                 paths[temp_url][targetMethod].tags.push(tag);
@@ -3021,15 +3067,17 @@ class ApipostToSwagger {
                 }
                 else if (["folder", "socket"].includes(item.target_type)) {
                     const path = recursiveFolderPath(`${item?.name}`, sourceObj, pid, pidName);
+                    console.log(path, "path-folder");
                     item.path = path;
-                    if (!lodash.has(folderObj, item?.name)) {
+                    if (!lodash.has(folderObj, item?.path)) {
                         if (!this.apiToSwaggerResult.tags) {
                             this.apiToSwaggerResult.tags = [];
                         }
                         // 收到数据即认为完成(不处理分包问题) none
-                        if (item.target_type === 'socket' && lodash.isPlainObject(item?.request?.end_func)) {
-                            if (!folderObj?.[item?.name]) {
-                                item.description = `| ${t('serverAddress')} | ${t('pktCompletion')} |
+                        if (item.target_type === "socket" &&
+                            lodash.isPlainObject(item?.request?.end_func)) {
+                            if (!folderObj?.[item?.path]) {
+                                item.description = `| ${t("serverAddress")} | ${t("pktCompletion")} |
                 | --- | --- |
                 |  ${item?.url}  | ${getSocketRequestStr(item?.request?.end_func)}
                 ${item.description}
@@ -3037,16 +3085,18 @@ class ApipostToSwagger {
                             }
                         }
                         this.apiToSwaggerResult.tags.push({
-                            name: item?.name || t('createDir'),
+                            name: item?.path || t("createDir"),
                             description: item?.description || "",
-                            'x-type': item.target_type,
-                            'x-url': item?.url || '',
-                            'x-target-id': item?.target_id || ''
+                            "x-type": item.target_type,
+                            "x-url": item?.url || "",
+                            "x-target-id": item?.target_id || "",
+                            "x-sort": item?.sort || 0,
+                            "x-parent-id": item?.parent_id || "",
                         });
-                        folderObj[item?.name] = item;
+                        folderObj[item?.path] = item;
                     }
                 }
-                else if (['websocket2', 'socketio', 'graphql'].includes(item.target_type)) {
+                else if (["websocket2", "socketio", "graphql"].includes(item.target_type)) {
                     const temp_url = removeQuery(item?.url);
                     const targetMethod = `x-${item?.target_id}`;
                     const pathItem = createPathItem(item, sourceObj, pid, pidName, modelsObj, this.apiToSwaggerVersion, item.target_type);
@@ -3056,7 +3106,7 @@ class ApipostToSwagger {
                         paths[temp_url][targetMethod] = pathItem;
                     }
                     else if (pathItem.tags.length > 0) {
-                        lodash.forEach(pathItem.tags, tag => {
+                        lodash.forEach(pathItem.tags, (tag) => {
                             if (!paths[temp_url][targetMethod].tags.includes(tag)) {
                                 // 排除重复目录
                                 paths[temp_url][targetMethod].tags.push(tag);
@@ -3064,8 +3114,10 @@ class ApipostToSwagger {
                         });
                     }
                 }
-                else if (item.target_type === 'socket_method') {
-                    const temp_url = sourceObj?.[pid] && sourceObj[pid]?.url ? sourceObj[pid]?.url : `${item?.name}`;
+                else if (item.target_type === "socket_method") {
+                    const temp_url = sourceObj?.[pid] && sourceObj[pid]?.url
+                        ? sourceObj[pid]?.url
+                        : `${item?.name}`;
                     const targetMethod = `x-${item.target_id}`;
                     const pathItem = createPathItem(item, sourceObj, pid, pidName, modelsObj, this.apiToSwaggerVersion, item.target_type);
                     if (!paths[temp_url])
@@ -3074,7 +3126,7 @@ class ApipostToSwagger {
                         paths[temp_url][targetMethod] = pathItem;
                     }
                     else if (pathItem.tags.length > 0) {
-                        lodash.forEach(pathItem.tags, tag => {
+                        lodash.forEach(pathItem.tags, (tag) => {
                             if (!paths[temp_url][targetMethod].tags.includes(tag)) {
                                 // 排除重复目录
                                 paths[temp_url][targetMethod].tags.push(tag);
@@ -3082,7 +3134,7 @@ class ApipostToSwagger {
                         });
                     }
                 }
-                else if (item.target_type === 'doc') {
+                else if (item.target_type === "doc") {
                     const temp_url = `x-${item.target_id}`;
                     const targetMethod = `x-${item?.name}`;
                     const pathItem = createPathItem(item, sourceObj, pid, pidName, modelsObj, this.apiToSwaggerVersion, item.target_type);
@@ -3092,7 +3144,7 @@ class ApipostToSwagger {
                         paths[temp_url][targetMethod] = pathItem;
                     }
                     else if (pathItem.tags.length > 0) {
-                        lodash.forEach(pathItem.tags, tag => {
+                        lodash.forEach(pathItem.tags, (tag) => {
                             if (!paths[temp_url][targetMethod].tags.includes(tag)) {
                                 // 排除重复目录
                                 paths[temp_url][targetMethod].tags.push(tag);
@@ -3127,9 +3179,81 @@ class ApipostToSwagger {
             this.array2TreeExport("target_id", "parent_id", modelsObj) || [];
         }
     }
-    async apiToswagger(apipostObj, version, language) {
+    sortApiNodes(nodes) {
+        // 1. 构建 id -> node 的映射，并初始化 children
+        const nodeMap = new Map();
+        nodes.forEach((node) => {
+            nodeMap.set(node["x-target-id"], { ...node, children: [] });
+        });
+        const roots = [];
+        // 2. 建立父子关系
+        nodes.forEach((node) => {
+            const currentNode = nodeMap.get(node["x-target-id"]);
+            const parentId = node["x-parent-id"];
+            if (parentId === "0") {
+                roots.push(currentNode);
+            }
+            else {
+                const parent = nodeMap.get(parentId);
+                if (parent) {
+                    parent.children.push(currentNode);
+                }
+                else {
+                    // 防御：若父节点不存在，当作根节点处理
+                    roots.push(currentNode);
+                }
+            }
+        });
+        // 辅助排序函数：按 x-sort 升序
+        const sortBySort = (arr) => {
+            arr.sort((a, b) => a["x-sort"] - b["x-sort"]);
+        };
+        // 3. 递归排序子节点
+        const sortChildrenRecursively = (node) => {
+            sortBySort(node.children);
+            node.children.forEach((child) => sortChildrenRecursively(child));
+        };
+        sortBySort(roots); // 根节点排序
+        roots.forEach((root) => sortChildrenRecursively(root));
+        // 4. 深度优先遍历（先序）
+        const result = [];
+        const dfs = (node) => {
+            result.push(node);
+            node.children.forEach((child) => dfs(child));
+        };
+        roots.forEach((root) => dfs(root));
+        // 5. 去除 children 字段，只保留原始属性
+        return result.map(({ children, ...rest }) => rest);
+    }
+    sortByXSortPreserveStructure(data, ascending = true) {
+        // 提取所有 (path, method, sort)
+        const items = [];
+        for (const [path, methods] of Object.entries(data)) {
+            for (const [method, spec] of Object.entries(methods)) {
+                if (spec && typeof spec === "object" && spec["x-sort"] !== undefined) {
+                    items.push({ path, method, sort: spec["x-sort"] });
+                }
+            }
+        }
+        // 排序
+        items.sort((a, b) => (ascending ? a.sort - b.sort : b.sort - a.sort));
+        // 重建对象
+        const result = {};
+        for (const { path, method } of items) {
+            if (!result[path])
+                result[path] = {};
+            result[path][method] = data[path][method];
+        }
+        // 调试：打印排序后的 x-sort 列表
+        console.log("排序后的顺序（path + method + x-sort）：");
+        items.forEach((item) => {
+            console.log(`  ${item.sort} - ${item.method} ${item.path}`);
+        });
+        return result;
+    }
+    async apiToswagger(apipostObj, version, language, options) {
         // 初始化语言包
-        await I18nInit(language || 'en');
+        await I18nInit(language || "en");
         this.apiToSwaggerOrigin = apipostObj;
         this.apiToSwaggerVersion = version;
         this.apiToSwaggerResult = {};
@@ -3148,7 +3272,35 @@ class ApipostToSwagger {
             if (`${version}` === "metersphere") {
                 this.formatData();
             }
-            return throwResult$2("success", "", this.apiToSwaggerResult);
+            // 处理tags排序问题
+            const tempTags = this.sortApiNodes(this.apiToSwaggerResult?.tags || []);
+            // 处理paths排序
+            console.log(this.apiToSwaggerResult.paths, "this.apiToSwaggerResult.paths");
+            const tempPaths = this.sortByXSortPreserveStructure(this.apiToSwaggerResult?.paths);
+            // this.apiToSwaggerResult.paths
+            // sortBy(this.apiToSwaggerResult?.tags, ["x-sort", "x-parent-id"]);
+            let result = { ...this.apiToSwaggerResult, tags: tempTags, paths: tempPaths };
+            if (options) {
+                if (options.includeExt === false) {
+                    result = stripExtensions(result);
+                }
+                if (options.dirAsTags === false) {
+                    result.tags = [];
+                    if (result.paths && typeof result.paths === "object") {
+                        for (const p of Object.keys(result.paths)) {
+                            const ms = result.paths[p];
+                            if (ms && typeof ms === "object") {
+                                for (const m of Object.keys(ms)) {
+                                    if (ms[m] && Array.isArray(ms[m].tags)) {
+                                        ms[m].tags = [];
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            return throwResult$2("success", "", result);
         }
         catch (error) {
             console.log(JSON.stringify(error.message), "error");

package/package.json

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