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

Comparing version 2.8.0-acdk-upgrade-2-129.0 to 2.8.0

API.md

@@ -229,2 +229,5 @@ ## API Report File for "@aws-amplify/graphql-transformer-core"
 
+// @public (undocumented)
+export const getField: (obj: ObjectTypeDefinitionNode, fieldName: string) => FieldDefinitionNode | undefined;
+
 // Warning: (ae-forgotten-export) The symbol "Operation" needs to be exported by the entry point index.d.ts
@@ -260,2 +263,5 @@ //
 // @public (undocumented)
+export const getPrimaryKeyFieldNodes: (type: ObjectTypeDefinitionNode) => FieldDefinitionNode[];
+
+// @public (undocumented)
 export const getPrimaryKeyFields: (type: ObjectTypeDefinitionNode) => string[];
@@ -291,2 +297,5 @@
 // @public (undocumented)
+export const getType: (schema: DocumentNode_2, typeName: string) => ObjectTypeDefinitionNode | undefined;
+
+// @public (undocumented)
 export class GraphQLTransform {
@@ -293,0 +302,0 @@ constructor(options: GraphQLTransformOptions);

lib/index.d.ts

@@ -5,3 +5,3 @@ export { constructDataSourceStrategies, constructSqlDirectiveDataSourceStrategies, getModelTypeNames, GraphQLTransform, GraphQLTransformOptions, SyncUtils, } from './transformation';
 export { ConflictDetectionType, ConflictHandlerType, ResolverConfig, SyncConfig, SyncConfigOptimistic, SyncConfigServer, SyncConfigLambda, TransformConfig, } from './config/index';
-export { APICategory, collectDirectives, collectDirectivesByTypeNames, constructArrayFieldsStatement, constructAuthFilterStatement, constructFieldMappingInput, constructNonScalarFieldsStatement, DirectiveWrapper, fieldsWithSqlDirective, generateGetArgumentsInput, GetArgumentsOptions, getArrayFields, getConditionInputName, getConnectionName, getDefaultStrategyNameForDbType, getFilterInputName, getImportedRDSTypeFromStrategyDbType, getKeySchema, getModelDataSourceNameForTypeName, getModelDataSourceStrategy, getNonScalarFields, getParameterStoreSecretPath, getPrimaryKeyFields, getResourceName, getResourceNamesForStrategy, getResourceNamesForStrategyName, getSortKeyFieldNames, getStrategyDbTypeFromModel, getStrategyDbTypeFromTypeNode, getSubscriptionFilterInputName, getTable, isAmplifyDynamoDbModelDataSourceStrategy, isBuiltInGraphqlNode, isDefaultDynamoDbModelDataSourceStrategy, isDynamoDbModel, isDynamoDbType, isModelType, isMutationNode, isObjectTypeDefinitionNode, isQueryNode, isSqlDbType, isSqlModel, isSqlStrategy, normalizeDbType, setResourceName, SQLLambdaResourceNames, } from './utils';
+export { APICategory, collectDirectives, collectDirectivesByTypeNames, constructArrayFieldsStatement, constructAuthFilterStatement, constructFieldMappingInput, constructNonScalarFieldsStatement, DirectiveWrapper, fieldsWithSqlDirective, generateGetArgumentsInput, GetArgumentsOptions, getArrayFields, getConditionInputName, getConnectionName, getDefaultStrategyNameForDbType, getField, getFilterInputName, getImportedRDSTypeFromStrategyDbType, getKeySchema, getModelDataSourceNameForTypeName, getModelDataSourceStrategy, getNonScalarFields, getParameterStoreSecretPath, getPrimaryKeyFieldNodes, getPrimaryKeyFields, getResourceName, getResourceNamesForStrategy, getResourceNamesForStrategyName, getSortKeyFieldNames, getStrategyDbTypeFromModel, getStrategyDbTypeFromTypeNode, getSubscriptionFilterInputName, getTable, getType, isAmplifyDynamoDbModelDataSourceStrategy, isBuiltInGraphqlNode, isDefaultDynamoDbModelDataSourceStrategy, isDynamoDbModel, isDynamoDbType, isModelType, isMutationNode, isObjectTypeDefinitionNode, isQueryNode, isSqlDbType, isSqlModel, isSqlStrategy, normalizeDbType, setResourceName, SQLLambdaResourceNames, } from './utils';
 export type { SetResourceNameProps } from './utils';
@@ -8,0 +8,0 @@ export * from './utils/operation-names';

lib/index.js

@@ -17,4 +17,4 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeDbType = exports.isSqlStrategy = exports.isSqlModel = exports.isSqlDbType = exports.isQueryNode = exports.isObjectTypeDefinitionNode = exports.isMutationNode = exports.isModelType = exports.isDynamoDbType = exports.isDynamoDbModel = exports.isDefaultDynamoDbModelDataSourceStrategy = exports.isBuiltInGraphqlNode = exports.isAmplifyDynamoDbModelDataSourceStrategy = exports.getTable = exports.getSubscriptionFilterInputName = exports.getStrategyDbTypeFromTypeNode = exports.getStrategyDbTypeFromModel = exports.getSortKeyFieldNames = exports.getResourceNamesForStrategyName = exports.getResourceNamesForStrategy = exports.getResourceName = exports.getPrimaryKeyFields = exports.getParameterStoreSecretPath = exports.getNonScalarFields = exports.getModelDataSourceStrategy = exports.getModelDataSourceNameForTypeName = exports.getKeySchema = exports.getImportedRDSTypeFromStrategyDbType = exports.getFilterInputName = exports.getDefaultStrategyNameForDbType = exports.getConnectionName = exports.getConditionInputName = exports.getArrayFields = exports.generateGetArgumentsInput = exports.fieldsWithSqlDirective = exports.DirectiveWrapper = exports.constructNonScalarFieldsStatement = exports.constructFieldMappingInput = exports.constructAuthFilterStatement = exports.constructArrayFieldsStatement = exports.collectDirectivesByTypeNames = exports.collectDirectives = exports.APICategory = exports.ConflictHandlerType = exports.validateModelSchema = exports.SyncUtils = exports.GraphQLTransform = exports.getModelTypeNames = exports.constructSqlDirectiveDataSourceStrategies = exports.constructDataSourceStrategies = void 0;
-exports.ObjectDefinitionWrapper = exports.InputObjectDefinitionWrapper = exports.InputFieldWrapper = exports.FieldWrapper = exports.EnumWrapper = exports.MappingTemplate = exports.getAppSyncServiceExtraDirectives = exports.SQL_SCHEMA_FILE_NAME = exports.POSTGRES_DB_TYPE = exports.MYSQL_DB_TYPE = exports.ImportedRDSType = exports.DDB_DEFAULT_DATASOURCE_STRATEGY = exports.DDB_DB_TYPE = exports.DDB_AMPLIFY_MANAGED_DATASOURCE_STRATEGY = exports.StackManager = exports.TransformerResolver = exports.TransformerAuthBase = exports.TransformerPluginBase = exports.TransformerModelEnhancerBase = exports.TransformerModelBase = exports.setResourceName = void 0;
+exports.isSqlDbType = exports.isQueryNode = exports.isObjectTypeDefinitionNode = exports.isMutationNode = exports.isModelType = exports.isDynamoDbType = exports.isDynamoDbModel = exports.isDefaultDynamoDbModelDataSourceStrategy = exports.isBuiltInGraphqlNode = exports.isAmplifyDynamoDbModelDataSourceStrategy = exports.getType = exports.getTable = exports.getSubscriptionFilterInputName = exports.getStrategyDbTypeFromTypeNode = exports.getStrategyDbTypeFromModel = exports.getSortKeyFieldNames = exports.getResourceNamesForStrategyName = exports.getResourceNamesForStrategy = exports.getResourceName = exports.getPrimaryKeyFields = exports.getPrimaryKeyFieldNodes = exports.getParameterStoreSecretPath = exports.getNonScalarFields = exports.getModelDataSourceStrategy = exports.getModelDataSourceNameForTypeName = exports.getKeySchema = exports.getImportedRDSTypeFromStrategyDbType = exports.getFilterInputName = exports.getField = exports.getDefaultStrategyNameForDbType = exports.getConnectionName = exports.getConditionInputName = exports.getArrayFields = exports.generateGetArgumentsInput = exports.fieldsWithSqlDirective = exports.DirectiveWrapper = exports.constructNonScalarFieldsStatement = exports.constructFieldMappingInput = exports.constructAuthFilterStatement = exports.constructArrayFieldsStatement = exports.collectDirectivesByTypeNames = exports.collectDirectives = exports.APICategory = exports.ConflictHandlerType = exports.validateModelSchema = exports.SyncUtils = exports.GraphQLTransform = exports.getModelTypeNames = exports.constructSqlDirectiveDataSourceStrategies = exports.constructDataSourceStrategies = void 0;
+exports.ObjectDefinitionWrapper = exports.InputObjectDefinitionWrapper = exports.InputFieldWrapper = exports.FieldWrapper = exports.EnumWrapper = exports.MappingTemplate = exports.getAppSyncServiceExtraDirectives = exports.SQL_SCHEMA_FILE_NAME = exports.POSTGRES_DB_TYPE = exports.MYSQL_DB_TYPE = exports.ImportedRDSType = exports.DDB_DEFAULT_DATASOURCE_STRATEGY = exports.DDB_DB_TYPE = exports.DDB_AMPLIFY_MANAGED_DATASOURCE_STRATEGY = exports.StackManager = exports.TransformerResolver = exports.TransformerAuthBase = exports.TransformerPluginBase = exports.TransformerModelEnhancerBase = exports.TransformerModelBase = exports.setResourceName = exports.normalizeDbType = exports.isSqlStrategy = exports.isSqlModel = void 0;
 const graphql_1 = require("graphql");
@@ -47,2 +47,3 @@ const validation_1 = require("./transformation/validation");
 Object.defineProperty(exports, "getDefaultStrategyNameForDbType", { enumerable: true, get: function () { return utils_1.getDefaultStrategyNameForDbType; } });
+Object.defineProperty(exports, "getField", { enumerable: true, get: function () { return utils_1.getField; } });
 Object.defineProperty(exports, "getFilterInputName", { enumerable: true, get: function () { return utils_1.getFilterInputName; } });
@@ -55,2 +56,3 @@ Object.defineProperty(exports, "getImportedRDSTypeFromStrategyDbType", { enumerable: true, get: function () { return utils_1.getImportedRDSTypeFromStrategyDbType; } });
 Object.defineProperty(exports, "getParameterStoreSecretPath", { enumerable: true, get: function () { return utils_1.getParameterStoreSecretPath; } });
+Object.defineProperty(exports, "getPrimaryKeyFieldNodes", { enumerable: true, get: function () { return utils_1.getPrimaryKeyFieldNodes; } });
 Object.defineProperty(exports, "getPrimaryKeyFields", { enumerable: true, get: function () { return utils_1.getPrimaryKeyFields; } });
@@ -65,2 +67,3 @@ Object.defineProperty(exports, "getResourceName", { enumerable: true, get: function () { return utils_1.getResourceName; } });
 Object.defineProperty(exports, "getTable", { enumerable: true, get: function () { return utils_1.getTable; } });
+Object.defineProperty(exports, "getType", { enumerable: true, get: function () { return utils_1.getType; } });
 Object.defineProperty(exports, "isAmplifyDynamoDbModelDataSourceStrategy", { enumerable: true, get: function () { return utils_1.isAmplifyDynamoDbModelDataSourceStrategy; } });
@@ -67,0 +70,0 @@ Object.defineProperty(exports, "isBuiltInGraphqlNode", { enumerable: true, get: function () { return utils_1.isBuiltInGraphqlNode; } });

lib/utils/graphql-utils.d.ts

@@ -1,2 +0,2 @@
-import { DefinitionNode, FieldDefinitionNode, InterfaceTypeDefinitionNode, ObjectTypeDefinitionNode } from 'graphql';
+import { DefinitionNode, DocumentNode, FieldDefinitionNode, InterfaceTypeDefinitionNode, ObjectTypeDefinitionNode } from 'graphql';
 export declare const isObjectTypeDefinitionNode: (obj: DefinitionNode) => obj is ObjectTypeDefinitionNode;
@@ -28,2 +28,4 @@ export declare const isMutationType: (typeName: string) => typeName is "Mutation";
 export declare const fieldsWithSqlDirective: (obj: ObjectTypeDefinitionNode | InterfaceTypeDefinitionNode) => FieldDefinitionNode[];
+export declare const getField: (obj: ObjectTypeDefinitionNode, fieldName: string) => FieldDefinitionNode | undefined;
+export declare const getType: (schema: DocumentNode, typeName: string) => ObjectTypeDefinitionNode | undefined;
 //# sourceMappingURL=graphql-utils.d.ts.map

lib/utils/graphql-utils.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fieldsWithSqlDirective = exports.isBuiltInGraphqlNode = exports.isSubscriptionNode = exports.isQueryNode = exports.isMutationNode = exports.isBuiltInGraphqlType = exports.isSubscriptionType = exports.isQueryType = exports.isMutationType = exports.isObjectTypeDefinitionNode = void 0;
+exports.getType = exports.getField = exports.fieldsWithSqlDirective = exports.isBuiltInGraphqlNode = exports.isSubscriptionNode = exports.isQueryNode = exports.isMutationNode = exports.isBuiltInGraphqlType = exports.isSubscriptionType = exports.isQueryType = exports.isMutationType = exports.isObjectTypeDefinitionNode = void 0;
 const graphql_1 = require("graphql");
@@ -39,2 +39,6 @@ const SQL_DIRECTIVE_NAME = 'sql';
 exports.fieldsWithSqlDirective = fieldsWithSqlDirective;
+const getField = (obj, fieldName) => { var _a; return (_a = obj.fields) === null || _a === void 0 ? void 0 : _a.find((f) => f.name.value === fieldName); };
+exports.getField = getField;
+const getType = (schema, typeName) => schema.definitions.find((def) => (0, exports.isObjectTypeDefinitionNode)(def) && def.name.value === typeName);
+exports.getType = getType;
 //# sourceMappingURL=graphql-utils.js.map

lib/utils/index.d.ts

@@ -1,2 +0,2 @@
-export { getPrimaryKeyFields, getFilterInputName, getConditionInputName, getSubscriptionFilterInputName, getConnectionName, } from './model-util';
+export { getConditionInputName, getConnectionName, getFilterInputName, getPrimaryKeyFieldNodes, getPrimaryKeyFields, getSubscriptionFilterInputName, } from './model-util';
 export { DirectiveWrapper, GetArgumentsOptions, generateGetArgumentsInput } from './directive-wrapper';
@@ -3,0 +3,0 @@ export { collectDirectives, collectDirectivesByTypeNames } from './type-map-utils';

lib/utils/index.js

@@ -17,9 +17,10 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getResourceNamesForStrategyName = exports.getResourceNamesForStrategy = exports.getResourceName = exports.getDefaultStrategyNameForDbType = exports.setResourceName = exports.APICategory = exports.getParameterStoreSecretPath = exports.getNonScalarFields = exports.getArrayFields = exports.constructNonScalarFieldsStatement = exports.constructFieldMappingInput = exports.constructAuthFilterStatement = exports.constructArrayFieldsStatement = exports.DEFAULT_SCHEMA_DEFINITION = exports.getStrategyDbTypeFromTypeNode = exports.getSortKeyFieldNames = exports.getKeySchema = exports.getTable = exports.stripDirectives = exports.collectDirectivesByTypeNames = exports.collectDirectives = exports.generateGetArgumentsInput = exports.DirectiveWrapper = exports.getConnectionName = exports.getSubscriptionFilterInputName = exports.getConditionInputName = exports.getFilterInputName = exports.getPrimaryKeyFields = void 0;
+exports.getResourceNamesForStrategyName = exports.getResourceNamesForStrategy = exports.getResourceName = exports.getDefaultStrategyNameForDbType = exports.setResourceName = exports.APICategory = exports.getParameterStoreSecretPath = exports.getNonScalarFields = exports.getArrayFields = exports.constructNonScalarFieldsStatement = exports.constructFieldMappingInput = exports.constructAuthFilterStatement = exports.constructArrayFieldsStatement = exports.DEFAULT_SCHEMA_DEFINITION = exports.getStrategyDbTypeFromTypeNode = exports.getSortKeyFieldNames = exports.getKeySchema = exports.getTable = exports.stripDirectives = exports.collectDirectivesByTypeNames = exports.collectDirectives = exports.generateGetArgumentsInput = exports.DirectiveWrapper = exports.getSubscriptionFilterInputName = exports.getPrimaryKeyFields = exports.getPrimaryKeyFieldNodes = exports.getFilterInputName = exports.getConnectionName = exports.getConditionInputName = void 0;
 var model_util_1 = require("./model-util");
+Object.defineProperty(exports, "getConditionInputName", { enumerable: true, get: function () { return model_util_1.getConditionInputName; } });
+Object.defineProperty(exports, "getConnectionName", { enumerable: true, get: function () { return model_util_1.getConnectionName; } });
+Object.defineProperty(exports, "getFilterInputName", { enumerable: true, get: function () { return model_util_1.getFilterInputName; } });
+Object.defineProperty(exports, "getPrimaryKeyFieldNodes", { enumerable: true, get: function () { return model_util_1.getPrimaryKeyFieldNodes; } });
 Object.defineProperty(exports, "getPrimaryKeyFields", { enumerable: true, get: function () { return model_util_1.getPrimaryKeyFields; } });
-Object.defineProperty(exports, "getFilterInputName", { enumerable: true, get: function () { return model_util_1.getFilterInputName; } });
-Object.defineProperty(exports, "getConditionInputName", { enumerable: true, get: function () { return model_util_1.getConditionInputName; } });
 Object.defineProperty(exports, "getSubscriptionFilterInputName", { enumerable: true, get: function () { return model_util_1.getSubscriptionFilterInputName; } });
-Object.defineProperty(exports, "getConnectionName", { enumerable: true, get: function () { return model_util_1.getConnectionName; } });
 var directive_wrapper_1 = require("./directive-wrapper");
@@ -26,0 +27,0 @@ Object.defineProperty(exports, "DirectiveWrapper", { enumerable: true, get: function () { return directive_wrapper_1.DirectiveWrapper; } });

lib/utils/model-util.d.ts

@@ -1,2 +0,3 @@
-import { ObjectTypeDefinitionNode } from 'graphql';
+import { FieldDefinitionNode, ObjectTypeDefinitionNode } from 'graphql';
+export declare const getPrimaryKeyFieldNodes: (type: ObjectTypeDefinitionNode) => FieldDefinitionNode[];
 export declare const getPrimaryKeyFields: (type: ObjectTypeDefinitionNode) => string[];
@@ -7,2 +8,3 @@ export declare const getFilterInputName: (modelName: string) => string;
 export declare const getConnectionName: (modelName: string) => string;
+export declare const getImplicitlyDefinedIdField: () => FieldDefinitionNode;
 //# sourceMappingURL=model-util.d.ts.map

lib/utils/model-util.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConnectionName = exports.getSubscriptionFilterInputName = exports.getConditionInputName = exports.getFilterInputName = exports.getPrimaryKeyFields = void 0;
+exports.getImplicitlyDefinedIdField = exports.getConnectionName = exports.getSubscriptionFilterInputName = exports.getConditionInputName = exports.getFilterInputName = exports.getPrimaryKeyFields = exports.getPrimaryKeyFieldNodes = void 0;
 const graphql_transformer_common_1 = require("graphql-transformer-common");
-const getPrimaryKeyFields = (type) => {
+const graphql_utils_1 = require("./graphql-utils");
+const getPrimaryKeyFieldNodes = (type) => {
     var _a, _b, _c, _d;
     const primaryKeyField = (_a = type.fields) === null || _a === void 0 ? void 0 : _a.find((f) => { var _a; return (_a = f.directives) === null || _a === void 0 ? void 0 : _a.some((d) => d.name.value === 'primaryKey'); });
     if (!primaryKeyField) {
-        return ['id'];
+        return [(0, exports.getImplicitlyDefinedIdField)()];
     }
     const primaryKeyDirective = (_b = primaryKeyField === null || primaryKeyField === void 0 ? void 0 : primaryKeyField.directives) === null || _b === void 0 ? void 0 : _b.find((d) => d.name.value === 'primaryKey');
-    const result = [primaryKeyField.name.value];
+    const result = [primaryKeyField];
     const sortKeys = (_d = (_c = primaryKeyDirective === null || primaryKeyDirective === void 0 ? void 0 : primaryKeyDirective.arguments) === null || _c === void 0 ? void 0 : _c.find((a) => a.name.value === 'sortKeyFields')) === null || _d === void 0 ? void 0 : _d.value;
     if (sortKeys) {
-        result.push(...sortKeys.values.map((v) => v.value));
+        const fieldFinder = (fieldName) => (0, graphql_utils_1.getField)(type, fieldName);
+        const sortKeyNames = sortKeys.values.map((v) => v.value);
+        const sortFields = sortKeyNames.map(fieldFinder);
+        for (const sortField of sortFields) {
+            if (!sortField) {
+                throw new Error(`Invalid sort key field name in primary key directive: ${sortKeyNames}`);
+            }
+        }
+        result.push(...sortFields);
     }
     return result;
 };
+exports.getPrimaryKeyFieldNodes = getPrimaryKeyFieldNodes;
+const getPrimaryKeyFields = (type) => {
+    return (0, exports.getPrimaryKeyFieldNodes)(type).map((f) => f.name.value);
+};
 exports.getPrimaryKeyFields = getPrimaryKeyFields;
@@ -36,2 +49,20 @@ const getFilterInputName = (modelName) => {
 exports.getConnectionName = getConnectionName;
+const getImplicitlyDefinedIdField = () => ({
+    kind: 'FieldDefinition',
+    name: {
+        kind: 'Name',
+        value: 'id',
+    },
+    type: {
+        kind: 'NonNullType',
+        type: {
+            kind: 'NamedType',
+            name: {
+                kind: 'Name',
+                value: 'ID',
+            },
+        },
+    },
+});
+exports.getImplicitlyDefinedIdField = getImplicitlyDefinedIdField;
 //# sourceMappingURL=model-util.js.map

package.json

 {
   "name": "@aws-amplify/graphql-transformer-core",
-  "version": "2.8.0-acdk-upgrade-2-129.0",
+  "version": "2.8.0",
   "description": "A framework to transform from GraphQL SDL to AWS CloudFormation.",
@@ -32,3 +32,3 @@ "repository": {
     "@aws-amplify/graphql-directives": "1.1.0",
-    "@aws-amplify/graphql-transformer-interfaces": "3.8.0-acdk-upgrade-2-129.0",
+    "@aws-amplify/graphql-transformer-interfaces": "3.8.0",
     "fs-extra": "^8.1.0",
@@ -45,4 +45,4 @@ "graphql": "^15.5.0",
   "peerDependencies": {
-    "aws-cdk-lib": "^2.129.0",
-    "constructs": "^10.3.0"
+    "aws-cdk-lib": "^2.80.0",
+    "constructs": "^10.0.5"
   },
@@ -92,3 +92,3 @@ "devDependencies": {
   },
-  "gitHead": "48772bfb1e32be014db55405be00dd5ef88020cb"
+  "gitHead": "a6bd979529c1c7686ae3e9ad928f232d181114ab"
 }

New alerts

SPDX disjunction

License

SPDX disjunction for an artifact's license information

Found 1 instance in 1 package

Fixed alerts

SPDX disjunction

License

SPDX disjunction for an artifact's license information

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

Improved metrics

Total package byte prevSize

644902

increased by0.76%

Lines of code

5514

increased by0.79%

Number of low quality alerts

1

decreased by-50%

Dependency changes

• + Added@aws-amplify/graphql-transformer-interfaces@3.8.0(transitive)

• - Removed@aws-amplify/graphql-transformer-interfaces@3.8.0-acdk-upgrade-2-129.0(transitive)

• Updated@aws-amplify/graphql-transformer-interfaces@3.8.0