@aws-amplify/graphql-model-transformer 0.7.0-graphql-vnext-dev-preview.2 → 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.
Files changed (22) hide show
  1. package/CHANGELOG.md +17 -12
  2. package/lib/graphql-model-transformer.d.ts +13 -9
  3. package/lib/graphql-model-transformer.d.ts.map +1 -1
  4. package/lib/graphql-model-transformer.js +51 -32
  5. package/lib/graphql-model-transformer.js.map +1 -1
  6. package/lib/graphql-types/mutation.d.ts.map +1 -1
  7. package/lib/graphql-types/mutation.js +2 -5
  8. package/lib/graphql-types/mutation.js.map +1 -1
  9. package/lib/graphql-types/query.js +1 -1
  10. package/lib/graphql-types/query.js.map +1 -1
  11. package/lib/wrappers/object-definition-wrapper.d.ts +2 -15
  12. package/lib/wrappers/object-definition-wrapper.d.ts.map +1 -1
  13. package/lib/wrappers/object-definition-wrapper.js +7 -43
  14. package/lib/wrappers/object-definition-wrapper.js.map +1 -1
  15. package/package.json +6 -6
  16. package/src/__tests__/__snapshots__/model-transformer.test.ts.snap +11 -11
  17. package/src/__tests__/model-transformer.test.ts +34 -1
  18. package/src/graphql-model-transformer.ts +86 -28
  19. package/src/graphql-types/mutation.ts +2 -4
  20. package/src/graphql-types/query.ts +1 -1
  21. package/src/wrappers/object-definition-wrapper.ts +2 -52
  22. package/tsconfig.tsbuildinfo +1 -1
package/lib/graphql-types/mutation.js CHANGED
@@ -26,10 +26,7 @@ const makeUpdateInputField = (obj, modelDirectiveConfig, knownModelTypes, docume
26
26
  };
27
27
  const input = object_definition_wrapper_1.InputObjectDefinitionWrapper.fromObject(name, objectTypeDefinition, document);
28
28
  input.fields.forEach(f => f.makeNullable());
