houdini 1.1.1 → 1.1.2

package/build/vite-cjs/index.js

@@ -67191,13 +67191,23 @@ var List = class {
   when(when) {
     return this.manager.lists.get(this.name).get(this.recordID).when(when);
   }
-  append(selection, data, variables = {}) {
-    return this.addToList(selection, data, variables, "last");
+  append({
+    selection,
+    data,
+    variables = {},
+    layer
+  }) {
+    return this.addToList(selection, data, variables, "last", layer);
   }
-  prepend(selection, data, variables = {}) {
-    return this.addToList(selection, data, variables, "first");
+  prepend({
+    selection,
+    data,
+    variables = {},
+    layer
+  }) {
+    return this.addToList(selection, data, variables, "first", layer);
   }
-  addToList(selection, data, variables = {}, where) {
+  addToList(selection, data, variables = {}, where, layer) {
     const listType = this.listType(data);
     const dataID = this.cache._internal_unstable.id(listType, data);
     if (!this.validateWhen() || !dataID) {
@@ -67275,7 +67285,8 @@ var List = class {
       data: insertData,
       variables,
       parent: this.recordID,
-      applyUpdates: [where === "first" ? "prepend" : "append"]
+      applyUpdates: [where === "first" ? "prepend" : "append"],
+      layer: layer?.id
     });
   }
   removeID(id, variables = {}) {
@@ -67368,9 +67379,15 @@ var List = class {
     }
     return ok;
   }
-  toggleElement(selection, data, variables = {}, where) {
+  toggleElement({
+    selection,
+    data,
+    variables = {},
+    layer,
+    where
+  }) {
     if (!this.remove(data, variables)) {
-      this.addToList(selection, data, variables, where);
+      this.addToList(selection, data, variables, where, layer);
     }
   }
   *[Symbol.iterator]() {
@@ -68378,6 +68395,9 @@ var CacheInternal = class {
         nullable,
         link: !!fieldSelection
       });
+      if (value && typeof value === "object" && "__typename" in value && value["__typename"]) {
+        linkedType = value["__typename"];
+      }
       const currentSubscribers = this.subscriptions.get(parent, key);
       const specs = currentSubscribers.map((sub) => sub[0]);
       const { value: previousValue, displayLayers } = this.storage.get(parent, key);
@@ -68431,7 +68451,6 @@ var CacheInternal = class {
               "Encountered interface type without __typename in the payload"
             );
           }
-          linkedType = value.__typename;
         }
         const embedded = this.idFields(linkedType)?.filter(
           (field2) => typeof value[field2] === "undefined"
@@ -68587,7 +68606,8 @@ var CacheInternal = class {
               fieldSelection,
               target,
               variables,
-              operation.position || "last"
+              operation.position || "last",
+              layer
             );
           } else if (operation.action === "remove" && target instanceof Object && fieldSelection && operation.list) {
             this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).remove(target, variables);
@@ -68601,12 +68621,13 @@ var CacheInternal = class {
             }
             this.cache.delete(targetID);
           } else if (operation.action === "toggle" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement(
-              fieldSelection,
-              target,
+            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement({
+              selection: fieldSelection,
+              data: target,
               variables,
-              operation.position || "last"
-            );
+              where: operation.position || "last",
+              layer
+            });
           }
         }
       }
@@ -68635,7 +68656,7 @@ var CacheInternal = class {
         ])
       );
     }
-    let hasData = false;
+    let hasData = !!selection.fragments;
     let partial = false;
     let cascadeNull = false;
     let stale = false;
