@aws-amplify/graphql-model-transformer 0.8.0-beta.0 → 0.8.0-beta.1
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 +12 -0
- package/lib/graphql-model-transformer.d.ts +13 -9
- package/lib/graphql-model-transformer.d.ts.map +1 -1
- package/lib/graphql-model-transformer.js +48 -28
- package/lib/graphql-model-transformer.js.map +1 -1
- package/lib/graphql-types/mutation.d.ts.map +1 -1
- package/lib/graphql-types/mutation.js +2 -5
- package/lib/graphql-types/mutation.js.map +1 -1
- package/lib/wrappers/object-definition-wrapper.d.ts +2 -15
- package/lib/wrappers/object-definition-wrapper.d.ts.map +1 -1
- package/lib/wrappers/object-definition-wrapper.js +6 -42
- package/lib/wrappers/object-definition-wrapper.js.map +1 -1
- package/package.json +4 -4
- package/src/__tests__/model-transformer.test.ts +33 -0
- package/src/graphql-model-transformer.ts +83 -20
- package/src/graphql-types/mutation.ts +2 -4
- package/src/wrappers/object-definition-wrapper.ts +1 -51
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object-definition-wrapper.d.ts","sourceRoot":"","sources":["../../src/wrappers/object-definition-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"object-definition-wrapper.d.ts","sourceRoot":"","sources":["../../src/wrappers/object-definition-wrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,45 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.EnumWrapper = exports.InputObjectDefinitionWrapper = exports.ObjectDefinitionWrapper = exports.FieldWrapper = exports.InputFieldWrapper = exports.GenericFieldWrapper =
|
|
3
|
+
exports.EnumWrapper = exports.InputObjectDefinitionWrapper = exports.ObjectDefinitionWrapper = exports.FieldWrapper = exports.InputFieldWrapper = exports.GenericFieldWrapper = void 0;
|
|
4
|
+
const graphql_transformer_core_1 = require("@aws-amplify/graphql-transformer-core");
|
|
4
5
|
const graphql_1 = require("graphql");
|
|
5
6
|
const graphql_transformer_common_1 = require("graphql-transformer-common");
|
|
6
|
-
class ArgumentWrapper {
|
|
7
|
-
constructor(argument) {
|
|
8
|
-
this.serialize = () => {
|
|
9
|
-
return {
|
|
10
|
-
kind: 'Argument',
|
|
11
|
-
name: this.name,
|
|
12
|
-
value: this.value,
|
|
13
|
-
};
|
|
14
|
-
};
|
|
15
|
-
this.name = argument.name;
|
|
16
|
-
this.value = argument.value;
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
exports.ArgumentWrapper = ArgumentWrapper;
|
|
20
|
-
class DirectiveWrapper {
|
|
21
|
-
constructor(node) {
|
|
22
|
-
this.arguments = [];
|
|
23
|
-
this.serialize = () => {
|
|
24
|
-
return {
|
|
25
|
-
kind: 'Directive',
|
|
26
|
-
name: this.name,
|
|
27
|
-
arguments: this.arguments.map(arg => arg.serialize()),
|
|
28
|
-
};
|
|
29
|
-
};
|
|
30
|
-
this.getArguments = (defaultValue) => {
|
|
31
|
-
const argValues = this.arguments.reduce((acc, arg) => ({
|
|
32
|
-
...acc,
|
|
33
|
-
[arg.name.value]: graphql_1.valueFromASTUntyped(arg.value),
|
|
34
|
-
}), {});
|
|
35
|
-
return Object.assign(defaultValue, argValues);
|
|
36
|
-
};
|
|
37
|
-
this.name = node.name;
|
|
38
|
-
this.arguments = (node.arguments || []).map(arg => new ArgumentWrapper(arg));
|
|
39
|
-
this.location = this.location;
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
exports.DirectiveWrapper = DirectiveWrapper;
|
|
43
7
|
class GenericFieldWrapper {
|
|
44
8
|
constructor(field) {
|
|
45
9
|
this.isList = () => {
|
|
@@ -103,7 +67,7 @@ class GenericFieldWrapper {
|
|
|
103
67
|
this.type = field.type;
|
|
104
68
|
this.name = field.name.value;
|
|
105
69
|
this.loc = field.loc;
|
|
106
|
-
this.directives = (field.directives || []).map(d => new DirectiveWrapper(d));
|
|
70
|
+
this.directives = (field.directives || []).map(d => new graphql_transformer_core_1.DirectiveWrapper(d));
|
|
107
71
|
}
|
|
108
72
|
}
|
|
109
73
|
exports.GenericFieldWrapper = GenericFieldWrapper;
|
|
@@ -255,7 +219,7 @@ class ObjectDefinitionWrapper {
|
|
|
255
219
|
const index = this.fields.indexOf(field);
|
|
256
220
|
this.fields.splice(index, 1);
|
|
257
221
|
};
|
|
258
|
-
this.directives = (node.directives || []).map(d => new DirectiveWrapper(d));
|
|
222
|
+
this.directives = (node.directives || []).map(d => new graphql_transformer_core_1.DirectiveWrapper(d));
|
|
259
223
|
this.fields = (node.fields || []).map(f => new FieldWrapper(f));
|
|
260
224
|
this.name = node.name.value;
|
|
261
225
|
}
|
|
@@ -307,7 +271,7 @@ class InputObjectDefinitionWrapper {
|
|
|
307
271
|
const index = this.fields.indexOf(field);
|
|
308
272
|
this.fields.splice(index, 1);
|
|
309
273
|
};
|
|
310
|
-
this.directives = (node.directives || []).map(d => new DirectiveWrapper(d));
|
|
274
|
+
this.directives = (node.directives || []).map(d => new graphql_transformer_core_1.DirectiveWrapper(d));
|
|
311
275
|
this.fields = (node.fields || []).map(f => new InputFieldWrapper(f));
|
|
312
276
|
this.name = node.name.value;
|
|
313
277
|
}
|
|
@@ -369,7 +333,7 @@ class EnumWrapper {
|
|
|
369
333
|
};
|
|
370
334
|
this.name = node.name.value;
|
|
371
335
|
this.values = ((_a = node.values) === null || _a === void 0 ? void 0 : _a.map(v => v.name.value)) || [];
|
|
372
|
-
this.directives = (node.directives || []).map(d => new DirectiveWrapper(d));
|
|
336
|
+
this.directives = (node.directives || []).map(d => new graphql_transformer_core_1.DirectiveWrapper(d));
|
|
373
337
|
}
|
|
374
338
|
}
|
|
375
339
|
exports.EnumWrapper = EnumWrapper;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object-definition-wrapper.js","sourceRoot":"","sources":["../../src/wrappers/object-definition-wrapper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"object-definition-wrapper.js","sourceRoot":"","sources":["../../src/wrappers/object-definition-wrapper.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.8.0-beta.
|
|
3
|
+
"version": "0.8.0-beta.1",
|
|
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.11.1-beta.
|
|
31
|
+
"@aws-amplify/graphql-transformer-core": "0.11.0-beta.0",
|
|
32
|
+
"@aws-amplify/graphql-transformer-interfaces": "1.11.1-beta.1",
|
|
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",
|
|
@@ -83,5 +83,5 @@
|
|
|
83
83
|
],
|
|
84
84
|
"collectCoverage": true
|
|
85
85
|
},
|
|
86
|
-
"gitHead": "
|
|
86
|
+
"gitHead": "a035b6d07ee15dff6dc4ea641ccd59a2eb0caf0d"
|
|
87
87
|
}
|
|
@@ -1056,4 +1056,37 @@ describe('ModelTransformer: ', () => {
|
|
|
1056
1056
|
|
|
1057
1057
|
validateModelSchema(parsed);
|
|
1058
1058
|
});
|
|
1059
|
+
|
|
1060
|
+
it('should generate the ID field when not specified', () => {
|
|
1061
|
+
const validSchema = `type Todo @model {
|
|
1062
|
+
name: String
|
|
1063
|
+
}`;
|
|
1064
|
+
|
|
1065
|
+
const transformer = new GraphQLTransform({
|
|
1066
|
+
transformers: [new ModelTransformer()],
|
|
1067
|
+
});
|
|
1068
|
+
|
|
1069
|
+
const out = transformer.transform(validSchema);
|
|
1070
|
+
expect(out).toBeDefined();
|
|
1071
|
+
|
|
1072
|
+
const definition = out.schema;
|
|
1073
|
+
expect(definition).toBeDefined();
|
|
1074
|
+
|
|
1075
|
+
const parsed = parse(definition);
|
|
1076
|
+
validateModelSchema(parsed);
|
|
1077
|
+
|
|
1078
|
+
const createTodoInput = getInputType(parsed, 'CreateTodoInput');
|
|
1079
|
+
expect(createTodoInput).toBeDefined();
|
|
1080
|
+
|
|
1081
|
+
expectFieldsOnInputType(createTodoInput!, ['id', 'name']);
|
|
1082
|
+
|
|
1083
|
+
const idField = createTodoInput!.fields!.find(f => f.name.value === 'id');
|
|
1084
|
+
expect((idField!.type as NamedTypeNode).name!.value).toEqual('ID');
|
|
1085
|
+
expect((idField!.type as NamedTypeNode).kind).toEqual('NamedType');
|
|
1086
|
+
|
|
1087
|
+
const updateTodoInput = getInputType(parsed, 'UpdateTodoInput');
|
|
1088
|
+
expect(updateTodoInput).toBeDefined();
|
|
1089
|
+
|
|
1090
|
+
expectFieldsOnInputType(updateTodoInput!, ['name']);
|
|
1091
|
+
});
|
|
1059
1092
|
});
|
|
@@ -1,4 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
DirectiveWrapper,
|
|
3
|
+
InvalidDirectiveError,
|
|
4
|
+
MappingTemplate,
|
|
5
|
+
SyncConfig,
|
|
6
|
+
SyncUtils,
|
|
7
|
+
TransformerModelBase,
|
|
8
|
+
} from '@aws-amplify/graphql-transformer-core';
|
|
2
9
|
import {
|
|
3
10
|
AppSyncDataSourceType,
|
|
4
11
|
DataSourceInstance,
|
|
@@ -37,6 +44,7 @@ import {
|
|
|
37
44
|
makeValueNode,
|
|
38
45
|
ModelResourceIDs,
|
|
39
46
|
plurality,
|
|
47
|
+
ResolverResourceIDs,
|
|
40
48
|
ResourceConstants,
|
|
41
49
|
SyncResourceIDs,
|
|
42
50
|
toCamelCase,
|
|
@@ -71,12 +79,7 @@ import {
|
|
|
71
79
|
generateListRequestTemplate,
|
|
72
80
|
generateSyncRequestTemplate,
|
|
73
81
|
} from './resolvers/query';
|
|
74
|
-
import {
|
|
75
|
-
DirectiveWrapper,
|
|
76
|
-
FieldWrapper,
|
|
77
|
-
InputObjectDefinitionWrapper,
|
|
78
|
-
ObjectDefinitionWrapper,
|
|
79
|
-
} from './wrappers/object-definition-wrapper';
|
|
82
|
+
import { FieldWrapper, InputObjectDefinitionWrapper, ObjectDefinitionWrapper } from './wrappers/object-definition-wrapper';
|
|
80
83
|
import { CfnRole } from '@aws-cdk/aws-iam';
|
|
81
84
|
import md5 from 'md5';
|
|
82
85
|
|
|
@@ -260,13 +263,13 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
260
263
|
let resolver;
|
|
261
264
|
switch (query.type) {
|
|
262
265
|
case QueryFieldType.GET:
|
|
263
|
-
resolver = this.generateGetResolver(context, def!, query.typeName, query.fieldName);
|
|
266
|
+
resolver = this.generateGetResolver(context, def!, query.typeName, query.fieldName, query.resolverLogicalId);
|
|
264
267
|
break;
|
|
265
268
|
case QueryFieldType.LIST:
|
|
266
|
-
resolver = this.generateListResolver(context, def!, query.typeName, query.fieldName);
|
|
269
|
+
resolver = this.generateListResolver(context, def!, query.typeName, query.fieldName, query.resolverLogicalId);
|
|
267
270
|
break;
|
|
268
271
|
case QueryFieldType.SYNC:
|
|
269
|
-
resolver = this.generateSyncResolver(context, def!, query.typeName, query.fieldName);
|
|
272
|
+
resolver = this.generateSyncResolver(context, def!, query.typeName, query.fieldName, query.resolverLogicalId);
|
|
270
273
|
break;
|
|
271
274
|
default:
|
|
272
275
|
throw new Error('Unknown query field type');
|
|
@@ -287,13 +290,13 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
287
290
|
let resolver;
|
|
288
291
|
switch (mutation.type) {
|
|
289
292
|
case MutationFieldType.CREATE:
|
|
290
|
-
resolver = this.generateCreateResolver(context, def!, mutation.typeName, mutation.fieldName);
|
|
293
|
+
resolver = this.generateCreateResolver(context, def!, mutation.typeName, mutation.fieldName, mutation.resolverLogicalId);
|
|
291
294
|
break;
|
|
292
295
|
case MutationFieldType.DELETE:
|
|
293
|
-
resolver = this.generateDeleteResolver(context, def!, mutation.typeName, mutation.fieldName);
|
|
296
|
+
resolver = this.generateDeleteResolver(context, def!, mutation.typeName, mutation.fieldName, mutation.resolverLogicalId);
|
|
294
297
|
break;
|
|
295
298
|
case MutationFieldType.UPDATE:
|
|
296
|
-
resolver = this.generateUpdateResolver(context, def!, mutation.typeName, mutation.fieldName);
|
|
299
|
+
resolver = this.generateUpdateResolver(context, def!, mutation.typeName, mutation.fieldName, mutation.resolverLogicalId);
|
|
297
300
|
break;
|
|
298
301
|
default:
|
|
299
302
|
throw new Error('Unknown mutation field type');
|
|
@@ -317,13 +320,31 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
317
320
|
let resolver;
|
|
318
321
|
switch (subscription.type) {
|
|
319
322
|
case SubscriptionFieldType.ON_CREATE:
|
|
320
|
-
resolver = this.generateOnCreateResolver(
|
|
323
|
+
resolver = this.generateOnCreateResolver(
|
|
324
|
+
context,
|
|
325
|
+
def,
|
|
326
|
+
subscription.typeName,
|
|
327
|
+
subscription.fieldName,
|
|
328
|
+
subscription.resolverLogicalId,
|
|
329
|
+
);
|
|
321
330
|
break;
|
|
322
331
|
case SubscriptionFieldType.ON_UPDATE:
|
|
323
|
-
resolver = this.generateOnUpdateResolver(
|
|
332
|
+
resolver = this.generateOnUpdateResolver(
|
|
333
|
+
context,
|
|
334
|
+
def,
|
|
335
|
+
subscription.typeName,
|
|
336
|
+
subscription.fieldName,
|
|
337
|
+
subscription.resolverLogicalId,
|
|
338
|
+
);
|
|
324
339
|
break;
|
|
325
340
|
case SubscriptionFieldType.ON_DELETE:
|
|
326
|
-
resolver = this.generateOnDeleteResolver(
|
|
341
|
+
resolver = this.generateOnDeleteResolver(
|
|
342
|
+
context,
|
|
343
|
+
def,
|
|
344
|
+
subscription.typeName,
|
|
345
|
+
subscription.fieldName,
|
|
346
|
+
subscription.resolverLogicalId,
|
|
347
|
+
);
|
|
327
348
|
break;
|
|
328
349
|
default:
|
|
329
350
|
throw new Error('Unknown subscription field type');
|
|
@@ -347,6 +368,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
347
368
|
type: ObjectTypeDefinitionNode,
|
|
348
369
|
typeName: string,
|
|
349
370
|
fieldName: string,
|
|
371
|
+
resolverLogicalId: string,
|
|
350
372
|
): TransformerResolverProvider => {
|
|
351
373
|
const isSyncEnabled = ctx.isProjectUsingDataStore();
|
|
352
374
|
const dataSource = this.datasourceMap[type.name.value];
|
|
@@ -355,6 +377,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
355
377
|
this.resolverMap[resolverKey] = ctx.resolvers.generateQueryResolver(
|
|
356
378
|
typeName,
|
|
357
379
|
fieldName,
|
|
380
|
+
resolverLogicalId,
|
|
358
381
|
dataSource,
|
|
359
382
|
MappingTemplate.s3MappingTemplateFromString(generateGetRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
|
|
360
383
|
MappingTemplate.s3MappingTemplateFromString(generateGetResponseTemplate(isSyncEnabled), `${typeName}.${fieldName}.res.vtl`),
|
|
@@ -368,6 +391,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
368
391
|
type: ObjectTypeDefinitionNode,
|
|
369
392
|
typeName: string,
|
|
370
393
|
fieldName: string,
|
|
394
|
+
resolverLogicalId: string,
|
|
371
395
|
): TransformerResolverProvider => {
|
|
372
396
|
const isSyncEnabled = ctx.isProjectUsingDataStore();
|
|
373
397
|
const dataSource = this.datasourceMap[type.name.value];
|
|
@@ -376,6 +400,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
376
400
|
this.resolverMap[resolverKey] = ctx.resolvers.generateQueryResolver(
|
|
377
401
|
typeName,
|
|
378
402
|
fieldName,
|
|
403
|
+
resolverLogicalId,
|
|
379
404
|
dataSource,
|
|
380
405
|
MappingTemplate.s3MappingTemplateFromString(generateListRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
|
|
381
406
|
MappingTemplate.s3MappingTemplateFromString(
|
|
@@ -392,6 +417,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
392
417
|
type: ObjectTypeDefinitionNode,
|
|
393
418
|
typeName: string,
|
|
394
419
|
fieldName: string,
|
|
420
|
+
resolverLogicalId: string,
|
|
395
421
|
): TransformerResolverProvider => {
|
|
396
422
|
const isSyncEnabled = ctx.isProjectUsingDataStore();
|
|
397
423
|
const dataSource = this.datasourceMap[type.name.value];
|
|
@@ -400,6 +426,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
400
426
|
const resolver = ctx.resolvers.generateMutationResolver(
|
|
401
427
|
typeName,
|
|
402
428
|
fieldName,
|
|
429
|
+
resolverLogicalId,
|
|
403
430
|
dataSource,
|
|
404
431
|
MappingTemplate.s3MappingTemplateFromString(
|
|
405
432
|
generateUpdateRequestTemplate(typeName, isSyncEnabled),
|
|
@@ -427,6 +454,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
427
454
|
type: ObjectTypeDefinitionNode,
|
|
428
455
|
typeName: string,
|
|
429
456
|
fieldName: string,
|
|
457
|
+
resolverLogicalId: string,
|
|
430
458
|
): TransformerResolverProvider => {
|
|
431
459
|
const isSyncEnabled = ctx.isProjectUsingDataStore();
|
|
432
460
|
const dataSource = this.datasourceMap[type.name.value];
|
|
@@ -435,6 +463,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
435
463
|
this.resolverMap[resolverKey] = ctx.resolvers.generateMutationResolver(
|
|
436
464
|
typeName,
|
|
437
465
|
fieldName,
|
|
466
|
+
resolverLogicalId,
|
|
438
467
|
dataSource,
|
|
439
468
|
MappingTemplate.s3MappingTemplateFromString(generateDeleteRequestTemplate(isSyncEnabled), `${typeName}.${fieldName}.req.vtl`),
|
|
440
469
|
MappingTemplate.s3MappingTemplateFromString(
|
|
@@ -451,12 +480,14 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
451
480
|
type: ObjectTypeDefinitionNode,
|
|
452
481
|
typeName: string,
|
|
453
482
|
fieldName: string,
|
|
483
|
+
resolverLogicalId: string,
|
|
454
484
|
): TransformerResolverProvider => {
|
|
455
485
|
const resolverKey = `OnCreate${generateResolverKey(typeName, fieldName)}`;
|
|
456
486
|
if (!this.resolverMap[resolverKey]) {
|
|
457
487
|
this.resolverMap[resolverKey] = ctx.resolvers.generateSubscriptionResolver(
|
|
458
488
|
typeName,
|
|
459
489
|
fieldName,
|
|
490
|
+
resolverLogicalId,
|
|
460
491
|
MappingTemplate.s3MappingTemplateFromString(generateSubscriptionRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
|
|
461
492
|
MappingTemplate.s3MappingTemplateFromString(generateSubscriptionResponseTemplate(), `${typeName}.${fieldName}.res.vtl`),
|
|
462
493
|
);
|
|
@@ -468,12 +499,14 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
468
499
|
type: ObjectTypeDefinitionNode,
|
|
469
500
|
typeName: string,
|
|
470
501
|
fieldName: string,
|
|
502
|
+
resolverLogicalId: string,
|
|
471
503
|
): TransformerResolverProvider => {
|
|
472
504
|
const resolverKey = `OnUpdate${generateResolverKey(typeName, fieldName)}`;
|
|
473
505
|
if (!this.resolverMap[resolverKey]) {
|
|
474
506
|
this.resolverMap[resolverKey] = ctx.resolvers.generateSubscriptionResolver(
|
|
475
507
|
typeName,
|
|
476
508
|
fieldName,
|
|
509
|
+
resolverLogicalId,
|
|
477
510
|
MappingTemplate.s3MappingTemplateFromString(generateSubscriptionRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
|
|
478
511
|
MappingTemplate.s3MappingTemplateFromString(generateSubscriptionResponseTemplate(), `${typeName}.${fieldName}.res.vtl`),
|
|
479
512
|
);
|
|
@@ -485,12 +518,14 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
485
518
|
type: ObjectTypeDefinitionNode,
|
|
486
519
|
typeName: string,
|
|
487
520
|
fieldName: string,
|
|
521
|
+
resolverLogicalId: string,
|
|
488
522
|
): TransformerResolverProvider => {
|
|
489
523
|
const resolverKey = `OnDelete${generateResolverKey(typeName, fieldName)}`;
|
|
490
524
|
if (!this.resolverMap[resolverKey]) {
|
|
491
525
|
this.resolverMap[resolverKey] = ctx.resolvers.generateSubscriptionResolver(
|
|
492
526
|
typeName,
|
|
493
527
|
fieldName,
|
|
528
|
+
resolverLogicalId,
|
|
494
529
|
MappingTemplate.s3MappingTemplateFromString(generateSubscriptionRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
|
|
495
530
|
MappingTemplate.s3MappingTemplateFromString(generateSubscriptionResponseTemplate(), `${typeName}.${fieldName}.res.vtl`),
|
|
496
531
|
);
|
|
@@ -502,6 +537,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
502
537
|
type: ObjectTypeDefinitionNode,
|
|
503
538
|
typeName: string,
|
|
504
539
|
fieldName: string,
|
|
540
|
+
resolverLogicalId: string,
|
|
505
541
|
): TransformerResolverProvider => {
|
|
506
542
|
const isSyncEnabled = ctx.isProjectUsingDataStore();
|
|
507
543
|
const dataSource = this.datasourceMap[type.name.value];
|
|
@@ -510,6 +546,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
510
546
|
this.resolverMap[resolverKey] = ctx.resolvers.generateQueryResolver(
|
|
511
547
|
typeName,
|
|
512
548
|
fieldName,
|
|
549
|
+
resolverLogicalId,
|
|
513
550
|
dataSource,
|
|
514
551
|
MappingTemplate.s3MappingTemplateFromString(generateSyncRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
|
|
515
552
|
MappingTemplate.s3MappingTemplateFromString(
|
|
@@ -524,15 +561,16 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
524
561
|
getQueryFieldNames = (
|
|
525
562
|
ctx: TransformerTransformSchemaStepContextProvider,
|
|
526
563
|
type: ObjectTypeDefinitionNode,
|
|
527
|
-
): Set<{ fieldName: string; typeName: string; type: QueryFieldType }> => {
|
|
564
|
+
): Set<{ fieldName: string; typeName: string; type: QueryFieldType; resolverLogicalId: string }> => {
|
|
528
565
|
const typeName = type.name.value;
|
|
529
|
-
const fields: Set<{ fieldName: string; typeName: string; type: QueryFieldType }> = new Set();
|
|
566
|
+
const fields: Set<{ fieldName: string; typeName: string; type: QueryFieldType; resolverLogicalId: string }> = new Set();
|
|
530
567
|
const modelDirectiveConfig = this.modelDirectiveConfig.get(type.name.value);
|
|
531
568
|
if (modelDirectiveConfig?.queries?.get) {
|
|
532
569
|
fields.add({
|
|
533
570
|
typeName: 'Query',
|
|
534
571
|
fieldName: modelDirectiveConfig.queries.get || toCamelCase(['get', typeName]),
|
|
535
572
|
type: QueryFieldType.GET,
|
|
573
|
+
resolverLogicalId: ResolverResourceIDs.DynamoDBGetResolverResourceID(typeName),
|
|
536
574
|
});
|
|
537
575
|
}
|
|
538
576
|
|
|
@@ -541,6 +579,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
541
579
|
typeName: 'Query',
|
|
542
580
|
fieldName: modelDirectiveConfig.queries.list || toCamelCase(['list', typeName]),
|
|
543
581
|
type: QueryFieldType.LIST,
|
|
582
|
+
resolverLogicalId: ResolverResourceIDs.DynamoDBListResolverResourceID(typeName),
|
|
544
583
|
});
|
|
545
584
|
}
|
|
546
585
|
|
|
@@ -549,6 +588,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
549
588
|
typeName: 'Query',
|
|
550
589
|
fieldName: modelDirectiveConfig.queries.sync || toCamelCase(['sync', typeName]),
|
|
551
590
|
type: QueryFieldType.SYNC,
|
|
591
|
+
resolverLogicalId: ResolverResourceIDs.SyncResolverResourceID(typeName),
|
|
552
592
|
});
|
|
553
593
|
}
|
|
554
594
|
|
|
@@ -558,7 +598,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
558
598
|
getMutationFieldNames = (
|
|
559
599
|
ctx: TransformerTransformSchemaStepContextProvider,
|
|
560
600
|
type: ObjectTypeDefinitionNode,
|
|
561
|
-
): Set<{ fieldName: string; typeName: string; type: MutationFieldType }> => {
|
|
601
|
+
): Set<{ fieldName: string; typeName: string; type: MutationFieldType; resolverLogicalId: string }> => {
|
|
562
602
|
// Todo: get fields names from the directives
|
|
563
603
|
const typeName = type.name.value;
|
|
564
604
|
const modelDirectiveConfig = this.modelDirectiveConfig.get(typeName);
|
|
@@ -575,13 +615,27 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
575
615
|
}
|
|
576
616
|
};
|
|
577
617
|
|
|
578
|
-
const
|
|
618
|
+
const getMutationResolverLogicalId = (type: string): string => {
|
|
619
|
+
switch (type) {
|
|
620
|
+
case 'create':
|
|
621
|
+
return ResolverResourceIDs.DynamoDBCreateResolverResourceID(typeName);
|
|
622
|
+
case 'update':
|
|
623
|
+
return ResolverResourceIDs.DynamoDBUpdateResolverResourceID(typeName);
|
|
624
|
+
case 'delete':
|
|
625
|
+
return ResolverResourceIDs.DynamoDBDeleteResolverResourceID(typeName);
|
|
626
|
+
default:
|
|
627
|
+
throw new Error('Unknown mutation type');
|
|
628
|
+
}
|
|
629
|
+
};
|
|
630
|
+
|
|
631
|
+
const fieldNames: Set<{ fieldName: string; typeName: string; type: MutationFieldType; resolverLogicalId: string }> = new Set();
|
|
579
632
|
for (let [mutationType, mutationName] of Object.entries(modelDirectiveConfig?.mutations || {})) {
|
|
580
633
|
if (mutationName) {
|
|
581
634
|
fieldNames.add({
|
|
582
635
|
typeName: 'Mutation',
|
|
583
636
|
fieldName: mutationName,
|
|
584
637
|
type: getMutationType(mutationType),
|
|
638
|
+
resolverLogicalId: getMutationResolverLogicalId(mutationType),
|
|
585
639
|
});
|
|
586
640
|
}
|
|
587
641
|
}
|
|
@@ -595,6 +649,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
595
649
|
fieldName: string;
|
|
596
650
|
typeName: string;
|
|
597
651
|
type: MutationFieldType;
|
|
652
|
+
resolverLogicalId: string;
|
|
598
653
|
}>,
|
|
599
654
|
): string => {
|
|
600
655
|
const mutationToSubscriptionTypeMap = {
|
|
@@ -680,11 +735,13 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
680
735
|
fieldName: string;
|
|
681
736
|
typeName: string;
|
|
682
737
|
type: SubscriptionFieldType;
|
|
738
|
+
resolverLogicalId: string;
|
|
683
739
|
}> => {
|
|
684
740
|
const fields: Set<{
|
|
685
741
|
fieldName: string;
|
|
686
742
|
typeName: string;
|
|
687
743
|
type: SubscriptionFieldType;
|
|
744
|
+
resolverLogicalId: string;
|
|
688
745
|
}> = new Set();
|
|
689
746
|
|
|
690
747
|
const modelDirectiveConfig = this.modelDirectiveConfig.get(type.name.value);
|
|
@@ -695,6 +752,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
695
752
|
typeName: 'Subscription',
|
|
696
753
|
fieldName: fieldName,
|
|
697
754
|
type: SubscriptionFieldType.ON_CREATE,
|
|
755
|
+
resolverLogicalId: ModelResourceIDs.ModelOnCreateSubscriptionName(type.name.value),
|
|
698
756
|
});
|
|
699
757
|
}
|
|
700
758
|
}
|
|
@@ -705,6 +763,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
705
763
|
typeName: 'Subscription',
|
|
706
764
|
fieldName: fieldName,
|
|
707
765
|
type: SubscriptionFieldType.ON_UPDATE,
|
|
766
|
+
resolverLogicalId: ModelResourceIDs.ModelOnUpdateSubscriptionName(type.name.value),
|
|
708
767
|
});
|
|
709
768
|
}
|
|
710
769
|
}
|
|
@@ -715,6 +774,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
715
774
|
typeName: 'Subscription',
|
|
716
775
|
fieldName: fieldName,
|
|
717
776
|
type: SubscriptionFieldType.ON_DELETE,
|
|
777
|
+
resolverLogicalId: ModelResourceIDs.ModelOnDeleteSubscriptionName(type.name.value),
|
|
718
778
|
});
|
|
719
779
|
}
|
|
720
780
|
}
|
|
@@ -737,6 +797,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
737
797
|
type: ObjectTypeDefinitionNode,
|
|
738
798
|
typeName: string,
|
|
739
799
|
fieldName: string,
|
|
800
|
+
resolverLogicalId: string,
|
|
740
801
|
): TransformerResolverProvider => {
|
|
741
802
|
const isSyncEnabled = ctx.isProjectUsingDataStore();
|
|
742
803
|
const dataSource = this.datasourceMap[type.name.value];
|
|
@@ -745,6 +806,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
745
806
|
const resolver = ctx.resolvers.generateMutationResolver(
|
|
746
807
|
typeName,
|
|
747
808
|
fieldName,
|
|
809
|
+
resolverLogicalId,
|
|
748
810
|
dataSource,
|
|
749
811
|
MappingTemplate.s3MappingTemplateFromString(generateCreateRequestTemplate(type.name.value), `${typeName}.${fieldName}.req.vtl`),
|
|
750
812
|
MappingTemplate.s3MappingTemplateFromString(
|
|
@@ -1131,6 +1193,7 @@ export class ModelTransformer extends TransformerModelBase implements Transforme
|
|
|
1131
1193
|
|
|
1132
1194
|
const cfnDataSource = dataSource.node.defaultChild as CfnDataSource;
|
|
1133
1195
|
cfnDataSource.addDependsOn(role.node.defaultChild as CfnRole);
|
|
1196
|
+
cfnDataSource.overrideLogicalId(datasourceRoleLogicalID);
|
|
1134
1197
|
|
|
1135
1198
|
if (context.isProjectUsingDataStore()) {
|
|
1136
1199
|
const datasourceDynamoDb = cfnDataSource.dynamoDbConfig as any;
|
|
@@ -45,9 +45,7 @@ export const makeUpdateInputField = (
|
|
|
45
45
|
input.fields.forEach(f => f.makeNullable());
|
|
46
46
|
|
|
47
47
|
// Add id field and make it optional
|
|
48
|
-
if (
|
|
49
|
-
input.addField(InputFieldWrapper.create('id', 'ID', false));
|
|
50
|
-
} else {
|
|
48
|
+
if (hasIdField) {
|
|
51
49
|
const idField = input.fields.find(f => f.name === 'id');
|
|
52
50
|
if (idField) {
|
|
53
51
|
idField.makeNonNullable();
|
|
@@ -127,7 +125,7 @@ export const makeCreateInputField = (
|
|
|
127
125
|
|
|
128
126
|
// Add id field and make it optional
|
|
129
127
|
if (!hasIdField) {
|
|
130
|
-
input.addField(InputFieldWrapper.create('id', 'ID'));
|
|
128
|
+
input.addField(InputFieldWrapper.create('id', 'ID', true));
|
|
131
129
|
} else {
|
|
132
130
|
const idField = input.fields.find(f => f.name === 'id');
|
|
133
131
|
if (idField) {
|