houdini-svelte 2.0.1 → 2.1.1

package/build/test-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;
@@ -142730,6 +142770,11 @@ var CachePolicy = {
   CacheAndNetwork: "CacheAndNetwork",
   NoCache: "NoCache"
 };
+var DedupeMatchMode = {
+  Variables: "Variables",
+  Operation: "Operation",
+  None: "None"
+};
 var PaginateMode = {
   Infinite: "Infinite",
   SinglePage: "SinglePage"
@@ -143273,7 +143318,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;
@@ -143395,6 +143451,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);
   }
@@ -144539,8 +144598,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?`
@@ -144955,6 +145014,7 @@ var CacheInternal2 = class {
           });
         }
       }
+      const processedOperations = /* @__PURE__ */ new Set();
       for (const operation of operations || []) {
         let parentID;
         if (operation.parentID) {
@@ -144974,7 +145034,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,
@@ -144982,7 +145047,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,
@@ -144990,7 +145060,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) {
@@ -145002,6 +145077,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;
@@ -147175,14 +147260,27 @@ async function paginate(config, documents) {
           return {
             ...node,
             variableDefinitions: finalVariables,
-            directives: [
+            directives: config.configFile.supressPaginationDeduplication ? node.directives : [
               ...node.directives || [],
               {
                 kind: graphql13.Kind.DIRECTIVE,
                 name: {
                   kind: graphql13.Kind.NAME,
                   value: config.dedupeDirective
-                }
+                },
+                arguments: [
+                  {
+                    kind: "Argument",
+                    name: {
+                      kind: "Name",
+                      value: "match"
+                    },
+                    value: {
+                      kind: "EnumValue",
+                      value: DedupeMatchMode.Variables
+                    }
+                  }
+                ]
               }
             ]
           };
@@ -147550,6 +147648,46 @@ function objectNode([type, defaultValue]) {
   return node;
 }
 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: {
@@ -148530,7 +148668,13 @@ function artifactGenerator(stats) {
               const cancelFirstArg = dedupeDirective.arguments?.find(
                 (arg) => arg.name.value === "cancelFirst"
               );
-              dedupe = cancelFirstArg && cancelFirstArg.value.kind === "BooleanValue" && cancelFirstArg.value ? "first" : "last";
+              const matchArg = dedupeDirective.arguments?.find(
+                (arg) => arg.name.value === "match"
+              );
+              dedupe = {
+                cancel: cancelFirstArg && cancelFirstArg.value.kind === "BooleanValue" && cancelFirstArg.value ? "first" : "last",
+                match: matchArg && matchArg.value.kind === "EnumValue" ? matchArg.value.value : DedupeMatchMode.Operation
+              };
             }
             selectionSet = operation.selectionSet;
             if (originalParsed.definitions[0].kind === "OperationDefinition") {
@@ -152067,11 +152211,20 @@ directive @${config.paginateDirective}(${config.listOrPaginateNameArg}: String,
 """
 directive @${config.listPrependDirective} on FRAGMENT_SPREAD
 
+enum DedupeMatchMode {
+	${DedupeMatchMode.Variables}
+	${DedupeMatchMode.Operation}
+	${DedupeMatchMode.None}
+}
+
 """
 	@${config.dedupeDirective} is used to prevent an operation from running more than once at the same time.
 	If the cancelFirst arg is set to true, the response already in flight will be canceled instead of the second one.
+	If match is set to Operation, then a request will be deduplicated any time there is a request with the same operation. 
+	If it's set to Variables then the request will only be deduplicated if the variables match. If match is set to None,
+	then the request will never be deduplicated.
 """
-directive @${config.dedupeDirective}(cancelFirst: Boolean) on QUERY | MUTATION
+directive @${config.dedupeDirective}(cancelFirst: Boolean, match: DedupeMatchMode) on QUERY | MUTATION
 
 """
 	@${config.optimisticKeyDirective} is used to identify a field as an optimistic key
@@ -207735,7 +207888,18 @@ var ListManager3 = 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 ListCollection3(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;
@@ -207857,6 +208021,9 @@ var List3 = 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);
   }
@@ -209001,8 +209168,8 @@ var Cache3 = 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?`
@@ -209417,6 +209584,7 @@ var CacheInternal3 = class {
           });
         }
       }
