Merge remote-tracking branch 'origin/manyToMany-fix' into manyToMany-fix

Author: marcvberg

packages/amplify-codegen/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.26.9](https://github.com/aws-amplify/amplify-codegen/compare/[email protected]@2.26.9) (2021-10-27)
+
+**Note:** Version bump only for package amplify-codegen
+
+
+
+
+
+## [2.26.8](https://github.com/aws-amplify/amplify-codegen/compare/[email protected]@2.26.8) (2021-10-21)
+
+**Note:** Version bump only for package amplify-codegen
+
+
+
+
+
 ## [2.26.7](https://github.com/aws-amplify/amplify-codegen/compare/[email protected]@2.26.7) (2021-10-05)
 
 **Note:** Version bump only for package amplify-codegen

packages/amplify-codegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplify-codegen",
-  "version": "2.26.7",
+  "version": "2.26.9",
   "description": "amplify code generator",
   "repository": {
     "type": "git",
@@ -20,9 +20,9 @@
     "test-watch": "jest --watch"
   },
   "dependencies": {
-    "@aws-amplify/appsync-modelgen-plugin": "1.29.0",
-    "@aws-amplify/graphql-docs-generator": "2.3.4",
-    "@aws-amplify/graphql-types-generator": "2.8.2",
+    "@aws-amplify/appsync-modelgen-plugin": "1.29.1",
+    "@aws-amplify/graphql-docs-generator": "2.4.0",
+    "@aws-amplify/graphql-types-generator": "2.8.3",
     "@graphql-codegen/core": "1.8.3",
     "amplify-codegen-appsync-model-plugin": "^1.22.3",
     "amplify-graphql-docs-generator": "^2.2.1",

packages/amplify-codegen/src/walkthrough/questions/maxDepth.js

@@ -2,7 +2,7 @@ const inquirer = require('inquirer');
 
 const constants = require('../../constants');
 
-async function askMaxDepth(defaultDepth = 3) {
+async function askMaxDepth(defaultDepth = 2) {
   const answer = await inquirer.prompt([
     {
       name: 'maxDepth',

packages/appsync-modelgen-plugin/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.29.1](https://github.com/aws-amplify/amplify-codegen/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2021-10-21)
+
+
+### Bug Fixes
+
+* **appsync-modelgen-plugin:** non model type with id field in java ([#260](https://github.com/aws-amplify/amplify-codegen/issues/260)) ([186f8cd](https://github.com/aws-amplify/amplify-codegen/commit/186f8cdc6be4657e8dc061ee19430d0dccbaebdb))
+
+
+
+
+
 # [1.29.0](https://github.com/aws-amplify/amplify-codegen/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2021-10-05)
 
 

packages/appsync-modelgen-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/appsync-modelgen-plugin",
-  "version": "1.29.0",
+  "version": "1.29.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/aws-amplify/amplify-codegen.git",

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

@@ -2605,6 +2605,125 @@ public final class Location {
 "
 `;
 
+exports[`AppSyncModelVisitor Non model type should generate class for non model types with id field 1`] = `
+"package com.amplifyframework.datastore.generated.model;
+
+
+import androidx.core.util.ObjectsCompat;
+
+import java.util.Objects;
+import java.util.List;
+
+/** This is an auto generated class representing the Reference type in your schema. */
+public final class Reference {
+  private final String id;
+  private final ReferenceIdTypeEnum idType;
+  public String getId() {
+      return id;
+  }
+  
+  public ReferenceIdTypeEnum getIdType() {
+      return idType;
+  }
+  
+  private Reference(String id, ReferenceIdTypeEnum idType) {
+    this.id = id;
+    this.idType = idType;
+  }
+  
+  @Override
+   public boolean equals(Object obj) {
+      if (this == obj) {
+        return true;
+      } else if(obj == null || getClass() != obj.getClass()) {
+        return false;
+      } else {
+      Reference reference = (Reference) obj;
+      return ObjectsCompat.equals(getId(), reference.getId()) &&
+              ObjectsCompat.equals(getIdType(), reference.getIdType());
+      }
+  }
+  
+  @Override
+   public int hashCode() {
+    return new StringBuilder()
+      .append(getId())
+      .append(getIdType())
+      .toString()
+      .hashCode();
+  }
+  
+  public static IdStep builder() {
+      return new Builder();
+  }
+  
+  public CopyOfBuilder copyOfBuilder() {
+    return new CopyOfBuilder(id,
+      idType);
+  }
+  public interface IdStep {
+    IdTypeStep id(String id);
+  }
+  
+
+  public interface IdTypeStep {
+    BuildStep idType(ReferenceIdTypeEnum idType);
+  }
+  
+
+  public interface BuildStep {
+    Reference build();
+  }
+  
+
+  public static class Builder implements IdStep, IdTypeStep, BuildStep {
+    private String id;
+    private ReferenceIdTypeEnum idType;
+    @Override
+     public Reference build() {
+        
+        return new Reference(
+          id,
+          idType);
+    }
+    
+    @Override
+     public IdTypeStep id(String id) {
+        Objects.requireNonNull(id);
+        this.id = id;
+        return this;
+    }
+    
+    @Override
+     public BuildStep idType(ReferenceIdTypeEnum idType) {
+        Objects.requireNonNull(idType);
+        this.idType = idType;
+        return this;
+    }
+  }
+  
+
+  public final class CopyOfBuilder extends Builder {
+    private CopyOfBuilder(String id, ReferenceIdTypeEnum idType) {
+      super.id(id)
+        .idType(idType);
+    }
+    
+    @Override
+     public CopyOfBuilder id(String id) {
+      return (CopyOfBuilder) super.id(id);
+    }
+    
+    @Override
+     public CopyOfBuilder idType(ReferenceIdTypeEnum idType) {
+      return (CopyOfBuilder) super.idType(idType);
+    }
+  }
+  
+}
+"
+`;
+
 exports[`AppSyncModelVisitor One to Many connection with no nullable and non nullable fields should generate class for many side of the connection 1`] = `
 "package com.amplifyframework.datastore.generated.model;
 

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

@@ -9,19 +9,37 @@ const buildSchemaWithDirectives = (schema: String): GraphQLSchema => {
   return buildSchema([schema, directives, scalars].join('\n'));
 };
 
-const getVisitor = (schema: string, selectedType?: string, generate: CodeGenGenerateEnum = CodeGenGenerateEnum.code, transformerVersion: number = 1) => {
+
+const getVisitor = (
+  schema: string,
+  selectedType?: string,
+  generate: CodeGenGenerateEnum = CodeGenGenerateEnum.code,
+  transformerVersion: number = 1,
+) => {
   const ast = parse(schema);
   const builtSchema = buildSchemaWithDirectives(schema);
   const visitor = new AppSyncModelJavaVisitor(
     builtSchema,
-    { directives, target: 'android', generate, scalars: JAVA_SCALAR_MAP, isTimestampFieldsAdded: true, handleListNullabilityTransparently: true, transformerVersion: transformerVersion },
+    {
+      directives,
+      target: 'android',
+      generate,
+      scalars: JAVA_SCALAR_MAP,
+      isTimestampFieldsAdded: true,
+      handleListNullabilityTransparently: true,
+      transformerVersion: transformerVersion,
+    },
     { selectedType },
   );
   visit(ast, { leave: visitor });
   return visitor;
 };
 
-const getVisitorPipelinedTransformer = (schema: string, selectedType?: string, generate: CodeGenGenerateEnum = CodeGenGenerateEnum.code) => {
+const getVisitorPipelinedTransformer = (
+  schema: string,
+  selectedType?: string,
+  generate: CodeGenGenerateEnum = CodeGenGenerateEnum.code,
+) => {
   return getVisitor(schema, selectedType, generate, 2);
 };
 
@@ -98,7 +116,7 @@ describe('AppSyncModelVisitor', () => {
   it('Should generate a class a model with all optional fields except id field', () => {
     const schema = /* GraphQL */ `
       type SimpleModel @model {
-        id: ID!,
+        id: ID!
         name: String
         bar: String
       }
@@ -196,23 +214,23 @@ describe('AppSyncModelVisitor', () => {
   describe('vNext transformer feature parity tests', () => {
     it('should produce the same result for @primaryKey as the primary key variant of @key', async () => {
       const schemaV1 = /* GraphQL */ `
-      type authorBook @model @key(fields: ["author_id"]) {
-        id: ID!
-        author_id: ID!
-        book_id: ID!
-        author: String
-        book: String
-      }
-    `;
+        type authorBook @model @key(fields: ["author_id"]) {
+          id: ID!
+          author_id: ID!
+          book_id: ID!
+          author: String
+          book: String
+        }
+      `;
       const schemaV2 = /* GraphQL */ `
-      type authorBook @model {
-        id: ID!
-        author_id: ID! @primaryKey
-        book_id: ID!
-        author: String
-        book: String
-      }
-    `;
+        type authorBook @model {
+          id: ID!
+          author_id: ID! @primaryKey
+          book_id: ID!
+          author: String
+          book: String
+        }
+      `;
       const visitorV1 = getVisitor(schemaV1, 'authorBook');
       const visitorV2 = getVisitorPipelinedTransformer(schemaV2, 'authorBook');
       const version1Code = visitorV1.generate();
@@ -223,23 +241,23 @@ describe('AppSyncModelVisitor', () => {
 
     it('should produce the same result for @index as the secondary index variant of @key', async () => {
       const schemaV1 = /* GraphQL */ `
-      type authorBook @model @key(fields: ["id"]) @key(name: "authorSecondary", fields: ["author_id", "author"]) {
-        id: ID!
-        author_id: ID!
-        book_id: ID!
-        author: String
-        book: String
-      }
-    `;
+        type authorBook @model @key(fields: ["id"]) @key(name: "authorSecondary", fields: ["author_id", "author"]) {
+          id: ID!
+          author_id: ID!
+          book_id: ID!
+          author: String
+          book: String
+        }
+      `;
       const schemaV2 = /* GraphQL */ `
-      type authorBook @model {
-        id: ID! @primaryKey
-        author_id: ID! @index(name: "authorSecondary", sortKeyFields: ["author"])
-        book_id: ID!
-        author: String
-        book: String
-      }
-    `;
+        type authorBook @model {
+          id: ID! @primaryKey
+          author_id: ID! @index(name: "authorSecondary", sortKeyFields: ["author"])
+          book_id: ID!
+          author: String
+          book: String
+        }
+      `;
       const visitorV1 = getVisitor(schemaV1, 'authorBook');
       const visitorV2 = getVisitorPipelinedTransformer(schemaV2, 'authorBook');
       const version1Code = visitorV1.generate();
@@ -260,9 +278,7 @@ describe('AppSyncModelVisitor', () => {
         name: String
       }
 
-      type ListContainer
-      @model
-      {
+      type ListContainer @model {
         id: ID!
         name: String
         list: [Int]
@@ -383,11 +399,11 @@ describe('AppSyncModelVisitor', () => {
 
     it('should generate class with non-default providers', () => {
       const schema = /* GraphQL */ `
-        type Employee @model @auth(rules: [{ allow: owner }, { allow: private, provider:"iam" } ]) {
+        type Employee @model @auth(rules: [{ allow: owner }, { allow: private, provider: "iam" }]) {
           id: ID!
           name: String!
           address: String!
-          ssn: String @auth(rules: [{ allow: groups, provider:"oidc", groups: ["Admins"] }])
+          ssn: String @auth(rules: [{ allow: groups, provider: "oidc", groups: ["Admins"] }])
         }
       `;
       const visitor = getVisitor(schema, 'Employee');
@@ -453,6 +469,16 @@ describe('AppSyncModelVisitor', () => {
         lang: String!
       }
     `;
+    const nonModelwithIdSchema = /* GraphQL */ `
+      enum ReferenceIdTypeEnum {
+        ASIN
+        OBJECT_ID
+      }
+      type Reference {
+        id: String!
+        idType: ReferenceIdTypeEnum!
+      }
+    `;
     it('should generate class for non model types', () => {
       const visitor = getVisitor(schema, 'Location');
       const generatedCode = visitor.generate();
@@ -465,6 +491,12 @@ describe('AppSyncModelVisitor', () => {
       expect(() => validateJava(generatedCode)).not.toThrow();
       expect(generatedCode).toMatchSnapshot();
     });
+    it('should generate class for non model types with id field', () => {
+      const visitor = getVisitor(nonModelwithIdSchema, 'Reference');
+      const generatedCode = visitor.generate();
+      expect(() => validateJava(generatedCode)).not.toThrow();
+      expect(generatedCode).toMatchSnapshot();
+    });
   });
 
   it('should generate Temporal type for AWSDate* scalars', () => {