openapi-ts-request 0.13.1 → 0.13.3

package/dist/generator/serviceGenarator.js

@@ -86,6 +86,9 @@ class ServiceGenerator {
                 const tags = hookCustomFileNames(operationObject, pathKey, method);
                 // 这里判断tags
                 tags.forEach((tag) => {
+                    if (!tag) {
+                        return;
+                    }
                     const tagLowerCase = tag.toLowerCase();
                     if (priorityRule === type_1.PriorityRule.include) {
                         // includeTags 为空，不会匹配任何path，故跳过
@@ -697,9 +700,12 @@ class ServiceGenerator {
         const enumArray = schemaObject.enum;
         let enumStr = '';
         let enumLabelTypeStr = '';
-        if (config_1.numberEnum.includes(schemaObject.type) || (0, util_1.isAllNumeric)(enumArray)) {
+        if (config_1.numberEnum.includes(schemaObject.type) || (0, util_1.isAllNumber)(enumArray)) {
             enumStr = `{${(0, lodash_1.map)(enumArray, (value) => `"NUMBER_${value}"=${Number(value)}`).join(',')}}`;
         }
+        else if ((0, util_1.isAllNumeric)(enumArray)) {
+            enumStr = `{${(0, lodash_1.map)(enumArray, (value) => `"STRING_NUMBER_${value}"="${value}"`).join(',')}}`;
+        }
         else {
             enumStr = `{${(0, lodash_1.map)(enumArray, (value) => `${value}="${value}"`).join(',')}}`;
         }
@@ -716,10 +722,20 @@ class ServiceGenerator {
                 return `${value}:"${enumLabel}"`;
             }).join(',')}}`;
         }
+        else if (schemaObject === null || schemaObject === void 0 ? void 0 : schemaObject['x-apifox-enum']) {
+            enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => {
+                var _a;
+                const enumLabel = (_a = (0, lodash_1.find)(schemaObject['x-apifox-enum'], (item) => item.value === value)) === null || _a === void 0 ? void 0 : _a.description;
+                return `${value}:"${enumLabel}"`;
+            }).join(',')}}`;
+        }
         else {
-            if (config_1.numberEnum.includes(schemaObject.type) || (0, util_1.isAllNumeric)(enumArray)) {
+            if (config_1.numberEnum.includes(schemaObject.type) || (0, util_1.isAllNumber)(enumArray)) {
                 enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `"NUMBER_${value}":${Number(value)}`).join(',')}}`;
             }
+            else if ((0, util_1.isAllNumeric)(enumArray)) {
+                enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `"STRING_NUMBER_${value}":"${value}"`).join(',')}}`;
+            }
             else {
                 enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `${value}:"${value}"`).join(',')}}`;
             }

package/dist/generator/util.d.ts

@@ -20,3 +20,4 @@ export declare function isArraySchemaObject(schema: unknown): schema is ArraySch
 export declare function isBinaryArraySchemaObject(schema: unknown): schema is BinaryArraySchemaObject;
 export declare function resolveRefs(obj: OpenAPIObject, fields: string[]): unknown;
 export declare function isAllNumeric(arr: any): boolean;
+export declare function isAllNumber(arr: any): boolean;

package/dist/generator/util.js

@@ -20,6 +20,7 @@ exports.isArraySchemaObject = isArraySchemaObject;
 exports.isBinaryArraySchemaObject = isBinaryArraySchemaObject;
 exports.resolveRefs = resolveRefs;
 exports.isAllNumeric = isAllNumeric;
+exports.isAllNumber = isAllNumber;
 const tslib_1 = require("tslib");
 const lodash_1 = require("lodash");
 const reserved_words_1 = tslib_1.__importDefault(require("reserved-words"));
@@ -333,3 +334,7 @@ function resolveRefs(obj, fields) {
 function isAllNumeric(arr) {
     return (0, lodash_1.every)(arr, (item) => (0, lodash_1.isString)(item) && /^-?[0-9]+$/.test(item));
 }
+// 检查数组每一项是否都是数字
+function isAllNumber(arr) {
+    return (0, lodash_1.every)(arr, (item) => (0, lodash_1.isNumber)(item));
+}

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

@@ -47,6 +47,11 @@ export declare function inferSchema(thing: ParameterObject | SchemaObject | Refe
     'x-apifox'?: {
         enumDescriptions: Record<string, string>;
     };
+    'x-apifox-enum'?: {
+        value: string;
+        name: string;
+        description: string;
+    }[];
     items: import("../type").ISchemaObject;
 } | {
     type: string;
@@ -92,5 +97,10 @@ export declare function inferSchema(thing: ParameterObject | SchemaObject | Refe
     'x-apifox'?: {
         enumDescriptions: Record<string, string>;
     };
+    'x-apifox-enum'?: {
+        value: string;
+        name: string;
+        description: string;
+    }[];
 };
 export declare function getRandomInt(min: number, max: number): number;

package/dist/type.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-ts-request",
-  "version": "0.13.1",
+  "version": "0.13.3",
   "description": "Swagger2/OpenAPI3 to TypeScript, request client, request mock service, enum, type field label, JSON Schemas",
   "engines": {
     "node": ">=18.0.0",