@aws-amplify/graphql-transformer 1.3.2 → 1.3.4

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 (8) hide show
  1. package/API.md +4 -16
  2. package/CHANGELOG.md +10 -0
  3. package/lib/graphql-transformer.d.ts +4 -13
  4. package/lib/graphql-transformer.d.ts.map +1 -1
  5. package/lib/graphql-transformer.js +8 -14
  6. package/lib/graphql-transformer.js.map +1 -1
  7. package/package.json +20 -16
  8. package/src/graphql-transformer.ts +30 -54
package/API.md CHANGED
@@ -7,21 +7,18 @@
7
7
  import { AppSyncAuthConfiguration } from '@aws-amplify/graphql-transformer-interfaces';
8
8
  import { AssetProvider } from '@aws-amplify/graphql-transformer-interfaces';
9
9
  import { Construct } from 'constructs';
10
- import { DataSourceType } from '@aws-amplify/graphql-transformer-interfaces';
10
+ import type { DataSourceStrategiesProvider } from '@aws-amplify/graphql-transformer-interfaces';
11
11
  import { GraphQLTransform } from '@aws-amplify/graphql-transformer-core';
12
12
  import { IFunction } from 'aws-cdk-lib/aws-lambda';
13
13
  import { NestedStackProvider } from '@aws-amplify/graphql-transformer-interfaces';
14
- import { ProvisionedConcurrencyConfig } from '@aws-amplify/graphql-transformer-interfaces';
15
- import { RDSConnectionSecrets } from '@aws-amplify/graphql-transformer-core';
16
- import { RDSLayerMapping } from '@aws-amplify/graphql-transformer-interfaces';
14
+ import type { RDSLayerMappingProvider } from '@aws-amplify/graphql-transformer-interfaces';
17
15
  import { ResolverConfig } from '@aws-amplify/graphql-transformer-core';
18
16
  import { SynthParameters } from '@aws-amplify/graphql-transformer-interfaces';
19
17
  import { TransformerLog } from '@aws-amplify/graphql-transformer-interfaces';
20
18
  import { TransformerPluginProvider } from '@aws-amplify/graphql-transformer-interfaces';
21
19
  import { TransformParameterProvider } from '@aws-amplify/graphql-transformer-interfaces';
22
- import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces/src';
20
+ import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces';
23
21
  import { UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
24
- import { VpcConfig } from '@aws-amplify/graphql-transformer-interfaces';
25
22
 
26
23
  // @public (undocumented)
27
24
  export const constructTransform: (config: TransformConfig) => GraphQLTransform;
@@ -33,20 +30,14 @@ export const constructTransformerChain: (options?: TransformerFactoryArgs) => Tr
33
30
  export const executeTransform: (config: ExecuteTransformConfig) => void;
34
31
 
35
32
  // @public (undocumented)
36
- export type ExecuteTransformConfig = TransformConfig & {
33
+ export type ExecuteTransformConfig = TransformConfig & DataSourceStrategiesProvider & RDSLayerMappingProvider & {
37
34
  schema: string;
38
- modelToDatasourceMap?: Map<string, DataSourceType>;
39
- customQueries?: Map<string, string>;
40
- datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>;
41
35
  printTransformerLog?: (log: TransformerLog) => void;
42
- sqlLambdaVpcConfig?: VpcConfig;
43
- rdsLayerMapping?: RDSLayerMapping;
44
36
  scope: Construct;
45
37
  nestedStackProvider: NestedStackProvider;
46
38
  parameterProvider?: TransformParameterProvider;
47
39
  assetProvider: AssetProvider;
48
40
  synthParameters: SynthParameters;
49
- sqlLambdaProvisionedConcurrencyConfig?: ProvisionedConcurrencyConfig;
50
41
  };
51
42
 
52
43
  // @public (undocumented)
@@ -57,9 +48,6 @@ export type TransformConfig = {
57
48
  userDefinedSlots?: Record<string, UserDefinedSlot[]>;
58
49
  stackMapping?: Record<string, string>;
59
50
  transformParameters: TransformParameters;
60
- sqlLambdaVpcConfig?: VpcConfig;
61
- rdsLayerMapping?: RDSLayerMapping;
62
- sqlLambdaProvisionedConcurrencyConfig?: ProvisionedConcurrencyConfig;
63
51
  };
64
52
 
65
53
  // @public (undocumented)
package/CHANGELOG.md CHANGED
@@ -3,6 +3,16 @@
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
+ ## [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)
7
+
8
+ **Note:** Version bump only for package @aws-amplify/graphql-transformer
9
+
10
+ ## [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)
11
+
12
+ ### Bug Fixes
13
+
14
+ - 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))
15
+
6
16
  ## [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)
