houdini 1.1.3 → 1.1.4

package/build/runtime-esm/cache/cache.js

@@ -446,7 +446,8 @@ class CacheInternal {
     parent = rootID,
     variables,
     stepsFromConnection = null,
-    ignoreMasking
+    ignoreMasking,
+    fullCheck = false
   }) {
     if (parent === null) {
       return { data: null, partial: false, stale: false, hasData: true };
@@ -471,11 +472,28 @@ class CacheInternal {
     let targetSelection = getFieldsForType(selection, typename);
     for (const [
       attributeName,
-      { type, keyRaw, selection: fieldSelection, nullable, list, visible }
+      { type, keyRaw, selection: fieldSelection, nullable, list, visible, directives }
     ] of Object.entries(targetSelection)) {
-      if (!visible && !ignoreMasking) {
+      if (!visible && !ignoreMasking && !fullCheck) {
         continue;
       }
+      const includeDirective = directives?.find((d) => {
+        return d.name === "include";
+      });
+      if (includeDirective) {
+        if (!evaluateFragmentVariables(includeDirective.arguments, variables ?? {})["if"]) {
+          continue;
+        }
+      }
+      const skipDirective = directives?.find((d) => {
+        return d.name === "skip";
+      });
+      if (skipDirective) {
+        if (evaluateFragmentVariables(skipDirective.arguments, variables ?? {})["if"]) {
+          continue;
+        }
+      }
+      const fieldTarget = visible || ignoreMasking ? target : {};
       const key = evaluateKey(keyRaw, variables);
       const { value } = this.storage.get(parent, key);
       const dt_field = this.staleManager.getFieldTime(parent, key);
@@ -498,16 +516,16 @@ class CacheInternal {
         partial = true;
       }
       if (typeof value === "undefined" || value === null) {
-        target[attributeName] = null;
+        fieldTarget[attributeName] = null;
         if (typeof value !== "undefined") {
           hasData = true;
         }
       } else if (!fieldSelection) {
         const fnUnmarshal = this.config?.scalars?.[type]?.unmarshal;
         if (fnUnmarshal) {
-          target[attributeName] = fnUnmarshal(value);
+          fieldTarget[attributeName] = fnUnmarshal(value);
         } else {
-          target[attributeName] = value;
+          fieldTarget[attributeName] = value;
         }
         hasData = true;
       } else if (Array.isArray(value)) {
@@ -516,9 +534,10 @@ class CacheInternal {
           variables,
           linkedList: value,
           stepsFromConnection: nextStep,
-          ignoreMasking: !!ignoreMasking
+          ignoreMasking: !!ignoreMasking,
+          fullCheck
         });
-        target[attributeName] = listValue.data;
+        fieldTarget[attributeName] = listValue.data;
         if (listValue.partial) {
           partial = true;
         }
@@ -534,9 +553,10 @@ class CacheInternal {
           selection: fieldSelection,
           variables,
           stepsFromConnection: nextStep,
-          ignoreMasking
+          ignoreMasking,
+          fullCheck
         });
-        target[attributeName] = objectFields.data;
+        fieldTarget[attributeName] = objectFields.data;
         if (objectFields.partial) {
           partial = true;
         }
@@ -547,7 +567,7 @@ class CacheInternal {
           hasData = true;
         }
       }
-      if (target[attributeName] === null && !nullable && !embeddedCursor) {
+      if (fieldTarget[attributeName] === null && !nullable && !embeddedCursor) {
         cascadeNull = true;
       }
     }
@@ -579,7 +599,8 @@ class CacheInternal {
     variables,
     linkedList,
     stepsFromConnection,
-    ignoreMasking
+    ignoreMasking,
+    fullCheck
   }) {
     const result = [];
     let partialData = false;
@@ -592,7 +613,8 @@ class CacheInternal {
           variables,
           linkedList: entry,
           stepsFromConnection,
-          ignoreMasking
+          ignoreMasking,
+          fullCheck
         });
         result.push(nestedValue.data);
         if (nestedValue.partial) {
@@ -614,7 +636,8 @@ class CacheInternal {
         selection: fields,
         variables,
         stepsFromConnection,
-        ignoreMasking
+        ignoreMasking,
+        fullCheck
       });
       result.push(data);
       if (partial) {

package/build/runtime-esm/client/plugins/cache.js

@@ -16,7 +16,8 @@ const cachePolicy = ({
         if (policy !== CachePolicy.NetworkOnly) {
           const value = localCache.read({
             selection: artifact.selection,
-            variables: marshalVariables(ctx)
+            variables: marshalVariables(ctx),
+            fullCheck: true
           });
           const allowed = !value.partial || artifact.kind === ArtifactKind.Query && artifact.partial;
           if (policy === CachePolicy.CacheOnly) {

package/build/runtime-esm/lib/types.d.ts

@@ -141,6 +141,10 @@ export type SubscriptionSelection = {
                 connection: boolean;
                 type: string;
             };
+            directives?: {
+                name: string;
+                arguments: ValueMap;
+            }[];
             updates?: string[];
             visible?: boolean;
             filters?: Record<string, {