refactor: add allowGen1Patterns to TransformerFactoryArgs

aws-amplify · Jul 3, 2024 · ce75ede · ce75ede
1 parent c07c917
commit ce75ede
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 24 deletions.
diff --git a/packages/amplify-graphql-api-construct/.jsii b/packages/amplify-graphql-api-construct/.jsii
@@ -3998,7 +3998,7 @@
           },
           "locationInModule": {
             "filename": "src/amplify-graphql-api.ts",
-            "line": 283
+            "line": 285
           },
           "name": "addDynamoDbDataSource",
           "parameters": [
@@ -4047,7 +4047,7 @@
           },
           "locationInModule": {
             "filename": "src/amplify-graphql-api.ts",
-            "line": 295
+            "line": 297
           },
           "name": "addElasticsearchDataSource",
           "parameters": [
@@ -4094,7 +4094,7 @@
           },
           "locationInModule": {
             "filename": "src/amplify-graphql-api.ts",
-            "line": 305
+            "line": 307
           },
           "name": "addEventBridgeDataSource",
           "parameters": [
@@ -4141,7 +4141,7 @@
           },
           "locationInModule": {
             "filename": "src/amplify-graphql-api.ts",
-            "line": 387
+            "line": 389
           },
           "name": "addFunction",
           "parameters": [
@@ -4176,7 +4176,7 @@
           },
           "locationInModule": {
             "filename": "src/amplify-graphql-api.ts",
-            "line": 316
+            "line": 318
           },
           "name": "addHttpDataSource",
           "parameters": [
@@ -4224,7 +4224,7 @@
           },
           "locationInModule": {
             "filename": "src/amplify-graphql-api.ts",
-            "line": 327
+            "line": 329
           },
           "name": "addLambdaDataSource",
           "parameters": [
@@ -4272,7 +4272,7 @@
           },
           "locationInModule": {
             "filename": "src/amplify-graphql-api.ts",
-            "line": 338
+            "line": 340
           },
           "name": "addNoneDataSource",
           "parameters": [
@@ -4311,7 +4311,7 @@
           },
           "locationInModule": {
             "filename": "src/amplify-graphql-api.ts",
-            "line": 349
+            "line": 351
           },
           "name": "addOpenSearchDataSource",
           "parameters": [
@@ -4359,7 +4359,7 @@
           },
           "locationInModule": {
             "filename": "src/amplify-graphql-api.ts",
-            "line": 362
+            "line": 364
           },
           "name": "addRdsDataSource",
           "parameters": [
@@ -4426,7 +4426,7 @@
           },
           "locationInModule": {
             "filename": "src/amplify-graphql-api.ts",
-            "line": 378
+            "line": 380
           },
           "name": "addResolver",
           "parameters": [
@@ -8487,5 +8487,5 @@
     }
   },
   "version": "1.11.1",
-  "fingerprint": "2wmG0N5kBjtA+aK3rlV8/q7K/7DLfdP+golmlXXr04M="
+  "fingerprint": "bie/pSK2lDysAxU25A0YKgH5obMspQsx/3xuPdQi6vg="
 }
diff --git a/packages/amplify-graphql-api-construct/src/amplify-graphql-api.ts b/packages/amplify-graphql-api-construct/src/amplify-graphql-api.ts
@@ -184,6 +184,10 @@ export class AmplifyGraphqlApi extends Construct {
 
     const assetProvider = new AssetProvider(this);
 
+    const transformParameters = {
+      ...defaultTranslationBehavior,
+      ...(translationBehavior ?? {}),
+    };
     const executeTransformConfig: ExecuteTransformConfig = {
       scope: this,
       nestedStackProvider: {
@@ -204,14 +208,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 ?? {}),
-      },
+      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,

diff --git a/packages/amplify-graphql-transformer/API.md b/packages/amplify-graphql-transformer/API.md
@@ -25,7 +25,7 @@ import { UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
 export const constructTransform: (config: TransformConfig) => GraphQLTransform;
 
 // @public (undocumented)
-export const constructTransformerChain: (options?: TransformerFactoryArgs, allowGen1Patterns?: boolean) => TransformerPluginProvider[];
+export const constructTransformerChain: (options?: TransformerFactoryArgs) => TransformerPluginProvider[];
 
 // @public (undocumented)
 export const executeTransform: (config: ExecuteTransformConfig) => void;
@@ -56,6 +56,7 @@ export type TransformerFactoryArgs = {
     storageConfig?: any;
     customTransformers?: TransformerPluginProvider[];
     functionNameMap?: Record<string, IFunction>;
+    allowGen1Patterns?: boolean;
 };
 
 // (No @packageDocumentation comment for this package)

diff --git a/packages/amplify-graphql-transformer/src/graphql-transformer.ts b/packages/amplify-graphql-transformer/src/graphql-transformer.ts
@@ -42,6 +42,7 @@ export type TransformerFactoryArgs = {
   storageConfig?: any;
   customTransformers?: TransformerPluginProvider[];
   functionNameMap?: Record<string, IFunction>;
+  allowGen1Patterns?: boolean;
 };
 
 /**
@@ -56,10 +57,7 @@ export type TransformConfig = {
   transformParameters: TransformParameters;
 };
 
-export const constructTransformerChain = (
-  options?: TransformerFactoryArgs,
-  allowGen1Patterns: boolean = true,
-): TransformerPluginProvider[] => {
+export const constructTransformerChain = (options?: TransformerFactoryArgs): TransformerPluginProvider[] => {
   const modelTransformer = new ModelTransformer();
   const authTransformer = new AuthTransformer();
   const indexTransformer = new IndexTransformer();
@@ -70,19 +68,21 @@ export const constructTransformerChain = (
     modelTransformer,
     new FunctionTransformer(options?.functionNameMap),
     new HttpTransformer(),
-    ...(allowGen1Patterns ? [new PredictionsTransformer(options?.storageConfig)] : []),
+    ...(options?.allowGen1Patterns ? [new PredictionsTransformer(options?.storageConfig)] : []),
     new PrimaryKeyTransformer(),
     indexTransformer,
     new HasManyTransformer(),
     hasOneTransformer,
-    ...(allowGen1Patterns ? [new ManyToManyTransformer(modelTransformer, indexTransformer, hasOneTransformer, authTransformer)] : []),
+    ...(options?.allowGen1Patterns
+      ? [new ManyToManyTransformer(modelTransformer, indexTransformer, hasOneTransformer, authTransformer)]
+      : []),
     new BelongsToTransformer(),
     new DefaultValueTransformer(),
     authTransformer,
     new MapsToTransformer(),
     new SqlTransformer(),
     new RefersToTransformer(),
-    ...(allowGen1Patterns ? [new SearchableModelTransformer()] : []),
+    ...(options?.allowGen1Patterns ? [new SearchableModelTransformer()] : []),
     ...(options?.customTransformers ?? []),
   ];
 };
@@ -95,7 +95,7 @@ export const constructTransformerChain = (
 export const constructTransform = (config: TransformConfig): GraphQLTransform => {
   const { transformersFactoryArgs, authConfig, resolverConfig, userDefinedSlots, stackMapping, transformParameters } = config;
 
-  const transformers = constructTransformerChain(transformersFactoryArgs, transformParameters.allowGen1Patterns);
+  const transformers = constructTransformerChain(transformersFactoryArgs);
 
   return new GraphQLTransform({
     transformers,