review comments 2

Author: yuth

packages/amplify-graphql-model-transformer/src/graphql-model-transformer.ts

@@ -54,7 +54,7 @@ import {
   DirectiveWrapper,
   FieldWrapper,
   InputObjectDefinitionWrapper,
-  ObjectDefinationWrapper,
+  ObjectDefinitionWrapper,
 } from './wrappers/object-definition-wrapper';
 
 export type Nullable<T> = T | null;
@@ -248,8 +248,8 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
       const def = context.output.getObject(type);
       // add the table
       const tableLogicalName = `${def!.name.value}Table`;
-      const tableName = context.resourceHelper.generateResourceName(def!.name.value);
-      const stack = context.stackManager.getStackFor(tableLogicalName, def!.name.value);
+      const stack = context.stackManager.getOrCreateStackFor(tableLogicalName, def!.name.value);
+      const tableName = context.resourceHelper.generateResourceName(def!.name.value, stack);
       // Expose a way in context to allow proper resource naming
       const table = new Table(stack, tableLogicalName, {
         tableName,
@@ -261,7 +261,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
         removalPolicy: RemovalPolicy.DESTROY,
       });
       // Expose a better API to select what stack this belongs to
-      const dataSource = context.api.addDynamoDbDataSource(
+      const dataSource = context.api.addDynamoDBDataSource(
         `${def!.name.value}DS`,
         table,
         {
@@ -794,7 +794,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
     if (!typeObj) {
       throw new Error(`Type ${name} is missing in outputs`);
     }
-    const typeWrapper = new ObjectDefinationWrapper(typeObj);
+    const typeWrapper = new ObjectDefinitionWrapper(typeObj);
     if (!typeWrapper.hasField('id')) {
       const idField = FieldWrapper.create('id', 'ID');
       typeWrapper.addField(idField);

packages/amplify-graphql-model-transformer/src/graphql-types/common.ts

@@ -33,22 +33,22 @@ import {
   EnumWrapper,
   InputFieldWraper,
   InputObjectDefinitionWrapper,
-  ObjectDefinationWrapper
+  ObjectDefinitionWrapper
 } from '../wrappers/object-definition-wrapper';
 
 /**
  * Creates the condition/filter input for a model
  * @param ctx TransformerContext
  * @param name model name
- * @param object ModelObjectDefination
+ * @param object ModelObjectDefinition
  */
 export const makeConditionFilterInput = (
   ctx: TranformerTransformSchemaStepContextProvider,
   name: string,
   object: ObjectTypeDefinitionNode,
 ): InputObjectDefinitionWrapper => {
   const input = InputObjectDefinitionWrapper.create(name);
-  const wrappedObject = new ObjectDefinationWrapper(object);
+  const wrappedObject = new ObjectDefinitionWrapper(object);
   for (let field of wrappedObject.fields) {
     const fieldType = ctx.output.getType(field.getTypeName());
     const isEnumType = fieldType && fieldType.kind === 'EnumTypeDefinition';
@@ -105,7 +105,7 @@ export const createEnumModelFilters = (
   type: ObjectTypeDefinitionNode,
 ): InputObjectTypeDefinitionNode[] => {
   // add enum type if present
-  const typeWrapper = new ObjectDefinationWrapper(type);
+  const typeWrapper = new ObjectDefinitionWrapper(type);
   const enumFields = typeWrapper.fields.filter(field => {
     const typeName = field.getTypeName();
     const typeObj = ctx.output.getType(typeName);

packages/amplify-graphql-model-transformer/src/graphql-types/mutation.ts

@@ -2,7 +2,7 @@ import { TranformerTransformSchemaStepContextProvider } from '@aws-amplify/graph
 import { ObjectTypeDefinitionNode, InputObjectTypeDefinitionNode } from 'graphql';
 import { toPascalCase } from 'graphql-transformer-common';
 import { ModelDirectiveConfiguration } from '../graphql-model-transformer';
-import { ObjectDefinationWrapper, InputObjectDefinitionWrapper, InputFieldWraper } from '../wrappers/object-definition-wrapper';
+import { ObjectDefinitionWrapper, InputObjectDefinitionWrapper, InputFieldWraper } from '../wrappers/object-definition-wrapper';
 import { makeConditionFilterInput } from './common';
 
 /**
@@ -17,7 +17,7 @@ export const makeUpdateInputField = (
   knownModelTypes: Set<string>,
 ): InputObjectTypeDefinitionNode => {
   // sync related things
-  const objectWrapped = new ObjectDefinationWrapper(obj);
+  const objectWrapped = new ObjectDefinitionWrapper(obj);
   const typeName = objectWrapped.name;
   const name = toPascalCase([`Update`, typeName, 'Input']);
   const hasIdField = objectWrapped.hasField('id');
@@ -51,9 +51,9 @@ export const makeUpdateInputField = (
   }
 
   // Make createdAt and updatedAt field Optionals if present
-  for (let timeStampFieldName of Object.values(modelDirectiveConfig?.timestamps || {})) {
-    if (input.hasField(timeStampFieldName!)) {
-      const timestampField = input.getField(timeStampFieldName!);
+  for (let timestampFieldName of Object.values(modelDirectiveConfig?.timestamps || {})) {
+    if (input.hasField(timestampFieldName!)) {
+      const timestampField = input.getField(timestampFieldName!);
       if (['String', 'AWSDateTime'].includes(timestampField.getTypeName())) {
         timestampField.makeNullable();
       }
@@ -86,7 +86,7 @@ export const makeCreateInputField = (
   knownModelTypes: Set<string>,
 ): InputObjectTypeDefinitionNode => {
   // sync related things
-  const objectWrapped = new ObjectDefinationWrapper(obj);
+  const objectWrapped = new ObjectDefinitionWrapper(obj);
   const typeName = objectWrapped.name;
   const name = toPascalCase([`Create`, typeName, 'Input']);
   const hasIdField = objectWrapped.hasField('id');

packages/amplify-graphql-model-transformer/src/graphql-types/query.ts

@@ -1,6 +1,6 @@
 import { TranformerTransformSchemaStepContextProvider } from '@aws-amplify/graphql-transformer-interfaces';
 import { InputObjectTypeDefinitionNode, ObjectTypeDefinitionNode } from 'graphql';
-import { FieldWrapper, ObjectDefinationWrapper } from '../wrappers/object-definition-wrapper';
+import { FieldWrapper, ObjectDefinitionWrapper } from '../wrappers/object-definition-wrapper';
 import { makeConditionFilterInput } from './common';
 export const makeListQueryFilterInput = (
   ctx: TranformerTransformSchemaStepContextProvider,
@@ -11,7 +11,7 @@ export const makeListQueryFilterInput = (
 };
 
 export const makeListQueryModel = (type: ObjectTypeDefinitionNode, modelName: string): ObjectTypeDefinitionNode => {
-  const outputType = ObjectDefinationWrapper.create(modelName);
+  const outputType = ObjectDefinitionWrapper.create(modelName);
 
   outputType.addField(FieldWrapper.create('items', type.name.value, true, true));
   outputType.addField(FieldWrapper.create('nextToken', 'String', true, false));

packages/amplify-graphql-model-transformer/src/resolvers/common.ts

@@ -17,6 +17,7 @@ import {
   toJson,
 } from 'graphql-mapping-template';
 
+export const APPSYNC_RESOLVER_VERSION = '2018-05-29';
 /**
  * Helper method to genrate code that converts DynamoDB condition object to condtion
  * expression

packages/amplify-graphql-model-transformer/src/resolvers/mutation.ts

@@ -19,7 +19,7 @@ import {
   printBlock,
 } from 'graphql-mapping-template';
 import { ModelDirectiveConfiguration } from '../graphql-model-transformer';
-import { generateConditionSlot } from './common';
+import { APPSYNC_RESOLVER_VERSION, generateConditionSlot } from './common';
 
 /**
  * Generates VTL template in update mutation
@@ -121,7 +121,7 @@ export const generateUpdateRequestTemplate = (modelName: string): string => {
     set(
       ref('UpdateItem'),
       obj({
-        version: str('2018-05-29'),
+        version: str(APPSYNC_RESOLVER_VERSION),
         operation: str('UpdateItem'),
         key: ref('Key'),
         update: ref('update'),
@@ -165,7 +165,7 @@ export const generateCreateRequestTemplate = (modelName: string): string => {
     set(
       ref('PutObject'),
       obj({
-        version: str('2018-05-29'),
+        version: str(APPSYNC_RESOLVER_VERSION),
         operation: str('PutItem'),
         attributeValues: methodCall(ref('util.dynamodb.toMapValues'), ref('mergedValues')),
         condition: ref('condition'),
@@ -240,7 +240,7 @@ export const generateCreateInitSlotTemplate = (name: string, modelConfig: ModelD
   statements.push(
     toJson(
       obj({
-        version: str('2018-05-29'),
+        version: str(APPSYNC_RESOLVER_VERSION),
         payload: obj({}),
       }),
     ),
@@ -256,7 +256,7 @@ export const generateDeleteRequestTemplate = (): string => {
     set(
       ref('DeleteRequest'),
       obj({
-        version: str('2018-05-29'),
+        version: str(APPSYNC_RESOLVER_VERSION),
         operation: str('DeleteItem'),
       }),
     ),
@@ -314,7 +314,7 @@ export const generateUpdateInitSlotTemplate = (modelName: string, modelConfig: M
   statements.push(
     toJson(
       obj({
-        version: str('2018-05-29'),
+        version: str(APPSYNC_RESOLVER_VERSION),
         payload: obj({}),
       }),
     ),

packages/amplify-graphql-model-transformer/src/resolvers/query.ts

@@ -17,13 +17,14 @@ import {
   bool,
   and,
 } from 'graphql-mapping-template';
+import { APPSYNC_RESOLVER_VERSION } from './common';
 
 /**
  * Generate get query resolver template
  */
 export const generateGetRequestTemplate = (): string => {
   const statements: Expression[] = [
-    set(ref('GetRequest'), obj({ version: str('2018-05-29'), operation: str('GetItem') })),
+    set(ref('GetRequest'), obj({ version: str(APPSYNC_RESOLVER_VERSION), operation: str('GetItem') })),
     ifElse(
       ref('ctx.stash.metadata.modelKeyObject'),
       set(ref('Key'), ref('ctx.stash.metadata.modelKeyObject')),
@@ -45,7 +46,7 @@ export const generateListRequestTemplate = (): string => {
     set(
       ref(requestVariable),
       obj({
-        version: str('2018-05-29'),
+        version: str(APPSYNC_RESOLVER_VERSION),
         limit: ref('limit'),
       }),
     ),

packages/amplify-graphql-model-transformer/src/resolvers/subscriptions.ts

@@ -1,7 +1,8 @@
 import { compoundExpression, Expression, obj, printBlock, str, toJson, nul } from 'graphql-mapping-template';
+import { APPSYNC_RESOLVER_VERSION } from './common';
 
 export const generateSubscriptionRequestTemplate = (): string => {
-  const statements: Expression[] = [toJson(obj({ version: str('2018-05-29'), payload: obj({}) }))];
+  const statements: Expression[] = [toJson(obj({ version: str(APPSYNC_RESOLVER_VERSION), payload: obj({}) }))];
   return printBlock('Subscription Request template')(compoundExpression(statements));
 };
 

packages/amplify-graphql-model-transformer/src/wrappers/object-definition-wrapper.ts

@@ -259,7 +259,7 @@ export class FieldWrapper extends GenericFieldWrapper {
   };
 }
 
-export class ObjectDefinationWrapper {
+export class ObjectDefinitionWrapper {
   public readonly directives?: DirectiveWrapper[];
   public readonly fields: FieldWrapper[];
   public readonly name: string;
@@ -310,8 +310,8 @@ export class ObjectDefinationWrapper {
     this.fields.splice(index, 1);
   };
 
-  static create = (name: string, fields: FieldDefinitionNode[] = [], directives: DirectiveNode[] = []): ObjectDefinationWrapper => {
-    return new ObjectDefinationWrapper({
+  static create = (name: string, fields: FieldDefinitionNode[] = [], directives: DirectiveNode[] = []): ObjectDefinitionWrapper => {
+    return new ObjectDefinitionWrapper({
       kind: 'ObjectTypeDefinition',
       name: {
         kind: 'Name',

packages/amplify-graphql-transformer-core/src/graphql-api.ts

@@ -64,19 +64,19 @@ export interface GraphqlApiProps {
   readonly xrayEnabled?: boolean;
 }
 
-export class IamResource implements APIIAMResourceProvider {
+export class IAMResource implements APIIAMResourceProvider {
   /**
    * Generate the resource names given custom arns
    *
    * @param arns The custom arns that need to be permissioned
    *
    * Example: custom('/types/Query/fields/getExample')
    */
-  public static custom(...arns: string[]): IamResource {
+  public static custom(...arns: string[]): IAMResource {
     if (arns.length === 0) {
       throw new Error('At least 1 custom ARN must be provided.');
     }
-    return new IamResource(arns);
+    return new IAMResource(arns);
   }
 
   /**
@@ -87,16 +87,16 @@ export class IamResource implements APIIAMResourceProvider {
    *
    * Example: ofType('Query', 'GetExample')
    */
-  public static ofType(type: string, ...fields: string[]): IamResource {
+  public static ofType(type: string, ...fields: string[]): IAMResource {
     const arns = fields.length ? fields.map(field => `types/${type}/fields/${field}`) : [`types/${type}/*`];
-    return new IamResource(arns);
+    return new IAMResource(arns);
   }
 
   /**
    * Generate the resource names that accepts all types: `*`
    */
-  public static all(): IamResource {
-    return new IamResource(['*']);
+  public static all(): IAMResource {
+    return new IAMResource(['*']);
   }
 
   private arns: string[];
@@ -224,11 +224,11 @@ export class GraphQLApi extends GraphqlApiBase implements GraphQLAPIProvider {
     return dataSource;
   }
 
-  public addDynamoDbDataSource(name: string, table: ITable, options?: DataSourceOptions, stack?: Stack): DynamoDbDataSource {
+  public addDynamoDBDataSource(name: string, table: ITable, options?: DataSourceOptions, stack?: Stack): DynamoDbDataSource {
     if (this.dataSources.has(name)) {
       throw new Error(`DataSource ${name} already exists in the API`);
     }
-    const dataSource = this.doAddDynamoDbDataSource(name, table, options, stack);
+    const dataSource = this.doAddDynamoDBDataSource(name, table, options, stack);
     this.dataSources.set(options?.name || name, dataSource);
     return dataSource;
   }
@@ -279,7 +279,7 @@ export class GraphQLApi extends GraphqlApiBase implements GraphQLAPIProvider {
    * @param resources The set of resources to allow (i.e. ...:[region]:[accountId]:apis/GraphQLId/...)
    * @param actions The actions that should be granted to the principal (i.e. appsync:graphql )
    */
-  public grant(grantee: IGrantable, resources: IamResource, ...actions: string[]): Grant {
+  public grant(grantee: IGrantable, resources: IAMResource, ...actions: string[]): Grant {
     return Grant.addToPrincipal({
       grantee,
       actions,
@@ -289,11 +289,11 @@ export class GraphQLApi extends GraphqlApiBase implements GraphQLAPIProvider {
   }
 
   public grantQuery(grantee: IGrantable, ...fields: string[]): Grant {
-    return this.grant(grantee, IamResource.ofType('Query', ...fields), 'appsync:GraphQL');
+    return this.grant(grantee, IAMResource.ofType('Query', ...fields), 'appsync:GraphQL');
   }
 
   public grantMutation(grantee: IGrantable, ...fields: string[]): Grant {
-    return this.grant(grantee, IamResource.ofType('Mutation', ...fields), 'appsync:GraphQL');
+    return this.grant(grantee, IAMResource.ofType('Mutation', ...fields), 'appsync:GraphQL');
   }
 
   /**
@@ -304,7 +304,7 @@ export class GraphQLApi extends GraphqlApiBase implements GraphQLAPIProvider {
    * @param fields The fields to grant access to that are Subscriptions (leave blank for all)
    */
   public grantSubscription(grantee: IGrantable, ...fields: string[]): Grant {
-    return this.grant(grantee, IamResource.ofType('Subscription', ...fields), 'appsync:GraphQL');
+    return this.grant(grantee, IAMResource.ofType('Subscription', ...fields), 'appsync:GraphQL');
   }
 
   public createAPIKey(config?: ApiKeyConfig) {
@@ -415,7 +415,7 @@ export class GraphQLApi extends GraphqlApiBase implements GraphQLAPIProvider {
    * @param options The optional configuration for this data source
    * @param stack  Stack to which this datasource needs to mapped to
    */
-  protected doAddDynamoDbDataSource(id: string, table: ITable, options?: DataSourceOptions, stack?: Stack): DynamoDbDataSource {
+  protected doAddDynamoDBDataSource(id: string, table: ITable, options?: DataSourceOptions, stack?: Stack): DynamoDbDataSource {
     return new DynamoDbDataSource(stack ?? this, id, {
       api: this,
       table,