@aws-amplify/graphql-model-transformer 1.4.0-rds.3 → 1.4.0-test-tag-1.0

package/src/resolvers/common.ts

@@ -1,15 +1,4 @@
-import {
-  iff,
-  ref,
-  notEquals,
-  methodCall,
-  compoundExpression,
-  obj,
-  printBlock,
-  toJson,
-  str,
-  not,
-} from 'graphql-mapping-template';
+import { iff, ref, notEquals, methodCall, compoundExpression, obj, printBlock, toJson, str, not } from 'graphql-mapping-template';
 
 const API_KEY = 'API Key Authorization';
 /**

package/src/resolvers/dynamodb/mutation.ts

@@ -163,16 +163,18 @@ export const generateCreateRequestTemplate = (modelName: string, modelIndexField
     comment('set the typename'),
     qref(methodCall(ref('mergedValues.put'), str('__typename'), str(modelName))),
 
-    ...(modelIndexFields.length ? [
-      set(ref('nullIndexFields'), list([])),
-      set(ref('indexFields'), list(modelIndexFields.map(it => str(it)))),
+    ...(modelIndexFields.length
+      ? [
+          set(ref('nullIndexFields'), list([])),
+          set(ref('indexFields'), list(modelIndexFields.map((it) => str(it)))),
 
-      forEach(ref('entry'), ref('util.map.copyAndRetainAllKeys($mergedValues, $indexFields).entrySet()'), [
-        iff(raw('$util.isNull($entry.value)'), qref(methodCall(ref('nullIndexFields.add'), ref('entry.key')))),
-      ]),
+          forEach(ref('entry'), ref('util.map.copyAndRetainAllKeys($mergedValues, $indexFields).entrySet()'), [
+            iff(raw('$util.isNull($entry.value)'), qref(methodCall(ref('nullIndexFields.add'), ref('entry.key')))),
+          ]),
 
-      set(ref('mergedValues'), ref('util.map.copyAndRemoveAllKeys($mergedValues, $nullIndexFields)')),
-    ] : []),
+          set(ref('mergedValues'), ref('util.map.copyAndRemoveAllKeys($mergedValues, $nullIndexFields)')),
+        ]
+      : []),
 
     // Set PutObject
     set(
@@ -256,7 +258,7 @@ export const generateCreateInitSlotTemplate = (modelConfig: ModelDirectiveConfig
  * Generates VTL template in delete mutation
  *
  */
