@aws-amplify/graphql-api-construct 1.4.2 → 1.5.0

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

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.2.0](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-sql-transformer@0.1.3...@aws-amplify/graphql-sql-transformer@0.2.0) (2023-12-06)
+
+### Features
+
+- combine heterogeneous data sources ([#2109](https://github.com/aws-amplify/amplify-category-api/issues/2109)) ([fd58bb5](https://github.com/aws-amplify/amplify-category-api/commit/fd58bb5af4249220d17c9751acf677955aed74ea))
+
+## [0.1.3](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-sql-transformer@0.1.2...@aws-amplify/graphql-sql-transformer@0.1.3) (2023-11-22)
+
+### Bug Fixes
+
+- Allow custom SQL statements without model declarations ([#2087](https://github.com/aws-amplify/amplify-category-api/issues/2087)) ([ea5b26c](https://github.com/aws-amplify/amplify-category-api/commit/ea5b26cd554f5c74b6431cbad6ccf60ab556478f))
+
 ## [0.1.2](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-sql-transformer@0.1.1...@aws-amplify/graphql-sql-transformer@0.1.2) (2023-11-18)
 
 **Note:** Version bump only for package @aws-amplify/graphql-sql-transformer

package/node_modules/@aws-amplify/graphql-sql-transformer/lib/graphql-sql-transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-sql-transformer.d.ts","sourceRoot":"","sources":["../src/graphql-sql-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,qBAAqB,EACtB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,0BAA0B,EAAE,yCAAyC,EAAE,MAAM,6CAA6C,CAAC;AAkBpI,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAcpH,qBAAa,cAAe,SAAQ,qBAAqB;IACvD,OAAO,CAAC,kBAAkB,CAAoE;;IAM9F,KAAK,WACK,wBAAwB,GAAG,2BAA2B,cAClD,mBAAmB,aACpB,aAAa,OACnB,yCAAyC,KAC7C,IAAI,CAgCL;IAEF,iBAAiB,YAAa,0BAA0B,KAAG,IAAI,CA+C7D;CACH;AAqCD,eAAO,MAAM,gCAAgC,cAAe,MAAM,aAAa,MAAM,iBAAiB,MAAM,KAAG,MAgB9G,CAAC;AAEF,eAAO,MAAM,wCAAwC,QAAO,MAQ3D,CAAC"}
+{"version":3,"file":"graphql-sql-transformer.d.ts","sourceRoot":"","sources":["../src/graphql-sql-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,qBAAqB,EACtB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,0BAA0B,EAAE,yCAAyC,EAAE,MAAM,6CAA6C,CAAC;AAkBpI,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAcpH,qBAAa,cAAe,SAAQ,qBAAqB;IACvD,OAAO,CAAC,kBAAkB,CAAoE;;IAM9F,KAAK,WACK,wBAAwB,GAAG,2BAA2B,cAClD,mBAAmB,aACpB,aAAa,OACnB,yCAAyC,KAC7C,IAAI,CAkCL;IAEF,iBAAiB,YAAa,0BAA0B,KAAG,IAAI,CAwD7D;CACH;AAwDD,eAAO,MAAM,gCAAgC,cAAe,MAAM,aAAa,MAAM,iBAAiB,MAAM,KAAG,MAgB9G,CAAC;AAEF,eAAO,MAAM,wCAAwC,QAAO,MAQ3D,CAAC"}

package/node_modules/@aws-amplify/graphql-sql-transformer/lib/graphql-sql-transformer.js

@@ -44,7 +44,7 @@ class SqlTransformer extends graphql_transformer_core_1.TransformerPluginBase {
             const directiveWrapped = new graphql_transformer_core_1.DirectiveWrapper(directive);
             if (!((_a = directive === null || directive === void 0 ? void 0 : directive.arguments) === null || _a === void 0 ? void 0 : _a.find((arg) => arg.name.value === 'statement')) &&
                 !((_b = directive === null || directive === void 0 ? void 0 : directive.arguments) === null || _b === void 0 ? void 0 : _b.find((arg) => arg.name.value === 'reference'))) {
-                throw new graphql_transformer_core_1.InvalidDirectiveError(`@sql directive must have either a 'statement' or 'reference' argument. Check type "${parent.name.value}" and field "${definition.name.value}".`);
+                throw new graphql_transformer_core_1.InvalidDirectiveError(`@sql directive must have either a 'statement' or a 'reference' argument. Check type "${parent.name.value}" and field "${definition.name.value}".`);
             }
             const args = directiveWrapped.getArguments({
                 resolverTypeName: parent.name.value,
@@ -70,9 +70,17 @@ class SqlTransformer extends graphql_transformer_core_1.TransformerPluginBase {
             });
             this.sqlDirectiveFields.forEach((resolverFns) => {
                 resolverFns.forEach((config) => {
-                    const { SQLLambdaDataSourceLogicalID: dataSourceId } = graphql_transformer_common_1.ResourceConstants.RESOURCES;
+                    var _a;
+                    const typeName = config.resolverTypeName;
+                    const fieldName = config.resolverFieldName;
+                    const strategy = (_a = context.sqlDirectiveDataSourceStrategies) === null || _a === void 0 ? void 0 : _a.find((css) => css.typeName === typeName && css.fieldName === fieldName);
+                    if (!strategy) {
+                        throw new Error(`Could not find custom SQL strategy for ${typeName}.${fieldName}`);
+                    }
+                    const resourceNames = (0, graphql_transformer_core_1.getResourceNamesForStrategy)(strategy.strategy);
+                    const dataSourceId = resourceNames.sqlLambdaDataSource;
                     const dataSource = context.api.host.getDataSource(dataSourceId);
-                    const statement = getStatement(config, context.customQueries);
+                    const statement = getStatement(config, strategy.customSqlStatements);
                     const resolverResourceId = graphql_transformer_common_1.ResolverResourceIDs.ResolverResourceID(config.resolverTypeName, config.resolverFieldName);
                     const resolver = context.resolvers.generateQueryResolver(config.resolverTypeName, config.resolverFieldName, resolverResourceId, dataSource, graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString((0, exports.generateSqlLambdaRequestTemplate)(statement, 'RAW_SQL', config.resolverFieldName), `${config.resolverTypeName}.${config.resolverFieldName}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString((0, exports.generateSqlLambdaResponseMappingTemplate)(), `${config.resolverTypeName}.${config.resolverFieldName}.res.vtl`));
                     resolver.addToSlot('postAuth', graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(generateAuthExpressionForSandboxMode(context.transformParameters.sandboxModeEnabled), `${config.resolverTypeName}.${config.resolverFieldName}.{slotName}.{slotIndex}.req.vtl`));
@@ -93,19 +101,31 @@ const generateAuthExpressionForSandboxMode = (enabled) => {
         exp = (0, graphql_mapping_template_1.methodCall)((0, graphql_mapping_template_1.ref)('util.unauthorized'));
     return (0, graphql_mapping_template_1.printBlock)(`Sandbox Mode ${enabled ? 'Enabled' : 'Disabled'}`)((0, graphql_mapping_template_1.compoundExpression)([(0, graphql_mapping_template_1.iff)((0, graphql_mapping_template_1.not)((0, graphql_mapping_template_1.ref)('ctx.stash.get("hasAuth")')), exp), (0, graphql_mapping_template_1.toJson)((0, graphql_mapping_template_1.obj)({}))]));
 };
-const getStatement = (config, customQueries) => {
-    var _a;
-    if (config.reference && !customQueries.has(config.reference)) {
-        throw new graphql_transformer_core_1.InvalidDirectiveError(`@sql directive 'reference' argument must be a valid custom query name. Check type "${config.resolverTypeName}" and field "${config.resolverFieldName}". The custom query "${config.reference}" does not exist in "sql-statements" directory.`);
+const getStatementFromStatementAttribute = (config) => {
+    const statement = config.statement;
+    if (statement === undefined || statement.trim().length === 0) {
+        throw new graphql_transformer_core_1.InvalidDirectiveError(`@sql directive 'statement' argument must not be empty. Check type "${config.resolverTypeName}" and field "${config.resolverFieldName}".`);
+    }
+    return statement;
+};
+const getStatementFromReferenceAttribute = (config, customQueries) => {
+    if (!config.reference || !customQueries || !customQueries[config.reference]) {
+        throw new graphql_transformer_core_1.InvalidDirectiveError(`The ${config.resolverTypeName} field "${config.resolverFieldName}" references a custom SQL statement "${config.reference}" that ` +
+            `doesn't exist. Verify that "${config.reference}" is a key in the customSqlStatements property.`);
     }
+    return customQueries[config.reference];
+};
+const getStatement = (config, customQueries) => {
     if (config.reference && config.statement) {
-        throw new graphql_transformer_core_1.InvalidDirectiveError(`@sql directive can have either 'statement' or 'reference' argument but not both. Check type "${config.resolverTypeName}" and field "${config.resolverFieldName}".`);
+        throw new graphql_transformer_core_1.InvalidDirectiveError(`@sql directive can have either a 'statement' or a 'reference' argument but not both. Check type "${config.resolverTypeName}" and field "${config.resolverFieldName}".`);
     }
-    if (config.statement !== undefined && config.statement.trim().length === 0) {
-        throw new graphql_transformer_core_1.InvalidDirectiveError(`@sql directive 'statement' argument must not be empty. Check type "${config.resolverTypeName}" and field "${config.resolverFieldName}".`);
+    if (typeof config.statement === 'string') {
+        return getStatementFromStatementAttribute(config);
     }
-    const statement = (_a = config.statement) !== null && _a !== void 0 ? _a : customQueries.get(config.reference);
-    return statement;
+    if (typeof config.reference === 'string') {
+        return getStatementFromReferenceAttribute(config, customQueries);
+    }
+    throw new graphql_transformer_core_1.InvalidDirectiveError(`@sql directive must have either a 'statement' or a 'reference' argument. Check type "${config.resolverTypeName}" and field "${config.resolverFieldName}".`);
 };
 const generateSqlLambdaRequestTemplate = (statement, operation, operationName) => {
     return (0, graphql_mapping_template_1.printBlock)('Invoke RDS Lambda data source')((0, graphql_mapping_template_1.compoundExpression)([

package/node_modules/@aws-amplify/graphql-sql-transformer/lib/graphql-sql-transformer.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-sql-transformer.js","sourceRoot":"","sources":["../src/graphql-sql-transformer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graphql-sql-transformer.js","sourceRoot":"","sources":["../src/graphql-sql-transformer.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-sql-transformer",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "Amplify GraphQL @sql transformer",
   "repository": {
     "type": "git",
@@ -28,15 +28,15 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/graphql-model-transformer": "2.3.2",
-    "@aws-amplify/graphql-transformer-core": "2.3.2",
-    "@aws-amplify/graphql-transformer-interfaces": "3.3.0",
+    "@aws-amplify/graphql-model-transformer": "2.4.0",
+    "@aws-amplify/graphql-transformer-core": "2.4.0",
+    "@aws-amplify/graphql-transformer-interfaces": "3.3.2",
     "graphql": "^15.5.0",
-    "graphql-mapping-template": "4.20.12",
-    "graphql-transformer-common": "4.26.2"
+    "graphql-mapping-template": "4.20.13",
+    "graphql-transformer-common": "4.27.0"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-transformer-test-utils": "0.3.2"
+    "@aws-amplify/graphql-transformer-test-utils": "0.4.0"
   },
   "peerDependencies": {
     "aws-cdk-lib": "^2.80.0",
@@ -63,9 +63,13 @@
         "lines": 90
       }
     },
+    "coverageReporters": [
+      "clover",
+      "text"
+    ],
     "modulePathIgnorePatterns": [
       "overrides"
     ]
   },
-  "gitHead": "4aa08fae3f0a4b953ef7267522ae537e7ff063ac"
+  "gitHead": "6e450d037cf84098b51ce787a99d6023cbc0e39d"
 }

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

@@ -7,21 +7,18 @@
 import { AppSyncAuthConfiguration } from '@aws-amplify/graphql-transformer-interfaces';
 import { AssetProvider } from '@aws-amplify/graphql-transformer-interfaces';
 import { Construct } from 'constructs';
-import { DataSourceType } from '@aws-amplify/graphql-transformer-interfaces';
+import type { DataSourceStrategiesProvider } from '@aws-amplify/graphql-transformer-interfaces';
 import { GraphQLTransform } from '@aws-amplify/graphql-transformer-core';
 import { IFunction } from 'aws-cdk-lib/aws-lambda';
 import { NestedStackProvider } from '@aws-amplify/graphql-transformer-interfaces';
-import { ProvisionedConcurrencyConfig } from '@aws-amplify/graphql-transformer-interfaces';
-import { RDSConnectionSecrets } from '@aws-amplify/graphql-transformer-core';
-import { RDSLayerMapping } from '@aws-amplify/graphql-transformer-interfaces';
+import type { RDSLayerMappingProvider } from '@aws-amplify/graphql-transformer-interfaces';
 import { ResolverConfig } from '@aws-amplify/graphql-transformer-core';
 import { SynthParameters } from '@aws-amplify/graphql-transformer-interfaces';
 import { TransformerLog } from '@aws-amplify/graphql-transformer-interfaces';
 import { TransformerPluginProvider } from '@aws-amplify/graphql-transformer-interfaces';
 import { TransformParameterProvider } from '@aws-amplify/graphql-transformer-interfaces';
-import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces/src';
+import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces';
 import { UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
-import { VpcConfig } from '@aws-amplify/graphql-transformer-interfaces';
 
 // @public (undocumented)
 export const constructTransform: (config: TransformConfig) => GraphQLTransform;
@@ -33,20 +30,14 @@ export const constructTransformerChain: (options?: TransformerFactoryArgs) => Tr
 export const executeTransform: (config: ExecuteTransformConfig) => void;
 
 // @public (undocumented)
-export type ExecuteTransformConfig = TransformConfig & {
+export type ExecuteTransformConfig = TransformConfig & DataSourceStrategiesProvider & RDSLayerMappingProvider & {
     schema: string;
-    modelToDatasourceMap?: Map<string, DataSourceType>;
-    customQueries?: Map<string, string>;
-    datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>;
     printTransformerLog?: (log: TransformerLog) => void;
-    sqlLambdaVpcConfig?: VpcConfig;
-    rdsLayerMapping?: RDSLayerMapping;
     scope: Construct;
     nestedStackProvider: NestedStackProvider;
     parameterProvider?: TransformParameterProvider;
     assetProvider: AssetProvider;
     synthParameters: SynthParameters;
-    sqlLambdaProvisionedConcurrencyConfig?: ProvisionedConcurrencyConfig;
 };
 
 // @public (undocumented)
@@ -57,9 +48,6 @@ export type TransformConfig = {
     userDefinedSlots?: Record<string, UserDefinedSlot[]>;
     stackMapping?: Record<string, string>;
     transformParameters: TransformParameters;
-    sqlLambdaVpcConfig?: VpcConfig;
-    rdsLayerMapping?: RDSLayerMapping;
-    sqlLambdaProvisionedConcurrencyConfig?: ProvisionedConcurrencyConfig;
 };
 
 // @public (undocumented)

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

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.3.4](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@1.3.3...@aws-amplify/graphql-transformer@1.3.4) (2023-12-06)
+
+**Note:** Version bump only for package @aws-amplify/graphql-transformer
+
+## [1.3.3](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@1.3.2...@aws-amplify/graphql-transformer@1.3.3) (2023-11-22)
+
+### Bug Fixes
+
+- Allow custom SQL statements without model declarations ([#2087](https://github.com/aws-amplify/amplify-category-api/issues/2087)) ([ea5b26c](https://github.com/aws-amplify/amplify-category-api/commit/ea5b26cd554f5c74b6431cbad6ccf60ab556478f))
+
 ## [1.3.2](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@1.3.1...@aws-amplify/graphql-transformer@1.3.2) (2023-11-18)
 
 **Note:** Version bump only for package @aws-amplify/graphql-transformer

package/node_modules/@aws-amplify/graphql-transformer/lib/graphql-transformer.d.ts

@@ -1,6 +1,6 @@
-import { AppSyncAuthConfiguration, TransformerPluginProvider, TransformerLog, VpcConfig, RDSLayerMapping, NestedStackProvider, AssetProvider, SynthParameters, TransformParameterProvider, DataSourceType, ProvisionedConcurrencyConfig } from '@aws-amplify/graphql-transformer-interfaces';
-import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces/src';
-import { GraphQLTransform, RDSConnectionSecrets, ResolverConfig, UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
+import { AppSyncAuthConfiguration, TransformerPluginProvider, TransformerLog, NestedStackProvider, AssetProvider, SynthParameters, TransformParameterProvider } from '@aws-amplify/graphql-transformer-interfaces';
+import type { DataSourceStrategiesProvider, RDSLayerMappingProvider, TransformParameters } from '@aws-amplify/graphql-transformer-interfaces';
+import { GraphQLTransform, ResolverConfig, UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
 import { Construct } from 'constructs';
 import { IFunction } from 'aws-cdk-lib/aws-lambda';
 export type TransformerFactoryArgs = {
@@ -15,26 +15,17 @@ export type TransformConfig = {
     userDefinedSlots?: Record<string, UserDefinedSlot[]>;
     stackMapping?: Record<string, string>;
     transformParameters: TransformParameters;
-    sqlLambdaVpcConfig?: VpcConfig;
-    rdsLayerMapping?: RDSLayerMapping;
-    sqlLambdaProvisionedConcurrencyConfig?: ProvisionedConcurrencyConfig;
 };
 export declare const constructTransformerChain: (options?: TransformerFactoryArgs) => TransformerPluginProvider[];
 export declare const constructTransform: (config: TransformConfig) => GraphQLTransform;
-export type ExecuteTransformConfig = TransformConfig & {
+export type ExecuteTransformConfig = TransformConfig & DataSourceStrategiesProvider & RDSLayerMappingProvider & {
     schema: string;
-    modelToDatasourceMap?: Map<string, DataSourceType>;
-    customQueries?: Map<string, string>;
-    datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>;
     printTransformerLog?: (log: TransformerLog) => void;
-    sqlLambdaVpcConfig?: VpcConfig;
-    rdsLayerMapping?: RDSLayerMapping;
     scope: Construct;
     nestedStackProvider: NestedStackProvider;
     parameterProvider?: TransformParameterProvider;
     assetProvider: AssetProvider;
     synthParameters: SynthParameters;
-    sqlLambdaProvisionedConcurrencyConfig?: ProvisionedConcurrencyConfig;
 };
 export declare const defaultPrintTransformerLog: (log: TransformerLog) => void;
 export declare const executeTransform: (config: ExecuteTransformConfig) => void;

package/node_modules/@aws-amplify/graphql-transformer/lib/graphql-transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-transformer.d.ts","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":"AAgBA,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,cAAc,EAEd,SAAS,EACT,eAAe,EACf,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,0BAA0B,EAC1B,cAAc,EACd,4BAA4B,EAC7B,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAChI,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,MAAM,MAAM,sBAAsB,GAAG;IACnC,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,kBAAkB,CAAC,EAAE,yBAAyB,EAAE,CAAC;IACjD,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAC7C,CAAC;AAKF,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,EAAE,sBAAsB,CAAC;IAChD,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,CAAC,EAAE,wBAAwB,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IACrD,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,qCAAqC,CAAC,EAAE,4BAA4B,CAAC;CACtE,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,sBAAsB,KAAG,yBAAyB,EAyBrG,CAAC;AAOF,eAAO,MAAM,kBAAkB,WAAY,eAAe,KAAG,gBA0B5D,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAAG;IACrD,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACnD,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,kCAAkC,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IACvE,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAC;IACpD,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,EAAE,SAAS,CAAC;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,CAAC,EAAE,0BAA0B,CAAC;IAC/C,aAAa,EAAE,aAAa,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC;IACjC,qCAAqC,CAAC,EAAE,4BAA4B,CAAC;CACtE,CAAC;AAMF,eAAO,MAAM,0BAA0B,QAAS,cAAc,KAAG,IAiBhE,CAAC;AAOF,eAAO,MAAM,gBAAgB,WAAY,sBAAsB,KAAG,IAmCjE,CAAC"}
+{"version":3,"file":"graphql-transformer.d.ts","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":"AAgBA,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,cAAc,EAEd,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,0BAA0B,EAC3B,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EACV,4BAA4B,EAC5B,uBAAuB,EACvB,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAC1G,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,MAAM,MAAM,sBAAsB,GAAG;IACnC,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,kBAAkB,CAAC,EAAE,yBAAyB,EAAE,CAAC;IACjD,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAC7C,CAAC;AAKF,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,EAAE,sBAAsB,CAAC;IAChD,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,CAAC,EAAE,wBAAwB,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IACrD,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,sBAAsB,KAAG,yBAAyB,EAyBrG,CAAC;AAOF,eAAO,MAAM,kBAAkB,WAAY,eAAe,KAAG,gBAa5D,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAClD,4BAA4B,GAC5B,uBAAuB,GAAG;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAC;IACpD,KAAK,EAAE,SAAS,CAAC;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,CAAC,EAAE,0BAA0B,CAAC;IAC/C,aAAa,EAAE,aAAa,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC;CAClC,CAAC;AAMJ,eAAO,MAAM,0BAA0B,QAAS,cAAc,KAAG,IAiBhE,CAAC;AAOF,eAAO,MAAM,gBAAgB,WAAY,sBAAsB,KAAG,IA+BjE,CAAC"}

package/node_modules/@aws-amplify/graphql-transformer/lib/graphql-transformer.js

@@ -42,7 +42,7 @@ const constructTransformerChain = (options) => {
 };
 exports.constructTransformerChain = constructTransformerChain;
 const constructTransform = (config) => {
-    const { transformersFactoryArgs, authConfig, resolverConfig, userDefinedSlots, stackMapping, transformParameters, sqlLambdaVpcConfig, rdsLayerMapping, sqlLambdaProvisionedConcurrencyConfig, } = config;
+    const { transformersFactoryArgs, authConfig, resolverConfig, userDefinedSlots, stackMapping, transformParameters } = config;
     const transformers = (0, exports.constructTransformerChain)(transformersFactoryArgs);
     return new graphql_transformer_core_1.GraphQLTransform({
         transformers,
@@ -51,9 +51,6 @@ const constructTransform = (config) => {
         transformParameters,
         userDefinedSlots,
         resolverConfig,
-        sqlLambdaVpcConfig,
-        rdsLayerMapping,
-        sqlLambdaProvisionedConcurrencyConfig,
     });
 };
 exports.constructTransform = constructTransform;
@@ -77,23 +74,20 @@ const defaultPrintTransformerLog = (log) => {
 };
 exports.defaultPrintTransformerLog = defaultPrintTransformerLog;
 const executeTransform = (config) => {
-    const { schema, modelToDatasourceMap, datasourceSecretParameterLocations, printTransformerLog, rdsLayerMapping, scope, nestedStackProvider, assetProvider, synthParameters, customQueries, parameterProvider, } = config;
+    const { assetProvider, dataSourceStrategies, nestedStackProvider, parameterProvider, printTransformerLog, rdsLayerMapping, schema, scope, sqlDirectiveDataSourceStrategies, synthParameters, } = config;
     const printLog = printTransformerLog !== null && printTransformerLog !== void 0 ? printTransformerLog : exports.defaultPrintTransformerLog;
     const transform = (0, exports.constructTransform)(config);
     try {
         transform.transform({
-            scope,
+            assetProvider,
+            dataSourceStrategies,
             nestedStackProvider,
             parameterProvider,
-            assetProvider,
-            synthParameters,
+            rdsLayerMapping,
             schema,
-            datasourceConfig: {
-                modelToDatasourceMap,
-                datasourceSecretParameterLocations,
-                rdsLayerMapping,
-                customQueries,
-            },
+            scope,
+            sqlDirectiveDataSourceStrategies,
+            synthParameters,
         });
     }
     finally {

package/node_modules/@aws-amplify/graphql-transformer/lib/graphql-transformer.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-transformer.js","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graphql-transformer.js","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-transformer",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Amplify GraphQL Transformer Root Package",
   "repository": {
     "type": "git",
@@ -28,19 +28,19 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/graphql-auth-transformer": "3.2.2",
-    "@aws-amplify/graphql-default-value-transformer": "2.1.11",
-    "@aws-amplify/graphql-function-transformer": "2.1.10",
-    "@aws-amplify/graphql-http-transformer": "2.1.10",
-    "@aws-amplify/graphql-index-transformer": "2.2.2",
-    "@aws-amplify/graphql-maps-to-transformer": "3.3.2",
-    "@aws-amplify/graphql-model-transformer": "2.3.2",
-    "@aws-amplify/graphql-predictions-transformer": "2.1.10",
-    "@aws-amplify/graphql-relational-transformer": "2.2.2",
-    "@aws-amplify/graphql-searchable-transformer": "2.3.2",
-    "@aws-amplify/graphql-sql-transformer": "0.1.2",
-    "@aws-amplify/graphql-transformer-core": "2.3.2",
-    "@aws-amplify/graphql-transformer-interfaces": "3.3.0"
+    "@aws-amplify/graphql-auth-transformer": "3.3.0",
+    "@aws-amplify/graphql-default-value-transformer": "2.2.0",
+    "@aws-amplify/graphql-function-transformer": "2.1.12",
+    "@aws-amplify/graphql-http-transformer": "2.1.12",
+    "@aws-amplify/graphql-index-transformer": "2.3.0",
+    "@aws-amplify/graphql-maps-to-transformer": "3.4.0",
+    "@aws-amplify/graphql-model-transformer": "2.4.0",
+    "@aws-amplify/graphql-predictions-transformer": "2.1.12",
+    "@aws-amplify/graphql-relational-transformer": "2.3.0",
+    "@aws-amplify/graphql-searchable-transformer": "2.4.0",
+    "@aws-amplify/graphql-sql-transformer": "0.2.0",
+    "@aws-amplify/graphql-transformer-core": "2.4.0",
+    "@aws-amplify/graphql-transformer-interfaces": "3.3.2"
   },
   "devDependencies": {
     "@types/node": "^12.12.6",
@@ -73,7 +73,11 @@
         "functions": 80,
         "lines": 80
       }
-    }
+    },
+    "coverageReporters": [
+      "clover",
+      "text"
+    ]
   },
-  "gitHead": "4aa08fae3f0a4b953ef7267522ae537e7ff063ac"
+  "gitHead": "6e450d037cf84098b51ce787a99d6023cbc0e39d"
 }

package/node_modules/@aws-amplify/graphql-transformer/src/graphql-transformer.ts

@@ -19,17 +19,17 @@ import {
   TransformerPluginProvider,
   TransformerLog,
   TransformerLogLevel,
-  VpcConfig,
-  RDSLayerMapping,
   NestedStackProvider,
   AssetProvider,
   SynthParameters,
   TransformParameterProvider,
-  DataSourceType,
-  ProvisionedConcurrencyConfig,
 } from '@aws-amplify/graphql-transformer-interfaces';
-import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces/src';
-import { GraphQLTransform, RDSConnectionSecrets, ResolverConfig, UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
+import type {
+  DataSourceStrategiesProvider,
+  RDSLayerMappingProvider,
+  TransformParameters,
+} from '@aws-amplify/graphql-transformer-interfaces';
+import { GraphQLTransform, ResolverConfig, UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
 import { Construct } from 'constructs';
 import { IFunction } from 'aws-cdk-lib/aws-lambda';
 
@@ -53,9 +53,6 @@ export type TransformConfig = {
   userDefinedSlots?: Record<string, UserDefinedSlot[]>;
   stackMapping?: Record<string, string>;
   transformParameters: TransformParameters;
-  sqlLambdaVpcConfig?: VpcConfig;
-  rdsLayerMapping?: RDSLayerMapping;
-  sqlLambdaProvisionedConcurrencyConfig?: ProvisionedConcurrencyConfig;
 };
 
 export const constructTransformerChain = (options?: TransformerFactoryArgs): TransformerPluginProvider[] => {
@@ -91,17 +88,7 @@ export const constructTransformerChain = (options?: TransformerFactoryArgs): Tra
  * @returns the GraphQLTransform object, which can be used for transformation or preprocessing a given schema.
  */
 export const constructTransform = (config: TransformConfig): GraphQLTransform => {
-  const {
-    transformersFactoryArgs,
-    authConfig,
-    resolverConfig,
-    userDefinedSlots,
-    stackMapping,
-    transformParameters,
-    sqlLambdaVpcConfig,
-    rdsLayerMapping,
-    sqlLambdaProvisionedConcurrencyConfig,
-  } = config;
+  const { transformersFactoryArgs, authConfig, resolverConfig, userDefinedSlots, stackMapping, transformParameters } = config;
 
   const transformers = constructTransformerChain(transformersFactoryArgs);
 
@@ -112,27 +99,20 @@ export const constructTransform = (config: TransformConfig): GraphQLTransform =>
     transformParameters,
     userDefinedSlots,
     resolverConfig,
-    sqlLambdaVpcConfig,
-    rdsLayerMapping,
-    sqlLambdaProvisionedConcurrencyConfig,
   });
 };
 
-export type ExecuteTransformConfig = TransformConfig & {
-  schema: string;
-  modelToDatasourceMap?: Map<string, DataSourceType>;
-  customQueries?: Map<string, string>;
-  datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>;
-  printTransformerLog?: (log: TransformerLog) => void;
-  sqlLambdaVpcConfig?: VpcConfig;
-  rdsLayerMapping?: RDSLayerMapping;
-  scope: Construct;
-  nestedStackProvider: NestedStackProvider;
-  parameterProvider?: TransformParameterProvider;
-  assetProvider: AssetProvider;
-  synthParameters: SynthParameters;
-  sqlLambdaProvisionedConcurrencyConfig?: ProvisionedConcurrencyConfig;
-};
+export type ExecuteTransformConfig = TransformConfig &
+  DataSourceStrategiesProvider &
+  RDSLayerMappingProvider & {
+    schema: string;
+    printTransformerLog?: (log: TransformerLog) => void;
+    scope: Construct;
+    nestedStackProvider: NestedStackProvider;
+    parameterProvider?: TransformParameterProvider;
+    assetProvider: AssetProvider;
+    synthParameters: SynthParameters;
+  };
 
 /**
  * By default, rely on console to print out the transformer logs.
@@ -164,35 +144,31 @@ export const defaultPrintTransformerLog = (log: TransformerLog): void => {
  */
 export const executeTransform = (config: ExecuteTransformConfig): void => {
   const {
-    schema,
-    modelToDatasourceMap,
-    datasourceSecretParameterLocations,
+    assetProvider,
+    dataSourceStrategies,
+    nestedStackProvider,
+    parameterProvider,
     printTransformerLog,
     rdsLayerMapping,
+    schema,
     scope,
-    nestedStackProvider,
-    assetProvider,
+    sqlDirectiveDataSourceStrategies,
     synthParameters,
-    customQueries,
-    parameterProvider,
   } = config;
 
   const printLog = printTransformerLog ?? defaultPrintTransformerLog;
   const transform = constructTransform(config);
   try {
     transform.transform({
-      scope,
+      assetProvider,
+      dataSourceStrategies,
       nestedStackProvider,
       parameterProvider,
-      assetProvider,
-      synthParameters,
+      rdsLayerMapping,
       schema,
-      datasourceConfig: {
-        modelToDatasourceMap,
-        datasourceSecretParameterLocations,
-        rdsLayerMapping,
-        customQueries,
-      },
+      scope,
+      sqlDirectiveDataSourceStrategies,
+      synthParameters,
     });
   } finally {
     transform.getLogs().forEach(printLog);