@aws-amplify/graphql-transformer 0.1.1-rds.0 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/API.md +11 -6
  2. package/CHANGELOG.md +4 -2
  3. package/lib/graphql-transformer.d.ts +10 -5
  4. package/lib/graphql-transformer.d.ts.map +1 -1
  5. package/lib/graphql-transformer.js +14 -9
  6. package/lib/graphql-transformer.js.map +1 -1
  7. package/lib/index.d.ts.map +1 -1
  8. package/package.json +20 -15
  9. package/src/graphql-transformer.ts +34 -16
  10. package/src/index.ts +0 -2
package/API.md CHANGED
@@ -5,14 +5,16 @@
5
5
  ```ts
6
6
 
7
7
  import { AppSyncAuthConfiguration } from '@aws-amplify/graphql-transformer-interfaces';
8
+ import { AssetProvider } from '@aws-amplify/graphql-transformer-interfaces';
9
+ import { Construct } from 'constructs';
8
10
  import { DatasourceType } from '@aws-amplify/graphql-transformer-core';
9
- import { DeploymentResources } from '@aws-amplify/graphql-transformer-interfaces';
10
11
  import { GraphQLTransform } from '@aws-amplify/graphql-transformer-core';
11
- import { OverrideConfig } from '@aws-amplify/graphql-transformer-core';
12
+ import { IFunction } from 'aws-cdk-lib/aws-lambda';
13
+ import { NestedStackProvider } from '@aws-amplify/graphql-transformer-interfaces';
12
14
  import { RDSConnectionSecrets } from '@aws-amplify/graphql-transformer-core';
13
15
  import { RDSLayerMapping } from '@aws-amplify/graphql-transformer-interfaces';
14
16
  import { ResolverConfig } from '@aws-amplify/graphql-transformer-core';
15
- import { Template } from '@aws-amplify/graphql-transformer-interfaces';
17
+ import { SynthParameters } from '@aws-amplify/graphql-transformer-interfaces';
16
18
  import { TransformerLog } from '@aws-amplify/graphql-transformer-interfaces';
17
19
  import { TransformerPluginProvider } from '@aws-amplify/graphql-transformer-interfaces';
18
20
  import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces/src';
@@ -26,7 +28,7 @@ export const constructTransform: (config: TransformConfig) => GraphQLTransform;
26
28
  export const constructTransformerChain: (options?: TransformerFactoryArgs) => TransformerPluginProvider[];
27
29
 
28
30
  // @public (undocumented)
29
- export const executeTransform: (config: ExecuteTransformConfig) => DeploymentResources;
31
+ export const executeTransform: (config: ExecuteTransformConfig) => void;
30
32
 
31
33
  // @public (undocumented)
32
34
  export type ExecuteTransformConfig = TransformConfig & {
@@ -36,6 +38,10 @@ export type ExecuteTransformConfig = TransformConfig & {
36
38
  printTransformerLog?: (log: TransformerLog) => void;
37
39
  sqlLambdaVpcConfig?: VpcConfig;
38
40
  rdsLayerMapping?: RDSLayerMapping;
41
+ scope: Construct;
42
+ nestedStackProvider: NestedStackProvider;
43
+ assetProvider: AssetProvider;
44
+ synthParameters: SynthParameters;
39
45
  };
40
46
 
41
47
  // @public (undocumented)
@@ -43,8 +49,6 @@ export type TransformConfig = {
43
49
  transformersFactoryArgs: TransformerFactoryArgs;
44
50
  resolverConfig?: ResolverConfig;
45
51
  authConfig?: AppSyncAuthConfiguration;
46
- stacks?: Record<string, Template>;
47
- overrideConfig?: OverrideConfig;
48
52
  userDefinedSlots?: Record<string, UserDefinedSlot[]>;
49
53
  stackMapping?: Record<string, string>;
50
54
  transformParameters: TransformParameters;
@@ -59,6 +63,7 @@ export type TransformerFactoryArgs = {
59
63
  adminRoles?: Array<string>;
60
64
  identityPoolId?: string;
61
65
  customTransformers?: TransformerPluginProvider[];
66
+ functionNameMap?: Record<string, IFunction>;
62
67
  };
63
68
 
64
69
  // (No @packageDocumentation comment for this package)
package/CHANGELOG.md CHANGED
@@ -3,9 +3,11 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
- ## [0.1.1-rds.0](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@0.1.0...@aws-amplify/graphql-transformer@0.1.1-rds.0) (2023-08-07)
6
+ # [1.1.0](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@0.1.0...@aws-amplify/graphql-transformer@1.1.0) (2023-08-09)
7
7
 
8
- **Note:** Version bump only for package @aws-amplify/graphql-transformer
8
+ ### Features
9
+
10
+ - bump major version of transformer packages ([2458c84](https://github.com/aws-amplify/amplify-category-api/commit/2458c8426da5772aa669d37e11f99ee9c6c5ac2e))
9
11
 
10
12
  # [0.1.0](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@0.0.7...@aws-amplify/graphql-transformer@0.1.0) (2023-07-21)
11
13
 
package/lib/graphql-transformer.d.ts CHANGED
@@ -1,19 +1,20 @@
1
- import { AppSyncAuthConfiguration, DeploymentResources, Template, TransformerPluginProvider, TransformerLog, VpcConfig, RDSLayerMapping } from '@aws-amplify/graphql-transformer-interfaces';
1
+ import { AppSyncAuthConfiguration, TransformerPluginProvider, TransformerLog, VpcConfig, RDSLayerMapping, NestedStackProvider, AssetProvider, SynthParameters } from '@aws-amplify/graphql-transformer-interfaces';
2
2
  import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces/src';
3
- import { DatasourceType, GraphQLTransform, OverrideConfig, RDSConnectionSecrets, ResolverConfig, UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
3
+ import { DatasourceType, GraphQLTransform, RDSConnectionSecrets, ResolverConfig, UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
4
+ import { Construct } from 'constructs';
5
+ import { IFunction } from 'aws-cdk-lib/aws-lambda';
4
6
  export type TransformerFactoryArgs = {
5
7
  authConfig?: any;
6
8
  storageConfig?: any;
7
9
  adminRoles?: Array<string>;
8
10
  identityPoolId?: string;
9
11
  customTransformers?: TransformerPluginProvider[];
12
+ functionNameMap?: Record<string, IFunction>;
10
13
  };
11
14
  export type TransformConfig = {
12
15
  transformersFactoryArgs: TransformerFactoryArgs;
13
16
  resolverConfig?: ResolverConfig;
14
17
  authConfig?: AppSyncAuthConfiguration;
15
- stacks?: Record<string, Template>;
16
- overrideConfig?: OverrideConfig;
17
18
  userDefinedSlots?: Record<string, UserDefinedSlot[]>;
18
19
  stackMapping?: Record<string, string>;
19
20
  transformParameters: TransformParameters;
@@ -29,7 +30,11 @@ export type ExecuteTransformConfig = TransformConfig & {
29
30
  printTransformerLog?: (log: TransformerLog) => void;
30
31
  sqlLambdaVpcConfig?: VpcConfig;
31
32
  rdsLayerMapping?: RDSLayerMapping;
33
+ scope: Construct;
34
+ nestedStackProvider: NestedStackProvider;
35
+ assetProvider: AssetProvider;
36
+ synthParameters: SynthParameters;
32
37
  };
33
38
  export declare const defaultPrintTransformerLog: (log: TransformerLog) => void;
34
- export declare const executeTransform: (config: ExecuteTransformConfig) => DeploymentResources;
39
+ export declare const executeTransform: (config: ExecuteTransformConfig) => void;
35
40
  //# sourceMappingURL=graphql-transformer.d.ts.map
package/lib/graphql-transformer.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"graphql-transformer.d.ts","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,wBAAwB,EACxB,mBAAmB,EACnB,QAAQ,EACR,yBAAyB,EACzB,cAAc,EAEd,SAAS,EACT,eAAe,EAChB,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,cAAc,EACd,oBAAoB,EACpB,cAAc,EACd,eAAe,EAChB,MAAM,uCAAuC,CAAC;AAM/C,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,yBAAyB,EAAE,CAAC;CAClD,CAAC;AAKF,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,EAAE,sBAAsB,CAAC;IAChD,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,CAAC,EAAE,wBAAwB,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAClC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,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;CACnC,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,sBAAsB,KAAG,yBAAyB,EA0BrG,CAAC;AAOF,eAAO,MAAM,kBAAkB,WAAY,eAAe,KAAG,gBA4B5D,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,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;CACnC,CAAC;AAMF,eAAO,MAAM,0BAA0B,QAAS,cAAc,KAAG,IAiBhE,CAAC;AAOF,eAAO,MAAM,gBAAgB,WAAY,sBAAsB,KAAG,mBAejE,CAAC"}
1
+ {"version":3,"file":"graphql-transformer.d.ts","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,cAAc,EAEd,SAAS,EACT,eAAe,EACf,mBAAmB,EACnB,aAAa,EACb,eAAe,EAChB,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACd,eAAe,EAChB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,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;CACnC,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,sBAAsB,KAAG,yBAAyB,EA0BrG,CAAC;AAOF,eAAO,MAAM,kBAAkB,WAAY,eAAe,KAAG,gBAwB5D,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,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,aAAa,EAAE,aAAa,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC;CAClC,CAAC;AAMF,eAAO,MAAM,0BAA0B,QAAS,cAAc,KAAG,IAiBhE,CAAC;AAOF,eAAO,MAAM,gBAAgB,WAAY,sBAAsB,KAAG,IAgCjE,CAAC"}
package/lib/graphql-transformer.js CHANGED
@@ -24,7 +24,7 @@ const constructTransformerChain = (options) => {
24
24
  const hasOneTransformer = new graphql_relational_transformer_1.HasOneTransformer();
25
25
  return [
26
26
  modelTransformer,
27
- new graphql_function_transformer_1.FunctionTransformer(),
27
+ new graphql_function_transformer_1.FunctionTransformer(options === null || options === void 0 ? void 0 : options.functionNameMap),
28
28
  new graphql_http_transformer_1.HttpTransformer(),
29
29
  new graphql_predictions_transformer_1.PredictionsTransformer(options === null || options === void 0 ? void 0 : options.storageConfig),
30
30
  new graphql_index_transformer_1.PrimaryKeyTransformer(),
@@ -42,17 +42,15 @@ const constructTransformerChain = (options) => {
42
42
  };
43
43
  exports.constructTransformerChain = constructTransformerChain;
44
44
  const constructTransform = (config) => {
45
- const { transformersFactoryArgs, authConfig, resolverConfig, overrideConfig, userDefinedSlots, stacks, stackMapping, transformParameters, sqlLambdaVpcConfig, rdsLayerMapping, } = config;
45
+ const { transformersFactoryArgs, authConfig, resolverConfig, userDefinedSlots, stackMapping, transformParameters, sqlLambdaVpcConfig, rdsLayerMapping, } = config;
46
46
  const transformers = (0, exports.constructTransformerChain)(transformersFactoryArgs);
47
47
  return new graphql_transformer_core_1.GraphQLTransform({
48
48
  transformers,
49
49
  stackMapping,
50
50
  authConfig,
51
- stacks,
52
51
  transformParameters,
53
52
  userDefinedSlots,
54
53
  resolverConfig,
55
- overrideConfig,
56
54
  sqlLambdaVpcConfig,
57
55
  rdsLayerMapping,
58
56
  });
@@ -78,14 +76,21 @@ const defaultPrintTransformerLog = (log) => {
78
76
  };
79
77
  exports.defaultPrintTransformerLog = defaultPrintTransformerLog;
80
78
  const executeTransform = (config) => {
81
- const { schema, modelToDatasourceMap, datasourceSecretParameterLocations, printTransformerLog, rdsLayerMapping } = config;
79
+ const { schema, modelToDatasourceMap, datasourceSecretParameterLocations, printTransformerLog, rdsLayerMapping, scope, nestedStackProvider, assetProvider, synthParameters, } = config;
82
80
  const printLog = printTransformerLog !== null && printTransformerLog !== void 0 ? printTransformerLog : exports.defaultPrintTransformerLog;
83
81
  const transform = (0, exports.constructTransform)(config);
84
82
  try {
85
- return transform.transform(schema, {
86
- modelToDatasourceMap,
87
- datasourceSecretParameterLocations,
88
- rdsLayerMapping,
83
+ transform.transform({
84
+ scope,
85
+ nestedStackProvider,
86
+ assetProvider,
87
+ synthParameters,
88
+ schema,
89
+ datasourceConfig: {
90
+ modelToDatasourceMap,
91
+ datasourceSecretParameterLocations,
92
+ rdsLayerMapping,
93
+ },
89
94
  });
90
95
  }
91
96
  finally {
package/lib/graphql-transformer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"graphql-transformer.js","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"graphql-transformer.js","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":"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"}
package/lib/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAExG,YAAY,EAAE,sBAAsB,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACxG,YAAY,EAAE,sBAAsB,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-amplify/graphql-transformer",
3
- "version": "0.1.1-rds.0",
3
+ "version": "1.1.0",
4
4
  "description": "Amplify GraphQL Transformer Root Package",
5
5
  "repository": {
6
6
  "type": "git",
@@ -28,24 +28,29 @@
28
28
  "access": "public"
29
29
  },
30
30
  "dependencies": {
31
- "@aws-amplify/graphql-auth-transformer": "2.1.14-rds.0",
32
- "@aws-amplify/graphql-default-value-transformer": "1.1.14-rds.0",
33
- "@aws-amplify/graphql-function-transformer": "1.2.12-rds.0",
34
- "@aws-amplify/graphql-http-transformer": "1.2.12-rds.0",
35
- "@aws-amplify/graphql-index-transformer": "1.2.10-rds.0",
36
- "@aws-amplify/graphql-maps-to-transformer": "2.1.14-rds.0",
37
- "@aws-amplify/graphql-model-transformer": "1.5.0-rds.0",
38
- "@aws-amplify/graphql-predictions-transformer": "1.2.12-rds.0",
39
- "@aws-amplify/graphql-relational-transformer": "1.3.0-rds.0",
40
- "@aws-amplify/graphql-searchable-transformer": "1.2.12-rds.0",
41
- "@aws-amplify/graphql-transformer-core": "1.5.0-rds.0",
42
- "@aws-amplify/graphql-transformer-interfaces": "2.3.0"
31
+ "@aws-amplify/graphql-auth-transformer": "3.1.0",
32
+ "@aws-amplify/graphql-default-value-transformer": "2.1.0",
33
+ "@aws-amplify/graphql-function-transformer": "2.1.0",
34
+ "@aws-amplify/graphql-http-transformer": "2.1.0",
35
+ "@aws-amplify/graphql-index-transformer": "2.1.0",
36
+ "@aws-amplify/graphql-maps-to-transformer": "3.1.0",
37
+ "@aws-amplify/graphql-model-transformer": "2.1.0",
38
+ "@aws-amplify/graphql-predictions-transformer": "2.1.0",
39
+ "@aws-amplify/graphql-relational-transformer": "2.1.0",
40
+ "@aws-amplify/graphql-searchable-transformer": "2.1.0",
41
+ "@aws-amplify/graphql-transformer-core": "2.1.0",
42
+ "@aws-amplify/graphql-transformer-interfaces": "3.1.0"
43
43
  },
44
44
  "devDependencies": {
45
45
  "@types/node": "^12.12.6",
46
+ "fs-extra": "^8.1.0",
46
47
  "rimraf": "^3.0.0",
47
48
  "ts-jest": "26.4.4"
48
49
  },
50
+ "peerDependencies": {
51
+ "aws-cdk-lib": "^2.80.0",
52
+ "constructs": "^10.0.5"
53
+ },
49
54
  "jest": {
50
55
  "testURL": "http://localhost",
51
56
  "transform": {
@@ -63,11 +68,11 @@
63
68
  "collectCoverage": true,
64
69
  "coverageThreshold": {
65
70
  "global": {
66
- "branches": 80,
71
+ "branches": 74,
67
72
  "functions": 80,
68
73
  "lines": 80
69
74
  }
70
75
  }
71
76
  },
72
- "gitHead": "ce50129f66540242a333df9b4ca76fb90cfc00ef"
77
+ "gitHead": "de6751fd91228eecae518326515833f72509afa0"
73
78
  }
package/src/graphql-transformer.ts CHANGED
@@ -15,23 +15,25 @@ import {
15
15
  import { SearchableModelTransformer } from '@aws-amplify/graphql-searchable-transformer';
16
16
  import {
17
17
  AppSyncAuthConfiguration,
18
- DeploymentResources,
19
- Template,
20
18
  TransformerPluginProvider,
21
19
  TransformerLog,
22
20
  TransformerLogLevel,
23
21
  VpcConfig,
24
22
  RDSLayerMapping,
23
+ NestedStackProvider,
24
+ AssetProvider,
25
+ SynthParameters,
25
26
  } from '@aws-amplify/graphql-transformer-interfaces';
26
27
  import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces/src';
27
28
  import {
28
29
  DatasourceType,
29
30
  GraphQLTransform,
30
- OverrideConfig,
31
31
  RDSConnectionSecrets,
32
32
  ResolverConfig,
33
33
  UserDefinedSlot,
34
34
  } from '@aws-amplify/graphql-transformer-core';
35
+ import { Construct } from 'constructs';
36
+ import { IFunction } from 'aws-cdk-lib/aws-lambda';
35
37
 
36
38
  /**
37
39
  * Arguments passed into a TransformerFactory
@@ -43,6 +45,7 @@ export type TransformerFactoryArgs = {
43
45
  adminRoles?: Array<string>;
44
46
  identityPoolId?: string;
45
47
  customTransformers?: TransformerPluginProvider[];
48
+ functionNameMap?: Record<string, IFunction>;
46
49
  };
47
50
 
48
51
  /**
@@ -52,8 +55,6 @@ export type TransformConfig = {
52
55
  transformersFactoryArgs: TransformerFactoryArgs;
53
56
  resolverConfig?: ResolverConfig;
54
57
  authConfig?: AppSyncAuthConfiguration;
55
- stacks?: Record<string, Template>;
56
- overrideConfig?: OverrideConfig;
57
58
  userDefinedSlots?: Record<string, UserDefinedSlot[]>;
58
59
  stackMapping?: Record<string, string>;
59
60
  transformParameters: TransformParameters;
@@ -72,7 +73,7 @@ export const constructTransformerChain = (options?: TransformerFactoryArgs): Tra
72
73
 
73
74
  return [
74
75
  modelTransformer,
75
- new FunctionTransformer(),
76
+ new FunctionTransformer(options?.functionNameMap),
76
77
  new HttpTransformer(),
77
78
  new PredictionsTransformer(options?.storageConfig),
78
79
  new PrimaryKeyTransformer(),
@@ -99,9 +100,7 @@ export const constructTransform = (config: TransformConfig): GraphQLTransform =>
99
100
  transformersFactoryArgs,
100
101
  authConfig,
101
102
  resolverConfig,
102
- overrideConfig,
103
103
  userDefinedSlots,
104
- stacks,
105
104
  stackMapping,
106
105
  transformParameters,
107
106
  sqlLambdaVpcConfig,
@@ -114,11 +113,9 @@ export const constructTransform = (config: TransformConfig): GraphQLTransform =>
114
113
  transformers,
115
114
  stackMapping,
116
115
  authConfig,
117
- stacks,
118
116
  transformParameters,
119
117
  userDefinedSlots,
120
118
  resolverConfig,
121
- overrideConfig,
122
119
  sqlLambdaVpcConfig,
123
120
  rdsLayerMapping,
124
121
  });
@@ -131,6 +128,10 @@ export type ExecuteTransformConfig = TransformConfig & {
131
128
  printTransformerLog?: (log: TransformerLog) => void;
132
129
  sqlLambdaVpcConfig?: VpcConfig;
133
130
  rdsLayerMapping?: RDSLayerMapping;
131
+ scope: Construct;
132
+ nestedStackProvider: NestedStackProvider;
133
+ assetProvider: AssetProvider;
134
+ synthParameters: SynthParameters;
134
135
  };
135
136
 
136
137
  /**
@@ -161,17 +162,34 @@ export const defaultPrintTransformerLog = (log: TransformerLog): void => {
161
162
  * @param config the configuration for the transform.
162
163
  * @returns the transformed api deployment resources.
163
164
  */
164
- export const executeTransform = (config: ExecuteTransformConfig): DeploymentResources => {
165
- const { schema, modelToDatasourceMap, datasourceSecretParameterLocations, printTransformerLog, rdsLayerMapping } = config;
165
+ export const executeTransform = (config: ExecuteTransformConfig): void => {
166
+ const {
167
+ schema,
168
+ modelToDatasourceMap,
169
+ datasourceSecretParameterLocations,
170
+ printTransformerLog,
171
+ rdsLayerMapping,
172
+ scope,
173
+ nestedStackProvider,
174
+ assetProvider,
175
+ synthParameters,
176
+ } = config;
166
177
 
167
178
  const printLog = printTransformerLog ?? defaultPrintTransformerLog;
168
179
  const transform = constructTransform(config);
169
180
 
170
181
  try {
171
- return transform.transform(schema, {
172
- modelToDatasourceMap,
173
- datasourceSecretParameterLocations,
174
- rdsLayerMapping,
182
+ transform.transform({
183
+ scope,
184
+ nestedStackProvider,
185
+ assetProvider,
186
+ synthParameters,
187
+ schema,
188
+ datasourceConfig: {
189
+ modelToDatasourceMap,
190
+ datasourceSecretParameterLocations,
191
+ rdsLayerMapping,
192
+ },
175
193
  });
176
194
  } finally {
177
195
  transform.getLogs().forEach(printLog);
package/src/index.ts CHANGED
@@ -1,4 +1,2 @@
1
1
  export { constructTransformerChain, constructTransform, executeTransform } from './graphql-transformer';
2
-
3
2
  export type { TransformerFactoryArgs, TransformConfig, ExecuteTransformConfig } from './graphql-transformer';
4
- // No-op change to trigger re-publish