Merge pull request #124 from openapi-ui/main

fix: fix generate number type enum error #117

Author: rookie-luochao

.changeset/weak-beds-tap.md

@@ -0,0 +1,5 @@
+---
+'openapi-ts-request': patch
+---
+
+fix: fix generate number type enum error #117

pnpm-lock.yaml

@@ -1074,7 +1074,7 @@ export default class ServiceGenerator {
     let enumLabelTypeStr = '';
 
     if (numberEnum.includes(schemaObject.type) || isAllNumeric(enumArray)) {
-      enumStr = `{${map(enumArray, (value) => `NUMBER_${value}=${Number(value)}`).join(',')}}`;
+      enumStr = `{${map(enumArray, (value) => `"NUMBER_${value}"=${Number(value)}`).join(',')}}`;
     } else {
       enumStr = `{${map(enumArray, (value) => `${value}="${value}"`).join(',')}}`;
     }
@@ -1094,7 +1094,7 @@ export default class ServiceGenerator {
       }).join(',')}}`;
     } else {
       if (numberEnum.includes(schemaObject.type) || isAllNumeric(enumArray)) {
-        enumLabelTypeStr = `{${map(enumArray, (value) => `NUMBER_${value}:${Number(value)}`).join(',')}}`;
+        enumLabelTypeStr = `{${map(enumArray, (value) => `"NUMBER_${value}":${Number(value)}`).join(',')}}`;
       } else {
         enumLabelTypeStr = `{${map(enumArray, (value) => `${value}:"${value}"`).join(',')}}`;
       }

src/generator/serviceGenarator.ts

@@ -481,5 +481,5 @@ export function resolveRefs(obj: OpenAPIObject, fields: string[]) {
 }
 
 export function isAllNumeric(arr) {
-  return every(arr, (item) => isString(item) && /^[0-9]+$/.test(item));
+  return every(arr, (item) => isString(item) && /^-?[0-9]+$/.test(item));
 }

src/generator/util.ts

@@ -153,6 +153,8 @@
       "Poi2CategoryEnum": {
         "type": "string",
         "enum": [
+          "-1",
+          "-1000",
           "010700",
           "010800",
           "010900",