@aws-amplify/graphql-api-construct 1.5.7 → 1.6.0

package/node_modules/@aws-amplify/graphql-predictions-transformer/package.json

@@ -78,6 +78,5 @@
     "coveragePathIgnorePatterns": [
       "/__tests__/"
     ]
-  },
-  "gitHead": "a60eb2036ba0ba43bf469b4e5687b0cfa0a2e301"
+  }
 }

package/node_modules/@aws-amplify/graphql-relational-transformer/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.4.1](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-relational-transformer@2.4.0...@aws-amplify/graphql-relational-transformer@2.4.1) (2024-03-13)
+
+**Note:** Version bump only for package @aws-amplify/graphql-relational-transformer
+
 # [2.4.0](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-relational-transformer@2.3.6...@aws-amplify/graphql-relational-transformer@2.4.0) (2024-02-28)
 
 ### Features

package/node_modules/@aws-amplify/graphql-relational-transformer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-relational-transformer",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Amplify GraphQL relational modeling transformers",
   "repository": {
     "type": "git",
@@ -28,8 +28,8 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/graphql-index-transformer": "2.3.6",
-    "@aws-amplify/graphql-model-transformer": "2.5.0",
+    "@aws-amplify/graphql-index-transformer": "2.3.7",
+    "@aws-amplify/graphql-model-transformer": "2.6.0",
     "@aws-amplify/graphql-transformer-core": "2.5.0",
     "@aws-amplify/graphql-transformer-interfaces": "3.4.0",
     "graphql": "^15.5.0",
@@ -78,5 +78,5 @@
       "/__tests__/"
     ]
   },
-  "gitHead": "a60eb2036ba0ba43bf469b4e5687b0cfa0a2e301"
+  "gitHead": "9a0fb53d5df94e76811cbbdc4f3fc98fc6278c41"
 }

package/node_modules/@aws-amplify/graphql-searchable-transformer/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.6.1](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-searchable-transformer@2.6.0...@aws-amplify/graphql-searchable-transformer@2.6.1) (2024-03-13)
+
+**Note:** Version bump only for package @aws-amplify/graphql-searchable-transformer
+
 # [2.6.0](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-searchable-transformer@2.5.2...@aws-amplify/graphql-searchable-transformer@2.6.0) (2024-02-28)
 
 ### Features

package/node_modules/@aws-amplify/graphql-searchable-transformer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-searchable-transformer",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Amplfy GraphQL @searchable transformer",
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/graphql-model-transformer": "2.5.0",
+    "@aws-amplify/graphql-model-transformer": "2.6.0",
     "@aws-amplify/graphql-transformer-core": "2.5.0",
     "@aws-amplify/graphql-transformer-interfaces": "3.4.0",
     "graphql": "^15.5.0",
@@ -81,5 +81,5 @@
       "/__tests__/"
     ]
   },
-  "gitHead": "a60eb2036ba0ba43bf469b4e5687b0cfa0a2e301"
+  "gitHead": "9a0fb53d5df94e76811cbbdc4f3fc98fc6278c41"
 }

package/node_modules/@aws-amplify/graphql-sql-transformer/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.7](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-sql-transformer@0.2.6...@aws-amplify/graphql-sql-transformer@0.2.7) (2024-03-13)
+
+**Note:** Version bump only for package @aws-amplify/graphql-sql-transformer
+
 ## [0.2.6](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-sql-transformer@0.2.5...@aws-amplify/graphql-sql-transformer@0.2.6) (2024-02-28)
 
 **Note:** Version bump only for package @aws-amplify/graphql-sql-transformer

package/node_modules/@aws-amplify/graphql-sql-transformer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-sql-transformer",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Amplify GraphQL @sql transformer",
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/graphql-model-transformer": "2.5.0",
+    "@aws-amplify/graphql-model-transformer": "2.6.0",
     "@aws-amplify/graphql-transformer-core": "2.5.0",
     "@aws-amplify/graphql-transformer-interfaces": "3.4.0",
     "graphql": "^15.5.0",
@@ -79,5 +79,5 @@
       "/__tests__/"
     ]
   },
