Merge pull request #1734 from crycode-de/issue-1733

Fixed TypeResolver issue for negative number literal types

Author: WoH

packages/cli/src/metadataGeneration/typeResolver.ts

@@ -508,6 +508,10 @@ export class TypeResolver {
         return typeNode.literal.text;
       case ts.SyntaxKind.NumericLiteral:
         return parseFloat(typeNode.literal.text);
+      case ts.SyntaxKind.PrefixUnaryExpression:
+        // make sure to only handle the MinusToken here
+        throwUnless((typeNode.literal as ts.PrefixUnaryExpression).operator === ts.SyntaxKind.MinusToken, new GenerateMetadataError(`Couldn't resolve literal node: ${typeNode.literal.getText()}`));
+        return parseFloat(typeNode.literal.getText());
       case ts.SyntaxKind.NullKeyword:
         return null;
       default:

tests/fixtures/testModel.ts

@@ -72,6 +72,7 @@ export interface TestModel extends Model {
   nullableUnionPrimitiveType?: 'String' | 1 | 20.0 | true | false | null;
   undefineableUnionPrimitiveType: 'String' | 1 | 20.0 | true | false | undefined;
   singleFloatLiteralType?: 3.1415;
+  negativeNumberLiteralType?: -1;
   dateValue?: Date;
   optionalString?: string;
   anyType?: any;

tests/unit/swagger/definitionsGeneration/definitions.spec.ts

@@ -500,6 +500,15 @@ describe('Definition generation', () => {
             expect(propertySchema.enum).to.have.length(1, `for property ${propertyName}.enum`);
             expect(propertySchema.enum).to.include(3.1415, `for property ${propertyName}.enum`);
           },
+          negativeNumberLiteralType: (propertyName, propertySchema) => {
+            expect(propertySchema.type).to.eq('number', `for property ${propertyName}.type`);
+            expect(propertySchema['x-nullable']).to.eq(false, `for property ${propertyName}[x-nullable]`);
+            if (!propertySchema.enum) {
+              throw new Error(`There was no 'enum' property on ${propertyName}.`);
+            }
+            expect(propertySchema.enum).to.have.length(1, `for property ${propertyName}.enum`);
+            expect(propertySchema.enum).to.include(-1, `for property ${propertyName}.enum`);
+          },
           dateValue: (propertyName, propertySchema) => {
             expect(propertySchema.type).to.eq('string', `for property ${propertyName}.type`);
             expect(propertySchema['x-nullable']).to.eq(undefined, `for property ${propertyName}[x-nullable]`);

tests/unit/swagger/schemaDetails3.spec.ts

@@ -1526,6 +1526,15 @@ describe('Definition generation for OpenAPI 3.0.0', () => {
             expect(propertySchema.enum).to.have.length(1, `for property ${propertyName}.enum`);
             expect(propertySchema.enum).to.include(3.1415, `for property ${propertyName}.enum`);
           },
+          negativeNumberLiteralType: (propertyName, propertySchema) => {
+            expect(propertySchema.type).to.eq('number', `for property ${propertyName}.type`);
+            expect(propertySchema.nullable).to.eq(false, `for property ${propertyName}.nullable`);
+            if (!propertySchema.enum) {
+              throw new Error(`There was no 'enum' property on ${propertyName}.`);
+            }
+            expect(propertySchema.enum).to.have.length(1, `for property ${propertyName}.enum`);
+            expect(propertySchema.enum).to.include(-1, `for property ${propertyName}.enum`);
+          },
           dateValue: (propertyName, propertySchema) => {
             expect(propertySchema.type).to.eq('string', `for property ${propertyName}.type`);
             expect(propertySchema.nullable).to.eq(undefined, `for property ${propertyName}.nullable`);