@rohal12/spindle-lsp 0.15.37 → 0.15.39

package/dist/bin.js

@@ -55,7 +55,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = false ? pkg.version : "0.15.37";
+    VERSION = false ? pkg.version : "0.15.39";
   }
 });
 
@@ -10640,11 +10640,6 @@ var init_file_inputs = __esm({
 });
 
 // node_modules/@rohal12/spindle/dist/pkg/story-variables.js
-function effectiveNamedDefinitions(definitions) {
-  const latest = new NameMap();
-  for (const definition2 of definitions) latest.set(definition2.name, definition2);
-  return [...latest.values()];
-}
 function isSigil(c) {
   return c !== void 0 && SIGIL_CHARS.has(c);
 }
@@ -11067,79 +11062,96 @@ function peg$parse(input2, options) {
     return joinText(items);
   }
   function peg$f1() {
-    return !textMode;
+    return !htmlTextTag;
   }
   function peg$f2() {
-    return !textMode;
+    return !htmlTextTag;
   }
-  function peg$f3(tag) {
-    return tag;
+  function peg$f3() {
+    return !htmlTextTag;
   }
   function peg$f4() {
+    return !textMode && !htmlTextTag;
+  }
+  function peg$f5() {
+    return !textMode && !htmlTextTag;
+  }
+  function peg$f6(tag) {
+    if (!tag.isSelfClose && HTML_TEXT_ELEMENTS.has(tag.lower)) htmlTextTag = tag.lower;
+    return tag;
+  }
+  function peg$f7() {
     return !textMode;
   }
-  function peg$f5(tag) {
+  function peg$f8(tag) {
+    return !htmlTextTag || tag.lower === htmlTextTag;
+  }
+  function peg$f9(tag) {
+    htmlTextTag = "";
     return VOID_TAGS.has(tag.lower) ? null : tag;
   }
-  function peg$f6(tag) {
+  function peg$f10(tag) {
     rawName = tag.lower;
     return tag.kind === "open" && hooks.isRaw(rawName);
   }
-  function peg$f7(tag, b) {
+  function peg$f11(tag, b) {
     return b;
   }
-  function peg$f8(tag, body) {
+  function peg$f12(tag, body) {
     return body ? [tag, body] : tag;
   }
-  function peg$f9(tag) {
+  function peg$f13(tag) {
     return tag.kind === "close";
   }
-  function peg$f10(tag) {
+  function peg$f14(tag) {
     return tag;
   }
-  function peg$f11() {
+  function peg$f15() {
     return !textMode;
   }
-  function peg$f12(tag) {
+  function peg$f16(tag) {
     return tag;
   }
-  function peg$f13(start) {
+  function peg$f17(start) {
     return skipTo(hooks.rawBodyEnd(input2, start, rawName));
   }
-  function peg$f14(start) {
+  function peg$f18(start) {
     return skipEnd - offset2();
   }
-  function peg$f15(start, body, end) {
+  function peg$f19(start, body, end) {
     const loc = {
       start: { offset: start },
       end: { offset: start + body.length }
     };
     return [body ? lexeme("text", loc, { value: body }) : null, end];
   }
-  function peg$f16() {
+  function peg$f20() {
     return completionMode;
   }
-  function peg$f17(body) {
+  function peg$f21(body) {
     return lexeme("text", location(), { value: body });
   }
-  function peg$f18() {
+  function peg$f22() {
     return offset2();
   }
-  function peg$f19(value) {
+  function peg$f23(value) {
     return lexeme("text", location(), { value });
   }
-  function peg$f20(value) {
+  function peg$f24() {
+    return completionMode || offset2() <= lastCommentClose;
+  }
+  function peg$f25(value) {
     const node2 = lexeme("text", location(), { value });
     node2.comment = true;
     return node2;
   }
-  function peg$f21(bs2) {
+  function peg$f26(bs2) {
     return bs2.length % 2 === 1;
   }
-  function peg$f22(bs2, c) {
+  function peg$f27(bs2, c) {
     return c;
   }
-  function peg$f23(bs2, brace) {
+  function peg$f28(bs2, brace) {
     const loc = location();
     const next = input2.charAt(loc.end.offset);
     if (textMode) {
@@ -11156,48 +11168,48 @@ function peg$parse(input2, options) {
     escaped.escape = true;
     return bs2.length > 1 ? [before, escaped] : escaped;
   }
-  function peg$f24() {
+  function peg$f29() {
     return lexeme("text", location(), { value: LB });
   }
-  function peg$f25() {
-    return !textMode;
+  function peg$f30() {
+    return !textMode && !htmlTextTag;
   }
-  function peg$f26() {
+  function peg$f31() {
     return lexeme("text", location(), { value: "<" });
   }
-  function peg$f27() {
+  function peg$f32() {
     return lexeme("text", location(), { value: "[" });
   }
-  function peg$f28() {
+  function peg$f33() {
     return !textMode;
   }
-  function peg$f29(ss2, s, at3, inner) {
+  function peg$f34(ss2, s, at3, inner) {
     const link = lexeme("link", location(), parseLink(inner, at3, (separator) => linkSeparatorIndex(inner, at3, separator)));
     link.selectorSpan = selectorSpan(s, ss2, at3);
     return withSelectors(link, s);
   }
-  function peg$f30() {
+  function peg$f35() {
     return !textMode;
   }
-  function peg$f31() {
+  function peg$f36() {
     fail("Unclosed link: [[ without ]]", location(), "unclosed-link");
   }
-  function peg$f32(parts) {
+  function peg$f37(parts) {
     return selectorsOf(parts);
   }
-  function peg$f33() {
+  function peg$f38() {
     return NO_SELECTORS;
   }
-  function peg$f34(s, end) {
+  function peg$f39(s, end) {
     return {
       ...s,
       end
     };
   }
-  function peg$f35(prefix, name) {
+  function peg$f40(prefix, name) {
     return [prefix, name];
   }
-  function peg$f36(ss2, s, sigil, nameStart, name) {
+  function peg$f41(ss2, s, sigil, nameStart, name) {
     const variable = lexeme("variable", location(), {
       name,
       nameStart,
@@ -11207,7 +11219,7 @@ function peg$parse(input2, options) {
     variable.selectorSpan = selectorSpan(s, ss2, nameStart - 1);
     return withSelectors(variable, s);
   }
-  function peg$f37(ss2, s, after, expression) {
+  function peg$f42(ss2, s, after, expression) {
     const node2 = lexeme("expression", location(), {
       expression,
       expressionStart: after,
@@ -11216,33 +11228,33 @@ function peg$parse(input2, options) {
     node2.selectorSpan = selectorSpan(s, ss2, after);
     return withSelectors(node2, s);
   }
-  function peg$f38() {
+  function peg$f43() {
     fail("Unclosed {" + input2.substr(location().end.offset, 1) + "\u2026: no } ends it", location(), "unclosed-expression");
   }
-  function peg$f39(start) {
+  function peg$f44(start) {
     const end = hooks.closeBrace(input2, start, start);
     return skipTo(end < 0 && completionMode ? input2.length : end);
   }
-  function peg$f40(start) {
+  function peg$f45(start) {
     return skipEnd - offset2();
   }
-  function peg$f41(start, code) {
+  function peg$f46(start, code) {
     return code;
   }
-  function peg$f42() {
+  function peg$f47() {
     return completionMode;
   }
-  function peg$f43(ss2, s, start, close, name, nameEnd) {
+  function peg$f48(ss2, s, start, close, name, nameEnd) {
     const end = hooks.closeBrace(input2, nameEnd, start);
     return skipTo(end < 0 && completionMode ? input2.length : end);
   }
-  function peg$f44(ss2, s, start, close, name, nameEnd) {
+  function peg$f49(ss2, s, start, close, name, nameEnd) {
     return skipEnd - offset2();
   }
-  function peg$f45(ss2, s, start, close, name, nameEnd, args2) {
+  function peg$f50(ss2, s, start, close, name, nameEnd, args2) {
     return args2;
   }
-  function peg$f46(ss2, s, start, close, name, nameEnd, tail) {
+  function peg$f51(ss2, s, start, close, name, nameEnd, tail) {
     const loc = location();
     const lower = name.toLowerCase();
     const tag = lexeme("macro", loc, {
@@ -11268,19 +11280,19 @@ function peg$parse(input2, options) {
     }
     return tag;
   }
-  function peg$f47(s) {
+  function peg$f52(s) {
     fail("A closing tag starts with a letter after {/", location(), "invalid-closer");
   }
-  function peg$f48(value) {
+  function peg$f53(value) {
     return EMAIL_AUTOLINK.test(value);
   }
-  function peg$f49(value) {
+  function peg$f54(value) {
     return lexeme("text", location(), { value });
   }
-  function peg$f50(value) {
+  function peg$f55(value) {
     return lexeme("text", location(), { value });
   }
-  function peg$f51(tagStart, tag, list3, slash) {
+  function peg$f56(tagStart, tag, list3, slash) {
     const lower = tag.toLowerCase();
     return lexeme("html", location(), {
       tag,
@@ -11293,7 +11305,7 @@ function peg$parse(input2, options) {
       isSelfClose: !!slash || VOID_TAGS.has(lower)
     });
   }
-  function peg$f52(tag, bad) {
+  function peg$f57(tag, bad) {
     const c = input2.charAt(bad);
     if (!c) fail("Unclosed tag <" + tag + ": no > ends it (write &lt; for a < that starts no tag)", location(), "unclosed-tag");
     const at3 = {
@@ -11311,7 +11323,7 @@ function peg$parse(input2, options) {
     };
     fail("Unexpected " + JSON.stringify(c) + " in the tag <" + tag + ">: expected an attribute, or > to end the tag", at3, "unexpected-character");
   }
-  function peg$f53(tagStart, tag) {
+  function peg$f58(tagStart, tag) {
     return lexeme("html", location(), {
       tag,
       lower: tag.toLowerCase(),
@@ -11323,14 +11335,14 @@ function peg$parse(input2, options) {
       isSelfClose: false
     });
   }
-  function peg$f54(nameStart, name) {
+  function peg$f59(nameStart, name) {
     attrCode = hooks.isCodeAttribute(name);
     return true;
   }
-  function peg$f55(nameStart, name, v2) {
+  function peg$f60(nameStart, name, v2) {
     return v2;
   }
-  function peg$f56(nameStart, name, value) {
+  function peg$f61(nameStart, name, value) {
     const attribute = {
       name,
       value: value ? value.value : "",
@@ -11344,7 +11356,7 @@ function peg$parse(input2, options) {
     }
     return attribute;
   }
-  function peg$f57(start, value, end) {
+  function peg$f62(start, value, end) {
     return {
       value,
       start,
@@ -11352,7 +11364,7 @@ function peg$parse(input2, options) {
       quote: '"'
     };
   }
-  function peg$f58(start, value, end) {
+  function peg$f63(start, value, end) {
     return {
       value,
       start,
@@ -11360,36 +11372,36 @@ function peg$parse(input2, options) {
       quote: "'"
     };
   }
-  function peg$f59(q2) {
+  function peg$f64(q2) {
     fail("Unclosed attribute value: the " + q2 + " here has no closing " + q2, location(), "unclosed-attribute");
   }
-  function peg$f60(start, value, end) {
+  function peg$f65(start, value, end) {
     return {
       value,
       start,
       end
     };
   }
-  function peg$f61() {
+  function peg$f66() {
     return !attrCode;
   }
-  function peg$f62(bs2) {
+  function peg$f67(bs2) {
     return bs2.length % 2 === 1;
   }
-  function peg$f63() {
+  function peg$f68() {
     return !attrCode;
   }
-  function peg$f64(start, nameEnd) {
+  function peg$f69(start, nameEnd) {
     const end = hooks.closeBrace(input2, nameEnd, start);
     return skipTo(end < 0 && completionMode ? input2.length : end);
   }
-  function peg$f65(start, nameEnd) {
+  function peg$f70(start, nameEnd) {
     return skipEnd - offset2();
   }
-  function peg$f66() {
+  function peg$f71() {
     return !attrCode;
   }
-  function peg$f67() {
+  function peg$f72() {
     return attrCode;
   }
   let peg$currPos = options.peg$currPos | 0;
@@ -11525,15 +11537,66 @@ function peg$parse(input2, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$parseEscape();
       if (s0 === peg$FAILED) {
-        s0 = peg$parseComment();
+        s0 = peg$currPos;
+        peg$savedPos = peg$currPos;
+        s1 = peg$f1();
+        if (s1) s1 = void 0;
+        else s1 = peg$FAILED;
+        if (s1 !== peg$FAILED) {
+          s2 = peg$parseComment();
+          if (s2 !== peg$FAILED) {
+            s1 = [s1, s2];
+            s0 = s1;
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
         if (s0 === peg$FAILED) {
-          s0 = peg$parseLinkLexeme();
+          s0 = peg$currPos;
+          peg$savedPos = peg$currPos;
+          s1 = peg$f2();
+          if (s1) s1 = void 0;
+          else s1 = peg$FAILED;
+          if (s1 !== peg$FAILED) {
+            s2 = peg$parseLinkLexeme();
+            if (s2 !== peg$FAILED) {
+              s1 = [s1, s2];
+              s0 = s1;
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
           if (s0 === peg$FAILED) {
-            s0 = peg$parseEmailAutolink();
+            s0 = peg$currPos;
+            peg$savedPos = peg$currPos;
+            s1 = peg$f3();
+            if (s1) s1 = void 0;
+            else s1 = peg$FAILED;
+            if (s1 !== peg$FAILED) {
+              s2 = peg$parseEmailAutolink();
+              if (s2 !== peg$FAILED) {
+                s1 = [s1, s2];
+                s0 = s1;
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
               peg$savedPos = peg$currPos;
-              s1 = peg$f1();
+              s1 = peg$f4();
               if (s1) s1 = void 0;
               else s1 = peg$FAILED;
               if (s1 !== peg$FAILED) {
@@ -11552,14 +11615,14 @@ function peg$parse(input2, options) {
               if (s0 === peg$FAILED) {
                 s0 = peg$currPos;
                 peg$savedPos = peg$currPos;
-                s1 = peg$f2();
+                s1 = peg$f5();
                 if (s1) s1 = void 0;
                 else s1 = peg$FAILED;
                 if (s1 !== peg$FAILED) {
                   s2 = peg$parseHtmlOpen();
                   if (s2 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s0 = peg$f3(s2);
+                    s0 = peg$f6(s2);
                   } else {
                     peg$currPos = s0;
                     s0 = peg$FAILED;
@@ -11571,14 +11634,23 @@ function peg$parse(input2, options) {
                 if (s0 === peg$FAILED) {
                   s0 = peg$currPos;
                   peg$savedPos = peg$currPos;
-                  s1 = peg$f4();
+                  s1 = peg$f7();
                   if (s1) s1 = void 0;
                   else s1 = peg$FAILED;
                   if (s1 !== peg$FAILED) {
                     s2 = peg$parseHtmlClose();
                     if (s2 !== peg$FAILED) {
-                      peg$savedPos = s0;
-                      s0 = peg$f5(s2);
+                      peg$savedPos = peg$currPos;
+                      s3 = peg$f8(s2);
+                      if (s3) s3 = void 0;
+                      else s3 = peg$FAILED;
+                      if (s3 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s0 = peg$f9(s2);
+                      } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                      }
                     } else {
                       peg$currPos = s0;
                       s0 = peg$FAILED;
@@ -11595,14 +11667,14 @@ function peg$parse(input2, options) {
                       if (s1 !== peg$FAILED) {
                         s2 = peg$currPos;
                         peg$savedPos = peg$currPos;
-                        s3 = peg$f6(s1);
+                        s3 = peg$f10(s1);
                         if (s3) s3 = void 0;
                         else s3 = peg$FAILED;
                         if (s3 !== peg$FAILED) {
                           s4 = peg$parseRawTokens();
                           if (s4 !== peg$FAILED) {
                             peg$savedPos = s2;
-                            s2 = peg$f7(s1, s4);
+                            s2 = peg$f11(s1, s4);
                           } else {
                             peg$currPos = s2;
                             s2 = peg$FAILED;
@@ -11613,7 +11685,7 @@ function peg$parse(input2, options) {
                         }
                         if (s2 === peg$FAILED) s2 = null;
                         peg$savedPos = s0;
-                        s0 = peg$f8(s1, s2);
+                        s0 = peg$f12(s1, s2);
                       } else {
                         peg$currPos = s0;
                         s0 = peg$FAILED;
@@ -11636,12 +11708,12 @@ function peg$parse(input2, options) {
     s1 = peg$parseMacroTag();
     if (s1 !== peg$FAILED) {
       peg$savedPos = peg$currPos;
-      s2 = peg$f9(s1);
+      s2 = peg$f13(s1);
       if (s2) s2 = void 0;
       else s2 = peg$FAILED;
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f10(s1);
+        s0 = peg$f14(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -11653,14 +11725,14 @@ function peg$parse(input2, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s1 = peg$f11();
+      s1 = peg$f15();
       if (s1) s1 = void 0;
       else s1 = peg$FAILED;
       if (s1 !== peg$FAILED) {
         s2 = peg$parseHtmlClose();
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f12(s2);
+          s0 = peg$f16(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -11677,12 +11749,12 @@ function peg$parse(input2, options) {
     s0 = peg$currPos;
     s1 = peg$parseHere();
     peg$savedPos = peg$currPos;
-    s2 = peg$f13(s1);
+    s2 = peg$f17(s1);
     if (s2) s2 = void 0;
     else s2 = peg$FAILED;
     if (s2 !== peg$FAILED) {
       s3 = peg$currPos;
-      s4 = peg$f14(s1);
+      s4 = peg$f18(s1);
       s5 = peg$currPos;
       s6 = [];
       if (s6.length >= (s4 | 0)) s7 = peg$FAILED;
@@ -11715,7 +11787,7 @@ function peg$parse(input2, options) {
         s4 = peg$parseCloseTag();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f15(s1, s3, s4);
+          s0 = peg$f19(s1, s3, s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -11731,7 +11803,7 @@ function peg$parse(input2, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s1 = peg$f16();
+      s1 = peg$f20();
       if (s1) s1 = void 0;
       else s1 = peg$FAILED;
       if (s1 !== peg$FAILED) {
@@ -11756,7 +11828,7 @@ function peg$parse(input2, options) {
         }
         s2 = input2.substring(s2, peg$currPos);
         peg$savedPos = s0;
-        s0 = peg$f17(s2);
+        s0 = peg$f21(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -11769,7 +11841,7 @@ function peg$parse(input2, options) {
     s0 = peg$currPos;
     s1 = "";
     peg$savedPos = s0;
-    s1 = peg$f18();
+    s1 = peg$f22();
     s0 = s1;
     return s0;
   }
@@ -11798,13 +11870,13 @@ function peg$parse(input2, options) {
     else s1 = s2;
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f19(s1);
+      s1 = peg$f23(s1);
     }
     s0 = s1;
     return s0;
   }
   function peg$parseComment() {
-    let s0, s1, s2, s3, s4, s5, s6, s7, s8;
+    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
     s0 = peg$currPos;
     s1 = peg$currPos;
     s2 = peg$currPos;
@@ -11833,91 +11905,104 @@ function peg$parse(input2, options) {
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
-          s5 = [];
-          s6 = peg$currPos;
-          s7 = peg$currPos;
-          peg$silentFails++;
-          if (input2.substr(peg$currPos, 3) === peg$c3) {
-            s8 = peg$c3;
-            peg$currPos += 3;
-          } else {
-            s8 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$e5);
-          }
-          peg$silentFails--;
-          if (s8 === peg$FAILED) s7 = void 0;
-          else {
-            peg$currPos = s7;
-            s7 = peg$FAILED;
-          }
-          if (s7 !== peg$FAILED) {
-            if (input2.length > peg$currPos) {
-              s8 = input2.charAt(peg$currPos);
-              peg$currPos++;
-            } else {
-              s8 = peg$FAILED;
-              if (peg$silentFails === 0) peg$fail(peg$e0);
-            }
-            if (s8 !== peg$FAILED) {
-              s7 = [s7, s8];
-              s6 = s7;
-            } else {
-              peg$currPos = s6;
-              s6 = peg$FAILED;
-            }
-          } else {
-            peg$currPos = s6;
-            s6 = peg$FAILED;
-          }
-          while (s6 !== peg$FAILED) {
-            s5.push(s6);
-            s6 = peg$currPos;
+          peg$savedPos = peg$currPos;
+          s5 = peg$f24();
+          if (s5) s5 = void 0;
+          else s5 = peg$FAILED;
+          if (s5 !== peg$FAILED) {
+            s6 = [];
             s7 = peg$currPos;
+            s8 = peg$currPos;
             peg$silentFails++;
             if (input2.substr(peg$currPos, 3) === peg$c3) {
-              s8 = peg$c3;
+              s9 = peg$c3;
               peg$currPos += 3;
             } else {
-              s8 = peg$FAILED;
+              s9 = peg$FAILED;
               if (peg$silentFails === 0) peg$fail(peg$e5);
             }
             peg$silentFails--;
-            if (s8 === peg$FAILED) s7 = void 0;
+            if (s9 === peg$FAILED) s8 = void 0;
             else {
-              peg$currPos = s7;
-              s7 = peg$FAILED;
+              peg$currPos = s8;
+              s8 = peg$FAILED;
             }
-            if (s7 !== peg$FAILED) {
+            if (s8 !== peg$FAILED) {
               if (input2.length > peg$currPos) {
-                s8 = input2.charAt(peg$currPos);
+                s9 = input2.charAt(peg$currPos);
                 peg$currPos++;
               } else {
-                s8 = peg$FAILED;
+                s9 = peg$FAILED;
                 if (peg$silentFails === 0) peg$fail(peg$e0);
               }
+              if (s9 !== peg$FAILED) {
+                s8 = [s8, s9];
+                s7 = s8;
+              } else {
+                peg$currPos = s7;
+                s7 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s7;
+              s7 = peg$FAILED;
+            }
+            while (s7 !== peg$FAILED) {
+              s6.push(s7);
+              s7 = peg$currPos;
+              s8 = peg$currPos;
+              peg$silentFails++;
+              if (input2.substr(peg$currPos, 3) === peg$c3) {
+                s9 = peg$c3;
+                peg$currPos += 3;
+              } else {
+                s9 = peg$FAILED;
+                if (peg$silentFails === 0) peg$fail(peg$e5);
+              }
+              peg$silentFails--;
+              if (s9 === peg$FAILED) s8 = void 0;
+              else {
+                peg$currPos = s8;
+                s8 = peg$FAILED;
+              }
               if (s8 !== peg$FAILED) {
-                s7 = [s7, s8];
-                s6 = s7;
+                if (input2.length > peg$currPos) {
+                  s9 = input2.charAt(peg$currPos);
+                  peg$currPos++;
+                } else {
+                  s9 = peg$FAILED;
+                  if (peg$silentFails === 0) peg$fail(peg$e0);
+                }
+                if (s9 !== peg$FAILED) {
+                  s8 = [s8, s9];
+                  s7 = s8;
+                } else {
+                  peg$currPos = s7;
+                  s7 = peg$FAILED;
+                }
               } else {
-                peg$currPos = s6;
-                s6 = peg$FAILED;
+                peg$currPos = s7;
+                s7 = peg$FAILED;
               }
+            }
+            if (input2.substr(peg$currPos, 3) === peg$c3) {
+              s7 = peg$c3;
+              peg$currPos += 3;
             } else {
-              peg$currPos = s6;
-              s6 = peg$FAILED;
+              s7 = peg$FAILED;
+              if (peg$silentFails === 0) peg$fail(peg$e5);
+            }
+            if (s7 === peg$FAILED) s7 = peg$parseOpenEnd();
+            if (s7 !== peg$FAILED) {
+              s5 = [
+                s5,
+                s6,
+                s7
+              ];
+              s4 = s5;
+            } else {
+              peg$currPos = s4;
+              s4 = peg$FAILED;
             }
-          }
-          if (input2.substr(peg$currPos, 3) === peg$c3) {
-            s6 = peg$c3;
-            peg$currPos += 3;
-          } else {
-            s6 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$e5);
-          }
-          if (s6 === peg$FAILED) s6 = peg$parseOpenEnd();
-          if (s6 !== peg$FAILED) {
-            s5 = [s5, s6];
-            s4 = s5;
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -11939,7 +12024,7 @@ function peg$parse(input2, options) {
     else s1 = s2;
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f20(s1);
+      s1 = peg$f25(s1);
     }
     s0 = s1;
     return s0;
@@ -11972,7 +12057,7 @@ function peg$parse(input2, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s3 = peg$f21(s1);
+      s3 = peg$f26(s1);
       if (s3) s3 = void 0;
       else s3 = peg$FAILED;
       if (s3 !== peg$FAILED) {
@@ -11984,7 +12069,7 @@ function peg$parse(input2, options) {
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s2;
-          s2 = peg$f22(s1, s4);
+          s2 = peg$f27(s1, s4);
         } else {
           peg$currPos = s2;
           s2 = peg$FAILED;
@@ -11995,7 +12080,7 @@ function peg$parse(input2, options) {
       }
       if (s2 === peg$FAILED) s2 = null;
       peg$savedPos = s0;
-      s0 = peg$f23(s1, s2);
+      s0 = peg$f28(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -12043,7 +12128,7 @@ function peg$parse(input2, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f24();
+        s0 = peg$f29();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -12058,7 +12143,7 @@ function peg$parse(input2, options) {
       peg$silentFails++;
       s2 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s3 = peg$f25();
+      s3 = peg$f30();
       if (s3) s3 = void 0;
       else s3 = peg$FAILED;
       if (s3 !== peg$FAILED) {
@@ -12090,7 +12175,7 @@ function peg$parse(input2, options) {
         }
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f26();
+          s0 = peg$f31();
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -12110,7 +12195,7 @@ function peg$parse(input2, options) {
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f27();
+          s1 = peg$f32();
         }
         s0 = s1;
       }
@@ -12121,7 +12206,7 @@ function peg$parse(input2, options) {
     let s0, s1, s2, s3, s4, s5, s6, s7;
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f28();
+    s1 = peg$f33();
     if (s1) s1 = void 0;
     else s1 = peg$FAILED;
     if (s1 !== peg$FAILED) {
@@ -12150,7 +12235,7 @@ function peg$parse(input2, options) {
           if (s7 === peg$FAILED) s7 = peg$parseOpenEnd();
           if (s7 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f29(s3, s4, s5, s6);
+            s0 = peg$f34(s3, s4, s5, s6);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -12170,7 +12255,7 @@ function peg$parse(input2, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s1 = peg$f30();
+      s1 = peg$f35();
       if (s1) s1 = void 0;
       else s1 = peg$FAILED;
       if (s1 !== peg$FAILED) {
@@ -12183,7 +12268,7 @@ function peg$parse(input2, options) {
         }
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f31();
+          s0 = peg$f36();
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -12311,7 +12396,7 @@ function peg$parse(input2, options) {
       }
       if (s2 === peg$FAILED) s2 = null;
       peg$savedPos = s0;
-      s0 = peg$f32(s1);
+      s0 = peg$f37(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -12320,7 +12405,7 @@ function peg$parse(input2, options) {
       s0 = peg$currPos;
       s1 = "";
       peg$savedPos = s0;
-      s1 = peg$f33();
+      s1 = peg$f38();
       s0 = s1;
     }
     return s0;
@@ -12350,7 +12435,7 @@ function peg$parse(input2, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f34(s1, s2);
+      s0 = peg$f39(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -12376,7 +12461,7 @@ function peg$parse(input2, options) {
       }
       s2 = input2.substring(s2, peg$currPos);
       peg$savedPos = s0;
-      s0 = peg$f35(s1, s2);
+      s0 = peg$f40(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -12497,7 +12582,7 @@ function peg$parse(input2, options) {
           s7 = peg$parseBraceEnd();
           if (s7 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f36(s2, s3, s4, s5, s6);
+            s0 = peg$f41(s2, s3, s4, s5, s6);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -12547,7 +12632,7 @@ function peg$parse(input2, options) {
               s7 = peg$parseBraceEnd();
               if (s7 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f37(s2, s3, s4, s6);
+                s0 = peg$f42(s2, s3, s4, s6);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -12595,7 +12680,7 @@ function peg$parse(input2, options) {
             } else s3 = peg$FAILED;
             if (s3 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f38();
+              s0 = peg$f43();
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -12617,12 +12702,12 @@ function peg$parse(input2, options) {
     s0 = peg$currPos;
     s1 = peg$parseHere();
     peg$savedPos = peg$currPos;
-    s2 = peg$f39(s1);
+    s2 = peg$f44(s1);
     if (s2) s2 = void 0;
     else s2 = peg$FAILED;
     if (s2 !== peg$FAILED) {
       s3 = peg$currPos;
-      s4 = peg$f40(s1);
+      s4 = peg$f45(s1);
       s5 = peg$currPos;
       s6 = [];
       if (s6.length >= (s4 | 0)) s7 = peg$FAILED;
@@ -12653,7 +12738,7 @@ function peg$parse(input2, options) {
       else s3 = s4;
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f41(s1, s3);
+        s0 = peg$f46(s1, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -12668,7 +12753,7 @@ function peg$parse(input2, options) {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f42();
+    s1 = peg$f47();
     if (s1) s1 = void 0;
     else s1 = peg$FAILED;
     if (s1 !== peg$FAILED) {
@@ -12740,12 +12825,12 @@ function peg$parse(input2, options) {
           s7 = peg$parseHere();
           s8 = peg$currPos;
           peg$savedPos = peg$currPos;
-          s9 = peg$f43(s2, s3, s4, s5, s6, s7);
+          s9 = peg$f48(s2, s3, s4, s5, s6, s7);
           if (s9) s9 = void 0;
           else s9 = peg$FAILED;
           if (s9 !== peg$FAILED) {
             s10 = peg$currPos;
-            s11 = peg$f44(s2, s3, s4, s5, s6, s7);
+            s11 = peg$f49(s2, s3, s4, s5, s6, s7);
             s12 = peg$currPos;
             s13 = [];
             if (s13.length >= (s11 | 0)) s14 = peg$FAILED;
@@ -12778,7 +12863,7 @@ function peg$parse(input2, options) {
               s11 = peg$parseBraceEnd();
               if (s11 !== peg$FAILED) {
                 peg$savedPos = s8;
-                s8 = peg$f45(s2, s3, s4, s5, s6, s7, s10);
+                s8 = peg$f50(s2, s3, s4, s5, s6, s7, s10);
               } else {
                 peg$currPos = s8;
                 s8 = peg$FAILED;
@@ -12793,7 +12878,7 @@ function peg$parse(input2, options) {
           }
           if (s8 === peg$FAILED) s8 = null;
           peg$savedPos = s0;
-          s0 = peg$f46(s2, s3, s4, s5, s6, s7, s8);
+          s0 = peg$f51(s2, s3, s4, s5, s6, s7, s8);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -12827,7 +12912,7 @@ function peg$parse(input2, options) {
           }
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f47(s2);
+            s0 = peg$f52(s2);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -12977,12 +13062,12 @@ function peg$parse(input2, options) {
     else s1 = s2;
     if (s1 !== peg$FAILED) {
       peg$savedPos = peg$currPos;
-      s2 = peg$f48(s1);
+      s2 = peg$f53(s1);
       if (s2) s2 = void 0;
       else s2 = peg$FAILED;
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f49(s1);
+        s0 = peg$f54(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -13159,7 +13244,7 @@ function peg$parse(input2, options) {
     else s1 = s2;
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f50(s1);
+      s1 = peg$f55(s1);
     }
     s0 = s1;
     return s0;
@@ -13203,7 +13288,7 @@ function peg$parse(input2, options) {
         if (s7 === peg$FAILED) s7 = peg$parseOpenEnd();
         if (s7 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f51(s2, s3, s4, s6);
+          s0 = peg$f56(s2, s3, s4, s6);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -13268,7 +13353,7 @@ function peg$parse(input2, options) {
             s5 = peg$parse_();
             s6 = peg$parseHere();
             peg$savedPos = s0;
-            s0 = peg$f52(s2, s6);
+            s0 = peg$f57(s2, s6);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -13308,7 +13393,7 @@ function peg$parse(input2, options) {
         }
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f53(s2, s3);
+          s0 = peg$f58(s2, s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -13443,7 +13528,7 @@ function peg$parse(input2, options) {
     else s3 = s4;
     if (s3 !== peg$FAILED) {
       peg$savedPos = peg$currPos;
-      s4 = peg$f54(s2, s3);
+      s4 = peg$f59(s2, s3);
       if (s4) s4 = void 0;
       else s4 = peg$FAILED;
       if (s4 !== peg$FAILED) {
@@ -13461,7 +13546,7 @@ function peg$parse(input2, options) {
           s9 = peg$parseAttrValue();
           if (s9 !== peg$FAILED) {
             peg$savedPos = s5;
-            s5 = peg$f55(s2, s3, s9);
+            s5 = peg$f60(s2, s3, s9);
           } else {
             peg$currPos = s5;
             s5 = peg$FAILED;
@@ -13472,7 +13557,7 @@ function peg$parse(input2, options) {
         }
         if (s5 === peg$FAILED) s5 = null;
         peg$savedPos = s0;
-        s0 = peg$f56(s2, s3, s5);
+        s0 = peg$f61(s2, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -13530,7 +13615,7 @@ function peg$parse(input2, options) {
       if (s5 === peg$FAILED) s5 = peg$parseOpenEnd();
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f57(s2, s3, s4);
+        s0 = peg$f62(s2, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -13585,7 +13670,7 @@ function peg$parse(input2, options) {
         if (s5 === peg$FAILED) s5 = peg$parseOpenEnd();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f58(s2, s3, s4);
+          s0 = peg$f63(s2, s3, s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -13604,7 +13689,7 @@ function peg$parse(input2, options) {
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f59(s1);
+          s1 = peg$f64(s1);
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
@@ -13630,7 +13715,7 @@ function peg$parse(input2, options) {
           s2 = input2.substring(s2, peg$currPos);
           s3 = peg$parseHere();
           peg$savedPos = s0;
-          s0 = peg$f60(s1, s2, s3);
+          s0 = peg$f65(s1, s2, s3);
         }
       }
     }
@@ -13640,7 +13725,7 @@ function peg$parse(input2, options) {
     let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13;
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f61();
+    s1 = peg$f66();
     if (s1) s1 = void 0;
     else s1 = peg$FAILED;
     if (s1 !== peg$FAILED) {
@@ -13669,7 +13754,7 @@ function peg$parse(input2, options) {
       if (s2 !== peg$FAILED) {
         s3 = peg$currPos;
         peg$savedPos = peg$currPos;
-        s4 = peg$f62(s2);
+        s4 = peg$f67(s2);
         if (s4) s4 = void 0;
         else s4 = peg$FAILED;
         if (s4 !== peg$FAILED) {
@@ -13708,7 +13793,7 @@ function peg$parse(input2, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s1 = peg$f63();
+      s1 = peg$f68();
       if (s1) s1 = void 0;
       else s1 = peg$FAILED;
       if (s1 !== peg$FAILED) {
@@ -13735,12 +13820,12 @@ function peg$parse(input2, options) {
             if (s6 !== peg$FAILED) {
               s7 = peg$parseHere();
               peg$savedPos = peg$currPos;
-              s8 = peg$f64(s4, s7);
+              s8 = peg$f69(s4, s7);
               if (s8) s8 = void 0;
               else s8 = peg$FAILED;
               if (s8 !== peg$FAILED) {
                 s9 = peg$currPos;
-                s10 = peg$f65(s4, s7);
+                s10 = peg$f70(s4, s7);
                 s11 = peg$currPos;
                 s12 = [];
                 if (s12.length >= (s10 | 0)) s13 = peg$FAILED;
@@ -13816,7 +13901,7 @@ function peg$parse(input2, options) {
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         peg$savedPos = peg$currPos;
-        s1 = peg$f66();
+        s1 = peg$f71();
         if (s1) s1 = void 0;
         else s1 = peg$FAILED;
         if (s1 !== peg$FAILED) {
@@ -13901,7 +13986,7 @@ function peg$parse(input2, options) {
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           peg$savedPos = peg$currPos;
-          s1 = peg$f67();
+          s1 = peg$f72();
           if (s1) s1 = void 0;
           else s1 = peg$FAILED;
           if (s1 !== peg$FAILED) {
@@ -13987,9 +14072,11 @@ function peg$parse(input2, options) {
   const textMode = options.text === true;
   const completionMode = options.completion === true;
   const hooks = options.hooks;
+  const lastCommentClose = input2.lastIndexOf("-->");
   let skipEnd = -1;
   let attrCode = false;
   let rawName = "";
+  let htmlTextTag = "";
   function linkSeparatorIndex(inner, at3, separator) {
     for (let i2 = 0; i2 < inner.length; i2++) {
       const c = inner.charAt(i2);
@@ -14056,6 +14143,11 @@ function peg$parse(input2, options) {
   if (peg$success) return peg$result;
   else peg$throw();
 }
+function effectiveNamedDefinitions(definitions) {
+  const latest = new NameMap();
+  for (const definition2 of definitions) latest.set(definition2.name, definition2);
+  return [...latest.values()];
+}
 function isOptionClause(name) {
   return name.toLowerCase() === OPTION_CLAUSE;
 }
@@ -14691,29 +14783,17 @@ function parseCode(src, goal = "expression") {
   return parseWithAst(src, goal).out;
 }
 function parseWithAst(src, goal) {
-  const percentAt = /* @__PURE__ */ new Map();
-  for (; ; ) {
-    const transientsRead = /* @__PURE__ */ new Set();
-    try {
-      const ast = parseAst(src, goal, percentAt, transientsRead);
-      const out = {
-        refs: [],
-        strings: []
-      };
-      walk(ast, src, out, false, false);
-      out.refs.sort((a, b) => a.start - b.start);
-      return {
-        out,
-        ast
-      };
-    } catch (error62) {
-      const pos = error62.pos ?? -1;
-      if (!(error62 instanceof SyntaxError) || percentAt.has(pos)) throw error62;
-      TRANS_NAME_RE.lastIndex = pos + 1;
-      if (src.charAt(pos) !== "%" || !TRANS_NAME_RE.test(src)) throw error62;
-      percentAt.set(pos, !transientsRead.has(pos));
-    }
-  }
+  const ast = parseAst(src, goal);
+  const out = {
+    refs: [],
+    strings: []
+  };
+  walk(ast, src, out, false, false);
+  out.refs.sort((a, b) => a.start - b.start);
+  return {
+    out,
+    ast
+  };
 }
 function parseReferencePath(src) {
   const { ast } = parseWithAst(src, "expression");
@@ -14762,11 +14842,9 @@ function readMemberPath(src, end) {
     end
   };
 }
-function parseAst(src, goal, percentAt, transientsRead) {
+function parseAst(src, goal) {
   try {
     const p = tokenizerAt(src, 0, goal);
-    p.percentAt = percentAt;
-    p.transientsRead = transientsRead;
     if (goal === "statements") return p.parse();
     p.nextToken();
     const ast = p.parseExpression();
@@ -14933,25 +15011,45 @@ function walk(root, src, out, binding, shorthand, access = "read") {
   }
 }
 function findCodeEnd(src, start, { goal = "expression", stop, onRunOut } = {}) {
-  const end = scanCodeEnd(src, start, goal, stop, onRunOut);
-  return end < 0 && !stop ? parsedCodeEnd(src, start, goal) : end;
+  let verifyStop = false;
+  const end = scanCodeEnd(src, start, goal, stop, onRunOut, () => {
+    verifyStop = true;
+  });
+  if (end < 0 || verifyStop) {
+    const parsed = parsedCodeEnd(src, start, goal, stop);
+    if (parsed >= 0) return parsed;
+  }
+  return end;
 }
-function parsedCodeEnd(src, start, goal) {
+function parsedCodeEnd(src, start, goal, stop) {
   const p = tokenizerAt(src, start, goal);
+  const stopped = {};
+  let stoppedAt = -1;
+  if (stop) {
+    const nextToken = p.nextToken;
+    p.nextToken = () => {
+      nextToken.call(p);
+      if (p.type === types$1.braceL && stop(p.start)) {
+        stoppedAt = p.start;
+        throw stopped;
+      }
+    };
+  }
   try {
     if (goal === "statements") p.parse();
     else {
       p.nextToken();
       p.parseExpression();
-      if (p.type === types$1.braceR) return p.start;
+      if (!stop && p.type === types$1.braceR) return p.start;
     }
   } catch (error62) {
+    if (error62 === stopped) return stoppedAt;
     const pos = error62.pos ?? -1;
-    if (src.charAt(pos) === "}") return pos;
+    if (!stop && src.charAt(pos) === "}") return pos;
   }
   return -1;
 }
-function scanCodeEnd(src, start, goal, stop, onRunOut) {
+function scanCodeEnd(src, start, goal, stop, onRunOut, onTemplateStop) {
   const ranOut = () => {
     onRunOut?.();
     return -1;
@@ -14962,6 +15060,7 @@ function scanCodeEnd(src, start, goal, stop, onRunOut) {
   let from = start;
   let afterOperand = false;
   let templateSlip = false;
+  let interpolated = false;
   for (; ; ) {
     let resumeAt = -1;
     for (const tok of tokens(src, from, goal, { afterOperand })) {
@@ -14990,10 +15089,15 @@ function scanCodeEnd(src, start, goal, stop, onRunOut) {
       prevWord = t === types$1.name && !WORDS_BEFORE_STRING.has(tok.value) || t === types$1.num;
       prevEnd = tok.end;
       if (t === types$1.braceL) {
-        if (stop?.(tok.start)) return tok.start;
+        if (stop?.(tok.start)) {
+          if (interpolated) onTemplateStop();
+          return tok.start;
+        }
         stack.push("{");
-      } else if (t === types$1.dollarBraceL) stack.push("${");
-      else if (t === types$1.parenL) stack.push("(");
+      } else if (t === types$1.dollarBraceL) {
+        interpolated = true;
+        stack.push("${");
+      } else if (t === types$1.parenL) stack.push("(");
       else if (t === types$1.bracketL) stack.push("[");
       else if (t === types$1.parenR || t === types$1.bracketR) {
         if (last(stack) === (t === types$1.parenR ? "(" : "[")) stack.pop();
@@ -15064,7 +15168,8 @@ function* tokens(src, start, goal, options = {}) {
       type: p.type,
       start: p.start,
       end: p.end,
-      value: p.value
+      value: p.value,
+      operand: p.operandHere
     };
     if (p.type === types$1.eof) return;
   }
@@ -15210,6 +15315,58 @@ function scanStringLiteral(src, start) {
     closed: false
   };
 }
+function completionIdentifier(source, cursor, goal = "expression") {
+  let previous2;
+  for (const token of tokens(source, 0, goal)) {
+    if ("error" in token) {
+      if (source[token.pos] === "@" && cursor === token.pos + 1) return {
+        kind: "root",
+        name: "",
+        start: token.pos,
+        end: cursor
+      };
+      return;
+    }
+    const member = previous2 && isMemberDot(previous2.type) ? previous2 : void 0;
+    if (token.start <= cursor && cursor <= token.end) {
+      if (member && (token.type === types$1.name || token.type.keyword)) return {
+        kind: "member",
+        name: token.value,
+        start: token.start,
+        end: token.end,
+        dotStart: member.start
+      };
+      if (token.type === types$1.name && !member) {
+        const value = token.value;
+        if ((sigilAt(source, token.start, value) || value === "$" || value === "_") && !keyPosition(source, token.end, previous2?.type)) return {
+          kind: "root",
+          name: value.slice(1),
+          start: token.start,
+          end: token.end
+        };
+      }
+      if (token.type === types$1.modulo && source.slice(token.start, token.end) === "%" && cursor === token.end && token.operand) return {
+        kind: "root",
+        name: "",
+        start: token.start,
+        end: token.end
+      };
+    }
+    if (isMemberDot(token.type) && token.end === cursor) {
+      previous2 = token;
+      continue;
+    }
+    if (member && member.end === cursor && token.start >= cursor) return {
+      kind: "member",
+      name: "",
+      start: cursor,
+      end: cursor,
+      dotStart: member.start
+    };
+    if (token.start > cursor || token.type === types$1.eof) return;
+    previous2 = token;
+  }
+}
 function skipLiteral(input2, i2) {
   const quote = input2[i2];
   const template = quote === "`";
@@ -16447,12 +16604,18 @@ function locate(text3, part, from) {
   return anywhere >= 0 ? anywhere : from;
 }
 function completionContext(source, cursor, macros = []) {
-  if (!Number.isInteger(cursor) || cursor < 0 || cursor > source.length) throw new RangeError("cursor must be a UTF-16 offset within source");
+  return readCompletion(source.slice(0, cursor), cursor, macros, false, source.length);
+}
+function readCompletion(source, cursor, macros, full, sourceLength = source.length, visit2) {
+  if (!Number.isInteger(cursor) || cursor < 0 || cursor > sourceLength) throw new RangeError("cursor must be a UTF-16 offset within source");
   const parametersOf2 = parameterLookup(macros);
   const codeContext = (code, goal, map2, containers) => {
-    const probe = code.length + 1;
+    let position = 0;
+    while (position < code.length && map2(position) < cursor) position++;
+    const prefix = code.slice(0, position);
+    const probe = prefix.length + 1;
     let executable = false;
-    lexJs(code + " __spindle_cursor__", {
+    lexJs(prefix + " __spindle_cursor__", {
       code(_ch, at3) {
         if (at3 >= probe) executable = true;
       },
@@ -16461,6 +16624,7 @@ function completionContext(source, cursor, macros = []) {
       }
     }, goal);
     if (!executable) return LITERAL;
+    const identifier = full ? completionIdentifier(code, position, goal) : void 0;
     const offset2 = map2(0);
     const offsets = Array.from({ length: code.length + 1 }, (_2, i2) => map2(i2));
     return {
@@ -16468,7 +16632,8 @@ function completionContext(source, cursor, macros = []) {
       code,
       goal,
       offset: offset2,
-      cursor: code.length,
+      cursor: position,
+      ...identifier && { identifier },
       ...containers.length ? { containers } : {},
       ...offsets.some((at3, i2) => at3 !== offset2 + i2) ? { sourceOffsets: offsets } : {}
     };
@@ -16478,7 +16643,7 @@ function completionContext(source, cursor, macros = []) {
     if (sigilsOnly) {
       let at3 = 0;
       for (const part of splitSigilTemplate(src, true)) if ("expr" in part) {
-        if (at3 + 1 + part.expr.length === src.length) return codeContext(part.expr, "expression", (i2) => map2(at3 + 1 + i2), containers);
+        if (map2(at3 + 1) <= cursor && cursor <= map2(at3 + 1 + part.expr.length)) return codeContext(part.expr, "expression", (i2) => map2(at3 + 1 + i2), containers);
         at3 += part.expr.length + 2;
       } else at3 += ("text" in part ? part.text : part.verbatim).length;
       return LITERAL;
@@ -16487,14 +16652,17 @@ function completionContext(source, cursor, macros = []) {
       text: text3,
       hooks: { isRaw: (name) => isRawMacro(name, parametersOf2.widget?.(name) !== void 0) }
     });
-    const token = tokens2[tokens2.length - 1];
-    if (!token || token.end !== src.length) return LITERAL;
+    if (visit2 && !visit2(tokens2, map2)) return LITERAL;
+    const contains = (start, end) => map2(start) <= cursor && cursor <= map2(end);
+    const index = tokens2.findIndex((token2) => map2(token2.start) < cursor && cursor <= map2(token2.end));
+    const token = tokens2[index];
+    if (!token) return LITERAL;
     const codeAt = (code, at3, goal = "expression") => codeContext(code, goal, (i2) => map2(at3 + i2), containers);
     const nested = (value, at3, offsets, onlySigils = false, container) => read(value, (i2) => map2(offsets?.[i2] ?? at3 + i2), true, depth + 1, onlySigils, container ? [...containers, container] : containers);
-    if (token.type === "variable" && token.nameEnd === src.length) return codeAt(src.slice(token.nameStart - 1), token.nameStart - 1);
-    if (token.type === "expression" && token.expressionEnd === src.length) return codeAt(token.expression, token.expressionStart);
+    if (token.type === "variable" && contains(token.nameStart - 1, token.nameEnd)) return codeAt(src.slice(token.nameStart - 1, token.nameEnd), token.nameStart - 1);
+    if (token.type === "expression" && contains(token.expressionStart, token.expressionEnd)) return codeAt(token.expression, token.expressionStart);
     if (token.type === "html") {
-      for (const { name, value, at: at3 } of attributeValues(src, token)) if (at3 + value.length === src.length) {
+      for (const { name, value, at: at3 } of attributeValues(src, token)) if (contains(at3, at3 + value.length)) {
         const span = token.attributeSpans.find((span2) => span2.valueStart === at3);
         return nested(value, at3, void 0, isCodeAttribute(name), {
           kind: "attribute",
@@ -16503,11 +16671,11 @@ function completionContext(source, cursor, macros = []) {
           code: isCodeAttribute(name)
         });
       }
-    } else if (token.type === "link" && token.displayEnd === src.length) return nested(token.display, token.displayStart, void 0, false, { kind: "link-label" });
+    } else if (token.type === "link" && contains(token.displayStart, token.displayEnd)) return nested(token.display, token.displayStart, void 0, false, { kind: "link-label" });
     else if (token.type === "text" && !token.comment) {
-      const opener = tokens2[tokens2.length - 2];
+      const opener = tokens2[index - 1];
       if (opener?.type === "macro" && !opener.isClose && executesRawBody(opener.name, parametersOf2)) return codeAt(token.value, token.start, "statements");
-    } else if (token.type === "macro" && !token.isClose && token.argsEnd === src.length) {
+    } else if (token.type === "macro" && !token.isClose && contains(token.argsStart, token.argsEnd)) {
       const name = token.name.toLowerCase();
       const args2 = token.rawArgs;
       const widget = parametersOf2.widget?.(name);
@@ -16520,29 +16688,32 @@ function completionContext(source, cursor, macros = []) {
           if (holds === "expression" || holds === "statements") return codeAt(raw2, at4, holds);
           return holds === "markup" ? nested(raw2, at4) : LITERAL;
         }
-        if (scanStringLiteral(raw2, 0).closed) return LITERAL;
-        const value = escapes === "javascript" ? stringLiteralValue(raw2 + raw2[0]) : quoted.value;
+        const scan = scanStringLiteral(raw2, 0);
+        const bodyEnd = scan.closed ? scan.end - 1 : scan.end;
+        if (!contains(at4 + 1, at4 + bodyEnd)) return LITERAL;
+        const value = escapes === "javascript" ? stringLiteralValue(raw2.slice(0, scan.end) + (scan.closed ? "" : raw2[0])) : quoted.value;
         if (value == null) return LITERAL;
         const container = {
           kind: "string",
           quote: raw2[0],
           escapes
         };
-        const offsets = escapeOffsets(raw2.slice(1), at4 + 1, value, escapes);
+        const offsets = escapeOffsets(raw2.slice(1, bodyEnd), at4 + 1, value, escapes);
         if (holds === "expression" || holds === "statements") return codeContext(value, holds, (i2) => map2(offsets?.[i2] ?? at4 + 1 + i2), [...containers, container]);
         return holds === "markup" ? nested(value, at4 + 1, offsets, false, container) : LITERAL;
       };
       if (widget) {
         const spans2 = splitArgSpans(args2);
-        const span2 = spans2[spans2.length - 1];
+        const which = spans2.findIndex(([start, end]) => contains(token.argsStart + start, token.argsStart + end));
+        const span2 = spans2[which];
         if (!span2) return LITERAL;
-        const raw2 = args2.slice(span2[0]);
-        const holds = widget[spans2.length - 1]?.holds;
+        const raw2 = args2.slice(...span2);
+        const holds = widget[which]?.holds;
         return /^["']/.test(raw2) && holds ? stringContext(raw2, token.argsStart + span2[0], holds, "javascript") : codeAt(raw2, token.argsStart + span2[0]);
       }
       const params = parametersOf2(name);
       if (!params) return LITERAL;
-      const spans = macroArgumentSpans(args2, params).filter((span2) => span2.parameter.type !== "options" && span2.end === args2.trimEnd().length);
+      const spans = macroArgumentSpans(args2, params).filter((span2) => span2.parameter.type !== "options" && contains(token.argsStart + span2.start, token.argsStart + span2.end));
       const span = spans[spans.length - 1];
       if (!span) return LITERAL;
       const param = span.parameter;
@@ -16551,7 +16722,7 @@ function completionContext(source, cursor, macros = []) {
         at3 += param.name.length;
         while (/\s/.test(args2.charAt(at3))) at3++;
       }
-      const raw = args2.slice(at3);
+      const raw = args2.slice(at3, span.end);
       const offset2 = token.argsStart + at3;
       if (param.type === "expression" || param.type === "passage") return codeAt(raw, offset2);
       if (param.type === "statements") return codeAt(raw, offset2, "statements");
@@ -16559,7 +16730,7 @@ function completionContext(source, cursor, macros = []) {
     }
     return LITERAL;
   };
-  return read(source.slice(0, cursor), (i2) => i2);
+  return read(source, (i2) => i2);
 }
 function textContainsChildren(text3, parametersOf2, hooks, budget = new MarkupExpansionBudget(text3.length)) {
   if (!text3.includes("{")) return false;
@@ -21208,6 +21379,72 @@ function markdownOptions(options) {
     htmlExtensions: [gfmTableHtml(), gfmStrikethroughHtml()]
   };
 }
+function boundedMarkdownOptions(text3, options) {
+  const base = markdownOptions(options);
+  return {
+    ...base,
+    extensions: [
+      ...base.extensions ?? [],
+      unclosedHtml(text3),
+      textData
+    ]
+  };
+}
+function unclosedHtml(text3) {
+  const shift = text3.charCodeAt(0) === 65279 ? 1 : 0;
+  const comment = text3.lastIndexOf("-->");
+  const instruction = text3.lastIndexOf("?>");
+  const cdata = text3.lastIndexOf("]]>");
+  const declaration = text3.lastIndexOf(">");
+  function unclosed(p) {
+    if (text3[p] !== "<") return false;
+    if (text3.startsWith("<!--", p)) return comment < p + 2;
+    if (text3.startsWith("<![CDATA[", p)) return cdata < p + 9;
+    if (text3[p + 1] === "!" && ALPHA.test(text3[p + 2] ?? "")) return declaration < p + 3;
+    if (text3[p + 1] === "?") return instruction < p + 2 && !emailAutolink(p);
+    return false;
+  }
+  function emailAutolink(p) {
+    let i2 = p + 1;
+    while (ATEXT.test(text3[i2] ?? "")) i2++;
+    if (text3[i2] !== "@") return false;
+    i2++;
+    let size = 0;
+    let state = "atSignOrDot";
+    for (; ; ) {
+      const c = text3[i2] ?? "";
+      if (state === "atSignOrDot") {
+        if (!ALPHANUMERIC.test(c)) return false;
+        state = "label";
+      } else if (state === "label") {
+        if (c === ">") return true;
+        if (c === ".") {
+          i2++;
+          size = 0;
+          state = "atSignOrDot";
+        } else state = "value";
+      } else {
+        if (!((c === "-" || ALPHANUMERIC.test(c)) && size++ < 63)) return false;
+        i2++;
+        state = c === "-" ? "value" : "label";
+      }
+    }
+  }
+  return { text: { 60: {
+    name: "unclosedHtml",
+    resolveTo: joinData,
+    tokenize(effects, ok, nok) {
+      const at3 = this.now().offset + shift;
+      return (code) => {
+        if (code !== 60 || !unclosed(at3)) return nok(code);
+        effects.enter("data");
+        effects.consume(code);
+        effects.exit("data");
+        return ok;
+      };
+    }
+  } } };
+}
 function sourceLines(source) {
   const position = sourcePositions(source);
   return (offset2) => position(offset2).line - 1;
@@ -21233,7 +21470,7 @@ function markdownLines(source, isBlock, types3) {
         for (const branch of node2.body.branches) visit2(branch.children);
       }
     }
-    const events = postprocess(parse3(markdownOptions()).document().write(preprocess()(markdown, void 0, true)));
+    const events = postprocess(parse3(boundedMarkdownOptions(markdown)).document().write(preprocess()(markdown, void 0, true)));
     for (const [event, token] of events) {
       if (event !== "enter" || !types3.has(token.type)) continue;
       let low = 0;
@@ -21877,7 +22114,6 @@ function blockLookup(macros, includeRuntime = true) {
 }
 function macroCalls(source, macros = []) {
   const all = effectiveToolingMacros(macros);
-  const definitions = new NameMap(all.map((macro) => [macro.name, macro]));
   const parametersOf2 = parameterLookup(all);
   const options = tokenizationOptions({
     macros: all,
@@ -21886,9 +22122,32 @@ function macroCalls(source, macros = []) {
   const hooks = options.hooks;
   const tokens2 = tokenizeMarkupTolerant$1(source, options).tokens;
   const calls = [];
+  const classifier = macroClassifier(all);
   const classify2 = (tokens3) => {
+    for (const call of classifier(tokens3)) calls.push(call);
+  };
+  classify2(tokens2);
+  for (const piece of passagePiecesOf(source, tokens2, parametersOf2, { isBlock: hooks.isBlock })) {
+    if (piece.kind !== "text" || !piece.tokens.length) continue;
+    classify2(piece.tokens);
+  }
+  let literalEnd = -1;
+  return calls.sort((a, b) => a.token.start - b.token.start).filter((call) => {
+    if (call.token.start < literalEnd) return false;
+    if (call.kind === "value" || call.kind === "branch") literalEnd = call.token.argsEnd;
+    return true;
+  });
+}
+function macroClassifier(all) {
+  const definitions = new NameMap(all.map((macro) => [macro.name, macro]));
+  const hooks = tokenizationOptions({
+    macros: all,
+    hooks: { isBlock: blockLookup(all, false) }
+  }).hooks;
+  return (tokens2) => {
+    const calls = [];
     const found = /* @__PURE__ */ new Map();
-    const pending = pairMarkup(tokens3, hooks).nodes.map((node2) => ({ node: node2 }));
+    const pending = pairMarkup(tokens2, hooks).nodes.map((node2) => ({ node: node2 }));
     while (pending.length) {
       const { node: node2, parent } = pending.pop();
       const token = node2.token;
@@ -21919,7 +22178,7 @@ function macroCalls(source, macros = []) {
         });
       }
     }
-    for (const token of tokens3) {
+    for (const token of tokens2) {
       if (token.type !== "macro" || token.isClose) continue;
       const call = found.get(token) ?? {
         token,
@@ -21927,18 +22186,8 @@ function macroCalls(source, macros = []) {
       };
       calls.push(call);
     }
+    return calls;
   };
-  classify2(tokens2);
-  for (const piece of passagePiecesOf(source, tokens2, parametersOf2, { isBlock: hooks.isBlock })) {
-    if (piece.kind !== "text" || !piece.tokens.length) continue;
-    classify2(piece.tokens);
-  }
-  let literalEnd = -1;
-  return calls.sort((a, b) => a.token.start - b.token.start).filter((call) => {
-    if (call.token.start < literalEnd) return false;
-    if (call.kind === "value" || call.kind === "branch") literalEnd = call.token.argsEnd;
-    return true;
-  });
 }
 function passagePieces(source, macros = []) {
   const all = effectiveToolingMacros(macros);
@@ -21971,7 +22220,7 @@ function validateVariableReferences(passages, declarations, macros = []) {
   const list3 = [...passages];
   return checkVariableReferences(list3.filter((p) => !p.tags?.some((t) => NOT_MARKUP_TAGS.includes(t))), declarations, referenceOptions(macros, false, list3));
 }
-var __defProp2, __exportAll, NameMap, NameSet, SIGIL_SCOPES, SIGIL_CHARS, grammar_shared_default, LB, RB, SIGIL_SCOPES$1, withSelectors, VOID_TAGS, BRANCH_PARENT$1, LINK_SEPARATORS, NO_SELECTORS, EMAIL_AUTOLINK, peg$SyntaxError, OPTION_CLAUSE, PARAMETER_TYPES, STRING_HOLDS, metadataRegistry, companionParents, BLOCK_MACROS, BLOCK_WIDGETS, WIDGETS, DEFINED_BLOCK_MACROS, DEFINED_MACROS, REGISTERED_BLOCK_MACROS, RAW_BODY_MACROS, BRANCHING, quoteArg, MAX_MARKUP_DEPTH, last$1, BRANCH_PARENT, lowerName, nameOf, closerOf, closes, astralIdentifierCodes, astralIdentifierStartCodes, nonASCIIidentifierChars, nonASCIIidentifierStartChars, reservedWords, ecma5AndLessKeywords, keywords$1, keywordRelationalOperator, nonASCIIidentifierStart, nonASCIIidentifier, TokenType, beforeExpr, startsExpr, keywords, types$1, lineBreak, lineBreakG, nonASCIIwhitespace, skipWhiteSpace, ref, hasOwnProperty$1, toString, hasOwn$1, isArray, regexpCache, loneSurrogate, Position, SourceLocation, defaultOptions, warnedAboutEcmaVersion, SCOPE_TOP, SCOPE_FUNCTION, SCOPE_ASYNC, SCOPE_GENERATOR, SCOPE_ARROW, SCOPE_SIMPLE_CATCH, SCOPE_SUPER, SCOPE_DIRECT_SUPER, SCOPE_CLASS_STATIC_BLOCK, SCOPE_CLASS_FIELD_INIT, SCOPE_SWITCH, SCOPE_VAR, BIND_NONE, BIND_VAR, BIND_LEXICAL, BIND_FUNCTION, BIND_SIMPLE_CATCH, BIND_OUTSIDE, Parser, prototypeAccessors, pp$9, literal, DestructuringErrors, pp$8, loopLabel, switchLabel, empty$1, FUNC_STATEMENT, FUNC_HANGING_STATEMENT, FUNC_NULLABLE_ID, pp$7, TokContext, types, pp$6, pp$5, empty, pp$4, pp$3, Scope, Node, pp$2, scriptValuesAddedInUnicode, ecma9BinaryProperties, ecma10BinaryProperties, ecma11BinaryProperties, ecma12BinaryProperties, ecma13BinaryProperties, unicodeBinaryProperties, unicodeBinaryPropertiesOfStrings, unicodeGeneralCategoryValues, ecma9ScriptValues, ecma10ScriptValues, ecma11ScriptValues, ecma12ScriptValues, ecma13ScriptValues, unicodeScriptValues, data, ecmaVersion, i, list$2, pp$1, BranchID, RegExpValidationState, CharSetNone, CharSetOk, CharSetString, Token, pp, INVALID_TEMPLATE_ESCAPE_ERROR, OPTIONS, AT_NAME_RE, TRANS_NAME_RE, SIGIL_IDENT_RE, LINE_BREAK_RE, NOT_A_BODY_RE, OPERAND_ENDS, SigilParser, OPENERS, CLOSERS$1, CodeSyntaxError, last, CLOSER, isNode, NAMESPACE_NAME, WORD_RE$2, FLAGS_RE, WORDS_BEFORE_STRING, NON_STRING_QUOTE_PREFIX, memoInput, memo, defaultCodeEnd, defaultHooks, MarkupError, OFFSET_FIELD, listeners, RESERVED_NAME, isArrayIndex, hasOwn, createNamespace, TRAILING_OPERATOR_RE, slice, MacroArgumentError, WORD_RE$1, NUMBER_RE$1, WORD_OR_PUNCT_RE, LEADING_OPERATOR_RE, takesRest, SUB_MACRO_PARAMETERS, _MarkupExpansionBudget, MarkupExpansionBudget, parses, CONDITION_MACROS, PASSAGE_BODIES, holdsByDefault, JS_ESCAPE_RE, textPiece, LITERAL, registeredParameters, WIDGET_PARAMETERS, SPECIAL_PASSAGES, NOT_MARKUP, NOT_MARKUP_TAGS$1, BRANCH_MACROS, didYouMean, PASSAGE_ARGUMENT_HINT, BARE_WORD_RE, NUMBER_RE, IDENT_RE, KEY_RE, ARROW_RE, LINE_END_RE, ARRAY_INDEX_RE, UNSUPPORTED_UNDEFINED, Reader, VALID_VAR_TYPES, PRIMITIVE_SAMPLES, UNSUPPORTED_TYPE, NO_STORE_VAR_MACROS, CLOSERS, BLOCK_WORDS, NOT_PARAMETERS, DECLARATIONS, WRITE_RE, MUTATORS, MUTATING_CALL_RE, BEFORE_BINDING, isWordChar, Bindings, CALL_RE, IDENTIFIER_ARGUMENT_RE, WORD_RE, MODIFIER_RE, KEY_START_RE, CONFIG_KEYS, ConfigReader, stringOf, booleanOf, textOf, stringsOf, VOID_ELEMENTS, characterEntities, own, hasOwnProperty, asciiAlpha, asciiAlphanumeric, asciiAtext, asciiDigit, asciiHexDigit, asciiPunctuation, unicodePunctuation, unicodeWhitespace, content$1, EditMap$1, document$1, containerConstruct, attention, autolink, blankLine, blockQuote, characterEscape, characterReference, nonLazyContinuation, codeFenced, codeIndented, furtherStart, codeText, SpliceBuffer, content, continuationConstruct, definition, titleBefore, hardBreakEscape, headingAtx, htmlBlockNames, htmlRawNames, htmlFlow, blankLineBefore, htmlText, labelEnd, resourceConstruct, referenceFullConstruct, referenceCollapsedConstruct, labelStartImage, labelStartLink, lineEnding, thematicBreak, list, listItemPrefixWhitespaceConstruct, indentConstruct, setextUnderline, flow$1, resolver, string$1, text$1, constructs_exports, document, contentInitial, flowInitial, flow, string, text, insideSpan, attentionMarkers, disable, search, alignment, EditMap, DEFAULT_PRETTIER_OPTIONS, SVG_PLACEHOLDERS, SPINDLE_PLACEHOLDERS, PLACEHOLDER_PATTERN, DEFAULT_DEDENTING, WHITESPACE_AS_WRITTEN, HTML_MARKDOWN_BOUNDARIES, LIST_ITEM_REGEX, CODE_FENCE_REGEX, NO_WRAP, NOT_MARKUP_TAGS;
+var __defProp2, __exportAll, HTML_TEXT_ELEMENTS$1, SIGIL_SCOPES, SIGIL_CHARS, grammar_shared_default, LB, RB, SIGIL_SCOPES$1, withSelectors, HTML_TEXT_ELEMENTS, VOID_TAGS, BRANCH_PARENT$1, LINK_SEPARATORS, NO_SELECTORS, EMAIL_AUTOLINK, peg$SyntaxError, NameMap, NameSet, OPTION_CLAUSE, PARAMETER_TYPES, STRING_HOLDS, metadataRegistry, companionParents, BLOCK_MACROS, BLOCK_WIDGETS, WIDGETS, DEFINED_BLOCK_MACROS, DEFINED_MACROS, REGISTERED_BLOCK_MACROS, RAW_BODY_MACROS, BRANCHING, quoteArg, MAX_MARKUP_DEPTH, last$1, BRANCH_PARENT, lowerName, nameOf, closerOf, closes, astralIdentifierCodes, astralIdentifierStartCodes, nonASCIIidentifierChars, nonASCIIidentifierStartChars, reservedWords, ecma5AndLessKeywords, keywords$1, keywordRelationalOperator, nonASCIIidentifierStart, nonASCIIidentifier, TokenType, beforeExpr, startsExpr, keywords, types$1, lineBreak, lineBreakG, nonASCIIwhitespace, skipWhiteSpace, ref, hasOwnProperty$1, toString, hasOwn$1, isArray, regexpCache, loneSurrogate, Position, SourceLocation, defaultOptions, warnedAboutEcmaVersion, SCOPE_TOP, SCOPE_FUNCTION, SCOPE_ASYNC, SCOPE_GENERATOR, SCOPE_ARROW, SCOPE_SIMPLE_CATCH, SCOPE_SUPER, SCOPE_DIRECT_SUPER, SCOPE_CLASS_STATIC_BLOCK, SCOPE_CLASS_FIELD_INIT, SCOPE_SWITCH, SCOPE_VAR, BIND_NONE, BIND_VAR, BIND_LEXICAL, BIND_FUNCTION, BIND_SIMPLE_CATCH, BIND_OUTSIDE, Parser, prototypeAccessors, pp$9, literal, DestructuringErrors, pp$8, loopLabel, switchLabel, empty$1, FUNC_STATEMENT, FUNC_HANGING_STATEMENT, FUNC_NULLABLE_ID, pp$7, TokContext, types, pp$6, pp$5, empty, pp$4, pp$3, Scope, Node, pp$2, scriptValuesAddedInUnicode, ecma9BinaryProperties, ecma10BinaryProperties, ecma11BinaryProperties, ecma12BinaryProperties, ecma13BinaryProperties, unicodeBinaryProperties, unicodeBinaryPropertiesOfStrings, unicodeGeneralCategoryValues, ecma9ScriptValues, ecma10ScriptValues, ecma11ScriptValues, ecma12ScriptValues, ecma13ScriptValues, unicodeScriptValues, data, ecmaVersion, i, list$2, pp$1, BranchID, RegExpValidationState, CharSetNone, CharSetOk, CharSetString, Token, pp, INVALID_TEMPLATE_ESCAPE_ERROR, OPTIONS, AT_NAME_RE, TRANS_NAME_RE, SIGIL_IDENT_RE, LINE_BREAK_RE, NOT_A_BODY_RE, OPERAND_ENDS, SigilParser, OPENERS, CLOSERS$1, CodeSyntaxError, last, CLOSER, isNode, NAMESPACE_NAME, WORD_RE$2, FLAGS_RE, WORDS_BEFORE_STRING, NON_STRING_QUOTE_PREFIX, memoInput, memo, defaultCodeEnd, defaultHooks, MarkupError, OFFSET_FIELD, listeners, RESERVED_NAME, isArrayIndex, hasOwn, createNamespace, TRAILING_OPERATOR_RE, slice, MacroArgumentError, WORD_RE$1, NUMBER_RE$1, WORD_OR_PUNCT_RE, LEADING_OPERATOR_RE, takesRest, SUB_MACRO_PARAMETERS, _MarkupExpansionBudget, MarkupExpansionBudget, parses, CONDITION_MACROS, PASSAGE_BODIES, holdsByDefault, JS_ESCAPE_RE, textPiece, LITERAL, registeredParameters, WIDGET_PARAMETERS, SPECIAL_PASSAGES, NOT_MARKUP, NOT_MARKUP_TAGS$1, BRANCH_MACROS, didYouMean, PASSAGE_ARGUMENT_HINT, BARE_WORD_RE, NUMBER_RE, IDENT_RE, KEY_RE, ARROW_RE, LINE_END_RE, ARRAY_INDEX_RE, UNSUPPORTED_UNDEFINED, Reader, VALID_VAR_TYPES, PRIMITIVE_SAMPLES, UNSUPPORTED_TYPE, NO_STORE_VAR_MACROS, CLOSERS, BLOCK_WORDS, NOT_PARAMETERS, DECLARATIONS, WRITE_RE, MUTATORS, MUTATING_CALL_RE, BEFORE_BINDING, isWordChar, Bindings, CALL_RE, IDENTIFIER_ARGUMENT_RE, WORD_RE, MODIFIER_RE, KEY_START_RE, CONFIG_KEYS, ConfigReader, stringOf, booleanOf, textOf, stringsOf, VOID_ELEMENTS, characterEntities, own, hasOwnProperty, asciiAlpha, asciiAlphanumeric, asciiAtext, asciiDigit, asciiHexDigit, asciiPunctuation, unicodePunctuation, unicodeWhitespace, content$1, EditMap$1, document$1, containerConstruct, attention, autolink, blankLine, blockQuote, characterEscape, characterReference, nonLazyContinuation, codeFenced, codeIndented, furtherStart, codeText, SpliceBuffer, content, continuationConstruct, definition, titleBefore, hardBreakEscape, headingAtx, htmlBlockNames, htmlRawNames, htmlFlow, blankLineBefore, htmlText, labelEnd, resourceConstruct, referenceFullConstruct, referenceCollapsedConstruct, labelStartImage, labelStartLink, lineEnding, thematicBreak, list, listItemPrefixWhitespaceConstruct, indentConstruct, setextUnderline, flow$1, resolver, string$1, text$1, constructs_exports, document, contentInitial, flowInitial, flow, string, text, insideSpan, attentionMarkers, disable, search, alignment, EditMap, joinData, textData, ATEXT, ALPHANUMERIC, ALPHA, DEFAULT_PRETTIER_OPTIONS, SVG_PLACEHOLDERS, SPINDLE_PLACEHOLDERS, PLACEHOLDER_PATTERN, DEFAULT_DEDENTING, WHITESPACE_AS_WRITTEN, HTML_MARKDOWN_BOUNDARIES, LIST_ITEM_REGEX, CODE_FENCE_REGEX, NO_WRAP, NOT_MARKUP_TAGS;
 var init_story_variables = __esm({
   "node_modules/@rohal12/spindle/dist/pkg/story-variables.js"() {
     __defProp2 = Object.defineProperty;
@@ -21984,38 +22233,18 @@ var init_story_variables = __esm({
       if (!no_symbols) __defProp2(target, Symbol.toStringTag, { value: "Module" });
       return target;
     };
-    NameMap = class extends Map {
-      get(name) {
-        return super.get(name.toLowerCase());
-      }
-      set(name, value) {
-        return super.set(name.toLowerCase(), value);
-      }
-      has(name) {
-        return super.has(name.toLowerCase());
-      }
-      delete(name) {
-        return super.delete(name.toLowerCase());
-      }
-    };
-    NameSet = class {
-      constructor(names = []) {
-        this.names = new NameMap();
-        for (const name of names) this.add(name);
-      }
-      add(name) {
-        this.names.set(name, true);
-      }
-      has(name) {
-        return this.names.has(name);
-      }
-      delete(name) {
-        this.names.delete(name);
-      }
-      clear() {
-        this.names.clear();
-      }
-    };
+    HTML_TEXT_ELEMENTS$1 = /* @__PURE__ */ new Set([
+      .../* @__PURE__ */ new Set([
+        "script",
+        "style",
+        "xmp",
+        "iframe",
+        "noembed",
+        "noframes"
+      ]),
+      "textarea",
+      "title"
+    ]);
     SIGIL_SCOPES = {
       $: "variable",
       _: "temporary",
@@ -22026,11 +22255,12 @@ var init_story_variables = __esm({
     SIGIL_CHARS = new Set(Object.keys(SIGIL_SCOPES));
     grammar_shared_default = {
       SIGIL_SCOPES,
-      withSelectors: withSelectors$1
+      withSelectors: withSelectors$1,
+      HTML_TEXT_ELEMENTS: HTML_TEXT_ELEMENTS$1
     };
     LB = String.fromCharCode(123);
     RB = String.fromCharCode(125);
-    ({ SIGIL_SCOPES: SIGIL_SCOPES$1, withSelectors } = grammar_shared_default);
+    ({ SIGIL_SCOPES: SIGIL_SCOPES$1, withSelectors, HTML_TEXT_ELEMENTS } = grammar_shared_default);
     VOID_TAGS = /* @__PURE__ */ new Set([
       "area",
       "base",
@@ -22150,6 +22380,38 @@ var init_story_variables = __esm({
         return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
       }
     };
+    NameMap = class extends Map {
+      get(name) {
+        return super.get(name.toLowerCase());
+      }
+      set(name, value) {
+        return super.set(name.toLowerCase(), value);
+      }
+      has(name) {
+        return super.has(name.toLowerCase());
+      }
+      delete(name) {
+        return super.delete(name.toLowerCase());
+      }
+    };
+    NameSet = class {
+      constructor(names = []) {
+        this.names = new NameMap();
+        for (const name of names) this.add(name);
+      }
+      add(name) {
+        this.names.set(name, true);
+      }
+      has(name) {
+        return this.names.has(name);
+      }
+      delete(name) {
+        this.names.delete(name);
+      }
+      clear() {
+        this.names.clear();
+      }
+    };
     OPTION_CLAUSE = "option";
     new NameMap();
     new NameMap();
@@ -27292,9 +27554,7 @@ var init_story_variables = __esm({
           if (name) {
             const end = at3 + 1 + name.length;
             const afterPrefix = self.type === types$1.incDec && (this.operandBeforeLast || this.breakBeforeLast);
-            const forced = code === 37 ? this.percentAt?.get(at3) : void 0;
-            if (code === 64 || (forced ?? (self.exprAllowed || afterPrefix || this.lookahead && transientAssignment(self, end)))) {
-              if (code === 37) this.transientsRead?.add(at3);
+            if (code === 64 || self.exprAllowed || afterPrefix || this.lookahead && transientAssignment(self, end)) {
               self.pos = end;
               self.finishToken(types$1.name, self.input.charAt(at3) + name);
               return;
@@ -27317,16 +27577,31 @@ var init_story_variables = __esm({
         }
         const self = this;
         const prevType = self.type;
+        const beforePreviousValue = this.prevValue;
         this.prevValue = isMemberDot(this.typeBeforeLast) ? void 0 : self.value;
         const property = type.keyword !== void 0 && isMemberDot(prevType) || (type === types$1._function || type === types$1._class) && notABody(self.input, self.pos);
         if (!property && (type === types$1._function || type === types$1._class)) {
-          const before = type === types$1._function && prevType === types$1.name && this.prevValue === "async" && !this.breakHere ? this.typeBeforeLast : prevType;
-          self.type = before === types$1.colon && this.colonEndsTernary ? types$1.parenL : before;
+          const afterAsync = type === types$1._function && prevType === types$1.name && this.prevValue === "async" && !this.breakHere;
+          const before = afterAsync ? this.typeBeforeLast : prevType;
+          const contextualOperand = before === types$1.name && (afterAsync ? this.operandBeforeLast : self.exprAllowed) && ((afterAsync ? beforePreviousValue : this.prevValue) !== "yield" || !(afterAsync ? this.breakBeforeLast : this.breakHere));
+          self.type = before === types$1.colon && this.colonEndsTernary || contextualOperand ? types$1.parenL : before;
         }
         this.typeBeforeLast = prevType;
         super.finishToken(property ? types$1.name : type, value);
         if (type === types$1.name && (isMemberDot(prevType) || value === "of" && (prevType === types$1._const || prevType === types$1._var || this.prevValue === "let"))) self.exprAllowed = false;
       }
+      parseIdent(liberal) {
+        this.exprAllowed = false;
+        return super.parseIdent(liberal);
+      }
+      parseForIn(node2, init) {
+        this.exprAllowed = true;
+        return super.parseForIn(node2, init);
+      }
+      parseAwait(forInit) {
+        this.exprAllowed = true;
+        return super.parseAwait(forInit);
+      }
       braceIsBlock(prevType) {
         if (prevType === types$1.colon && this.colonEndsTernary) return false;
         if (prevType === types$1.braceR && this.closedBlock) return true;
@@ -31281,6 +31556,44 @@ var init_story_variables = __esm({
         this.index.clear();
       }
     };
+    joinData = (events) => {
+      const at3 = events.length - 2;
+      const before = events[at3 - 1];
+      if (before && before[0] === "exit" && before[1].type === "data") {
+        before[1].end = events[at3][1].end;
+        events.length = at3;
+      }
+      return events;
+    };
+    textData = { text: { null: {
+      name: "textData",
+      tokenize(effects, ok) {
+        const self = this;
+        const constructs2 = this.parser.constructs.text;
+        function atBreak(code) {
+          if (code === null) return true;
+          const list3 = constructs2[code] ?? [];
+          return (Array.isArray(list3) ? list3 : [list3]).some((item) => !item.previous || item.previous.call(self, self.previous));
+        }
+        function data2(code) {
+          if (atBreak(code)) {
+            effects.exit("data");
+            return ok(code);
+          }
+          effects.consume(code);
+          return data2;
+        }
+        return (code) => {
+          effects.enter("data");
+          effects.consume(code);
+          return data2;
+        };
+      },
+      resolveTo: joinData
+    } } };
+    ATEXT = /[#-'*+\--9=?A-Z^-~]/;
+    ALPHANUMERIC = /[0-9A-Za-z]/;
+    ALPHA = /[A-Za-z]/;
     DEFAULT_PRETTIER_OPTIONS = { tabWidth: 2 };
     SVG_PLACEHOLDERS = (i2) => [`<!--SVG:${i2}-->`];
     SPINDLE_PLACEHOLDERS = (i2) => [`<!--SP:${i2}-->`, `__SP${i2}__`];