@aws-amplify/graphql-model-transformer 0.8.0-beta.1 → 0.9.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +22 -4
- package/lib/definitions.d.ts +1 -0
- package/lib/definitions.d.ts.map +1 -1
- package/lib/definitions.js +2 -1
- package/lib/definitions.js.map +1 -1
- package/lib/graphql-model-transformer.d.ts +2 -1
- package/lib/graphql-model-transformer.d.ts.map +1 -1
- package/lib/graphql-model-transformer.js +64 -12
- package/lib/graphql-model-transformer.js.map +1 -1
- package/lib/graphql-types/common.d.ts +6 -2
- package/lib/graphql-types/common.d.ts.map +1 -1
- package/lib/graphql-types/common.js +65 -1
- package/lib/graphql-types/common.js.map +1 -1
- package/lib/resolvers/common.d.ts +1 -1
- package/lib/resolvers/common.d.ts.map +1 -1
- package/lib/resolvers/common.js +1 -2
- package/lib/resolvers/common.js.map +1 -1
- package/package.json +6 -6
- package/src/__tests__/__snapshots__/model-transformer.test.ts.snap +51 -3
- package/src/__tests__/model-transformer.test.ts +194 -13
- package/src/definitions.ts +2 -0
- package/src/graphql-model-transformer.ts +81 -12
- package/src/graphql-types/common.ts +97 -1
- package/src/resolvers/common.ts +1 -3
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/graphql-types/common.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/graphql-types/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,5 @@ import { CompoundExpressionNode } from 'graphql-mapping-template';
|
|
|
2
2
|
export declare const generateConditionSlot: (inputConditionObjectName: string, conditionOutputVariableName: string) => CompoundExpressionNode;
|
|
3
3
|
export declare const generateDefaultResponseMappingTemplate: (isSyncEnabled: boolean, mutation?: boolean) => string;
|
|
4
4
|
export declare const generateResolverKey: (typeName: string, fieldName: string) => string;
|
|
5
|
-
export declare const generateAuthExpressionForSandboxMode: (
|
|
5
|
+
export declare const generateAuthExpressionForSandboxMode: (enabled: boolean) => string;
|
|
6
6
|
//# sourceMappingURL=common.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/resolvers/common.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EAmBvB,MAAM,0BAA0B,CAAC;AAWlC,eAAO,MAAM,qBAAqB,6BAA8B,MAAM,+BAA+B,MAAM,KAAG,sBA8B7G,CAAC;AAMF,eAAO,MAAM,sCAAsC,kBAAmB,OAAO,yBAAqB,MAkBjG,CAAC;AAOF,eAAO,MAAM,mBAAmB,aAAc,MAAM,aAAa,MAAM,KAAG,MAEzE,CAAC;
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/resolvers/common.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EAmBvB,MAAM,0BAA0B,CAAC;AAWlC,eAAO,MAAM,qBAAqB,6BAA8B,MAAM,+BAA+B,MAAM,KAAG,sBA8B7G,CAAC;AAMF,eAAO,MAAM,sCAAsC,kBAAmB,OAAO,yBAAqB,MAkBjG,CAAC;AAOF,eAAO,MAAM,mBAAmB,aAAc,MAAM,aAAa,MAAM,KAAG,MAEzE,CAAC;AAKF,eAAO,MAAM,oCAAoC,YAAa,OAAO,KAAG,MASvE,CAAC"}
|
package/lib/resolvers/common.js
CHANGED
|
@@ -40,8 +40,7 @@ const generateResolverKey = (typeName, fieldName) => {
|
|
|
40
40
|
return `${typeName}.${fieldName}`;
|
|
41
41
|
};
|
|
42
42
|
exports.generateResolverKey = generateResolverKey;
|
|
43
|
-
const generateAuthExpressionForSandboxMode = (
|
|
44
|
-
const enabled = ctx.resourceHelper.api.sandboxModeEnabled;
|
|
43
|
+
const generateAuthExpressionForSandboxMode = (enabled) => {
|
|
45
44
|
let exp;
|
|
46
45
|
if (enabled)
|
|
47
46
|
exp = graphql_mapping_template_1.iff(graphql_mapping_template_1.notEquals(graphql_mapping_template_1.methodCall(graphql_mapping_template_1.ref('util.authType')), graphql_mapping_template_1.str(API_KEY)), graphql_mapping_template_1.methodCall(graphql_mapping_template_1.ref('util.unauthorized')));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/resolvers/common.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/resolvers/common.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/graphql-model-transformer",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.9.2",
|
|
4
4
|
"description": "Amplify graphql @model transformer",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -28,8 +28,8 @@
|
|
|
28
28
|
"test-watch": "jest --watch"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@aws-amplify/graphql-transformer-core": "0.
|
|
32
|
-
"@aws-amplify/graphql-transformer-interfaces": "1.
|
|
31
|
+
"@aws-amplify/graphql-transformer-core": "0.13.0",
|
|
32
|
+
"@aws-amplify/graphql-transformer-interfaces": "1.12.2",
|
|
33
33
|
"@aws-cdk/assets": "~1.124.0",
|
|
34
34
|
"@aws-cdk/aws-applicationautoscaling": "~1.124.0",
|
|
35
35
|
"@aws-cdk/aws-appsync": "~1.124.0",
|
|
@@ -57,8 +57,8 @@
|
|
|
57
57
|
"@aws-cdk/region-info": "~1.124.0",
|
|
58
58
|
"constructs": "^3.3.125",
|
|
59
59
|
"graphql": "^14.5.8",
|
|
60
|
-
"graphql-mapping-template": "4.
|
|
61
|
-
"graphql-transformer-common": "4.
|
|
60
|
+
"graphql-mapping-template": "4.20.1",
|
|
61
|
+
"graphql-transformer-common": "4.22.2",
|
|
62
62
|
"lodash": "^4.17.21",
|
|
63
63
|
"md5": "^2.3.0"
|
|
64
64
|
},
|
|
@@ -83,5 +83,5 @@
|
|
|
83
83
|
],
|
|
84
84
|
"collectCoverage": true
|
|
85
85
|
},
|
|
86
|
-
"gitHead": "
|
|
86
|
+
"gitHead": "efc99baf0d9f5695210275865cd78a5cd9097ca7"
|
|
87
87
|
}
|
|
@@ -13303,7 +13303,7 @@ $util.toJson($UpdateItem)
|
|
|
13303
13303
|
## [End] Mutation Update resolver. **"
|
|
13304
13304
|
`;
|
|
13305
13305
|
|
|
13306
|
-
exports[`ModelTransformer: should support timestamp parameters when generating
|
|
13306
|
+
exports[`ModelTransformer: should support timestamp parameters when generating resolvers and output schema 1`] = `
|
|
13307
13307
|
"
|
|
13308
13308
|
type Post {
|
|
13309
13309
|
id: ID!
|
|
@@ -13457,7 +13457,7 @@ type Subscription {
|
|
|
13457
13457
|
"
|
|
13458
13458
|
`;
|
|
13459
13459
|
|
|
13460
|
-
exports[`ModelTransformer: should support timestamp parameters when generating
|
|
13460
|
+
exports[`ModelTransformer: should support timestamp parameters when generating resolvers and output schema 2`] = `
|
|
13461
13461
|
"## [Start] Create Request template. **
|
|
13462
13462
|
## Set the default values to put request **
|
|
13463
13463
|
#set( $mergedValues = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
|
|
@@ -13525,7 +13525,7 @@ $util.toJson($PutObject)
|
|
|
13525
13525
|
## [End] Create Request template. **"
|
|
13526
13526
|
`;
|
|
13527
13527
|
|
|
13528
|
-
exports[`ModelTransformer: should support timestamp parameters when generating
|
|
13528
|
+
exports[`ModelTransformer: should support timestamp parameters when generating resolvers and output schema 3`] = `
|
|
13529
13529
|
"## [Start] Mutation Update resolver. **
|
|
13530
13530
|
## Set the default values to put request **
|
|
13531
13531
|
#set( $mergedValues = $util.defaultIfNull($ctx.stash.defaultValues, {}) )
|
|
@@ -13656,3 +13656,51 @@ $util.qr($update.put(\\"expression\\", \\"$expression\\"))
|
|
|
13656
13656
|
$util.toJson($UpdateItem)
|
|
13657
13657
|
## [End] Mutation Update resolver. **"
|
|
13658
13658
|
`;
|
|
13659
|
+
|
|
13660
|
+
exports[`ModelTransformer: the datastore table should be configured 1`] = `
|
|
13661
|
+
"## [Start] Sync Request template. **
|
|
13662
|
+
#if( !$util.isNullOrEmpty($ctx.stash.authFilter) )
|
|
13663
|
+
#set( $filter = $ctx.stash.authFilter )
|
|
13664
|
+
#if( !$util.isNullOrEmpty($ctx.args.filter) )
|
|
13665
|
+
#set( $filter = {
|
|
13666
|
+
\\"and\\": [$filter, $ctx.args.filter]
|
|
13667
|
+
} )
|
|
13668
|
+
#end
|
|
13669
|
+
#else
|
|
13670
|
+
#if( !$util.isNullOrEmpty($ctx.args.filter) )
|
|
13671
|
+
#set( $filter = $ctx.args.filter )
|
|
13672
|
+
#end
|
|
13673
|
+
#end
|
|
13674
|
+
#if( !$util.isNullOrEmpty($filter) )
|
|
13675
|
+
#set( $filterExpression = $util.parseJson($util.transform.toDynamoDBFilterExpression($filter)) )
|
|
13676
|
+
#if( !$util.isNullOrBlank($filterExpression.expression) )
|
|
13677
|
+
#if( $filterEpression.expressionValues.size() == 0 )
|
|
13678
|
+
$util.qr($filterEpression.remove(\\"expressionValues\\"))
|
|
13679
|
+
#end
|
|
13680
|
+
#set( $filter = $filterExpression )
|
|
13681
|
+
#end
|
|
13682
|
+
#end
|
|
13683
|
+
{
|
|
13684
|
+
\\"version\\": \\"2018-05-29\\",
|
|
13685
|
+
\\"operation\\": \\"Sync\\",
|
|
13686
|
+
\\"filter\\": #if( $filter )
|
|
13687
|
+
$util.toJson($filter)
|
|
13688
|
+
#else
|
|
13689
|
+
null
|
|
13690
|
+
#end,
|
|
13691
|
+
\\"limit\\": $util.defaultIfNull($ctx.args.limit, 100),
|
|
13692
|
+
\\"lastSync\\": $util.toJson($util.defaultIfNull($ctx.args.lastSync, null)),
|
|
13693
|
+
\\"nextToken\\": $util.toJson($util.defaultIfNull($ctx.args.nextToken, null))
|
|
13694
|
+
}
|
|
13695
|
+
## [End] Sync Request template. **"
|
|
13696
|
+
`;
|
|
13697
|
+
|
|
13698
|
+
exports[`ModelTransformer: the datastore table should be configured 2`] = `
|
|
13699
|
+
"## [Start] ResponseTemplate. **
|
|
13700
|
+
#if( $ctx.error )
|
|
13701
|
+
$util.error($ctx.error.message, $ctx.error.type, $ctx.result)
|
|
13702
|
+
#else
|
|
13703
|
+
$util.toJson($ctx.result)
|
|
13704
|
+
#end
|
|
13705
|
+
## [End] ResponseTemplate. **"
|
|
13706
|
+
`;
|
|
@@ -411,7 +411,7 @@ describe('ModelTransformer: ', () => {
|
|
|
411
411
|
expect(defaultIdField).toBeDefined();
|
|
412
412
|
expect(getBaseType(defaultIdField.type)).toEqual('Int');
|
|
413
413
|
// It should not add default value for ctx.arg.id as id is of type Int
|
|
414
|
-
expect(result.
|
|
414
|
+
expect(result.resolvers['Mutation.createPost.req.vtl']).toMatchSnapshot();
|
|
415
415
|
});
|
|
416
416
|
|
|
417
417
|
it('should generate only create mutation', () => {
|
|
@@ -670,7 +670,7 @@ describe('ModelTransformer: ', () => {
|
|
|
670
670
|
validateModelSchema(schema);
|
|
671
671
|
});
|
|
672
672
|
|
|
673
|
-
it('should support timestamp parameters when generating
|
|
673
|
+
it('should support timestamp parameters when generating resolvers and output schema', () => {
|
|
674
674
|
const validSchema = `
|
|
675
675
|
type Post @model(timestamps: { createdAt: "createdOn", updatedAt: "updatedOn"}) {
|
|
676
676
|
id: ID!
|
|
@@ -688,8 +688,8 @@ describe('ModelTransformer: ', () => {
|
|
|
688
688
|
const schema = parse(result.schema);
|
|
689
689
|
validateModelSchema(schema);
|
|
690
690
|
|
|
691
|
-
expect(result.
|
|
692
|
-
expect(result.
|
|
691
|
+
expect(result.resolvers['Mutation.createPost.req.vtl']).toMatchSnapshot();
|
|
692
|
+
expect(result.resolvers['Mutation.updatePost.req.vtl']).toMatchSnapshot();
|
|
693
693
|
});
|
|
694
694
|
|
|
695
695
|
it('should not to auto generate createdAt and updatedAt when the type in schema is not AWSDateTime', () => {
|
|
@@ -712,8 +712,8 @@ describe('ModelTransformer: ', () => {
|
|
|
712
712
|
const schema = parse(result.schema);
|
|
713
713
|
validateModelSchema(schema);
|
|
714
714
|
|
|
715
|
-
expect(result.
|
|
716
|
-
expect(result.
|
|
715
|
+
expect(result.resolvers['Mutation.createPost.req.vtl']).toMatchSnapshot();
|
|
716
|
+
expect(result.resolvers['Mutation.updatePost.req.vtl']).toMatchSnapshot();
|
|
717
717
|
});
|
|
718
718
|
|
|
719
719
|
it('should have timestamps as nullable fields when the type makes it non-nullable', () => {
|
|
@@ -737,8 +737,8 @@ describe('ModelTransformer: ', () => {
|
|
|
737
737
|
const schema = parse(result.schema);
|
|
738
738
|
validateModelSchema(schema);
|
|
739
739
|
|
|
740
|
-
expect(result.
|
|
741
|
-
expect(result.
|
|
740
|
+
expect(result.resolvers['Mutation.createPost.req.vtl']).toMatchSnapshot();
|
|
741
|
+
expect(result.resolvers['Mutation.updatePost.req.vtl']).toMatchSnapshot();
|
|
742
742
|
});
|
|
743
743
|
|
|
744
744
|
it('should not to include createdAt and updatedAt field when timestamps is set to null', () => {
|
|
@@ -759,8 +759,8 @@ describe('ModelTransformer: ', () => {
|
|
|
759
759
|
const schema = parse(result.schema);
|
|
760
760
|
validateModelSchema(schema);
|
|
761
761
|
|
|
762
|
-
expect(result.
|
|
763
|
-
expect(result.
|
|
762
|
+
expect(result.resolvers['Mutation.createPost.req.vtl']).toMatchSnapshot();
|
|
763
|
+
expect(result.resolvers['Mutation.updatePost.req.vtl']).toMatchSnapshot();
|
|
764
764
|
});
|
|
765
765
|
|
|
766
766
|
it('should filter known input types from create and update input fields', () => {
|
|
@@ -908,7 +908,7 @@ describe('ModelTransformer: ', () => {
|
|
|
908
908
|
|
|
909
909
|
const definition = out.schema;
|
|
910
910
|
expect(definition).toBeDefined();
|
|
911
|
-
expect(out.
|
|
911
|
+
expect(out.resolvers).toMatchSnapshot();
|
|
912
912
|
|
|
913
913
|
validateModelSchema(parse(definition));
|
|
914
914
|
});
|
|
@@ -945,7 +945,7 @@ describe('ModelTransformer: ', () => {
|
|
|
945
945
|
|
|
946
946
|
const definition = out.schema;
|
|
947
947
|
expect(definition).toBeDefined();
|
|
948
|
-
expect(out.
|
|
948
|
+
expect(out.resolvers).toMatchSnapshot();
|
|
949
949
|
|
|
950
950
|
validateModelSchema(parse(definition));
|
|
951
951
|
});
|
|
@@ -979,7 +979,7 @@ describe('ModelTransformer: ', () => {
|
|
|
979
979
|
|
|
980
980
|
const definition = out.schema;
|
|
981
981
|
expect(definition).toBeDefined();
|
|
982
|
-
expect(out.
|
|
982
|
+
expect(out.resolvers).toMatchSnapshot();
|
|
983
983
|
|
|
984
984
|
validateModelSchema(parse(definition));
|
|
985
985
|
});
|
|
@@ -1089,4 +1089,185 @@ describe('ModelTransformer: ', () => {
|
|
|
1089
1089
|
|
|
1090
1090
|
expectFieldsOnInputType(updateTodoInput!, ['name']);
|
|
1091
1091
|
});
|
|
1092
|
+
it('the datastore table should be configured', () => {
|
|
1093
|
+
const validSchema = `
|
|
1094
|
+
type Todo @model {
|
|
1095
|
+
name: String
|
|
1096
|
+
}`;
|
|
1097
|
+
|
|
1098
|
+
const transformer = new GraphQLTransform({
|
|
1099
|
+
transformConfig: {
|
|
1100
|
+
ResolverConfig: {
|
|
1101
|
+
project: {
|
|
1102
|
+
ConflictDetection: 'VERSION',
|
|
1103
|
+
ConflictHandler: ConflictHandlerType.AUTOMERGE,
|
|
1104
|
+
},
|
|
1105
|
+
},
|
|
1106
|
+
},
|
|
1107
|
+
sandboxModeEnabled: true,
|
|
1108
|
+
transformers: [new ModelTransformer()],
|
|
1109
|
+
});
|
|
1110
|
+
const out = transformer.transform(validSchema);
|
|
1111
|
+
expect(out).toBeDefined();
|
|
1112
|
+
const schema = parse(out.schema);
|
|
1113
|
+
validateModelSchema(schema);
|
|
1114
|
+
// sync operation
|
|
1115
|
+
const queryObject = getObjectType(schema, 'Query');
|
|
1116
|
+
expectFields(queryObject!, ['syncTodos']);
|
|
1117
|
+
// sync resolvers
|
|
1118
|
+
expect(out.resolvers['Query.syncTodos.req.vtl']).toMatchSnapshot();
|
|
1119
|
+
expect(out.resolvers['Query.syncTodos.res.vtl']).toMatchSnapshot();
|
|
1120
|
+
// ds table
|
|
1121
|
+
cdkExpect(out.rootStack).to(
|
|
1122
|
+
haveResource('AWS::DynamoDB::Table', {
|
|
1123
|
+
KeySchema: [
|
|
1124
|
+
{
|
|
1125
|
+
AttributeName: 'ds_pk',
|
|
1126
|
+
KeyType: 'HASH',
|
|
1127
|
+
},
|
|
1128
|
+
{
|
|
1129
|
+
AttributeName: 'ds_sk',
|
|
1130
|
+
KeyType: 'RANGE',
|
|
1131
|
+
},
|
|
1132
|
+
],
|
|
1133
|
+
AttributeDefinitions: [
|
|
1134
|
+
{
|
|
1135
|
+
AttributeName: 'ds_pk',
|
|
1136
|
+
AttributeType: 'S',
|
|
1137
|
+
},
|
|
1138
|
+
{
|
|
1139
|
+
AttributeName: 'ds_sk',
|
|
1140
|
+
AttributeType: 'S',
|
|
1141
|
+
},
|
|
1142
|
+
],
|
|
1143
|
+
BillingMode: 'PAY_PER_REQUEST',
|
|
1144
|
+
StreamSpecification: {
|
|
1145
|
+
StreamViewType: 'NEW_AND_OLD_IMAGES',
|
|
1146
|
+
},
|
|
1147
|
+
TableName: {
|
|
1148
|
+
'Fn::Join': [
|
|
1149
|
+
'',
|
|
1150
|
+
[
|
|
1151
|
+
'AmplifyDataStore-',
|
|
1152
|
+
{
|
|
1153
|
+
'Fn::GetAtt': ['GraphQLAPI', 'ApiId'],
|
|
1154
|
+
},
|
|
1155
|
+
'-',
|
|
1156
|
+
{
|
|
1157
|
+
Ref: 'env',
|
|
1158
|
+
},
|
|
1159
|
+
],
|
|
1160
|
+
],
|
|
1161
|
+
},
|
|
1162
|
+
TimeToLiveSpecification: {
|
|
1163
|
+
AttributeName: '_ttl',
|
|
1164
|
+
Enabled: true,
|
|
1165
|
+
},
|
|
1166
|
+
}),
|
|
1167
|
+
);
|
|
1168
|
+
});
|
|
1169
|
+
|
|
1170
|
+
it('should add the model parameters at the root sack', () => {
|
|
1171
|
+
const modelParams = {
|
|
1172
|
+
DynamoDBModelTableReadIOPS: expect.objectContaining({
|
|
1173
|
+
Type: 'Number',
|
|
1174
|
+
Default: 5,
|
|
1175
|
+
Description: 'The number of read IOPS the table should support.',
|
|
1176
|
+
}),
|
|
1177
|
+
DynamoDBModelTableWriteIOPS: expect.objectContaining({
|
|
1178
|
+
Type: 'Number',
|
|
1179
|
+
Default: 5,
|
|
1180
|
+
Description: 'The number of write IOPS the table should support.',
|
|
1181
|
+
}),
|
|
1182
|
+
DynamoDBBillingMode: expect.objectContaining({
|
|
1183
|
+
Type: 'String',
|
|
1184
|
+
Default: 'PAY_PER_REQUEST',
|
|
1185
|
+
AllowedValues: ['PAY_PER_REQUEST', 'PROVISIONED'],
|
|
1186
|
+
Description: 'Configure @model types to create DynamoDB tables with PAY_PER_REQUEST or PROVISIONED billing modes.',
|
|
1187
|
+
}),
|
|
1188
|
+
DynamoDBEnablePointInTimeRecovery: expect.objectContaining({
|
|
1189
|
+
Type: 'String',
|
|
1190
|
+
Default: 'false',
|
|
1191
|
+
AllowedValues: ['true', 'false'],
|
|
1192
|
+
Description: 'Whether to enable Point in Time Recovery on the table.',
|
|
1193
|
+
}),
|
|
1194
|
+
DynamoDBEnableServerSideEncryption: expect.objectContaining({
|
|
1195
|
+
Type: 'String',
|
|
1196
|
+
Default: 'true',
|
|
1197
|
+
AllowedValues: ['true', 'false'],
|
|
1198
|
+
Description: 'Enable server side encryption powered by KMS.',
|
|
1199
|
+
}),
|
|
1200
|
+
};
|
|
1201
|
+
const validSchema = `type Todo @model {
|
|
1202
|
+
name: String
|
|
1203
|
+
}`;
|
|
1204
|
+
const transformer = new GraphQLTransform({
|
|
1205
|
+
sandboxModeEnabled: true,
|
|
1206
|
+
transformers: [new ModelTransformer()],
|
|
1207
|
+
});
|
|
1208
|
+
const out = transformer.transform(validSchema);
|
|
1209
|
+
|
|
1210
|
+
const rootStack = out.rootStack;
|
|
1211
|
+
expect(rootStack).toBeDefined();
|
|
1212
|
+
expect(rootStack.Parameters).toMatchObject(modelParams);
|
|
1213
|
+
|
|
1214
|
+
const todoStack = out.stacks['Todo'];
|
|
1215
|
+
expect(todoStack).toBeDefined();
|
|
1216
|
+
expect(todoStack.Parameters).toMatchObject(modelParams);
|
|
1217
|
+
});
|
|
1218
|
+
|
|
1219
|
+
it('global auth enabled should add apiKey if not default mode of auth', () => {
|
|
1220
|
+
const validSchema = `
|
|
1221
|
+
type Post @model {
|
|
1222
|
+
id: ID!
|
|
1223
|
+
title: String!
|
|
1224
|
+
tags: [Tag]
|
|
1225
|
+
}
|
|
1226
|
+
|
|
1227
|
+
type Tag {
|
|
1228
|
+
id: ID
|
|
1229
|
+
tags: [Tag]
|
|
1230
|
+
}`;
|
|
1231
|
+
const transformer = new GraphQLTransform({
|
|
1232
|
+
authConfig: {
|
|
1233
|
+
defaultAuthentication: {
|
|
1234
|
+
authenticationType: 'AMAZON_COGNITO_USER_POOLS',
|
|
1235
|
+
},
|
|
1236
|
+
additionalAuthenticationProviders: [
|
|
1237
|
+
{
|
|
1238
|
+
authenticationType: 'API_KEY',
|
|
1239
|
+
},
|
|
1240
|
+
],
|
|
1241
|
+
},
|
|
1242
|
+
sandboxModeEnabled: true,
|
|
1243
|
+
transformers: [new ModelTransformer()],
|
|
1244
|
+
});
|
|
1245
|
+
const out = transformer.transform(validSchema);
|
|
1246
|
+
expect(out).toBeDefined();
|
|
1247
|
+
|
|
1248
|
+
const schema = parse(out.schema);
|
|
1249
|
+
validateModelSchema(schema);
|
|
1250
|
+
|
|
1251
|
+
const postType = getObjectType(schema, 'Post')!;
|
|
1252
|
+
expect(postType).toBeDefined();
|
|
1253
|
+
expect(postType.directives).toBeDefined();
|
|
1254
|
+
expect(postType.directives!.some(dir => dir.name.value === 'aws_api_key')).toEqual(true);
|
|
1255
|
+
|
|
1256
|
+
const tagType = getObjectType(schema, 'Tag')!;
|
|
1257
|
+
expect(tagType).toBeDefined();
|
|
1258
|
+
expect(tagType.directives).toBeDefined();
|
|
1259
|
+
expect(tagType.directives!.some(dir => dir.name.value === 'aws_api_key')).toEqual(true);
|
|
1260
|
+
|
|
1261
|
+
// check operations
|
|
1262
|
+
const queryType = getObjectType(schema, 'Query')!;
|
|
1263
|
+
expect(queryType).toBeDefined();
|
|
1264
|
+
const mutationType = getObjectType(schema, 'Mutation')!;
|
|
1265
|
+
expect(mutationType).toBeDefined();
|
|
1266
|
+
const subscriptionType = getObjectType(schema, 'Subscription')!;
|
|
1267
|
+
expect(subscriptionType).toBeDefined();
|
|
1268
|
+
|
|
1269
|
+
for (const field of [...queryType.fields!, ...mutationType.fields!, ...subscriptionType.fields!]) {
|
|
1270
|
+
expect(field.directives!.some(dir => dir.name.value === 'aws_api_key')).toEqual(true);
|
|
1271
|
+
}
|
|
1272
|
+
});
|
|
1092
1273
|
});
|
package/src/definitions.ts
CHANGED
|
@@ -14,3 +14,5 @@ export const BOOLEAN_FUNCTIONS = new Set<string>(['attributeExists', 'attributeT
|
|
|
14
14
|
export const ATTRIBUTE_TYPES = ['binary', 'binarySet', 'bool', 'list', 'map', 'number', 'numberSet', 'string', 'stringSet', '_null'];
|
|
15
15
|
|
|
16
16
|
export const OPERATION_KEY = '__operation';
|
|
17
|
+
|
|
18
|
+
export const API_KEY_DIRECTIVE = 'aws_api_key';
|