-  "gitHead": "a60eb2036ba0ba43bf469b4e5687b0cfa0a2e301"
+  "gitHead": "9a0fb53d5df94e76811cbbdc4f3fc98fc6278c41"
 }

package/node_modules/@aws-amplify/graphql-transformer/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.12](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@1.3.11...@aws-amplify/graphql-transformer@1.3.12) (2024-03-13)
+
+**Note:** Version bump only for package @aws-amplify/graphql-transformer
+
 ## [1.3.11](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@1.3.10...@aws-amplify/graphql-transformer@1.3.11) (2024-02-28)
 
 **Note:** Version bump only for package @aws-amplify/graphql-transformer

package/node_modules/@aws-amplify/graphql-transformer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-transformer",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "description": "Amplify GraphQL Transformer Root Package",
   "repository": {
     "type": "git",
@@ -28,17 +28,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/graphql-auth-transformer": "3.4.0",
-    "@aws-amplify/graphql-default-value-transformer": "2.3.0",
+    "@aws-amplify/graphql-auth-transformer": "3.4.1",
+    "@aws-amplify/graphql-default-value-transformer": "2.3.1",
     "@aws-amplify/graphql-function-transformer": "2.1.18",
     "@aws-amplify/graphql-http-transformer": "2.1.18",
-    "@aws-amplify/graphql-index-transformer": "2.3.6",
-    "@aws-amplify/graphql-maps-to-transformer": "3.4.7",
-    "@aws-amplify/graphql-model-transformer": "2.5.0",
+    "@aws-amplify/graphql-index-transformer": "2.3.7",
+    "@aws-amplify/graphql-maps-to-transformer": "3.4.8",
+    "@aws-amplify/graphql-model-transformer": "2.6.0",
     "@aws-amplify/graphql-predictions-transformer": "2.1.18",
-    "@aws-amplify/graphql-relational-transformer": "2.4.0",
-    "@aws-amplify/graphql-searchable-transformer": "2.6.0",
-    "@aws-amplify/graphql-sql-transformer": "0.2.6",
+    "@aws-amplify/graphql-relational-transformer": "2.4.1",
+    "@aws-amplify/graphql-searchable-transformer": "2.6.1",
+    "@aws-amplify/graphql-sql-transformer": "0.2.7",
     "@aws-amplify/graphql-transformer-core": "2.5.0",
     "@aws-amplify/graphql-transformer-interfaces": "3.4.0"
   },
@@ -87,5 +87,5 @@
       "/__tests__/"
     ]
   },
-  "gitHead": "a60eb2036ba0ba43bf469b4e5687b0cfa0a2e301"
+  "gitHead": "9a0fb53d5df94e76811cbbdc4f3fc98fc6278c41"
 }

package/node_modules/@aws-amplify/graphql-transformer-core/package.json

@@ -84,6 +84,5 @@
     "coveragePathIgnorePatterns": [
       "/__tests__/"
     ]
-  },
-  "gitHead": "a60eb2036ba0ba43bf469b4e5687b0cfa0a2e301"
+  }
 }

package/node_modules/@aws-amplify/graphql-transformer-interfaces/package.json

@@ -59,6 +59,5 @@
     "coveragePathIgnorePatterns": [
       "/__tests__/"
     ]
-  },
-  "gitHead": "a60eb2036ba0ba43bf469b4e5687b0cfa0a2e301"
+  }
 }

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

@@ -57,6 +57,5 @@
     "coveragePathIgnorePatterns": [
       "/__tests__/"
     ]
-  },
-  "gitHead": "a60eb2036ba0ba43bf469b4e5687b0cfa0a2e301"
+  }
 }

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

@@ -65,6 +65,5 @@
     "coveragePathIgnorePatterns": [
       "/__tests__/"
     ]
