Merge pull request #79 from dmitry-urenev/simple-type-aliases

Simple type aliases

Author: thiagobustamante

src/metadata/keywordKinds.ts

@@ -0,0 +1,17 @@
+import { SyntaxKind } from 'typescript';
+
+export const keywords = [
+    SyntaxKind.AnyKeyword,
+    SyntaxKind.UnknownKeyword,
+    SyntaxKind.NumberKeyword,
+    SyntaxKind.BigIntKeyword,
+    SyntaxKind.ObjectKeyword,
+    SyntaxKind.BooleanKeyword,
+    SyntaxKind.StringKeyword, 
+    SyntaxKind.SymbolKeyword,
+    SyntaxKind.ThisKeyword,
+    SyntaxKind.VoidKeyword,
+    SyntaxKind.UndefinedKeyword, 
+    SyntaxKind.NullKeyword,
+    SyntaxKind.NeverKeyword
+];

src/metadata/resolveType.ts

@@ -2,6 +2,7 @@ import * as _ from 'lodash';
 import * as ts from 'typescript';
 import { getDecoratorName } from '../utils/decoratorUtils';
 import { getFirstMatchingJSDocTagName } from '../utils/jsDocUtils';
+import { keywords } from './keywordKinds';
 import { ArrayType, EnumerateType, MetadataGenerator, ObjectType, Property, ReferenceType, Type } from './metadataGenerator';
 
 const syntaxKindMap: { [kind: number]: string } = {};
@@ -460,7 +461,11 @@ function getModelTypeProperties(node: any, genericTypes?: Array<ts.TypeNode>): A
     }
 
     if (node.kind === ts.SyntaxKind.TypeAliasDeclaration) {
-        return getModelTypeProperties(node.type as any, genericTypes);
+        const typeAlias = node as ts.TypeAliasDeclaration;
+
+        return !keywords.includes(typeAlias.type.kind) 
+            ? getModelTypeProperties(typeAlias.type, genericTypes)
+            : [];
     }
 
     const classDeclaration = node as ts.ClassDeclaration;

test/data/apis.ts

@@ -233,7 +233,8 @@ export class DerivedEndpoint2 {
     }
 }
 
-export interface SimpleHelloType {
+// tslint:disable-next-line: interface-over-type-literal
+export type SimpleHelloType = {
     /**
      * Description for greeting property
      */
@@ -251,13 +252,16 @@ export interface SimpleHelloType {
     };
 
     comparePassword: (candidatePassword: string, cb: (err: any, isMatch: any) => {}) => void;
-}
+};
 
 export interface Something {
+    id: UUID;
     someone: string;
     kind: string;
 }
 
+export type UUID = string;
+
 @Path('type')
 export class TypeEndpoint {
 

test/unit/definitions.spec.ts

@@ -189,8 +189,15 @@ describe('Definition generation', () => {
   describe('TypeEndpoint', () => {
     it('should generate definitions for type aliases', () => {
       expect(spec.paths).to.have.property('/type/{param}');
-      const expression = jsonata('definitions.SimpleHelloType.properties.greeting.description');
+      let expression = jsonata('definitions.SimpleHelloType.properties.greeting.description');
       expect(expression.evaluate(spec)).to.eq('Description for greeting property');
+
+      expression = jsonata('definitions.UUID');
+      expect(expression.evaluate(spec)).to.eql({
+        description: '',
+        properties: {},
+        type: 'object',
+      });
     });
 
     it('should generate nested object types in definitions', () => {