@graphql-box/cache-manager 5.1.0 → 5.2.3

package/src/helpers/filterOutPropsWithArgsOrDirectives.ts

@@ -0,0 +1,29 @@
+import { type PlainObject } from '@graphql-box/core';
+import { type KeysAndPaths, buildFieldKeysAndPaths, getName, resolveFragments } from '@graphql-box/helpers';
+import { type SelectionNode } from 'graphql';
+import { keys } from 'lodash-es';
+import { type CacheManagerContext } from '../types.ts';
+
+export const filterOutPropsWithArgsOrDirectives = (
+  fieldData: PlainObject,
+  selectionNodes: readonly SelectionNode[],
+  ancestorKeysAndPaths: KeysAndPaths,
+  context: CacheManagerContext
+) => {
+  const fieldAndTypeName = resolveFragments(selectionNodes, context.fragmentDefinitions);
+
+  return keys(fieldData).reduce<PlainObject>((acc, key) => {
+    const match = fieldAndTypeName.find(({ fieldNode }) => getName(fieldNode) === key);
+
+    if (match) {
+      const { requestFieldPath } = buildFieldKeysAndPaths(match.fieldNode, ancestorKeysAndPaths, context);
+      const fieldTypeInfo = context.fieldTypeMap.get(requestFieldPath);
+
+      if (!fieldTypeInfo?.hasArguments && !fieldTypeInfo?.hasDirectives) {
+        acc[key] = fieldData[key];
+      }
+    }
+
+    return acc;
+  }, {});
+};

package/src/helpers/validTypeIdValue.ts

@@ -3,11 +3,11 @@ import { isPlainObject } from '@graphql-box/helpers';
 
 export const getValidTypeIdValue = (
   requestFieldPathData: unknown,
-  fieldTypeInfo: FieldTypeInfo | undefined,
+  { typeIDValue }: FieldTypeInfo,
   typeIDKey: string
 ): string | number | undefined => {
-  if (fieldTypeInfo?.typeIDValue) {
-    return fieldTypeInfo.typeIDValue;
+  if (typeIDValue) {
+    return typeIDValue;
   }
 
   if (isPlainObject(requestFieldPathData)) {