openapi-ts-request 0.8.4 → 0.10.0

package/dist/generator/serviceGenarator.js

@@ -607,6 +607,7 @@ class ServiceGenerator {
         };
     }
     resolveEnumObject(schemaObject) {
+        var _a;
         const enumArray = schemaObject.enum;
         let enumStr = '';
         let enumLabelTypeStr = '';
@@ -623,6 +624,12 @@ class ServiceGenerator {
                 return `${value}:"${schemaObject['x-enum-comments'][enumKey]}"`;
             }).join(',')}}`;
         }
+        else if ((_a = schemaObject === null || schemaObject === void 0 ? void 0 : schemaObject['x-apifox']) === null || _a === void 0 ? void 0 : _a['enumDescriptions']) {
+            enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => {
+                const enumLabel = schemaObject['x-apifox']['enumDescriptions'][value];
+                return `${value}:"${enumLabel}"`;
+            }).join(',')}}`;
+        }
         else {
             if (!config_1.numberEnum.includes(schemaObject.type)) {
                 enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `${value}:"${value}"`).join(',')}}`;
@@ -671,14 +678,12 @@ class ServiceGenerator {
         });
     }
     resolveRefObject(refObject) {
-        var _a, _b;
         if (!(0, util_1.isReferenceObject)(refObject)) {
             return refObject;
         }
-        // 测试了很多用例，很少有用例走到这里
         const refPaths = refObject.$ref.split('/');
         if (refPaths[0] === '#') {
-            const schema = (_b = (_a = this.openAPIData.components) === null || _a === void 0 ? void 0 : _a.schemas) === null || _b === void 0 ? void 0 : _b[(0, util_1.getLastRefName)(refObject.$ref)];
+            const schema = (0, util_1.resolveRefs)(this.openAPIData, refPaths.slice(1));
             if (!schema) {
                 throw new Error(`[GenSDK] Data Error! Notfoud: ${refObject.$ref}`);
             }

package/dist/generator/util.d.ts

@@ -1,4 +1,4 @@
-import { ArraySchemaObject, BinaryArraySchemaObject, ComponentsObject, ISchemaObject, NonArraySchemaObject, OperationObject, ReferenceObject, SchemaObject } from '../type';
+import { ArraySchemaObject, BinaryArraySchemaObject, ComponentsObject, ISchemaObject, NonArraySchemaObject, OpenAPIObject, OperationObject, ReferenceObject, SchemaObject } from '../type';
 import { ITypeItem } from './type';
 export declare function stripDot(str: string): string;
 export declare function resolveTypeName(typeName: string): string;
@@ -17,3 +17,4 @@ export declare function isSchemaObject(schema: unknown): schema is SchemaObject;
 export declare function isNonArraySchemaObject(schema: unknown): schema is NonArraySchemaObject;
 export declare function isArraySchemaObject(schema: unknown): schema is ArraySchemaObject;
 export declare function isBinaryArraySchemaObject(schema: unknown): schema is BinaryArraySchemaObject;
+export declare function resolveRefs(obj: OpenAPIObject, fields: string[]): unknown;

package/dist/generator/util.js

@@ -17,6 +17,7 @@ exports.isSchemaObject = isSchemaObject;
 exports.isNonArraySchemaObject = isNonArraySchemaObject;
 exports.isArraySchemaObject = isArraySchemaObject;
 exports.isBinaryArraySchemaObject = isBinaryArraySchemaObject;
+exports.resolveRefs = resolveRefs;
 const tslib_1 = require("tslib");
 const lodash_1 = require("lodash");
 const reserved_words_1 = tslib_1.__importDefault(require("reserved-words"));
@@ -315,3 +316,13 @@ function isBinaryArraySchemaObject(schema) {
         (((_a = schema.items) === null || _a === void 0 ? void 0 : _a.format) === 'binary' ||
             ((_b = schema.items) === null || _b === void 0 ? void 0 : _b.format) === 'base64'));
 }
+function resolveRefs(obj, fields) {
+    return fields.reduce((acc, field) => {
+        if (!acc)
+            return;
+        const s = acc[decodeURIComponent(field)];
+        if (!s)
+            return;
+        return s;
+    }, obj);
+}

package/dist/parser-mock/util.d.ts

@@ -44,6 +44,9 @@ export declare function inferSchema(thing: ParameterObject | SchemaObject | Refe
     'x-enum-comments'?: {
         [name: string]: string;
     };
+    'x-apifox'?: {
+        enumDescriptions: Record<string, string>;
+    };
     items: import("../type").ISchemaObject;
 } | {
     type: string;
@@ -86,5 +89,8 @@ export declare function inferSchema(thing: ParameterObject | SchemaObject | Refe
     'x-enum-comments'?: {
         [name: string]: string;
     };
+    'x-apifox'?: {
+        enumDescriptions: Record<string, string>;
+    };
 };
 export declare function getRandomInt(min: number, max: number): number;

package/dist/type.d.ts

@@ -14,6 +14,9 @@ type ICustomBaseSchemaObject = {
     'x-enum-comments'?: {
         [name: string]: string;
     };
+    'x-apifox'?: {
+        enumDescriptions: Record<string, string>;
+    };
 };
 export type ArraySchemaObject = Modify<OpenAPIV3.ArraySchemaObject, ICustomBaseSchemaObject & {
     items: ISchemaObject;

package/package.json

@@ -1,7 +1,11 @@
 {
   "name": "openapi-ts-request",
-  "version": "0.8.4",
+  "version": "0.10.0",
   "description": "Swagger2/OpenAPI3 to TypeScript, request client, request mock service, enum, type field label, JSON Schemas",
+  "engines": {
+    "node": ">=18.0.0",
+    "pnpm": ">=9"
+  },
   "repository": {
     "type": "git",
     "url": "git+git@github.com:openapi-ui/openapi-ts-request.git"