yapi-apifox-to-typescript 4.2.1 → 4.2.3

package/lib/cjs/ApifoxToYApiData.js

@@ -68,6 +68,20 @@ var ApifoxToYApiData = /*#__PURE__*/function () {
     return resolved.type || 'string';
   };
 
+  _proto.getRequestParamType = function getRequestParamType(schema) {
+    var schemaType = this.getSchemaType(schema);
+    if (schemaType === 'boolean') return _types.RequestParamType.boolean;
+    if (schemaType === 'number') return _types.RequestParamType.number;
+    return _types.RequestParamType.string;
+  };
+
+  _proto.getRequestQueryType = function getRequestQueryType(schema) {
+    var schemaType = this.getSchemaType(schema);
+    if (schemaType === 'boolean') return _types.RequestQueryType.boolean;
+    if (schemaType === 'number') return _types.RequestQueryType.number;
+    return _types.RequestQueryType.string;
+  };
+
   _proto.convertParametersToReqParams = function convertParametersToReqParams(parameters, type) {
     var _this = this;
 
@@ -84,7 +98,7 @@ var ApifoxToYApiData = /*#__PURE__*/function () {
           desc: p.description || '',
           example: p.example || '',
           required: p.required ? _types.Required.true : _types.Required.false,
-          type: _this.getSchemaType(p.schema) === 'string' ? _types.RequestParamType.string : _types.RequestParamType.number
+          type: _this.getRequestParamType(p.schema)
         };
       });
     }
@@ -97,7 +111,7 @@ var ApifoxToYApiData = /*#__PURE__*/function () {
         desc: p.description || '',
         example: p.example || '',
         required: p.required ? _types.Required.true : _types.Required.false,
-        type: _this.getSchemaType(p.schema) === 'string' ? _types.RequestQueryType.string : _types.RequestQueryType.number
+        type: _this.getRequestQueryType(p.schema)
       };
     });
   };
@@ -173,14 +187,26 @@ var ApifoxToYApiData = /*#__PURE__*/function () {
     };
   };
 
