🐞 fix: AYPI Schema 中 $$ref、$ref 字段导致报错

Author: wjkang

package.json

@@ -3,7 +3,7 @@
 	"displayName": "lowcode",
 	"description": "lowcode tool, support ChatGPT",
 	"author": "wjkang <ruoxieme@gmail.com>",
-	"version": "1.7.2",
+	"version": "1.7.3",
 	"icon": "asset/icon.png",
 	"publisher": "wjkang",
 	"repository": "https://github.com/lowcoding/lowcode-vscode",

src/genCode/genCodeByYapi.ts

@@ -94,6 +94,7 @@ export const genTemplateModelByYapi = async (
       const reqBodyScheme = JSON.parse(
         stripJsonComments(res.data.data.req_body_other),
       );
+      fixSchema(reqBodyScheme);
       delete reqBodyScheme.title;
       requestBodyType = await compile(
         reqBodyScheme,
@@ -121,6 +122,7 @@ export const genTemplateModelByYapi = async (
   // const ts = await jsonToTs(selectInfo.typeName, res.data.data.res_body);
   const resBodyJson = JSON.parse(stripJsonComments(res.data.data.res_body));
   const schema = GenerateSchema.json(typeName || 'Schema', resBodyJson);
+  fixSchema(schema);
   let ts = await compile(schema, typeName, {
     bannerComment: '',
   });
@@ -131,6 +133,7 @@ export const genTemplateModelByYapi = async (
     const reqBodyScheme = JSON.parse(
       stripJsonComments(res.data.data.req_body_other),
     );
+    fixSchema(reqBodyScheme);
     delete reqBodyScheme.title;
     requestBodyType = await compile(
       reqBodyScheme,
@@ -156,18 +159,34 @@ export const genTemplateModelByYapi = async (
   return model;
 };
 
-const fixSchema = (obj: object) => {
+function fixSchema(obj: object, fieldNames: string[] = ['$ref', '$$ref']) {
   // eslint-disable-next-line no-restricted-syntax
   for (const key in obj) {
-    // @ts-ignore
-    if (typeof obj[key] === 'object' && obj[key] !== null) {
-      // @ts-ignore
+    if (Array.isArray(obj[key])) {
+      obj[key].forEach((item: object) => {
+        if (typeof item === 'object' && item !== null) {
+          fixSchema(item, fieldNames);
+        } else {
+          // eslint-disable-next-line no-restricted-syntax
+          for (const fieldName of fieldNames) {
+            if (item && item[fieldName]) {
+              delete item[fieldName];
+            }
+          }
+        }
+      });
+    } else if (typeof obj[key] === 'object' && obj[key] !== null) {
       if (obj[key].type === 'object' && !obj[key].properties) {
-        // @ts-ignore
         delete obj[key];
       }
-      // @ts-ignore
-      fixSchema(obj[key]); // 递归处理
+      fixSchema(obj[key], fieldNames);
+    } else {
+      // eslint-disable-next-line no-restricted-syntax
+      for (const fieldName of fieldNames) {
+        if (key === fieldName) {
+          delete obj[key];
+        }
+      }
     }
   }
-};
+}

tsconfig.json

@@ -5,11 +5,13 @@
 		"target": "ES5",
 		"outDir": "build",
 		"allowSyntheticDefaultImports": true,
+		"suppressImplicitAnyIndexErrors": true,
 		"lib": [
 			"ES5"
 		],
 		"sourceMap": true,
 		"rootDir": "src",
+		"ignoreDeprecations": "5.0",
 		"strict": true /* enable all strict type-checking options */
 		/* Additional Checks */
 		// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */