echoapi-converter 0.0.45 → 0.0.46

package/dist/index.js

@@ -256,65 +256,178 @@ const THUNDER_CLIENT_GRANT_TYPES = {
     "authorization_code": "authorization_code",
     "authorization_code_with_pkce": "authorization_code_with_pkce"
 };
+// export const CONTENT_TYPES: Record<string, string> = {
+//   none: 'none',
+//   'form-data': 'multipart/form-data',
+//   urlencoded: 'application/x-www-form-urlencoded',
+//   json: 'application/json',
+//   xml: 'application/xml',
+//   javascript: 'application/javascript',
+//   plain: 'text/plain',
+//   html: 'text/html',
+// };
+const FILL_TYPES = {
+    left: '左填充',
+    right: '右填充'
+};
+const RULE_TYPES_ICON = {
+    1: '(,)',
+    2: '(|)',
+    3: '(;)',
+    4: '(\\t)',
+    5: '( )',
+    6: '(:)',
+    7: '(\\n)',
+    8: '(\\r)',
+    9: '(\\r\\n)',
+};
 
 // @ts-nocheck
-const splicedPath = (name, version) => {
-    if (version === "2.0") {
+const MAX_DEEP_COUNT = 10;
+const schemaPath = (name, version) => {
+    if (version === '2.0') {
         return `#/definitions/${name}`;
     }
     return `#/components/schemas/${name}`;
 };
-const deepHandleModelRef = (modelObj, modelsObj, version) => {
-    var _a, _b, _c;
-    const result = modelObj;
-    // 遍历所有属性
-    for (const key in modelObj) {
-        if (lodash.has(modelObj, key)) {
-            const value = modelObj[key];
-            // 如果属性名为 "ECHOAPI_REFS"
-            if (key === "ECHOAPI_REFS") {
-                const lonely = !lodash.has(modelObj, "properties") || lodash.isEmpty(modelObj.properties);
-                if (lodash.isPlainObject(value) && !lodash.isEmpty(value)) {
-                    const refArr = Object.keys(value);
-                    let modelPath = "";
-                    if (refArr.length > 1) {
-                        if (!lodash.has(modelObj, "properties")) {
-                            modelObj.properties = {};
+const deepModelRef = (originSchema, schemaMap, startSchema, count = 0) => {
+    var _a, _b;
+    try {
+        let deepCount = lodash.cloneDeep(count);
+        const schema = lodash.cloneDeep(originSchema);
+        if (lodash.has(schema, 'ECHOAPI_REFS')) {
+            const refsValue = schema === null || schema === void 0 ? void 0 : schema.ECHOAPI_REFS;
+            if (!lodash.isEmpty(refsValue) &&
+                Object.prototype.toString.call(schema === null || schema === void 0 ? void 0 : schema.properties) === '[object Object]') {
+                const properties = Object.prototype.toString.call(schema === null || schema === void 0 ? void 0 : schema.properties) === '[object Object]'
+                    ? schema === null || schema === void 0 ? void 0 : schema.properties
+                    : {};
+                schema['properties'] = (_a = lodash.values(refsValue)) === null || _a === void 0 ? void 0 : _a.reduce((pre, item) => {
+                    var _a, _b;
+                    if ((item === null || item === void 0 ? void 0 : item.ref) &&
+                        lodash.has(schemaMap, item === null || item === void 0 ? void 0 : item.ref) &&
+                        !lodash.isEqual(startSchema || originSchema, (_a = schemaMap[item === null || item === void 0 ? void 0 : item.ref]) === null || _a === void 0 ? void 0 : _a.schema)) {
+                        const mapValue = schemaMap[item === null || item === void 0 ? void 0 : item.ref];
+                        if (mapValue && (mapValue === null || mapValue === void 0 ? void 0 : mapValue.name)) {
+                            // 暂时没找到多ref引用的方案 先直接导出数据
+                            // pre[mapValue?.name] = {
+                            //   $ref: mapValue?.path,
+                            // };
+                            let mapSchema = mapValue === null || mapValue === void 0 ? void 0 : mapValue.schema;
+                            if (lodash.has(mapValue === null || mapValue === void 0 ? void 0 : mapValue.schema, 'APIPOST_REFS')) {
+                                if (deepCount > MAX_DEEP_COUNT) {
+                                    mapSchema = mapValue === null || mapValue === void 0 ? void 0 : mapValue.schema;
+                                }
+                                else {
+                                    mapSchema = deepModelRef(mapValue === null || mapValue === void 0 ? void 0 : mapValue.schema, schemaMap, startSchema || originSchema, ++deepCount);
+                                }
+                            }
+                            pre = Object.assign(Object.assign({}, pre), ((mapSchema === null || mapSchema === void 0 ? void 0 : mapSchema.properties) || {}));
+                        }
+                        if (lodash.isEqual(startSchema || originSchema, (_b = schemaMap[item === null || item === void 0 ? void 0 : item.ref]) === null || _b === void 0 ? void 0 : _b.schema)) {
+                            pre = {};
                         }
-                        refArr.forEach((item) => {
-                            var _a;
-                            const modelObjItem = modelsObj === null || modelsObj === void 0 ? void 0 : modelsObj[(_a = value === null || value === void 0 ? void 0 : value[item]) === null || _a === void 0 ? void 0 : _a.ref];
-                            modelPath = splicedPath(modelObjItem === null || modelObjItem === void 0 ? void 0 : modelObjItem.modelPath, version);
-                            modelObj.properties["$ref"] = modelPath;
-                        });
+                    }
+                    return pre;
+                }, properties);
+            }
+        }
+        if (lodash.has(schema, 'properties') &&
+            Object.prototype.toString.call(schema === null || schema === void 0 ? void 0 : schema.properties) === '[object Object]') {
+            let properties_keys = lodash.keys(schema === null || schema === void 0 ? void 0 : schema.properties);
+            if (
+            // 优化展示顺序
+            (schema === null || schema === void 0 ? void 0 : schema.ECHOAPI_ORDERS) &&
+                lodash.isArray(schema === null || schema === void 0 ? void 0 : schema.ECHOAPI_ORDERS) &&
+                lodash.isEqual(lodash.sortBy(schema === null || schema === void 0 ? void 0 : schema.ECHOAPI_ORDERS), lodash.sortBy(lodash.keys(schema === null || schema === void 0 ? void 0 : schema.properties)))) {
+                properties_keys = schema === null || schema === void 0 ? void 0 : schema.ECHOAPI_ORDERS;
+            }
+            schema['properties'] = properties_keys === null || properties_keys === void 0 ? void 0 : properties_keys.reduce((pre, key) => {
+                if (key && !lodash.isEmpty(schema === null || schema === void 0 ? void 0 : schema.properties[key])) {
+                    if (deepCount > MAX_DEEP_COUNT) {
+                        pre[key] = schema === null || schema === void 0 ? void 0 : schema.properties[key];
                     }
                     else {
-                        const oldRef = (_a = value === null || value === void 0 ? void 0 : value[refArr[0]]) === null || _a === void 0 ? void 0 : _a.ref;
-                        const hasInvPath = (_b = modelsObj === null || modelsObj === void 0 ? void 0 : modelsObj[oldRef]) === null || _b === void 0 ? void 0 : _b.modelPath;
-                        let modelPath = splicedPath((_c = modelsObj === null || modelsObj === void 0 ? void 0 : modelsObj[oldRef]) === null || _c === void 0 ? void 0 : _c.modelPath, version);
-                        if (lonely && hasInvPath) {
-                            modelObj.$ref = modelPath;
-                        }
-                        else {
-                            refArr.forEach((item) => {
-                                var _a;
-                                const modelObjItem = modelsObj === null || modelsObj === void 0 ? void 0 : modelsObj[(_a = value === null || value === void 0 ? void 0 : value[item]) === null || _a === void 0 ? void 0 : _a.ref];
-                                modelPath = splicedPath(modelObjItem === null || modelObjItem === void 0 ? void 0 : modelObjItem.modelPath, version);
-                                modelObj.properties["$ref"] = modelPath;
-                            });
-                        }
+                        pre[key] = deepModelRef(schema === null || schema === void 0 ? void 0 : schema.properties[key], schemaMap, startSchema || originSchema, ++deepCount);
                     }
                 }
-            }
-            // 如果属性是一个对象，就递归查找
-            else if (Object.prototype.toString.call(value) === "[object Object]" &&
-                value !== null) {
-                modelObj[key] = deepHandleModelRef(value, modelsObj, version);
+                return pre;
+            }, {});
+        }
+        if ((schema === null || schema === void 0 ? void 0 : schema.type) === 'array' && lodash.has(schema, 'items')) {
+            if (lodash.has(schema === null || schema === void 0 ? void 0 : schema.items, 'properties') &&
+                Object.prototype.toString.call((_b = schema === null || schema === void 0 ? void 0 : schema.items) === null || _b === void 0 ? void 0 : _b.properties) === '[object Object]') {
+                if (deepCount <= MAX_DEEP_COUNT) {
+                    schema.items = deepModelRef(schema === null || schema === void 0 ? void 0 : schema.items, schemaMap, startSchema || originSchema, ++deepCount);
+                }
             }
         }
+        // 处理数组的引用
+        schema === null || schema === void 0 ? true : delete schema.ECHOAPI_ORDERS;
+        schema === null || schema === void 0 ? true : delete schema.ECHOAPI_REFS;
+        return schema;
+    }
+    catch (err) {
+        console.log(err.message, "deepModelRef error");
+        return originSchema;
     }
-    return result;
 };
+// export const deepHandleModelRef = (
+//   modelObj: any,
+//   modelsObj: any,
+//   version: string
+// ) => {
+//   const result = modelObj;
+//   // 遍历所有属性
+//   for (const key in modelObj) {
+//     if (has(modelObj, key)) {
+//       const value = modelObj[key];
+//       // 如果属性名为 "APIPOST_REFS"
+//       if (key === "APIPOST_REFS") {
+//         const lonely =
+//           !has(modelObj, "properties") || isEmpty(modelObj.properties);
+//         if (isPlainObject(value) && !isEmpty(value)) {
+//           const refArr: any = Object.keys(value);
+//           let modelPath = "";
+//           if (refArr.length > 1) {
+//             if (!has(modelObj, "properties")) {
+//               modelObj.properties = {};
+//             }
+//             refArr.forEach((item: any) => {
+//               const modelObjItem = modelsObj?.[value?.[item]?.ref];
+//               modelPath = splicedPath(modelObjItem?.modelPath, version);
+//               modelObj.properties["$ref"] = modelPath;
+//             });
+//           } else {
+//             const oldRef = value?.[refArr[0]]?.ref;
+//             const hasInvPath = modelsObj?.[oldRef]?.modelPath;
+//             let modelPath = splicedPath(
+//               modelsObj?.[oldRef]?.modelPath,
+//               version
+//             );
+//             if (lonely && hasInvPath) {
+//               modelObj.$ref = modelPath;
+//             } else {
+//               refArr.forEach((item: any) => {
+//                 const modelObjItem = modelsObj?.[value?.[item]?.ref];
+//                 modelPath = splicedPath(modelObjItem?.modelPath, version);
+//                 modelObj.properties["$ref"] = modelPath;
+//               });
+//             }
+//           }
+//         }
+//       }
+//       // 如果属性是一个对象，就递归查找
+//       else if (
+//         Object.prototype.toString.call(value) === "[object Object]" &&
+//         value !== null
+//       ) {
+//         modelObj[key] = deepHandleModelRef(value, modelsObj, version);
+//       }
+//     }
+//   }
+//   return result;
+// };
 const removeQuery = (url) => {
     let path = url;
     try {
@@ -405,11 +518,12 @@ const handlePathItemBodyParameters = (body, pathItem, modelsObj) => {
                     in: "body",
                     name: "body",
                     description: "",
-                    schema: (body === null || body === void 0 ? void 0 : body.raw_schema) || {},
+                    schema: deepModelRef((body === null || body === void 0 ? void 0 : body.raw_schema) || {
+                        type: 'object'
+                    }, modelsObj),
                     type: "string",
                     example: (body === null || body === void 0 ? void 0 : body.raw) || "",
                 };
-                obj = deepHandleModelRef(obj, modelsObj, "2.0");
                 pathItem.parameters.push(obj);
             }
             else if (["multipart/form-data", "application/x-www-form-urlencoded"].includes(mode)) {
@@ -433,7 +547,138 @@ const handlePathItemBodyParameters = (body, pathItem, modelsObj) => {
         }
     }
 };
-const handlePathItemrequestBody = (body, pathItem) => {
+const handleGraphqlRequestBody = (query_list, query_schema, pathItem, modelsObj) => {
+    if (lodash.isArray(query_list) && query_list.length > 0) {
+        if (!lodash.has(pathItem, "requestBody")) {
+            pathItem.requestBody = {
+                content: {},
+                'x-schema': query_schema || {}
+            };
+        }
+        query_list.forEach(m => {
+            var _a, _b, _c;
+            const mode = `x-${m === null || m === void 0 ? void 0 : m.param_id}`;
+            pathItem.requestBody.content[mode] = {
+                'x-query': (m === null || m === void 0 ? void 0 : m.query) || '',
+                'x-variables': (m === null || m === void 0 ? void 0 : m.variables) || '',
+                'x-summary': (m === null || m === void 0 ? void 0 : m.name) || '',
+                'x-response': {
+                    'x-mode': ((_a = m === null || m === void 0 ? void 0 : m.response) === null || _a === void 0 ? void 0 : _a.mode) || '',
+                    example: ((_b = m === null || m === void 0 ? void 0 : m.response) === null || _b === void 0 ? void 0 : _b.raw) || "",
+                    schema: deepModelRef(((_c = m === null || m === void 0 ? void 0 : m.response) === null || _c === void 0 ? void 0 : _c.raw_schema) || {
+                        type: "object",
+                    }, modelsObj),
+                }
+            };
+        });
+    }
+};
+const handleSocketMethodParameterDescription = (item, mode) => {
+    let description = item === null || item === void 0 ? void 0 : item.description;
+    let rules = item === null || item === void 0 ? void 0 : item.rules;
+    if (mode == 'fixed_message') {
+        let fillTypStr = (FILL_TYPES === null || FILL_TYPES === void 0 ? void 0 : FILL_TYPES[rules === null || rules === void 0 ? void 0 : rules.fill_type]) || '';
+        return `${description}\n${fillTypStr}至长度${rules === null || rules === void 0 ? void 0 : rules.length}，填充字符${rules === null || rules === void 0 ? void 0 : rules.custom}`;
+    }
+    else if (mode == 'delimiter_message') {
+        return `${description}\n结尾添加分隔符${RULE_TYPES_ICON[rules === null || rules === void 0 ? void 0 : rules.delimiter]}`;
+    }
+    return description;
+};
+const handleSocketMethodRequestBody = (body, pathItem) => {
+    if (lodash.isPlainObject(body) && !lodash.isEmpty(body)) {
+        if (!lodash.has(pathItem, "requestBody")) {
+            pathItem.requestBody = {
+                content: {},
+            };
+        }
+        const mode = MODE_TYPE[body === null || body === void 0 ? void 0 : body.mode];
+        const parameter = (body === null || body === void 0 ? void 0 : body.parameter) || [];
+        if (['delimiter_message', 'fixed_message'].includes(body === null || body === void 0 ? void 0 : body.mode)) {
+            pathItem.requestBody.content[body === null || body === void 0 ? void 0 : body.mode] = {
+                'x-mode': (body === null || body === void 0 ? void 0 : body.mode) || '',
+                schema: {
+                    type: "object",
+                    properties: parameter.reduce((lastData, item) => {
+                        if (lodash.isString(item === null || item === void 0 ? void 0 : item.key) &&
+                            item.key.length > 0 &&
+                            (!lodash.has(item, "is_checked") || (item === null || item === void 0 ? void 0 : item.is_checked) > 0)) {
+                            lastData[item.key] = {
+                                type: "string",
+                                description: handleSocketMethodParameterDescription(item, body === null || body === void 0 ? void 0 : body.mode),
+                                example: (item === null || item === void 0 ? void 0 : item.value) || "",
+                            };
+                        }
+                        return lastData;
+                    }, {}),
+                },
+                example: "",
+            };
+        }
+        else {
+            let modeStr = MODE_TYPE[mode];
+            if (modeStr) {
+                pathItem.requestBody.content[modeStr] = {
+                    'x-mode': modeStr || '',
+                    schema: {
+                        type: "object",
+                    },
+                    example: (body === null || body === void 0 ? void 0 : body.raw) || "",
+                };
+            }
+        }
+    }
+};
+const handleMessagePathItemrequestBody = (message, pathItem, modelsObj) => {
+    if (lodash.isArray(message) && message.length > 0) {
+        if (!lodash.has(pathItem, "requestBody")) {
+            pathItem.requestBody = {
+                content: {},
+            };
+        }
+        message.forEach(m => {
+            var _a, _b, _c, _d, _e, _f;
+            const mode = `x-${m === null || m === void 0 ? void 0 : m.param_id}`;
+            pathItem.requestBody.content[mode] = {
+                'x-mode': ((_a = m === null || m === void 0 ? void 0 : m.request) === null || _a === void 0 ? void 0 : _a.mode) || '',
+                'x-summary': (m === null || m === void 0 ? void 0 : m.name) || '',
+                schema: deepModelRef(((_b = m === null || m === void 0 ? void 0 : m.request) === null || _b === void 0 ? void 0 : _b.raw_schema) || {
+                    type: "object",
+                }, modelsObj),
+                example: ((_c = m === null || m === void 0 ? void 0 : m.request) === null || _c === void 0 ? void 0 : _c.raw) || "",
+                'x-response': {
+                    'x-mode': ((_d = m === null || m === void 0 ? void 0 : m.response) === null || _d === void 0 ? void 0 : _d.mode) || '',
+                    example: ((_e = m === null || m === void 0 ? void 0 : m.response) === null || _e === void 0 ? void 0 : _e.raw) || "",
+                    schema: deepModelRef(((_f = m === null || m === void 0 ? void 0 : m.response) === null || _f === void 0 ? void 0 : _f.raw_schema) || {
+                        type: "object",
+                    }, modelsObj),
+                }
+            };
+        });
+    }
+};
+const handlePathItemResponse = (response, modelsObj) => {
+    const temp_responses = {};
+    const example = (response === null || response === void 0 ? void 0 : response.example) || [];
+    if (lodash.isPlainObject(response)) {
+        example.forEach(({ expect, raw }) => {
+            const code = expect === null || expect === void 0 ? void 0 : expect.code;
+            if (lodash.isNumber(code) || lodash.isString(code)) {
+                temp_responses[code] = {
+                    description: (expect === null || expect === void 0 ? void 0 : expect.name) || "",
+                    content: {
+                        [(MODE_TYPE === null || MODE_TYPE === void 0 ? void 0 : MODE_TYPE[expect === null || expect === void 0 ? void 0 : expect.content_type]) || "*/*"]: {
+                            schema: deepModelRef((expect === null || expect === void 0 ? void 0 : expect.schema) || {}, modelsObj),
+                            example: raw || '',
+                        },
+                    },
+                };
+            }
+        });
+    }
+    return temp_responses;
+};
+const handlePathItemRequestBody = (body, pathItem, modelsObj) => {
     if (lodash.isPlainObject(body) && !lodash.isEmpty(body) && (body === null || body === void 0 ? void 0 : body.mode) != "none") {
         if (!lodash.has(pathItem, "requestBody")) {
             pathItem.requestBody = {
@@ -450,9 +695,9 @@ const handlePathItemrequestBody = (body, pathItem) => {
                 "text/html",
             ].includes(mode)) {
                 pathItem.requestBody.content[mode] = {
-                    schema: (body === null || body === void 0 ? void 0 : body.raw_schema) || {
-                        type: "string",
-                    },
+                    schema: deepModelRef((body === null || body === void 0 ? void 0 : body.raw_schema) || {
+                        type: "object",
+                    }, modelsObj),
                     example: (body === null || body === void 0 ? void 0 : body.raw) || "",
                 };
             }
@@ -462,19 +707,19 @@ const handlePathItemrequestBody = (body, pathItem) => {
                     pathItem.requestBody.content[mode] = {
                         schema: {
                             type: "object",
+                            properties: parameter.reduce((lastData, item) => {
+                                if (lodash.isString(item === null || item === void 0 ? void 0 : item.key) &&
+                                    item.key.length > 0 &&
+                                    (!lodash.has(item, "is_checked") || (item === null || item === void 0 ? void 0 : item.is_checked) > 0)) {
+                                    lastData[item.key] = {
+                                        type: "string",
+                                        description: (item === null || item === void 0 ? void 0 : item.description) || "",
+                                        example: (item === null || item === void 0 ? void 0 : item.value) || "",
+                                    };
+                                }
+                                return lastData;
+                            }, {})
                         },
-                        properties: parameter.reduce((lastData, item) => {
-                            if (lodash.isString(item === null || item === void 0 ? void 0 : item.key) &&
-                                item.key.length > 0 &&
-                                (!lodash.has(item, "is_checked") || (item === null || item === void 0 ? void 0 : item.is_checked) > 0)) {
-                                lastData[item.key] = {
-                                    type: "string",
-                                    description: (item === null || item === void 0 ? void 0 : item.description) || "",
-                                    example: (item === null || item === void 0 ? void 0 : item.value) || "",
-                                };
-                            }
-                            return lastData;
-                        }, {}),
                     };
                 }
             }
@@ -484,25 +729,151 @@ const handlePathItemrequestBody = (body, pathItem) => {
         (pathItem === null || pathItem === void 0 ? void 0 : pathItem.requestBody) && delete pathItem.requestBody;
     }
 };
-const handelPathItemResponse = (response) => {
-    const temp_responses = {};
-    const example = (response === null || response === void 0 ? void 0 : response.example) || [];
-    if (lodash.isPlainObject(response)) {
-        example.forEach(({ expect }) => {
-            const code = expect === null || expect === void 0 ? void 0 : expect.code;
-            if (lodash.isNumber(code) || lodash.isString(code)) {
-                temp_responses[code] = {
-                    description: (expect === null || expect === void 0 ? void 0 : expect.name) || "",
-                    content: {
-                        [(MODE_TYPE === null || MODE_TYPE === void 0 ? void 0 : MODE_TYPE[expect === null || expect === void 0 ? void 0 : expect.contentType]) || "*/*"]: {
-                            schema: (expect === null || expect === void 0 ? void 0 : expect.schema) || {},
-                        },
-                    },
-                };
+const createPathItem = (item, sourceObj, pid, pidName, modelsObj, apiVersion, target_type) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11;
+    const path = recursiveFolderPath("", sourceObj, pid, pidName);
+    const pathItem = {
+        'x-protocol': target_type || '',
+        summary: (item === null || item === void 0 ? void 0 : item.name) || "",
+        description: (item === null || item === void 0 ? void 0 : item.description) || "",
+        tags: (item === null || item === void 0 ? void 0 : item.tags) || [],
+    };
+    if (lodash.isArray(item === null || item === void 0 ? void 0 : item.tags) && (item === null || item === void 0 ? void 0 : item.tags.length) > 0) {
+        pathItem['x-tags'] = item === null || item === void 0 ? void 0 : item.tags;
+    }
+    if (lodash.isString(item === null || item === void 0 ? void 0 : item.mark_id)) {
+        pathItem['x-mark-id'] = item === null || item === void 0 ? void 0 : item.mark_id;
+    }
+    if (lodash.isString(item === null || item === void 0 ? void 0 : item.updated_at)) {
+        pathItem['x-updated-at'] = item === null || item === void 0 ? void 0 : item.tags;
+    }
+    if (lodash.isString((_a = item === null || item === void 0 ? void 0 : item.updated_user) === null || _a === void 0 ? void 0 : _a.nick_name)) {
+        pathItem['x-updated-user-name'] = (_b = item === null || item === void 0 ? void 0 : item.updated_user) === null || _b === void 0 ? void 0 : _b.nick_name;
+    }
+    if (lodash.isPlainObject(item === null || item === void 0 ? void 0 : item.attribute_info) && !lodash.isEmpty(item === null || item === void 0 ? void 0 : item.attribute_info)) {
+        pathItem['x-attribute-info'] = item === null || item === void 0 ? void 0 : item.attribute_info;
+    }
+    if ((item === null || item === void 0 ? void 0 : item.is_exampled) === 1) {
+        pathItem['x-exampled'] = item === null || item === void 0 ? void 0 : item.is_exampled;
+    }
+    if (['http', 'sse'].includes(target_type)) {
+        // 处理 Query 和 Header 参数
+        handlePathItemParameters("query", ((_d = (_c = item === null || item === void 0 ? void 0 : item.request) === null || _c === void 0 ? void 0 : _c.query) === null || _d === void 0 ? void 0 : _d.parameter) || [], pathItem);
+        handlePathItemParameters("header", ((_f = (_e = item === null || item === void 0 ? void 0 : item.request) === null || _e === void 0 ? void 0 : _e.header) === null || _f === void 0 ? void 0 : _f.parameter) || [], pathItem);
+        handlePathItemParameters("cookie", ((_h = (_g = item === null || item === void 0 ? void 0 : item.request) === null || _g === void 0 ? void 0 : _g.cookie) === null || _h === void 0 ? void 0 : _h.parameter) || [], pathItem);
+        // 处理请求体参数（根据 Swagger 版本）
+        if (apiVersion === "2.0") {
+            handlePathItemBodyParameters(((_j = item === null || item === void 0 ? void 0 : item.request) === null || _j === void 0 ? void 0 : _j.body) || {}, pathItem, modelsObj);
+        }
+        else {
+            handlePathItemRequestBody(((_k = item === null || item === void 0 ? void 0 : item.request) === null || _k === void 0 ? void 0 : _k.body) || {}, pathItem, modelsObj);
+        }
+        // 添加路径标签
+        if ((path === null || path === void 0 ? void 0 : path.length) > 0 && !pathItem.tags.includes(path)) {
+            pathItem.tags = [...pathItem.tags, path];
+        }
+        // 处理响应
+        pathItem.responses = handlePathItemResponse((item === null || item === void 0 ? void 0 : item.response) || {}, modelsObj);
+    }
+    else if (['websocket2', 'socketio', 'graphql'].includes(target_type)) {
+        // 拼接description
+        if (lodash.isPlainObject(item === null || item === void 0 ? void 0 : item.config)) {
+            switch (target_type) {
+                case 'socketio':
+                    pathItem.description = `${pathItem.description}
+Over a secure connection，${((_l = item === null || item === void 0 ? void 0 : item.config) === null || _l === void 0 ? void 0 : _l.certificate_verification) == -1 ? 'Do not enable server certificate verification.' : 'Enable server certificate verification'}，And use the client version ${((_m = item === null || item === void 0 ? void 0 : item.config) === null || _m === void 0 ? void 0 : _m.socket_version) || 'v4'}And the specified handshake path ${((_o = item === null || item === void 0 ? void 0 : item.config) === null || _o === void 0 ? void 0 : _o.shake_hands_path) || '/socket.io'} make a connection.`;
+                    break;
+                case 'websocket2':
+                    pathItem.description = `${pathItem.description}
+Over a secure connection，${((_p = item === null || item === void 0 ? void 0 : item.config) === null || _p === void 0 ? void 0 : _p.certificate_verification) == -1 ? 'Do not enable server certificate verification.' : 'Enable server certificate verification'}，${((_q = item === null || item === void 0 ? void 0 : item.config) === null || _q === void 0 ? void 0 : _q.information_size) == 0 ? 'And there is no limit to the maximum sent content that can be received。' : `And the maximum sent content allowed to be received is${((_r = item === null || item === void 0 ? void 0 : item.config) === null || _r === void 0 ? void 0 : _r.information_size) || 5}M。`}`;
+                    break;
             }
-        });
+        }
+        handlePathItemParameters("query", ((_t = (_s = item === null || item === void 0 ? void 0 : item.request) === null || _s === void 0 ? void 0 : _s.query) === null || _t === void 0 ? void 0 : _t.parameter) || [], pathItem);
+        handlePathItemParameters("header", ((_v = (_u = item === null || item === void 0 ? void 0 : item.request) === null || _u === void 0 ? void 0 : _u.header) === null || _v === void 0 ? void 0 : _v.parameter) || [], pathItem);
+        handlePathItemParameters("cookie", ((_x = (_w = item === null || item === void 0 ? void 0 : item.request) === null || _w === void 0 ? void 0 : _w.cookie) === null || _x === void 0 ? void 0 : _x.parameter) || [], pathItem);
+        if (target_type == 'socketio')
+            handlePathItemParameters("event", ((_z = (_y = item === null || item === void 0 ? void 0 : item.request) === null || _y === void 0 ? void 0 : _y.event) === null || _z === void 0 ? void 0 : _z.parameter) || [], pathItem);
+        // 处理请体
+        if (target_type == 'graphql') {
+            handleGraphqlRequestBody(((_1 = (_0 = item === null || item === void 0 ? void 0 : item.request) === null || _0 === void 0 ? void 0 : _0.body) === null || _1 === void 0 ? void 0 : _1.query_list) || [], ((_3 = (_2 = item === null || item === void 0 ? void 0 : item.request) === null || _2 === void 0 ? void 0 : _2.body) === null || _3 === void 0 ? void 0 : _3.query_schema) || {}, pathItem, modelsObj);
+        }
+        else {
+            handleMessagePathItemrequestBody((item === null || item === void 0 ? void 0 : item.message) || [], pathItem, modelsObj);
+        }
+        // 添加路径标签
+        if ((path === null || path === void 0 ? void 0 : path.length) > 0 && !pathItem.tags.includes(path)) {
+            pathItem.tags = [...pathItem.tags, path];
+        }
     }
-    return temp_responses;
+    else if (target_type == 'socket_method') {
+        // 拼接description
+        const configs = (_4 = item === null || item === void 0 ? void 0 : item.request) === null || _4 === void 0 ? void 0 : _4.configs;
+        if (lodash.isPlainObject(configs)) {
+            let requestString = `The encoding format of the request packet is ${configs === null || configs === void 0 ? void 0 : configs.charset} ${lodash.isArray((_5 = configs === null || configs === void 0 ? void 0 : configs.func) === null || _5 === void 0 ? void 0 : _5.request) && ((_6 = configs === null || configs === void 0 ? void 0 : configs.func) === null || _6 === void 0 ? void 0 : _6.request.length) > 0 ?
+                (_7 = configs === null || configs === void 0 ? void 0 : configs.func) === null || _7 === void 0 ? void 0 : _7.request.map((r, index) => {
+                    var _a;
+                    let str = getTcpMethodFucString(r);
+                    if (index < ((_a = configs === null || configs === void 0 ? void 0 : configs.func) === null || _a === void 0 ? void 0 : _a.request.length) - 1) {
+                        return str + '，';
+                    }
+                    return str;
+                }) : ''}`;
+            let responseString = lodash.isArray((_8 = configs === null || configs === void 0 ? void 0 : configs.func) === null || _8 === void 0 ? void 0 : _8.response) && ((_9 = configs === null || configs === void 0 ? void 0 : configs.func) === null || _9 === void 0 ? void 0 : _9.response.length) > 0 ? (_10 = configs === null || configs === void 0 ? void 0 : configs.func) === null || _10 === void 0 ? void 0 : _10.response.map((r, index) => {
+                var _a;
+                let str = getTcpMethodFucString(r);
+                if (index < ((_a = configs === null || configs === void 0 ? void 0 : configs.func) === null || _a === void 0 ? void 0 : _a.request.length) - 1) {
+                    return str + '，';
+                }
+                return str + '。';
+            }) : '';
+            pathItem.description = `${pathItem.description}\n${requestString}\n${responseString}`;
+        }
+        handleSocketMethodRequestBody(((_11 = item === null || item === void 0 ? void 0 : item.request) === null || _11 === void 0 ? void 0 : _11.body) || {}, pathItem);
+        // 处理响应
+        pathItem.responses = handlePathItemResponse((item === null || item === void 0 ? void 0 : item.response) || {}, modelsObj);
+        // 添加路径标签
+        if ((path === null || path === void 0 ? void 0 : path.length) > 0 && !pathItem.tags.includes(path)) {
+            pathItem.tags = [...pathItem.tags, path];
+        }
+    }
+    else if (target_type == 'doc') {
+        // 添加路径标签
+        if ((path === null || path === void 0 ? void 0 : path.length) > 0 && !pathItem.tags.includes(path)) {
+            pathItem.tags = [...pathItem.tags, path];
+        }
+    }
+    return pathItem;
+};
+const getTcpMethodFucString = (func) => {
+    switch (func === null || func === void 0 ? void 0 : func.id) {
+        case 'addCharToPacketEnd':
+            return `Add a newline character at the end of each request message ${func === null || func === void 0 ? void 0 : func.option}`;
+        case 'calcLengthToPacketHeader':
+            return `Calculates the content length (excluding the header) and adds it to the header (in text format, the header byte length is ${func === null || func === void 0 ? void 0 : func.option}）`;
+        case 'removePacketHeader':
+            return `The response packet needs to be stripped of its header (length ${func === null || func === void 0 ? void 0 : func.option} byte）`;
+        case 'removeWrapChar':
+            return `Removes the newline character at the end of the line ${func === null || func === void 0 ? void 0 : func.option}`;
+        case 'parseXmlToJson':
+            return 'And convert the content in XML format to JSON format';
+    }
+    return '';
+};
+const getSocketRequestStr = (end_func) => {
+    switch (end_func === null || end_func === void 0 ? void 0 : end_func.name) {
+        case 'none':
+            return `Data received deemed complete (subcontracting is not addressed`;
+        case 'endedChar':
+            return `Packet tail with special characters ${end_func === null || end_func === void 0 ? void 0 : end_func.option}`;
+        case 'endedHexChar':
+            return `Packet tail with special characters (binary message) ${end_func === null || end_func === void 0 ? void 0 : end_func.option}`;
+        case 'endedHeaderByteLength':
+            return `[header + packet body] format message ${end_func === null || end_func === void 0 ? void 0 : end_func.option}`;
+        case 'endedContentByteLength':
+            return `Fixed-length message ${end_func === null || end_func === void 0 ? void 0 : end_func.option}`;
+    }
+    return '';
 };
 
 const throwResult$1 = (status, message, data = '') => {
@@ -804,7 +1175,7 @@ class ApipostToSwagger {
         this.apiToSwaggerVersion = "2.0";
     }
     handleProject() {
-        const { name, intro } = this.apiToSwaggerOrigin.project || {};
+        const { name, intro, marks, attributes } = this.apiToSwaggerOrigin.project || {};
         this.apiToSwaggerResult.info = {
             title: name || "New Project",
             description: intro || "",
@@ -816,51 +1187,44 @@ class ApipostToSwagger {
         else if (this.apiToSwaggerVersion == "3.0") {
             this.apiToSwaggerResult.openapi = "3.0.0";
         }
+        if (lodash.isArray(marks) && marks.length > 0) {
+            this.apiToSwaggerResult.info['x-marks'] = marks;
+        }
+        if (lodash.isArray(attributes) && attributes.length > 0) {
+            this.apiToSwaggerResult.info['x-attributes'] = attributes;
+        }
     }
     handleModels() {
-        var _a;
+        var _a, _b;
         const version = this.apiToSwaggerVersion;
-        let modelsObj = {};
-        const models = (_a = this.apiToSwaggerOrigin.models) === null || _a === void 0 ? void 0 : _a.filter((item) => (item === null || item === void 0 ? void 0 : item.model_type) === "model");
-        if (lodash.isArray(models) && models.length > 0) {
-            const components = {
-                schemas: {},
-            };
-            const modelsPathObj = {};
-            modelsObj = models.reduce((lastObj, item) => {
-                if (item === null || item === void 0 ? void 0 : item.model_id) {
-                    let modelPath = `${item === null || item === void 0 ? void 0 : item.name}`;
-                    if (lodash.has(modelsPathObj, modelPath)) {
-                        while (!lodash.has(modelsPathObj, modelPath)) {
-                            modelPath += "1";
-                        }
-                    }
-                    if (Object.isExtensible(item)) {
-                        item["modelPath"] = modelPath;
-                    }
-                    modelsPathObj[modelPath] = item;
-                    lastObj[item.model_id] = item;
-                    return lastObj;
-                }
-            }, {});
-            components.schemas = Object.keys(modelsPathObj).reduce((lastObj, key) => {
-                const modelObj = modelsPathObj[key];
-                if (!lodash.has(modelObj, "schema") || !lodash.isPlainObject(modelObj.schema)) {
-                    modelObj.schema = {};
+        const childModels = (_a = this.apiToSwaggerOrigin.models) === null || _a === void 0 ? void 0 : _a.filter((item) => (item === null || item === void 0 ? void 0 : item.model_type) === "model");
+        // 声明一个schema映射表
+        const schemaMap = childModels === null || childModels === void 0 ? void 0 : childModels.reduce((pre, item) => {
+            if ((item === null || item === void 0 ? void 0 : item.model_id) && (item === null || item === void 0 ? void 0 : item.name)) {
+                pre[item === null || item === void 0 ? void 0 : item.model_id] = {
+                    schema: (item === null || item === void 0 ? void 0 : item.schema) || { type: 'object', properties: {} },
+                    path: schemaPath(item === null || item === void 0 ? void 0 : item.name, version),
+                    name: (item === null || item === void 0 ? void 0 : item.name) || '',
+                };
+            }
+            return pre;
+        }, {});
+        if (lodash.isArray(childModels) && childModels.length > 0) {
+            const schemas = (_b = lodash.values(schemaMap)) === null || _b === void 0 ? void 0 : _b.reduce((pre, item) => {
+                if ((item === null || item === void 0 ? void 0 : item.name) && (item === null || item === void 0 ? void 0 : item.schema)) {
+                    pre[item === null || item === void 0 ? void 0 : item.name] = deepModelRef(item === null || item === void 0 ? void 0 : item.schema, schemaMap);
                 }
-                // modelObj.schema.title = modelObj?.display_name || '';
-                // 处理完所有当前模型所有引用
-                lastObj[key] = deepHandleModelRef(modelObj.schema, modelsObj, version);
-                return lastObj;
+                return pre;
             }, {});
-            if (version === "2.0") {
-                this.apiToSwaggerResult.definitions = components.schemas;
+            // 先不区分目录概念 把所有的schema都放在schemas目录下 后期加上schemas生成多目录
+            if (version === '2.0') {
+                this.apiToSwaggerResult.definitions = schemas;
             }
-            else if (version === "3.0") {
-                this.apiToSwaggerResult.components = components;
+            if (lodash.isEqual(version, '3.0') || lodash.isEqual(version, '3.0.0')) {
+                this.apiToSwaggerResult.components = { schemas };
             }
         }
-        return modelsObj;
+        return schemaMap;
     }
     handleEnvs() {
         const envs = this.apiToSwaggerOrigin.envs;
@@ -937,7 +1301,7 @@ class ApipostToSwagger {
         this.apiToSwaggerResult.paths = tempPaths;
     }
     array2NamePathObj(idName = "id", pidName = "pid", modelsObj) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e;
         const items = this.apiToSwaggerOrigin.apis;
         try {
             const paths = {};
@@ -952,57 +1316,82 @@ class ApipostToSwagger {
                 if (!id || id == undefined) {
                     continue;
                 }
-                if (item.target_type == "api") {
+                if (['sse', 'api'].includes(item.target_type)) {
                     const temp_url = removeQuery(item === null || item === void 0 ? void 0 : item.url);
-                    const path = recursiveFolderPath("", sourceObj, pid, pidName);
-                    const targetMethod = (_a = item === null || item === void 0 ? void 0 : item.method) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase();
-                    item.path = path;
-                    if (!lodash.has(paths, temp_url)) {
+                    const targetMethod = (_a = item === null || item === void 0 ? void 0 : item.method) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+                    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 (!lodash.has(paths[temp_url], targetMethod)) {
-                        const pathItem = {
-                            summary: (item === null || item === void 0 ? void 0 : item.name) || "",
-                            description: (item === null || item === void 0 ? void 0 : item.description) || "",
-                            tags: (item === null || item === void 0 ? void 0 : item.tags) || [],
-                        };
-                        handlePathItemParameters("query", ((_c = (_b = item === null || item === void 0 ? void 0 : item.request) === null || _b === void 0 ? void 0 : _b.query) === null || _c === void 0 ? void 0 : _c.parameter) || [], pathItem);
-                        handlePathItemParameters("header", ((_e = (_d = item === null || item === void 0 ? void 0 : item.request) === null || _d === void 0 ? void 0 : _d.header) === null || _e === void 0 ? void 0 : _e.parameter) || [], pathItem);
-                        if (this.apiToSwaggerVersion == "2.0") {
-                            handlePathItemBodyParameters(((_f = item === null || item === void 0 ? void 0 : item.request) === null || _f === void 0 ? void 0 : _f.body) || {}, pathItem, modelsObj);
-                        }
-                        else {
-                            handlePathItemrequestBody(((_g = item === null || item === void 0 ? void 0 : item.request) === null || _g === void 0 ? void 0 : _g.body) || {}, pathItem);
-                        }
-                        pathItem.requestBody = deepHandleModelRef(pathItem.requestBody, modelsObj, this.apiToSwaggerVersion);
-                        if (path && path.length > 0 && !pathItem.tags.includes(path)) {
-                            pathItem.tags = [...pathItem.tags, path];
-                        }
-                        // 添加响应期望 responses
-                        pathItem.responses = handelPathItemResponse((item === null || item === void 0 ? void 0 : item.response) || {});
-                        pathItem.responses = deepHandleModelRef(pathItem.responses, modelsObj, this.apiToSwaggerVersion);
+                    if (!paths[temp_url][targetMethod]) {
                         paths[temp_url][targetMethod] = pathItem;
                     }
-                    else if (path &&
-                        path.length > 0 &&
-                        !((_h = paths[temp_url][targetMethod]) === null || _h === void 0 ? void 0 : _h.tags.includes(path))) {
-                        (_j = paths[temp_url][targetMethod]) === null || _j === void 0 ? void 0 : _j.tags.push(path);
+                    else if (pathItem.tags.length > 0) {
+                        paths[temp_url][targetMethod].tags.push(...pathItem.tags);
                     }
                 }
-                else if (item.target_type == "folder") {
+                else if (["folder", "socket"].includes(item.target_type)) {
                     const path = recursiveFolderPath(`${item === null || item === void 0 ? void 0 : item.name}`, sourceObj, pid, pidName);
                     item.path = path;
                     if (!lodash.has(folderObj, item === null || item === void 0 ? void 0 : item.name)) {
                         if (!this.apiToSwaggerResult.tags) {
                             this.apiToSwaggerResult.tags = [];
                         }
+                        // 收到数据即认为完成(不处理分包问题) none
+                        if (item.target_type === 'socket' && lodash.isPlainObject((_b = item === null || item === void 0 ? void 0 : item.request) === null || _b === void 0 ? void 0 : _b.end_func)) {
+                            item.description = `| Server address | Determine the completion mode of receiving packets |
+| --- | --- |
+|  ${item === null || item === void 0 ? void 0 : item.url}  | ${getSocketRequestStr((_c = item === null || item === void 0 ? void 0 : item.request) === null || _c === void 0 ? void 0 : _c.end_func)}
+${item.description}
+              `;
+                        }
                         this.apiToSwaggerResult.tags.push({
                             name: (item === null || item === void 0 ? void 0 : item.name) || "New Folder",
                             description: (item === null || item === void 0 ? void 0 : item.description) || "",
+                            'x-type': item.target_type,
+                            'x-url': (item === null || item === void 0 ? void 0 : item.url) || ''
                         });
                         folderObj[item === null || item === void 0 ? void 0 : item.name] = item;
                     }
                 }
+                else if (['websocket2', 'socketio', 'graphql'].includes(item.target_type)) {
+                    const temp_url = removeQuery(item === null || item === void 0 ? void 0 : item.url);
+                    const targetMethod = `x-${item === null || item === void 0 ? void 0 : item.target_id}`;
+                    const pathItem = createPathItem(item, sourceObj, pid, pidName, modelsObj, this.apiToSwaggerVersion, 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) {
+                        paths[temp_url][targetMethod].tags.push(...pathItem.tags);
+                    }
+                }
+                else if (item.target_type === 'socket_method') {
+                    const temp_url = (sourceObj === null || sourceObj === void 0 ? void 0 : sourceObj[pid]) && ((_d = sourceObj[pid]) === null || _d === void 0 ? void 0 : _d.url) ? (_e = sourceObj[pid]) === null || _e === void 0 ? void 0 : _e.url : `${item === null || item === void 0 ? void 0 : 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])
+                        paths[temp_url] = {};
+                    if (!paths[temp_url][targetMethod]) {
+                        paths[temp_url][targetMethod] = pathItem;
+                    }
+                    else if (pathItem.tags.length > 0) {
+                        paths[temp_url][targetMethod].tags.push(...pathItem.tags);
+                    }
+                }
+                else if (item.target_type === 'doc') {
+                    const temp_url = `x-${item.target_id}`;
+                    const targetMethod = `x-${item === null || item === void 0 ? void 0 : item.name}`;
+                    const pathItem = createPathItem(item, sourceObj, pid, pidName, modelsObj, this.apiToSwaggerVersion, 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) {
+                        paths[temp_url][targetMethod].tags.push(...pathItem.tags);
+                    }
+                }
             }
             return {
                 paths,
@@ -1041,9 +1430,9 @@ class ApipostToSwagger {
             // 处理项目信息
             this.handleProject();
             // 处理数据模型
-            const modelsObj = this.handleModels();
+            const schemaMap = this.handleModels();
             // // 处理apis
-            this.handleApis(modelsObj);
+            this.handleApis(schemaMap);
             // 处理环境信息
             this.handleEnvs();
             if (`${version}` === "metersphere") {
@@ -1052,6 +1441,7 @@ class ApipostToSwagger {
             return throwResult$1("success", "", this.apiToSwaggerResult);
         }
         catch (error) {
+            console.log(JSON.stringify(error.message), "error");
             return throwResult$1("error", String(error), this.apiToSwaggerResult);
         }
     }
@@ -1574,8 +1964,8 @@ class SwaggerToApipost {
         }
     }
     handlePathV3(path, pathItem, tags) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             let url = path;
             for (const method in pathItem) {
                 const swaggerApi = pathItem[method];
@@ -1992,8 +2382,8 @@ class SwaggerToApipost {
         });
     }
     handlePathsV3(json) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             try {
                 const paths = ((_a = json === null || json === void 0 ? void 0 : json.openapi) === null || _a === void 0 ? void 0 : _a.paths) || json.paths;
                 const tags = ((_b = json === null || json === void 0 ? void 0 : json.openapi) === null || _b === void 0 ? void 0 : _b.tags) || json.tags;
@@ -2025,8 +2415,8 @@ class SwaggerToApipost {
         }
     }
     handlePath(path, pathItem, tags) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             let url = path;
             url = decodeURI(this.basePath + url);
             url = fixUrlPath(url);
@@ -2433,8 +2823,8 @@ class SwaggerToApipost {
             catch (err) { }
         });
     }
-    convert(json, options = null) {
-        return __awaiter(this, void 0, void 0, function* () {
+    convert(json_1) {
+        return __awaiter(this, arguments, void 0, function* (json, options = null) {
             this.clear();
             try {
                 if (options && options instanceof Object) {

package/package.json

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