@aws-amplify/graphql-model-transformer 0.10.8-codegen-ui-q1-release.0 → 0.11.0-mapsto3.0

package/src/graphql-model-transformer.ts

@@ -9,6 +9,7 @@ import {
   FieldWrapper,
   InputObjectDefinitionWrapper,
   ObjectDefinitionWrapper,
+  getFieldNameFor,
 } from '@aws-amplify/graphql-transformer-core';
 import {
   AppSyncDataSourceType,
@@ -48,7 +49,6 @@ import {
   makeNonNullType,
   makeValueNode,
   ModelResourceIDs,
-  plurality,
   ResolverResourceIDs,
   ResourceConstants,
   SyncResourceIDs,
@@ -227,20 +227,20 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     const directiveWrapped: DirectiveWrapper = new DirectiveWrapper(directive);
     const options = directiveWrapped.getArguments({
       queries: {
-        get: toCamelCase(['get', typeName]),
-        list: toCamelCase(['list', plurality(typeName, true)]),
-        ...(ctx.isProjectUsingDataStore() ? { sync: toCamelCase(['sync', plurality(typeName, true)]) } : undefined),
+        get: getFieldNameFor('get', typeName),
+        list: getFieldNameFor('list', typeName),
+        ...(ctx.isProjectUsingDataStore() ? { sync: getFieldNameFor('sync', typeName) } : undefined),
       },
       mutations: {
-        create: toCamelCase(['create', typeName]),
-        update: toCamelCase(['update', typeName]),
-        delete: toCamelCase(['delete', typeName]),
+        create: getFieldNameFor('create', typeName),
+        update: getFieldNameFor('update', typeName),
+        delete: getFieldNameFor('delete', typeName),
       },
       subscriptions: {
         level: SubscriptionLevel.on,
-        onCreate: [this.ensureValidSubscriptionName(toCamelCase(['onCreate', typeName]))],
-        onDelete: [this.ensureValidSubscriptionName(toCamelCase(['onDelete', typeName]))],
-        onUpdate: [this.ensureValidSubscriptionName(toCamelCase(['onUpdate', typeName]))],
+        onCreate: [getFieldNameFor('onCreate', typeName)],
+        onDelete: [getFieldNameFor('onDelete', typeName)],
+        onUpdate: [getFieldNameFor('onUpdate', typeName)],
       },
       timestamps: {
         createdAt: 'createdAt',
@@ -324,8 +324,9 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     for (let type of this.typesWithModelDirective) {
       const def = context.output.getObject(type)!;
       // This name is used by the mock functionality. Changing this can break mock.
-      const tableLogicalName = `${def!.name.value}Table`;
-      const stack = context.stackManager.getStackFor(tableLogicalName, def!.name.value);
+      const tableBaseName = context.resourceHelper.getModelNameMapping(def!.name.value);
+      const tableLogicalName = ModelResourceIDs.ModelTableResourceID(tableBaseName);
+      const stack = context.stackManager.getStackFor(tableLogicalName, tableBaseName);
 
       this.createModelTable(stack, def!, context);
 
@@ -1149,8 +1150,8 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
   };
 
   private createModelTable(stack: cdk.Stack, def: ObjectTypeDefinitionNode, context: TransformerContextProvider) {
-    const tableLogicalName = `${def!.name.value}Table`;
-    const tableName = context.resourceHelper.generateResourceName(def!.name.value);
+    const tableLogicalName = ModelResourceIDs.ModelTableResourceID(def!.name.value);
+    const tableName = context.resourceHelper.generateTableName(def!.name.value);
 
     // Add parameters.
     const env = context.stackManager.getParameter(ResourceConstants.PARAMETERS.Env) as cdk.CfnParameter;
@@ -1257,7 +1258,8 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     });
 
     const role = this.createIAMRole(context, def, stack, tableName);
-    this.createModelTableDataSource(def, context, table, stack, role);
+    const tableDataSourceLogicalName = `${def!.name.value}Table`;
+    this.createModelTableDataSource(def, context, table, stack, role, tableDataSourceLogicalName);
   }
 
   private createModelTableDataSource(
@@ -1266,13 +1268,13 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     table: Table,
     stack: cdk.Stack,
     role: iam.Role,
+    dataSourceLogicalName: string,
   ) {
-    const tableLogicalName = `${def!.name.value}Table`;
     const datasourceRoleLogicalID = ModelResourceIDs.ModelTableDataSourceID(def!.name.value);
     const dataSource = context.api.host.addDynamoDbDataSource(
       datasourceRoleLogicalID,
       table,
-      { name: tableLogicalName, serviceRole: role },
+      { name: dataSourceLogicalName, serviceRole: role },
       stack,
     );
 
@@ -1282,7 +1284,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     if (context.isProjectUsingDataStore()) {
       const datasourceDynamoDb = cfnDataSource.dynamoDbConfig as any;
       datasourceDynamoDb.deltaSyncConfig = {
-        deltaSyncTableName: context.resourceHelper.generateResourceName(SyncResourceIDs.syncTableName),
+        deltaSyncTableName: context.resourceHelper.generateTableName(SyncResourceIDs.syncTableName),
         deltaSyncTableTtl: '30',
         baseTableTtl: '43200',
       };
@@ -1309,7 +1311,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       assumedBy: new iam.ServicePrincipal('appsync.amazonaws.com'),
     });
 
-    const amplifyDataStoreTableName = context.resourceHelper.generateResourceName(SyncResourceIDs.syncTableName);
+    const amplifyDataStoreTableName = context.resourceHelper.generateTableName(SyncResourceIDs.syncTableName);
     role.attachInlinePolicy(
       new iam.Policy(stack, 'DynamoDBAccess', {
         statements: [

package/src/resolvers/mutation.ts

@@ -18,6 +18,7 @@ import {
   toJson,
   printBlock,
 } from 'graphql-mapping-template';
+import { setArgs } from 'graphql-transformer-common';
 import { ModelDirectiveConfiguration } from '../graphql-model-transformer';
 import { generateConditionSlot } from './common';
 
@@ -34,10 +35,11 @@ export const generateUpdateRequestTemplate = (modelName: string, isSyncEnabled:
     keyFields.push(str('_lastChangedAt'));
   }
   const statements: Expression[] = [
+    setArgs,
     comment('Set the default values to put request'),
     set(ref('mergedValues'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.defaultValues'), obj({}))),
     comment('copy the values from input'),
-    qref(methodCall(ref('mergedValues.putAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.args.input'), obj({})))),
+    qref(methodCall(ref('mergedValues.putAll'), methodCall(ref('util.defaultIfNull'), ref('args.input'), obj({})))),
     comment('set the typename'),
     // Initialize object as placeholder for expressions
     comment('Initialize the vars for creating ddb expression'),
@@ -50,7 +52,7 @@ export const generateUpdateRequestTemplate = (modelName: string, isSyncEnabled:
     ifElse(
       ref(objectKeyVariable),
       set(ref('Key'), ref(objectKeyVariable)),
-      set(ref('Key'), obj({ id: methodCall(ref('util.dynamodb.toDynamoDB'), ref('ctx.args.input.id')) })),
+      set(ref('Key'), obj({ id: methodCall(ref('util.dynamodb.toDynamoDB'), ref('args.input.id')) })),
     ),
     comment('Model key'),
     ifElse(
@@ -121,7 +123,7 @@ export const generateUpdateRequestTemplate = (modelName: string, isSyncEnabled:
     // add conditions
     // set key the condition
     ...generateKeyConditionTemplate(true),
-    iff(ref('context.args.condition'), qref(methodCall(ref('ctx.stash.conditions.add'), ref('context.args.condition')))),
+    iff(ref('args.condition'), qref(methodCall(ref('ctx.stash.conditions.add'), ref('args.condition')))),
     // Generate conditions
     generateConditionSlot('ctx.stash.conditions', 'Conditions'),
     set(
@@ -131,7 +133,7 @@ export const generateUpdateRequestTemplate = (modelName: string, isSyncEnabled:
         operation: str('UpdateItem'),
         key: ref('Key'),
         update: ref('update'),
-        ...(isSyncEnabled && { _version: ref('util.defaultIfNull($ctx.args.input["_version"], "0")') }),
+        ...(isSyncEnabled && { _version: ref('util.defaultIfNull($args.input["_version"], 0)') }),
       }),
     ),
     iff(
@@ -152,11 +154,12 @@ export const generateUpdateRequestTemplate = (modelName: string, isSyncEnabled:
  */
 export const generateCreateRequestTemplate = (modelName: string): string => {
   const statements: Expression[] = [
+    setArgs,
     // Generate conditions
     comment('Set the default values to put request'),
     set(ref('mergedValues'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.defaultValues'), obj({}))),
     comment('copy the values from input'),
-    qref(methodCall(ref('mergedValues.putAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.args.input'), obj({})))),
+    qref(methodCall(ref('mergedValues.putAll'), methodCall(ref('util.defaultIfNull'), ref('args.input'), obj({})))),
     comment('set the typename'),
     qref(methodCall(ref('mergedValues.put'), str('__typename'), str(modelName))),
 
@@ -172,7 +175,7 @@ export const generateCreateRequestTemplate = (modelName: string): string => {
     ),
 
     // add conditions
-    iff(ref('context.args.condition'), qref(methodCall(ref('ctx.stash.conditions.add'), ref('context.args.condition')))),
+    iff(ref('args.condition'), qref(methodCall(ref('ctx.stash.conditions.add'), ref('args.condition')))),
     // key conditions
     ...generateKeyConditionTemplate(false),
     // Generate conditions
@@ -245,6 +248,7 @@ export const generateCreateInitSlotTemplate = (name: string, modelConfig: ModelD
  */
 export const generateDeleteRequestTemplate = (isSyncEnabled: boolean): string => {
   const statements: Expression[] = [
+    setArgs,
     set(
       ref('DeleteRequest'),
       obj({
@@ -255,11 +259,11 @@ export const generateDeleteRequestTemplate = (isSyncEnabled: boolean): string =>
     ifElse(
       ref('ctx.stash.metadata.modelObjectKey'),
       set(ref('Key'), ref('ctx.stash.metadata.modelObjectKey')),
-      set(ref('Key'), obj({ id: methodCall(ref('util.dynamodb.toDynamoDB'), ref('ctx.args.input.id')) })),
+      set(ref('Key'), obj({ id: methodCall(ref('util.dynamodb.toDynamoDB'), ref('args.input.id')) })),
     ),
     qref(methodCall(ref('DeleteRequest.put'), str('key'), ref('Key'))),
     ...generateKeyConditionTemplate(true),
-    iff(ref('context.args.condition'), qref(methodCall(ref('ctx.stash.conditions.add'), ref('context.args.condition')))),
+    iff(ref('args.condition'), qref(methodCall(ref('ctx.stash.conditions.add'), ref('args.condition')))),
     // Generate conditions
     generateConditionSlot('ctx.stash.conditions', 'Conditions'),
     iff(
@@ -271,9 +275,7 @@ export const generateDeleteRequestTemplate = (isSyncEnabled: boolean): string =>
     ),
   ];
   if (isSyncEnabled) {
-    statements.push(
-      qref(methodCall(ref('DeleteRequest.put'), str('_version'), ref('util.defaultIfNull($ctx.args.input["_version"], "0")'))),
-    );
+    statements.push(qref(methodCall(ref('DeleteRequest.put'), str('_version'), ref('util.defaultIfNull($args.input["_version"], 0)'))));
   }
 
   statements.push(toJson(ref('DeleteRequest')));

package/src/resolvers/query.ts

@@ -21,7 +21,7 @@ import {
   forEach,
   nul,
 } from 'graphql-mapping-template';
-import { ResourceConstants } from 'graphql-transformer-common';
+import { ResourceConstants, setArgs } from 'graphql-transformer-common';
 const authFilter = ref('ctx.stash.authFilter');
 
 /**
@@ -101,7 +101,8 @@ export const generateListRequestTemplate = (): string => {
   const modelQueryObj = 'ctx.stash.modelQueryExpression';
   const indexNameVariable = 'ctx.stash.metadata.index';
   const expression = compoundExpression([
-    set(ref('limit'), methodCall(ref(`util.defaultIfNull`), ref('context.args.limit'), int(100))),
+    setArgs,
+    set(ref('limit'), methodCall(ref(`util.defaultIfNull`), ref('args.limit'), int(100))),
     set(
       ref(requestVariable),
       obj({
@@ -109,14 +110,14 @@ export const generateListRequestTemplate = (): string => {
         limit: ref('limit'),
       }),
     ),
-    iff(ref('context.args.nextToken'), set(ref(`${requestVariable}.nextToken`), ref('context.args.nextToken'))),
+    iff(ref('args.nextToken'), set(ref(`${requestVariable}.nextToken`), ref('args.nextToken'))),
     ifElse(
       not(isNullOrEmpty(authFilter)),
       compoundExpression([
         set(ref('filter'), authFilter),
-        iff(not(isNullOrEmpty(ref('ctx.args.filter'))), set(ref('filter'), obj({ and: list([ref('filter'), ref('ctx.args.filter')]) }))),
+        iff(not(isNullOrEmpty(ref('args.filter'))), set(ref('filter'), obj({ and: list([ref('filter'), ref('args.filter')]) }))),
       ]),
-      iff(not(isNullOrEmpty(ref('ctx.args.filter'))), set(ref('filter'), ref('ctx.args.filter'))),
+      iff(not(isNullOrEmpty(ref('args.filter'))), set(ref('filter'), ref('args.filter'))),
     ),
     iff(
       not(isNullOrEmpty(ref('filter'))),
@@ -146,7 +147,7 @@ export const generateListRequestTemplate = (): string => {
         qref(methodCall(ref(`${requestVariable}.put`), str('operation'), str('Query'))),
         qref(methodCall(ref(`${requestVariable}.put`), str('query'), ref(modelQueryObj))),
         ifElse(
-          and([not(methodCall(ref('util.isNull'), ref('ctx.args.sortDirection'))), equals(ref('ctx.args.sortDirection'), str('DESC'))]),
+          and([not(methodCall(ref('util.isNull'), ref('args.sortDirection'))), equals(ref('args.sortDirection'), str('DESC'))]),
           set(ref(`${requestVariable}.scanIndexForward`), bool(false)),
           set(ref(`${requestVariable}.scanIndexForward`), bool(true)),
         ),
@@ -162,13 +163,14 @@ export const generateListRequestTemplate = (): string => {
 export const generateSyncRequestTemplate = (): string => {
   return printBlock('Sync Request template')(
     compoundExpression([
+      setArgs,
       ifElse(
         not(isNullOrEmpty(authFilter)),
         compoundExpression([
           set(ref('filter'), authFilter),
-          iff(not(isNullOrEmpty(ref('ctx.args.filter'))), set(ref('filter'), obj({ and: list([ref('filter'), ref('ctx.args.filter')]) }))),
+          iff(not(isNullOrEmpty(ref('args.filter'))), set(ref('filter'), obj({ and: list([ref('filter'), ref('args.filter')]) }))),
         ]),
-        iff(not(isNullOrEmpty(ref('ctx.args.filter'))), set(ref('filter'), ref('ctx.args.filter'))),
+        iff(not(isNullOrEmpty(ref('args.filter'))), set(ref('filter'), ref('args.filter'))),
       ),
       iff(
         not(isNullOrEmpty(ref('filter'))),
@@ -193,9 +195,9 @@ export const generateSyncRequestTemplate = (): string => {
         version: str('2018-05-29'),
         operation: str('Sync'),
         filter: ifElse(ref('filter'), ref('util.toJson($filter)'), nul()),
-        limit: ref(`util.defaultIfNull($ctx.args.limit, ${ResourceConstants.DEFAULT_SYNC_QUERY_PAGE_LIMIT})`),
-        lastSync: ref('util.toJson($util.defaultIfNull($ctx.args.lastSync, null))'),
-        nextToken: ref('util.toJson($util.defaultIfNull($ctx.args.nextToken, null))'),
+        limit: ref(`util.defaultIfNull($args.limit, ${ResourceConstants.DEFAULT_SYNC_QUERY_PAGE_LIMIT})`),
+        lastSync: ref('util.toJson($util.defaultIfNull($args.lastSync, null))'),
+        nextToken: ref('util.toJson($util.defaultIfNull($args.nextToken, null))'),
       }),
     ]),
   );

package/tsconfig.json

@@ -6,6 +6,8 @@
   },
   "references": [
     {"path": "../amplify-graphql-transformer-interfaces"},
-    {"path": "../graphql-mapping-template"}
+    {"path": "../graphql-mapping-template"},
+    {"path": "../amplify-graphql-transformer-core"},
+    {"path": "../graphql-transformer-common"},
   ]
 }