npm - @apollo/federation-internals - Versions diffs - 2.2.3 → 2.3.0-beta.1 - Mend

@apollo/federation-internals 2.2.3 → 2.3.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 (63) hide show

package/dist/definitions.d.ts +2 -0
package/dist/definitions.d.ts.map +1 -1
package/dist/definitions.js +14 -2
package/dist/definitions.js.map +1 -1
package/dist/error.d.ts +5 -1
package/dist/error.d.ts.map +1 -1
package/dist/error.js +21 -12
package/dist/error.js.map +1 -1
package/dist/extractSubgraphsFromSupergraph.d.ts.map +1 -1
package/dist/extractSubgraphsFromSupergraph.js +31 -5
package/dist/extractSubgraphsFromSupergraph.js.map +1 -1
package/dist/federation.d.ts +14 -6
package/dist/federation.d.ts.map +1 -1
package/dist/federation.js +141 -62
package/dist/federation.js.map +1 -1
package/dist/federationSpec.d.ts +2 -1
package/dist/federationSpec.d.ts.map +1 -1
package/dist/federationSpec.js +11 -2
package/dist/federationSpec.js.map +1 -1
package/dist/joinSpec.d.ts +9 -1
package/dist/joinSpec.d.ts.map +1 -1
package/dist/joinSpec.js +24 -2
package/dist/joinSpec.js.map +1 -1
package/dist/operations.d.ts +11 -0
package/dist/operations.d.ts.map +1 -1
package/dist/operations.js +46 -1
package/dist/operations.js.map +1 -1
package/dist/schemaUpgrader.d.ts.map +1 -1
package/dist/schemaUpgrader.js +9 -0
package/dist/schemaUpgrader.js.map +1 -1
package/dist/supergraphs.d.ts.map +1 -1
package/dist/supergraphs.js +2 -0
package/dist/supergraphs.js.map +1 -1
package/dist/tagSpec.d.ts +1 -0
package/dist/tagSpec.d.ts.map +1 -1
package/dist/tagSpec.js +9 -1
package/dist/tagSpec.js.map +1 -1
package/dist/types.d.ts.map +1 -1
package/dist/types.js +3 -6
package/dist/types.js.map +1 -1
package/dist/utils.js +1 -1
package/dist/utils.js.map +1 -1
package/package.json +2 -3
package/src/__tests__/extractSubgraphsFromSupergraph.test.ts +0 -1
package/src/__tests__/matchers/toMatchString.ts +5 -1
package/src/__tests__/schemaUpgrader.test.ts +43 -0
package/src/__tests__/subgraphValidation.test.ts +126 -57
package/src/__tests__/testUtils.ts +28 -0
package/src/__tests__/values.test.ts +1 -1
package/src/definitions.ts +12 -0
package/src/error.ts +47 -16
package/src/extractSubgraphsFromSupergraph.ts +40 -9
package/src/federation.ts +178 -73
package/src/federationSpec.ts +16 -2
package/src/joinSpec.ts +40 -11
package/src/operations.ts +59 -1
package/src/schemaUpgrader.ts +13 -0
package/src/supergraphs.ts +2 -0
package/src/tagSpec.ts +10 -1
package/src/types.ts +12 -15
package/src/utils.ts +1 -1
package/tsconfig.test.tsbuildinfo +1 -1
package/tsconfig.tsbuildinfo +1 -1

package/dist/schemaUpgrader.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"schemaUpgrader.d.ts","sourceRoot":"","sources":["../src/schemaUpgrader.ts"],"names":[],"mappings":"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~~CAuB5E~~"}
1	+ {"version":3,"file":"schemaUpgrader.d.ts","sourceRoot":"","sources":["../src/schemaUpgrader.ts"],"names":[],"mappings":"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"}

package/dist/schemaUpgrader.js CHANGED Viewed

@@ -176,9 +176,13 @@ function upgradeSubgraphsIfNecessary(inputs) {
     }
     const subgraphs = new federation_1.Subgraphs();
     let errors = [];
+    const subgraphsUsingInterfaceObject = [];
     for (const subgraph of inputs.values()) {
         if (subgraph.isFed2Subgraph()) {
             subgraphs.add(subgraph);
+            if (subgraph.metadata().interfaceObjectDirective().applications().length > 0) {
+                subgraphsUsingInterfaceObject.push(subgraph.name);
+            }
         }
         else {
             const otherSubgraphs = inputs.values().filter((s) => s.name !== subgraph.name);
@@ -192,6 +196,11 @@ function upgradeSubgraphsIfNecessary(inputs) {
             }
         }
     }
