Skip to content

Commit

Permalink
fix api extract and lint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
sundersc committed Aug 1, 2023
1 parent cbfb017 commit 5b665ab
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"createTest\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
## Set the default values to put request **
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
Expand Down Expand Up @@ -72,6 +73,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"deleteTest\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
#set( $lambdaInput.args.condition = $util.defaultIfNull($context.arguments.condition, {}) )
{
Expand Down Expand Up @@ -116,6 +118,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"updateTest\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
## Set the default values to put request **
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
Expand Down Expand Up @@ -157,6 +160,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"getTest\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
$util.qr($lambdaInput.args.input.putAll($util.defaultIfNull($context.arguments, {})))
Expand Down Expand Up @@ -200,6 +204,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"listTests\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
$util.qr($lambdaInput.args.putAll($util.defaultIfNull($context.arguments, {})))
Expand Down Expand Up @@ -304,6 +309,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"createTest\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
## Set the default values to put request **
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
Expand Down Expand Up @@ -343,6 +349,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"deleteTest\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
#set( $lambdaInput.args.condition = $util.defaultIfNull($context.arguments.condition, {}) )
{
Expand Down Expand Up @@ -386,6 +393,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"updateTest\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
## Set the default values to put request **
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
Expand Down Expand Up @@ -426,6 +434,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"getTest\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
$util.qr($lambdaInput.args.input.putAll($util.defaultIfNull($context.arguments, {})))
Expand Down Expand Up @@ -468,6 +477,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"listTests\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
$util.qr($lambdaInput.args.putAll($util.defaultIfNull($context.arguments, {})))
Expand Down Expand Up @@ -571,6 +581,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"createTest\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
## Set the default values to put request **
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
Expand Down Expand Up @@ -609,6 +620,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"deleteTest\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
#set( $lambdaInput.args.condition = $util.defaultIfNull($context.arguments.condition, {}) )
{
Expand Down Expand Up @@ -651,6 +663,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"updateTest\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
## Set the default values to put request **
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
Expand Down Expand Up @@ -690,6 +703,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"getTest\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
$util.qr($lambdaInput.args.input.putAll($util.defaultIfNull($context.arguments, {})))
Expand Down Expand Up @@ -731,6 +745,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"listTests\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
$util.qr($lambdaInput.args.putAll($util.defaultIfNull($context.arguments, {})))
Expand Down Expand Up @@ -836,6 +851,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"createTest\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
## Set the default values to put request **
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
Expand Down Expand Up @@ -875,6 +891,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"deleteTest\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
#set( $lambdaInput.args.condition = $util.defaultIfNull($context.arguments.condition, {}) )
{
Expand Down Expand Up @@ -918,6 +935,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"updateTest\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
## Set the default values to put request **
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
Expand Down Expand Up @@ -958,6 +976,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"testGet\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
$util.qr($lambdaInput.args.input.putAll($util.defaultIfNull($context.arguments, {})))
Expand Down Expand Up @@ -1063,6 +1082,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"testCreate\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
## Set the default values to put request **
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
Expand Down Expand Up @@ -1102,6 +1122,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"testDelete\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
#set( $lambdaInput.args.condition = $util.defaultIfNull($context.arguments.condition, {}) )
{
Expand Down Expand Up @@ -1145,6 +1166,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"testUpdate\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
## Set the default values to put request **
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
Expand Down Expand Up @@ -1185,6 +1207,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"testGet\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
$util.qr($lambdaInput.args.input.putAll($util.defaultIfNull($context.arguments, {})))
Expand Down Expand Up @@ -1227,6 +1250,7 @@ $util.qr($ctx.stash.put(\\"keys\\", $keys))
#set( $lambdaInput.operationName = \\"testList\\" )
#set( $lambdaInput.args.metadata = {} )
#set( $lambdaInput.args.metadata.keys = [] )
#set( $lambdaInput.args.metadata.nonScalarFields = [] )
$util.qr($lambdaInput.args.metadata.keys.addAll($util.defaultIfNull($ctx.stash.keys, [])))
#set( $lambdaInput.args.input = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
$util.qr($lambdaInput.args.putAll($util.defaultIfNull($context.arguments, {})))
Expand Down
30 changes: 15 additions & 15 deletions packages/amplify-graphql-model-transformer/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@ export class DynamoDBModelVTLGenerator implements ModelVTLGenerator {
// (undocumented)
generateCreateInitSlotTemplate(config: ModelCreateInitSlotConfig, initializeIdField: boolean): string;
// (undocumented)
generateCreateRequestTemplate(config: ModelCreateRequestConfig): string;
generateCreateRequestTemplate(config: ModelCreateRequestConfig, ctx: TransformerContextProvider): string;
// (undocumented)
generateDefaultResponseMappingTemplate(config: ModelDefaultResponseConfig): string;
// (undocumented)
generateDeleteRequestTemplate(config: ModelUpdateRequestConfig): string;
generateDeleteRequestTemplate(config: ModelUpdateRequestConfig, ctx: TransformerContextProvider): string;
// (undocumented)
generateGetRequestTemplate(config: ModelRequestConfig): string;
generateGetRequestTemplate(config: ModelRequestConfig, ctx: TransformerContextProvider): string;
// (undocumented)
generateGetResponseTemplate(config: ModelUpdateRequestConfig): string;
// (undocumented)
generateListRequestTemplate(config: ModelRequestConfig): string;
generateListRequestTemplate(config: ModelRequestConfig, ctx: TransformerContextProvider): string;
// (undocumented)
generateSubscriptionRequestTemplate(): string;
// (undocumented)
Expand All @@ -69,7 +69,7 @@ export class DynamoDBModelVTLGenerator implements ModelVTLGenerator {
// (undocumented)
generateUpdateInitSlotTemplate(config: ModelCreateInitSlotConfig): string;
// (undocumented)
generateUpdateRequestTemplate(config: ModelUpdateRequestConfig): string;
generateUpdateRequestTemplate(config: ModelUpdateRequestConfig, ctx: TransformerContextProvider): string;
}

// @public (undocumented)
Expand Down Expand Up @@ -284,17 +284,17 @@ export interface ModelVTLGenerator {
// (undocumented)
generateCreateInitSlotTemplate(config: ModelCreateInitSlotConfig, initializeIdField: boolean): string;
// (undocumented)
generateCreateRequestTemplate(config: ModelCreateRequestConfig): string;
generateCreateRequestTemplate(config: ModelCreateRequestConfig, ctx: TransformerContextProvider): string;
// (undocumented)
generateDefaultResponseMappingTemplate(config: ModelDefaultResponseConfig): string;
// (undocumented)
generateDeleteRequestTemplate(config: ModelDeleteRequestConfig): string;
generateDeleteRequestTemplate(config: ModelDeleteRequestConfig, ctx: TransformerContextProvider): string;
// (undocumented)
generateGetRequestTemplate(config: ModelRequestConfig): string;
generateGetRequestTemplate(config: ModelRequestConfig, ctx: TransformerContextProvider): string;
// (undocumented)
generateGetResponseTemplate(config: ModelGetResponseConfig): string;
// (undocumented)
generateListRequestTemplate(config: ModelRequestConfig): string;
generateListRequestTemplate(config: ModelRequestConfig, ctx: TransformerContextProvider): string;
// (undocumented)
generateSubscriptionRequestTemplate(): string;
// (undocumented)
Expand All @@ -304,7 +304,7 @@ export interface ModelVTLGenerator {
// (undocumented)
generateUpdateInitSlotTemplate(config: ModelUpdateInitSlotConfig): string;
// (undocumented)
generateUpdateRequestTemplate(config: ModelUpdateRequestConfig): string;
generateUpdateRequestTemplate(config: ModelUpdateRequestConfig, ctx: TransformerContextProvider): string;
}

// @public (undocumented)
Expand All @@ -318,17 +318,17 @@ export class RDSModelVTLGenerator implements ModelVTLGenerator {
// (undocumented)
generateCreateInitSlotTemplate(config: ModelCreateInitSlotConfig, initializeIdField: boolean): string;
// (undocumented)
generateCreateRequestTemplate(config: ModelCreateRequestConfig): string;
generateCreateRequestTemplate(config: ModelCreateRequestConfig, ctx: TransformerContextProvider): string;
// (undocumented)
generateDefaultResponseMappingTemplate(config: ModelDefaultResponseConfig): string;
// (undocumented)
generateDeleteRequestTemplate(config: ModelUpdateRequestConfig): string;
generateDeleteRequestTemplate(config: ModelUpdateRequestConfig, ctx: TransformerContextProvider): string;
// (undocumented)
generateGetRequestTemplate(config: ModelRequestConfig): string;
generateGetRequestTemplate(config: ModelRequestConfig, ctx: TransformerContextProvider): string;
// (undocumented)
generateGetResponseTemplate(config: ModelUpdateRequestConfig): string;
// (undocumented)
generateListRequestTemplate(config: ModelRequestConfig): string;
generateListRequestTemplate(config: ModelRequestConfig, ctx: TransformerContextProvider): string;
// (undocumented)
generateSubscriptionRequestTemplate(): string;
// (undocumented)
Expand All @@ -338,7 +338,7 @@ export class RDSModelVTLGenerator implements ModelVTLGenerator {
// (undocumented)
generateUpdateInitSlotTemplate(config: ModelCreateInitSlotConfig): string;
// (undocumented)
generateUpdateRequestTemplate(config: ModelUpdateRequestConfig): string;
generateUpdateRequestTemplate(config: ModelUpdateRequestConfig, ctx: TransformerContextProvider): string;
}

// @public (undocumented)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export class DynamoDBModelVTLGenerator implements ModelVTLGenerator {
generateCreateRequestTemplate(config: ModelCreateRequestConfig, ctx: TransformerContextProvider): string {
return generateCreateRequestTemplate(config.modelName, config.modelIndexFields);
}

generateCreateInitSlotTemplate(config: ModelCreateInitSlotConfig, initializeIdField: boolean): string {
return generateCreateInitSlotTemplate(config.modelConfig, initializeIdField);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,12 @@ 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[], ctx: TransformerContextProvider): string =>
export const generateLambdaUpdateRequestTemplate = (
tableName: string,
operationName: string,
modelIndexFields: string[],
ctx: TransformerContextProvider,
): string =>
printBlock('Invoke RDS Lambda data source')(
compoundExpression([
set(ref('lambdaInput'), obj({})),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,12 @@ export const createRdsPatchingLambdaRole = (roleName: string, stack: Construct,
* @param operation string
* @param operationName string
*/
export const generateLambdaRequestTemplate = (tableName: string, operation: string, operationName: string, ctx: TransformerContextProvider): string =>
export const generateLambdaRequestTemplate = (
tableName: string,
operation: string,
operationName: string,
ctx: TransformerContextProvider,
): string =>
printBlock('Invoke RDS Lambda data source')(
compoundExpression([
set(ref('lambdaInput'), obj({})),
Expand Down Expand Up @@ -375,5 +380,5 @@ export const getNonScalarFields = (object: ObjectTypeDefinitionNode | undefined,
return object.fields?.filter((f: FieldDefinitionNode) => isArrayOrObject(f.type, enums)).map((f) => f.name.value) || [];
};

export const constructNonScalarFieldsStatement = (tableName: string, ctx: TransformerContextProvider): Expression =>
export const constructNonScalarFieldsStatement = (tableName: string, ctx: TransformerContextProvider): Expression =>
set(ref('lambdaInput.args.metadata.nonScalarFields'), list(getNonScalarFields(ctx.output.getObject(tableName), ctx).map(str)));
3 changes: 3 additions & 0 deletions packages/graphql-transformer-common/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ export class HttpResourceIDs {
static HttpDataSourceID(baseURL: string): string;
}

// @public (undocumented)
export const isArrayOrObject: (type: TypeNode, enums: EnumTypeDefinitionNode[]) => boolean;

// @public (undocumented)
export function isEnum(type: TypeNode, document: DocumentNode): DefinitionNode;

Expand Down

0 comments on commit 5b665ab

Please sign in to comment.