@aws-amplify/graphql-transformer 0.1.0-agqlac.0 → 0.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 (12) hide show
  1. package/API.md +7 -9
  2. package/CHANGELOG.md +25 -3
  3. package/lib/graphql-transformer.d.ts +7 -9
  4. package/lib/graphql-transformer.d.ts.map +1 -1
  5. package/lib/graphql-transformer.js +11 -10
  6. package/lib/graphql-transformer.js.map +1 -1
  7. package/lib/index.d.ts +2 -2
  8. package/lib/index.d.ts.map +1 -1
  9. package/lib/index.js.map +1 -1
  10. package/package.json +22 -15
  11. package/src/graphql-transformer.ts +16 -26
  12. package/src/index.ts +3 -10
package/API.md CHANGED
@@ -10,12 +10,14 @@ import { DeploymentResources } from '@aws-amplify/graphql-transformer-interfaces
10
10
  import { GraphQLTransform } from '@aws-amplify/graphql-transformer-core';
11
11
  import { OverrideConfig } from '@aws-amplify/graphql-transformer-core';
12
12
  import { RDSConnectionSecrets } from '@aws-amplify/graphql-transformer-core';
13
+ import { RDSLayerMapping } from '@aws-amplify/graphql-transformer-interfaces';
13
14
  import { ResolverConfig } from '@aws-amplify/graphql-transformer-core';
14
15
  import { Template } from '@aws-amplify/graphql-transformer-interfaces';
15
16
  import { TransformerLog } from '@aws-amplify/graphql-transformer-interfaces';
16
17
  import { TransformerPluginProvider } from '@aws-amplify/graphql-transformer-interfaces';
17
18
  import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces/src';