+      const processedOperations = /* @__PURE__ */ new Set();
       for (const operation of operations || []) {
         let parentID;
         if (operation.parentID) {
@@ -209436,7 +209604,12 @@ var CacheInternal3 = 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,
@@ -209444,7 +209617,12 @@ var CacheInternal3 = 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,
@@ -209452,7 +209630,12 @@ var CacheInternal3 = 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) {
@@ -209464,6 +209647,16 @@ var CacheInternal3 = 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;
@@ -209923,8 +210116,9 @@ var Config = class {
   localSchema;
   projectRoot;
   schema;
+  runtimeDir;
   schemaPath;
-  persistedQueriesPath = "./$houdini/persisted_queries.json";
+  persistedQueriesPath;
   exclude;
   scalars;
   module = "esm";
@@ -209965,6 +210159,7 @@ var Config = class {
     let {
       schema: schema2,
       schemaPath = "./schema.graphql",
+      runtimeDir = "$houdini",
       exclude = [],
       module = "esm",
       scalars,
@@ -210003,6 +210198,7 @@ var Config = class {
     this.projectRoot = dirname3(
       projectDir ? join4(process.cwd(), projectDir) : filepath
     );
+    this.runtimeDir = runtimeDir;
     this.scalars = scalars;
     this.cacheBufferSize = cacheBufferSize;
     this.defaultCachePolicy = defaultCachePolicy;
@@ -210017,11 +210213,9 @@ var Config = class {
     this.schemaPollInterval = watchSchema?.interval === void 0 ? 2e3 : watchSchema.interval;
     this.schemaPollTimeout = watchSchema?.timeout ?? 3e4;
     this.schemaPollHeaders = watchSchema?.headers ?? {};
-    this.rootDir = join4(this.projectRoot, "$houdini");
+    this.rootDir = join4(this.projectRoot, this.runtimeDir);
+    this.persistedQueriesPath = persistedQueriesPath ?? join4(this.rootDir, "persisted_queries.json");
     this.#fragmentVariableMaps = {};
-    if (persistedQueriesPath) {
-      this.persistedQueriesPath = persistedQueriesPath;
-    }
     if (defaultKeys) {
       this.defaultKeys = defaultKeys;
     }
@@ -210604,6 +210798,46 @@ var { keys: keys2 } = Object;
 var recast42 = __toESM4(require_main23(), 1);
 var AST42 = recast42.types.builders;
 var pageInfoSelection2 = [
+  {
+    kind: graphql132.Kind.FIELD,
+    name: {
+      kind: graphql132.Kind.NAME,
+      value: "pageInfo"
+    },
+    selectionSet: {
+      kind: graphql132.Kind.SELECTION_SET,
+      selections: [
+        {
+          kind: graphql132.Kind.FIELD,
+          name: {
+            kind: graphql132.Kind.NAME,
+            value: "hasPreviousPage"
+          }
+        },
+        {
+          kind: graphql132.Kind.FIELD,
+          name: {
+            kind: graphql132.Kind.NAME,
+            value: "hasNextPage"
+          }
+        },
+        {
+          kind: graphql132.Kind.FIELD,
+          name: {
+            kind: graphql132.Kind.NAME,
+            value: "startCursor"
+          }
+        },
+        {
+          kind: graphql132.Kind.FIELD,
+          name: {
+            kind: graphql132.Kind.NAME,
+            value: "endCursor"
+          }
+        }
+      ]
+    }
+  },
   {
     kind: graphql132.Kind.FIELD,
     name: {
@@ -231004,30 +231238,30 @@ var require_utils52 = __commonJS5({
       validate32.oneOf = values;
       return validate32;
     }
-    function assertNodeType(...types17) {
+    function assertNodeType(...types18) {
       function validate32(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)}`);
       }
-      validate32.oneOfNodeTypes = types17;
+      validate32.oneOfNodeTypes = types18;
       return validate32;
     }
-    function assertNodeOrValueType(...types17) {
+    function assertNodeOrValueType(...types18) {
       function validate32(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)}`);
       }
-      validate32.oneOfNodeOrValueTypes = types17;
+      validate32.oneOfNodeOrValueTypes = types18;
       return validate32;
     }
     function assertValueType(type) {
@@ -235431,10 +235665,10 @@ var require_generated24 = __commonJS5({
         body
       });
     }
-    function intersectionTypeAnnotation(types17) {
+    function intersectionTypeAnnotation(types18) {
       return (0, _validateNode.default)({
         type: "IntersectionTypeAnnotation",
-        types: types17
+        types: types18
       });
     }
     function mixedTypeAnnotation() {
@@ -235557,10 +235791,10 @@ var require_generated24 = __commonJS5({
         type: "ThisTypeAnnotation"
       };
     }
-    function tupleTypeAnnotation(types17) {
+    function tupleTypeAnnotation(types18) {
       return (0, _validateNode.default)({
         type: "TupleTypeAnnotation",
-        types: types17
+        types: types18
       });
     }
     function typeofTypeAnnotation(argument) {
@@ -235611,10 +235845,10 @@ var require_generated24 = __commonJS5({
         params
       });
     }
-    function unionTypeAnnotation(types17) {
+    function unionTypeAnnotation(types18) {
       return (0, _validateNode.default)({
         type: "UnionTypeAnnotation",
-        types: types17
+        types: types18
       });
     }
     function variance(kind) {
@@ -236127,16 +236361,16 @@ var require_generated24 = __commonJS5({
         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) {
@@ -237737,12 +237971,12 @@ var require_removeTypeDuplicates5 = __commonJS5({
       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)) {
@@ -237776,15 +238010,15 @@ var require_removeTypeDuplicates5 = __commonJS5({
           }
           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;
     }
   }
 });
@@ -237797,8 +238031,8 @@ var require_createFlowUnionType4 = __commonJS5({
     exports.default = createFlowUnionType;
     var _generated = require_generated24();
     var _removeTypeDuplicates = require_removeTypeDuplicates5();
-    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 {
@@ -237823,12 +238057,12 @@ var require_removeTypeDuplicates24 = __commonJS5({
       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)) {
@@ -237862,15 +238096,15 @@ var require_removeTypeDuplicates24 = __commonJS5({
           }
           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;
     }
   }
 });
@@ -237885,10 +238119,10 @@ var require_createTSUnionType4 = __commonJS5({
     var _removeTypeDuplicates = require_removeTypeDuplicates24();
     var _index = require_generated7();
     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 {
@@ -242152,14 +242386,14 @@ var require_lib64 = __commonJS5({
         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;
@@ -242697,17 +242931,17 @@ var require_lib64 = __commonJS5({
         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";
@@ -243267,7 +243501,7 @@ var require_lib64 = __commonJS5({
         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;
@@ -247094,7 +247328,7 @@ var require_lib64 = __commonJS5({
             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();
           }
         }
@@ -248116,9 +248350,9 @@ var require_lib64 = __commonJS5({
         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);
             }
@@ -248137,7 +248371,7 @@ var require_lib64 = __commonJS5({
       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");
@@ -248157,11 +248391,11 @@ var require_lib64 = __commonJS5({
       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");
@@ -248220,12 +248454,12 @@ var require_lib64 = __commonJS5({
                   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;
                 }
@@ -248290,11 +248524,11 @@ var require_lib64 = __commonJS5({
       }
       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;
@@ -248304,7 +248538,7 @@ var require_lib64 = __commonJS5({
             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;
           }
@@ -248322,17 +248556,17 @@ var require_lib64 = __commonJS5({
           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 {
@@ -249707,14 +249941,14 @@ var require_lib64 = __commonJS5({
       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() {
@@ -250278,7 +250512,7 @@ var require_lib64 = __commonJS5({
         }));
         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);
@@ -250904,7 +251138,7 @@ var require_lib64 = __commonJS5({
             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();
           }
         }
@@ -256032,9 +256266,9 @@ var require_shared4 = __commonJS5({
     var tslib_1 = require_tslib4();
     var types_1 = tslib_1.__importDefault(require_types4());
     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) {
@@ -256182,9 +256416,9 @@ var require_types4 = __commonJS5({
     }(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;
       }
@@ -256325,11 +256559,11 @@ var require_types4 = __commonJS5({
     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);
           }));
         },
@@ -256772,9 +257006,9 @@ var require_path24 = __commonJS5({
     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'");
@@ -257074,13 +257308,13 @@ var require_scope4 = __commonJS5({
     var types_1 = tslib_1.__importDefault(require_types4());
     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(path32, parentScope) {
         if (!(this instanceof Scope22)) {
           throw new Error("Scope constructor cannot be invoked without 'new'");
@@ -257143,7 +257377,7 @@ var require_scope4 = __commonJS5({
           ++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());
@@ -257219,7 +257453,7 @@ var require_scope4 = __commonJS5({
             bindings
           );
         } else if (Node3.check(node) && !Expression.check(node)) {
-          types17.eachField(node, function(name, child) {
+          types18.eachField(node, function(name, child) {
             var childPath = path32.get(name);
             if (!pathHasValue(childPath, child)) {
               throw new Error("");
@@ -257297,24 +257531,24 @@ var require_scope4 = __commonJS5({
           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) {
@@ -257353,11 +257587,11 @@ var require_node_path4 = __commonJS5({
     var scope_1 = tslib_1.__importDefault(require_scope4());
     var shared_1 = require_shared4();
     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) {
@@ -257448,7 +257682,7 @@ var require_node_path4 = __commonJS5({
         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;
@@ -257590,7 +257824,7 @@ var require_node_path4 = __commonJS5({
           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);
           });
         }
@@ -257709,11 +257943,11 @@ var require_path_visitor4 = __commonJS5({
     var shared_1 = require_shared4();
     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)) {
@@ -257733,7 +257967,7 @@ var require_path_visitor4 = __commonJS5({
             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;
@@ -257852,7 +258086,7 @@ var require_path_visitor4 = __commonJS5({
           path32.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");
           }
@@ -257861,7 +258095,7 @@ var require_path_visitor4 = __commonJS5({
           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(path32.get(childName));
           }
@@ -258002,13 +258236,13 @@ var require_equiv4 = __commonJS5({
     var shared_1 = require_shared4();
     var types_1 = tslib_1.__importDefault(require_types4());
     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)) {
@@ -258159,24 +258393,24 @@ var require_fork4 = __commonJS5({
     var shared_1 = require_shared4();
     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,
@@ -258336,8 +258570,8 @@ var require_core34 = __commonJS5({
     var types_1 = tslib_1.__importDefault(require_types4());
     var shared_1 = tslib_1.__importStar(require_shared4());
     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);
@@ -258427,9 +258661,9 @@ var require_es64 = __commonJS5({
     var shared_1 = tslib_1.__importStar(require_shared4());
     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(
@@ -258515,8 +258749,8 @@ var require_es20174 = __commonJS5({
     var shared_1 = tslib_1.__importStar(require_shared4());
     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"));
@@ -258537,9 +258771,9 @@ var require_es20184 = __commonJS5({
     var shared_1 = tslib_1.__importStar(require_shared4());
     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"));
@@ -258568,9 +258802,9 @@ var require_es20194 = __commonJS5({
     var shared_1 = tslib_1.__importStar(require_shared4());
     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"]);
     }
@@ -258592,9 +258826,9 @@ var require_es202024 = __commonJS5({
     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"));
@@ -258640,8 +258874,8 @@ var require_es20224 = __commonJS5({
     var shared_1 = require_shared4();
     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;
@@ -258660,9 +258894,9 @@ var require_es_proposals4 = __commonJS5({
     var es2022_1 = tslib_1.__importDefault(require_es20224());
     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;
@@ -258700,9 +258934,9 @@ var require_jsx24 = __commonJS5({
     var shared_1 = tslib_1.__importStar(require_shared4());
     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"),
@@ -258758,9 +258992,9 @@ var require_type_annotations4 = __commonJS5({
     var types_1 = tslib_1.__importDefault(require_types4());
     var shared_1 = tslib_1.__importStar(require_shared4());
     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);
@@ -258793,9 +259027,9 @@ var require_flow24 = __commonJS5({
     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");
@@ -258907,10 +259141,10 @@ var require_esprima6 = __commonJS5({
     var shared_1 = tslib_1.__importStar(require_shared4());
     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")
@@ -258953,11 +259187,11 @@ var require_babel_core4 = __commonJS5({
     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"));
@@ -258982,7 +259216,7 @@ var require_babel_core4 = __commonJS5({
             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)
@@ -259083,8 +259317,8 @@ var require_babel4 = __commonJS5({
     var flow_1 = tslib_1.__importDefault(require_flow24());
     var shared_1 = require_shared4();
     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);
@@ -259108,12 +259342,12 @@ var require_typescript24 = __commonJS5({
     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;
         }
@@ -261061,8 +261295,8 @@ var require_util24 = __commonJS5({
     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_tslib4();
     var assert_1 = tslib_1.__importDefault(__require5("assert"));
-    var types17 = tslib_1.__importStar(require_main5());
-    var n2 = types17.namedTypes;
+    var types18 = tslib_1.__importStar(require_main5());
+    var n2 = types18.namedTypes;
     var source_map_1 = tslib_1.__importDefault(require_source_map4());
     var SourceMapConsumer = source_map_1.default.SourceMapConsumer;
     var SourceMapGenerator = source_map_1.default.SourceMapGenerator;
@@ -268368,10 +268602,10 @@ var require_comments4 = __commonJS5({
     exports.printComments = exports.attach = void 0;
     var tslib_1 = require_tslib4();
     var assert_1 = tslib_1.__importDefault(__require5("assert"));
-    var types17 = tslib_1.__importStar(require_main5());
-    var n2 = types17.namedTypes;
-    var isArray2 = types17.builtInTypes.array;
-    var isObject2 = types17.builtInTypes.object;
+    var types18 = tslib_1.__importStar(require_main5());
+    var n2 = types18.namedTypes;
+    var isArray2 = types18.builtInTypes.array;
+    var isObject2 = types18.builtInTypes.object;
     var lines_1 = require_lines4();
     var util_1 = require_util24();
     var childNodesCache = /* @__PURE__ */ new WeakMap();
@@ -268402,7 +268636,7 @@ var require_comments4 = __commonJS5({
       if (isArray2.check(node)) {
         names = Object.keys(node);
       } else if (isObject2.check(node)) {
-        names = types17.getFieldNames(node);
+        names = types18.getFieldNames(node);
       } else {
         return resultArray;
       }
@@ -268580,7 +268814,7 @@ var require_comments4 = __commonJS5({
     function printComments(path32, print132) {
       var value = path32.getValue();
       var innerLines = print132(path32);
-      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;
       }
@@ -268588,8 +268822,8 @@ var require_comments4 = __commonJS5({
       var trailingParts = [innerLines];
       path32.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) {
@@ -268609,10 +268843,10 @@ var require_parser4 = __commonJS5({
     exports.parse = void 0;
     var tslib_1 = require_tslib4();
     var assert_1 = tslib_1.__importDefault(__require5("assert"));
-    var types17 = tslib_1.__importStar(require_main5());
-    var b2 = types17.builders;
-    var isObject2 = types17.builtInTypes.object;
-    var isArray2 = types17.builtInTypes.array;
+    var types18 = tslib_1.__importStar(require_main5());
+    var b2 = types18.builders;
+    var isObject2 = types18.builtInTypes.object;
+    var isArray2 = types18.builtInTypes.array;
     var options_1 = require_options4();
     var lines_1 = require_lines4();
     var comments_1 = require_comments4();
@@ -268796,11 +269030,11 @@ var require_fast_path4 = __commonJS5({
     Object.defineProperty(exports, "__esModule", { value: true });
     var tslib_1 = require_tslib4();
     var assert_1 = tslib_1.__importDefault(__require5("assert"));
-    var types17 = tslib_1.__importStar(require_main5());
+    var types18 = tslib_1.__importStar(require_main5());
     var util = tslib_1.__importStar(require_util24());
-    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 = {};
     [
       ["??"],
@@ -268829,7 +269063,7 @@ var require_fast_path4 = __commonJS5({
       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)
@@ -269140,7 +269374,7 @@ var require_fast_path4 = __commonJS5({
         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);
         });
       }
@@ -269228,16 +269462,16 @@ var require_patcher4 = __commonJS5({
     var tslib_1 = require_tslib4();
     var assert_1 = tslib_1.__importDefault(__require5("assert"));
     var linesModule = tslib_1.__importStar(require_lines4());
-    var types17 = tslib_1.__importStar(require_main5());
-    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_main5());
+    var Printable = types18.namedTypes.Printable;
+    var Expression = types18.namedTypes.Expression;
+    var ReturnStatement = types18.namedTypes.ReturnStatement;
+    var SourceLocation3 = types18.namedTypes.SourceLocation;
     var util_1 = require_util24();
     var fast_path_1 = tslib_1.__importDefault(require_fast_path4());
-    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);
@@ -269507,8 +269741,8 @@ var require_patcher4 = __commonJS5({
         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;
@@ -269530,16 +269764,16 @@ var require_printer4 = __commonJS5({
     exports.Printer = void 0;
     var tslib_1 = require_tslib4();
     var assert_1 = tslib_1.__importDefault(__require5("assert"));
-    var types17 = tslib_1.__importStar(require_main5());
+    var types18 = tslib_1.__importStar(require_main5());
     var comments_1 = require_comments4();
     var fast_path_1 = tslib_1.__importDefault(require_fast_path4());
     var lines_1 = require_lines4();
     var options_1 = require_options4();
     var patcher_1 = require_patcher4();
     var util = tslib_1.__importStar(require_util24());
-    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);
@@ -269701,7 +269935,7 @@ var require_printer4 = __commonJS5({
         case "OptionalMemberExpression": {
           parts.push(path32.call(print132, "object"));
           var property = path32.call(print132, "property");
-          var optional = types17.getFieldValue(n2, "optional");
+          var optional = types18.getFieldValue(n2, "optional");
           if (n2.computed) {
             parts.push(optional ? "?.[" : "[", property, "]");
           } else {
@@ -269972,7 +270206,7 @@ var require_printer4 = __commonJS5({
           if (n2.typeArguments) {
             parts.push(path32.call(print132, "typeArguments"));
           }
-          if (types17.getFieldValue(n2, "optional")) {
+          if (types18.getFieldValue(n2, "optional")) {
             parts.push("?.");
           }
           parts.push(printArgumentsList(path32, options, print132));
@@ -271651,8 +271885,8 @@ var require_printer4 = __commonJS5({
       });
     }
     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;
       }
@@ -271698,8 +271932,8 @@ var require_main24 = __commonJS5({
     exports.run = exports.prettyPrint = exports.print = exports.visit = exports.types = exports.parse = void 0;
     var tslib_1 = require_tslib4();
     var fs_1 = tslib_1.__importDefault(__require5("fs"));
-    var types17 = tslib_1.__importStar(require_main5());
-    exports.types = types17;
+    var types18 = tslib_1.__importStar(require_main5());
+    exports.types = types18;
     var parser_1 = require_parser4();
     Object.defineProperty(exports, "parse", { enumerable: true, get: function() {
       return parser_1.parse;
@@ -272359,7 +272593,7 @@ var printDocASTReducer4 = {
     leave: ({ name, interfaces, directives, fields }) => join5(["interface", name, wrap4("implements ", join5(interfaces, " & ")), join5(directives, " "), block4(fields)], " ")
   },
   UnionTypeDefinition: {
-    leave: ({ name, directives, types: types17 }) => join5(["union", name, join5(directives, " "), wrap4("= ", join5(types17, " | "))], " ")
+    leave: ({ name, directives, types: types18 }) => join5(["union", name, join5(directives, " "), wrap4("= ", join5(types18, " | "))], " ")
   },
   EnumTypeDefinition: {
     leave: ({ name, directives, values }) => join5(["enum", name, join5(directives, " "), block4(values)], " ")
@@ -272386,7 +272620,7 @@ var printDocASTReducer4 = {
     leave: ({ name, interfaces, directives, fields }) => join5(["extend interface", name, wrap4("implements ", join5(interfaces, " & ")), join5(directives, " "), block4(fields)], " ")
   },
   UnionTypeExtension: {
-    leave: ({ name, directives, types: types17 }) => join5(["extend union", name, join5(directives, " "), wrap4("= ", join5(types17, " | "))], " ")
+    leave: ({ name, directives, types: types18 }) => join5(["extend union", name, join5(directives, " "), wrap4("= ", join5(types18, " | "))], " ")
   },
   EnumTypeExtension: {
     leave: ({ name, directives, values }) => join5(["extend enum", name, join5(directives, " "), block4(values)], " ")
@@ -273801,7 +274035,18 @@ var ListManager4 = 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 ListCollection4(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;
@@ -273923,6 +274168,9 @@ var List4 = 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);
   }
@@ -275067,8 +275315,8 @@ var Cache4 = 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?`
@@ -275483,6 +275731,7 @@ var CacheInternal4 = class {
           });
         }
       }
+      const processedOperations = /* @__PURE__ */ new Set();
       for (const operation of operations || []) {
         let parentID;
         if (operation.parentID) {
@@ -275502,7 +275751,12 @@ var CacheInternal4 = 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,
@@ -275510,7 +275764,12 @@ var CacheInternal4 = 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,
@@ -275518,7 +275777,12 @@ var CacheInternal4 = 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) {
@@ -275530,6 +275794,16 @@ var CacheInternal4 = 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;
@@ -275995,6 +276269,46 @@ var { keys: keys3 } = Object;
 var recast43 = __toESM5(require_main24(), 1);
 var AST43 = recast43.types.builders;
 var pageInfoSelection3 = [
+  {
+    kind: graphql133.Kind.FIELD,
+    name: {
+      kind: graphql133.Kind.NAME,
+      value: "pageInfo"
+    },
+    selectionSet: {
+      kind: graphql133.Kind.SELECTION_SET,
+      selections: [
+        {
+          kind: graphql133.Kind.FIELD,
+          name: {
+            kind: graphql133.Kind.NAME,
+            value: "hasPreviousPage"
+          }
+        },
+        {
+          kind: graphql133.Kind.FIELD,
+          name: {
+            kind: graphql133.Kind.NAME,
+            value: "hasNextPage"
+          }
+        },
+        {
+          kind: graphql133.Kind.FIELD,
+          name: {
+            kind: graphql133.Kind.NAME,
+            value: "startCursor"
+          }
+        },
+        {
+          kind: graphql133.Kind.FIELD,
+          name: {
+            kind: graphql133.Kind.NAME,
+            value: "endCursor"
+          }
+        }
+      ]
+    }
+  },
   {
     kind: graphql133.Kind.FIELD,
     name: {
@@ -276265,7 +276579,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)], " ")
@@ -276304,7 +276618,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)], " ")
@@ -276341,6 +276655,8 @@ For more information, please visit these links:
 - https://graphql.org/learn/global-object-identification/
 - ${siteURL3}/guides/caching-data#custom-ids
 `;
+var recast142 = __toESM5(require_main24(), 1);
+var AST142 = recast142.types.builders;
 function find_insert_index(script) {
   let insert_index = script.body.findIndex((statement) => {
     return statement.type !== "ImportDeclaration";
@@ -276359,7 +276675,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;
@@ -276378,7 +276694,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;
@@ -276390,10 +276709,10 @@ function find_exported_fn(body, name) {
   if (!exported) {
     return null;
   }
-  return exported.declaration;
+  return { declaration: exported.declaration, export: exported };
 }
-var recast142 = __toESM5(require_main24(), 1);
-var AST142 = recast142.types.builders;
+var recast152 = __toESM5(require_main24(), 1);
+var AST152 = recast152.types.builders;
 function ensure_imports({
   config: config2,
   script,
@@ -276409,13 +276728,13 @@ function ensure_imports({
     if (!has_import) {
       script.body.unshift({
         type: "ImportDeclaration",
-        source: AST142.stringLiteral(sourceModule),
+        source: AST152.stringLiteral(sourceModule),
         importKind
       });
     }
     return { ids: [], added: has_import ? 0 : 1 };
   }
-  const idList = (Array.isArray(importID) ? importID : [importID]).map((id2) => AST142.identifier(id2));
+  const idList = (Array.isArray(importID) ? importID : [importID]).map((id2) => AST152.identifier(id2));
   const toImport = idList.filter(
     (identifier) => !script.body.find(
       (statement) => statement.type === "ImportDeclaration" && statement.specifiers?.find(
@@ -276426,16 +276745,16 @@ function ensure_imports({
   if (toImport.length > 0) {
     script.body.unshift({
       type: "ImportDeclaration",
-      source: AST142.stringLiteral(sourceModule),
+      source: AST152.stringLiteral(sourceModule),
       specifiers: toImport.map(
-        (identifier, i22) => !Array.isArray(importID) ? AST142.importDefaultSpecifier(identifier) : AST142.importSpecifier(identifier, as?.[i22] ? AST142.identifier(as[i22]) : identifier)
+        (identifier, i22) => !Array.isArray(importID) ? AST152.importDefaultSpecifier(identifier) : AST152.importSpecifier(identifier, as?.[i22] ? AST152.identifier(as[i22]) : identifier)
       ),
       importKind
     });
   }
   for (const [i22, target] of (as ?? []).entries()) {
     if (target) {
-      idList[i22] = AST142.identifier(target);
+      idList[i22] = AST152.identifier(target);
     }
   }
   return {
@@ -294267,7 +294586,7 @@ 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 />";
 
@@ -295032,24 +295351,28 @@ function add_load_return(page, properties) {
     } else {
       return_statement = AST20.returnStatement(AST20.objectExpression([]));
       body.body.push(return_statement);
-      return_statement_index = body.body.length - 1;
     }
-    const local_return_var = AST20.identifier("__houdini__vite__plugin__return__value__");
-    body.body[return_statement_index] = AST20.variableDeclaration("const", [
-      AST20.variableDeclarator(local_return_var, return_statement.argument)
-    ]);
-    body.body.splice(
-      return_statement_index + 1,
-      0,
-      AST20.returnStatement(
-        AST20.objectExpression([...properties(event_id), AST20.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 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") {
@@ -295058,7 +295381,7 @@ function modify_load(page, cb) {
       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) {
@@ -295074,6 +295397,30 @@ function modify_load(page, cb) {
       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);
@@ -295091,7 +295438,7 @@ function modify_load(page, cb) {
       );
     }
   }
-  cb(body, event_id);
+  load_fn.body = cb(body, event_id);
 }
 
 // src/plugin/transforms/kit/index.ts