@aws-amplify/graphql-model-transformer 2.1.1 → 2.1.2

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

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ModelTransformer:  should filter known input types from create and update input fields 1`] = `
+exports[`ModelTransformer: should filter known input types from create and update input fields 1`] = `
 "type Test {
   id: ID!
   email: Email
@@ -285,7 +285,7 @@ input ModelSubscriptionEmailFilterInput {
 "
 `;
 
-exports[`ModelTransformer:  should generate enum input objects 1`] = `
+exports[`ModelTransformer: should generate enum input objects 1`] = `
 "type Post {
   id: ID!
   title: String!
@@ -810,7 +810,7 @@ input ModelSubscriptionCommentFilterInput {
 "
 `;
 
-exports[`ModelTransformer:  should generate sync resolver with ConflictHandlerType.Automerge 1`] = `
+exports[`ModelTransformer: should generate sync resolver with ConflictHandlerType.Automerge 1`] = `
 Object {
   "Mutation.createPost.init.1.req.vtl": "## [Start] Initialization default values. **
 $util.qr($ctx.stash.put(\\"defaultValues\\", $util.defaultIfNull($ctx.stash.defaultValues, {})))
@@ -1397,7 +1397,7 @@ $util.toJson(null)
 }
 `;
 
-exports[`ModelTransformer:  should generate sync resolver with ConflictHandlerType.LAMBDA 1`] = `
+exports[`ModelTransformer: should generate sync resolver with ConflictHandlerType.LAMBDA 1`] = `
 Object {
   "Mutation.createPost.init.1.req.vtl": "## [Start] Initialization default values. **
 $util.qr($ctx.stash.put(\\"defaultValues\\", $util.defaultIfNull($ctx.stash.defaultValues, {})))
@@ -1984,7 +1984,7 @@ $util.toJson(null)
 }
 `;
 
-exports[`ModelTransformer:  should generate sync resolver with ConflictHandlerType.Optimistic 1`] = `
+exports[`ModelTransformer: should generate sync resolver with ConflictHandlerType.Optimistic 1`] = `
 Object {
   "Mutation.createPost.init.1.req.vtl": "## [Start] Initialization default values. **
 $util.qr($ctx.stash.put(\\"defaultValues\\", $util.defaultIfNull($ctx.stash.defaultValues, {})))
@@ -2571,7 +2571,7 @@ $util.toJson(null)
 }
 `;
 
-exports[`ModelTransformer:  should have timestamps as nullable fields when the type makes it non-nullable 1`] = `
+exports[`ModelTransformer: should have timestamps as nullable fields when the type makes it non-nullable 1`] = `
 "type Post {
   id: ID!
   str: String
@@ -2810,7 +2810,7 @@ type Subscription {
 "
 `;
 
-exports[`ModelTransformer:  should have timestamps as nullable fields when the type makes it non-nullable 2`] = `
+exports[`ModelTransformer: should have timestamps as nullable fields when the type makes it non-nullable 2`] = `
 "## [Start] Create Request template. **
 #set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
 ## Set the default values to put request **
@@ -2879,7 +2879,7 @@ $util.toJson($PutObject)
 ## [End] Create Request template. **"
 `;
 
-exports[`ModelTransformer:  should have timestamps as nullable fields when the type makes it non-nullable 3`] = `
+exports[`ModelTransformer: should have timestamps as nullable fields when the type makes it non-nullable 3`] = `
 "## [Start] Mutation Update resolver. **
 #set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
 ## Set the default values to put request **
@@ -3013,7 +3013,7 @@ $util.toJson($UpdateItem)
 ## [End] Mutation Update resolver. **"
 `;
 
-exports[`ModelTransformer:  should not add default primary key when ID is defined 1`] = `
+exports[`ModelTransformer: should not add default primary key when ID is defined 1`] = `
 "## [Start] Create Request template. **
 #set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
 ## Set the default values to put request **
@@ -3082,7 +3082,7 @@ $util.toJson($PutObject)
 ## [End] Create Request template. **"
 `;
 
-exports[`ModelTransformer:  should not generate superfluous input and filter types 1`] = `
+exports[`ModelTransformer: should not generate superfluous input and filter types 1`] = `
 "type Entity {
   id: ID!
   str: String
@@ -3246,7 +3246,7 @@ type Query {
 "
 `;
 
-exports[`ModelTransformer:  should not to auto generate createdAt and updatedAt when the type in schema is not AWSDateTime 1`] = `
+exports[`ModelTransformer: should not to auto generate createdAt and updatedAt when the type in schema is not AWSDateTime 1`] = `
 "type Post {
   id: ID!
   str: String
@@ -3485,7 +3485,7 @@ type Subscription {
 "
 `;
 
-exports[`ModelTransformer:  should not to auto generate createdAt and updatedAt when the type in schema is not AWSDateTime 2`] = `
+exports[`ModelTransformer: should not to auto generate createdAt and updatedAt when the type in schema is not AWSDateTime 2`] = `
 "## [Start] Create Request template. **
 #set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
 ## Set the default values to put request **
@@ -3554,7 +3554,7 @@ $util.toJson($PutObject)
 ## [End] Create Request template. **"
 `;
 
-exports[`ModelTransformer:  should not to auto generate createdAt and updatedAt when the type in schema is not AWSDateTime 3`] = `
+exports[`ModelTransformer: should not to auto generate createdAt and updatedAt when the type in schema is not AWSDateTime 3`] = `
 "## [Start] Mutation Update resolver. **
 #set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
 ## Set the default values to put request **
@@ -3688,7 +3688,7 @@ $util.toJson($UpdateItem)
 ## [End] Mutation Update resolver. **"
 `;
 
-exports[`ModelTransformer:  should not to include createdAt and updatedAt field when timestamps is set to null 1`] = `
+exports[`ModelTransformer: should not to include createdAt and updatedAt field when timestamps is set to null 1`] = `
 "type Post {
   id: ID!
   str: String
@@ -3915,7 +3915,7 @@ type Subscription {
 "
 `;
 
-exports[`ModelTransformer:  should not to include createdAt and updatedAt field when timestamps is set to null 2`] = `
+exports[`ModelTransformer: should not to include createdAt and updatedAt field when timestamps is set to null 2`] = `
 "## [Start] Create Request template. **
 #set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
 ## Set the default values to put request **
@@ -3984,7 +3984,7 @@ $util.toJson($PutObject)
 ## [End] Create Request template. **"
 `;
 
-exports[`ModelTransformer:  should not to include createdAt and updatedAt field when timestamps is set to null 3`] = `
+exports[`ModelTransformer: should not to include createdAt and updatedAt field when timestamps is set to null 3`] = `
 "## [Start] Mutation Update resolver. **
 #set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
 ## Set the default values to put request **
@@ -4118,7 +4118,7 @@ $util.toJson($UpdateItem)
 ## [End] Mutation Update resolver. **"
 `;
 
-exports[`ModelTransformer:  should successfully transform simple Embeddable type (non-model) schema 1`] = `
+exports[`ModelTransformer: should successfully transform simple Embeddable type (non-model) schema 1`] = `
 "type NonModelType {
   id: ID!
   title: String!
@@ -4276,7 +4276,7 @@ enum ModelSortDirection {
 "
 `;
 
-exports[`ModelTransformer:  should successfully transform simple non-capitalized Model/Embeddable type (non-model) name schema 1`] = `
+exports[`ModelTransformer: should successfully transform simple non-capitalized Model/Embeddable type (non-model) name schema 1`] = `
 "type modelType {
   id: ID!
   title: String!
@@ -4518,7 +4518,7 @@ type Subscription {
 "
 `;
 
-exports[`ModelTransformer:  should support timestamp parameters when generating resolvers and output schema 1`] = `
+exports[`ModelTransformer: should support timestamp parameters when generating resolvers and output schema 1`] = `
 "type Post {
   id: ID!
   str: String
@@ -4747,7 +4747,7 @@ type Subscription {
 "
 `;
 
-exports[`ModelTransformer:  should support timestamp parameters when generating resolvers and output schema 2`] = `
+exports[`ModelTransformer: should support timestamp parameters when generating resolvers and output schema 2`] = `
 "## [Start] Create Request template. **
 #set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
 ## Set the default values to put request **
@@ -4816,7 +4816,7 @@ $util.toJson($PutObject)
 ## [End] Create Request template. **"
 `;
 
-exports[`ModelTransformer:  should support timestamp parameters when generating resolvers and output schema 3`] = `
+exports[`ModelTransformer: should support timestamp parameters when generating resolvers and output schema 3`] = `
 "## [Start] Mutation Update resolver. **
 #set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
 ## Set the default values to put request **
@@ -4950,7 +4950,7 @@ $util.toJson($UpdateItem)
 ## [End] Mutation Update resolver. **"
 `;
 
-exports[`ModelTransformer:  the datastore table should be configured 1`] = `
+exports[`ModelTransformer: the datastore table should be configured 1`] = `
 "## [Start] Sync Request template. **
 #set( $args = $util.defaultIfNull($ctx.stash.transformedArgs, $ctx.args) )
 #set( $queryFilterContainsAuthField = false )
@@ -5034,7 +5034,7 @@ null
 ## [End] Sync Request template. **"
 `;
 
-exports[`ModelTransformer:  the datastore table should be configured 2`] = `
+exports[`ModelTransformer: the datastore table should be configured 2`] = `
 "## [Start] ResponseTemplate. **
 #if( $ctx.error )
   $util.error($ctx.error.message, $ctx.error.type, $ctx.result)

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

@@ -16,7 +16,7 @@ import {
   verifyMatchingTypes,
 } from './test-utils/helpers';
 
-describe('ModelTransformer: ', () => {
+describe('ModelTransformer:', () => {
   it('should successfully transform simple valid schema', async () => {
     const validSchema = `
       type Post @model {
@@ -603,7 +603,7 @@ describe('ModelTransformer: ', () => {
     expect(verifyInputCount(parsed, 'TagInput', 1)).toBeTruthy();
   });
 
-  it('it should generate filter inputs', () => {
+  it('should generate filter inputs', () => {
     const validSchema = `
       type Post @model {
           id: ID!

package/src/graphql-model-transformer.ts

@@ -698,7 +698,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       }
       case SubscriptionFieldType.ON_CREATE:
       case SubscriptionFieldType.ON_DELETE:
-      case SubscriptionFieldType.ON_UPDATE:
+      case SubscriptionFieldType.ON_UPDATE: {
         const filterInputName = toPascalCase(['ModelSubscription', type.name.value, 'FilterInput']);
         const filterInputs = createEnumModelFilters(ctx, type);
         filterInputs.push(makeSubscriptionQueryFilterInput(ctx, filterInputName, type));
@@ -710,6 +710,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
         });
 
         return [makeInputValueDefinition('filter', makeNamedType(filterInputName))];
+      }
 
       default:
         throw new Error('Unknown operation type');

package/src/resources/rds-model-resource-generator.ts

@@ -1,6 +1,6 @@
 import { MYSQL_DB_TYPE, RDSConnectionSecrets } from '@aws-amplify/graphql-transformer-core';
 import { TransformerContextProvider } from '@aws-amplify/graphql-transformer-interfaces';
-import { Topic } from 'aws-cdk-lib/aws-sns';
+import { Topic, SubscriptionFilter } from 'aws-cdk-lib/aws-sns';
 import { LambdaSubscription } from 'aws-cdk-lib/aws-sns-subscriptions';
 import { ResourceConstants } from 'graphql-transformer-common';
 import { ModelVTLGenerator, RDSModelVTLGenerator } from '../resolvers';
@@ -13,7 +13,6 @@ import {
 } from '../resolvers/rds';
 import { ModelResourceGenerator } from './model-resource-generator';
 import { Fn } from 'aws-cdk-lib';
-import { SubscriptionFilter } from 'aws-cdk-lib/aws-sns';
 
 export const RDS_STACK_NAME = 'RdsApiStack';
 // Beta SNS topic - 'arn:aws:sns:us-east-1:956468067974:AmplifyRDSLayerNotification'