fix: Custom type for output types

unlight · Apr 7, 2021 · c9ae9e9 · c9ae9e9
1 parent d72d390
commit c9ae9e9
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 17 deletions.
diff --git a/src/generate.spec.ts b/src/generate.spec.ts
@@ -1769,6 +1769,20 @@ describe('custom decorators field custom type namespace', () => {
 
         // it('^', () => console.log(sourceFile.getText()));
     });
+
+    describe('custom type user model', () => {
+        before(() => {
+            setSourceFile('user.model.ts');
+        });
+
+        it('custom type user model email field type', () => {
+            const decorator = p('email')?.decorators?.find(d => d.name === 'Field');
+            const typeArgument = decorator?.arguments?.[0];
+            expect(typeArgument).toEqual('() => Scalars.EmailAddress');
+        });
+
+        // it('^', () => console.log(sourceFile.getText()));
+    });
 });
 
 // it('^', () => console.log(sourceFile.getText()));
diff --git a/src/handlers/model-output-type.ts b/src/handlers/model-output-type.ts
@@ -105,23 +105,35 @@ export function modelOutputType(outputType: OutputType, args: EventArguments) {
                   type: outputTypeName,
               });
 
-        const graphqlType =
-            customType?.graphqlType ??
-            getGraphqlType({
+        let graphqlType: string;
+        const fieldType = settings?.getFieldType();
+
+        if (fieldType) {
+            graphqlType = fieldType.name;
+            importDeclarations.create({ ...fieldType });
+        } else {
+            graphqlType =
+                customType?.graphqlType ??
+                getGraphqlType({
+                    location,
+                    type: outputTypeName,
+                    isId: modelField?.isId,
+                });
+
+            const graphqlImport = getGraphqlImport({
+                sourceFile,
+                fileType,
                 location,
-                type: outputTypeName,
                 isId: modelField?.isId,
+                name: graphqlType,
+                customType,
+                getSourceFile,
             });
 
-        const graphqlImport = getGraphqlImport({
-            sourceFile,
-            fileType,
-            location,
-            isId: modelField?.isId,
-            name: graphqlType,
-            customType,
-            getSourceFile,
-        });
+            if (graphqlImport.name !== outputType.name && graphqlImport.specifier) {
+                importDeclarations.add(graphqlImport.name, graphqlImport.specifier);
+            }
+        }
 
         // console.log({
         //     'field.outputType': field.outputType,
@@ -145,10 +157,6 @@ export function modelOutputType(outputType: OutputType, args: EventArguments) {
 
         classStructure.properties?.push(property);
 
-        if (graphqlImport.name !== outputType.name && graphqlImport.specifier) {
-            importDeclarations.add(graphqlImport.name, graphqlImport.specifier);
-        }
-
         // Create import for typescript field/property type
         if (customType && customType.fieldType && customType.fieldModule) {
             importDeclarations.add(customType.fieldType, customType.fieldModule);