fix(input types): fix missing scalar enum imports

rfermann · Apr 21, 2021 · fbf4656 · fbf4656
1 parent c35b318
commit fbf4656
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/Handlers/InputTypeHandler/__snapshots__/index.test.ts.snap b/src/Handlers/InputTypeHandler/__snapshots__/index.test.ts.snap
@@ -2702,6 +2702,7 @@ export class DeleteOneUserInput {
 
 exports[`InputTypeHandler should parse input types and create correct user input files from datamodel 6`] = `
 "import { Field, InputType, Int } from \\"@nestjs/graphql\\";
+import { UserScalarFieldEnum } from \\"../../enums\\";
 import { UserOrderByInput } from \\"./UserOrderByInput\\";
 import { UserWhereInput } from \\"./UserWhereInput\\";
 import { UserWhereUniqueInput } from \\"./UserWhereUniqueInput\\";
@@ -2745,6 +2746,7 @@ export class FindFirstUserInput {
 
 exports[`InputTypeHandler should parse input types and create correct user input files from datamodel 7`] = `
 "import { Field, InputType, Int } from \\"@nestjs/graphql\\";
+import { UserScalarFieldEnum } from \\"../../enums\\";
 import { UserOrderByInput } from \\"./UserOrderByInput\\";
 import { UserWhereInput } from \\"./UserWhereInput\\";
 import { UserWhereUniqueInput } from \\"./UserWhereUniqueInput\\";
@@ -2804,6 +2806,7 @@ export class FindUniqueUserInput {
 
 exports[`InputTypeHandler should parse input types and create correct user input files from datamodel 9`] = `
 "import { Field, InputType, Int } from \\"@nestjs/graphql\\";
+import { UserScalarFieldEnum } from \\"../../enums\\";
 import { UserOrderByInput } from \\"./UserOrderByInput\\";
 import { UserScalarWhereWithAggregatesInput } from \\"./UserScalarWhereWithAggregatesInput\\";
 import { UserWhereInput } from \\"./UserWhereInput\\";

diff --git a/src/Handlers/InputTypeHandler/index.ts b/src/Handlers/InputTypeHandler/index.ts
@@ -114,8 +114,10 @@ export class InputTypeHandler extends BaseHandler {
           type: parsedField.graphQLType,
         });
 
+        const baseGraphqlType = parsedField.graphQLType.replace("[", "").replace("]", "");
+
         fieldInputTypes.forEach(({ location, type }) => {
-          if (this.baseParser.getEnumName(type) === parsedField.graphQLType) {
+          if (this.baseParser.getEnumName(type) === baseGraphqlType) {
             enumImports = this.baseParser.getEnumImports({ enumImports, field: { location, type } });
           }
 
@@ -126,8 +128,6 @@ export class InputTypeHandler extends BaseHandler {
           });
         });
 
-        const baseGraphqlType = parsedField.graphQLType.replace("[", "").replace("]", "");
-
         // prevent a type from importing itself
         if (name === baseGraphqlType) {
           return;
@@ -139,11 +139,11 @@ export class InputTypeHandler extends BaseHandler {
 
         graphqlScalarImports = this.baseParser.getGraphqlScalarImports({
           graphqlScalarImports,
-          type: parsedField.graphQLType,
+          type: baseGraphqlType,
         });
 
-        if (this.baseParser.nestJSImports.has(parsedField.graphQLType)) {
-          nestJSImports.add(parsedField.graphQLType);
+        if (this.baseParser.nestJSImports.has(baseGraphqlType)) {
+          nestJSImports.add(baseGraphqlType);
         }
 
         fields.push(parsedField);