handle negative numbers correctly

smartlyio · Apr 10, 2024 · 86ad1f5 · 86ad1f5
1 parent 26d9da0
commit 86ad1f5
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 10 deletions.
diff --git a/packages/oats/package.json b/packages/oats/package.json
@@ -61,6 +61,6 @@
     "koa-router": "12.0.0",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "typescript": "4.9.5"
+    "typescript": "^5.4.4"
   }
 }
diff --git a/packages/oats/src/generate-types.ts b/packages/oats/src/generate-types.ts
@@ -498,10 +498,19 @@ export function run(options: Options) {
     if (e === null) return ts.factory.createNull();
     if (type === 'string') return ts.factory.createStringLiteral(e);
     if (type === 'bigint') return ts.factory.createBigIntLiteral(e);
-    if (type === 'number') return ts.factory.createNumericLiteral(e);
-
+    if (type === 'number') return generateNumericLiteral(e);
     throw new Error(`unsupported enum value: "${e}"`);
   }
+  function generateNumericLiteral(value: number | string): ts.LiteralTypeNode['literal'] {
+    value = Number(value);
+    if (value < 0) {
+      return ts.factory.createPrefixUnaryExpression(
+        ts.SyntaxKind.MinusToken,
+        ts.factory.createNumericLiteral(Math.abs(value))
+      );
+    }
+    return ts.factory.createNumericLiteral(value);
+  }
 
   function generateType(
     schema: oautil.SchemaObject,
@@ -883,7 +892,7 @@ export function run(options: Options) {
           ? [
               ts.factory.createPropertyAssignment(
                 'minLength',
-                ts.factory.createNumericLiteral(schema.minLength)
+                generateNumericLiteral(schema.minLength)
               )
             ]
           : [];
@@ -892,7 +901,7 @@ export function run(options: Options) {
           ? [
               ts.factory.createPropertyAssignment(
                 'maxLength',
-                ts.factory.createNumericLiteral(schema.maxLength)
+                generateNumericLiteral(schema.maxLength)
               )
             ]
           : [];
@@ -915,7 +924,7 @@ export function run(options: Options) {
             ts.factory.createPropertyAssignment(
               'enum',
               ts.factory.createArrayLiteralExpression(
-                schema.enum.map(i => ts.factory.createNumericLiteral('' + i))
+                schema.enum.map(i => generateNumericLiteral('' + i))
               )
             )
           ]
@@ -928,15 +937,15 @@ export function run(options: Options) {
         properties.push(
           ts.factory.createPropertyAssignment(
             'minimum',
-            ts.factory.createNumericLiteral(schema.minimum + '')
+            generateNumericLiteral(schema.minimum + '')
           )
         );
       }
       if (schema.maximum != null) {
         properties.push(
           ts.factory.createPropertyAssignment(
             'maximum',
-            ts.factory.createNumericLiteral(schema.maximum + '')
+            generateNumericLiteral(schema.maximum + '')
           )
         );
       }
@@ -976,15 +985,15 @@ export function run(options: Options) {
         properties.push(
           ts.factory.createPropertyAssignment(
             'minItems',
-            ts.factory.createNumericLiteral(schema.minItems + '')
+            generateNumericLiteral(schema.minItems + '')
           )
         );
       }
       if (schema.maxItems != null) {
         properties.push(
           ts.factory.createPropertyAssignment(
             'maxItems',
-            ts.factory.createNumericLiteral(schema.maxItems + '')
+            generateNumericLiteral(schema.maxItems + '')
           )
         );
       }

diff --git a/test/negative-limits/driver.ts b/test/negative-limits/driver.ts
@@ -0,0 +1,11 @@
+import { driver } from '@smartlyio/oats';
+
+import * as process from 'process';
+process.chdir(__dirname);
+
+driver.generate({
+  generatedValueClassFile: './tmp/fixture.types.generated.ts',
+  header: '/* tslint:disable variable-name only-arrow-functions*/',
+  openapiFilePath: './fixture.yaml',
+  resolve: driver.compose(driver.generateFile(), driver.localResolve)
+});
diff --git a/test/negative-limits/fixture.yaml b/test/negative-limits/fixture.yaml
@@ -0,0 +1,11 @@
+openapi: 3.0.0
+info:
+  version: 1.0.0
+  title: fixtures for runtime test
+paths: {}
+components:
+  schemas:
+    test:
+      type: number
+      minimum: -2
+