@aws-amplify/graphql-model-transformer 1.3.7 → 1.3.8

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

@@ -173,13 +173,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 +196,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 +252,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/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,

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,
@@ -60,11 +61,15 @@ export const generateLambdaCreateRequestTemplate = (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([]))),
+      ),
       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({})))),
+      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'),
@@ -119,11 +124,15 @@ export const generateLambdaUpdateRequestTemplate = (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([]))),
+      ),
       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({})))),
+      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'),
@@ -146,7 +155,9 @@ export const generateLambdaDeleteRequestTemplate = (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([]))),
+      ),
       obj({
         version: str('2018-05-29'),
         operation: str('Invoke'),

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({

package/src/resolvers/rds/resolver.ts

@@ -23,18 +23,11 @@ import {
 import { ResourceConstants } from 'graphql-transformer-common';
 import { Stack } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
-import {
-  Effect,
-  IRole,
-  Policy,
-  PolicyStatement,
-  Role,
-  ServicePrincipal,
-} from 'aws-cdk-lib/aws-iam';
+import { Effect, IRole, Policy, PolicyStatement, Role, ServicePrincipal } from 'aws-cdk-lib/aws-iam';
 import { IFunction, Runtime } from 'aws-cdk-lib/aws-lambda';
 import { GraphQLAPIProvider } from '@aws-amplify/graphql-transformer-interfaces';
 import path from 'path';
-import {RDSConnectionSecrets} from '@aws-amplify/graphql-transformer-core';
+import { RDSConnectionSecrets } from '@aws-amplify/graphql-transformer-core';
 
 export type OPERATIONS = 'CREATE' | 'UPDATE' | 'DELETE' | 'GET' | 'LIST' | 'SYNC';
 
@@ -73,7 +66,7 @@ export const createRdsLambdaRole = (roleName: string, stack: Construct, secretEn
       actions: ['logs:CreateLogGroup', 'logs:CreateLogStream', 'logs:PutLogEvents'],
       effect: Effect.ALLOW,
       resources: ['arn:aws:logs:*:*:*'],
-    })
+    }),
   ];
   if (secretEntry) {
     policyStatements.push(
@@ -81,8 +74,8 @@ export const createRdsLambdaRole = (roleName: string, stack: Construct, secretEn
         actions: ['ssm:GetParameter', 'ssm:GetParameters'],
         effect: Effect.ALLOW,
         resources: [`arn:aws:ssm:*:*:parameter${secretEntry.username}`, `arn:aws:ssm:*:*:parameter${secretEntry.password}`],
-      })
-    )
+      }),
+    );
   }
   role.attachInlinePolicy(
     new Policy(stack, 'CloudwatchLogsAccess', {
@@ -103,7 +96,9 @@ export const generateLambdaRequestTemplate = (tableName: string, operation: stri
       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.input.putAll'), methodCall(ref('util.defaultIfNull'), ref('context.arguments'), obj({})))),
       obj({

package/src/resources/dynamo-model-resource-generator.ts

@@ -1,19 +1,9 @@
 import * as cdk from 'aws-cdk-lib';
 import { TransformerContextProvider } from '@aws-amplify/graphql-transformer-interfaces';
-import {
-  ModelResourceIDs,
-  ResourceConstants,
-  SyncResourceIDs,
-} from 'graphql-transformer-common';
+import { ModelResourceIDs, ResourceConstants, SyncResourceIDs } from 'graphql-transformer-common';
 import { ObjectTypeDefinitionNode } from 'graphql';
 import { SyncUtils, TransformerNestedStack } from '@aws-amplify/graphql-transformer-core';
-import {
-  AttributeType,
-  CfnTable,
-  StreamViewType,
-  Table,
-  TableEncryption,
-} from 'aws-cdk-lib/aws-dynamodb';
+import { AttributeType, CfnTable, StreamViewType, Table, TableEncryption } from 'aws-cdk-lib/aws-dynamodb';
 import { CfnDataSource } from 'aws-cdk-lib/aws-appsync';
 import * as iam from 'aws-cdk-lib/aws-iam';
 import { CfnRole } from 'aws-cdk-lib/aws-iam';
@@ -269,15 +259,15 @@ export class DynamoModelResourceGenerator extends ModelResourceGenerator {
               }),
               ...(context.isProjectUsingDataStore()
                 ? [
-                  // eslint-disable-next-line no-template-curly-in-string
-                  cdk.Fn.sub('arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}', {
-                    tablename: amplifyDataStoreTableName,
-                  }),
-                  // eslint-disable-next-line no-template-curly-in-string
-                  cdk.Fn.sub('arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*', {
-                    tablename: amplifyDataStoreTableName,
-                  }),
-                ]
+                    // eslint-disable-next-line no-template-curly-in-string
+                    cdk.Fn.sub('arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}', {
+                      tablename: amplifyDataStoreTableName,
+                    }),
+                    // eslint-disable-next-line no-template-curly-in-string
+                    cdk.Fn.sub('arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*', {
+                      tablename: amplifyDataStoreTableName,
+                    }),
+                  ]
                 : []),
             ],
           }),
@@ -293,5 +283,5 @@ export class DynamoModelResourceGenerator extends ModelResourceGenerator {
     }
 
     return role;
-  }
+  };
 }

