@aws-amplify/graphql-api-construct 1.14.0-gen2-migration-0930.0 → 1.15.0

package/node_modules/graphql-mapping-template/CHANGELOG.md

@@ -3,10 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [5.0.2-gen2-migration-0930.0](https://github.com/aws-amplify/amplify-category-api/compare/graphql-mapping-template@5.0.1...graphql-mapping-template@5.0.2-gen2-migration-0930.0) (2024-09-30)
-
-**Note:** Version bump only for package graphql-mapping-template
-
 ## [5.0.1](https://github.com/aws-amplify/amplify-category-api/compare/graphql-mapping-template@5.0.0...graphql-mapping-template@5.0.1) (2024-09-06)
 
 **Note:** Version bump only for package graphql-mapping-template

package/node_modules/graphql-mapping-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-mapping-template",
-  "version": "5.0.2-gen2-migration-0930.0",
+  "version": "5.0.1",
   "description": "An AST wrapper around AWS AppSync resolvers",
   "repository": {
     "type": "git",
@@ -64,6 +64,5 @@
       "escapeString": true,
       "printBasicPrototype": true
     }
-  },
-  "gitHead": "9747afc0099b5403bfde9d3489c34088eb76b02e"
+  }
 }

package/node_modules/graphql-transformer-common/CHANGELOG.md

