@aws-amplify/graphql-model-transformer 0.7.0-graphql-vnext-dev-preview.2 → 0.8.0-beta.1

package/src/graphql-model-transformer.ts

@@ -1,4 +1,11 @@
-import { InvalidDirectiveError, MappingTemplate, SyncConfig, SyncUtils, TransformerModelBase } from '@aws-amplify/graphql-transformer-core';
+import {
+  DirectiveWrapper,
+  InvalidDirectiveError,
+  MappingTemplate,
+  SyncConfig,
+  SyncUtils,
+  TransformerModelBase,
+} from '@aws-amplify/graphql-transformer-core';
 import {
   AppSyncDataSourceType,
   DataSourceInstance,
@@ -37,6 +44,7 @@ import {
   makeValueNode,
   ModelResourceIDs,
   plurality,
+  ResolverResourceIDs,
   ResourceConstants,
   SyncResourceIDs,
   toCamelCase,
@@ -71,12 +79,7 @@ import {
   generateListRequestTemplate,
   generateSyncRequestTemplate,
 } from './resolvers/query';
-import {
-  DirectiveWrapper,
-  FieldWrapper,
-  InputObjectDefinitionWrapper,
-  ObjectDefinitionWrapper,
-} from './wrappers/object-definition-wrapper';
+import { FieldWrapper, InputObjectDefinitionWrapper, ObjectDefinitionWrapper } from './wrappers/object-definition-wrapper';
 import { CfnRole } from '@aws-cdk/aws-iam';
 import md5 from 'md5';
 
@@ -241,8 +244,6 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       this.addAutoGeneratableFields(ctx, type);
 
       if (ctx.isProjectUsingDataStore()) {
-        SyncUtils.validateResolverConfigForType(ctx, def!.name.value);
-        this.options.SyncConfig = SyncUtils.getSyncConfig(ctx, def!.name.value);
         this.addModelSyncFields(ctx, type);
       }
     }
@@ -262,13 +263,13 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
         let resolver;
         switch (query.type) {
           case QueryFieldType.GET:
-            resolver = this.generateGetResolver(context, def!, query.typeName, query.fieldName);
+            resolver = this.generateGetResolver(context, def!, query.typeName, query.fieldName, query.resolverLogicalId);
             break;
           case QueryFieldType.LIST:
-            resolver = this.generateListResolver(context, def!, query.typeName, query.fieldName);
+            resolver = this.generateListResolver(context, def!, query.typeName, query.fieldName, query.resolverLogicalId);
             break;
           case QueryFieldType.SYNC:
-            resolver = this.generateSyncResolver(context, def!, query.typeName, query.fieldName);
+            resolver = this.generateSyncResolver(context, def!, query.typeName, query.fieldName, query.resolverLogicalId);
             break;
           default:
             throw new Error('Unknown query field type');
@@ -289,13 +290,13 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
         let resolver;
         switch (mutation.type) {
           case MutationFieldType.CREATE:
-            resolver = this.generateCreateResolver(context, def!, mutation.typeName, mutation.fieldName);
+            resolver = this.generateCreateResolver(context, def!, mutation.typeName, mutation.fieldName, mutation.resolverLogicalId);
             break;
           case MutationFieldType.DELETE:
-            resolver = this.generateDeleteResolver(context, def!, mutation.typeName, mutation.fieldName);
+            resolver = this.generateDeleteResolver(context, def!, mutation.typeName, mutation.fieldName, mutation.resolverLogicalId);
             break;
           case MutationFieldType.UPDATE:
-            resolver = this.generateUpdateResolver(context, def!, mutation.typeName, mutation.fieldName);
+            resolver = this.generateUpdateResolver(context, def!, mutation.typeName, mutation.fieldName, mutation.resolverLogicalId);
             break;
           default:
             throw new Error('Unknown mutation field type');
@@ -319,13 +320,31 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
           let resolver;
           switch (subscription.type) {
             case SubscriptionFieldType.ON_CREATE:
-              resolver = this.generateOnCreateResolver(context, def, subscription.typeName, subscription.fieldName);
+              resolver = this.generateOnCreateResolver(
+                context,
+                def,
+                subscription.typeName,
+                subscription.fieldName,
+                subscription.resolverLogicalId,
+              );
               break;
             case SubscriptionFieldType.ON_UPDATE:
-              resolver = this.generateOnUpdateResolver(context, def, subscription.typeName, subscription.fieldName);
+              resolver = this.generateOnUpdateResolver(
+                context,
+                def,
+                subscription.typeName,
+                subscription.fieldName,
+                subscription.resolverLogicalId,
+              );
               break;
             case SubscriptionFieldType.ON_DELETE:
-              resolver = this.generateOnDeleteResolver(context, def, subscription.typeName, subscription.fieldName);
+              resolver = this.generateOnDeleteResolver(
+                context,
+                def,
+                subscription.typeName,
+                subscription.fieldName,
+                subscription.resolverLogicalId,
+              );
               break;
             default:
               throw new Error('Unknown subscription field type');
@@ -349,6 +368,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     type: ObjectTypeDefinitionNode,
     typeName: string,
     fieldName: string,
+    resolverLogicalId: string,
   ): TransformerResolverProvider => {
     const isSyncEnabled = ctx.isProjectUsingDataStore();
     const dataSource = this.datasourceMap[type.name.value];
@@ -357,6 +377,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       this.resolverMap[resolverKey] = ctx.resolvers.generateQueryResolver(
         typeName,
         fieldName,
+        resolverLogicalId,
         dataSource,
         MappingTemplate.s3MappingTemplateFromString(generateGetRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
         MappingTemplate.s3MappingTemplateFromString(generateGetResponseTemplate(isSyncEnabled), `${typeName}.${fieldName}.res.vtl`),
@@ -370,6 +391,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     type: ObjectTypeDefinitionNode,
     typeName: string,
     fieldName: string,
+    resolverLogicalId: string,
   ): TransformerResolverProvider => {
     const isSyncEnabled = ctx.isProjectUsingDataStore();
     const dataSource = this.datasourceMap[type.name.value];
@@ -378,6 +400,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       this.resolverMap[resolverKey] = ctx.resolvers.generateQueryResolver(
         typeName,
         fieldName,
+        resolverLogicalId,
         dataSource,
         MappingTemplate.s3MappingTemplateFromString(generateListRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
         MappingTemplate.s3MappingTemplateFromString(
@@ -394,6 +417,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     type: ObjectTypeDefinitionNode,
     typeName: string,
     fieldName: string,
+    resolverLogicalId: string,
   ): TransformerResolverProvider => {
     const isSyncEnabled = ctx.isProjectUsingDataStore();
     const dataSource = this.datasourceMap[type.name.value];
@@ -402,6 +426,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       const resolver = ctx.resolvers.generateMutationResolver(
         typeName,
         fieldName,
+        resolverLogicalId,
         dataSource,
         MappingTemplate.s3MappingTemplateFromString(
           generateUpdateRequestTemplate(typeName, isSyncEnabled),
@@ -429,6 +454,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     type: ObjectTypeDefinitionNode,
     typeName: string,
     fieldName: string,
+    resolverLogicalId: string,
   ): TransformerResolverProvider => {
     const isSyncEnabled = ctx.isProjectUsingDataStore();
     const dataSource = this.datasourceMap[type.name.value];
@@ -437,6 +463,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       this.resolverMap[resolverKey] = ctx.resolvers.generateMutationResolver(
         typeName,
         fieldName,
+        resolverLogicalId,
         dataSource,
         MappingTemplate.s3MappingTemplateFromString(generateDeleteRequestTemplate(isSyncEnabled), `${typeName}.${fieldName}.req.vtl`),
         MappingTemplate.s3MappingTemplateFromString(
@@ -453,12 +480,14 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     type: ObjectTypeDefinitionNode,
     typeName: string,
     fieldName: string,
+    resolverLogicalId: string,
   ): TransformerResolverProvider => {
     const resolverKey = `OnCreate${generateResolverKey(typeName, fieldName)}`;
     if (!this.resolverMap[resolverKey]) {
       this.resolverMap[resolverKey] = ctx.resolvers.generateSubscriptionResolver(
         typeName,
         fieldName,
+        resolverLogicalId,
         MappingTemplate.s3MappingTemplateFromString(generateSubscriptionRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
         MappingTemplate.s3MappingTemplateFromString(generateSubscriptionResponseTemplate(), `${typeName}.${fieldName}.res.vtl`),
       );
@@ -470,12 +499,14 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     type: ObjectTypeDefinitionNode,
     typeName: string,
     fieldName: string,
+    resolverLogicalId: string,
   ): TransformerResolverProvider => {
     const resolverKey = `OnUpdate${generateResolverKey(typeName, fieldName)}`;
     if (!this.resolverMap[resolverKey]) {
       this.resolverMap[resolverKey] = ctx.resolvers.generateSubscriptionResolver(
         typeName,
         fieldName,
+        resolverLogicalId,
         MappingTemplate.s3MappingTemplateFromString(generateSubscriptionRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
         MappingTemplate.s3MappingTemplateFromString(generateSubscriptionResponseTemplate(), `${typeName}.${fieldName}.res.vtl`),
       );
@@ -487,12 +518,14 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     type: ObjectTypeDefinitionNode,
     typeName: string,
     fieldName: string,
+    resolverLogicalId: string,
   ): TransformerResolverProvider => {
     const resolverKey = `OnDelete${generateResolverKey(typeName, fieldName)}`;
     if (!this.resolverMap[resolverKey]) {
       this.resolverMap[resolverKey] = ctx.resolvers.generateSubscriptionResolver(
         typeName,
         fieldName,
+        resolverLogicalId,
         MappingTemplate.s3MappingTemplateFromString(generateSubscriptionRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
         MappingTemplate.s3MappingTemplateFromString(generateSubscriptionResponseTemplate(), `${typeName}.${fieldName}.res.vtl`),
       );
@@ -504,6 +537,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     type: ObjectTypeDefinitionNode,
     typeName: string,
     fieldName: string,
+    resolverLogicalId: string,
   ): TransformerResolverProvider => {
     const isSyncEnabled = ctx.isProjectUsingDataStore();
     const dataSource = this.datasourceMap[type.name.value];
@@ -512,6 +546,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       this.resolverMap[resolverKey] = ctx.resolvers.generateQueryResolver(
         typeName,
         fieldName,
+        resolverLogicalId,
         dataSource,
         MappingTemplate.s3MappingTemplateFromString(generateSyncRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
         MappingTemplate.s3MappingTemplateFromString(
@@ -526,15 +561,16 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
   getQueryFieldNames = (
     ctx: TransformerTransformSchemaStepContextProvider,
     type: ObjectTypeDefinitionNode,
-  ): Set<{ fieldName: string; typeName: string; type: QueryFieldType }> => {
+  ): Set<{ fieldName: string; typeName: string; type: QueryFieldType; resolverLogicalId: string }> => {
     const typeName = type.name.value;
-    const fields: Set<{ fieldName: string; typeName: string; type: QueryFieldType }> = new Set();
+    const fields: Set<{ fieldName: string; typeName: string; type: QueryFieldType; resolverLogicalId: string }> = new Set();
     const modelDirectiveConfig = this.modelDirectiveConfig.get(type.name.value);
     if (modelDirectiveConfig?.queries?.get) {
       fields.add({
         typeName: 'Query',
         fieldName: modelDirectiveConfig.queries.get || toCamelCase(['get', typeName]),
         type: QueryFieldType.GET,
+        resolverLogicalId: ResolverResourceIDs.DynamoDBGetResolverResourceID(typeName),
       });
     }
 
@@ -543,6 +579,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
         typeName: 'Query',
         fieldName: modelDirectiveConfig.queries.list || toCamelCase(['list', typeName]),
         type: QueryFieldType.LIST,
+        resolverLogicalId: ResolverResourceIDs.DynamoDBListResolverResourceID(typeName),
       });
     }
 
@@ -551,6 +588,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
         typeName: 'Query',
         fieldName: modelDirectiveConfig.queries.sync || toCamelCase(['sync', typeName]),
         type: QueryFieldType.SYNC,
+        resolverLogicalId: ResolverResourceIDs.SyncResolverResourceID(typeName),
       });
     }
 
@@ -560,7 +598,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
   getMutationFieldNames = (
     ctx: TransformerTransformSchemaStepContextProvider,
     type: ObjectTypeDefinitionNode,
-  ): Set<{ fieldName: string; typeName: string; type: MutationFieldType }> => {
+  ): Set<{ fieldName: string; typeName: string; type: MutationFieldType; resolverLogicalId: string }> => {
     // Todo: get fields names from the directives
     const typeName = type.name.value;
     const modelDirectiveConfig = this.modelDirectiveConfig.get(typeName);
@@ -577,13 +615,27 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       }
     };
 
-    const fieldNames: Set<{ fieldName: string; typeName: string; type: MutationFieldType }> = new Set();
+    const getMutationResolverLogicalId = (type: string): string => {
+      switch (type) {
+        case 'create':
+          return ResolverResourceIDs.DynamoDBCreateResolverResourceID(typeName);
+        case 'update':
+          return ResolverResourceIDs.DynamoDBUpdateResolverResourceID(typeName);
+        case 'delete':
+          return ResolverResourceIDs.DynamoDBDeleteResolverResourceID(typeName);
+        default:
+          throw new Error('Unknown mutation type');
+      }
+    };
+
+    const fieldNames: Set<{ fieldName: string; typeName: string; type: MutationFieldType; resolverLogicalId: string }> = new Set();
     for (let [mutationType, mutationName] of Object.entries(modelDirectiveConfig?.mutations || {})) {
       if (mutationName) {
         fieldNames.add({
           typeName: 'Mutation',
           fieldName: mutationName,
           type: getMutationType(mutationType),
+          resolverLogicalId: getMutationResolverLogicalId(mutationType),
         });
       }
     }
@@ -597,6 +649,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       fieldName: string;
       typeName: string;
       type: MutationFieldType;
+      resolverLogicalId: string;
     }>,
   ): string => {
     const mutationToSubscriptionTypeMap = {
@@ -682,11 +735,13 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     fieldName: string;
     typeName: string;
     type: SubscriptionFieldType;
+    resolverLogicalId: string;
   }> => {
     const fields: Set<{
       fieldName: string;
       typeName: string;
       type: SubscriptionFieldType;
+      resolverLogicalId: string;
     }> = new Set();
 
     const modelDirectiveConfig = this.modelDirectiveConfig.get(type.name.value);
@@ -697,6 +752,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
             typeName: 'Subscription',
             fieldName: fieldName,
             type: SubscriptionFieldType.ON_CREATE,
+            resolverLogicalId: ModelResourceIDs.ModelOnCreateSubscriptionName(type.name.value),
           });
         }
       }
@@ -707,6 +763,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
             typeName: 'Subscription',
             fieldName: fieldName,
             type: SubscriptionFieldType.ON_UPDATE,
+            resolverLogicalId: ModelResourceIDs.ModelOnUpdateSubscriptionName(type.name.value),
           });
         }
       }
@@ -717,6 +774,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
             typeName: 'Subscription',
             fieldName: fieldName,
             type: SubscriptionFieldType.ON_DELETE,
+            resolverLogicalId: ModelResourceIDs.ModelOnDeleteSubscriptionName(type.name.value),
           });
         }
       }
@@ -739,6 +797,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     type: ObjectTypeDefinitionNode,
     typeName: string,
     fieldName: string,
+    resolverLogicalId: string,
   ): TransformerResolverProvider => {
     const isSyncEnabled = ctx.isProjectUsingDataStore();
     const dataSource = this.datasourceMap[type.name.value];
@@ -747,6 +806,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       const resolver = ctx.resolvers.generateMutationResolver(
         typeName,
         fieldName,
+        resolverLogicalId,
         dataSource,
         MappingTemplate.s3MappingTemplateFromString(generateCreateRequestTemplate(type.name.value), `${typeName}.${fieldName}.req.vtl`),
         MappingTemplate.s3MappingTemplateFromString(
@@ -1133,6 +1193,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
 
     const cfnDataSource = dataSource.node.defaultChild as CfnDataSource;
     cfnDataSource.addDependsOn(role.node.defaultChild as CfnRole);
+    cfnDataSource.overrideLogicalId(datasourceRoleLogicalID);
 
     if (context.isProjectUsingDataStore()) {
       const datasourceDynamoDb = cfnDataSource.dynamoDbConfig as any;
@@ -1207,13 +1268,10 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       }),
     );
 
-    if (this.options.SyncConfig && SyncUtils.isLambdaSyncConfig(this.options.SyncConfig)) {
+    const syncConfig = SyncUtils.getSyncConfig(context, def!.name.value);
+    if (syncConfig && SyncUtils.isLambdaSyncConfig(syncConfig)) {
       role.attachInlinePolicy(
-        SyncUtils.createSyncLambdaIAMPolicy(
-          stack,
-          this.options.SyncConfig.LambdaConflictHandler.name,
-          this.options.SyncConfig.LambdaConflictHandler.region,
-        ),
+        SyncUtils.createSyncLambdaIAMPolicy(stack, syncConfig.LambdaConflictHandler.name, syncConfig.LambdaConflictHandler.region),
       );
     }
     return role;

package/src/graphql-types/mutation.ts

@@ -45,9 +45,7 @@ export const makeUpdateInputField = (
   input.fields.forEach(f => f.makeNullable());
 
   // Add id field and make it optional
-  if (!hasIdField) {
-    input.addField(InputFieldWrapper.create('id', 'ID', false));
-  } else {
+  if (hasIdField) {
     const idField = input.fields.find(f => f.name === 'id');
     if (idField) {
       idField.makeNonNullable();
@@ -127,7 +125,7 @@ export const makeCreateInputField = (
 
   // Add id field and make it optional
   if (!hasIdField) {
-    input.addField(InputFieldWrapper.create('id', 'ID'));
+    input.addField(InputFieldWrapper.create('id', 'ID', true));
   } else {
     const idField = input.fields.find(f => f.name === 'id');
     if (idField) {

package/src/graphql-types/query.ts

@@ -13,7 +13,7 @@ export const makeListQueryFilterInput = (
 export const makeListQueryModel = (type: ObjectTypeDefinitionNode, modelName: string, isSyncEnabled: boolean): ObjectTypeDefinitionNode => {
   const outputType = ObjectDefinitionWrapper.create(modelName);
 
-  outputType.addField(FieldWrapper.create('items', type.name.value, true, true));
+  outputType.addField(FieldWrapper.create('items', type.name.value, false, true));
   outputType.addField(FieldWrapper.create('nextToken', 'String', true, false));
 
   if (isSyncEnabled) {

package/src/wrappers/object-definition-wrapper.ts

@@ -1,5 +1,5 @@
+import { DirectiveWrapper } from '@aws-amplify/graphql-transformer-core';
 import {
-  ArgumentNode,
   DirectiveNode,
   DocumentNode,
   EnumTypeDefinitionNode,
@@ -11,13 +11,10 @@ import {
   ListTypeNode,
   Location,
   NamedTypeNode,
-  NameNode,
   NonNullTypeNode,
   ObjectTypeDefinitionNode,
   StringValueNode,
   TypeNode,
-  valueFromASTUntyped,
-  ValueNode,
 } from 'graphql';
 import {
   DEFAULT_SCALARS,
@@ -29,53 +26,6 @@ import {
   withNamedNodeNamed,
 } from 'graphql-transformer-common';
 
-// Todo: to be moved to core later. context.output.getObject would return wrapper type so its easier to manipulate
-// objects
-
-export class ArgumentWrapper {
-  public readonly name: NameNode;
-  public readonly value: ValueNode;
-  constructor(argument: ArgumentNode) {
-    this.name = argument.name;
-    this.value = argument.value;
-  }
-  serialize = (): ArgumentNode => {
-    return {
-      kind: 'Argument',
-      name: this.name,
-      value: this.value,
-    };
-  };
-}
-
-export class DirectiveWrapper {
-  private arguments: ArgumentWrapper[] = [];
-  private name: NameNode;
-  private location?: Location;
-  constructor(node: DirectiveNode) {
-    this.name = node.name;
-    this.arguments = (node.arguments || []).map(arg => new ArgumentWrapper(arg));
-    this.location = this.location;
-  }
-  public serialize = (): DirectiveNode => {
-    return {
-      kind: 'Directive',
-      name: this.name,
-      arguments: this.arguments.map(arg => arg.serialize()),
-    };
-  };
-  public getArguments = <T>(defaultValue: Required<T>): Required<T> => {
-    const argValues = this.arguments.reduce(
-      (acc: Record<string, any>, arg: ArgumentWrapper) => ({
-        ...acc,
-        [arg.name.value]: valueFromASTUntyped(arg.value),
-      }),
-      {},
-    );
-    return Object.assign(defaultValue, argValues);
-  };
-}
-
 export class GenericFieldWrapper {
   protected type: TypeNode;
   public readonly directives: DirectiveWrapper[];
@@ -295,7 +245,7 @@ export class FieldWrapper extends GenericFieldWrapper {
       field.makeNonNullable();
     }
     if (isList) {
-      field.wrapListType();
+      field.wrapListType().makeNonNullable();
     }
     return field;
   };