-  },
-  "gitHead": "a60eb2036ba0ba43bf469b4e5687b0cfa0a2e301"
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-api-construct",
-  "version": "1.5.7",
+  "version": "1.6.0",
   "description": "AppSync GraphQL Api Construct using Amplify GraphQL Transformer.",
   "repository": {
     "type": "git",
@@ -75,18 +75,18 @@
   "dependencies": {
     "@aws-amplify/backend-output-schemas": "^0.4.0",
     "@aws-amplify/backend-output-storage": "^0.2.2",
-    "@aws-amplify/graphql-auth-transformer": "3.4.0",
-    "@aws-amplify/graphql-default-value-transformer": "2.3.0",
+    "@aws-amplify/graphql-auth-transformer": "3.4.1",
+    "@aws-amplify/graphql-default-value-transformer": "2.3.1",
     "@aws-amplify/graphql-function-transformer": "2.1.18",
     "@aws-amplify/graphql-http-transformer": "2.1.18",
-    "@aws-amplify/graphql-index-transformer": "2.3.6",
-    "@aws-amplify/graphql-maps-to-transformer": "3.4.7",
-    "@aws-amplify/graphql-model-transformer": "2.5.0",
+    "@aws-amplify/graphql-index-transformer": "2.3.7",
+    "@aws-amplify/graphql-maps-to-transformer": "3.4.8",
+    "@aws-amplify/graphql-model-transformer": "2.6.0",
     "@aws-amplify/graphql-predictions-transformer": "2.1.18",
-    "@aws-amplify/graphql-relational-transformer": "2.4.0",
-    "@aws-amplify/graphql-searchable-transformer": "2.6.0",
-    "@aws-amplify/graphql-sql-transformer": "0.2.6",
-    "@aws-amplify/graphql-transformer": "1.3.11",
+    "@aws-amplify/graphql-relational-transformer": "2.4.1",
+    "@aws-amplify/graphql-searchable-transformer": "2.6.1",
+    "@aws-amplify/graphql-sql-transformer": "0.2.7",
+    "@aws-amplify/graphql-transformer": "1.3.12",
     "@aws-amplify/graphql-transformer-core": "2.5.0",
     "@aws-amplify/graphql-transformer-interfaces": "3.4.0",
     "@aws-amplify/platform-core": "^0.2.0",
@@ -177,5 +177,5 @@
       "/__tests__/"
     ]
   },
-  "gitHead": "a60eb2036ba0ba43bf469b4e5687b0cfa0a2e301"
+  "gitHead": "9a0fb53d5df94e76811cbbdc4f3fc98fc6278c41"
 }

package/src/amplify-dynamodb-table-wrapper.ts

@@ -1,4 +1,4 @@
-import { CfnResource } from 'aws-cdk-lib';
+import { CfnResource, RemovalPolicy } from 'aws-cdk-lib';
 import { BillingMode, StreamViewType } from 'aws-cdk-lib/aws-dynamodb';
 
 const AMPLIFY_DYNAMODB_TABLE_RESOURCE_TYPE = 'Custom::AmplifyDynamoDBTable';
@@ -110,6 +110,14 @@ export class AmplifyDynamoDbTableWrapper {
     }
   }
 
+  /**
+   * Set the deletion policy of the resource based on the removal policy specified.
+   * @param policy removal policy to set
+   */
+  applyRemovalPolicy(policy: RemovalPolicy): void {
+    this.resource.applyRemovalPolicy(policy);
+  }
+
   /**
    * Specify how you are charged for read and write throughput and how you manage capacity.
    */

package/src/amplify-graphql-api.ts

