@theguild/federation-composition 0.14.1 → 0.14.2-alpha-20241212110315-21e2fa5

package/cjs/supergraph/composition/object-type.js

@@ -316,14 +316,13 @@ function objectTypeBuilder() {
                         }
                     }
                     if (isQuery) {
-                        if (differencesBetweenGraphs.override) {
-                            const graphsWithOverride = fieldInGraphs.filter(([_, meta]) => meta.override !== null &&
-                                (objectType.byGraph.size > 1
-                                    ?
-                                        true
-                                    :
-                                        typeof graphNameToId(meta.override) === 'string'));
-                            joinFields = graphsWithOverride.map(([graphId, meta]) => ({
+                        if (differencesBetweenGraphs.override && graphs.size > 1) {
+                            const overriddenGraphs = fieldInGraphs
+                                .map(([_, meta]) => (meta.override ? graphNameToId(meta.override) : null))
+                                .filter((graphId) => typeof graphId === 'string');
+                            const graphsToPrintJoinField = fieldInGraphs.filter(([graphId, meta]) => meta.override !== null ||
+                                (meta.shareable && !overriddenGraphs.includes(graphId)));
+                            joinFields = graphsToPrintJoinField.map(([graphId, meta]) => ({
                                 graph: graphId,
                                 override: meta.override ?? undefined,
                                 usedOverridden: provideUsedOverriddenValue(field, meta, fieldNamesOfImplementedInterfaces, graphId, graphNameToId),

package/esm/supergraph/composition/object-type.js

@@ -312,14 +312,13 @@ export function objectTypeBuilder() {
                         }
                     }
                     if (isQuery) {
-                        if (differencesBetweenGraphs.override) {
-                            const graphsWithOverride = fieldInGraphs.filter(([_, meta]) => meta.override !== null &&
-                                (objectType.byGraph.size > 1
-                                    ?
-                                        true
-                                    :
-                                        typeof graphNameToId(meta.override) === 'string'));
-                            joinFields = graphsWithOverride.map(([graphId, meta]) => ({
+                        if (differencesBetweenGraphs.override && graphs.size > 1) {
+                            const overriddenGraphs = fieldInGraphs
+                                .map(([_, meta]) => (meta.override ? graphNameToId(meta.override) : null))
+                                .filter((graphId) => typeof graphId === 'string');
+                            const graphsToPrintJoinField = fieldInGraphs.filter(([graphId, meta]) => meta.override !== null ||
+                                (meta.shareable && !overriddenGraphs.includes(graphId)));
+                            joinFields = graphsToPrintJoinField.map(([graphId, meta]) => ({
                                 graph: graphId,
                                 override: meta.override ?? undefined,
                                 usedOverridden: provideUsedOverriddenValue(field, meta, fieldNamesOfImplementedInterfaces, graphId, graphNameToId),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theguild/federation-composition",
-  "version": "0.14.1",
+  "version": "0.14.2-alpha-20241212110315-21e2fa5",
   "description": "Open Source Composition library for Apollo Federation",
   "peerDependencies": {
     "graphql": "^16.0.0"