yapi-apifox-to-typescript 4.2.2 → 4.2.3

package/lib/cjs/ApifoxToYApiData.js

@@ -187,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));
       }
     }
 
@@ -207,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;

package/lib/esm/ApifoxToYApiData.js

@@ -173,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));
       }
     }
 
@@ -193,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;

package/package.json

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