chore: add back removed elements

wundergraph · Feb 20, 2025 · 6bb97b4 · 6bb97b4
1 parent efe3726
commit 6bb97b4
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 77 deletions.
diff --git a/composition-go/index.global.js b/composition-go/index.global.js
diff --git a/composition/src/index.ts b/composition/src/index.ts
@@ -35,4 +35,3 @@ export * from './v1/utils/constants';
 export * from './v1/utils/utils';
 export * from './v1/utils/string-constants';
 export * from './v1/warnings/warnings';
-export { newFieldSetConditionData } from './router-configuration/utils';
diff --git a/composition/src/v1/federation/utils.ts b/composition/src/v1/federation/utils.ts
@@ -154,8 +154,8 @@ export function validateImplicitFieldSets({
             // Depth 0 is the original parent type
             // If a field is external, but it's part of a key FieldSet, it will be included in the root configuration
             if (currentDepth === 0) {
-              // @TODO removed for testing
-              // keyFieldNames.add(fieldName);
+              // @TODO
+              keyFieldNames.add(fieldName);
             }
             const namedTypeName = getTypeNodeNamedTypeName(fieldData.node.type);
             // The base scalars are not in the parents map
@@ -216,8 +216,8 @@ export function validateImplicitFieldSets({
         continue;
       }
       // Add any top-level fields that compose the key in case they are external
-      // @TODO removed for testing
-      // addIterableValuesToSet(keyFieldNames, configurationData.fieldNames);
+      // @TODO
+      addIterableValuesToSet(keyFieldNames, configurationData.fieldNames);
       implicitKeys.push({
         fieldName: '',
         selectionSet: fieldSet,

diff --git a/composition/src/v1/normalization/utils.ts b/composition/src/v1/normalization/utils.ts
@@ -220,16 +220,16 @@ export function validateKeyFieldSets(
            * If a field is external, but it's part of a key FieldSet, it should be included in its respective
            * root or child node */
           if (currentDepth === 0) {
-            // @TODO removed to test
-            // fieldNames.add(fieldName);
+            // @TODO
+            fieldNames.add(fieldName);
           } else {
             const nestedConfigurationData = nf.configurationDataByTypeName.get(parentTypeName);
             if (!nestedConfigurationData) {
               errorMessages.push(invalidConfigurationDataErrorMessage(parentTypeName, fieldName, rawFieldSet));
               return BREAK;
             }
-            // @TODO removed to test
-            // nestedConfigurationData.fieldNames.add(fieldName);
+            // @TODO
+            nestedConfigurationData.fieldNames.add(fieldName);
           }
           getValueOrDefault(nf.keyFieldNamesByParentTypeName, parentTypeName, () => new Set<string>()).add(fieldName);
           const namedTypeName = getTypeNodeNamedTypeName(fieldData.node.type);