@aws-amplify/graphql-transformer-core - npm Package Compare versions

Comparing version 2.2.1 to 2.3.0-rds-3.0

API.md

@@ -85,3 +85,3 @@ ## API Report File for "@aws-amplify/graphql-transformer-core"
 import { UnionTypeExtensionNode } from 'graphql';
-import { VpcConfig } from '@aws-amplify/graphql-transformer-interfaces';
+import type { VpcSubnetConfig } from '@aws-amplify/graphql-transformer-interfaces';
 
@@ -189,2 +189,5 @@ // @public (undocumented)
 
+// @public (undocumented)
+export const getDatasourceType: (type: TypeNode, ctx: TransformerContextProvider) => DBType;
+
 // Warning: (ae-forgotten-export) The symbol "Operation" needs to be exported by the entry point index.d.ts
@@ -202,2 +205,5 @@ //
 // @public (undocumented)
+export const getPrimaryKeyFields: (type: ObjectTypeDefinitionNode) => string[];
+
+// @public (undocumented)
 export const getResourceName: (scope: Construct) => string | undefined;
@@ -243,3 +249,3 @@
     // (undocumented)
-    readonly sqlLambdaVpcConfig?: VpcConfig;
+    readonly sqlLambdaVpcConfig?: VpcSubnetConfig;
     // Warning: (ae-forgotten-export) The symbol "StackMapping" needs to be exported by the entry point index.d.ts
@@ -348,2 +354,5 @@ //
 // @public (undocumented)
