fix(amplify-codegen): fix name for many to many join table fields (#303)

Author: pavellazar

packages/appsync-modelgen-plugin/src/__tests__/visitors/appsync-visitor.test.ts

@@ -339,7 +339,9 @@ describe('AppSyncModelVisitor', () => {
       );
       visit(ast, { leave: visitor });
       visitor.generate();
-      const projectTeamIdField = visitor.models.Project.fields.find(field => { return field.name === 'projectTeamId'; });
+      const projectTeamIdField = visitor.models.Project.fields.find(field => {
+        return field.name === 'projectTeamId';
+      });
       expect(projectTeamIdField).toBeDefined();
       expect(projectTeamIdField.isNullable).toBeTruthy();
     });
@@ -664,6 +666,7 @@ describe('AppSyncModelVisitor', () => {
     let simpleManyToManySchema;
     let simpleManyModelMap;
     let transformedSimpleManyModelMap;
+    let manyToManyModelNameSchema;
 
     beforeEach(() => {
       simpleManyToManySchema = /* GraphQL */ `
@@ -678,6 +681,16 @@ describe('AppSyncModelVisitor', () => {
         }
       `;
 
+      manyToManyModelNameSchema = /* GraphQL */ `
+        type ModelA @model {
+          models: [ModelB] @manyToMany(relationName: "Models")
+        }
+
+        type ModelB @model {
+          models: [ModelA] @manyToMany(relationName: "Models")
+        }
+      `;
+
       simpleManyModelMap = {
         Human: {
           name: 'Human',
@@ -832,5 +845,36 @@ describe('AppSyncModelVisitor', () => {
       expect(visitor.models.Animal.fields[2].directives[0].arguments.fields[0]).toEqual('id');
       expect(visitor.models.Animal.fields[2].directives[0].arguments.indexName).toEqual('byAnimal');
     });
+
+    it('Should correctly field names for many to many join table', () => {
+      const visitor = createAndGeneratePipelinedTransformerVisitor(manyToManyModelNameSchema);
+
+      expect(visitor.models.ModelA.fields.length).toEqual(4);
+      expect(visitor.models.ModelA.fields[1].directives[0].name).toEqual('hasMany');
+      expect(visitor.models.ModelA.fields[1].directives[0].arguments.fields.length).toEqual(1);
+      expect(visitor.models.ModelA.fields[1].directives[0].arguments.fields[0]).toEqual('id');
+      expect(visitor.models.ModelA.fields[1].directives[0].arguments.indexName).toEqual('byModelA');
+
+      expect(visitor.models.Models).toBeDefined();
+      expect(visitor.models.Models.fields.length).toEqual(5);
+
+      const modelA = visitor.models.Models.fields.find(f => f.name === 'modelA');
+      expect(modelA).toBeDefined();
+      expect(modelA.directives[0].name).toEqual('belongsTo');
+      expect(modelA.directives[0].arguments.fields.length).toEqual(1);
+      expect(modelA.directives[0].arguments.fields[0]).toEqual('modelAID');
+
+      const modelB = visitor.models.Models.fields.find(f => f.name === 'modelB');
+      expect(modelB).toBeDefined();
+      expect(modelB.directives[0].name).toEqual('belongsTo');
+      expect(modelB.directives[0].arguments.fields.length).toEqual(1);
+      expect(modelB.directives[0].arguments.fields[0]).toEqual('modelBID');
+
+      expect(visitor.models.ModelB.fields.length).toEqual(4);
+      expect(visitor.models.ModelB.fields[1].directives[0].name).toEqual('hasMany');
+      expect(visitor.models.ModelB.fields[1].directives[0].arguments.fields.length).toEqual(1);
+      expect(visitor.models.ModelB.fields[1].directives[0].arguments.fields[0]).toEqual('id');
+      expect(visitor.models.ModelB.fields[1].directives[0].arguments.indexName).toEqual('byModelB');
+    });
   });
 });

packages/appsync-modelgen-plugin/src/visitors/appsync-visitor.ts

@@ -6,7 +6,7 @@ import {
   ParsedConfig,
   RawConfig,
 } from '@graphql-codegen/visitor-plugin-common';
-import { constantCase, pascalCase } from 'change-case';
+import { camelCase, constantCase, pascalCase } from 'change-case';
 import { plural } from 'pluralize';
 import crypto from 'crypto';
 import {
@@ -553,8 +553,8 @@ export class AppSyncModelVisitor<
     secondField: CodeGenField,
     relationName: string,
   ) {
-    const firstModelKeyFieldName = `${firstModel.name.toLowerCase()}ID`;
-    const secondModelKeyFieldName = `${secondModel.name.toLowerCase()}ID`;
+    const firstModelKeyFieldName = `${camelCase(firstModel.name)}ID`;
+    const secondModelKeyFieldName = `${camelCase(secondModel.name)}ID`;
     let intermediateModel: CodeGenModel = {
       name: relationName,
       type: 'model',
@@ -585,14 +585,14 @@ export class AppSyncModelVisitor<
           type: firstModel.name,
           isNullable: false,
           isList: false,
-          name: firstModel.name.toLowerCase(),
+          name: camelCase(firstModel.name),
           directives: [{ name: 'belongsTo', arguments: { fields: [firstModelKeyFieldName] } }],
         },
         {
           type: secondModel.name,
           isNullable: false,
           isList: false,
-          name: secondModel.name.toLowerCase(),
+          name: camelCase(secondModel.name),
           directives: [{ name: 'belongsTo', arguments: { fields: [secondModelKeyFieldName] } }],
         },
       ],
@@ -708,7 +708,9 @@ export class AppSyncModelVisitor<
         const connectionInfo = field.connectionInfo;
         if (modelTypes.includes(fieldType) && connectionInfo === undefined) {
           printWarning(
-            `Model ${model.name} has field ${field.name} of type ${field.type} but its not connected. Add the appropriate ${field.isList ? '@hasMany' : '@hasOne'}/@belongsTo directive if you want to connect them.`,
+            `Model ${model.name} has field ${field.name} of type ${field.type} but its not connected. Add the appropriate ${
+              field.isList ? '@hasMany' : '@hasOne'
+            }/@belongsTo directive if you want to connect them.`,
           );
           return false;
         }