@@ -3,16 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [5.1.0-gen2-migration-0930.0](https://github.com/aws-amplify/amplify-category-api/compare/graphql-transformer-common@5.0.1...graphql-transformer-common@5.1.0-gen2-migration-0930.0) (2024-09-30)
-
-### Features
-
-- get datasource map for migration ([#2668](https://github.com/aws-amplify/amplify-category-api/issues/2668)) ([02c7da0](https://github.com/aws-amplify/amplify-category-api/commit/02c7da0da0d5837ca05a8e4ff1b1536cc20ae15b))
-
-### Reverts
-
-- Revert "feat: get datasource map for migration (#2668)" (#2907) ([2b17871](https://github.com/aws-amplify/amplify-category-api/commit/2b17871b600dbfa6d911057c30498f7df6a7e8dc)), closes [#2668](https://github.com/aws-amplify/amplify-category-api/issues/2668) [#2907](https://github.com/aws-amplify/amplify-category-api/issues/2907)
-
 ## [5.0.1](https://github.com/aws-amplify/amplify-category-api/compare/graphql-transformer-common@5.0.0...graphql-transformer-common@5.0.1) (2024-09-06)
 
 **Note:** Version bump only for package graphql-transformer-common

package/node_modules/graphql-transformer-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-transformer-common",
-  "version": "5.1.0-gen2-migration-0930.0",
+  "version": "5.0.1",
   "description": "Common code and constants for AppSync Transformers",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "graphql": "^15.5.0",
-    "graphql-mapping-template": "5.0.2-gen2-migration-0930.0",
+    "graphql-mapping-template": "5.0.1",
     "md5": "^2.2.1",
     "pluralize": "8.0.0"
   },
@@ -72,6 +72,5 @@
       "escapeString": true,
       "printBasicPrototype": true
     }
-  },
-  "gitHead": "9747afc0099b5403bfde9d3489c34088eb76b02e"
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-api-construct",
-  "version": "1.14.0-gen2-migration-0930.0",
+  "version": "1.15.0",
   "description": "AppSync GraphQL Api Construct using Amplify GraphQL Transformer.",
   "repository": {
     "type": "git",
@@ -158,26 +158,26 @@
     "semver"
   ],
   "dependencies": {
-    "@aws-amplify/ai-constructs": "^0.1.4",
+    "@aws-amplify/ai-constructs": "^0.2.0",
     "@aws-amplify/backend-output-schemas": "^1.0.0",
     "@aws-amplify/backend-output-storage": "^1.0.0",
-    "@aws-amplify/graphql-auth-transformer": "4.1.2-gen2-migration-0930.0",
-    "@aws-amplify/graphql-conversation-transformer": "0.2.2-gen2-migration-0930.0",
-    "@aws-amplify/graphql-default-value-transformer": "3.0.4-gen2-migration-0930.0",
-    "@aws-amplify/graphql-directives": "2.3.0-gen2-migration-0930.0",
-    "@aws-amplify/graphql-function-transformer": "3.1.1-gen2-migration-0930.0",
-    "@aws-amplify/graphql-generation-transformer": "0.2.2-gen2-migration-0930.0",
-    "@aws-amplify/graphql-http-transformer": "3.0.4-gen2-migration-0930.0",
-    "@aws-amplify/graphql-index-transformer": "3.0.4-gen2-migration-0930.0",
-    "@aws-amplify/graphql-maps-to-transformer": "4.0.4-gen2-migration-0930.0",
-    "@aws-amplify/graphql-model-transformer": "3.1.0-gen2-migration-0930.0",
-    "@aws-amplify/graphql-predictions-transformer": "3.0.4-gen2-migration-0930.0",
-    "@aws-amplify/graphql-relational-transformer": "3.1.0-gen2-migration-0930.0",
-    "@aws-amplify/graphql-searchable-transformer": "3.0.4-gen2-migration-0930.0",
-    "@aws-amplify/graphql-sql-transformer": "0.4.4-gen2-migration-0930.0",
-    "@aws-amplify/graphql-transformer": "2.2.0-gen2-migration-0930.0",
-    "@aws-amplify/graphql-transformer-core": "3.2.0-gen2-migration-0930.0",
-    "@aws-amplify/graphql-transformer-interfaces": "4.2.0-gen2-migration-0930.0",
+    "@aws-amplify/graphql-auth-transformer": "4.1.3",
+    "@aws-amplify/graphql-conversation-transformer": "0.3.0",
+    "@aws-amplify/graphql-default-value-transformer": "3.1.0",
+    "@aws-amplify/graphql-directives": "2.3.0",
+    "@aws-amplify/graphql-function-transformer": "3.1.2",
+    "@aws-amplify/graphql-generation-transformer": "0.2.3",
+    "@aws-amplify/graphql-http-transformer": "3.0.5",
+    "@aws-amplify/graphql-index-transformer": "3.0.5",
+    "@aws-amplify/graphql-maps-to-transformer": "4.0.5",
+    "@aws-amplify/graphql-model-transformer": "3.0.5",
+    "@aws-amplify/graphql-predictions-transformer": "3.0.5",
+    "@aws-amplify/graphql-relational-transformer": "3.0.5",
+    "@aws-amplify/graphql-searchable-transformer": "3.0.5",
+    "@aws-amplify/graphql-sql-transformer": "0.4.5",
+    "@aws-amplify/graphql-transformer": "2.1.3",
+    "@aws-amplify/graphql-transformer-core": "3.2.0",
+    "@aws-amplify/graphql-transformer-interfaces": "4.1.2",
     "@aws-amplify/platform-core": "^1.0.0",
     "@aws-amplify/plugin-types": "^1.0.0",
     "@aws-crypto/crc32": "5.2.0",
@@ -260,8 +260,8 @@
     "fs-extra": "^8.1.0",
     "graceful-fs": "^4.2.0",
     "graphql": "^15.5.0",
-    "graphql-mapping-template": "5.0.2-gen2-migration-0930.0",
-    "graphql-transformer-common": "5.1.0-gen2-migration-0930.0",
+    "graphql-mapping-template": "5.0.1",
+    "graphql-transformer-common": "5.0.1",
     "hjson": "^3.2.2",
     "immer": "^9.0.12",
     "is-buffer": "~1.1.6",
@@ -282,10 +282,10 @@
     "zod": "^3.22.2"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-transformer-test-utils": "1.0.3-gen2-migration-0930.0",
+    "@aws-amplify/graphql-transformer-test-utils": "1.0.4",
     "@types/fs-extra": "^8.0.1",
     "@types/node": "^18.0.0",
-    "aws-cdk-lib": "2.152.0",
+    "aws-cdk-lib": "2.158.0",
     "constructs": "10.3.0",
     "jsii": "^5.4.23",
     "jsii-docgen": "9.1.2",
@@ -296,7 +296,7 @@
     "ts-node": "^8.10.1"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.152.0",
+    "aws-cdk-lib": "^2.158.0",
     "constructs": "^10.3.0"
   },
   "stability": "stable",
@@ -353,5 +353,5 @@
       "printBasicPrototype": true
     }
   },
