openapi-ts-request 0.12.0 → 0.12.1

package/dist/generator/serviceGenarator.js

@@ -627,11 +627,11 @@ class ServiceGenerator {
         const enumArray = schemaObject.enum;
         let enumStr = '';
         let enumLabelTypeStr = '';
-        if (!config_1.numberEnum.includes(schemaObject.type)) {
-            enumStr = `{${(0, lodash_1.map)(enumArray, (value) => `${value}="${value}"`).join(',')}}`;
+        if (config_1.numberEnum.includes(schemaObject.type) || (0, util_1.isAllNumeric)(enumArray)) {
+            enumStr = `{${(0, lodash_1.map)(enumArray, (value) => `NUMBER_${value}=${Number(value)}`).join(',')}}`;
         }
         else {
-            enumStr = `{${(0, lodash_1.map)(enumArray, (value) => `NUMBER_${value}=${value}`).join(',')}}`;
+            enumStr = `{${(0, lodash_1.map)(enumArray, (value) => `${value}="${value}"`).join(',')}}`;
         }
         // 翻译枚举
         if (schemaObject['x-enum-varnames'] && schemaObject['x-enum-comments']) {
@@ -647,11 +647,11 @@ class ServiceGenerator {
             }).join(',')}}`;
         }
         else {
-            if (!config_1.numberEnum.includes(schemaObject.type)) {
-                enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `${value}:"${value}"`).join(',')}}`;
+            if (config_1.numberEnum.includes(schemaObject.type) || (0, util_1.isAllNumeric)(enumArray)) {
+                enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `NUMBER_${value}:${Number(value)}`).join(',')}}`;
             }
             else {
-                enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `NUMBER_${value}:${value}`).join(',')}}`;
+                enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `${value}:"${value}"`).join(',')}}`;
             }
         }
         return {

package/dist/generator/util.d.ts

@@ -19,3 +19,4 @@ export declare function isNonArraySchemaObject(schema: unknown): schema is NonAr
 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;
+export declare function isAllNumeric(arr: any): boolean;

package/dist/generator/util.js

@@ -19,6 +19,7 @@ exports.isNonArraySchemaObject = isNonArraySchemaObject;
 exports.isArraySchemaObject = isArraySchemaObject;
 exports.isBinaryArraySchemaObject = isBinaryArraySchemaObject;
 exports.resolveRefs = resolveRefs;
+exports.isAllNumeric = isAllNumeric;
 const tslib_1 = require("tslib");
 const lodash_1 = require("lodash");
 const reserved_words_1 = tslib_1.__importDefault(require("reserved-words"));
@@ -327,3 +328,6 @@ function resolveRefs(obj, fields) {
         return s;
     }, obj);
 }
+function isAllNumeric(arr) {
+    return (0, lodash_1.every)(arr, (item) => (0, lodash_1.isString)(item) && /^[0-9]+$/.test(item));
+}

package/package.json

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