wesl 0.6.7 → 0.6.9

package/dist/minified.js

@@ -1,56 +1,60 @@
-var xe = (t) => {
+var tr = Object.defineProperty;
+var ve = (t) => {
   throw TypeError(t);
 };
-var ke = (t, e, n) => e.has(t) || xe("Cannot " + n);
-var b = (t, e, n) => (ke(t, e, "read from private field"), n ? n.call(t) : e.get(t)), I = (t, e, n) => e.has(t) ? xe("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(t) : e.set(t, n), A = (t, e, n, r) => (ke(t, e, "write to private field"), r ? r.call(t, n) : e.set(t, n), n);
-function Hn(t, e) {
+var er = (t, e, n) => e in t ? tr(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
+var w = (t, e, n) => er(t, typeof e != "symbol" ? e + "" : e, n), Se = (t, e, n) => e.has(t) || ve("Cannot " + n);
+var b = (t, e, n) => (Se(t, e, "read from private field"), n ? n.call(t) : e.get(t)), B = (t, e, n) => e.has(t) ? ve("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(t) : e.set(t, n), R = (t, e, n, r) => (Se(t, e, "write to private field"), r ? r.call(t, n) : e.set(t, n), n);
+function nr(t, e) {
   if (!t)
     throw new Error(e);
 }
-function Tt(t) {
-  throw new Yn("Unreachable value", { data: t });
+function Nt(t) {
+  throw new rr("Unreachable value", { data: t });
 }
-let Yn = class extends Error {
-  constructor(e, n) {
-    super(e, n), this.data = n == null ? void 0 : n.data;
+let rr = class extends Error {
+  constructor(n, r) {
+    super(n, r);
+    w(this, "data");
+    this.data = r == null ? void 0 : r.data;
   }
-}, Zn = console.log;
-function Qn(t, e, ...n) {
-  tr(Zn, t, e, ...n);
+}, sr = console.log;
+function or(t, e, ...n) {
+  ir(sr, t, e, ...n);
 }
-function Ie(t) {
+function je(t) {
   return t ? `'${t.replace(/\n/g, "\\n")}'` : "";
 }
-function tr(t, e, n, ...r) {
+function ir(t, e, n, ...r) {
   if (typeof e == "string") {
-    _e(t, e, n, ...r);
+    ye(t, e, n, ...r);
     return;
   }
-  const { src: s, positions: o } = er(e, n);
-  _e(t, s.text, o, ...r);
+  const { src: s, positions: o } = ar(e, n);
+  ye(t, s.text, o, ...r);
 }
-function er(t, e) {
+function ar(t, e) {
   var o, i, a, c;
   const n = t.mapPositions(...[e].flat()), { src: r } = n[0];
   let s;
   return ((i = (o = n[1]) == null ? void 0 : o.src) == null ? void 0 : i.path) === r.path && ((c = (a = n[1]) == null ? void 0 : a.src) == null ? void 0 : c.text) === r.text ? s = n.map((l) => l.position) : s = n[0].position, { src: r, positions: s };
 }
-function _e(t, e, n, ...r) {
+function ye(t, e, n, ...r) {
   t(...r);
-  const { line: s, lineNum: o, linePos: i, linePos2: a } = rr(e, n);
+  const { line: s, lineNum: o, linePos: i, linePos2: a } = lr(e, n);
   t(s, `  Ln ${o}`);
-  const c = nr(i, a);
+  const c = cr(i, a);
   t(c);
 }
-function nr(t, e) {
+function cr(t, e) {
   const n = " ".repeat(t), r = e ? e - t : 1, s = "^".repeat(r);
   return n + s;
 }
-const ve = /* @__PURE__ */ new Map();
-function rr(t, e) {
+const we = /* @__PURE__ */ new Map();
+function lr(t, e) {
   let n, r;
   typeof e == "number" ? n = e : [n, r] = e;
-  const s = sr(t);
+  const s = ur(t);
   let o = 0, i = s.length - 1;
   for (n >= s[i] && (o = i); o + 1 < i; ) {
     const d = o + i >> 1;
@@ -62,19 +66,19 @@ function rr(t, e) {
   return { line: c.slice(-1) === `
 ` ? c.slice(0, -1) : c, linePos: n - s[o], linePos2: a, lineNum: o + 1 };
 }
-function sr(t) {
-  const e = ve.get(t);
+function ur(t) {
+  const e = we.get(t);
   if (e) return e;
   const n = [...t.matchAll(/\n/g)].map((r) => r.index + 1);
-  return n.unshift(0), ve.set(t, n), n;
+  return n.unshift(0), we.set(t, n), n;
 }
-function or(t) {
+function dr(t) {
   const e = t.checkpoint(), n = t.nextToken();
   return t.reset(e), n;
 }
-function ot(t, e) {
-  return X(
-    `token '${t}' ${Ie(e)}`,
+function it(t, e) {
+  return J(
+    `token '${t}' ${je(e)}`,
     function(r) {
       r.stream.checkpoint();
       const s = r.stream.nextToken();
@@ -82,8 +86,8 @@ function ot(t, e) {
     }
   );
 }
-function xt(t, e) {
-  return X(
+function kt(t, e) {
+  return J(
     `tokenOf '${t}'`,
     function(r) {
       r.stream.checkpoint();
@@ -92,8 +96,8 @@ function xt(t, e) {
     }
   );
 }
-function Be(t) {
-  return X(
+function Le(t) {
+  return J(
     `tokenKind '${t}'`,
     function(n) {
       n.stream.checkpoint();
@@ -102,8 +106,8 @@ function Be(t) {
     }
   );
 }
-function Jt(t) {
-  return X(
+function Kt(t) {
+  return J(
     `kind '${t}'`,
     function(n) {
       n.stream.checkpoint();
@@ -112,9 +116,9 @@ function Jt(t) {
     }
   );
 }
-function Nt(t) {
-  return X(
-    `${Ie(t)}`,
+function $t(t) {
+  return J(
+    `${je(t)}`,
     function(n) {
       n.stream.checkpoint();
       const r = n.stream.nextToken();
@@ -135,7 +139,7 @@ function u(...t) {
     return { value: s };
   });
 }
-function ir(t) {
+function fr(t) {
   const e = Object.entries(t).map(
     ([n, r]) => [n, k(r)]
   );
@@ -150,23 +154,23 @@ function ir(t) {
     return { value: s };
   });
 }
-function ar(t) {
-  return t.collect({ before: gr, after: hr });
+function pr(t) {
+  return t.collect({ before: vr, after: Sr });
 }
-function T(t, e) {
+function N(t, e) {
   const n = k(t), r = k(e);
   return y("preceded", function(o) {
     return n._run(o) === null ? null : r._run(o);
   });
 }
-function qt(t, e) {
+function Ft(t, e) {
   const n = k(t), r = k(e);
   return y("terminated", function(o) {
     const i = n._run(o);
     return i === null || r._run(o) === null ? null : i;
   });
 }
-function F(t, e, n) {
+function W(t, e, n) {
   const r = k(t), s = k(e), o = k(n);
   return y("delimited", function(a) {
     if (r._run(a) === null) return null;
@@ -174,7 +178,7 @@ function F(t, e, n) {
     return l === null || o._run(a) === null ? null : l;
   });
 }
-function cr(t, e, n) {
+function mr(t, e, n) {
   const r = k(t), s = k(e), o = k(n);
   return y(
     "terminated",
@@ -209,22 +213,22 @@ function h(t) {
     }
   );
 }
-function lr(t) {
+function gr(t) {
   const e = k(t);
   return y("not", function(r) {
     const s = r.stream.checkpoint();
     return e._run(r) === null ? (r.stream.reset(s), { value: !0 }) : null;
   });
 }
-function N(t) {
+function $(t) {
   const e = k(t);
-  return y("repeat", ur(e));
+  return y("repeat", hr(e));
 }
-function B(t) {
+function D(t) {
   const e = k(t);
-  return u(e, N(e)).map((n) => [n[0], ...n[1]]).setTraceName("repeatPlus");
+  return u(e, $(e)).map((n) => [n[0], ...n[1]]).setTraceName("repeatPlus");
 }
-function ur(t, e = () => !0) {
+function hr(t, e = () => !0) {
   return function(r) {
     const s = [];
     for (; ; ) {
@@ -237,11 +241,11 @@ function ur(t, e = () => !0) {
     }
   };
 }
-function Kt(t) {
+function Ht(t) {
   const e = k(t);
   return y("span", function(r) {
     var a, c;
-    const s = ((c = (a = or(r.stream)) == null ? void 0 : a.span) == null ? void 0 : c[0]) ?? null, o = e._run(r);
+    const s = ((c = (a = dr(r.stream)) == null ? void 0 : a.span) == null ? void 0 : c[0]) ?? null, o = e._run(r);
     if (o === null) return null;
     const i = r.stream.checkpoint();
     return {
@@ -252,8 +256,8 @@ function Kt(t) {
     };
   });
 }
-function dr() {
-  return X("eof", function(e) {
+function br() {
+  return J("eof", function(e) {
     return e.stream.nextToken() !== null ? null : { value: !0 };
   });
 }
@@ -262,16 +266,16 @@ function f(t, e) {
   return y("req", function(s) {
     const o = s.stream.checkpoint(), i = n._run(s);
     if (i === null)
-      throw new Y(e, [o, s.stream.checkpoint()]);
+      throw new Z(e, [o, s.stream.checkpoint()]);
     return i;
   });
 }
-function kt() {
-  return X("yes", function() {
+function _t() {
+  return J("yes", function() {
     return { value: null };
   });
 }
-function et(t, e, n = {}) {
+function nt(t, e, n = {}) {
   const { trailing: r = !0, requireOne: s = !1 } = n, o = k(e), i = k(t);
   return y("withSep", function(c) {
     const l = [], d = c.stream.checkpoint(), p = o._run(c);
@@ -285,23 +289,23 @@ function et(t, e, n = {}) {
         c.stream.reset(g);
         break;
       }
-      const E = c.stream.checkpoint(), C = o._run(c);
-      if (C === null) {
-        r ? c.stream.reset(E) : c.stream.reset(g);
+      const T = c.stream.checkpoint(), A = o._run(c);
+      if (A === null) {
+        r ? c.stream.reset(T) : c.stream.reset(g);
         break;
       }
-      l.push(C.value);
+      l.push(A.value);
     }
     return {
       value: l
     };
   });
 }
-function $t(t, e) {
-  return et(t, e, { requireOne: !0 }).setTraceName("withSepPlus");
+function Pt(t, e) {
+  return nt(t, e, { requireOne: !0 }).setTraceName("withSepPlus");
 }
-function De(t) {
-  return X(
+function Oe(t) {
+  return J(
     "withStreamAction",
     function(n) {
       const r = t(n.stream);
@@ -310,15 +314,15 @@ function De(t) {
   );
 }
 function k(t) {
-  return typeof t == "string" ? Nt(t) : t instanceof Qt ? t : G(t);
+  return typeof t == "string" ? $t(t) : t instanceof te ? t : X(t);
 }
-function G(t) {
-  const e = new Qt({
+function X(t) {
+  const e = new te({
     fn: function(r) {
       const s = t();
       if (!t) {
         const o = r.stream.checkpoint();
-        throw new Y("fn parser called before definition", [
+        throw new Z("fn parser called before definition", [
           o,
           o
         ]);
@@ -330,19 +334,19 @@ function G(t) {
   });
   return e;
 }
-function fr(t, e, n) {
+function xr(t, e, n) {
   const r = (e == null ? void 0 : e.after) ?? e, s = e == null ? void 0 : e.before;
   let o = r;
   n && (o = (a) => {
     const c = r(a);
-    return c != null && Yt(a.tags, n, c), c;
+    return c != null && Zt(a.tags, n, c), c;
   });
   const i = n ? `${t.debugName}-${n}` : `${t.debugName}`;
   return y(
     "collect",
     function(c) {
       const l = c.stream.checkpoint();
-      return s && Pt(c, l, s, `${i}.before`), Ht(t, c, o, i);
+      return s && Mt(c, l, s, `${i}.before`), Yt(t, c, o, i);
     }
   );
 }
@@ -353,14 +357,14 @@ function _(t) {
     function(r) {
       const s = r.stream.checkpoint();
       let o;
-      return Pt(
+      return Mt(
         r,
         s,
         (i) => {
-          o = pr(i.tags), i.tags = {};
+          o = kr(i.tags), i.tags = {};
         },
         `scope.before ${e.debugName}`
-      ), Ht(
+      ), Yt(
         e,
         r,
         (i) => {
@@ -371,52 +375,52 @@ function _(t) {
     }
   );
 }
-function pr(t) {
+function kr(t) {
   const e = Object.entries(t).map(([n, r]) => [n, [...r]]);
   return Object.fromEntries(e);
 }
-function mr(t, e) {
+function _r(t, e) {
   return y("ctag", function(r) {
-    return Ht(
+    return Yt(
       t,
       r,
       (s) => {
-        const o = Zt(s._values);
-        Yt(s.tags, e, o.value);
+        const o = Qt(s._values);
+        Zt(s.tags, e, o.value);
       },
       `ctag ${e}`
     );
   });
 }
-function Ht(t, e, n, r = "") {
+function Yt(t, e, n, r = "") {
   const s = e.stream.checkpoint(), o = t._run(e);
-  return o && Pt(e, s, n, r), o;
+  return o && Mt(e, s, n, r), o;
 }
-function Pt(t, e, n, r) {
-  const s = kr(t.stream, e);
+function Mt(t, e, n, r) {
+  const s = Er(t.stream, e);
   t._collect.push({
     srcPosition: s,
     collectFn: n,
     debugName: r
   });
 }
-function gr(t) {
+function vr(t) {
   t._values.push({ value: null, openArray: [] });
 }
-function hr(t) {
-  const e = Zt(t._values);
-  e.openArray === void 0 && console.log("---closeArray: no open array"), t._values.pop(), je(t, e.openArray);
+function Sr(t) {
+  const e = Qt(t._values);
+  e.openArray === void 0 && console.log("---closeArray: no open array"), t._values.pop(), qe(t, e.openArray);
 }
-function br(t, e) {
+function yr(t, e) {
   return y("ptag", function(r) {
     const s = r.stream.checkpoint(), o = t._run(r);
-    return o && Pt(r, s, (a) => Yt(a.tags, e, o.value), `ptag ${e}`), o;
+    return o && Mt(r, s, (a) => Zt(a.tags, e, o.value), `ptag ${e}`), o;
   });
 }
-function Yt(t, e, n) {
+function Zt(t, e, n) {
   t[e] === void 0 && (t[e] = []), t[e].push(n);
 }
-function xr(t, e, n) {
+function wr(t, e, n) {
   const r = {}, { src: s } = n, i = {
     tags: r,
     src: s,
@@ -429,35 +433,40 @@ function xr(t, e, n) {
     const { collectFn: c, srcPosition: l } = a;
     i.start = l.start, i.end = l.end;
     const d = c(i);
-    je(i, d);
+    qe(i, d);
   });
 }
-function je(t, e) {
+function qe(t, e) {
   if (e !== void 0) {
-    const n = Zt(t._values);
+    const n = Qt(t._values);
     n || console.log("----saveCollectValue: no valueEntry"), n && (n.value = e), (n == null ? void 0 : n.openArray) !== void 0 && n.openArray.push(e);
   }
 }
-function Zt(t) {
+function Qt(t) {
   return t[t.length - 1];
 }
-function kr(t, e) {
+function Er(t, e) {
   const n = t.checkpoint();
   t.reset(e);
-  const r = _r(t);
+  const r = Tr(t);
   return t.reset(n), { start: r, end: n };
 }
-function _r(t) {
+function Tr(t) {
   const e = t.nextToken();
   return e === null || t.reset(e.span[0]), t.checkpoint();
 }
-class Y extends Error {
-  constructor(e, n) {
-    super(e), this.span = n;
+class Z extends Error {
+  constructor(n, r) {
+    super(n);
+    w(this, "span");
+    this.span = r;
   }
 }
-class Qt {
+class te {
   constructor(e) {
+    /** If tracing is enabled, this exists. Otherwise it does not exist. */
+    w(this, "_traceInfo");
+    w(this, "fn");
     this.fn = e.fn;
   }
   /** run the parser given an already created parsing context
@@ -476,11 +485,11 @@ class Qt {
   }
   /** tag parse results */
   ptag(e) {
-    return br(this, e);
+    return yr(this, e);
   }
   /** tag collect results */
   ctag(e) {
-    return mr(this, e);
+    return _r(this, e);
   }
   /** record a name for debug tracing */
   setTraceName(e) {
@@ -493,18 +502,18 @@ class Qt {
   /** map results to a new value.
    */
   map(e) {
-    return vr(this, e);
+    return Nr(this, e);
   }
   /** Queue a function that runs later, typically to collect AST elements from the parse.
    * when a commit() is parsed.
    * Collection functions are dropped with parser backtracking, so
    * only succsessful parses are collected. */
   collect(e, n) {
-    return fr(this, e, n);
+    return xr(this, e, n);
   }
   /** switch next parser based on results */
   toParser(e) {
-    return Sr(this, e);
+    return $r(this, e);
   }
   /**
    * start parsing
@@ -517,7 +526,7 @@ class Qt {
       app: r,
       _collect: s
     });
-    return o && xr(s, r, n), o;
+    return o && wr(s, r, n), o;
   }
   /** name of this parser for debugging/tracing */
   get debugName() {
@@ -525,18 +534,18 @@ class Qt {
   }
 }
 function y(t, e, n) {
-  return new Qt({ fn: e, traceName: t, terminal: n });
+  return new te({ fn: e, traceName: t, terminal: n });
 }
-function X(t, e) {
+function J(t, e) {
   return y(t, e, !0);
 }
-function vr(t, e) {
+function Nr(t, e) {
   return y("map", function(r) {
     const s = t._run(r);
     return s === null ? null : { value: e(s.value) };
   });
 }
-function Sr(t, e) {
+function $r(t, e) {
   return y(
     "toParser",
     function(r) {
@@ -547,8 +556,10 @@ function Sr(t, e) {
     }
   );
 }
-class te {
+class ee {
   constructor(e, n = []) {
+    w(this, "entries");
+    w(this, "dest");
     this.dest = e, this.entries = n;
   }
   /** add a new mapping from src to dest ranges.
@@ -587,7 +598,7 @@ class te {
     );
     if (n.length === 0)
       return console.log("other source map does not link to this one"), e;
-    yr(n);
+    Pr(n);
     const r = n.map((i) => {
       const { src: a, position: c } = this.destToSrc(i.srcStart), { src: l, position: d } = this.destToSrc(i.srcEnd);
       if (l !== a) throw new Error("NYI, need to split");
@@ -600,7 +611,7 @@ class te {
       };
     }), s = e.entries.filter(
       (i) => i.src.path !== this.dest.path || i.src.text !== this.dest.text
-    ), o = new te(e.dest, [...s, ...r]);
+    ), o = new ee(e.dest, [...s, ...r]);
     return o.sort(), o;
   }
   /**
@@ -621,23 +632,23 @@ class te {
     };
   }
 }
-function yr(t) {
+function Pr(t) {
   t.sort((e, n) => e.srcStart - n.srcStart);
 }
-var Z, O, V;
-class ht {
+var Q, q, z;
+class bt {
   constructor(e) {
-    I(this, Z, []);
-    I(this, O, 0);
-    I(this, V, []);
+    B(this, Q, []);
+    B(this, q, 0);
+    B(this, z, []);
     this.source = e;
   }
   /** append a string fragment to the destination string */
   add(e, n, r) {
-    const s = b(this, O);
-    A(this, O, b(this, O) + e.length);
-    const o = b(this, O);
-    b(this, Z).push(e), b(this, V).push({
+    const s = b(this, q);
+    R(this, q, b(this, q) + e.length);
+    const o = b(this, q);
+    b(this, Q).push(e), b(this, z).push({
       src: this.source,
       srcStart: n,
       srcEnd: r,
@@ -653,14 +664,14 @@ class ht {
    */
   appendNext(e) {
     var r;
-    const n = ((r = b(this, V).at(-1)) == null ? void 0 : r.destEnd) ?? 0;
+    const n = ((r = b(this, z).at(-1)) == null ? void 0 : r.destEnd) ?? 0;
     this.add(e, n, n + e.length);
   }
   addSynthetic(e, n, r, s) {
-    const o = b(this, O);
-    A(this, O, b(this, O) + e.length);
-    const i = b(this, O);
-    b(this, Z).push(e), b(this, V).push({
+    const o = b(this, q);
+    R(this, q, b(this, q) + e.length);
+    const i = b(this, q);
+    b(this, Q).push(e), b(this, z).push({
       src: { text: n },
       srcStart: r,
       srcEnd: s,
@@ -670,7 +681,7 @@ class ht {
   }
   /** append a synthetic newline, mapped to previous source location */
   addNl() {
-    const e = b(this, V).at(-1) ?? { srcStart: 0, srcEnd: 0 }, { srcStart: n, srcEnd: r } = e;
+    const e = b(this, z).at(-1) ?? { srcStart: 0, srcEnd: 0 }, { srcStart: n, srcEnd: r } = e;
     this.add(`
 `, n, r);
   }
@@ -681,17 +692,18 @@ class ht {
   }
   /** return a SrcMap */
   static build(e) {
-    const n = new te(
-      { text: e.map((r) => b(r, Z).join("")).join("") },
-      e.flatMap((r) => b(r, V))
+    const n = new ee(
+      { text: e.map((r) => b(r, Q).join("")).join("") },
+      e.flatMap((r) => b(r, z))
     );
     return n.compact(), n;
   }
 }
-Z = new WeakMap(), O = new WeakMap(), V = new WeakMap();
-class wr {
+Q = new WeakMap(), q = new WeakMap(), z = new WeakMap();
+class Mr {
   constructor(e) {
-    this.inner = e, this.cache = new Er(5);
+    w(this, "cache", new Cr(5));
+    this.inner = e;
   }
   checkpoint() {
     return this.inner.checkpoint();
@@ -712,7 +724,7 @@ class wr {
     return this.inner.src;
   }
 }
-class Er extends Map {
+class Cr extends Map {
   constructor(e) {
     super(), this.max = e;
   }
@@ -724,31 +736,32 @@ class Er extends Map {
     return super.set(e, n);
   }
 }
-function Tr(t) {
+function Ar(t) {
   const [e, n] = t;
   if (typeof n == "string") {
-    const r = `(${Le(n)})`;
-    return Se(e, new RegExp(r)), r;
+    const r = `(${Fe(n)})`;
+    return Ee(e, new RegExp(r)), r;
   } else
-    return Se(e, n), `(${n.source})`;
+    return Ee(e, n), `(${n.source})`;
 }
-function Se(t, e) {
+function Ee(t, e) {
   if (new RegExp("|" + e.source).exec("").length > 1)
     throw new Error(
       `match expression groups must be non-capturing: ${t}: /${e.source}/. Use (?:...) instead.`
     );
 }
-const Nr = /[$+*.?|(){}[\]\\/^]/g;
-function Le(t) {
-  return t.replace(Nr, "\\$&");
+const Rr = /[$+*.?|(){}[\]\\/^]/g;
+function Fe(t) {
+  return t.replace(Rr, "\\$&");
 }
-function Mt(t) {
-  const n = t.split(/\s+/).sort((r, s) => s.length - r.length).filter((r) => r).map(Le);
+function Ct(t) {
+  const n = t.split(/\s+/).sort((r, s) => s.length - r.length).filter((r) => r).map(Fe);
   return new RegExp(n.join("|"));
 }
-class $r {
+class Ir {
   constructor(e, n) {
-    this.text = e, this.matchers = n, this.position = 0;
+    w(this, "position", 0);
+    this.text = e, this.matchers = n;
   }
   checkpoint() {
     return this.position;
@@ -764,15 +777,17 @@ class $r {
     return this.text;
   }
 }
-class Pr {
+class Br {
   constructor(e) {
+    w(this, "groups");
+    w(this, "exp");
     this.groups = Object.keys(e);
-    const n = Object.entries(e).map(Tr).join("|");
+    const n = Object.entries(e).map(Ar).join("|");
     this.exp = new RegExp(n, "dyu");
   }
   execAt(e, n) {
     this.exp.lastIndex = n;
-    const r = this.exp.exec(e), s = Mr(r == null ? void 0 : r.indices);
+    const r = this.exp.exec(e), s = Dr(r == null ? void 0 : r.indices);
     if (s) {
       const { span: o, groupDex: i } = s;
       return {
@@ -784,7 +799,7 @@ class Pr {
       return null;
   }
 }
-function Mr(t) {
+function Dr(t) {
   if (t !== void 0)
     for (let e = 1; e < t.length; e++) {
       const n = t[e];
@@ -792,29 +807,31 @@ function Mr(t) {
         return { span: n, groupDex: e - 1 };
     }
 }
-function D(t) {
-  throw new Cr("Unreachable value", { data: t });
+function j(t) {
+  throw new jr("Unreachable value", { data: t });
 }
-class Cr extends Error {
-  constructor(e, n) {
-    super(e, n), this.data = n == null ? void 0 : n.data;
+class jr extends Error {
+  constructor(n, r) {
+    super(n, r);
+    w(this, "data");
+    this.data = r == null ? void 0 : r.data;
   }
 }
-function ea(t, e, n, r) {
+function sa(t, e, n, r) {
   const s = t.get(e) || /* @__PURE__ */ new Map();
   t.set(e, s), s.set(n, r);
 }
-const Ar = /\b(\w+)\b/gi;
-function na(t, e) {
-  return t.replaceAll(Ar, (n) => n in e ? e[n] : n);
+const Lr = /\b(\w+)\b/gi;
+function oa(t, e) {
+  return t.replaceAll(Lr, (n) => n in e ? e[n] : n);
 }
-function ra(t, e, n = e) {
+function ia(t, e, n = e) {
   const r = [];
   for (let s = 0; s < t.length; s += n)
     r.push(t.slice(s, s + e));
   return r;
 }
-function sa(t, e) {
+function aa(t, e) {
   const n = /* @__PURE__ */ new Map();
   for (const r of t) {
     const s = e(r), o = n.get(s) || [];
@@ -822,44 +839,44 @@ function sa(t, e) {
   }
   return n;
 }
-function oa(t, e) {
+function ca(t, e) {
   const n = [], r = [];
   for (const s of t)
     e(s) ? n.push(s) : r.push(s);
   return [n, r];
 }
-function ia(t, e, n) {
+function la(t, e, n) {
   const r = [n];
   let s = n;
   for (let o = 0; o < t.length; o++)
     s = e(t[o], s), r.push(s);
   return r;
 }
-function aa(t, e) {
+function ua(t, e) {
   const n = Object.entries(t).map(([r, s]) => {
     const o = s in e ? e[s] : s;
     return [r, o];
   });
   return Object.fromEntries(n);
 }
-function Rr(t) {
+function Or(t) {
   return t[t.length - 1];
 }
-function ca(t, e) {
+function da(t, e) {
   let n = Math.min(t.length, e.length);
   for (; n > 0; ) {
     const r = t.slice(-n), s = e.slice(0, n);
-    if (Ir(r, s))
+    if (qr(r, s))
       break;
     n--;
   }
   if (n)
     return e.slice(n);
 }
-function Ir(t, e) {
+function qr(t, e) {
   return t.length === e.length && t.every((n, r) => n === e[r]);
 }
-function ee(t, e) {
+function ne(t, e) {
   const n = [];
   for (const r of t) {
     const s = e(r);
@@ -867,16 +884,16 @@ function ee(t, e) {
   }
   return n;
 }
-function Br(t, e) {
+function Fr(t, e) {
   for (const n of t) {
     const r = e(n);
     if (r) return r;
   }
 }
-function Dr(t, e) {
+function Wr(t, e) {
   return Object.fromEntries(Object.entries(t).map(([n, r]) => [n, e(r)]));
 }
-function Ct(t, e) {
+function At(t, e) {
   const n = Math.min(e.length, Math.max(0, t));
   let r = 0, s = 1;
   for (; ; ) {
@@ -889,7 +906,7 @@ function Ct(t, e) {
       r = o + 1, s += 1;
   }
 }
-function Oe(t, e) {
+function We(t, e) {
   let n = t.lastIndexOf(`
 `, e[0]);
   n === -1 && (n = 0);
@@ -911,35 +928,35 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-const qe = {};
+const Ue = {};
 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".split("").forEach((t, e) => {
-  qe[e] = t;
+  Ue[e] = t;
 });
-function ye(t) {
+function Te(t) {
   if (typeof t == "number")
-    return we(t);
+    return Ne(t);
   let e = "";
   for (let n = 0; n < t.length; n += 1)
-    e += we(t[n]);
+    e += Ne(t[n]);
   return e;
 }
-function we(t) {
+function Ne(t) {
   let e = "", n;
   t < 0 ? n = -t << 1 | 1 : n = t << 1;
   do {
     let r = n & 31;
-    n >>>= 5, n > 0 && (r |= 32), e += qe[r];
+    n >>>= 5, n > 0 && (r |= 32), e += Ue[r];
   } while (n > 0);
   return e;
 }
-function ne(t) {
-  const { url: e, text: n, lineNumber: r, lineColumn: s, length: o, error: i } = t, a = ye([
+function re(t) {
+  const { url: e, text: n, lineNumber: r, lineColumn: s, length: o, error: i } = t, a = Te([
     0,
     0,
     Math.max(0, r - 1),
     Math.max(0, s - 1)
   ]) + "," + // Sadly no browser makes use of this info to map the error properly
-  ye([
+  Te([
     18,
     // Arbitrary number that is high enough
     0,
@@ -965,18 +982,18 @@ function ne(t) {
     throw "stackTraceLimit" in Error && (Error.stackTraceLimit = d), i.message = "", p;
   }
 }
-function Fe(t, e) {
+function Ve(t, e) {
   const { refIdentElem: n, originalName: r } = t, s = e ?? `'${r}'`;
   if (n)
-    Ue(n, s);
+    ze(n, s);
   else
     throw new Error(s);
 }
-function Ue(t, e = "") {
+function ze(t, e = "") {
   const { srcModule: n, start: r, end: s } = t, { debugFilePath: o, src: i } = n, a = `${e} in file: ${o}`;
-  Qn(i, [r, s], a);
-  const [c, l] = Ct(r, i), d = s - r;
-  ne({
+  or(i, [r, s], a);
+  const [c, l] = At(r, i), d = s - r;
+  re({
     url: o,
     text: i,
     lineNumber: c,
@@ -985,170 +1002,170 @@ function Ue(t, e = "") {
     error: new Error(a)
   });
 }
-function We(t, e) {
+function Ge(t, e) {
   const n = t.attributes;
   if (!n) return !0;
-  const r = Br(n, jr);
-  return !r || ze(r, e);
+  const r = Fr(n, Ur);
+  return !r || Je(r, e);
 }
-function Ve(t, e) {
+function Xe(t, e) {
   const { ifAttribute: n } = t;
-  return n ? ze(n, e) : !0;
+  return n ? Je(n, e) : !0;
 }
-function jr(t) {
+function Ur(t) {
   const { attribute: e } = t;
   return e.kind === "@if" ? e : void 0;
 }
-function ze(t, e) {
-  return H(t.param.expression, e);
+function Je(t, e) {
+  return Y(t.param.expression, e);
 }
-function H(t, e) {
+function Y(t, e) {
   const { kind: n } = t;
   if (n === "unary-expression")
-    return t.operator.value, !H(t.expression, e);
+    return t.operator.value, !Y(t.expression, e);
   if (n === "binary-expression") {
-    const r = t.operator.value, s = H(t.left, e);
+    const r = t.operator.value, s = Y(t.left, e);
     if (r === "||")
-      return s || H(t.right, e);
+      return s || Y(t.right, e);
     if (r === "&&")
-      return s && H(t.right, e);
-    D(r);
+      return s && Y(t.right, e);
+    j(r);
   } else if (n === "literal") {
     const { value: r } = t;
     return r === "true";
   } else {
     if (n === "parenthesized-expression")
-      return H(t.expression, e);
+      return Y(t.expression, e);
     if (n === "translate-time-feature")
       return e[t.name];
     throw new Error(`unexpected @if expression ${JSON.stringify(t)}`);
   }
 }
-function Ft(t, e) {
+function Wt(t, e) {
   e && (t.kind, e.kind, t.parent, e.parent, e.ifAttribute, t.contents = t.contents.concat(e.contents));
 }
-function Lr() {
-  Ge = 0, Xe = 0;
+function Vr() {
+  Ke = 0, He = 0;
 }
-let Ge = 0, Xe = 0;
-function re() {
-  return Xe++;
+let Ke = 0, He = 0;
+function se() {
+  return He++;
 }
-function Je(t, e = "scope") {
-  return { id: Ge++, kind: e, parent: t, contents: [] };
+function Ye(t, e = "scope") {
+  return { id: Ke++, kind: e, parent: t, contents: [] };
 }
-function Or(t, e) {
+function zr(t, e) {
   if (e === t)
     return !0;
   for (const n of t.contents)
-    if (se(n) && Or(n, e))
+    if (oe(n) && zr(n, e))
       return !0;
   return !1;
 }
-function se(t) {
+function oe(t) {
   const { kind: e } = t;
   return e === "partial" || e === "scope";
 }
-function la(t) {
-  return !se(t);
+function fa(t) {
+  return !oe(t);
 }
-function Ke(t, e, n) {
+function Ze(t, e, n) {
   for (const r of t.contents) {
     if (r.kind === "decl" && r.originalName === e)
       return r;
-    if (r.kind === "partial" && Ve(r, n)) {
-      const s = Ke(r, e, n);
+    if (r.kind === "partial" && Xe(r, n)) {
+      const s = Ze(r, e, n);
       if (s) return s;
     }
   }
 }
-var q, z, ut, dt, Q, ft;
-class oe {
+var F, G, dt, ft, tt, pt;
+class ie {
   constructor(e = 0, n = 60, r = 2) {
-    I(this, q, []);
-    I(this, z, 0);
-    I(this, ut);
-    I(this, dt, !0);
-    I(this, Q, !1);
-    I(this, ft);
-    this.indent = e, this.maxWidth = n, this.hangingIndent = r, A(this, ut, " ".repeat(e)), A(this, ft, " ".repeat(r));
+    B(this, F, []);
+    B(this, G, 0);
+    B(this, dt);
+    B(this, ft, !0);
+    B(this, tt, !1);
+    B(this, pt);
+    this.indent = e, this.maxWidth = n, this.hangingIndent = r, R(this, dt, " ".repeat(e)), R(this, pt, " ".repeat(r));
   }
   /** add a new line to the constructed string */
   nl() {
-    b(this, q).push(`
-`), A(this, z, 0), A(this, dt, !1), A(this, Q, !1);
+    b(this, F).push(`
+`), R(this, G, 0), R(this, ft, !1), R(this, tt, !1);
   }
   /** add a string, wrapping to the next line if necessary */
   add(e) {
-    b(this, z) + qr(e) > this.maxWidth && this.hangingNl(), b(this, z) === 0 && (b(this, q).push(b(this, ut)), b(this, Q) && b(this, q).push(b(this, ft)), A(this, z, this.indent)), b(this, q).push(e), A(this, z, b(this, z) + e.length);
+    b(this, G) + Gr(e) > this.maxWidth && this.hangingNl(), b(this, G) === 0 && (b(this, F).push(b(this, dt)), b(this, tt) && b(this, F).push(b(this, pt)), R(this, G, this.indent)), b(this, F).push(e), R(this, G, b(this, G) + e.length);
   }
   /** add a raw block of text with no wrapping */
   addBlock(e, n = !0) {
-    b(this, q).push(e), n && this.nl();
+    b(this, F).push(e), n && this.nl();
   }
   /** @return the constructed string */
   get result() {
-    return b(this, q).join("");
+    return b(this, F).join("");
   }
   /** true if the result contains no newlines */
   get oneLine() {
-    return b(this, dt);
+    return b(this, ft);
   }
   hangingNl() {
-    this.nl(), A(this, Q, !0);
+    this.nl(), R(this, tt, !0);
   }
 }
-q = new WeakMap(), z = new WeakMap(), ut = new WeakMap(), dt = new WeakMap(), Q = new WeakMap(), ft = new WeakMap();
-function qr(t) {
+F = new WeakMap(), G = new WeakMap(), dt = new WeakMap(), ft = new WeakMap(), tt = new WeakMap(), pt = new WeakMap();
+function Gr(t) {
   const e = t.indexOf(`
 `);
   return e === -1 ? t.length : e;
 }
-function He(t, e = 0, n = !0) {
-  const { contents: r, kind: s, ifAttribute: o } = t, i = new oe(e), a = o && hi(o);
+function Qe(t, e = 0, n = !0) {
+  const { contents: r, kind: s, ifAttribute: o } = t, i = new ie(e), a = o && Si(o);
   a && i.add(a + " "), s === "partial" && i.add("-"), i.add("{ ");
   const c = r.length - 1;
   let l = !1, d = !1;
   return r.forEach((p, g) => {
-    if (se(p)) {
-      const E = He(p, e + 2, n);
-      !l && i.nl(), i.addBlock(E), l = !0, d = !0;
+    if (oe(p)) {
+      const T = Qe(p, e + 2, n);
+      l || i.nl(), i.addBlock(T), l = !0, d = !0;
     } else {
       l && i.add("  "), l = !1;
       const x = p;
-      n ? i.add(Fr(x)) : i.add(At(x)), g < c && i.add(" ");
+      n ? i.add(Xr(x)) : i.add(Rt(x)), g < c && i.add(" ");
     }
   }), !d && i.oneLine ? i.add(" }") : (d && !l && i.nl(), i.add("}")), i.add(` #${t.id}`), i.result;
 }
-function ua(t) {
-  return He(t, 0, !1);
+function pa(t) {
+  return Qe(t, 0, !1);
 }
-function Fr(t) {
+function Xr(t) {
   const { kind: e, originalName: n } = t;
   return `${e === "decl" ? "%" : ""}${n}`;
 }
-function At(t) {
+function Rt(t) {
   if (!t) return JSON.stringify(t);
   const { kind: e, originalName: n } = t, r = t.id ? `#${t.id}` : "";
   if (e === "ref") {
-    const s = At(t.refersTo);
+    const s = Rt(t.refersTo);
     return `${n} ${r} -> ${s}`;
   } else {
     const { mangledName: s } = t, o = s ? `(${s})` : "";
     return `%${n}${o} ${r} `;
   }
 }
-function Ye(t = null) {
+function tn(t = null) {
   return { decls: /* @__PURE__ */ new Map(), parent: t };
 }
-function da(t, e) {
+function ma(t, e) {
   const { modulePath: n } = e;
   return [...n.split("::"), t.originalName].map((r) => {
     const s = (r.match(/_/g) ?? []).length;
     return s > 0 ? "_" + s + r : r;
   }).join("_");
 }
-function fa(t, e) {
+function ga(t, e) {
   function n(s) {
     return [...s].length;
   }
@@ -1157,16 +1174,16 @@ function fa(t, e) {
     t.originalName
   ].map((s) => n(s) + s).join("");
 }
-function Ze(t, e, n, r) {
-  return Qe(n, r);
+function en(t, e, n, r) {
+  return nn(n, r);
 }
-function Qe(t, e) {
+function nn(t, e) {
   let n = t, r = 0;
   for (; e.has(n); )
     n = t + r++;
   return n;
 }
-function Ur(t) {
+function Jr(t) {
   return e([], [], t.segments, t.finalSegment);
   function e(n, r, s, o) {
     if (s.length > 0) {
@@ -1187,13 +1204,13 @@ function Ur(t) {
         ], a = [...r, o.name];
         return [{ importPath: i, modulePath: a }];
       } else
-        D(o);
+        j(o);
     }
   }
 }
-var Wr = zr((t) => " ".repeat(t)), Vr = 20;
-"" + Wr(Vr + 3);
-function zr(t) {
+var Kr = Yr((t) => " ".repeat(t)), Hr = 20;
+"" + Kr(Hr + 3);
+function Yr(t) {
   const e = /* @__PURE__ */ new Map();
   return function(...n) {
     const r = JSON.stringify(n);
@@ -1207,111 +1224,111 @@ function zr(t) {
 }
 typeof DOMRect > "u" && (globalThis.DOMRect = function() {
 });
-function Gr(t) {
+function Zr(t) {
   var n;
   const e = (n = t.tags.owo) == null ? void 0 : n[0];
   for (const r of e)
-    t.app.stable.imports.push(r.imports), nt(t, r);
+    t.app.stable.imports.push(r.imports), rt(t, r);
 }
-function nt(t, e) {
+function rt(t, e) {
   const n = t.app.context, { openElems: r } = n;
   r != null && r.length && r[r.length - 1].contents.push(e);
 }
-function pt(t) {
+function mt(t) {
   const { src: e, start: n, end: r } = t, s = t.app, { srcModule: o } = s.stable, i = e.slice(n, r), a = "ref", c = {
     kind: a,
     originalName: i,
     ast: t.app.stable,
-    id: re(),
+    id: se(),
     refIdentElem: null
     // set below
   }, l = { kind: a, start: n, end: r, srcModule: o, ident: c };
-  return c.refIdentElem = l, nn(t, l), nt(t, l), l;
+  return c.refIdentElem = l, on(t, l), rt(t, l), l;
 }
-function tn(t) {
-  return en(t, !1);
+function rn(t) {
+  return sn(t, !1);
 }
-function Rt(t) {
-  return en(t, !0);
+function It(t) {
+  return sn(t, !0);
 }
-function en(t, e) {
+function sn(t, e) {
   const { src: n, start: r, end: s } = t, o = t.app, { scope: i } = o.context, { srcModule: a } = o.stable, c = n.slice(r, s), l = "decl", p = {
     declElem: null,
     kind: l,
     originalName: c,
     containingScope: i,
     isGlobal: e,
-    id: re(),
+    id: se(),
     srcModule: a
   }, g = { kind: l, start: r, end: s, srcModule: a, ident: p };
-  return nn(t, g), nt(t, g), g;
+  return on(t, g), rt(t, g), g;
 }
-const ie = w(
+const ae = E(
   "typeDecl",
   (t, e) => {
     var a, c, l;
     const n = (a = t.tags.decl_elem) == null ? void 0 : a[0], r = (c = t.tags.typeRefElem) == null ? void 0 : c[0], s = (l = t.tags.decl_type) == null ? void 0 : l[0], o = { ...e, decl: n, typeScope: s, typeRef: r };
-    return M(o, t);
+    return C(o, t);
   }
 );
-function nn(t, e) {
+function on(t, e) {
   const { ident: n } = e;
-  n.id = re(), t.app.context.scope.contents.push(n);
+  n.id = se(), t.app.context.scope.contents.push(n);
 }
-function rn(t) {
-  sn("scope", t);
+function an(t) {
+  cn("scope", t);
 }
-function Xr(t) {
-  sn("partial", t);
+function Qr(t) {
+  cn("partial", t);
 }
-function sn(t, e) {
-  const { scope: n } = e.app.context, r = Je(n, t);
+function cn(t, e) {
+  const { scope: n } = e.app.context, r = Ye(n, t);
   n.contents.push(r), e.app.context.scope = r;
 }
-function on(t) {
-  return an(t, !0);
+function ln(t) {
+  return un(t, !0);
 }
-function Jr(t) {
-  return an(t, !1);
+function ts(t) {
+  return un(t, !1);
 }
-function an(t, e) {
+function un(t, e) {
   const n = t.app.context, r = n.scope, { parent: s } = r;
   if (s && (n.scope = s), e) {
-    const o = Kr(t);
+    const o = es(t);
     r.ifAttribute = o == null ? void 0 : o[0];
   }
   return r;
 }
-function Kr(t) {
+function es(t) {
   const e = t.tags.attribute;
-  return cn(e);
+  return dn(e);
 }
-function cn(t) {
+function dn(t) {
   if (t)
-    return ee(
+    return ne(
       t,
       (e) => e.attribute.kind === "@if" ? e.attribute : void 0
     );
 }
-function _t(t) {
-  return w(t, (e, n) => {
+function vt(t) {
+  return E(t, (e, n) => {
     var l, d;
-    const r = (l = e.tags.var_name) == null ? void 0 : l[0], s = (d = e.tags.decl_scope) == null ? void 0 : d[0], o = e.tags.attribute, i = { ...n, name: r, attributes: o }, a = M(i, e), c = r.decl.ident;
-    return c.declElem = a, r.typeScope ? (Ft(r.typeScope, s), c.dependentScope = r.typeScope) : c.dependentScope = s, a;
+    const r = (l = e.tags.var_name) == null ? void 0 : l[0], s = (d = e.tags.decl_scope) == null ? void 0 : d[0], o = e.tags.attribute, i = { ...n, name: r, attributes: o }, a = C(i, e), c = r.decl.ident;
+    return c.declElem = a, r.typeScope ? (Wt(r.typeScope, s), c.dependentScope = r.typeScope) : c.dependentScope = s, a;
   });
 }
-const Hr = w(
+const ns = E(
   "alias",
   (t, e) => {
     var c, l, d, p;
-    const n = (c = t.tags.alias_name) == null ? void 0 : c[0], r = (l = t.tags.alias_scope) == null ? void 0 : l[0], s = (d = t.tags.typeRefElem) == null ? void 0 : d[0], o = ((p = t.tags.attributes) == null ? void 0 : p.flat()) ?? [], i = { ...e, name: n, attributes: o, typeRef: s }, a = M(i, t);
+    const n = (c = t.tags.alias_name) == null ? void 0 : c[0], r = (l = t.tags.alias_scope) == null ? void 0 : l[0], s = (d = t.tags.typeRefElem) == null ? void 0 : d[0], o = ((p = t.tags.attributes) == null ? void 0 : p.flat()) ?? [], i = { ...e, name: n, attributes: o, typeRef: s }, a = C(i, t);
     return n.ident.dependentScope = r, n.ident.declElem = a, a;
   }
-), Yr = w(
+), rs = E(
   "fn",
   (t, e) => {
     var U;
-    const n = Zr(t), { name: r, headerScope: s, returnScope: o, bodyScope: i, body: a, params: c } = n, { attributes: l, returnAttributes: d, returnType: p, fnScope: g } = n, x = {
+    const n = ss(t), { name: r, headerScope: s, returnScope: o, bodyScope: i, body: a, params: c } = n, { attributes: l, returnAttributes: d, returnType: p, fnScope: g } = n, x = {
       ...e,
       name: r,
       attributes: l,
@@ -1320,78 +1337,78 @@ const Hr = w(
       body: a,
       returnType: p
     };
-    g.ifAttribute = (U = cn(l)) == null ? void 0 : U[0];
-    const E = s;
-    o && Ft(E, o), Ft(E, i);
-    const C = [];
-    for (const W of g.contents)
-      W === s || W === o || (W === i ? C.push(E) : C.push(W));
-    return g.contents = C, r.ident.declElem = x, r.ident.dependentScope = E, x;
+    g.ifAttribute = (U = dn(l)) == null ? void 0 : U[0];
+    const T = s;
+    o && Wt(T, o), Wt(T, i);
+    const A = [];
+    for (const V of g.contents)
+      V === s || V === o || (V === i ? A.push(T) : A.push(V));
+    return g.contents = A, r.ident.declElem = x, r.ident.dependentScope = T, x;
   }
 );
-function Zr(t) {
-  const { fn_attributes: e, fn_name: n, fn_param: r, return_attributes: s } = t.tags, { return_type: o } = t.tags, { header_scope: i, return_scope: a, body_scope: c, body_statement: l } = t.tags, { fn_partial_scope: d } = t.tags, p = n == null ? void 0 : n[0], g = i == null ? void 0 : i[0], x = a == null ? void 0 : a[0], E = c == null ? void 0 : c[0], C = l == null ? void 0 : l[0], U = (r == null ? void 0 : r.flat(3)) ?? [], W = e == null ? void 0 : e.flat(), j = s == null ? void 0 : s.flat(), Jn = o == null ? void 0 : o.flat(3)[0], Kn = d == null ? void 0 : d[0];
+function ss(t) {
+  const { fn_attributes: e, fn_name: n, fn_param: r, return_attributes: s } = t.tags, { return_type: o } = t.tags, { header_scope: i, return_scope: a, body_scope: c, body_statement: l } = t.tags, { fn_partial_scope: d } = t.tags, p = n == null ? void 0 : n[0], g = i == null ? void 0 : i[0], x = a == null ? void 0 : a[0], T = c == null ? void 0 : c[0], A = l == null ? void 0 : l[0], U = (r == null ? void 0 : r.flat(3)) ?? [], V = e == null ? void 0 : e.flat(), L = s == null ? void 0 : s.flat(), Zn = o == null ? void 0 : o.flat(3)[0], Qn = d == null ? void 0 : d[0];
   return {
     name: p,
     headerScope: g,
     returnScope: x,
-    bodyScope: E,
-    body: C,
+    bodyScope: T,
+    body: A,
     params: U,
-    attributes: W,
-    returnAttributes: j,
-    returnType: Jn,
-    fnScope: Kn
+    attributes: V,
+    returnAttributes: L,
+    returnType: Zn,
+    fnScope: Qn
   };
 }
-const Qr = w(
+const os = E(
   "param",
   (t, e) => {
     var i, a;
-    const n = (i = t.tags.param_name) == null ? void 0 : i[0], r = ((a = t.tags.attributes) == null ? void 0 : a.flat()) ?? [], s = { ...e, name: n, attributes: r }, o = M(s, t);
+    const n = (i = t.tags.param_name) == null ? void 0 : i[0], r = ((a = t.tags.attributes) == null ? void 0 : a.flat()) ?? [], s = { ...e, name: n, attributes: r }, o = C(s, t);
     return n.decl.ident.declElem = o, o;
   }
-), ts = w(
+), is = E(
   "struct",
   (t, e) => {
     var a, c, l;
     const n = (a = t.tags.type_name) == null ? void 0 : a[0], r = t.tags.members, s = ((c = t.tags.attributes) == null ? void 0 : c.flat()) ?? [];
     n.ident.dependentScope = (l = t.tags.struct_scope) == null ? void 0 : l[0];
-    const o = { ...e, name: n, attributes: s, members: r }, i = M(o, t);
+    const o = { ...e, name: n, attributes: s, members: r }, i = C(o, t);
     return n.ident.declElem = i, i;
   }
-), es = w(
+), as = E(
   "member",
   (t, e) => {
     var i, a, c;
     const n = (i = t.tags.nameElem) == null ? void 0 : i[0], r = (a = t.tags.typeRefElem) == null ? void 0 : a[0], s = (c = t.tags.attribute) == null ? void 0 : c.flat(3), o = { ...e, name: n, attributes: s, typeRef: r };
-    return M(o, t);
+    return C(o, t);
   }
-), ln = w(
+), fn = E(
   "attribute",
   (t, e) => {
     var s;
     const n = (s = t.tags.attr_variant) == null ? void 0 : s[0];
     return { ...e, attribute: n };
   }
-), ns = ae("assert"), it = ae("statement"), rs = ae("switch-clause");
-function ae(t) {
-  return w(t, (e, n) => {
+), cs = ce("assert"), at = ce("statement"), ls = ce("switch-clause");
+function ce(t) {
+  return E(t, (e, n) => {
     var o;
     const r = (o = e.tags.attribute) == null ? void 0 : o.flat(3), s = { ...n, attributes: r };
-    return M(s, e);
+    return C(s, e);
   });
 }
-const ss = w(
+const us = E(
   "attribute",
   (t, e) => {
     var a;
     const n = t.tags.attrParam, o = { kind: "@attribute", name: (a = t.tags.name) == null ? void 0 : a[0], params: n };
     return { ...e, attribute: o };
   }
-), os = w(
+), ds = E(
   "type",
-  // @ts-ignore
+  // @ts-expect-error type mismatch
   (t, e) => {
     var i, a;
     const n = (i = t.tags.templateParam) == null ? void 0 : i.flat(3), r = (a = t.tags.typeRefName) == null ? void 0 : a[0], s = typeof r == "string" ? r : r.ident, o = {
@@ -1399,27 +1416,27 @@ const ss = w(
       name: s,
       templateParams: n
     };
-    return M(o, t);
+    return C(o, t);
   }
-), un = w(
+), pn = E(
   "expression",
   (t, e) => {
     const n = { ...e };
-    return M(n, t);
+    return C(n, t);
   }
 );
-function is(t) {
+function fs(t) {
   var r;
   const e = (r = t.tags.const_assert) == null ? void 0 : r.flat()[0], n = t.app.stable;
   n.moduleAsserts || (n.moduleAsserts = []), n.moduleAsserts.push(e);
 }
-const as = w(
+const ps = E(
   "stuff",
   (t, e) => {
     const n = { ...e };
-    return M(n, t);
+    return C(n, t);
   }
-), cs = w(
+), ms = E(
   "memberRef",
   (t, e) => {
     const { component: n, structRef: r, extra_components: s } = t.tags, o = n == null ? void 0 : n[0], i = r == null ? void 0 : r.flat()[0], a = s == null ? void 0 : s.flat()[0], c = {
@@ -1428,36 +1445,36 @@ const as = w(
       member: o,
       extraComponents: a
     };
-    return M(c, t);
+    return C(c, t);
   }
 );
-function dn(t) {
+function mn(t) {
   const { start: e, end: n, src: r } = t, s = r.slice(e, n), o = { kind: "name", start: e, end: n, name: s };
-  return nt(t, o), o;
+  return rt(t, o), o;
 }
-const ls = w(
+const gs = E(
   "module",
   (t, e) => {
-    const n = { ...t, start: 0, end: t.src.length }, r = M(e, n), s = t.app.stable;
+    const n = { ...t, start: 0, end: t.src.length }, r = C(e, n), s = t.app.stable;
     return s.moduleElem = r, r;
   }
 );
-function us(t) {
+function hs(t) {
   var a, c;
   const { start: e, end: n } = t, r = (a = t.tags.directive) == null ? void 0 : a.flat()[0], i = { kind: "directive", attributes: (c = t.tags.attribute) == null ? void 0 : c.flat(), start: e, end: n, directive: r };
-  return nt(t, i), i;
-}
-const R = {
-  before: rn,
-  after: on
-}, Ee = {
-  before: rn,
-  after: Jr
-}, It = {
-  before: Xr,
-  after: on
+  return rt(t, i), i;
+}
+const I = {
+  before: an,
+  after: ln
+}, $e = {
+  before: an,
+  after: ts
+}, Bt = {
+  before: Qr,
+  after: ln
 };
-function w(t, e) {
+function E(t, e) {
   return {
     before: (n) => {
       const r = { kind: t, contents: [] };
@@ -1467,15 +1484,15 @@ function w(t, e) {
       const s = n.app.context.openElems.pop();
       console.assert(s && s.kind === t);
       const o = e(n, { ...s, start: n.start, end: n.end });
-      return o && nt(n, o), o;
+      return o && rt(n, o), o;
     }
   };
 }
-function M(t, e) {
-  const n = ds(e, t);
+function C(t, e) {
+  const n = bs(e, t);
   return { ...t, contents: n };
 }
-function ds(t, e) {
+function bs(t, e) {
   let { start: n } = t;
   const r = t.app.stable, { contents: s, end: o } = e, i = s.sort((l, d) => l.start - d.start), a = [];
   for (const l of i)
@@ -1485,81 +1502,81 @@ function ds(t, e) {
     return { kind: "text", start: n, end: l, srcModule: r.srcModule };
   }
 }
-const P = Jt("word"), fn = Jt("keyword"), mt = $t(
+const M = Kt("word"), gn = Kt("keyword"), gt = Pt(
   "::",
-  m(P, fn, "package", "super")
-), fs = Jt("number");
+  m(M, gn, "package", "super")
+), xs = Kt("number");
 function Ut(t, e) {
   return { kind: "import-statement", segments: t, finalSegment: e };
 }
-function vt(t) {
+function St(t) {
   return { kind: "import-segment", name: t };
 }
-function ps(t) {
+function ks(t) {
   return {
     kind: "import-collection",
     subtrees: t
   };
 }
-function Te(t, e) {
+function Pe(t, e) {
   return { kind: "import-item", name: t, as: e };
 }
-function pn(t, e) {
+function hn(t, e) {
   return e.segments = t.concat(e.segments), e;
 }
-let ce = null;
-const ms = m("super", "package", "import", "as"), gs = T(lr(ms), m(P, fn)), le = u(
-  gs,
+let le = null;
+const _s = m("super", "package", "import", "as"), vs = N(gr(_s), m(M, gn)), ue = u(
+  vs,
   m(
-    T(
+    N(
       "::",
       f(
         m(
-          G(() => ce),
-          G(() => le)
+          X(() => le),
+          X(() => ue)
         ),
         "invalid import, expected '{' or name"
       )
     ),
-    T("as", f(P, "invalid alias, expected name")).map(
-      (t) => Te("", t)
+    N("as", f(M, "invalid alias, expected name")).map(
+      (t) => Pe("", t)
     ),
-    kt().map(() => Te(""))
+    _t().map(() => Pe(""))
     // Optional
   )
 ).map(([t, e]) => {
   if (e.kind === "import-collection")
-    return Ut([vt(t)], e);
+    return Ut([St(t)], e);
   if (e.kind === "import-statement")
-    return pn([vt(t)], e);
+    return hn([St(t)], e);
   if (e.kind === "import-item")
     return e.name = t, Ut([], e);
-  D(e);
+  j(e);
 });
-ce = F(
+le = W(
   "{",
-  $t(",", () => le).map(ps),
+  Pt(",", () => ue).map(ks),
   f("}", "invalid import collection, expected }")
 );
-const hs = m(
-  qt("package", f("::", "invalid import, expected '::'")).map((t) => [
-    vt(t)
+const Ss = m(
+  Ft("package", f("::", "invalid import, expected '::'")).map((t) => [
+    St(t)
   ]),
-  B(
-    qt("super", f("::", "invalid import, expected '::'")).map(
-      vt
+  D(
+    Ft("super", f("::", "invalid import, expected '::'")).map(
+      St
     )
   )
-), bs = Kt(
-  F(
+), ys = Ht(
+  W(
     "import",
-    ir({
-      relative: h(hs),
+    fr({
+      relative: h(Ss),
       collection_or_statement: f(
-        m(ce, le),
+        m(le, ue),
         "invalid import, expected { or name"
       )
-    }).map(({ relative: t, collection_or_statement: e }) => e.kind === "import-statement" ? pn(t ?? [], e) : Ut(t ?? [], e)),
+    }).map(({ relative: t, collection_or_statement: e }) => e.kind === "import-statement" ? hn(t ?? [], e) : Ut(t ?? [], e)),
     f(";", "invalid import, expected ';'")
   )
 ).map(
@@ -1569,11 +1586,11 @@ const hs = m(
     start: t.span[0],
     end: t.span[1]
   })
-), xs = _(
-  N(bs).ptag("owo").collect(Gr)
-), ks = `alias break case const const_assert continue continuing 
+), ws = _(
+  $(ys).ptag("owo").collect(Zr)
+), Es = `alias break case const const_assert continue continuing 
   default diagnostic discard else enable false fn for if 
-  let loop override requires return struct switch true var while`.split(/\s+/), _s = `NULL Self abstract active alignas alignof as asm asm_fragment async attribute auto await 
+  let loop override requires return struct switch true var while`.split(/\s+/), Ts = `NULL Self abstract active alignas alignof as asm asm_fragment async attribute auto await 
   become binding_array cast catch class co_await co_return co_yield coherent column_major 
   common compile compile_fragment concept const_cast consteval constexpr constinit crate 
   debugger decltype delete demote demote_to_helper do dynamic_cast 
@@ -1587,24 +1604,29 @@ const hs = m(
   target template this thread_local throw trait try type typedef typeid typename typeof 
   union unless unorm unsafe unsized use using varying virtual volatile wgsl where with writeonly yield`.split(
   /\s+/
-), vs = /[ \t\n\v\f\r\u{0085}\u{200E}\u{200F}\u{2028}\u{2029}]+/u, Ss = "& && -> @ / ! [ ] { } :: : , == = != >>= >> >= > <<= << <= < % - -- . + ++ | || ( ) ; * ~ ^ // /* */ += -= *= /= %= &= |= ^= _", ys = /(?:(?:[_\p{XID_Start}][\p{XID_Continue}]+)|(?:[\p{XID_Start}]))/u, ws = new Set(ks.concat(_s)), Es = new RegExp(
+), Ns = /[ \t\n\v\f\r\u{0085}\u{200E}\u{200F}\u{2028}\u{2029}]+/u, $s = "& && -> @ / ! [ ] { } :: : , == = != >>= >> >= > <<= << <= < % - -- . + ++ | || ( ) ; * ~ ^ // /* */ += -= *= /= %= &= |= ^= _", Ps = /(?:(?:[_\p{XID_Start}][\p{XID_Continue}]+)|(?:[\p{XID_Start}]))/u, Ms = new Set(Es.concat(Ts)), Cs = new RegExp(
   // decimal_float_literal
   /(?:0[fh])|(?:[1-9][0-9]*[fh])/.source + /|(?:[0-9]*\.[0-9]+(?:[eE][+-]?[0-9]+)?[fh]?)/.source + /|(?:[0-9]+\.[0-9]*(?:[eE][+-]?[0-9]+)?[fh]?)/.source + /|(?:[0-9]+[eE][+-]?[0-9]+[fh]?)/.source + // hex_float_literal
   /|(?:0[xX][0-9a-fA-F]*\.[0-9a-fA-F]+(?:[pP][+-]?[0-9]+[fh]?)?)/.source + /|(?:0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*(?:[pP][+-]?[0-9]+[fh]?)?)/.source + /|(?:0[xX][0-9a-fA-F]+[pP][+-]?[0-9]+[fh]?)/.source + // hex_int_literal
   /|(?:0[xX][0-9a-fA-F]+[iu]?)/.source + // decimal_int_literal
   /|(?:0[iu]?)|(?:[1-9][0-9]*[iu]?)/.source
-), Ts = /\/\/|\/\*/, Ns = new Pr({
-  word: ys,
-  number: Es,
-  blankspaces: vs,
-  commentStart: Ts,
-  symbol: Mt(Ss),
+), As = /\/\/|\/\*/, Rs = new Br({
+  word: Ps,
+  number: Cs,
+  blankspaces: Ns,
+  commentStart: As,
+  symbol: Ct($s),
   // biome-ignore lint/correctness/noEmptyCharacterClassInRegex: TODO
   invalid: /[^]/
 });
-class $s {
+class Is {
   constructor(e) {
-    this.src = e, this.eolPattern = /[\n\v\f\u{0085}\u{2028}\u{2029}]|\r\n?/gu, this.blockCommentPattern = /\/\*|\*\//g, this.stream = new wr(new $r(e, Ns));
+    w(this, "stream");
+    /** New line */
+    w(this, "eolPattern", /[\n\v\f\u{0085}\u{2028}\u{2029}]|\r\n?/gu);
+    /** Block comments */
+    w(this, "blockCommentPattern", /\/\*|\*\//g);
+    this.src = e, this.stream = new Mr(new Ir(e, Rs));
   }
   checkpoint() {
     return this.stream.checkpoint();
@@ -1622,10 +1644,10 @@ class $s {
           e.text === "//" ? this.stream.reset(this.skipToEol(e.span[1])) : this.stream.reset(this.skipBlockComment(e.span[1]));
         else if (n === "word") {
           const r = e;
-          return ws.has(e.text) && (r.kind = "keyword"), r;
+          return Ms.has(e.text) && (r.kind = "keyword"), r;
         } else {
           if (n === "invalid")
-            throw new Y("Invalid token " + e.text, e.span);
+            throw new Z("Invalid token " + e.text, e.span);
           return e;
         }
     }
@@ -1639,7 +1661,7 @@ class $s {
       this.blockCommentPattern.lastIndex = n;
       const r = this.blockCommentPattern.exec(this.src);
       if (r === null)
-        throw new Y("Unclosed block comment!", [n, n]);
+        throw new Z("Unclosed block comment!", [n, n]);
       if (r[0] === "*/")
         return this.blockCommentPattern.lastIndex;
       if (r[0] === "/*")
@@ -1708,7 +1730,7 @@ class $s {
       const n = this.stream.nextToken();
       if (n === null) {
         const r = this.stream.checkpoint();
-        throw new Y("Unclosed bracket!", [r, r]);
+        throw new Z("Unclosed bracket!", [r, r]);
       }
       if (n.kind === "symbol") {
         if (n.text === "(")
@@ -1721,165 +1743,165 @@ class $s {
     }
   }
 }
-const mn = De((t) => t.nextTemplateStartToken()), gn = De((t) => t.nextTemplateEndToken()), ue = h(
+const bn = Oe((t) => t.nextTemplateStartToken()), xn = Oe((t) => t.nextTemplateEndToken()), de = h(
   u(
-    mn,
-    $t(",", () => Fs),
-    f(gn, "invalid template, expected '>'")
+    bn,
+    Pt(",", () => Xs),
+    f(xn, "invalid template, expected '>'")
   )
-), Ps = m("private", "workgroup", "uniform", "function"), Ms = u(
+), Bs = m("private", "workgroup", "uniform", "function"), Ds = u(
   "storage",
   h(u(",", m("read", "read_write")))
-), hn = h(
+), kn = h(
   u(
-    mn,
-    m(Ms, Ps),
-    f(gn, "invalid template, expected '>'")
+    bn,
+    m(Ds, Bs),
+    f(xn, "invalid template, expected '>'")
   )
-), Cs = u(
-  mt.collect(pt),
-  ue
-), As = m("true", "false", fs), Rs = u(
+), js = u(
+  gt.collect(mt),
+  de
+), Ls = m("true", "false", xs), Os = u(
   "(",
   () => v,
   f(")", "invalid expression, expected ')'")
-), Is = m(
-  As,
-  Rs,
-  u(Cs, h(G(() => kn)))
-), St = B(
+), qs = m(
+  Ls,
+  Os,
+  u(js, h(X(() => Sn)))
+), yt = D(
   m(
-    T(".", P),
-    ar(
-      F(
+    N(".", M),
+    pr(
+      W(
         "[",
         () => v,
         f("]", "invalid expression, expected ']'")
       )
     )
   )
-), bn = _(
+), _n = _(
   u(
-    mt.collect(pt, "structRef"),
-    u(".", P.collect(dn, "component")),
-    h(St.collect(as, "extra_components"))
-  ).collect(cs)
-), $ = m(
-  u(xt("symbol", ["!", "&", "*", "-", "~"]), () => $),
+    gt.collect(mt, "structRef"),
+    u(".", M.collect(mn, "component")),
+    h(yt.collect(ps, "extra_components"))
+  ).collect(ms)
+), P = m(
+  u(kt("symbol", ["!", "&", "*", "-", "~"]), () => P),
   m(
-    bn,
-    u(Is, h(St))
+    _n,
+    u(qs, h(yt))
   )
-), Bs = m(
+), Fs = m(
   // LATER I can skip template list discovery in these cases, because a&b<c cannot be a comparison. Must be a template
-  B(u("&", $)),
-  B(u("^", $)),
-  B(u("|", $))
-), Ne = m("%", "*", "/"), Ds = m("+", "-"), $e = (t) => {
-  const e = u("<<", $), n = u(">>", $), r = u(
-    N(u(Ne, $)),
-    N(
+  D(u("&", P)),
+  D(u("^", P)),
+  D(u("|", P))
+), Me = m("%", "*", "/"), Ws = m("+", "-"), Ce = (t) => {
+  const e = u("<<", P), n = u(">>", P), r = u(
+    $(u(Me, P)),
+    $(
       u(
-        Ds,
-        $,
-        N(u(Ne, $))
+        Ws,
+        P,
+        $(u(Me, P))
       )
     )
   );
   return t ? m(e, r) : m(e, n, r);
-}, jt = (t) => u(
-  $e(t),
+}, Lt = (t) => u(
+  Ce(t),
   h(
     u(
       // '<' is unambiguous, since templates were already caught by the primary expression inside of the previous unary_expression!
-      t ? xt("symbol", ["<", "<=", "!=", "=="]) : xt("symbol", [">", ">=", "<", "<=", "!=", "=="]),
+      t ? kt("symbol", ["<", "<=", "!=", "=="]) : kt("symbol", [">", ">=", "<", "<=", "!=", "=="]),
       // LATER I can skip template list discovery in this cases, because a>=b<c cannot be a comparison. Must be a template
-      $,
-      $e(t)
+      P,
+      Ce(t)
     )
   )
-), xn = (t) => u(
-  $,
+), vn = (t) => u(
+  P,
   m(
-    Bs,
+    Fs,
     u(
-      jt(t),
+      Lt(t),
       t ? (
         // Don't accept || or && in template mode
-        kt()
+        _t()
       ) : m(
-        B(
-          u("||", u($, jt(!1)))
+        D(
+          u("||", u(P, Lt(!1)))
         ),
-        B(
-          u("&&", u($, jt(!1)))
+        D(
+          u("&&", u(P, Lt(!1)))
         ),
-        kt().map(() => [])
+        _t().map(() => [])
       )
     )
   )
-), js = !1, v = xn(js), Ls = !0, Os = xn(Ls), qs = u(
-  mt.collect(pt, "typeRefName"),
-  () => ue
-).collect(os), K = _(
-  qs
-).ctag("typeRefElem"), Fs = m(
+), Us = !1, v = vn(Us), Vs = !0, zs = vn(Vs), Gs = u(
+  gt.collect(mt, "typeRefName"),
+  () => de
+).collect(ds), H = _(
+  Gs
+).ctag("typeRefElem"), Xs = m(
   // LATER Remove this, it's wrong. This should instead be done by inspecting the syntax tree.
-  K.ctag("templateParam"),
-  Os.collect(un, "templateParam")
-), kn = u(
+  H.ctag("templateParam"),
+  zs.collect(pn, "templateParam")
+), Sn = u(
   "(",
-  et(",", v),
+  nt(",", v),
   f(")", "invalid fn arguments, expected ')'")
-), at = Be("word").map(Mo), Us = u(
-  at,
-  h(T(".", f(at, "invalid diagnostic rule name, expected name")))
-), _n = F(
+), ct = Le("word").map(Do), Js = u(
+  ct,
+  h(N(".", f(ct, "invalid diagnostic rule name, expected name")))
+), yn = W(
   "(",
   f(
-    cr(at, ",", Us),
+    mr(ct, ",", Js),
     "invalid diagnostic control, expected rule name"
   ),
   u(h(","), f(")", "invalid diagnostic control, expected ')'"))
-), Wt = et(",", at, { requireOne: !0 }), vn = _(
-  T(
+), Vt = nt(",", ct, { requireOne: !0 }), wn = _(
+  N(
     "@",
     m(
       // These attributes have no arguments
       m("compute", "const", "fragment", "invariant", "must_use", "vertex").map(
-        (t) => wo([t, []])
+        (t) => Mo([t, []])
       ),
       // These attributes have arguments, but the argument doesn't have any identifiers
-      T(
+      N(
         "interpolate",
         f(
-          F("(", Wt, ")"),
+          W("(", Vt, ")"),
           "invalid @interpolate, expected '('"
         )
-      ).map(Eo),
-      T(
+      ).map(Co),
+      N(
         "builtin",
-        f(F("(", at, ")"), "invalid @builtin, expected '('")
-      ).map(To),
-      T(
+        f(W("(", ct, ")"), "invalid @builtin, expected '('")
+      ).map(Ao),
+      N(
         "diagnostic",
-        f(_n, "invalid @diagnostic, expected '('")
-      ).map(No)
+        f(yn, "invalid @diagnostic, expected '('")
+      ).map(Ro)
     ).ptag("attr_variant")
-  ).collect(ln)
-), Ws = _(
-  T(
+  ).collect(fn)
+), Ks = _(
+  N(
     u("@", "if"),
-    Kt(
-      F(
+    Ht(
+      W(
         "(",
-        G(() => yn),
+        X(() => Tn),
         u(h(","), ")")
       )
-    ).map(Po)
-  ).map($o).ptag("attr_variant").collect(ln)
-), Sn = _(
-  T(
+    ).map(Bo)
+  ).map(Io).ptag("attr_variant").collect(fn)
+), En = _(
+  N(
     "@",
     m(
       // These are normal attributes, with required arguments
@@ -1894,427 +1916,427 @@ const mn = De((t) => t.nextTemplateStartToken()), gn = De((t) => t.nextTemplateE
           "location",
           "size"
         ).ptag("name"),
-        f(() => Pe, "invalid attribute, expected '('")
+        f(() => Ae, "invalid attribute, expected '('")
       ),
       // Everything else is also a normal attribute, optional expression list
       u(
         // we don't want this to interfere with if_attribute,
         // but not("if") isn't necessary for now, since 'if' is a keyword, not a word
-        P.ptag("name"),
-        h(() => Pe)
+        M.ptag("name"),
+        h(() => Ae)
       )
     )
-  ).collect(ss)
-), Pe = F(
+  ).collect(us)
+), Ae = W(
   "(",
-  et(
+  nt(
     ",",
-    Kt(G(() => v)).collect(un, "attrParam")
+    Ht(X(() => v)).collect(pn, "attrParam")
     // LATER These unknown expressions have decls inside of them, that's why they're tough to replace!
   ),
   f(")", "invalid attribute arguments, expected ')'")
-), Vs = m(vn, Sn).ctag(
+), Hs = m(wn, En).ctag(
   "attribute"
-), zs = m(
-  Ws,
-  vn,
-  Sn
-).ctag("attribute"), S = N(zs), Vt = N(Vs), Gs = f(
-  P.collect(Rt, "type_name"),
+), Ys = m(
+  Ks,
+  wn,
+  En
+).ctag("attribute"), S = $(Ys), zt = $(Hs), Zs = f(
+  M.collect(It, "type_name"),
   "invalid type name, expected a name"
-), Xs = f(
-  P.collect(Rt, "fn_name"),
+), Qs = f(
+  M.collect(It, "fn_name"),
   "missing fn name"
-), Js = _(
+), to = _(
   u(
-    P.collect(tn, "decl_elem"),
-    h(u(":", K))
-  ).collect(ie)
-).ctag("var_name"), zt = f(Js, "invalid ident"), Gt = _(
+    M.collect(rn, "decl_elem"),
+    h(u(":", H))
+  ).collect(ae)
+).ctag("var_name"), Gt = f(to, "invalid ident"), Xt = _(
   f(
     u(
-      P.collect(Rt, "decl_elem"),
-      h(u(":", K.collect(R, "decl_type")))
-    ).collect(ie),
+      M.collect(It, "decl_elem"),
+      h(u(":", H.collect(I, "decl_type")))
+    ).collect(ae),
     "expected identifier"
   )
-).ctag("var_name"), Ks = _(
+).ctag("var_name"), eo = _(
   u(
     S,
-    P.collect(dn, "nameElem"),
+    M.collect(mn, "nameElem"),
     f(":", "invalid struct member, expected ':'"),
-    f(K, "invalid struct member, expected type specifier")
-  ).collect(es)
-).ctag("members"), Hs = u(
+    f(H, "invalid struct member, expected type specifier")
+  ).collect(as)
+).ctag("members"), no = u(
   S.collect((t) => t.tags.attribute, "attributes"),
   "struct",
-  f(Gs, "invalid struct, expected name"),
+  f(Zs, "invalid struct, expected name"),
   u(
     f("{", "invalid struct, expected '{'"),
-    $t(",", Ks),
+    Pt(",", eo),
     f("}", "invalid struct, expected '}'")
-  ).collect(R, "struct_scope")
-).collect(ts), de = u(
-  mt.collect(pt),
-  () => ue,
-  kn
-), Ys = _(
+  ).collect(I, "struct_scope")
+).collect(is), fe = u(
+  gt.collect(mt),
+  () => de,
+  Sn
+), ro = _(
   u(
     S.collect((t) => t.tags.attribute, "attributes"),
-    P.collect(tn, "decl_elem"),
+    M.collect(rn, "decl_elem"),
     h(
       u(
         ":",
-        f(K, "invalid fn parameter, expected type specifier")
+        f(H, "invalid fn parameter, expected type specifier")
       )
-    ).collect(ie, "param_name")
-  ).collect(Qr)
-).ctag("fn_param"), Zs = u("(", et(",", Ys), ")"), Qs = u(
+    ).collect(ae, "param_name")
+  ).collect(os)
+).ctag("fn_param"), so = u("(", nt(",", ro), ")"), oo = u(
   "var",
-  () => hn,
-  zt,
+  () => kn,
+  Gt,
   h(u("=", () => v))
   // no decl_scope, but I think that's ok
-).collect(_t("var")), to = u(
+).collect(vt("var")), io = u(
   S,
   "var",
-  () => hn,
-  Gt,
-  h(u("=", () => v.collect(R, "decl_scope"))),
+  () => kn,
+  Xt,
+  h(u("=", () => v.collect(I, "decl_scope"))),
   ";"
-).collect(_t("gvar")).collect(It), eo = m(
-  xt("keyword", ["true", "false"]).map(Co),
-  F(
-    ot("symbol", "("),
-    G(() => yn),
-    ot("symbol", ")")
-  ).map(Ro),
-  Be("word").map(Ao)
-), bt = m(
+).collect(vt("gvar")).collect(Bt), ao = m(
+  kt("keyword", ["true", "false"]).map(jo),
+  W(
+    it("symbol", "("),
+    X(() => Tn),
+    it("symbol", ")")
+  ).map(Oo),
+  Le("word").map(Lo)
+), xt = m(
   u(
-    ot("symbol", "!").map(Io),
-    G(() => bt)
-  ).map(Bo),
-  eo
-), yn = u(
-  bt,
+    it("symbol", "!").map(qo),
+    X(() => xt)
+  ).map(Fo),
+  ao
+), Tn = u(
+  xt,
   m(
-    B(
+    D(
       u(
-        ot("symbol", "||").map(Me),
+        it("symbol", "||").map(Re),
         f(
-          bt,
+          xt,
           "invalid expression, expected expression"
         )
       )
     ),
-    B(
+    D(
       u(
-        ot("symbol", "&&").map(Me),
+        it("symbol", "&&").map(Re),
         f(
-          bt,
+          xt,
           "invalid expression, expected expression"
         )
       )
     ),
-    kt().map(() => [])
+    _t().map(() => [])
   )
-).map(Do), wn = u(
+).map(Wo), Nn = u(
   S,
-  Nt("{"),
-  N(() => yt),
+  $t("{"),
+  $(() => wt),
   f("}", "invalid block, expected }")
-).collect(it), J = _(
+).collect(at), K = _(
   u(
     S,
     u(
-      Nt("{"),
-      N(() => yt),
+      $t("{"),
+      $(() => wt),
       f("}", "invalid block, expected '}'")
-    ).collect(R)
-  ).collect(it)
-), no = u(
+    ).collect(I)
+  ).collect(at)
+), co = u(
   S,
   m(
-    de,
-    () => Tn,
-    () => fe
+    fe,
+    () => Pn,
+    () => pe
   )
-), ro = u(
+), lo = u(
   S,
-  m(de, () => fe)
-), so = u(
+  m(fe, () => pe)
+), uo = u(
   // LATER consider allowing @if on for_init, expression and for_update
   "for",
   u(
     f("(", "invalid for loop, expected '('"),
-    h(no),
+    h(co),
     f(";", "invalid for loop, expected ';'"),
     h(v),
     f(";", "invalid for loop, expected ';'"),
-    h(ro),
+    h(lo),
     f(")", "invalid for loop, expected ')'"),
-    wn
-  ).collect(R)
-), oo = u(
+    Nn
+  ).collect(I)
+), fo = u(
   "if",
-  f(u(v, J), "invalid if statement"),
-  N(
+  f(u(v, K), "invalid if statement"),
+  $(
     u(
       "else",
       "if",
-      f(u(v, J), "invalid else if branch")
+      f(u(v, K), "invalid else if branch")
     )
   ),
   h(
-    u("else", f(J, "invalid else branch, expected '{'"))
+    u("else", f(K, "invalid else branch, expected '{'"))
   )
-), io = u(
+), po = u(
   "loop",
-  Vt,
+  zt,
   f(
     u(
       "{",
-      N(() => yt),
+      $(() => wt),
       h(
         _(
           u(
             S,
             "continuing",
-            Vt,
+            zt,
             "{",
-            N(() => yt),
+            $(() => wt),
             _(
               h(
                 u(
                   S,
                   u("break", "if", v, ";")
-                ).collect(it)
+                ).collect(at)
               )
             ),
             "}"
-          ).collect(it).collect(R)
+          ).collect(at).collect(I)
         )
       ),
       "}"
     ),
     "invalid loop statement"
   )
-).collect(R), ao = m("default", v), co = _(
+).collect(I), mo = m("default", v), go = _(
   u(
     S,
     m(
       u(
         "case",
-        et(",", ao, { requireOne: !0 }),
+        nt(",", mo, { requireOne: !0 }),
         h(":"),
-        J
+        K
       ),
-      u("default", h(":"), J)
-    ).collect(rs)
+      u("default", h(":"), K)
+    ).collect(ls)
   )
-), lo = u(S, "{", B(co), "}"), uo = u("switch", v, lo), fo = u("while", v, J), En = m(
-  so,
-  oo,
-  io,
+), ho = u(S, "{", D(go), "}"), bo = u("switch", v, ho), xo = u("while", v, K), $n = m(
   uo,
   fo,
+  po,
+  bo,
+  xo,
   u("break", ";"),
   // ambiguous with break if
   u("continue", f(";", "invalid statement, expected ';'")),
   u(";"),
   // LATER this one cannot have attributes in front of it
-  () => Nn,
+  () => Mn,
   u("discard", f(";", "invalid statement, expected ';'")),
   u("return", h(v), f(";", "invalid statement, expected ';'")),
-  u(de, f(";", "invalid statement, expected ';'")),
+  u(fe, f(";", "invalid statement, expected ';'")),
   u(
-    () => Tn,
+    () => Pn,
     f(";", "invalid statement, expected ';'")
   ),
   u(
-    () => fe,
+    () => pe,
     f(";", "invalid statement, expected ';'")
   )
-), po = _(
-  u(S, En).collect(it).collect(It)
-), mo = _(
-  u(Vt, En)
-), yt = m(
-  J,
-  mo,
-  po
-), rt = m(
-  bn,
-  u(mt.collect(pt), h(St)),
+), ko = _(
+  u(S, $n).collect(at).collect(Bt)
+), _o = _(
+  u(zt, $n)
+), wt = m(
+  K,
+  _o,
+  ko
+), st = m(
+  _n,
+  u(gt.collect(mt), h(yt)),
   u(
     "(",
-    () => rt,
+    () => st,
     ")",
-    h(St)
+    h(yt)
     // LATER this doesn't find member references.
   ),
-  u("&", () => rt),
-  u("*", () => rt)
-), Tn = _(
+  u("&", () => st),
+  u("*", () => st)
+), Pn = _(
   // LATER consider collecting these as var elems and scopes
   m(
     // Also covers the = expression case
-    Qs,
+    oo,
     u(
       "const",
-      zt,
+      Gt,
       f("=", "invalid const declaration, expected '='"),
       v
     ),
     u(
       "let",
-      zt,
+      Gt,
       f("=", "invalid let declaration, expected '='"),
       v
     )
   )
-), fe = m(
+), pe = m(
   u(
-    rt,
+    st,
     m("=", "<<=", ">>=", "%=", "&=", "*=", "+=", "-=", "/=", "^=", "|="),
     v
   ),
-  u(rt, m("++", "--")),
+  u(st, m("++", "--")),
   u("_", "=", v)
-), go = u(
+), vo = u(
   _(S.collect((t) => t.tags.attribute || [])).ctag(
     "fn_attributes"
   ),
-  Nt("fn"),
-  f(Xs, "invalid fn, expected function name"),
+  $t("fn"),
+  f(Qs, "invalid fn, expected function name"),
   u(
-    f(Zs, "invalid fn, expected function parameters").collect(
-      R,
+    f(so, "invalid fn, expected function parameters").collect(
+      I,
       "header_scope"
     ),
     h(
       u(
         "->",
         S.collect((t) => t.tags.attribute, "return_attributes"),
-        K.ctag("return_type").collect(R, "return_scope")
+        H.ctag("return_type").collect(I, "return_scope")
       )
     ),
-    f(wn, "invalid fn, expected function body").ctag("body_statement").collect(R, "body_scope")
+    f(Nn, "invalid fn, expected function body").ctag("body_statement").collect(I, "body_scope")
   )
-).collect(It, "fn_partial_scope").collect(Yr), ho = m(
+).collect(Bt, "fn_partial_scope").collect(rs), So = m(
   u(
     S,
     "override",
-    Gt,
-    u(h(u("=", v.collect(Ee, "decl_scope")))),
+    Xt,
+    u(h(u("=", v.collect($e, "decl_scope")))),
     ";"
-  ).collect(_t("override")),
+  ).collect(vt("override")),
   u(
     S,
     "const",
-    Gt,
+    Xt,
     "=",
-    u(v).collect(Ee, "decl_scope"),
+    u(v).collect($e, "decl_scope"),
     ";"
-  ).collect(_t("const"))
-).collect(It), bo = u(
+  ).collect(vt("const"))
+).collect(Bt), yo = u(
   S.collect((t) => t.tags.attribute, "attributes"),
   "alias",
-  f(P, "invalid alias, expected name").collect(
-    Rt,
+  f(M, "invalid alias, expected name").collect(
+    It,
     "alias_name"
   ),
   f("=", "invalid alias, expected '='"),
-  f(K, "invalid alias, expected type").collect(
-    R,
+  f(H, "invalid alias, expected type").collect(
+    I,
     "alias_scope"
   ),
   f(";", "invalid alias, expected ';'")
-).collect(Hr), Nn = _(
+).collect(ns), Mn = _(
   u(
     S,
     "const_assert",
     f(v, "invalid const_assert, expected expression"),
     f(";", "invalid statement, expected ';'")
-  ).collect(ns)
-).ctag("const_assert"), xo = _(
+  ).collect(cs)
+).ctag("const_assert"), wo = _(
   u(
     S,
-    qt(
+    Ft(
       m(
-        T("diagnostic", _n).map(vo),
-        T("enable", Wt).map(So),
-        T("requires", Wt).map(yo)
+        N("diagnostic", yn).map(No),
+        N("enable", Vt).map($o),
+        N("requires", Vt).map(Po)
       ).ptag("directive"),
       ";"
     )
-  ).collect(us)
-), ko = _(
+  ).collect(hs)
+), Eo = _(
   m(
-    go,
-    to,
-    ho,
+    vo,
+    io,
+    So,
     ";",
-    bo,
-    Nn.collect(is),
-    Hs
+    yo,
+    Mn.collect(fs),
+    no
   )
-), _o = u(
-  xs,
-  N(xo),
-  N(ko),
-  f(dr(), "invalid WESL, expected EOF")
-).collect(ls, "collectModule");
-function vo([t, e]) {
+), To = u(
+  ws,
+  $(wo),
+  $(Eo),
+  f(br(), "invalid WESL, expected EOF")
+).collect(gs, "collectModule");
+function No([t, e]) {
   return { kind: "diagnostic", severity: t, rule: e };
 }
-function So(t) {
+function $o(t) {
   return { kind: "enable", extensions: t };
 }
-function yo(t) {
+function Po(t) {
   return { kind: "requires", extensions: t };
 }
-function wo([t, e]) {
+function Mo([t, e]) {
   return {
     kind: "@attribute",
     name: t,
     params: e
   };
 }
-function Eo(t) {
+function Co(t) {
   return {
     kind: "@interpolate",
     params: t
   };
 }
-function To(t) {
+function Ao(t) {
   return {
     kind: "@builtin",
     param: t
   };
 }
-function No([t, e]) {
+function Ro([t, e]) {
   return {
     kind: "@diagnostic",
     severity: t,
     rule: e
   };
 }
-function $o(t) {
+function Io(t) {
   return {
     kind: "@if",
     param: t
   };
 }
-function Po(t) {
+function Bo(t) {
   return {
     kind: "translate-time-expression",
     expression: t.value,
     span: t.span
   };
 }
-function Mo(t) {
+function Do(t) {
   return {
     kind: "name",
     name: t.text,
@@ -2322,52 +2344,52 @@ function Mo(t) {
     end: t.span[1]
   };
 }
-function Co(t) {
+function jo(t) {
   return {
     kind: "literal",
     value: t.text,
     span: t.span
   };
 }
-function Ao(t) {
+function Lo(t) {
   return {
     kind: "translate-time-feature",
     name: t.text,
     span: t.span
   };
 }
-function Ro(t) {
+function Oo(t) {
   return {
     kind: "parenthesized-expression",
     expression: t
   };
 }
-function Io(t) {
+function qo(t) {
   return {
     value: t.text,
     span: t.span
   };
 }
-function Me(t) {
+function Re(t) {
   return {
     value: t.text,
     span: t.span
   };
 }
-function Bo([t, e]) {
+function Fo([t, e]) {
   return {
     kind: "unary-expression",
     operator: t,
     expression: e
   };
 }
-function Do([t, e]) {
+function Wo([t, e]) {
   let n = t;
   for (const [r, s] of e)
-    n = jo([n, r, s]);
+    n = Uo([n, r, s]);
   return n;
 }
-function jo([t, e, n]) {
+function Uo([t, e, n]) {
   return {
     kind: "binary-expression",
     operator: e,
@@ -2375,29 +2397,33 @@ function jo([t, e, n]) {
     right: n
   };
 }
-class Lo extends Error {
-  constructor(e) {
-    const n = e.src.src, [r, s] = Ct(e.cause.span[0], n);
-    let o = `${e.src.debugFilePath}:${r}:${s}`;
-    o += ` error: ${e.cause.message}
-`, o += Oe(n, e.cause.span).join(`
-`), super(o, {
-      cause: e.cause
-    }), this.span = e.cause.span, this.src = e.src;
+class Vo extends Error {
+  constructor(n) {
+    const r = n.src.src, [s, o] = At(n.cause.span[0], r);
+    let i = `${n.src.debugFilePath}:${s}:${o}`;
+    i += ` error: ${n.cause.message}
+`, i += We(r, n.cause.span).join(`
+`);
+    super(i, {
+      cause: n.cause
+    });
+    w(this, "span");
+    w(this, "src");
+    this.span = n.cause.span, this.src = n.src;
   }
 }
-function $n(t) {
-  const e = new $s(t.src), n = Pn(t), r = { stream: e, appState: n };
+function Cn(t) {
+  const e = new Is(t.src), n = An(t), r = { stream: e, appState: n };
   try {
-    if (_o.parse(r) === null)
+    if (To.parse(r) === null)
       throw new Error("parseWESL failed");
   } catch (s) {
-    if (s instanceof Y) {
-      const [o, i] = Ct(
+    if (s instanceof Z) {
+      const [o, i] = At(
         s.span[0],
         t.src
-      ), a = new Lo({ cause: s, src: t });
-      ne({
+      ), a = new Vo({ cause: s, src: t });
+      re({
         url: t.debugFilePath,
         text: t.src,
         error: a,
@@ -2410,26 +2436,26 @@ function $n(t) {
   }
   return n.stable;
 }
-function Pn(t) {
-  const e = Je(null);
+function An(t) {
+  const e = Ye(null);
   return {
     context: { scope: e, openElems: [] },
     stable: { srcModule: t, imports: [], rootScope: e, moduleElem: null }
   };
 }
-function pa() {
-  return Pn({
+function ha() {
+  return An({
     modulePath: "package::test",
     debugFilePath: "./test.wesl",
     src: ""
   });
 }
-function Oo(t) {
+function zo(t) {
   if (t._flatImports) return t._flatImports;
-  const e = t.imports.flatMap(Ur);
+  const e = t.imports.flatMap(Jr);
   return t._flatImports = e, e;
 }
-const qo = `bitcast all any select arrayLength 
+const Go = `bitcast all any select arrayLength 
   abs acos acosh asin asinh atan atanh atan2 ceil clamp cos cosh 
   countLeadingZeros countOneBits countTrailingZeros cross 
   degrees determinant distance dot dot4U8Packed dot4I8Packed 
@@ -2457,15 +2483,15 @@ const qo = `bitcast all any select arrayLength
   subgroupExclusiveAdd subgroupExclusiveMul subgroupInclusiveAdd 
   subgroupInclusiveMul subgroupMax subgroupMin subgroupMul subgroupOr 
   subgroupShuffle subgroupShuffleUp subgroupShuffleXor subgroupXor
-  quadBroadcast quadSwapDiagonal quadSwapX quadSwapY`.split(/\s+/), Mn = `
+  quadBroadcast quadSwapDiagonal quadSwapX quadSwapY`.split(/\s+/), Rn = `
   texture_1d texture_2d texture_2d_array texture_3d 
   texture_cube texture_cube_array
-`, Cn = `
+`, In = `
   texture_multisampled_2d texture_depth_multisampled_2d
-`, An = `
+`, Bn = `
   texture_storage_1d texture_storage_2d texture_storage_2d_array 
   texture_storage_3d
-`, Fo = `array atomic bool f16 f32 i32 
+`, Xo = `array atomic bool f16 f32 i32 
   mat2x2 mat2x3 mat2x4 mat3x2 mat3x3 mat3x4 mat4x2 mat4x3 mat4x4
   mat2x2f mat2x3f mat2x4f mat3x2f mat3x3f mat3x4f
   mat4x2f mat4x3f mat4x4f
@@ -2474,10 +2500,10 @@ const qo = `bitcast all any select arrayLength
   u32 vec2 vec3 vec4 ptr
   vec2i vec3i vec4i vec2u vec3u vec4u
   vec2f vec3f vec4f vec2h vec3h vec4h
-  ${Mn}
-  ${Cn}
+  ${Rn}
+  ${In}
   texture_external
-  ${An}
+  ${Bn}
   texture_depth_2d texture_depth_2d_array texture_depth_cube
   texture_depth_cube_array
   sampler sampler_comparison
@@ -2485,25 +2511,25 @@ const qo = `bitcast all any select arrayLength
   rgba16uint rgba16sint rgba16float 
   r32uint r32sint r32float rg32uint rg32sint rg32float
   rgba32uint rgba32sint rgba32float
-  bgra8unorm`.split(/\s+/), Uo = `read write read_write 
+  bgra8unorm`.split(/\s+/), Jo = `read write read_write 
   function private workgroup uniform storage
   rgba8unorm rgba8snorm rgba8uint rgba8sint 
   rgba16uint rgba16sint rgba16float 
   r32uint r32sint r32float rg32uint rg32sint rg32float
   rgba32uint rgba32sint rgba32float bgra8unorm`.split(/\s+/);
-function Rn(t) {
-  return Fo.includes(t);
+function Dn(t) {
+  return Xo.includes(t);
 }
-function Wo(t) {
-  return qo.includes(t) || Rn(t);
+function Ko(t) {
+  return Go.includes(t) || Dn(t);
 }
-function Vo(t) {
-  return Uo.includes(t);
+function Ho(t) {
+  return Jo.includes(t);
 }
-function zo(t) {
-  const { rootAst: e, registry: n, virtuals: r, accumulateUnbound: s } = t, { conditions: o = {}, mangler: i = Ze } = t, { rootScope: a } = e, c = /* @__PURE__ */ new Set(), l = /* @__PURE__ */ new Set(), d = Bt(a, o);
-  d.forEach((j) => {
-    j.mangledName = j.originalName, c.add(j.originalName), l.add(j);
+function Yo(t) {
+  const { rootAst: e, registry: n, virtuals: r, accumulateUnbound: s } = t, { conditions: o = {}, mangler: i = en } = t, { rootScope: a } = e, c = /* @__PURE__ */ new Set(), l = /* @__PURE__ */ new Set(), d = Dt(a, o);
+  d.forEach((L) => {
+    L.mangledName = L.originalName, c.add(L.originalName), l.add(L);
   });
   const p = s ? [] : void 0, g = /* @__PURE__ */ new Map(), x = {
     registry: n,
@@ -2515,10 +2541,10 @@ function zo(t) {
     virtuals: r,
     mangler: i,
     unbound: p
-  }, E = d.map((j) => [j.originalName, j]), C = { decls: new Map(E), parent: null }, U = ct(a, x, C, !0), W = [...g.values()];
-  return { decls: U, globalNames: c, newStatements: W, unbound: p };
+  }, T = d.map((L) => [L.originalName, L]), A = { decls: new Map(T), parent: null }, U = lt(a, x, A, !0), V = [...g.values()];
+  return { decls: U, globalNames: c, newStatements: V, unbound: p };
 }
-function ma(t) {
+function ba(t) {
   const e = {
     registry: t,
     conditions: {},
@@ -2526,22 +2552,22 @@ function ma(t) {
     foundScopes: /* @__PURE__ */ new Set(),
     globalNames: /* @__PURE__ */ new Set(),
     globalStatements: /* @__PURE__ */ new Map(),
-    mangler: Ze,
+    mangler: en,
     unbound: [],
     dontFollowDecls: !0
   };
   return Object.entries(t.modules).map(([n, r]) => {
-    const o = Bt(r.rootScope, {}).map((a) => [a.originalName, a]), i = { decls: new Map(o), parent: null };
-    ct(r.rootScope, e, i, !0);
+    const o = Dt(r.rootScope, {}).map((a) => [a.originalName, a]), i = { decls: new Map(o), parent: null };
+    lt(r.rootScope, e, i, !0);
   }), e.unbound;
 }
-function Bt(t, e) {
+function Dt(t, e) {
   const n = [];
   for (const r of t.contents)
-    r.kind === "decl" ? (r.declElem, We(r.declElem, e) && n.push(r)) : r.kind === "partial" && n.push(...Bt(r, e));
+    r.kind === "decl" ? (r.declElem, Ge(r.declElem, e) && n.push(r)) : r.kind === "partial" && n.push(...Dt(r, e));
   return n;
 }
-function ct(t, e, n, r = !1) {
+function lt(t, e, n, r = !1) {
   const { dontFollowDecls: s, foundScopes: o } = e;
   if (o.has(t)) return [];
   o.add(t);
@@ -2552,75 +2578,75 @@ function ct(t, e, n, r = !1) {
       const p = l;
       r || n.decls.set(p.originalName, p);
     } else if (d === "ref") {
-      const p = Xo(l, n, e);
+      const p = Qo(l, n, e);
       p && i.push(p);
     } else {
-      const p = Jo(l, n, e);
+      const p = ti(l, n, e);
       p && a.push(...p);
     }
   });
-  const c = s ? [] : Go(i, e);
+  const c = s ? [] : Zo(i, e);
   return [i, a, c].flat();
 }
-function Go(t, e) {
+function Zo(t, e) {
   const { conditions: n } = e;
   return t.flatMap((r) => {
     const s = r.dependentScope;
     if (s) {
-      const o = Ho(r, n);
+      const o = ni(r, n);
       if (o) {
-        const i = Ye(o);
-        return ct(s, e, i);
+        const i = tn(o);
+        return lt(s, e, i);
       }
     }
     return [];
   });
 }
-function Xo(t, e, n) {
+function Qo(t, e, n) {
   const { registry: r, conditions: s, unbound: o } = n, { virtuals: i } = n;
   if (!t.refersTo && !t.std) {
-    const a = In(t, e) ?? Qo(t, r, s, i, o);
+    const a = jn(t, e) ?? oi(t, r, s, i, o);
     if (a)
-      return t.refersTo = a.decl, Ko(t, a, n);
-    Zo(t.originalName) ? t.std = !0 : o || Fe(t, `unresolved identifier '${t.originalName}'`);
+      return t.refersTo = a.decl, ei(t, a, n);
+    si(t.originalName) ? t.std = !0 : o || Ve(t, `unresolved identifier '${t.originalName}'`);
   }
 }
-function Jo(t, e, n) {
+function ti(t, e, n) {
   const { conditions: r } = n;
-  if (!Ve(t, r)) return;
+  if (!Xe(t, r)) return;
   const { kind: s } = t;
   if (s === "scope") {
-    const o = Ye(e);
-    return ct(t, n, o);
+    const o = tn(e);
+    return lt(t, n, o);
   } else if (s === "partial")
-    return ct(t, n, e);
+    return lt(t, n, e);
 }
-function Ko(t, e, n) {
+function ei(t, e, n) {
   const { decl: r, moduleAst: s } = e, { knownDecls: o, globalNames: i, mangler: a, globalStatements: c } = n;
   if (!o.has(r)) {
     o.add(r);
     const { srcModule: l } = r, d = t.originalName;
-    if (Yo(d, r, i, l, a), pe(r)) {
+    if (ri(d, r, i, l, a), me(r)) {
       const { moduleAsserts: p } = s, g = p == null ? void 0 : p.map((x) => ({ srcModule: l, elem: x }));
       return g == null || g.forEach((x) => c.set(x.elem, x)), r;
     }
   }
 }
-function Ho(t, e) {
-  t.isGlobal, At(t);
+function ni(t, e) {
+  t.isGlobal, Rt(t);
   let n = t.containingScope;
   for (; n.parent; )
     n = n.parent;
   n.kind;
   const r = n;
   if (r._scopeDecls) return r._scopeDecls;
-  const o = Bt(n, e).map((c) => [c.originalName, c]), a = { decls: new Map(o) };
+  const o = Dt(n, e).map((c) => [c.originalName, c]), a = { decls: new Map(o) };
   return r._scopeDecls = a, a;
 }
-function Yo(t, e, n, r, s) {
+function ri(t, e, n, r, s) {
   if (!e.mangledName) {
     let o;
-    if (pe(e)) {
+    if (me(e)) {
       const i = t.lastIndexOf("::"), a = i === -1 ? t : t.slice(i + 2);
       o = s(e, r, a, n);
     } else
@@ -2628,21 +2654,21 @@ function Yo(t, e, n, r, s) {
     e.mangledName = o, n.add(o);
   }
 }
-function Zo(t) {
-  return Rn(t) || Wo(t) || Vo(t);
+function si(t) {
+  return Dn(t) || Ko(t) || Ho(t);
 }
-function In(t, e) {
+function jn(t, e) {
   const { originalName: n } = t, r = e.decls.get(n);
   if (r)
     return { decl: r, moduleAst: t.ast };
   const { parent: s } = e;
   if (s)
-    return In(t, s);
+    return jn(t, s);
 }
-function Qo(t, e, n, r, s) {
-  const o = Oo(t.ast), i = t.originalName.split("::"), a = ei(i, o) ?? ti(i);
+function oi(t, e, n, r, s) {
+  const o = zo(t.ast), i = t.originalName.split("::"), a = ai(i, o) ?? ii(i);
   if (a) {
-    const { srcModule: c } = t.ast, l = ni(
+    const { srcModule: c } = t.ast, l = ci(
       a,
       c,
       e,
@@ -2654,28 +2680,28 @@ function Qo(t, e, n, r, s) {
         s.push(a);
       else {
         const d = `module not found for '${a.join("::")}'`;
-        Fe(t, d);
+        Ve(t, d);
       }
     return l;
   } else s && s.push(i);
 }
-function ti(t) {
+function ii(t) {
   if (t.length > 1) return t;
 }
-function ei(t, e) {
+function ai(t, e) {
   for (const n of e)
     if (n.importPath.at(-1) === t.at(0))
       return [...n.modulePath, ...t.slice(1)];
 }
-function ni(t, e, n, r = {}, s) {
-  const i = ri(t, e).slice(0, -1).join("::"), a = n.modules[i] ?? si(t[0], r, s);
+function ci(t, e, n, r = {}, s) {
+  const i = li(t, e).slice(0, -1).join("::"), a = n.modules[i] ?? ui(t[0], r, s);
   if (!a)
     return;
-  const c = Rr(t), l = Ke(a.rootScope, c, r);
+  const c = Or(t), l = Ze(a.rootScope, c, r);
   if (l)
     return { decl: l, moduleAst: a };
 }
-function ri(t, e) {
+function li(t, e) {
   const n = t.findLastIndex((r) => r === "super");
   if (n > -1) {
     const s = e.modulePath.split("::").slice(0, -(n + 1)), o = t.slice(n + 1);
@@ -2683,7 +2709,7 @@ function ri(t, e) {
   }
   return t;
 }
-function si(t, e = {}, n) {
+function ui(t, e = {}, n) {
   if (!n) return;
   const r = n[t];
   if (r) {
@@ -2694,41 +2720,41 @@ function si(t, e = {}, n) {
       debugFilePath: t,
       src: i
     };
-    return r.ast = $n(a), r.ast;
+    return r.ast = Cn(a), r.ast;
   }
 }
-function pe(t) {
+function me(t) {
   const { declElem: e } = t;
   return e ? ["alias", "const", "override", "fn", "struct", "gvar"].includes(
     e.kind
   ) : !1;
 }
-function Lt(t, e, n, r = !0) {
+function Ot(t, e, n, r = !0) {
   const s = { conditions: n, srcBuilder: t, extracting: r };
-  e.forEach((o) => me(o, s));
+  e.forEach((o) => ge(o, s));
 }
-function me(t, e) {
-  if (he(t, e.conditions))
+function ge(t, e) {
+  if (be(t, e.conditions))
     switch (t.kind) {
       // import statements are dropped from from emitted text
       case "import":
         return;
       // terminal elements copy strings to the output
       case "text":
-        oi(t, e);
+        di(t, e);
         return;
       case "name":
-        ii(t, e);
+        fi(t, e);
         return;
       case "synthetic":
-        ui(t, e);
+        hi(t, e);
         return;
       // identifiers are copied to the output, but with potentially mangled names
       case "ref":
-        di(t, e);
+        bi(t, e);
         return;
       case "decl":
-        ge(t, e);
+        he(t, e);
         return;
       // container elements just emit their child elements
       case "param":
@@ -2743,7 +2769,7 @@ function me(t, e) {
       case "statement":
       case "stuff":
       case "switch-clause":
-        lt(t, e);
+        ut(t, e);
         return;
       // root level container elements get some extra newlines to make the output prettier
       case "override":
@@ -2751,93 +2777,93 @@ function me(t, e) {
       case "assert":
       case "alias":
       case "gvar":
-        Ot(e), lt(t, e);
+        qt(e), ut(t, e);
         return;
       case "fn":
-        Ot(e), ai(t, e);
+        qt(e), pi(t, e);
         return;
       case "struct":
-        Ot(e), ci(t, e);
+        qt(e), mi(t, e);
         return;
       case "attribute":
-        Bn(t, e);
+        Ln(t, e);
         return;
       case "directive":
-        fi(t, e);
+        xi(t, e);
         return;
       default:
-        D(t);
+        j(t);
     }
 }
-function Ot(t) {
+function qt(t) {
   t.extracting && (t.srcBuilder.addNl(), t.srcBuilder.addNl());
 }
-function oi(t, e) {
+function di(t, e) {
   e.srcBuilder.addCopy(t.start, t.end);
 }
-function ii(t, e) {
+function fi(t, e) {
   e.srcBuilder.add(t.name, t.start, t.end);
 }
-function ai(t, e) {
+function pi(t, e) {
   const { attributes: n, name: r, params: s, returnAttributes: o, returnType: i, body: a } = t, { conditions: c, srcBuilder: l } = e;
-  Ce(n, e), l.add("fn ", r.start - 3, r.start), ge(r, e), l.appendNext("(");
-  const d = s.filter((p) => he(p, c));
+  Ie(n, e), l.add("fn ", r.start - 3, r.start), he(r, e), l.appendNext("(");
+  const d = s.filter((p) => be(p, c));
   d.forEach((p, g) => {
-    Xt(p, e), g < d.length - 1 && l.appendNext(", ");
-  }), l.appendNext(") "), i && (l.appendNext("-> "), Ce(o, e), lt(i, e), l.appendNext(" ")), lt(a, e);
+    Jt(p, e), g < d.length - 1 && l.appendNext(", ");
+  }), l.appendNext(") "), i && (l.appendNext("-> "), Ie(o, e), ut(i, e), l.appendNext(" ")), ut(a, e);
 }
-function Ce(t, e) {
+function Ie(t, e) {
   t == null || t.forEach((n) => {
-    Bn(n, e), e.srcBuilder.add(" ", n.start, n.end);
+    Ln(n, e), e.srcBuilder.add(" ", n.start, n.end);
   });
 }
-function ci(t, e) {
-  const { name: n, members: r, start: s, end: o } = t, { srcBuilder: i } = e, a = r.filter((l) => he(l, e.conditions)), c = a.length;
+function mi(t, e) {
+  const { name: n, members: r, start: s, end: o } = t, { srcBuilder: i } = e, a = r.filter((l) => be(l, e.conditions)), c = a.length;
   if (c === 0) {
-    li(t);
+    gi(t);
     return;
   }
-  i.add("struct ", s, n.start), ge(n, e), c === 1 ? (i.add(" { ", n.end, r[0].start), Xt(a[0], e), i.add(` }
+  i.add("struct ", s, n.start), he(n, e), c === 1 ? (i.add(" { ", n.end, r[0].start), Jt(a[0], e), i.add(` }
 `, o - 1, o)) : (i.add(` {
 `, n.end, r[0].start), a.forEach((l) => {
-    i.add("  ", l.start - 1, l.start), Xt(l, e), i.add(",", l.end, l.end + 1), i.addNl();
+    i.add("  ", l.start - 1, l.start), Jt(l, e), i.add(",", l.end, l.end + 1), i.addNl();
   }), i.add(`}
 `, o - 1, o));
 }
-function li(t) {
+function gi(t) {
   const { name: e, members: n } = t, r = n.length ? "(with current conditions)" : "", s = `struct '${e.ident.originalName}' has no members ${r}`;
-  Ue(e, s);
+  ze(e, s);
 }
-function ui(t, e) {
+function hi(t, e) {
   const { text: n } = t;
   e.srcBuilder.addSynthetic(n, n, 0, n.length);
 }
-function lt(t, e) {
-  t.contents.forEach((n) => me(n, e));
+function ut(t, e) {
+  t.contents.forEach((n) => ge(n, e));
 }
-function Xt(t, e) {
+function Jt(t, e) {
   t.contents.forEach((n) => {
     if (n.kind === "text") {
       const { srcModule: r, start: s, end: o } = n;
       if (r.src.slice(s, o).trim() === "")
         return;
     }
-    me(n, e);
+    ge(n, e);
   });
 }
-function di(t, e) {
+function bi(t, e) {
   if (t.ident.std)
     e.srcBuilder.add(t.ident.originalName, t.start, t.end);
   else {
-    const n = wt(t.ident), r = Dn(n);
+    const n = Et(t.ident), r = On(n);
     e.srcBuilder.add(r, t.start, t.end);
   }
 }
-function ge(t, e) {
-  const n = Dn(t.ident);
+function he(t, e) {
+  const n = On(t.ident);
   e.srcBuilder.add(n, t.start, t.end);
 }
-function Bn(t, e) {
+function Ln(t, e) {
   const { kind: n } = t.attribute;
   if (n === "@attribute") {
     const { params: r } = t.attribute;
@@ -2850,7 +2876,7 @@ function Bn(t, e) {
         r[0].start
       );
       for (let s = 0; s < r.length; s++)
-        lt(r[s], e), s < r.length - 1 && e.srcBuilder.add(",", r[s].end, r[s + 1].start);
+        ut(r[s], e), s < r.length - 1 && e.srcBuilder.add(",", r[s].end, r[s + 1].start);
       e.srcBuilder.add(")", r[r.length - 1].end, t.end);
     }
   } else n === "@builtin" ? e.srcBuilder.add(
@@ -2858,25 +2884,25 @@ function Bn(t, e) {
     t.start,
     t.end
   ) : n === "@diagnostic" ? e.srcBuilder.add(
-    "@diagnostic" + gt(t.attribute.severity, t.attribute.rule),
+    "@diagnostic" + ht(t.attribute.severity, t.attribute.rule),
     t.start,
     t.end
   ) : n === "@if" || (n === "@interpolate" ? e.srcBuilder.add(
     `@interpolate(${t.attribute.params.map((r) => r.name).join(", ")})`,
     t.start,
     t.end
-  ) : D(n));
+  ) : j(n));
 }
-function gt(t, e) {
+function ht(t, e) {
   const n = e[0].name + (e[1] !== null ? "." + e[1].name : "");
   return `(${t.name}, ${n})`;
 }
-function L(t) {
+function O(t) {
   const { kind: e } = t;
   if (e === "binary-expression")
-    return `${L(t.left)} ${t.operator.value} ${L(t.right)}`;
+    return `${O(t.left)} ${t.operator.value} ${O(t.right)}`;
   if (e === "unary-expression")
-    return `${t.operator.value}${L(t.expression)}`;
+    return `${t.operator.value}${O(t.expression)}`;
   if (e === "ref")
     return t.ident.originalName;
   if (e === "literal")
@@ -2884,19 +2910,19 @@ function L(t) {
   if (e === "translate-time-feature")
     return t.name;
   if (e === "parenthesized-expression")
-    return `(${L(t.expression)})`;
+    return `(${O(t.expression)})`;
   if (e === "component-expression")
-    return `${L(t.base)}[${t.access}]`;
+    return `${O(t.base)}[${t.access}]`;
   if (e === "component-member-expression")
-    return `${L(t.base)}.${t.access}`;
+    return `${O(t.base)}.${t.access}`;
   if (e === "call-expression")
-    return `${t.function.ident.originalName}(${t.arguments.map(L).join(", ")})`;
-  D(e);
+    return `${t.function.ident.originalName}(${t.arguments.map(O).join(", ")})`;
+  j(e);
 }
-function fi(t, e) {
+function xi(t, e) {
   const { directive: n } = t, { kind: r } = n;
   r === "diagnostic" ? e.srcBuilder.add(
-    `diagnostic${gt(n.severity, n.rule)};`,
+    `diagnostic${ht(n.severity, n.rule)};`,
     t.start,
     t.end
   ) : r === "enable" ? e.srcBuilder.add(
@@ -2907,12 +2933,12 @@ function fi(t, e) {
     `requires ${n.extensions.map((s) => s.name).join(", ")};`,
     t.start,
     t.end
-  ) : D(r);
+  ) : j(r);
 }
-function Dn(t) {
-  return pe(t) ? (t.mangledName, `${At(t)}`, t.mangledName) : t.mangledName || t.originalName;
+function On(t) {
+  return me(t) ? (t.mangledName, `${Rt(t)}`, t.mangledName) : t.mangledName || t.originalName;
 }
-function wt(t) {
+function Et(t) {
   let e = t;
   do {
     if (e.kind === "decl")
@@ -2921,7 +2947,7 @@ function wt(t) {
   } while (e);
   throw new Error(`unresolved identifer: ${t.originalName}`);
 }
-function he(t, e) {
+function be(t, e) {
   const n = t, { kind: r } = n;
   switch (r) {
     case "alias":
@@ -2938,145 +2964,145 @@ function he(t, e) {
     case "fn":
     case "struct":
     case "param":
-      return We(n, e);
+      return Ge(n, e);
   }
   return !0;
 }
-function pi(t) {
-  return jn(t) + ";";
+function ki(t) {
+  return qn(t) + ";";
 }
-function jn(t) {
+function qn(t) {
   return [
     ...t.segments.map((e) => e.name),
-    mi(t.finalSegment)
+    _i(t.finalSegment)
   ].join("::");
 }
-function mi(t) {
+function _i(t) {
   if (t.kind === "import-item") {
     const { name: e, as: n } = t, r = n ? ` as ${n}` : "";
     return `${e}${r}`;
   } else {
     if (t.kind === "import-collection")
-      return `{${t.subtrees.map((e) => jn(e)).join(", ")}}`;
-    Tt(t);
+      return `{${t.subtrees.map((e) => qn(e)).join(", ")}}`;
+    Nt(t);
   }
 }
-const Ln = 150;
-function Et(t, e = 0) {
-  const { kind: n } = t, r = new oe(e, Ln);
-  r.add(n), gi(t, r);
+const Fn = 150;
+function Tt(t, e = 0) {
+  const { kind: n } = t, r = new ie(e, Fn);
+  r.add(n), vi(t, r);
   let s = [];
-  return "contents" in t && (s = t.contents.map((o) => Et(o, e + 2))), s.length && (r.nl(), r.addBlock(s.join(`
+  return "contents" in t && (s = t.contents.map((o) => Tt(o, e + 2))), s.length && (r.nl(), r.addBlock(s.join(`
 `), !1)), r.result;
 }
-function gi(t, e) {
+function vi(t, e) {
   const { kind: n } = t;
   if (n === "text") {
     const { srcModule: r, start: s, end: o } = t;
     e.add(` '${r.src.slice(s, o)}'`);
   } else if (n === "var" || n === "let" || n === "gvar" || n === "const" || n === "override")
-    Ae(t.name, e), st(t.attributes, e);
+    Be(t.name, e), ot(t.attributes, e);
   else if (n === "struct")
     e.add(" " + t.name.ident.originalName);
   else if (n === "member") {
     const { name: r, typeRef: s, attributes: o } = t;
-    st(o, e), e.add(" " + r.name), e.add(": " + tt(s));
+    ot(o, e), e.add(" " + r.name), e.add(": " + et(s));
   } else if (n === "name")
     e.add(" " + t.name);
   else if (n === "memberRef") {
-    const { extraComponents: r } = t, s = r ? _i(r) : "";
+    const { extraComponents: r } = t, s = r ? Ti(r) : "";
     e.add(` ${t.name.ident.originalName}.${t.member.name}${s}`);
   } else if (n === "fn")
-    bi(t, e);
+    yi(t, e);
   else if (n === "alias") {
     const { name: r, typeRef: s } = t, o = r.ident.kind === "decl" ? "%" : "";
-    e.add(" " + o + r.ident.originalName), e.add("=" + tt(s));
+    e.add(" " + o + r.ident.originalName), e.add("=" + et(s));
   } else if (n === "attribute")
-    On(t.attribute, e);
+    Wn(t.attribute, e);
   else if (n === "expression") {
-    const r = t.contents.map((s) => s.kind === "text" ? "'" + s.srcModule.src.slice(s.start, s.end) + "'" : Et(s)).join(" ");
+    const r = t.contents.map((s) => s.kind === "text" ? "'" + s.srcModule.src.slice(s.start, s.end) + "'" : Tt(s)).join(" ");
     e.add(" " + r);
   } else if (n === "type") {
     const { name: r } = t, s = typeof r == "string" ? r : r.originalName;
     if (e.add(" " + s), t.templateParams !== void 0) {
-      const o = t.templateParams.map(Fn).join(", ");
+      const o = t.templateParams.map(Vn).join(", ");
       e.add("<" + o + ">");
     }
   } else if (n === "synthetic")
     e.add(` '${t.text}'`);
   else if (n === "import")
-    e.add(" " + pi(t.imports));
+    e.add(" " + ki(t.imports));
   else if (n === "ref")
     e.add(" " + t.ident.originalName);
   else if (n === "typeDecl")
-    Ae(t, e);
+    Be(t, e);
   else if (n === "decl") {
     const { ident: r } = t;
     e.add(" %" + r.originalName);
-  } else n === "assert" || n === "module" || n === "param" || n === "stuff" || (n === "directive" ? ki(t, e) : n === "statement" ? st(t.attributes, e) : n === "switch-clause" || Tt(n));
+  } else n === "assert" || n === "module" || n === "param" || n === "stuff" || (n === "directive" ? Ei(t, e) : n === "statement" ? ot(t.attributes, e) : n === "switch-clause" || Nt(n));
 }
-function On(t, e) {
+function Wn(t, e) {
   const { kind: n } = t;
   if (n === "@attribute") {
     const { name: r, params: s } = t;
-    e.add(" @" + r), s && s.length > 0 && (e.add("("), e.add(s.map(qn).join(", ")), e.add(")"));
+    e.add(" @" + r), s && s.length > 0 && (e.add("("), e.add(s.map(Un).join(", ")), e.add(")"));
   } else n === "@builtin" ? e.add(` @builtin(${t.param.name})`) : n === "@diagnostic" ? e.add(
-    ` @diagnostic${gt(t.severity, t.rule)}`
-  ) : n === "@if" ? (e.add(" @if"), e.add("("), e.add(L(t.param.expression)), e.add(")")) : n === "@interpolate" ? e.add(` @interpolate(${t.params.map((r) => r.name).join(", ")})`) : Tt(n);
+    ` @diagnostic${ht(t.severity, t.rule)}`
+  ) : n === "@if" ? (e.add(" @if"), e.add("("), e.add(O(t.param.expression)), e.add(")")) : n === "@interpolate" ? e.add(` @interpolate(${t.params.map((r) => r.name).join(", ")})`) : Nt(n);
 }
-function hi(t) {
-  const e = new oe(0, Ln);
-  return On(t, e), e.result;
+function Si(t) {
+  const e = new ie(0, Fn);
+  return Wn(t, e), e.result;
 }
-function Ae(t, e) {
+function Be(t, e) {
   const { decl: n, typeRef: r } = t;
-  e.add(" %" + n.ident.originalName), r && e.add(" : " + tt(r));
+  e.add(" %" + n.ident.originalName), r && e.add(" : " + et(r));
 }
-function bi(t, e) {
+function yi(t, e) {
   const { name: n, params: r, returnType: s, attributes: o } = t;
   e.add(" " + n.ident.originalName), e.add("(");
   const i = r.map(
     (a) => {
-      const { name: c } = a, { originalName: l } = c.decl.ident, d = tt(c.typeRef);
+      const { name: c } = a, { originalName: l } = c.decl.ident, d = et(c.typeRef);
       return l + ": " + d;
     }
   ).join(", ");
-  e.add(i), e.add(")"), st(o, e), s && e.add(" -> " + tt(s));
+  e.add(i), e.add(")"), ot(o, e), s && e.add(" -> " + et(s));
 }
-function st(t, e) {
-  t == null || t.forEach((n) => e.add(" " + xi(n.attribute)));
+function ot(t, e) {
+  t == null || t.forEach((n) => e.add(" " + wi(n.attribute)));
 }
-function xi(t) {
+function wi(t) {
   const { kind: e } = t;
   return e === "@attribute" ? "@" + t.name : e;
 }
-function ki(t, e) {
+function Ei(t, e) {
   const { directive: n, attributes: r } = t, { kind: s } = n;
   if (s === "diagnostic") {
-    const { severity: o, rule: i } = n, a = gt(o, i);
+    const { severity: o, rule: i } = n, a = ht(o, i);
     e.add(` diagnostic${a}`);
-  } else s === "enable" || s === "requires" ? e.add(` ${s} ${n.extensions.map((o) => o.name).join(", ")}`) : Tt(s);
-  st(r, e);
+  } else s === "enable" || s === "requires" ? e.add(` ${s} ${n.extensions.map((o) => o.name).join(", ")}`) : Nt(s);
+  ot(r, e);
 }
-function qn(t) {
-  return "contents" in t ? t.contents.map((n) => n.kind === "text" ? "'" + n.srcModule.src.slice(n.start, n.end) + "'" : Et(n)).join(" ") : Et(t);
+function Un(t) {
+  return "contents" in t ? t.contents.map((n) => n.kind === "text" ? "'" + n.srcModule.src.slice(n.start, n.end) + "'" : Tt(n)).join(" ") : Tt(t);
 }
-function Fn(t) {
-  return typeof t == "string" ? t : t.kind === "type" ? tt(t) : t.kind === "expression" ? qn(t) : (console.log("unknown template parameter type", t), "??");
+function Vn(t) {
+  return typeof t == "string" ? t : t.kind === "type" ? et(t) : t.kind === "expression" ? Un(t) : (console.log("unknown template parameter type", t), "??");
 }
-function tt(t) {
+function et(t) {
   if (!t) return "?type?";
   const { name: e } = t, n = typeof e == "string" ? e : e.originalName;
   let r = "";
-  return t.templateParams !== void 0 && (r = "<" + t.templateParams.map(Fn).join(", ") + ">"), n + r;
+  return t.templateParams !== void 0 && (r = "<" + t.templateParams.map(Vn).join(", ") + ">"), n + r;
 }
-function _i(t) {
+function Ti(t) {
   return t.contents.map((n) => {
     const { kind: r } = n;
     return r === "text" ? n.srcModule.src.slice(n.start, n.end) : r === "ref" ? n.ident.originalName : `?${n.kind}?`;
   }).join(" ");
 }
-class vi {
+class zn {
   constructor(e) {
     this.sourceMap = e;
   }
@@ -3107,11 +3133,11 @@ class vi {
         o(null);
         return;
       }
-      const a = this.mapGPUCompilationInfo(i), c = Si(
+      const a = this.mapGPUCompilationInfo(i), c = Ni(
         a,
         r
       );
-      Hn(c !== null);
+      nr(c !== null);
       const l = new GPUValidationError(
         c
       );
@@ -3136,7 +3162,7 @@ class vi {
     };
   }
   mapGPUCompilationMessage(e) {
-    const n = this.sourceMap, r = n.destToSrc(e.offset), o = (e.length > 0 ? n.destToSrc(e.offset + e.length) : r).position - r.position, [i, a] = Ct(
+    const n = this.sourceMap, r = n.destToSrc(e.offset), o = (e.length > 0 ? n.destToSrc(e.offset + e.length) : r).position - r.position, [i, a] = At(
       r.position,
       r.src.text
     );
@@ -3155,7 +3181,7 @@ class vi {
     };
   }
 }
-function Si(t, e) {
+function Ni(t, e) {
   if (t.messages.length === 0) return null;
   let n = `Compilation log for [Invalid ShaderModule (${e.label || "unlabled"})]:
 `;
@@ -3169,7 +3195,7 @@ function Si(t, e) {
     n += `${s.module.url}:${o}:${i}`, n += ` ${s.type}: ${s.message}
 `;
     const a = s.module.text;
-    a && (n += Oe(a, [
+    a && (n += We(a, [
       s.offset,
       s.offset + s.length
     ]).join(`
@@ -3177,63 +3203,69 @@ function Si(t, e) {
   }
   return n;
 }
-function yi(t) {
+function $i(t) {
   const n = t.split("/").filter((s) => s !== "."), r = [];
   return n.forEach((s) => {
     s !== "" && (s === ".." && r.length && r[r.length - 1] !== ".." ? r.pop() : r.push(s));
   }), r.join("/");
 }
-function wi(t) {
+function Pi(t) {
   const e = t.lastIndexOf("/"), n = e === -1 ? 0 : e + 1, r = t.indexOf(".", n), s = r === -1 ? t.length : r;
   return t.slice(0, s);
 }
-function Ei() {
-  return Lr(), { modules: {} };
+function Gn() {
+  return Vr(), { modules: {} };
 }
-function ga(t) {
+function xa(t) {
   return `modules: ${[...Object.keys(t.modules)]}`;
 }
-function Ti(t, e, n = "package") {
+function Mi(t, e, n = "package") {
   let r;
-  return e.includes("::") ? r = e : e.includes("/") || e.endsWith(".wesl") || e.endsWith(".wgsl") ? r = Vn(e, n) : r = n + "::" + e, t.modules[r];
+  return e.includes("::") ? r = e : e.includes("/") || e.endsWith(".wesl") || e.endsWith(".wgsl") ? r = Xn(e, n) : r = n + "::" + e, t.modules[r];
 }
-function Un(t, e, n = "package", r) {
+function xe(t, e, n = "package", r) {
   let s = r;
   s === void 0 ? s = "" : s.endsWith("/") || (s += "/"), Object.entries(t).map(
-    ([i, a]) => ({ modulePath: Vn(i, n), debugFilePath: s + i, src: a })
+    ([i, a]) => ({ modulePath: Xn(i, n), debugFilePath: s + i, src: a })
   ).forEach((i) => {
-    const a = $n(i);
+    const a = Cn(i);
     if (e.modules[i.modulePath])
       throw new Error(`duplicate module path: '${i.modulePath}'`);
     e.modules[i.modulePath] = a;
   });
 }
-function Wn(t, e) {
+function ke(t, e) {
   t.forEach(
-    ({ modules: n, name: r }) => Un(n, e, r)
+    ({ modules: n, name: r }) => xe(n, e, r)
   ), t.forEach(
-    ({ dependencies: n }) => Wn(n || [], e)
+    ({ dependencies: n }) => ke(n || [], e)
   );
 }
-const Ni = /^lib\.w[eg]sl$/i;
-function Vn(t, e) {
+const Ci = /^lib\.w[eg]sl$/i;
+function Xn(t, e) {
   if (t.includes("::"))
     return t;
-  if (e !== "package" && Ni.test(t))
+  if (e !== "package" && Ci.test(t))
     return e;
-  const r = wi(yi(t)).replaceAll("/", "::");
+  const r = Pi($i(t)).replaceAll("/", "::");
   return e + "::" + r;
 }
-async function ha(t) {
-  const { weslSrc: e, debugWeslRoot: n, libs: r = [] } = t, s = Ei();
-  Un(e, s, "package", n), Wn(r, s);
-  const o = $i({ registry: s, ...t });
-  return new vi(o);
-}
-function $i(t) {
-  const e = Pi(t), { transformedAst: n, newDecls: r, newStatements: s } = e;
-  return ht.build(
-    Ri(
+async function ka(t) {
+  const { weslSrc: e, debugWeslRoot: n, libs: r = [] } = t, s = Gn();
+  xe(e, s, "package", n), ke(r, s);
+  const o = Jn({ registry: s, ...t });
+  return new zn(o);
+}
+function _a(t) {
+  const { weslSrc: e, debugWeslRoot: n, libs: r = [] } = t, s = Gn();
+  xe(e, s, "package", n), ke(r, s);
+  const o = Jn({ registry: s, ...t });
+  return new zn(o);
+}
+function Jn(t) {
+  const e = Ai(t), { transformedAst: n, newDecls: r, newStatements: s } = e;
+  return bt.build(
+    Di(
       n.moduleElem,
       n.srcModule,
       r,
@@ -3242,133 +3274,133 @@ function $i(t) {
     )
   );
 }
-function Pi(t) {
-  const { registry: e, mangler: n } = t, { rootModuleName: r = "main", conditions: s = {} } = t, o = Ci(e, r), { constants: i, config: a } = t;
+function Ai(t) {
+  const { registry: e, mangler: n } = t, { rootModuleName: r = "main", conditions: s = {} } = t, o = Ii(e, r), { constants: i, config: a } = t;
   let { virtualLibs: c } = t;
-  i && (c = { ...c, constants: Mi(i) });
-  const l = c && Dr(c, (U) => ({ fn: U })), p = zo({ rootAst: o, registry: e, conditions: s, virtuals: l, mangler: n }), { globalNames: g, decls: x, newStatements: E } = p;
-  return { transformedAst: Ai(o, g, a), newDecls: x, newStatements: E };
+  i && (c = { ...c, constants: Ri(i) });
+  const l = c && Wr(c, (U) => ({ fn: U })), p = Yo({ rootAst: o, registry: e, conditions: s, virtuals: l, mangler: n }), { globalNames: g, decls: x, newStatements: T } = p;
+  return { transformedAst: Bi(o, g, a), newDecls: x, newStatements: T };
 }
-function Mi(t) {
+function Ri(t) {
   return () => Object.entries(t).map(([e, n]) => `const ${e} = ${n};`).join(`
 `);
 }
-function Ci(t, e) {
-  const n = Ti(t, e);
+function Ii(t, e) {
+  const n = Mi(t, e);
   if (!n)
     throw new Error(`Root module not found: ${e}`);
   return n;
 }
-function Ai(t, e, n) {
+function Bi(t, e, n) {
   const { moduleElem: r, srcModule: s } = t, o = { moduleElem: r, srcModule: s, globalNames: e, notableElems: {} }, i = (n == null ? void 0 : n.plugins) ?? [];
-  return ee(i, (l) => l.transform).reduce(
+  return ne(i, (l) => l.transform).reduce(
     (l, d) => d(l),
     o
   );
 }
-function Ri(t, e, n, r, s = {}) {
+function Di(t, e, n, r, s = {}) {
   const o = r.map((c) => {
-    const { elem: l, srcModule: d } = c, { src: p, debugFilePath: g } = d, x = new ht({ text: p, path: g });
-    return Lt(x, [l], s), x.addNl(), x;
-  }), i = new ht({
+    const { elem: l, srcModule: d } = c, { src: p, debugFilePath: g } = d, x = new bt({ text: p, path: g });
+    return Ot(x, [l], s), x.addNl(), x;
+  }), i = new bt({
     text: e.src,
     path: e.debugFilePath
   });
-  Lt(i, [t], s, !1);
+  Ot(i, [t], s, !1);
   const a = n.map((c) => {
-    const l = new ht({
+    const l = new bt({
       text: c.srcModule.src,
       path: c.srcModule.debugFilePath
     });
-    return Lt(l, [c.declElem], s), l;
+    return Ot(l, [c.declElem], s), l;
   });
   return [...o, i, ...a];
 }
-function zn(t, e) {
-  e(t), t.contents && t.contents.forEach((r) => zn(r, e));
+function Kn(t, e) {
+  e(t), t.contents && t.contents.forEach((r) => Kn(r, e));
 }
-function Ii(t) {
+function ji(t) {
   const { kind: e } = t.attribute;
   if (e === "@attribute") {
     const { params: n } = t.attribute;
-    return n === void 0 || n.length === 0 ? "@" + t.attribute.name : `@${t.attribute.name}(${n.map((r) => be(r)).join(", ")})`;
+    return n === void 0 || n.length === 0 ? "@" + t.attribute.name : `@${t.attribute.name}(${n.map((r) => _e(r)).join(", ")})`;
   } else {
     if (e === "@builtin")
       return "@builtin(" + t.attribute.param.name + ")";
     if (e === "@diagnostic")
-      return "@diagnostic" + gt(t.attribute.severity, t.attribute.rule);
+      return "@diagnostic" + ht(t.attribute.severity, t.attribute.rule);
     if (e === "@if")
-      return `@if(${L(t.attribute.param.expression)})`;
+      return `@if(${O(t.attribute.param.expression)})`;
     if (e === "@interpolate")
       return `@interpolate(${t.attribute.params.map((n) => n.name).join(", ")})`;
-    D(e);
+    j(e);
   }
 }
-function Dt(t) {
-  return `<${t.map(Gn).join(", ")}>`;
+function jt(t) {
+  return `<${t.map(Hn).join(", ")}>`;
 }
-function Gn(t) {
+function Hn(t) {
   if (t === void 0) return "?";
   if (typeof t == "string") return t;
-  if (t.kind === "expression") return be(t);
-  if (t.kind === "type") return Bi(t);
-  D(t);
+  if (t.kind === "expression") return _e(t);
+  if (t.kind === "type") return Li(t);
+  j(t);
 }
-function Bi(t) {
+function Li(t) {
   if (!t) return "?";
-  const { name: e, templateParams: n } = t, r = n ? Dt(n) : "";
-  return `${Xn(e)}${r}`;
+  const { name: e, templateParams: n } = t, r = n ? jt(n) : "";
+  return `${Yn(e)}${r}`;
 }
-function Xn(t) {
+function Yn(t) {
   if (typeof t == "string") return t;
   if (t.std) return t.originalName;
-  const e = wt(t);
+  const e = Et(t);
   return e.mangledName || e.originalName;
 }
-function be(t) {
+function _e(t) {
   if (t.kind === "translate-time-expression")
     throw new Error("Not supported");
   if (t.kind === "expression" || t.kind === "stuff")
     return t.contents.map((n) => {
       const { kind: r } = n;
-      return r === "text" ? n.srcModule.src.slice(n.start, n.end) : r === "ref" ? Xn(n.ident) : `?${n.kind}?`;
+      return r === "text" ? n.srcModule.src.slice(n.start, n.end) : r === "ref" ? Yn(n.ident) : `?${n.kind}?`;
     }).join(" ");
   if (t.kind === "name")
     return t.name;
-  D(t);
+  j(t);
 }
-const Di = Mt(An);
-Mt(Mn);
-Mt(Cn);
-function ba() {
+const Oi = Ct(Bn);
+Ct(Rn);
+Ct(In);
+function va() {
   return {
-    transform: ji
+    transform: qi
   };
 }
-function ji(t) {
-  const e = structuredClone(t), { moduleElem: n, globalNames: r, notableElems: s } = e, o = Fi(n);
-  Li(n, o);
+function qi(t) {
+  const e = structuredClone(t), { moduleElem: n, globalNames: r, notableElems: s } = e, o = Vi(n);
+  Fi(n, o);
   const i = o.flatMap(
-    (l) => Vi(l, r)
-  ), a = Ji(n);
+    (l) => Xi(l, r)
+  ), a = Yi(n);
   a.forEach(
-    ({ memberRef: l, struct: d }) => Yi(l, d)
+    ({ memberRef: l, struct: d }) => ta(l, d)
   ), a.forEach(
     ({ intermediates: l }) => l.forEach((d) => {
       d.contents = [];
     })
   );
-  const c = qi(n);
+  const c = Ui(n);
   return n.contents = [...i, ...c], s.bindingStructs = o, { ...e, moduleElem: n };
 }
-function Li(t, e) {
-  const n = t.contents.filter((s) => s.kind === "fn"), r = Oi(n, e);
+function Fi(t, e) {
+  const n = t.contents.filter((s) => s.kind === "fn"), r = Wi(n, e);
   if (r) {
     const { fn: s, struct: o } = r;
     o.entryFn = s;
   }
 }
-function Oi(t, e) {
+function Wi(t, e) {
   var n, r, s;
   for (const o of t) {
     const { params: i } = o;
@@ -3379,101 +3411,101 @@ function Oi(t, e) {
     }
   }
 }
-function qi(t) {
+function Ui(t) {
   return t.contents.filter(
     (e) => e.kind !== "struct" || !e.bindingStruct
   );
 }
-function Fi(t) {
-  const n = t.contents.filter((r) => r.kind === "struct").filter(Ui);
+function Vi(t) {
+  const n = t.contents.filter((r) => r.kind === "struct").filter(zi);
   return n.forEach((r) => {
     r.bindingStruct = !0;
   }), n;
 }
-function Ui(t) {
-  return t.members.some(({ attributes: e }) => Wi(e));
+function zi(t) {
+  return t.members.some(({ attributes: e }) => Gi(e));
 }
-function Wi(t) {
+function Gi(t) {
   return t ? t.some(
     ({ attribute: e }) => e.kind === "@attribute" && (e.name === "binding" || e.name === "group")
   ) : !1;
 }
-function Vi(t, e) {
+function Xi(t, e) {
   return t.members.map((n) => {
     var g;
-    const { typeRef: r, name: s } = n, { name: o } = r, i = r == null ? void 0 : r.templateParams, a = Qe(s.name, e);
+    const { typeRef: r, name: s } = n, { name: o } = r, i = r == null ? void 0 : r.templateParams, a = nn(s.name, e);
     n.mangledVarName = a, e.add(a);
-    const c = ((g = n.attributes) == null ? void 0 : g.map(Ii).join(" ")) ?? "", l = zi(o, i) ?? Gi(o, i) ?? Xi(o, i);
+    const c = ((g = n.attributes) == null ? void 0 : g.map(ji).join(" ")) ?? "", l = Ji(o, i) ?? Ki(o, i) ?? Hi(o, i);
     if (!l)
-      return console.log("unhandled case transforming member", o), Re(c, a, "", "??");
+      return console.log("unhandled case transforming member", o), De(c, a, "", "??");
     const { storage: d, varType: p } = l;
-    return Re(c, a, d, p);
+    return De(c, a, d, p);
   });
 }
-function zi(t, e) {
+function Ji(t, e) {
   if (t.originalName === "ptr") {
     const n = e ?? [], r = [n[0]];
     n[2] && r.push(n[2]);
-    const s = Dt(r), o = Gn(n == null ? void 0 : n[1]);
+    const s = jt(r), o = Hn(n == null ? void 0 : n[1]);
     return { storage: s, varType: o };
   }
 }
-function Gi(t, e) {
+function Ki(t, e) {
   if (typeof t != "string") {
-    const n = t.std ? t.originalName : "??", r = e ? Dt(e) : "";
+    const n = t.std ? t.originalName : "??", r = e ? jt(e) : "";
     return { varType: n + r, storage: "" };
   }
 }
-function Xi(t, e) {
-  if (Di.test(t.originalName)) {
-    const n = e ? Dt(e) : "";
+function Hi(t, e) {
+  if (Oi.test(t.originalName)) {
+    const n = e ? jt(e) : "";
     return { varType: t + n, storage: "" };
   }
 }
-function Re(t, e, n, r) {
+function De(t, e, n, r) {
   return {
     kind: "synthetic",
     text: `${t} var${n} ${e} : ${r};
 `
   };
 }
-function Ji(t) {
+function Yi(t) {
   const e = [];
-  return zn(t, (n) => {
+  return Kn(t, (n) => {
     n.kind === "memberRef" && e.push(n);
-  }), ee(e, Ki);
+  }), ne(e, Zi);
 }
-function Ki(t) {
-  const e = Hi(t.name.ident);
+function Zi(t) {
+  const e = Qi(t.name.ident);
   if (e != null && e.struct.bindingStruct)
     return { memberRef: t, ...e };
 }
-function Hi(t) {
+function Qi(t) {
   var r;
-  const n = wt(t).declElem;
+  const n = Et(t).declElem;
   if (n && n.kind === "param") {
     const s = (r = n.name.typeRef) == null ? void 0 : r.name;
     if (typeof s != "string") {
       if (s != null && s.std)
         return;
-      const i = wt(s).declElem;
+      const i = Et(s).declElem;
       return (i == null ? void 0 : i.kind) === "struct" ? { struct: i, intermediates: [n] } : void 0;
     }
   }
 }
-function Yi(t, e) {
+function ta(t, e) {
   const n = t.member.name, r = e.members.find((c) => c.name.name === n);
   if (!r || !r.mangledVarName)
     return { kind: "synthetic", text: n };
-  const { extraComponents: s } = t, o = s ? be(s) : "", a = { kind: "synthetic", text: r.mangledVarName + o };
+  const { extraComponents: s } = t, o = s ? _e(s) : "", a = { kind: "synthetic", text: r.mangledVarName + o };
   return t.contents = [a], a;
 }
-async function xa(t, e) {
+async function Sa(t, e) {
   if (!t)
     throw new Error("No GPU adapter");
-  return t.requestDevice(e).then(Zi);
+  return t.requestDevice(e).then(ea);
 }
-function Zi(t) {
+function ea(t) {
   const e = [];
   t.injectError = (r, s) => {
     const o = e.findLast((i) => i.filter === r);
@@ -3490,7 +3522,7 @@ function Zi(t) {
             const o = s.error;
             if (o.compilationInfo)
               for (const i of o.compilationInfo.messages)
-                ne({
+                re({
                   url: i.module.url,
                   text: i.module.text ?? null,
                   lineNumber: i.lineNum,
@@ -3529,67 +3561,68 @@ function Zi(t) {
   })(t.popErrorScope), t;
 }
 export {
-  vi as LinkedWesl,
-  Lo as WeslParseError,
-  $s as WeslStream,
-  Et as astToString,
-  hi as attributeToString,
-  Pi as bindAndTransform,
-  zo as bindIdents,
-  ba as bindingStructsPlugin,
-  Pn as blankWeslParseState,
-  la as childIdent,
-  se as childScope,
-  Or as containsScope,
-  _i as debugContentsToString,
-  Je as emptyScope,
-  Oe as errorHighlight,
-  ee as filterMap,
-  Br as findMap,
-  Ji as findRefsToBindingStructs,
-  ma as findUnboundIdents,
-  Bt as findValidRootDecls,
-  Oo as flatImports,
-  sa as groupBy,
-  ra as grouped,
-  At as identToString,
-  pe as isGlobal,
-  Rr as last,
-  fa as lengthPrefixMangle,
-  ha as link,
-  $i as linkRegistry,
-  ji as lowerBindingStructs,
-  Zi as makeWeslDevice,
-  aa as mapForward,
-  Dr as mapValues,
-  Fi as markBindingStructs,
-  Li as markEntryTypes,
-  Ft as mergeScope,
-  Ze as minimalMangle,
-  Qe as minimallyMangledName,
-  ea as multiKeySet,
-  re as nextIdentId,
-  wi as noSuffix,
-  yi as normalize,
-  Ct as offsetToLineNumber,
-  ca as overlapTail,
-  Un as parseIntoRegistry,
-  Wn as parseLibsIntoRegistry,
-  $n as parseSrcModule,
-  Ei as parsedRegistry,
-  oa as partition,
-  Ke as publicDecl,
-  ga as registryToString,
-  na as replaceWords,
-  xa as requestWeslDevice,
-  Lr as resetScopeIds,
-  ia as scan,
-  He as scopeToString,
-  ua as scopeToStringLong,
-  Ti as selectModule,
-  pa as syntheticWeslParseState,
-  Yi as transformBindingReference,
-  Vi as transformBindingStruct,
-  da as underscoreMangle
+  zn as LinkedWesl,
+  Vo as WeslParseError,
+  Is as WeslStream,
+  _a as _linkSync,
+  Tt as astToString,
+  Si as attributeToString,
+  Ai as bindAndTransform,
+  Yo as bindIdents,
+  va as bindingStructsPlugin,
+  An as blankWeslParseState,
+  fa as childIdent,
+  oe as childScope,
+  zr as containsScope,
+  Ti as debugContentsToString,
+  Ye as emptyScope,
+  We as errorHighlight,
+  ne as filterMap,
+  Fr as findMap,
+  Yi as findRefsToBindingStructs,
+  ba as findUnboundIdents,
+  Dt as findValidRootDecls,
+  zo as flatImports,
+  aa as groupBy,
+  ia as grouped,
+  Rt as identToString,
+  me as isGlobal,
+  Or as last,
+  ga as lengthPrefixMangle,
+  ka as link,
+  Jn as linkRegistry,
+  qi as lowerBindingStructs,
+  ea as makeWeslDevice,
+  ua as mapForward,
+  Wr as mapValues,
+  Vi as markBindingStructs,
+  Fi as markEntryTypes,
+  Wt as mergeScope,
+  en as minimalMangle,
+  nn as minimallyMangledName,
+  sa as multiKeySet,
+  se as nextIdentId,
+  Pi as noSuffix,
+  $i as normalize,
+  At as offsetToLineNumber,
+  da as overlapTail,
+  xe as parseIntoRegistry,
+  ke as parseLibsIntoRegistry,
+  Cn as parseSrcModule,
+  Gn as parsedRegistry,
+  ca as partition,
+  Ze as publicDecl,
+  xa as registryToString,
+  oa as replaceWords,
+  Sa as requestWeslDevice,
+  Vr as resetScopeIds,
+  la as scan,
+  Qe as scopeToString,
+  pa as scopeToStringLong,
+  Mi as selectModule,
+  ha as syntheticWeslParseState,
+  ta as transformBindingReference,
+  Xi as transformBindingStruct,
+  ma as underscoreMangle
 };
 //# sourceMappingURL=minified.js.map