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

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

@@ -37,4 +37,33 @@ describe('ModelTransformer: ', () => {
     expect(postStack).toMatchSnapshot();
     expect(commentStack).toMatchSnapshot();
   });
+
+  it('should not override model objects when override file does not exist', () => {
+    const validSchema = `
+      type Post @model {
+        id: ID!
+        comments: [Comment]
+      }
+      type Comment @model{
+        id: String!
+        text: String!
+      }
+    `;
+    const transformer = new GraphQLTransform({
+      transformers: [new ModelTransformer()],
+      overrideConfig: {
+        overrideDir: path.join(__dirname, 'non-existing-override-directory'),
+        overrideFlag: true,
+        resourceName: 'myResource',
+      },
+      featureFlags,
+    });
+    const out = transformer.transform(validSchema);
+    expect(out).toBeDefined();
+    const postStack = out.stacks.Post;
+    const commentStack = out.stacks.Comment;
+
+    expect(postStack).toMatchSnapshot();
+    expect(commentStack).toMatchSnapshot();
+  });
 });

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({