@aws-amplify/graphql-model-transformer 1.3.7 → 1.3.8

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

@@ -70,17 +70,17 @@ describe('ModelTransformer: ', () => {
       resolverConfig: {
         project: {
           ConflictDetection: 'VERSION',
-          ConflictHandler: ConflictHandlerType.AUTOMERGE
-        }
+          ConflictHandler: ConflictHandlerType.AUTOMERGE,
+        },
       },
     });
     const out = transformer.transform(alsoValidSchema);
     expect(out).toBeDefined();
-    
+
     validateModelSchema(parse(out.schema));
     parse(out.schema);
     expect(out.schema).toMatchSnapshot();
-    expect(out.schema).toContain("input NonModelTypeInput")
+    expect(out.schema).toContain('input NonModelTypeInput');
   });
 
   it('should support custom query overrides', () => {
@@ -111,7 +111,7 @@ describe('ModelTransformer: ', () => {
 
     // This id should always be optional.
     // aka a named type node aka name.value would not be set if it were a non null node
-    const idField = createPostInput!.fields!.find(f => f.name.value === 'id');
+    const idField = createPostInput!.fields!.find((f) => f.name.value === 'id');
     expect((idField!.type as NamedTypeNode).name!.value).toEqual('ID');
     const queryType = getObjectType(parsed, 'Query');
     expect(queryType).toBeDefined();
@@ -120,7 +120,7 @@ describe('ModelTransformer: ', () => {
     const subscriptionType = getObjectType(parsed, 'Subscription');
     expect(subscriptionType).toBeDefined();
     expectFields(subscriptionType!, ['onCreatePost', 'onUpdatePost', 'onDeletePost']);
-    const subField = subscriptionType!.fields!.find(f => f.name.value === 'onCreatePost');
+    const subField = subscriptionType!.fields!.find((f) => f.name.value === 'onCreatePost');
     expect(subField).toBeDefined();
     expect(subField!.directives!.length).toEqual(1);
     expect(subField!.directives![0].name!.value).toEqual('aws_subscribe');
@@ -331,10 +331,10 @@ describe('ModelTransformer: ', () => {
     validateModelSchema(schema);
 
     const createPostInput: InputObjectTypeDefinitionNode = schema.definitions.find(
-      d => d.kind === 'InputObjectTypeDefinition' && d.name.value === 'CreatePostInput',
+      (d) => d.kind === 'InputObjectTypeDefinition' && d.name.value === 'CreatePostInput',
     )! as InputObjectTypeDefinitionNode;
     expect(createPostInput).toBeDefined();
-    const defaultIdField: InputValueDefinitionNode = createPostInput.fields!.find(f => f.name.value === 'id')!;
+    const defaultIdField: InputValueDefinitionNode = createPostInput.fields!.find((f) => f.name.value === 'id')!;
     expect(defaultIdField).toBeDefined();
     expect(getBaseType(defaultIdField.type)).toEqual('ID');
   });
@@ -433,10 +433,10 @@ describe('ModelTransformer: ', () => {
     validateModelSchema(schema);
 
     const createPostInput: InputObjectTypeDefinitionNode = schema.definitions.find(
-      d => d.kind === 'InputObjectTypeDefinition' && d.name.value === 'CreatePostInput',
+      (d) => d.kind === 'InputObjectTypeDefinition' && d.name.value === 'CreatePostInput',
     )! as InputObjectTypeDefinitionNode;
     expect(createPostInput).toBeDefined();
-    const defaultIdField: InputValueDefinitionNode = createPostInput.fields!.find(f => f.name.value === 'id')!;
+    const defaultIdField: InputValueDefinitionNode = createPostInput.fields!.find((f) => f.name.value === 'id')!;
     expect(defaultIdField).toBeDefined();
     expect(getBaseType(defaultIdField.type)).toEqual('Int');
     // It should not add default value for ctx.arg.id as id is of type Int
@@ -723,8 +723,8 @@ describe('ModelTransformer: ', () => {
       resolverConfig: {
         project: {
           ConflictDetection: 'VERSION',
-          ConflictHandler: ConflictHandlerType.AUTOMERGE
-        }
+          ConflictHandler: ConflictHandlerType.AUTOMERGE,
+        },
       },
     });
     const result = transformer.transform(validSchema);
@@ -752,8 +752,8 @@ describe('ModelTransformer: ', () => {
       resolverConfig: {
         project: {
           ConflictDetection: 'VERSION',
-          ConflictHandler: ConflictHandlerType.AUTOMERGE
-        }
+          ConflictHandler: ConflictHandlerType.AUTOMERGE,
+        },
       },
     });
     const result = transformer.transform(validSchema);
@@ -781,8 +781,8 @@ describe('ModelTransformer: ', () => {
       resolverConfig: {
         project: {
           ConflictDetection: 'VERSION',
-          ConflictHandler: ConflictHandlerType.AUTOMERGE
-        }
+          ConflictHandler: ConflictHandlerType.AUTOMERGE,
+        },
       },
     });
 
@@ -809,8 +809,8 @@ describe('ModelTransformer: ', () => {
       resolverConfig: {
         project: {
           ConflictDetection: 'VERSION',
-          ConflictHandler: ConflictHandlerType.AUTOMERGE
-        }
+          ConflictHandler: ConflictHandlerType.AUTOMERGE,
+        },
       },
     });
     const result = transformer.transform(validSchema);
@@ -840,8 +840,8 @@ describe('ModelTransformer: ', () => {
       resolverConfig: {
         project: {
           ConflictDetection: 'VERSION',
-          ConflictHandler: ConflictHandlerType.AUTOMERGE
-        }
+          ConflictHandler: ConflictHandlerType.AUTOMERGE,
+        },
       },
     });
 
@@ -910,8 +910,8 @@ describe('ModelTransformer: ', () => {
       resolverConfig: {
         project: {
           ConflictDetection: 'VERSION',
-          ConflictHandler: ConflictHandlerType.AUTOMERGE
-        }
+          ConflictHandler: ConflictHandlerType.AUTOMERGE,
+        },
       },
     });
     const result = transformer.transform(validSchema);
@@ -1074,42 +1074,41 @@ describe('ModelTransformer: ', () => {
     const subscriptionType = getObjectType(parsed, 'Subscription');
     expect(subscriptionType).toBeDefined();
 
-    subscriptionType!.fields!.forEach(it => {
+    subscriptionType!.fields!.forEach((it) => {
       expect(it.name.value.length <= 50).toBeTruthy();
     });
 
     const iamStackResource = out.stacks.ThisIsAVeryLongNameModelThatShouldNotGenerateIAMRoleNamesOver64Characters;
     expect(iamStackResource).toBeDefined();
-    Template.fromJSON(iamStackResource)
-      .hasResourceProperties('AWS::IAM::Role', {
-        AssumeRolePolicyDocument: {
-          Statement: [
+    Template.fromJSON(iamStackResource).hasResourceProperties('AWS::IAM::Role', {
+      AssumeRolePolicyDocument: {
+        Statement: [
+          {
+            Action: 'sts:AssumeRole',
+            Effect: 'Allow',
+            Principal: {
+              Service: 'appsync.amazonaws.com',
+            },
+          },
+        ],
+        Version: '2012-10-17',
+      },
+      RoleName: {
+        'Fn::Join': [
+          '',
+          [
+            'ThisIsAVeryLongNameM2d9fca-',
             {
-              Action: 'sts:AssumeRole',
-              Effect: 'Allow',
-              Principal: {
-                Service: 'appsync.amazonaws.com',
-              },
+              Ref: 'referencetotransformerrootstackGraphQLAPI20497F53ApiId',
+            },
+            '-',
+            {
+              Ref: 'referencetotransformerrootstackenv10C5A902Ref',
             },
           ],
-          Version: '2012-10-17',
-        },
-        RoleName: {
-          'Fn::Join': [
-            '',
-            [
-              'ThisIsAVeryLongNameM2d9fca-',
-              {
-                Ref: 'referencetotransformerrootstackGraphQLAPI20497F53ApiId',
-              },
-              '-',
-              {
-                Ref: 'referencetotransformerrootstackenv10C5A902Ref',
-              },
-            ],
-          ],
-        },
-      });
+        ],
+      },
+    });
 
     validateModelSchema(parsed);
   });
@@ -1137,7 +1136,7 @@ describe('ModelTransformer: ', () => {
 
     expectFieldsOnInputType(createTodoInput!, ['id', 'name']);
 
-    const idField = createTodoInput!.fields!.find(f => f.name.value === 'id');
+    const idField = createTodoInput!.fields!.find((f) => f.name.value === 'id');
     expect((idField!.type as NamedTypeNode).name!.value).toEqual('ID');
     expect((idField!.type as NamedTypeNode).kind).toEqual('NamedType');
 
@@ -1175,54 +1174,53 @@ describe('ModelTransformer: ', () => {
     expect(out.resolvers['Query.syncTodos.req.vtl']).toMatchSnapshot();
     expect(out.resolvers['Query.syncTodos.res.vtl']).toMatchSnapshot();
     // ds table
-    Template.fromJSON(out.rootStack)
-      .hasResourceProperties('AWS::DynamoDB::Table', {
-        KeySchema: [
-          {
-            AttributeName: 'ds_pk',
-            KeyType: 'HASH',
-          },
-          {
-            AttributeName: 'ds_sk',
-            KeyType: 'RANGE',
-          },
-        ],
-        AttributeDefinitions: [
-          {
-            AttributeName: 'ds_pk',
-            AttributeType: 'S',
-          },
-          {
-            AttributeName: 'ds_sk',
-            AttributeType: 'S',
-          },
-        ],
-        BillingMode: 'PAY_PER_REQUEST',
-        StreamSpecification: {
-          StreamViewType: 'NEW_AND_OLD_IMAGES',
+    Template.fromJSON(out.rootStack).hasResourceProperties('AWS::DynamoDB::Table', {
+      KeySchema: [
+        {
+          AttributeName: 'ds_pk',
+          KeyType: 'HASH',
         },
-        TableName: {
-          'Fn::Join': [
-            '',
-            [
-              'AmplifyDataStore-',
-              {
-                'Fn::GetAtt': ['GraphQLAPI', 'ApiId'],
-              },
-              '-',
-              {
-                Ref: 'env',
-              },
-            ],
-          ],
+        {
+          AttributeName: 'ds_sk',
+          KeyType: 'RANGE',
+        },
+      ],
+      AttributeDefinitions: [
+        {
+          AttributeName: 'ds_pk',
+          AttributeType: 'S',
         },
-        TimeToLiveSpecification: {
-          AttributeName: '_ttl',
-          Enabled: true,
+        {
+          AttributeName: 'ds_sk',
+          AttributeType: 'S',
         },
-      });
+      ],
+      BillingMode: 'PAY_PER_REQUEST',
+      StreamSpecification: {
+        StreamViewType: 'NEW_AND_OLD_IMAGES',
+      },
+      TableName: {
+        'Fn::Join': [
+          '',
+          [
+            'AmplifyDataStore-',
+            {
+              'Fn::GetAtt': ['GraphQLAPI', 'ApiId'],
+            },
+            '-',
+            {
+              Ref: 'env',
+            },
+          ],
+        ],
+      },
+      TimeToLiveSpecification: {
+        AttributeName: '_ttl',
+        Enabled: true,
+      },
+    });
   });
-  it("the conflict detection of per model rule should be respected", () => {
+  it('the conflict detection of per model rule should be respected', () => {
     const validSchema = `
       type Todo @model {
         name: String
@@ -1235,22 +1233,22 @@ describe('ModelTransformer: ', () => {
     const transformer = new GraphQLTransform({
       resolverConfig: {
         project: {
-          ConflictDetection: "VERSION",
-          ConflictHandler: ConflictHandlerType.AUTOMERGE
+          ConflictDetection: 'VERSION',
+          ConflictHandler: ConflictHandlerType.AUTOMERGE,
         },
         models: {
           Todo: {
-            ConflictDetection: "VERSION",
+            ConflictDetection: 'VERSION',
             ConflictHandler: ConflictHandlerType.LAMBDA,
             LambdaConflictHandler: {
-              name: "myTodoConflictHandler"
-            }
+              name: 'myTodoConflictHandler',
+            },
           },
           Author: {
-            ConflictDetection: "VERSION",
-            ConflictHandler: ConflictHandlerType.AUTOMERGE
-          }
-        }
+            ConflictDetection: 'VERSION',
+            ConflictHandler: ConflictHandlerType.AUTOMERGE,
+          },
+        },
       },
       transformers: [new ModelTransformer()],
       transformParameters: {
@@ -1262,49 +1260,42 @@ describe('ModelTransformer: ', () => {
     const schema = parse(out.schema);
     validateModelSchema(schema);
     // nested stacks for models
-    const todoStack = out.stacks["Todo"];
-    const authorStack = out.stacks["Author"];
+    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).hasResourceProperties('AWS::AppSync::FunctionConfiguration', {
+      SyncConfig: {
+        ConflictDetection: 'VERSION',
+        ConflictHandler: 'LAMBDA',
+      },
+    });
     Template.fromJSON(todoStack).resourcePropertiesCountIs(
-      "AWS::AppSync::FunctionConfiguration",
+      'AWS::AppSync::FunctionConfiguration',
       {
         SyncConfig: {
-          ConflictDetection: "VERSION",
-          ConflictHandler: "AUTOMERGE",
-        }
+          ConflictDetection: 'VERSION',
+          ConflictHandler: 'AUTOMERGE',
+        },
       },
-      0
+      0,
     );
     // Author stack should have automerge for conflict detect rather than lambda
     Template.fromJSON(authorStack).resourcePropertiesCountIs(
-      "AWS::AppSync::FunctionConfiguration",
+      'AWS::AppSync::FunctionConfiguration',
       {
         SyncConfig: {
-          ConflictDetection: "VERSION",
-          ConflictHandler: "LAMBDA",
-        }
+          ConflictDetection: 'VERSION',
+          ConflictHandler: 'LAMBDA',
+        },
       },
-      0
+      0,
     );
-    Template.fromJSON(authorStack).hasResourceProperties(
-      "AWS::AppSync::FunctionConfiguration",
-      {
-        SyncConfig: {
-          ConflictDetection: "VERSION",
-          ConflictHandler: "AUTOMERGE",
-        }
-      }
-    );
-
+    Template.fromJSON(authorStack).hasResourceProperties('AWS::AppSync::FunctionConfiguration', {
+      SyncConfig: {
+        ConflictDetection: 'VERSION',
+        ConflictHandler: 'AUTOMERGE',
+      },
+    });
   });
   it('should add the model parameters at the root sack', () => {
     const modelParams = {
@@ -1383,7 +1374,7 @@ describe('ModelTransformer: ', () => {
       transformers: [new ModelTransformer()],
       transformParameters: {
         sandboxModeEnabled: true,
-      }
+      },
     });
     const out = transformer.transform(validSchema);
     expect(out).toBeDefined();
@@ -1394,12 +1385,12 @@ describe('ModelTransformer: ', () => {
     const postType = getObjectType(schema, 'Post')!;
     expect(postType).toBeDefined();
     expect(postType.directives).toBeDefined();
-    expect(postType.directives!.some(dir => dir.name.value === 'aws_api_key')).toEqual(true);
+    expect(postType.directives!.some((dir) => dir.name.value === 'aws_api_key')).toEqual(true);
 
     const tagType = getObjectType(schema, 'Tag')!;
     expect(tagType).toBeDefined();
     expect(tagType.directives).toBeDefined();
-    expect(tagType.directives!.some(dir => dir.name.value === 'aws_api_key')).toEqual(true);
+    expect(tagType.directives!.some((dir) => dir.name.value === 'aws_api_key')).toEqual(true);
 
     // check operations
     const queryType = getObjectType(schema, 'Query')!;
@@ -1410,7 +1401,7 @@ describe('ModelTransformer: ', () => {
     expect(subscriptionType).toBeDefined();
 
     for (const field of [...queryType.fields!, ...mutationType.fields!, ...subscriptionType.fields!]) {
-      expect(field.directives!.some(dir => dir.name.value === 'aws_api_key')).toEqual(true);
+      expect(field.directives!.some((dir) => dir.name.value === 'aws_api_key')).toEqual(true);
     }
   });
 

package/src/__tests__/test-utils/helpers.ts

@@ -43,7 +43,7 @@ export function doNotExpectFields(type: ObjectTypeDefinitionNode, fields: string
 }
 
 export function verifyInputCount(doc: DocumentNode, type: string, count: number): boolean {
-  return doc.definitions.filter(def => def.kind === Kind.INPUT_OBJECT_TYPE_DEFINITION && def.name.value === type).length == count;
+  return doc.definitions.filter((def) => def.kind === Kind.INPUT_OBJECT_TYPE_DEFINITION && def.name.value === type).length == count;
 }
 
 export function getFieldOnInputType(type: InputObjectTypeDefinitionNode, field: string): InputValueDefinitionNode {

package/src/__tests__/test-utils/rds_utils.test.ts

@@ -4,10 +4,7 @@ describe('filterToRdsExpression', () => {
   // QueryGroup - and, or
   it('should convert and: QueryGroup', () => {
     const filter = {
-      and: [
-        { id: { eq: '123' } },
-        { name: { eq: 'Amplify' } },
-      ],
+      and: [{ id: { eq: '123' } }, { name: { eq: 'Amplify' } }],
     };
     const queryExpression = toRDSQueryExpression(filter);
     expect(queryExpression.rawSql).toEqual('((id = ?) AND (name = ?))');
@@ -15,10 +12,7 @@ describe('filterToRdsExpression', () => {
   });
   it('should convert or: QueryGroup', () => {
     const filter = {
-      or: [
-        { id: { eq: '123' } },
-        { name: { eq: 'Amplify' } },
-      ],
+      or: [{ id: { eq: '123' } }, { name: { eq: 'Amplify' } }],
     };
     const queryExpression = toRDSQueryExpression(filter);
     expect(queryExpression.rawSql).toEqual('((id = ?) OR (name = ?))');
@@ -133,13 +127,15 @@ describe('filterToRdsExpression', () => {
     expect(queryExpression.queryParams).toEqual(['123', '18', '60', 'AWS']);
   });
 
-  test('filterToRdsExpression > should throw error if between: doesn\'t have 2 values', () => {
+  test("filterToRdsExpression > should throw error if between: doesn't have 2 values", () => {
     const filter = {
       id: { eq: '123' },
       age: { between: ['18'] },
       org: { ne: 'AWS' },
     };
-    expect(() => { toRDSQueryExpression(filter); }).toThrowError(/between condition must have two values/);
+    expect(() => {
+      toRDSQueryExpression(filter);
+    }).toThrowError(/between condition must have two values/);
   });
 
   // nested QueryGroup & Operators
@@ -148,10 +144,7 @@ describe('filterToRdsExpression', () => {
       and: [
         { id: { eq: '123' } },
         {
-          or: [
-            { name: { eq: 'Amplify' } },
-            { org: { eq: 'AWS' } },
-          ],
+          or: [{ name: { eq: 'Amplify' } }, { org: { eq: 'AWS' } }],
         },
       ],
     };
@@ -165,10 +158,7 @@ describe('filterToRdsExpression', () => {
       or: [
         { id: { eq: '123' } },
         {
-          and: [
-            { name: { eq: 'Amplify' } },
-            { org: { eq: 'AWS' } },
-          ],
+          and: [{ name: { eq: 'Amplify' } }, { org: { eq: 'AWS' } }],
         },
       ],
     };
@@ -181,10 +171,7 @@ describe('filterToRdsExpression', () => {
       and: [
         { id: { eq: '123' } },
         {
-          and: [
-            { name: { eq: 'Amplify' } },
-            { org: { eq: 'AWS' } },
-          ],
+          and: [{ name: { eq: 'Amplify' } }, { org: { eq: 'AWS' } }],
         },
       ],
     };
@@ -201,10 +188,7 @@ describe('filterToRdsExpression', () => {
           or: [
             { name: { eq: 'Amplify' } },
             {
-              and: [
-                { org: { eq: 'AWS' } },
-                { age: { between: ['18', '60'] } },
-              ],
+              and: [{ org: { eq: 'AWS' } }, { age: { between: ['18', '60'] } }],
             },
           ],
         },
@@ -223,11 +207,7 @@ describe('filterToRdsExpression', () => {
           or: [
             { name: { eq: 'Amplify' } },
             {
-              and: [
-                { org: { eq: 'AWS' } },
-                { age: { between: ['18', '60'] } },
-                { name: { beginsWith: 'Amplify' } },
-              ],
+              and: [{ org: { eq: 'AWS' } }, { age: { between: ['18', '60'] } }, { name: { beginsWith: 'Amplify' } }],
             },
           ],
         },
@@ -246,22 +226,17 @@ describe('filterToRdsExpression', () => {
           or: [
             { name: { eq: 'Amplify' } },
             {
-              and: [
-                { org: { ne: 'AWS' } },
-                { age: { between: ['18', '60'] } },
-                { name: { beginsWith: 'Amplify' } },
-              ],
+              and: [{ org: { ne: 'AWS' } }, { age: { between: ['18', '60'] } }, { name: { beginsWith: 'Amplify' } }],
             },
           ],
         },
       ],
-      or: [
-        { name: { eq: 'Amplify' } },
-        { org: { eq: 'AWS' } },
-      ],
+      or: [{ name: { eq: 'Amplify' } }, { org: { eq: 'AWS' } }],
     };
     const queryExpression = toRDSQueryExpression(filter);
-    expect(queryExpression.rawSql).toEqual("(id != ? AND ((name = ?) OR ((org != ?) AND (age BETWEEN ? AND ?) AND (name LIKE '?%'))) AND (name = ?) OR (org = ?))");
+    expect(queryExpression.rawSql).toEqual(
+      "(id != ? AND ((name = ?) OR ((org != ?) AND (age BETWEEN ? AND ?) AND (name LIKE '?%'))) AND (name = ?) OR (org = ?))",
+    );
     expect(queryExpression.queryParams).toEqual(['123', 'Amplify', 'AWS', '18', '60', 'Amplify', 'Amplify', 'AWS']);
   });
 
@@ -271,20 +246,15 @@ describe('filterToRdsExpression', () => {
       or: [
         { name: { eq: 'Amplify' } },
         {
-          and: [
-            { org: { eq: 'AWS' } },
-            { age: { between: ['18', '60'] } },
-            { name: { eq: 'Amplify' } },
-          ],
+          and: [{ org: { eq: 'AWS' } }, { age: { between: ['18', '60'] } }, { name: { eq: 'Amplify' } }],
         },
       ],
-      and: [
-        { name: { eq: 'Amplify' } },
-        { org: { eq: 'AWS' } },
-      ],
+      and: [{ name: { eq: 'Amplify' } }, { org: { eq: 'AWS' } }],
     };
     const queryExpression = toRDSQueryExpression(filter);
-    expect(queryExpression.rawSql).toEqual("(name LIKE '?%' AND (name = ?) OR ((org = ?) AND (age BETWEEN ? AND ?) AND (name = ?)) AND (name = ?) AND (org = ?))");
+    expect(queryExpression.rawSql).toEqual(
+      "(name LIKE '?%' AND (name = ?) OR ((org = ?) AND (age BETWEEN ? AND ?) AND (name = ?)) AND (name = ?) AND (org = ?))",
+    );
     expect(queryExpression.queryParams).toEqual(['A', 'Amplify', 'AWS', '18', '60', 'Amplify', 'Amplify', 'AWS']);
   });
 
@@ -327,9 +297,7 @@ describe('filterToRdsExpression', () => {
 
   it('should work on size: eq: operator along with and: QueryGroup', () => {
     const filter = {
-      and: [
-        { id: { eq: '123', size: { eq: 1 } } },
-      ],
+      and: [{ id: { eq: '123', size: { eq: 1 } } }],
     };
     const queryExpression = toRDSQueryExpression(filter);
     expect(queryExpression.rawSql).toEqual('((id = ? AND LENGTH (id) = ?))');
@@ -338,12 +306,8 @@ describe('filterToRdsExpression', () => {
 
   it('should work on size: eq: operator along with or: QueryGroup', () => {
     const filter = {
-      or: [
-        { id: { eq: '123', size: { eq: 2 } } },
-      ],
-      and: [
-        { age: { eq: '30', size: { eq: 3 } } },
-      ],
+      or: [{ id: { eq: '123', size: { eq: 2 } } }],
+      and: [{ age: { eq: '30', size: { eq: 3 } } }],
     };
     const queryExpression = toRDSQueryExpression(filter);
     expect(queryExpression.rawSql).toEqual('((id = ? AND LENGTH (id) = ?) AND (age = ? AND LENGTH (age) = ?))');
@@ -355,18 +319,15 @@ describe('filterToRdsExpression', () => {
       or: [
         { id: { eq: '123', size: { eq: 2 } } },
         {
-          and: [
-            { age: { eq: '30', size: { eq: 3 } } },
-          ],
+          and: [{ age: { eq: '30', size: { eq: 3 } } }],
         },
       ],
-      and: [
-        { age: { eq: '20', size: { eq: 3 } } },
-        { org: { eq: 'AWS', size: { eq: 3 } } },
-      ],
+      and: [{ age: { eq: '20', size: { eq: 3 } } }, { org: { eq: 'AWS', size: { eq: 3 } } }],
     };
     const queryExpression = toRDSQueryExpression(filter);
-    expect(queryExpression.rawSql).toEqual('((id = ? AND LENGTH (id) = ?) OR ((age = ? AND LENGTH (age) = ?)) AND (age = ? AND LENGTH (age) = ?) AND (org = ? AND LENGTH (org) = ?))');
+    expect(queryExpression.rawSql).toEqual(
+      '((id = ? AND LENGTH (id) = ?) OR ((age = ? AND LENGTH (age) = ?)) AND (age = ? AND LENGTH (age) = ?) AND (org = ? AND LENGTH (org) = ?))',
+    );
     expect(queryExpression.queryParams).toEqual(['123', 2, '30', 3, '20', 3, 'AWS', 3]);
   });
 });