7
17
 
8
18
  **Note:** Version bump only for package @aws-amplify/graphql-transformer
package/lib/graphql-transformer.d.ts CHANGED
@@ -1,6 +1,6 @@
1
- import { AppSyncAuthConfiguration, TransformerPluginProvider, TransformerLog, VpcConfig, RDSLayerMapping, NestedStackProvider, AssetProvider, SynthParameters, TransformParameterProvider, DataSourceType, ProvisionedConcurrencyConfig } from '@aws-amplify/graphql-transformer-interfaces';
2
- import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces/src';
3
- import { GraphQLTransform, RDSConnectionSecrets, ResolverConfig, UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
1
+ import { AppSyncAuthConfiguration, TransformerPluginProvider, TransformerLog, NestedStackProvider, AssetProvider, SynthParameters, TransformParameterProvider } from '@aws-amplify/graphql-transformer-interfaces';
2
+ import type { DataSourceStrategiesProvider, RDSLayerMappingProvider, TransformParameters } from '@aws-amplify/graphql-transformer-interfaces';
3
+ import { GraphQLTransform, ResolverConfig, UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
4
4
  import { Construct } from 'constructs';
5
5
  import { IFunction } from 'aws-cdk-lib/aws-lambda';
6
6
  export type TransformerFactoryArgs = {
@@ -15,26 +15,17 @@ export type TransformConfig = {
15
15
  userDefinedSlots?: Record<string, UserDefinedSlot[]>;
16
16
  stackMapping?: Record<string, string>;
17
17
  transformParameters: TransformParameters;
18
- sqlLambdaVpcConfig?: VpcConfig;
19
- rdsLayerMapping?: RDSLayerMapping;
20
- sqlLambdaProvisionedConcurrencyConfig?: ProvisionedConcurrencyConfig;
21
18
  };
22
19
  export declare const constructTransformerChain: (options?: TransformerFactoryArgs) => TransformerPluginProvider[];
23
20
  export declare const constructTransform: (config: TransformConfig) => GraphQLTransform;
24
- export type ExecuteTransformConfig = TransformConfig & {
21
+ export type ExecuteTransformConfig = TransformConfig & DataSourceStrategiesProvider & RDSLayerMappingProvider & {
25
22
  schema: string;
26
- modelToDatasourceMap?: Map<string, DataSourceType>;
27
- customQueries?: Map<string, string>;
28
- datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>;
29
23
  printTransformerLog?: (log: TransformerLog) => void;
30
- sqlLambdaVpcConfig?: VpcConfig;
31
- rdsLayerMapping?: RDSLayerMapping;
32
24
  scope: Construct;
33
25
  nestedStackProvider: NestedStackProvider;
34
26
  parameterProvider?: TransformParameterProvider;
35
27
  assetProvider: AssetProvider;
36
28
  synthParameters: SynthParameters;
37
- sqlLambdaProvisionedConcurrencyConfig?: ProvisionedConcurrencyConfig;
38
29
  };
39
30
  export declare const defaultPrintTransformerLog: (log: TransformerLog) => void;
40
31
  export declare const executeTransform: (config: ExecuteTransformConfig) => void;
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":"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"}
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,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/lib/graphql-transformer.js CHANGED
@@ -42,7 +42,7 @@ const constructTransformerChain = (options) => {
42
42
  };
43
43
  exports.constructTransformerChain = constructTransformerChain;
44
44
  const constructTransform = (config) => {
45
- const { transformersFactoryArgs, authConfig, resolverConfig, userDefinedSlots, stackMapping, transformParameters, sqlLambdaVpcConfig, rdsLayerMapping, sqlLambdaProvisionedConcurrencyConfig, } = config;
45
+ const { transformersFactoryArgs, authConfig, resolverConfig, userDefinedSlots, stackMapping, transformParameters } = config;
46
46
  const transformers = (0, exports.constructTransformerChain)(transformersFactoryArgs);
47
47
  return new graphql_transformer_core_1.GraphQLTransform({
48
48
  transformers,
@@ -51,9 +51,6 @@ const constructTransform = (config) => {
51
51
  transformParameters,
52
52
  userDefinedSlots,
53
53
  resolverConfig,
54
- sqlLambdaVpcConfig,
55
- rdsLayerMapping,
56
- sqlLambdaProvisionedConcurrencyConfig,
57
54
  });
58
55
  };
59
56
  exports.constructTransform = constructTransform;
@@ -77,23 +74,20 @@ const defaultPrintTransformerLog = (log) => {
77
74
  };
78
75
  exports.defaultPrintTransformerLog = defaultPrintTransformerLog;
79
76
  const executeTransform = (config) => {
80
- const { schema, modelToDatasourceMap, datasourceSecretParameterLocations, printTransformerLog, rdsLayerMapping, scope, nestedStackProvider, assetProvider, synthParameters, customQueries, parameterProvider, } = config;
77
+ const { assetProvider, dataSourceStrategies, nestedStackProvider, parameterProvider, printTransformerLog, rdsLayerMapping, schema, scope, sqlDirectiveDataSourceStrategies, synthParameters, } = config;
81
78
  const printLog = printTransformerLog !== null && printTransformerLog !== void 0 ? printTransformerLog : exports.defaultPrintTransformerLog;
82
79
  const transform = (0, exports.constructTransform)(config);
83
80
  try {
84
81
  transform.transform({
85
- scope,
82
+ assetProvider,
83
+ dataSourceStrategies,
86
84
  nestedStackProvider,
87
85
  parameterProvider,
88
- assetProvider,
89
- synthParameters,
86
+ rdsLayerMapping,
90
87
  schema,
91
- datasourceConfig: {
92
- modelToDatasourceMap,
93
- datasourceSecretParameterLocations,
94
- rdsLayerMapping,
95
- customQueries,
96
- },
88
+ scope,
89
+ sqlDirectiveDataSourceStrategies,
90
+ synthParameters,
97
91
  });
98
92
  }
99
93
  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":";;;AAAA,oFAAwE;AACxE,sGAAyF;AACzF,4FAAgF;AAChF,oFAAwE;AACxE,sFAAiG;AACjG,0FAAkG;AAClG,sFAA0E;AAC1E,kFAAsE;AACtE,kGAAsF;AACtF,gGAKqD;AACrD,gGAAyF;AACzF,gGAaqD;AAErD,oFAAgI;AA6BzH,MAAM,yBAAyB,GAAG,CAAC,OAAgC,EAA+B,EAAE;;IACzG,MAAM,gBAAgB,GAAG,IAAI,4CAAgB,EAAE,CAAC;IAChD,MAAM,eAAe,GAAG,IAAI,0CAAe,EAAE,CAAC;IAC9C,MAAM,gBAAgB,GAAG,IAAI,4CAAgB,EAAE,CAAC;IAChD,MAAM,iBAAiB,GAAG,IAAI,kDAAiB,EAAE,CAAC;IAElD,OAAO;QACL,gBAAgB;QAChB,IAAI,kDAAmB,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,CAAC;QACjD,IAAI,0CAAe,EAAE;QACrB,IAAI,wDAAsB,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,CAAC;QAClD,IAAI,iDAAqB,EAAE;QAC3B,gBAAgB;QAChB,IAAI,mDAAkB,EAAE;QACxB,iBAAiB;QACjB,IAAI,sDAAqB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,eAAe,CAAC;QACjG,IAAI,qDAAoB,EAAE;QAC1B,IAAI,2DAAuB,EAAE;QAC7B,eAAe;QACf,IAAI,+CAAiB,EAAE;QACvB,IAAI,wCAAc,EAAE;QACpB,IAAI,iDAAmB,EAAE;QACzB,IAAI,2DAA0B,EAAE;QAChC,GAAG,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,mCAAI,EAAE,CAAC;KACvC,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,yBAAyB,6BAyBpC;AAOK,MAAM,kBAAkB,GAAG,CAAC,MAAuB,EAAoB,EAAE;IAC9E,MAAM,EACJ,uBAAuB,EACvB,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,EACnB,kBAAkB,EAClB,eAAe,EACf,qCAAqC,GACtC,GAAG,MAAM,CAAC;IAEX,MAAM,YAAY,GAAG,IAAA,iCAAyB,EAAC,uBAAuB,CAAC,CAAC;IAExE,OAAO,IAAI,2CAAgB,CAAC;QAC1B,YAAY;QACZ,YAAY;QACZ,UAAU;QACV,mBAAmB;QACnB,gBAAgB;QAChB,cAAc;QACd,kBAAkB;QAClB,eAAe;QACf,qCAAqC;KACtC,CAAC,CAAC;AACL,CAAC,CAAC;AA1BW,QAAA,kBAAkB,sBA0B7B;AAsBK,MAAM,0BAA0B,GAAG,CAAC,GAAmB,EAAQ,EAAE;IACtE,QAAQ,GAAG,CAAC,KAAK,EAAE;QACjB,KAAK,oDAAmB,CAAC,KAAK;YAC5B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC3B,MAAM;QACR,KAAK,oDAAmB,CAAC,IAAI;YAC3B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM;QACR,KAAK,oDAAmB,CAAC,IAAI;YAC3B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM;QACR,KAAK,oDAAmB,CAAC,KAAK;YAC5B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC3B,MAAM;QACR;YACE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;KAC9B;AACH,CAAC,CAAC;AAjBW,QAAA,0BAA0B,8BAiBrC;AAOK,MAAM,gBAAgB,GAAG,CAAC,MAA8B,EAAQ,EAAE;IACvE,MAAM,EACJ,MAAM,EACN,oBAAoB,EACpB,kCAAkC,EAClC,mBAAmB,EACnB,eAAe,EACf,KAAK,EACL,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,aAAa,EACb,iBAAiB,GAClB,GAAG,MAAM,CAAC;IAEX,MAAM,QAAQ,GAAG,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,kCAA0B,CAAC;IACnE,MAAM,SAAS,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IAC7C,IAAI;QACF,SAAS,CAAC,SAAS,CAAC;YAClB,KAAK;YACL,mBAAmB;YACnB,iBAAiB;YACjB,aAAa;YACb,eAAe;YACf,MAAM;YACN,gBAAgB,EAAE;gBAChB,oBAAoB;gBACpB,kCAAkC;gBAClC,eAAe;gBACf,aAAa;aACd;SACF,CAAC,CAAC;KACJ;YAAS;QACR,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;KACvC;AACH,CAAC,CAAC;AAnCW,QAAA,gBAAgB,oBAmC3B"}
1
+ {"version":3,"file":"graphql-transformer.js","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":";;;AAAA,oFAAwE;AACxE,sGAAyF;AACzF,4FAAgF;AAChF,oFAAwE;AACxE,sFAAiG;AACjG,0FAAkG;AAClG,sFAA0E;AAC1E,kFAAsE;AACtE,kGAAsF;AACtF,gGAKqD;AACrD,gGAAyF;AACzF,gGASqD;AAMrD,oFAA0G;AA0BnG,MAAM,yBAAyB,GAAG,CAAC,OAAgC,EAA+B,EAAE;;IACzG,MAAM,gBAAgB,GAAG,IAAI,4CAAgB,EAAE,CAAC;IAChD,MAAM,eAAe,GAAG,IAAI,0CAAe,EAAE,CAAC;IAC9C,MAAM,gBAAgB,GAAG,IAAI,4CAAgB,EAAE,CAAC;IAChD,MAAM,iBAAiB,GAAG,IAAI,kDAAiB,EAAE,CAAC;IAElD,OAAO;QACL,gBAAgB;QAChB,IAAI,kDAAmB,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,CAAC;QACjD,IAAI,0CAAe,EAAE;QACrB,IAAI,wDAAsB,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,CAAC;QAClD,IAAI,iDAAqB,EAAE;QAC3B,gBAAgB;QAChB,IAAI,mDAAkB,EAAE;QACxB,iBAAiB;QACjB,IAAI,sDAAqB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,eAAe,CAAC;QACjG,IAAI,qDAAoB,EAAE;QAC1B,IAAI,2DAAuB,EAAE;QAC7B,eAAe;QACf,IAAI,+CAAiB,EAAE;QACvB,IAAI,wCAAc,EAAE;QACpB,IAAI,iDAAmB,EAAE;QACzB,IAAI,2DAA0B,EAAE;QAChC,GAAG,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,mCAAI,EAAE,CAAC;KACvC,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,yBAAyB,6BAyBpC;AAOK,MAAM,kBAAkB,GAAG,CAAC,MAAuB,EAAoB,EAAE;IAC9E,MAAM,EAAE,uBAAuB,EAAE,UAAU,EAAE,cAAc,EAAE,gBAAgB,EAAE,YAAY,EAAE,mBAAmB,EAAE,GAAG,MAAM,CAAC;IAE5H,MAAM,YAAY,GAAG,IAAA,iCAAyB,EAAC,uBAAuB,CAAC,CAAC;IAExE,OAAO,IAAI,2CAAgB,CAAC;QAC1B,YAAY;QACZ,YAAY;QACZ,UAAU;QACV,mBAAmB;QACnB,gBAAgB;QAChB,cAAc;KACf,CAAC,CAAC;AACL,CAAC,CAAC;AAbW,QAAA,kBAAkB,sBAa7B;AAkBK,MAAM,0BAA0B,GAAG,CAAC,GAAmB,EAAQ,EAAE;IACtE,QAAQ,GAAG,CAAC,KAAK,EAAE;QACjB,KAAK,oDAAmB,CAAC,KAAK;YAC5B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC3B,MAAM;QACR,KAAK,oDAAmB,CAAC,IAAI;YAC3B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM;QACR,KAAK,oDAAmB,CAAC,IAAI;YAC3B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC1B,MAAM;QACR,KAAK,oDAAmB,CAAC,KAAK;YAC5B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC3B,MAAM;QACR;YACE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;KAC9B;AACH,CAAC,CAAC;AAjBW,QAAA,0BAA0B,8BAiBrC;AAOK,MAAM,gBAAgB,GAAG,CAAC,MAA8B,EAAQ,EAAE;IACvE,MAAM,EACJ,aAAa,EACb,oBAAoB,EACpB,mBAAmB,EACnB,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EACf,MAAM,EACN,KAAK,EACL,gCAAgC,EAChC,eAAe,GAChB,GAAG,MAAM,CAAC;IAEX,MAAM,QAAQ,GAAG,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,kCAA0B,CAAC;IACnE,MAAM,SAAS,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IAC7C,IAAI;QACF,SAAS,CAAC,SAAS,CAAC;YAClB,aAAa;YACb,oBAAoB;YACpB,mBAAmB;YACnB,iBAAiB;YACjB,eAAe;YACf,MAAM;YACN,KAAK;YACL,gCAAgC;YAChC,eAAe;SAChB,CAAC,CAAC;KACJ;YAAS;QACR,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;KACvC;AACH,CAAC,CAAC;AA/BW,QAAA,gBAAgB,oBA+B3B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-amplify/graphql-transformer",
3
- "version": "1.3.2",
3
+ "version": "1.3.4",
4
4
  "description": "Amplify GraphQL Transformer Root Package",
5
5
  "repository": {
6
6
  "type": "git",
@@ -28,19 +28,19 @@
28
28
  "access": "public"
29
29
  },
30
30
  "dependencies": {
31
- "@aws-amplify/graphql-auth-transformer": "3.2.2",
32
- "@aws-amplify/graphql-default-value-transformer": "2.1.11",
33
- "@aws-amplify/graphql-function-transformer": "2.1.10",
34
- "@aws-amplify/graphql-http-transformer": "2.1.10",
35
- "@aws-amplify/graphql-index-transformer": "2.2.2",
36
- "@aws-amplify/graphql-maps-to-transformer": "3.3.2",
37
- "@aws-amplify/graphql-model-transformer": "2.3.2",
38
- "@aws-amplify/graphql-predictions-transformer": "2.1.10",
39
- "@aws-amplify/graphql-relational-transformer": "2.2.2",
40
- "@aws-amplify/graphql-searchable-transformer": "2.3.2",
41
- "@aws-amplify/graphql-sql-transformer": "0.1.2",
42
- "@aws-amplify/graphql-transformer-core": "2.3.2",
43
- "@aws-amplify/graphql-transformer-interfaces": "3.3.0"
31
+ "@aws-amplify/graphql-auth-transformer": "3.3.0",
32
+ "@aws-amplify/graphql-default-value-transformer": "2.2.0",
33
+ "@aws-amplify/graphql-function-transformer": "2.1.12",
34
+ "@aws-amplify/graphql-http-transformer": "2.1.12",
35
+ "@aws-amplify/graphql-index-transformer": "2.3.0",
36
+ "@aws-amplify/graphql-maps-to-transformer": "3.4.0",
37
+ "@aws-amplify/graphql-model-transformer": "2.4.0",
38
+ "@aws-amplify/graphql-predictions-transformer": "2.1.12",
39
+ "@aws-amplify/graphql-relational-transformer": "2.3.0",
40
+ "@aws-amplify/graphql-searchable-transformer": "2.4.0",
41
+ "@aws-amplify/graphql-sql-transformer": "0.2.0",
42
+ "@aws-amplify/graphql-transformer-core": "2.4.0",
43
+ "@aws-amplify/graphql-transformer-interfaces": "3.3.2"
44
44
  },
45
45
  "devDependencies": {
46
46
  "@types/node": "^12.12.6",
@@ -73,7 +73,11 @@
73
73
  "functions": 80,
74
74
  "lines": 80
75
75
  }
76
- }
76
+ },
77
+ "coverageReporters": [
78
+ "clover",
79
+ "text"
80
+ ]
77
81
  },
78
- "gitHead": "4aa08fae3f0a4b953ef7267522ae537e7ff063ac"
82
+ "gitHead": "6e450d037cf84098b51ce787a99d6023cbc0e39d"
79
83
  }
package/src/graphql-transformer.ts CHANGED
@@ -19,17 +19,17 @@ import {
19
19
  TransformerPluginProvider,
20
20
  TransformerLog,
21
21
  TransformerLogLevel,
22
- VpcConfig,
23
- RDSLayerMapping,
24
22
  NestedStackProvider,
25
23
  AssetProvider,
26
24
  SynthParameters,
27
25
  TransformParameterProvider,
28
- DataSourceType,
29
- ProvisionedConcurrencyConfig,
30
26
  } from '@aws-amplify/graphql-transformer-interfaces';
31
- import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces/src';
32
- import { GraphQLTransform, RDSConnectionSecrets, ResolverConfig, UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
27
+ import type {
28
+ DataSourceStrategiesProvider,
29
+ RDSLayerMappingProvider,
30
+ TransformParameters,
31
+ } from '@aws-amplify/graphql-transformer-interfaces';
32
+ import { GraphQLTransform, ResolverConfig, UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
33
33
  import { Construct } from 'constructs';
34
34
  import { IFunction } from 'aws-cdk-lib/aws-lambda';
35
35
 
@@ -53,9 +53,6 @@ export type TransformConfig = {
53
53
  userDefinedSlots?: Record<string, UserDefinedSlot[]>;
54
54
  stackMapping?: Record<string, string>;
55
55
  transformParameters: TransformParameters;
56
- sqlLambdaVpcConfig?: VpcConfig;
57
- rdsLayerMapping?: RDSLayerMapping;
58
- sqlLambdaProvisionedConcurrencyConfig?: ProvisionedConcurrencyConfig;
59
56
  };
60
57
 
61
58
  export const constructTransformerChain = (options?: TransformerFactoryArgs): TransformerPluginProvider[] => {
@@ -91,17 +88,7 @@ export const constructTransformerChain = (options?: TransformerFactoryArgs): Tra
91
88
  * @returns the GraphQLTransform object, which can be used for transformation or preprocessing a given schema.
92
89
  */
93
90
  export const constructTransform = (config: TransformConfig): GraphQLTransform => {
94
- const {
95
- transformersFactoryArgs,
96
- authConfig,
97
- resolverConfig,
98
- userDefinedSlots,
99
- stackMapping,
100
- transformParameters,
101
- sqlLambdaVpcConfig,
102
- rdsLayerMapping,
103
- sqlLambdaProvisionedConcurrencyConfig,
104
- } = config;
91
+ const { transformersFactoryArgs, authConfig, resolverConfig, userDefinedSlots, stackMapping, transformParameters } = config;
105
92
 
106
93
  const transformers = constructTransformerChain(transformersFactoryArgs);
107
94
 
@@ -112,27 +99,20 @@ export const constructTransform = (config: TransformConfig): GraphQLTransform =>
112
99
  transformParameters,
113
100
  userDefinedSlots,
114
101
  resolverConfig,
115
- sqlLambdaVpcConfig,
116
- rdsLayerMapping,
117
- sqlLambdaProvisionedConcurrencyConfig,
118
102
  });
119
103
  };
120
104
 
121
- export type ExecuteTransformConfig = TransformConfig & {
122
- schema: string;
123
- modelToDatasourceMap?: Map<string, DataSourceType>;
124
- customQueries?: Map<string, string>;
125
- datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>;
126
- printTransformerLog?: (log: TransformerLog) => void;
127
- sqlLambdaVpcConfig?: VpcConfig;
128
- rdsLayerMapping?: RDSLayerMapping;
129
- scope: Construct;
130
- nestedStackProvider: NestedStackProvider;
131
- parameterProvider?: TransformParameterProvider;
132
- assetProvider: AssetProvider;
133
- synthParameters: SynthParameters;
134
- sqlLambdaProvisionedConcurrencyConfig?: ProvisionedConcurrencyConfig;
135
- };
105
+ export type ExecuteTransformConfig = TransformConfig &
106
+ DataSourceStrategiesProvider &
107
+ RDSLayerMappingProvider & {
108
+ schema: string;
109
+ printTransformerLog?: (log: TransformerLog) => void;
110
+ scope: Construct;
111
+ nestedStackProvider: NestedStackProvider;
112
+ parameterProvider?: TransformParameterProvider;
113
+ assetProvider: AssetProvider;
114
+ synthParameters: SynthParameters;
115
+ };
136
116
 
137
117
  /**
138
118
  * By default, rely on console to print out the transformer logs.
@@ -164,35 +144,31 @@ export const defaultPrintTransformerLog = (log: TransformerLog): void => {
164
144
  */
165
145
  export const executeTransform = (config: ExecuteTransformConfig): void => {
166
146
  const {
167
- schema,
168
- modelToDatasourceMap,
169
- datasourceSecretParameterLocations,
147
+ assetProvider,
148
+ dataSourceStrategies,
149
+ nestedStackProvider,
150
+ parameterProvider,
170
151
  printTransformerLog,
171
152
  rdsLayerMapping,
153
+ schema,
172
154
  scope,
173
- nestedStackProvider,
174
- assetProvider,
155
+ sqlDirectiveDataSourceStrategies,
175
156
  synthParameters,
176
- customQueries,
177
- parameterProvider,
178
157
  } = config;
179
158
 
180
159
  const printLog = printTransformerLog ?? defaultPrintTransformerLog;
181
160
  const transform = constructTransform(config);
182
161
  try {
183
162
  transform.transform({
184
- scope,
163
+ assetProvider,
164
+ dataSourceStrategies,
185
165
  nestedStackProvider,
186
166
  parameterProvider,
187
- assetProvider,
188
- synthParameters,
167
+ rdsLayerMapping,
189
168
  schema,
190
- datasourceConfig: {
191
- modelToDatasourceMap,
192
- datasourceSecretParameterLocations,
193
- rdsLayerMapping,
194
- customQueries,
195
- },
169
+ scope,
170
+ sqlDirectiveDataSourceStrategies,
171
+ synthParameters,
196
172
  });
197
173
  } finally {
198
174
  transform.getLogs().forEach(printLog);