@@ -68850,13 +68871,12 @@ var CacheInternal = class {
       const embedded = this.idFields(linkedType)?.filter(
         (field) => typeof entry[field] === "undefined"
       ).length > 0;
-      const typename = entryObj.__typename;
       let innerType = linkedType;
-      if (abstract) {
-        if (!typename) {
-          throw new Error("Encountered interface type without __typename in the payload");
-        }
+      const typename = entryObj.__typename;
+      if (typename) {
         innerType = typename;
+      } else if (abstract) {
+        throw new Error("Encountered interface type without __typename in the payload");
       }
       if (!embedded) {
         const id = this.id(innerType, entry);
@@ -72662,19 +72682,6 @@ function artifactGenerator(stats) {
           if (docKind === ArtifactKind.Fragment && directive) {
             inputs = fragmentArgumentsDefinitions(config4, doc.filename, fragments[0]);
           }
-          const mask = selection_default({
-            config: config4,
-            filepath: doc.filename,
-            rootType,
-            operations: {},
-            document: doc,
-            selections: flattenSelections({
-              config: config4,
-              filepath: doc.filename,
-              selections: selectionSet.selections,
-              fragmentDefinitions
-            })
-          });
           let artifact = {
             name,
             kind: docKind,
@@ -72704,7 +72711,23 @@ function artifactGenerator(stats) {
             }),
             pluginData: {}
           };
-          applyMask(config4, artifact.selection, mask);
+          applyMask(
+            config4,
+            artifact.selection,
+            selection_default({
+              config: config4,
+              filepath: doc.filename,
+              rootType,
+              operations: {},
+              document: doc,
+              selections: flattenSelections({
+                config: config4,
+                filepath: doc.filename,
+                selections: selectionSet.selections,
+                fragmentDefinitions
+              })
+            })
+          );
           artifact.pluginData = {};
           for (const plugin2 of config4.plugins) {
             if (!plugin2.artifactData) {
@@ -72782,14 +72805,21 @@ function artifactGenerator(stats) {
   };
 }
 function applyMask(config4, target, mask) {
+  const targetFields = Object.entries(target.fields ?? {}).concat(
+    Object.values(target.abstractFields?.fields ?? {}).flatMap((typeMap) => Object.entries(typeMap))
+  );
   for (const [fieldName, value] of Object.entries(mask.fields ?? {})) {
-    const targetSelection = target.fields?.[fieldName];
-    if (!targetSelection || !mask.fields) {
-      continue;
-    }
-    targetSelection.visible = true;
-    if (targetSelection.selection && value.selection) {
-      applyMask(config4, targetSelection.selection, value.selection);
+    for (const [potentialFieldName, targetSelection] of targetFields) {
+      if (fieldName !== potentialFieldName) {
+        continue;
+      }
+      if (!targetSelection) {
+        continue;
+      }
+      targetSelection.visible = true;
+      if (targetSelection.selection && value.selection) {
+        applyMask(config4, targetSelection.selection, value.selection);
+      }
     }
   }
   for (const [type, selection] of Object.entries(mask.abstractFields?.fields ?? {})) {
@@ -74400,6 +74430,24 @@ async function addTypename(config4, documents) {
             }
           };
         }
+      },
+      FragmentDefinition(node) {
+        return {
+          ...node,
+          selectionSet: {
+            ...node.selectionSet,
+            selections: [
+              ...node.selectionSet.selections,
+              {
+                kind: graphql23.Kind.FIELD,
+                name: {
+                  kind: graphql23.Kind.NAME,
+                  value: "__typename"
+                }
+              }
+            ]
+          }
+        };
       }
     });
   }

package/build/vite-esm/index.js

@@ -67186,13 +67186,23 @@ var List = class {
   when(when) {
     return this.manager.lists.get(this.name).get(this.recordID).when(when);
   }
-  append(selection, data, variables = {}) {
-    return this.addToList(selection, data, variables, "last");
+  append({
+    selection,
+    data,
+    variables = {},
+    layer
+  }) {
+    return this.addToList(selection, data, variables, "last", layer);
   }
-  prepend(selection, data, variables = {}) {
-    return this.addToList(selection, data, variables, "first");
+  prepend({
+    selection,
+    data,
+    variables = {},
+    layer
+  }) {
+    return this.addToList(selection, data, variables, "first", layer);
   }
-  addToList(selection, data, variables = {}, where) {
+  addToList(selection, data, variables = {}, where, layer) {
     const listType = this.listType(data);
     const dataID = this.cache._internal_unstable.id(listType, data);
     if (!this.validateWhen() || !dataID) {
@@ -67270,7 +67280,8 @@ var List = class {
       data: insertData,
       variables,
       parent: this.recordID,
-      applyUpdates: [where === "first" ? "prepend" : "append"]
+      applyUpdates: [where === "first" ? "prepend" : "append"],
+      layer: layer?.id
     });
   }
   removeID(id, variables = {}) {
@@ -67363,9 +67374,15 @@ var List = class {
     }
     return ok;
   }
-  toggleElement(selection, data, variables = {}, where) {
+  toggleElement({
+    selection,
+    data,
+    variables = {},
+    layer,
+    where
+  }) {
     if (!this.remove(data, variables)) {
-      this.addToList(selection, data, variables, where);
+      this.addToList(selection, data, variables, where, layer);
     }
   }
   *[Symbol.iterator]() {
@@ -68373,6 +68390,9 @@ var CacheInternal = class {
         nullable,
         link: !!fieldSelection
       });
+      if (value && typeof value === "object" && "__typename" in value && value["__typename"]) {
+        linkedType = value["__typename"];
+      }
       const currentSubscribers = this.subscriptions.get(parent, key);
       const specs = currentSubscribers.map((sub) => sub[0]);
       const { value: previousValue, displayLayers } = this.storage.get(parent, key);
@@ -68426,7 +68446,6 @@ var CacheInternal = class {
               "Encountered interface type without __typename in the payload"
             );
           }
-          linkedType = value.__typename;
         }
         const embedded = this.idFields(linkedType)?.filter(
           (field2) => typeof value[field2] === "undefined"
@@ -68582,7 +68601,8 @@ var CacheInternal = class {
               fieldSelection,
               target,
               variables,
-              operation.position || "last"
+              operation.position || "last",
+              layer
             );
           } else if (operation.action === "remove" && target instanceof Object && fieldSelection && operation.list) {
             this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).remove(target, variables);
@@ -68596,12 +68616,13 @@ var CacheInternal = class {
             }
             this.cache.delete(targetID);
           } else if (operation.action === "toggle" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement(
-              fieldSelection,
-              target,
+            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement({
+              selection: fieldSelection,
+              data: target,
               variables,
-              operation.position || "last"
-            );
+              where: operation.position || "last",
+              layer
+            });
           }
         }
       }
@@ -68630,7 +68651,7 @@ var CacheInternal = class {
         ])
       );
     }
