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

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

@@ -1,12 +1,7 @@
 import { DocumentNode } from 'graphql';
-import {
-  AppSyncAuthConfiguration,
-  GraphQLAPIProvider,
-  RDSLayerMapping,
-  VpcConfig,
-  ProvisionedConcurrencyConfig,
-} from '../graphql-api-provider';
-import { TransformerDataSourceManagerProvider, DataSourceType } from './transformer-datasource-provider';
+import { AppSyncAuthConfiguration, GraphQLAPIProvider } from '../graphql-api-provider';
+import { DataSourceStrategiesProvider, RDSLayerMappingProvider } from '../model-datasource';
+import { TransformerDataSourceManagerProvider } from './transformer-datasource-provider';
 import { TransformerProviderRegistry } from './transformer-provider-registry';
 import { TransformerContextOutputProvider } from './transformer-context-output-provider';
 import { StackManagerProvider } from './stack-manager-provider';
@@ -16,22 +11,20 @@ import { TransformerResolversManagerProvider } from './transformer-resolver-prov
 import { SynthParameters } from './synth-parameters';
 
 export interface TransformerContextMetadataProvider {
-  set<T>(key: string, value: T): void;
-  get<T>(key: string): T | undefined;
-  has(key: string): boolean;
+  set: <T>(key: string, value: T) => void;
+  get: <T>(key: string) => T | undefined;
+  has: (key: string) => boolean;
 }
 
 export type TransformerSecrets = { [key: string]: any };
 
-export interface TransformerContextProvider {
+export interface TransformerContextProvider extends DataSourceStrategiesProvider, RDSLayerMappingProvider {
   metadata: TransformerContextMetadataProvider;
   resolvers: TransformerResolversManagerProvider;
   dataSources: TransformerDataSourceManagerProvider;
   providerRegistry: TransformerProviderRegistry;
 
   inputDocument: DocumentNode;
-  modelToDatasourceMap: Map<string, DataSourceType>;
-  datasourceSecretParameterLocations: Map<string, TransformerSecrets>;
   output: TransformerContextOutputProvider;
   stackManager: StackManagerProvider;
   api: GraphQLAPIProvider;
@@ -39,19 +32,16 @@ export interface TransformerContextProvider {
   authConfig: AppSyncAuthConfiguration;
   transformParameters: TransformParameters;
   synthParameters: SynthParameters;
-  customQueries: Map<string, string>;
 
-  isProjectUsingDataStore(): boolean;
-  getResolverConfig<ResolverConfig>(): ResolverConfig | undefined;
-  readonly sqlLambdaVpcConfig?: VpcConfig;
-  readonly rdsLayerMapping?: RDSLayerMapping;
-  readonly sqlLambdaProvisionedConcurrencyConfig?: ProvisionedConcurrencyConfig;
+  isProjectUsingDataStore: () => boolean;
+  getResolverConfig: <ResolverConfig>() => ResolverConfig | undefined;
 }
 
 export type TransformerBeforeStepContextProvider = Pick<
   TransformerContextProvider,
   | 'inputDocument'
-  | 'modelToDatasourceMap'
+  | 'dataSourceStrategies'
+  | 'sqlDirectiveDataSourceStrategies'
   | 'transformParameters'
   | 'isProjectUsingDataStore'
   | 'getResolverConfig'
@@ -63,7 +53,8 @@ export type TransformerBeforeStepContextProvider = Pick<
 export type TransformerSchemaVisitStepContextProvider = Pick<
   TransformerContextProvider,
   | 'inputDocument'
-  | 'modelToDatasourceMap'
+  | 'dataSourceStrategies'
+  | 'sqlDirectiveDataSourceStrategies'
   | 'output'
   | 'providerRegistry'
   | 'transformParameters'
@@ -77,7 +68,8 @@ export type TransformerSchemaVisitStepContextProvider = Pick<
 export type TransformerValidationStepContextProvider = Pick<
   TransformerContextProvider,
   | 'inputDocument'
-  | 'modelToDatasourceMap'
+  | 'dataSourceStrategies'
+  | 'sqlDirectiveDataSourceStrategies'
   | 'output'
   | 'providerRegistry'
   | 'dataSources'

package/node_modules/@aws-amplify/graphql-transformer-interfaces/src/transformer-context/transformer-datasource-provider.ts

@@ -26,46 +26,3 @@ export interface TransformerDataSourceManagerProvider {
 }
 
 export interface DataSourceProvider extends BackedDataSource {}
-
-/**
- * Supported transformable database types. TODO: Move this to amplify-graphql-api-construct
- */
-export type DBType = 'DDB' | SQLDBType;
-
-/**
- * Supported transformable SQL database types. TODO: Move this to amplify-graphql-api-construct
- */
-export type SQLDBType = 'MySQL' | 'Postgres';
-
-// TODO: add strategy for the RDS. TODO: Move this to amplify-graphql-api-construct
-export type DataSourceProvisionStrategy = DynamoDBProvisionStrategy | SQLLambdaModelProvisionStrategy;
-
-/**
- * Provisioning configuration for a DynamoDB datasource. TODO: Remove this type in favor of strategy definitions in
- * amplify-graphql-api-construct
- */
-export const enum DynamoDBProvisionStrategy {
-  /**
-   * Use default CloudFormation resource of `AWS::DynamoDB::Table`
-   */
-  DEFAULT = 'DEFAULT',
-  /**
-   * Use custom resource type `Custom::AmplifyDynamoDBTable`
-   */
-  AMPLIFY_TABLE = 'AMPLIFY_TABLE',
-}
-
-// TODO: Remove this type in favor of fully-specified SQLLambdaModelDataSourceStrategy from amplify-graphql-api-construct
-export const enum SQLLambdaModelProvisionStrategy {
-  /**
-   * A strategy that creates a Lambda to connect to a pre-existing SQL table to resolve model data.
-   */
-  DEFAULT = 'DEFAULT',
-}
-
-// TODO: Replace usages of this type with ModelDataSourceStrategy
-export interface DataSourceType {
-  dbType: DBType;
-  provisionDB: boolean;
-  provisionStrategy: DataSourceProvisionStrategy;
-}