fix: Hide field for model type

Fix: #14

Author: unlight

src/generate.spec.ts

@@ -1298,9 +1298,10 @@ describe('export all from index', () => {
 });
 
 describe('hide field', () => {
-    before(async () => {
-        await testGenerate({
-            schema: `
+    describe('scalar field', () => {
+        before(async () => {
+            await testGenerate({
+                schema: `
             model User {
                 id String @id
                 /// @TypeGraphQL.omit(output: true)
@@ -1311,40 +1312,79 @@ describe('hide field', () => {
                 password2 String
             }
             `,
-            options: [],
+                options: [],
+            });
+            // const filePaths = sourceFiles.map(s => s.getFilePath());
         });
-        // const filePaths = sourceFiles.map(s => s.getFilePath());
-    });
 
-    describe('model', () => {
-        before(() => {
-            sourceFile = project.getSourceFile(s =>
-                s.getFilePath().endsWith('/user.model.ts'),
-            )!;
-        });
+        describe('model', () => {
+            before(() => {
+                sourceFile = project.getSourceFile(s =>
+                    s.getFilePath().endsWith('/user.model.ts'),
+                )!;
+            });
 
-        // it('^', () => console.log(sourceFile.getText()));
+            // it('^', () => console.log(sourceFile.getText()));
 
-        it('TypeGraphQL omit should hide password1', () => {
-            expect(d('password1')?.name).toBe('HideField');
-            expect(d('password1')?.arguments).toEqual([]);
+            it('TypeGraphQL omit should hide password1', () => {
+                expect(d('password1')?.name).toBe('HideField');
+                expect(d('password1')?.arguments).toEqual([]);
+            });
+
+            it('HideField should hide field', () => {
+                expect(d('password2')?.name).toBe('HideField');
+                expect(d('password2')?.arguments).toEqual([]);
+            });
         });
 
-        it('HideField should hide field', () => {
-            expect(d('password2')?.name).toBe('HideField');
-            expect(d('password2')?.arguments).toEqual([]);
+        describe('other outputs', () => {
+            it('user-max-aggregate', () => {
+                sourceFile = project.getSourceFile(s =>
+                    s.getFilePath().endsWith('/user-max-aggregate.output.ts'),
+                )!;
+                expect(d('password1')?.name).toBe('HideField');
+                expect(d('password1')?.arguments).toEqual([]);
+                expect(d('password2')?.name).toBe('HideField');
+                expect(d('password2')?.arguments).toEqual([]);
+            });
         });
     });
 
-    describe('other outputs', () => {
-        it('user-max-aggregate', () => {
-            sourceFile = project.getSourceFile(s =>
-                s.getFilePath().endsWith('/user-max-aggregate.output.ts'),
-            )!;
-            expect(d('password1')?.name).toBe('HideField');
-            expect(d('password1')?.arguments).toEqual([]);
-            expect(d('password2')?.name).toBe('HideField');
-            expect(d('password2')?.arguments).toEqual([]);
+    describe('hide on non scalar', () => {
+        before(async () => {
+            await testGenerate({
+                schema: `
+                    model User {
+                      id       String @id
+                      /// @HideField()
+                      secret   Secret @relation(fields: [secretId], references: [id])
+                      secretId String
+                    }
+
+                    model Secret {
+                      id    String @id
+                      users User[]
+                    }
+            `,
+                options: [],
+            });
+        });
+
+        describe('model', () => {
+            before(() => {
+                sourceFile = project.getSourceFile(s =>
+                    s.getFilePath().endsWith('/user.model.ts'),
+                )!;
+            });
+
+            it('type should be imported', () => {
+                const imports = getImportDeclarations(sourceFile);
+                expect(imports).toContainEqual(
+                    expect.objectContaining({ name: 'Secret' }),
+                );
+            });
+
+            // it('^', () => console.log(sourceFile.getText()));
         });
     });
 });

src/handlers/model-output-type.ts

@@ -77,16 +77,6 @@ export function modelOutputType(outputType: OutputType, args: EventArguments) {
             isList,
         });
 
-        if (fieldMeta?.hideOutput) {
-            generateImport({
-                sourceFile,
-                name: 'HideField',
-                moduleSpecifier: '@nestjs/graphql',
-            });
-            propertyDeclaration.addDecorator({ name: 'HideField()' });
-            continue;
-        }
-
         const graphqlType =
             customType?.graphqlType ??
             getGraphqlType({
@@ -122,14 +112,23 @@ export function modelOutputType(outputType: OutputType, args: EventArguments) {
             });
         }
 
-        generateDecorator({
-            propertyDeclaration,
-            graphqlType,
-            isList,
-            isNullable: field.isNullable,
-            defaultValue: modelField?.default,
-            description: modelField?.documentation,
-        });
+        if (fieldMeta?.hideOutput) {
+            generateImport({
+                sourceFile,
+                name: 'HideField',
+                moduleSpecifier: '@nestjs/graphql',
+            });
+            propertyDeclaration.addDecorator({ name: 'HideField()' });
+        } else {
+            generateDecorator({
+                propertyDeclaration,
+                graphqlType,
+                isList,
+                isNullable: field.isNullable,
+                defaultValue: modelField?.default,
+                description: modelField?.documentation,
+            });
+        }
     }
 
     // Check re-export, comment generated class if found

src/handlers/output-type.ts

@@ -107,15 +107,6 @@ export function outputType(outputType: OutputType, args: EventArguments) {
 
         classStructure.properties?.push(property);
 
-        if (fieldMeta?.hideOutput) {
-            importDeclarations.add('HideField', {
-                namedImports: [{ name: 'HideField' }],
-                moduleSpecifier: '@nestjs/graphql',
-            });
-            property.decorators?.push({ name: 'HideField', arguments: [] });
-            continue;
-        }
-
         const graphqlType =
             customType?.graphqlType ??
             getGraphqlType({
@@ -158,16 +149,24 @@ export function outputType(outputType: OutputType, args: EventArguments) {
             });
         }
 
-        // Generate `@Field()` decorator
-        property.decorators?.push({
-            name: 'Field',
-            arguments: [
-                `() => ${isList ? `[${graphqlType}]` : graphqlType}`,
-                JSON5.stringify({
-                    nullable: Boolean(field.isNullable),
-                }),
-            ],
-        });
+        if (fieldMeta?.hideOutput) {
+            importDeclarations.add('HideField', {
+                namedImports: [{ name: 'HideField' }],
+                moduleSpecifier: '@nestjs/graphql',
+            });
+            property.decorators?.push({ name: 'HideField', arguments: [] });
+        } else {
+            // Generate `@Field()` decorator
+            property.decorators?.push({
+                name: 'Field',
+                arguments: [
+                    `() => ${isList ? `[${graphqlType}]` : graphqlType}`,
+                    JSON5.stringify({
+                        nullable: Boolean(field.isNullable),
+                    }),
+                ],
+            });
+        }
     }
 
     sourceFile.set({

src/helpers/property-structure.ts

@@ -1,4 +1,4 @@
-import { OptionalKind, PropertyDeclarationStructure } from 'ts-morph';
+import { PropertyDeclarationStructure, StructureKind } from 'ts-morph';
 
 /**
  * Get property structure (field) for class.
@@ -8,13 +8,14 @@ export function propertyStructure(args: {
     isList: boolean;
     name: string;
     isNullable?: boolean;
-}): OptionalKind<PropertyDeclarationStructure> {
+}): PropertyDeclarationStructure {
     const { isNullable, propertyType, name, isList } = args;
     const type = propertyType
         .map(type => (isList ? `Array<${type}>` : type))
         .join(' | ');
 
     return {
+        kind: StructureKind.Property,
         name,
         type,
         hasQuestionToken: isNullable,