+export const isRDSModel: (ctx: TransformerContextProvider, typename: string) => boolean;
+
+// @public (undocumented)
 export class MappingTemplate {
@@ -350,0 +359,0 @@ // Warning: (ae-forgotten-export) The symbol "InlineTemplate" needs to be exported by the entry point index.d.ts

lib/index.d.ts

@@ -5,3 +5,3 @@ export { GraphQLTransform, GraphQLTransformOptions, SyncUtils } from './transformation';
 export { ConflictDetectionType, ConflictHandlerType, ResolverConfig, SyncConfig, SyncConfigOptimistic, SyncConfigServer, SyncConfigLambda, TransformConfig, DatasourceType, DBType, } from './config/index';
-export { GetArgumentsOptions, generateGetArgumentsInput, getTable, getKeySchema, getSortKeyFieldNames, getParameterStoreSecretPath, collectDirectives, collectDirectivesByTypeNames, DirectiveWrapper, APICategory, setResourceName, getResourceName, } from './utils';
+export { GetArgumentsOptions, generateGetArgumentsInput, getTable, getKeySchema, getSortKeyFieldNames, getParameterStoreSecretPath, collectDirectives, collectDirectivesByTypeNames, DirectiveWrapper, APICategory, getPrimaryKeyFields, getDatasourceType, setResourceName, getResourceName, isRDSModel, } from './utils';
 export type { SetResourceNameProps } from './utils';
@@ -8,0 +8,0 @@ export * from './utils/operation-names';

lib/index.js

@@ -17,3 +17,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectDefinitionWrapper = exports.InputObjectDefinitionWrapper = exports.InputFieldWrapper = exports.FieldWrapper = exports.EnumWrapper = exports.MappingTemplate = exports.getAppSyncServiceExtraDirectives = exports.RDS_SCHEMA_FILE_NAME = exports.MYSQL_DB_TYPE = exports.ImportedRDSType = exports.DDB_DB_TYPE = exports.StackManager = exports.TransformerResolver = exports.TransformerAuthBase = exports.TransformerPluginBase = exports.TransformerModelEnhancerBase = exports.TransformerModelBase = exports.getResourceName = exports.setResourceName = exports.APICategory = exports.DirectiveWrapper = exports.collectDirectivesByTypeNames = exports.collectDirectives = exports.getParameterStoreSecretPath = exports.getSortKeyFieldNames = exports.getKeySchema = exports.getTable = exports.generateGetArgumentsInput = exports.ConflictHandlerType = exports.validateModelSchema = exports.SyncUtils = exports.GraphQLTransform = void 0;
+exports.ObjectDefinitionWrapper = exports.InputObjectDefinitionWrapper = exports.InputFieldWrapper = exports.FieldWrapper = exports.EnumWrapper = exports.MappingTemplate = exports.getAppSyncServiceExtraDirectives = exports.RDS_SCHEMA_FILE_NAME = exports.MYSQL_DB_TYPE = exports.ImportedRDSType = exports.DDB_DB_TYPE = exports.StackManager = exports.TransformerResolver = exports.TransformerAuthBase = exports.TransformerPluginBase = exports.TransformerModelEnhancerBase = exports.TransformerModelBase = exports.isRDSModel = exports.getResourceName = exports.setResourceName = exports.getDatasourceType = exports.getPrimaryKeyFields = exports.APICategory = exports.DirectiveWrapper = exports.collectDirectivesByTypeNames = exports.collectDirectives = exports.getParameterStoreSecretPath = exports.getSortKeyFieldNames = exports.getKeySchema = exports.getTable = exports.generateGetArgumentsInput = exports.ConflictHandlerType = exports.validateModelSchema = exports.SyncUtils = exports.GraphQLTransform = void 0;
 const graphql_1 = require("graphql");
@@ -38,4 +38,7 @@ const validation_1 = require("./transformation/validation");
 Object.defineProperty(exports, "APICategory", { enumerable: true, get: function () { return utils_1.APICategory; } });
+Object.defineProperty(exports, "getPrimaryKeyFields", { enumerable: true, get: function () { return utils_1.getPrimaryKeyFields; } });
+Object.defineProperty(exports, "getDatasourceType", { enumerable: true, get: function () { return utils_1.getDatasourceType; } });
 Object.defineProperty(exports, "setResourceName", { enumerable: true, get: function () { return utils_1.setResourceName; } });
 Object.defineProperty(exports, "getResourceName", { enumerable: true, get: function () { return utils_1.getResourceName; } });
+Object.defineProperty(exports, "isRDSModel", { enumerable: true, get: function () { return utils_1.isRDSModel; } });
 __exportStar(require("./utils/operation-names"), exports);
@@ -42,0 +45,0 @@ __exportStar(require("./errors"), exports);

lib/transformation/transform.d.ts

@@ -1,3 +0,3 @@
-import { AppSyncAuthConfiguration, TransformerPluginProvider, TransformHostProvider, TransformerLog, NestedStackProvider, VpcConfig, RDSLayerMapping, SynthParameters } from '@aws-amplify/graphql-transformer-interfaces';
-import type { AssetProvider, StackManagerProvider, TransformParameterProvider, TransformParameters } from '@aws-amplify/graphql-transformer-interfaces';
+import { AppSyncAuthConfiguration, TransformerPluginProvider, TransformHostProvider, TransformerLog, NestedStackProvider, RDSLayerMapping, SynthParameters } from '@aws-amplify/graphql-transformer-interfaces';
+import type { AssetProvider, StackManagerProvider, TransformParameterProvider, TransformParameters, VpcSubnetConfig } from '@aws-amplify/graphql-transformer-interfaces';
 import { DocumentNode } from 'graphql/language';
@@ -17,3 +17,3 @@ import { Construct } from 'constructs';
     readonly resolverConfig?: ResolverConfig;
-    readonly sqlLambdaVpcConfig?: VpcConfig;
+    readonly sqlLambdaVpcConfig?: VpcSubnetConfig;
     readonly rdsLayerMapping?: RDSLayerMapping;
@@ -42,3 +42,2 @@ }
     private readonly transformParameters;
-    private readonly rdsLayerMapping?;
     private seenTransformations;
@@ -45,0 +44,0 @@ private logs;

lib/transformation/transform.js

@@ -70,3 +70,2 @@ "use strict";
         this.sqlLambdaVpcConfig = options.sqlLambdaVpcConfig;