-  "gitHead": "9747afc0099b5403bfde9d3489c34088eb76b02e"
+  "gitHead": "d11c76ced9ad33acfded8863f144ae6f402d2bd1"
 }

package/src/amplify-graphql-api.ts

@@ -87,6 +87,11 @@ export class AmplifyGraphqlApi extends Construct {
    */
   public readonly resources: AmplifyGraphqlApiResources;
 
+  /**
+   * Reference to parent stack of data construct
+   */
+  public readonly stack: Stack;
+
   /**
    * Generated assets required for codegen steps. Persisted in order to render as part of the output strategy.
    */
@@ -137,6 +142,7 @@ export class AmplifyGraphqlApi extends Construct {
    */
   constructor(scope: Construct, id: string, props: AmplifyGraphqlApiProps) {
     super(scope, id);
+    this.stack = Stack.of(scope);
 
     validateNoOtherAmplifyGraphqlApiInStack(this);
 

package/src/internal/authorization-modes.ts

@@ -91,8 +91,8 @@ const convertAuthModeToAuthProvider = (authMode: AuthorizationConfigMode): AppSy
           name: authMode.oidcProviderName,
           issuerUrl: authMode.oidcIssuerUrl,
           clientId: authMode.clientId,
-          iatTTL: authMode.tokenExpiryFromIssue.toSeconds(),
-          authTTL: authMode.tokenExpiryFromAuth.toSeconds(),
+          iatTTL: authMode.tokenExpiryFromIssue.toMilliseconds(),
+          authTTL: authMode.tokenExpiryFromAuth.toMilliseconds(),
         },
       };
     case 'AWS_LAMBDA':

package/src/model-datasource-strategy-types.ts

@@ -12,7 +12,6 @@
 export type ModelDataSourceStrategy =
   | DefaultDynamoDbModelDataSourceStrategy
   | AmplifyDynamoDbModelDataSourceStrategy
-  | ImportedAmplifyDynamoDbModelDataSourceStrategy
   | SQLLambdaModelDataSourceStrategy;
 
 /**
@@ -41,26 +40,6 @@ export interface AmplifyDynamoDbModelDataSourceStrategy {
   readonly provisionStrategy: 'AMPLIFY_TABLE';
 }
 
-// TODO: decide final naming before merging to main
-/**
- * Use custom resource type 'Custom::ImportedAmplifyDynamoDBTable' to manage an imported table.
- *
- * Tables can be imported only if they meet the following criteria.
- * 1. The imported table must have been created with through an Amplify Gen 1 project.
- * 2. The imported table must be in the same account and region as this construct.
- * 3. The imported table properties must match the corresponding table properties specified in this construct.
- *    (AttributeDefinitions, KeySchema, GlobalSecondaryIndexes, BillingModeSummary, ProvisionedThroughput, StreamSpecification, SSEDescription, DeletionProtectionEnabled)
- *
- * The imported tables will follow the auth rules defined in this construct.
- * The auth rules of the source Gen 1 project will not apply to the API created by this construct.
- * Ensure the correct auth rules have been set to prevent data exposure.
- */
-export interface ImportedAmplifyDynamoDbModelDataSourceStrategy {
-  readonly dbType: 'DYNAMODB';
-  readonly provisionStrategy: 'IMPORTED_AMPLIFY_TABLE';
-  readonly tableName: string;
-}
-
 /**
  * A strategy that creates a Lambda to connect to a pre-existing SQL table to resolve model data.
  */

package/src/types.ts

@@ -753,7 +753,7 @@ export interface AmplifyGraphqlApiProps {
   readonly translationBehavior?: PartialTranslationBehavior;
 
   /**
-   * Strategy to store construct outputs. If no outputStorageStrategy is provided a default strategy will be used.
+   * Strategy to store construct outputs. If no outputStorageStrategey is provided a default strategy will be used.
    */
   readonly outputStorageStrategy?: IBackendOutputStorageStrategy;
 

package/node_modules/@aws-amplify/graphql-conversation-transformer/lib/resolvers/js-resolver-function-provider.d.ts

@@ -1,6 +0,0 @@
-import { MappingTemplateProvider } from '@aws-amplify/graphql-transformer-interfaces';
-export type JSResolverFunctionProvider = {
-    req: MappingTemplateProvider;
-    res: MappingTemplateProvider;
-};
-//# sourceMappingURL=js-resolver-function-provider.d.ts.map

package/node_modules/@aws-amplify/graphql-conversation-transformer/lib/resolvers/js-resolver-function-provider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"js-resolver-function-provider.d.ts","sourceRoot":"","sources":["../../src/resolvers/js-resolver-function-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AAQtF,MAAM,MAAM,0BAA0B,GAAG;IAAE,GAAG,EAAE,uBAAuB,CAAC;IAAC,GAAG,EAAE,uBAAuB,CAAA;CAAE,CAAC"}

package/node_modules/@aws-amplify/graphql-conversation-transformer/lib/resolvers/js-resolver-function-provider.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=js-resolver-function-provider.js.map

package/node_modules/@aws-amplify/graphql-conversation-transformer/lib/resolvers/js-resolver-function-provider.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"js-resolver-function-provider.js","sourceRoot":"","sources":["../../src/resolvers/js-resolver-function-provider.ts"],"names":[],"mappings":""}

package/node_modules/@aws-amplify/graphql-conversation-transformer/lib/resolvers/message-history-resolver.d.ts

@@ -1,3 +0,0 @@
-import { JSResolverFunctionProvider } from './js-resolver-function-provider';
-export declare const readHistoryMappingTemplate: () => JSResolverFunctionProvider;
-//# sourceMappingURL=message-history-resolver.d.ts.map

package/node_modules/@aws-amplify/graphql-conversation-transformer/lib/resolvers/message-history-resolver.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"message-history-resolver.d.ts","sourceRoot":"","sources":["../../src/resolvers/message-history-resolver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAO7E,eAAO,MAAM,0BAA0B,QAAO,0BAM7C,CAAC"}

package/node_modules/@aws-amplify/graphql-conversation-transformer/lib/resolvers/message-history-resolver.js

@@ -1,59 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readHistoryMappingTemplate = void 0;
-const graphql_transformer_core_1 = require("@aws-amplify/graphql-transformer-core");
-const ts_dedent_1 = require("ts-dedent");
-const readHistoryMappingTemplate = () => {
-    const req = createMessageHistoryRequestFunction();
-    const res = createMessageHistoryResponseFunction();
-    return { req, res };
-};
-exports.readHistoryMappingTemplate = readHistoryMappingTemplate;
-const createMessageHistoryRequestFunction = () => {
-    const requestFunctionString = `
-      export function request(ctx) {
-        const { conversationId } = ctx.args;
-        const { authFilter } = ctx.stash;
-
-        const limit = 100;
-        const query = {
-          expression: 'conversationId = :conversationId',
-          expressionValues: util.dynamodb.toMapValues({
-            ':conversationId': ctx.args.conversationId
-          })
-        };
-
-        const filter = JSON.parse(util.transform.toDynamoDBFilterExpression(authFilter));
-        const index = 'gsi-ConversationMessage.conversationId.createdAt';
-
-        return {
-          operation: 'Query',
-          query,
-          filter,
-          index,
-          scanIndexForward: false,
-        }
-      }`;
-    return graphql_transformer_core_1.MappingTemplate.inlineTemplateFromString((0, ts_dedent_1.dedent)(requestFunctionString));
-};
-const createMessageHistoryResponseFunction = () => {
-    const responseFunctionString = `
-      export function response(ctx) {
-        if (ctx.error) {
-          util.error(ctx.error.message, ctx.error.type);
-        }
-        const messagesWithAssistantResponse = ctx.result.items
-          .filter((message) => message.assistantContent !== undefined)
-          .reduce((acc, current) => {
-              acc.push({ role: 'user', content: current.content });
-              acc.push({ role: 'assistant', content: current.assistantContent });
-              return acc;
-          }, [])
-
-        const currentMessage = { role: 'user', content: ctx.prev.result.content };
-        const items = [...messagesWithAssistantResponse, currentMessage];
-        return { items };
-      }`;
-    return graphql_transformer_core_1.MappingTemplate.inlineTemplateFromString((0, ts_dedent_1.dedent)(responseFunctionString));
-};
-//# sourceMappingURL=message-history-resolver.js.map

package/node_modules/@aws-amplify/graphql-conversation-transformer/lib/resolvers/message-history-resolver.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"message-history-resolver.js","sourceRoot":"","sources":["../../src/resolvers/message-history-resolver.ts"],"names":[],"mappings":";;;AAAA,oFAAwE;AAExE,yCAAmC;AAQ5B,MAAM,0BAA0B,GAAG,GAA+B,EAAE;IAEzE,MAAM,GAAG,GAAG,mCAAmC,EAAE,CAAC;IAClD,MAAM,GAAG,GAAG,oCAAoC,EAAE,CAAC;IAEnD,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AACtB,CAAC,CAAC;AANW,QAAA,0BAA0B,8BAMrC;AAOF,MAAM,mCAAmC,GAAG,GAA4B,EAAE;IACxE,MAAM,qBAAqB,GAAG;;;;;;;;;;;;;;;;;;;;;;;QAuBxB,CAAC;IAEP,OAAO,0CAAe,CAAC,wBAAwB,CAAC,IAAA,kBAAM,EAAC,qBAAqB,CAAC,CAAC,CAAC;AACjF,CAAC,CAAC;AAOF,MAAM,oCAAoC,GAAG,GAA4B,EAAE;IACzE,MAAM,sBAAsB,GAAG;;;;;;;;;;;;;;;;QAgBzB,CAAC;IAEP,OAAO,0CAAe,CAAC,wBAAwB,CAAC,IAAA,kBAAM,EAAC,sBAAsB,CAAC,CAAC,CAAC;AAClF,CAAC,CAAC"}