-export const generateDeleteRequestTemplate = (modelName:string, isSyncEnabled: boolean): string => {
+export const generateDeleteRequestTemplate = (modelName: string, isSyncEnabled: boolean): string => {
   const statements: Expression[] = [
     setArgs,
     set(
@@ -328,10 +330,11 @@ export const generateUpdateInitSlotTemplate = (modelConfig: ModelDirectiveConfig
 /**
  * generateApplyDefaultsToInputTemplate
  */
-export const generateApplyDefaultsToInputTemplate = (target: string): Expression => compoundExpression([
-  set(ref(target), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.defaultValues'), obj({}))),
-  qref(methodCall(ref(`${target}.putAll`), methodCall(ref('util.defaultIfNull'), ref('ctx.args.input'), obj({})))),
-]);
+export const generateApplyDefaultsToInputTemplate = (target: string): Expression =>
+  compoundExpression([
+    set(ref(target), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.defaultValues'), obj({}))),
+    qref(methodCall(ref(`${target}.putAll`), methodCall(ref('util.defaultIfNull'), ref('ctx.args.input'), obj({})))),
+  ]);
 
 const generateKeyConditionTemplate = (attributeExistsValue: boolean): Expression[] => {
   const statements: Expression[] = [

package/src/resolvers/dynamodb/query.ts

@@ -23,6 +23,7 @@ import {
   raw,
 } from 'graphql-mapping-template';
 import { ResourceConstants, setArgs } from 'graphql-transformer-common';
+
 const authFilter = ref('ctx.stash.authFilter');
 
 /**
@@ -173,13 +174,7 @@ export const generateSyncRequestTemplate = (): string => {
       set(ref('queryFilterContainsAuthField'), bool(false)),
       set(ref('authFilterContainsSortKey'), bool(false)),
       set(ref('useScan'), bool(true)),
-      iff(
-        and([
-          isNullOrEmpty(authFilter),
-          ref('ctx.stash.QueryRequest'),
-        ]),
-        set(ref('useScan'), bool(false)),
-      ),
+      iff(and([isNullOrEmpty(authFilter), ref('ctx.stash.QueryRequest')]), set(ref('useScan'), bool(false))),
       ifElse(
         not(isNullOrEmpty(authFilter)),
         compoundExpression([
@@ -202,10 +197,7 @@ export const generateSyncRequestTemplate = (): string => {
                 compoundExpression([
                   forEach(ref('filterItem'), ref('ctx.stash.authFilter.or'), [
                     forEach(ref('sortKey'), ref('ctx.stash.QueryRequestVariables.sortKeys'), [
-                      iff(
-                        raw('$filterItem.get($sortKey)'),
-                        set(ref('authFilterContainsSortKey'), bool(true)),
-                      ),
+                      iff(raw('$filterItem.get($sortKey)'), set(ref('authFilterContainsSortKey'), bool(true))),
                     ]),
                   ]),
                   iff(
@@ -261,7 +253,10 @@ export const generateSyncRequestTemplate = (): string => {
             ref(`${requestVariable}.filter`),
             set(
               ref(`${requestVariable}.filter`),
-              methodCall(ref('util.parseJson'), methodCall(ref('util.transform.toDynamoDBFilterExpression'), ref(`${requestVariable}.filter`))),
+              methodCall(
+                ref('util.parseJson'),
+                methodCall(ref('util.transform.toDynamoDBFilterExpression'), ref(`${requestVariable}.filter`)),
+              ),
             ),
           ),
           raw(`$util.toJson($${requestVariable})`),

package/src/resolvers/dynamodb/subscriptions.ts

@@ -1,6 +1,4 @@
-import {
-  compoundExpression, Expression, obj, printBlock, str, toJson, nul, iff, not, isNullOrEmpty, ref,
-} from 'graphql-mapping-template';
+import { compoundExpression, Expression, obj, printBlock, str, toJson, nul, iff, not, isNullOrEmpty, ref } from 'graphql-mapping-template';
 /**
  * Generates subscription request template
  */

package/src/resolvers/generators/dynamodb-vtl-generator.ts

@@ -1,11 +1,3 @@
-import {
-  ModelCreateInitSlotConfig,
-  ModelCreateRequestConfig,
-  ModelDefaultResponseConfig,
-  ModelRequestConfig,
-  ModelUpdateRequestConfig,
-  ModelVTLGenerator,
-} from './vtl-generator';
 import {
   generateUpdateRequestTemplate,
   generateCreateRequestTemplate,
@@ -20,41 +12,59 @@ import {
   generateSubscriptionResponseTemplate,
   generateDefaultResponseMappingTemplate,
 } from '../dynamodb';
+import {
+  ModelCreateInitSlotConfig,
+  ModelCreateRequestConfig,
+  ModelDefaultResponseConfig,
+  ModelRequestConfig,
+  ModelUpdateRequestConfig,
+  ModelVTLGenerator,
+} from './vtl-generator';
 
 export class DynamoDBModelVTLGenerator implements ModelVTLGenerator {
   generateUpdateRequestTemplate(config: ModelUpdateRequestConfig): string {
     return generateUpdateRequestTemplate(config.modelName, config.isSyncEnabled);
   }
+
   generateCreateRequestTemplate(config: ModelCreateRequestConfig): string {
     return generateCreateRequestTemplate(config.modelName, config.modelIndexFields);
   }
   generateCreateInitSlotTemplate(config: ModelCreateInitSlotConfig, initializeIdField: boolean): string {
     return generateCreateInitSlotTemplate(config.modelConfig, initializeIdField);
   }
+
   generateDeleteRequestTemplate(config: ModelUpdateRequestConfig): string {
     return generateDeleteRequestTemplate(config.modelName, config.isSyncEnabled);
   }
+
   generateUpdateInitSlotTemplate(config: ModelCreateInitSlotConfig): string {
     return generateUpdateInitSlotTemplate(config.modelConfig);
   }
+
   generateGetRequestTemplate(config: ModelRequestConfig): string {
     return generateGetRequestTemplate();
   }
+
   generateGetResponseTemplate(config: ModelUpdateRequestConfig): string {
     return generateGetResponseTemplate(config.isSyncEnabled);
   }
+
   generateListRequestTemplate(config: ModelRequestConfig): string {
     return generateListRequestTemplate();
   }
+
   generateSyncRequestTemplate(config: ModelRequestConfig): string {
     return generateSyncRequestTemplate();
   }
+
   generateSubscriptionRequestTemplate(): string {
     return generateSubscriptionRequestTemplate();
   }
+
   generateSubscriptionResponseTemplate(): string {
     return generateSubscriptionResponseTemplate();
   }
+
   generateDefaultResponseMappingTemplate(config: ModelDefaultResponseConfig): string {
     return generateDefaultResponseMappingTemplate(config.isSyncEnabled, config.mutation);
   }

package/src/resolvers/generators/rds-vtl-generator.ts

@@ -9,10 +9,7 @@ import {
   generateLambdaDeleteRequestTemplate,
   generateLambdaListRequestTemplate,
 } from '../rds';
-import {
-  generateSubscriptionRequestTemplate,
-  generateSubscriptionResponseTemplate,
-} from '../dynamodb';
+import { generateSubscriptionRequestTemplate, generateSubscriptionResponseTemplate } from '../dynamodb';
 import {
   ModelCreateInitSlotConfig,
   ModelCreateRequestConfig,
@@ -27,36 +24,46 @@ export class RDSModelVTLGenerator implements ModelVTLGenerator {
   generateUpdateRequestTemplate(config: ModelUpdateRequestConfig): string {
     return generateLambdaUpdateRequestTemplate(config.modelName, config.operationName, config.modelIndexFields ?? ['id']);
   }
+
   generateCreateRequestTemplate(config: ModelCreateRequestConfig): string {
     return generateLambdaCreateRequestTemplate(config.modelName, config.operationName);
   }
   generateCreateInitSlotTemplate(config: ModelCreateInitSlotConfig, initializeIdField: boolean): string {
     return generateCreateInitSlotTemplate(config.modelConfig, initializeIdField);
   }
+
   generateDeleteRequestTemplate(config: ModelUpdateRequestConfig): string {
     return generateLambdaDeleteRequestTemplate(config.modelName, config.operationName, config.modelIndexFields ?? ['id']);
   }
+
   generateUpdateInitSlotTemplate(config: ModelCreateInitSlotConfig): string {
     return generateUpdateInitSlotTemplate(config.modelConfig);
   }
+
   generateGetRequestTemplate(config: ModelRequestConfig): string {
     return generateLambdaRequestTemplate(config.modelName, config.operation, config.operationName);
   }
+
   generateGetResponseTemplate(config: ModelUpdateRequestConfig): string {
     return generateGetLambdaResponseTemplate(false);
   }
+
   generateListRequestTemplate(config: ModelRequestConfig): string {
     return generateLambdaListRequestTemplate(config.modelName, config.operation, config.operationName);
   }
+
   generateSyncRequestTemplate(config: ModelRequestConfig): string {
     return generateDefaultLambdaResponseMappingTemplate(false);
   }
+
   generateSubscriptionRequestTemplate(): string {
     return generateSubscriptionRequestTemplate();
   }
+
   generateSubscriptionResponseTemplate(): string {
     return generateSubscriptionResponseTemplate();
   }
+
   generateDefaultResponseMappingTemplate(config: ModelDefaultResponseConfig): string {
     return generateDefaultLambdaResponseMappingTemplate(false);
   }

package/src/resolvers/generators/vtl-generator.ts

@@ -4,22 +4,22 @@ export type ModelRequestConfig = {
   modelName: string;
   operation: string;
   operationName: string;
-}
+};
 
 export type ModelUpdateRequestConfig = ModelRequestConfig & {
   modelIndexFields: string[];
   isSyncEnabled: boolean;
-}
+};
 
 export type ModelDeleteRequestConfig = ModelUpdateRequestConfig;
 
 export type ModelCreateRequestConfig = ModelRequestConfig & {
   modelIndexFields: string[];
-}
+};
 
 export type ModelCreateInitSlotConfig = {
   modelConfig: ModelDirectiveConfiguration;
-}
+};
 
 export type ModelUpdateInitSlotConfig = ModelCreateInitSlotConfig;
 
@@ -28,7 +28,7 @@ export type ModelGetResponseConfig = ModelUpdateRequestConfig;
 export type ModelDefaultResponseConfig = ModelRequestConfig & {
   isSyncEnabled: boolean;
   mutation: boolean;
-}
+};
 
 export interface ModelVTLGenerator {
   generateUpdateRequestTemplate(config: ModelUpdateRequestConfig): string;

package/src/resolvers/index.ts

@@ -1,5 +1,3 @@
 export * from './generators';
 export * from './common';
-export {
-  generateApplyDefaultsToInputTemplate
-} from './dynamodb';
+export { generateApplyDefaultsToInputTemplate } from './dynamodb';

package/src/resolvers/rds/mutation.ts

@@ -1,7 +1,8 @@
 import {
   comment,
   compoundExpression,
-  Expression, list,
+  Expression,
+  list,
   methodCall,
   obj,
   printBlock,
@@ -52,27 +53,32 @@ export const generateCreateInitSlotTemplate = (modelConfig: ModelDirectiveConfig
   return printBlock('Initialization default values')(compoundExpression(statements));
 };
 
-export const generateLambdaCreateRequestTemplate = (tableName: string, operationName: string): string => printBlock('Invoke RDS Lambda data source')(
-  compoundExpression([
-    set(ref('lambdaInput'), obj({})),
-    set(ref('lambdaInput.table'), str(tableName)),
-    set(ref('lambdaInput.args'), obj({})),
-    set(ref('lambdaInput.operation'), str('CREATE')),
-    set(ref('lambdaInput.operationName'), str(operationName)),
-    set(ref('lambdaInput.args.metadata'), obj({})),
-    set(ref('lambdaInput.args.metadata.keys'), list([])),
-    qref(methodCall(ref('lambdaInput.args.metadata.keys.addAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.keys'), list([])))),
-    comment('Set the default values to put request'),
-    set(ref('lambdaInput.args.input'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.defaultValues'), obj({}))),
-    comment('copy the values from input'),
-    qref(methodCall(ref('lambdaInput.args.input.putAll'), methodCall(ref('util.defaultIfNull'), ref('context.arguments.input'), obj({})))),
-    obj({
-      version: str('2018-05-29'),
-      operation: str('Invoke'),
-      payload: methodCall(ref('util.toJson'), ref('lambdaInput')),
-    }),
-  ]),
-);
+export const generateLambdaCreateRequestTemplate = (tableName: string, operationName: string): string =>
+  printBlock('Invoke RDS Lambda data source')(
+    compoundExpression([
+      set(ref('lambdaInput'), obj({})),
+      set(ref('lambdaInput.table'), str(tableName)),
+      set(ref('lambdaInput.args'), obj({})),
+      set(ref('lambdaInput.operation'), str('CREATE')),
+      set(ref('lambdaInput.operationName'), str(operationName)),
+      set(ref('lambdaInput.args.metadata'), obj({})),
+      set(ref('lambdaInput.args.metadata.keys'), list([])),
+      qref(
+        methodCall(ref('lambdaInput.args.metadata.keys.addAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.keys'), list([]))),
+      ),
+      comment('Set the default values to put request'),
+      set(ref('lambdaInput.args.input'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.defaultValues'), obj({}))),
+      comment('copy the values from input'),
+      qref(
+        methodCall(ref('lambdaInput.args.input.putAll'), methodCall(ref('util.defaultIfNull'), ref('context.arguments.input'), obj({}))),
+      ),
+      obj({
+        version: str('2018-05-29'),
+        operation: str('Invoke'),
+        payload: methodCall(ref('util.toJson'), ref('lambdaInput')),
+      }),
+    ]),
+  );
 
 /**
  * Generate VTL template that sets the default values for Update mutation
@@ -109,55 +115,55 @@ export const generateUpdateInitSlotTemplate = (modelConfig: ModelDirectiveConfig
 /**
  * Generate VTL template that calls the lambda for an Update mutation
  */
-export const generateLambdaUpdateRequestTemplate = (
-  tableName: string,
-  operationName: string,
-  modelIndexFields: string[],
-): string => printBlock('Invoke RDS Lambda data source')(
-  compoundExpression([
-    set(ref('lambdaInput'), obj({})),
-    set(ref('lambdaInput.table'), str(tableName)),
-    set(ref('lambdaInput.args'), obj({})),
-    set(ref('lambdaInput.operation'), str('UPDATE')),
-    set(ref('lambdaInput.operationName'), str(operationName)),
-    set(ref('lambdaInput.args.metadata'), obj({})),
-    set(ref('lambdaInput.args.metadata.keys'), list([])),
-    qref(methodCall(ref('lambdaInput.args.metadata.keys.addAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.keys'), list([])))),
-    comment('Set the default values to put request'),
-    set(ref('lambdaInput.args.input'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.defaultValues'), obj({}))),
-    comment('copy the values from input'),
-    qref(methodCall(ref('lambdaInput.args.input.putAll'), methodCall(ref('util.defaultIfNull'), ref('context.arguments.input'), obj({})))),
-    set(ref('lambdaInput.args.condition'), methodCall(ref('util.defaultIfNull'), ref('context.arguments.condition'), obj({}))),
-    obj({
-      version: str('2018-05-29'),
-      operation: str('Invoke'),
-      payload: methodCall(ref('util.toJson'), ref('lambdaInput')),
-    }),
-  ]),
-);
+export const generateLambdaUpdateRequestTemplate = (tableName: string, operationName: string, modelIndexFields: string[]): string =>
+  printBlock('Invoke RDS Lambda data source')(
+    compoundExpression([
+      set(ref('lambdaInput'), obj({})),
+      set(ref('lambdaInput.table'), str(tableName)),
+      set(ref('lambdaInput.args'), obj({})),
+      set(ref('lambdaInput.operation'), str('UPDATE')),
+      set(ref('lambdaInput.operationName'), str(operationName)),
+      set(ref('lambdaInput.args.metadata'), obj({})),
+      set(ref('lambdaInput.args.metadata.keys'), list([])),
+      qref(
+        methodCall(ref('lambdaInput.args.metadata.keys.addAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.keys'), list([]))),
+      ),
+      comment('Set the default values to put request'),
+      set(ref('lambdaInput.args.input'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.defaultValues'), obj({}))),
+      comment('copy the values from input'),
+      qref(
+        methodCall(ref('lambdaInput.args.input.putAll'), methodCall(ref('util.defaultIfNull'), ref('context.arguments.input'), obj({}))),
+      ),
+      set(ref('lambdaInput.args.condition'), methodCall(ref('util.defaultIfNull'), ref('context.arguments.condition'), obj({}))),
+      obj({
+        version: str('2018-05-29'),
+        operation: str('Invoke'),
+        payload: methodCall(ref('util.toJson'), ref('lambdaInput')),
+      }),
+    ]),
+  );
 
 /**
  * Generate VTL template that calls the lambda for a Delete mutation
  */
-export const generateLambdaDeleteRequestTemplate = (
-  tableName: string,
-  operationName: string,
-  modelIndexFields: string[],
-): string => printBlock('Invoke RDS Lambda data source')(
-  compoundExpression([
-    set(ref('lambdaInput'), obj({})),
-    set(ref('lambdaInput.table'), str(tableName)),
-    set(ref('lambdaInput.args'), ref('context.arguments')),
-    set(ref('lambdaInput.operation'), str('DELETE')),
-    set(ref('lambdaInput.operationName'), str(operationName)),
-    set(ref('lambdaInput.args.metadata'), obj({})),
-    set(ref('lambdaInput.args.metadata.keys'), list([])),
-    qref(methodCall(ref('lambdaInput.args.metadata.keys.addAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.keys'), list([])))),
-    set(ref('lambdaInput.args.condition'), methodCall(ref('util.defaultIfNull'), ref('context.arguments.condition'), obj({}))),
-    obj({
-      version: str('2018-05-29'),
-      operation: str('Invoke'),
-      payload: methodCall(ref('util.toJson'), ref('lambdaInput')),
-    }),
-  ]),
-);
+export const generateLambdaDeleteRequestTemplate = (tableName: string, operationName: string, modelIndexFields: string[]): string =>
+  printBlock('Invoke RDS Lambda data source')(
+    compoundExpression([
+      set(ref('lambdaInput'), obj({})),
+      set(ref('lambdaInput.table'), str(tableName)),
+      set(ref('lambdaInput.args'), ref('context.arguments')),
+      set(ref('lambdaInput.operation'), str('DELETE')),
+      set(ref('lambdaInput.operationName'), str(operationName)),
+      set(ref('lambdaInput.args.metadata'), obj({})),
+      set(ref('lambdaInput.args.metadata.keys'), list([])),
+      qref(
+        methodCall(ref('lambdaInput.args.metadata.keys.addAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.keys'), list([]))),
+      ),
+      set(ref('lambdaInput.args.condition'), methodCall(ref('util.defaultIfNull'), ref('context.arguments.condition'), obj({}))),
+      obj({
+        version: str('2018-05-29'),
+        operation: str('Invoke'),
+        payload: methodCall(ref('util.toJson'), ref('lambdaInput')),
+      }),
+    ]),
+  );

package/src/resolvers/rds/query.ts

@@ -1,14 +1,4 @@
-import {
-  compoundExpression,
-  list,
-  methodCall,
-  obj,
-  printBlock,
-  qref,
-  ref,
-  set,
-  str,
-} from 'graphql-mapping-template';
+import { compoundExpression, list, methodCall, obj, printBlock, qref, ref, set, str } from 'graphql-mapping-template';
 
 export const generateLambdaListRequestTemplate = (tableName: string, operation: string, operationName: string): string => {
   return printBlock('Invoke RDS Lambda data source')(
@@ -20,7 +10,9 @@ export const generateLambdaListRequestTemplate = (tableName: string, operation:
       set(ref('lambdaInput.operationName'), str(operationName)),
       set(ref('lambdaInput.args.metadata'), obj({})),
       set(ref('lambdaInput.args.metadata.keys'), list([])),
-      qref(methodCall(ref('lambdaInput.args.metadata.keys.addAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.keys'), list([])))),
+      qref(
+        methodCall(ref('lambdaInput.args.metadata.keys.addAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.keys'), list([]))),
+      ),
       set(ref('lambdaInput.args.input'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.defaultValues'), obj({}))),
       qref(methodCall(ref('lambdaInput.args.putAll'), methodCall(ref('util.defaultIfNull'), ref('context.arguments'), obj({})))),
       obj({