Merge pull request #20 from recifejs/feature/alias-import-no-default

Validating alias in the import not default
recifejs · Jul 1, 2020 · 237cadc · 237cadc
2 parents a7d0dec + c596705
commit 237cadc
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 29 deletions.
diff --git a/example/src/controllers/admin/TestController.ts b/example/src/controllers/admin/TestController.ts
@@ -1,6 +1,6 @@
 import { Query, Mutation } from 'recife';
 
-import CommentAFilter, { CommentCreate, CommentDelete } from '../../inputs/CommentInput';
+import CommentAFilter, { CommentCreate as CommentCreateA, CommentDelete } from '../../inputs/CommentInput';
 import CommentModel from '../../models/CommentModel';
 
 export default class TestController {
@@ -22,7 +22,7 @@ export default class TestController {
   }
 
   @Mutation({ name: 'registerComment' })
-  createComment(input: CommentCreate): CommentModel {
+  createComment(input: CommentCreateA): CommentModel {
     return this.commentDefault;
   }
 

diff --git a/src/compiler/GraphCompiler.ts b/src/compiler/GraphCompiler.ts
@@ -7,6 +7,8 @@ import Graph from './token/Graph';
 import InputCompiler from './InputCompiler';
 import ImportDeclaration from './token/ImportDeclaration';
 import { isExport, getNameExportDefault } from '../helpers/exportHelper';
+import NameImportType from './type/NameImportType';
+import Input from './token/Input';
 
 class GraphCompiler {
   private static _instance: GraphCompiler;
@@ -66,27 +68,32 @@ class GraphCompiler {
         const graph = new Graph(member, node, this.path, isDefault, this.sourceFile);
 
         if (graph.type) {
-          this.graphs.push(graph);
-
           if (graph.params) {
-            this.createInput(graph.params.type);
+            const input = this.createInput(graph.params.type);
+            graph.params.type = input!.name;
           }
+
+          this.graphs.push(graph);
         }
       }
     });
   }
 
