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

package/rds-patching-lambda/node_modules/.package-lock.json

@@ -1076,9 +1076,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.4.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.9.tgz",
-      "integrity": "sha512-8e2HYcg7ohnTUbHk8focoklEQYvemQmu9M/f43DZVx43kHn0tE3BY/6gSDxS7k0SprtS0NHvj+L80cGLnoOUcQ==",
+      "version": "20.5.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.7.tgz",
+      "integrity": "sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==",
       "dev": true
     },
     "node_modules/ansi-regex": {
@@ -1106,16 +1106,16 @@
       }
     },
     "node_modules/archiver": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz",
-      "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz",
+      "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==",
       "dev": true,
       "dependencies": {
         "archiver-utils": "^2.1.0",
-        "async": "^3.2.3",
+        "async": "^3.2.4",
         "buffer-crc32": "^0.2.1",
         "readable-stream": "^3.6.0",
-        "readdir-glob": "^1.0.0",
+        "readdir-glob": "^1.1.2",
         "tar-stream": "^2.2.0",
         "zip-stream": "^4.1.0"
       },
@@ -1761,9 +1761,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/typescript": {
       "version": "5.1.3",

package/rds-patching-lambda/node_modules/@types/node/README.md

@@ -8,7 +8,7 @@ This package contains type definitions for Node.js (https://nodejs.org/).
 Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node.
 
 ### Additional Details
- * Last updated: Tue, 08 Aug 2023 20:32:42 GMT
+ * Last updated: Mon, 28 Aug 2023 00:33:00 GMT
  * Dependencies: none
  * Global values: `AbortController`, `AbortSignal`, `__dirname`, `__filename`, `console`, `exports`, `gc`, `global`, `module`, `process`, `require`, `structuredClone`
 

package/rds-patching-lambda/node_modules/@types/node/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@types/node",
-    "version": "20.4.9",
+    "version": "20.5.7",
     "description": "TypeScript definitions for Node.js",
     "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node",
     "license": "MIT",
@@ -227,6 +227,6 @@
     },
     "scripts": {},
     "dependencies": {},
-    "typesPublisherContentHash": "b2f4c2c06161f1c6a01968b024abf85b1541142467b4d7a7fe451165a706da3f",
+    "typesPublisherContentHash": "3c31754d724881876a0bd7b216ddce3840ec052e1944538329b9271e525d425c",
     "typeScriptVersion": "4.3"
 }

package/rds-patching-lambda/node_modules/archiver/CHANGELOG.md

@@ -1,5 +1,23 @@
 ## Changelog
 
+**5.3.2** - <small>_August 16, 2023_</small> — [Diff](https://github.com/archiverjs/node-archiver/compare/5.3.1...5.3.2)
+
+Maintenance 
+
+- test: run tests against node 18 @yharaskrik (#637)
+
+Dependency updates
+
+- Bump release-drafter/release-drafter from 5.19.0 to 5.23.0 @dependabot (#652)
+- Bump actions/setup-node from 3.1.1 to 3.6.0 @dependabot (#638)
+- Bump chai from 4.3.6 to 4.3.7 @dependabot (#627)
+- Bump mkdirp from 1.0.4 to 2.1.5 @dependabot (#657)
+- Bump rimraf from 3.0.2 to 4.3.1 @dependabot (#660)
+- Bump tar from 6.1.11 to 6.1.13 @dependabot (#631)
+- Bump readdir-glob from 1.1.1 to 1.1.2 @dependabot (#604)
+- Bump minimatch from 3.0.4 to 3.1.2 @dependabot (#669)
+- Bump async from 3.2.3 to 3.2.4 @dependabot (#596)
+
 **5.3.1** - <small>_April 15, 2022_</small> — [Diff](https://github.com/archiverjs/node-archiver/compare/5.3.0...5.3.1)
 
 Maintenance

package/rds-patching-lambda/node_modules/archiver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "archiver",
-  "version": "5.3.1",
+  "version": "5.3.2",
   "description": "a streaming interface for archive generation",
   "homepage": "https://github.com/archiverjs/node-archiver",
   "author": {
@@ -29,22 +29,22 @@
   },
   "dependencies": {
     "archiver-utils": "^2.1.0",
-    "async": "^3.2.3",
+    "async": "^3.2.4",
     "buffer-crc32": "^0.2.1",
     "readable-stream": "^3.6.0",
-    "readdir-glob": "^1.0.0",
+    "readdir-glob": "^1.1.2",
     "tar-stream": "^2.2.0",
     "zip-stream": "^4.1.0"
   },
   "devDependencies": {
     "archiver-jsdoc-theme": "^1.1.3",
-    "chai": "^4.2.0",
+    "chai": "^4.3.7",
     "jsdoc": "^3.6.4",
-    "mkdirp": "^1.0.4",
+    "mkdirp": "^2.1.5",
     "mocha": "^9.0.2",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4.3.1",
     "stream-bench": "^0.1.2",
-    "tar": "^6.1.11",
+    "tar": "^6.1.13",
     "yauzl": "^2.9.0"
   },
   "keywords": [

package/rds-patching-lambda/node_modules/tslib/package.json

@@ -2,7 +2,7 @@
     "name": "tslib",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "2.6.1",
+    "version": "2.6.2",
     "license": "0BSD",
     "description": "Runtime library for TypeScript helper functions",
     "keywords": [
@@ -29,7 +29,7 @@
     "exports": {
         ".": {
             "module": {
-                "types": "./tslib/modules/index.d.ts",
+                "types": "./modules/index.d.ts",
                 "default": "./tslib.es6.mjs"
             },
             "import": {

package/rds-patching-lambda/package-lock.json

@@ -1089,9 +1089,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.4.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.9.tgz",
-      "integrity": "sha512-8e2HYcg7ohnTUbHk8focoklEQYvemQmu9M/f43DZVx43kHn0tE3BY/6gSDxS7k0SprtS0NHvj+L80cGLnoOUcQ==",
+      "version": "20.5.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.7.tgz",
+      "integrity": "sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==",
       "dev": true
     },
     "node_modules/ansi-regex": {
@@ -1119,16 +1119,16 @@
       }
     },
     "node_modules/archiver": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz",
-      "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz",
+      "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==",
       "dev": true,
       "dependencies": {
         "archiver-utils": "^2.1.0",
-        "async": "^3.2.3",
+        "async": "^3.2.4",
         "buffer-crc32": "^0.2.1",
         "readable-stream": "^3.6.0",
-        "readdir-glob": "^1.0.0",
+        "readdir-glob": "^1.1.2",
         "tar-stream": "^2.2.0",
         "zip-stream": "^4.1.0"
       },
@@ -1774,9 +1774,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/typescript": {
       "version": "5.1.3",

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'