18
19
  import { UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
20
+ import { VpcConfig } from '@aws-amplify/graphql-transformer-interfaces';
19
21
 
20
22
  // @public (undocumented)
21
23
  export const constructTransform: (config: TransformConfig) => GraphQLTransform;
@@ -32,21 +34,22 @@ export type ExecuteTransformConfig = TransformConfig & {
32
34
  modelToDatasourceMap?: Map<string, DatasourceType>;
33
35
  datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>;
34
36
  printTransformerLog?: (log: TransformerLog) => void;
37
+ sqlLambdaVpcConfig?: VpcConfig;
38
+ rdsLayerMapping?: RDSLayerMapping;
35
39
  };
36
40
 
37
41
  // @public (undocumented)
38
42
  export type TransformConfig = {
39
- legacyApiKeyEnabled?: boolean;
40
- disableResolverDeduping?: boolean;
41
43
  transformersFactoryArgs: TransformerFactoryArgs;
42
44
  resolverConfig?: ResolverConfig;
43
45
  authConfig?: AppSyncAuthConfiguration;
44
46
  stacks?: Record<string, Template>;
45
- sandboxModeEnabled?: boolean;
46
47
  overrideConfig?: OverrideConfig;
47
48
  userDefinedSlots?: Record<string, UserDefinedSlot[]>;
48
49
  stackMapping?: Record<string, string>;
49
- transformParameters?: Partial<TransformParameters>;
50
+ transformParameters: TransformParameters;
51
+ sqlLambdaVpcConfig?: VpcConfig;
52
+ rdsLayerMapping?: RDSLayerMapping;
50
53
  };
51
54
 
52
55
  // @public (undocumented)
@@ -55,14 +58,9 @@ export type TransformerFactoryArgs = {
55
58
  storageConfig?: any;
56
59
  adminRoles?: Array<string>;
57
60
  identityPoolId?: string;
58
- searchConfig?: TransformerSearchConfig;
59
61
  customTransformers?: TransformerPluginProvider[];
60
62
  };
61
63
 
62
- // Warnings were encountered during analysis:
63
- //
64
- // src/graphql-transformer.ts:47:3 - (ae-forgotten-export) The symbol "TransformerSearchConfig" needs to be exported by the entry point index.d.ts
65
-
66
64
  // (No @packageDocumentation comment for this package)
67
65
 
68
66
  ```
package/CHANGELOG.md CHANGED
@@ -3,12 +3,34 @@
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.0-agqlac.0](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@0.0.2-agqlac.0...@aws-amplify/graphql-transformer@0.1.0-agqlac.0) (2023-06-13)
6
+ # [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)
7
7
 
8
8
  ### Features
9
9
 
10
- - add graphql api cdk construct ([7bfc2ae](https://github.com/aws-amplify/amplify-category-api/commit/7bfc2aef04bd1eb352a8f067ea0bd7162c88c25e))
10
+ - **graphql:** pull rds latest layer ([8325ef5](https://github.com/aws-amplify/amplify-category-api/commit/8325ef559b4bd5d86e9502bb1dc2cff833e7db0c))
11
11
 
12
- ## 0.0.2-agqlac.0 (2023-06-10)
12
+ ## [0.0.7](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@0.0.6...@aws-amplify/graphql-transformer@0.0.7) (2023-07-17)
13
+
14
+ **Note:** Version bump only for package @aws-amplify/graphql-transformer
15
+
16
+ ## [0.0.6](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@0.0.5...@aws-amplify/graphql-transformer@0.0.6) (2023-07-07)
17
+
18
+ **Note:** Version bump only for package @aws-amplify/graphql-transformer
19
+
20
+ ## [0.0.5](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@0.0.4...@aws-amplify/graphql-transformer@0.0.5) (2023-07-07)
21
+
22
+ ### Bug Fixes
23
+
24
+ - trigger republish of dependencies that failed in https://app.circleci.com/pipelines/github/aws-amplify/amplify-category-api/7981/workflows/e7366f04-6f0a-4ee4-9cc2-1772089e8005/jobs/163571 ([f2c7151](https://github.com/aws-amplify/amplify-category-api/commit/f2c7151005e4a9fd29d91ac1af1f3e482a06a5cc))
25
+
26
+ ## [0.0.4](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@0.0.3...@aws-amplify/graphql-transformer@0.0.4) (2023-07-07)
27
+
28
+ **Note:** Version bump only for package @aws-amplify/graphql-transformer
29
+
30
+ ## [0.0.3](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@0.0.2...@aws-amplify/graphql-transformer@0.0.3) (2023-06-29)
31
+
32
+ **Note:** Version bump only for package @aws-amplify/graphql-transformer
33
+
34
+ ## 0.0.2 (2023-06-20)
13
35
 
14
36
  **Note:** Version bump only for package @aws-amplify/graphql-transformer
package/lib/graphql-transformer.d.ts CHANGED
@@ -1,29 +1,24 @@
1
- import { AppSyncAuthConfiguration, DeploymentResources, Template, TransformerPluginProvider, TransformerLog } from '@aws-amplify/graphql-transformer-interfaces';
1
+ import { AppSyncAuthConfiguration, DeploymentResources, Template, TransformerPluginProvider, TransformerLog, VpcConfig, RDSLayerMapping } from '@aws-amplify/graphql-transformer-interfaces';
2
2
  import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces/src';
3
3
  import { DatasourceType, GraphQLTransform, OverrideConfig, RDSConnectionSecrets, ResolverConfig, UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
4
- export type TransformerSearchConfig = {
5
- enableNodeToNodeEncryption?: boolean;
6
- };
7
4
  export type TransformerFactoryArgs = {
8
5
  authConfig?: any;
9
6
  storageConfig?: any;
10
7
  adminRoles?: Array<string>;
11
8
  identityPoolId?: string;
12
- searchConfig?: TransformerSearchConfig;
13
9
  customTransformers?: TransformerPluginProvider[];
14
10
  };
15
11
  export type TransformConfig = {
16
- legacyApiKeyEnabled?: boolean;
17
- disableResolverDeduping?: boolean;
18
12
  transformersFactoryArgs: TransformerFactoryArgs;
19
13
  resolverConfig?: ResolverConfig;
20
14
  authConfig?: AppSyncAuthConfiguration;
21
15
  stacks?: Record<string, Template>;
22
- sandboxModeEnabled?: boolean;
23
16
  overrideConfig?: OverrideConfig;
24
17
  userDefinedSlots?: Record<string, UserDefinedSlot[]>;
25
18
  stackMapping?: Record<string, string>;
26
- transformParameters?: Partial<TransformParameters>;
19
+ transformParameters: TransformParameters;
20
+ sqlLambdaVpcConfig?: VpcConfig;
21
+ rdsLayerMapping?: RDSLayerMapping;
27
22
  };
28
23
  export declare const constructTransformerChain: (options?: TransformerFactoryArgs) => TransformerPluginProvider[];
29
24
  export declare const constructTransform: (config: TransformConfig) => GraphQLTransform;
@@ -32,6 +27,9 @@ export type ExecuteTransformConfig = TransformConfig & {
32
27
  modelToDatasourceMap?: Map<string, DatasourceType>;
33
28
  datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>;
34
29
  printTransformerLog?: (log: TransformerLog) => void;
30
+ sqlLambdaVpcConfig?: VpcConfig;
31
+ rdsLayerMapping?: RDSLayerMapping;
35
32
  };
33
+ export declare const defaultPrintTransformerLog: (log: TransformerLog) => void;
36
34
  export declare const executeTransform: (config: ExecuteTransformConfig) => DeploymentResources;
37
35
  //# 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,EAEf,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;AAE/C,MAAM,MAAM,uBAAuB,GAAG;IACpC,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACtC,CAAC;AAMF,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,YAAY,CAAC,EAAE,uBAAuB,CAAC;IACvC,kBAAkB,CAAC,EAAE,yBAAyB,EAAE,CAAC;CAClD,CAAC;AAKF,MAAM,MAAM,eAAe,GAAG;IAC5B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,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,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,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,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACpD,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAC1B,sBAAsB,KAC/B,yBAAyB,EA0B3B,CAAC;AAOF,eAAO,MAAM,kBAAkB,WAAY,eAAe,KAAG,gBA8B5D,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;CACrD,CAAC;AA8BF,eAAO,MAAM,gBAAgB,WAAY,sBAAsB,KAAG,mBAmBjE,CAAC"}
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"}
package/lib/graphql-transformer.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.executeTransform = exports.constructTransform = exports.constructTransformerChain = void 0;
3
+ exports.executeTransform = exports.defaultPrintTransformerLog = exports.constructTransform = exports.constructTransformerChain = void 0;
4
4
  const graphql_auth_transformer_1 = require("@aws-amplify/graphql-auth-transformer");
5
5
  const graphql_default_value_transformer_1 = require("@aws-amplify/graphql-default-value-transformer");
6
6
  const graphql_function_transformer_1 = require("@aws-amplify/graphql-function-transformer");
@@ -14,7 +14,7 @@ const graphql_searchable_transformer_1 = require("@aws-amplify/graphql-searchabl
14
14
  const graphql_transformer_interfaces_1 = require("@aws-amplify/graphql-transformer-interfaces");
15
15
  const graphql_transformer_core_1 = require("@aws-amplify/graphql-transformer-core");
16
16
  const constructTransformerChain = (options) => {
17
- var _a, _b, _c;
17
+ var _a, _b;
18
18
  const modelTransformer = new graphql_model_transformer_1.ModelTransformer();
19
19
  const authTransformer = new graphql_auth_transformer_1.AuthTransformer({
20
20
  adminRoles: (_a = options === null || options === void 0 ? void 0 : options.adminRoles) !== null && _a !== void 0 ? _a : [],
@@ -36,13 +36,13 @@ const constructTransformerChain = (options) => {
36
36
  new graphql_default_value_transformer_1.DefaultValueTransformer(),
37
37
  authTransformer,
38
38
  new graphql_maps_to_transformer_1.MapsToTransformer(),
39
- new graphql_searchable_transformer_1.SearchableModelTransformer({ enableNodeToNodeEncryption: (_b = options === null || options === void 0 ? void 0 : options.searchConfig) === null || _b === void 0 ? void 0 : _b.enableNodeToNodeEncryption }),
40
- ...((_c = options === null || options === void 0 ? void 0 : options.customTransformers) !== null && _c !== void 0 ? _c : []),
39
+ new graphql_searchable_transformer_1.SearchableModelTransformer(),
40
+ ...((_b = options === null || options === void 0 ? void 0 : options.customTransformers) !== null && _b !== void 0 ? _b : []),
41
41
  ];
42
42
  };
43
43
  exports.constructTransformerChain = constructTransformerChain;
44
44
  const constructTransform = (config) => {
45
- const { transformersFactoryArgs, authConfig, sandboxModeEnabled, resolverConfig, overrideConfig, userDefinedSlots, legacyApiKeyEnabled, disableResolverDeduping, stacks, stackMapping, transformParameters, } = config;
45
+ const { transformersFactoryArgs, authConfig, resolverConfig, overrideConfig, userDefinedSlots, stacks, 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,
@@ -50,12 +50,11 @@ const constructTransform = (config) => {
50
50
  authConfig,
51
51
  stacks,
52
52
  transformParameters,
53
- sandboxModeEnabled,
54
53
  userDefinedSlots,
55
54
  resolverConfig,
56
55
  overrideConfig,
57
- legacyApiKeyEnabled,
58
- disableResolverDeduping,
56
+ sqlLambdaVpcConfig,
57
+ rdsLayerMapping,
59
58
  });
60
59
  };
61
60
  exports.constructTransform = constructTransform;
@@ -77,14 +76,16 @@ const defaultPrintTransformerLog = (log) => {
77
76
  console.error(log.message);
78
77
  }
79
78
  };
79
+ exports.defaultPrintTransformerLog = defaultPrintTransformerLog;
80
80
  const executeTransform = (config) => {
81
- const { schema, modelToDatasourceMap, datasourceSecretParameterLocations, printTransformerLog, } = config;
82
- const printLog = printTransformerLog !== null && printTransformerLog !== void 0 ? printTransformerLog : defaultPrintTransformerLog;
81
+ const { schema, modelToDatasourceMap, datasourceSecretParameterLocations, printTransformerLog, rdsLayerMapping } = config;
82
+ const printLog = printTransformerLog !== null && printTransformerLog !== void 0 ? printTransformerLog : exports.defaultPrintTransformerLog;
83
83
  const transform = (0, exports.constructTransform)(config);
84
84
  try {
85
85
  return transform.transform(schema, {
86
86
  modelToDatasourceMap,
87
87
  datasourceSecretParameterLocations,
88
+ rdsLayerMapping,
88
89
  });
89
90
  }
90
91
  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 CHANGED
@@ -1,3 +1,3 @@
1
- export { constructTransformerChain, constructTransform, executeTransform, } from './graphql-transformer';
2
- export type { TransformerFactoryArgs, TransformConfig, ExecuteTransformConfig, } from './graphql-transformer';
1
+ export { constructTransformerChain, constructTransform, executeTransform } from './graphql-transformer';
2
+ export type { TransformerFactoryArgs, TransformConfig, ExecuteTransformConfig } from './graphql-transformer';
3
3
  //# sourceMappingURL=index.d.ts.map
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,EACL,yBAAyB,EACzB,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAE/B,YAAY,EACV,sBAAsB,EACtB,eAAe,EACf,sBAAsB,GACvB,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;AAExG,YAAY,EAAE,sBAAsB,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC"}
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,6DAI+B;AAH7B,gIAAA,yBAAyB,OAAA;AACzB,yHAAA,kBAAkB,OAAA;AAClB,uHAAA,gBAAgB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,6DAAwG;AAA/F,gIAAA,yBAAyB,OAAA;AAAE,yHAAA,kBAAkB,OAAA;AAAE,uHAAA,gBAAgB,OAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-amplify/graphql-transformer",
3
- "version": "0.1.0-agqlac.0",
3
+ "version": "0.1.0",
4
4
  "description": "Amplify GraphQL Transformer Root Package",
5
5
  "repository": {
6
6
  "type": "git",
@@ -28,18 +28,18 @@
28
28
  "access": "public"
29
29
  },
30
30
  "dependencies": {
31
- "@aws-amplify/graphql-auth-transformer": "2.1.7-agqlac.1",
32
- "@aws-amplify/graphql-default-value-transformer": "1.1.7-agqlac.1",
33
- "@aws-amplify/graphql-function-transformer": "1.2.5-agqlac.1",
34
- "@aws-amplify/graphql-http-transformer": "1.2.5-agqlac.1",
35
- "@aws-amplify/graphql-index-transformer": "1.2.3-agqlac.1",
36
- "@aws-amplify/graphql-maps-to-transformer": "2.1.7-agqlac.1",
37
- "@aws-amplify/graphql-model-transformer": "1.3.3-agqlac.1",
38
- "@aws-amplify/graphql-predictions-transformer": "1.2.5-agqlac.1",
39
- "@aws-amplify/graphql-relational-transformer": "1.2.3-agqlac.1",
40
- "@aws-amplify/graphql-searchable-transformer": "1.2.5-agqlac.1",
41
- "@aws-amplify/graphql-transformer-core": "1.3.3-agqlac.1",
42
- "@aws-amplify/graphql-transformer-interfaces": "2.2.2-agqlac.1"
31
+ "@aws-amplify/graphql-auth-transformer": "2.1.13",
32
+ "@aws-amplify/graphql-default-value-transformer": "1.1.13",
33
+ "@aws-amplify/graphql-function-transformer": "1.2.11",
34
+ "@aws-amplify/graphql-http-transformer": "1.2.11",
35
+ "@aws-amplify/graphql-index-transformer": "1.2.9",
36
+ "@aws-amplify/graphql-maps-to-transformer": "2.1.13",
37
+ "@aws-amplify/graphql-model-transformer": "1.4.0",
38
+ "@aws-amplify/graphql-predictions-transformer": "1.2.11",
39
+ "@aws-amplify/graphql-relational-transformer": "1.2.9",
40
+ "@aws-amplify/graphql-searchable-transformer": "1.2.11",
41
+ "@aws-amplify/graphql-transformer-core": "1.4.0",
42
+ "@aws-amplify/graphql-transformer-interfaces": "2.3.0"
43
43
  },
44
44
  "devDependencies": {
45
45
  "@types/node": "^12.12.6",
@@ -60,7 +60,14 @@
60
60
  "json",
61
61
  "node"
62
62
  ],
63
- "collectCoverage": true
63
+ "collectCoverage": true,
64
+ "coverageThreshold": {
65
+ "global": {
66
+ "branches": 80,
67
+ "functions": 80,
68
+ "lines": 80
69
+ }
70
+ }
64
71
  },
65
- "gitHead": "a6bd5ca4d00b799c5becc3e6aea46d499ceff393"
72
+ "gitHead": "28a89d960eaf3be3b729af567c83442e374e2443"
66
73
  }
package/src/graphql-transformer.ts CHANGED
@@ -20,6 +20,8 @@ import {
20
20
  TransformerPluginProvider,
21
21
  TransformerLog,
22
22
  TransformerLogLevel,
23
+ VpcConfig,
24
+ RDSLayerMapping,
23
25
  } from '@aws-amplify/graphql-transformer-interfaces';
24
26
  import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces/src';
25
27
  import {
@@ -31,10 +33,6 @@ import {
31
33
  UserDefinedSlot,
32
34
  } from '@aws-amplify/graphql-transformer-core';
33
35
 
34
- export type TransformerSearchConfig = {
35
- enableNodeToNodeEncryption?: boolean;
36
- };
37
-
38
36
  /**
39
37
  * Arguments passed into a TransformerFactory
40
38
  * Used to determine how to create a new GraphQLTransform
@@ -44,7 +42,6 @@ export type TransformerFactoryArgs = {
44
42
  storageConfig?: any;
45
43
  adminRoles?: Array<string>;
46
44
  identityPoolId?: string;
47
- searchConfig?: TransformerSearchConfig;
48
45
  customTransformers?: TransformerPluginProvider[];
49
46
  };
50
47
 
@@ -52,22 +49,19 @@ export type TransformerFactoryArgs = {
52
49
  * Transformer Options used to create a GraphQL Transform and compile a GQL API
53
50
  */
54
51
  export type TransformConfig = {
55
- legacyApiKeyEnabled?: boolean;
56
- disableResolverDeduping?: boolean;
57
52
  transformersFactoryArgs: TransformerFactoryArgs;
58
53
  resolverConfig?: ResolverConfig;
59
54
  authConfig?: AppSyncAuthConfiguration;
60
55
  stacks?: Record<string, Template>;
61
- sandboxModeEnabled?: boolean;
62
56
  overrideConfig?: OverrideConfig;
63
57
  userDefinedSlots?: Record<string, UserDefinedSlot[]>;
64
58
  stackMapping?: Record<string, string>;
65
- transformParameters?: Partial<TransformParameters>;
59
+ transformParameters: TransformParameters;
60
+ sqlLambdaVpcConfig?: VpcConfig;
61
+ rdsLayerMapping?: RDSLayerMapping;
66
62
  };
67
63
 
68
- export const constructTransformerChain = (
69
- options?: TransformerFactoryArgs,
70
- ): TransformerPluginProvider[] => {
64
+ export const constructTransformerChain = (options?: TransformerFactoryArgs): TransformerPluginProvider[] => {
71
65
  const modelTransformer = new ModelTransformer();
72
66
  const authTransformer = new AuthTransformer({
73
67
  adminRoles: options?.adminRoles ?? [],
@@ -90,7 +84,7 @@ export const constructTransformerChain = (
90
84
  new DefaultValueTransformer(),
91
85
  authTransformer,
92
86
  new MapsToTransformer(),
93
- new SearchableModelTransformer({ enableNodeToNodeEncryption: options?.searchConfig?.enableNodeToNodeEncryption }),
87
+ new SearchableModelTransformer(),
94
88
  ...(options?.customTransformers ?? []),
95
89
  ];
96
90
  };
@@ -104,15 +98,14 @@ export const constructTransform = (config: TransformConfig): GraphQLTransform =>
104
98
  const {
105
99
  transformersFactoryArgs,
106
100
  authConfig,
107
- sandboxModeEnabled,
108
101
  resolverConfig,
109
102
  overrideConfig,
110
103
  userDefinedSlots,
111
- legacyApiKeyEnabled,
112
- disableResolverDeduping,
113
104
  stacks,
114
105
  stackMapping,
115
106
  transformParameters,
107
+ sqlLambdaVpcConfig,
108
+ rdsLayerMapping,
116
109
  } = config;
117
110
 
118
111
  const transformers = constructTransformerChain(transformersFactoryArgs);
@@ -123,12 +116,11 @@ export const constructTransform = (config: TransformConfig): GraphQLTransform =>
123
116
  authConfig,
124
117
  stacks,
125
118
  transformParameters,
126
- sandboxModeEnabled,
127
119
  userDefinedSlots,
128
120
  resolverConfig,
129
121
  overrideConfig,
130
- legacyApiKeyEnabled,
131
- disableResolverDeduping,
122
+ sqlLambdaVpcConfig,
123
+ rdsLayerMapping,
132
124
  });
133
125
  };
134
126
 
@@ -137,13 +129,15 @@ export type ExecuteTransformConfig = TransformConfig & {
137
129
  modelToDatasourceMap?: Map<string, DatasourceType>;
138
130
  datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>;
139
131
  printTransformerLog?: (log: TransformerLog) => void;
132
+ sqlLambdaVpcConfig?: VpcConfig;
133
+ rdsLayerMapping?: RDSLayerMapping;
140
134
  };
141
135
 
142
136
  /**
143
137
  * By default, rely on console to print out the transformer logs.
144
138
  * @param log the log to print.
145
139
  */
146
- const defaultPrintTransformerLog = (log: TransformerLog): void => {
140
+ export const defaultPrintTransformerLog = (log: TransformerLog): void => {
147
141
  switch (log.level) {
148
142
  case TransformerLogLevel.ERROR:
149
143
  console.error(log.message);
@@ -168,12 +162,7 @@ const defaultPrintTransformerLog = (log: TransformerLog): void => {
168
162
  * @returns the transformed api deployment resources.
169
163
  */
170
164
  export const executeTransform = (config: ExecuteTransformConfig): DeploymentResources => {
171
- const {
172
- schema,
173
- modelToDatasourceMap,
174
- datasourceSecretParameterLocations,
175
- printTransformerLog,
176
- } = config;
165
+ const { schema, modelToDatasourceMap, datasourceSecretParameterLocations, printTransformerLog, rdsLayerMapping } = config;
177
166
 
178
167
  const printLog = printTransformerLog ?? defaultPrintTransformerLog;
179
168
  const transform = constructTransform(config);
@@ -182,6 +171,7 @@ export const executeTransform = (config: ExecuteTransformConfig): DeploymentReso
182
171
  return transform.transform(schema, {
183
172
  modelToDatasourceMap,
184
173
  datasourceSecretParameterLocations,
174
+ rdsLayerMapping,
185
175
  });
186
176
  } finally {
187
177
  transform.getLogs().forEach(printLog);
package/src/index.ts CHANGED
@@ -1,11 +1,4 @@
1
- export {
2
- constructTransformerChain,
3
- constructTransform,
4
- executeTransform,
5
- } from './graphql-transformer';
1
+ export { constructTransformerChain, constructTransform, executeTransform } from './graphql-transformer';
6
2
 
7
- export type {
8
- TransformerFactoryArgs,
9
- TransformConfig,
10
- ExecuteTransformConfig,
11
- } from './graphql-transformer';
3
+ export type { TransformerFactoryArgs, TransformConfig, ExecuteTransformConfig } from './graphql-transformer';
4
+ // No-op change to trigger re-publish