Merge 9bc449f into 6bfcba2

recifejs · Jul 7, 2020 · a84d8cd · a84d8cd
2 parents 6bfcba2 + 9bc449f
commit a84d8cd
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 12 deletions.
diff --git a/example/src/models/CommentModel.ts b/example/src/models/CommentModel.ts
@@ -21,6 +21,10 @@ class CommentModel extends Publication {
 export class AuthorModel {
   name!: String;
   book?: BookModel;
+  params?: {
+    a: string;
+    b: string;
+  };
 }
 
 @Type({ name: 'Journal' })

diff --git a/src/compiler/TypeCompiler.ts b/src/compiler/TypeCompiler.ts
@@ -55,6 +55,13 @@ class TypeCompiler {
     }
   }
 
+  compileObjectLiteral(node: ts.TypeLiteralNode, fieldName: string, path: string): Type {
+    const type = new Type(node, path, false, [], this.sourceFile, fieldName);
+    this.types.push(type);
+
+    return type;
+  }
+
   private getFolder(): string {
     const bar = os.platform() === 'win32' ? '\\' : '/';
     return this.path.substring(0, this.path.lastIndexOf(bar));

diff --git a/src/compiler/token/Field.ts b/src/compiler/token/Field.ts
@@ -1,6 +1,7 @@
 import * as ts from 'typescript';
 import Log from '../../log';
 import InputCompiler from '../InputCompiler';
+import TypeCompiler from '../TypeCompiler';
 import FieldTypeEnum from '../enum/FieldTypeEnum';
 import PrimitiveType from '../PrimitiveType';
 
@@ -66,6 +67,13 @@ class Field {
             this.path
           );
           this.type = input.name;
+        } else if (fieldType === FieldTypeEnum.TYPE) {
+          const type = TypeCompiler.Instance.compileObjectLiteral(
+            node.type,
+            `${capitalize(this.parentName)}${capitalize(this.name)}`,
+            this.path
+          );
+          this.type = type.name;
         }
       } else {
         this.type = PrimitiveType.getPrimitiveType(node.type.getText(sourceFile));

diff --git a/src/compiler/token/Type.ts b/src/compiler/token/Type.ts
@@ -17,34 +17,42 @@ class Type {
   public options: TypeOptions;
 
   constructor(
-    node: ts.ClassDeclaration,
+    node: ts.ClassDeclaration | ts.TypeLiteralNode,
     path: string,
     isDefaultExternal: boolean,
     imports: ImportDeclaration[],
-    sourceFile?: ts.SourceFile
+    sourceFile?: ts.SourceFile,
+    name?: string
   ) {
     this.fields = [];
     this.options = {};
     this.path = path;
-    this.name = node.name!.getText(sourceFile).replace('Model', '');
-    this.nameModel = node.name!.getText(sourceFile);
+    if (ts.isTypeLiteralNode(node)) {
+      this.name = name!;
+      this.nameModel = name!;
+    } else {
+      this.name = node.name!.getText(sourceFile).replace('Model', '');
+      this.nameModel = node.name!.getText(sourceFile);
+    }
 
     this.isExportDefaultModel = isDefaultExternal || isExportDefault(node);
 
-    node.members.forEach(member => {
-      if (ts.isPropertyDeclaration(member)) {
+    node.members.forEach((member: ts.Node) => {
+      if (ts.isPropertyDeclaration(member) || ts.isPropertySignature(member)) {
         const field = new Field(member, this.path, this.name, imports, FieldTypeEnum.TYPE, sourceFile);
         this.fields.push(field);
       }
     });
 
-    if (node.heritageClauses) {
-      node.heritageClauses.forEach((heritage: ts.HeritageClause) => {
-        this.heritageName = heritage.types[0].expression.getText(sourceFile);
-      });
-    }
+    if (ts.isClassDeclaration(node)) {
+      if (node.heritageClauses) {
+        node.heritageClauses.forEach((heritage: ts.HeritageClause) => {
+          this.heritageName = heritage.types[0].expression.getText(sourceFile);
+        });
+      }
 
-    this.getOptions(node, sourceFile);
+      this.getOptions(node, sourceFile);
+    }
   }
 
   private getOptions(node: ts.ClassDeclaration, sourceFile?: ts.SourceFile) {

diff --git a/test/type-compiler/snapshot/with-object-type-in-field/input.ts b/test/type-compiler/snapshot/with-object-type-in-field/input.ts
@@ -0,0 +1,14 @@
+import { Type } from 'recife';
+
+@Type()
+class User {
+  name?: String;
+  exist?: Boolean;
+  emails: String[];
+  params?: {
+    a: string;
+    b: string;
+  };
+}
+
+export default User;
diff --git a/test/type-compiler/snapshot/with-object-type-in-field/output.js b/test/type-compiler/snapshot/with-object-type-in-field/output.js
@@ -0,0 +1,64 @@
+'use-strict';
+
+module.exports = {
+  types: [
+    {
+      fields: [
+        {
+          visible: true,
+          parentName: 'UserParams',
+          name: 'a',
+          isRequired: true,
+          type: 'String'
+        },
+        {
+          visible: true,
+          parentName: 'UserParams',
+          name: 'b',
+          isRequired: true,
+          type: 'String'
+        }
+      ],
+      options: {},
+      name: 'UserParams',
+      nameModel: 'UserParams',
+      isExportDefaultModel: false
+    },
+    {
+      fields: [
+        {
+          visible: true,
+          parentName: 'User',
+          name: 'name',
+          isRequired: false,
+          type: 'String'
+        },
+        {
+          visible: true,
+          parentName: 'User',
+          name: 'exist',
+          isRequired: false,
+          type: 'Boolean'
+        },
+        {
+          visible: true,
+          parentName: 'User',
+          name: 'emails',
+          isRequired: true,
+          type: '[String]'
+        },
+        {
+          visible: true,
+          parentName: 'User',
+          name: 'params',
+          isRequired: false,
+          type: 'UserParams'
+        }
+      ],
+      options: {},
+      name: 'User',
+      nameModel: 'User',
+      isExportDefaultModel: true
+    }
+  ]
+};