openapi-ts-request 0.8.4 → 0.9.0

package/dist/generator/serviceGenarator.js

@@ -671,14 +671,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-ts-request",
-  "version": "0.8.4",
+  "version": "0.9.0",
   "description": "Swagger2/OpenAPI3 to TypeScript, request client, request mock service, enum, type field label, JSON Schemas",
   "repository": {
     "type": "git",