openapi-ts-request 0.8.0 → 0.8.1

package/dist/generator/serviceGenarator.js

@@ -506,8 +506,7 @@ class ServiceGenerator {
         let schema = (resContent[mediaType].schema ||
             config_1.DEFAULT_SCHEMA);
         if ((0, util_1.isReferenceObject)(schema)) {
-            const refPaths = schema.$ref.split('/');
-            const refName = refPaths[refPaths.length - 1];
+            const refName = (0, util_1.getLastRefName)(schema.$ref);
             const childrenSchema = components.schemas[refName];
             if ((0, util_1.isNonArraySchemaObject)(childrenSchema) && this.config.dataFields) {
                 schema = (((_a = this.config.dataFields
@@ -540,11 +539,9 @@ class ServiceGenerator {
                     var _a, _b, _c, _d, _e;
                     const isDirectObject = (((_a = p.schema) === null || _a === void 0 ? void 0 : _a.type) === 'object' ||
                         p.type) === 'object';
-                    const refList = (((_b = p.schema) === null || _b === void 0 ? void 0 : _b.$ref) ||
-                        p.$ref ||
-                        '').split('/');
-                    const ref = refList[refList.length - 1];
-                    const deRefObj = (0, lodash_1.entries)((_c = this.openAPIData.components) === null || _c === void 0 ? void 0 : _c.schemas).find(([k]) => k === ref) || [];
+                    const refName = (0, util_1.getLastRefName)(((_b = p.schema) === null || _b === void 0 ? void 0 : _b.$ref) ||
+                        p.$ref);
+                    const deRefObj = (0, lodash_1.entries)((_c = this.openAPIData.components) === null || _c === void 0 ? void 0 : _c.schemas).find(([k]) => k === refName) || [];
                     const isRefObject = ((_d = deRefObj[1]) === null || _d === void 0 ? void 0 : _d.type) === 'object' &&
                         !(0, lodash_1.isEmpty)((_e = deRefObj[1]) === null || _e === void 0 ? void 0 : _e.properties);
                     return Object.assign(Object.assign({}, p), { isObject: isDirectObject || isRefObject, type: this.getType(p.schema || config_1.DEFAULT_SCHEMA, this.config.namespace) });
@@ -596,9 +593,9 @@ class ServiceGenerator {
     }
     resolveArray(schemaObject) {
         if ((0, util_1.isReferenceObject)(schemaObject.items)) {
-            const refPaths = schemaObject.items.$ref.split('/');
+            const refName = (0, util_1.getLastRefName)(schemaObject.items.$ref);
             return {
-                type: `${refPaths[refPaths.length - 1]}[]`,
+                type: `${refName}[]`,
             };
         }
         // 这里需要解析出具体属性，但由于 parser 层还不确定，所以暂时先返回 unknown[]
@@ -681,7 +678,7 @@ class ServiceGenerator {
         // 测试了很多用例，很少有用例走到这里
         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[refPaths[refPaths.length - 1]];
+            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)];
             if (!schema) {
                 throw new Error(`[GenSDK] Data Error! Notfoud: ${refObject.$ref}`);
             }

package/dist/generator/util.d.ts

@@ -2,6 +2,7 @@ import { ArraySchemaObject, BinaryArraySchemaObject, ComponentsObject, ISchemaOb
 import { ITypeItem } from './type';
 export declare function stripDot(str: string): string;
 export declare function resolveTypeName(typeName: string): string;
+export declare function getLastRefName(refPath?: string): string;
 export declare function getDefaultType(schemaObject?: ISchemaObject | string, namespace?: string, schemas?: ComponentsObject['schemas']): string;
 export declare function getDefaultFileTag(operationObject: OperationObject, apiPath: string): string[];
 export declare function handleDuplicateTypeNames(interfaceTPConfigs: Array<Pick<ITypeItem, 'typeName' | 'displayLabelFuncName'>>): void;

package/dist/generator/util.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stripDot = stripDot;
 exports.resolveTypeName = resolveTypeName;
+exports.getLastRefName = getLastRefName;
 exports.getDefaultType = getDefaultType;
 exports.getDefaultFileTag = getDefaultFileTag;
 exports.handleDuplicateTypeNames = handleDuplicateTypeNames;
@@ -73,8 +74,13 @@ function getRefName(refObject) {
     if (!isReferenceObject(refObject)) {
         return refObject;
     }
-    const refPaths = refObject.$ref.split('/');
-    return resolveTypeName(refPaths[refPaths.length - 1]);
+    return resolveTypeName(getLastRefName(refObject.$ref));
+}
+function getLastRefName(refPath = '') {
+    const refPaths = refPath.split('/');
+    return refPaths.length > 0
+        ? decodeURIComponent(refPaths[refPaths.length - 1])
+        : '';
 }
 function getDefaultType(schemaObject, namespace = '', schemas) {
     var _a, _b;
@@ -147,8 +153,7 @@ function getDefaultType(schemaObject, namespace = '', schemas) {
             var _a;
             if (isReferenceObject(item)) {
                 // 不使用 getRefName 函数处理，无法通过 schemas[schemaKey] 获取到schema
-                const refPaths = item.$ref.split('/');
-                const schemaKey = refPaths[refPaths.length - 1];
+                const schemaKey = getLastRefName(item.$ref);
                 if ((_a = schemas === null || schemas === void 0 ? void 0 : schemas[schemaKey]) === null || _a === void 0 ? void 0 : _a.enum) {
                     return `I${getDefaultType(item, namespace)}`;
                 }
@@ -282,8 +287,7 @@ function resolveFunctionName(functionName, methodName) {
 function markAllowSchema(schemaStr, schemas) {
     const refs = schemaStr === null || schemaStr === void 0 ? void 0 : schemaStr.match(/#\/components\/schemas\/([A-Za-z0-9._-]+)/g);
     (0, lodash_1.forEach)(refs, (ref) => {
-        const refPaths = ref.split('/');
-        const schema = schemas === null || schemas === void 0 ? void 0 : schemas[refPaths[refPaths.length - 1]];
+        const schema = schemas === null || schemas === void 0 ? void 0 : schemas[getLastRefName(ref)];
         if (schema && !schema.isAllowed) {
             schema.isAllowed = true;
             markAllowSchema(JSON.stringify(schema), schemas);

package/package.json

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