@apollo/gateway 2.3.0-beta.3 → 2.3.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/dist/resultShaping.js +1 -1
- package/dist/resultShaping.js.map +1 -1
- package/package.json +4 -4
- package/src/__tests__/executeQueryPlan.test.ts +70 -0
- package/src/__tests__/resultShaping.test.ts +66 -0
- package/src/resultShaping.ts +1 -2
- package/dist/utilities/cleanErrorOfInaccessibleNames.d.ts +0 -3
- package/dist/utilities/cleanErrorOfInaccessibleNames.d.ts.map +0 -1
- package/dist/utilities/cleanErrorOfInaccessibleNames.js +0 -27
- package/dist/utilities/cleanErrorOfInaccessibleNames.js.map +0 -1
package/dist/resultShaping.js
CHANGED
|
@@ -85,7 +85,7 @@ function applySelectionSet({ input, selectionSet, output, parameters, path, pare
|
|
|
85
85
|
if (inputValue === null && responseName !== federation_internals_1.typenameFieldName) {
|
|
86
86
|
inputValue = (_b = input[federation_internals_1.typenameFieldName]) !== null && _b !== void 0 ? _b : null;
|
|
87
87
|
}
|
|
88
|
-
const type = inputValue !== null && typeof inputValue
|
|
88
|
+
const type = inputValue !== null && typeof inputValue === 'string'
|
|
89
89
|
? (_c = parameters.schema.type(inputValue)) !== null && _c !== void 0 ? _c : parentType
|
|
90
90
|
: parentType;
|
|
91
91
|
if (!(0, federation_internals_1.isObjectType)(type)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resultShaping.js","sourceRoot":"","sources":["../src/resultShaping.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"resultShaping.js","sourceRoot":"","sources":["../src/resultShaping.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@apollo/gateway",
|
|
3
|
-
"version": "2.3.0
|
|
3
|
+
"version": "2.3.0",
|
|
4
4
|
"description": "Apollo Gateway",
|
|
5
5
|
"author": "Apollo <packages@apollographql.com>",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -25,9 +25,9 @@
|
|
|
25
25
|
"access": "public"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@apollo/composition": "2.3.0
|
|
29
|
-
"@apollo/federation-internals": "2.3.0
|
|
30
|
-
"@apollo/query-planner": "2.3.0
|
|
28
|
+
"@apollo/composition": "2.3.0",
|
|
29
|
+
"@apollo/federation-internals": "2.3.0",
|
|
30
|
+
"@apollo/query-planner": "2.3.0",
|
|
31
31
|
"@apollo/server-gateway-interface": "^1.0.2",
|
|
32
32
|
"@apollo/usage-reporting-protobuf": "^4.0.0",
|
|
33
33
|
"@apollo/utils.createhash": "^1.1.0",
|
|
@@ -4229,6 +4229,76 @@ describe('executeQueryPlan', () => {
|
|
|
4229
4229
|
}
|
|
4230
4230
|
`);
|
|
4231
4231
|
});
|
|
4232
|
+
|
|
4233
|
+
test('handles __typename rewriting after forced resolution of implementation type', async () => {
|
|
4234
|
+
const tester = defineSchema({
|
|
4235
|
+
s1: { iResolveReferenceExtra: (id: string) => ({ __typename: id === 'idA' ? 'A' : 'B' }), },
|
|
4236
|
+
});
|
|
4237
|
+
|
|
4238
|
+
let { plan, response } = await tester(`
|
|
4239
|
+
query {
|
|
4240
|
+
iFromS2 {
|
|
4241
|
+
... on B {
|
|
4242
|
+
y
|
|
4243
|
+
}
|
|
4244
|
+
}
|
|
4245
|
+
}
|
|
4246
|
+
`);
|
|
4247
|
+
|
|
4248
|
+
expect(plan).toMatchInlineSnapshot(`
|
|
4249
|
+
QueryPlan {
|
|
4250
|
+
Sequence {
|
|
4251
|
+
Fetch(service: "S2") {
|
|
4252
|
+
{
|
|
4253
|
+
iFromS2 {
|
|
4254
|
+
__typename
|
|
4255
|
+
id
|
|
4256
|
+
}
|
|
4257
|
+
}
|
|
4258
|
+
},
|
|
4259
|
+
Flatten(path: "iFromS2") {
|
|
4260
|
+
Fetch(service: "S1") {
|
|
4261
|
+
{
|
|
4262
|
+
... on I {
|
|
4263
|
+
__typename
|
|
4264
|
+
id
|
|
4265
|
+
}
|
|
4266
|
+
} =>
|
|
4267
|
+
{
|
|
4268
|
+
... on I {
|
|
4269
|
+
__typename
|
|
4270
|
+
}
|
|
4271
|
+
}
|
|
4272
|
+
},
|
|
4273
|
+
},
|
|
4274
|
+
Flatten(path: "iFromS2") {
|
|
4275
|
+
Fetch(service: "S2") {
|
|
4276
|
+
{
|
|
4277
|
+
... on B {
|
|
4278
|
+
__typename
|
|
4279
|
+
id
|
|
4280
|
+
}
|
|
4281
|
+
} =>
|
|
4282
|
+
{
|
|
4283
|
+
... on I {
|
|
4284
|
+
y
|
|
4285
|
+
}
|
|
4286
|
+
}
|
|
4287
|
+
},
|
|
4288
|
+
},
|
|
4289
|
+
},
|
|
4290
|
+
}
|
|
4291
|
+
`);
|
|
4292
|
+
|
|
4293
|
+
expect(response.errors).toBeUndefined();
|
|
4294
|
+
expect(response.data).toMatchInlineSnapshot(`
|
|
4295
|
+
Object {
|
|
4296
|
+
"iFromS2": Object {
|
|
4297
|
+
"y": 20,
|
|
4298
|
+
},
|
|
4299
|
+
}
|
|
4300
|
+
`);
|
|
4301
|
+
});
|
|
4232
4302
|
});
|
|
4233
4303
|
|
|
4234
4304
|
describe('fields with conflicting types needing aliasing', () => {
|
|
@@ -464,4 +464,70 @@ describe('gateway post-processing', () => {
|
|
|
464
464
|
}
|
|
465
465
|
`);
|
|
466
466
|
});
|
|
467
|
+
|
|
468
|
+
test('Handles __typename from subgraphs correctly', () => {
|
|
469
|
+
const schema = buildSchemaFromAST(gql`
|
|
470
|
+
type Query {
|
|
471
|
+
i: [I]
|
|
472
|
+
}
|
|
473
|
+
|
|
474
|
+
interface I {
|
|
475
|
+
x: Int
|
|
476
|
+
}
|
|
477
|
+
|
|
478
|
+
type A implements I {
|
|
479
|
+
x: Int
|
|
480
|
+
}
|
|
481
|
+
|
|
482
|
+
type B implements I {
|
|
483
|
+
x: Int
|
|
484
|
+
}
|
|
485
|
+
`);
|
|
486
|
+
|
|
487
|
+
const input = {
|
|
488
|
+
"i": [
|
|
489
|
+
{
|
|
490
|
+
"__typename": "A",
|
|
491
|
+
"x": 24,
|
|
492
|
+
},
|
|
493
|
+
{
|
|
494
|
+
"__typename": "B",
|
|
495
|
+
"x": 42,
|
|
496
|
+
},
|
|
497
|
+
]
|
|
498
|
+
}
|
|
499
|
+
|
|
500
|
+
const operation = parseOperation(schema, `
|
|
501
|
+
{
|
|
502
|
+
i {
|
|
503
|
+
... on I {
|
|
504
|
+
__typename
|
|
505
|
+
x
|
|
506
|
+
}
|
|
507
|
+
}
|
|
508
|
+
}
|
|
509
|
+
`);
|
|
510
|
+
|
|
511
|
+
expect(computeResponse({
|
|
512
|
+
operation,
|
|
513
|
+
input,
|
|
514
|
+
introspectionHandling,
|
|
515
|
+
})).toMatchInlineSnapshot(`
|
|
516
|
+
Object {
|
|
517
|
+
"data": Object {
|
|
518
|
+
"i": Array [
|
|
519
|
+
Object {
|
|
520
|
+
"__typename": "A",
|
|
521
|
+
"x": 24,
|
|
522
|
+
},
|
|
523
|
+
Object {
|
|
524
|
+
"__typename": "B",
|
|
525
|
+
"x": 42,
|
|
526
|
+
},
|
|
527
|
+
],
|
|
528
|
+
},
|
|
529
|
+
"errors": Array [],
|
|
530
|
+
}
|
|
531
|
+
`);
|
|
532
|
+
});
|
|
467
533
|
})
|
package/src/resultShaping.ts
CHANGED
|
@@ -207,7 +207,7 @@ function applySelectionSet({
|
|
|
207
207
|
|
|
208
208
|
// We're using the type pointed by our input value if there is one and it points to a genuine
|
|
209
209
|
// type of the schema. Otherwise, we default to our parent type.
|
|
210
|
-
const type = inputValue !== null && typeof inputValue
|
|
210
|
+
const type = inputValue !== null && typeof inputValue === 'string'
|
|
211
211
|
? parameters.schema.type(inputValue) ?? parentType
|
|
212
212
|
: parentType;
|
|
213
213
|
|
|
@@ -267,7 +267,6 @@ function pathLastElementDescription(path: ResponsePath, currentType: Type, paren
|
|
|
267
267
|
: `array element of type ${currentType} at index ${element}`;
|
|
268
268
|
}
|
|
269
269
|
|
|
270
|
-
|
|
271
270
|
/**
|
|
272
271
|
* Given some partially computed output value (`outputValue`, possibly `undefined`) for a given `type` and the
|
|
273
272
|
* corresponding input value (`inputValue`, which should never be `undefined` for this method, but can be `null`),
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"cleanErrorOfInaccessibleNames.d.ts","sourceRoot":"","sources":["../../src/utilities/cleanErrorOfInaccessibleNames.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAEtD,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,YAAY,GAClB,YAAY,CAuBd"}
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.cleanErrorOfInaccessibleNames = void 0;
|
|
4
|
-
function cleanErrorOfInaccessibleNames(schema, error) {
|
|
5
|
-
const typeDotFieldRegex = /"([_A-Za-z][_0-9A-Za-z]*)\.([_A-Za-z][_0-9A-Za-z]*)"/g;
|
|
6
|
-
error.message = error.message.replace(typeDotFieldRegex, (match) => {
|
|
7
|
-
const [typeName, fieldName] = match.replace(/"/g, '').split('.');
|
|
8
|
-
const type = schema.getType(typeName);
|
|
9
|
-
if (!type) {
|
|
10
|
-
return '[inaccessible field]';
|
|
11
|
-
}
|
|
12
|
-
else {
|
|
13
|
-
const field = 'getFields' in type ? type.getFields()[fieldName] : null;
|
|
14
|
-
return field ? match : '[inaccessible field]';
|
|
15
|
-
}
|
|
16
|
-
});
|
|
17
|
-
const typeRegex = /"([_A-Za-z][_0-9A-Za-z]*)"/g;
|
|
18
|
-
error.message = error.message.replace(typeRegex, (match) => {
|
|
19
|
-
if (match === '"isTypeOf"' || match === '"resolveType"')
|
|
20
|
-
return match;
|
|
21
|
-
const typeName = match.replace(/"/g, '');
|
|
22
|
-
return schema.getType(typeName) ? match : '[inaccessible type]';
|
|
23
|
-
});
|
|
24
|
-
return error;
|
|
25
|
-
}
|
|
26
|
-
exports.cleanErrorOfInaccessibleNames = cleanErrorOfInaccessibleNames;
|
|
27
|
-
//# sourceMappingURL=cleanErrorOfInaccessibleNames.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"cleanErrorOfInaccessibleNames.js","sourceRoot":"","sources":["../../src/utilities/cleanErrorOfInaccessibleNames.ts"],"names":[],"mappings":";;;AAEA,SAAgB,6BAA6B,CAC3C,MAAqB,EACrB,KAAmB;IAGnB,MAAM,iBAAiB,GAAG,uDAAuD,CAAC;IAClF,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,KAAa,EAAE,EAAE;QACzE,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,sBAAsB,CAAC;SAC/B;aAAM;YACL,MAAM,KAAK,GAAG,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACvE,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,sBAAsB,CAAC;SAC/C;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,6BAA6B,CAAC;IAChD,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,KAAa,EAAE,EAAE;QAEjE,IAAI,KAAK,KAAK,YAAY,IAAI,KAAK,KAAK,eAAe;YAAE,OAAO,KAAK,CAAC;QACtE,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAE,CAAC;QAC1C,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,qBAAqB,CAAC;IAClE,CAAC,CAAC,CAAA;IAEF,OAAO,KAAK,CAAC;AACf,CAAC;AA1BD,sEA0BC"}
|