houdini 1.1.3 → 1.1.4

package/build/lib/config.d.ts

@@ -127,6 +127,7 @@ export declare class Config {
         args: ValueMap | null;
         fragment: string;
     };
+    serializeValueMap(map: ValueMap | null): ValueMap | null;
     isListFragment(name: string): boolean;
     isListOperationDirective(name: string): boolean;
     isFragmentForList(listName: string, fragmentName: string): boolean;

package/build/lib-cjs/index.js

@@ -65276,7 +65276,8 @@ var CacheInternal = class {
     parent = rootID,
     variables,
     stepsFromConnection = null,
-    ignoreMasking
+    ignoreMasking,
+    fullCheck = false
   }) {
     if (parent === null) {
       return { data: null, partial: false, stale: false, hasData: true };
@@ -65301,11 +65302,28 @@ var CacheInternal = class {
     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);
@@ -65328,16 +65346,16 @@ var CacheInternal = class {
         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)) {
@@ -65346,9 +65364,10 @@ var CacheInternal = class {
           variables,
           linkedList: value,
           stepsFromConnection: nextStep,
-          ignoreMasking: !!ignoreMasking
+          ignoreMasking: !!ignoreMasking,
+          fullCheck
         });
-        target[attributeName] = listValue.data;
+        fieldTarget[attributeName] = listValue.data;
         if (listValue.partial) {
           partial = true;
         }
@@ -65364,9 +65383,10 @@ var CacheInternal = class {
           selection: fieldSelection,
           variables,
           stepsFromConnection: nextStep,
-          ignoreMasking
+          ignoreMasking,
+          fullCheck
         });
-        target[attributeName] = objectFields.data;
+        fieldTarget[attributeName] = objectFields.data;
         if (objectFields.partial) {
           partial = true;
         }
@@ -65377,7 +65397,7 @@ var CacheInternal = class {
           hasData = true;
         }
       }
-      if (target[attributeName] === null && !nullable && !embeddedCursor) {
+      if (fieldTarget[attributeName] === null && !nullable && !embeddedCursor) {
         cascadeNull = true;
       }
     }
