houdini 1.2.1 → 1.2.3

package/build/test-esm/index.js

@@ -54771,10 +54771,10 @@ var ListManager = class {
     this.lists.get(list.name).get(parentID).lists.push(handler);
     this.listsByField.get(parentID).get(list.key).push(handler);
   }
-  removeIDFromAllLists(id) {
+  removeIDFromAllLists(id, layer) {
     for (const fieldMap of this.lists.values()) {
       for (const list of fieldMap.values()) {
-        list.removeID(id);
+        list.removeID(id, void 0, layer);
       }
     }
   }
@@ -54931,7 +54931,7 @@ var List = class {
       layer: layer?.id
     });
   }
-  removeID(id, variables = {}) {
+  removeID(id, variables = {}, layer) {
     if (!this.validateWhen()) {
       return;
     }
@@ -54978,7 +54978,7 @@ var List = class {
       subscribers.map((sub) => sub[0]),
       variables
     );
-    this.cache._internal_unstable.storage.remove(parentID, targetKey, targetID);
+    this.cache._internal_unstable.storage.remove(parentID, targetKey, targetID, layer);
     for (const [spec] of subscribers) {
       spec.set(
         this.cache._internal_unstable.getSelection({
@@ -54991,12 +54991,12 @@ var List = class {
     }
     return true;
   }
-  remove(data, variables = {}) {
+  remove(data, variables = {}, layer) {
     const targetID = this.cache._internal_unstable.id(this.listType(data), data);
     if (!targetID) {
       return;
     }
-    return this.removeID(targetID, variables);
+    return this.removeID(targetID, variables, layer);
   }
   listType(data) {
     return data.__typename || this.type;
@@ -55028,7 +55028,7 @@ var List = class {
     layer,
     where
   }) {
-    if (!this.remove(data, variables)) {
+    if (!this.remove(data, variables, layer)) {
       this.addToList(selection, data, variables, where, layer);
     }
   }
@@ -55165,7 +55165,7 @@ var StaleManager = class {
 // src/runtime/cache/storage.ts
 var InMemoryStorage = class {
   data;
-  idCount = 0;
+  idCount = 1;
   rank = 0;
   constructor() {
     this.data = [];
@@ -55185,11 +55185,11 @@ var InMemoryStorage = class {
   insert(id, field, location, target) {
     return this.topLayer.insert(id, field, location, target);
   }
-  remove(id, field, target) {
-    return this.topLayer.remove(id, field, target);
+  remove(id, field, target, layerToUser = this.topLayer) {
+    return layerToUser.remove(id, field, target);
   }
-  delete(id) {
-    return this.topLayer.delete(id);
+  delete(id, layerToUser = this.topLayer) {
+    return layerToUser.delete(id);
   }
   deleteField(id, field) {
     return this.topLayer.deleteField(id, field);
@@ -55561,6 +55561,9 @@ var InMemorySubscriptions = class {
   subscribers = {};
   referenceCounts = {};
   keyVersions = {};
+  activeFields(parent2) {
+    return Object.keys(this.subscribers[parent2] || {});
+  }
   add({
     parent: parent2,
     spec,
@@ -55829,20 +55832,7 @@ var Cache = class {
   }) {
     const layer = layerID ? this._internal_unstable.storage.getLayer(layerID) : this._internal_unstable.storage.topLayer;
     const subscribers = this._internal_unstable.writeSelection({ ...args, layer }).map((sub) => sub[0]);
-    const notified = [];
-    for (const spec of subscribers.concat(notifySubscribers)) {
-      if (!notified.includes(spec.set)) {
-        notified.push(spec.set);
-        spec.set(
-          this._internal_unstable.getSelection({
-            parent: spec.parentID || rootID,
-            selection: spec.selection,
-            variables: spec.variables?.() || {},
-            ignoreMasking: false
-          }).data
-        );
-      }
-    }
+    this.#notifySubscribers(subscribers.concat(notifySubscribers));
     return subscribers;
   }
   read(...args) {
@@ -55881,10 +55871,10 @@ var Cache = class {
     }
     return handler;
   }
-  delete(id) {
+  delete(id, layer) {
     this._internal_unstable.subscriptions.removeAllSubscribers(id);
-    this._internal_unstable.lists.removeIDFromAllLists(id);
-    this._internal_unstable.storage.delete(id);
+    this._internal_unstable.lists.removeIDFromAllLists(id, layer);
+    this._internal_unstable.storage.delete(id, layer);
   }
   setConfig(config2) {
     this._internal_unstable.setConfig(config2);
@@ -55916,6 +55906,70 @@ var Cache = class {
   config() {
     return this._internal_unstable.config;
   }
+  clearLayer(layerID) {
+    const layer = this._internal_unstable.storage.getLayer(layerID);
+    if (!layer) {
+      throw new Error("Cannot find layer with id: " + layerID);
+    }
+    const toNotify = [];
+    const allFields = [];
+    for (const target of [layer.fields, layer.links]) {
+      for (const [id, fields] of Object.entries(target)) {
+        allFields.push(
+          ...Object.entries(fields).map(([field, value]) => ({ id, field, value }))
+        );
+      }
+    }
+    const displayFields = [];
+    for (const pair of allFields) {
+      const { displayLayers } = this._internal_unstable.storage.get(pair.id, pair.field);
+      if (!displayLayers.includes(layerID)) {
+        continue;
+      }
+      displayFields.push(pair);
+    }
+    for (const [id, operation] of Object.entries(layer.operations)) {
+      if (operation.deleted) {
+        displayFields.push(
+          ...this._internal_unstable.subscriptions.activeFields(id).map((field) => ({ id, field }))
+        );
+      }
+      const fields = Object.keys(operation.fields ?? {});
+      if (fields.length > 0) {
+        displayFields.push(...fields.map((field) => ({ id, field })));
+      }
+    }
+    layer.clear();
+    for (const display of displayFields) {
+      const { field, id } = display;
+      const notify = !("value" in display) || this._internal_unstable.storage.get(id, field).value !== display.value;
+      if (notify) {
+        toNotify.push(
+          ...this._internal_unstable.subscriptions.get(id, field).map((sub) => sub[0])
+        );
+      }
+    }
+    this.#notifySubscribers(toNotify);
+  }
+  #notifySubscribers(subs) {
+    if (subs.length === 0) {
+      return;
+    }
+    const notified = [];
+    for (const spec of subs) {
+      if (!notified.includes(spec.set)) {
+        notified.push(spec.set);
+        spec.set(
+          this._internal_unstable.getSelection({
+            parent: spec.parentID || rootID,
+            selection: spec.selection,
+            variables: spec.variables?.() || {},
+            ignoreMasking: false
+          }).data
+        );
+      }
+    }
+  }
 };
 var CacheInternal = class {
   _disabled = false;
@@ -56203,8 +56257,16 @@ var CacheInternal = class {
               operation.position || "last",
               layer
             );
+          } else if (operation.action === "toggle" && target instanceof Object && fieldSelection && operation.list) {
+            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).toggleElement({
+              selection: fieldSelection,
+              data: target,
+              variables,
+              where: 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);
+            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).remove(target, variables, layer);
           } else if (operation.action === "delete" && operation.type) {
             if (typeof target !== "string") {
               throw new Error("Cannot delete a record with a non-string ID");
@@ -56213,15 +56275,7 @@ var CacheInternal = class {
             if (!targetID) {
               continue;
             }
-            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({
-              selection: fieldSelection,
-              data: target,
-              variables,
-              where: operation.position || "last",
-              layer
-            });
+            this.cache.delete(targetID, layer);
           }
         }
       }
@@ -56756,7 +56810,7 @@ var fragment = documentPlugin(ArtifactKind.Fragment, function() {
 var mutation = documentPlugin(ArtifactKind.Mutation, () => {
   return {
     async start(ctx, { next, marshalVariables }) {
-      const layer = cache_default._internal_unstable.storage.createLayer(true);
+      const layerOptimistic = cache_default._internal_unstable.storage.createLayer(true);
       const optimisticResponse = ctx.stuff.optimisticResponse;
       let toNotify = [];
       if (optimisticResponse) {
@@ -56767,25 +56821,29 @@ var mutation = documentPlugin(ArtifactKind.Mutation, () => {
             data: optimisticResponse
           }),
           variables: marshalVariables(ctx),
-          layer: layer.id
+          layer: layerOptimistic.id
         });
       }
       ctx.cacheParams = {
         ...ctx.cacheParams,
-        layer,
+        layer: layerOptimistic,
         notifySubscribers: toNotify,
         forceNotify: true
       };
       next(ctx);
     },
     afterNetwork(ctx, { resolve: resolve2 }) {
-      ctx.cacheParams?.layer?.clear();
+      if (ctx.cacheParams?.layer) {
+        cache_default.clearLayer(ctx.cacheParams.layer.id);
+      }
       resolve2(ctx);
     },
     end(ctx, { resolve: resolve2, value }) {
       const hasErrors = value.errors && value.errors.length > 0;
       if (hasErrors) {
-        ctx.cacheParams?.layer?.clear();
+        if (ctx.cacheParams?.layer) {
+          cache_default.clearLayer(ctx.cacheParams.layer.id);
+        }
       }
       if (ctx.cacheParams?.layer) {
         cache_default._internal_unstable.storage.resolveLayer(ctx.cacheParams.layer.id);
@@ -56795,7 +56853,7 @@ var mutation = documentPlugin(ArtifactKind.Mutation, () => {
     catch(ctx, { error }) {
       if (ctx.cacheParams?.layer) {
         const { layer } = ctx.cacheParams;
-        layer.clear();
+        cache_default.clearLayer(layer.id);
         cache_default._internal_unstable.storage.resolveLayer(layer.id);
       }
       throw error;
@@ -57685,18 +57743,14 @@ function flattenSelections({
   filepath,
   selections,
   fragmentDefinitions,
-  ignoreMaskDisable,
-  keepFragmentSpreadNodes,
-  hoistFragments
+  applyFragments
 }) {
   const fields = new FieldCollection({
     config: config2,
     filepath,
     selections,
     fragmentDefinitions,
-    ignoreMaskDisable: !!ignoreMaskDisable,
-    keepFragmentSpreadNodes: !!keepFragmentSpreadNodes,
-    hoistFragments
+    applyFragments: !!applyFragments
   });
   return fields.toSelectionSet();
 }
@@ -57707,18 +57761,14 @@ var FieldCollection = class {
   fields;
   inlineFragments;
   fragmentSpreads;
-  ignoreMaskDisable;
-  keepFragmentSpreadNodes;
-  hoistFragments;
+  applyFragments;
   constructor(args) {
     this.config = args.config;
     this.fragmentDefinitions = args.fragmentDefinitions;
-    this.ignoreMaskDisable = args.ignoreMaskDisable;
-    this.keepFragmentSpreadNodes = args.keepFragmentSpreadNodes;
+    this.applyFragments = args.applyFragments;
     this.fields = {};
     this.inlineFragments = {};
     this.fragmentSpreads = {};
-    this.hoistFragments = !!args.hoistFragments;
     this.filepath = args.filepath;
     for (const selection of args.selections) {
       this.add({ selection });
@@ -57728,21 +57778,18 @@ var FieldCollection = class {
     return Object.keys(this.fields).length + Object.keys(this.inlineFragments).length + Object.keys(this.fragmentSpreads).length;
   }
   add({ selection, external }) {
-    let includeFragments = this.config.defaultFragmentMasking === "disable";
+    let include = this.config.defaultFragmentMasking === "disable";
     const maskEnableDirective = selection.directives?.find(
       ({ name }) => name.value === this.config.maskEnableDirective
     );
     if (maskEnableDirective) {
-      includeFragments = false;
+      include = false;
     }
     const maskDisableDirective = selection.directives?.find(
       ({ name }) => name.value === this.config.maskDisableDirective
     );
     if (maskDisableDirective) {
-      includeFragments = true;
-    }
-    if (this.ignoreMaskDisable) {
-      includeFragments = true;
+      include = true;
     }
     if (selection.kind === "Field") {
       const key = selection.alias?.value || selection.name.value;
@@ -57758,7 +57805,7 @@ var FieldCollection = class {
           external
         });
       }
-      if (!external && includeFragments) {
+      if (this.applyFragments && !external) {
         this.fields[key].selection.fragmentSpreads = {
           ...this.collectFragmentSpreads(selection.selectionSet?.selections ?? []),
           ...this.fields[key].selection.fragmentSpreads
@@ -57772,16 +57819,13 @@ var FieldCollection = class {
       }
     }
     if (selection.kind === "InlineFragment" && selection.typeCondition) {
-      this.walkInlineFragment({ selection, external, hoistFragments: this.hoistFragments });
+      this.walkInlineFragment({ selection, external });
       return;
     }
     if (selection.kind === "FragmentSpread") {
-      if (this.keepFragmentSpreadNodes && !external) {
+      if (!external || include) {
         this.fragmentSpreads[selection.name.value] = selection;
       }
-      if (!includeFragments) {
-        return;
-      }
       const definition = this.fragmentDefinitions[selection.name.value];
       if (!definition) {
         throw new HoudiniError({
@@ -57789,23 +57833,25 @@ var FieldCollection = class {
           message: "Could not find referenced fragment definition: " + selection.name.value + "\n" + JSON.stringify(Object.keys(this.fragmentDefinitions), null, 4)
         });
       }
-      this.add({
-        selection: {
-          kind: "InlineFragment",
-          typeCondition: {
-            kind: "NamedType",
-            name: {
-              kind: "Name",
-              value: definition.typeCondition.name.value
+      if (this.applyFragments || include) {
+        this.add({
+          selection: {
+            kind: "InlineFragment",
+            typeCondition: {
+              kind: "NamedType",
+              name: {
+                kind: "Name",
+                value: definition.typeCondition.name.value
+              }
+            },
+            selectionSet: {
+              kind: "SelectionSet",
+              selections: [...definition.selectionSet.selections]
             }
           },
-          selectionSet: {
-            kind: "SelectionSet",
-            selections: [...definition.selectionSet.selections]
-          }
-        },
-        external
-      });
+          external: !include
+        });
+      }
     }
   }
   collectFragmentSpreads(selections, result = {}) {
@@ -57862,8 +57908,7 @@ var FieldCollection = class {
   }
   walkInlineFragment({
     selection,
-    external,
-    hoistFragments
+    external
   }) {
     const key = selection.typeCondition.name.value;
     if (!this.inlineFragments[key]) {
@@ -57873,7 +57918,7 @@ var FieldCollection = class {
       };
     }
     for (const subselect of selection.selectionSet.selections || []) {
-      if (subselect.kind === "FragmentSpread" && !hoistFragments || subselect.kind === "Field" || subselect.kind === "InlineFragment" && !subselect.typeCondition) {
+      if (subselect.kind === "Field" || subselect.kind === "InlineFragment" && !subselect.typeCondition) {
         this.inlineFragments[key].selection.add({
           selection: subselect,
           external
@@ -57882,11 +57927,11 @@ var FieldCollection = class {
       } else if (subselect.kind === "FragmentSpread") {
         this.add({
           selection: subselect,
-          external: true
+          external
         });
         continue;
       } else {
-        this.walkInlineFragment({ selection: subselect, external, hoistFragments });
+        this.walkInlineFragment({ selection: subselect, external });
       }
     }
   }
@@ -57896,9 +57941,7 @@ var FieldCollection = class {
       fragmentDefinitions: this.fragmentDefinitions,
       selections: [],
       filepath: this.filepath,
-      ignoreMaskDisable: this.ignoreMaskDisable,
-      keepFragmentSpreadNodes: this.keepFragmentSpreadNodes,
-      hoistFragments: this.hoistFragments
+      applyFragments: this.applyFragments
     });
   }
 };
@@ -58827,7 +58870,7 @@ function operationObject({
   if (operationKind === "insert" || operationKind === "toggle") {
     operation.position = position;
   }
-  if (operationKind === "insert" && allLists) {
+  if (allLists && operationKind !== "delete") {
     operation.target = "all";
   }
   if (parentID) {
@@ -59818,7 +59861,8 @@ function prepareSelection({
   inConnection,
   typeMap,
   abstractTypes,
-  globalLoading
+  globalLoading,
+  includeFragments
 }) {
   let object = {};
   const loadingTypes = [];
@@ -59838,7 +59882,8 @@ function prepareSelection({
             document,
             typeMap,
             abstractTypes,
-            globalLoading
+            globalLoading,
+            includeFragments
           }).fields || {}
         );
       } else {
@@ -59886,7 +59931,8 @@ function prepareSelection({
             document,
             typeMap,
             abstractTypes,
-            globalLoading
+            globalLoading,
+            includeFragments
           }).fields
         };
         if (field.directives?.find((d) => d.name.value === config2.loadingDirective)) {
@@ -60004,7 +60050,8 @@ function prepareSelection({
           inConnection: connectionState,
           typeMap,
           abstractTypes,
-          globalLoading: forceLoading
+          globalLoading: forceLoading,
+          includeFragments
         });
         if (Object.values(fieldObj.selection.fields ?? {}).some((field2) => field2.required)) {
           fieldObj.nullable = true;
@@ -60337,14 +60384,13 @@ function artifactGenerator(stats) {
               document: doc,
               rootType,
               globalLoading,
+              includeFragments: doc.kind !== ArtifactKind.Fragment,
               selections: flattenSelections({
                 config: config2,
                 filepath: doc.filename,
                 selections: selectionSet.selections,
                 fragmentDefinitions,
-                ignoreMaskDisable: docKind !== "HoudiniFragment",
-                keepFragmentSpreadNodes: true,
-                hoistFragments: true
+                applyFragments: doc.kind !== ArtifactKind.Fragment
               }),
               operations: operationsByPath(
                 config2,
@@ -61309,8 +61355,7 @@ async function generateDocumentTypes(config2, docs) {
         config: config2,
         filepath: filename,
         selections: definition.selectionSet.selections,
-        fragmentDefinitions,
-        keepFragmentSpreadNodes: true
+        fragmentDefinitions
       });
       if (definition?.kind === "OperationDefinition") {
         await generateOperationTypeDefs(