houdini 1.2.44 → 1.2.45

package/build/lib-cjs/index.js

@@ -13560,14 +13560,14 @@ var require_lib3 = __commonJS({
         this.preserveSpace = !!preserveSpace;
       }
     };
-    var types4 = {
+    var types5 = {
       brace: new TokContext("{"),
       j_oTag: new TokContext("<tag"),
       j_cTag: new TokContext("</tag"),
       j_expr: new TokContext("<tag>...</tag>", true)
     };
     {
-      types4.template = new TokContext("`", true);
+      types5.template = new TokContext("`", true);
     }
     var beforeExpr = true;
     var startsExpr = true;
@@ -14105,17 +14105,17 @@ var require_lib3 = __commonJS({
         context.pop();
       };
       tokenTypes[5].updateContext = tokenTypes[7].updateContext = tokenTypes[23].updateContext = (context) => {
-        context.push(types4.brace);
+        context.push(types5.brace);
       };
       tokenTypes[22].updateContext = (context) => {
-        if (context[context.length - 1] === types4.template) {
+        if (context[context.length - 1] === types5.template) {
           context.pop();
         } else {
-          context.push(types4.template);
+          context.push(types5.template);
         }
       };
       tokenTypes[142].updateContext = (context) => {
-        context.push(types4.j_expr, types4.j_oTag);
+        context.push(types5.j_expr, types5.j_oTag);
       };
     }
     var nonASCIIidentifierStartChars = "\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";
@@ -14675,7 +14675,7 @@ var require_lib3 = __commonJS({
         this.end = 0;
         this.lastTokEndLoc = null;
         this.lastTokStartLoc = null;
-        this.context = [types4.brace];
+        this.context = [types5.brace];
         this.firstInvalidTemplateEscapePos = null;
         this.strictErrors = /* @__PURE__ */ new Map();
         this.tokensLength = 0;
@@ -18502,7 +18502,7 @@ var require_lib3 = __commonJS({
             context
           } = this.state;
           const currentContext = context[context.length - 1];
-          if (currentContext === types4.j_oTag || currentContext === types4.j_expr) {
+          if (currentContext === types5.j_oTag || currentContext === types5.j_expr) {
             context.pop();
           }
         }
@@ -19524,9 +19524,9 @@ var require_lib3 = __commonJS({
         switch (this.state.type) {
           case 5:
             node = this.startNode();
-            this.setContext(types4.brace);
+            this.setContext(types5.brace);
             this.next();
-            node = this.jsxParseExpressionContainer(node, types4.j_oTag);
+            node = this.jsxParseExpressionContainer(node, types5.j_oTag);
             if (node.expression.type === "JSXEmptyExpression") {
               this.raise(JsxErrors.AttributeIsEmpty, node);
             }
@@ -19545,7 +19545,7 @@ var require_lib3 = __commonJS({
       jsxParseSpreadChild(node) {
         this.next();
         node.expression = this.parseExpression();
-        this.setContext(types4.j_expr);
+        this.setContext(types5.j_expr);
         this.state.canStartJSXElement = true;
         this.expect(8);
         return this.finishNode(node, "JSXSpreadChild");
@@ -19565,11 +19565,11 @@ var require_lib3 = __commonJS({
       jsxParseAttribute() {
         const node = this.startNode();
         if (this.match(5)) {
-          this.setContext(types4.brace);
+          this.setContext(types5.brace);
           this.next();
           this.expect(21);
           node.argument = this.parseMaybeAssignAllowIn();
-          this.setContext(types4.j_oTag);
+          this.setContext(types5.j_oTag);
           this.state.canStartJSXElement = true;
           this.expect(8);
           return this.finishNode(node, "JSXSpreadAttribute");
@@ -19628,12 +19628,12 @@ var require_lib3 = __commonJS({
                   break;
                 case 5: {
                   const node2 = this.startNode();
-                  this.setContext(types4.brace);
+                  this.setContext(types5.brace);
                   this.next();
                   if (this.match(21)) {
                     children.push(this.jsxParseSpreadChild(node2));
                   } else {
-                    children.push(this.jsxParseExpressionContainer(node2, types4.j_expr));
+                    children.push(this.jsxParseExpressionContainer(node2, types5.j_expr));
                   }
                   break;
                 }
@@ -19698,11 +19698,11 @@ var require_lib3 = __commonJS({
       }
       getTokenFromCode(code2) {
         const context = this.curContext();
-        if (context === types4.j_expr) {
+        if (context === types5.j_expr) {
           this.jsxReadToken();
           return;
         }
-        if (context === types4.j_oTag || context === types4.j_cTag) {
+        if (context === types5.j_oTag || context === types5.j_cTag) {
           if (isIdentifierStart(code2)) {
             this.jsxReadWord();
             return;
@@ -19712,7 +19712,7 @@ var require_lib3 = __commonJS({
             this.finishToken(143);
             return;
           }
-          if ((code2 === 34 || code2 === 39) && context === types4.j_oTag) {
+          if ((code2 === 34 || code2 === 39) && context === types5.j_oTag) {
             this.jsxReadString(code2);
             return;
           }
@@ -19730,17 +19730,17 @@ var require_lib3 = __commonJS({
           type
         } = this.state;
         if (type === 56 && prevType === 142) {
-          context.splice(-2, 2, types4.j_cTag);
+          context.splice(-2, 2, types5.j_cTag);
           this.state.canStartJSXElement = false;
         } else if (type === 142) {
-          context.push(types4.j_oTag);
+          context.push(types5.j_oTag);
         } else if (type === 143) {
           const out = context[context.length - 1];
-          if (out === types4.j_oTag && prevType === 56 || out === types4.j_cTag) {
+          if (out === types5.j_oTag && prevType === 56 || out === types5.j_cTag) {
             context.pop();
-            this.state.canStartJSXElement = context[context.length - 1] === types4.j_expr;
+            this.state.canStartJSXElement = context[context.length - 1] === types5.j_expr;
           } else {
-            this.setContext(types4.j_expr);
+            this.setContext(types5.j_expr);
             this.state.canStartJSXElement = true;
           }
         } else {
@@ -21115,14 +21115,14 @@ var require_lib3 = __commonJS({
       tsParseUnionOrIntersectionType(kind, parseConstituentType, operator) {
         const node = this.startNode();
         const hasLeadingOperator = this.eat(operator);
-        const types5 = [];
+        const types6 = [];
         do {
-          types5.push(parseConstituentType());
+          types6.push(parseConstituentType());
         } while (this.eat(operator));
-        if (types5.length === 1 && !hasLeadingOperator) {
-          return types5[0];
+        if (types6.length === 1 && !hasLeadingOperator) {
+          return types6[0];
         }
-        node.types = types5;
+        node.types = types6;
         return this.finishNode(node, kind);
       }
       tsParseIntersectionTypeOrHigher() {
@@ -21686,7 +21686,7 @@ var require_lib3 = __commonJS({
         }));
         if (node.params.length === 0) {
           this.raise(TSErrors.EmptyTypeArguments, node);
-        } else if (!this.state.inType && this.curContext() === types4.brace) {
+        } else if (!this.state.inType && this.curContext() === types5.brace) {
           this.reScan_lt_gt();
         }
         this.expect(48);
@@ -22312,7 +22312,7 @@ var require_lib3 = __commonJS({
             context
           } = this.state;
           const currentContext = context[context.length - 1];
-          if (currentContext === types4.j_oTag || currentContext === types4.j_expr) {
+          if (currentContext === types5.j_oTag || currentContext === types5.j_expr) {
             context.pop();
           }
         }
@@ -27444,9 +27444,9 @@ var require_shared = __commonJS({
     var tslib_1 = require_tslib();
     var types_1 = tslib_1.__importDefault(require_types());
     function default_1(fork) {
-      var types4 = fork.use(types_1.default);
-      var Type = types4.Type;
-      var builtin = types4.builtInTypes;
+      var types5 = fork.use(types_1.default);
+      var Type = types5.Type;
+      var builtin = types5.builtInTypes;
       var isNumber = builtin.number;
       function geq(than) {
         return Type.from(function(value) {
@@ -27596,9 +27596,9 @@ var require_types = __commonJS({
     }(BaseType);
     var OrType = function(_super) {
       tslib_1.__extends(OrType2, _super);
-      function OrType2(types4) {
+      function OrType2(types5) {
         var _this = _super.call(this) || this;
-        _this.types = types4;
+        _this.types = types5;
         _this.kind = "OrType";
         return _this;
       }
@@ -27739,11 +27739,11 @@ var require_types = __commonJS({
     function typesPlugin(_fork) {
       var Type = {
         or: function() {
-          var types4 = [];
+          var types5 = [];
           for (var _i = 0; _i < arguments.length; _i++) {
-            types4[_i] = arguments[_i];
+            types5[_i] = arguments[_i];
           }
-          return new OrType(types4.map(function(type) {
+          return new OrType(types5.map(function(type) {
             return Type.from(type);
           }));
         },
@@ -28188,9 +28188,9 @@ var require_path2 = __commonJS({
     var Op = Object.prototype;
     var hasOwn = Op.hasOwnProperty;
     function pathPlugin(fork) {
-      var types4 = fork.use(types_1.default);
-      var isArray = types4.builtInTypes.array;
-      var isNumber = types4.builtInTypes.number;
+      var types5 = fork.use(types_1.default);
+      var isArray = types5.builtInTypes.array;
+      var isNumber = types5.builtInTypes.number;
       var Path = function Path2(value, parentPath, name) {
         if (!(this instanceof Path2)) {
           throw new Error("Path constructor cannot be invoked without 'new'");
@@ -28492,13 +28492,13 @@ var require_scope = __commonJS({
     var types_1 = tslib_1.__importDefault(require_types());
     var hasOwn = Object.prototype.hasOwnProperty;
     function scopePlugin(fork) {
-      var types4 = fork.use(types_1.default);
-      var Type = types4.Type;
-      var namedTypes = types4.namedTypes;
+      var types5 = fork.use(types_1.default);
+      var Type = types5.Type;
+      var namedTypes = types5.namedTypes;
       var Node = namedTypes.Node;
       var Expression = namedTypes.Expression;
-      var isArray = types4.builtInTypes.array;
-      var b = types4.builders;
+      var isArray = types5.builtInTypes.array;
+      var b = types5.builders;
       var Scope = function Scope2(path3, parentScope) {
         if (!(this instanceof Scope2)) {
           throw new Error("Scope constructor cannot be invoked without 'new'");
@@ -28561,7 +28561,7 @@ var require_scope = __commonJS({
           ++index;
         }
         var name = prefix + index;
-        return this.bindings[name] = types4.builders.identifier(name);
+        return this.bindings[name] = types5.builders.identifier(name);
       };
       Sp.injectTemporary = function(identifier, init) {
         identifier || (identifier = this.declareTemporary());
@@ -28637,7 +28637,7 @@ var require_scope = __commonJS({
             bindings
           );
         } else if (Node.check(node) && !Expression.check(node)) {
-          types4.eachField(node, function(name, child) {
+          types5.eachField(node, function(name, child) {
             var childPath = path3.get(name);
             if (!pathHasValue(childPath, child)) {
               throw new Error("");
@@ -28715,24 +28715,24 @@ var require_scope = __commonJS({
           addPattern(patternPath.get("argument"), bindings);
         }
       }
-      function addTypePattern(patternPath, types5) {
+      function addTypePattern(patternPath, types6) {
         var pattern = patternPath.value;
         namedTypes.Pattern.assert(pattern);
         if (namedTypes.Identifier.check(pattern)) {
-          if (hasOwn.call(types5, pattern.name)) {
-            types5[pattern.name].push(patternPath);
+          if (hasOwn.call(types6, pattern.name)) {
+            types6[pattern.name].push(patternPath);
           } else {
-            types5[pattern.name] = [patternPath];
+            types6[pattern.name] = [patternPath];
           }
         }
       }
-      function addTypeParameter(parameterPath, types5) {
+      function addTypeParameter(parameterPath, types6) {
         var parameter = parameterPath.value;
         FlowOrTSTypeParameterType.assert(parameter);
-        if (hasOwn.call(types5, parameter.name)) {
-          types5[parameter.name].push(parameterPath);
+        if (hasOwn.call(types6, parameter.name)) {
+          types6[parameter.name].push(parameterPath);
         } else {
-          types5[parameter.name] = [parameterPath];
+          types6[parameter.name] = [parameterPath];
         }
       }
       Sp.lookup = function(name) {
@@ -28773,11 +28773,11 @@ var require_node_path = __commonJS({
     var scope_1 = tslib_1.__importDefault(require_scope());
     var shared_1 = require_shared();
     function nodePathPlugin(fork) {
-      var types4 = fork.use(types_1.default);
-      var n = types4.namedTypes;
-      var b = types4.builders;
-      var isNumber = types4.builtInTypes.number;
-      var isArray = types4.builtInTypes.array;
+      var types5 = fork.use(types_1.default);
+      var n = types5.namedTypes;
+      var b = types5.builders;
+      var isNumber = types5.builtInTypes.number;
+      var isArray = types5.builtInTypes.array;
       var Path = fork.use(path_1.default);
       var Scope = fork.use(scope_1.default);
       var NodePath = function NodePath2(value, parentPath, name) {
@@ -28868,7 +28868,7 @@ var require_node_path = __commonJS({
         return scope || null;
       };
       NPp.getValueProperty = function(name) {
-        return types4.getFieldValue(this.value, name);
+        return types5.getFieldValue(this.value, name);
       };
       NPp.needsParens = function(assumeExpressionContext) {
         var pp = this.parentPath;
@@ -29010,7 +29010,7 @@ var require_node_path = __commonJS({
           return node.some(containsCallExpression);
         }
         if (n.Node.check(node)) {
-          return types4.someField(node, function(_name, child) {
+          return types5.someField(node, function(_name, child) {
             return containsCallExpression(child);
           });
         }
@@ -29131,11 +29131,11 @@ var require_path_visitor = __commonJS({
     var shared_1 = require_shared();
     var hasOwn = Object.prototype.hasOwnProperty;
     function pathVisitorPlugin(fork) {
-      var types4 = fork.use(types_1.default);
+      var types5 = fork.use(types_1.default);
       var NodePath = fork.use(node_path_1.default);
-      var isArray = types4.builtInTypes.array;
-      var isObject2 = types4.builtInTypes.object;
-      var isFunction = types4.builtInTypes.function;
+      var isArray = types5.builtInTypes.array;
+      var isObject2 = types5.builtInTypes.object;
+      var isFunction = types5.builtInTypes.function;
       var undefined2;
       var PathVisitor = function PathVisitor2() {
         if (!(this instanceof PathVisitor2)) {
@@ -29155,7 +29155,7 @@ var require_path_visitor = __commonJS({
             typeNames[methodName.slice("visit".length)] = true;
           }
         }
-        var supertypeTable = types4.computeSupertypeLookupTable(typeNames);
+        var supertypeTable = types5.computeSupertypeLookupTable(typeNames);
         var methodNameTable = /* @__PURE__ */ Object.create(null);
         var typeNameKeys = Object.keys(supertypeTable);
         var typeNameCount = typeNameKeys.length;
@@ -29274,7 +29274,7 @@ var require_path_visitor = __commonJS({
           path3.each(visitor.visitWithoutReset, visitor);
         } else if (!isObject2.check(value)) {
         } else {
-          var childNames = types4.getFieldNames(value);
+          var childNames = types5.getFieldNames(value);
           if (visitor._shouldVisitComments && value.comments && childNames.indexOf("comments") < 0) {
             childNames.push("comments");
           }
@@ -29283,7 +29283,7 @@ var require_path_visitor = __commonJS({
           for (var i2 = 0; i2 < childCount; ++i2) {
             var childName = childNames[i2];
             if (!hasOwn.call(value, childName)) {
-              value[childName] = types4.getFieldValue(value, childName);
+              value[childName] = types5.getFieldValue(value, childName);
             }
             childPaths.push(path3.get(childName));
           }
@@ -29426,13 +29426,13 @@ var require_equiv = __commonJS({
     var shared_1 = require_shared();
     var types_1 = tslib_1.__importDefault(require_types());
     function default_1(fork) {
-      var types4 = fork.use(types_1.default);
-      var getFieldNames = types4.getFieldNames;
-      var getFieldValue = types4.getFieldValue;
-      var isArray = types4.builtInTypes.array;
-      var isObject2 = types4.builtInTypes.object;
-      var isDate = types4.builtInTypes.Date;
-      var isRegExp = types4.builtInTypes.RegExp;
+      var types5 = fork.use(types_1.default);
+      var getFieldNames = types5.getFieldNames;
+      var getFieldValue = types5.getFieldValue;
+      var isArray = types5.builtInTypes.array;
+      var isObject2 = types5.builtInTypes.object;
+      var isDate = types5.builtInTypes.Date;
+      var isRegExp = types5.builtInTypes.RegExp;
       var hasOwn = Object.prototype.hasOwnProperty;
       function astNodesAreEquivalent(a, b, problemPath) {
         if (isArray.check(problemPath)) {
@@ -29585,24 +29585,24 @@ var require_fork = __commonJS({
     var shared_1 = require_shared();
     function default_1(plugins2) {
       var fork = createFork();
-      var types4 = fork.use(types_1.default);
+      var types5 = fork.use(types_1.default);
       plugins2.forEach(fork.use);
-      types4.finalize();
+      types5.finalize();
       var PathVisitor = fork.use(path_visitor_1.default);
       return {
-        Type: types4.Type,
-        builtInTypes: types4.builtInTypes,
-        namedTypes: types4.namedTypes,
-        builders: types4.builders,
-        defineMethod: types4.defineMethod,
-        getFieldNames: types4.getFieldNames,
-        getFieldValue: types4.getFieldValue,
-        eachField: types4.eachField,
-        someField: types4.someField,
-        getSupertypeNames: types4.getSupertypeNames,
-        getBuilderName: types4.getBuilderName,
+        Type: types5.Type,
+        builtInTypes: types5.builtInTypes,
+        namedTypes: types5.namedTypes,
+        builders: types5.builders,
+        defineMethod: types5.defineMethod,
+        getFieldNames: types5.getFieldNames,
+        getFieldValue: types5.getFieldValue,
+        eachField: types5.eachField,
+        someField: types5.someField,
+        getSupertypeNames: types5.getSupertypeNames,
+        getBuilderName: types5.getBuilderName,
         astNodesAreEquivalent: fork.use(equiv_1.default),
-        finalize: types4.finalize,
+        finalize: types5.finalize,
         Path: fork.use(path_1.default),
         NodePath: fork.use(node_path_1.default),
         PathVisitor,
@@ -29772,8 +29772,8 @@ var require_core2 = __commonJS({
     var types_1 = tslib_1.__importDefault(require_types());
     var shared_1 = tslib_1.__importStar(require_shared());
     function default_1(fork) {
-      var types4 = fork.use(types_1.default);
-      var Type = types4.Type;
+      var types5 = fork.use(types_1.default);
+      var Type = types5.Type;
       var def = Type.def;
       var or = Type.or;
       var shared = fork.use(shared_1.default);
@@ -29865,9 +29865,9 @@ var require_es6 = __commonJS({
     var shared_1 = tslib_1.__importStar(require_shared());
     function default_1(fork) {
       fork.use(core_1.default);
-      var types4 = fork.use(types_1.default);
-      var def = types4.Type.def;
-      var or = types4.Type.or;
+      var types5 = fork.use(types_1.default);
+      var def = types5.Type.def;
+      var or = types5.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(
@@ -29957,8 +29957,8 @@ var require_es2017 = __commonJS({
     var shared_1 = tslib_1.__importStar(require_shared());
     function default_1(fork) {
       fork.use(es2016_1.default);
-      var types4 = fork.use(types_1.default);
-      var def = types4.Type.def;
+      var types5 = fork.use(types_1.default);
+      var def = types5.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"));
@@ -29981,9 +29981,9 @@ var require_es2018 = __commonJS({
     var shared_1 = tslib_1.__importStar(require_shared());
     function default_1(fork) {
       fork.use(es2017_1.default);
-      var types4 = fork.use(types_1.default);
-      var def = types4.Type.def;
-      var or = types4.Type.or;
+      var types5 = fork.use(types_1.default);
+      var def = types5.Type.def;
+      var or = types5.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"));
@@ -30014,9 +30014,9 @@ var require_es2019 = __commonJS({
     var shared_1 = tslib_1.__importStar(require_shared());
     function default_1(fork) {
       fork.use(es2018_1.default);
-      var types4 = fork.use(types_1.default);
-      var def = types4.Type.def;
-      var or = types4.Type.or;
+      var types5 = fork.use(types_1.default);
+      var def = types5.Type.def;
+      var or = types5.Type.or;
       var defaults = fork.use(shared_1.default).defaults;
       def("CatchClause").field("param", or(def("Pattern"), null), defaults["null"]);
     }
@@ -30040,9 +30040,9 @@ var require_es20202 = __commonJS({
     function default_1(fork) {
       fork.use(es2020_1.default);
       fork.use(es2019_1.default);
-      var types4 = fork.use(types_1.default);
-      var def = types4.Type.def;
-      var or = types4.Type.or;
+      var types5 = fork.use(types_1.default);
+      var def = types5.Type.def;
+      var or = types5.Type.or;
       var shared = fork.use(shared_1.default);
       var defaults = shared.defaults;
       def("ImportExpression").bases("Expression").build("source").field("source", def("Expression"));
@@ -30092,8 +30092,8 @@ var require_es2022 = __commonJS({
     var shared_1 = require_shared();
     function default_1(fork) {
       fork.use(es2021_1.default);
-      var types4 = fork.use(types_1.default);
-      var def = types4.Type.def;
+      var types5 = fork.use(types_1.default);
+      var def = types5.Type.def;
       def("StaticBlock").bases("Declaration").build("body").field("body", [def("Statement")]);
     }
     exports.default = default_1;
@@ -30114,9 +30114,9 @@ var require_es_proposals = __commonJS({
     var es2022_1 = tslib_1.__importDefault(require_es2022());
     function default_1(fork) {
       fork.use(es2022_1.default);
-      var types4 = fork.use(types_1.default);
-      var Type = types4.Type;
-      var def = types4.Type.def;
+      var types5 = fork.use(types_1.default);
+      var Type = types5.Type;
+      var def = types5.Type.def;
       var or = Type.or;
       var shared = fork.use(shared_1.default);
       var defaults = shared.defaults;
@@ -30156,9 +30156,9 @@ var require_jsx = __commonJS({
     var shared_1 = tslib_1.__importStar(require_shared());
     function default_1(fork) {
       fork.use(es_proposals_1.default);
-      var types4 = fork.use(types_1.default);
-      var def = types4.Type.def;
-      var or = types4.Type.or;
+      var types5 = fork.use(types_1.default);
+      var def = types5.Type.def;
+      var or = types5.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"),
@@ -30216,9 +30216,9 @@ var require_type_annotations = __commonJS({
     var types_1 = tslib_1.__importDefault(require_types());
     var shared_1 = tslib_1.__importStar(require_shared());
     function default_1(fork) {
-      var types4 = fork.use(types_1.default);
-      var def = types4.Type.def;
-      var or = types4.Type.or;
+      var types5 = fork.use(types_1.default);
+      var def = types5.Type.def;
+      var or = types5.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);
@@ -30253,9 +30253,9 @@ var require_flow = __commonJS({
     function default_1(fork) {
       fork.use(es_proposals_1.default);
       fork.use(type_annotations_1.default);
-      var types4 = fork.use(types_1.default);
-      var def = types4.Type.def;
-      var or = types4.Type.or;
+      var types5 = fork.use(types_1.default);
+      var def = types5.Type.def;
+      var or = types5.Type.or;
       var defaults = fork.use(shared_1.default).defaults;
       def("Flow").bases("Node");
       def("FlowType").bases("Flow");
@@ -30369,10 +30369,10 @@ var require_esprima = __commonJS({
     var shared_1 = tslib_1.__importStar(require_shared());
     function default_1(fork) {
       fork.use(es_proposals_1.default);
-      var types4 = fork.use(types_1.default);
+      var types5 = fork.use(types_1.default);
       var defaults = fork.use(shared_1.default).defaults;
-      var def = types4.Type.def;
-      var or = types4.Type.or;
+      var def = types5.Type.def;
+      var or = types5.Type.or;
       def("VariableDeclaration").field("declarations", [or(
         def("VariableDeclarator"),
         def("Identifier")
@@ -30417,11 +30417,11 @@ var require_babel_core = __commonJS({
     function default_1(fork) {
       var _a, _b, _c, _d, _e;
       fork.use(es_proposals_1.default);
-      var types4 = fork.use(types_1.default);
+      var types5 = fork.use(types_1.default);
       var defaults = fork.use(shared_1.default).defaults;
-      var def = types4.Type.def;
-      var or = types4.Type.or;
-      var isUndefined = types4.builtInTypes.undefined;
+      var def = types5.Type.def;
+      var or = types5.Type.or;
+      var isUndefined = types5.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"));
@@ -30446,7 +30446,7 @@ var require_babel_core = __commonJS({
             raw: String
           },
           function getDefault() {
-            var value = types4.getFieldValue(this, "value");
+            var value = types5.getFieldValue(this, "value");
             return {
               rawValue: value,
               raw: toRaw ? toRaw(value) : String(value)
@@ -30549,8 +30549,8 @@ var require_babel = __commonJS({
     var flow_1 = tslib_1.__importDefault(require_flow());
     var shared_1 = require_shared();
     function default_1(fork) {
-      var types4 = fork.use(types_1.default);
-      var def = types4.Type.def;
+      var types5 = fork.use(types_1.default);
+      var def = types5.Type.def;
       fork.use(babel_core_1.default);
       fork.use(flow_1.default);
       def("V8IntrinsicIdentifier").bases("Expression").build("name").field("name", String);
@@ -30576,12 +30576,12 @@ var require_typescript = __commonJS({
     function default_1(fork) {
       fork.use(babel_core_1.default);
       fork.use(type_annotations_1.default);
-      var types4 = fork.use(types_1.default);
-      var n = types4.namedTypes;
-      var def = types4.Type.def;
-      var or = types4.Type.or;
+      var types5 = fork.use(types_1.default);
+      var n = types5.namedTypes;
+      var def = types5.Type.def;
+      var or = types5.Type.or;
       var defaults = fork.use(shared_1.default).defaults;
-      var StringLiteral = types4.Type.from(function(value, deep) {
+      var StringLiteral = types5.Type.from(function(value, deep) {
         if (n.StringLiteral && n.StringLiteral.check(value, deep)) {
           return true;
         }
@@ -32557,8 +32557,8 @@ var require_util2 = __commonJS({
     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_tslib();
     var assert_1 = tslib_1.__importDefault(require("assert"));
-    var types4 = tslib_1.__importStar(require_main());
-    var n = types4.namedTypes;
+    var types5 = tslib_1.__importStar(require_main());
+    var n = types5.namedTypes;
     var source_map_1 = tslib_1.__importDefault(require_source_map());
     var SourceMapConsumer = source_map_1.default.SourceMapConsumer;
     var SourceMapGenerator = source_map_1.default.SourceMapGenerator;
@@ -39876,10 +39876,10 @@ var require_comments = __commonJS({
     exports.printComments = exports.attach = void 0;
     var tslib_1 = require_tslib();
     var assert_1 = tslib_1.__importDefault(require("assert"));
-    var types4 = tslib_1.__importStar(require_main());
-    var n = types4.namedTypes;
-    var isArray = types4.builtInTypes.array;
-    var isObject2 = types4.builtInTypes.object;
+    var types5 = tslib_1.__importStar(require_main());
+    var n = types5.namedTypes;
+    var isArray = types5.builtInTypes.array;
+    var isObject2 = types5.builtInTypes.object;
     var lines_1 = require_lines();
     var util_1 = require_util2();
     var childNodesCache = /* @__PURE__ */ new WeakMap();
@@ -39910,7 +39910,7 @@ var require_comments = __commonJS({
       if (isArray.check(node)) {
         names = Object.keys(node);
       } else if (isObject2.check(node)) {
-        names = types4.getFieldNames(node);
+        names = types5.getFieldNames(node);
       } else {
         return resultArray;
       }
@@ -40088,7 +40088,7 @@ var require_comments = __commonJS({
     function printComments(path3, print6) {
       var value = path3.getValue();
       var innerLines = print6(path3);
-      var comments = n.Node.check(value) && types4.getFieldValue(value, "comments");
+      var comments = n.Node.check(value) && types5.getFieldValue(value, "comments");
       if (!comments || comments.length === 0) {
         return innerLines;
       }
@@ -40096,8 +40096,8 @@ var require_comments = __commonJS({
       var trailingParts = [innerLines];
       path3.each(function(commentPath) {
         var comment = commentPath.getValue();
-        var leading = types4.getFieldValue(comment, "leading");
-        var trailing = types4.getFieldValue(comment, "trailing");
+        var leading = types5.getFieldValue(comment, "leading");
+        var trailing = types5.getFieldValue(comment, "trailing");
         if (leading || trailing && !(n.Statement.check(value) || comment.type === "Block" || comment.type === "CommentBlock")) {
           leadingParts.push(printLeadingComment(commentPath, print6));
         } else if (trailing) {
@@ -40119,10 +40119,10 @@ var require_parser = __commonJS({
     exports.parse = void 0;
     var tslib_1 = require_tslib();
     var assert_1 = tslib_1.__importDefault(require("assert"));
-    var types4 = tslib_1.__importStar(require_main());
-    var b = types4.builders;
-    var isObject2 = types4.builtInTypes.object;
-    var isArray = types4.builtInTypes.array;
+    var types5 = tslib_1.__importStar(require_main());
+    var b = types5.builders;
+    var isObject2 = types5.builtInTypes.object;
+    var isArray = types5.builtInTypes.array;
     var options_1 = require_options();
     var lines_1 = require_lines();
     var comments_1 = require_comments();
@@ -40308,11 +40308,11 @@ var require_fast_path = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     var tslib_1 = require_tslib();
     var assert_1 = tslib_1.__importDefault(require("assert"));
-    var types4 = tslib_1.__importStar(require_main());
+    var types5 = tslib_1.__importStar(require_main());
     var util = tslib_1.__importStar(require_util2());
-    var n = types4.namedTypes;
-    var isArray = types4.builtInTypes.array;
-    var isNumber = types4.builtInTypes.number;
+    var n = types5.namedTypes;
+    var isArray = types5.builtInTypes.array;
+    var isNumber = types5.builtInTypes.number;
     var PRECEDENCE = {};
     [
       ["??"],
@@ -40341,7 +40341,7 @@ var require_fast_path = __commonJS({
       if (obj instanceof FastPath) {
         return obj.copy();
       }
-      if (obj instanceof types4.NodePath) {
+      if (obj instanceof types5.NodePath) {
         var copy = Object.create(FastPath.prototype);
         var stack = [obj.value];
         for (var pp = void 0; pp = obj.parentPath; obj = pp)
@@ -40652,7 +40652,7 @@ var require_fast_path = __commonJS({
         return node.some(containsCallExpression);
       }
       if (n.Node.check(node)) {
-        return types4.someField(node, function(_name, child) {
+        return types5.someField(node, function(_name, child) {
           return containsCallExpression(child);
         });
       }
@@ -40742,16 +40742,16 @@ var require_patcher = __commonJS({
     var tslib_1 = require_tslib();
     var assert_1 = tslib_1.__importDefault(require("assert"));
     var linesModule = tslib_1.__importStar(require_lines());
-    var types4 = tslib_1.__importStar(require_main());
-    var Printable = types4.namedTypes.Printable;
-    var Expression = types4.namedTypes.Expression;
-    var ReturnStatement = types4.namedTypes.ReturnStatement;
-    var SourceLocation = types4.namedTypes.SourceLocation;
+    var types5 = tslib_1.__importStar(require_main());
+    var Printable = types5.namedTypes.Printable;
+    var Expression = types5.namedTypes.Expression;
+    var ReturnStatement = types5.namedTypes.ReturnStatement;
+    var SourceLocation = types5.namedTypes.SourceLocation;
     var util_1 = require_util2();
     var fast_path_1 = tslib_1.__importDefault(require_fast_path());
-    var isObject2 = types4.builtInTypes.object;
-    var isArray = types4.builtInTypes.array;
-    var isString = types4.builtInTypes.string;
+    var isObject2 = types5.builtInTypes.object;
+    var isArray = types5.builtInTypes.array;
+    var isString = types5.builtInTypes.string;
     var riskyAdjoiningCharExp = /[0-9a-z_$]/i;
     var Patcher = function Patcher2(lines) {
       assert_1.default.ok(this instanceof Patcher2);
@@ -41021,8 +41021,8 @@ var require_patcher = __commonJS({
         if (k.charAt(0) === "_") {
           continue;
         }
-        newPath.stack.push(k, types4.getFieldValue(newNode, k));
-        oldPath.stack.push(k, types4.getFieldValue(oldNode, k));
+        newPath.stack.push(k, types5.getFieldValue(newNode, k));
+        oldPath.stack.push(k, types5.getFieldValue(oldNode, k));
         var canReprint = findAnyReprints(newPath, oldPath, reprints);
         newPath.stack.length -= 2;
         oldPath.stack.length -= 2;
@@ -41046,16 +41046,16 @@ var require_printer = __commonJS({
     exports.Printer = void 0;
     var tslib_1 = require_tslib();
     var assert_1 = tslib_1.__importDefault(require("assert"));
-    var types4 = tslib_1.__importStar(require_main());
+    var types5 = tslib_1.__importStar(require_main());
     var comments_1 = require_comments();
     var fast_path_1 = tslib_1.__importDefault(require_fast_path());
     var lines_1 = require_lines();
     var options_1 = require_options();
     var patcher_1 = require_patcher();
     var util = tslib_1.__importStar(require_util2());
-    var namedTypes = types4.namedTypes;
-    var isString = types4.builtInTypes.string;
-    var isObject2 = types4.builtInTypes.object;
+    var namedTypes = types5.namedTypes;
+    var isString = types5.builtInTypes.string;
+    var isObject2 = types5.builtInTypes.object;
     var PrintResult = function PrintResult2(code, sourceMap) {
       assert_1.default.ok(this instanceof PrintResult2);
       isString.assert(code);
@@ -41217,7 +41217,7 @@ var require_printer = __commonJS({
         case "OptionalMemberExpression": {
           parts.push(path3.call(print6, "object"));
           var property = path3.call(print6, "property");
-          var optional = types4.getFieldValue(n, "optional");
+          var optional = types5.getFieldValue(n, "optional");
           if (n.computed) {
             parts.push(optional ? "?.[" : "[", property, "]");
           } else {
@@ -41488,7 +41488,7 @@ var require_printer = __commonJS({
           if (n.typeArguments) {
             parts.push(path3.call(print6, "typeArguments"));
           }
-          if (types4.getFieldValue(n, "optional")) {
+          if (types5.getFieldValue(n, "optional")) {
             parts.push("?.");
           }
           parts.push(printArgumentsList(path3, options, print6));
@@ -43167,8 +43167,8 @@ var require_printer = __commonJS({
       });
     }
     function getPossibleRaw(node) {
-      var value = types4.getFieldValue(node, "value");
-      var extra = types4.getFieldValue(node, "extra");
+      var value = types5.getFieldValue(node, "value");
+      var extra = types5.getFieldValue(node, "extra");
       if (extra && typeof extra.raw === "string" && value == extra.rawValue) {
         return extra.raw;
       }
@@ -43216,8 +43216,8 @@ var require_main2 = __commonJS({
     exports.run = exports.prettyPrint = exports.print = exports.visit = exports.types = exports.parse = void 0;
     var tslib_1 = require_tslib();
     var fs_1 = tslib_1.__importDefault(require("fs"));
-    var types4 = tslib_1.__importStar(require_main());
-    exports.types = types4;
+    var types5 = tslib_1.__importStar(require_main());
+    exports.types = types5;
     var parser_1 = require_parser();
     Object.defineProperty(exports, "parse", { enumerable: true, get: function() {
       return parser_1.parse;
@@ -47645,30 +47645,30 @@ var require_utils3 = __commonJS({
       validate2.oneOf = values;
       return validate2;
     }
-    function assertNodeType(...types4) {
+    function assertNodeType(...types5) {
       function validate2(node, key, val) {
-        for (const type of types4) {
+        for (const type of types5) {
           if ((0, _is.default)(type, val)) {
             (0, _validate.validateChild)(node, key, val);
             return;
           }
         }
-        throw new TypeError(`Property ${key} of ${node.type} expected node to be of a type ${JSON.stringify(types4)} but instead got ${JSON.stringify(val == null ? void 0 : val.type)}`);
+        throw new TypeError(`Property ${key} of ${node.type} expected node to be of a type ${JSON.stringify(types5)} but instead got ${JSON.stringify(val == null ? void 0 : val.type)}`);
       }
-      validate2.oneOfNodeTypes = types4;
+      validate2.oneOfNodeTypes = types5;
       return validate2;
     }
-    function assertNodeOrValueType(...types4) {
+    function assertNodeOrValueType(...types5) {
       function validate2(node, key, val) {
-        for (const type of types4) {
+        for (const type of types5) {
           if (getType(val) === type || (0, _is.default)(type, val)) {
             (0, _validate.validateChild)(node, key, val);
             return;
           }
         }
-        throw new TypeError(`Property ${key} of ${node.type} expected node to be of a type ${JSON.stringify(types4)} but instead got ${JSON.stringify(val == null ? void 0 : val.type)}`);
+        throw new TypeError(`Property ${key} of ${node.type} expected node to be of a type ${JSON.stringify(types5)} but instead got ${JSON.stringify(val == null ? void 0 : val.type)}`);
       }
-      validate2.oneOfNodeOrValueTypes = types4;
+      validate2.oneOfNodeOrValueTypes = types5;
       return validate2;
     }
     function assertValueType(type) {
@@ -51270,7 +51270,7 @@ var require_generated2 = __commonJS({
     exports.tSTypeParameterInstantiation = exports.tsTypeParameterInstantiation = tsTypeParameterInstantiation;
     exports.tSTypePredicate = exports.tsTypePredicate = tsTypePredicate;
     exports.tSTypeQuery = exports.tsTypeQuery = tsTypeQuery;
-    exports.tSTypeReference = exports.tsTypeReference = tsTypeReference;
+    exports.tSTypeReference = exports.tsTypeReference = tsTypeReference2;
     exports.tSUndefinedKeyword = exports.tsUndefinedKeyword = tsUndefinedKeyword;
     exports.tSUnionType = exports.tsUnionType = tsUnionType;
     exports.tSUnknownKeyword = exports.tsUnknownKeyword = tsUnknownKeyword;
@@ -52096,10 +52096,10 @@ var require_generated2 = __commonJS({
         body
       });
     }
-    function intersectionTypeAnnotation(types4) {
+    function intersectionTypeAnnotation(types5) {
       return (0, _validateNode.default)({
         type: "IntersectionTypeAnnotation",
-        types: types4
+        types: types5
       });
     }
     function mixedTypeAnnotation() {
@@ -52222,10 +52222,10 @@ var require_generated2 = __commonJS({
         type: "ThisTypeAnnotation"
       };
     }
-    function tupleTypeAnnotation(types4) {
+    function tupleTypeAnnotation(types5) {
       return (0, _validateNode.default)({
         type: "TupleTypeAnnotation",
-        types: types4
+        types: types5
       });
     }
     function typeofTypeAnnotation(argument) {
@@ -52276,10 +52276,10 @@ var require_generated2 = __commonJS({
         params
       });
     }
-    function unionTypeAnnotation(types4) {
+    function unionTypeAnnotation(types5) {
       return (0, _validateNode.default)({
         type: "UnionTypeAnnotation",
-        types: types4
+        types: types5
       });
     }
     function variance(kind) {
@@ -52732,7 +52732,7 @@ var require_generated2 = __commonJS({
         typeAnnotation: typeAnnotation2
       });
     }
-    function tsTypeReference(typeName, typeParameters = null) {
+    function tsTypeReference2(typeName, typeParameters = null) {
       return (0, _validateNode.default)({
         type: "TSTypeReference",
         typeName,
@@ -52792,16 +52792,16 @@ var require_generated2 = __commonJS({
         optional
       });
     }
-    function tsUnionType(types4) {
+    function tsUnionType(types5) {
       return (0, _validateNode.default)({
         type: "TSUnionType",
-        types: types4
+        types: types5
       });
     }
-    function tsIntersectionType(types4) {
+    function tsIntersectionType(types5) {
       return (0, _validateNode.default)({
         type: "TSIntersectionType",
-        types: types4
+        types: types5
       });
     }
     function tsConditionalType(checkType, extendsType, trueType, falseType) {
@@ -54416,12 +54416,12 @@ var require_removeTypeDuplicates = __commonJS({
       const generics = /* @__PURE__ */ new Map();
       const bases = /* @__PURE__ */ new Map();
       const typeGroups = /* @__PURE__ */ new Set();
-      const types4 = [];
+      const types5 = [];
       for (let i2 = 0; i2 < nodes.length; i2++) {
         const node = nodes[i2];
         if (!node)
           continue;
-        if (types4.indexOf(node) >= 0) {
+        if (types5.indexOf(node) >= 0) {
           continue;
         }
         if ((0, _generated.isAnyTypeAnnotation)(node)) {
@@ -54455,15 +54455,15 @@ var require_removeTypeDuplicates = __commonJS({
           }
           continue;
         }
-        types4.push(node);
+        types5.push(node);
       }
       for (const [, baseType] of bases) {
-        types4.push(baseType);
+        types5.push(baseType);
       }
       for (const [, genericName] of generics) {
-        types4.push(genericName);
+        types5.push(genericName);
       }
-      return types4;
+      return types5;
     }
   }
 });
@@ -54478,8 +54478,8 @@ var require_createFlowUnionType = __commonJS({
     exports.default = createFlowUnionType;
     var _generated = require_generated2();
     var _removeTypeDuplicates = require_removeTypeDuplicates();
-    function createFlowUnionType(types4) {
-      const flattened = (0, _removeTypeDuplicates.default)(types4);
+    function createFlowUnionType(types5) {
+      const flattened = (0, _removeTypeDuplicates.default)(types5);
       if (flattened.length === 1) {
         return flattened[0];
       } else {
@@ -54506,12 +54506,12 @@ var require_removeTypeDuplicates2 = __commonJS({
       const generics = /* @__PURE__ */ new Map();
       const bases = /* @__PURE__ */ new Map();
       const typeGroups = /* @__PURE__ */ new Set();
-      const types4 = [];
+      const types5 = [];
       for (let i2 = 0; i2 < nodes.length; i2++) {
         const node = nodes[i2];
         if (!node)
           continue;
-        if (types4.indexOf(node) >= 0) {
+        if (types5.indexOf(node) >= 0) {
           continue;
         }
         if ((0, _generated.isTSAnyKeyword)(node)) {
@@ -54545,15 +54545,15 @@ var require_removeTypeDuplicates2 = __commonJS({
           }
           continue;
         }
-        types4.push(node);
+        types5.push(node);
       }
       for (const [, baseType] of bases) {
-        types4.push(baseType);
+        types5.push(baseType);
       }
       for (const [, genericName] of generics) {
-        types4.push(genericName);
+        types5.push(genericName);
       }
-      return types4;
+      return types5;
     }
   }
 });
@@ -54570,10 +54570,10 @@ var require_createTSUnionType = __commonJS({
     var _removeTypeDuplicates = require_removeTypeDuplicates2();
     var _index = require_generated();
     function createTSUnionType(typeAnnotations) {
-      const types4 = typeAnnotations.map((type) => {
+      const types5 = typeAnnotations.map((type) => {
         return (0, _index.isTSTypeAnnotation)(type) ? type.typeAnnotation : type;
       });
-      const flattened = (0, _removeTypeDuplicates.default)(types4);
+      const flattened = (0, _removeTypeDuplicates.default)(types5);
       if (flattened.length === 1) {
         return flattened[0];
       } else {
@@ -58200,6 +58200,7 @@ __export(lib_exports, {
   detectTools: () => detectTools,
   ensureArtifactImport: () => ensureArtifactImport,
   ensureImports: () => ensureImports,
+  enumReference: () => enumReference,
   exec: () => exec,
   extractHeaders: () => extractHeaders,
   extractHeadersStr: () => extractHeadersStr,
@@ -58229,6 +58230,7 @@ __export(lib_exports, {
   localApiEndpoint: () => localApiEndpoint,
   localApiSessionKeys: () => localApiSessionKeys,
   mutation: () => mutation,
+  nullableField: () => nullableField,
   operation_requires_variables: () => operation_requires_variables,
   orderedPlugins: () => orderedPlugins,
   parentField: () => parentField,
@@ -58243,12 +58245,16 @@ __export(lib_exports, {
   pullSchema: () => pullSchema,
   query: () => query,
   readConfigFile: () => readConfigFile,
+  readonlyProperty: () => readonlyProperty,
   routerConventions: () => conventions_exports,
   runPipeline: () => runPipeline,
+  scalarPropertyValue: () => scalarPropertyValue,
   setMockConfig: () => setMockConfig,
   siteURL: () => siteURL,
   subscription: () => subscription,
+  tsTypeReference: () => tsTypeReference,
   unwrapType: () => unwrapType,
+  unwrappedTsTypeReference: () => unwrappedTsTypeReference,
   wrapType: () => wrapType
 });
 module.exports = __toCommonJS(lib_exports);
@@ -59127,7 +59133,7 @@ var printDocASTReducer = {
     leave: ({ name, interfaces, directives, fields }) => join(["interface", name, wrap("implements ", join(interfaces, " & ")), join(directives, " "), block(fields)], " ")
   },
   UnionTypeDefinition: {
-    leave: ({ name, directives, types: types4 }) => join(["union", name, join(directives, " "), wrap("= ", join(types4, " | "))], " ")
+    leave: ({ name, directives, types: types5 }) => join(["union", name, join(directives, " "), wrap("= ", join(types5, " | "))], " ")
   },
   EnumTypeDefinition: {
     leave: ({ name, directives, values }) => join(["enum", name, join(directives, " "), block(values)], " ")
@@ -59154,7 +59160,7 @@ var printDocASTReducer = {
     leave: ({ name, interfaces, directives, fields }) => join(["extend interface", name, wrap("implements ", join(interfaces, " & ")), join(directives, " "), block(fields)], " ")
   },
   UnionTypeExtension: {
-    leave: ({ name, directives, types: types4 }) => join(["extend union", name, join(directives, " "), wrap("= ", join(types4, " | "))], " ")
+    leave: ({ name, directives, types: types5 }) => join(["extend union", name, join(directives, " "), wrap("= ", join(types5, " | "))], " ")
   },
   EnumTypeExtension: {
     leave: ({ name, directives, values }) => join(["extend enum", name, join(directives, " "), block(values)], " ")
@@ -60034,8 +60040,8 @@ function healTypes(originalTypeMap, directives) {
     }
   }
   function healUnderlyingTypes(type) {
-    const types4 = type.getTypes();
-    types4.push(...types4.splice(0).map((t3) => healType(t3)).filter(Boolean));
+    const types5 = type.getTypes();
+    types5.push(...types5.splice(0).map((t3) => healType(t3)).filter(Boolean));
   }
   function healType(type) {
     if ((0, import_graphql12.isListType)(type)) {
@@ -60819,11 +60825,11 @@ function mergeEnum(e1, e2, config) {
 
 // ../../node_modules/.pnpm/@graphql-tools+merge@8.3.14_graphql@15.5.0/node_modules/@graphql-tools/merge/esm/typedefs-mergers/utils.js
 var import_graphql21 = require("graphql");
-function isStringTypes(types4) {
-  return typeof types4 === "string";
+function isStringTypes(types5) {
+  return typeof types5 === "string";
 }
-function isSourceTypes(types4) {
-  return types4 instanceof import_graphql21.Source;
+function isSourceTypes(types5) {
+  return types5 instanceof import_graphql21.Source;
 }
 function extractType(type) {
   let visitedType = type;
@@ -61518,6 +61524,44 @@ function deepMerge(...objects) {
   return mergedObj;
 }
 
+// src/runtime/lib/types.ts
+var CachePolicy = {
+  CacheOrNetwork: "CacheOrNetwork",
+  CacheOnly: "CacheOnly",
+  NetworkOnly: "NetworkOnly",
+  CacheAndNetwork: "CacheAndNetwork",
+  NoCache: "NoCache"
+};
+var PaginateMode = {
+  Infinite: "Infinite",
+  SinglePage: "SinglePage"
+};
+var ArtifactKind = {
+  Query: "HoudiniQuery",
+  Subscription: "HoudiniSubscription",
+  Mutation: "HoudiniMutation",
+  Fragment: "HoudiniFragment"
+};
+var CompiledFragmentKind = ArtifactKind.Fragment;
+var CompiledMutationKind = ArtifactKind.Mutation;
+var CompiledQueryKind = ArtifactKind.Query;
+var CompiledSubscriptionKind = ArtifactKind.Subscription;
+var RefetchUpdateMode = {
+  append: "append",
+  prepend: "prepend",
+  replace: "replace"
+};
+var DataSource = {
+  Cache: "cache",
+  Network: "network",
+  Ssr: "ssr"
+};
+var fragmentKey = " $fragments";
+var PendingValue = Symbol("houdini_loading");
+function isPending(value) {
+  return typeof value === "symbol";
+}
+
 // src/runtime/lib/scalars.ts
 async function marshalSelection({
   selection,
@@ -61534,6 +61578,9 @@ async function marshalSelection({
   return Object.fromEntries(
     await Promise.all(
       Object.entries(data).map(async ([fieldName, value]) => {
+        if (fieldName === fragmentKey) {
+          return [fieldName, value];
+        }
         const { type, selection: selection2 } = targetSelection[fieldName];
         if (!type) {
           return [fieldName, value];
@@ -61598,44 +61645,6 @@ function isScalar(config, type) {
   return ["String", "Boolean", "Float", "ID", "Int"].concat(Object.keys(config.scalars || {})).includes(type);
 }
 
-// src/runtime/lib/types.ts
-var CachePolicy = {
-  CacheOrNetwork: "CacheOrNetwork",
-  CacheOnly: "CacheOnly",
-  NetworkOnly: "NetworkOnly",
-  CacheAndNetwork: "CacheAndNetwork",
-  NoCache: "NoCache"
-};
-var PaginateMode = {
-  Infinite: "Infinite",
-  SinglePage: "SinglePage"
-};
-var ArtifactKind = {
-  Query: "HoudiniQuery",
-  Subscription: "HoudiniSubscription",
-  Mutation: "HoudiniMutation",
-  Fragment: "HoudiniFragment"
-};
-var CompiledFragmentKind = ArtifactKind.Fragment;
-var CompiledMutationKind = ArtifactKind.Mutation;
-var CompiledQueryKind = ArtifactKind.Query;
-var CompiledSubscriptionKind = ArtifactKind.Subscription;
-var RefetchUpdateMode = {
-  append: "append",
-  prepend: "prepend",
-  replace: "replace"
-};
-var DataSource = {
-  Cache: "cache",
-  Network: "network",
-  Ssr: "ssr"
-};
-var fragmentKey = " $fragments";
-var PendingValue = Symbol("houdini_loading");
-function isPending(value) {
-  return typeof value === "symbol";
-}
-
 // src/runtime/lib/store.ts
 var subscriber_queue = [];
 var noop = () => {
@@ -63438,167 +63447,6 @@ function flatten(source) {
   }, []);
 }
 
-// src/runtime/client/plugins/fetch.ts
-var fetch2 = (target) => {
-  return () => {
-    return {
-      async network(ctx, { client: client2, initialValue, resolve: resolve2, marshalVariables: marshalVariables2 }) {
-        if (ctx.artifact.kind === ArtifactKind.Fragment) {
-          return resolve2(ctx, initialValue);
-        }
-        const fetch3 = ctx.fetch ?? globalThis.fetch;
-        const fetchParams2 = {
-          name: ctx.name,
-          text: ctx.text,
-          hash: ctx.hash,
-          variables: marshalVariables2(ctx)
-        };
-        let fetchFn = defaultFetch(client2.url, ctx.fetchParams);
-        if (target) {
-          if (typeof target === "string") {
-            fetchFn = defaultFetch(target, ctx.fetchParams);
-          } else {
-            fetchFn = target;
-          }
-        }
-        const result = await fetchFn({
-          fetch: (url, args) => {
-            const newArgs = handleMultipart(fetchParams2, args) ?? args;
-            return fetch3(url, newArgs);
-          },
-          metadata: ctx.metadata,
-          session: ctx.session || {},
-          ...fetchParams2
-        });
-        resolve2(ctx, {
-          fetching: false,
-          variables: ctx.variables ?? {},
-          data: result.data,
-          errors: !result.errors || result.errors.length === 0 ? null : result.errors,
-          partial: false,
-          stale: false,
-          source: DataSource.Network
-        });
-      }
-    };
-  };
-};
-var defaultFetch = (url, params) => {
-  if (!url) {
-    throw new Error(
-      "Could not find configured client url. Please specify one in your HoudiniClient constructor."
-    );
-  }
-  return async ({ fetch: fetch3, name, text, variables }) => {
-    const result = await fetch3(url, {
-      method: "POST",
-      body: JSON.stringify({ operationName: name, query: text, variables }),
-      ...params,
-      headers: {
-        Accept: "application/graphql+json, application/json",
-        "Content-Type": "application/json",
-        ...params?.headers
-      }
-    });
-    return await result.json();
-  };
-};
-function handleMultipart(params, args) {
-  const { files } = extractFiles({
-    variables: params.variables
-  });
-  if (files.size) {
-    const req = args;
-    let headers = {};
-    if (req?.headers) {
-      const filtered = Object.entries(req?.headers).filter(([key, value]) => {
-        return !(key.toLowerCase() == "content-type" && value.toLowerCase() == "application/json");
-      });
-      headers = Object.fromEntries(filtered);
-    }
-    const form = new FormData();
-    if (args && args?.body) {
-      form.set("operations", args?.body);
-    } else {
-      form.set(
-        "operations",
-        JSON.stringify({
-          operationName: params.name,
-          query: params.text,
-          variables: params.variables
-        })
-      );
-    }
-    const map = {};
-    let i2 = 0;
-    files.forEach((paths) => {
-      map[++i2] = paths;
-    });
-    form.set("map", JSON.stringify(map));
-    i2 = 0;
-    files.forEach((paths, file) => {
-      form.set(`${++i2}`, file, file.name);
-    });
-    return { ...req, headers, body: form };
-  }
-}
-function isExtractableFile(value) {
-  return typeof File !== "undefined" && value instanceof File || typeof Blob !== "undefined" && value instanceof Blob;
-}
-function extractFiles(value) {
-  if (!arguments.length)
-    throw new TypeError("Argument 1 `value` is required.");
-  const clones = /* @__PURE__ */ new Map();
-  const files = /* @__PURE__ */ new Map();
-  function recurse(value2, path3, recursed) {
-    if (isExtractableFile(value2)) {
-      const filePaths = files.get(value2);
-      filePaths ? filePaths.push(path3) : files.set(value2, [path3]);
-      return null;
-    }
-    const valueIsList = Array.isArray(value2) || typeof FileList !== "undefined" && value2 instanceof FileList;
-    const valueIsPlainObject = isPlainObject(value2);
-    if (valueIsList || valueIsPlainObject) {
-      let clone2 = clones.get(value2);
-      const uncloned = !clone2;
-      if (uncloned) {
-        clone2 = valueIsList ? [] : value2 instanceof Object ? {} : /* @__PURE__ */ Object.create(null);
-        clones.set(value2, clone2);
-      }
-      if (!recursed.has(value2)) {
-        const pathPrefix = path3 ? `${path3}.` : "";
-        const recursedDeeper = new Set(recursed).add(value2);
-        if (valueIsList) {
-          let index = 0;
-          for (const item of value2) {
-            const itemClone = recurse(item, pathPrefix + index++, recursedDeeper);
-            if (uncloned)
-              clone2.push(itemClone);
-          }
-        } else
-          for (const key in value2) {
-            const propertyClone = recurse(value2[key], pathPrefix + key, recursedDeeper);
-            if (uncloned)
-              clone2[key] = propertyClone;
-          }
-      }
-      return clone2;
-    }
-    return value2;
-  }
-  return {
-    clone: recurse(value, "", /* @__PURE__ */ new Set()),
-    files
-  };
-}
-function isPlainObject(value) {
-  if (typeof value !== "object" || value === null) {
-    return false;
-  }
-  const prototype = Object.getPrototypeOf(value);
-  return (prototype === null || prototype === Object.prototype || Object.getPrototypeOf(prototype) === null) && !(Symbol.toStringTag in value) && !(Symbol.iterator in value);
-}
-
 // src/runtime/cache/gc.ts
 var GarbageCollector = class {
   cache;
@@ -65748,6 +65596,167 @@ function defaultComponentField({
 // src/runtime/cache/index.ts
 var cache_default = new Cache();
 
+// src/runtime/client/plugins/fetch.ts
+var fetch2 = (target) => {
+  return () => {
+    return {
+      async network(ctx, { client: client2, initialValue, resolve: resolve2, marshalVariables: marshalVariables2 }) {
+        if (ctx.artifact.kind === ArtifactKind.Fragment) {
+          return resolve2(ctx, initialValue);
+        }
+        const fetch3 = ctx.fetch ?? globalThis.fetch;
+        const fetchParams2 = {
+          name: ctx.name,
+          text: ctx.text,
+          hash: ctx.hash,
+          variables: marshalVariables2(ctx)
+        };
+        let fetchFn = defaultFetch(client2.url, ctx.fetchParams);
+        if (target) {
+          if (typeof target === "string") {
+            fetchFn = defaultFetch(target, ctx.fetchParams);
+          } else {
+            fetchFn = target;
+          }
+        }
+        const result = await fetchFn({
+          fetch: (url, args) => {
+            const newArgs = handleMultipart(fetchParams2, args) ?? args;
+            return fetch3(url, newArgs);
+          },
+          metadata: ctx.metadata,
+          session: ctx.session || {},
+          ...fetchParams2
+        });
+        resolve2(ctx, {
+          fetching: false,
+          variables: ctx.variables ?? {},
+          data: result.data,
+          errors: !result.errors || result.errors.length === 0 ? null : result.errors,
+          partial: false,
+          stale: false,
+          source: DataSource.Network
+        });
+      }
+    };
+  };
+};
+var defaultFetch = (url, params) => {
+  if (!url) {
+    throw new Error(
+      "Could not find configured client url. Please specify one in your HoudiniClient constructor."
+    );
+  }
+  return async ({ fetch: fetch3, name, text, variables }) => {
+    const result = await fetch3(url, {
+      method: "POST",
+      body: JSON.stringify({ operationName: name, query: text, variables }),
+      ...params,
+      headers: {
+        Accept: "application/graphql+json, application/json",
+        "Content-Type": "application/json",
+        ...params?.headers
+      }
+    });
+    return await result.json();
+  };
+};
+function handleMultipart(params, args) {
+  const { files } = extractFiles({
+    variables: params.variables
+  });
+  if (files.size) {
+    const req = args;
+    let headers = {};
+    if (req?.headers) {
+      const filtered = Object.entries(req?.headers).filter(([key, value]) => {
+        return !(key.toLowerCase() == "content-type" && value.toLowerCase() == "application/json");
+      });
+      headers = Object.fromEntries(filtered);
+    }
+    const form = new FormData();
+    if (args && args?.body) {
+      form.set("operations", args?.body);
+    } else {
+      form.set(
+        "operations",
+        JSON.stringify({
+          operationName: params.name,
+          query: params.text,
+          variables: params.variables
+        })
+      );
+    }
+    const map = {};
+    let i2 = 0;
+    files.forEach((paths) => {
+      map[++i2] = paths;
+    });
+    form.set("map", JSON.stringify(map));
+    i2 = 0;
+    files.forEach((paths, file) => {
+      form.set(`${++i2}`, file, file.name);
+    });
+    return { ...req, headers, body: form };
+  }
+}
+function isExtractableFile(value) {
+  return typeof File !== "undefined" && value instanceof File || typeof Blob !== "undefined" && value instanceof Blob;
+}
+function extractFiles(value) {
+  if (!arguments.length)
+    throw new TypeError("Argument 1 `value` is required.");
+  const clones = /* @__PURE__ */ new Map();
+  const files = /* @__PURE__ */ new Map();
+  function recurse(value2, path3, recursed) {
+    if (isExtractableFile(value2)) {
+      const filePaths = files.get(value2);
+      filePaths ? filePaths.push(path3) : files.set(value2, [path3]);
+      return null;
+    }
+    const valueIsList = Array.isArray(value2) || typeof FileList !== "undefined" && value2 instanceof FileList;
+    const valueIsPlainObject = isPlainObject(value2);
+    if (valueIsList || valueIsPlainObject) {
+      let clone2 = clones.get(value2);
+      const uncloned = !clone2;
+      if (uncloned) {
+        clone2 = valueIsList ? [] : value2 instanceof Object ? {} : /* @__PURE__ */ Object.create(null);
+        clones.set(value2, clone2);
+      }
+      if (!recursed.has(value2)) {
+        const pathPrefix = path3 ? `${path3}.` : "";
+        const recursedDeeper = new Set(recursed).add(value2);
+        if (valueIsList) {
+          let index = 0;
+          for (const item of value2) {
+            const itemClone = recurse(item, pathPrefix + index++, recursedDeeper);
+            if (uncloned)
+              clone2.push(itemClone);
+          }
+        } else
+          for (const key in value2) {
+            const propertyClone = recurse(value2[key], pathPrefix + key, recursedDeeper);
+            if (uncloned)
+              clone2[key] = propertyClone;
+          }
+      }
+      return clone2;
+    }
+    return value2;
+  }
+  return {
+    clone: recurse(value, "", /* @__PURE__ */ new Set()),
+    files
+  };
+}
+function isPlainObject(value) {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value);
+  return (prototype === null || prototype === Object.prototype || Object.getPrototypeOf(prototype) === null) && !(Symbol.toStringTag in value) && !(Symbol.iterator in value);
+}
+
 // src/runtime/client/plugins/cache.ts
 var serverSide = typeof globalThis.window === "undefined";
 var cachePolicy = ({
@@ -65878,7 +65887,7 @@ var documentPlugin = (kind, source) => {
 };
 
 // src/runtime/client/plugins/query.ts
-var query = documentPlugin(ArtifactKind.Query, function() {
+var query = (cache) => documentPlugin(ArtifactKind.Query, function() {
   let subscriptionSpec = null;
   let lastVariables = null;
   return {
@@ -65906,7 +65915,7 @@ var query = documentPlugin(ArtifactKind.Query, function() {
     end(ctx, { resolve: resolve2, marshalVariables: marshalVariables2, variablesChanged: variablesChanged2 }) {
       if (variablesChanged2(ctx) && !ctx.cacheParams?.disableSubscriptions) {
         if (subscriptionSpec) {
-          cache_default.unsubscribe(subscriptionSpec, subscriptionSpec.variables?.() || {});
+          cache.unsubscribe(subscriptionSpec, subscriptionSpec.variables?.() || {});
         }
         lastVariables = { ...marshalVariables2(ctx) };
         const variables = lastVariables;
@@ -65926,13 +65935,13 @@ var query = documentPlugin(ArtifactKind.Query, function() {
             });
           }
         };
-        cache_default.subscribe(subscriptionSpec, lastVariables);
+        cache.subscribe(subscriptionSpec, lastVariables);
       }
       resolve2(ctx);
     },
     cleanup() {
       if (subscriptionSpec) {
-        cache_default.unsubscribe(subscriptionSpec, subscriptionSpec.variables?.());
+        cache.unsubscribe(subscriptionSpec, subscriptionSpec.variables?.());
         lastVariables = null;
       }
     }
@@ -65940,7 +65949,7 @@ var query = documentPlugin(ArtifactKind.Query, function() {
 });
 
 // src/runtime/client/plugins/fragment.ts
-var fragment = documentPlugin(ArtifactKind.Fragment, function() {
+var fragment = (cache) => documentPlugin(ArtifactKind.Fragment, function() {
   let subscriptionSpec = null;
   let lastReference = null;
   return {
@@ -65954,7 +65963,7 @@ var fragment = documentPlugin(ArtifactKind.Fragment, function() {
       };
       if (!ctx.cacheParams?.disableSubscriptions && (!deepEquals(lastReference, currentReference) || variablesChanged2(ctx))) {
         if (subscriptionSpec) {
-          cache_default.unsubscribe(subscriptionSpec, subscriptionSpec.variables?.() || {});
+          cache.unsubscribe(subscriptionSpec, subscriptionSpec.variables?.() || {});
         }
         const variables = marshalVariables2(ctx);
         subscriptionSpec = {
@@ -65974,28 +65983,28 @@ var fragment = documentPlugin(ArtifactKind.Fragment, function() {
             });
           }
         };
-        cache_default.subscribe(subscriptionSpec, variables);
+        cache.subscribe(subscriptionSpec, variables);
         lastReference = currentReference;
       }
       next(ctx);
     },
     cleanup() {
       if (subscriptionSpec) {
-        cache_default.unsubscribe(subscriptionSpec, subscriptionSpec.variables?.());
+        cache.unsubscribe(subscriptionSpec, subscriptionSpec.variables?.());
       }
     }
   };
 });
 
 // src/runtime/client/plugins/mutation.ts
-var mutation = documentPlugin(ArtifactKind.Mutation, () => {
+var mutation = (cache) => documentPlugin(ArtifactKind.Mutation, () => {
   return {
     async start(ctx, { next, marshalVariables: marshalVariables2 }) {
-      const layerOptimistic = cache_default._internal_unstable.storage.createLayer(true);
+      const layerOptimistic = cache._internal_unstable.storage.createLayer(true);
       const optimisticResponse = ctx.stuff.optimisticResponse;
       let toNotify = [];
       if (optimisticResponse) {
-        toNotify = cache_default.write({
+        toNotify = cache.write({
           selection: ctx.artifact.selection,
           data: await marshalSelection({
             selection: ctx.artifact.selection,
@@ -66015,7 +66024,7 @@ var mutation = documentPlugin(ArtifactKind.Mutation, () => {
     },
     afterNetwork(ctx, { resolve: resolve2 }) {
       if (ctx.cacheParams?.layer) {
-        cache_default.clearLayer(ctx.cacheParams.layer.id);
+        cache.clearLayer(ctx.cacheParams.layer.id);
       }
       resolve2(ctx);
     },
@@ -66023,19 +66032,19 @@ var mutation = documentPlugin(ArtifactKind.Mutation, () => {
       const hasErrors = value.errors && value.errors.length > 0;
       if (hasErrors) {
         if (ctx.cacheParams?.layer) {
-          cache_default.clearLayer(ctx.cacheParams.layer.id);
+          cache.clearLayer(ctx.cacheParams.layer.id);
         }
       }
       if (ctx.cacheParams?.layer) {
-        cache_default._internal_unstable.storage.resolveLayer(ctx.cacheParams.layer.id);
+        cache._internal_unstable.storage.resolveLayer(ctx.cacheParams.layer.id);
       }
       resolve2(ctx);
     },
     catch(ctx, { error }) {
       if (ctx.cacheParams?.layer) {
         const { layer } = ctx.cacheParams;
-        cache_default.clearLayer(layer.id);
-        cache_default._internal_unstable.storage.resolveLayer(layer.id);
+        cache.clearLayer(layer.id);
+        cache._internal_unstable.storage.resolveLayer(layer.id);
       }
       throw error;
     }
@@ -66561,10 +66570,17 @@ var injectedPlugins_default = plugins;
 // src/runtime/client/index.ts
 var HoudiniClient = class {
   url;
-  plugins;
   throwOnError_operations;
+  cache = null;
+  throwOnError;
+  fetchParams;
+  pipeline;
+  extraPlugins;
   proxies = {};
   componentCache = {};
+  setCache(cache) {
+    this.cache = cache;
+  }
   constructor({
     url,
     fetchParams: fetchParams2,
@@ -66578,23 +66594,29 @@ var HoudiniClient = class {
       );
     }
     this.throwOnError_operations = throwOnError2?.operations ?? [];
-    this.plugins = flatten(
+    let serverPort = globalThis.process?.env?.HOUDINI_PORT ?? "5173";
+    this.url = url ?? (globalThis.window ? "" : `https://localhost:${serverPort}`) + localApiEndpoint(getCurrentConfig());
+    this.throwOnError = throwOnError2;
+    this.fetchParams = fetchParams2;
+    this.pipeline = pipeline2;
+    this.extraPlugins = plugins2;
+  }
+  get plugins() {
+    return flatten(
       [].concat(
-        throwOnError2 ? [throwOnError(throwOnError2)] : [],
-        fetchParams(fetchParams2),
-        pipeline2 ?? [
-          query,
-          mutation,
-          fragment
+        this.throwOnError ? [throwOnError(this.throwOnError)] : [],
+        fetchParams(this.fetchParams),
+        this.pipeline ?? [
+          query(this.cache ?? cache_default),
+          mutation(this.cache ?? cache_default),
+          fragment(this.cache ?? cache_default)
         ].concat(
-          plugins2 ?? [],
+          this.extraPlugins ?? [],
           injectedPlugins_default,
           fetch2()
         )
       )
     );
-    let serverPort = globalThis.process?.env?.HOUDINI_PORT ?? "5173";
-    this.url = url ?? (globalThis.window ? "" : `https://localhost:${serverPort}`) + localApiEndpoint(getCurrentConfig());
   }
   observe({
     enableCache = true,
@@ -66606,6 +66628,7 @@ var HoudiniClient = class {
       plugins: createPluginHooks(this.plugins),
       fetching,
       enableCache,
+      cache: this.cache ?? void 0,
       ...rest
     });
   }
@@ -66706,7 +66729,7 @@ var Config = class {
       defaultListTarget = null,
       defaultPaginateMode = PaginateMode.Infinite,
       defaultKeys,
-      types: types4 = {},
+      types: types5 = {},
       logLevel,
       defaultFragmentMasking = "enable",
       watchSchema,
@@ -66754,10 +66777,10 @@ var Config = class {
     if (defaultKeys) {
       this.defaultKeys = defaultKeys;
     }
-    if (types4) {
+    if (types5) {
       this.typeConfig = {
         ...this.typeConfig,
-        ...types4
+        ...types5
       };
     }
   }
@@ -67691,7 +67714,7 @@ function operation_requires_variables(operation) {
     )
   );
 }
-function unwrapType(config, type, wrappers = []) {
+function unwrapType(config, type, wrappers = [], convertRuntimeScalars) {
   if (type.kind === "NonNullType") {
     return unwrapType(config, type.type, [TypeWrapper.NonNull, ...wrappers]);
   }
@@ -67707,6 +67730,11 @@ function unwrapType(config, type, wrappers = []) {
   if (type instanceof graphql3.GraphQLList) {
     return unwrapType(config, type.ofType, [TypeWrapper.List, ...wrappers]);
   }
+  if (convertRuntimeScalars && config.configFile.features?.runtimeScalars?.[type.name.value]) {
+    type = config.schema.getType(
+      config.configFile.features?.runtimeScalars?.[type.name.value].type
+    );
+  }
   const namedType = config.schema.getType(type.name.value || type.name);
   if (!namedType) {
     throw new Error("Unknown type: " + type.name.value || type.name);
@@ -68033,6 +68061,152 @@ function escape2(str) {
   return str.normalize().replace(/[[\]]/g, "\\$&").replace(/%/g, "%25").replace(/\//g, "%2[Ff]").replace(/\?/g, "%3[Ff]").replace(/#/g, "%23").replace(/[.*+?^${}()|\\]/g, "\\$&");
 }
 
+// src/lib/typescript.ts
+var graphql4 = __toESM(require("graphql"), 1);
+var recast2 = __toESM(require_main2(), 1);
+var AST2 = recast2.types.builders;
+function unwrappedTsTypeReference(config, filepath, missingScalars, {
+  type,
+  wrappers
+}, body) {
+  let result;
+  if (graphql4.isScalarType(type)) {
+    result = scalarPropertyValue(config, filepath, missingScalars, type, body, null);
+  } else if (graphql4.isEnumType(type)) {
+    result = enumReference(config, body, type.name);
+  } else {
+    result = AST2.tsTypeReference(AST2.identifier(type.name));
+  }
+  for (const toWrap of wrappers) {
+    if (toWrap === "NonNull" /* NonNull */) {
+      continue;
+    } else if (toWrap === "Nullable" /* Nullable */) {
+      result = nullableField(result, true);
+    } else if (toWrap === "List" /* List */) {
+      result = AST2.tsArrayType(AST2.tsParenthesizedType(result));
+    }
+  }
+  return result;
+}
+function tsTypeReference(config, filepath, missingScalars, definition, body) {
+  const { type, wrappers } = unwrapType(config, definition.type);
+  return unwrappedTsTypeReference(
+    config,
+    filepath,
+    missingScalars,
+    { type, wrappers },
+    body
+  );
+}
+function enumReference(config, body, name) {
+  ensureImports({
+    config,
+    body,
+    import: ["ValueOf"],
+    importKind: "type",
+    sourceModule: "$houdini/runtime/lib/types"
+  });
+  return AST2.tsTypeReference(
+    AST2.identifier("ValueOf"),
+    AST2.tsTypeParameterInstantiation([AST2.tsTypeQuery(AST2.identifier(name))])
+  );
+}
+function readonlyProperty(prop, enable = true) {
+  if (enable) {
+    prop.readonly = true;
+  }
+  return prop;
+}
+function nullableField(inner, input = false) {
+  const members = [inner, AST2.tsNullKeyword()];
+  if (input) {
+    members.push(AST2.tsUndefinedKeyword());
+  }
+  return AST2.tsUnionType(members);
+}
+function scalarPropertyValue(config, filepath, missingScalars, target, body, field) {
+  if (config.configFile.features?.componentFields && target.name === config.componentScalar) {
+    if (!field) {
+      return AST2.tsNeverKeyword();
+    }
+    const component = config.componentFields[field.parent][field.field];
+    const sourcePathRelative = path_exports.relative(
+      path_exports.join(config.projectRoot, "src"),
+      component.filepath
+    );
+    let sourcePathParsed = path_exports.parse(sourcePathRelative);
+    let sourcePath = path_exports.join(sourcePathParsed.dir, sourcePathParsed.name);
+    const localImport = ensureImports({
+      config,
+      body,
+      import: "__component__" + component.fragment,
+      sourceModule: path_exports.join(
+        path_exports.relative(path_exports.dirname(filepath), config.projectRoot),
+        "src",
+        sourcePath
+      )
+    }) ?? "__component__" + component.fragment;
+    const parameters = AST2.tsTypeReference(AST2.identifier("Parameters"));
+    parameters.typeParameters = AST2.tsTypeParameterInstantiation([
+      AST2.tsTypeQuery(AST2.identifier(localImport))
+    ]);
+    const indexed = AST2.tsIndexedAccessType(
+      parameters,
+      AST2.tsLiteralType(AST2.numericLiteral(0))
+    );
+    const omit = AST2.tsTypeReference(AST2.identifier("Omit"));
+    omit.typeParameters = AST2.tsTypeParameterInstantiation([
+      indexed,
+      AST2.tsLiteralType(AST2.stringLiteral(component.prop))
+    ]);
+    const arg = AST2.identifier("props");
+    arg.typeAnnotation = AST2.tsTypeAnnotation(omit);
+    const returnType = AST2.tsTypeReference(AST2.identifier("ReturnType"));
+    returnType.typeParameters = AST2.tsTypeParameterInstantiation([
+      AST2.tsTypeQuery(AST2.identifier(localImport))
+    ]);
+    const fnType = AST2.tsFunctionType([arg]);
+    fnType.typeAnnotation = AST2.tsTypeAnnotation(returnType);
+    return fnType;
+  }
+  switch (target.name) {
+    case "String": {
+      return AST2.tsStringKeyword();
+    }
+    case "Int": {
+      return AST2.tsNumberKeyword();
+    }
+    case "Float": {
+      return AST2.tsNumberKeyword();
+    }
+    case "Boolean": {
+      return AST2.tsBooleanKeyword();
+    }
+    case "ID": {
+      return AST2.tsStringKeyword();
+    }
+    default: {
+      if (graphql4.isNonNullType(target) && "ofType" in target) {
+        return scalarPropertyValue(
+          config,
+          filepath,
+          missingScalars,
+          target.ofType,
+          body,
+          field
+        );
+      }
+      if (config.scalars?.[target.name]) {
+        return AST2.tsTypeReference(AST2.identifier(config.scalars?.[target.name].type));
+      }
+      if (target.name !== config.componentScalar) {
+        missingScalars.add(target.name);
+      }
+      return AST2.tsAnyKeyword();
+    }
+  }
+}
+
 // ../../node_modules/.pnpm/estree-walker@3.0.1/node_modules/estree-walker/src/walker.js
 var WalkerBase = class {
   constructor() {
@@ -68146,7 +68320,7 @@ async function asyncWalk(ast, { enter, leave }) {
 }
 
 // src/lib/walk.ts
-var graphql4 = __toESM(require("graphql"), 1);
+var graphql5 = __toESM(require("graphql"), 1);
 async function find_graphql(config, parsedScript, walker) {
   await asyncWalk(parsedScript, {
     async enter(node, parent) {
@@ -68201,7 +68375,7 @@ async function find_graphql(config, parsedScript, walker) {
       } else if (!documentString) {
         return;
       }
-      const parsedTag = graphql4.parse(documentString);
+      const parsedTag = graphql5.parse(documentString);
       if (walker.where && !walker.where(parsedTag, { node, parent })) {
         return;
       }
@@ -68333,7 +68507,7 @@ function extractAnonymousQuery(config, raw, expr, propName) {
       };
       return defs.concat([
         {
-          raw: graphql4.print(parsed),
+          raw: graphql5.print(parsed),
           parsed
         }
       ]);
@@ -68474,7 +68648,7 @@ function serialized_manifest_path(config, base = base_dir(config)) {
 
 // src/lib/router/manifest.ts
 var t2 = __toESM(require_lib6(), 1);
-var graphql5 = __toESM(require("graphql"), 1);
+var graphql6 = __toESM(require("graphql"), 1);
 async function load_manifest(args) {
   const manifest = await walk_routes({
     config: args.config,
@@ -68491,7 +68665,8 @@ async function load_manifest(args) {
       local_yoga: false
     },
     queries: [],
-    layouts: []
+    layouts: [],
+    variables: {}
   });
   if (args.includeArtifacts) {
     try {
@@ -68522,6 +68697,7 @@ async function walk_routes(args) {
   const directory_contents = await fs_exports.readdir(args.filepath, {
     withFileTypes: true
   });
+  const variables = { ...args.variables };
   let newLayouts = args.layouts;
   let newLayoutQueries = args.queries;
   let layout = null;
@@ -68545,7 +68721,8 @@ async function walk_routes(args) {
       url: args.url,
       project: args.project,
       type: "layout",
-      contents: layoutQueryContents
+      contents: layoutQueryContents,
+      variables
     });
     newLayoutQueries = [...args.queries, layoutQuery.name];
   }
@@ -68558,7 +68735,8 @@ async function walk_routes(args) {
       contents: layoutViewContents,
       layouts: args.layouts,
       queries: newLayoutQueries,
-      config: args.config
+      config: args.config,
+      variables
     });
     newLayouts = [...args.layouts, page_id(layout.url)];
   }
@@ -68569,7 +68747,8 @@ async function walk_routes(args) {
       url: args.url,
       project: args.project,
       type: "page",
-      contents: pageQueryContents
+      contents: pageQueryContents,
+      variables
     });
   }
   if (pageViewContents) {
@@ -68581,7 +68760,8 @@ async function walk_routes(args) {
       contents: pageViewContents,
       layouts: newLayouts,
       queries: pageQuery ? [...newLayoutQueries, pageQuery.name] : newLayoutQueries,
-      config: args.config
+      config: args.config,
+      variables
     });
   }
   await Promise.all(
@@ -68594,7 +68774,8 @@ async function walk_routes(args) {
         filepath: path_exports.join(args.filepath, dir.name),
         url: `${args.url}${dir.name}/`,
         queries: newLayoutQueries,
-        layouts: newLayouts
+        layouts: newLayouts,
+        variables
       });
     })
   );
@@ -68616,12 +68797,18 @@ async function add_view(args) {
     url: args.url,
     layouts: args.layouts,
     path: path_exports.relative(args.config.projectRoot, args.path),
-    query_options: args.queries
+    query_options: args.queries,
+    params: Object.fromEntries(
+      parse_page_pattern(args.url).params.map((param) => [
+        param.name,
+        args.variables[param.name] ?? null
+      ])
+    )
   };
   return target[id];
 }
 async function add_query(args) {
-  const parsed = graphql5.parse(args.contents);
+  const parsed = graphql6.parse(args.contents);
   const query2 = parsed.definitions.find(
     (def) => def.kind === "OperationDefinition" && def.operation === "query"
   );
@@ -68629,20 +68816,30 @@ async function add_query(args) {
     throw new Error("No query found");
   }
   let loading = false;
-  await graphql5.visit(parsed, {
+  await graphql6.visit(parsed, {
     Directive(node) {
       if (node.name.value === args.config.loadingDirective) {
         loading = true;
       }
     }
   });
+  const queryVariables = Object.fromEntries(
+    query2.variableDefinitions?.map((variable) => {
+      const { type, wrappers } = unwrapType(args.config, variable.type, [], true);
+      return [
+        variable.variable.name.value,
+        { wrappers, type: type.name }
+      ];
+    }) ?? []
+  );
+  Object.assign(args.variables, queryVariables);
   const target = args.type === "page" ? args.project.page_queries : args.project.layout_queries;
   target[page_id(args.url)] = {
     path: path_exports.relative(args.config.routesDir, args.path),
     name: query2.name.value,
     url: args.url,
     loading,
-    variables: query2.variableDefinitions?.map((variable) => variable.variable.name.value) ?? []
+    variables: queryVariables
   };
   return target[page_id(args.url)];
 }
@@ -69035,6 +69232,7 @@ async function get_session(req, secrets) {
   detectTools,
   ensureArtifactImport,
   ensureImports,
+  enumReference,
   exec,
   extractHeaders,
   extractHeadersStr,
@@ -69064,6 +69262,7 @@ async function get_session(req, secrets) {
   localApiEndpoint,
   localApiSessionKeys,
   mutation,
+  nullableField,
   operation_requires_variables,
   orderedPlugins,
   parentField,
@@ -69078,12 +69277,16 @@ async function get_session(req, secrets) {
   pullSchema,
   query,
   readConfigFile,
+  readonlyProperty,
   routerConventions,
   runPipeline,
+  scalarPropertyValue,
   setMockConfig,
   siteURL,
   subscription,
+  tsTypeReference,
   unwrapType,
+  unwrappedTsTypeReference,
   wrapType
 });
 /*!