-    let hasData = false;
+    let hasData = !!selection.fragments;
     let partial = false;
     let cascadeNull = false;
     let stale = false;
@@ -68845,13 +68866,12 @@ var CacheInternal = class {
       const embedded = this.idFields(linkedType)?.filter(
         (field) => typeof entry[field] === "undefined"
       ).length > 0;
-      const typename = entryObj.__typename;
       let innerType = linkedType;
-      if (abstract) {
-        if (!typename) {
-          throw new Error("Encountered interface type without __typename in the payload");
-        }
+      const typename = entryObj.__typename;
+      if (typename) {
         innerType = typename;
+      } else if (abstract) {
+        throw new Error("Encountered interface type without __typename in the payload");
       }
       if (!embedded) {
         const id = this.id(innerType, entry);
@@ -72656,19 +72676,6 @@ function artifactGenerator(stats) {
           if (docKind === ArtifactKind.Fragment && directive) {
             inputs = fragmentArgumentsDefinitions(config4, doc.filename, fragments[0]);
           }
-          const mask = selection_default({
-            config: config4,
-            filepath: doc.filename,
-            rootType,
-            operations: {},
-            document: doc,
-            selections: flattenSelections({
-              config: config4,
-              filepath: doc.filename,
-              selections: selectionSet.selections,
-              fragmentDefinitions
-            })
-          });
           let artifact = {
             name,
             kind: docKind,
@@ -72698,7 +72705,23 @@ function artifactGenerator(stats) {
             }),
             pluginData: {}
           };
-          applyMask(config4, artifact.selection, mask);
+          applyMask(
+            config4,
+            artifact.selection,
+            selection_default({
+              config: config4,
+              filepath: doc.filename,
+              rootType,
+              operations: {},
+              document: doc,
+              selections: flattenSelections({
+                config: config4,
+                filepath: doc.filename,
+                selections: selectionSet.selections,
+                fragmentDefinitions
+              })
+            })
+          );
           artifact.pluginData = {};
           for (const plugin2 of config4.plugins) {
             if (!plugin2.artifactData) {
@@ -72776,14 +72799,21 @@ function artifactGenerator(stats) {
   };
 }
 function applyMask(config4, target, mask) {
+  const targetFields = Object.entries(target.fields ?? {}).concat(
+    Object.values(target.abstractFields?.fields ?? {}).flatMap((typeMap) => Object.entries(typeMap))
+  );
   for (const [fieldName, value] of Object.entries(mask.fields ?? {})) {
-    const targetSelection = target.fields?.[fieldName];
-    if (!targetSelection || !mask.fields) {
-      continue;
-    }
-    targetSelection.visible = true;
-    if (targetSelection.selection && value.selection) {
-      applyMask(config4, targetSelection.selection, value.selection);
+    for (const [potentialFieldName, targetSelection] of targetFields) {
+      if (fieldName !== potentialFieldName) {
+        continue;
+      }
+      if (!targetSelection) {
+        continue;
+      }
+      targetSelection.visible = true;
+      if (targetSelection.selection && value.selection) {
+        applyMask(config4, targetSelection.selection, value.selection);
+      }
     }
   }
   for (const [type, selection] of Object.entries(mask.abstractFields?.fields ?? {})) {
@@ -74394,6 +74424,24 @@ async function addTypename(config4, documents) {
             }
           };
         }
+      },
+      FragmentDefinition(node) {
+        return {
+          ...node,
+          selectionSet: {
+            ...node.selectionSet,
+            selections: [
+              ...node.selectionSet.selections,
+              {
+                kind: graphql23.Kind.FIELD,
+                name: {
+                  kind: graphql23.Kind.NAME,
+                  value: "__typename"
+                }
+              }
+            ]
+          }
+        };
       }
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "The disappearing GraphQL clients",
   "keywords": [
     "typescript",