houdini-svelte 2.0.1 → 2.1.1

package/build/plugin-esm/index.js

@@ -86460,7 +86460,18 @@ var ListManager = class {
   }
   lists = /* @__PURE__ */ new Map();
   listsByField = /* @__PURE__ */ new Map();
-  get(listName, id2, allLists) {
+  get(listName, id2, allLists, skipMatches) {
+    const lists = this.getLists(listName, id2, allLists);
+    if (!lists) {
+      return null;
+    }
+    if (skipMatches) {
+      return new ListCollection(lists.lists.filter((list3) => !skipMatches.has(list3.fieldRef)));
+    } else {
+      return lists;
+    }
+  }
+  getLists(listName, id2, allLists) {
     const matches = this.lists.get(listName);
     if (!matches || matches.size === 0) {
       return null;
@@ -86582,6 +86593,9 @@ var List = class {
     this.manager = manager;
     this.abstract = abstract;
   }
+  get fieldRef() {
+    return `${this.recordID}.${this.key}`;
+  }
   when(when) {
     return this.manager.lists.get(this.name).get(this.recordID).when(when);
   }
@@ -87726,8 +87740,8 @@ var Cache = class {
       variables
     );
   }
-  list(name, parentID, allLists) {
-    const handler = this._internal_unstable.lists.get(name, parentID, allLists);
+  list(name, parentID, allLists, skipMatches) {
+    const handler = this._internal_unstable.lists.get(name, parentID, allLists, skipMatches);
     if (!handler) {
       throw new Error(
         `Cannot find list with name: ${name}${parentID ? " under parent " + parentID : ""}. Is it possible that the query is not mounted?`
@@ -88142,6 +88156,7 @@ var CacheInternal = class {
           });
         }
       }
+      const processedOperations = /* @__PURE__ */ new Set();
       for (const operation of operations || []) {
         let parentID;
         if (operation.parentID) {
@@ -88161,7 +88176,12 @@ var CacheInternal = class {
         const targets = Array.isArray(value) ? value : [value];
         for (const target of targets) {
           if (operation.action === "insert" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).addToList(
+            this.cache.list(
+              operation.list,
+              parentID,
+              operation.target === "all",
+              processedOperations
+            ).when(operation.when).addToList(
               fieldSelection,
               target,
               variables,
@@ -88169,7 +88189,12 @@ var CacheInternal = class {
               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({
+            this.cache.list(
+              operation.list,
+              parentID,
+              operation.target === "all",
+              processedOperations
+            ).when(operation.when).toggleElement({
               selection: fieldSelection,
               data: target,
               variables,
@@ -88177,7 +88202,12 @@ var CacheInternal = class {
               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, layer);
+            this.cache.list(
+              operation.list,
+              parentID,
+              operation.target === "all",
+              processedOperations
+            ).when(operation.when).remove(target, variables, layer);
           } else if (operation.action === "delete" && operation.type && target) {
             const targetID = this.id(operation.type, target);
             if (!targetID) {
@@ -88189,6 +88219,16 @@ var CacheInternal = class {
             this.cache.delete(targetID, layer);
           }
         }
+        if (operation.list) {
+          const matchingLists = this.cache.list(
+            operation.list,
+            parentID,
+            operation.target === "all"
+          );
+          for (const list3 of matchingLists.lists) {
+            processedOperations.add(list3.fieldRef);
+          }
+        }
       }
     }
     return toNotify;
@@ -108838,30 +108878,30 @@ var require_utils5 = __commonJS3({
       validate3.oneOf = values;
       return validate3;
     }
-    function assertNodeType(...types17) {
+    function assertNodeType(...types18) {
       function validate3(node, key2, val) {
-        for (const type of types17) {
+        for (const type of types18) {
           if ((0, _is.default)(type, val)) {
             (0, _validate.validateChild)(node, key2, val);
             return;
           }
         }
-        throw new TypeError(`Property ${key2} of ${node.type} expected node to be of a type ${JSON.stringify(types17)} but instead got ${JSON.stringify(val == null ? void 0 : val.type)}`);
+        throw new TypeError(`Property ${key2} of ${node.type} expected node to be of a type ${JSON.stringify(types18)} but instead got ${JSON.stringify(val == null ? void 0 : val.type)}`);
       }
-      validate3.oneOfNodeTypes = types17;
+      validate3.oneOfNodeTypes = types18;
       return validate3;
     }
-    function assertNodeOrValueType(...types17) {
+    function assertNodeOrValueType(...types18) {
       function validate3(node, key2, val) {
-        for (const type of types17) {
+        for (const type of types18) {
           if (getType(val) === type || (0, _is.default)(type, val)) {
             (0, _validate.validateChild)(node, key2, val);
             return;
           }
         }
-        throw new TypeError(`Property ${key2} of ${node.type} expected node to be of a type ${JSON.stringify(types17)} but instead got ${JSON.stringify(val == null ? void 0 : val.type)}`);
+        throw new TypeError(`Property ${key2} of ${node.type} expected node to be of a type ${JSON.stringify(types18)} but instead got ${JSON.stringify(val == null ? void 0 : val.type)}`);
       }
-      validate3.oneOfNodeOrValueTypes = types17;
+      validate3.oneOfNodeOrValueTypes = types18;
       return validate3;
     }
     function assertValueType(type) {
@@ -113265,10 +113305,10 @@ var require_generated22 = __commonJS3({
         body
       });
     }
-    function intersectionTypeAnnotation(types17) {
+    function intersectionTypeAnnotation(types18) {
       return (0, _validateNode.default)({
         type: "IntersectionTypeAnnotation",
-        types: types17
+        types: types18
       });
     }
     function mixedTypeAnnotation() {
@@ -113391,10 +113431,10 @@ var require_generated22 = __commonJS3({
         type: "ThisTypeAnnotation"
       };
     }
-    function tupleTypeAnnotation(types17) {
+    function tupleTypeAnnotation(types18) {
       return (0, _validateNode.default)({
         type: "TupleTypeAnnotation",
-        types: types17
+        types: types18
       });
     }
     function typeofTypeAnnotation(argument) {
@@ -113445,10 +113485,10 @@ var require_generated22 = __commonJS3({
         params
       });
     }
-    function unionTypeAnnotation(types17) {
+    function unionTypeAnnotation(types18) {
       return (0, _validateNode.default)({
         type: "UnionTypeAnnotation",
-        types: types17
+        types: types18
       });
     }
     function variance(kind) {
@@ -113961,16 +114001,16 @@ var require_generated22 = __commonJS3({
         optional
       });
     }
-    function tsUnionType(types17) {
+    function tsUnionType(types18) {
       return (0, _validateNode.default)({
         type: "TSUnionType",
-        types: types17
+        types: types18
       });
     }
-    function tsIntersectionType(types17) {
+    function tsIntersectionType(types18) {
       return (0, _validateNode.default)({
         type: "TSIntersectionType",
-        types: types17
+        types: types18
       });
     }
     function tsConditionalType(checkType, extendsType, trueType, falseType) {
@@ -115571,12 +115611,12 @@ var require_removeTypeDuplicates3 = __commonJS3({
       const generics = /* @__PURE__ */ new Map();
       const bases = /* @__PURE__ */ new Map();
       const typeGroups = /* @__PURE__ */ new Set();
-      const types17 = [];
+      const types18 = [];
       for (let i22 = 0; i22 < nodes.length; i22++) {
         const node = nodes[i22];
         if (!node)
           continue;
-        if (types17.indexOf(node) >= 0) {
+        if (types18.indexOf(node) >= 0) {
           continue;
         }
         if ((0, _generated.isAnyTypeAnnotation)(node)) {
@@ -115610,15 +115650,15 @@ var require_removeTypeDuplicates3 = __commonJS3({
           }
           continue;
         }
-        types17.push(node);
+        types18.push(node);
       }
       for (const [, baseType] of bases) {
-        types17.push(baseType);
+        types18.push(baseType);
       }
       for (const [, genericName] of generics) {
-        types17.push(genericName);
+        types18.push(genericName);
       }
-      return types17;
+      return types18;
     }
   }
 });
@@ -115631,8 +115671,8 @@ var require_createFlowUnionType2 = __commonJS3({
     exports.default = createFlowUnionType;
     var _generated = require_generated22();
     var _removeTypeDuplicates = require_removeTypeDuplicates3();
-    function createFlowUnionType(types17) {
-      const flattened = (0, _removeTypeDuplicates.default)(types17);
+    function createFlowUnionType(types18) {
+      const flattened = (0, _removeTypeDuplicates.default)(types18);
       if (flattened.length === 1) {
         return flattened[0];
       } else {
@@ -115657,12 +115697,12 @@ var require_removeTypeDuplicates22 = __commonJS3({
       const generics = /* @__PURE__ */ new Map();
       const bases = /* @__PURE__ */ new Map();
       const typeGroups = /* @__PURE__ */ new Set();
-      const types17 = [];
+      const types18 = [];
       for (let i22 = 0; i22 < nodes.length; i22++) {
         const node = nodes[i22];
         if (!node)
           continue;
-        if (types17.indexOf(node) >= 0) {
+        if (types18.indexOf(node) >= 0) {
           continue;
         }
         if ((0, _generated.isTSAnyKeyword)(node)) {
@@ -115696,15 +115736,15 @@ var require_removeTypeDuplicates22 = __commonJS3({
           }
           continue;
         }
-        types17.push(node);
+        types18.push(node);
       }
       for (const [, baseType] of bases) {
-        types17.push(baseType);
+        types18.push(baseType);
       }
       for (const [, genericName] of generics) {
-        types17.push(genericName);
+        types18.push(genericName);
       }
-      return types17;
+      return types18;
     }
   }
 });
@@ -115719,10 +115759,10 @@ var require_createTSUnionType2 = __commonJS3({
     var _removeTypeDuplicates = require_removeTypeDuplicates22();
     var _index = require_generated5();
     function createTSUnionType(typeAnnotations) {
-      const types17 = typeAnnotations.map((type) => {
+      const types18 = typeAnnotations.map((type) => {
         return (0, _index.isTSTypeAnnotation)(type) ? type.typeAnnotation : type;
       });
-      const flattened = (0, _removeTypeDuplicates.default)(types17);
+      const flattened = (0, _removeTypeDuplicates.default)(types18);
       if (flattened.length === 1) {
         return flattened[0];
       } else {
@@ -119986,14 +120026,14 @@ var require_lib62 = __commonJS3({
         this.preserveSpace = !!preserveSpace;
       }
     };
-    var types17 = {
+    var types18 = {
       brace: new TokContext3("{"),
       j_oTag: new TokContext3("<tag"),
       j_cTag: new TokContext3("</tag"),
       j_expr: new TokContext3("<tag>...</tag>", true)
     };
     {
-      types17.template = new TokContext3("`", true);
+      types18.template = new TokContext3("`", true);
     }
     var beforeExpr2 = true;
     var startsExpr2 = true;
@@ -120531,17 +120571,17 @@ var require_lib62 = __commonJS3({
         context.pop();
       };
       tokenTypes[5].updateContext = tokenTypes[7].updateContext = tokenTypes[23].updateContext = (context) => {
-        context.push(types17.brace);
+        context.push(types18.brace);
       };
       tokenTypes[22].updateContext = (context) => {
-        if (context[context.length - 1] === types17.template) {
+        if (context[context.length - 1] === types18.template) {
           context.pop();
         } else {
-          context.push(types17.template);
+          context.push(types18.template);
         }
       };
       tokenTypes[142].updateContext = (context) => {
-        context.push(types17.j_expr, types17.j_oTag);
+        context.push(types18.j_expr, types18.j_oTag);
       };
     }
     var nonASCIIidentifierStartChars2 = "\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u05D0-\u05EA\u05EF-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u0870-\u0887\u0889-\u088E\u08A0-\u08C9\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C5D\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D04-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E86-\u0E8A\u0E8C-\u0EA3\u0EA5\u0EA7-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u1711\u171F-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1878\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4C\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CE9-\u1CEC\u1CEE-\u1CF3\u1CF5\u1CF6\u1CFA\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u31A0-\u31BF\u31F0-\u31FF\u3400-\u4DBF\u4E00-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7CA\uA7D0\uA7D1\uA7D3\uA7D5-\uA7D9\uA7F2-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA8FE\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB69\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC";
@@ -121101,7 +121141,7 @@ var require_lib62 = __commonJS3({
         this.end = 0;
         this.lastTokEndLoc = null;
         this.lastTokStartLoc = null;
-        this.context = [types17.brace];
+        this.context = [types18.brace];
         this.firstInvalidTemplateEscapePos = null;
         this.strictErrors = /* @__PURE__ */ new Map();
         this.tokensLength = 0;
@@ -124928,7 +124968,7 @@ var require_lib62 = __commonJS3({
             context
           } = this.state;
           const currentContext = context[context.length - 1];
-          if (currentContext === types17.j_oTag || currentContext === types17.j_expr) {
+          if (currentContext === types18.j_oTag || currentContext === types18.j_expr) {
             context.pop();
           }
         }
@@ -125950,9 +125990,9 @@ var require_lib62 = __commonJS3({
         switch (this.state.type) {
           case 5:
             node = this.startNode();
-            this.setContext(types17.brace);
+            this.setContext(types18.brace);
             this.next();
-            node = this.jsxParseExpressionContainer(node, types17.j_oTag);
+            node = this.jsxParseExpressionContainer(node, types18.j_oTag);
             if (node.expression.type === "JSXEmptyExpression") {
               this.raise(JsxErrors.AttributeIsEmpty, node);
             }
@@ -125971,7 +126011,7 @@ var require_lib62 = __commonJS3({
       jsxParseSpreadChild(node) {
         this.next();
         node.expression = this.parseExpression();
-        this.setContext(types17.j_expr);
+        this.setContext(types18.j_expr);
         this.state.canStartJSXElement = true;
         this.expect(8);
         return this.finishNode(node, "JSXSpreadChild");
@@ -125991,11 +126031,11 @@ var require_lib62 = __commonJS3({
       jsxParseAttribute() {
         const node = this.startNode();
         if (this.match(5)) {
-          this.setContext(types17.brace);
+          this.setContext(types18.brace);
           this.next();
           this.expect(21);
           node.argument = this.parseMaybeAssignAllowIn();
-          this.setContext(types17.j_oTag);
+          this.setContext(types18.j_oTag);
           this.state.canStartJSXElement = true;
           this.expect(8);
           return this.finishNode(node, "JSXSpreadAttribute");
@@ -126054,12 +126094,12 @@ var require_lib62 = __commonJS3({
                   break;
                 case 5: {
                   const node2 = this.startNode();
-                  this.setContext(types17.brace);
+                  this.setContext(types18.brace);
                   this.next();
                   if (this.match(21)) {
                     children.push(this.jsxParseSpreadChild(node2));
                   } else {
-                    children.push(this.jsxParseExpressionContainer(node2, types17.j_expr));
+                    children.push(this.jsxParseExpressionContainer(node2, types18.j_expr));
                   }
                   break;
                 }
@@ -126124,11 +126164,11 @@ var require_lib62 = __commonJS3({
       }
       getTokenFromCode(code2) {
         const context = this.curContext();
-        if (context === types17.j_expr) {
+        if (context === types18.j_expr) {
           this.jsxReadToken();
           return;
         }
-        if (context === types17.j_oTag || context === types17.j_cTag) {
+        if (context === types18.j_oTag || context === types18.j_cTag) {
           if (isIdentifierStart2(code2)) {
             this.jsxReadWord();
             return;
@@ -126138,7 +126178,7 @@ var require_lib62 = __commonJS3({
             this.finishToken(143);
             return;
           }
-          if ((code2 === 34 || code2 === 39) && context === types17.j_oTag) {
+          if ((code2 === 34 || code2 === 39) && context === types18.j_oTag) {
             this.jsxReadString(code2);
             return;
           }
@@ -126156,17 +126196,17 @@ var require_lib62 = __commonJS3({
           type
         } = this.state;
         if (type === 56 && prevType === 142) {
-          context.splice(-2, 2, types17.j_cTag);
+          context.splice(-2, 2, types18.j_cTag);
           this.state.canStartJSXElement = false;
         } else if (type === 142) {
-          context.push(types17.j_oTag);
+          context.push(types18.j_oTag);
         } else if (type === 143) {
           const out = context[context.length - 1];
-          if (out === types17.j_oTag && prevType === 56 || out === types17.j_cTag) {
+          if (out === types18.j_oTag && prevType === 56 || out === types18.j_cTag) {
             context.pop();
-            this.state.canStartJSXElement = context[context.length - 1] === types17.j_expr;
+            this.state.canStartJSXElement = context[context.length - 1] === types18.j_expr;
           } else {
-            this.setContext(types17.j_expr);
+            this.setContext(types18.j_expr);
             this.state.canStartJSXElement = true;
           }
         } else {
@@ -127541,14 +127581,14 @@ var require_lib62 = __commonJS3({
       tsParseUnionOrIntersectionType(kind, parseConstituentType, operator) {
         const node = this.startNode();
         const hasLeadingOperator = this.eat(operator);
-        const types18 = [];
+        const types19 = [];
         do {
-          types18.push(parseConstituentType());
+          types19.push(parseConstituentType());
         } while (this.eat(operator));
-        if (types18.length === 1 && !hasLeadingOperator) {
-          return types18[0];
+        if (types19.length === 1 && !hasLeadingOperator) {
+          return types19[0];
         }
-        node.types = types18;
+        node.types = types19;
         return this.finishNode(node, kind);
       }
       tsParseIntersectionTypeOrHigher() {
@@ -128112,7 +128152,7 @@ var require_lib62 = __commonJS3({
         }));
         if (node.params.length === 0) {
           this.raise(TSErrors.EmptyTypeArguments, node);
-        } else if (!this.state.inType && this.curContext() === types17.brace) {
+        } else if (!this.state.inType && this.curContext() === types18.brace) {
           this.reScan_lt_gt();
         }
         this.expect(48);
@@ -128738,7 +128778,7 @@ var require_lib62 = __commonJS3({
             context
           } = this.state;
           const currentContext = context[context.length - 1];
-          if (currentContext === types17.j_oTag || currentContext === types17.j_expr) {
+          if (currentContext === types18.j_oTag || currentContext === types18.j_expr) {
             context.pop();
           }
         }
@@ -133866,9 +133906,9 @@ var require_shared2 = __commonJS3({
     var tslib_1 = require_tslib2();
     var types_1 = tslib_1.__importDefault(require_types2());
     function default_1(fork) {
-      var types17 = fork.use(types_1.default);
-      var Type = types17.Type;
-      var builtin = types17.builtInTypes;
+      var types18 = fork.use(types_1.default);
+      var Type = types18.Type;
+      var builtin = types18.builtInTypes;
       var isNumber = builtin.number;
       function geq(than) {
         return Type.from(function(value) {
@@ -134016,9 +134056,9 @@ var require_types2 = __commonJS3({
     }(BaseType);
     var OrType = function(_super) {
       tslib_1.__extends(OrType2, _super);
-      function OrType2(types17) {
+      function OrType2(types18) {
         var _this = _super.call(this) || this;
-        _this.types = types17;
+        _this.types = types18;
         _this.kind = "OrType";
         return _this;
       }
@@ -134159,11 +134199,11 @@ var require_types2 = __commonJS3({
     function typesPlugin(_fork) {
       var Type = {
         or: function() {
-          var types17 = [];
+          var types18 = [];
           for (var _i = 0; _i < arguments.length; _i++) {
-            types17[_i] = arguments[_i];
+            types18[_i] = arguments[_i];
           }
-          return new OrType(types17.map(function(type) {
+          return new OrType(types18.map(function(type) {
             return Type.from(type);
           }));
         },
@@ -134606,9 +134646,9 @@ var require_path22 = __commonJS3({
     var Op = Object.prototype;
     var hasOwn2 = Op.hasOwnProperty;
     function pathPlugin(fork) {
-      var types17 = fork.use(types_1.default);
-      var isArray2 = types17.builtInTypes.array;
-      var isNumber = types17.builtInTypes.number;
+      var types18 = fork.use(types_1.default);
+      var isArray2 = types18.builtInTypes.array;
+      var isNumber = types18.builtInTypes.number;
       var Path = function Path2(value, parentPath, name) {
         if (!(this instanceof Path2)) {
           throw new Error("Path constructor cannot be invoked without 'new'");
@@ -134908,13 +134948,13 @@ var require_scope2 = __commonJS3({
     var types_1 = tslib_1.__importDefault(require_types2());
     var hasOwn2 = Object.prototype.hasOwnProperty;
     function scopePlugin(fork) {
-      var types17 = fork.use(types_1.default);
-      var Type = types17.Type;
-      var namedTypes = types17.namedTypes;
+      var types18 = fork.use(types_1.default);
+      var Type = types18.Type;
+      var namedTypes = types18.namedTypes;
       var Node3 = namedTypes.Node;
       var Expression = namedTypes.Expression;
-      var isArray2 = types17.builtInTypes.array;
-      var b2 = types17.builders;
+      var isArray2 = types18.builtInTypes.array;
+      var b2 = types18.builders;
       var Scope4 = function Scope22(path3, parentScope) {
         if (!(this instanceof Scope22)) {
           throw new Error("Scope constructor cannot be invoked without 'new'");
@@ -134977,7 +135017,7 @@ var require_scope2 = __commonJS3({
           ++index;
         }
         var name = prefix + index;
-        return this.bindings[name] = types17.builders.identifier(name);
+        return this.bindings[name] = types18.builders.identifier(name);
       };
       Sp.injectTemporary = function(identifier, init2) {
         identifier || (identifier = this.declareTemporary());
@@ -135053,7 +135093,7 @@ var require_scope2 = __commonJS3({
             bindings
           );
         } else if (Node3.check(node) && !Expression.check(node)) {
-          types17.eachField(node, function(name, child) {
+          types18.eachField(node, function(name, child) {
             var childPath = path3.get(name);
             if (!pathHasValue(childPath, child)) {
               throw new Error("");
@@ -135131,24 +135171,24 @@ var require_scope2 = __commonJS3({
           addPattern(patternPath.get("argument"), bindings);
         }
       }
-      function addTypePattern(patternPath, types18) {
+      function addTypePattern(patternPath, types19) {
         var pattern = patternPath.value;
         namedTypes.Pattern.assert(pattern);
         if (namedTypes.Identifier.check(pattern)) {
-          if (hasOwn2.call(types18, pattern.name)) {
-            types18[pattern.name].push(patternPath);
+          if (hasOwn2.call(types19, pattern.name)) {
+            types19[pattern.name].push(patternPath);
           } else {
-            types18[pattern.name] = [patternPath];
+            types19[pattern.name] = [patternPath];
           }
         }
       }
-      function addTypeParameter(parameterPath, types18) {
+      function addTypeParameter(parameterPath, types19) {
         var parameter = parameterPath.value;
         FlowOrTSTypeParameterType.assert(parameter);
-        if (hasOwn2.call(types18, parameter.name)) {
-          types18[parameter.name].push(parameterPath);
+        if (hasOwn2.call(types19, parameter.name)) {
+          types19[parameter.name].push(parameterPath);
         } else {
-          types18[parameter.name] = [parameterPath];
+          types19[parameter.name] = [parameterPath];
         }
       }
       Sp.lookup = function(name) {
@@ -135187,11 +135227,11 @@ var require_node_path2 = __commonJS3({
     var scope_1 = tslib_1.__importDefault(require_scope2());
     var shared_1 = require_shared2();
     function nodePathPlugin(fork) {
-      var types17 = fork.use(types_1.default);
-      var n2 = types17.namedTypes;
-      var b2 = types17.builders;
-      var isNumber = types17.builtInTypes.number;
-      var isArray2 = types17.builtInTypes.array;
+      var types18 = fork.use(types_1.default);
+      var n2 = types18.namedTypes;
+      var b2 = types18.builders;
+      var isNumber = types18.builtInTypes.number;
+      var isArray2 = types18.builtInTypes.array;
       var Path = fork.use(path_1.default);
       var Scope4 = fork.use(scope_1.default);
       var NodePath = function NodePath2(value, parentPath, name) {
@@ -135282,7 +135322,7 @@ var require_node_path2 = __commonJS3({
         return scope || null;
       };
       NPp.getValueProperty = function(name) {
-        return types17.getFieldValue(this.value, name);
+        return types18.getFieldValue(this.value, name);
       };
       NPp.needsParens = function(assumeExpressionContext) {
         var pp2 = this.parentPath;
@@ -135424,7 +135464,7 @@ var require_node_path2 = __commonJS3({
           return node.some(containsCallExpression);
         }
         if (n2.Node.check(node)) {
-          return types17.someField(node, function(_name, child) {
+          return types18.someField(node, function(_name, child) {
             return containsCallExpression(child);
           });
         }
@@ -135543,11 +135583,11 @@ var require_path_visitor2 = __commonJS3({
     var shared_1 = require_shared2();
     var hasOwn2 = Object.prototype.hasOwnProperty;
     function pathVisitorPlugin(fork) {
-      var types17 = fork.use(types_1.default);
+      var types18 = fork.use(types_1.default);
       var NodePath = fork.use(node_path_1.default);
-      var isArray2 = types17.builtInTypes.array;
-      var isObject2 = types17.builtInTypes.object;
-      var isFunction = types17.builtInTypes.function;
+      var isArray2 = types18.builtInTypes.array;
+      var isObject2 = types18.builtInTypes.object;
+      var isFunction = types18.builtInTypes.function;
       var undefined2;
       var PathVisitor = function PathVisitor2() {
         if (!(this instanceof PathVisitor2)) {
@@ -135567,7 +135607,7 @@ var require_path_visitor2 = __commonJS3({
             typeNames[methodName.slice("visit".length)] = true;
           }
         }
-        var supertypeTable = types17.computeSupertypeLookupTable(typeNames);
+        var supertypeTable = types18.computeSupertypeLookupTable(typeNames);
         var methodNameTable = /* @__PURE__ */ Object.create(null);
         var typeNameKeys = Object.keys(supertypeTable);
         var typeNameCount = typeNameKeys.length;
@@ -135686,7 +135726,7 @@ var require_path_visitor2 = __commonJS3({
           path3.each(visitor.visitWithoutReset, visitor);
         } else if (!isObject2.check(value)) {
         } else {
-          var childNames = types17.getFieldNames(value);
+          var childNames = types18.getFieldNames(value);
           if (visitor._shouldVisitComments && value.comments && childNames.indexOf("comments") < 0) {
             childNames.push("comments");
           }
@@ -135695,7 +135735,7 @@ var require_path_visitor2 = __commonJS3({
           for (var i22 = 0; i22 < childCount; ++i22) {
             var childName = childNames[i22];
             if (!hasOwn2.call(value, childName)) {
-              value[childName] = types17.getFieldValue(value, childName);
+              value[childName] = types18.getFieldValue(value, childName);
             }
             childPaths.push(path3.get(childName));
           }
@@ -135836,13 +135876,13 @@ var require_equiv2 = __commonJS3({
     var shared_1 = require_shared2();
     var types_1 = tslib_1.__importDefault(require_types2());
     function default_1(fork) {
-      var types17 = fork.use(types_1.default);
-      var getFieldNames = types17.getFieldNames;
-      var getFieldValue = types17.getFieldValue;
-      var isArray2 = types17.builtInTypes.array;
-      var isObject2 = types17.builtInTypes.object;
-      var isDate = types17.builtInTypes.Date;
-      var isRegExp = types17.builtInTypes.RegExp;
+      var types18 = fork.use(types_1.default);
+      var getFieldNames = types18.getFieldNames;
+      var getFieldValue = types18.getFieldValue;
+      var isArray2 = types18.builtInTypes.array;
+      var isObject2 = types18.builtInTypes.object;
+      var isDate = types18.builtInTypes.Date;
+      var isRegExp = types18.builtInTypes.RegExp;
       var hasOwn2 = Object.prototype.hasOwnProperty;
       function astNodesAreEquivalent(a2, b2, problemPath) {
         if (isArray2.check(problemPath)) {
@@ -135993,24 +136033,24 @@ var require_fork2 = __commonJS3({
     var shared_1 = require_shared2();
     function default_1(plugins) {
       var fork = createFork();
-      var types17 = fork.use(types_1.default);
+      var types18 = fork.use(types_1.default);
       plugins.forEach(fork.use);
-      types17.finalize();
+      types18.finalize();
       var PathVisitor = fork.use(path_visitor_1.default);
       return {
-        Type: types17.Type,
-        builtInTypes: types17.builtInTypes,
-        namedTypes: types17.namedTypes,
-        builders: types17.builders,
-        defineMethod: types17.defineMethod,
-        getFieldNames: types17.getFieldNames,
-        getFieldValue: types17.getFieldValue,
-        eachField: types17.eachField,
-        someField: types17.someField,
-        getSupertypeNames: types17.getSupertypeNames,
-        getBuilderName: types17.getBuilderName,
+        Type: types18.Type,
+        builtInTypes: types18.builtInTypes,
+        namedTypes: types18.namedTypes,
+        builders: types18.builders,
+        defineMethod: types18.defineMethod,
+        getFieldNames: types18.getFieldNames,
+        getFieldValue: types18.getFieldValue,
+        eachField: types18.eachField,
+        someField: types18.someField,
+        getSupertypeNames: types18.getSupertypeNames,
+        getBuilderName: types18.getBuilderName,
         astNodesAreEquivalent: fork.use(equiv_1.default),
-        finalize: types17.finalize,
+        finalize: types18.finalize,
         Path: fork.use(path_1.default),
         NodePath: fork.use(node_path_1.default),
         PathVisitor,
@@ -136170,8 +136210,8 @@ var require_core32 = __commonJS3({
     var types_1 = tslib_1.__importDefault(require_types2());
     var shared_1 = tslib_1.__importStar(require_shared2());
     function default_1(fork) {
-      var types17 = fork.use(types_1.default);
-      var Type = types17.Type;
+      var types18 = fork.use(types_1.default);
+      var Type = types18.Type;
       var def = Type.def;
       var or = Type.or;
       var shared2 = fork.use(shared_1.default);
@@ -136261,9 +136301,9 @@ var require_es62 = __commonJS3({
     var shared_1 = tslib_1.__importStar(require_shared2());
     function default_1(fork) {
       fork.use(core_1.default);
-      var types17 = fork.use(types_1.default);
-      var def = types17.Type.def;
-      var or = types17.Type.or;
+      var types18 = fork.use(types_1.default);
+      var def = types18.Type.def;
+      var or = types18.Type.or;
       var defaults = fork.use(shared_1.default).defaults;
       def("Function").field("generator", Boolean, defaults["false"]).field("expression", Boolean, defaults["false"]).field("defaults", [or(def("Expression"), null)], defaults.emptyArray).field("rest", or(def("Identifier"), null), defaults["null"]);
       def("RestElement").bases("Pattern").build("argument").field("argument", def("Pattern")).field(
@@ -136349,8 +136389,8 @@ var require_es20172 = __commonJS3({
     var shared_1 = tslib_1.__importStar(require_shared2());
     function default_1(fork) {
       fork.use(es2016_1.default);
-      var types17 = fork.use(types_1.default);
-      var def = types17.Type.def;
+      var types18 = fork.use(types_1.default);
+      var def = types18.Type.def;
       var defaults = fork.use(shared_1.default).defaults;
       def("Function").field("async", Boolean, defaults["false"]);
       def("AwaitExpression").bases("Expression").build("argument").field("argument", def("Expression"));
@@ -136371,9 +136411,9 @@ var require_es20182 = __commonJS3({
     var shared_1 = tslib_1.__importStar(require_shared2());
     function default_1(fork) {
       fork.use(es2017_1.default);
-      var types17 = fork.use(types_1.default);
-      var def = types17.Type.def;
-      var or = types17.Type.or;
+      var types18 = fork.use(types_1.default);
+      var def = types18.Type.def;
+      var or = types18.Type.or;
       var defaults = fork.use(shared_1.default).defaults;
       def("ForOfStatement").field("await", Boolean, defaults["false"]);
       def("SpreadProperty").bases("Node").build("argument").field("argument", def("Expression"));
@@ -136402,9 +136442,9 @@ var require_es20192 = __commonJS3({
     var shared_1 = tslib_1.__importStar(require_shared2());
     function default_1(fork) {
       fork.use(es2018_1.default);
-      var types17 = fork.use(types_1.default);
-      var def = types17.Type.def;
-      var or = types17.Type.or;
+      var types18 = fork.use(types_1.default);
+      var def = types18.Type.def;
+      var or = types18.Type.or;
       var defaults = fork.use(shared_1.default).defaults;
       def("CatchClause").field("param", or(def("Pattern"), null), defaults["null"]);
     }
@@ -136426,9 +136466,9 @@ var require_es202022 = __commonJS3({
     function default_1(fork) {
       fork.use(es2020_1.default);
       fork.use(es2019_1.default);
-      var types17 = fork.use(types_1.default);
-      var def = types17.Type.def;
-      var or = types17.Type.or;
+      var types18 = fork.use(types_1.default);
+      var def = types18.Type.def;
+      var or = types18.Type.or;
       var shared2 = fork.use(shared_1.default);
       var defaults = shared2.defaults;
       def("ImportExpression").bases("Expression").build("source").field("source", def("Expression"));
@@ -136474,8 +136514,8 @@ var require_es20222 = __commonJS3({
     var shared_1 = require_shared2();
     function default_1(fork) {
       fork.use(es2021_1.default);
-      var types17 = fork.use(types_1.default);
-      var def = types17.Type.def;
+      var types18 = fork.use(types_1.default);
+      var def = types18.Type.def;
       def("StaticBlock").bases("Declaration").build("body").field("body", [def("Statement")]);
     }
     exports.default = default_1;
@@ -136494,9 +136534,9 @@ var require_es_proposals2 = __commonJS3({
     var es2022_1 = tslib_1.__importDefault(require_es20222());
     function default_1(fork) {
       fork.use(es2022_1.default);
-      var types17 = fork.use(types_1.default);
-      var Type = types17.Type;
-      var def = types17.Type.def;
+      var types18 = fork.use(types_1.default);
+      var Type = types18.Type;
+      var def = types18.Type.def;
       var or = Type.or;
       var shared2 = fork.use(shared_1.default);
       var defaults = shared2.defaults;
@@ -136534,9 +136574,9 @@ var require_jsx22 = __commonJS3({
     var shared_1 = tslib_1.__importStar(require_shared2());
     function default_1(fork) {
       fork.use(es_proposals_1.default);
-      var types17 = fork.use(types_1.default);
-      var def = types17.Type.def;
-      var or = types17.Type.or;
+      var types18 = fork.use(types_1.default);
+      var def = types18.Type.def;
+      var or = types18.Type.or;
       var defaults = fork.use(shared_1.default).defaults;
       def("JSXAttribute").bases("Node").build("name", "value").field("name", or(def("JSXIdentifier"), def("JSXNamespacedName"))).field("value", or(
         def("Literal"),
@@ -136592,9 +136632,9 @@ var require_type_annotations2 = __commonJS3({
     var types_1 = tslib_1.__importDefault(require_types2());
     var shared_1 = tslib_1.__importStar(require_shared2());
     function default_1(fork) {
-      var types17 = fork.use(types_1.default);
-      var def = types17.Type.def;
-      var or = types17.Type.or;
+      var types18 = fork.use(types_1.default);
+      var def = types18.Type.def;
+      var or = types18.Type.or;
       var defaults = fork.use(shared_1.default).defaults;
       var TypeAnnotation = or(def("TypeAnnotation"), def("TSTypeAnnotation"), null);
       var TypeParamDecl = or(def("TypeParameterDeclaration"), def("TSTypeParameterDeclaration"), null);
@@ -136627,9 +136667,9 @@ var require_flow22 = __commonJS3({
     function default_1(fork) {
       fork.use(es_proposals_1.default);
       fork.use(type_annotations_1.default);
-      var types17 = fork.use(types_1.default);
-      var def = types17.Type.def;
-      var or = types17.Type.or;
+      var types18 = fork.use(types_1.default);
+      var def = types18.Type.def;
+      var or = types18.Type.or;
       var defaults = fork.use(shared_1.default).defaults;
       def("Flow").bases("Node");
       def("FlowType").bases("Flow");
@@ -136741,10 +136781,10 @@ var require_esprima4 = __commonJS3({
     var shared_1 = tslib_1.__importStar(require_shared2());
     function default_1(fork) {
       fork.use(es_proposals_1.default);
-      var types17 = fork.use(types_1.default);
+      var types18 = fork.use(types_1.default);
       var defaults = fork.use(shared_1.default).defaults;
-      var def = types17.Type.def;
-      var or = types17.Type.or;
+      var def = types18.Type.def;
+      var or = types18.Type.or;
       def("VariableDeclaration").field("declarations", [or(
         def("VariableDeclarator"),
         def("Identifier")
@@ -136787,11 +136827,11 @@ var require_babel_core2 = __commonJS3({
     function default_1(fork) {
       var _a, _b, _c, _d, _e;
       fork.use(es_proposals_1.default);
-      var types17 = fork.use(types_1.default);
+      var types18 = fork.use(types_1.default);
       var defaults = fork.use(shared_1.default).defaults;
-      var def = types17.Type.def;
-      var or = types17.Type.or;
-      var isUndefined = types17.builtInTypes.undefined;
+      var def = types18.Type.def;
+      var or = types18.Type.or;
+      var isUndefined = types18.builtInTypes.undefined;
       def("Noop").bases("Statement").build();
       def("DoExpression").bases("Expression").build("body").field("body", [def("Statement")]);
       def("BindExpression").bases("Expression").build("object", "callee").field("object", or(def("Expression"), null)).field("callee", def("Expression"));
@@ -136816,7 +136856,7 @@ var require_babel_core2 = __commonJS3({
             raw: String
           },
           function getDefault() {
-            var value = types17.getFieldValue(this, "value");
+            var value = types18.getFieldValue(this, "value");
             return {
               rawValue: value,
               raw: toRaw ? toRaw(value) : String(value)
@@ -136917,8 +136957,8 @@ var require_babel2 = __commonJS3({
     var flow_1 = tslib_1.__importDefault(require_flow22());
     var shared_1 = require_shared2();
     function default_1(fork) {
-      var types17 = fork.use(types_1.default);
-      var def = types17.Type.def;
+      var types18 = fork.use(types_1.default);
+      var def = types18.Type.def;
       fork.use(babel_core_1.default);
       fork.use(flow_1.default);
       def("V8IntrinsicIdentifier").bases("Expression").build("name").field("name", String);
@@ -136942,12 +136982,12 @@ var require_typescript22 = __commonJS3({
     function default_1(fork) {
       fork.use(babel_core_1.default);
       fork.use(type_annotations_1.default);
-      var types17 = fork.use(types_1.default);
-      var n2 = types17.namedTypes;
-      var def = types17.Type.def;
-      var or = types17.Type.or;
+      var types18 = fork.use(types_1.default);
+      var n2 = types18.namedTypes;
+      var def = types18.Type.def;
+      var or = types18.Type.or;
       var defaults = fork.use(shared_1.default).defaults;
-      var StringLiteral = types17.Type.from(function(value, deep) {
+      var StringLiteral = types18.Type.from(function(value, deep) {
         if (n2.StringLiteral && n2.StringLiteral.check(value, deep)) {
           return true;
         }
@@ -138895,8 +138935,8 @@ var require_util22 = __commonJS3({
     exports.isTrailingCommaEnabled = exports.getParentExportDeclaration = exports.isExportDeclaration = exports.fixFaultyLocations = exports.getTrueLoc = exports.composeSourceMaps = exports.copyPos = exports.comparePos = exports.getUnionOfKeys = exports.getOption = exports.isBrowser = exports.getLineTerminator = void 0;
     var tslib_1 = require_tslib2();
     var assert_1 = tslib_1.__importDefault(__require3("assert"));
-    var types17 = tslib_1.__importStar(require_main3());
-    var n2 = types17.namedTypes;
+    var types18 = tslib_1.__importStar(require_main3());
+    var n2 = types18.namedTypes;
     var source_map_1 = tslib_1.__importDefault(require_source_map2());
     var SourceMapConsumer = source_map_1.default.SourceMapConsumer;
     var SourceMapGenerator = source_map_1.default.SourceMapGenerator;
@@ -146202,10 +146242,10 @@ var require_comments2 = __commonJS3({
     exports.printComments = exports.attach = void 0;
     var tslib_1 = require_tslib2();
     var assert_1 = tslib_1.__importDefault(__require3("assert"));
-    var types17 = tslib_1.__importStar(require_main3());
-    var n2 = types17.namedTypes;
-    var isArray2 = types17.builtInTypes.array;
-    var isObject2 = types17.builtInTypes.object;
+    var types18 = tslib_1.__importStar(require_main3());
+    var n2 = types18.namedTypes;
+    var isArray2 = types18.builtInTypes.array;
+    var isObject2 = types18.builtInTypes.object;
     var lines_1 = require_lines2();
     var util_1 = require_util22();
     var childNodesCache = /* @__PURE__ */ new WeakMap();
@@ -146236,7 +146276,7 @@ var require_comments2 = __commonJS3({
       if (isArray2.check(node)) {
         names = Object.keys(node);
       } else if (isObject2.check(node)) {
-        names = types17.getFieldNames(node);
+        names = types18.getFieldNames(node);
       } else {
         return resultArray;
       }
@@ -146414,7 +146454,7 @@ var require_comments2 = __commonJS3({
     function printComments(path3, print132) {
       var value = path3.getValue();
       var innerLines = print132(path3);
-      var comments = n2.Node.check(value) && types17.getFieldValue(value, "comments");
+      var comments = n2.Node.check(value) && types18.getFieldValue(value, "comments");
       if (!comments || comments.length === 0) {
         return innerLines;
       }
@@ -146422,8 +146462,8 @@ var require_comments2 = __commonJS3({
       var trailingParts = [innerLines];
       path3.each(function(commentPath) {
         var comment = commentPath.getValue();
-        var leading = types17.getFieldValue(comment, "leading");
-        var trailing = types17.getFieldValue(comment, "trailing");
+        var leading = types18.getFieldValue(comment, "leading");
+        var trailing = types18.getFieldValue(comment, "trailing");
         if (leading || trailing && !(n2.Statement.check(value) || comment.type === "Block" || comment.type === "CommentBlock")) {
           leadingParts.push(printLeadingComment(commentPath, print132));
         } else if (trailing) {
@@ -146443,10 +146483,10 @@ var require_parser2 = __commonJS3({
     exports.parse = void 0;
     var tslib_1 = require_tslib2();
     var assert_1 = tslib_1.__importDefault(__require3("assert"));
-    var types17 = tslib_1.__importStar(require_main3());
-    var b2 = types17.builders;
-    var isObject2 = types17.builtInTypes.object;
-    var isArray2 = types17.builtInTypes.array;
+    var types18 = tslib_1.__importStar(require_main3());
+    var b2 = types18.builders;
+    var isObject2 = types18.builtInTypes.object;
+    var isArray2 = types18.builtInTypes.array;
     var options_1 = require_options2();
     var lines_1 = require_lines2();
     var comments_1 = require_comments2();
@@ -146630,11 +146670,11 @@ var require_fast_path2 = __commonJS3({
     Object.defineProperty(exports, "__esModule", { value: true });
     var tslib_1 = require_tslib2();
     var assert_1 = tslib_1.__importDefault(__require3("assert"));
-    var types17 = tslib_1.__importStar(require_main3());
+    var types18 = tslib_1.__importStar(require_main3());
     var util = tslib_1.__importStar(require_util22());
-    var n2 = types17.namedTypes;
-    var isArray2 = types17.builtInTypes.array;
-    var isNumber = types17.builtInTypes.number;
+    var n2 = types18.namedTypes;
+    var isArray2 = types18.builtInTypes.array;
+    var isNumber = types18.builtInTypes.number;
     var PRECEDENCE = {};
     [
       ["??"],
@@ -146663,7 +146703,7 @@ var require_fast_path2 = __commonJS3({
       if (obj instanceof FastPath) {
         return obj.copy();
       }
-      if (obj instanceof types17.NodePath) {
+      if (obj instanceof types18.NodePath) {
         var copy = Object.create(FastPath.prototype);
         var stack = [obj.value];
         for (var pp2 = void 0; pp2 = obj.parentPath; obj = pp2)
@@ -146974,7 +147014,7 @@ var require_fast_path2 = __commonJS3({
         return node.some(containsCallExpression);
       }
       if (n2.Node.check(node)) {
-        return types17.someField(node, function(_name, child) {
+        return types18.someField(node, function(_name, child) {
           return containsCallExpression(child);
         });
       }
@@ -147062,16 +147102,16 @@ var require_patcher2 = __commonJS3({
     var tslib_1 = require_tslib2();
     var assert_1 = tslib_1.__importDefault(__require3("assert"));
     var linesModule = tslib_1.__importStar(require_lines2());
-    var types17 = tslib_1.__importStar(require_main3());
-    var Printable = types17.namedTypes.Printable;
-    var Expression = types17.namedTypes.Expression;
-    var ReturnStatement = types17.namedTypes.ReturnStatement;
-    var SourceLocation3 = types17.namedTypes.SourceLocation;
+    var types18 = tslib_1.__importStar(require_main3());
+    var Printable = types18.namedTypes.Printable;
+    var Expression = types18.namedTypes.Expression;
+    var ReturnStatement = types18.namedTypes.ReturnStatement;
+    var SourceLocation3 = types18.namedTypes.SourceLocation;
     var util_1 = require_util22();
     var fast_path_1 = tslib_1.__importDefault(require_fast_path2());
-    var isObject2 = types17.builtInTypes.object;
-    var isArray2 = types17.builtInTypes.array;
-    var isString = types17.builtInTypes.string;
+    var isObject2 = types18.builtInTypes.object;
+    var isArray2 = types18.builtInTypes.array;
+    var isString = types18.builtInTypes.string;
     var riskyAdjoiningCharExp = /[0-9a-z_$]/i;
     var Patcher = function Patcher2(lines) {
       assert_1.default.ok(this instanceof Patcher2);
@@ -147341,8 +147381,8 @@ var require_patcher2 = __commonJS3({
         if (k2.charAt(0) === "_") {
           continue;
         }
-        newPath.stack.push(k2, types17.getFieldValue(newNode, k2));
-        oldPath.stack.push(k2, types17.getFieldValue(oldNode, k2));
+        newPath.stack.push(k2, types18.getFieldValue(newNode, k2));
+        oldPath.stack.push(k2, types18.getFieldValue(oldNode, k2));
         var canReprint = findAnyReprints(newPath, oldPath, reprints);
         newPath.stack.length -= 2;
         oldPath.stack.length -= 2;
@@ -147364,16 +147404,16 @@ var require_printer2 = __commonJS3({
     exports.Printer = void 0;
     var tslib_1 = require_tslib2();
     var assert_1 = tslib_1.__importDefault(__require3("assert"));
-    var types17 = tslib_1.__importStar(require_main3());
+    var types18 = tslib_1.__importStar(require_main3());
     var comments_1 = require_comments2();
     var fast_path_1 = tslib_1.__importDefault(require_fast_path2());
     var lines_1 = require_lines2();
     var options_1 = require_options2();
     var patcher_1 = require_patcher2();
     var util = tslib_1.__importStar(require_util22());
-    var namedTypes = types17.namedTypes;
-    var isString = types17.builtInTypes.string;
-    var isObject2 = types17.builtInTypes.object;
+    var namedTypes = types18.namedTypes;
+    var isString = types18.builtInTypes.string;
+    var isObject2 = types18.builtInTypes.object;
     var PrintResult = function PrintResult2(code, sourceMap) {
       assert_1.default.ok(this instanceof PrintResult2);
       isString.assert(code);
@@ -147535,7 +147575,7 @@ var require_printer2 = __commonJS3({
         case "OptionalMemberExpression": {
           parts.push(path3.call(print132, "object"));
           var property = path3.call(print132, "property");
-          var optional = types17.getFieldValue(n2, "optional");
+          var optional = types18.getFieldValue(n2, "optional");
           if (n2.computed) {
             parts.push(optional ? "?.[" : "[", property, "]");
           } else {
@@ -147806,7 +147846,7 @@ var require_printer2 = __commonJS3({
           if (n2.typeArguments) {
             parts.push(path3.call(print132, "typeArguments"));
           }
-          if (types17.getFieldValue(n2, "optional")) {
+          if (types18.getFieldValue(n2, "optional")) {
             parts.push("?.");
           }
           parts.push(printArgumentsList(path3, options, print132));
@@ -149485,8 +149525,8 @@ var require_printer2 = __commonJS3({
       });
     }
     function getPossibleRaw(node) {
-      var value = types17.getFieldValue(node, "value");
-      var extra = types17.getFieldValue(node, "extra");
+      var value = types18.getFieldValue(node, "value");
+      var extra = types18.getFieldValue(node, "extra");
       if (extra && typeof extra.raw === "string" && value == extra.rawValue) {
         return extra.raw;
       }
@@ -149532,8 +149572,8 @@ var require_main22 = __commonJS3({
     exports.run = exports.prettyPrint = exports.print = exports.visit = exports.types = exports.parse = void 0;
     var tslib_1 = require_tslib2();
     var fs_1 = tslib_1.__importDefault(__require3("fs"));
-    var types17 = tslib_1.__importStar(require_main3());
-    exports.types = types17;
+    var types18 = tslib_1.__importStar(require_main3());
+    exports.types = types18;
     var parser_1 = require_parser2();
     Object.defineProperty(exports, "parse", { enumerable: true, get: function() {
       return parser_1.parse;
@@ -150193,7 +150233,7 @@ var printDocASTReducer2 = {
     leave: ({ name, interfaces, directives, fields }) => join3(["interface", name, wrap2("implements ", join3(interfaces, " & ")), join3(directives, " "), block2(fields)], " ")
   },
   UnionTypeDefinition: {
-    leave: ({ name, directives, types: types17 }) => join3(["union", name, join3(directives, " "), wrap2("= ", join3(types17, " | "))], " ")
+    leave: ({ name, directives, types: types18 }) => join3(["union", name, join3(directives, " "), wrap2("= ", join3(types18, " | "))], " ")
   },
   EnumTypeDefinition: {
     leave: ({ name, directives, values }) => join3(["enum", name, join3(directives, " "), block2(values)], " ")
@@ -150220,7 +150260,7 @@ var printDocASTReducer2 = {
     leave: ({ name, interfaces, directives, fields }) => join3(["extend interface", name, wrap2("implements ", join3(interfaces, " & ")), join3(directives, " "), block2(fields)], " ")
   },
   UnionTypeExtension: {
-    leave: ({ name, directives, types: types17 }) => join3(["extend union", name, join3(directives, " "), wrap2("= ", join3(types17, " | "))], " ")
+    leave: ({ name, directives, types: types18 }) => join3(["extend union", name, join3(directives, " "), wrap2("= ", join3(types18, " | "))], " ")
   },
   EnumTypeExtension: {
     leave: ({ name, directives, values }) => join3(["extend enum", name, join3(directives, " "), block2(values)], " ")
@@ -151635,7 +151675,18 @@ var ListManager2 = class {
   }
   lists = /* @__PURE__ */ new Map();
   listsByField = /* @__PURE__ */ new Map();
-  get(listName, id2, allLists) {
+  get(listName, id2, allLists, skipMatches) {
+    const lists = this.getLists(listName, id2, allLists);
+    if (!lists) {
+      return null;
+    }
+    if (skipMatches) {
+      return new ListCollection2(lists.lists.filter((list3) => !skipMatches.has(list3.fieldRef)));
+    } else {
+      return lists;
+    }
+  }
+  getLists(listName, id2, allLists) {
     const matches = this.lists.get(listName);
     if (!matches || matches.size === 0) {
       return null;
@@ -151757,6 +151808,9 @@ var List2 = class {
     this.manager = manager;
     this.abstract = abstract;
   }
+  get fieldRef() {
+    return `${this.recordID}.${this.key}`;
+  }
   when(when) {
     return this.manager.lists.get(this.name).get(this.recordID).when(when);
   }
@@ -152901,8 +152955,8 @@ var Cache2 = class {
       variables
     );
   }
-  list(name, parentID, allLists) {
-    const handler = this._internal_unstable.lists.get(name, parentID, allLists);
+  list(name, parentID, allLists, skipMatches) {
+    const handler = this._internal_unstable.lists.get(name, parentID, allLists, skipMatches);
     if (!handler) {
       throw new Error(
         `Cannot find list with name: ${name}${parentID ? " under parent " + parentID : ""}. Is it possible that the query is not mounted?`
@@ -153317,6 +153371,7 @@ var CacheInternal2 = class {
           });
         }
       }
+      const processedOperations = /* @__PURE__ */ new Set();
       for (const operation of operations || []) {
         let parentID;
         if (operation.parentID) {
@@ -153336,7 +153391,12 @@ var CacheInternal2 = class {
         const targets = Array.isArray(value) ? value : [value];
         for (const target of targets) {
           if (operation.action === "insert" && target instanceof Object && fieldSelection && operation.list) {
-            this.cache.list(operation.list, parentID, operation.target === "all").when(operation.when).addToList(
+            this.cache.list(
+              operation.list,
+              parentID,
+              operation.target === "all",
+              processedOperations
+            ).when(operation.when).addToList(
               fieldSelection,
               target,
               variables,
@@ -153344,7 +153404,12 @@ var CacheInternal2 = class {
               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({
+            this.cache.list(
+              operation.list,
+              parentID,
+              operation.target === "all",
+              processedOperations
+            ).when(operation.when).toggleElement({
               selection: fieldSelection,
               data: target,
               variables,
@@ -153352,7 +153417,12 @@ var CacheInternal2 = class {
               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, layer);
+            this.cache.list(
+              operation.list,
+              parentID,
+              operation.target === "all",
+              processedOperations
+            ).when(operation.when).remove(target, variables, layer);
           } else if (operation.action === "delete" && operation.type && target) {
             const targetID = this.id(operation.type, target);
             if (!targetID) {
@@ -153364,6 +153434,16 @@ var CacheInternal2 = class {
             this.cache.delete(targetID, layer);
           }
         }
+        if (operation.list) {
+          const matchingLists = this.cache.list(
+            operation.list,
+            parentID,
+            operation.target === "all"
+          );
+          for (const list3 of matchingLists.lists) {
+            processedOperations.add(list3.fieldRef);
+          }
+        }
       }
     }
     return toNotify;
@@ -153829,6 +153909,46 @@ var { keys } = Object;
 var recast4 = __toESM3(require_main22(), 1);
 var AST4 = recast4.types.builders;
 var pageInfoSelection = [
+  {
+    kind: graphql13.Kind.FIELD,
+    name: {
+      kind: graphql13.Kind.NAME,
+      value: "pageInfo"
+    },
+    selectionSet: {
+      kind: graphql13.Kind.SELECTION_SET,
+      selections: [
+        {
+          kind: graphql13.Kind.FIELD,
+          name: {
+            kind: graphql13.Kind.NAME,
+            value: "hasPreviousPage"
+          }
+        },
+        {
+          kind: graphql13.Kind.FIELD,
+          name: {
+            kind: graphql13.Kind.NAME,
+            value: "hasNextPage"
+          }
+        },
+        {
+          kind: graphql13.Kind.FIELD,
+          name: {
+            kind: graphql13.Kind.NAME,
+            value: "startCursor"
+          }
+        },
+        {
+          kind: graphql13.Kind.FIELD,
+          name: {
+            kind: graphql13.Kind.NAME,
+            value: "endCursor"
+          }
+        }
+      ]
+    }
+  },
   {
     kind: graphql13.Kind.FIELD,
     name: {
@@ -154099,7 +154219,7 @@ var printDocASTReducer22 = {
     ], " ")
   },
   UnionTypeDefinition: {
-    leave: ({ name, directives, types: types17 }) => join32(["union", name, join32(directives, " "), wrap22("= ", join32(types17, " | "))], " ")
+    leave: ({ name, directives, types: types18 }) => join32(["union", name, join32(directives, " "), wrap22("= ", join32(types18, " | "))], " ")
   },
   EnumTypeDefinition: {
     leave: ({ name, directives, values }) => join32(["enum", name, join32(directives, " "), block22(values)], " ")
@@ -154138,7 +154258,7 @@ var printDocASTReducer22 = {
     ], " ")
   },
   UnionTypeExtension: {
-    leave: ({ name, directives, types: types17 }) => join32(["extend union", name, join32(directives, " "), wrap22("= ", join32(types17, " | "))], " ")
+    leave: ({ name, directives, types: types18 }) => join32(["extend union", name, join32(directives, " "), wrap22("= ", join32(types18, " | "))], " ")
   },
   EnumTypeExtension: {
     leave: ({ name, directives, values }) => join32(["extend enum", name, join32(directives, " "), block22(values)], " ")
@@ -154175,6 +154295,8 @@ For more information, please visit these links:
 - https://graphql.org/learn/global-object-identification/
 - ${siteURL}/guides/caching-data#custom-ids
 `;
+var recast14 = __toESM3(require_main22(), 1);
+var AST14 = recast14.types.builders;
 function find_insert_index(script) {
   let insert_index = script.body.findIndex((statement) => {
     return statement.type !== "ImportDeclaration";
@@ -154193,7 +154315,7 @@ function find_exported_fn(body, name) {
     if (exportDeclaration.declaration?.type === "FunctionDeclaration") {
       const value = exportDeclaration.declaration;
       if (value.id?.name === name) {
-        return exportDeclaration.declaration;
+        return { declaration: exportDeclaration.declaration, export: exportDeclaration };
       }
     } else if (exportDeclaration.declaration?.type === "VariableDeclaration") {
       const value = exportDeclaration.declaration;
@@ -154212,7 +154334,10 @@ function find_exported_fn(body, name) {
         init2 = init2.arguments[0];
       }
       if (init2.type === "FunctionExpression" || init2.type === "ArrowFunctionExpression") {
-        return init2;
+        return { declaration: init2, export: exportDeclaration };
+      }
+      if (init2.type === "Identifier" || init2.type === "CallExpression") {
+        return { declaration: init2, export: exportDeclaration };
       }
     } else {
       continue;
@@ -154224,10 +154349,10 @@ function find_exported_fn(body, name) {
   if (!exported) {
     return null;
   }
-  return exported.declaration;
+  return { declaration: exported.declaration, export: exported };
 }
-var recast14 = __toESM3(require_main22(), 1);
-var AST14 = recast14.types.builders;
+var recast15 = __toESM3(require_main22(), 1);
+var AST15 = recast15.types.builders;
 function ensure_imports({
   config: config2,
   script,
@@ -154243,13 +154368,13 @@ function ensure_imports({
     if (!has_import) {
       script.body.unshift({
         type: "ImportDeclaration",
-        source: AST14.stringLiteral(sourceModule),
+        source: AST15.stringLiteral(sourceModule),
         importKind
       });
     }
     return { ids: [], added: has_import ? 0 : 1 };
   }
-  const idList = (Array.isArray(importID) ? importID : [importID]).map((id2) => AST14.identifier(id2));
+  const idList = (Array.isArray(importID) ? importID : [importID]).map((id2) => AST15.identifier(id2));
   const toImport = idList.filter(
     (identifier) => !script.body.find(
       (statement) => statement.type === "ImportDeclaration" && statement.specifiers?.find(
@@ -154260,16 +154385,16 @@ function ensure_imports({
   if (toImport.length > 0) {
     script.body.unshift({
       type: "ImportDeclaration",
-      source: AST14.stringLiteral(sourceModule),
+      source: AST15.stringLiteral(sourceModule),
       specifiers: toImport.map(
-        (identifier, i22) => !Array.isArray(importID) ? AST14.importDefaultSpecifier(identifier) : AST14.importSpecifier(identifier, as?.[i22] ? AST14.identifier(as[i22]) : identifier)
+        (identifier, i22) => !Array.isArray(importID) ? AST15.importDefaultSpecifier(identifier) : AST15.importSpecifier(identifier, as?.[i22] ? AST15.identifier(as[i22]) : identifier)
       ),
       importKind
     });
   }
   for (const [i22, target] of (as ?? []).entries()) {
     if (target) {
-      idList[i22] = AST14.identifier(target);
+      idList[i22] = AST15.identifier(target);
     }
   }
   return {
@@ -171126,8 +171251,8 @@ export type ${config.variableFunctionName(
 }
 
 // src/plugin/codegen/fragmentTypedefs/index.ts
-var recast15 = __toESM(require_main5(), 1);
-var AST15 = recast15.types.builders;
+var recast16 = __toESM(require_main5(), 1);
+var AST16 = recast16.types.builders;
 async function fragmentTypedefs(input) {
   let fragments = {};
   for (const doc of input.documents) {
@@ -171173,43 +171298,43 @@ async function fragmentTypedefs(input) {
         }
         const store = store_name({ config: input.config, name: doc.name });
         const import_path = path_exports.join("..", stores_directory_name(), doc.name);
-        const fragment_map = AST15.tsTypeLiteral([
-          AST15.tsPropertySignature(
-            AST15.stringLiteral(fragmentKey),
-            AST15.tsTypeAnnotation(
-              AST15.tsTypeLiteral([
-                AST15.tsPropertySignature(
-                  AST15.identifier(doc.name),
-                  AST15.tsTypeAnnotation(AST15.tsAnyKeyword())
+        const fragment_map = AST16.tsTypeLiteral([
+          AST16.tsPropertySignature(
+            AST16.stringLiteral(fragmentKey),
+            AST16.tsTypeAnnotation(
+              AST16.tsTypeLiteral([
+                AST16.tsPropertySignature(
+                  AST16.identifier(doc.name),
+                  AST16.tsTypeAnnotation(AST16.tsAnyKeyword())
                 )
               ])
             )
           )
         ]);
-        const non_exhaustive = AST15.tsTypeLiteral([
-          AST15.tsPropertySignature(
-            AST15.literal("__typename"),
-            AST15.tsTypeAnnotation(
-              AST15.tsLiteralType(AST15.stringLiteral("non-exhaustive; don't match this"))
+        const non_exhaustive = AST16.tsTypeLiteral([
+          AST16.tsPropertySignature(
+            AST16.literal("__typename"),
+            AST16.tsTypeAnnotation(
+              AST16.tsLiteralType(AST16.stringLiteral("non-exhaustive; don't match this"))
             )
           )
         ]);
-        const initial_value_input = AST15.identifier("initialValue");
-        initial_value_input.typeAnnotation = AST15.tsTypeAnnotation(
-          AST15.tsUnionType([fragment_map, non_exhaustive])
+        const initial_value_input = AST16.identifier("initialValue");
+        initial_value_input.typeAnnotation = AST16.tsTypeAnnotation(
+          AST16.tsUnionType([fragment_map, non_exhaustive])
         );
-        const initial_value_or_null_input = AST15.identifier("initialValue");
-        initial_value_or_null_input.typeAnnotation = AST15.tsTypeAnnotation(
-          AST15.tsUnionType([
+        const initial_value_or_null_input = AST16.identifier("initialValue");
+        initial_value_or_null_input.typeAnnotation = AST16.tsTypeAnnotation(
+          AST16.tsUnionType([
             fragment_map,
-            AST15.tsNullKeyword(),
-            AST15.tsUndefinedKeyword(),
+            AST16.tsNullKeyword(),
+            AST16.tsUndefinedKeyword(),
             non_exhaustive
           ])
         );
-        const document_input = AST15.identifier("document");
-        document_input.typeAnnotation = AST15.tsTypeAnnotation(
-          AST15.tsTypeReference(AST15.identifier(store))
+        const document_input = AST16.identifier("document");
+        document_input.typeAnnotation = AST16.tsTypeAnnotation(
+          AST16.tsTypeReference(AST16.identifier(store))
         );
         let store_type = "FragmentStoreInstance";
         if (doc.refetch?.paginated) {
@@ -171240,37 +171365,37 @@ async function fragmentTypedefs(input) {
           sourceModule: "../../../artifacts/" + doc.name,
           import: [inputID, shapeID]
         });
-        const typeParams = [AST15.tsTypeReference(AST15.identifier(inputID))];
-        const return_value = AST15.tsTypeReference(
-          AST15.identifier(store_type),
-          AST15.tsTypeParameterInstantiation([
-            AST15.tsTypeReference(AST15.identifier(shapeID)),
+        const typeParams = [AST16.tsTypeReference(AST16.identifier(inputID))];
+        const return_value = AST16.tsTypeReference(
+          AST16.identifier(store_type),
+          AST16.tsTypeParameterInstantiation([
+            AST16.tsTypeReference(AST16.identifier(shapeID)),
             ...typeParams
           ])
         );
-        const null_return_value = AST15.tsTypeReference(
-          AST15.identifier(store_type),
-          AST15.tsTypeParameterInstantiation([
-            AST15.tsUnionType([
-              AST15.tsTypeReference(AST15.identifier(shapeID)),
-              AST15.tsNullKeyword()
+        const null_return_value = AST16.tsTypeReference(
+          AST16.identifier(store_type),
+          AST16.tsTypeParameterInstantiation([
+            AST16.tsUnionType([
+              AST16.tsTypeReference(AST16.identifier(shapeID)),
+              AST16.tsNullKeyword()
             ]),
             ...typeParams
           ])
         );
         return [
-          AST15.exportNamedDeclaration(
-            AST15.tsDeclareFunction(
-              AST15.identifier(which),
+          AST16.exportNamedDeclaration(
+            AST16.tsDeclareFunction(
+              AST16.identifier(which),
               [initial_value_input, document_input],
-              AST15.tsTypeAnnotation(return_value)
+              AST16.tsTypeAnnotation(return_value)
             )
           ),
-          AST15.exportNamedDeclaration(
-            AST15.tsDeclareFunction(
-              AST15.identifier(which),
+          AST16.exportNamedDeclaration(
+            AST16.tsDeclareFunction(
+              AST16.identifier(which),
               [initial_value_or_null_input, document_input],
-              AST15.tsTypeAnnotation(null_return_value)
+              AST16.tsTypeAnnotation(null_return_value)
             )
           )
         ];
@@ -172101,22 +172226,22 @@ function is_root_route(filepath) {
   if (filepath.toString().endsWith("/")) {
     filepath = filepath.slice(0, -1);
   }
-  return filepath.endsWith(path_exports.join("src", "routes")) && !filepath.includes(".svelte-kit") && !filepath.includes("$houdini");
+  return filepath.endsWith(path_exports.join("src", "routes")) && !filepath.includes(".svelte-kit") && !filepath.includes(_config.runtimeDir ?? "$houdini");
 }
 var empty_layout = "<slot />";
 
 // src/plugin/transforms/index.ts
-var recast21 = __toESM(require_main5(), 1);
+var recast23 = __toESM(require_main5(), 1);
 
 // src/plugin/transforms/componentQuery.ts
-var recast16 = __toESM(require_main5(), 1);
-var AST16 = recast16.types.builders;
+var recast17 = __toESM(require_main5(), 1);
+var AST17 = recast17.types.builders;
 async function QueryProcessor(config, page) {
   if (!is_component(config, page.framework, page.filepath)) {
     return;
   }
   const store_id = (name) => {
-    return AST16.identifier(`_houdini_` + name);
+    return AST17.identifier(`_houdini_` + name);
   };
   const queries = await find_inline_queries(page, page.script, store_id);
   if (queries.length === 0) {
@@ -172186,8 +172311,8 @@ async function QueryProcessor(config, page) {
     page.script.body.splice(
       find_insert_index(page.script),
       0,
-      AST16.variableDeclaration("const", [
-        AST16.variableDeclarator(store_id(query.name.value), AST16.newExpression(factory, []))
+      AST17.variableDeclaration("const", [
+        AST17.variableDeclarator(store_id(query.name.value), AST17.newExpression(factory, []))
       ])
     );
   }
@@ -172203,47 +172328,47 @@ async function QueryProcessor(config, page) {
           )}. maybe its not exported? `
         });
       }
-      const queryLoadExpression = AST16.callExpression(
-        AST16.memberExpression(store_id(query.name.value), AST16.identifier("fetch")),
+      const queryLoadExpression = AST17.callExpression(
+        AST17.memberExpression(store_id(query.name.value), AST17.identifier("fetch")),
         [
-          AST16.objectExpression([
-            AST16.objectProperty(
-              AST16.identifier("variables"),
-              AST16.callExpression(AST16.identifier("marshalInputs"), [
-                AST16.objectExpression([
-                  AST16.objectProperty(
-                    AST16.identifier("config"),
-                    AST16.callExpression(AST16.identifier("getCurrentConfig"), [])
+          AST17.objectExpression([
+            AST17.objectProperty(
+              AST17.identifier("variables"),
+              AST17.callExpression(AST17.identifier("marshalInputs"), [
+                AST17.objectExpression([
+                  AST17.objectProperty(
+                    AST17.identifier("config"),
+                    AST17.callExpression(AST17.identifier("getCurrentConfig"), [])
                   ),
-                  AST16.objectProperty(
-                    AST16.identifier("artifact"),
-                    AST16.memberExpression(
+                  AST17.objectProperty(
+                    AST17.identifier("artifact"),
+                    AST17.memberExpression(
                       store_id(query.name.value),
-                      AST16.identifier("artifact")
+                      AST17.identifier("artifact")
                     )
                   ),
-                  AST16.objectProperty(
-                    AST16.identifier("input"),
-                    has_variables ? AST16.callExpression(
-                      AST16.memberExpression(
-                        AST16.identifier(variable_fn),
-                        AST16.identifier("call")
+                  AST17.objectProperty(
+                    AST17.identifier("input"),
+                    has_variables ? AST17.callExpression(
+                      AST17.memberExpression(
+                        AST17.identifier(variable_fn),
+                        AST17.identifier("call")
                       ),
                       [
-                        AST16.newExpression(
-                          AST16.identifier("RequestContext"),
+                        AST17.newExpression(
+                          AST17.identifier("RequestContext"),
                           []
                         ),
-                        AST16.objectExpression([
-                          AST16.objectProperty(
-                            AST16.identifier("props"),
-                            AST16.objectExpression(
+                        AST17.objectExpression([
+                          AST17.objectProperty(
+                            AST17.identifier("props"),
+                            AST17.objectExpression(
                               props.map(
-                                (prop2) => AST16.objectProperty(
-                                  AST16.identifier(
+                                (prop2) => AST17.objectProperty(
+                                  AST17.identifier(
                                     prop2
                                   ),
-                                  AST16.identifier(
+                                  AST17.identifier(
                                     prop2
                                   )
                                 )
@@ -172252,7 +172377,7 @@ async function QueryProcessor(config, page) {
                           )
                         ])
                       ]
-                    ) : AST16.objectExpression([])
+                    ) : AST17.objectExpression([])
                   )
                 ])
               ])
@@ -172263,23 +172388,23 @@ async function QueryProcessor(config, page) {
       let finalExpression = [];
       if (page.svelte5Runes) {
         finalExpression = [
-          AST16.expressionStatement(
-            AST16.callExpression(AST16.identifier("$effect"), [
-              AST16.arrowFunctionExpression(
+          AST17.expressionStatement(
+            AST17.callExpression(AST17.identifier("$effect"), [
+              AST17.arrowFunctionExpression(
                 [],
-                AST16.blockStatement([AST16.expressionStatement(queryLoadExpression)])
+                AST17.blockStatement([AST17.expressionStatement(queryLoadExpression)])
               )
             ])
           )
         ];
       } else {
         finalExpression = [
-          AST16.labeledStatement(
-            AST16.identifier("$"),
-            AST16.expressionStatement(
-              AST16.logicalExpression(
+          AST17.labeledStatement(
+            AST17.identifier("$"),
+            AST17.expressionStatement(
+              AST17.logicalExpression(
                 "&&",
-                AST16.identifier("isBrowser"),
+                AST17.identifier("isBrowser"),
                 queryLoadExpression
               )
             )
@@ -172321,8 +172446,8 @@ async function find_inline_queries(page, parsed, store_id) {
 }
 
 // src/plugin/transforms/kit/init.ts
-var recast17 = __toESM(require_main5(), 1);
-var AST17 = recast17.types.builders;
+var recast18 = __toESM(require_main5(), 1);
+var AST18 = recast18.types.builders;
 async function kit_init(page) {
   if (!is_root_layout(page.config, page.filepath)) {
     return;
@@ -172346,9 +172471,9 @@ async function kit_init(page) {
     import: ["extractSession", "setClientSession"]
   }).ids;
   page.script.body.push(
-    AST17.expressionStatement(
-      AST17.callExpression(on_mount, [
-        AST17.arrowFunctionExpression([], AST17.callExpression(set_client_started, []))
+    AST18.expressionStatement(
+      AST18.callExpression(on_mount, [
+        AST18.arrowFunctionExpression([], AST18.callExpression(set_client_started, []))
       ])
     )
   );
@@ -172359,17 +172484,17 @@ async function kit_init(page) {
     import: ["page"]
   }).ids[0];
   page.script.body.push(
-    AST17.expressionStatement(
-      AST17.callExpression(AST17.memberExpression(store_id, AST17.identifier("subscribe")), [
-        AST17.arrowFunctionExpression(
-          [AST17.identifier("val")],
-          AST17.blockStatement([
-            AST17.expressionStatement(
-              AST17.callExpression(set_session, [
-                AST17.callExpression(extract_session, [
-                  AST17.memberExpression(
-                    AST17.identifier("val"),
-                    AST17.identifier("data")
+    AST18.expressionStatement(
+      AST18.callExpression(AST18.memberExpression(store_id, AST18.identifier("subscribe")), [
+        AST18.arrowFunctionExpression(
+          [AST18.identifier("val")],
+          AST18.blockStatement([
+            AST18.expressionStatement(
+              AST18.callExpression(set_session, [
+                AST18.callExpression(extract_session, [
+                  AST18.memberExpression(
+                    AST18.identifier("val"),
+                    AST18.identifier("data")
                   )
                 ])
               ])
@@ -172383,15 +172508,15 @@ async function kit_init(page) {
 
 // src/plugin/transforms/kit/load.ts
 import * as graphql36 from "graphql";
-var recast18 = __toESM(require_main5(), 1);
-var AST18 = recast18.types.builders;
+var recast19 = __toESM(require_main5(), 1);
+var AST19 = recast19.types.builders;
 async function kit_load_generator(page) {
   const route = is_route(page.config, page.framework, page.filepath);
   const script = is_route_script(page.framework, page.filepath);
   if (!route && !script) {
     return;
   }
-  const inline_query_store = (name) => route ? AST18.memberExpression(AST18.identifier("data"), AST18.identifier(name)) : artifact_import({
+  const inline_query_store = (name) => route ? AST19.memberExpression(AST19.identifier("data"), AST19.identifier(name)) : artifact_import({
     config: page.config,
     script: page.script,
     page,
@@ -172443,8 +172568,8 @@ async function kit_load_generator(page) {
       find_insert_index(page.script),
       0,
       ...!has_data ? [
-        AST18.exportNamedDeclaration(
-          AST18.variableDeclaration("let", [AST18.identifier("data")])
+        AST19.exportNamedDeclaration(
+          AST19.variableDeclaration("let", [AST19.identifier("data")])
         )
       ] : []
     );
@@ -172491,43 +172616,43 @@ function add_load({
   let before_load = page_info.exports.includes(houdini_before_load_fn);
   let afterLoad = page_info.exports.includes(houdini_afterLoad_fn);
   let on_error = page_info.exports.includes(houdini_on_error_fn);
-  const request_context = AST18.identifier("houdini_context");
-  const promise_list = AST18.identifier("promises");
-  const return_value = AST18.memberExpression(request_context, AST18.identifier("returnValue"));
-  const result_obj = AST18.identifier("result");
-  const input_obj = AST18.identifier("inputs");
-  const preload_fn = AST18.functionDeclaration(
-    AST18.identifier("load"),
-    [AST18.identifier("context")],
-    AST18.blockStatement([
-      AST18.variableDeclaration("const", [
-        AST18.variableDeclarator(
+  const request_context = AST19.identifier("houdini_context");
+  const promise_list = AST19.identifier("promises");
+  const return_value = AST19.memberExpression(request_context, AST19.identifier("returnValue"));
+  const result_obj = AST19.identifier("result");
+  const input_obj = AST19.identifier("inputs");
+  const preload_fn = AST19.functionDeclaration(
+    AST19.identifier("load"),
+    [AST19.identifier("context")],
+    AST19.blockStatement([
+      AST19.variableDeclaration("const", [
+        AST19.variableDeclarator(
           request_context,
-          AST18.newExpression(AST18.identifier("RequestContext"), [AST18.identifier("context")])
+          AST19.newExpression(AST19.identifier("RequestContext"), [AST19.identifier("context")])
         )
       ]),
-      AST18.variableDeclaration("const", [
-        AST18.variableDeclarator(
-          AST18.identifier("houdiniConfig"),
-          AST18.callExpression(AST18.identifier("getCurrentConfig"), [])
+      AST19.variableDeclaration("const", [
+        AST19.variableDeclarator(
+          AST19.identifier("houdiniConfig"),
+          AST19.callExpression(AST19.identifier("getCurrentConfig"), [])
         )
       ]),
-      AST18.variableDeclaration("const", [
-        AST18.variableDeclarator(promise_list, AST18.arrayExpression([]))
+      AST19.variableDeclaration("const", [
+        AST19.variableDeclarator(promise_list, AST19.arrayExpression([]))
       ]),
-      AST18.variableDeclaration("const", [
-        AST18.variableDeclarator(input_obj, AST18.objectExpression([]))
+      AST19.variableDeclaration("const", [
+        AST19.variableDeclarator(input_obj, AST19.objectExpression([]))
       ]),
-      AST18.returnStatement(
-        AST18.objectExpression([
-          AST18.spreadElement(return_value),
-          AST18.spreadElement(result_obj)
+      AST19.returnStatement(
+        AST19.objectExpression([
+          AST19.spreadElement(return_value),
+          AST19.spreadElement(result_obj)
         ])
       )
     ])
   );
   preload_fn.async = true;
-  page.script.body.push(AST18.exportNamedDeclaration(preload_fn));
+  page.script.body.push(AST19.exportNamedDeclaration(preload_fn));
   let insert_index = 4;
   for (const query of queries) {
     const { ids } = ensure_imports({
@@ -172537,19 +172662,19 @@ function add_load({
       sourceModule: store_import_path({ config: page.config, name: query.name.value })
     });
     const load_fn = ids[0];
-    const variables = (query.variableDefinitions?.length ?? 0) > 0 ? AST18.awaitExpression(
-      AST18.callExpression(AST18.identifier(__variable_fn_name(query.name.value)), [
-        AST18.identifier("houdiniConfig"),
-        AST18.identifier("context")
+    const variables = (query.variableDefinitions?.length ?? 0) > 0 ? AST19.awaitExpression(
+      AST19.callExpression(AST19.identifier(__variable_fn_name(query.name.value)), [
+        AST19.identifier("houdiniConfig"),
+        AST19.identifier("context")
       ])
-    ) : AST18.objectExpression([]);
+    ) : AST19.objectExpression([]);
     preload_fn.body.body.splice(
       insert_index++,
       0,
-      AST18.expressionStatement(
-        AST18.assignmentExpression(
+      AST19.expressionStatement(
+        AST19.assignmentExpression(
           "=",
-          AST18.memberExpression(input_obj, AST18.literal(query.name.value)),
+          AST19.memberExpression(input_obj, AST19.literal(query.name.value)),
           variables
         )
       )
@@ -172557,18 +172682,18 @@ function add_load({
     preload_fn.body.body.splice(
       insert_index++,
       0,
-      AST18.expressionStatement(
-        AST18.callExpression(AST18.memberExpression(promise_list, AST18.identifier("push")), [
-          AST18.callExpression(load_fn, [
-            AST18.objectExpression([
-              AST18.objectProperty(
-                AST18.literal("variables"),
-                AST18.memberExpression(input_obj, AST18.literal(query.name.value))
+      AST19.expressionStatement(
+        AST19.callExpression(AST19.memberExpression(promise_list, AST19.identifier("push")), [
+          AST19.callExpression(load_fn, [
+            AST19.objectExpression([
+              AST19.objectProperty(
+                AST19.literal("variables"),
+                AST19.memberExpression(input_obj, AST19.literal(query.name.value))
               ),
-              AST18.objectProperty(AST18.literal("event"), AST18.identifier("context")),
-              AST18.objectProperty(
-                AST18.literal("blocking"),
-                afterLoad || on_error ? AST18.booleanLiteral(true) : AST18.identifier("undefined")
+              AST19.objectProperty(AST19.literal("event"), AST19.identifier("context")),
+              AST19.objectProperty(
+                AST19.literal("blocking"),
+                afterLoad || on_error ? AST19.booleanLiteral(true) : AST19.identifier("undefined")
               )
             ])
           ])
@@ -172580,28 +172705,28 @@ function add_load({
   preload_fn.body.body.splice(
     insert_index++,
     0,
-    AST18.variableDeclaration("let", [
-      AST18.variableDeclarator(result_obj, AST18.objectExpression([]))
+    AST19.variableDeclaration("let", [
+      AST19.variableDeclarator(result_obj, AST19.objectExpression([]))
     ]),
-    AST18.tryStatement(
-      AST18.blockStatement([
-        AST18.expressionStatement(
-          AST18.assignmentExpression(
+    AST19.tryStatement(
+      AST19.blockStatement([
+        AST19.expressionStatement(
+          AST19.assignmentExpression(
             "=",
             result_obj,
-            AST18.callExpression(
-              AST18.memberExpression(
-                AST18.identifier("Object"),
-                AST18.identifier("assign")
+            AST19.callExpression(
+              AST19.memberExpression(
+                AST19.identifier("Object"),
+                AST19.identifier("assign")
               ),
               [
-                AST18.objectExpression([]),
-                AST18.spreadElement(
-                  AST18.awaitExpression(
-                    AST18.callExpression(
-                      AST18.memberExpression(
-                        AST18.identifier("Promise"),
-                        AST18.identifier("all")
+                AST19.objectExpression([]),
+                AST19.spreadElement(
+                  AST19.awaitExpression(
+                    AST19.callExpression(
+                      AST19.memberExpression(
+                        AST19.identifier("Promise"),
+                        AST19.identifier("all")
                       ),
                       [promise_list]
                     )
@@ -172612,37 +172737,37 @@ function add_load({
           )
         )
       ]),
-      AST18.catchClause(
-        AST18.identifier("err"),
+      AST19.catchClause(
+        AST19.identifier("err"),
         null,
-        AST18.blockStatement([
-          on_error ? AST18.expressionStatement(
-            AST18.awaitExpression(
-              AST18.callExpression(
-                AST18.memberExpression(
+        AST19.blockStatement([
+          on_error ? AST19.expressionStatement(
+            AST19.awaitExpression(
+              AST19.callExpression(
+                AST19.memberExpression(
                   request_context,
-                  AST18.identifier("invokeLoadHook")
+                  AST19.identifier("invokeLoadHook")
                 ),
                 [
-                  AST18.objectExpression([
-                    AST18.objectProperty(
-                      AST18.literal("variant"),
-                      AST18.stringLiteral("error")
+                  AST19.objectExpression([
+                    AST19.objectProperty(
+                      AST19.literal("variant"),
+                      AST19.stringLiteral("error")
                     ),
-                    AST18.objectProperty(
-                      AST18.literal("hookFn"),
-                      AST18.identifier(houdini_on_error_fn)
+                    AST19.objectProperty(
+                      AST19.literal("hookFn"),
+                      AST19.identifier(houdini_on_error_fn)
                     ),
-                    AST18.objectProperty(
-                      AST18.literal("error"),
-                      AST18.identifier("err")
+                    AST19.objectProperty(
+                      AST19.literal("error"),
+                      AST19.identifier("err")
                     ),
-                    AST18.objectProperty(AST18.literal("input"), input_obj)
+                    AST19.objectProperty(AST19.literal("input"), input_obj)
                   ])
                 ]
               )
             )
-          ) : AST18.throwStatement(AST18.identifier("err"))
+          ) : AST19.throwStatement(AST19.identifier("err"))
         ])
       )
     )
@@ -172677,22 +172802,22 @@ async function find_special_query(type, page) {
   return definition;
 }
 function load_hook_statements(name, request_context, input_id, result_id) {
-  return AST18.expressionStatement(
-    AST18.awaitExpression(
-      AST18.callExpression(
-        AST18.memberExpression(request_context, AST18.identifier("invokeLoadHook")),
+  return AST19.expressionStatement(
+    AST19.awaitExpression(
+      AST19.callExpression(
+        AST19.memberExpression(request_context, AST19.identifier("invokeLoadHook")),
         [
-          AST18.objectExpression([
-            AST18.objectProperty(AST18.literal("variant"), AST18.stringLiteral(name)),
-            AST18.objectProperty(
-              AST18.literal("hookFn"),
-              AST18.identifier(
+          AST19.objectExpression([
+            AST19.objectProperty(AST19.literal("variant"), AST19.stringLiteral(name)),
+            AST19.objectProperty(
+              AST19.literal("hookFn"),
+              AST19.identifier(
                 name === "before" ? houdini_before_load_fn : houdini_afterLoad_fn
               )
             ),
             ...name === "after" ? [
-              AST18.objectProperty(AST18.literal("input"), input_id),
-              AST18.objectProperty(AST18.literal("data"), result_id)
+              AST19.objectProperty(AST19.literal("input"), input_id),
+              AST19.objectProperty(AST19.literal("data"), result_id)
             ] : []
           ])
         ]
@@ -172754,22 +172879,22 @@ function variable_function_for_query(page, query, has_local) {
     };
   }
   const fn_body = [
-    AST18.variableDeclaration("const", [
-      AST18.variableDeclarator(
-        AST18.identifier("result"),
-        AST18.objectExpression(
+    AST19.variableDeclaration("const", [
+      AST19.variableDeclarator(
+        AST19.identifier("result"),
+        AST19.objectExpression(
           Object.entries(has_args).map(([arg, type]) => {
-            return AST18.objectProperty(
-              AST18.identifier(arg),
-              AST18.callExpression(AST18.identifier("parseScalar"), [
-                AST18.identifier("config"),
-                AST18.stringLiteral(type),
-                AST18.memberExpression(
-                  AST18.memberExpression(
-                    AST18.identifier("event"),
-                    AST18.identifier("params")
+            return AST19.objectProperty(
+              AST19.identifier(arg),
+              AST19.callExpression(AST19.identifier("parseScalar"), [
+                AST19.identifier("config"),
+                AST19.stringLiteral(type),
+                AST19.memberExpression(
+                  AST19.memberExpression(
+                    AST19.identifier("event"),
+                    AST19.identifier("params")
                   ),
-                  AST18.identifier(arg)
+                  AST19.identifier(arg)
                 )
               ])
             );
@@ -172780,28 +172905,28 @@ function variable_function_for_query(page, query, has_local) {
   ];
   if (has_local) {
     fn_body.push(
-      AST18.expressionStatement(
-        AST18.callExpression(
-          AST18.memberExpression(AST18.identifier("Object"), AST18.identifier("assign")),
+      AST19.expressionStatement(
+        AST19.callExpression(
+          AST19.memberExpression(AST19.identifier("Object"), AST19.identifier("assign")),
           [
-            AST18.identifier("result"),
-            AST18.callExpression(AST18.identifier("marshalInputs"), [
-              AST18.objectExpression([
-                AST18.objectProperty(
-                  AST18.identifier("config"),
-                  AST18.identifier("config")
+            AST19.identifier("result"),
+            AST19.callExpression(AST19.identifier("marshalInputs"), [
+              AST19.objectExpression([
+                AST19.objectProperty(
+                  AST19.identifier("config"),
+                  AST19.identifier("config")
                 ),
-                AST18.objectProperty(
-                  AST18.identifier("input"),
-                  AST18.awaitExpression(
-                    AST18.callExpression(
-                      AST18.identifier(query_variable_fn(query.name.value)),
-                      [AST18.identifier("event")]
+                AST19.objectProperty(
+                  AST19.identifier("input"),
+                  AST19.awaitExpression(
+                    AST19.callExpression(
+                      AST19.identifier(query_variable_fn(query.name.value)),
+                      [AST19.identifier("event")]
                     )
                   )
                 ),
-                AST18.objectProperty(
-                  AST18.identifier("artifact"),
+                AST19.objectProperty(
+                  AST19.identifier("artifact"),
                   artifact_import({
                     config: page.config,
                     script: page.script,
@@ -172816,11 +172941,11 @@ function variable_function_for_query(page, query, has_local) {
       )
     );
   }
-  fn_body.push(AST18.returnStatement(AST18.identifier("result")));
-  const declaration2 = AST18.functionDeclaration(
-    AST18.identifier(__variable_fn_name(query.name.value)),
-    [AST18.identifier("config"), AST18.identifier("event")],
-    AST18.blockStatement(fn_body)
+  fn_body.push(AST19.returnStatement(AST19.identifier("result")));
+  const declaration2 = AST19.functionDeclaration(
+    AST19.identifier(__variable_fn_name(query.name.value)),
+    [AST19.identifier("config"), AST19.identifier("event")],
+    AST19.blockStatement(fn_body)
   );
   declaration2.async = true;
   return declaration2;
@@ -172830,8 +172955,8 @@ function __variable_fn_name(name) {
 }
 
 // src/plugin/transforms/kit/session.ts
-var recast19 = __toESM(require_main5(), 1);
-var AST19 = recast19.types.builders;
+var recast20 = __toESM(require_main5(), 1);
+var AST20 = recast20.types.builders;
 function session_default(page) {
   if (is_root_layout_server(page.config, page.filepath)) {
     process_root_layout_server(page);
@@ -172847,12 +172972,12 @@ function process_root_layout_server(page) {
     sourceModule: "$houdini/plugins/houdini-svelte/runtime/session"
   }).ids[0];
   add_load_return(page, (event_id) => [
-    AST19.spreadElement(AST19.callExpression(build_session_object, [event_id]))
+    AST20.spreadElement(AST20.callExpression(build_session_object, [event_id]))
   ]);
 }
 function process_root_layout_script(page) {
   add_load_return(page, (event_id) => [
-    AST19.spreadElement(AST19.memberExpression(event_id, AST19.identifier("data")))
+    AST20.spreadElement(AST20.memberExpression(event_id, AST20.identifier("data")))
   ]);
 }
 function add_load_return(page, properties) {
@@ -172864,50 +172989,78 @@ function add_load_return(page, properties) {
     if (return_statement_index !== -1) {
       return_statement = body.body[return_statement_index];
     } else {
-      return_statement = AST19.returnStatement(AST19.objectExpression([]));
+      return_statement = AST20.returnStatement(AST20.objectExpression([]));
       body.body.push(return_statement);
-      return_statement_index = body.body.length - 1;
     }
-    const local_return_var = AST19.identifier("__houdini__vite__plugin__return__value__");
-    body.body[return_statement_index] = AST19.variableDeclaration("const", [
-      AST19.variableDeclarator(local_return_var, return_statement.argument)
-    ]);
-    body.body.splice(
-      return_statement_index + 1,
-      0,
-      AST19.returnStatement(
-        AST19.objectExpression([...properties(event_id), AST19.spreadElement(local_return_var)])
-      )
-    );
+    return walk(body, {
+      enter(node) {
+        if (node.type === "ReturnStatement") {
+          const returnedValue = node.argument;
+          this.replace(
+            AST20.returnStatement(
+              AST20.objectExpression([
+                ...properties(event_id),
+                AST20.spreadElement(returnedValue ?? AST20.objectExpression([]))
+              ])
+            )
+          );
+        }
+      }
+    });
   });
 }
 function modify_load(page, cb) {
-  let load_fn = find_exported_fn(page.script.body, "load");
-  let event_id = AST19.identifier("event");
-  let body = AST19.blockStatement([]);
+  let exported = find_exported_fn(page.script.body, "load");
+  let event_id = AST20.identifier("event");
+  let load_fn = exported?.declaration || null;
+  let body = AST20.blockStatement([]);
   if (load_fn?.type === "ArrowFunctionExpression") {
     if (load_fn.body.type === "BlockStatement") {
       body = load_fn.body;
     } else {
-      body = AST19.blockStatement([AST19.returnStatement(load_fn.body)]);
+      body = AST20.blockStatement([AST20.returnStatement(load_fn.body)]);
       load_fn.body = body;
     }
-  } else if (load_fn) {
+  } else if (load_fn && "body" in load_fn) {
     body = load_fn.body;
   }
   if (!load_fn) {
-    load_fn = AST19.functionDeclaration(
-      AST19.identifier("load"),
+    load_fn = AST20.functionDeclaration(
+      AST20.identifier("load"),
       [event_id],
-      AST19.blockStatement([])
+      AST20.blockStatement([])
     );
     load_fn.async = true;
     page.script.body.splice(
       find_insert_index(page.script),
       0,
-      AST19.exportNamedDeclaration(load_fn)
+      AST20.exportNamedDeclaration(load_fn)
     );
     body = load_fn.body;
+  } else if (load_fn.type === "CallExpression" || load_fn.type === "Identifier") {
+    const exportStatement = exported?.export;
+    if (!exportStatement) {
+      return;
+    }
+    const intermediateID = AST20.identifier("houdini__intermediate__load__");
+    page.script.body.push(
+      AST20.variableDeclaration("const", [AST20.variableDeclarator(intermediateID, load_fn)])
+    );
+    const newLoad = AST20.arrowFunctionExpression(
+      [AST20.identifier("event")],
+      AST20.blockStatement([
+        AST20.variableDeclaration("const", [
+          AST20.variableDeclarator(
+            AST20.identifier("result"),
+            AST20.callExpression(intermediateID, [AST20.identifier("event")])
+          )
+        ]),
+        AST20.returnStatement(AST20.identifier("result"))
+      ])
+    );
+    exportStatement.declaration.declarations[0].init = newLoad;
+    load_fn = newLoad;
+    body = newLoad.body;
   } else {
     if (load_fn.params.length === 0) {
       load_fn.params.push(event_id);
@@ -172917,7 +173070,7 @@ function modify_load(page, cb) {
       const pattern = load_fn.params[0];
       load_fn.params[0] = event_id;
       body.body.unshift(
-        AST19.variableDeclaration("let", [AST19.variableDeclarator(pattern, event_id)])
+        AST20.variableDeclaration("let", [AST20.variableDeclarator(pattern, event_id)])
       );
     } else {
       throw new Error(
@@ -172925,7 +173078,7 @@ function modify_load(page, cb) {
       );
     }
   }
-  cb(body, event_id);
+  load_fn.body = cb(body, event_id);
 }
 
 // src/plugin/transforms/kit/index.ts
@@ -172938,8 +173091,8 @@ async function SvelteKitProcessor(config, page) {
 }
 
 // src/plugin/transforms/tags.ts
-var recast20 = __toESM(require_main5(), 1);
-var AST20 = recast20.types.builders;
+var recast21 = __toESM(require_main5(), 1);
+var AST21 = recast21.types.builders;
 async function GraphQLTagProcessor(config, page) {
   await find_graphql(config, page.script, {
     dependency: page.watch_file,
@@ -172947,7 +173100,7 @@ async function GraphQLTagProcessor(config, page) {
       const { node, parsedDocument } = tag2;
       const operation = config.extractDefinition(parsedDocument);
       const { id: id2 } = store_import({ page, artifact: { name: operation.name.value } });
-      node.replaceWith(AST20.newExpression(id2, []));
+      node.replaceWith(AST21.newExpression(id2, []));
     }
   });
 }
@@ -172966,7 +173119,7 @@ async function apply_transforms(framework2, page) {
         position = res.position;
         useRunes = res.useRunes;
       } else {
-        script = recast21.types.builders.program([]);
+        script = recast23.types.builders.program([]);
         position = { start: 0, end: 0 };
       }
     } else {