@@ -36,7 +36,7 @@ import type {
   FunctionSlot,
   IBackendOutputStorageStrategy,
   AddFunctionProps,
-  ConflictResolution,
+  DataStoreConfiguration,
   IAmplifyGraphqlDefinition,
 } from './types';
 import {
@@ -120,9 +120,9 @@ export class AmplifyGraphqlApi extends Construct {
   public readonly apiId: string;
 
   /**
-   * Conflict resolution setting
+   * DataStore conflict resolution setting
    */
-  private readonly conflictResolution: ConflictResolution | undefined;
+  private readonly dataStoreConfiguration: DataStoreConfiguration | undefined;
 
   /**
    * Be very careful editing this value. This is the string that is used to identify graphql stacks in BI metrics
@@ -152,8 +152,17 @@ export class AmplifyGraphqlApi extends Construct {
       translationBehavior,
       functionNameMap,
       outputStorageStrategy,
+      dataStoreConfiguration,
     } = props;
 
+    if (conflictResolution && dataStoreConfiguration) {
+      throw new Error(
+        `conflictResolution is deprecated. conflictResolution and dataStoreConfiguration cannot be used together. Please use dataStoreConfiguration.`,
+      );
+    }
+
+    this.dataStoreConfiguration = dataStoreConfiguration || conflictResolution;
+
     const dataSources = getMetadataDataSources(definition);
 
     new AttributionMetadataStorage().storeAttributionMetadata(Stack.of(scope), this.stackType, path.join(__dirname, '..', 'package.json'), {
@@ -201,7 +210,7 @@ export class AmplifyGraphqlApi extends Construct {
       },
       authConfig,
       stackMapping: stackMappings ?? {},
-      resolverConfig: conflictResolution ? convertToResolverConfig(conflictResolution) : undefined,
+      resolverConfig: this.dataStoreConfiguration ? convertToResolverConfig(this.dataStoreConfiguration) : undefined,
       transformParameters: {
         ...defaultTranslationBehavior,
         ...(translationBehavior ?? {}),
@@ -217,7 +226,6 @@ export class AmplifyGraphqlApi extends Construct {
     this.codegenAssets = new CodegenAssets(this, 'AmplifyCodegenAssets', { modelSchema: definition.schema });
 
     this.resources = getGeneratedResources(this);
-    this.conflictResolution = conflictResolution;
     this.generatedFunctionSlots = getGeneratedFunctionSlots(assetManager.resolverAssets);
     this.storeOutput(outputStorageStrategy);
 
@@ -255,8 +263,8 @@ export class AmplifyGraphqlApi extends Construct {
       output.payload.awsAppsyncAdditionalAuthenticationTypes = additionalAuthTypes;
     }
 
-    if (this.conflictResolution?.project?.handlerType) {
-      output.payload.awsAppsyncConflictResolutionMode = this.conflictResolution?.project?.handlerType;
+    if (this.dataStoreConfiguration?.project?.handlerType) {
+      output.payload.awsAppsyncConflictResolutionMode = this.dataStoreConfiguration?.project?.handlerType;
     }
 
     outputStorageStrategy.addBackendOutputEntry(graphqlOutputKey, output);

package/src/index.ts

@@ -20,6 +20,7 @@ export type {
   FunctionSlot,
   FunctionSlotOverride,
   ConflictResolution,
+  DataStoreConfiguration,
   ConflictDetectionType,
   OptimisticConflictResolutionStrategy,
   CustomConflictResolutionStrategy,

package/src/internal/construct-exports.ts

@@ -8,7 +8,7 @@ import {
   CfnDataSource,
   GraphqlApi,
 } from 'aws-cdk-lib/aws-appsync';
-import { CfnTable, Table } from 'aws-cdk-lib/aws-dynamodb';
+import { CfnTable, Table, ITable } from 'aws-cdk-lib/aws-dynamodb';
 import { CfnRole, Role } from 'aws-cdk-lib/aws-iam';
 import { CfnResource, NestedStack } from 'aws-cdk-lib';
 import { getResourceName } from '@aws-amplify/graphql-transformer-core';
@@ -17,6 +17,16 @@ import { AmplifyGraphqlApiResources, FunctionSlot } from '../types';
 import { AmplifyDynamoDbTableWrapper } from '../amplify-dynamodb-table-wrapper';
 import { walkAndProcessNodes } from './construct-tree';
 
+/**
+ * Check if a resource is implementing table interface
+ * The required properties need to be present in the input
+ * https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_dynamodb.ITable.html#properties
+ * @param table table resource
+ * @returns whether the resource is a ITable or not
+ */
+function isITable(table: any): table is ITable {
+  return 'env' in table && 'node' in table && 'stack' in table && 'tableArn' in table && 'tableName' in table;
+}
 /**
  * Everything below here is intended to help us gather the
  * output values and render out the L1 resources for access.
@@ -33,7 +43,7 @@ export const getGeneratedResources = (scope: Construct): AmplifyGraphqlApiResour
   const cfnResolvers: Record<string, CfnResolver> = {};
   const cfnFunctionConfigurations: Record<string, CfnFunctionConfiguration> = {};
   const cfnDataSources: Record<string, CfnDataSource> = {};
-  const tables: Record<string, Table> = {};
+  const tables: Record<string, ITable> = {};
   const cfnTables: Record<string, CfnTable> = {};
   const amplifyDynamoDbTables: Record<string, AmplifyDynamoDbTableWrapper> = {};
   const roles: Record<string, Role> = {};
@@ -72,7 +82,7 @@ export const getGeneratedResources = (scope: Construct): AmplifyGraphqlApiResour
       cfnFunctionConfigurations[resourceName] = currentScope;
       return;
     }
-    if (currentScope instanceof Table) {
+    if (currentScope instanceof Table || isITable(currentScope)) {
       tables[resourceName] = currentScope;
       return;
     }
@@ -123,7 +133,6 @@ export const getGeneratedResources = (scope: Construct): AmplifyGraphqlApiResour
   return {
     graphqlApi: GraphqlApi.fromGraphqlApiAttributes(scope, 'L2GraphqlApi', { graphqlApiId: cfnGraphqlApi.attrApiId }),
     tables,
-    amplifyDynamoDbTables,
     roles,
     functions,
     nestedStacks,
@@ -135,6 +144,7 @@ export const getGeneratedResources = (scope: Construct): AmplifyGraphqlApiResour
       cfnFunctionConfigurations,
       cfnDataSources,
       cfnTables,
+      amplifyDynamoDbTables,
       cfnRoles,
       cfnFunctions,
       additionalCfnResources,

package/src/types.ts

@@ -234,8 +234,14 @@ export type ConflictResolutionStrategy =
 
 /**
  * Project level configuration for conflict resolution.
+ * @deprecated use DataStoreConfiguration instead.
  */
-export interface ConflictResolution {
+export interface ConflictResolution extends DataStoreConfiguration {}
+
+/**
+ * Project level configuration for DataStore
+ */
+export interface DataStoreConfiguration {
   /**
    * Project-wide config for conflict resolution. Applies to all non-overridden models.
    */
@@ -636,6 +642,7 @@ export interface AmplifyGraphqlApiProps {
   /**
    * Configure conflict resolution on the Api, which is required to enable DataStore Api functionality.
    * For more information, refer to https://docs.amplify.aws/lib/datastore/getting-started/q/platform/js/
+   * @deprecated use dataStoreConfiguration instead.
    */
   readonly conflictResolution?: ConflictResolution;
 
@@ -676,6 +683,12 @@ export interface AmplifyGraphqlApiProps {
    * Strategy to store construct outputs. If no outputStorageStrategey is provided a default strategy will be used.
    */
   readonly outputStorageStrategy?: IBackendOutputStorageStrategy;
+
+  /**
+   * Configure DataStore conflict resolution on the Api. Conflict resolution is required to enable DataStore Api functionality.
+   * For more information, refer to https://docs.amplify.aws/lib/datastore/getting-started/q/platform/js/
+   */
+  readonly dataStoreConfiguration?: DataStoreConfiguration;
 }
 
 /**
@@ -718,6 +731,11 @@ export interface AmplifyGraphqlApiCfnResources {
    */
   readonly cfnTables: Record<string, CfnTable>;
 
+  /**
+   * The Generated Amplify DynamoDb Table L1 resource wrapper, keyed by model type name.
+   */
+  readonly amplifyDynamoDbTables: Record<string, AmplifyDynamoDbTableWrapper>;
+
   /**
    * The Generated IAM Role L1 Resources, keyed by logicalId.
    */
@@ -749,11 +767,6 @@ export interface AmplifyGraphqlApiResources {
    */
   readonly tables: Record<string, ITable>;
 
-  /**
-   * The Generated Amplify DynamoDb Table wrapped if produced, keyed by name.
-   */
-  readonly amplifyDynamoDbTables: Record<string, AmplifyDynamoDbTableWrapper>;
-
   /**
    * The Generated IAM Role L2 Resources, keyed by logicalId.
    */