@@ -65409,7 +65429,8 @@ var CacheInternal = class {
     variables,
     linkedList,
     stepsFromConnection,
-    ignoreMasking
+    ignoreMasking,
+    fullCheck
   }) {
     const result = [];
     let partialData = false;
@@ -65422,7 +65443,8 @@ var CacheInternal = class {
           variables,
           linkedList: entry,
           stepsFromConnection,
-          ignoreMasking
+          ignoreMasking,
+          fullCheck
         });
         result.push(nestedValue.data);
         if (nestedValue.partial) {
@@ -65444,7 +65466,8 @@ var CacheInternal = class {
         selection: fields,
         variables,
         stepsFromConnection,
-        ignoreMasking
+        ignoreMasking,
+        fullCheck
       });
       result.push(data);
       if (partial) {
@@ -65607,7 +65630,8 @@ var cachePolicy = ({
         if (policy !== CachePolicy.NetworkOnly) {
           const value = localCache.read({
             selection: artifact.selection,
-            variables: marshalVariables2(ctx)
+            variables: marshalVariables2(ctx),
+            fullCheck: true
           });
           const allowed = !value.partial || artifact.kind === ArtifactKind.Query && artifact.partial;
           if (policy === CachePolicy.CacheOnly) {
@@ -66823,7 +66847,7 @@ var Config = class {
     fragment: fragment2
   }) {
     this.#fragmentVariableMaps[hash] = {
-      args: this.#serializeValueMap(args),
+      args: this.serializeValueMap(args),
       fragment: fragment2
     };
   }
@@ -66834,7 +66858,7 @@ var Config = class {
       hash
     };
   }
-  #serializeValueMap(map) {
+  serializeValueMap(map) {
     if (!map) {
       return null;
     }
@@ -66849,7 +66873,7 @@ var Config = class {
           }
           if ("values" in input) {
             result.values = input.values.map(
-              (value) => this.#serializeValueMap({ foo: value }).foo
+              (value) => this.serializeValueMap({ foo: value }).foo
             );
           }
           if ("name" in input) {
@@ -66858,7 +66882,7 @@ var Config = class {
           if ("fields" in input) {
             result.fields = input.fields.map((field) => ({
               name: field.name,
-              value: this.#serializeValueMap({ foo: field.value }).foo
+              value: this.serializeValueMap({ foo: field.value }).foo
             }));
           }
         }

package/build/lib-esm/index.js

@@ -65221,7 +65221,8 @@ var CacheInternal = class {
     parent = rootID,
     variables,
     stepsFromConnection = null,
-    ignoreMasking
+    ignoreMasking,
+    fullCheck = false
   }) {
     if (parent === null) {
       return { data: null, partial: false, stale: false, hasData: true };
@@ -65246,11 +65247,28 @@ var CacheInternal = class {
     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);
@@ -65273,16 +65291,16 @@ var CacheInternal = class {
         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)) {
@@ -65291,9 +65309,10 @@ var CacheInternal = class {
           variables,
           linkedList: value,
           stepsFromConnection: nextStep,
-          ignoreMasking: !!ignoreMasking
+          ignoreMasking: !!ignoreMasking,
+          fullCheck
         });
-        target[attributeName] = listValue.data;
+        fieldTarget[attributeName] = listValue.data;
         if (listValue.partial) {
           partial = true;
         }
@@ -65309,9 +65328,10 @@ var CacheInternal = class {
           selection: fieldSelection,
           variables,
           stepsFromConnection: nextStep,
-          ignoreMasking
+          ignoreMasking,
+          fullCheck
         });
-        target[attributeName] = objectFields.data;
+        fieldTarget[attributeName] = objectFields.data;
         if (objectFields.partial) {
           partial = true;
         }
@@ -65322,7 +65342,7 @@ var CacheInternal = class {
           hasData = true;
         }
       }
-      if (target[attributeName] === null && !nullable && !embeddedCursor) {
+      if (fieldTarget[attributeName] === null && !nullable && !embeddedCursor) {
         cascadeNull = true;
       }
     }
@@ -65354,7 +65374,8 @@ var CacheInternal = class {
     variables,
     linkedList,
     stepsFromConnection,
-    ignoreMasking
+    ignoreMasking,
+    fullCheck
   }) {
     const result = [];
     let partialData = false;
@@ -65367,7 +65388,8 @@ var CacheInternal = class {
           variables,
           linkedList: entry,
           stepsFromConnection,
-          ignoreMasking
+          ignoreMasking,
+          fullCheck
         });
         result.push(nestedValue.data);
         if (nestedValue.partial) {
@@ -65389,7 +65411,8 @@ var CacheInternal = class {
         selection: fields,
         variables,
         stepsFromConnection,
-        ignoreMasking
+        ignoreMasking,
+        fullCheck
       });
       result.push(data);
       if (partial) {
@@ -65552,7 +65575,8 @@ var cachePolicy = ({
         if (policy !== CachePolicy.NetworkOnly) {
           const value = localCache.read({
             selection: artifact.selection,
-            variables: marshalVariables2(ctx)
+            variables: marshalVariables2(ctx),
+            fullCheck: true
           });
           const allowed = !value.partial || artifact.kind === ArtifactKind.Query && artifact.partial;
           if (policy === CachePolicy.CacheOnly) {
@@ -66767,7 +66791,7 @@ var Config = class {
     fragment: fragment2
   }) {
     this.#fragmentVariableMaps[hash] = {
-      args: this.#serializeValueMap(args),
+      args: this.serializeValueMap(args),
       fragment: fragment2
     };
   }
@@ -66778,7 +66802,7 @@ var Config = class {
       hash
     };
   }
-  #serializeValueMap(map) {
+  serializeValueMap(map) {
     if (!map) {
       return null;
     }
@@ -66793,7 +66817,7 @@ var Config = class {
           }
           if ("values" in input) {
             result.values = input.values.map(
-              (value) => this.#serializeValueMap({ foo: value }).foo
+              (value) => this.serializeValueMap({ foo: value }).foo
             );
           }
           if ("name" in input) {
@@ -66802,7 +66826,7 @@ var Config = class {
           if ("fields" in input) {
             result.fields = input.fields.map((field) => ({
               name: field.name,
-              value: this.#serializeValueMap({ foo: field.value }).foo
+              value: this.serializeValueMap({ foo: field.value }).foo
             }));
           }
         }

package/build/runtime/cache/cache.d.ts

@@ -87,12 +87,13 @@ declare class CacheInternal {
         forceNotify?: boolean;
         forceStale?: boolean;
     }): FieldSelection[];
-    getSelection({ selection, parent, variables, stepsFromConnection, ignoreMasking, }: {
+    getSelection({ selection, parent, variables, stepsFromConnection, ignoreMasking, fullCheck, }: {
         selection: SubscriptionSelection;
         parent?: string;
         variables?: {};
         stepsFromConnection?: number | null;
         ignoreMasking?: boolean;
+        fullCheck?: boolean;
     }): {
         data: GraphQLObject | null;
         partial: boolean;
@@ -103,12 +104,13 @@ declare class CacheInternal {
     id(type: string, id: string): string | null;
     idFields(type: string): string[];
     computeID(type: string, data: any): string;
-    hydrateNestedList({ fields, variables, linkedList, stepsFromConnection, ignoreMasking, }: {
+    hydrateNestedList({ fields, variables, linkedList, stepsFromConnection, ignoreMasking, fullCheck, }: {
         fields: SubscriptionSelection;
         variables?: {};
         linkedList: NestedList;
         stepsFromConnection: number | null;
         ignoreMasking: boolean;
+        fullCheck?: boolean;
     }): {
         data: NestedList<GraphQLValue>;
         partial: boolean;

package/build/runtime/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, {

package/build/runtime-cjs/cache/cache.d.ts

@@ -87,12 +87,13 @@ declare class CacheInternal {
         forceNotify?: boolean;
         forceStale?: boolean;
     }): FieldSelection[];
-    getSelection({ selection, parent, variables, stepsFromConnection, ignoreMasking, }: {
+    getSelection({ selection, parent, variables, stepsFromConnection, ignoreMasking, fullCheck, }: {
         selection: SubscriptionSelection;
         parent?: string;
         variables?: {};
         stepsFromConnection?: number | null;
         ignoreMasking?: boolean;
+        fullCheck?: boolean;
     }): {
         data: GraphQLObject | null;
         partial: boolean;
@@ -103,12 +104,13 @@ declare class CacheInternal {
     id(type: string, id: string): string | null;
     idFields(type: string): string[];
     computeID(type: string, data: any): string;
-    hydrateNestedList({ fields, variables, linkedList, stepsFromConnection, ignoreMasking, }: {
+    hydrateNestedList({ fields, variables, linkedList, stepsFromConnection, ignoreMasking, fullCheck, }: {
         fields: SubscriptionSelection;
         variables?: {};
         linkedList: NestedList;
         stepsFromConnection: number | null;
         ignoreMasking: boolean;
+        fullCheck?: boolean;
     }): {
         data: NestedList<GraphQLValue>;
         partial: boolean;

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

@@ -471,7 +471,8 @@ class CacheInternal {
     parent = rootID,
     variables,
     stepsFromConnection = null,
-    ignoreMasking
+    ignoreMasking,
+    fullCheck = false
   }) {
     if (parent === null) {
       return { data: null, partial: false, stale: false, hasData: true };
@@ -496,11 +497,28 @@ class CacheInternal {
     let targetSelection = (0, import_selection.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 = (0, import_stuff.evaluateKey)(keyRaw, variables);
       const { value } = this.storage.get(parent, key);
       const dt_field = this.staleManager.getFieldTime(parent, key);
@@ -523,16 +541,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)) {
@@ -541,9 +559,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;
         }
@@ -559,9 +578,10 @@ class CacheInternal {
           selection: fieldSelection,
           variables,
           stepsFromConnection: nextStep,
-          ignoreMasking
+          ignoreMasking,
+          fullCheck
         });
-        target[attributeName] = objectFields.data;
+        fieldTarget[attributeName] = objectFields.data;
         if (objectFields.partial) {
           partial = true;
         }
@@ -572,7 +592,7 @@ class CacheInternal {
           hasData = true;
         }
       }
-      if (target[attributeName] === null && !nullable && !embeddedCursor) {
+      if (fieldTarget[attributeName] === null && !nullable && !embeddedCursor) {
         cascadeNull = true;
       }
     }
@@ -604,7 +624,8 @@ class CacheInternal {
     variables,
     linkedList,
     stepsFromConnection,
-    ignoreMasking
+    ignoreMasking,
+    fullCheck
   }) {
     const result = [];
     let partialData = false;
@@ -617,7 +638,8 @@ class CacheInternal {
           variables,
           linkedList: entry,
           stepsFromConnection,
-          ignoreMasking
+          ignoreMasking,
+          fullCheck
         });
         result.push(nestedValue.data);
         if (nestedValue.partial) {
@@ -639,7 +661,8 @@ class CacheInternal {
         selection: fields,
         variables,
         stepsFromConnection,
-        ignoreMasking
+        ignoreMasking,
+        fullCheck
       });
       result.push(data);
       if (partial) {

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

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

package/build/runtime-cjs/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, {

package/build/runtime-esm/cache/cache.d.ts

@@ -87,12 +87,13 @@ declare class CacheInternal {
         forceNotify?: boolean;
         forceStale?: boolean;
     }): FieldSelection[];
-    getSelection({ selection, parent, variables, stepsFromConnection, ignoreMasking, }: {
+    getSelection({ selection, parent, variables, stepsFromConnection, ignoreMasking, fullCheck, }: {
         selection: SubscriptionSelection;
         parent?: string;
         variables?: {};
         stepsFromConnection?: number | null;
         ignoreMasking?: boolean;
+        fullCheck?: boolean;
     }): {
         data: GraphQLObject | null;
         partial: boolean;
@@ -103,12 +104,13 @@ declare class CacheInternal {
     id(type: string, id: string): string | null;
     idFields(type: string): string[];
     computeID(type: string, data: any): string;
-    hydrateNestedList({ fields, variables, linkedList, stepsFromConnection, ignoreMasking, }: {
+    hydrateNestedList({ fields, variables, linkedList, stepsFromConnection, ignoreMasking, fullCheck, }: {
         fields: SubscriptionSelection;
         variables?: {};
         linkedList: NestedList;
         stepsFromConnection: number | null;
         ignoreMasking: boolean;
+        fullCheck?: boolean;
     }): {
         data: NestedList<GraphQLValue>;
         partial: boolean;