-  private createInput(className: string) {
+  private createInput(className: string): Input | undefined {
     let importDeclaration: ImportDeclaration | undefined = undefined;
+    let nameImport: NameImportType | undefined = undefined;
 
     this.imports.forEach((importDecl: ImportDeclaration) => {
-      if (importDecl.names.some(item => item.name === className)) {
+      const nameImportSearch = importDecl.names.find(item => (item.nameAlias || item.name) === className);
+      if (nameImportSearch) {
         importDeclaration = importDecl;
+        nameImport = nameImportSearch;
       }
     });
 
-    if (importDeclaration) {
-      InputCompiler.Instance.compile(importDeclaration, this.program!, className);
+    if (importDeclaration && nameImport) {
+      const input = InputCompiler.Instance.compile(importDeclaration, this.program!, nameImport!);
+      return input;
     }
   }
 

diff --git a/src/compiler/InputCompiler.ts b/src/compiler/InputCompiler.ts
@@ -3,6 +3,7 @@ import ScalarCompiler from './ScalarCompiler';
 import TypeCompiler from './TypeCompiler';
 import ImportDeclaration from './token/ImportDeclaration';
 import Input from './token/Input';
+import NameImportType from './type/NameImportType';
 
 class InputCompiler {
   private static _instance: InputCompiler;
@@ -25,16 +26,21 @@ class InputCompiler {
     this.inputs = [];
   }
 
-  compile(importDeclaration: ImportDeclaration, program: ts.Program, className: string) {
-    if (!this.existInput(importDeclaration, className)) {
+  compile(importDeclaration: ImportDeclaration, program: ts.Program, nameImport: NameImportType): Input {
+    const inputSearch = this.findInput(importDeclaration, nameImport.name);
+
+    if (!inputSearch) {
       this.sourceFile = program.getSourceFile(importDeclaration.getPath());
-      const input = new Input(importDeclaration, className, this.sourceFile);
+      const input = new Input(importDeclaration, nameImport, this.sourceFile);
       this.inputs.push(input);
+      return input;
     }
+
+    return inputSearch;
   }
 
-  private existInput(importDeclaration: ImportDeclaration, className: String): boolean {
-    return this.inputs.some(item => item.name === className && item.path === importDeclaration.getPath());
+  private findInput(importDeclaration: ImportDeclaration, className: String): Input | undefined {
+    return this.inputs.find(item => item.name === className && item.path === importDeclaration.getPath());
   }
 
   expand() {

diff --git a/src/compiler/token/ImportDeclaration.ts b/src/compiler/token/ImportDeclaration.ts
@@ -1,10 +1,6 @@
 import * as ts from 'typescript';
 import path from 'path';
-
-type NameImportType = {
-  name: string;
-  exportDefault: boolean;
-};
+import NameImportType from '../type/NameImportType';
 
 class ImportDeclaration {
   public names: NameImportType[] = [];
@@ -24,11 +20,13 @@ class ImportDeclaration {
       }
 
       if (node.importClause.namedBindings) {
-        node.importClause.namedBindings.forEachChild((node: ts.Node) => {
-          this.names.push({
-            name: node.getText(sourceFile),
-            exportDefault: false
-          });
+        node.importClause.namedBindings.forEachChild(node => {
+          if (ts.isImportSpecifier(node))
+            this.names.push({
+              name: node.propertyName ? node.propertyName.getText(sourceFile) : node.name.getText(sourceFile),
+              nameAlias: node.propertyName ? node.name.getText(sourceFile) : undefined,
+              exportDefault: false
+            });
         });
       }
     }

diff --git a/src/compiler/token/Input.ts b/src/compiler/token/Input.ts
@@ -2,6 +2,7 @@ import * as ts from 'typescript';
 import Field from './Field';
 import ImportDeclaration from './ImportDeclaration';
 import { findNodeExportDefault } from '../../helpers/exportHelper';
+import NameImportType from '../type/NameImportType';
 
 class Input {
   public name: string;
@@ -10,12 +11,10 @@ class Input {
   private sourceFile?: ts.SourceFile;
   private exportDefault: boolean;
 
-  constructor(importDeclaration: ImportDeclaration, className: string, sourceFile?: ts.SourceFile) {
-    const nameImport = importDeclaration.names.find(item => item.name === className);
-
-    this.exportDefault = nameImport!.exportDefault;
+  constructor(importDeclaration: ImportDeclaration, nameImport: NameImportType, sourceFile?: ts.SourceFile) {
+    this.exportDefault = nameImport.exportDefault;
     this.path = importDeclaration.getPath();
-    this.name = className;
+    this.name = nameImport.name;
     this.sourceFile = sourceFile;
     this.fields = [];
 
@@ -44,14 +43,23 @@ class Input {
   private compileType(node: ts.Node) {
     if (ts.isTypeAliasDeclaration(node)) {
       if (this.exportDefault || node.name.getText(this.sourceFile) === this.name) {
+        if (this.exportDefault) {
+          this.name = node.name.getText(this.sourceFile);
+        }
         this.compileTypeLiteral(node);
       }
     } else if (ts.isClassDeclaration(node)) {
       if (this.exportDefault || node.name!.getText(this.sourceFile) === this.name) {
+        if (this.exportDefault) {
+          this.name = node.name!.getText(this.sourceFile);
+        }
         this.compileClass(node);
       }
     } else if (ts.isInterfaceDeclaration(node)) {
       if (this.exportDefault || node.name.getText(this.sourceFile) === this.name) {
+        if (this.exportDefault) {
+          this.name = node.name.getText(this.sourceFile);
+        }
         this.compileInterface(node);
       }
     }

diff --git a/src/compiler/type/NameImportType.ts b/src/compiler/type/NameImportType.ts
@@ -0,0 +1,7 @@
+type NameImportType = {
+  name: string;
+  nameAlias?: string;
+  exportDefault: boolean;
+};
+
+export default NameImportType;