@aws-amplify/graphql-model-transformer 1.4.0 → 1.5.0-no-internal-synth.0
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 +10 -0
- package/lib/rds-lambda.zip +0 -0
- package/lib/rds-notification-lambda.zip +0 -0
- package/lib/rds-patching-lambda.zip +0 -0
- package/lib/resolvers/rds/resolver.d.ts +5 -5
- package/lib/resolvers/rds/resolver.d.ts.map +1 -1
- package/lib/resolvers/rds/resolver.js +14 -11
- package/lib/resolvers/rds/resolver.js.map +1 -1
- package/lib/resources/dynamo-model-resource-generator.d.ts +2 -2
- package/lib/resources/dynamo-model-resource-generator.d.ts.map +1 -1
- package/lib/resources/dynamo-model-resource-generator.js +48 -43
- package/lib/resources/dynamo-model-resource-generator.js.map +1 -1
- package/lib/resources/model-resource-generator.js +3 -3
- package/lib/resources/model-resource-generator.js.map +1 -1
- package/lib/resources/rds-model-resource-generator.js +13 -13
- package/package.json +7 -6
- package/publish-notification-lambda/node_modules/.package-lock.json +13 -13
- package/publish-notification-lambda/node_modules/@smithy/protocol-http/package.json +2 -2
- package/publish-notification-lambda/node_modules/@smithy/types/README.md +37 -0
- package/publish-notification-lambda/node_modules/@smithy/types/package.json +3 -2
- package/publish-notification-lambda/node_modules/@types/node/README.md +2 -2
- package/publish-notification-lambda/node_modules/@types/node/package.json +2 -7
- package/publish-notification-lambda/node_modules/tslib/package.json +1 -1
- package/publish-notification-lambda/node_modules/tslib/tslib.es6.mjs +1 -1
- package/publish-notification-lambda/package-lock.json +13 -13
- package/rds-lambda/node_modules/.package-lock.json +370 -345
- package/rds-lambda/node_modules/@babel/code-frame/README.md +1 -1
- package/rds-lambda/node_modules/@babel/code-frame/package.json +3 -2
- package/rds-lambda/node_modules/@babel/core/cjs-proxy.cjs +3 -1
- package/rds-lambda/node_modules/@babel/core/package.json +10 -10
- package/rds-lambda/node_modules/@babel/generator/package.json +3 -3
- package/rds-lambda/node_modules/@babel/helper-compilation-targets/package.json +1 -5
- package/rds-lambda/node_modules/@babel/helpers/package.json +6 -6
- package/rds-lambda/node_modules/@babel/highlight/README.md +1 -1
- package/rds-lambda/node_modules/@babel/highlight/package.json +2 -3
- package/rds-lambda/node_modules/@babel/parser/package.json +3 -3
- package/rds-lambda/node_modules/@babel/traverse/package.json +6 -5
- package/rds-lambda/node_modules/@babel/types/README.md +1 -1
- package/rds-lambda/node_modules/@babel/types/package.json +3 -4
- package/rds-lambda/node_modules/@jest/console/package.json +5 -5
- package/rds-lambda/node_modules/@jest/core/package.json +20 -20
- package/rds-lambda/node_modules/@jest/environment/package.json +4 -4
- package/rds-lambda/node_modules/@jest/expect/package.json +4 -4
- package/rds-lambda/node_modules/@jest/expect-utils/package.json +3 -3
- package/rds-lambda/node_modules/@jest/fake-timers/package.json +6 -6
- package/rds-lambda/node_modules/@jest/globals/package.json +5 -5
- package/rds-lambda/node_modules/@jest/reporters/package.json +10 -10
- package/rds-lambda/node_modules/@jest/test-result/package.json +5 -5
- package/rds-lambda/node_modules/@jest/test-sequencer/package.json +5 -5
- package/rds-lambda/node_modules/@jest/transform/package.json +6 -6
- package/rds-lambda/node_modules/@jridgewell/resolve-uri/package.json +2 -2
- package/rds-lambda/node_modules/@jridgewell/trace-mapping/package.json +3 -3
- package/rds-lambda/node_modules/@smithy/protocol-http/package.json +2 -2
- package/rds-lambda/node_modules/@smithy/types/README.md +37 -0
- package/rds-lambda/node_modules/@smithy/types/package.json +3 -2
- package/rds-lambda/node_modules/@types/node/README.md +2 -2
- package/rds-lambda/node_modules/@types/node/package.json +2 -7
- package/rds-lambda/node_modules/babel-jest/package.json +4 -4
- package/rds-lambda/node_modules/browserslist/package.json +4 -4
- package/rds-lambda/node_modules/caniuse-lite/package.json +1 -1
- package/rds-lambda/node_modules/dedent/README.md +56 -0
- package/rds-lambda/node_modules/dedent/dist/dedent.d.mts +17 -0
- package/rds-lambda/node_modules/dedent/dist/dedent.mjs +59 -0
- package/rds-lambda/node_modules/dedent/package.json +54 -10
- package/rds-lambda/node_modules/electron-to-chromium/full-chromium-versions.json +1 -1
- package/rds-lambda/node_modules/electron-to-chromium/full-versions.json +1 -1
- package/rds-lambda/node_modules/electron-to-chromium/package.json +1 -1
- package/rds-lambda/node_modules/electron-to-chromium/versions.json +1 -1
- package/rds-lambda/node_modules/expect/package.json +7 -7
- package/rds-lambda/node_modules/is-core-module/CHANGELOG.md +7 -0
- package/rds-lambda/node_modules/is-core-module/core.json +3 -3
- package/rds-lambda/node_modules/is-core-module/package.json +5 -5
- package/rds-lambda/node_modules/istanbul-lib-report/CHANGELOG.md +7 -0
- package/rds-lambda/node_modules/istanbul-lib-report/package.json +5 -6
- package/rds-lambda/node_modules/istanbul-reports/CHANGELOG.md +7 -0
- package/rds-lambda/node_modules/istanbul-reports/package.json +1 -1
- package/rds-lambda/node_modules/jest/package.json +4 -4
- package/rds-lambda/node_modules/jest-circus/package.json +13 -14
- package/rds-lambda/node_modules/jest-cli/package.json +7 -7
- package/rds-lambda/node_modules/jest-config/package.json +11 -11
- package/rds-lambda/node_modules/jest-diff/package.json +4 -4
- package/rds-lambda/node_modules/jest-each/package.json +4 -4
- package/rds-lambda/node_modules/jest-environment-node/package.json +7 -7
- package/rds-lambda/node_modules/jest-haste-map/package.json +4 -4
- package/rds-lambda/node_modules/jest-leak-detector/package.json +3 -3
- package/rds-lambda/node_modules/jest-matcher-utils/package.json +5 -5
- package/rds-lambda/node_modules/jest-message-util/package.json +3 -3
- package/rds-lambda/node_modules/jest-mock/package.json +3 -3
- package/rds-lambda/node_modules/jest-resolve/package.json +5 -5
- package/rds-lambda/node_modules/jest-resolve-dependencies/package.json +7 -7
- package/rds-lambda/node_modules/jest-runner/package.json +17 -17
- package/rds-lambda/node_modules/jest-runtime/package.json +15 -15
- package/rds-lambda/node_modules/jest-snapshot/package.json +12 -12
- package/rds-lambda/node_modules/jest-util/package.json +2 -2
- package/rds-lambda/node_modules/jest-validate/package.json +3 -3
- package/rds-lambda/node_modules/jest-watcher/package.json +4 -4
- package/rds-lambda/node_modules/jest-worker/package.json +4 -4
- package/rds-lambda/node_modules/make-dir/license +1 -1
- package/rds-lambda/node_modules/make-dir/node_modules/lru-cache/LICENSE +15 -0
- package/rds-lambda/node_modules/make-dir/node_modules/lru-cache/README.md +166 -0
- package/rds-lambda/node_modules/make-dir/node_modules/lru-cache/package.json +34 -0
- package/rds-lambda/node_modules/make-dir/node_modules/semver/LICENSE +15 -0
- package/rds-lambda/node_modules/make-dir/node_modules/semver/README.md +637 -0
- package/rds-lambda/node_modules/make-dir/node_modules/semver/package.json +87 -0
- package/rds-lambda/node_modules/make-dir/node_modules/semver/range.bnf +16 -0
- package/rds-lambda/node_modules/make-dir/node_modules/yallist/LICENSE +15 -0
- package/rds-lambda/node_modules/make-dir/node_modules/yallist/README.md +204 -0
- package/rds-lambda/node_modules/make-dir/node_modules/yallist/package.json +29 -0
- package/rds-lambda/node_modules/make-dir/package.json +15 -11
- package/rds-lambda/node_modules/make-dir/readme.md +1 -1
- package/rds-lambda/node_modules/pretty-format/package.json +3 -3
- package/rds-lambda/node_modules/resolve/lib/core.json +4 -1
- package/rds-lambda/node_modules/resolve/package.json +6 -6
- package/rds-lambda/node_modules/tslib/package.json +1 -1
- package/rds-lambda/node_modules/tslib/tslib.es6.mjs +1 -1
- package/rds-lambda/package-lock.json +370 -345
- package/rds-patching-lambda/node_modules/.package-lock.json +13 -13
- package/rds-patching-lambda/node_modules/@smithy/protocol-http/package.json +2 -2
- package/rds-patching-lambda/node_modules/@smithy/types/README.md +37 -0
- package/rds-patching-lambda/node_modules/@smithy/types/package.json +3 -2
- package/rds-patching-lambda/node_modules/@types/node/README.md +2 -2
- package/rds-patching-lambda/node_modules/@types/node/package.json +2 -7
- package/rds-patching-lambda/node_modules/tslib/package.json +1 -1
- package/rds-patching-lambda/node_modules/tslib/tslib.es6.mjs +1 -1
- package/rds-patching-lambda/package-lock.json +13 -13
- package/src/__tests__/model-directive-arguments.test.ts +23 -28
- package/src/__tests__/model-transformer.test.ts +138 -160
- package/src/resolvers/rds/resolver.ts +19 -17
- package/src/resources/dynamo-model-resource-generator.ts +50 -47
- package/src/resources/model-resource-generator.ts +3 -3
- package/src/resources/rds-model-resource-generator.ts +13 -13
- package/tsconfig.tsbuildinfo +1 -1
- package/rds-lambda/node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec/LICENSE +0 -21
- package/rds-lambda/node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec/README.md +0 -200
- package/rds-lambda/node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.mjs +0 -164
- package/rds-lambda/node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.mjs.map +0 -1
- package/rds-lambda/node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec/package.json +0 -75
- package/rds-lambda/node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec/src/sourcemap-codec.ts +0 -198
- package/rds-lambda/node_modules/@types/prettier/LICENSE +0 -21
- package/rds-lambda/node_modules/@types/prettier/README.md +0 -16
- package/rds-lambda/node_modules/@types/prettier/package.json +0 -65
|
@@ -1,14 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
ConflictHandlerType,
|
|
4
|
-
DatasourceType,
|
|
5
|
-
GraphQLTransform,
|
|
6
|
-
SyncConfig,
|
|
7
|
-
validateModelSchema,
|
|
8
|
-
} from '@aws-amplify/graphql-transformer-core';
|
|
9
|
-
import { InputObjectTypeDefinitionNode, InputValueDefinitionNode, ListValueNode, NamedTypeNode, parse } from 'graphql';
|
|
1
|
+
import { ConflictHandlerType, DatasourceType, GraphQLTransform, validateModelSchema } from '@aws-amplify/graphql-transformer-core';
|
|
2
|
+
import { InputObjectTypeDefinitionNode, InputValueDefinitionNode, NamedTypeNode, parse } from 'graphql';
|
|
10
3
|
import { getBaseType } from 'graphql-transformer-common';
|
|
11
4
|
import { Template } from 'aws-cdk-lib/assertions';
|
|
5
|
+
import { testTransform } from '@aws-amplify/graphql-transformer-test-utils';
|
|
6
|
+
import { ModelTransformer } from '../graphql-model-transformer';
|
|
12
7
|
import {
|
|
13
8
|
doNotExpectFields,
|
|
14
9
|
expectFields,
|
|
@@ -30,10 +25,10 @@ describe('ModelTransformer: ', () => {
|
|
|
30
25
|
}
|
|
31
26
|
`;
|
|
32
27
|
|
|
33
|
-
const
|
|
28
|
+
const out = testTransform({
|
|
29
|
+
schema: validSchema,
|
|
34
30
|
transformers: [new ModelTransformer()],
|
|
35
31
|
});
|
|
36
|
-
const out = transformer.transform(validSchema);
|
|
37
32
|
expect(out).toBeDefined();
|
|
38
33
|
|
|
39
34
|
validateModelSchema(parse(out.schema));
|
|
@@ -48,10 +43,10 @@ describe('ModelTransformer: ', () => {
|
|
|
48
43
|
title: String!
|
|
49
44
|
}
|
|
50
45
|
`;
|
|
51
|
-
const
|
|
46
|
+
const out = testTransform({
|
|
47
|
+
schema: validSchema,
|
|
52
48
|
transformers: [new ModelTransformer()],
|
|
53
49
|
});
|
|
54
|
-
const out = transformer.transform(validSchema);
|
|
55
50
|
expect(out).toBeDefined();
|
|
56
51
|
|
|
57
52
|
validateModelSchema(parse(out.schema));
|
|
@@ -71,7 +66,8 @@ describe('ModelTransformer: ', () => {
|
|
|
71
66
|
title: String!
|
|
72
67
|
}
|
|
73
68
|
`;
|
|
74
|
-
const
|
|
69
|
+
const out = testTransform({
|
|
70
|
+
schema: alsoValidSchema,
|
|
75
71
|
transformers: [new ModelTransformer()],
|
|
76
72
|
resolverConfig: {
|
|
77
73
|
project: {
|
|
@@ -80,7 +76,6 @@ describe('ModelTransformer: ', () => {
|
|
|
80
76
|
},
|
|
81
77
|
},
|
|
82
78
|
});
|
|
83
|
-
const out = transformer.transform(alsoValidSchema);
|
|
84
79
|
expect(out).toBeDefined();
|
|
85
80
|
|
|
86
81
|
validateModelSchema(parse(out.schema));
|
|
@@ -98,11 +93,10 @@ describe('ModelTransformer: ', () => {
|
|
|
98
93
|
}
|
|
99
94
|
`;
|
|
100
95
|
|
|
101
|
-
const
|
|
96
|
+
const out = testTransform({
|
|
97
|
+
schema: validSchema,
|
|
102
98
|
transformers: [new ModelTransformer()],
|
|
103
99
|
});
|
|
104
|
-
|
|
105
|
-
const out = transformer.transform(validSchema);
|
|
106
100
|
expect(out).toBeDefined();
|
|
107
101
|
|
|
108
102
|
const definition = out.schema;
|
|
@@ -141,11 +135,10 @@ describe('ModelTransformer: ', () => {
|
|
|
141
135
|
}
|
|
142
136
|
`;
|
|
143
137
|
|
|
144
|
-
const
|
|
138
|
+
const out = testTransform({
|
|
139
|
+
schema: validSchema,
|
|
145
140
|
transformers: [new ModelTransformer()],
|
|
146
141
|
});
|
|
147
|
-
|
|
148
|
-
const out = transformer.transform(validSchema);
|
|
149
142
|
expect(out).toBeDefined();
|
|
150
143
|
const definition = out.schema;
|
|
151
144
|
expect(definition).toBeDefined();
|
|
@@ -164,10 +157,10 @@ describe('ModelTransformer: ', () => {
|
|
|
164
157
|
updatedAt: String
|
|
165
158
|
}
|
|
166
159
|
`;
|
|
167
|
-
const
|
|
160
|
+
const out = testTransform({
|
|
161
|
+
schema: validSchema,
|
|
168
162
|
transformers: [new ModelTransformer()],
|
|
169
163
|
});
|
|
170
|
-
const out = transformer.transform(validSchema);
|
|
171
164
|
expect(out).toBeDefined();
|
|
172
165
|
const definition = out.schema;
|
|
173
166
|
expect(definition).toBeDefined();
|
|
@@ -185,11 +178,10 @@ describe('ModelTransformer: ', () => {
|
|
|
185
178
|
updatedAt: String
|
|
186
179
|
}
|
|
187
180
|
`;
|
|
188
|
-
const
|
|
181
|
+
const out = testTransform({
|
|
182
|
+
schema: validSchema,
|
|
189
183
|
transformers: [new ModelTransformer()],
|
|
190
184
|
});
|
|
191
|
-
|
|
192
|
-
const out = transformer.transform(validSchema);
|
|
193
185
|
expect(out).toBeDefined();
|
|
194
186
|
const definition = out.schema;
|
|
195
187
|
expect(definition).toBeDefined();
|
|
@@ -209,10 +201,10 @@ describe('ModelTransformer: ', () => {
|
|
|
209
201
|
updatedAt: String
|
|
210
202
|
}
|
|
211
203
|
`;
|
|
212
|
-
const
|
|
204
|
+
const out = testTransform({
|
|
205
|
+
schema: validSchema,
|
|
213
206
|
transformers: [new ModelTransformer()],
|
|
214
207
|
});
|
|
215
|
-
const out = transformer.transform(validSchema);
|
|
216
208
|
expect(out).toBeDefined();
|
|
217
209
|
const definition = out.schema;
|
|
218
210
|
expect(definition).toBeDefined();
|
|
@@ -234,10 +226,10 @@ describe('ModelTransformer: ', () => {
|
|
|
234
226
|
updatedAt: String
|
|
235
227
|
}
|
|
236
228
|
`;
|
|
237
|
-
const
|
|
229
|
+
const out = testTransform({
|
|
230
|
+
schema: validSchema,
|
|
238
231
|
transformers: [new ModelTransformer()],
|
|
239
232
|
});
|
|
240
|
-
const out = transformer.transform(validSchema);
|
|
241
233
|
expect(out).toBeDefined();
|
|
242
234
|
const definition = out.schema;
|
|
243
235
|
expect(definition).toBeDefined();
|
|
@@ -268,10 +260,10 @@ describe('ModelTransformer: ', () => {
|
|
|
268
260
|
different3: String
|
|
269
261
|
}
|
|
270
262
|
`;
|
|
271
|
-
const
|
|
263
|
+
const out = testTransform({
|
|
264
|
+
schema: validSchema,
|
|
272
265
|
transformers: [new ModelTransformer()],
|
|
273
266
|
});
|
|
274
|
-
const out = transformer.transform(validSchema);
|
|
275
267
|
expect(out).toBeDefined();
|
|
276
268
|
const definition = out.schema;
|
|
277
269
|
expect(definition).toBeDefined();
|
|
@@ -303,10 +295,10 @@ describe('ModelTransformer: ', () => {
|
|
|
303
295
|
different3: String
|
|
304
296
|
}
|
|
305
297
|
`;
|
|
306
|
-
const
|
|
298
|
+
const out = testTransform({
|
|
299
|
+
schema: validSchema,
|
|
307
300
|
transformers: [new ModelTransformer()],
|
|
308
301
|
});
|
|
309
|
-
const out = transformer.transform(validSchema);
|
|
310
302
|
expect(out).toBeDefined();
|
|
311
303
|
const definition = out.schema;
|
|
312
304
|
expect(definition).toBeDefined();
|
|
@@ -327,10 +319,10 @@ describe('ModelTransformer: ', () => {
|
|
|
327
319
|
str: String
|
|
328
320
|
}
|
|
329
321
|
`;
|
|
330
|
-
const
|
|
322
|
+
const result = testTransform({
|
|
323
|
+
schema: validSchema,
|
|
331
324
|
transformers: [new ModelTransformer()],
|
|
332
325
|
});
|
|
333
|
-
const result = transformer.transform(validSchema);
|
|
334
326
|
expect(result).toBeDefined();
|
|
335
327
|
expect(result.schema).toBeDefined();
|
|
336
328
|
const schema = parse(result.schema);
|
|
@@ -360,10 +352,10 @@ describe('ModelTransformer: ', () => {
|
|
|
360
352
|
query: Query
|
|
361
353
|
}
|
|
362
354
|
`;
|
|
363
|
-
const
|
|
355
|
+
const out = testTransform({
|
|
356
|
+
schema: validSchema,
|
|
364
357
|
transformers: [new ModelTransformer()],
|
|
365
358
|
});
|
|
366
|
-
const out = transformer.transform(validSchema);
|
|
367
359
|
expect(out).toBeDefined();
|
|
368
360
|
const parsed = parse(out.schema);
|
|
369
361
|
validateModelSchema(parsed);
|
|
@@ -387,10 +379,10 @@ describe('ModelTransformer: ', () => {
|
|
|
387
379
|
text: String!
|
|
388
380
|
}
|
|
389
381
|
`;
|
|
390
|
-
const
|
|
382
|
+
const out = testTransform({
|
|
383
|
+
schema: validSchema,
|
|
391
384
|
transformers: [new ModelTransformer()],
|
|
392
385
|
});
|
|
393
|
-
const out = transformer.transform(validSchema);
|
|
394
386
|
expect(out).toBeDefined();
|
|
395
387
|
const definition = out.schema;
|
|
396
388
|
expect(definition).toBeDefined();
|
|
@@ -414,12 +406,12 @@ describe('ModelTransformer: ', () => {
|
|
|
414
406
|
str: String
|
|
415
407
|
}
|
|
416
408
|
`;
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
);
|
|
409
|
+
expect(() =>
|
|
410
|
+
testTransform({
|
|
411
|
+
schema: invalidSchema,
|
|
412
|
+
transformers: [new ModelTransformer()],
|
|
413
|
+
}),
|
|
414
|
+
).toThrowError("'Subscription' is a reserved type name and currently in use within the default schema element.");
|
|
423
415
|
});
|
|
424
416
|
|
|
425
417
|
it('should not add default primary key when ID is defined', () => {
|
|
@@ -429,10 +421,10 @@ describe('ModelTransformer: ', () => {
|
|
|
429
421
|
str: String
|
|
430
422
|
}
|
|
431
423
|
`;
|
|
432
|
-
const
|
|
424
|
+
const result = testTransform({
|
|
425
|
+
schema: validSchema,
|
|
433
426
|
transformers: [new ModelTransformer()],
|
|
434
427
|
});
|
|
435
|
-
const result = transformer.transform(validSchema);
|
|
436
428
|
expect(result).toBeDefined();
|
|
437
429
|
expect(result.schema).toBeDefined();
|
|
438
430
|
const schema = parse(result.schema);
|
|
@@ -457,14 +449,14 @@ describe('ModelTransformer: ', () => {
|
|
|
457
449
|
updatedAt: String
|
|
458
450
|
}
|
|
459
451
|
`;
|
|
460
|
-
|
|
452
|
+
|
|
453
|
+
const out = testTransform({
|
|
454
|
+
schema: validSchema,
|
|
461
455
|
transformers: [new ModelTransformer()],
|
|
462
456
|
transformParameters: {
|
|
463
457
|
shouldDeepMergeDirectiveConfigDefaults: false,
|
|
464
458
|
},
|
|
465
459
|
});
|
|
466
|
-
|
|
467
|
-
const out = transformer.transform(validSchema);
|
|
468
460
|
expect(out).toBeDefined();
|
|
469
461
|
const definition = out.schema;
|
|
470
462
|
expect(definition).toBeDefined();
|
|
@@ -491,11 +483,10 @@ describe('ModelTransformer: ', () => {
|
|
|
491
483
|
name: String!
|
|
492
484
|
}
|
|
493
485
|
`;
|
|
494
|
-
const
|
|
486
|
+
const out = testTransform({
|
|
487
|
+
schema: validSchema,
|
|
495
488
|
transformers: [new ModelTransformer()],
|
|
496
489
|
});
|
|
497
|
-
|
|
498
|
-
const out = transformer.transform(validSchema);
|
|
499
490
|
expect(out).toBeDefined();
|
|
500
491
|
|
|
501
492
|
const definition = out.schema;
|
|
@@ -540,11 +531,10 @@ describe('ModelTransformer: ', () => {
|
|
|
540
531
|
lastStatus: Status!
|
|
541
532
|
}
|
|
542
533
|
`;
|
|
543
|
-
const
|
|
534
|
+
const out = testTransform({
|
|
535
|
+
schema: validSchema,
|
|
544
536
|
transformers: [new ModelTransformer()],
|
|
545
537
|
});
|
|
546
|
-
|
|
547
|
-
const out = transformer.transform(validSchema);
|
|
548
538
|
expect(out).toBeDefined();
|
|
549
539
|
const definition = out.schema;
|
|
550
540
|
expect(definition).toBeDefined();
|
|
@@ -581,10 +571,10 @@ describe('ModelTransformer: ', () => {
|
|
|
581
571
|
JEDI
|
|
582
572
|
}
|
|
583
573
|
`;
|
|
584
|
-
const
|
|
574
|
+
const out = testTransform({
|
|
575
|
+
schema: validSchema,
|
|
585
576
|
transformers: [new ModelTransformer()],
|
|
586
577
|
});
|
|
587
|
-
const out = transformer.transform(validSchema);
|
|
588
578
|
expect(out).toBeDefined();
|
|
589
579
|
|
|
590
580
|
const definition = out.schema;
|
|
@@ -621,10 +611,10 @@ describe('ModelTransformer: ', () => {
|
|
|
621
611
|
createdAt: String
|
|
622
612
|
updatedAt: String
|
|
623
613
|
}`;
|
|
624
|
-
const
|
|
614
|
+
const out = testTransform({
|
|
615
|
+
schema: validSchema,
|
|
625
616
|
transformers: [new ModelTransformer()],
|
|
626
617
|
});
|
|
627
|
-
const out = transformer.transform(validSchema);
|
|
628
618
|
expect(out).toBeDefined();
|
|
629
619
|
|
|
630
620
|
const definition = out.schema;
|
|
@@ -654,10 +644,10 @@ describe('ModelTransformer: ', () => {
|
|
|
654
644
|
title: String!
|
|
655
645
|
}
|
|
656
646
|
`;
|
|
657
|
-
const
|
|
647
|
+
const out = testTransform({
|
|
648
|
+
schema: validSchema,
|
|
658
649
|
transformers: [new ModelTransformer()],
|
|
659
650
|
});
|
|
660
|
-
const out = transformer.transform(validSchema);
|
|
661
651
|
expect(out).toBeDefined();
|
|
662
652
|
const definition = out.schema;
|
|
663
653
|
expect(definition).toBeDefined();
|
|
@@ -681,10 +671,10 @@ describe('ModelTransformer: ', () => {
|
|
|
681
671
|
updatedAt: String
|
|
682
672
|
}
|
|
683
673
|
`;
|
|
684
|
-
const
|
|
674
|
+
const out = testTransform({
|
|
675
|
+
schema: validSchema,
|
|
685
676
|
transformers: [new ModelTransformer()],
|
|
686
677
|
});
|
|
687
|
-
const out = transformer.transform(validSchema);
|
|
688
678
|
expect(out).toBeDefined();
|
|
689
679
|
const definition = out.schema;
|
|
690
680
|
expect(definition).toBeDefined();
|
|
@@ -703,13 +693,13 @@ describe('ModelTransformer: ', () => {
|
|
|
703
693
|
str: String
|
|
704
694
|
}
|
|
705
695
|
`;
|
|
706
|
-
const
|
|
696
|
+
const result = testTransform({
|
|
697
|
+
schema: validSchema,
|
|
707
698
|
transformers: [new ModelTransformer()],
|
|
708
699
|
transformParameters: {
|
|
709
700
|
shouldDeepMergeDirectiveConfigDefaults: false,
|
|
710
701
|
},
|
|
711
702
|
});
|
|
712
|
-
const result = transformer.transform(validSchema);
|
|
713
703
|
expect(result).toBeDefined();
|
|
714
704
|
expect(result.schema).toBeDefined();
|
|
715
705
|
expect(result.schema).toMatchSnapshot();
|
|
@@ -724,7 +714,8 @@ describe('ModelTransformer: ', () => {
|
|
|
724
714
|
str: String
|
|
725
715
|
}
|
|
726
716
|
`;
|
|
727
|
-
const
|
|
717
|
+
const result = testTransform({
|
|
718
|
+
schema: validSchema,
|
|
728
719
|
transformers: [new ModelTransformer()],
|
|
729
720
|
resolverConfig: {
|
|
730
721
|
project: {
|
|
@@ -733,7 +724,6 @@ describe('ModelTransformer: ', () => {
|
|
|
733
724
|
},
|
|
734
725
|
},
|
|
735
726
|
});
|
|
736
|
-
const result = transformer.transform(validSchema);
|
|
737
727
|
expect(result).toBeDefined();
|
|
738
728
|
expect(result.schema).toBeDefined();
|
|
739
729
|
expect(result.schema).toMatchSnapshot();
|
|
@@ -753,7 +743,8 @@ describe('ModelTransformer: ', () => {
|
|
|
753
743
|
updatedAt: AWSTimestamp
|
|
754
744
|
}
|
|
755
745
|
`;
|
|
756
|
-
const
|
|
746
|
+
const result = testTransform({
|
|
747
|
+
schema: validSchema,
|
|
757
748
|
transformers: [new ModelTransformer()],
|
|
758
749
|
resolverConfig: {
|
|
759
750
|
project: {
|
|
@@ -762,7 +753,6 @@ describe('ModelTransformer: ', () => {
|
|
|
762
753
|
},
|
|
763
754
|
},
|
|
764
755
|
});
|
|
765
|
-
const result = transformer.transform(validSchema);
|
|
766
756
|
expect(result).toBeDefined();
|
|
767
757
|
expect(result.schema).toBeDefined();
|
|
768
758
|
expect(result.schema).toMatchSnapshot();
|
|
@@ -782,7 +772,8 @@ describe('ModelTransformer: ', () => {
|
|
|
782
772
|
updatedAt: AWSDateTime!
|
|
783
773
|
}
|
|
784
774
|
`;
|
|
785
|
-
const
|
|
775
|
+
const result = testTransform({
|
|
776
|
+
schema: validSchema,
|
|
786
777
|
transformers: [new ModelTransformer()],
|
|
787
778
|
resolverConfig: {
|
|
788
779
|
project: {
|
|
@@ -791,8 +782,6 @@ describe('ModelTransformer: ', () => {
|
|
|
791
782
|
},
|
|
792
783
|
},
|
|
793
784
|
});
|
|
794
|
-
|
|
795
|
-
const result = transformer.transform(validSchema);
|
|
796
785
|
expect(result).toBeDefined();
|
|
797
786
|
expect(result.schema).toBeDefined();
|
|
798
787
|
expect(result.schema).toMatchSnapshot();
|
|
@@ -810,7 +799,8 @@ describe('ModelTransformer: ', () => {
|
|
|
810
799
|
str: String
|
|
811
800
|
}
|
|
812
801
|
`;
|
|
813
|
-
const
|
|
802
|
+
const result = testTransform({
|
|
803
|
+
schema: validSchema,
|
|
814
804
|
transformers: [new ModelTransformer()],
|
|
815
805
|
resolverConfig: {
|
|
816
806
|
project: {
|
|
@@ -819,7 +809,6 @@ describe('ModelTransformer: ', () => {
|
|
|
819
809
|
},
|
|
820
810
|
},
|
|
821
811
|
});
|
|
822
|
-
const result = transformer.transform(validSchema);
|
|
823
812
|
expect(result).toBeDefined();
|
|
824
813
|
expect(result.schema).toBeDefined();
|
|
825
814
|
expect(result.schema).toMatchSnapshot();
|
|
@@ -841,7 +830,8 @@ describe('ModelTransformer: ', () => {
|
|
|
841
830
|
id: ID!
|
|
842
831
|
}
|
|
843
832
|
`;
|
|
844
|
-
const
|
|
833
|
+
const result = testTransform({
|
|
834
|
+
schema: validSchema,
|
|
845
835
|
transformers: [new ModelTransformer()],
|
|
846
836
|
resolverConfig: {
|
|
847
837
|
project: {
|
|
@@ -850,8 +840,6 @@ describe('ModelTransformer: ', () => {
|
|
|
850
840
|
},
|
|
851
841
|
},
|
|
852
842
|
});
|
|
853
|
-
|
|
854
|
-
const result = transformer.transform(validSchema);
|
|
855
843
|
expect(result).toBeDefined();
|
|
856
844
|
expect(result.schema).toBeDefined();
|
|
857
845
|
expect(result.schema).toMatchSnapshot();
|
|
@@ -911,7 +899,8 @@ describe('ModelTransformer: ', () => {
|
|
|
911
899
|
}
|
|
912
900
|
`;
|
|
913
901
|
|
|
914
|
-
const
|
|
902
|
+
const result = testTransform({
|
|
903
|
+
schema: validSchema,
|
|
915
904
|
transformers: [new ModelTransformer()],
|
|
916
905
|
resolverConfig: {
|
|
917
906
|
project: {
|
|
@@ -920,7 +909,6 @@ describe('ModelTransformer: ', () => {
|
|
|
920
909
|
},
|
|
921
910
|
},
|
|
922
911
|
});
|
|
923
|
-
const result = transformer.transform(validSchema);
|
|
924
912
|
expect(result).toBeDefined();
|
|
925
913
|
expect(result.schema).toBeDefined();
|
|
926
914
|
const schema = parse(result.schema);
|
|
@@ -949,10 +937,10 @@ describe('ModelTransformer: ', () => {
|
|
|
949
937
|
jsonField: AWSJSON
|
|
950
938
|
}
|
|
951
939
|
`;
|
|
952
|
-
const
|
|
940
|
+
const out = testTransform({
|
|
941
|
+
schema: validSchema,
|
|
953
942
|
transformers: [new ModelTransformer()],
|
|
954
943
|
});
|
|
955
|
-
const out = transformer.transform(validSchema);
|
|
956
944
|
expect(out).toBeDefined();
|
|
957
945
|
validateModelSchema(parse(out.schema));
|
|
958
946
|
});
|
|
@@ -965,18 +953,16 @@ describe('ModelTransformer: ', () => {
|
|
|
965
953
|
}
|
|
966
954
|
`;
|
|
967
955
|
|
|
968
|
-
const
|
|
969
|
-
|
|
970
|
-
ConflictHandler: ConflictHandlerType.AUTOMERGE,
|
|
971
|
-
};
|
|
972
|
-
|
|
973
|
-
const transformer = new GraphQLTransform({
|
|
956
|
+
const out = testTransform({
|
|
957
|
+
schema: validSchema,
|
|
974
958
|
transformers: [new ModelTransformer()],
|
|
975
959
|
resolverConfig: {
|
|
976
|
-
project:
|
|
960
|
+
project: {
|
|
961
|
+
ConflictDetection: 'VERSION',
|
|
962
|
+
ConflictHandler: ConflictHandlerType.AUTOMERGE,
|
|
963
|
+
},
|
|
977
964
|
},
|
|
978
965
|
});
|
|
979
|
-
const out = transformer.transform(validSchema);
|
|
980
966
|
expect(out).toBeDefined();
|
|
981
967
|
|
|
982
968
|
const definition = out.schema;
|
|
@@ -996,21 +982,19 @@ describe('ModelTransformer: ', () => {
|
|
|
996
982
|
}
|
|
997
983
|
`;
|
|
998
984
|
|
|
999
|
-
const
|
|
1000
|
-
|
|
1001
|
-
ConflictHandler: ConflictHandlerType.LAMBDA,
|
|
1002
|
-
LambdaConflictHandler: {
|
|
1003
|
-
name: 'myLambdaConflictHandler',
|
|
1004
|
-
},
|
|
1005
|
-
};
|
|
1006
|
-
|
|
1007
|
-
const transformer = new GraphQLTransform({
|
|
985
|
+
const out = testTransform({
|
|
986
|
+
schema: validSchema,
|
|
1008
987
|
transformers: [new ModelTransformer()],
|
|
1009
988
|
resolverConfig: {
|
|
1010
|
-
project:
|
|
989
|
+
project: {
|
|
990
|
+
ConflictDetection: 'VERSION',
|
|
991
|
+
ConflictHandler: ConflictHandlerType.LAMBDA,
|
|
992
|
+
LambdaConflictHandler: {
|
|
993
|
+
name: 'myLambdaConflictHandler',
|
|
994
|
+
},
|
|
995
|
+
},
|
|
1011
996
|
},
|
|
1012
997
|
});
|
|
1013
|
-
const out = transformer.transform(validSchema);
|
|
1014
998
|
expect(out).toBeDefined();
|
|
1015
999
|
|
|
1016
1000
|
const definition = out.schema;
|
|
@@ -1029,19 +1013,16 @@ describe('ModelTransformer: ', () => {
|
|
|
1029
1013
|
updatedAt: String
|
|
1030
1014
|
}
|
|
1031
1015
|
`;
|
|
1032
|
-
|
|
1033
|
-
|
|
1034
|
-
ConflictDetection: 'VERSION',
|
|
1035
|
-
ConflictHandler: ConflictHandlerType.OPTIMISTIC,
|
|
1036
|
-
};
|
|
1037
|
-
|
|
1038
|
-
const transformer = new GraphQLTransform({
|
|
1016
|
+
const out = testTransform({
|
|
1017
|
+
schema: validSchema,
|
|
1039
1018
|
transformers: [new ModelTransformer()],
|
|
1040
1019
|
resolverConfig: {
|
|
1041
|
-
project:
|
|
1020
|
+
project: {
|
|
1021
|
+
ConflictDetection: 'VERSION',
|
|
1022
|
+
ConflictHandler: ConflictHandlerType.OPTIMISTIC,
|
|
1023
|
+
},
|
|
1042
1024
|
},
|
|
1043
1025
|
});
|
|
1044
|
-
const out = transformer.transform(validSchema);
|
|
1045
1026
|
expect(out).toBeDefined();
|
|
1046
1027
|
|
|
1047
1028
|
const definition = out.schema;
|
|
@@ -1059,18 +1040,16 @@ describe('ModelTransformer: ', () => {
|
|
|
1059
1040
|
}
|
|
1060
1041
|
`;
|
|
1061
1042
|
|
|
1062
|
-
const
|
|
1063
|
-
|
|
1064
|
-
ConflictHandler: ConflictHandlerType.AUTOMERGE,
|
|
1065
|
-
};
|
|
1066
|
-
|
|
1067
|
-
const transformer = new GraphQLTransform({
|
|
1043
|
+
const out = testTransform({
|
|
1044
|
+
schema: validSchema,
|
|
1068
1045
|
transformers: [new ModelTransformer()],
|
|
1069
1046
|
resolverConfig: {
|
|
1070
|
-
project:
|
|
1047
|
+
project: {
|
|
1048
|
+
ConflictDetection: 'VERSION',
|
|
1049
|
+
ConflictHandler: ConflictHandlerType.AUTOMERGE,
|
|
1050
|
+
},
|
|
1071
1051
|
},
|
|
1072
1052
|
});
|
|
1073
|
-
const out = transformer.transform(validSchema);
|
|
1074
1053
|
expect(out).toBeDefined();
|
|
1075
1054
|
|
|
1076
1055
|
const definition = out.schema;
|
|
@@ -1124,11 +1103,10 @@ describe('ModelTransformer: ', () => {
|
|
|
1124
1103
|
name: String
|
|
1125
1104
|
}`;
|
|
1126
1105
|
|
|
1127
|
-
const
|
|
1106
|
+
const out = testTransform({
|
|
1107
|
+
schema: validSchema,
|
|
1128
1108
|
transformers: [new ModelTransformer()],
|
|
1129
1109
|
});
|
|
1130
|
-
|
|
1131
|
-
const out = transformer.transform(validSchema);
|
|
1132
1110
|
expect(out).toBeDefined();
|
|
1133
1111
|
|
|
1134
1112
|
const definition = out.schema;
|
|
@@ -1157,19 +1135,19 @@ describe('ModelTransformer: ', () => {
|
|
|
1157
1135
|
name: String
|
|
1158
1136
|
}`;
|
|
1159
1137
|
|
|
1160
|
-
const
|
|
1138
|
+
const out = testTransform({
|
|
1139
|
+
schema: validSchema,
|
|
1140
|
+
transformers: [new ModelTransformer()],
|
|
1141
|
+
transformParameters: {
|
|
1142
|
+
sandboxModeEnabled: true,
|
|
1143
|
+
},
|
|
1161
1144
|
resolverConfig: {
|
|
1162
1145
|
project: {
|
|
1163
1146
|
ConflictDetection: 'VERSION',
|
|
1164
1147
|
ConflictHandler: ConflictHandlerType.AUTOMERGE,
|
|
1165
1148
|
},
|
|
1166
1149
|
},
|
|
1167
|
-
transformers: [new ModelTransformer()],
|
|
1168
|
-
transformParameters: {
|
|
1169
|
-
sandboxModeEnabled: true,
|
|
1170
|
-
},
|
|
1171
1150
|
});
|
|
1172
|
-
const out = transformer.transform(validSchema);
|
|
1173
1151
|
expect(out).toBeDefined();
|
|
1174
1152
|
const schema = parse(out.schema);
|
|
1175
1153
|
validateModelSchema(schema);
|
|
@@ -1236,7 +1214,12 @@ describe('ModelTransformer: ', () => {
|
|
|
1236
1214
|
}
|
|
1237
1215
|
`;
|
|
1238
1216
|
|
|
1239
|
-
const
|
|
1217
|
+
const out = testTransform({
|
|
1218
|
+
schema: validSchema,
|
|
1219
|
+
transformers: [new ModelTransformer()],
|
|
1220
|
+
transformParameters: {
|
|
1221
|
+
sandboxModeEnabled: true,
|
|
1222
|
+
},
|
|
1240
1223
|
resolverConfig: {
|
|
1241
1224
|
project: {
|
|
1242
1225
|
ConflictDetection: 'VERSION',
|
|
@@ -1256,12 +1239,7 @@ describe('ModelTransformer: ', () => {
|
|
|
1256
1239
|
},
|
|
1257
1240
|
},
|
|
1258
1241
|
},
|
|
1259
|
-
transformers: [new ModelTransformer()],
|
|
1260
|
-
transformParameters: {
|
|
1261
|
-
sandboxModeEnabled: true,
|
|
1262
|
-
},
|
|
1263
1242
|
});
|
|
1264
|
-
const out = transformer.transform(validSchema);
|
|
1265
1243
|
expect(out).toBeDefined();
|
|
1266
1244
|
const schema = parse(out.schema);
|
|
1267
1245
|
validateModelSchema(schema);
|
|
@@ -1337,13 +1315,13 @@ describe('ModelTransformer: ', () => {
|
|
|
1337
1315
|
const validSchema = `type Todo @model {
|
|
1338
1316
|
name: String
|
|
1339
1317
|
}`;
|
|
1340
|
-
const
|
|
1318
|
+
const out = testTransform({
|
|
1319
|
+
schema: validSchema,
|
|
1341
1320
|
transformers: [new ModelTransformer()],
|
|
1342
1321
|
transformParameters: {
|
|
1343
1322
|
sandboxModeEnabled: true,
|
|
1344
1323
|
},
|
|
1345
1324
|
});
|
|
1346
|
-
const out = transformer.transform(validSchema);
|
|
1347
1325
|
|
|
1348
1326
|
const rootStack = out.rootStack;
|
|
1349
1327
|
expect(rootStack).toBeDefined();
|
|
@@ -1366,7 +1344,12 @@ describe('ModelTransformer: ', () => {
|
|
|
1366
1344
|
id: ID
|
|
1367
1345
|
tags: [Tag]
|
|
1368
1346
|
}`;
|
|
1369
|
-
const
|
|
1347
|
+
const out = testTransform({
|
|
1348
|
+
schema: validSchema,
|
|
1349
|
+
transformers: [new ModelTransformer()],
|
|
1350
|
+
transformParameters: {
|
|
1351
|
+
sandboxModeEnabled: true,
|
|
1352
|
+
},
|
|
1370
1353
|
authConfig: {
|
|
1371
1354
|
defaultAuthentication: {
|
|
1372
1355
|
authenticationType: 'AMAZON_COGNITO_USER_POOLS',
|
|
@@ -1377,12 +1360,7 @@ describe('ModelTransformer: ', () => {
|
|
|
1377
1360
|
},
|
|
1378
1361
|
],
|
|
1379
1362
|
},
|
|
1380
|
-
transformers: [new ModelTransformer()],
|
|
1381
|
-
transformParameters: {
|
|
1382
|
-
sandboxModeEnabled: true,
|
|
1383
|
-
},
|
|
1384
1363
|
});
|
|
1385
|
-
const out = transformer.transform(validSchema);
|
|
1386
1364
|
expect(out).toBeDefined();
|
|
1387
1365
|
|
|
1388
1366
|
const schema = parse(out.schema);
|
|
@@ -1418,15 +1396,14 @@ describe('ModelTransformer: ', () => {
|
|
|
1418
1396
|
name: String!
|
|
1419
1397
|
}
|
|
1420
1398
|
`;
|
|
1421
|
-
const
|
|
1399
|
+
const result = testTransform({
|
|
1400
|
+
schema: inputSchema,
|
|
1422
1401
|
transformers: [new ModelTransformer()],
|
|
1423
1402
|
stackMapping: {
|
|
1424
1403
|
CreateBlogResolver: 'myCustomStack1',
|
|
1425
1404
|
UpdateBlogResolver: 'myCustomStack2',
|
|
1426
1405
|
},
|
|
1427
1406
|
});
|
|
1428
|
-
|
|
1429
|
-
const result = transformer.transform(inputSchema);
|
|
1430
1407
|
expect(Object.keys(result.stacks.myCustomStack1.Resources!).includes('CreateBlogResolver')).toBe(true);
|
|
1431
1408
|
expect(Object.keys(result.stacks.myCustomStack2.Resources!).includes('UpdateBlogResolver')).toBe(true);
|
|
1432
1409
|
|
|
@@ -1449,10 +1426,10 @@ describe('ModelTransformer: ', () => {
|
|
|
1449
1426
|
type Query {
|
|
1450
1427
|
todo: Todo @aws_lambda
|
|
1451
1428
|
}`;
|
|
1452
|
-
const
|
|
1429
|
+
const out = testTransform({
|
|
1430
|
+
schema: validSchema,
|
|
1453
1431
|
transformers: [new ModelTransformer()],
|
|
1454
1432
|
});
|
|
1455
|
-
const out = transformer.transform(validSchema);
|
|
1456
1433
|
expect(out).toBeDefined();
|
|
1457
1434
|
|
|
1458
1435
|
const schema = parse(out.schema);
|
|
@@ -1468,10 +1445,10 @@ describe('ModelTransformer: ', () => {
|
|
|
1468
1445
|
id: ID!
|
|
1469
1446
|
}
|
|
1470
1447
|
`;
|
|
1471
|
-
const
|
|
1448
|
+
const out = testTransform({
|
|
1449
|
+
schema: validSchema,
|
|
1472
1450
|
transformers: [new ModelTransformer()],
|
|
1473
1451
|
});
|
|
1474
|
-
const out = transformer.transform(validSchema);
|
|
1475
1452
|
expect(out).toBeDefined();
|
|
1476
1453
|
const definition = out.schema;
|
|
1477
1454
|
expect(definition).toBeDefined();
|
|
@@ -1492,10 +1469,10 @@ describe('ModelTransformer: ', () => {
|
|
|
1492
1469
|
}
|
|
1493
1470
|
`;
|
|
1494
1471
|
|
|
1495
|
-
const
|
|
1472
|
+
const out = testTransform({
|
|
1473
|
+
schema: validSchema,
|
|
1496
1474
|
transformers: [new ModelTransformer()],
|
|
1497
1475
|
});
|
|
1498
|
-
const out = transformer.transform(validSchema);
|
|
1499
1476
|
expect(out).toBeDefined();
|
|
1500
1477
|
const definition = out.schema;
|
|
1501
1478
|
expect(definition).toBeDefined();
|
|
@@ -1519,16 +1496,17 @@ describe('ModelTransformer: ', () => {
|
|
|
1519
1496
|
}
|
|
1520
1497
|
`;
|
|
1521
1498
|
|
|
1522
|
-
const
|
|
1499
|
+
const out = testTransform({
|
|
1500
|
+
schema: validSchema,
|
|
1523
1501
|
transformers: [new ModelTransformer()],
|
|
1524
|
-
|
|
1525
|
-
|
|
1526
|
-
|
|
1527
|
-
|
|
1528
|
-
|
|
1529
|
-
|
|
1530
|
-
|
|
1531
|
-
|
|
1502
|
+
modelToDatasourceMap: new Map(
|
|
1503
|
+
Object.entries({
|
|
1504
|
+
Post: {
|
|
1505
|
+
dbType: 'MySQL',
|
|
1506
|
+
provisionDB: false,
|
|
1507
|
+
},
|
|
1508
|
+
}),
|
|
1509
|
+
),
|
|
1532
1510
|
});
|
|
1533
1511
|
expect(out).toBeDefined();
|
|
1534
1512
|
|