29
- if (!hasIdField) {
30
- input.addField(object_definition_wrapper_1.InputFieldWrapper.create('id', 'ID', false));
31
- }
32
- else {
29
+ if (hasIdField) {
33
30
  const idField = input.fields.find(f => f.name === 'id');
34
31
  if (idField) {
35
32
  idField.makeNonNullable();
@@ -82,7 +79,7 @@ const makeCreateInputField = (obj, modelDirectiveConfig, knownModelTypes, docume
82
79
  };
83
80
  const input = object_definition_wrapper_1.InputObjectDefinitionWrapper.fromObject(name, objectTypeDefinition, document);
84
81
  if (!hasIdField) {
85
- input.addField(object_definition_wrapper_1.InputFieldWrapper.create('id', 'ID'));
82
+ input.addField(object_definition_wrapper_1.InputFieldWrapper.create('id', 'ID', true));
86
83
  }
87
84
  else {
88
85
  const idField = input.fields.find(f => f.name === 'id');
package/lib/graphql-types/mutation.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"mutation.js","sourceRoot":"","sources":["../../src/graphql-types/mutation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mutation.js","sourceRoot":"","sources":["../../src/graphql-types/mutation.ts"],"names":[],"mappings":"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"}
package/lib/graphql-types/query.js CHANGED
@@ -9,7 +9,7 @@ const makeListQueryFilterInput = (ctx, name, object) => {
9
9
  exports.makeListQueryFilterInput = makeListQueryFilterInput;
10
10
  const makeListQueryModel = (type, modelName, isSyncEnabled) => {
11
11
  const outputType = object_definition_wrapper_1.ObjectDefinitionWrapper.create(modelName);
12
- outputType.addField(object_definition_wrapper_1.FieldWrapper.create('items', type.name.value, true, true));
12
+ outputType.addField(object_definition_wrapper_1.FieldWrapper.create('items', type.name.value, false, true));
13
13
  outputType.addField(object_definition_wrapper_1.FieldWrapper.create('nextToken', 'String', true, false));
14
14
  if (isSyncEnabled) {
15
15
  outputType.addField(object_definition_wrapper_1.FieldWrapper.create('startedAt', 'AWSTimestamp', true, false));
package/lib/graphql-types/query.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/graphql-types/query.ts"],"names":[],"mappings":";;;AAEA,qFAA8F;AAC9F,qCAAoD;AAC7C,MAAM,wBAAwB,GAAG,CACtC,GAAkD,EAClD,IAAY,EACZ,MAAgC,EACD,EAAE;IACjC,OAAO,iCAAwB,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC;AACjE,CAAC,CAAC;AANW,QAAA,wBAAwB,4BAMnC;AAEK,MAAM,kBAAkB,GAAG,CAAC,IAA8B,EAAE,SAAiB,EAAE,aAAsB,EAA4B,EAAE;IACxI,MAAM,UAAU,GAAG,mDAAuB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAE7D,UAAU,CAAC,QAAQ,CAAC,wCAAY,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC/E,UAAU,CAAC,QAAQ,CAAC,wCAAY,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IAE7E,IAAI,aAAa,EAAE;QACjB,UAAU,CAAC,QAAQ,CAAC,wCAAY,CAAC,MAAM,CAAC,WAAW,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;KACpF;IAED,OAAO,UAAU,CAAC,SAAS,EAAE,CAAC;AAChC,CAAC,CAAC;AAXW,QAAA,kBAAkB,sBAW7B"}
1
+ {"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/graphql-types/query.ts"],"names":[],"mappings":";;;AAEA,qFAA8F;AAC9F,qCAAoD;AAC7C,MAAM,wBAAwB,GAAG,CACtC,GAAkD,EAClD,IAAY,EACZ,MAAgC,EACD,EAAE;IACjC,OAAO,iCAAwB,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC;AACjE,CAAC,CAAC;AANW,QAAA,wBAAwB,4BAMnC;AAEK,MAAM,kBAAkB,GAAG,CAAC,IAA8B,EAAE,SAAiB,EAAE,aAAsB,EAA4B,EAAE;IACxI,MAAM,UAAU,GAAG,mDAAuB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAE7D,UAAU,CAAC,QAAQ,CAAC,wCAAY,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAChF,UAAU,CAAC,QAAQ,CAAC,wCAAY,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;IAE7E,IAAI,aAAa,EAAE;QACjB,UAAU,CAAC,QAAQ,CAAC,wCAAY,CAAC,MAAM,CAAC,WAAW,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;KACpF;IAED,OAAO,UAAU,CAAC,SAAS,EAAE,CAAC;AAChC,CAAC,CAAC;AAXW,QAAA,kBAAkB,sBAW7B"}
package/lib/wrappers/object-definition-wrapper.d.ts CHANGED
@@ -1,18 +1,5 @@
1
- import { ArgumentNode, DirectiveNode, DocumentNode, EnumTypeDefinitionNode, FieldDefinitionNode, InputObjectTypeDefinitionNode, InputValueDefinitionNode, Location, NamedTypeNode, NameNode, ObjectTypeDefinitionNode, StringValueNode, TypeNode, ValueNode } from 'graphql';
2
- export declare class ArgumentWrapper {
3
- readonly name: NameNode;
4
- readonly value: ValueNode;
5
- constructor(argument: ArgumentNode);
6
- serialize: () => ArgumentNode;
7
- }
8
- export declare class DirectiveWrapper {
9
- private arguments;
10
- private name;
11
- private location?;
12
- constructor(node: DirectiveNode);
13
- serialize: () => DirectiveNode;
14
- getArguments: <T>(defaultValue: Required<T>) => Required<T>;
15
- }
1
+ import { DirectiveWrapper } from '@aws-amplify/graphql-transformer-core';
2
+ import { DirectiveNode, DocumentNode, EnumTypeDefinitionNode, FieldDefinitionNode, InputObjectTypeDefinitionNode, InputValueDefinitionNode, Location, NamedTypeNode, ObjectTypeDefinitionNode, StringValueNode, TypeNode } from 'graphql';
16
3
  export declare class GenericFieldWrapper {
17
4
  protected type: TypeNode;
18
5
  readonly directives: DirectiveWrapper[];
package/lib/wrappers/object-definition-wrapper.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"object-definition-wrapper.d.ts","sourceRoot":"","sources":["../../src/wrappers/object-definition-wrapper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"object-definition-wrapper.d.ts","sourceRoot":"","sources":["../../src/wrappers/object-definition-wrapper.ts"],"names":[],"mappings":"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"}
package/lib/wrappers/object-definition-wrapper.js CHANGED
@@ -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 = exports.DirectiveWrapper = exports.ArgumentWrapper = void 0;
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;
@@ -212,7 +176,7 @@ FieldWrapper.create = (name, type, isNullable = false, isList = false) => {
212
176
  field.makeNonNullable();
213
177
  }
214
178
  if (isList) {
215
- field.wrapListType();
179
+ field.wrapListType().makeNonNullable();
216
180
  }
217
181
  return field;
218
182
  };
@@ -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;
package/lib/wrappers/object-definition-wrapper.js.map CHANGED
@@ -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.7.0-graphql-vnext-dev-preview.2",
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.10.0-graphql-vnext-dev-preview.2",
32
- "@aws-amplify/graphql-transformer-interfaces": "1.10.0-graphql-vnext-dev-preview.0",
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",
@@ -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.19.0-graphql-vnext-dev-preview.0",
61
- "graphql-transformer-common": "4.19.10-graphql-vnext-dev-preview.1",
60
+ "graphql-mapping-template": "4.19.1-beta.0",
61
+ "graphql-transformer-common": "4.21.0-beta.0",
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": "fed934d4241d946e8ec529f9fa72e550c08586cd"
86
+ "gitHead": "a035b6d07ee15dff6dc4ea641ccd59a2eb0caf0d"
87
87
  }
package/src/__tests__/__snapshots__/model-transformer.test.ts.snap CHANGED
@@ -107,7 +107,7 @@ enum ModelSortDirection {
107
107
  }
108
108
 
109
109
  type ModelTestConnection {
110
- items: [Test]
110
+ items: [Test!]!
111
111
  nextToken: String
112
112
  }
113
113
 
@@ -162,7 +162,7 @@ type Subscription {
162
162
  }
163
163
 
164
164
  type ModelEmailConnection {
165
- items: [Email]
165
+ items: [Email!]!
166
166
  nextToken: String
167
167
  }
168
168
 
@@ -356,7 +356,7 @@ input EntityMetadataInput {
356
356
  }
357
357
 
358
358
  type ModelPostConnection {
359
- items: [Post]
359
+ items: [Post!]!
360
360
  nextToken: String
361
361
  }
362
362
 
@@ -463,7 +463,7 @@ type Subscription {
463
463
  }
464
464
 
465
465
  type ModelAuthorConnection {
466
- items: [Author]
466
+ items: [Author!]!
467
467
  nextToken: String
468
468
  }
469
469
 
@@ -501,7 +501,7 @@ input DeleteAuthorInput {
501
501
  }
502
502
 
503
503
  type ModelRequireConnection {
504
- items: [Require]
504
+ items: [Require!]!
505
505
  nextToken: String
506
506
  }
507
507
 
@@ -539,7 +539,7 @@ input DeleteRequireInput {
539
539
  }
540
540
 
541
541
  type ModelCommentConnection {
542
- items: [Comment]
542
+ items: [Comment!]!
543
543
  nextToken: String
544
544
  }
545
545
 
@@ -4406,7 +4406,7 @@ $util.toJson(null)
4406
4406
  }
4407
4407
  `;
4408
4408
 
4409
- exports[`ModelTransformer: should generate sync resolver with ConflictHandlerType.Lambda 1`] = `
4409
+ exports[`ModelTransformer: should generate sync resolver with ConflictHandlerType.LAMBDA 1`] = `
4410
4410
  Object {
4411
4411
  "Mutation.createAuthor.init.1.req.vtl": "## [Start] Initialization default values. **
4412
4412
  $util.qr($ctx.stash.put(\\"defaultValues\\", $util.defaultIfNull($ctx.stash.defaultValues, {})))
@@ -12153,7 +12153,7 @@ enum ModelSortDirection {
12153
12153
  }
12154
12154
 
12155
12155
  type ModelPostConnection {
12156
- items: [Post]
12156
+ items: [Post!]!
12157
12157
  nextToken: String
12158
12158
  }
12159
12159
 
@@ -12690,7 +12690,7 @@ enum ModelSortDirection {
12690
12690
  }
12691
12691
 
12692
12692
  type ModelPostConnection {
12693
- items: [Post]
12693
+ items: [Post!]!
12694
12694
  nextToken: String
12695
12695
  }
12696
12696
 
@@ -13050,7 +13050,7 @@ enum ModelSortDirection {
13050
13050
  }
13051
13051
 
13052
13052
  type ModelPostConnection {
13053
- items: [Post]
13053
+ items: [Post!]!
13054
13054
  nextToken: String
13055
13055
  }
13056
13056
 
@@ -13404,7 +13404,7 @@ enum ModelSortDirection {
13404
13404
  }
13405
13405
 
13406
13406
  type ModelPostConnection {
13407
- items: [Post]
13407
+ items: [Post!]!
13408
13408
  nextToken: String
13409
13409
  }
13410
13410
 
package/src/__tests__/model-transformer.test.ts CHANGED
@@ -913,7 +913,7 @@ describe('ModelTransformer: ', () => {
913
913
  validateModelSchema(parse(definition));
914
914
  });
915
915
 
916
- it('should generate sync resolver with ConflictHandlerType.Lambda', () => {
916
+ it('should generate sync resolver with ConflictHandlerType.LAMBDA', () => {
917
917
  const validSchema = `
918
918
  type Post @model {
919
919
  id: ID!
@@ -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
  });