@apollo/federation-internals 2.8.3 → 2.8.4

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 (5) hide show
  1. package/dist/schemaUpgrader.d.ts.map +1 -1
  2. package/dist/schemaUpgrader.js +50 -31
  3. package/dist/schemaUpgrader.js.map +1 -1
  4. package/package.json +1 -1
  5. package/src/schemaUpgrader.ts +55 -31
package/dist/schemaUpgrader.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"schemaUpgrader.d.ts","sourceRoot":"","sources":["../src/schemaUpgrader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"schemaUpgrader.d.ts","sourceRoot":"","sources":["../src/schemaUpgrader.ts"],"names":[],"mappings":"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"}
package/dist/schemaUpgrader.js CHANGED
@@ -177,6 +177,25 @@ function upgradeSubgraphsIfNecessary(inputs) {
177
177
  const subgraphs = new federation_1.Subgraphs();
178
178
  let errors = [];
179
179
  const subgraphsUsingInterfaceObject = [];
180
+ const objectTypeMap = new Map();
181
+ for (const subgraph of inputs.values()) {
182
+ for (const t of subgraph.schema.objectTypes()) {
183
+ let entry = objectTypeMap.get(t.name);
184
+ if (!entry) {
185
+ entry = new Map();
186
+ objectTypeMap.set(t.name, entry);
187
+ }
188
+ entry.set(subgraph.name, [t, subgraph.metadata()]);
189
+ }
190
+ for (const t of subgraph.schema.interfaceTypes()) {
191
+ let entry = objectTypeMap.get(t.name);
192
+ if (!entry) {
193
+ entry = new Map();
194
+ objectTypeMap.set(t.name, entry);
195
+ }
196
+ entry.set(subgraph.name, [t, subgraph.metadata()]);
197
+ }
198
+ }
180
199
  for (const subgraph of inputs.values()) {
181
200
  if (subgraph.isFed2Subgraph()) {
182
201
  subgraphs.add(subgraph);
@@ -185,8 +204,7 @@ function upgradeSubgraphsIfNecessary(inputs) {
185
204
  }
186
205
  }
187
206
  else {
188
- const otherSubgraphs = inputs.values().filter((s) => s.name !== subgraph.name);
189
- const res = new SchemaUpgrader(subgraph, otherSubgraphs).upgrade();
207
+ const res = new SchemaUpgrader(subgraph, inputs.values(), objectTypeMap).upgrade();
190
208
  if (res.errors) {
191
209
  errors = errors.concat(res.errors);
192
210
  }
@@ -219,23 +237,15 @@ function isRootTypeExtension(type) {
219
237
  && type.isRootType()
220
238
  && (type.hasAppliedDirective(metadata.extendsDirective()) || (type.hasExtensionElements() && !type.hasNonExtensionElements()));
221
239
  }
222
- function resolvesField(subgraph, field) {
223
- const metadata = subgraph.metadata();
224
- const t = subgraph.schema.type(field.parent.name);
225
- if (!t || !(0, definitions_1.isObjectType)(t)) {
226
- return false;
227
- }
228
- const f = t.field(field.name);
229
- return !!f && (!metadata.isFieldExternal(f) || metadata.isFieldPartiallyExternal(f));
230
- }
231
240
  function getField(schema, typeName, fieldName) {
232
241
  const type = schema.type(typeName);
233
242
  return type && (0, definitions_1.isCompositeType)(type) ? type.field(fieldName) : undefined;
234
243
  }
235
244
  class SchemaUpgrader {
236
- constructor(originalSubgraph, otherSubgraphs) {
245
+ constructor(originalSubgraph, allSubgraphs, objectTypeMap) {
237
246
  this.originalSubgraph = originalSubgraph;
238
- this.otherSubgraphs = otherSubgraphs;
247
+ this.allSubgraphs = allSubgraphs;
248
+ this.objectTypeMap = objectTypeMap;
239
249
  this.changes = new utils_1.MultiMap();
240
250
  this.errors = [];
241
251
  this.schema = originalSubgraph.schema.clone();
@@ -280,8 +290,9 @@ class SchemaUpgrader {
280
290
  return;
281
291
  }
282
292
  const extensionAST = (_a = (0, utils_1.firstOf)(type.extensions().values())) === null || _a === void 0 ? void 0 : _a.sourceAST;
283
- for (const subgraph of this.otherSubgraphs) {
284
- const otherType = subgraph.schema.type(type.name);
293
+ const typeInOtherSubgraphs = Array.from(this.objectTypeMap.get(type.name).entries()).filter(([subgraphName, _]) => subgraphName !== this.subgraph.name);
294
+ for (let i = 0; i < typeInOtherSubgraphs.length; i += 1) {
295
+ const otherType = typeInOtherSubgraphs[i][1][0];
285
296
  if (otherType && otherType.hasNonExtensionElements()) {
286
297
  return;
287
298
  }
@@ -425,13 +436,11 @@ class SchemaUpgrader {
425
436
  }
426
437
  }
427
438
  else {
428
- for (const other of this.otherSubgraphs) {
429
- const typeInOther = other.schema.type(type.name);
430
- if (!typeInOther) {
431
- continue;
432
- }
433
- (0, utils_1.assert)((0, definitions_1.isCompositeType)(typeInOther), () => `Type ${type} is of kind ${type.kind} in ${this.subgraph.name} but ${typeInOther.kind} in ${other.name}`);
434
- const keysInOther = typeInOther.appliedDirectivesOf(other.metadata().keyDirective());
439
+ const typeInOtherSubgraphs = Array.from(this.objectTypeMap.get(type.name).entries()).filter(([subgraphName, _]) => subgraphName !== this.subgraph.name);
440
+ for (const [otherSubgraphName, v] of typeInOtherSubgraphs) {
441
+ const [typeInOther, metadata] = v;
442
+ (0, utils_1.assert)((0, definitions_1.isCompositeType)(typeInOther), () => `Type ${type} is of kind ${type.kind} in ${this.subgraph.name} but ${typeInOther.kind} in ${otherSubgraphName}`);
443
+ const keysInOther = typeInOther.appliedDirectivesOf(metadata.keyDirective());
435
444
  if (keysInOther.length === 0) {
436
445
  continue;
437
446
  }
@@ -523,23 +532,33 @@ class SchemaUpgrader {
523
532
  const keyDirective = this.metadata.keyDirective();
524
533
  const shareableDirective = this.metadata.shareableDirective();
525
534
  for (const type of this.schema.objectTypes()) {
526
- if (type.hasAppliedDirective(keyDirective) || type.isRootType()) {
535
+ if (type.isSubscriptionRootType()) {
536
+ continue;
537
+ }
538
+ if (type.hasAppliedDirective(keyDirective) || (type.isRootType())) {
527
539
  for (const field of type.fields()) {
528
540
  if (originalMetadata.isFieldShareable(field)) {
529
541
  continue;
530
542
  }
531
- const otherResolvingSubgraphs = this.otherSubgraphs.filter((s) => resolvesField(s, field));
532
- if (otherResolvingSubgraphs.length > 0 && !field.hasAppliedDirective(shareableDirective)) {
543
+ const entries = Array.from(this.objectTypeMap.get(type.name).entries());
544
+ const typeInOtherSubgraphs = entries.filter(([subgraphName, v]) => {
545
+ if (subgraphName === this.subgraph.name) {
546
+ return false;
547
+ }
548
+ const f = v[0].field(field.name);
549
+ return !!f && (!v[1].isFieldExternal(f) || v[1].isFieldPartiallyExternal(f));
550
+ });
551
+ if (typeInOtherSubgraphs.length > 0 && !field.hasAppliedDirective(shareableDirective)) {
533
552
  field.applyDirective(shareableDirective);
534
- this.addChange(new ShareableFieldAddition(field.coordinate, otherResolvingSubgraphs.map((s) => s.name)));
553
+ this.addChange(new ShareableFieldAddition(field.coordinate, typeInOtherSubgraphs.map(([s]) => s)));
535
554
  }
536
555
  }
537
556
  }
538
557
  else {
539
- const otherDeclaringSubgraphs = this.otherSubgraphs.filter((s) => s.schema.type(type.name));
540
- if (otherDeclaringSubgraphs.length > 0 && !type.hasAppliedDirective(shareableDirective)) {
558
+ const typeInOtherSubgraphs = Array.from(this.objectTypeMap.get(type.name).entries()).filter(([subgraphName, _]) => subgraphName !== this.subgraph.name);
559
+ if (typeInOtherSubgraphs.length > 0 && !type.hasAppliedDirective(shareableDirective)) {
541
560
  type.applyDirective(shareableDirective);
542
- this.addChange(new ShareableTypeAddition(type.coordinate, otherDeclaringSubgraphs.map((s) => s.name)));
561
+ this.addChange(new ShareableTypeAddition(type.coordinate, typeInOtherSubgraphs.map(([s]) => s)));
543
562
  }
544
563
  }
545
564
  }
@@ -555,8 +574,8 @@ class SchemaUpgrader {
555
574
  continue;
556
575
  }
557
576
  if (this.external(element)) {
558
- const tagIsUsedInOtherDefinition = this.otherSubgraphs
559
- .map((s) => getField(s.schema, element.parent.name, element.name))
577
+ const tagIsUsedInOtherDefinition = this.allSubgraphs
578
+ .map((s) => s.name === this.originalSubgraph.name ? undefined : getField(s.schema, element.parent.name, element.name))
560
579
  .filter((f) => !(f && f.hasAppliedDirective('external')))
561
580
  .some((f) => f && f.appliedDirectivesOf('tag').some((d) => (0, values_1.valueEquals)(application.arguments(), d.arguments())));
562
581
  if (tagIsUsedInOtherDefinition) {
package/dist/schemaUpgrader.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"schemaUpgrader.js","sourceRoot":"","sources":["../src/schemaUpgrader.ts"],"names":[],"mappings":";;;AAAA,qCAKiB;AACjB,mCAA8C;AAC9C,+CAcuB;AACvB,6CAUsB;AACtB,mCAAoD;AACpD,qCAAuC;AACvC,2DAA2D;AAsC3D,MAAa,8BAA8B;IAGzC,YAAqB,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;QAFzB,OAAE,GAAG,oCAA6C,CAAC;IAEvB,CAAC;IAEtC,QAAQ;QACN,OAAO,iCAAiC,IAAI,CAAC,KAAK,uCAAuC,CAAC;IAC5F,CAAC;CACF;AARD,wEAQC;AAED,MAAa,oBAAoB;IAG/B,YAAqB,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;QAFxB,OAAE,GAAG,wBAAiC,CAAC;IAEZ,CAAC;IAErC,QAAQ;QACN,OAAO,kBAAkB,IAAI,CAAC,IAAI,qCAAqC,CAAC;IAC1E,CAAC;CACF;AARD,oDAQC;AAED,MAAa,0BAA0B;IAGrC,YAAqB,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;QAFzB,OAAE,GAAG,+BAAwC,CAAC;IAElB,CAAC;IAEtC,QAAQ;QACN,OAAO,wDAAwD,IAAI,CAAC,KAAK,iDAAiD,CAAC;IAC7H,CAAC;CACF;AARD,gEAQC;AAED,MAAa,2BAA2B;IAGtC,YAAqB,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;QAFxB,OAAE,GAAG,iCAA0C,CAAC;IAErB,CAAC;IAErC,QAAQ;QACN,OAAO,+CAA+C,IAAI,CAAC,IAAI,iEAAiE,CAAC;IACnI,CAAC;CACF;AARD,kEAQC;AAED,MAAa,qBAAqB;IAGhC,YAAqB,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;QAFzB,OAAE,GAAG,yBAAkC,CAAC;IAEZ,CAAC;IAEtC,QAAQ;QACN,OAAO,4BAA4B,IAAI,CAAC,KAAK,0DAA0D,CAAC;IAC1G,CAAC;CACF;AARD,sDAQC;AAED,MAAa,iCAAiC;IAG5C,YAAqB,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;QAFxB,OAAE,GAAG,wCAAiD,CAAC;IAE5B,CAAC;IAErC,QAAQ;QACN,OAAO,gBAAgB,IAAI,CAAC,IAAI,iFAAiF,CAAC;IACpH,CAAC;CACF;AARD,8EAQC;AAED,MAAa,iCAAiC;IAG5C,YAAqB,MAAc,EAAW,OAAe;QAAxC,WAAM,GAAN,MAAM,CAAQ;QAAW,YAAO,GAAP,OAAO,CAAQ;QAFpD,OAAE,GAAG,uCAAgD,CAAC;IAEC,CAAC;IAEjE,QAAQ;QACN,OAAO,qBAAqB,IAAI,CAAC,OAAO,QAAQ,IAAI,CAAC,MAAM,4CAA4C,CAAC;IAC1G,CAAC;CACF;AARD,8EAQC;AAED,MAAa,uCAAuC;IAGlD,YAAqB,MAAc,EAAW,QAAgB,EAAW,OAAe;QAAnE,WAAM,GAAN,MAAM,CAAQ;QAAW,aAAQ,GAAR,QAAQ,CAAQ;QAAW,YAAO,GAAP,OAAO,CAAQ;QAF/E,OAAE,GAAG,8CAAuD,CAAC;IAEqB,CAAC;IAE5F,QAAQ;QACN,OAAO,qBAAqB,IAAI,CAAC,QAAQ,QAAQ,IAAI,CAAC,MAAM,QAAQ,IAAI,CAAC,OAAO,gDAAgD,CAAC;IACnI,CAAC;CACF;AARD,0FAQC;AAED,MAAa,sBAAsB;IAGjC,YAAqB,KAAa,EAAW,kBAA4B;QAApD,UAAK,GAAL,KAAK,CAAQ;QAAW,uBAAkB,GAAlB,kBAAkB,CAAU;QAFhE,OAAE,GAAG,0BAAmC,CAAC;IAE0B,CAAC;IAE7E,QAAQ;QACN,OAAO,8BAA8B,IAAI,CAAC,KAAK,6BAA6B,IAAA,+BAAkB,EAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAC5H,CAAC;CACF;AARD,wDAQC;AAED,MAAa,qBAAqB;IAGhC,YAAqB,IAAY,EAAW,kBAA4B;QAAnD,SAAI,GAAJ,IAAI,CAAQ;QAAW,uBAAkB,GAAlB,kBAAkB,CAAU;QAF/D,OAAE,GAAG,yBAAkC,CAAC;IAE0B,CAAC;IAE5E,QAAQ;QACN,OAAO,6BAA6B,IAAI,CAAC,IAAI,mDAAmD,IAAA,+BAAkB,EAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAChJ,CAAC;CACF;AARD,sDAQC;AAED,MAAa,qBAAqB;IAGhC,YAAqB,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;QAFxB,OAAE,GAAG,0BAAmC,CAAC;IAEd,CAAC;IAErC,QAAQ;QACN,OAAO,8BAA8B,IAAI,CAAC,IAAI,8FAA8F,CAAC;IAC/I,CAAC;CACF;AARD,sDAQC;AAED,MAAa,yCAAyC;IAGpD,YAAqB,KAAa,EAAW,SAAiB;QAAzC,UAAK,GAAL,KAAK,CAAQ;QAAW,cAAS,GAAT,SAAS,CAAQ;QAFrD,OAAE,GAAG,iDAA0D,CAAC;IAER,CAAC;IAElE,QAAQ;QACN,OAAO,YAAY,IAAI,CAAC,SAAS,wBAAwB,IAAI,CAAC,KAAK,wCAAwC,IAAI,CAAC,SAAS,4DAA4D,CAAC;IACxL,CAAC;CACF;AARD,8FAQC;AAED,MAAa,6BAA6B;IAGxC,YAAqB,KAAa,EAAW,IAAY;QAApC,UAAK,GAAL,KAAK,CAAQ;QAAW,SAAI,GAAJ,IAAI,CAAQ;QAFhD,OAAE,GAAG,mCAA4C,CAAC;IAEC,CAAC;IAE7D,QAAQ;QACN,OAAO,yCAAyC,IAAI,CAAC,KAAK,qCAAqC,IAAI,CAAC,IAAI,uFAAuF,CAAC;IAClM,CAAC;CACF;AARD,sEAQC;AAED,MAAa,8BAA8B;IAGzC,YAAqB,OAAe,EAAW,SAAiB,EAAW,MAAc,EAAW,KAAa;QAA5F,YAAO,GAAP,OAAO,CAAQ;QAAW,cAAS,GAAT,SAAS,CAAQ;QAAW,WAAM,GAAN,MAAM,CAAQ;QAAW,UAAK,GAAL,KAAK,CAAQ;QAFxG,OAAE,GAAG,oCAA6C,CAAC;IAEwD,CAAC;IAErH,QAAQ;QACN,OAAO,4CAA4C,IAAI,CAAC,SAAS,SAAS,IAAI,CAAC,OAAO,iCAAiC,IAAI,CAAC,MAAM,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;IACxJ,CAAC;CACF;AARD,wEAQC;AAED,MAAa,oBAAoB;IAG/B,YAAqB,WAAmB,EAAW,OAAe;QAA7C,gBAAW,GAAX,WAAW,CAAQ;QAAW,YAAO,GAAP,OAAO,CAAQ;QAFzD,OAAE,GAAG,yBAAkC,CAAC;IAEoB,CAAC;IAEtE,QAAQ;QACN,OAAO,WAAW,IAAI,CAAC,WAAW,8BAA8B,IAAI,CAAC,OAAO,oDAAoD,CAAC;IACnI,CAAC;CACF;AARD,oDAQC;AAED,SAAgB,2BAA2B,CAAC,MAAiB;IAC3D,MAAM,OAAO,GAAgC,IAAI,GAAG,EAAE,CAAC;IACvD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC;QACrD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IACxC,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,sBAAS,EAAE,CAAC;IAClC,IAAI,MAAM,GAAmB,EAAE,CAAC;IAChC,MAAM,6BAA6B,GAAG,EAAE,CAAC;IACzC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACvC,IAAI,QAAQ,CAAC,cAAc,EAAE,EAAE,CAAC;YAC9B,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxB,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC,wBAAwB,EAAE,CAAC,YAAY,EAAE,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBAC3E,6BAA6B,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC/E,MAAM,GAAG,GAAG,IAAI,cAAc,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC;YACnE,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;gBACf,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC5B,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,6BAA6B,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpE,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAE5F,MAAM,GAAG,CAAE,cAAM,CAAC,4BAA4B,CAAC,GAAG,CAChD,4LAA4L;kBAC1L,+BAA+B,IAAA,+BAAkB,EAAC,6BAA6B,CAAC,QAAQ,IAAA,+BAAkB,EAAC,aAAa,CAAC,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,gCAAgC,CACjN,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;AACnE,CAAC;AApCD,kEAoCC;AAcD,SAAS,yBAAyB,CAAC,IAAe;IAChD,MAAM,QAAQ,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACnD,IAAA,cAAM,EAAC,QAAQ,EAAE,6BAA6B,CAAC,CAAC;IAChD,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACxE,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,SAAS,CAAC;WAC5C,CAAC,IAAA,0BAAY,EAAC,IAAI,CAAC,IAAI,IAAA,6BAAe,EAAC,IAAI,CAAC,CAAC;WAC7C,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC;AACtD,CAAC;AAKD,SAAS,mBAAmB,CAAC,IAAe;IAC1C,MAAM,QAAQ,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACnD,IAAA,cAAM,EAAC,QAAQ,EAAE,6BAA6B,CAAC,CAAC;IAChD,OAAO,IAAA,0BAAY,EAAC,IAAI,CAAC;WACpB,IAAI,CAAC,UAAU,EAAE;WACjB,CAAC,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC;AACnI,CAAC;AAED,SAAS,aAAa,CAAC,QAAkB,EAAE,KAAkC;IAC3E,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;IACrC,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClD,IAAI,CAAC,CAAC,IAAI,CAAC,IAAA,0BAAY,EAAC,CAAC,CAAC,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9B,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC;AACvF,CAAC;AAED,SAAS,QAAQ,CAAC,MAAc,EAAE,QAAgB,EAAE,SAAiB;IACnE,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnC,OAAO,IAAI,IAAI,IAAA,6BAAe,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3E,CAAC;AAED,MAAM,cAAc;IAOlB,YAA6B,gBAA0B,EAAmB,cAA0B;QAAvE,qBAAgB,GAAhB,gBAAgB,CAAU;QAAmB,mBAAc,GAAd,cAAc,CAAY;QANnF,YAAO,GAAG,IAAI,gBAAQ,EAAkC,CAAC;QAIzD,WAAM,GAAmB,EAAE,CAAC;QAM3C,IAAI,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC9C,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAG7B,IAAI,CAAC,QAAQ,GAAG,IAAI,qBAAQ,CAAC,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACvF,IAAI,CAAC;YACH,IAAA,oCAAuB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YASX,MAAM,MAAM,GAAG,IAAA,mBAAW,EAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBAEN,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC3C,CAAC;IAEO,QAAQ,CAAC,CAAe;QAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,+BAAkB,EAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAM,CAAC,eAAe,CAAC,CAAC,CAAC;IACtF,CAAC;IAEO,qBAAqB;QAM3B,KAAK,MAAM,QAAQ,IAAI,kCAAiB,EAAE,CAAC;YACzC,MAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,0BAA0B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACtG,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAClD,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,CAAC,MAAM,CAAC,eAAe,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;IACH,CAAC;IAEO,QAAQ,CAAC,GAAyB;QACxC,MAAM,YAAY,GAAG,GAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAChF,OAAO,YAAY,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACjE,CAAC;IAEO,SAAS,CAAC,MAAqB;QACrC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAEO,2BAA2B,CAAC,IAAe;;QAGjD,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC;YAClE,OAAO;QACT,CAAC;QAED,MAAM,YAAY,GAAG,MAAA,IAAA,eAAO,EAAiB,IAAI,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,CAAC,0CAAE,SAAS,CAAC;QACpF,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YAC3C,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClD,IAAI,SAAS,IAAI,SAAS,CAAC,uBAAuB,EAAE,EAAE,CAAC;gBACrD,OAAO;YACT,CAAC;QACH,CAAC;QAGD,IAAI,CAAC,QAAQ,CAAC,cAAM,CAAC,sBAAsB,CAAC,GAAG,CAC7C,SAAS,IAAI,gEAAgE,IAAI,oBAAoB,EACrG,EAAE,KAAK,EAAE,YAAY,EAAE,CACxB,CAAC,CAAC;IACL,CAAC;IAEO,qBAAqB;QAC3B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;YACxC,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,IAAI,CAAC,gCAAgC,EAAE,CAAC;QAExC,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACjC,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAGnC,IAAI,CAAC,8BAA8B,EAAE,CAAC;QAEtC,IAAI,CAAC,8BAA8B,EAAE,CAAC;QAEtC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAE5B,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAGnC,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAIpC,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE7B,IAAI,CAAC,YAAY,EAAE,CAAC;QAEpB,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAI3B,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;QACjC,CAAC;QAED,IAAI,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACzB,OAAO;gBACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,MAAM,GAAG,IAAA,mBAAW,EAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,CAAC,CAAC;YACV,CAAC;YAMD,OAAO,EAAE,MAAM,EAAE,CAAC;QACpB,CAAC;IACH,CAAC;IAEO,gCAAgC;;QACtC,KAAK,MAAM,SAAS,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC;YAE7H,KAAK,MAAM,WAAW,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC;gBAC/D,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC;gBAC9C,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;oBAG/B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,EAAE,CAAC;wBACxE,IAAI,CAAC,qCAAqC,CAAC,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;oBACzH,CAAC;oBACD,SAAS;gBACX,CAAC;gBAKD,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC;gBACpC,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBACxC,KAAK,MAAM,OAAO,IAAI,MAAA,KAAK,CAAC,SAAS,mCAAI,EAAE,EAAE,CAAC;wBAC5C,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;4BACpC,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,cAAI,CAAC,IAAI,EAAE,CAAC;gCAGrC,IAAI,CAAC,qCAAqC,CAAC,WAAW,EAAE,IAAA,eAAQ,EAAC,KAAK,CAAC,EAAE,MAAM,EAAE;oCAC/E,GAAG,KAAK;oCACR,SAAS,EAAE,CAAC;4CACV,GAAG,OAAO;4CACV,KAAK,EAAE;gDACL,IAAI,EAAE,cAAI,CAAC,MAAM;gDACjB,KAAK,EAAE,MAAM;6CACd;yCACF,CAAC;iCACH,CAAC,CAAA;gCACF,MAAM;4BACR,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEO,yBAAyB;QAC/B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC;YAC/C,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC;gBACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACtC,IAAI,QAAQ,EAAE,CAAC;oBACb,IAAI,CAAC,SAAS,CAAC,IAAI,0BAA0B,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;oBACjE,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACpB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEO,2BAA2B;QACjC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;YAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAChF,IAAI,QAAQ,EAAE,CAAC;gBACb,IAAI,CAAC,SAAS,CAAC,IAAI,2BAA2B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;gBACjE,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpB,CAAC;QACH,CAAC;IACH,CAAC;IAEO,qCAAqC,CAC3C,WAA8D,EAC9D,MAAc,EACd,MAAc,EACd,gBAAqC;QAErC,MAAM,SAAS,GAAG,WAAW,CAAC,UAAW,CAAC;QAE1C,MAAM,MAAM,GAAG,WAAW,CAAC,MAA2C,CAAC;QACvE,WAAW,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,EAAC,MAAM,EAAC,CAAC,CAAC;QAChE,YAAY,CAAC,SAAS,GAAG,gBAAgB,CAAC;QAC1C,IAAI,CAAC,SAAS,CAAC,IAAI,8BAA8B,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACzH,CAAC;IAEO,8BAA8B;QACpC,IAAA,8CAAiC,EAC/B,IAAI,CAAC,MAAM,EACX,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE;YAC3B,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC,SAAS,CAAC,IAAI,uCAAuC,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YACzH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,SAAS,CAAC,IAAI,iCAAiC,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YAC/F,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IAEO,8BAA8B;QACpC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;YACvC,IAAI,CAAC,IAAA,6BAAe,EAAC,IAAI,CAAC,EAAE,CAAC;gBAC3B,SAAS;YACX,CAAC;YACD,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnE,SAAS;YACX,CAAC;YAED,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;YAC/E,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAE/B,KAAK,MAAM,cAAc,IAAI,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC;oBACpF,IAAA,gCAAmB,EAAC;wBAClB,UAAU,EAAE,IAAI;wBAChB,SAAS,EAAE,cAAc;wBACzB,qCAAqC,EAAE,KAAK;wBAC5C,QAAQ,EAAE,KAAK;qBAChB,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;wBAEnB,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;4BAC1B,OAAO;wBACT,CAAC;wBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;wBACtC,IAAI,QAAQ,EAAE,CAAC;4BACb,IAAI,CAAC,SAAS,CAAC,IAAI,8BAA8B,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;4BACrE,QAAQ,CAAC,MAAM,EAAE,CAAC;wBACpB,CAAC;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;iBAAM,CAAC;gBAYN,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;oBACxC,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACjD,IAAI,CAAC,WAAW,EAAE,CAAC;wBACjB,SAAS;oBACX,CAAC;oBACD,IAAA,cAAM,EAAC,IAAA,6BAAe,EAAC,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,QAAQ,IAAI,eAAe,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,QAAQ,WAAW,CAAC,IAAI,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;oBACrJ,MAAM,WAAW,GAAG,WAAW,CAAC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC;oBACrF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBAC7B,SAAS;oBACX,CAAC;oBACD,IAAA,gCAAmB,EAAC;wBAClB,UAAU,EAAE,WAAW;wBACvB,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;wBACzB,qCAAqC,EAAE,KAAK;wBAC5C,QAAQ,EAAE,KAAK;qBAChB,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;wBACnB,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;4BACjC,OAAO;wBACT,CAAC;wBAGD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBACxC,IAAI,CAAC,QAAQ,EAAE,CAAC;4BACd,OAAO;wBACT,CAAC;wBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;wBACzC,IAAI,QAAQ,EAAE,CAAC;4BACb,IAAI,CAAC,SAAS,CAAC,IAAI,8BAA8B,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;4BACxE,QAAQ,CAAC,MAAM,EAAE,CAAC;wBACpB,CAAC;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEO,oBAAoB;QAC1B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;YACvC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnE,SAAS;YACX,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,IAAI,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;YAC1D,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,CAAC;IACH,CAAC;IAEO,qBAAqB;QAC3B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;YACvC,IAAI,CAAC,IAAA,0BAAY,EAAC,IAAI,CAAC,IAAI,CAAC,IAAA,6BAAe,EAAC,IAAI,CAAC,EAAE,CAAC;gBAClD,SAAS;YACX,CAAC;YACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;gBAClC,IAAI,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC9E,IAAI,CAAC,SAAS,CAAC,IAAI,qBAAqB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;oBAC5D,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjB,CAAC;YACH,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;gBACtB,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;oBACxB,IAAI,CAAC,QAAQ,CAAC,cAAM,CAAC,8BAA8B,CAAC,GAAG,CACrD,QAAQ,IAAI,8HAA8H,EAC1I,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,CAC1B,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBAGN,IAAI,CAAC,SAAS,CAAC,IAAI,iCAAiC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;oBACjE,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEO,2BAA2B;QACjC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC;YAChD,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC;gBACjF,IAAI,CAAC,SAAS,CAAC,IAAI,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBACrD,WAAW,CAAC,MAAM,EAAE,CAAC;YACvB,CAAC;YACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;gBAClC,KAAK,MAAM,SAAS,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC;oBAC/F,KAAK,MAAM,WAAW,IAAI,KAAK,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC;wBAC/D,IAAI,CAAC,SAAS,CAAC,IAAI,yCAAyC,CAAC,KAAK,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;wBAChG,WAAW,CAAC,MAAM,EAAE,CAAC;oBACvB,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEO,4BAA4B;QAClC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;YAC7C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;gBAClC,IAAI,IAAA,6BAAe,EAAC,IAAA,sBAAQ,EAAC,KAAK,CAAC,IAAK,CAAC,CAAC,EAAE,CAAC;oBAC3C,SAAS;gBACX,CAAC;gBACD,KAAK,MAAM,WAAW,IAAI,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC;oBACvF,IAAI,CAAC,SAAS,CAAC,IAAI,6BAA6B,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,IAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;oBAC5F,WAAW,CAAC,MAAM,EAAE,CAAC;gBACvB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEO,YAAY;QAClB,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;QAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;QAClD,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;QAI9D,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;YAC7C,IAAI,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC;gBAChE,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;oBAIlC,IAAI,gBAAgB,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;wBAC7C,SAAS;oBACX,CAAC;oBACD,MAAM,uBAAuB,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;oBAC3F,IAAI,uBAAuB,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,EAAE,CAAC;wBACzF,KAAK,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;wBACzC,IAAI,CAAC,SAAS,CAAC,IAAI,sBAAsB,CAAC,KAAK,CAAC,UAAU,EAAE,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBAC3G,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,uBAAuB,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC5F,IAAI,uBAAuB,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,EAAE,CAAC;oBACxF,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;oBACxC,IAAI,CAAC,SAAS,CAAC,IAAI,qBAAqB,CAAC,IAAI,CAAC,UAAU,EAAE,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACzG,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEO,mBAAmB;QACzB,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QAGD,KAAK,MAAM,WAAW,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC;YAClE,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC;YACnC,IAAI,CAAC,CAAC,OAAO,YAAY,6BAAe,CAAC,EAAE,CAAC;gBAC1C,SAAS;YACX,CAAC;YACD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3B,MAAM,0BAA0B,GAAG,IAAI,CAAC,cAAc;qBACnD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;qBACjE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAC;qBACxD,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,oBAAW,EAAC,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;gBAEnH,IAAI,0BAA0B,EAAE,CAAC;oBAC/B,IAAI,CAAC,SAAS,CAAC,IAAI,oBAAoB,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;oBACrF,WAAW,CAAC,MAAM,EAAE,CAAC;gBACvB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
1
+ {"version":3,"file":"schemaUpgrader.js","sourceRoot":"","sources":["../src/schemaUpgrader.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@apollo/federation-internals",
3
- "version": "2.8.3",
3
+ "version": "2.8.4",
4
4
  "description": "Apollo Federation internal utilities",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/schemaUpgrader.ts CHANGED
@@ -11,6 +11,7 @@ import {
11
11
  Directive,
12
12
  Extension,
13
13
  FieldDefinition,
14
+ InterfaceType,
14
15
  isCompositeType,
15
16
  isInterfaceType,
16
17
  isObjectType,
@@ -230,6 +231,28 @@ export function upgradeSubgraphsIfNecessary(inputs: Subgraphs): UpgradeResult {
230
231
  const subgraphs = new Subgraphs();
231
232
  let errors: GraphQLError[] = [];
232
233
  const subgraphsUsingInterfaceObject = [];
234
+
235
+ // build a data structure to help us do computation only once
236
+ const objectTypeMap = new Map<string, Map<string, [ObjectType | InterfaceType, FederationMetadata]>>();
237
+ for (const subgraph of inputs.values()) {
238
+ for (const t of subgraph.schema.objectTypes()) {
239
+ let entry = objectTypeMap.get(t.name);
240
+ if (!entry) {
241
+ entry = new Map();
242
+ objectTypeMap.set(t.name, entry);
243
+ }
244
+ entry.set(subgraph.name, [t, subgraph.metadata()]);
245
+ }
246
+ for (const t of subgraph.schema.interfaceTypes()) {
247
+ let entry = objectTypeMap.get(t.name);
248
+ if (!entry) {
249
+ entry = new Map();
250
+ objectTypeMap.set(t.name, entry);
251
+ }
252
+ entry.set(subgraph.name, [t, subgraph.metadata()]);
253
+ }
254
+ }
255
+
233
256
  for (const subgraph of inputs.values()) {
234
257
  if (subgraph.isFed2Subgraph()) {
235
258
  subgraphs.add(subgraph);
@@ -237,8 +260,7 @@ export function upgradeSubgraphsIfNecessary(inputs: Subgraphs): UpgradeResult {
237
260
  subgraphsUsingInterfaceObject.push(subgraph.name);
238
261
  }
239
262
  } else {
240
- const otherSubgraphs = inputs.values().filter((s) => s.name !== subgraph.name);
241
- const res = new SchemaUpgrader(subgraph, otherSubgraphs).upgrade();
263
+ const res = new SchemaUpgrader(subgraph, inputs.values(), objectTypeMap).upgrade();
242
264
  if (res.errors) {
243
265
  errors = errors.concat(res.errors);
244
266
  } else {
@@ -291,16 +313,6 @@ function isRootTypeExtension(type: NamedType): boolean {
291
313
  && (type.hasAppliedDirective(metadata.extendsDirective()) || (type.hasExtensionElements() && !type.hasNonExtensionElements()));
292
314
  }
293
315
 
294
- function resolvesField(subgraph: Subgraph, field: FieldDefinition<ObjectType>): boolean {
295
- const metadata = subgraph.metadata();
296
- const t = subgraph.schema.type(field.parent.name);
297
- if (!t || !isObjectType(t)) {
298
- return false;
299
- }
300
- const f = t.field(field.name);
301
- return !!f && (!metadata.isFieldExternal(f) || metadata.isFieldPartiallyExternal(f));
302
- }
303
-
304
316
  function getField(schema: Schema, typeName: string, fieldName: string): FieldDefinition<CompositeType> | undefined {
305
317
  const type = schema.type(typeName);
306
318
  return type && isCompositeType(type) ? type.field(fieldName) : undefined;
@@ -313,7 +325,7 @@ class SchemaUpgrader {
313
325
  private readonly metadata: FederationMetadata;
314
326
  private readonly errors: GraphQLError[] = [];
315
327
 
316
- constructor(private readonly originalSubgraph: Subgraph, private readonly otherSubgraphs: Subgraph[]) {
328
+ constructor(private readonly originalSubgraph: Subgraph, private readonly allSubgraphs: readonly Subgraph[], private readonly objectTypeMap: Map<string, Map<string, [ObjectType | InterfaceType, FederationMetadata]>>) {
317
329
  // Note that as we clone the original schema, the 'sourceAST' values in the elements of the new schema will be those of the original schema
318
330
  // and those won't be updated as we modify the schema to make it fed2-enabled. This is _important_ for us here as this is what ensures that
319
331
  // later merge errors "AST" nodes ends up pointing to the original schema, the one that make sense to the user.
@@ -380,8 +392,9 @@ class SchemaUpgrader {
380
392
  }
381
393
 
382
394
  const extensionAST = firstOf<Extension<any>>(type.extensions().values())?.sourceAST;
383
- for (const subgraph of this.otherSubgraphs) {
384
- const otherType = subgraph.schema.type(type.name);
395
+ const typeInOtherSubgraphs = Array.from(this.objectTypeMap.get(type.name)!.entries()).filter(([subgraphName, _]) => subgraphName !== this.subgraph.name);
396
+ for (let i = 0; i < typeInOtherSubgraphs.length; i += 1) {
397
+ const otherType = typeInOtherSubgraphs[i][1][0];
385
398
  if (otherType && otherType.hasNonExtensionElements()) {
386
399
  return;
387
400
  }
@@ -589,13 +602,12 @@ class SchemaUpgrader {
589
602
  // case territory in the first place, so this is probably good enough (that is, there is
590
603
  // customer schema for which what we do here matter but not that I know of for which it's
591
604
  // not good enough).
592
- for (const other of this.otherSubgraphs) {
593
- const typeInOther = other.schema.type(type.name);
594
- if (!typeInOther) {
595
- continue;
596
- }
597
- assert(isCompositeType(typeInOther), () => `Type ${type} is of kind ${type.kind} in ${this.subgraph.name} but ${typeInOther.kind} in ${other.name}`);
598
- const keysInOther = typeInOther.appliedDirectivesOf(other.metadata().keyDirective());
605
+ const typeInOtherSubgraphs = Array.from(this.objectTypeMap.get(type.name)!.entries()).filter(([subgraphName, _]) => subgraphName !== this.subgraph.name);
606
+
607
+ for (const [otherSubgraphName, v] of typeInOtherSubgraphs) {
608
+ const [typeInOther, metadata] = v;
609
+ assert(isCompositeType(typeInOther), () => `Type ${type} is of kind ${type.kind} in ${this.subgraph.name} but ${typeInOther.kind} in ${otherSubgraphName}`);
610
+ const keysInOther = typeInOther.appliedDirectivesOf(metadata.keyDirective());
599
611
  if (keysInOther.length === 0) {
600
612
  continue;
601
613
  }
@@ -702,7 +714,10 @@ class SchemaUpgrader {
702
714
  // - to every "value type" (in the fed1 sense of non-root type and non-entity) if it is used in any other subgraphs
703
715
  // - to any (non-external) field of an entity/root-type that is not a key field and if another subgraphs resolve it (fully or partially through @provides)
704
716
  for (const type of this.schema.objectTypes()) {
705
- if (type.hasAppliedDirective(keyDirective) || type.isRootType()) {
717
+ if(type.isSubscriptionRootType()) {
718
+ continue;
719
+ }
720
+ if (type.hasAppliedDirective(keyDirective) || (type.isRootType())) {
706
721
  for (const field of type.fields()) {
707
722
  // To know if the field is a "key" field which doesn't need shareable, we rely on whether the field is shareable in the original
708
723
  // schema (the fed1 version), because as fed1 schema will have no @shareable, the key fields will effectively be the only field
@@ -710,17 +725,26 @@ class SchemaUpgrader {
710
725
  if (originalMetadata.isFieldShareable(field)) {
711
726
  continue;
712
727
  }
713
- const otherResolvingSubgraphs = this.otherSubgraphs.filter((s) => resolvesField(s, field));
714
- if (otherResolvingSubgraphs.length > 0 && !field.hasAppliedDirective(shareableDirective)) {
728
+
729
+ const entries = Array.from(this.objectTypeMap.get(type.name)!.entries());
730
+ const typeInOtherSubgraphs = entries.filter(([subgraphName, v]) => {
731
+ if (subgraphName === this.subgraph.name) {
732
+ return false;
733
+ }
734
+ const f = v[0].field(field.name);
735
+ return !!f && (!v[1].isFieldExternal(f) || v[1].isFieldPartiallyExternal(f));
736
+ });
737
+
738
+ if (typeInOtherSubgraphs.length > 0 && !field.hasAppliedDirective(shareableDirective)) {
715
739
  field.applyDirective(shareableDirective);
716
- this.addChange(new ShareableFieldAddition(field.coordinate, otherResolvingSubgraphs.map((s) => s.name)));
740
+ this.addChange(new ShareableFieldAddition(field.coordinate, typeInOtherSubgraphs.map(([s]) => s)));
717
741
  }
718
742
  }
719
743
  } else {
720
- const otherDeclaringSubgraphs = this.otherSubgraphs.filter((s) => s.schema.type(type.name));
721
- if (otherDeclaringSubgraphs.length > 0 && !type.hasAppliedDirective(shareableDirective)) {
744
+ const typeInOtherSubgraphs = Array.from(this.objectTypeMap.get(type.name)!.entries()).filter(([subgraphName, _]) => subgraphName !== this.subgraph.name);
745
+ if (typeInOtherSubgraphs.length > 0 && !type.hasAppliedDirective(shareableDirective)) {
722
746
  type.applyDirective(shareableDirective);
723
- this.addChange(new ShareableTypeAddition(type.coordinate, otherDeclaringSubgraphs.map((s) => s.name)));
747
+ this.addChange(new ShareableTypeAddition(type.coordinate, typeInOtherSubgraphs.map(([s]) => s)));
724
748
  }
725
749
  }
726
750
  }
@@ -739,8 +763,8 @@ class SchemaUpgrader {
739
763
  continue;
740
764
  }
741
765
  if (this.external(element)) {
742
- const tagIsUsedInOtherDefinition = this.otherSubgraphs
743
- .map((s) => getField(s.schema, element.parent.name, element.name))
766
+ const tagIsUsedInOtherDefinition = this.allSubgraphs
767
+ .map((s) => s.name === this.originalSubgraph.name ? undefined : getField(s.schema, element.parent.name, element.name))
744
768
  .filter((f) => !(f && f.hasAppliedDirective('external')))
745
769
  .some((f) => f && f.appliedDirectivesOf('tag').some((d) => valueEquals(application.arguments(), d.arguments())));
746
770