fix(graphql): merge amended metadata to serialized metadata

Author: kamilmysliwiec

packages/graphql/lib/plugin/visitors/model-class.visitor.ts

@@ -93,7 +93,7 @@ export class ModelClassVisitor {
           }
           return;
         }
-        const members = this.amendFieldsDecorators(
+        const [members, amendedMetadata] = this.amendFieldsDecorators(
           factory,
           node.members,
           pluginOptions,
@@ -126,7 +126,11 @@ export class ModelClassVisitor {
             this._collectedMetadata[filePath] = {};
           }
           const attributeKey = node.name.getText();
-          this._collectedMetadata[filePath][attributeKey] = metadata;
+          this._collectedMetadata[filePath][attributeKey] = safelyMergeObjects(
+            factory,
+            metadata,
+            amendedMetadata,
+          );
           return;
         }
       } else if (ts.isSourceFile(node) && !pluginOptions.readonly) {
@@ -210,8 +214,9 @@ export class ModelClassVisitor {
     pluginOptions: PluginOptions,
     hostFilename: string, // sourceFile.fileName,
     typeChecker: ts.TypeChecker | undefined,
-  ): ts.ClassElement[] {
-    return members.map((member) => {
+  ): [ts.ClassElement[], ts.ObjectLiteralExpression] {
+    const propertyAssignments: ts.PropertyAssignment[] = [];
+    const updatedClassElements = members.map((member) => {
       const decorators = getDecorators(member);
       if (
         (ts.isPropertyDeclaration(member) || ts.isGetAccessor(member)) &&
@@ -241,6 +246,13 @@ export class ModelClassVisitor {
                 f,
                 metadata as any,
               );
+
+              propertyAssignments.push(
+                f.createPropertyAssignment(
+                  f.createIdentifier(member.name.getText()),
+                  serializedMetadata,
+                ),
+              );
               return [
                 type,
                 options
@@ -256,6 +268,11 @@ export class ModelClassVisitor {
 
       return member;
     });
+
+    return [
+      updatedClassElements,
+      f.createObjectLiteralExpression(propertyAssignments),
+    ];
   }
 
   private collectMetadataFromClassMembers(

packages/graphql/tests/plugin/fixtures/project/recipes/models/recipe.model.ts

@@ -1,4 +1,4 @@
-import { ObjectType } from '../../../../../../lib/decorators';
+import { Field, ObjectType } from '../../../../../../lib/decorators';
 import { Ingredient } from './ingredient.model';
 
 @ObjectType({ description: 'recipe ' })
@@ -13,6 +13,10 @@ export class Recipe {
 
   description?: string;
 
+  /**
+   * Creation date of the recipe
+   */
+  @Field((type) => Date)
   creationDate: Date;
 
   ingredients: Ingredient[];

packages/graphql/tests/plugin/fixtures/serialized-meta.fixture.ts

@@ -49,13 +49,13 @@ export default async () => {
                 description: 'The title of the recipe'
               },
               description: { nullable: true, type: () => String },
-              creationDate: { type: () => Date },
               ingredients: {
                 type: () => [t['./recipes/models/ingredient.model'].Ingredient]
               },
               primary: {
                 type: () => t['./recipes/models/ingredient.model'].Ingredient
-              }
+              },
+              creationDate: { description: 'Creation date of the recipe' }
             }
           }
         ]