package/node_modules/@aws-amplify/graphql-model-transformer/lib/resources/amplify-dynamodb-table/amplify-table-manager-lambda/node_modules/.package-lock.json

@@ -1,13 +0,0 @@
-{
-  "name": "amplify-table-manager-lambda",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "node_modules/lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
-    }
-  }
-}

package/node_modules/@aws-amplify/graphql-model-transformer/lib/resources/amplify-dynamodb-table/amplify-table-manager-lambda/node_modules/lodash.isequal/LICENSE

@@ -1,47 +0,0 @@
-Copyright JS Foundation and other contributors <https://js.foundation/>
-
-Based on Underscore.js, copyright Jeremy Ashkenas,
-DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/lodash/lodash
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-Copyright and related rights for sample code are waived via CC0. Sample
-code is defined as all source code displayed within the prose of the
-documentation.
-
-CC0: http://creativecommons.org/publicdomain/zero/1.0/
-
-====
-
-Files located in the node_modules and vendor directories are externally
-maintained libraries used by this software which have their own
-licenses; we recommend you read them, as their terms may differ from the
-terms above.

package/node_modules/@aws-amplify/graphql-model-transformer/lib/resources/amplify-dynamodb-table/amplify-table-manager-lambda/node_modules/lodash.isequal/README.md

@@ -1,18 +0,0 @@
-# lodash.isequal v4.5.0
-
-The [Lodash](https://lodash.com/) method `_.isEqual` exported as a [Node.js](https://nodejs.org/) module.
-
-## Installation
-
-Using npm:
-```bash
-$ {sudo -H} npm i -g npm
-$ npm i --save lodash.isequal
-```
-
-In Node.js:
-```js
-var isEqual = require('lodash.isequal');
-```
-
-See the [documentation](https://lodash.com/docs#isEqual) or [package source](https://github.com/lodash/lodash/blob/4.5.0-npm-packages/lodash.isequal) for more details.