@aws-amplify/graphql-api-construct 1.12.0-gen2-migration.0 → 1.12.0-gen2-migration-0809.0

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

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [4.32.0-gen2-migration.0](https://github.com/aws-amplify/amplify-category-api/compare/graphql-transformer-common@4.31.1...graphql-transformer-common@4.32.0-gen2-migration.0) (2024-07-15)
+# [4.32.0-gen2-migration-0809.0](https://github.com/aws-amplify/amplify-category-api/compare/graphql-transformer-common@4.31.1...graphql-transformer-common@4.32.0-gen2-migration-0809.0) (2024-08-09)
 
 ### Features
 

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

@@ -1,6 +1,6 @@
 {
   "name": "graphql-transformer-common",
-  "version": "4.32.0-gen2-migration.0",
+  "version": "4.32.0-gen2-migration-0809.0",
   "description": "Common code and constants for AppSync Transformers",
   "repository": {
     "type": "git",
@@ -66,5 +66,5 @@
       "/__tests__/"
     ]
   },
-  "gitHead": "95431091fe3a13ae97a1f57a0bffb23f49c7e569"
+  "gitHead": "005a7b9dcb09f8c3b73574ab51b29762d1f71e00"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-api-construct",
-  "version": "1.12.0-gen2-migration.0",
+  "version": "1.12.0-gen2-migration-0809.0",
   "description": "AppSync GraphQL Api Construct using Amplify GraphQL Transformer.",
   "repository": {
     "type": "git",
@@ -76,21 +76,21 @@
   "dependencies": {
     "@aws-amplify/backend-output-schemas": "^0.4.0",
     "@aws-amplify/backend-output-storage": "^0.2.2",
-    "@aws-amplify/graphql-auth-transformer": "3.6.3-gen2-migration.0",
-    "@aws-amplify/graphql-default-value-transformer": "2.3.11-gen2-migration.0",
-    "@aws-amplify/graphql-directives": "1.1.0",
-    "@aws-amplify/graphql-function-transformer": "2.1.26-gen2-migration.0",
-    "@aws-amplify/graphql-http-transformer": "2.1.26-gen2-migration.0",
-    "@aws-amplify/graphql-index-transformer": "2.4.7-gen2-migration.0",
-    "@aws-amplify/graphql-maps-to-transformer": "3.4.21-gen2-migration.0",
-    "@aws-amplify/graphql-model-transformer": "2.12.0-gen2-migration.0",
-    "@aws-amplify/graphql-predictions-transformer": "2.1.26-gen2-migration.0",
-    "@aws-amplify/graphql-relational-transformer": "2.5.9-gen2-migration.0",
-    "@aws-amplify/graphql-searchable-transformer": "2.7.7-gen2-migration.0",
-    "@aws-amplify/graphql-sql-transformer": "0.3.7-gen2-migration.0",
-    "@aws-amplify/graphql-transformer": "1.7.0-gen2-migration.0",
-    "@aws-amplify/graphql-transformer-core": "2.10.0-gen2-migration.0",
-    "@aws-amplify/graphql-transformer-interfaces": "3.11.0-gen2-migration.0",
+    "@aws-amplify/graphql-auth-transformer": "3.6.5-gen2-migration-0809.0",
+    "@aws-amplify/graphql-default-value-transformer": "2.3.13-gen2-migration-0809.0",
+    "@aws-amplify/graphql-directives": "1.2.0-gen2-migration-0809.0",
+    "@aws-amplify/graphql-function-transformer": "2.1.27-gen2-migration-0809.0",
+    "@aws-amplify/graphql-http-transformer": "2.1.27-gen2-migration-0809.0",
+    "@aws-amplify/graphql-index-transformer": "2.4.9-gen2-migration-0809.0",
+    "@aws-amplify/graphql-maps-to-transformer": "3.4.23-gen2-migration-0809.0",
+    "@aws-amplify/graphql-model-transformer": "2.12.0-gen2-migration-0809.0",
+    "@aws-amplify/graphql-predictions-transformer": "2.1.27-gen2-migration-0809.0",
+    "@aws-amplify/graphql-relational-transformer": "2.6.0-gen2-migration-0809.0",
+    "@aws-amplify/graphql-searchable-transformer": "2.7.9-gen2-migration-0809.0",
+    "@aws-amplify/graphql-sql-transformer": "0.3.9-gen2-migration-0809.0",
+    "@aws-amplify/graphql-transformer": "1.7.0-gen2-migration-0809.0",
+    "@aws-amplify/graphql-transformer-core": "2.10.0-gen2-migration-0809.0",
+    "@aws-amplify/graphql-transformer-interfaces": "3.11.0-gen2-migration-0809.0",
     "@aws-amplify/platform-core": "^0.2.0",
     "@aws-amplify/plugin-types": "^0.4.1",
     "charenc": "^0.0.2",
@@ -99,7 +99,7 @@
     "graceful-fs": "^4.2.11",
     "graphql": "^15.5.0",
     "graphql-mapping-template": "4.20.16",
-    "graphql-transformer-common": "4.32.0-gen2-migration.0",
+    "graphql-transformer-common": "4.32.0-gen2-migration-0809.0",
     "hjson": "^3.2.2",
     "immer": "^9.0.12",
     "is-buffer": "^2.0.5",
@@ -114,11 +114,11 @@
     "zod": "^3.22.3"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-transformer-test-utils": "0.5.6-gen2-migration.0",
+    "@aws-amplify/graphql-transformer-test-utils": "0.5.7-gen2-migration-0809.0",
     "@types/fs-extra": "^8.0.1",
     "@types/node": "^12.12.6",
-    "aws-cdk-lib": "2.80.0",
-    "constructs": "10.0.5",
+    "aws-cdk-lib": "2.129.0",
+    "constructs": "10.3.0",
     "jsii": "^5.4.23",
     "jsii-docgen": "9.1.2",
     "jsii-pacmak": "^1.84.0",
@@ -127,8 +127,8 @@
     "ts-node": "^8.10.1"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.80.0",
-    "constructs": "^10.0.5"
+    "aws-cdk-lib": "^2.129.0",
+    "constructs": "^10.3.0"
   },
   "stability": "stable",
   "types": "lib/index.d.ts",
@@ -179,5 +179,5 @@
       "/__tests__/"
     ]
   },
