Merge pull request #470 from hey-api/fix/negative-enum-numeric-values

fix: negative numbers in numeric enums
hey-api · Apr 23, 2024 · ab68dfa · ab68dfa
2 parents dfad425 + 520318f
commit ab68dfa
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 13 deletions.
diff --git a/.changeset/early-radios-sort.md b/.changeset/early-radios-sort.md
@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+fix: negative numbers in numeric enums
diff --git a/packages/openapi-ts/src/compiler/typedef.ts b/packages/openapi-ts/src/compiler/typedef.ts
@@ -1,6 +1,11 @@
 import ts from 'typescript';
 
-import { addLeadingJSDocComment, type Comments, tsNodeToString } from './utils';
+import {
+  addLeadingJSDocComment,
+  type Comments,
+  ots,
+  tsNodeToString,
+} from './utils';
 
 export const createTypeNode = (
   base: any | ts.TypeNode,
@@ -11,9 +16,7 @@ export const createTypeNode = (
   }
 
   if (typeof base === 'number') {
-    return ts.factory.createLiteralTypeNode(
-      ts.factory.createNumericLiteral(base),
-    );
+    return ts.factory.createLiteralTypeNode(ots.number(base));
   }
 
   return ts.factory.createTypeReferenceNode(

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3/enums.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3/enums.gen.ts.snap
@@ -114,6 +114,9 @@ export const ModelWithNestedArrayEnumsDataBarEnum = {
  * Период
  */
 export const ValueEnum = {
+    '_-10': -10,
+    '_-1': -1,
+    '_0': 0,
     '_1': 1,
     '_3': 3,
     '_6': 6,

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3/schemas.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3/schemas.gen.ts.snap
@@ -1643,7 +1643,7 @@ export const $ModelWithNumericEnumUnion = {
         value: {
             type: 'number',
             description: 'Период',
-            enum: [1, 3, 6, 12]
+            enum: [-10, -1, 0, 1, 3, 6, 12]
         }
     }
 } as const;

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3/types.gen.ts.snap
@@ -770,7 +770,7 @@ export type ModelWithNumericEnumUnion = {
     /**
      * Период
      */
-    value?: 1 | 3 | 6 | 12;
+    value?: -10 | -1 | 0 | 1 | 3 | 6 | 12;
 };
 
 /**

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_angular/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_angular/types.gen.ts.snap
@@ -770,7 +770,7 @@ export type ModelWithNumericEnumUnion = {
     /**
      * Период
      */
-    value?: 1 | 3 | 6 | 12;
+    value?: -10 | -1 | 0 | 1 | 3 | 6 | 12;
 };
 
 /**

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_client/enums.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_client/enums.gen.ts.snap
@@ -114,6 +114,9 @@ export const ModelWithNestedArrayEnumsDataBarEnum = {
  * Период
  */
 export const ValueEnum = {
+    '_-10': -10,
+    '_-1': -1,
+    '_0': 0,
     '_1': 1,
     '_3': 3,
     '_6': 6,

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_client/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_client/types.gen.ts.snap
@@ -770,7 +770,7 @@ export type ModelWithNumericEnumUnion = {
     /**
      * Период
      */
-    value?: 1 | 3 | 6 | 12;
+    value?: -10 | -1 | 0 | 1 | 3 | 6 | 12;
 };
 
 /**

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_enums_typescript/enums.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_enums_typescript/enums.gen.ts.snap
@@ -114,6 +114,9 @@ export enum ModelWithNestedArrayEnumsDataBarEnum {
  * Период
  */
 export enum ValueEnum {
+    '_-10' = -10,
+    '_-1' = -1,
+    '_0' = 0,
     '_1' = 1,
     '_3' = 3,
     '_6' = 6,

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_enums_typescript/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_enums_typescript/types.gen.ts.snap
@@ -770,7 +770,7 @@ export type ModelWithNumericEnumUnion = {
     /**
      * Период
      */
-    value?: 1 | 3 | 6 | 12;
+    value?: -10 | -1 | 0 | 1 | 3 | 6 | 12;
 };
 
 /**

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_models/types.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_models/types.gen.ts.snap
@@ -770,7 +770,7 @@ export type ModelWithNumericEnumUnion = {
     /**
      * Период
      */
-    value?: 1 | 3 | 6 | 12;
+    value?: -10 | -1 | 0 | 1 | 3 | 6 | 12;
 };
 
 /**

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_schemas_form/schemas.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_schemas_form/schemas.gen.ts.snap
@@ -1530,7 +1530,7 @@ export const $ModelWithNumericEnumUnion = {
     properties: {
         value: {
             type: 'number',
-            enum: [1, 3, 6, 12]
+            enum: [-10, -1, 0, 1, 3, 6, 12]
         }
     }
 } as const;

diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3_schemas_json/schemas.gen.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3_schemas_json/schemas.gen.ts.snap
@@ -1643,7 +1643,7 @@ export const $ModelWithNumericEnumUnion = {
         value: {
             type: 'number',
             description: 'Период',
-            enum: [1, 3, 6, 12]
+            enum: [-10, -1, 0, 1, 3, 6, 12]
         }
     }
 } as const;

diff --git a/packages/openapi-ts/test/spec/v3.json b/packages/openapi-ts/test/spec/v3.json
@@ -3190,7 +3190,7 @@
           "value": {
             "type": "number",
             "description": "Период",
-            "enum": [1, 3, 6, 12]
+            "enum": [-10, -1, 0, 1, 3, 6, 12]
           }
         }
       },
-Original file line number
+Diff line change
@@ Expand Up / @@ -770,7 +770,7 @@ export type ModelWithNumericEnumUnion = { @@
         /**
          * Период
          */
-        value?: 1 | 3 | 6 | 12;
+        value?: -10 | -1 | 0 | 1 | 3 | 6 | 12;
     };
     /**
@@ Expand Down @@