package/src/resources/model-resource-generator.ts

@@ -1,19 +1,15 @@
 import {
-  DataSourceProvider, MutationFieldType, QueryFieldType, SubscriptionFieldType,
+  DataSourceProvider,
+  MutationFieldType,
+  QueryFieldType,
+  SubscriptionFieldType,
   TransformerContextProvider,
   TransformerResolverProvider,
 } from '@aws-amplify/graphql-transformer-interfaces';
 import { ObjectTypeDefinitionNode } from 'graphql';
 import { MappingTemplate } from '@aws-amplify/graphql-transformer-core';
-import {
-  ResolverResourceIDs,
-  toCamelCase,
-} from 'graphql-transformer-common';
-import {
-  generateAuthExpressionForSandboxMode,
-  generateResolverKey,
-  ModelVTLGenerator,
-} from '../resolvers';
+import { ResolverResourceIDs, toCamelCase } from 'graphql-transformer-common';
+import { generateAuthExpressionForSandboxMode, generateResolverKey, ModelVTLGenerator } from '../resolvers';
 import { ModelDirectiveConfiguration, SubscriptionLevel } from '../directive';
 import { ModelTransformerOptions } from '../types';
 
@@ -103,7 +99,6 @@ export abstract class ModelResourceGenerator {
 
   protected generateResolvers(context: TransformerContextProvider): void {
     this.models.forEach((def) => {
-
       const queryFields = this.getQueryFieldNames(def);
       queryFields.forEach((query) => {
         let resolver;
@@ -228,7 +223,9 @@ export abstract class ModelResourceGenerator {
     const dataSource = this.datasourceMap[type.name.value];
     const resolverKey = `Get${generateResolverKey(typeName, fieldName)}`;
     const vtlGenerator = this.getVTLGenerator();
-    const modelIndexFields = type.fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index')).map((it) => it.name.value);
+    const modelIndexFields = type
+      .fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index'))
+      .map((it) => it.name.value);
     const requestConfig = {
       operation: 'GET',
       operationName: fieldName,
@@ -246,8 +243,14 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         dataSource,
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateGetRequestTemplate(requestConfig), `${typeName}.${fieldName}.req.vtl`),
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateGetResponseTemplate(responseConfig), `${typeName}.${fieldName}.res.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateGetRequestTemplate(requestConfig),
+          `${typeName}.${fieldName}.req.vtl`,
+        ),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateGetResponseTemplate(responseConfig),
+          `${typeName}.${fieldName}.res.vtl`,
+        ),
       );
     }
     return this.resolverMap[resolverKey];
@@ -280,7 +283,10 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         dataSource,
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateListRequestTemplate(requestConfig), `${typeName}.${fieldName}.req.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateListRequestTemplate(requestConfig),
+          `${typeName}.${fieldName}.req.vtl`,
+        ),
         MappingTemplate.s3MappingTemplateFromString(
           vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig),
           `${typeName}.${fieldName}.res.vtl`,
@@ -301,7 +307,9 @@ export abstract class ModelResourceGenerator {
     const dataSource = this.datasourceMap[type.name.value];
     const resolverKey = `Create${generateResolverKey(typeName, fieldName)}`;
     const vtlGenerator = this.getVTLGenerator();
-    const modelIndexFields = type.fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index')).map((it) => it.name.value);
+    const modelIndexFields = type
+      .fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index'))
+      .map((it) => it.name.value);
     const requestConfig = {
       operation: 'CREATE',
       operationName: fieldName,
@@ -321,7 +329,10 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         dataSource,
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateCreateRequestTemplate(requestConfig), `${typeName}.${fieldName}.req.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateCreateRequestTemplate(requestConfig),
+          `${typeName}.${fieldName}.req.vtl`,
+        ),
         MappingTemplate.s3MappingTemplateFromString(
           vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig),
           `${typeName}.${fieldName}.res.vtl`,
@@ -356,7 +367,9 @@ export abstract class ModelResourceGenerator {
     const dataSource = this.datasourceMap[type.name.value];
     const resolverKey = `Update${generateResolverKey(typeName, fieldName)}`;
     const vtlGenerator = this.getVTLGenerator();
-    const modelIndexFields = type.fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index')).map((it) => it.name.value);
+    const modelIndexFields = type
+      .fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index'))
+      .map((it) => it.name.value);
     const requestConfig = {
       operation: 'UPDATE',
       operationName: fieldName,
@@ -415,7 +428,9 @@ export abstract class ModelResourceGenerator {
     const dataSource = this.datasourceMap[type.name.value];
     const resolverKey = `delete${generateResolverKey(typeName, fieldName)}`;
     const vtlGenerator = this.getVTLGenerator();
-    const modelIndexFields = type.fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index')).map((it) => it.name.value);
+    const modelIndexFields = type
+      .fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index'))
+      .map((it) => it.name.value);
     const requestConfig = {
       operation: 'DELETE',
       operationName: fieldName,
@@ -436,7 +451,10 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         dataSource,
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateDeleteRequestTemplate(requestConfig), `${typeName}.${fieldName}.req.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateDeleteRequestTemplate(requestConfig),
+          `${typeName}.${fieldName}.req.vtl`,
+        ),
         MappingTemplate.s3MappingTemplateFromString(
           vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig),
           `${typeName}.${fieldName}.res.vtl`,
@@ -460,7 +478,10 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateSubscriptionRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateSubscriptionResponseTemplate(), `${typeName}.${fieldName}.res.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateSubscriptionResponseTemplate(),
+          `${typeName}.${fieldName}.res.vtl`,
+        ),
       );
     }
     return this.resolverMap[resolverKey];
@@ -480,7 +501,10 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateSubscriptionRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateSubscriptionResponseTemplate(), `${typeName}.${fieldName}.res.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateSubscriptionResponseTemplate(),
+          `${typeName}.${fieldName}.res.vtl`,
+        ),
       );
     }
     return this.resolverMap[resolverKey];
@@ -500,7 +524,10 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateSubscriptionRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateSubscriptionResponseTemplate(), `${typeName}.${fieldName}.res.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateSubscriptionResponseTemplate(),
+          `${typeName}.${fieldName}.res.vtl`,
+        ),
       );
     }
     return this.resolverMap[resolverKey];
@@ -534,7 +561,10 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         dataSource,
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateSyncRequestTemplate(requestConfig), `${typeName}.${fieldName}.req.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateSyncRequestTemplate(requestConfig),
+          `${typeName}.${fieldName}.req.vtl`,
+        ),
         MappingTemplate.s3MappingTemplateFromString(
           vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig),
           `${typeName}.${fieldName}.res.vtl`,

package/src/resources/rds-model-resource-generator.ts

@@ -17,11 +17,7 @@ export class RdsModelResourceGenerator extends ModelResourceGenerator {
   generateResources(context: TransformerContextProvider): void {
     if (this.isEnabled()) {
       const secretEntry = context.datasourceSecretParameterLocations.get(MYSQL_DB_TYPE);
-      const {
-        RDSLambdaIAMRoleLogicalID,
-        RDSLambdaLogicalID,
-        RDSLambdaDataSourceLogicalID,
-      } = ResourceConstants.RESOURCES;
+      const { RDSLambdaIAMRoleLogicalID, RDSLambdaLogicalID, RDSLambdaDataSourceLogicalID } = ResourceConstants.RESOURCES;
       const lambdaRoleStack = context.stackManager.getStackFor(RDSLambdaIAMRoleLogicalID, RDS_STACK_NAME);
       const lambdaStack = context.stackManager.getStackFor(RDSLambdaLogicalID, RDS_STACK_NAME);
       const role = createRdsLambdaRole(
@@ -29,26 +25,16 @@ export class RdsModelResourceGenerator extends ModelResourceGenerator {
         lambdaRoleStack,
         secretEntry as RDSConnectionSecrets,
       );
-      const lambda = createRdsLambda(
-        lambdaStack,
-        context.api,
-        role,
-        {
-          username: secretEntry?.username ?? '',
-          password: secretEntry?.password ?? '',
-          host: secretEntry?.host ?? '',
-          port: secretEntry?.port ?? '',
-          database: secretEntry?.database ?? '',
-        },
-      );
+      const lambda = createRdsLambda(lambdaStack, context.api, role, {
+        username: secretEntry?.username ?? '',
+        password: secretEntry?.password ?? '',
+        host: secretEntry?.host ?? '',
+        port: secretEntry?.port ?? '',
+        database: secretEntry?.database ?? '',
+      });
 
       const lambdaDataSourceStack = context.stackManager.getStackFor(RDSLambdaDataSourceLogicalID, RDS_STACK_NAME);
-      const rdsDatasource = context.api.host.addLambdaDataSource(
-        `${RDSLambdaDataSourceLogicalID}`,
-        lambda,
-        {},
-        lambdaDataSourceStack,
-      );
+      const rdsDatasource = context.api.host.addLambdaDataSource(`${RDSLambdaDataSourceLogicalID}`, lambda, {}, lambdaDataSourceStack);
       this.models.forEach((model) => {
         context.dataSources.add(model, rdsDatasource);
         this.datasourceMap[model.name.value] = rdsDatasource;

package/tsconfig.json

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