echoapi-converter 0.0.83 → 0.0.84

package/dist/index.d.ts

@@ -280,4 +280,18 @@ declare class ThunderToApipost {
     };
 }
 
-export { ApipostToSwagger as ApiToSwagger, ApidocToApipost, ApifoxToApipost, ApipostToPostman, HarToApipost, InsomniaToApipost, PostmanToApipost, SwaggerToApipost, ThunderToApipost, YapiToApipost };
+type ImportConfig = {
+    mode: string;
+    folder_id: string;
+    host?: string;
+    base_path?: string;
+    api_cover_modal: string;
+    model_cover_modal: string;
+    env_cover_modal: string;
+};
+
+declare const swaggerConverFormat: (json: any, baseConfig: ImportConfig, project_id: string) => {
+    global: {};
+};
+
+export { ApipostToSwagger as ApiToSwagger, ApidocToApipost, ApifoxToApipost, ApipostToPostman, HarToApipost, InsomniaToApipost, PostmanToApipost, swaggerConverFormat as SwaggerConverFormat, SwaggerToApipost, ThunderToApipost, YapiToApipost };

package/dist/index.js

@@ -633,6 +633,32 @@ const getSubstring = (str, length) => {
     return str;
 };
 
+const DEFAULT_RESPONSE = {
+    example_id: '1',
+    raw: '',
+    raw_parameter: [],
+    headers: [], // 新headers
+    expect: {
+        name: '成功',
+        is_default: -1,
+        code: '200',
+        sleep: 0, // 新sleep
+        content_type: 'json',
+        verify_type: 'schema',
+        mock: '',
+        schema: {
+            type: 'object',
+            properties: {},
+        },
+    },
+};
+const SUCCESS_RESPONSE = Object.assign(Object.assign({}, DEFAULT_RESPONSE), { example_id: '1', expect: Object.assign(Object.assign({}, DEFAULT_RESPONSE.expect), { name: '成功', is_default: 1, code: '200' }) });
+const ERROR_RESPONSE = Object.assign(Object.assign({}, DEFAULT_RESPONSE), { example_id: '2', expect: Object.assign(Object.assign({}, DEFAULT_RESPONSE.expect), { name: '失败', is_default: -1, code: '404' }) });
+const DEFAULT_API_RESPONSE = {
+    is_check_result: 1,
+    example: [SUCCESS_RESPONSE, ERROR_RESPONSE],
+};
+
 const getApipostMode = (mode) => {
     let apipostMode = 'none';
     if (mode == 'multipart/form-data') {
@@ -717,7 +743,6 @@ const handleBodyJsonSchema = (schema, raw_para, pre = '', requiredArr = [], prop
         }
         else if (itemsType === "integer") {
             let value = ((_t = (_s = (_r = schema === null || schema === void 0 ? void 0 : schema.items) === null || _r === void 0 ? void 0 : _r.oneOf) === null || _s === void 0 ? void 0 : _s[0]) === null || _t === void 0 ? void 0 : _t.example) || ((_u = schema === null || schema === void 0 ? void 0 : schema.items) === null || _u === void 0 ? void 0 : _u.example) || 0;
-            // console.log(value,"valuevalue");
             if (Object.prototype.toString.call(raw_para) === '[object Array]') {
                 raw_para.push({
                     key: `${pre}.0`,
@@ -1071,7 +1096,7 @@ const completionResponse = (responses) => {
     const example = [];
     if (lodash.isPlainObject(responses)) {
         Object.keys(responses).forEach((status) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             const element = responses[status];
             if ((lodash.has(element, "schema") &&
                 lodash.has(element.schema, "properties") &&
@@ -1155,29 +1180,30 @@ const completionResponse = (responses) => {
                     if (lodash.has(schema, "properties")) ;
                     if (lodash.has(schema, "items")) ;
                 }
-                if (apipostMode == "json") {
+                if (apipostMode == "json" || apipostMode === "*/*") {
                     let jsonSchema = {};
-                    if (Object.prototype.toString.call((_d = bodyData === null || bodyData === void 0 ? void 0 : bodyData.schema) === null || _d === void 0 ? void 0 : _d["$$ref"]) === "[object String]") {
+                    if (Object.prototype.toString.call((_d = bodyData === null || bodyData === void 0 ? void 0 : bodyData.schema) === null || _d === void 0 ? void 0 : _d["$$ref"]) === "[object String]" ||
+                        Object.prototype.toString.call((_e = bodyData === null || bodyData === void 0 ? void 0 : bodyData.schema) === null || _e === void 0 ? void 0 : _e["$ref"]) === "[object String]") {
                         jsonSchema = swaggerSchema2apipostSchema(bodyData.schema);
                     }
                     else if (lodash.isPlainObject(bodyData === null || bodyData === void 0 ? void 0 : bodyData.schema)) {
                         jsonSchema = bodyData.schema;
                     }
                     if (lodash.has(bodyData, "example")) {
-                        const example = bodyData.example;
+                        const exampleRaw = bodyData.example;
                         if (status == 200 || status == 404) {
                             let originRaw;
                             try {
-                                if (Object.prototype.toString.call(example) ===
+                                if (Object.prototype.toString.call(exampleRaw) ===
                                     "[object Object]") {
-                                    originRaw = JSON.stringify(Object.assign({}, example));
+                                    originRaw = JSON.stringify(Object.assign({}, exampleRaw));
                                 }
                                 else {
-                                    originRaw = String(example);
+                                    originRaw = String(exampleRaw);
                                 }
                             }
                             catch (error) {
-                                originRaw = String(example);
+                                originRaw = String(exampleRaw);
                             }
                             const Raw_text = getBeautifulRaw(originRaw);
                             example.push({
@@ -1200,16 +1226,16 @@ const completionResponse = (responses) => {
                             const newUUID = apipostTools.snowflakeId();
                             let originRaw;
                             try {
-                                if (Object.prototype.toString.call(example) ===
+                                if (Object.prototype.toString.call(exampleRaw) ===
                                     "[object Object]") {
-                                    originRaw = JSON.stringify(Object.assign({}, example));
+                                    originRaw = JSON.stringify(Object.assign({}, exampleRaw));
                                 }
                                 else {
-                                    originRaw = example;
+                                    originRaw = exampleRaw;
                                 }
                             }
                             catch (error) {
-                                originRaw = String(example);
+                                originRaw = String(exampleRaw);
                             }
                             const Raw_text = getBeautifulRaw(originRaw);
                             example.push({
@@ -1465,6 +1491,254 @@ const completionSocketMethodRequest = (swaggerApi) => {
         },
     };
 };
+const completionConfig = (res, config, baseConfig) => {
+    var _a;
+    res['config'] = Object.assign(Object.assign({}, baseConfig), { host: config.host, base_path: config.base_path });
+    (_a = res === null || res === void 0 ? void 0 : res.config) === null || _a === void 0 ? true : delete _a.mode;
+};
+const completionProject = (res, project, project_id) => {
+    res['name'] = project.name;
+    res['project_id'] = project_id;
+    res['intro'] = project.description;
+};
+const completionSwaggerEnv = (res, env) => {
+    res['global']['envs'] = env === null || env === void 0 ? void 0 : env.map(({ name, env_var_list, url }) => ({
+        env_id: apipostTools.snowflakeId(),
+        name,
+        is_private: -1,
+        env_var_list: env_var_list || {},
+        server_list: url
+            ? [{ name: '默认服务', server_id: '1', uri: url }]
+            : undefined,
+    }));
+};
+const ApiItemInit = (res, apis, parent_id = '0', project_id) => {
+    if (lodash.isArray(apis) && apis.length) {
+        apis.forEach(({ name, target_type, tags, url, method, description, response, request, children, mark_id, }) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+            const targetItem = {
+                target_type,
+                description,
+                mark_id: mark_id || '1',
+                request: {
+                    auth: DEFAULT_AUTH,
+                    pre_tasks: [],
+                    post_tasks: [],
+                    header: {
+                        parameter: ((_a = request === null || request === void 0 ? void 0 : request.header) === null || _a === void 0 ? void 0 : _a.parameter) || [],
+                    },
+                    query: {
+                        parameter: ((_b = request === null || request === void 0 ? void 0 : request.query) === null || _b === void 0 ? void 0 : _b.parameter) || [],
+                    },
+                    cookie: {
+                        parameter: ((_c = request === null || request === void 0 ? void 0 : request.cookie) === null || _c === void 0 ? void 0 : _c.parameter) || [],
+                    },
+                    restful: {
+                        parameter: ((_d = request === null || request === void 0 ? void 0 : request.restful) === null || _d === void 0 ? void 0 : _d.parameter) || [],
+                    },
+                },
+                ai_expect_enable: -1,
+                is_check_result: 1,
+                is_socket: 1,
+                is_locked: -1,
+                is_force: -1,
+                attribute_info: {},
+                protocol: 'http/1.1',
+                ai_expect: {
+                    list: [],
+                    none_math_expect_id: '1',
+                },
+                project_id,
+                target_id: apipostTools.snowflakeId(),
+                parent_id,
+                sort: 0,
+                version: 0,
+                server_id: '0',
+                status: 1,
+                is_changed: -1,
+            };
+            if (target_type === 'api') {
+                targetItem['name'] = getSubstring(name, 255) || '新建接口';
+                targetItem['tags'] = tags || [];
+                targetItem['url'] = url || '';
+                targetItem['method'] = method || '';
+                targetItem['request'] = Object.assign(Object.assign({}, targetItem['request']), { body: {
+                        mode: ((_e = request === null || request === void 0 ? void 0 : request.body) === null || _e === void 0 ? void 0 : _e.mode) || 'none',
+                        parameter: ((_f = request === null || request === void 0 ? void 0 : request.body) === null || _f === void 0 ? void 0 : _f.parameter) || [],
+                        raw: ((_g = request === null || request === void 0 ? void 0 : request.body) === null || _g === void 0 ? void 0 : _g.raw) || '',
+                        raw_parameter: ((_h = request === null || request === void 0 ? void 0 : request.body) === null || _h === void 0 ? void 0 : _h.raw_parameter) || [],
+                        raw_schema: ((_j = request === null || request === void 0 ? void 0 : request.body) === null || _j === void 0 ? void 0 : _j.raw_schema) || { type: 'object' },
+                        binary: null,
+                    } });
+                targetItem['response'] = Object.assign(Object.assign({}, DEFAULT_API_RESPONSE), response);
+                if (!((_k = response === null || response === void 0 ? void 0 : response.example) === null || _k === void 0 ? void 0 : _k.find((e) => (e === null || e === void 0 ? void 0 : e.example_id) === '2'))) {
+                    (_l = targetItem['response']) === null || _l === void 0 ? void 0 : _l.example.unshift(ERROR_RESPONSE);
+                }
+                if (!((_m = response === null || response === void 0 ? void 0 : response.example) === null || _m === void 0 ? void 0 : _m.find((e) => (e === null || e === void 0 ? void 0 : e.example_id) === '1'))) {
+                    (_o = targetItem['response']) === null || _o === void 0 ? void 0 : _o.example.unshift(SUCCESS_RESPONSE);
+                }
+                // 通过query重新生成url
+                if (targetItem.url && lodash.isArray((_q = (_p = targetItem === null || targetItem === void 0 ? void 0 : targetItem.request) === null || _p === void 0 ? void 0 : _p.query) === null || _q === void 0 ? void 0 : _q.parameter)) {
+                    const newUrl = genUrlByQuery(targetItem.url, (_s = (_r = targetItem === null || targetItem === void 0 ? void 0 : targetItem.request) === null || _r === void 0 ? void 0 : _r.query) === null || _s === void 0 ? void 0 : _s.parameter);
+                    targetItem.url = newUrl;
+                }
+                res.apis.push(targetItem);
+                if (lodash.isArray(children) && children.length) {
+                    ApiItemInit(res, children, targetItem.target_id, project_id);
+                }
+            }
+            else if (target_type === 'folder') {
+                targetItem['name'] = getSubstring(name, 255) || '新建目录';
+                targetItem['request'] = Object.assign(Object.assign({}, targetItem['request']), { body: {
+                        parameter: ((_t = request === null || request === void 0 ? void 0 : request.body) === null || _t === void 0 ? void 0 : _t.parameter) || [],
+                    } });
+                res.apis.push(targetItem);
+                if (lodash.isArray(children) && children.length) {
+                    ApiItemInit(res, children, targetItem.target_id, project_id);
+                }
+            }
+        });
+    }
+};
+const ModelItemInit = (res, dataModel, parent_id = '0', project_id) => {
+    if (lodash.isArray(dataModel) && dataModel.length) {
+        // createModel(dataModel, newJson, '0');
+        dataModel.forEach((model) => {
+            let model_type = 'model';
+            if (lodash.has(model, 'model_type')) {
+                if (model.model_type == 'folder' ||
+                    (lodash.has(model, 'children') && model.children instanceof Array)) {
+                    model_type = 'folder';
+                }
+            }
+            try {
+                const hashIndex = model === null || model === void 0 ? void 0 : model.model_id.indexOf('#');
+                if (hashIndex !== -1) {
+                    model.model_id = model.model_id.substring(hashIndex);
+                }
+            }
+            catch (error) { }
+            const new_model_id = apipostTools.snowflakeId();
+            const target = {
+                model_id: new_model_id,
+                old_model_id: (model === null || model === void 0 ? void 0 : model.model_id) || '',
+                model_type,
+                description: (model === null || model === void 0 ? void 0 : model.description) || '',
+                parent_id,
+                project_id,
+                sort: (model === null || model === void 0 ? void 0 : model.sort) || 0,
+                schema: {
+                    type: 'object',
+                    properties: {},
+                },
+                name: '新建数据模型',
+                display_name: '',
+                created_at: 0,
+                updated_at: 0,
+                // created_id: '',
+                // updated_id: '',
+                version: 0,
+                is_changed: -1,
+                status: 1,
+                created_user_info: {
+                    nick_name: '',
+                    portrait: '',
+                },
+                updated_user_info: {
+                    nick_name: '',
+                    portrait: '',
+                },
+            };
+            if (model_type == 'folder') {
+                target['name'] = (model === null || model === void 0 ? void 0 : model.name) || '新建目录';
+                res.models.push(target);
+                ModelItemInit(res, model === null || model === void 0 ? void 0 : model.children, target.model_id, project_id);
+            }
+            else if (model_type == 'model') {
+                target['name'] = (model === null || model === void 0 ? void 0 : model.name) || '新建接口';
+                target['display_name'] = (model === null || model === void 0 ? void 0 : model.displayName) || '';
+                target['schema'] = (model === null || model === void 0 ? void 0 : model.schema) || {};
+                res.models.push(target);
+            }
+        });
+    }
+};
+const completionSwaggerApis = (res, apis, project_id) => {
+    var _a;
+    res['apis'] = [];
+    ApiItemInit(res, apis, (_a = res === null || res === void 0 ? void 0 : res.config) === null || _a === void 0 ? void 0 : _a.folder, project_id);
+};
+const completionSwaggerModel = (res, dataModel, version, project_id) => {
+    var _a, _b;
+    res['models'] = [];
+    // 新增目录schemas
+    const DEFAULT_FOLDER = {
+        description: '',
+        displayName: '',
+        model_type: 'folder',
+        name: 'schemas',
+        children: dataModel,
+    };
+    if (version === '2.0') {
+        ModelItemInit(res, [DEFAULT_FOLDER], (_a = res === null || res === void 0 ? void 0 : res.config) === null || _a === void 0 ? void 0 : _a.folder, project_id);
+    }
+    else {
+        ModelItemInit(res, dataModel, (_b = res === null || res === void 0 ? void 0 : res.config) === null || _b === void 0 ? void 0 : _b.folder, project_id);
+    }
+    if (res.models.length > 0) {
+        try {
+            const idMap = new Map();
+            res.models.forEach((model) => {
+                if (model.old_model_id) {
+                    idMap.set(model.old_model_id, model.model_id);
+                }
+            });
+            const replaceIdsIteratively = (root) => {
+                const stack = [root];
+                const visited = new WeakSet(); // 防止循环引用
+                while (stack.length > 0) {
+                    const current = stack.pop();
+                    // 跳过基本类型和已访问过的对象
+                    if (typeof current !== 'object' || current === null || visited.has(current)) {
+                        continue;
+                    }
+                    visited.add(current);
+                    // 处理数组
+                    if (Array.isArray(current)) {
+                        stack.push(...current);
+                        continue;
+                    }
+                    // 处理对象
+                    for (const key in current) {
+                        const value = current[key];
+                        // 1. 处理普通字符串ID的直接替换（包括完整路径）
+                        if (typeof value === 'string' && idMap.has(value)) {
+                            current[key] = idMap.get(value);
+                        }
+                        // 2. 处理嵌套对象
+                        else if (typeof value === 'object' && value !== null) {
+                            stack.push(value);
+                        }
+                    }
+                }
+            };
+            replaceIdsIteratively(res.models);
+            replaceIdsIteratively(res.apis);
+            // let dataModelStr = JSON.stringify(res.models);
+            // let apisStr = JSON.stringify(res.apis);
+            // for (const model of res.models) {
+            //   if (model?.old_model_id) {
+            //     const reg = new RegExp(`"${escapeRegExp(model.old_model_id)}"`, 'g');
+            //     dataModelStr = dataModelStr.replace(reg, `"${model.model_id}"`);
+            //     apisStr = apisStr.replace(reg, `"${model.model_id}"`);
+            //   }
+            // }
+            // res.apis = JSON.parse(apisStr);
+            // res.models = JSON.parse(dataModelStr);
+        }
+        catch (error) { }
+    }
+};
 
 var securityConnectionMessageNoPath$4 = "When connecting via a secure connection, {{enable}} server certificate validation, and use client version {{version}} with no specified handshake path.";
 var notNeedEnable$4 = "do not enable";
@@ -2300,6 +2574,9 @@ const createPathItem = (item, sourceObj, pid, pidName, modelsObj, apiVersion, ta
         description: (item === null || item === void 0 ? void 0 : item.description) || "",
         tags: []
     };
+    if (lodash.has(item, 'mock_server_enable')) {
+        pathItem['x-mock-server-enable'] = item === null || item === void 0 ? void 0 : item.mock_server_enable;
+    }
     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;
     }
@@ -2532,6 +2809,7 @@ class ApipostToSwagger {
                 const servers = {
                     url: (env === null || env === void 0 ? void 0 : env.url) || "",
                     description: (env === null || env === void 0 ? void 0 : env.name) || t('createEnv'),
+                    "x-env-id": (env === null || env === void 0 ? void 0 : env.env_id) || ''
                 };
                 if (lodash.isPlainObject(env === null || env === void 0 ? void 0 : env.env_var_list)) {
                     servers.variables = {};
@@ -3030,7 +3308,7 @@ class SwaggerToApipost {
                     mark_id: (swaggerApi === null || swaggerApi === void 0 ? void 0 : swaggerApi.deprecated) ? "4" : "1",
                 };
                 if (protocol === 'http' || protocol === 'sse') {
-                    baseApiInfo = Object.assign(Object.assign({}, baseApiInfo), { target_type: protocol === 'http' ? 'api' : protocol, method: completionMethod(method), protocol: 'http/1.1', request: Object.assign({}, completionRequestParam(swaggerApi)), response: Object.assign({}, completionResponse((swaggerApi === null || swaggerApi === void 0 ? void 0 : swaggerApi.response) || {})) });
+                    baseApiInfo = Object.assign(Object.assign({}, baseApiInfo), { target_type: protocol === 'http' ? 'api' : protocol, method: completionMethod(method), protocol: 'http/1.1', request: Object.assign({}, completionRequestParam(swaggerApi)), response: Object.assign({}, completionResponse((swaggerApi === null || swaggerApi === void 0 ? void 0 : swaggerApi.responses) || {})) });
                     // 根据query参数 重新生成url
                     baseApiInfo.url = genUrlByQuery(baseApiInfo.url, ((_b = (_a = baseApiInfo === null || baseApiInfo === void 0 ? void 0 : baseApiInfo.request) === null || _a === void 0 ? void 0 : _a.restful) === null || _b === void 0 ? void 0 : _b.parameter) || []);
                 }
@@ -3045,10 +3323,10 @@ class SwaggerToApipost {
                     baseApiInfo.url = genUrlByQuery(baseApiInfo.url, ((_f = (_e = baseApiInfo === null || baseApiInfo === void 0 ? void 0 : baseApiInfo.request) === null || _e === void 0 ? void 0 : _e.restful) === null || _f === void 0 ? void 0 : _f.parameter) || []);
                 }
                 if (protocol === 'graphql') {
-                    baseApiInfo = Object.assign(Object.assign({}, baseApiInfo), { url, request: completionGraphqlRequest(swaggerApi), response: completionResponse((swaggerApi === null || swaggerApi === void 0 ? void 0 : swaggerApi.response) || {}) });
+                    baseApiInfo = Object.assign(Object.assign({}, baseApiInfo), { url, request: completionGraphqlRequest(swaggerApi), response: completionResponse((swaggerApi === null || swaggerApi === void 0 ? void 0 : swaggerApi.responses) || {}) });
                 }
                 if (protocol === 'socket_method') {
-                    baseApiInfo = Object.assign(Object.assign({}, baseApiInfo), { method: 'TCP', url, request: completionSocketMethodRequest(swaggerApi), response: Object.assign({}, completionResponse((swaggerApi === null || swaggerApi === void 0 ? void 0 : swaggerApi.response) || {})) });
+                    baseApiInfo = Object.assign(Object.assign({}, baseApiInfo), { method: 'TCP', url, request: completionSocketMethodRequest(swaggerApi), response: Object.assign({}, completionResponse((swaggerApi === null || swaggerApi === void 0 ? void 0 : swaggerApi.responses) || {})) });
                 }
                 if (protocol === 'doc') {
                     baseApiInfo = Object.assign({}, baseApiInfo);
@@ -8327,6 +8605,20 @@ class ThunderToApipost {
     }
 }
 
+const swaggerConverFormat = (json, baseConfig, project_id) => {
+    const { project, env, apis, config, dataModel, version } = json || {};
+    const res = {
+        global: {},
+    };
+    // 不要动顺序ß
+    completionConfig(res, config, baseConfig);
+    completionProject(res, project, project_id);
+    completionSwaggerEnv(res, env);
+    completionSwaggerApis(res, apis, project_id);
+    completionSwaggerModel(res, dataModel, version, project_id);
+    return res;
+};
+
 exports.ApiToSwagger = ApipostToSwagger;
 exports.ApidocToApipost = ApidocToApipost;
 exports.ApifoxToApipost = ApifoxToApipost;
@@ -8334,6 +8626,7 @@ exports.ApipostToPostman = ApipostToPostman;
 exports.HarToApipost = HarToApipost;
 exports.InsomniaToApipost = InsomniaToApipost;
 exports.PostmanToApipost = PostmanToApipost;
+exports.SwaggerConverFormat = swaggerConverFormat;
 exports.SwaggerToApipost = SwaggerToApipost;
 exports.ThunderToApipost = ThunderToApipost;
 exports.YapiToApipost = YapiToApipost;

package/package.json

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

package/dist/test.js

@@ -1,5 +0,0 @@
-import { SwaggerToApipost } from './index';
-
-const aa = new SwaggerToApipost();
-const data= aa.convert({});
-console.log(data,"111")