fix(hide field): Missing import of enum type

close: unlight#73
resident-advisor · Nov 25, 2021 · b067142 · b067142
1 parent fa8e7fa
commit b067142
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 4 deletions.
diff --git a/src/handlers/input-type.ts b/src/handlers/input-type.ts
@@ -1,6 +1,6 @@
 import { ok } from 'assert';
 import JSON5 from 'json5';
-import { castArray } from 'lodash';
+import { castArray, last } from 'lodash';
 import pupa from 'pupa';
 import { ClassDeclarationStructure, StructureKind } from 'ts-morph';
 
@@ -132,12 +132,16 @@ export function inputType(
             });
 
             graphqlType = graphqlImport.name;
+            let referenceName = propertyType[0];
+            if (location === 'enumTypes') {
+                referenceName = last(referenceName.split(' ')) as string;
+            }
 
             if (
                 graphqlImport.specifier &&
                 !importDeclarations.has(graphqlImport.name) &&
                 ((graphqlImport.name !== inputType.name && !shouldHideField) ||
-                    (shouldHideField && propertyType[0] === graphqlImport.name))
+                    (shouldHideField && referenceName === graphqlImport.name))
             ) {
                 importDeclarations.set(graphqlImport.name, {
                     namedImports: [{ name: graphqlImport.name }],

diff --git a/src/handlers/output-type.ts b/src/handlers/output-type.ts
@@ -1,6 +1,6 @@
 import { ok } from 'assert';
 import JSON5 from 'json5';
-import { castArray } from 'lodash';
+import { castArray, last } from 'lodash';
 import { ClassDeclarationStructure, StructureKind } from 'ts-morph';
 
 import { getGraphqlImport } from '../helpers/get-graphql-import';
@@ -114,12 +114,16 @@ export function outputType(outputType: OutputType, args: EventArguments) {
             });
 
             graphqlType = graphqlImport.name;
+            let referenceName = propertyType[0];
+            if (location === 'enumTypes') {
+                referenceName = last(referenceName.split(' ')) as string;
+            }
 
             if (
                 graphqlImport.specifier &&
                 !importDeclarations.has(graphqlImport.name) &&
                 ((graphqlImport.name !== outputType.name && !shouldHideField) ||
-                    (shouldHideField && propertyType[0] === graphqlImport.name))
+                    (shouldHideField && referenceName === graphqlImport.name))
             ) {
                 importDeclarations.set(graphqlImport.name, {
                     namedImports: [{ name: graphqlImport.name }],

diff --git a/src/test/generate.spec.ts b/src/test/generate.spec.ts
@@ -1,6 +1,7 @@
 import expect from 'expect';
 import JSON5 from 'json5';
 import { trim } from 'lodash';
+import { async } from 'rxjs';
 import {
     ClassDeclaration,
     EnumDeclarationStructure,
@@ -1421,6 +1422,49 @@ describe('hide field', () => {
             specifier: './user-relation-filter.input',
         });
     });
+
+    describe('enums are not imported in classes when decorated', () => {
+        before(async () => {
+            ({ project, sourceFiles } = await testGenerate({
+                schema: `
+            model User {
+              id Int @id
+              /// @HideField({ input: true, output: true })
+              role Role
+            }
+            enum Role {
+              USER
+              ADMIN
+            }
+            `,
+                options: [`outputFilePattern = "{name}.{type}.ts"`],
+            }));
+        });
+
+        it('check files', () => {
+            [
+                'user-group-by.output.ts',
+                'user-max-aggregate.output.ts',
+                'user-min-aggregate.output.ts',
+                'user-create-many.input.ts',
+                'user.model.ts',
+            ].forEach(() => {
+                const s = testSourceFile({
+                    project,
+                    file: 'user-group-by.output.ts',
+                    property: 'role',
+                });
+
+                expect(s.namedImports).toContainEqual({
+                    name: 'Role',
+                    specifier: './role.enum',
+                });
+                expect(s.propertyDecorators).toContainEqual(
+                    expect.objectContaining({ name: 'HideField' }),
+                );
+            });
+        });
+    });
 });
 
 it('model with prisma keyword output', async () => {