-  _proto.normalizeSchema = function normalizeSchema(schema) {
+  _proto.normalizeSchema = function normalizeSchema(schema, visited) {
+    if (visited === void 0) {
+      visited = new Set();
+    }
+
     var result = (0, _extends2.default)({}, schema);
 
     if (schema.$ref) {
+      if (visited.has(schema.$ref)) {
+        // 循环引用，直接返回空对象避免无限递归
+        return {
+          type: 'object'
+        };
+      }
+
+      visited.add(schema.$ref);
       var resolved = this.resolveRef(schema.$ref);
 
       if (resolved) {
-        return this.normalizeSchema(resolved);
+        return this.normalizeSchema(resolved, new Set(visited));
       }
     }
 
@@ -193,13 +219,13 @@ var ApifoxToYApiData = /*#__PURE__*/function () {
             _value = _Object$entries2$_i[1];
 
         if (_value) {
-          result.properties[key] = this.normalizeSchema(_value);
+          result.properties[key] = this.normalizeSchema(_value, new Set(visited));
         }
       }
     }
 
     if (schema.items) {
-      result.items = this.normalizeSchema(schema.items);
+      result.items = this.normalizeSchema(schema.items, new Set(visited));
     }
 
     delete result.$ref;
@@ -432,31 +458,23 @@ var ApifoxToYApiData = /*#__PURE__*/function () {
       var _this$openApiDoc5;
 
       if (!((_this$openApiDoc5 = this.openApiDoc) != null && _this$openApiDoc5.tags)) {
-        console.log("\uD83D\uDCC1 getCats: \u8FD4\u56DE\u7A7A\u6570\u7EC4 (openApiDoc.tags \u4E0D\u5B58\u5728)");
         return [];
       }
 
       var tagIds = this.openApiDoc.tags.map(function (tag) {
         return _this2.getTagId(tag.name);
       });
-      console.log("\uD83D\uDCC1 getCats (id=0 \u83B7\u53D6\u5168\u90E8): \u8FD4\u56DE " + tagIds.length + " \u4E2A\u5206\u7C7B");
-      console.log("   Tags: " + this.openApiDoc.tags.map(function (t) {
-        return t.name;
-      }).join(', '));
       return tagIds;
     }
 
-    console.log("\uD83D\uDCC1 getCats: \u8FD4\u56DE " + categoryIds.length + " \u4E2A\u5206\u7C7B: " + categoryIds.join(', '));
     return categoryIds;
   };
 
   _proto.getInterfaceList = /*#__PURE__*/function () {
     var _getInterfaceList = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(syntheticalConfig) {
-      var _this$openApiDoc6,
-          _this$openApiDoc7,
-          _this3 = this;
+      var _this$openApiDoc6;
 
-      var catId, interfaces, seenKeys, tagName, tag, methods, _i3, _Object$entries3, _Object$entries3$_i, path, pathItem, _iterator, _step, method, operation, xApifoxFolder, tagId, key, categoryTag, interfaceInfo;
+      var catId, interfaces, seenKeys, methods, _i3, _Object$entries3, _Object$entries3$_i, path, pathItem, _iterator, _step, method, operation, xApifoxFolder, tagId, key, categoryTag, interfaceInfo;
 
       return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) {
@@ -474,32 +492,29 @@ var ApifoxToYApiData = /*#__PURE__*/function () {
               interfaces = []; // 用于去重：基于 path + method
 
               seenKeys = new Set(); // 调试：获取 tag 名称
+              // let tagName = 'unknown'
+              // if (this.openApiDoc?.tags) {
+              //   const tag = this.openApiDoc.tags.find(
+              //     t => this.getTagId(t.name) === catId,
+              //   )
+              //   tagName = tag?.name || `unknown(${catId})`
+              // }
 
-              tagName = 'unknown';
-
-              if ((_this$openApiDoc7 = this.openApiDoc) != null && _this$openApiDoc7.tags) {
-                tag = this.openApiDoc.tags.find(function (t) {
-                  return _this3.getTagId(t.name) === catId;
-                });
-                tagName = (tag == null ? void 0 : tag.name) || "unknown(" + catId + ")";
-              }
-
-              console.log("\n\uD83D\uDCC2 \u5206\u7C7B [" + tagName + "] (id: " + catId + ") \u5F00\u59CB\u83B7\u53D6\u63A5\u53E3...");
               methods = ['get', 'post', 'put', 'delete', 'patch', 'head', 'options'];
               _i3 = 0, _Object$entries3 = Object.entries(this.openApiDoc.paths);
 
-            case 10:
+            case 7:
               if (!(_i3 < _Object$entries3.length)) {
-                _context2.next = 34;
+                _context2.next = 30;
                 break;
               }
 
               _Object$entries3$_i = _Object$entries3[_i3], path = _Object$entries3$_i[0], pathItem = _Object$entries3$_i[1];
               _iterator = (0, _createForOfIteratorHelperLoose2.default)(methods);
 
-            case 13:
+            case 10:
               if ((_step = _iterator()).done) {
-                _context2.next = 31;
+                _context2.next = 27;
                 break;
               }
 
@@ -507,19 +522,19 @@ var ApifoxToYApiData = /*#__PURE__*/function () {
               operation = pathItem[method];
 
               if (operation) {
-                _context2.next = 18;
+                _context2.next = 15;
                 break;
               }
 
-              return _context2.abrupt("continue", 29);
+              return _context2.abrupt("continue", 25);
 
-            case 18:
+            case 15:
               // 获取接口的目录信息：优先使用 x-apifox-folder
               xApifoxFolder = this.getOperationFolder(operation);
               tagId = this.getTagId(xApifoxFolder);
 
               if (!(tagId === catId)) {
-                _context2.next = 29;
+                _context2.next = 25;
                 break;
               }
 
@@ -527,33 +542,32 @@ var ApifoxToYApiData = /*#__PURE__*/function () {
               key = method.toUpperCase() + ":" + path;
 
               if (!seenKeys.has(key)) {
-                _context2.next = 25;
+                _context2.next = 21;
                 break;
               }
 
-              console.log("  \u26A0\uFE0F \u8DF3\u8FC7\u91CD\u590D\u63A5\u53E3: " + key);
-              return _context2.abrupt("continue", 29);
+              return _context2.abrupt("continue", 25);
 
-            case 25:
+            case 21:
               seenKeys.add(key); // 根据实际的目录名称来确定分类
 
               categoryTag = xApifoxFolder;
               interfaceInfo = this.convertOperationToInterface(path, method, operation, categoryTag, catId);
               interfaces.push(interfaceInfo);
 
-            case 29:
-              _context2.next = 13;
+            case 25:
+              _context2.next = 10;
               break;
 
-            case 31:
+            case 27:
               _i3++;
-              _context2.next = 10;
+              _context2.next = 7;
               break;
 
-            case 34:
+            case 30:
               return _context2.abrupt("return", interfaces);
 
-            case 35:
+            case 31:
             case "end":
               return _context2.stop();
           }

package/lib/cjs/types.js

@@ -52,6 +52,7 @@ exports.RequestParamType = RequestParamType;
 (function (RequestParamType) {
   RequestParamType["string"] = "string";
   RequestParamType["number"] = "number";
+  RequestParamType["boolean"] = "boolean";
 })(RequestParamType || (exports.RequestParamType = RequestParamType = {}));
 
 var RequestQueryType;
@@ -62,6 +63,7 @@ exports.RequestQueryType = RequestQueryType;
 (function (RequestQueryType) {
   RequestQueryType["string"] = "string";
   RequestQueryType["number"] = "number";
+  RequestQueryType["boolean"] = "boolean";
 })(RequestQueryType || (exports.RequestQueryType = RequestQueryType = {}));
 
 var RequestFormItemType;

package/lib/esm/ApifoxToYApiData.js

@@ -54,6 +54,20 @@ export var ApifoxToYApiData = /*#__PURE__*/function () {
     return resolved.type || 'string';
   };
 
+  _proto.getRequestParamType = function getRequestParamType(schema) {
+    var schemaType = this.getSchemaType(schema);
+    if (schemaType === 'boolean') return RequestParamType.boolean;
+    if (schemaType === 'number') return RequestParamType.number;
+    return RequestParamType.string;
+  };
+
+  _proto.getRequestQueryType = function getRequestQueryType(schema) {
+    var schemaType = this.getSchemaType(schema);
+    if (schemaType === 'boolean') return RequestQueryType.boolean;
+    if (schemaType === 'number') return RequestQueryType.number;
+    return RequestQueryType.string;
+  };
+
   _proto.convertParametersToReqParams = function convertParametersToReqParams(parameters, type) {
     var _this = this;
 
@@ -70,7 +84,7 @@ export var ApifoxToYApiData = /*#__PURE__*/function () {
           desc: p.description || '',
           example: p.example || '',
           required: p.required ? Required.true : Required.false,
-          type: _this.getSchemaType(p.schema) === 'string' ? RequestParamType.string : RequestParamType.number
+          type: _this.getRequestParamType(p.schema)
         };
       });
     }
@@ -83,7 +97,7 @@ export var ApifoxToYApiData = /*#__PURE__*/function () {
         desc: p.description || '',
         example: p.example || '',
         required: p.required ? Required.true : Required.false,
-        type: _this.getSchemaType(p.schema) === 'string' ? RequestQueryType.string : RequestQueryType.number
+        type: _this.getRequestQueryType(p.schema)
       };
     });
   };
