@aws-amplify/graphql-api-construct 1.4.1 → 1.4.3

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

@@ -407,19 +407,26 @@ export class ResourceConstants {
         OpenSearchStreamingLambdaIAMRoleLogicalID: string;
         OpenSearchStreamingLambdaFunctionLogicalID: string;
         OpenSearchDataSourceLogicalID: string;
+        SQLLambdaAliasLogicalID: string;
         SQLLambdaIAMRoleLogicalID: string;
         SQLLambdaLogAccessPolicy: string;
-        SQLPatchingLambdaIAMRoleLogicalID: string;
         SQLLambdaLogicalID: string;
+        SQLStackName: string;
+        SQLVpcEndpointLogicalIDPrefix: string;
+        SQLLambdaDataSourceLogicalID: string;
+        SQLPatchingLambdaIAMRoleLogicalID: string;
         SQLPatchingLambdaLogAccessPolicy: string;
         SQLPatchingLambdaLogicalID: string;
-        SQLLambdaDataSourceLogicalID: string;
         SQLPatchingSubscriptionLogicalID: string;
         SQLPatchingTopicLogicalID: string;
-        SQLLambdaAliasLogicalID: string;
+        AmplifySQLLayerNotificationTopicName: string;
+        AmplifySQLLayerNotificationTopicAccount: string;
+        SQLLayerVersionManifestBucket: string;
+        SQLLayerVersionManifestBucketRegion: string;
+        SQLLayerVersionManifestKeyPrefix: string;
         SQLLambdaLayerVersionLogicalID: string;
         SQLLayerMappingID: string;
-        SQLVpcEndpointLogicalIDPrefix: string;
+        SQLLayerVersionCustomResourceID: string;
         NoneDataSource: string;
         AuthCognitoUserPoolLogicalID: string;
         AuthCognitoUserPoolNativeClientLogicalID: string;

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

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.26.2](https://github.com/aws-amplify/amplify-category-api/compare/graphql-transformer-common@4.26.1...graphql-transformer-common@4.26.2) (2023-11-18)
+
+### Bug Fixes
+
+- regionalize lambda layer patching SNS topics ([#2079](https://github.com/aws-amplify/amplify-category-api/issues/2079)) ([6006c86](https://github.com/aws-amplify/amplify-category-api/commit/6006c86cd4ee624b24c184fab523fcdcdb38be63))
+
 ## [4.26.1](https://github.com/aws-amplify/amplify-category-api/compare/graphql-transformer-common@4.26.0...graphql-transformer-common@4.26.1) (2023-11-16)
 
 ### Bug Fixes

package/node_modules/graphql-transformer-common/lib/ResourceConstants.d.ts

@@ -19,19 +19,26 @@ export declare class ResourceConstants {
         OpenSearchStreamingLambdaIAMRoleLogicalID: string;
         OpenSearchStreamingLambdaFunctionLogicalID: string;
         OpenSearchDataSourceLogicalID: string;
+        SQLLambdaAliasLogicalID: string;
         SQLLambdaIAMRoleLogicalID: string;
         SQLLambdaLogAccessPolicy: string;
-        SQLPatchingLambdaIAMRoleLogicalID: string;
         SQLLambdaLogicalID: string;
+        SQLStackName: string;
+        SQLVpcEndpointLogicalIDPrefix: string;
+        SQLLambdaDataSourceLogicalID: string;
+        SQLPatchingLambdaIAMRoleLogicalID: string;
         SQLPatchingLambdaLogAccessPolicy: string;
         SQLPatchingLambdaLogicalID: string;
-        SQLLambdaDataSourceLogicalID: string;
         SQLPatchingSubscriptionLogicalID: string;
         SQLPatchingTopicLogicalID: string;
-        SQLLambdaAliasLogicalID: string;
+        AmplifySQLLayerNotificationTopicName: string;
+        AmplifySQLLayerNotificationTopicAccount: string;
+        SQLLayerVersionManifestBucket: string;
+        SQLLayerVersionManifestBucketRegion: string;
+        SQLLayerVersionManifestKeyPrefix: string;
         SQLLambdaLayerVersionLogicalID: string;
         SQLLayerMappingID: string;
-        SQLVpcEndpointLogicalIDPrefix: string;
+        SQLLayerVersionCustomResourceID: string;
         NoneDataSource: string;
         AuthCognitoUserPoolLogicalID: string;
         AuthCognitoUserPoolNativeClientLogicalID: string;

package/node_modules/graphql-transformer-common/lib/ResourceConstants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ResourceConstants.d.ts","sourceRoot":"","sources":["../src/ResourceConstants.ts"],"names":[],"mappings":"AAAA,qBAAa,iBAAiB;IAC5B,OAAc,IAAI,SAAU;IAE5B,OAAc,kBAAkB,SAAO;IAEvC,OAAc,6BAA6B,SAAO;IAElD,OAAc,6BAA6B,SAAO;IAElD,gBAAuB,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAiD9B;IAEF,OAAc,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAiDtB;IAEF,OAAc,QAAQ,KAAM;IAE5B,OAAc,UAAU;;;;;;;MAYtB;IAEF,OAAc,OAAO;;;;;;;;;;;;;;;MAsBnB;IAEF,OAAc,QAAQ,KAAM;IAE5B,gBAAuB,QAAQ;;;;;;;;;;;;;;;MAe7B;CACH"}
+{"version":3,"file":"ResourceConstants.d.ts","sourceRoot":"","sources":["../src/ResourceConstants.ts"],"names":[],"mappings":"AAAA,qBAAa,iBAAiB;IAC5B,OAAc,IAAI,SAAU;IAE5B,OAAc,kBAAkB,SAAO;IAEvC,OAAc,6BAA6B,SAAO;IAElD,OAAc,6BAA6B,SAAO;IAElD,gBAAuB,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAoI9B;IAEF,OAAc,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAiDtB;IAEF,OAAc,QAAQ,KAAM;IAE5B,OAAc,UAAU;;;;;;;MAYtB;IAEF,OAAc,OAAO;;;;;;;;;;;;;;;MAsBnB;IAEF,OAAc,QAAQ,KAAM;IAE5B,gBAAuB,QAAQ;;;;;;;;;;;;;;;MAe7B;CACH"}

package/node_modules/graphql-transformer-common/lib/ResourceConstants.js

@@ -24,19 +24,26 @@ ResourceConstants.RESOURCES = {
     OpenSearchStreamingLambdaIAMRoleLogicalID: 'OpenSearchStreamingLambdaIAMRole',
     OpenSearchStreamingLambdaFunctionLogicalID: 'OpenSearchStreamingLambdaFunction',
     OpenSearchDataSourceLogicalID: 'OpenSearchDataSource',
+    SQLLambdaAliasLogicalID: 'SQLLambdaAlias',
     SQLLambdaIAMRoleLogicalID: 'SQLLambdaIAMRole',
     SQLLambdaLogAccessPolicy: 'SQLLambdaLogAccessPolicy',
-    SQLPatchingLambdaIAMRoleLogicalID: 'SQLPatchingLambdaIAMRole',
     SQLLambdaLogicalID: 'SQLLambdaFunction',
+    SQLStackName: 'SqlApiStack',
+    SQLVpcEndpointLogicalIDPrefix: 'SQLVpcEndpoint',
+    SQLLambdaDataSourceLogicalID: 'SQLLambdaDataSource',
+    SQLPatchingLambdaIAMRoleLogicalID: 'SQLPatchingLambdaIAMRole',
     SQLPatchingLambdaLogAccessPolicy: 'SQLPatchingLambdaLogAccessPolicy',
     SQLPatchingLambdaLogicalID: 'SQLPatchingLambda',
-    SQLLambdaDataSourceLogicalID: 'SQLLambdaDataSource',
     SQLPatchingSubscriptionLogicalID: 'SQLPatchingSubscription',
     SQLPatchingTopicLogicalID: 'SQLPatchingTopic',
-    SQLLambdaAliasLogicalID: 'SQLLambdaAlias',
+    AmplifySQLLayerNotificationTopicName: 'AmplifySQLLayerNotification',
+    AmplifySQLLayerNotificationTopicAccount: '582037449441',
+    SQLLayerVersionManifestBucket: 'amplify-rds-layer-resources',
+    SQLLayerVersionManifestBucketRegion: 'us-east-1',
+    SQLLayerVersionManifestKeyPrefix: 'sql-layer-versions/',
     SQLLambdaLayerVersionLogicalID: 'SQLLambdaLayerVersion',
     SQLLayerMappingID: 'SQLLayerResourceMapping',
-    SQLVpcEndpointLogicalIDPrefix: 'SQLVpcEndpoint',
+    SQLLayerVersionCustomResourceID: 'SQLLayerVersionCustomResource',
     NoneDataSource: 'NoneDataSource',
     AuthCognitoUserPoolLogicalID: 'AuthCognitoUserPool',
     AuthCognitoUserPoolNativeClientLogicalID: 'AuthCognitoUserPoolNativeClient',

package/node_modules/graphql-transformer-common/lib/ResourceConstants.js.map

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

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

@@ -1,6 +1,6 @@
 {
   "name": "graphql-transformer-common",
-  "version": "4.26.1",
+  "version": "4.26.2",
   "description": "Common code and constants for AppSync Transformers",
   "repository": {
     "type": "git",
@@ -54,6 +54,5 @@
       "json",
       "node"
     ]
-  },
-  "gitHead": "317a141956493f0940bb506470259026edf3b7bc"
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-api-construct",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "AppSync GraphQL Api Construct using Amplify GraphQL Transformer.",
   "repository": {
     "type": "git",
@@ -75,20 +75,20 @@
   "dependencies": {
     "@aws-amplify/backend-output-schemas": "^0.4.0",
     "@aws-amplify/backend-output-storage": "^0.2.2",
-    "@aws-amplify/graphql-auth-transformer": "3.2.1",
-    "@aws-amplify/graphql-default-value-transformer": "2.1.10",
-    "@aws-amplify/graphql-function-transformer": "2.1.9",
-    "@aws-amplify/graphql-http-transformer": "2.1.9",
-    "@aws-amplify/graphql-index-transformer": "2.2.1",
-    "@aws-amplify/graphql-maps-to-transformer": "3.3.1",
-    "@aws-amplify/graphql-model-transformer": "2.3.1",
-    "@aws-amplify/graphql-predictions-transformer": "2.1.9",
-    "@aws-amplify/graphql-relational-transformer": "2.2.1",
-    "@aws-amplify/graphql-searchable-transformer": "2.3.1",
-    "@aws-amplify/graphql-sql-transformer": "0.1.1",
-    "@aws-amplify/graphql-transformer": "1.3.1",
-    "@aws-amplify/graphql-transformer-core": "2.3.1",
-    "@aws-amplify/graphql-transformer-interfaces": "3.3.0",
+    "@aws-amplify/graphql-auth-transformer": "3.2.3",
+    "@aws-amplify/graphql-default-value-transformer": "2.1.12",
+    "@aws-amplify/graphql-function-transformer": "2.1.11",
+    "@aws-amplify/graphql-http-transformer": "2.1.11",
+    "@aws-amplify/graphql-index-transformer": "2.2.3",
+    "@aws-amplify/graphql-maps-to-transformer": "3.3.3",
+    "@aws-amplify/graphql-model-transformer": "2.3.3",
+    "@aws-amplify/graphql-predictions-transformer": "2.1.11",
+    "@aws-amplify/graphql-relational-transformer": "2.2.3",
+    "@aws-amplify/graphql-searchable-transformer": "2.3.3",
+    "@aws-amplify/graphql-sql-transformer": "0.1.3",
+    "@aws-amplify/graphql-transformer": "1.3.3",
+    "@aws-amplify/graphql-transformer-core": "2.3.3",
+    "@aws-amplify/graphql-transformer-interfaces": "3.3.1",
     "@aws-amplify/platform-core": "^0.2.0",
     "@aws-amplify/plugin-types": "^0.4.1",
     "charenc": "^0.0.2",
@@ -97,7 +97,7 @@
     "graceful-fs": "^4.2.11",
     "graphql": "^15.5.0",
     "graphql-mapping-template": "4.20.12",
-    "graphql-transformer-common": "4.26.1",
+    "graphql-transformer-common": "4.26.2",
     "hjson": "^3.2.2",
     "immer": "^9.0.12",
     "is-buffer": "^2.0.5",
@@ -164,5 +164,5 @@
       }
     }
   },
-  "gitHead": "317a141956493f0940bb506470259026edf3b7bc"
+  "gitHead": "5256b5955ee204dd56f8074a43406852f8206c54"
 }

package/src/amplify-graphql-api.ts

@@ -38,7 +38,6 @@ import type {
   IBackendOutputStorageStrategy,
   AddFunctionProps,
   ConflictResolution,
-  SQLLambdaModelDataSourceStrategy,
 } from './types';
 import {
   convertAuthorizationModesToTransformerAuthConfig,
@@ -50,9 +49,10 @@ import {
   CodegenAssets,
   getAdditionalAuthenticationTypes,
 } from './internal';
-import { isSQLLambdaModelDataSourceStrategy } from './sql-model-datasource-strategy';
-import { parseDataSourceConfig } from './internal/data-source-config';
+import { mapInterfaceCustomSqlStrategiesToImplementationStrategies, parseDataSourceConfig } from './internal/data-source-config';
 import { getStackForScope, walkAndProcessNodes } from './internal/construct-tree';
+import { SQLLambdaModelDataSourceStrategy } from './model-datasource-strategy';
+import { isSQLLambdaModelDataSourceStrategy } from './sql-model-datasource-strategy';
 
 /**
  * L3 Construct which invokes the Amplify Transformer Pattern over an input Graphql Schema.
@@ -209,8 +209,22 @@ export class AmplifyGraphqlApi extends Construct {
       ...parseDataSourceConfig(definition.dataSourceStrategies),
     };
 
+    // TODO: Normalize all of this once we start using strategies internally. Right now the data source configuration (VPC, connection info,
+    // etc) is separate from the DataSourceType, and singular
+    const customSqlDataSourceStrategies = mapInterfaceCustomSqlStrategiesToImplementationStrategies(
+      definition.customSqlDataSourceStrategies,
+    );
+    if (customSqlDataSourceStrategies.length > 0) {
+      executeTransformConfig = {
+        ...executeTransformConfig,
+        customSqlDataSourceStrategies,
+      };
+    }
+
     // TODO: Update this to support multiple definitions; right now we assume only one SQL data source type
-    for (const strategy of Object.values(definition.dataSourceStrategies)) {
+    const modelStrategies = Object.values(definition.dataSourceStrategies).filter(isSQLLambdaModelDataSourceStrategy);
+    const customSqlStrategies = definition.customSqlDataSourceStrategies?.map((css) => css.strategy) ?? [];
+    for (const strategy of [...modelStrategies, ...customSqlStrategies]) {
       if (isSQLLambdaModelDataSourceStrategy(strategy)) {
         executeTransformConfig = this.extendTransformConfig(executeTransformConfig, strategy);
         break;
@@ -235,7 +249,7 @@ export class AmplifyGraphqlApi extends Construct {
   /**
    * Extends executeTransformConfig with fields for provisioning a SQL Lambda
    * @param executeTransformConfig the executeTransformConfig to extend
-   * @param dataSourceDefinition the SQLLambdaModelDataSourceStrategy containing the SQL connection values to add to the transform config
+   * @param strategy the SQLLambdaModelDataSourceStrategy containing the SQL connection values to add to the transform config
    * @returns the extended configuration that includes SQL DB connection information
    */
   private extendTransformConfig(
@@ -243,6 +257,7 @@ export class AmplifyGraphqlApi extends Construct {
     strategy: SQLLambdaModelDataSourceStrategy,
   ): ExecuteTransformConfig {
     const extendedConfig = { ...executeTransformConfig };
+
     if (strategy.customSqlStatements) {
       extendedConfig.customQueries = new Map(Object.entries(strategy.customSqlStatements));
     }

package/src/amplify-graphql-definition.ts

@@ -1,7 +1,9 @@
 import * as os from 'os';
 import { SchemaFile } from 'aws-cdk-lib/aws-appsync';
-import { IAmplifyGraphqlDefinition, ModelDataSourceStrategy } from './types';
+import { IAmplifyGraphqlDefinition } from './types';
 import { constructDataSourceStrategyMap } from './internal';
+import { ModelDataSourceStrategy } from './model-datasource-strategy';
+import { constructCustomSqlDataSourceStrategies } from './internal/data-source-config';
 
 export const DEFAULT_MODEL_DATA_SOURCE_STRATEGY: ModelDataSourceStrategy = {
   dbType: 'DYNAMODB',
@@ -18,8 +20,8 @@ export class AmplifyGraphqlDefinition {
    * **NOTE** The 'dataSourceStrategy' configuration option is in preview and is not recommended to use with production systems.
    *
    * @param schema the graphql input as a string
-   * @param dataSourceStrategy the provisioning definition for datasources that resolve `@model`s in this schema. The DynamoDB from
-   * CloudFormation will be used by default.
+   * @param dataSourceStrategy the provisioning definition for datasources that resolve `@model`s and custom SQL statements in this schema.
+   * The DynamoDB from CloudFormation will be used by default.
    * @experimental dataSourceStrategy
    * @returns a fully formed amplify graphql definition
    */
@@ -32,6 +34,7 @@ export class AmplifyGraphqlDefinition {
       functionSlots: [],
       referencedLambdaFunctions: {},
       dataSourceStrategies: constructDataSourceStrategyMap(schema, dataSourceStrategy),
+      customSqlDataSourceStrategies: constructCustomSqlDataSourceStrategies(schema, dataSourceStrategy),
     };
   }
 
@@ -45,12 +48,7 @@ export class AmplifyGraphqlDefinition {
       filePaths = [filePaths];
     }
     const schema = filePaths.map((filePath) => new SchemaFile({ filePath }).definition).join(os.EOL);
-    return {
-      schema,
-      functionSlots: [],
-      referencedLambdaFunctions: {},
-      dataSourceStrategies: constructDataSourceStrategyMap(schema, DEFAULT_MODEL_DATA_SOURCE_STRATEGY),
-    };
+    return AmplifyGraphqlDefinition.fromString(schema, DEFAULT_MODEL_DATA_SOURCE_STRATEGY);
   }
 
   /**
@@ -72,12 +70,7 @@ export class AmplifyGraphqlDefinition {
       filePaths = [filePaths];
     }
     const schema = filePaths.map((filePath) => new SchemaFile({ filePath }).definition).join(os.EOL);
-    return {
-      schema,
-      functionSlots: [],
-      referencedLambdaFunctions: {},
-      dataSourceStrategies: constructDataSourceStrategyMap(schema, dataSourceStrategy),
-    };
+    return AmplifyGraphqlDefinition.fromString(schema, dataSourceStrategy);
   }
 
   /**

package/src/index.ts

@@ -1,6 +1,6 @@
 /* ATTENTION
  *
- * If you modify this file your must also modify packages/amplify-data-construct/src/index.ts to have the same exports
+ * If you modify this file you must also modify packages/amplify-data-construct/src/index.ts to have the same exports
  */
 export type {
   IAMAuthorizationConfig,
@@ -31,16 +31,6 @@ export type {
   IBackendOutputStorageStrategy,
   IBackendOutputEntry,
   AddFunctionProps,
-  ModelDataSourceStrategy,
-  DefaultDynamoDbModelDataSourceStrategy,
-  AmplifyDynamoDbModelDataSourceStrategy,
-  SQLLambdaModelDataSourceStrategy,
-  ModelDataSourceStrategyDbType,
-  VpcConfig,
-  SubnetAvailabilityZone,
-  SQLLambdaLayerMapping,
-  SqlModelDataSourceDbConnectionConfig,
-  ProvisionedConcurrencyConfig,
 } from './types';
 export { AmplifyGraphqlApi } from './amplify-graphql-api';
 export { AmplifyGraphqlDefinition } from './amplify-graphql-definition';
@@ -52,3 +42,5 @@ export {
   SSEType,
   StreamSpecification,
 } from './amplify-dynamodb-table-wrapper';
+export { SQLLambdaModelDataSourceStrategyFactory } from './sql-model-datasource-strategy';
+export * from './model-datasource-strategy';

package/src/internal/data-source-config.ts

@@ -1,46 +1,23 @@
+import { parse } from 'graphql';
 import {
+  CustomSqlDataSourceStrategy as ImplementationCustomSqlDataSourceStrategy,
   DataSourceType,
-  DynamoDBProvisionStrategy,
-  SQLDBType,
   SQLLambdaModelProvisionStrategy,
 } from '@aws-amplify/graphql-transformer-interfaces';
-import { ModelDataSourceStrategy } from '../types';
+import {
+  dataSourceStrategyToDataSourceType,
+  isSqlStrategy,
+  isQueryNode,
+  isMutationNode,
+  fieldsWithSqlDirective,
+} from '@aws-amplify/graphql-transformer-core';
+import { normalizeDbType } from '@aws-amplify/graphql-transformer-core/lib/utils';
+import { CustomSqlDataSourceStrategy as InterfaceCustomSqlDataSourceStrategy, ModelDataSourceStrategy } from '../model-datasource-strategy';
 
 type DataSourceConfig = {
   modelToDatasourceMap: Map<string, DataSourceType>;
 };
 
-// TODO: Do away with this after we normalize database types throughout the internals
-const convertSQLDBType = (definitionDBType: 'MYSQL' | 'POSTGRES'): SQLDBType => (definitionDBType === 'MYSQL' ? 'MySQL' : 'Postgres');
-
-const convertToDataSourceType = (dataSourceStrategy: ModelDataSourceStrategy): DataSourceType => {
-  if (dataSourceStrategy.dbType === 'DYNAMODB') {
-    switch (dataSourceStrategy.provisionStrategy) {
-      case 'DEFAULT':
-        return {
-          dbType: 'DDB',
-          provisionDB: true,
-          provisionStrategy: DynamoDBProvisionStrategy.DEFAULT,
-        };
-      case 'AMPLIFY_TABLE':
-        return {
-          dbType: 'DDB',
-          provisionDB: true,
-          provisionStrategy: DynamoDBProvisionStrategy.AMPLIFY_TABLE,
-        };
-      default:
-        throw new Error(`Encountered unexpected provision strategy: ${(dataSourceStrategy as any).provisionStrategy}`);
-    }
-  } else if (dataSourceStrategy.dbType === 'MYSQL' || dataSourceStrategy.dbType === 'POSTGRES') {
-    return {
-      dbType: convertSQLDBType(dataSourceStrategy.dbType),
-      provisionDB: false,
-      provisionStrategy: SQLLambdaModelProvisionStrategy.DEFAULT,
-    };
-  }
-  throw new Error(`Encountered unexpected database type ${dataSourceStrategy.dbType}`);
-};
-
 /**
  * An internal helper to convert from a map of model-to-ModelDataSourceStrategies to the map of model-to-DataSourceTypes that internal
  * transform processing requires. TODO: We can remove this once we refactor the internals to use ModelDataSourceStrategies natively.
@@ -48,10 +25,87 @@ const convertToDataSourceType = (dataSourceStrategy: ModelDataSourceStrategy): D
 export const parseDataSourceConfig = (dataSourceDefinitionMap: Record<string, ModelDataSourceStrategy>): DataSourceConfig => {
   const modelToDatasourceMap = new Map<string, DataSourceType>();
   for (const [key, value] of Object.entries(dataSourceDefinitionMap)) {
-    const dataSourceType = convertToDataSourceType(value);
+    const dataSourceType = dataSourceStrategyToDataSourceType(value);
     modelToDatasourceMap.set(key, dataSourceType);
   }
   return {
     modelToDatasourceMap,
   };
 };
+
+/**
+ * Creates an interface flavor of customSqlDataSourceStrategies from a factory method's schema and data source. Internally, this function
+ * scans the fields of `Query` and `Mutation` looking for fields annotated with the `@sql` directive and designates the specified
+ * dataSourceStrategy to fulfill those custom queries.
+ *
+ * Note that we do not scan for `Subscription` fields: `@sql` directives are not allowed on those, and it wouldn't make sense to do so
+ * anyway, since subscriptions are processed from an incoming Mutation, not as the result of a direct datasource access.
+ *
+ * TODO: Reword this when we refactor to use Strategies throughout the implementation rather than DataSources.
+ */
+export const constructCustomSqlDataSourceStrategies = (
+  schema: string,
+  dataSourceStrategy: ModelDataSourceStrategy,
+): InterfaceCustomSqlDataSourceStrategy[] => {
+  if (!isSqlStrategy(dataSourceStrategy)) {
+    return [];
+  }
+
+  const parsedSchema = parse(schema);
+
+  const queryNode = parsedSchema.definitions.find(isQueryNode);
+  const mutationNode = parsedSchema.definitions.find(isMutationNode);
+  if (!queryNode && !mutationNode) {
+    return [];
+  }
+
+  const customSqlDataSourceStrategies: InterfaceCustomSqlDataSourceStrategy[] = [];
+
+  if (queryNode) {
+    const fields = fieldsWithSqlDirective(queryNode);
+    for (const field of fields) {
+      customSqlDataSourceStrategies.push({
+        typeName: 'Query',
+        fieldName: field.name.value,
+        strategy: dataSourceStrategy,
+      });
+    }
+  }
+
+  if (mutationNode) {
+    const fields = fieldsWithSqlDirective(mutationNode);
+    for (const field of fields) {
+      customSqlDataSourceStrategies.push({
+        typeName: 'Mutation',
+        fieldName: field.name.value,
+        strategy: dataSourceStrategy,
+      });
+    }
+  }
+
+  return customSqlDataSourceStrategies;
+};
+
+/**
+ * We currently use a different type structure to model strategies in the interface than we do in the implementation. This maps the
+ * interface CustomSqlDataSourceStrategy (which uses SQLLambdaModelDataSourceStrategy) to the implementation flavor (which uses
+ * DataSourceType).
+ *
+ * TODO: Remove this once we refactor the internals to use strategies rather than DataSourceTypes
+ */
+export const mapInterfaceCustomSqlStrategiesToImplementationStrategies = (
+  strategies?: InterfaceCustomSqlDataSourceStrategy[],
+): ImplementationCustomSqlDataSourceStrategy[] => {
+  if (!strategies) {
+    return [];
+  }
+  return strategies.map((interfaceStrategy) => ({
+    fieldName: interfaceStrategy.fieldName,
+    typeName: interfaceStrategy.typeName,
+    dataSourceType: {
+      dbType: normalizeDbType(interfaceStrategy.strategy.dbType),
+      provisionDB: false,
+      provisionStrategy: SQLLambdaModelProvisionStrategy.DEFAULT,
+    },
+  }));
+};

package/src/internal/model-type-name.ts

@@ -1,5 +1,5 @@
-import { ModelDataSourceStrategy } from '../types';
 import { Kind, ObjectTypeDefinitionNode, StringValueNode, parse } from 'graphql';
+import { ModelDataSourceStrategy } from '../model-datasource-strategy';
 
 const MODEL_DIRECTIVE_NAME = 'model';
 const MANY_TO_MANY_DIRECTIVE_NAME = 'manyToMany';
@@ -8,7 +8,7 @@ const MANY_TO_MANY_DIRECTIVE_NAME = 'manyToMany';
  * @param schema graphql schema in SDL
  * @returns type names which model diretives are attached
  */
-export function getModelTypeNames(schema: string): string[] {
+export const getModelTypeNames = (schema: string): string[] => {
   const parsedSchema = parse(schema);
   const nodesWithModelDirective = parsedSchema.definitions.filter(
     (obj) => obj.kind === Kind.OBJECT_TYPE_DEFINITION && obj.directives?.some((dir) => dir.name.value === MODEL_DIRECTIVE_NAME),
@@ -28,7 +28,7 @@ export function getModelTypeNames(schema: string): string[] {
     });
   });
   return modelKeys.filter((key, idx) => modelKeys.indexOf(key) === idx);
-}
+};
 
 export const constructDataSourceStrategyMap = (
   schema: string,