+    if (errors.length === 0 && subgraphsUsingInterfaceObject.length > 0) {
+        const fed1Subgraphs = inputs.values().filter((s) => !s.isFed2Subgraph()).map((s) => s.name);
+        errors = [error_1.ERRORS.INTERFACE_OBJECT_USAGE_ERROR.err('The @interfaceObject directive can only be used if all subgraphs have federation 2 subgraph schema (schema with a `@link` to "https://specs.apollo.dev/federation" version 2.0 or newer): '
+                + `@interfaceObject is used in ${(0, federation_1.printSubgraphNames)(subgraphsUsingInterfaceObject)} but ${(0, federation_1.printSubgraphNames)(fed1Subgraphs)} ${fed1Subgraphs.length > 1 ? 'are not' : 'is not a'} federation 2 subgraph schema.`)];
+    }
     return errors.length === 0 ? { subgraphs, changes } : { errors };
 }
 exports.upgradeSubgraphsIfNecessary = upgradeSubgraphsIfNecessary;

package/dist/schemaUpgrader.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"schemaUpgrader.js","sourceRoot":"","sources":["../src/schemaUpgrader.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"schemaUpgrader.js","sourceRoot":"","sources":["../src/schemaUpgrader.ts"],"names":[],"mappings":"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"}

package/dist/supergraphs.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"supergraphs.d.ts","sourceRoot":"","sources":["../src/supergraphs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAgB,MAAM,SAAS,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,EAAc,MAAM,eAAe,CAAC;AACjE,OAAO,EAAgB,kBAAkB,EAAiB,MAAM,YAAY,CAAC;~~AAkB7E~~,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,YAAY,GAAG,CAAC,MAAM,EAAE;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAC,EAAE,CAAC,CAUnH;AAsCD,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAezF;AAED,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAE5D"}
1	+ {"version":3,"file":"supergraphs.d.ts","sourceRoot":"","sources":["../src/supergraphs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAgB,MAAM,SAAS,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,EAAc,MAAM,eAAe,CAAC;AACjE,OAAO,EAAgB,kBAAkB,EAAiB,MAAM,YAAY,CAAC;AAoB7E,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,YAAY,GAAG,CAAC,MAAM,EAAE;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAC,EAAE,CAAC,CAUnH;AAsCD,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAezF;AAED,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAE5D"}

package/dist/supergraphs.js CHANGED Viewed

@@ -12,8 +12,10 @@ const SUPPORTED_FEATURES = new Set([
     'https://specs.apollo.dev/core/v0.2',
     'https://specs.apollo.dev/join/v0.1',
     'https://specs.apollo.dev/join/v0.2',
+    'https://specs.apollo.dev/join/v0.3',
     'https://specs.apollo.dev/tag/v0.1',
     'https://specs.apollo.dev/tag/v0.2',
+    'https://specs.apollo.dev/tag/v0.3',
     'https://specs.apollo.dev/inaccessible/v0.1',
     'https://specs.apollo.dev/inaccessible/v0.2',
 ]);

package/dist/supergraphs.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"supergraphs.js","sourceRoot":"","sources":["../src/supergraphs.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"supergraphs.js","sourceRoot":"","sources":["../src/supergraphs.ts"],"names":[],"mappings":"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"}

package/dist/tagSpec.d.ts CHANGED Viewed

@@ -9,6 +9,7 @@ export declare class TagSpecDefinition extends FeatureDefinition {
     private readonly printedTagDefinition;
     constructor(version: FeatureVersion);
     private isV01;
+    private isV02;
     addElementsToSchema(schema: Schema): GraphQLError[];
     tagDirective(schema: Schema): DirectiveDefinition<{
         name: string;

package/dist/tagSpec.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tagSpec.d.ts","sourceRoot":"","sources":["../src/tagSpec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAc,cAAc,EAAE,MAAM,YAAY,CAAC;AAC/F,OAAO,EAAE,mBAAmB,EAAe,MAAM,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAgC,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAKvG,eAAO,MAAM,WAAW,iCAAiC,CAAC;AAE1D,qBAAa,iBAAkB,SAAQ,iBAAiB;IACtD,SAAgB,YAAY,EAAE,iBAAiB,EAAE,CAAC;IAClD,SAAgB,gBAAgB,EAAE,sBAAsB,CAAC;IACzD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;gBAElC,OAAO,EAAE,cAAc;~~IA+BnC~~,OAAO,CAAC,KAAK;IAIb,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE;IAInD,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC;IAIjE,wBAAwB,CAAC,UAAU,EAAE,mBAAmB,GAAG,YAAY,GAAG,SAAS;IAanF,eAAe,IAAI,MAAM,EAAE;CAG5B;AAED,eAAO,MAAM,YAAY,~~uCAE8B~~,CAAC"}
1	+ {"version":3,"file":"tagSpec.d.ts","sourceRoot":"","sources":["../src/tagSpec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAc,cAAc,EAAE,MAAM,YAAY,CAAC;AAC/F,OAAO,EAAE,mBAAmB,EAAe,MAAM,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAgC,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAKvG,eAAO,MAAM,WAAW,iCAAiC,CAAC;AAE1D,qBAAa,iBAAkB,SAAQ,iBAAiB;IACtD,SAAgB,YAAY,EAAE,iBAAiB,EAAE,CAAC;IAClD,SAAgB,gBAAgB,EAAE,sBAAsB,CAAC;IACzD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;gBAElC,OAAO,EAAE,cAAc;IAmCnC,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,KAAK;IAIb,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE;IAInD,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC;IAIjE,wBAAwB,CAAC,UAAU,EAAE,mBAAmB,GAAG,YAAY,GAAG,SAAS;IAanF,eAAe,IAAI,MAAM,EAAE;CAG5B;AAED,eAAO,MAAM,YAAY,uCAG8B,CAAC"}

package/dist/tagSpec.js CHANGED Viewed

@@ -22,6 +22,10 @@ class TagSpecDefinition extends coreSpec_1.FeatureDefinition {
         if (!this.isV01()) {
             this.tagLocations.push(graphql_1.DirectiveLocation.ARGUMENT_DEFINITION, graphql_1.DirectiveLocation.SCALAR, graphql_1.DirectiveLocation.ENUM, graphql_1.DirectiveLocation.ENUM_VALUE, graphql_1.DirectiveLocation.INPUT_OBJECT, graphql_1.DirectiveLocation.INPUT_FIELD_DEFINITION);
             this.printedTagDefinition = 'directive @tag(name: String!) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION';
+            if (!this.isV02()) {
+                this.tagLocations.push(graphql_1.DirectiveLocation.SCHEMA);
+                this.printedTagDefinition = 'directive @tag(name: String!) repeatable on FIELD_DEFINITION | INTERFACE | OBJECT | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION | SCHEMA';
+            }
         }
         this.tagDirectiveSpec = (0, directiveAndTypeSpecification_1.createDirectiveSpecification)({
             name: 'tag',
@@ -36,6 +40,9 @@ class TagSpecDefinition extends coreSpec_1.FeatureDefinition {
     isV01() {
         return this.version.equals(new coreSpec_1.FeatureVersion(0, 1));
     }
+    isV02() {
+        return this.version.equals(new coreSpec_1.FeatureVersion(0, 2));
+    }
     addElementsToSchema(schema) {
         return this.addDirectiveSpec(schema, this.tagDirectiveSpec);
     }
@@ -59,6 +66,7 @@ class TagSpecDefinition extends coreSpec_1.FeatureDefinition {
 exports.TagSpecDefinition = TagSpecDefinition;
 exports.TAG_VERSIONS = new coreSpec_1.FeatureDefinitions(exports.tagIdentity)
     .add(new TagSpecDefinition(new coreSpec_1.FeatureVersion(0, 1)))
-    .add(new TagSpecDefinition(new coreSpec_1.FeatureVersion(0, 2)));
+    .add(new TagSpecDefinition(new coreSpec_1.FeatureVersion(0, 2)))
+    .add(new TagSpecDefinition(new coreSpec_1.FeatureVersion(0, 3)));
 (0, knownCoreFeatures_1.registerKnownFeature)(exports.TAG_VERSIONS);
 //# sourceMappingURL=tagSpec.js.map

package/dist/tagSpec.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tagSpec.js","sourceRoot":"","sources":["../src/tagSpec.ts"],"names":[],"mappings":";;;AAAA,qCAA0D;AAC1D,yCAA+F;AAC/F,+CAAyE;AACzE,mFAAuG;AACvG,mCAAiC;AACjC,2DAA2D;AAC3D,mCAAmC;AAEtB,QAAA,WAAW,GAAG,8BAA8B,CAAC;AAE1D,MAAa,iBAAkB,SAAQ,4BAAiB;IAKtD,YAAY,OAAuB;QACjC,KAAK,CAAC,IAAI,qBAAU,CAAC,mBAAW,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;QACnD,IAAI,CAAC,YAAY,GAAG;YAClB,2BAAiB,CAAC,gBAAgB;YAClC,2BAAiB,CAAC,MAAM;YACxB,2BAAiB,CAAC,SAAS;YAC3B,2BAAiB,CAAC,KAAK;SACxB,CAAC;QACF,IAAI,CAAC,oBAAoB,GAAG,2FAA2F,CAAC;QACxH,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE;YACjB,IAAI,CAAC,YAAY,CAAC,IAAI,CACpB,2BAAiB,CAAC,mBAAmB,EACrC,2BAAiB,CAAC,MAAM,EACxB,2BAAiB,CAAC,IAAI,EACtB,2BAAiB,CAAC,UAAU,EAC5B,2BAAiB,CAAC,YAAY,EAC9B,2BAAiB,CAAC,sBAAsB,CACzC,CAAC;YACF,IAAI,CAAC,oBAAoB,GAAG,sLAAsL,CAAC;~~SACpN~~;QACD,IAAI,CAAC,gBAAgB,GAAG,IAAA,4DAA4B,EAAC;YACnD,IAAI,EAAC,KAAK;YACV,SAAS,EAAE,IAAI,CAAC,YAAY;YAC5B,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACxB,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,yBAAW,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC;gBACpE,MAAM,EAAE,EAAE;aACX,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IAEO,KAAK;QACX,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,yBAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,mBAAmB,CAAC,MAAc;QAChC,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC9D,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAE,CAAC;IACxC,CAAC;IAED,wBAAwB,CAAC,UAA+B;QACtD,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAC3E,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,eAAe,GAAG,OAAO,IAAI,IAAA,gBAAQ,EAAC,OAAO,CAAC,IAAK,EAAE,IAAI,yBAAW,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QAC9G,MAAM,iBAAiB,GAAG,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7F,IAAI,mBAAmB,IAAI,CAAC,eAAe,IAAI,CAAC,iBAAiB,EAAE;YACjE,OAAO,cAAM,CAAC,4BAA4B,CAAC,GAAG,CAC5C,0IAA0I,IAAI,CAAC,oBAAoB,EAAE,CACtK,CAAC;SACH;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,eAAe;QACb,OAAO,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;CACF;~~AAhED~~,~~8CAgEC~~;AAEY,QAAA,YAAY,GAAG,IAAI,6BAAkB,CAAoB,mBAAW,CAAC;KAC/E,GAAG,CAAC,IAAI,iBAAiB,CAAC,IAAI,yBAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KACpD,GAAG,CAAC,IAAI,iBAAiB,CAAC,IAAI,yBAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAExD,IAAA,wCAAoB,EAAC,oBAAY,CAAC,CAAC"}
1	+ {"version":3,"file":"tagSpec.js","sourceRoot":"","sources":["../src/tagSpec.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,YAAY,EACd,aAAa,~~EASb~~,UAAU,EACV,IAAI,EACJ,SAAS,EACV,MAAM,eAAe,CAAC;AAEvB,eAAO,MAAM,mBAAmB,0GAM/B,CAAC;AAEF,oBAAY,aAAa,GAAG,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC;AAG/D,eAAO,MAAM,uBAAuB,0GAAwD,CAAC;~~AAY7F~~,wBAAgB,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,GAAG,OAAO,~~CAYpD~~;AAgBD,wBAAgB,eAAe,CAC7B,IAAI,EAAE,YAAY,EAClB,YAAY,EAAE,UAAU,GAAG,aAAa,EACxC,qBAAqB,GAAE,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,KAAK,OAAsC,EAC5G,yBAAyB,GAAE,CAAC,gBAAgB,EAAE,UAAU,GAAG,aAAa,EAAE,GAAG,EAAE,aAAa,KAAK,OAA4C,GAC5I,OAAO,CAKT;AAkBD,wBAAgB,SAAS,CACvB,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,IAAI,EAClB,YAAY,GAAE,aAAa,EAA4B,EACvD,qBAAqB,GAAE,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,KAAK,OAAsC,EAC5G,yBAAyB,GAAE,CAAC,gBAAgB,EAAE,UAAU,GAAG,aAAa,EAAE,GAAG,EAAE,aAAa,KAAK,OAA4C,GAC5I,OAAO,CAET;AAQD,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,IAAI,EAClB,YAAY,GAAE,aAAa,EAA4B,EACvD,qBAAqB,GAAE,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,KAAK,OAAsC,EAC5G,yBAAyB,GAAE,CAAC,gBAAgB,EAAE,UAAU,GAAG,aAAa,EAAE,GAAG,EAAE,aAAa,KAAK,OAA4C,GAC5I,OAAO,CA2BT"}
1	+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,YAAY,EACd,aAAa,EAOb,UAAU,EACV,IAAI,EACJ,SAAS,EACV,MAAM,eAAe,CAAC;AAEvB,eAAO,MAAM,mBAAmB,0GAM/B,CAAC;AAEF,oBAAY,aAAa,GAAG,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC;AAG/D,eAAO,MAAM,uBAAuB,0GAAwD,CAAC;AAc7F,wBAAgB,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,GAAG,OAAO,CASpD;AAgBD,wBAAgB,eAAe,CAC7B,IAAI,EAAE,YAAY,EAClB,YAAY,EAAE,UAAU,GAAG,aAAa,EACxC,qBAAqB,GAAE,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,KAAK,OAAsC,EAC5G,yBAAyB,GAAE,CAAC,gBAAgB,EAAE,UAAU,GAAG,aAAa,EAAE,GAAG,EAAE,aAAa,KAAK,OAA4C,GAC5I,OAAO,CAKT;AAkBD,wBAAgB,SAAS,CACvB,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,IAAI,EAClB,YAAY,GAAE,aAAa,EAA4B,EACvD,qBAAqB,GAAE,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,KAAK,OAAsC,EAC5G,yBAAyB,GAAE,CAAC,gBAAgB,EAAE,UAAU,GAAG,aAAa,EAAE,GAAG,EAAE,aAAa,KAAK,OAA4C,GAC5I,OAAO,CAET;AAQD,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,IAAI,EAClB,YAAY,GAAE,aAAa,EAA4B,EACvD,qBAAqB,GAAE,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,KAAK,OAAsC,EAC5G,yBAAyB,GAAE,CAAC,gBAAgB,EAAE,UAAU,GAAG,aAAa,EAAE,GAAG,EAAE,aAAa,KAAK,OAA4C,GAC5I,OAAO,CA2BT"}

package/dist/types.js CHANGED Viewed

@@ -11,16 +11,13 @@ exports.ALL_SUBTYPING_RULES = [
 ];
 exports.DEFAULT_SUBTYPING_RULES = exports.ALL_SUBTYPING_RULES.filter(r => r !== "list_upgrade");
 function sameType(t1, t2) {
-    if (t1.kind !== t2.kind) {
-        return false;
-    }
     switch (t1.kind) {
         case 'ListType':
-            return sameType(t1.ofType, t2.ofType);
+            return (0, definitions_1.isListType)(t2) && sameType(t1.ofType, t2.ofType);
         case 'NonNullType':
-            return sameType(t1.ofType, t2.ofType);
+            return (0, definitions_1.isNonNullType)(t2) && sameType(t1.ofType, t2.ofType);
         default:
-            return t1.name === t2.name;
+            return (0, definitions_1.isNamedType)(t2) && t1.name === t2.name;
     }
 }
 exports.sameType = sameType;

package/dist/types.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAIA,+~~CAcuB~~;AAEV,QAAA,mBAAmB,GAAG;IACjC,QAAiB;IACjB,uBAAgC;IAChC,cAAuB;IACvB,kBAA2B;IAC3B,yBAAkC;CACnC,CAAC;AAKW,QAAA,uBAAuB,GAAG,2BAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,cAAc,CAAC,CAAC;~~AAY7F~~,SAAgB,QAAQ,CAAC,EAAQ,EAAE,EAAQ;IACzC,~~IAAI~~,EAAE,CAAC,IAAI,~~KAAK,~~EAAE,~~CAAC~~,~~IAAI,EAAE~~;~~QACvB~~,OAAO,~~KAAK~~,~~CAAC;KACd;IACD~~,~~QAAQ~~,EAAE,CAAC,IAAI,~~EAAE;QACf,KAAK,UAAU;YACb,OAAO,~~QAAQ,CAAC,EAAE,CAAC,MAAM,~~EAAG~~,~~EAAoB~~,CAAC,MAAM,CAAC,CAAC;~~QAC3D~~,KAAK,aAAa;YAChB,OAAO,QAAQ,CAAC,EAAE,CAAC,MAAM,~~EAAG~~,~~EAAuB~~,CAAC,MAAM,CAAC,CAAC;~~QAC9D~~;YACE,OAAO,EAAE,CAAC,IAAI,~~KAAM~~,~~EAAgB~~,CAAC,IAAI,CAAC;~~KAC7C~~;AACH,CAAC;~~AAZD~~,~~4BAYC~~;AAgBD,SAAgB,eAAe,CAC7B,IAAkB,EAClB,YAAwC,EACxC,wBAAgF,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAC5G,4BAA2G,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAE7I,IAAI,IAAA,yBAAW,EAAC,IAAI,CAAC,EAAE;QACrB,OAAO,IAAA,0BAAY,EAAC,YAAY,CAAC,IAAI,qBAAqB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;KAChF;IACD,OAAO,yBAAyB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;AACvD,CAAC;AAVD,0CAUC;AAkBD,SAAgB,SAAS,CACvB,IAAU,EACV,YAAkB,EAClB,eAAgC,+BAAuB,EACvD,wBAAgF,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAC5G,4BAA2G,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAE7I,OAAO,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,yBAAyB,CAAC,CAAC;AAC7I,CAAC;AARD,8BAQC;AAQD,SAAgB,eAAe,CAC7B,IAAU,EACV,YAAkB,EAClB,eAAgC,+BAAuB,EACvD,wBAAgF,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAC5G,4BAA2G,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAE7I,QAAQ,YAAY,CAAC,IAAI,EAAE;QACzB,KAAK,UAAU;YACb,OAAO,YAAY,CAAC,QAAQ,CAAC,kBAAkB,CAAC;mBAC3C,IAAA,wBAAU,EAAC,IAAI,CAAC;mBAChB,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,qBAAqB,EAAE,yBAAyB,CAAC,CAAC;QACnH,KAAK,aAAa;YAChB,IAAI,IAAA,2BAAa,EAAC,IAAI,CAAC,EAAE;gBACvB,OAAO,YAAY,CAAC,QAAQ,CAAC,yBAAyB,CAAC;uBAClD,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,qBAAqB,EAAE,yBAAyB,CAAC,CAAC;aAClH;YACD,OAAO,YAAY,CAAC,QAAQ,CAAC,uBAAuB,CAAC;mBAChD,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,qBAAqB,EAAE,yBAAyB,CAAC,CAAC;QAC5G,KAAK,YAAY,CAAC;QAClB,KAAK,eAAe;YAClB,IAAI,IAAA,wBAAU,EAAC,IAAI,CAAC,EAAE;gBACpB,OAAO,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC;uBACvC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,yBAAyB,CAAC,CAAC;aAC3G;YACD,OAAO,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC;mBACjC,CAAC,IAAA,6BAAe,EAAC,IAAI,CAAC,IAAI,IAAA,yBAAW,EAAC,IAAI,CAAC,CAAC;mBAC5C,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,qBAAqB,EAAE,yBAAyB,CAAC,CAAC;QAC7F;YACE,OAAO,IAAA,wBAAU,EAAC,IAAI,CAAC;mBAClB,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC;mBACrC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,yBAAyB,CAAC,CAAC;KAC7G;AACH,CAAC;AAjCD,0CAiCC"}
1	+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/utils.js CHANGED Viewed

@@ -270,7 +270,7 @@ function joinStrings(toJoin, sep = ', ', firstSep, lastSep = ' and ') {
     if (toJoin.length == 2) {
         return first + (firstSep ? firstSep : lastSep) + last;
     }
-    return first + (firstSep ? firstSep : sep) + toJoin.slice(1, toJoin.length - 1) + lastSep + last;
+    return first + (firstSep ? firstSep : sep) + toJoin.slice(1, toJoin.length - 1).join(sep) + lastSep + last;
 }
 exports.joinStrings = joinStrings;
 const DEFAULT_HUMAN_READABLE_LIST_CUTOFF_LENGTH = 100;

package/dist/utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AASA,SAAgB,MAAM,CAAC,SAAc,EAAE,OAAgC;IACrE,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;KACpE;AACH,CAAC;AAJD,wBAIC;AAED,SAAgB,iBAAiB,CAAC,CAAQ;IACxC,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;AAC/C,CAAC;AAFD,8CAEC;AAED,MAAa,QAAe,SAAQ,GAAW;IAC7C,GAAG,CAAC,GAAM,EAAE,KAAQ;QAClB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACpB;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;SACxB;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,QAAwB;QAC7B,KAAK,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;YACxC,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE;gBAClB,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aAChB;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAnBD,4BAmBC;AAED,MAAa,WAAkB,SAAQ,GAAc;IACnD,GAAG,CAAC,GAAM,EAAE,KAAQ;QAClB,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,GAAG,IAAI,GAAG,EAAK,CAAC;YACtB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;SACvB;QACD,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,QAA2B;QAChC,KAAK,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;YACxC,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE;gBAClB,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aAChB;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAnBD,kCAmBC;AASD,MAAa,UAAU;IAcrB,YAAY,YAAoC,UAAU,CAAC,gBAAgB;QAbnE,UAAK,GAAQ,EAAE,CAAC;QAChB,YAAO,GAAa,IAAI,GAAG,EAAO,CAAC;QAazC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAXO,MAAM,CAAC,gBAAgB,CAAI,CAAI,EAAE,CAAI;QAC3C,IAAI,CAAC,GAAG,CAAC,EAAE;YACT,OAAO,CAAC,CAAC,CAAC;SACX;aAAM,IAAI,CAAC,GAAG,CAAC,EAAE;YAChB,OAAO,CAAC,CAAC;SACV;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAMD,GAAG,CAAC,GAAM,EAAE,KAAQ;QAClB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC1B,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;SAC5B;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,GAAG,CAAC,GAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAED,GAAG,CAAC,GAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC1B,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAChC,MAAM,CAAC,CAAC,EAAE,6CAA6C,CAAC,CAAC;YACzD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC;IAGO,gBAAgB,CAAC,GAAM;QAC7B,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QAClC,OAAO,KAAK,IAAI,KAAK,EAAE;YACrB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YAC/C,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE;gBAChD,KAAK,GAAG,MAAM,GAAG,CAAC,CAAC;aACpB;iBAAM;gBACL,KAAK,GAAG,MAAM,GAAG,CAAC,CAAC;aACpB;SACF;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IACtF,CAAC;IAID,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;YAC7C,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,CAAC,CAAC,EAAE,6CAA6C,CAAC,CAAC;YACzD,MAAM,CAAC,CAAC;SACT;IACH,CAAC;CACF;AAzED,gCAyEC;AAQD,SAAgB,WAAW,CACzB,CAAe,EACf,CAAe,EACf,QAAoC;IAEpC,IAAI,CAAC,KAAK,CAAC,EAAE;QACX,OAAO,IAAI,CAAC;KACb;IACD,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,EAAE;QACzB,OAAO,KAAK,CAAC;KACd;IACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;QACjC,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,KAAK,CAAC;SACd;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAlBD,kCAkBC;AAKD,SAAgB,QAAQ,CAAI,QAAgB,EAAE,WAAmB;IAC/D,IAAI,QAAQ,KAAK,WAAW,EAAE;QAC5B,OAAO,IAAI,CAAC;KACb;IACD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE;QAC7B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACtB,OAAO,KAAK,CAAC;SACd;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAVD,4BAUC;AAED,SAAgB,OAAO,CAAI,QAAqB;IAC9C,MAAM,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;IAC/C,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC;AAC1C,CAAC;AAHD,0BAGC;AAED,SAAgB,SAAS,CAAI,GAAwB;IACnD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE;QAC5B,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;KAChB;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAPD,8BAOC;AAED,SAAgB,OAAO,CAAI,GAAwB;IACjD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE;QAC1B,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;KAChB;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAPD,0BAOC;AAED,SAAgB,UAAU,CAAO,GAAsB;IACrD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE;QACjC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC;KACpB;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAPD,gCAOC;AAED,SAAgB,SAAS,CAAI,GAAmB;IAC9C,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE;QAC5B,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;KAChB;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAPD,8BAOC;AAED,MAAa,mBAAmB;IAAhC;QACmB,QAAG,GAAG,IAAI,GAAG,EAAQ,CAAC;IAqDzC,CAAC;IAjDS,WAAW;QACjB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;IAChC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,GAAM;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,GAAG,CAAC,GAAM;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,GAAG,CAAC,GAAM,EAAE,KAAQ;QAClB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACzB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,GAAM;QACX,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,WAAW,EAAE,CAAC;SACpB;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACjB,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACrC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACzC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CACF;AAtDD,kDAsDC;AAED,SAAgB,gBAAgB,CAAI,GAAQ,EAAE,SAAiB;IAC7D,MAAM,CAAC,SAAS,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,SAAS,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IACtE,MAAM,IAAI,GAAG,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;IAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACnC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;KAClB;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAPD,4CAOC;AAWD,SAAgB,6BAA6B,CAAC,GAAY;IACxD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,KAAK,CAAC;KACd;IACD,QAAQ,GAAG,CAAC,iBAAiB,EAAE,EAAE;QAC/B,KAAK,MAAM,CAAC;QACZ,KAAK,KAAK,CAAC;QACX,KAAK,GAAG;YACN,OAAO,IAAI,CAAC;QACd,KAAK,OAAO,CAAC;QACb,KAAK,IAAI,CAAC;QACV,KAAK,GAAG;YACN,OAAO,KAAK,CAAC;QACf;YACE,OAAO,SAAS,CAAC;KACpB;AACH,CAAC;AAhBD,sEAgBC;AASD,SAAgB,WAAW,CAAC,MAAgB,EAAE,MAAc,IAAI,EAAE,QAAiB,EAAE,UAAkB,OAAO;IAC5G,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACxB,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;QACtB,OAAO,KAAK,CAAC;KACd;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACvC,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;QACtB,OAAO,KAAK,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;KACvD;IACD,OAAO,KAAK,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,OAAO,GAAG,IAAI,CAAC;~~AACnG~~,CAAC;AAbD,kCAaC;AAID,MAAM,yCAAyC,GAAG,GAAG,CAAC;AAUtD,SAAgB,sBAAsB,CACpC,KAAe,EACf,EACE,UAAU,EACV,MAAM,EACN,YAAY,EACZ,aAAa,EACb,oBAAoB,GAOrB;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,OAAO,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC;KACzB;IACD,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;QACrB,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACpD;IACD,MAAM,MAAM,GAAG,oBAAoB,aAApB,oBAAoB,cAApB,oBAAoB,GAAI,yCAAyC,CAAC;IAEjF,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,MAAM,CAC9B,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE;QAC5B,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE;YACjC,OAAO;gBACL,OAAO;gBACP,MAAM;aACP,CAAC;SACH;QACD,OAAO;YACL,OAAO,EAAE,OAAO,GAAG,CAAC;YACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,MAAM;SAC7B,CAAC;IACJ,CAAC,EACD,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAC,CACzB,CAAC;IAEF,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,YAAY;QAC/B,CAAC,CAAC,YAAY,GAAG,GAAG;QACpB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACjC,IAAI,SAAS,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE;QACrC,OAAO,YAAY,GAAG,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;KAC9E;SAAM;QACL,OAAO,YAAY,GAAG,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC;KAC/E;AACH,CAAC;AAjDD,wDAiDC;AAUM,MAAM,SAAS,GAAG,CAAI,CAAgB,EAAU,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;AAA5E,QAAA,SAAS,aAAmE;AAOzF,SAAgB,kBAAkB,CAAI,OAAU,EAAE,KAAU;IAC1D,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACrC,IAAI,KAAK,IAAI,CAAC,EAAE;QACd,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC;KACb;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AARD,gDAQC"}
1	+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/federation-internals",
-  "version": "2.2.3",
+  "version": "2.3.0-beta.1",
   "description": "Apollo Federation internal utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,6 +31,5 @@
   },
   "peerDependencies": {
     "graphql": "^16.5.0"
-  },
-  "gitHead": "fdc15069d2aa9aa44bb0534111fc6af390e9a764"
+  }
 }

package/src/__tests__/extractSubgraphsFromSupergraph.test.ts CHANGED Viewed

@@ -596,7 +596,6 @@ test('preserves default values of input object fields', () => {
   expect(inputFieldA?.defaultValue).toBe(1234)
 })
 test('throw meaningful error for invalid federation directive fieldSet', () => {
   const supergraph = `
     schema

package/src/__tests__/matchers/toMatchString.ts CHANGED Viewed

@@ -63,7 +63,11 @@ expect.extend({
     const messages: string[] = [];
     for (let i = 0; i < expected.length; i++) {
       const exp = expected[i];
-      const rec = deIndent(received[i]);
+      let rec = deIndent(received[i]);
+      // If the expected string as a trailing '\n', add one since we removed it.
+      if (exp.charAt(exp.length - 1) === '\n') {
+        rec = rec + '\n';
+      }
       if (!this.equals(exp, rec)) {
         pass = false;
         messages.push(

package/src/__tests__/schemaUpgrader.test.ts CHANGED Viewed

@@ -202,3 +202,46 @@ test('remove tag on external field if found on definition', () => {
   expect(typeAInS1.field("y")?.appliedDirectivesOf('tag').map((d) => d.toString())).toStrictEqual([]);
   expect(typeAInS2.field("y")?.appliedDirectivesOf('tag').map((d) => d.toString())).toStrictEqual([ '@tag(name: "a tag")' ]);
 })
+test('reject @interfaceObject usage if not all subgraphs are fed2', () => {
+  // Note that this test both validates the rejection of fed1 subgraph when @interfaceObject is used somewhere, but also
+  // illustrate why we do so: fed1 schema can use @key on interface for backward compatibility, but it is ignored and
+  // the schema upgrader removes them. Given that actual support for @key on interfaces is necesarry to make @interfaceObject
+  // work, it would be really confusing to not reject the example below right away, since it "looks" like it the @key on
+  // the interface in the 2nd subgraph should work, but it actually won't.
+  const s1 = `
+    extend schema
+      @link(url: "https://specs.apollo.dev/federation/v2.3", import: [ "@key", "@interfaceObject"])
+    type Query {
+      a: A
+    }
+    type A @key(fields: "id") @interfaceObject {
+      id: String
+      x: Int
+    }
+  `;
+  const s2 = `
+    interface A @key(fields: "id") {
+      id: String
+      y: Int
+    }
+    type X implements A @key(fields: "id") {
+      id: String
+      y: Int
+    }
+  `;
+  const subgraphs = new Subgraphs();
+  subgraphs.add(buildSubgraph('s1', 'http://s1', s1));
+  subgraphs.add(buildSubgraph('s2', 'http://s2', s2));
+  const res = upgradeSubgraphsIfNecessary(subgraphs);
+  expect(res.errors?.map((e) => e.message)).toStrictEqual([
+    'The @interfaceObject directive can only be used if all subgraphs have federation 2 subgraph schema (schema with a `@link` to "https://specs.apollo.dev/federation" version 2.0 or newer): '
+    + '@interfaceObject is used in subgraph "s1" but subgraph "s2" is not a federation 2 subgraph schema.'
+  ]);
+})