@@ -159,14 +173,26 @@ export var ApifoxToYApiData = /*#__PURE__*/function () {
     };
   };
 
-  _proto.normalizeSchema = function normalizeSchema(schema) {
+  _proto.normalizeSchema = function normalizeSchema(schema, visited) {
+    if (visited === void 0) {
+      visited = new Set();
+    }
+
     var result = _extends({}, schema);
 
     if (schema.$ref) {
+      if (visited.has(schema.$ref)) {
+        // 循环引用，直接返回空对象避免无限递归
+        return {
+          type: 'object'
+        };
+      }
+
+      visited.add(schema.$ref);
       var resolved = this.resolveRef(schema.$ref);
 
       if (resolved) {
-        return this.normalizeSchema(resolved);
+        return this.normalizeSchema(resolved, new Set(visited));
       }
     }
 
@@ -179,13 +205,13 @@ export var ApifoxToYApiData = /*#__PURE__*/function () {
             _value = _Object$entries2$_i[1];
 
         if (_value) {
-          result.properties[key] = this.normalizeSchema(_value);
+          result.properties[key] = this.normalizeSchema(_value, new Set(visited));
         }
       }
     }
 
     if (schema.items) {
-      result.items = this.normalizeSchema(schema.items);
+      result.items = this.normalizeSchema(schema.items, new Set(visited));
     }
 
     delete result.$ref;
@@ -418,31 +444,23 @@ export var ApifoxToYApiData = /*#__PURE__*/function () {
       var _this$openApiDoc5;
 
       if (!((_this$openApiDoc5 = this.openApiDoc) != null && _this$openApiDoc5.tags)) {
-        console.log("\uD83D\uDCC1 getCats: \u8FD4\u56DE\u7A7A\u6570\u7EC4 (openApiDoc.tags \u4E0D\u5B58\u5728)");
         return [];
       }
 
       var tagIds = this.openApiDoc.tags.map(function (tag) {
         return _this2.getTagId(tag.name);
       });
-      console.log("\uD83D\uDCC1 getCats (id=0 \u83B7\u53D6\u5168\u90E8): \u8FD4\u56DE " + tagIds.length + " \u4E2A\u5206\u7C7B");
-      console.log("   Tags: " + this.openApiDoc.tags.map(function (t) {
-        return t.name;
-      }).join(', '));
       return tagIds;
     }
 
-    console.log("\uD83D\uDCC1 getCats: \u8FD4\u56DE " + categoryIds.length + " \u4E2A\u5206\u7C7B: " + categoryIds.join(', '));
     return categoryIds;
   };
 
   _proto.getInterfaceList = /*#__PURE__*/function () {
     var _getInterfaceList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(syntheticalConfig) {
-      var _this$openApiDoc6,
-          _this$openApiDoc7,
-          _this3 = this;
+      var _this$openApiDoc6;
 
-      var catId, interfaces, seenKeys, tagName, tag, methods, _i3, _Object$entries3, _Object$entries3$_i, path, pathItem, _iterator, _step, method, operation, xApifoxFolder, tagId, key, categoryTag, interfaceInfo;
+      var catId, interfaces, seenKeys, methods, _i3, _Object$entries3, _Object$entries3$_i, path, pathItem, _iterator, _step, method, operation, xApifoxFolder, tagId, key, categoryTag, interfaceInfo;
 
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
@@ -460,32 +478,29 @@ export var ApifoxToYApiData = /*#__PURE__*/function () {
               interfaces = []; // 用于去重：基于 path + method
 
               seenKeys = new Set(); // 调试：获取 tag 名称
+              // let tagName = 'unknown'
+              // if (this.openApiDoc?.tags) {
+              //   const tag = this.openApiDoc.tags.find(
+              //     t => this.getTagId(t.name) === catId,
+              //   )
+              //   tagName = tag?.name || `unknown(${catId})`
+              // }
 
-              tagName = 'unknown';
-
-              if ((_this$openApiDoc7 = this.openApiDoc) != null && _this$openApiDoc7.tags) {
-                tag = this.openApiDoc.tags.find(function (t) {
-                  return _this3.getTagId(t.name) === catId;
-                });
-                tagName = (tag == null ? void 0 : tag.name) || "unknown(" + catId + ")";
-              }
-
-              console.log("\n\uD83D\uDCC2 \u5206\u7C7B [" + tagName + "] (id: " + catId + ") \u5F00\u59CB\u83B7\u53D6\u63A5\u53E3...");
               methods = ['get', 'post', 'put', 'delete', 'patch', 'head', 'options'];
               _i3 = 0, _Object$entries3 = Object.entries(this.openApiDoc.paths);
 
-            case 10:
+            case 7:
               if (!(_i3 < _Object$entries3.length)) {
-                _context2.next = 34;
+                _context2.next = 30;
                 break;
               }
 
               _Object$entries3$_i = _Object$entries3[_i3], path = _Object$entries3$_i[0], pathItem = _Object$entries3$_i[1];
               _iterator = _createForOfIteratorHelperLoose(methods);
 
-            case 13:
+            case 10:
               if ((_step = _iterator()).done) {
-                _context2.next = 31;
+                _context2.next = 27;
                 break;
               }
 
@@ -493,19 +508,19 @@ export var ApifoxToYApiData = /*#__PURE__*/function () {
               operation = pathItem[method];
 
               if (operation) {
-                _context2.next = 18;
+                _context2.next = 15;
                 break;
               }
 
-              return _context2.abrupt("continue", 29);
+              return _context2.abrupt("continue", 25);
 
-            case 18:
+            case 15:
               // 获取接口的目录信息：优先使用 x-apifox-folder
               xApifoxFolder = this.getOperationFolder(operation);
               tagId = this.getTagId(xApifoxFolder);
 
               if (!(tagId === catId)) {
-                _context2.next = 29;
+                _context2.next = 25;
                 break;
               }
 
@@ -513,33 +528,32 @@ export var ApifoxToYApiData = /*#__PURE__*/function () {
               key = method.toUpperCase() + ":" + path;
 
               if (!seenKeys.has(key)) {
-                _context2.next = 25;
+                _context2.next = 21;
                 break;
               }
 
-              console.log("  \u26A0\uFE0F \u8DF3\u8FC7\u91CD\u590D\u63A5\u53E3: " + key);
-              return _context2.abrupt("continue", 29);
+              return _context2.abrupt("continue", 25);
 
-            case 25:
+            case 21:
               seenKeys.add(key); // 根据实际的目录名称来确定分类
 
               categoryTag = xApifoxFolder;
               interfaceInfo = this.convertOperationToInterface(path, method, operation, categoryTag, catId);
               interfaces.push(interfaceInfo);
 
-            case 29:
-              _context2.next = 13;
+            case 25:
+              _context2.next = 10;
               break;
 
-            case 31:
+            case 27:
               _i3++;
-              _context2.next = 10;
+              _context2.next = 7;
               break;
 
-            case 34:
+            case 30:
               return _context2.abrupt("return", interfaces);
 
-            case 35:
+            case 31:
             case "end":
               return _context2.stop();
           }

package/lib/esm/index.d.ts

@@ -666,7 +666,9 @@ export declare enum RequestParamType {
     /** 字符串 */
     string = "string",
     /** 数字 */
-    number = "number"
+    number = "number",
+    /** 布尔值 */
+    boolean = "boolean"
 }
 
 /** 请求查询参数类型 */
@@ -674,7 +676,9 @@ export declare enum RequestQueryType {
     /** 字符串 */
     string = "string",
     /** 数字 */
-    number = "number"
+    number = "number",
+    /** 布尔值 */
+    boolean = "boolean"
 }
 
 /** 是否必需 */

package/lib/esm/types.js

@@ -39,6 +39,7 @@ export var RequestParamType;
 (function (RequestParamType) {
   RequestParamType["string"] = "string";
   RequestParamType["number"] = "number";
+  RequestParamType["boolean"] = "boolean";
 })(RequestParamType || (RequestParamType = {}));
 
 export var RequestQueryType;
@@ -47,6 +48,7 @@ export var RequestQueryType;
 (function (RequestQueryType) {
   RequestQueryType["string"] = "string";
   RequestQueryType["number"] = "number";
+  RequestQueryType["boolean"] = "boolean";
 })(RequestQueryType || (RequestQueryType = {}));
 
 export var RequestFormItemType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yapi-apifox-to-typescript",
-  "version": "4.2.1",
+  "version": "4.2.3",
   "description": "根据 YApi 或 Apifox 的接口定义生成 TypeScript/JavaScript 的接口类型及其请求函数代码。",
   "keywords": [
     "yapi",