@aws-amplify/graphql-model-transformer 1.1.0-beta.4 → 1.1.0-beta.5

package/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.1.0-beta.5](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-model-transformer@0.16.8...@aws-amplify/graphql-model-transformer@1.1.0-beta.5) (2023-02-15)
+
+### Bug Fixes
+
+- lock CDK v2 version ([#923](https://github.com/aws-amplify/amplify-category-api/issues/923)) ([2afe40c](https://github.com/aws-amplify/amplify-category-api/commit/2afe40cf13e7d1ee7db37988b9b3297768c7bd0a))
+- preserve logical id patterns for dynamodb tables and search domain ([#894](https://github.com/aws-amplify/amplify-category-api/issues/894)) ([7530fc2](https://github.com/aws-amplify/amplify-category-api/commit/7530fc2e9254b621dc3782271318dd3f5c97d2b8))
+
+### Features
+
+- migrate index and model transformers to CDK v2 ([#860](https://github.com/aws-amplify/amplify-category-api/issues/860)) ([886ab6c](https://github.com/aws-amplify/amplify-category-api/commit/886ab6c1eb699f9a09f273c76b3c419c73004f9b))
+
 # [1.1.0-beta.4](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-model-transformer@0.16.7...@aws-amplify/graphql-model-transformer@1.1.0-beta.4) (2023-02-03)
 
 ### Bug Fixes
@@ -64,6 +75,12 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 - migrate index and model transformers to CDK v2 ([#860](https://github.com/aws-amplify/amplify-category-api/issues/860)) ([886ab6c](https://github.com/aws-amplify/amplify-category-api/commit/886ab6c1eb699f9a09f273c76b3c419c73004f9b))
 
+## [0.16.8](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-model-transformer@0.16.7...@aws-amplify/graphql-model-transformer@0.16.8) (2023-02-10)
+
+### Bug Fixes
+
+- **transformer:** conflict detection respects to per model rule ([#1201](https://github.com/aws-amplify/amplify-category-api/issues/1201)) ([9fd7e16](https://github.com/aws-amplify/amplify-category-api/commit/9fd7e166c78c265c704653213adce47a5c8a55f7))
+
 ## [0.16.7](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-model-transformer@0.16.6...@aws-amplify/graphql-model-transformer@0.16.7) (2023-01-26)
 
 **Note:** Version bump only for package @aws-amplify/graphql-model-transformer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-model-transformer",
-  "version": "1.1.0-beta.4",
+  "version": "1.1.0-beta.5",
   "description": "Amplify graphql @model transformer",
   "repository": {
     "type": "git",
@@ -29,14 +29,14 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/graphql-transformer-core": "1.1.0-beta.4",
-    "@aws-amplify/graphql-transformer-interfaces": "2.1.0-beta.4",
+    "@aws-amplify/graphql-transformer-core": "1.1.0-beta.5",
+    "@aws-amplify/graphql-transformer-interfaces": "2.1.0-beta.5",
     "@aws-cdk/aws-appsync-alpha": "~2.53.0-alpha.0",
     "aws-cdk-lib": "~2.53.0",
     "constructs": "^10.0.5",
     "graphql": "^15.5.0",
-    "graphql-mapping-template": "4.20.8-beta.0",
-    "graphql-transformer-common": "4.24.5-beta.0"
+    "graphql-mapping-template": "4.20.8-beta.1",
+    "graphql-transformer-common": "4.24.5-beta.1"
   },
   "devDependencies": {
     "@types/node": "^12.12.6"
@@ -59,5 +59,5 @@
       "overrides"
     ]
   },
-  "gitHead": "eef8ea86c0a38391195853d705acce4d49aa2e0e"
+  "gitHead": "815c7a1f3f5ec7677f7234f2927ef75096ee1c98"
 }

package/src/__tests__/model-transformer.test.ts

@@ -1168,7 +1168,89 @@ describe('ModelTransformer: ', () => {
         },
       });
   });
+  it("the conflict detection of per model rule should be respected", () => {
+    const validSchema = `
+      type Todo @model {
+        name: String
+      }
+      type Author @model {
+        name: String
+      }
+    `;
+
+    const transformer = new GraphQLTransform({
+      transformConfig: {},
+      resolverConfig: {
+        project: {
+          ConflictDetection: "VERSION",
+          ConflictHandler: ConflictHandlerType.AUTOMERGE
+        },
+        models: {
+          Todo: {
+            ConflictDetection: "VERSION",
+            ConflictHandler: ConflictHandlerType.LAMBDA,
+            LambdaConflictHandler: {
+              name: "myTodoConflictHandler"
+            }
+          },
+          Author: {
+            ConflictDetection: "VERSION",
+            ConflictHandler: ConflictHandlerType.AUTOMERGE
+          }
+        }
+      },
+      sandboxModeEnabled: true,
+      transformers: [new ModelTransformer()]
+    });
+    const out = transformer.transform(validSchema);
+    expect(out).toBeDefined();
+    const schema = parse(out.schema);
+    validateModelSchema(schema);
+    // nested stacks for models
+    const todoStack = out.stacks["Todo"];
+    const authorStack = out.stacks["Author"];
+    // Todo stack should have lambda for conflict detect rather than auto merge
+    Template.fromJSON(todoStack).hasResourceProperties(
+      "AWS::AppSync::FunctionConfiguration",
+      {
+        SyncConfig: {
+          ConflictDetection: "VERSION",
+          ConflictHandler: "LAMBDA",
+        }
+      }
+    );
+    Template.fromJSON(todoStack).resourcePropertiesCountIs(
+      "AWS::AppSync::FunctionConfiguration",
+      {
+        SyncConfig: {
+          ConflictDetection: "VERSION",
+          ConflictHandler: "AUTOMERGE",
+        }
+      },
+      0
+    );
+    // Author stack should have automerge for conflict detect rather than lambda
+    Template.fromJSON(authorStack).resourcePropertiesCountIs(
+      "AWS::AppSync::FunctionConfiguration",
+      {
+        SyncConfig: {
+          ConflictDetection: "VERSION",
+          ConflictHandler: "LAMBDA",
+        }
+      },
+      0
+    );
+    Template.fromJSON(authorStack).hasResourceProperties(
+      "AWS::AppSync::FunctionConfiguration",
+      {
+        SyncConfig: {
+          ConflictDetection: "VERSION",
+          ConflictHandler: "AUTOMERGE",
+        }
+      }
+    );
 
+  });
   it('should add the model parameters at the root sack', () => {
     const modelParams = {
       DynamoDBModelTableReadIOPS: expect.objectContaining({