Merge pull request #308 from aws-amplify/master

release add dependencies version upgrade and join table name fix

Author: frimfram

package.json

@@ -95,9 +95,9 @@
     "ts-jest": "^25.5.0",
     "ts-node": "^8.10.1",
     "typescript": "^3.8.3",
-    "amplify-cli-core": "^1.17.2",
-    "graphql-transformer-core": "^6.26.2",
-    "amplify-headless-interface": "^1.6.0"
+    "amplify-cli-core": "^2.3.0",
+    "graphql-transformer-core": "^7.2.1",
+    "amplify-headless-interface": "^1.13.1"
   },
   "config": {
     "commitizen": {

packages/amplify-codegen-e2e-core/package.json

@@ -35,8 +35,8 @@
     "uuid": "7.0.1"
   },
   "peerDependencies": {
-    "amplify-cli-core": "^1.18.1",
-    "amplify-headless-interface": "^1.5.3",
-    "graphql-transformer-core": "^6.27.0"
+    "amplify-cli-core": "^2.3.0",
+    "amplify-headless-interface": "^1.13.1",
+    "graphql-transformer-core": "^7.2.1"
   }
 }

packages/amplify-codegen-e2e-core/src/categories/api.ts

@@ -36,7 +36,7 @@ export function addApiWithoutSchema(cwd: string, opts: Partial<AddApiOptions & {
   const options = _.assign(defaultOptions, opts);
   return new Promise<void>((resolve, reject) => {
     spawn(getCLIPath(options.testingWithLatestCodebase), ['add', 'api'], { cwd, stripColors: true })
-      .wait('Please select from one of the below mentioned services:')
+      .wait('Select from one of the below mentioned services:')
       .sendCarriageReturn()
       .wait(/.*Here is the GraphQL API that we will create. Select a setting to edit or continue.*/)
       .sendKeyUp(3)
@@ -66,7 +66,7 @@ export function addApiWithBlankSchema(cwd: string, opts: Partial<AddApiOptions &
   const options = _.assign(defaultOptions, opts);
   return new Promise<void>((resolve, reject) => {
     spawn(getCLIPath(options.testingWithLatestCodebase), ['add', 'api'], { cwd, stripColors: true })
-      .wait('Please select from one of the below mentioned services:')
+      .wait('Select from one of the below mentioned services:')
       .sendCarriageReturn()
       .wait(/.*Here is the GraphQL API that we will create. Select a setting to edit or continue.*/)
       .sendKeyUp(3)
@@ -97,7 +97,7 @@ export function addApiWithBlankSchema(cwd: string, opts: Partial<AddApiOptions &
 export function addApiWithBlankSchemaAndConflictDetection(cwd: string) {
   return new Promise<void>((resolve, reject) => {
     spawn(getCLIPath(defaultOptions.testingWithLatestCodebase), ['add', 'api'], { cwd, stripColors: true })
-      .wait('Please select from one of the below mentioned services:')
+      .wait('Select from one of the below mentioned services:')
       .sendCarriageReturn()
       .wait(/.*Here is the GraphQL API that we will create. Select a setting to edit or continue.*/)
       .sendKeyUp()
@@ -138,7 +138,7 @@ export function updateApiSchema(cwd: string, projectName: string, schemaName: st
 export function updateApiWithMultiAuth(cwd: string, settings: any) {
   return new Promise<void>((resolve, reject) => {
     spawn(getCLIPath(settings.testingWithLatestCodebase), ['update', 'api'], { cwd, stripColors: true })
-      .wait('Please select from one of the below mentioned services:')
+      .wait('Select from one of the below mentioned services:')
       .sendCarriageReturn()
       .wait(/.*Select a setting to edit.*/)
       .sendCarriageReturn()
@@ -185,7 +185,7 @@ export function updateApiWithMultiAuth(cwd: string, settings: any) {
 export function apiEnableDataStore(cwd: string, settings: any) {
   return new Promise<void>((resolve, reject) => {
     spawn(getCLIPath(settings.testingWithLatestCodebase), ['update', 'api'], { cwd, stripColors: true })
-      .wait('Please select from one of the below mentioned services:')
+      .wait('Select from one of the below mentioned services:')
       .sendCarriageReturn()
       .wait(/.*Select a setting to edit.*/)
       .sendKeyDown()
@@ -209,7 +209,7 @@ export function apiEnableDataStore(cwd: string, settings: any) {
 export function apiDisableDataStore(cwd: string, settings: any) {
   return new Promise<void>((resolve, reject) => {
     spawn(getCLIPath(settings.testingWithLatestCodebase), ['update', 'api'], { cwd, stripColors: true })
-      .wait('Please select from one of the below mentioned services:')
+      .wait('Select from one of the below mentioned services:')
       .sendCarriageReturn()
       .wait(/.*Select a setting to edit.*/)
       .sendKeyDown(2) // Disable conflict detection
@@ -229,7 +229,7 @@ export function apiDisableDataStore(cwd: string, settings: any) {
 export function updateAPIWithResolutionStrategyWithoutModels(cwd: string, settings: any) {
   return new Promise<void>((resolve, reject) => {
     spawn(getCLIPath(settings.testingWithLatestCodebase), ['update', 'api'], { cwd, stripColors: true })
-      .wait('Please select from one of the below mentioned services:')
+      .wait('Select from one of the below mentioned services:')
       .sendCarriageReturn()
       .wait(/.*Select a setting to edit.*/)
       .sendKeyDown()
@@ -252,7 +252,7 @@ export function updateAPIWithResolutionStrategyWithoutModels(cwd: string, settin
 export function updateAPIWithResolutionStrategyWithModels(cwd: string, settings: any) {
   return new Promise<void>((resolve, reject) => {
     spawn(getCLIPath(settings.testingWithLatestCodebase), ['update', 'api'], { cwd, stripColors: true })
-      .wait('Please select from one of the below mentioned services:')
+      .wait('Select from one of the below mentioned services:')
       .sendCarriageReturn()
       .wait(/.*Select a setting to edit.*/)
       .sendKeyDown()
@@ -277,7 +277,7 @@ export function updateAPIWithResolutionStrategyWithModels(cwd: string, settings:
 export function updateAPIWithResolutionStrategy(cwd: string, settings: any) {
   return new Promise<void>((resolve, reject) => {
     spawn(getCLIPath(settings.testingWithLatestCodebase), ['update', 'api'], { cwd, stripColors: true })
-      .wait('Please select from one of the below mentioned services:')
+      .wait('Select from one of the below mentioned services:')
       .sendCarriageReturn()
       .wait('Select from the options below')
       .sendCarriageReturn()
@@ -317,7 +317,7 @@ export function addRestApi(cwd: string, settings: any) {
     } else {
       const isFirstRestApi = settings.isFirstRestApi ?? true;
       let chain = spawn(getCLIPath(), ['add', 'api'], { cwd, stripColors: true })
-        .wait('Please select from one of the below mentioned services')
+        .wait('Select from one of the below mentioned services')
         .send(KEY_DOWN_ARROW)
         .sendCarriageReturn(); // REST
 
@@ -439,7 +439,7 @@ export function addApi(projectDir: string, settings?: any) {
   let authTypesToSelectFrom = allAuthTypes.slice();
   return new Promise<void>((resolve, reject) => {
     let chain = spawn(getCLIPath(defaultOptions.testingWithLatestCodebase), ['add', 'api'], { cwd: projectDir, stripColors: true })
-      .wait('Please select from one of the below mentioned services:')
+      .wait('Select from one of the below mentioned services:')
       .sendCarriageReturn();
 
     if (settings && Object.keys(settings).length > 0) {
@@ -557,7 +557,7 @@ function setupOIDC(chain: any, settings?: any) {
 export function addApiWithCognitoUserPoolAuthTypeWhenAuthExists(projectDir: string) {
   return new Promise<void>((resolve, reject) => {
     spawn(getCLIPath(defaultOptions.testingWithLatestCodebase), ['add', 'api'], { cwd: projectDir, stripColors: true })
-      .wait('Please select from one of the below mentioned services:')
+      .wait('Select from one of the below mentioned services:')
       .sendCarriageReturn()
       .wait(/.*Here is the GraphQL API that we will create. Select a setting to edit or continue.*/)
       .sendKeyUp(2)
@@ -587,7 +587,7 @@ export function addApiWithCognitoUserPoolAuthTypeWhenAuthExists(projectDir: stri
 export function addRestContainerApi(projectDir: string) {
   return new Promise<void>((resolve, reject) => {
     spawn(getCLIPath(), ['add', 'api'], { cwd: projectDir, stripColors: true })
-      .wait('Please select from one of the below mentioned services:')
+      .wait('Select from one of the below mentioned services:')
       .sendKeyDown()
       .sendCarriageReturn()
       .wait('Which service would you like to use')
@@ -628,7 +628,7 @@ export function rebuildApi(projDir: string, apiName: string) {
 export function addRestContainerApiForCustomPolicies(projectDir: string, settings: { name: string }) {
   return new Promise<void>((resolve, reject) => {
     spawn(getCLIPath(), ['add', 'api'], { cwd: projectDir, stripColors: true })
-      .wait('Please select from one of the below mentioned services:')
+      .wait('Select from one of the below mentioned services:')
       .sendKeyDown()
       .sendCarriageReturn()
       .wait('Which service would you like to use')

packages/amplify-codegen-e2e-tests/package.json

@@ -42,8 +42,8 @@
     "ts-node": "^8.9.0"
   },
   "peerDependencies": {
-    "amplify-cli-core": "^1.18.1",
-    "graphql-transformer-core": "^6.27.0"
+    "amplify-cli-core": "^2.3.0",
+    "graphql-transformer-core": "^7.2.1"
   },
   "jest": {
     "verbose": false,

packages/amplify-codegen/package.json

@@ -40,8 +40,8 @@
     "slash": "^3.0.0"
   },
   "peerDependencies": {
-    "amplify-cli-core": "^1.17.2",
-    "graphql-transformer-core": "^6.26.2"
+    "amplify-cli-core": "^2.3.0",
+    "graphql-transformer-core": "^7.2.1"
   },
   "jest": {
     "collectCoverage": true,

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;
         }

packages/graphql-types-generator/package.json

@@ -74,8 +74,7 @@
     ],
     "testMatch": [
       "**/test/**/*.(js|ts)",
-      "**/test/*.(js|ts)",
-      "**/__tests__/*.(js|ts)"
+      "**/test/*.(js|ts)"
     ],
     "testPathIgnorePatterns": [
       "<rootDir>/node_modules/",