-        this.sqlLambdaVpcConfig = options.sqlLambdaVpcConfig;
         this.transformParameters = {
@@ -94,6 +93,6 @@ ...transform_parameters_1.defaultTransformParameters,
     transform({ scope, nestedStackProvider, parameterProvider, assetProvider, synthParameters, schema, datasourceConfig, }) {
-        var _a;
+        var _a, _b;
         this.seenTransformations = {};
         const parsedDocument = (0, graphql_1.parse)(schema);
-        const context = new transformer_context_1.TransformerContext(scope, nestedStackProvider, parameterProvider, assetProvider, synthParameters, parsedDocument, (_a = datasourceConfig === null || datasourceConfig === void 0 ? void 0 : datasourceConfig.modelToDatasourceMap) !== null && _a !== void 0 ? _a : new Map(), this.stackMappingOverrides, this.authConfig, this.transformParameters, this.resolverConfig, datasourceConfig === null || datasourceConfig === void 0 ? void 0 : datasourceConfig.datasourceSecretParameterLocations, this.sqlLambdaVpcConfig, this.rdsLayerMapping);
+        const context = new transformer_context_1.TransformerContext(scope, nestedStackProvider, parameterProvider, assetProvider, synthParameters, parsedDocument, (_a = datasourceConfig === null || datasourceConfig === void 0 ? void 0 : datasourceConfig.modelToDatasourceMap) !== null && _a !== void 0 ? _a : new Map(), (_b = datasourceConfig === null || datasourceConfig === void 0 ? void 0 : datasourceConfig.customQueries) !== null && _b !== void 0 ? _b : new Map(), this.stackMappingOverrides, this.authConfig, this.transformParameters, this.resolverConfig, datasourceConfig === null || datasourceConfig === void 0 ? void 0 : datasourceConfig.datasourceSecretParameterLocations, this.sqlLambdaVpcConfig, datasourceConfig === null || datasourceConfig === void 0 ? void 0 : datasourceConfig.rdsLayerMapping);
         const validDirectiveNameMap = this.transformers.reduce((acc, t) => ({ ...acc, [t.directive.name.value]: true }), {
@@ -100,0 +99,0 @@ aws_subscribe: true,

lib/transformation/types.d.ts

@@ -19,3 +19,4 @@ import { RDSLayerMapping } from '@aws-amplify/graphql-transformer-interfaces';
     rdsLayerMapping?: RDSLayerMapping;
+    customQueries?: Map<string, string>;
 };
 //# sourceMappingURL=types.d.ts.map

lib/transformer-context/index.d.ts

@@ -1,3 +0,3 @@
-import { GraphQLAPIProvider, StackManagerProvider, TransformerContextOutputProvider, TransformerContextProvider, TransformerDataSourceManagerProvider, AppSyncAuthConfiguration, VpcConfig, RDSLayerMapping, SynthParameters } from '@aws-amplify/graphql-transformer-interfaces';
-import type { AssetProvider, NestedStackProvider, TransformParameterProvider, TransformParameters } from '@aws-amplify/graphql-transformer-interfaces';
+import { GraphQLAPIProvider, StackManagerProvider, TransformerContextOutputProvider, TransformerContextProvider, TransformerDataSourceManagerProvider, AppSyncAuthConfiguration, RDSLayerMapping, SynthParameters } from '@aws-amplify/graphql-transformer-interfaces';
+import type { AssetProvider, NestedStackProvider, TransformParameterProvider, TransformParameters, VpcSubnetConfig } from '@aws-amplify/graphql-transformer-interfaces';
 import { TransformerContextMetadataProvider } from '@aws-amplify/graphql-transformer-interfaces/src/transformer-context/transformer-context-provider';
@@ -35,6 +35,7 @@ import { DocumentNode } from 'graphql';
     readonly datasourceSecretParameterLocations: Map<string, RDSConnectionSecrets>;
-    readonly sqlLambdaVpcConfig?: VpcConfig;
+    readonly sqlLambdaVpcConfig?: VpcSubnetConfig;
     readonly rdsLayerMapping?: RDSLayerMapping;
+    readonly customQueries: Map<string, string>;
     metadata: TransformerContextMetadata;
-    constructor(scope: Construct, nestedStackProvider: NestedStackProvider, parameterProvider: TransformParameterProvider | undefined, assetProvider: AssetProvider, synthParameters: SynthParameters, inputDocument: DocumentNode, modelToDatasourceMap: Map<string, DatasourceType>, stackMapping: Record<string, string>, authConfig: AppSyncAuthConfiguration, transformParameters: TransformParameters, resolverConfig?: ResolverConfig, datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>, sqlLambdaVpcConfig?: VpcConfig, rdsLayerMapping?: RDSLayerMapping);
+    constructor(scope: Construct, nestedStackProvider: NestedStackProvider, parameterProvider: TransformParameterProvider | undefined, assetProvider: AssetProvider, synthParameters: SynthParameters, inputDocument: DocumentNode, modelToDatasourceMap: Map<string, DatasourceType>, customQueries: Map<string, string>, stackMapping: Record<string, string>, authConfig: AppSyncAuthConfiguration, transformParameters: TransformParameters, resolverConfig?: ResolverConfig, datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>, sqlLambdaVpcConfig?: VpcSubnetConfig, rdsLayerMapping?: RDSLayerMapping);
     get api(): GraphQLAPIProvider;
@@ -41,0 +42,0 @@ getResolverConfig: <ResolverConfig_1>() => ResolverConfig_1 | undefined;

lib/transformer-context/index.js

@@ -31,3 +31,3 @@ "use strict";
 class TransformerContext {
-    constructor(scope, nestedStackProvider, parameterProvider, assetProvider, synthParameters, inputDocument, modelToDatasourceMap, stackMapping, authConfig, transformParameters, resolverConfig, datasourceSecretParameterLocations, sqlLambdaVpcConfig, rdsLayerMapping) {
+    constructor(scope, nestedStackProvider, parameterProvider, assetProvider, synthParameters, inputDocument, modelToDatasourceMap, customQueries, stackMapping, authConfig, transformParameters, resolverConfig, datasourceSecretParameterLocations, sqlLambdaVpcConfig, rdsLayerMapping) {
         this.synthParameters = synthParameters;
@@ -51,2 +51,3 @@ this.inputDocument = inputDocument;
         this.rdsLayerMapping = rdsLayerMapping;
+        this.customQueries = customQueries;
     }
@@ -53,0 +54,0 @@ bind(api) {

lib/types/import-appsync-api-types.d.ts

@@ -25,2 +25,3 @@ import { TransformerSecrets } from '@aws-amplify/graphql-transformer-interfaces';
 export declare const DDB_DB_TYPE = "DDB";
+export type ModelDatasourceType = 'MySQL' | 'DDB';
 //# sourceMappingURL=import-appsync-api-types.d.ts.map

lib/types/index.d.ts

@@ -1,2 +0,2 @@
-export { DDB_DB_TYPE, ImportAppSyncAPIInputs, ImportedDataSourceType, ImportedRDSType, MYSQL_DB_TYPE, RDS_SCHEMA_FILE_NAME, RDSConnectionSecrets, ImportedDataSourceConfig, RDSDataSourceConfig, } from './import-appsync-api-types';
+export { DDB_DB_TYPE, ImportAppSyncAPIInputs, ImportedDataSourceType, ImportedRDSType, MYSQL_DB_TYPE, RDS_SCHEMA_FILE_NAME, RDSConnectionSecrets, ImportedDataSourceConfig, RDSDataSourceConfig, ModelDatasourceType, } from './import-appsync-api-types';
 //# sourceMappingURL=index.d.ts.map

lib/utils/index.d.ts

@@ -0,7 +1,8 @@
+export { getPrimaryKeyFields } from './model-util';
 export { DirectiveWrapper, GetArgumentsOptions, generateGetArgumentsInput } from './directive-wrapper';
 export { collectDirectives, collectDirectivesByTypeNames } from './type-map-utils';
 export { stripDirectives } from './strip-directives';
-export { getTable, getKeySchema, getSortKeyFieldNames } from './schema-utils';
+export { getTable, getKeySchema, getSortKeyFieldNames, getDatasourceType } from './schema-utils';
 export { DEFAULT_SCHEMA_DEFINITION } from './defaultSchema';
-export { getParameterStoreSecretPath } from './rds-secret-utils';
+export { getParameterStoreSecretPath, getModelDatasourceType, isDynamoDBModel, isRDSModel } from './rds-util';
 export declare const APICategory = "api";
@@ -8,0 +9,0 @@ export { setResourceName, getResourceName } from './resource-name';

lib/utils/index.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getResourceName = exports.setResourceName = exports.APICategory = exports.getParameterStoreSecretPath = exports.DEFAULT_SCHEMA_DEFINITION = exports.getSortKeyFieldNames = exports.getKeySchema = exports.getTable = exports.stripDirectives = exports.collectDirectivesByTypeNames = exports.collectDirectives = exports.generateGetArgumentsInput = exports.DirectiveWrapper = void 0;
+exports.getResourceName = exports.setResourceName = exports.APICategory = exports.isRDSModel = exports.isDynamoDBModel = exports.getModelDatasourceType = exports.getParameterStoreSecretPath = exports.DEFAULT_SCHEMA_DEFINITION = exports.getDatasourceType = exports.getSortKeyFieldNames = exports.getKeySchema = exports.getTable = exports.stripDirectives = exports.collectDirectivesByTypeNames = exports.collectDirectives = exports.generateGetArgumentsInput = exports.DirectiveWrapper = exports.getPrimaryKeyFields = void 0;
+var model_util_1 = require("./model-util");
+Object.defineProperty(exports, "getPrimaryKeyFields", { enumerable: true, get: function () { return model_util_1.getPrimaryKeyFields; } });
 var directive_wrapper_1 = require("./directive-wrapper");
@@ -16,6 +18,10 @@ Object.defineProperty(exports, "DirectiveWrapper", { enumerable: true, get: function () { return directive_wrapper_1.DirectiveWrapper; } });
 Object.defineProperty(exports, "getSortKeyFieldNames", { enumerable: true, get: function () { return schema_utils_1.getSortKeyFieldNames; } });
+Object.defineProperty(exports, "getDatasourceType", { enumerable: true, get: function () { return schema_utils_1.getDatasourceType; } });
 var defaultSchema_1 = require("./defaultSchema");
 Object.defineProperty(exports, "DEFAULT_SCHEMA_DEFINITION", { enumerable: true, get: function () { return defaultSchema_1.DEFAULT_SCHEMA_DEFINITION; } });
-var rds_secret_utils_1 = require("./rds-secret-utils");
-Object.defineProperty(exports, "getParameterStoreSecretPath", { enumerable: true, get: function () { return rds_secret_utils_1.getParameterStoreSecretPath; } });
+var rds_util_1 = require("./rds-util");
+Object.defineProperty(exports, "getParameterStoreSecretPath", { enumerable: true, get: function () { return rds_util_1.getParameterStoreSecretPath; } });
+Object.defineProperty(exports, "getModelDatasourceType", { enumerable: true, get: function () { return rds_util_1.getModelDatasourceType; } });
+Object.defineProperty(exports, "isDynamoDBModel", { enumerable: true, get: function () { return rds_util_1.isDynamoDBModel; } });
+Object.defineProperty(exports, "isRDSModel", { enumerable: true, get: function () { return rds_util_1.isRDSModel; } });
 exports.APICategory = 'api';
@@ -22,0 +28,0 @@ var resource_name_1 = require("./resource-name");

lib/utils/schema-utils.d.ts

 import { TransformerContextProvider } from '@aws-amplify/graphql-transformer-interfaces';
-import { ObjectTypeDefinitionNode } from 'graphql';
+import { ObjectTypeDefinitionNode, TypeNode } from 'graphql';
+import { DBType } from '../config';
 export declare const getKeySchema: (table: any, indexName?: string) => any;
 export declare const getTable: (ctx: TransformerContextProvider, object: ObjectTypeDefinitionNode) => any;
 export declare const getSortKeyFieldNames: (type: ObjectTypeDefinitionNode) => string[];
+export declare const getDatasourceType: (type: TypeNode, ctx: TransformerContextProvider) => DBType;
 //# sourceMappingURL=schema-utils.d.ts.map

lib/utils/schema-utils.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSortKeyFieldNames = exports.getTable = exports.getKeySchema = void 0;
+exports.getDatasourceType = exports.getSortKeyFieldNames = exports.getTable = exports.getKeySchema = void 0;
 const graphql_transformer_common_1 = require("graphql-transformer-common");
+const types_1 = require("../types");
 const getKeySchema = (table, indexName) => {
@@ -36,2 +37,7 @@ var _a, _b, _c;
 exports.getSortKeyFieldNames = getSortKeyFieldNames;
+const getDatasourceType = (type, ctx) => {
+    var _a, _b;
+    return (_b = (_a = ctx.modelToDatasourceMap.get((0, graphql_transformer_common_1.getBaseType)(type))) === null || _a === void 0 ? void 0 : _a.dbType) !== null && _b !== void 0 ? _b : types_1.DDB_DB_TYPE;
+};
+exports.getDatasourceType = getDatasourceType;
 //# sourceMappingURL=schema-utils.js.map

lib/wrappers/object-definition-wrapper.d.ts

 import { DirectiveNode, DocumentNode, EnumTypeDefinitionNode, FieldDefinitionNode, InputObjectTypeDefinitionNode, InputValueDefinitionNode, Location, NamedTypeNode, ObjectTypeDefinitionNode, StringValueNode, TypeNode } from 'graphql';
 import { DirectiveWrapper } from '../utils/directive-wrapper';
 export declare class GenericFieldWrapper {
-    protected type: TypeNode;
+    type: TypeNode;
     readonly directives: DirectiveWrapper[];
@@ -6,0 +6,0 @@ loc?: Location;

package.json

 {
   "name": "@aws-amplify/graphql-transformer-core",
-  "version": "2.2.1",
+  "version": "2.3.0-rds-3.0",
   "description": "A framework to transform from GraphQL SDL to AWS CloudFormation.",
@@ -31,6 +31,6 @@ "repository": {
   "dependencies": {
-    "@aws-amplify/graphql-transformer-interfaces": "3.2.0",
+    "@aws-amplify/graphql-transformer-interfaces": "3.3.0-rds-3.0",
     "fs-extra": "^8.1.0",
     "graphql": "^15.5.0",
-    "graphql-transformer-common": "4.25.1",
+    "graphql-transformer-common": "4.26.0-rds-3.0",
     "hjson": "^3.2.2",
@@ -77,3 +77,3 @@ "lodash": "^4.17.21",
   },
-  "gitHead": "26c697f3dcd421267e0c80e1125a2232036f3a2e"
+  "gitHead": "c1efd4e687969d2cb64361ee656b7ce99a5eebb8"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

567406

increased by1.71%

Number of package files

189

increased by2.16%

Lines of code

4917

increased by1.24%

Worsened metrics

Number of low quality alerts

2

increased by100%

Dependency changes

• + Added@aws-amplify/graphql-transformer-interfaces@3.3.0-rds-3.0(transitive)

• + Addedgraphql-mapping-template@4.20.13-rds-3.0(transitive)

• + Addedgraphql-transformer-common@4.26.0-rds-3.0(transitive)

• - Removed@aws-amplify/graphql-transformer-interfaces@3.2.0(transitive)

• - Removedgraphql-mapping-template@4.20.12(transitive)

• - Removedgraphql-transformer-common@4.25.1(transitive)

• Updated@aws-amplify/graphql-transformer-interfaces@3.3.0-rds-3.0

• Updatedgraphql-transformer-common@4.26.0-rds-3.0