-  "gitHead": "95431091fe3a13ae97a1f57a0bffb23f49c7e569"
+  "gitHead": "005a7b9dcb09f8c3b73574ab51b29762d1f71e00"
 }

package/src/amplify-graphql-api.ts

@@ -3,6 +3,7 @@ import { Construct } from 'constructs';
 import { ExecuteTransformConfig, executeTransform } from '@aws-amplify/graphql-transformer';
 import { NestedStack, Stack } from 'aws-cdk-lib';
 import { AttributionMetadataStorage, StackMetadataBackendOutputStorageStrategy } from '@aws-amplify/backend-output-storage';
+import { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces';
 import { graphqlOutputKey } from '@aws-amplify/backend-output-schemas';
 import type { GraphqlOutput, AwsAppsyncAuthenticationType } from '@aws-amplify/backend-output-schemas';
 import {
@@ -184,6 +185,18 @@ export class AmplifyGraphqlApi extends Construct {
 
     const assetProvider = new AssetProvider(this);
 
+    const mergedTranslationBehavior = {
+      ...defaultTranslationBehavior,
+      ...(translationBehavior ?? {}),
+    };
+    const transformParameters: TransformParameters = {
+      ...mergedTranslationBehavior,
+      allowGen1Patterns: mergedTranslationBehavior._allowGen1Patterns,
+      // TODO: decide naming before merge to main
+      // migrating from construct -> Gen2 is not supported
+      // this param is purposely omitted from translationBehavior so the param is not available through the construct
+      enableGen2Migration: false,
+    };
     const executeTransformConfig: ExecuteTransformConfig = {
       scope: this,
       nestedStackProvider: {
@@ -204,18 +217,12 @@ export class AmplifyGraphqlApi extends Construct {
           ...definition.referencedLambdaFunctions,
           ...functionNameMap,
         },
+        allowGen1Patterns: transformParameters.allowGen1Patterns,
       },
       authConfig,
       stackMapping: stackMappings ?? {},
       resolverConfig: this.dataStoreConfiguration ? convertToResolverConfig(this.dataStoreConfiguration) : undefined,
-      transformParameters: {
-        ...defaultTranslationBehavior,
-        ...(translationBehavior ?? {}),
-        // TODO: decide naming before merge to main
-        // migrating from construct -> Gen2 is not supported
-        // this param is purposely omitted from translationBehavior so the param is not available through the construct
-        enableGen2Migration: false,
-      },
+      transformParameters,
       // CDK construct uses a custom resource. We'll define this explicitly here to remind ourselves that this value is unused in the CDK
       // construct flow
       rdsLayerMapping: undefined,

package/src/internal/default-parameters.ts

@@ -20,4 +20,5 @@ export const defaultTranslationBehavior: TranslationBehavior = {
   enableTransformerCfnOutputs: false,
   allowDestructiveGraphqlSchemaUpdates: false,
   replaceTableUponGsiUpdate: false,
+  _allowGen1Patterns: true,
 };

package/src/types.ts

@@ -496,6 +496,23 @@ export interface TranslationBehavior {
    * @experimental
    */
   readonly replaceTableUponGsiUpdate: boolean;
+
+  /**
+   * When disabled usage of Gen 1 patterns will result in an error thrown.
+   *
+   * Gen 1 Patterns that will be disabled when set to false:
+   * - Use of @manyToMany
+   * - Use of @searchable
+   * - Use of @predictions
+   * - Use of fields argument on @hasOne, @hasMany, and @belongsTo.
+   * - Use of @hasOne, @hasMany, and @belongsTo on required fields.
+   *
+   * @default true
+   * @internal
+   * Warning: Although this has `public` access, it is intended for internal use and should not be used directly.
+   * The behavior of this may change without warning.
+   */
+  readonly _allowGen1Patterns: boolean;
 }
 
 /**
@@ -604,6 +621,23 @@ export interface PartialTranslationBehavior {
    * @experimental
    */
   readonly replaceTableUponGsiUpdate?: boolean;
+
+  /**
+   * When disabled usage of Gen 1 patterns will result in an error thrown.
+   *
+   * Gen 1 Patterns that will be disabled when set to false:
+   * - Use of @manyToMany
+   * - Use of @searchable
+   * - Use of @predictions
+   * - Use of fields argument on @hasOne, @hasMany, and @belongsTo.
+   * - Use of @hasOne, @hasMany, and @belongsTo on required fields.
+   *
+   * @default true
+   * @internal
+   * Warning: Although this has `public` access, it is intended for internal use and should not be used directly.
+   * The behavior of this may change without warning.
+   */
+  readonly _allowGen1Patterns?: boolean;
 }
 
 /**
@@ -726,7 +760,7 @@ export interface AmplifyGraphqlApiProps {
 
   /**
    * Provide a list of additional custom transformers which are injected into the transform process.
-   * These custom transformers must be implemented with aws-cdk-lib >=2.80.0, and @aws-amplify/graphql-transformer-core >= 2.1.1
+   * These custom transformers must be implemented with aws-cdk-lib >=2.129.0, and @aws-amplify/graphql-transformer-core >= 2.1.1
    * @experimental
    */
   readonly transformerPlugins?: any[];