@rohal12/spindle-lsp 0.15.7 → 0.15.9

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.7";
+    VERSION = false ? pkg.version : "0.15.9";
   }
 });
 
@@ -7011,10 +7011,10 @@ var require_resolve_block_map = __commonJS({
       let offset2 = bm.offset;
       let commentEnd = null;
       for (const collItem of bm.items) {
-        const { start, key, sep: sep3, value } = collItem;
+        const { start, key, sep: sep4, value } = collItem;
         const keyProps = resolveProps.resolveProps(start, {
           indicator: "explicit-key-ind",
-          next: key ?? sep3?.[0],
+          next: key ?? sep4?.[0],
           offset: offset2,
           onError,
           parentIndent: bm.indent,
@@ -7028,7 +7028,7 @@ var require_resolve_block_map = __commonJS({
             else if ("indent" in key && key.indent !== bm.indent)
               onError(offset2, "BAD_INDENT", startColMsg);
           }
-          if (!keyProps.anchor && !keyProps.tag && !sep3) {
+          if (!keyProps.anchor && !keyProps.tag && !sep4) {
             commentEnd = keyProps.end;
             if (keyProps.comment) {
               if (map2.comment)
@@ -7052,7 +7052,7 @@ var require_resolve_block_map = __commonJS({
         ctx.atKey = false;
         if (utilMapIncludes.mapIncludes(ctx, map2.items, keyNode))
           onError(keyStart, "DUPLICATE_KEY", "Map keys must be unique");
-        const valueProps = resolveProps.resolveProps(sep3 ?? [], {
+        const valueProps = resolveProps.resolveProps(sep4 ?? [], {
           indicator: "map-value-ind",
           next: value,
           offset: keyNode.range[2],
@@ -7068,7 +7068,7 @@ var require_resolve_block_map = __commonJS({
             if (ctx.options.strict && keyProps.start < valueProps.found.offset - 1024)
               onError(keyNode.range, "KEY_OVER_1024_CHARS", "The : indicator must be at most 1024 chars after the start of an implicit block mapping key");
           }
-          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : composeEmptyNode(ctx, offset2, sep3, null, valueProps, onError);
+          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : composeEmptyNode(ctx, offset2, sep4, null, valueProps, onError);
           if (ctx.schema.compat)
             utilFlowIndentCheck.flowIndentCheck(bm.indent, value, onError);
           offset2 = valueNode.range[2];
@@ -7159,7 +7159,7 @@ var require_resolve_end = __commonJS({
       let comment = "";
       if (end) {
         let hasSpace = false;
-        let sep3 = "";
+        let sep4 = "";
         for (const token of end) {
           const { source, type } = token;
           switch (type) {
@@ -7173,13 +7173,13 @@ var require_resolve_end = __commonJS({
               if (!comment)
                 comment = cb;
               else
-                comment += sep3 + cb;
-              sep3 = "";
+                comment += sep4 + cb;
+              sep4 = "";
               break;
             }
             case "newline":
               if (comment)
-                sep3 += source;
+                sep4 += source;
               hasSpace = true;
               break;
             default:
@@ -7222,18 +7222,18 @@ var require_resolve_flow_collection = __commonJS({
       let offset2 = fc.offset + fc.start.source.length;
       for (let i2 = 0; i2 < fc.items.length; ++i2) {
         const collItem = fc.items[i2];
-        const { start, key, sep: sep3, value } = collItem;
+        const { start, key, sep: sep4, value } = collItem;
         const props = resolveProps.resolveProps(start, {
           flow: fcName,
           indicator: "explicit-key-ind",
-          next: key ?? sep3?.[0],
+          next: key ?? sep4?.[0],
           offset: offset2,
           onError,
           parentIndent: fc.indent,
           startOnNewline: false
         });
         if (!props.found) {
-          if (!props.anchor && !props.tag && !sep3 && !value) {
+          if (!props.anchor && !props.tag && !sep4 && !value) {
             if (i2 === 0 && props.comma)
               onError(props.comma, "UNEXPECTED_TOKEN", `Unexpected , in ${fcName}`);
             else if (i2 < fc.items.length - 1)
@@ -7287,8 +7287,8 @@ var require_resolve_flow_collection = __commonJS({
             }
           }
         }
-        if (!isMap2 && !sep3 && !props.found) {
-          const valueNode = value ? composeNode(ctx, value, props, onError) : composeEmptyNode(ctx, props.end, sep3, null, props, onError);
+        if (!isMap2 && !sep4 && !props.found) {
+          const valueNode = value ? composeNode(ctx, value, props, onError) : composeEmptyNode(ctx, props.end, sep4, null, props, onError);
           coll.items.push(valueNode);
           offset2 = valueNode.range[2];
           if (isBlock(value))
@@ -7300,7 +7300,7 @@ var require_resolve_flow_collection = __commonJS({
           if (isBlock(key))
             onError(keyNode.range, "BLOCK_IN_FLOW", blockMsg);
           ctx.atKey = false;
-          const valueProps = resolveProps.resolveProps(sep3 ?? [], {
+          const valueProps = resolveProps.resolveProps(sep4 ?? [], {
             flow: fcName,
             indicator: "map-value-ind",
             next: value,
@@ -7311,8 +7311,8 @@ var require_resolve_flow_collection = __commonJS({
           });
           if (valueProps.found) {
             if (!isMap2 && !props.found && ctx.options.strict) {
-              if (sep3)
-                for (const st2 of sep3) {
+              if (sep4)
+                for (const st2 of sep4) {
                   if (st2 === valueProps.found)
                     break;
                   if (st2.type === "newline") {
@@ -7329,7 +7329,7 @@ var require_resolve_flow_collection = __commonJS({
             else
               onError(valueProps.start, "MISSING_CHAR", `Missing , or : between ${fcName} items`);
           }
-          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : valueProps.found ? composeEmptyNode(ctx, valueProps.end, sep3, null, valueProps, onError) : null;
+          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : valueProps.found ? composeEmptyNode(ctx, valueProps.end, sep4, null, valueProps, onError) : null;
           if (valueNode) {
             if (isBlock(value))
               onError(valueNode.range, "BLOCK_IN_FLOW", blockMsg);
@@ -7509,7 +7509,7 @@ var require_resolve_block_scalar = __commonJS({
           chompStart = i2 + 1;
       }
       let value = "";
-      let sep3 = "";
+      let sep4 = "";
       let prevMoreIndented = false;
       for (let i2 = 0; i2 < contentStart; ++i2)
         value += lines[i2][0].slice(trimIndent) + "\n";
@@ -7526,24 +7526,24 @@ var require_resolve_block_scalar = __commonJS({
           indent = "";
         }
         if (type === Scalar.Scalar.BLOCK_LITERAL) {
-          value += sep3 + indent.slice(trimIndent) + content2;
-          sep3 = "\n";
+          value += sep4 + indent.slice(trimIndent) + content2;
+          sep4 = "\n";
         } else if (indent.length > trimIndent || content2[0] === "	") {
-          if (sep3 === " ")
-            sep3 = "\n";
-          else if (!prevMoreIndented && sep3 === "\n")
-            sep3 = "\n\n";
-          value += sep3 + indent.slice(trimIndent) + content2;
-          sep3 = "\n";
+          if (sep4 === " ")
+            sep4 = "\n";
+          else if (!prevMoreIndented && sep4 === "\n")
+            sep4 = "\n\n";
+          value += sep4 + indent.slice(trimIndent) + content2;
+          sep4 = "\n";
           prevMoreIndented = true;
         } else if (content2 === "") {
-          if (sep3 === "\n")
+          if (sep4 === "\n")
             value += "\n";
           else
-            sep3 = "\n";
+            sep4 = "\n";
         } else {
-          value += sep3 + content2;
-          sep3 = " ";
+          value += sep4 + content2;
+          sep4 = " ";
           prevMoreIndented = false;
         }
       }
@@ -7726,25 +7726,25 @@ var require_resolve_flow_scalar = __commonJS({
         trimBoth = /^[ \t]+|[ \t]+$/g;
       }
       let res = match2[1].replace(trimEnd, "");
-      let sep3 = " ";
+      let sep4 = " ";
       let pos = line.lastIndex;
       while (match2 = line.exec(source)) {
         const lm = match2[1].replace(trimBoth, "");
         if (lm === "") {
-          if (sep3 === "\n")
-            res += sep3;
+          if (sep4 === "\n")
+            res += sep4;
           else
-            sep3 = "\n";
+            sep4 = "\n";
         } else {
-          res += sep3 + lm;
-          sep3 = " ";
+          res += sep4 + lm;
+          sep4 = " ";
         }
         pos = line.lastIndex;
       }
       const last2 = /[ \t]*(.*)/sy;
       last2.lastIndex = pos;
       match2 = last2.exec(source);
-      return res + sep3 + (match2?.[1] ?? "");
+      return res + sep4 + (match2?.[1] ?? "");
     }
     function doubleQuotedValue(source, onError) {
       let res = "";
@@ -8554,14 +8554,14 @@ var require_cst_stringify = __commonJS({
         }
       }
     }
-    function stringifyItem({ start, key, sep: sep3, value }) {
+    function stringifyItem({ start, key, sep: sep4, value }) {
       let res = "";
       for (const st2 of start)
         res += st2.source;
       if (key)
         res += stringifyToken(key);
-      if (sep3)
-        for (const st2 of sep3)
+      if (sep4)
+        for (const st2 of sep4)
           res += st2.source;
       if (value)
         res += stringifyToken(value);
@@ -9728,18 +9728,18 @@ var require_parser = __commonJS({
         if (this.type === "map-value-ind") {
           const prev = getPrevProps(this.peek(2));
           const start = getFirstKeyStartProps(prev);
-          let sep3;
+          let sep4;
           if (scalar.end) {
-            sep3 = scalar.end;
-            sep3.push(this.sourceToken);
+            sep4 = scalar.end;
+            sep4.push(this.sourceToken);
             delete scalar.end;
           } else
-            sep3 = [this.sourceToken];
+            sep4 = [this.sourceToken];
           const map2 = {
             type: "block-map",
             offset: scalar.offset,
             indent: scalar.indent,
-            items: [{ start, key: scalar, sep: sep3 }]
+            items: [{ start, key: scalar, sep: sep4 }]
           };
           this.onKeyLine = true;
           this.stack[this.stack.length - 1] = map2;
@@ -9892,15 +9892,15 @@ var require_parser = __commonJS({
                 } else if (isFlowToken(it2.key) && !includesToken(it2.sep, "newline")) {
                   const start2 = getFirstKeyStartProps(it2.start);
                   const key = it2.key;
-                  const sep3 = it2.sep;
-                  sep3.push(this.sourceToken);
+                  const sep4 = it2.sep;
+                  sep4.push(this.sourceToken);
                   delete it2.key;
                   delete it2.sep;
                   this.stack.push({
                     type: "block-map",
                     offset: this.offset,
                     indent: this.indent,
-                    items: [{ start: start2, key, sep: sep3 }]
+                    items: [{ start: start2, key, sep: sep4 }]
                   });
                 } else if (start.length > 0) {
                   it2.sep = it2.sep.concat(start, this.sourceToken);
@@ -10094,13 +10094,13 @@ var require_parser = __commonJS({
             const prev = getPrevProps(parent);
             const start = getFirstKeyStartProps(prev);
             fixFlowSeqItems(fc);
-            const sep3 = fc.end.splice(1, fc.end.length);
-            sep3.push(this.sourceToken);
+            const sep4 = fc.end.splice(1, fc.end.length);
+            sep4.push(this.sourceToken);
             const map2 = {
               type: "block-map",
               offset: fc.offset,
               indent: fc.indent,
-              items: [{ start, key: fc, sep: sep3 }]
+              items: [{ start, key: fc, sep: sep4 }]
             };
             this.onKeyLine = true;
             this.stack[this.stack.length - 1] = map2;
@@ -10489,8 +10489,8 @@ var init_config_loader = __esm({
 });
 
 // src/core/workspace/macro-sources.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
-import { dirname, isAbsolute, join as join2, relative } from "node:path";
+import { existsSync as existsSync2, lstatSync, readdir, readFileSync as readFileSync2 } from "node:fs";
+import { dirname, isAbsolute, join as join2, relative, resolve as resolve2, sep } from "node:path";
 import { pathToFileURL } from "node:url";
 function isExcludedSegment(segment) {
   return EXCLUDED_DIRS.includes(segment) || segment.startsWith(".") && segment !== "." && segment !== "..";
@@ -10501,19 +10501,41 @@ function isMacroSource(uriOrPath) {
 function isExcludedProjectFile(path2, root) {
   return (root ? relative(root, path2) : path2).split(/[\\/]/).some(isExcludedSegment);
 }
+function canDiscoverProjectPath(path2, root) {
+  let current2 = resolve2(root);
+  try {
+    for (const segment of relative(root, path2).split(sep)) {
+      current2 = resolve2(current2, segment);
+      if (lstatSync(current2).isSymbolicLink()) return false;
+    }
+  } catch (error48) {
+    if (["ENOENT", "ENOTDIR", "EACCES", "EPERM"].includes(error48.code ?? "")) return false;
+    throw error48;
+  }
+  return true;
+}
 function findMacroSourceFiles(root) {
   return findProjectFiles(root, MACRO_SOURCE_GLOB);
 }
-function findProjectFiles(root, pattern) {
-  const excluded = (p) => isExcludedProjectFile(p.fullpath(), root);
-  return Ze(pattern, {
+async function findProjectFiles(root, pattern) {
+  const excluded = (p) => isExcludedProjectFile(p.fullpath(), root) || !canDiscoverProjectPath(p.fullpath(), root);
+  const files = await Ze(pattern, {
     cwd: root,
     absolute: true,
     nodir: true,
+    follow: false,
     // Hidden entries are excluded by the predicate, not by glob's default
     dot: true,
-    ignore: { ignored: excluded, childrenIgnored: excluded }
+    ignore: { ignored: excluded, childrenIgnored: excluded },
+    // Glob can read a literal prefix before consulting childrenIgnored.
+    fs: {
+      readdir(path2, options, callback) {
+        if (canDiscoverProjectPath(path2, root)) readdir(path2, options, callback);
+        else callback(null, []);
+      }
+    }
   });
+  return files.filter((file2) => canDiscoverProjectPath(file2, root));
 }
 function isWithin(path2, dir) {
   const rel = relative(dir, path2);
@@ -10558,16 +10580,16 @@ var init_macro_sources = __esm({
 
 // src/core/workspace/file-inputs.ts
 import { readFileSync as readFileSync3, statSync } from "node:fs";
-import { isAbsolute as isAbsolute2, relative as relative2, resolve as resolve2, sep } from "node:path";
+import { isAbsolute as isAbsolute2, relative as relative2, resolve as resolve3, sep as sep2 } from "node:path";
 async function resolveFiles(pattern, cwd) {
   let input = pattern;
   let directory = cwd;
-  const literal3 = resolve2(cwd, pattern);
+  const literal3 = resolve3(cwd, pattern);
   try {
     const stat = statSync(literal3);
     if (stat.isFile()) return [literal3];
     if (stat.isDirectory()) {
-      if (isExcludedProjectFile(literal3, cwd)) return [];
+      if (isExcludedProjectFile(literal3, cwd) || !canDiscoverProjectPath(literal3, cwd)) return [];
       directory = literal3;
       input = "**/*.{tw,twee}";
     }
@@ -10586,7 +10608,7 @@ async function resolveInputs(patterns, cwd) {
 }
 function relativeTo(cwd, filePath) {
   const rel = relative2(cwd, filePath);
-  return rel === ".." || rel.startsWith(`..${sep}`) || isAbsolute2(rel) ? filePath : rel;
+  return rel === ".." || rel.startsWith(`..${sep2}`) || isAbsolute2(rel) ? filePath : rel;
 }
 var init_file_inputs = __esm({
   "src/core/workspace/file-inputs.ts"() {
@@ -10800,10 +10822,11 @@ function peg$parse(input, options) {
   const peg$c11 = "}";
   const peg$c12 = "/";
   const peg$c13 = "@";
-  const peg$c14 = "</";
-  const peg$c15 = "=";
-  const peg$c16 = '"';
-  const peg$c17 = "'";
+  const peg$c14 = ":";
+  const peg$c15 = "</";
+  const peg$c16 = "=";
+  const peg$c17 = '"';
+  const peg$c18 = "'";
   const peg$r0 = /^[^\\{[<]/;
   const peg$r1 = /^[{}]/;
   const peg$r2 = /^[$_@%(!\/a-zA-Z]/;
@@ -10816,14 +10839,16 @@ function peg$parse(input, options) {
   const peg$r9 = /^[^ \t\n\r\v\f\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF}]/;
   const peg$r10 = /^[a-zA-Z0-9.!#$%&'*+\/=?\^_`|~\-]/;
   const peg$r11 = /^[a-zA-Z0-9.\-]/;
-  const peg$r12 = /^[\t-\r \/>\xA0\u1680\u2000-\u200A\u2028-\u2029\u202F\u205F\u3000\uFEFF]/;
-  const peg$r13 = /^[a-zA-Z0-9\-]/;
-  const peg$r14 = /^[\t-\r "'\/<->{}\xA0\u1680\u2000-\u200A\u2028-\u2029\u202F\u205F\u3000\uFEFF]/;
-  const peg$r15 = /^[^"]/;
-  const peg$r16 = /^[^']/;
-  const peg$r17 = /^["']/;
-  const peg$r18 = /^[^ \t\n\r\v\f\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF>]/;
-  const peg$r19 = /^[ \t\n\r\v\f\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]/;
+  const peg$r12 = /^[a-zA-Z0-9+.\-]/;
+  const peg$r13 = /^[^\0- \x7F<>{}]/;
+  const peg$r14 = /^[\t-\r \/>\xA0\u1680\u2000-\u200A\u2028-\u2029\u202F\u205F\u3000\uFEFF]/;
+  const peg$r15 = /^[a-zA-Z0-9\-]/;
+  const peg$r16 = /^[\t-\r "'\/<->{}\xA0\u1680\u2000-\u200A\u2028-\u2029\u202F\u205F\u3000\uFEFF]/;
+  const peg$r17 = /^[^"]/;
+  const peg$r18 = /^[^']/;
+  const peg$r19 = /^["']/;
+  const peg$r20 = /^[^ \t\n\r\v\f\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF>]/;
+  const peg$r21 = /^[ \t\n\r\v\f\xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]/;
   const peg$e0 = peg$anyExpectation();
   const peg$e1 = peg$classExpectation([
     "\\",
@@ -10936,6 +10961,23 @@ function peg$parse(input, options) {
     "-"
   ], false, false, false);
   const peg$e27 = peg$classExpectation([
+    ["a", "z"],
+    ["A", "Z"],
+    ["0", "9"],
+    "+",
+    ".",
+    "-"
+  ], false, false, false);
+  const peg$e28 = peg$literalExpectation(":", false);
+  const peg$e29 = peg$classExpectation([
+    ["\0", " "],
+    "\x7F",
+    "<",
+    ">",
+    "{",
+    "}"
+  ], true, false, false);
+  const peg$e30 = peg$classExpectation([
     ["	", "\r"],
     " ",
     "/",
@@ -10949,14 +10991,14 @@ function peg$parse(input, options) {
     "\u3000",
     "\uFEFF"
   ], false, false, false);
-  const peg$e28 = peg$literalExpectation("</", false);
-  const peg$e29 = peg$classExpectation([
+  const peg$e31 = peg$literalExpectation("</", false);
+  const peg$e32 = peg$classExpectation([
     ["a", "z"],
     ["A", "Z"],
     ["0", "9"],
     "-"
   ], false, false, false);
-  const peg$e30 = peg$classExpectation([
+  const peg$e33 = peg$classExpectation([
     ["	", "\r"],
     " ",
     '"',
@@ -10974,13 +11016,13 @@ function peg$parse(input, options) {
     "\u3000",
     "\uFEFF"
   ], false, false, false);
-  const peg$e31 = peg$literalExpectation("=", false);
-  const peg$e32 = peg$literalExpectation('"', false);
-  const peg$e33 = peg$classExpectation(['"'], true, false, false);
-  const peg$e34 = peg$literalExpectation("'", false);
-  const peg$e35 = peg$classExpectation(["'"], true, false, false);
-  const peg$e36 = peg$classExpectation(['"', "'"], false, false, false);
-  const peg$e37 = peg$classExpectation([
+  const peg$e34 = peg$literalExpectation("=", false);
+  const peg$e35 = peg$literalExpectation('"', false);
+  const peg$e36 = peg$classExpectation(['"'], true, false, false);
+  const peg$e37 = peg$literalExpectation("'", false);
+  const peg$e38 = peg$classExpectation(["'"], true, false, false);
+  const peg$e39 = peg$classExpectation(['"', "'"], false, false, false);
+  const peg$e40 = peg$classExpectation([
     " ",
     "	",
     "\n",
@@ -10998,7 +11040,7 @@ function peg$parse(input, options) {
     "\uFEFF",
     ">"
   ], true, false, false);
-  const peg$e38 = peg$classExpectation([
+  const peg$e41 = peg$classExpectation([
     " ",
     "	",
     "\n",
@@ -11021,68 +11063,71 @@ function peg$parse(input, options) {
   function peg$f1() {
     return !textMode;
   }
-  function peg$f2(tag) {
+  function peg$f2() {
+    return !textMode;
+  }
+  function peg$f3(tag) {
     return tag;
   }
-  function peg$f3() {
+  function peg$f4() {
     return !textMode;
   }
-  function peg$f4(tag) {
+  function peg$f5(tag) {
     return VOID_TAGS.has(tag.lower) ? null : tag;
   }
-  function peg$f5(tag) {
+  function peg$f6(tag) {
     rawName = tag.lower;
     return tag.kind === "open" && hooks.isRaw(rawName);
   }
-  function peg$f6(tag, b) {
+  function peg$f7(tag, b) {
     return b;
   }
-  function peg$f7(tag, body) {
+  function peg$f8(tag, body) {
     return body ? [tag, body] : tag;
   }
-  function peg$f8(tag) {
+  function peg$f9(tag) {
     return tag.kind === "close";
   }
-  function peg$f9(tag) {
+  function peg$f10(tag) {
     return tag;
   }
-  function peg$f10() {
+  function peg$f11() {
     return !textMode;
   }
-  function peg$f11(tag) {
+  function peg$f12(tag) {
     return tag;
   }
-  function peg$f12(start) {
+  function peg$f13(start) {
     return skipTo(hooks.rawBodyEnd(input, start, rawName));
   }
-  function peg$f13(start) {
+  function peg$f14(start) {
     return skipEnd - offset2();
   }
-  function peg$f14(start, body, end) {
+  function peg$f15(start, body, end) {
     const loc = {
       start: { offset: start },
       end: { offset: start + body.length }
     };
     return [body ? lexeme("text", loc, { value: body }) : null, end];
   }
-  function peg$f15() {
+  function peg$f16() {
     return offset2();
   }
-  function peg$f16(value) {
+  function peg$f17(value) {
     return lexeme("text", location(), { value });
   }
-  function peg$f17(value) {
+  function peg$f18(value) {
     const node = lexeme("text", location(), { value });
     node.comment = true;
     return node;
   }
-  function peg$f18(bs2) {
+  function peg$f19(bs2) {
     return bs2.length % 2 === 1;
   }
-  function peg$f19(bs2, c) {
+  function peg$f20(bs2, c) {
     return c;
   }
-  function peg$f20(bs2, brace) {
+  function peg$f21(bs2, brace) {
     const loc = location();
     const next = input.charAt(loc.end.offset);
     if (textMode) {
@@ -11099,48 +11144,48 @@ function peg$parse(input, options) {
     escaped.escape = true;
     return bs2.length > 1 ? [before, escaped] : escaped;
   }
-  function peg$f21() {
+  function peg$f22() {
     return lexeme("text", location(), { value: LB });
   }
-  function peg$f22() {
+  function peg$f23() {
     return !textMode;
   }
-  function peg$f23() {
+  function peg$f24() {
     return lexeme("text", location(), { value: "<" });
   }
-  function peg$f24() {
+  function peg$f25() {
     return lexeme("text", location(), { value: "[" });
   }
-  function peg$f25() {
+  function peg$f26() {
     return !textMode;
   }
-  function peg$f26(ss2, s, at3, inner) {
+  function peg$f27(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$f27() {
+  function peg$f28() {
     return !textMode;
   }
-  function peg$f28() {
+  function peg$f29() {
     fail("Unclosed link: [[ without ]]", location(), "unclosed-link");
   }
-  function peg$f29(parts) {
+  function peg$f30(parts) {
     return selectorsOf(parts);
   }
-  function peg$f30() {
+  function peg$f31() {
     return NO_SELECTORS;
   }
-  function peg$f31(s, end) {
+  function peg$f32(s, end) {
     return {
       ...s,
       end
     };
   }
-  function peg$f32(prefix, name) {
+  function peg$f33(prefix, name) {
     return [prefix, name];
   }
-  function peg$f33(ss2, s, sigil, nameStart, name) {
+  function peg$f34(ss2, s, sigil, nameStart, name) {
     const variable = lexeme("variable", location(), {
       name,
       nameStart,
@@ -11150,7 +11195,7 @@ function peg$parse(input, options) {
     variable.selectorSpan = selectorSpan(s, ss2, nameStart - 1);
     return withSelectors(variable, s);
   }
-  function peg$f34(ss2, s, after, expression) {
+  function peg$f35(ss2, s, after, expression) {
     const node = lexeme("expression", location(), {
       expression,
       expressionStart: after,
@@ -11159,28 +11204,28 @@ function peg$parse(input, options) {
     node.selectorSpan = selectorSpan(s, ss2, after);
     return withSelectors(node, s);
   }
-  function peg$f35() {
+  function peg$f36() {
     fail("Unclosed {" + input.substr(location().end.offset, 1) + "\u2026: no } ends it", location(), "unclosed-expression");
   }
-  function peg$f36(start) {
+  function peg$f37(start) {
     return skipTo(hooks.closeBrace(input, start, start));
   }
-  function peg$f37(start) {
+  function peg$f38(start) {
     return skipEnd - offset2();
   }
-  function peg$f38(start, code) {
+  function peg$f39(start, code) {
     return code;
   }
-  function peg$f39(ss2, s, start, close, name, nameEnd) {
+  function peg$f40(ss2, s, start, close, name, nameEnd) {
     return skipTo(hooks.closeBrace(input, nameEnd, start));
   }
-  function peg$f40(ss2, s, start, close, name, nameEnd) {
+  function peg$f41(ss2, s, start, close, name, nameEnd) {
     return skipEnd - offset2();
   }
-  function peg$f41(ss2, s, start, close, name, nameEnd, args2) {
+  function peg$f42(ss2, s, start, close, name, nameEnd, args2) {
     return args2;
   }
-  function peg$f42(ss2, s, start, close, name, nameEnd, tail) {
+  function peg$f43(ss2, s, start, close, name, nameEnd, tail) {
     const loc = location();
     const lower = name.toLowerCase();
     const tag = lexeme("macro", loc, {
@@ -11206,16 +11251,19 @@ function peg$parse(input, options) {
     }
     return tag;
   }
-  function peg$f43(s) {
+  function peg$f44(s) {
     fail("A closing tag starts with a letter after {/", location(), "invalid-closer");
   }
-  function peg$f44(value) {
+  function peg$f45(value) {
     return EMAIL_AUTOLINK.test(value);
   }
-  function peg$f45(value) {
+  function peg$f46(value) {
+    return lexeme("text", location(), { value });
+  }
+  function peg$f47(value) {
     return lexeme("text", location(), { value });
   }
-  function peg$f46(tagStart, tag, list3, slash) {
+  function peg$f48(tagStart, tag, list3, slash) {
     const lower = tag.toLowerCase();
     return lexeme("html", location(), {
       tag,
@@ -11228,7 +11276,7 @@ function peg$parse(input, options) {
       isSelfClose: !!slash || VOID_TAGS.has(lower)
     });
   }
-  function peg$f47(tag, bad) {
+  function peg$f49(tag, bad) {
     const c = input.charAt(bad);
     if (!c) fail("Unclosed tag <" + tag + ": no > ends it (write &lt; for a < that starts no tag)", location(), "unclosed-tag");
     const at3 = {
@@ -11246,7 +11294,7 @@ function peg$parse(input, options) {
     };
     fail("Unexpected " + JSON.stringify(c) + " in the tag <" + tag + ">: expected an attribute, or > to end the tag", at3, "unexpected-character");
   }
-  function peg$f48(tagStart, tag) {
+  function peg$f50(tagStart, tag) {
     return lexeme("html", location(), {
       tag,
       lower: tag.toLowerCase(),
@@ -11258,14 +11306,14 @@ function peg$parse(input, options) {
       isSelfClose: false
     });
   }
-  function peg$f49(nameStart, name) {
+  function peg$f51(nameStart, name) {
     attrCode = hooks.isCodeAttribute(name);
     return true;
   }
-  function peg$f50(nameStart, name, v2) {
+  function peg$f52(nameStart, name, v2) {
     return v2;
   }
-  function peg$f51(nameStart, name, value) {
+  function peg$f53(nameStart, name, value) {
     const attribute = {
       name,
       value: value ? value.value : "",
@@ -11279,7 +11327,7 @@ function peg$parse(input, options) {
     }
     return attribute;
   }
-  function peg$f52(start, value, end) {
+  function peg$f54(start, value, end) {
     return {
       value,
       start,
@@ -11287,7 +11335,7 @@ function peg$parse(input, options) {
       quote: '"'
     };
   }
-  function peg$f53(start, value, end) {
+  function peg$f55(start, value, end) {
     return {
       value,
       start,
@@ -11295,35 +11343,35 @@ function peg$parse(input, options) {
       quote: "'"
     };
   }
-  function peg$f54(q2) {
+  function peg$f56(q2) {
     fail("Unclosed attribute value: the " + q2 + " here has no closing " + q2, location(), "unclosed-attribute");
   }
-  function peg$f55(start, value, end) {
+  function peg$f57(start, value, end) {
     return {
       value,
       start,
       end
     };
   }
-  function peg$f56() {
+  function peg$f58() {
     return !attrCode;
   }
-  function peg$f57(bs2) {
+  function peg$f59(bs2) {
     return bs2.length % 2 === 1;
   }
-  function peg$f58() {
+  function peg$f60() {
     return !attrCode;
   }
-  function peg$f59(start, nameEnd) {
+  function peg$f61(start, nameEnd) {
     return skipTo(hooks.closeBrace(input, nameEnd, start));
   }
-  function peg$f60(start, nameEnd) {
+  function peg$f62(start, nameEnd) {
     return skipEnd - offset2();
   }
-  function peg$f61() {
+  function peg$f63() {
     return !attrCode;
   }
-  function peg$f62() {
+  function peg$f64() {
     return attrCode;
   }
   let peg$currPos = options.peg$currPos | 0;
@@ -11471,10 +11519,10 @@ function peg$parse(input, options) {
               if (s1) s1 = void 0;
               else s1 = peg$FAILED;
               if (s1 !== peg$FAILED) {
-                s2 = peg$parseHtmlOpen();
+                s2 = peg$parseUriAutolink();
                 if (s2 !== peg$FAILED) {
-                  peg$savedPos = s0;
-                  s0 = peg$f2(s2);
+                  s1 = [s1, s2];
+                  s0 = s1;
                 } else {
                   peg$currPos = s0;
                   s0 = peg$FAILED;
@@ -11486,14 +11534,14 @@ function peg$parse(input, options) {
               if (s0 === peg$FAILED) {
                 s0 = peg$currPos;
                 peg$savedPos = peg$currPos;
-                s1 = peg$f3();
+                s1 = peg$f2();
                 if (s1) s1 = void 0;
                 else s1 = peg$FAILED;
                 if (s1 !== peg$FAILED) {
-                  s2 = peg$parseHtmlClose();
+                  s2 = peg$parseHtmlOpen();
                   if (s2 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s0 = peg$f4(s2);
+                    s0 = peg$f3(s2);
                   } else {
                     peg$currPos = s0;
                     s0 = peg$FAILED;
@@ -11503,37 +11551,57 @@ function peg$parse(input, options) {
                   s0 = peg$FAILED;
                 }
                 if (s0 === peg$FAILED) {
-                  s0 = peg$parseValue();
+                  s0 = peg$currPos;
+                  peg$savedPos = peg$currPos;
+                  s1 = peg$f4();
+                  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);
+                    } else {
+                      peg$currPos = s0;
+                      s0 = peg$FAILED;
+                    }
+                  } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                  }
                   if (s0 === peg$FAILED) {
-                    s0 = peg$currPos;
-                    s1 = peg$parseMacroTag();
-                    if (s1 !== peg$FAILED) {
-                      s2 = peg$currPos;
-                      peg$savedPos = peg$currPos;
-                      s3 = peg$f5(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$f6(s1, s4);
+                    s0 = peg$parseValue();
+                    if (s0 === peg$FAILED) {
+                      s0 = peg$currPos;
+                      s1 = peg$parseMacroTag();
+                      if (s1 !== peg$FAILED) {
+                        s2 = peg$currPos;
+                        peg$savedPos = peg$currPos;
+                        s3 = peg$f6(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);
+                          } else {
+                            peg$currPos = s2;
+                            s2 = peg$FAILED;
+                          }
                         } else {
                           peg$currPos = s2;
                           s2 = peg$FAILED;
                         }
+                        if (s2 === peg$FAILED) s2 = null;
+                        peg$savedPos = s0;
+                        s0 = peg$f8(s1, s2);
                       } else {
-                        peg$currPos = s2;
-                        s2 = peg$FAILED;
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
                       }
-                      if (s2 === peg$FAILED) s2 = null;
-                      peg$savedPos = s0;
-                      s0 = peg$f7(s1, s2);
-                    } else {
-                      peg$currPos = s0;
-                      s0 = peg$FAILED;
+                      if (s0 === peg$FAILED) s0 = peg$parseLiteral();
                     }
-                    if (s0 === peg$FAILED) s0 = peg$parseLiteral();
                   }
                 }
               }
@@ -11550,12 +11618,12 @@ function peg$parse(input, options) {
     s1 = peg$parseMacroTag();
     if (s1 !== peg$FAILED) {
       peg$savedPos = peg$currPos;
-      s2 = peg$f8(s1);
+      s2 = peg$f9(s1);
       if (s2) s2 = void 0;
       else s2 = peg$FAILED;
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f9(s1);
+        s0 = peg$f10(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -11567,14 +11635,14 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s1 = peg$f10();
+      s1 = peg$f11();
       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$f11(s2);
+          s0 = peg$f12(s2);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -11591,12 +11659,12 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parseHere();
     peg$savedPos = peg$currPos;
-    s2 = peg$f12(s1);
+    s2 = peg$f13(s1);
     if (s2) s2 = void 0;
     else s2 = peg$FAILED;
     if (s2 !== peg$FAILED) {
       s3 = peg$currPos;
-      s4 = peg$f13(s1);
+      s4 = peg$f14(s1);
       s5 = peg$currPos;
       s6 = [];
       if (s6.length >= (s4 | 0)) s7 = peg$FAILED;
@@ -11629,7 +11697,7 @@ function peg$parse(input, options) {
         s4 = peg$parseCloseTag();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f14(s1, s3, s4);
+          s0 = peg$f15(s1, s3, s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -11649,7 +11717,7 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = "";
     peg$savedPos = s0;
-    s1 = peg$f15();
+    s1 = peg$f16();
     s0 = s1;
     return s0;
   }
@@ -11678,7 +11746,7 @@ function peg$parse(input, options) {
     else s1 = s2;
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f16(s1);
+      s1 = peg$f17(s1);
     }
     s0 = s1;
     return s0;
@@ -11818,7 +11886,7 @@ function peg$parse(input, options) {
     else s1 = s2;
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f17(s1);
+      s1 = peg$f18(s1);
     }
     s0 = s1;
     return s0;
@@ -11851,7 +11919,7 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s3 = peg$f18(s1);
+      s3 = peg$f19(s1);
       if (s3) s3 = void 0;
       else s3 = peg$FAILED;
       if (s3 !== peg$FAILED) {
@@ -11863,7 +11931,7 @@ function peg$parse(input, options) {
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s2;
-          s2 = peg$f19(s1, s4);
+          s2 = peg$f20(s1, s4);
         } else {
           peg$currPos = s2;
           s2 = peg$FAILED;
@@ -11874,7 +11942,7 @@ function peg$parse(input, options) {
       }
       if (s2 === peg$FAILED) s2 = null;
       peg$savedPos = s0;
-      s0 = peg$f20(s1, s2);
+      s0 = peg$f21(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -11922,7 +11990,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f21();
+        s0 = peg$f22();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -11937,7 +12005,7 @@ function peg$parse(input, options) {
       peg$silentFails++;
       s2 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s3 = peg$f22();
+      s3 = peg$f23();
       if (s3) s3 = void 0;
       else s3 = peg$FAILED;
       if (s3 !== peg$FAILED) {
@@ -11969,7 +12037,7 @@ function peg$parse(input, options) {
         }
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f23();
+          s0 = peg$f24();
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -11989,7 +12057,7 @@ function peg$parse(input, options) {
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f24();
+          s1 = peg$f25();
         }
         s0 = s1;
       }
@@ -12000,7 +12068,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4, s5, s6, s7;
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f25();
+    s1 = peg$f26();
     if (s1) s1 = void 0;
     else s1 = peg$FAILED;
     if (s1 !== peg$FAILED) {
@@ -12028,7 +12096,7 @@ function peg$parse(input, options) {
           }
           if (s7 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f26(s3, s4, s5, s6);
+            s0 = peg$f27(s3, s4, s5, s6);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -12048,7 +12116,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s1 = peg$f27();
+      s1 = peg$f28();
       if (s1) s1 = void 0;
       else s1 = peg$FAILED;
       if (s1 !== peg$FAILED) {
@@ -12061,7 +12129,7 @@ function peg$parse(input, options) {
         }
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f28();
+          s0 = peg$f29();
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -12189,7 +12257,7 @@ function peg$parse(input, options) {
       }
       if (s2 === peg$FAILED) s2 = null;
       peg$savedPos = s0;
-      s0 = peg$f29(s1);
+      s0 = peg$f30(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -12198,7 +12266,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = "";
       peg$savedPos = s0;
-      s1 = peg$f30();
+      s1 = peg$f31();
       s0 = s1;
     }
     return s0;
@@ -12228,7 +12296,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f31(s1, s2);
+      s0 = peg$f32(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -12254,7 +12322,7 @@ function peg$parse(input, options) {
       }
       s2 = input.substring(s2, peg$currPos);
       peg$savedPos = s0;
-      s0 = peg$f32(s1, s2);
+      s0 = peg$f33(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -12381,7 +12449,7 @@ function peg$parse(input, options) {
           }
           if (s7 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f33(s2, s3, s4, s5, s6);
+            s0 = peg$f34(s2, s3, s4, s5, s6);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -12437,7 +12505,7 @@ function peg$parse(input, options) {
               }
               if (s7 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f34(s2, s3, s4, s6);
+                s0 = peg$f35(s2, s3, s4, s6);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -12485,7 +12553,7 @@ function peg$parse(input, options) {
             } else s3 = peg$FAILED;
             if (s3 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f35();
+              s0 = peg$f36();
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -12507,12 +12575,12 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parseHere();
     peg$savedPos = peg$currPos;
-    s2 = peg$f36(s1);
+    s2 = peg$f37(s1);
     if (s2) s2 = void 0;
     else s2 = peg$FAILED;
     if (s2 !== peg$FAILED) {
       s3 = peg$currPos;
-      s4 = peg$f37(s1);
+      s4 = peg$f38(s1);
       s5 = peg$currPos;
       s6 = [];
       if (s6.length >= (s4 | 0)) s7 = peg$FAILED;
@@ -12543,7 +12611,7 @@ function peg$parse(input, options) {
       else s3 = s4;
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f38(s1, s3);
+        s0 = peg$f39(s1, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -12582,12 +12650,12 @@ function peg$parse(input, options) {
           s7 = peg$parseHere();
           s8 = peg$currPos;
           peg$savedPos = peg$currPos;
-          s9 = peg$f39(s2, s3, s4, s5, s6, s7);
+          s9 = peg$f40(s2, s3, s4, s5, s6, s7);
           if (s9) s9 = void 0;
           else s9 = peg$FAILED;
           if (s9 !== peg$FAILED) {
             s10 = peg$currPos;
-            s11 = peg$f40(s2, s3, s4, s5, s6, s7);
+            s11 = peg$f41(s2, s3, s4, s5, s6, s7);
             s12 = peg$currPos;
             s13 = [];
             if (s13.length >= (s11 | 0)) s14 = peg$FAILED;
@@ -12626,7 +12694,7 @@ function peg$parse(input, options) {
               }
               if (s11 !== peg$FAILED) {
                 peg$savedPos = s8;
-                s8 = peg$f41(s2, s3, s4, s5, s6, s7, s10);
+                s8 = peg$f42(s2, s3, s4, s5, s6, s7, s10);
               } else {
                 peg$currPos = s8;
                 s8 = peg$FAILED;
@@ -12641,7 +12709,7 @@ function peg$parse(input, options) {
           }
           if (s8 === peg$FAILED) s8 = null;
           peg$savedPos = s0;
-          s0 = peg$f42(s2, s3, s4, s5, s6, s7, s8);
+          s0 = peg$f43(s2, s3, s4, s5, s6, s7, s8);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -12675,7 +12743,7 @@ function peg$parse(input, options) {
           }
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f43(s2);
+            s0 = peg$f44(s2);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -12825,12 +12893,12 @@ function peg$parse(input, options) {
     else s1 = s2;
     if (s1 !== peg$FAILED) {
       peg$savedPos = peg$currPos;
-      s2 = peg$f44(s1);
+      s2 = peg$f45(s1);
       if (s2) s2 = void 0;
       else s2 = peg$FAILED;
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f45(s1);
+        s0 = peg$f46(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -12841,6 +12909,177 @@ function peg$parse(input, options) {
     }
     return s0;
   }
+  function peg$parseUriAutolink() {
+    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = peg$currPos;
+    if (input.charCodeAt(peg$currPos) === 60) {
+      s3 = peg$c6;
+      peg$currPos++;
+    } else {
+      s3 = peg$FAILED;
+      if (peg$silentFails === 0) peg$fail(peg$e10);
+    }
+    if (s3 !== peg$FAILED) {
+      s4 = input.charAt(peg$currPos);
+      if (peg$r8.test(s4)) peg$currPos++;
+      else {
+        s4 = peg$FAILED;
+        if (peg$silentFails === 0) peg$fail(peg$e22);
+      }
+      if (s4 !== peg$FAILED) {
+        s5 = peg$currPos;
+        s6 = [];
+        s7 = input.charAt(peg$currPos);
+        if (peg$r12.test(s7)) peg$currPos++;
+        else {
+          s7 = peg$FAILED;
+          if (peg$silentFails === 0) peg$fail(peg$e27);
+        }
+        while (s7 !== peg$FAILED) {
+          s6.push(s7);
+          if (s6.length >= 31) s7 = peg$FAILED;
+          else {
+            s7 = input.charAt(peg$currPos);
+            if (peg$r12.test(s7)) peg$currPos++;
+            else {
+              s7 = peg$FAILED;
+              if (peg$silentFails === 0) peg$fail(peg$e27);
+            }
+          }
+        }
+        if (s6.length < 1) {
+          peg$currPos = s5;
+          s5 = peg$FAILED;
+        } else s5 = s6;
+        if (s5 !== peg$FAILED) {
+          if (input.charCodeAt(peg$currPos) === 58) {
+            s6 = peg$c14;
+            peg$currPos++;
+          } else {
+            s6 = peg$FAILED;
+            if (peg$silentFails === 0) peg$fail(peg$e28);
+          }
+          if (s6 !== peg$FAILED) {
+            s7 = [];
+            s8 = peg$currPos;
+            s9 = peg$currPos;
+            peg$silentFails++;
+            if (input.substr(peg$currPos, 2) === peg$c8) {
+              s10 = peg$c8;
+              peg$currPos += 2;
+            } else {
+              s10 = peg$FAILED;
+              if (peg$silentFails === 0) peg$fail(peg$e12);
+            }
+            peg$silentFails--;
+            if (s10 === peg$FAILED) s9 = void 0;
+            else {
+              peg$currPos = s9;
+              s9 = peg$FAILED;
+            }
+            if (s9 !== peg$FAILED) {
+              s10 = input.charAt(peg$currPos);
+              if (peg$r13.test(s10)) peg$currPos++;
+              else {
+                s10 = peg$FAILED;
+                if (peg$silentFails === 0) peg$fail(peg$e29);
+              }
+              if (s10 !== peg$FAILED) {
+                s9 = [s9, s10];
+                s8 = s9;
+              } else {
+                peg$currPos = s8;
+                s8 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s8;
+              s8 = peg$FAILED;
+            }
+            while (s8 !== peg$FAILED) {
+              s7.push(s8);
+              s8 = peg$currPos;
+              s9 = peg$currPos;
+              peg$silentFails++;
+              if (input.substr(peg$currPos, 2) === peg$c8) {
+                s10 = peg$c8;
+                peg$currPos += 2;
+              } else {
+                s10 = peg$FAILED;
+                if (peg$silentFails === 0) peg$fail(peg$e12);
+              }
+              peg$silentFails--;
+              if (s10 === peg$FAILED) s9 = void 0;
+              else {
+                peg$currPos = s9;
+                s9 = peg$FAILED;
+              }
+              if (s9 !== peg$FAILED) {
+                s10 = input.charAt(peg$currPos);
+                if (peg$r13.test(s10)) peg$currPos++;
+                else {
+                  s10 = peg$FAILED;
+                  if (peg$silentFails === 0) peg$fail(peg$e29);
+                }
+                if (s10 !== peg$FAILED) {
+                  s9 = [s9, s10];
+                  s8 = s9;
+                } else {
+                  peg$currPos = s8;
+                  s8 = peg$FAILED;
+                }
+              } else {
+                peg$currPos = s8;
+                s8 = peg$FAILED;
+              }
+            }
+            if (input.charCodeAt(peg$currPos) === 62) {
+              s8 = peg$c1;
+              peg$currPos++;
+            } else {
+              s8 = peg$FAILED;
+              if (peg$silentFails === 0) peg$fail(peg$e3);
+            }
+            if (s8 !== peg$FAILED) {
+              s3 = [
+                s3,
+                s4,
+                s5,
+                s6,
+                s7,
+                s8
+              ];
+              s2 = s3;
+            } else {
+              peg$currPos = s2;
+              s2 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s2;
+            s2 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s2;
+          s2 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s2;
+      s2 = peg$FAILED;
+    }
+    if (s2 !== peg$FAILED) s1 = input.substring(s1, peg$currPos);
+    else s1 = s2;
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f47(s1);
+    }
+    s0 = s1;
+    return s0;
+  }
   function peg$parseHtmlOpen() {
     let s0, s1, s2, s3, s4, s5, s6, s7;
     s0 = peg$currPos;
@@ -12879,7 +13118,7 @@ function peg$parse(input, options) {
         }
         if (s7 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f46(s2, s3, s4, s6);
+          s0 = peg$f48(s2, s3, s4, s6);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -12907,10 +13146,10 @@ function peg$parse(input, options) {
           s3 = peg$currPos;
           peg$silentFails++;
           s4 = input.charAt(peg$currPos);
-          if (peg$r12.test(s4)) peg$currPos++;
+          if (peg$r14.test(s4)) peg$currPos++;
           else {
             s4 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$e27);
+            if (peg$silentFails === 0) peg$fail(peg$e30);
           }
           if (s4 === peg$FAILED) {
             s4 = peg$currPos;
@@ -12944,7 +13183,7 @@ function peg$parse(input, options) {
             s5 = peg$parse_();
             s6 = peg$parseHere();
             peg$savedPos = s0;
-            s0 = peg$f47(s2, s6);
+            s0 = peg$f49(s2, s6);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -12963,12 +13202,12 @@ function peg$parse(input, options) {
   function peg$parseHtmlClose() {
     let s0, s1, s2, s3, s5;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c14) {
-      s1 = peg$c14;
+    if (input.substr(peg$currPos, 2) === peg$c15) {
+      s1 = peg$c15;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) peg$fail(peg$e28);
+      if (peg$silentFails === 0) peg$fail(peg$e31);
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parseHere();
@@ -12984,7 +13223,7 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f48(s2, s3);
+          s0 = peg$f50(s2, s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -13012,18 +13251,18 @@ function peg$parse(input, options) {
     if (s2 !== peg$FAILED) {
       s3 = [];
       s4 = input.charAt(peg$currPos);
-      if (peg$r13.test(s4)) peg$currPos++;
+      if (peg$r15.test(s4)) peg$currPos++;
       else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) peg$fail(peg$e29);
+        if (peg$silentFails === 0) peg$fail(peg$e32);
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
         s4 = input.charAt(peg$currPos);
-        if (peg$r13.test(s4)) peg$currPos++;
+        if (peg$r15.test(s4)) peg$currPos++;
         else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) peg$fail(peg$e29);
+          if (peg$silentFails === 0) peg$fail(peg$e32);
         }
       }
       s2 = [s2, s3];
@@ -13047,10 +13286,10 @@ function peg$parse(input, options) {
     s6 = peg$currPos;
     peg$silentFails++;
     s7 = input.charAt(peg$currPos);
-    if (peg$r14.test(s7)) peg$currPos++;
+    if (peg$r16.test(s7)) peg$currPos++;
     else {
       s7 = peg$FAILED;
-      if (peg$silentFails === 0) peg$fail(peg$e30);
+      if (peg$silentFails === 0) peg$fail(peg$e33);
     }
     peg$silentFails--;
     if (s7 === peg$FAILED) s6 = void 0;
@@ -13083,10 +13322,10 @@ function peg$parse(input, options) {
       s6 = peg$currPos;
       peg$silentFails++;
       s7 = input.charAt(peg$currPos);
-      if (peg$r14.test(s7)) peg$currPos++;
+      if (peg$r16.test(s7)) peg$currPos++;
       else {
         s7 = peg$FAILED;
-        if (peg$silentFails === 0) peg$fail(peg$e30);
+        if (peg$silentFails === 0) peg$fail(peg$e33);
       }
       peg$silentFails--;
       if (s7 === peg$FAILED) s6 = void 0;
@@ -13119,25 +13358,25 @@ function peg$parse(input, options) {
     else s3 = s4;
     if (s3 !== peg$FAILED) {
       peg$savedPos = peg$currPos;
-      s4 = peg$f49(s2, s3);
+      s4 = peg$f51(s2, s3);
       if (s4) s4 = void 0;
       else s4 = peg$FAILED;
       if (s4 !== peg$FAILED) {
         s5 = peg$currPos;
         s6 = peg$parse_();
         if (input.charCodeAt(peg$currPos) === 61) {
-          s7 = peg$c15;
+          s7 = peg$c16;
           peg$currPos++;
         } else {
           s7 = peg$FAILED;
-          if (peg$silentFails === 0) peg$fail(peg$e31);
+          if (peg$silentFails === 0) peg$fail(peg$e34);
         }
         if (s7 !== peg$FAILED) {
           peg$parse_();
           s9 = peg$parseAttrValue();
           if (s9 !== peg$FAILED) {
             peg$savedPos = s5;
-            s5 = peg$f50(s2, s3, s9);
+            s5 = peg$f52(s2, s3, s9);
           } else {
             peg$currPos = s5;
             s5 = peg$FAILED;
@@ -13148,7 +13387,7 @@ function peg$parse(input, options) {
         }
         if (s5 === peg$FAILED) s5 = null;
         peg$savedPos = s0;
-        s0 = peg$f51(s2, s3, s5);
+        s0 = peg$f53(s2, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -13163,11 +13402,11 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4, s5;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 34) {
-      s1 = peg$c16;
+      s1 = peg$c17;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) peg$fail(peg$e32);
+      if (peg$silentFails === 0) peg$fail(peg$e35);
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parseHere();
@@ -13176,10 +13415,10 @@ function peg$parse(input, options) {
       s5 = peg$parseValuePart();
       if (s5 === peg$FAILED) {
         s5 = input.charAt(peg$currPos);
-        if (peg$r15.test(s5)) peg$currPos++;
+        if (peg$r17.test(s5)) peg$currPos++;
         else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) peg$fail(peg$e33);
+          if (peg$silentFails === 0) peg$fail(peg$e36);
         }
       }
       while (s5 !== peg$FAILED) {
@@ -13187,25 +13426,25 @@ function peg$parse(input, options) {
         s5 = peg$parseValuePart();
         if (s5 === peg$FAILED) {
           s5 = input.charAt(peg$currPos);
-          if (peg$r15.test(s5)) peg$currPos++;
+          if (peg$r17.test(s5)) peg$currPos++;
           else {
             s5 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$e33);
+            if (peg$silentFails === 0) peg$fail(peg$e36);
           }
         }
       }
       s3 = input.substring(s3, peg$currPos);
       s4 = peg$parseHere();
       if (input.charCodeAt(peg$currPos) === 34) {
-        s5 = peg$c16;
+        s5 = peg$c17;
         peg$currPos++;
       } else {
         s5 = peg$FAILED;
-        if (peg$silentFails === 0) peg$fail(peg$e32);
+        if (peg$silentFails === 0) peg$fail(peg$e35);
       }
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f52(s2, s3, s4);
+        s0 = peg$f54(s2, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -13217,11 +13456,11 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 39) {
-        s1 = peg$c17;
+        s1 = peg$c18;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) peg$fail(peg$e34);
+        if (peg$silentFails === 0) peg$fail(peg$e37);
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$parseHere();
@@ -13230,10 +13469,10 @@ function peg$parse(input, options) {
         s5 = peg$parseValuePart();
         if (s5 === peg$FAILED) {
           s5 = input.charAt(peg$currPos);
-          if (peg$r16.test(s5)) peg$currPos++;
+          if (peg$r18.test(s5)) peg$currPos++;
           else {
             s5 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$e35);
+            if (peg$silentFails === 0) peg$fail(peg$e38);
           }
         }
         while (s5 !== peg$FAILED) {
@@ -13241,25 +13480,25 @@ function peg$parse(input, options) {
           s5 = peg$parseValuePart();
           if (s5 === peg$FAILED) {
             s5 = input.charAt(peg$currPos);
-            if (peg$r16.test(s5)) peg$currPos++;
+            if (peg$r18.test(s5)) peg$currPos++;
             else {
               s5 = peg$FAILED;
-              if (peg$silentFails === 0) peg$fail(peg$e35);
+              if (peg$silentFails === 0) peg$fail(peg$e38);
             }
           }
         }
         s3 = input.substring(s3, peg$currPos);
         s4 = peg$parseHere();
         if (input.charCodeAt(peg$currPos) === 39) {
-          s5 = peg$c17;
+          s5 = peg$c18;
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
-          if (peg$silentFails === 0) peg$fail(peg$e34);
+          if (peg$silentFails === 0) peg$fail(peg$e37);
         }
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f53(s2, s3, s4);
+          s0 = peg$f55(s2, s3, s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -13271,14 +13510,14 @@ function peg$parse(input, options) {
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         s1 = input.charAt(peg$currPos);
-        if (peg$r17.test(s1)) peg$currPos++;
+        if (peg$r19.test(s1)) peg$currPos++;
         else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) peg$fail(peg$e36);
+          if (peg$silentFails === 0) peg$fail(peg$e39);
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f54(s1);
+          s1 = peg$f56(s1);
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
@@ -13287,24 +13526,24 @@ function peg$parse(input, options) {
           s2 = peg$currPos;
           s3 = [];
           s4 = input.charAt(peg$currPos);
-          if (peg$r18.test(s4)) peg$currPos++;
+          if (peg$r20.test(s4)) peg$currPos++;
           else {
             s4 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$e37);
+            if (peg$silentFails === 0) peg$fail(peg$e40);
           }
           while (s4 !== peg$FAILED) {
             s3.push(s4);
             s4 = input.charAt(peg$currPos);
-            if (peg$r18.test(s4)) peg$currPos++;
+            if (peg$r20.test(s4)) peg$currPos++;
             else {
               s4 = peg$FAILED;
-              if (peg$silentFails === 0) peg$fail(peg$e37);
+              if (peg$silentFails === 0) peg$fail(peg$e40);
             }
           }
           s2 = input.substring(s2, peg$currPos);
           s3 = peg$parseHere();
           peg$savedPos = s0;
-          s0 = peg$f55(s1, s2, s3);
+          s0 = peg$f57(s1, s2, s3);
         }
       }
     }
@@ -13314,7 +13553,7 @@ function peg$parse(input, 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$f56();
+    s1 = peg$f58();
     if (s1) s1 = void 0;
     else s1 = peg$FAILED;
     if (s1 !== peg$FAILED) {
@@ -13343,7 +13582,7 @@ function peg$parse(input, options) {
       if (s2 !== peg$FAILED) {
         s3 = peg$currPos;
         peg$savedPos = peg$currPos;
-        s4 = peg$f57(s2);
+        s4 = peg$f59(s2);
         if (s4) s4 = void 0;
         else s4 = peg$FAILED;
         if (s4 !== peg$FAILED) {
@@ -13382,7 +13621,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s1 = peg$f58();
+      s1 = peg$f60();
       if (s1) s1 = void 0;
       else s1 = peg$FAILED;
       if (s1 !== peg$FAILED) {
@@ -13409,12 +13648,12 @@ function peg$parse(input, options) {
             if (s6 !== peg$FAILED) {
               s7 = peg$parseHere();
               peg$savedPos = peg$currPos;
-              s8 = peg$f59(s4, s7);
+              s8 = peg$f61(s4, s7);
               if (s8) s8 = void 0;
               else s8 = peg$FAILED;
               if (s8 !== peg$FAILED) {
                 s9 = peg$currPos;
-                s10 = peg$f60(s4, s7);
+                s10 = peg$f62(s4, s7);
                 s11 = peg$currPos;
                 s12 = [];
                 if (s12.length >= (s10 | 0)) s13 = peg$FAILED;
@@ -13496,7 +13735,7 @@ function peg$parse(input, options) {
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         peg$savedPos = peg$currPos;
-        s1 = peg$f61();
+        s1 = peg$f63();
         if (s1) s1 = void 0;
         else s1 = peg$FAILED;
         if (s1 !== peg$FAILED) {
@@ -13587,7 +13826,7 @@ function peg$parse(input, options) {
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           peg$savedPos = peg$currPos;
-          s1 = peg$f62();
+          s1 = peg$f64();
           if (s1) s1 = void 0;
           else s1 = peg$FAILED;
           if (s1 !== peg$FAILED) {
@@ -13669,10 +13908,10 @@ function peg$parse(input, options) {
   function peg$parse_c() {
     let s0;
     s0 = input.charAt(peg$currPos);
-    if (peg$r19.test(s0)) peg$currPos++;
+    if (peg$r21.test(s0)) peg$currPos++;
     else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) peg$fail(peg$e38);
+      if (peg$silentFails === 0) peg$fail(peg$e41);
     }
     return s0;
   }
@@ -14336,13 +14575,13 @@ function propertyName(node, src) {
   const c = src.charAt(node.start);
   if (c === "@" || c === "%") throw new CodeSyntaxError(`"${node.name}" can't be a property name`, src, node.start);
 }
-function walk(node, src, out, binding, shorthand) {
+function walk(node, src, out, binding, shorthand, access = "read") {
   if (Array.isArray(node)) {
-    for (const n7 of node) walk(n7, src, out, binding, false);
+    for (const n7 of node) walk(n7, src, out, binding, false, access);
     return;
   }
   if (!isNode(node)) return;
-  const sub = (child, bind = false, short = false) => walk(child, src, out, bind, short);
+  const sub = (child, bind = false, short = false, role = "read") => walk(child, src, out, bind, short, role);
   switch (node.type) {
     case "Identifier": {
       const sigil = sigilOf(node, src);
@@ -14353,7 +14592,9 @@ function walk(node, src, out, binding, shorthand) {
         name: sigil[1],
         start: node.start,
         end: node.end,
-        shorthand
+        shorthand,
+        read: access !== "write",
+        write: access !== "read"
       });
       return;
     }
@@ -14374,10 +14615,10 @@ function walk(node, src, out, binding, shorthand) {
       if (node.shorthand) {
         const value = node.value;
         if (value.type === "AssignmentPattern") {
-          sub(value.left, binding, true);
+          sub(value.left, binding, true, access);
           sub(value.right);
-        } else sub(value, binding, true);
-      } else sub(node.value, binding);
+        } else sub(value, binding, true, access);
+      } else sub(node.value, binding, false, access);
       return;
     case "MethodDefinition":
     case "PropertyDefinition":
@@ -14414,8 +14655,24 @@ function walk(node, src, out, binding, shorthand) {
       sub(node.param, true);
       sub(node.body);
       return;
+    case "AssignmentExpression":
+      sub(node.left, false, false, node.operator === "=" ? "write" : "readwrite");
+      sub(node.right);
+      return;
+    case "UnaryExpression":
+      sub(node.argument, false, false, node.operator === "delete" ? "write" : "read");
+      return;
+    case "UpdateExpression":
+      sub(node.argument, false, false, "readwrite");
+      return;
+    case "ForInStatement":
+    case "ForOfStatement":
+      sub(node.left, false, false, "write");
+      sub(node.right);
+      sub(node.body);
+      return;
     case "AssignmentPattern":
-      sub(node.left, binding);
+      sub(node.left, binding, false, access);
       sub(node.right);
       return;
     case "ObjectPattern":
@@ -14425,7 +14682,7 @@ function walk(node, src, out, binding, shorthand) {
         "properties",
         "elements",
         "argument"
-      ]) sub(node[key], binding);
+      ]) sub(node[key], binding, false, access);
       return;
     default:
       for (const key in node) {
@@ -15023,13 +15280,13 @@ function isCloser(ch) {
 function unescapeQuoted(body) {
   return body.replace(/\\(["'\\])/g, "$1");
 }
-function readQuoted(src, start) {
+function readQuoted(src, start, tolerant = false) {
   const quote = src[start];
   if (quote !== '"' && quote !== "'") return null;
   const { end, closed } = scanStringLiteral(src, start);
-  if (!closed) return null;
+  if (!closed && !tolerant) return null;
   return {
-    value: unescapeQuoted(src.slice(start + 1, end - 1)),
+    value: unescapeQuoted(src.slice(start + 1, closed ? end - 1 : end)),
     end
   };
 }
@@ -15087,8 +15344,7 @@ function startsLikeValue(token) {
   const first = token[0];
   if (first === '"' || first === "'" || first === "`") return true;
   if (/^[$_@]\w|^%[A-Za-z_]/.test(token)) return true;
-  if (/\d/.test(first)) return true;
-  if ((first === "-" || first === "+") && token.length > 1 && /\d/.test(token[1])) return true;
+  if (/^[+-]?(?:\d|\.\d)/.test(token)) return true;
   if (first === "(" || first === "[" || first === "{") return true;
   if (/^(?:true|false|null|undefined)(?![\w$])/.test(token)) return true;
   if (first === "!" && token.length > 1 && token[1] !== "=") return true;
@@ -15133,11 +15389,16 @@ function readText(src) {
   return readWholeQuoted(src) ?? stripLooseQuotes(src);
 }
 function readValue(param, src, place) {
-  place.spans?.set(param, [place.at, place.at + src.length]);
+  const span = [place.at, place.at + src.length];
+  place.spans?.set(param, span);
+  place.toolingSpans?.set(param, span);
   switch (param.type) {
     case "string": {
       const value = readWholeQuoted(src);
-      if (value === null) throw new MacroArgumentError(param, src);
+      if (value === null) {
+        if (place.toolingSpans && (src[0] === '"' || src[0] === "'")) return readText(src);
+        throw new MacroArgumentError(param, src);
+      }
       return value;
     }
     case "text":
@@ -15162,20 +15423,21 @@ function matchAt(re2, src, pos) {
   re2.lastIndex = pos;
   return re2.exec(src)?.[0] ?? null;
 }
-function readOptions(params, src, { at: at3, spans }) {
+function readOptions(params, src, { at: at3, spans, toolingSpans }) {
   const options = {};
   let i2 = 0;
   while (i2 < src.length) {
     const key = matchAt(WORD_RE$1, src, i2);
     if (!key) {
-      i2 = readQuoted(src, i2)?.end ?? i2 + 1;
+      i2 = readQuoted(src, i2, !!toolingSpans)?.end ?? i2 + 1;
       continue;
     }
+    const keyAt = i2;
     i2 += key.length;
     let val;
     let j2 = i2;
     while (j2 < src.length && isWhitespace(src[j2])) j2++;
-    const quoted = readQuoted(src, j2);
+    const quoted = readQuoted(src, j2, !!toolingSpans);
     const digits = quoted || j2 === i2 ? null : matchAt(NUMBER_RE$1, src, j2);
     if (quoted) {
       val = quoted.value;
@@ -15186,7 +15448,8 @@ function readOptions(params, src, { at: at3, spans }) {
     }
     const param = params.find((p) => p.name === key);
     if (param && param.type !== "flag" && val !== void 0) spans?.set(param, [at3 + j2, at3 + i2]);
-    if (param?.type === "string" && !quoted) throw new MacroArgumentError(param, matchAt(WORD_OR_PUNCT_RE, src, j2) ?? "");
+    if (param) toolingSpans?.set(param, [at3 + keyAt, at3 + i2]);
+    if (param?.type === "string" && !quoted && !toolingSpans) throw new MacroArgumentError(param, matchAt(WORD_OR_PUNCT_RE, src, j2) ?? "");
     if (param?.type === "flag") options[key] = true;
     else if (param?.type === "number") options[key] = Number(val ?? 0);
     else if (param) options[key] = val;
@@ -15207,7 +15470,7 @@ function takeFlag(src, word, alone) {
   }
   return null;
 }
-function findSeparator(src, word) {
+function findSeparator(src, word, tolerant = false) {
   if (word === "=") {
     const indices = topLevelIndices(src, (ch) => ch === "=");
     for (let k2 = 0; k2 < indices.length; k2++) {
@@ -15221,29 +15484,42 @@ function findSeparator(src, word) {
     return null;
   }
   const spans = terms(src);
-  for (let k2 = 1; k2 < spans.length - 1; k2++) if (slice(src, spans[k2]) === word) return [spans[k2 - 1][1], spans[k2 + 1][0]];
+  for (let k2 = 1; k2 < spans.length - (tolerant ? 0 : 1); k2++) if (slice(src, spans[k2]) === word) return [spans[k2 - 1][1], spans[k2 + 1]?.[0] ?? src.length];
   return null;
 }
 function trimmed(src, at3) {
   const text3 = src.trim();
   return [text3, text3 ? at3 + src.indexOf(text3) : at3];
 }
-function readGroup(params, src, args2, { at: srcAt, spans }) {
+function readGroup(params, src, args2, { at: srcAt, spans, toolingSpans }) {
   let [text3, at3] = trimmed(src ?? "", srcAt);
   const alone = !params.some((p) => p.type !== "flag" && p.required);
   for (const flag of params.filter((p) => p.type === "flag")) {
     const rest2 = src === null ? null : takeFlag(text3, flag.name, alone);
     args2[flag.name] = rest2 !== null;
-    if (rest2) [text3, at3] = trimmed(slice(text3, rest2), at3 + rest2[0]);
+    if (rest2) {
+      const flagSpan = rest2[0] > 0 ? [0, text3.indexOf(flag.name) + flag.name.length] : [text3.lastIndexOf(flag.name), text3.length];
+      toolingSpans?.set(flag, [at3 + flagSpan[0], at3 + flagSpan[1]]);
+      [text3, at3] = trimmed(slice(text3, rest2), at3 + rest2[0]);
+    }
   }
   const positional = params.filter((p) => p.type !== "flag");
   if (positional.length === 0) return;
   const lastText = positional.findIndex((p, i2) => takesRest(p) && !positional.slice(i2 + 1).some(takesRest));
   const restIndex = lastText < 0 ? positional.length - 1 : lastText;
-  const read = (param, [start, end]) => start === end ? unset(param) : readValue(param, text3.slice(start, end), {
-    at: at3 + start,
-    spans
-  });
+  const read = (param, [start, end], tolerant = true) => {
+    if (start === end) return unset(param);
+    try {
+      return readValue(param, text3.slice(start, end), {
+        at: at3 + start,
+        spans,
+        toolingSpans
+      });
+    } catch (error48) {
+      if (toolingSpans && tolerant && error48 instanceof MacroArgumentError) return;
+      throw error48;
+    }
+  };
   if (positional.length === 1) {
     args2[positional[0].name] = read(positional[0], [0, text3.length]);
     return;
@@ -15254,7 +15530,7 @@ function readGroup(params, src, args2, { at: srcAt, spans }) {
   for (const param of positional.slice(0, restIndex)) args2[param.name] = from < to ? read(param, parts[from++]) : unset(param);
   const readTrailing = (param, span) => {
     try {
-      return read(param, span);
+      return read(param, span, false);
     } catch (error48) {
       if (error48 instanceof MacroArgumentError) return void 0;
       throw error48;
@@ -15264,23 +15540,31 @@ function readGroup(params, src, args2, { at: srcAt, spans }) {
     const value = from < to && !endsWithOperator(text3.slice(0, parts[to - 1][0])) ? readTrailing(param, parts[to - 1]) : void 0;
     args2[param.name] = value ?? unset(param);
     if (value !== void 0) to--;
-    else spans?.delete(param);
+    else {
+      spans?.delete(param);
+      toolingSpans?.delete(param);
+    }
   }
   const rest = positional[restIndex];
   args2[rest.name] = from < to ? read(rest, [parts[from][0], parts[to - 1][1]]) : unset(rest);
 }
-function parseMacroArgs(rawArgs, parameters, spans) {
+function parseMacroArgs(rawArgs, parameters, spans, toolingSpans) {
   const args2 = {};
   let [rest, restAt] = trimmed(rawArgs, 0);
   let groupStart = 0;
   parameters.forEach((separator, i2) => {
     if (separator.type !== "separator") return;
-    const at3 = rest === null ? null : findSeparator(rest, separator.name);
+    const at3 = rest === null ? null : findSeparator(rest, separator.name, !!toolingSpans);
     args2[separator.name] = at3 !== null;
+    if (at3 && toolingSpans) {
+      const start = restAt + at3[0] + rest.slice(at3[0], at3[1]).indexOf(separator.name);
+      toolingSpans.set(separator, [start, start + separator.name.length]);
+    }
     const before = at3 ? rest.slice(0, at3[0]) : rest;
     readGroup(parameters.slice(groupStart, i2), before, args2, {
       at: restAt,
-      spans
+      spans,
+      toolingSpans
     });
     rest = at3 ? rest.slice(at3[1]) : null;
     if (at3) restAt += at3[1];
@@ -15288,7 +15572,8 @@ function parseMacroArgs(rawArgs, parameters, spans) {
   });
   readGroup(parameters.slice(groupStart), rest, args2, {
     at: restAt,
-    spans
+    spans,
+    toolingSpans
   });
   return args2;
 }
@@ -15395,7 +15680,14 @@ function stringHolds(param) {
   return param.holds ?? "markup";
 }
 function* codeAndText(src, tokens2, parametersOf2) {
-  const closeOf = (t, name) => tokens2.findIndex((c, k2) => k2 > t && c.type === "macro" && c.isClose && c.name.toLowerCase() === name);
+  const closeOfTextBody = (t, name) => {
+    for (let k2 = t + 1; k2 < tokens2.length; k2++) {
+      const c = tokens2[k2];
+      if (c.type === "text") continue;
+      return c.type === "macro" && c.isClose && c.name.toLowerCase() === name ? k2 : -1;
+    }
+    return -1;
+  };
   for (let t = 0; t < tokens2.length; t++) {
     const token = tokens2[t];
     if (token.type === "link") {
@@ -15431,7 +15723,7 @@ function* codeAndText(src, tokens2, parametersOf2) {
     else if (token.type === "macro" && !token.isClose) {
       const name = token.name.toLowerCase();
       if (name === "do") {
-        const close = closeOf(t, name);
+        const close = closeOfTextBody(t, name);
         if (close < 0) continue;
         yield {
           kind: "code",
@@ -15445,9 +15737,8 @@ function* codeAndText(src, tokens2, parametersOf2) {
       }
       const args2 = token.rawArgs;
       if (PASSAGE_BODIES.has(name)) {
-        const close = closeOf(t, name);
-        const body = tokens2.slice(t + 1, close);
-        if (close > t + 1 && body.every((b) => b.type === "text")) {
+        const close = closeOfTextBody(t, name);
+        if (close > t + 1) {
           const text3 = src.slice(token.end, tokens2[close].start);
           const written2 = text3.trim();
           yield {
@@ -16837,10 +17128,10 @@ function resolveAll(constructs2, events, context) {
   const called = [];
   let index = -1;
   while (++index < constructs2.length) {
-    const resolve7 = constructs2[index].resolveAll;
-    if (resolve7 && !called.includes(resolve7)) {
-      events = resolve7(events, context);
-      called.push(resolve7);
+    const resolve8 = constructs2[index].resolveAll;
+    if (resolve8 && !called.includes(resolve8)) {
+      events = resolve8(events, context);
+      called.push(resolve8);
     }
   }
   return events;
@@ -20304,10 +20595,25 @@ function markdownOptions(options) {
     htmlExtensions: [gfmTableHtml(), gfmStrikethroughHtml()]
   };
 }
-function fencedCodeLines(source, isBlock) {
+function sourceLines(source) {
+  const starts = [0];
+  for (let i2 = 0; i2 < source.length; i2++) if (source[i2] === "\n") starts.push(i2 + 1);
+  return (offset2) => {
+    let low = 0;
+    let high = starts.length;
+    while (low < high) {
+      const middle = low + high >>> 1;
+      if (starts[middle] <= offset2) low = middle + 1;
+      else high = middle;
+    }
+    return Math.max(0, low - 1);
+  };
+}
+function markdownLines(source, isBlock, types3) {
   const found = /* @__PURE__ */ new Set();
-  if (!/`{3}|~{3}/.test(source)) return found;
+  if (types3.size === 1 && types3.has("codeFenced") && !/`{3}|~{3}/.test(source)) return found;
   const { nodes } = analyzeMarkup(source, { hooks: { isBlock } });
+  const lineAt = sourceLines(source);
   function visit(nodes2) {
     let markdown = "";
     const spans = [];
@@ -20319,23 +20625,32 @@ function fencedCodeLines(source, isBlock) {
         end: markdown.length,
         node
       });
-      if (node.body && !(node.token.type === "macro" && node.token.name === "do")) {
+      if (node.body && !(node.token.type === "macro" && node.token.name.toLowerCase() === "do")) {
         visit(node.body.children);
         for (const branch of node.body.branches) visit(branch.children);
       }
     }
     const events = postprocess(parse3(markdownOptions()).document().write(preprocess()(markdown, void 0, true)));
     for (const [event, token] of events) {
-      if (event !== "enter" || token.type !== "codeFenced") continue;
-      for (const span of spans) {
+      if (event !== "enter" || !types3.has(token.type)) continue;
+      let low = 0;
+      let high = spans.length;
+      while (low < high) {
+        const middle = low + high >>> 1;
+        if (spans[middle].end <= token.start.offset) low = middle + 1;
+        else high = middle;
+      }
+      for (let i2 = low; i2 < spans.length; i2++) {
+        const span = spans[i2];
+        if (span.start >= token.end.offset) break;
         const start = Math.max(token.start.offset, span.start);
         const end = Math.min(token.end.offset, span.end);
         if (start >= end) continue;
         const text3 = span.node.token.type === "text";
         const a = text3 ? span.node.start + start - span.start : span.node.start;
         const b = text3 ? span.node.start + end - span.start : span.node.end;
-        const first = source.slice(0, a).split("\n").length - 1;
-        const last2 = source.slice(0, Math.max(a, b - 1)).split("\n").length - 1;
+        const first = lineAt(a);
+        const last2 = lineAt(Math.max(a, b - 1));
         for (let line = first; line <= last2; line++) found.add(line);
       }
     }
@@ -20395,7 +20710,7 @@ function scanSpindleMarkup(text3) {
       }, true);
     }
   } else if (t.type !== "text") {
-    if (t.type === "macro" && t.name === "do") {
+    if (t.type === "macro" && t.name.toLowerCase() === "do") {
       if (!t.isClose) open = t;
       else if (open) {
         doBlocks.push({
@@ -20428,9 +20743,6 @@ function multilineJsLiterals(code) {
   } }, "statements");
   return spans;
 }
-function lineHasTag(tags, start, end) {
-  return tags.some((tag) => tag.start < end && tag.end > start);
-}
 function replaceSvgBlocks(html) {
   const tokens2 = [];
   return {
@@ -20443,7 +20755,17 @@ function replaceSvgBlocks(html) {
   };
 }
 function placeholdersIntact(text3, tokens2, placeholdersOf) {
-  return tokens2.every((_2, index) => placeholdersOf(index).reduce((count, placeholder) => count + text3.split(placeholder).length - 1, 0) === 1);
+  if (tokens2.length === 0) return true;
+  const indices = /* @__PURE__ */ new Map();
+  const counts = new Array(tokens2.length).fill(0);
+  tokens2.forEach((_2, index) => {
+    for (const marker of placeholdersOf(index)) indices.set(marker, index);
+  });
+  for (const [marker] of text3.matchAll(PLACEHOLDER_PATTERN)) {
+    const index = indices.get(marker);
+    if (index !== void 0 && ++counts[index] > 1) return false;
+  }
+  return counts.every((count) => count === 1);
 }
 function sameSpindleTokens(before, after) {
   const tokensOf2 = (text3) => scanSpindleMarkup(text3).tokens.map((m) => m.token);
@@ -20451,15 +20773,19 @@ function sameSpindleTokens(before, after) {
   const found = tokensOf2(after);
   return expected.length === found.length && expected.every((t, i2) => t === found[i2]);
 }
-function restorePlaceholders(text3, tokens2, placeholdersOf) {
-  let result2 = text3;
-  tokens2.forEach((token, index) => {
-    for (const placeholder of placeholdersOf(index)) result2 = result2.replace(placeholder, () => token);
+function restorePlaceholders(text3, groups) {
+  const replacements = /* @__PURE__ */ new Map();
+  for (const [tokens2, placeholdersOf] of groups) tokens2.forEach((token, index) => {
+    for (const marker of placeholdersOf(index)) replacements.set(marker, token);
+  });
+  return text3.replace(PLACEHOLDER_PATTERN, (marker) => {
+    const token = replacements.get(marker);
+    replacements.delete(marker);
+    return token ?? marker;
   });
-  return result2;
 }
-function restoreSvgBlocks(text3, tokens2) {
-  return restorePlaceholders(text3, tokens2, SVG_PLACEHOLDERS);
+function restoreHtmlTokens(text3, spindle, svg) {
+  return restorePlaceholders(text3, [[spindle, SPINDLE_PLACEHOLDERS], [svg, SVG_PLACEHOLDERS]]);
 }
 function replaceSpindleTokens(html) {
   const { tokens: found, tags, doBlocks } = scanSpindleMarkup(html);
@@ -20484,6 +20810,7 @@ function replaceSpindleTokens(html) {
   const tokens2 = [];
   const resultLines = [];
   let unit = 0;
+  let tag = 0;
   let lineStart = 0;
   while (lineStart <= html.length) {
     let lineEnd = lineStart;
@@ -20503,8 +20830,10 @@ function replaceSpindleTokens(html) {
     }
     const line = html.slice(lineStart, lineEnd);
     const indent = line.match(/^(\s*)/)?.[1] ?? "";
+    while (tag < tags.length && tags[tag].end <= lineStart) tag++;
+    const hasTag = tag < tags.length && tags[tag].start < lineEnd;
     if (lineUnits.length === 0) resultLines.push(line);
-    else if (!lineHasTag(tags, lineStart, lineEnd)) {
+    else if (!hasTag) {
       const idx = tokens2.length;
       tokens2.push(line.trim());
       resultLines.push(`${indent}<!--SP:${idx}-->`);
@@ -20526,9 +20855,6 @@ function replaceSpindleTokens(html) {
     tokens: tokens2
   };
 }
-function restoreSpindleTokens(text3, tokens2) {
-  return restorePlaceholders(text3, tokens2, SPINDLE_PLACEHOLDERS);
-}
 function closedMacroNames(text3) {
   const found = /* @__PURE__ */ new Set();
   for (const t of tokenizeMarkupTolerant(text3).tokens) if (t.type === "macro" && t.isClose) found.add(t.name.toLowerCase());
@@ -20594,7 +20920,7 @@ async function formatLf(text3, options) {
   const literalSentinel = newlineSentinel(body + sentinel);
   const literalLines = /* @__PURE__ */ new Map();
   const literalMarkers = /* @__PURE__ */ new Set();
-  const fenced = fencedCodeLines(body, isBlock);
+  const fenced = markdownLines(body, isBlock, /* @__PURE__ */ new Set(["codeFenced"]));
   const literalHtml = whitespaceSensitiveLines(body, isBlock);
   body = body.split("\n").map((line, index) => {
     if (!fenced.has(index) && !literalHtml.has(index)) return line;
@@ -20637,18 +20963,22 @@ async function formatLf(text3, options) {
         continue;
       }
       const { text: svgPlaceholdered, tokens: svgTokens } = replaceSvgBlocks(htmlText2);
+      if (!placeholdersIntact(svgPlaceholdered, svgTokens, SVG_PLACEHOLDERS)) {
+        lines.push(...region.lines);
+        continue;
+      }
       const { text: placeholdered, tokens: tokens2 } = replaceSpindleTokens(svgPlaceholdered);
       const formatted = await formatHTML(placeholdered, prettier2, prettierOptions);
       if (formatted === void 0 || !placeholdersIntact(formatted, tokens2, SPINDLE_PLACEHOLDERS) || !placeholdersIntact(formatted, svgTokens, SVG_PLACEHOLDERS)) {
         lines.push(...region.lines);
         continue;
       }
-      const restored = restoreSvgBlocks(restoreSpindleTokens(formatted.trim(), tokens2.map((t) => replaceAll(t, "\n", sentinel))), svgTokens);
+      const restored = restoreHtmlTokens(formatted.trim(), tokens2.map((t) => replaceAll(t, "\n", sentinel)), svgTokens);
       for (const fLine of restored.split("\n")) lines.push(fLine);
       continue;
     }
     let indented = indentMacros(region.lines, isBlock, isDedenting, literalMarkers);
-    if (options.maxLineLength) indented = wrapLines(indented, options.maxLineLength, literalLines);
+    if (options.maxLineLength) indented = wrapLines(indented, options.maxLineLength, literalLines, isBlock);
     for (const line of indented) {
       if (line.endsWith("  ")) hardBreakLines.add(lines.length);
       lines.push(line);
@@ -20661,13 +20991,14 @@ async function formatLf(text3, options) {
 function whitespaceSensitiveLines(source, isBlock) {
   const lines = /* @__PURE__ */ new Set();
   if (!WHITESPACE_AS_WRITTEN.test(source)) return lines;
+  const lineAt = sourceLines(source);
   const { nodes } = analyzeMarkup(source, { hooks: { isBlock } });
   function visit(nodes2) {
     for (const node of nodes2) {
       const { token, body } = node;
       if (token.type === "html" && (["pre", "textarea"].includes(token.tag.toLowerCase()) || Object.entries(token.attributes).some(([name, value]) => name.toLowerCase() === "style" && /white-space\s*:/i.test(value)))) {
-        const first = source.slice(0, node.start).split("\n").length - 1;
-        const last2 = source.slice(0, node.end - 1).split("\n").length - 1;
+        const first = lineAt(node.start);
+        const last2 = lineAt(node.end - 1);
         for (let line = first; line <= last2; line++) lines.add(line);
       } else if (body) {
         visit(body.children);
@@ -20794,11 +21125,12 @@ function indentColumn(line) {
   else break;
   return col;
 }
-function wrapLines(lines, maxLen, literalLines) {
+function wrapLines(lines, maxLen, literalLines, isBlock) {
   const result2 = [];
-  const javaScript = doBodyLines(lines);
+  const verbatim = verbatimLines(lines);
+  const structured = markdownLines(lines.join("\n"), isBlock, NO_WRAP);
   for (const [index, line] of lines.entries()) {
-    if (line.length <= maxLen || javaScript.has(index) || literalLines.has(line.trim())) {
+    if (line.length <= maxLen || verbatim.has(index) || structured.has(index) || literalLines.has(line.trim())) {
       result2.push(line);
       continue;
     }
@@ -20808,17 +21140,29 @@ function wrapLines(lines, maxLen, literalLines) {
       continue;
     }
     const wrapped = wordWrap(trimmed2, maxLen, line.match(/^(\s*)/)?.[1] ?? "");
+    if (wrapped.length > 1 && markdownLines(wrapped.join("\n"), isBlock, NO_WRAP).size) {
+      result2.push(line);
+      continue;
+    }
     if (line.endsWith("  ")) wrapped[wrapped.length - 1] += "  ";
     result2.push(...wrapped);
   }
   return result2;
 }
-function doBodyLines(lines) {
+function verbatimLines(lines) {
   const found = /* @__PURE__ */ new Set();
   const text3 = lines.join("\n");
-  for (const block of scanSpindleMarkup(text3).doBlocks) {
-    const first = text3.slice(0, block.bodyStart).split("\n").length - 1;
-    const last2 = text3.slice(0, block.bodyEnd).split("\n").length - 1;
+  const lineAt = sourceLines(text3);
+  const { doBlocks, tags } = scanSpindleMarkup(text3);
+  for (const block of doBlocks) {
+    const first = lineAt(block.bodyStart);
+    const last2 = lineAt(block.bodyEnd);
+    for (let i2 = first; i2 <= last2; i2++) found.add(i2);
+  }
+  for (const tag of tags) {
+    const first = lineAt(tag.start);
+    const last2 = lineAt(tag.end - 1);
+    if (first === last2) continue;
     for (let i2 = first; i2 <= last2; i2++) found.add(i2);
   }
   return found;
@@ -20827,7 +21171,7 @@ function wordWrap(text3, maxLen, indent) {
   const lines = [];
   const inToken = new Array(text3.length).fill(false);
   for (const token of tokenizeMarkupTolerant(text3).tokens) {
-    if (token.type === "text" || token.type === "html") continue;
+    if (token.type === "text") continue;
     inToken.fill(true, token.start, token.end);
   }
   const room = maxLen - indentColumn(indent);
@@ -20859,8 +21203,8 @@ function validateStoryMarkup(passages, macros, options = {}) {
   const list3 = [...passages];
   const all = [...macros];
   const known = /* @__PURE__ */ new Set();
-  const widgets = widgetDefinitions$1(list3, parameterLookup(all));
-  const blocks = new Set(effectiveWidgetDefinitions(widgets).filter((def) => def.block).map((def) => def.name.toLowerCase()));
+  const widgets = effectiveWidgetDefinitions(widgetDefinitions$1(list3, parameterLookup(all)));
+  const blocks = new Set(widgets.filter((def) => def.block).map((def) => def.name.toLowerCase()));
   const parametersOf2 = parameterLookup([...all, ...definedWidgetMacros(widgets)]);
   for (const macro of all) {
     const name = macro.name.toLowerCase();
@@ -20900,7 +21244,7 @@ function widgetDefinitions(passages, macros = []) {
 }
 function referenceOptions(macros, all = false, passages = []) {
   const list3 = [...macros];
-  const widgets = widgetDefinitions$1(passages, parameterLookup(list3));
+  const widgets = effectiveWidgetDefinitions(widgetDefinitions$1(passages, parameterLookup(list3)));
   return {
     all,
     storeVarMacros: new Set(list3.filter((m) => m.storeVar).map((m) => m.name.toLowerCase())),
@@ -20915,7 +21259,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, PARAMETER_TYPES, STRING_HOLDS, metadataRegistry, companionParents, 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, BLOCK_MACROS, BLOCK_WIDGETS, DEFINED_BLOCK_MACROS, RAW_BODY_MACROS, BRANCHING, quoteArg, 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, TRAILING_OPERATOR_RE, slice, MacroArgumentError, WORD_RE$1, NUMBER_RE$1, WORD_OR_PUNCT_RE, LEADING_OPERATOR_RE, takesRest, SUB_MACRO_PARAMETERS, RESERVED_NAME, isArrayIndex, hasOwn, createNamespace, parses, CONDITION_MACROS, PASSAGE_BODIES, holdsByDefault, JS_ESCAPE_RE, textPiece, registeredParameters, WIDGET_PARAMETERS, 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, VAR_PATH_RE, QUOTED_VAR_ARG_RE, VALID_VAR_TYPES, PRIMITIVE_SAMPLES, UNSUPPORTED_TYPE, NO_STORE_VAR_MACROS, FIELD_PATH_RE, 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, nonLazyContinuationStart, 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, DEFAULT_DEDENTING, WHITESPACE_AS_WRITTEN, LIST_ITEM_REGEX, CODE_FENCE_REGEX, NOT_MARKUP_TAGS;
+var __defProp2, __exportAll, NameMap, NameSet, PARAMETER_TYPES, STRING_HOLDS, metadataRegistry, companionParents, 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, BLOCK_MACROS, BLOCK_WIDGETS, DEFINED_BLOCK_MACROS, RAW_BODY_MACROS, BRANCHING, quoteArg, 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, TRAILING_OPERATOR_RE, slice, MacroArgumentError, WORD_RE$1, NUMBER_RE$1, WORD_OR_PUNCT_RE, LEADING_OPERATOR_RE, takesRest, SUB_MACRO_PARAMETERS, RESERVED_NAME, isArrayIndex, hasOwn, createNamespace, parses, CONDITION_MACROS, PASSAGE_BODIES, holdsByDefault, JS_ESCAPE_RE, textPiece, registeredParameters, WIDGET_PARAMETERS, 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, VAR_PATH_RE, QUOTED_VAR_ARG_RE, VALID_VAR_TYPES, PRIMITIVE_SAMPLES, UNSUPPORTED_TYPE, NO_STORE_VAR_MACROS, FIELD_PATH_RE, 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, nonLazyContinuationStart, 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, 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;
@@ -26268,6 +26612,7 @@ var init_story_variables = __esm({
       braceIsBlock(prevType) {
         if (prevType === types$1.colon && this.colonEndsTernary) return false;
         if (prevType === types$1.braceR && this.closedBlock) return true;
+        if (prevType === types$1._do) return true;
         if (prevType === types$1.name && this.prevValue === "static") return true;
         if (this.breakHere && OPERAND_ENDS.has(prevType)) {
           const { context } = this;
@@ -26369,7 +26714,7 @@ var init_story_variables = __esm({
     WORD_RE$1 = /\w+/y;
     NUMBER_RE$1 = /[-+]?(?:\d+\.?\d*|\.\d+)/y;
     WORD_OR_PUNCT_RE = /\S+/y;
-    LEADING_OPERATOR_RE = /^(?:[-+*/&|^=<>?:,.]|%(?![A-Za-z_]))/;
+    LEADING_OPERATOR_RE = /^(?:[-+*/&|^=<>?:,]|\.(?!\d)|%(?![A-Za-z_]))/;
     takesRest = (param) => param.type === "expression" || param.type === "statements" || param.type === "passage" || param.type === "text";
     SUB_MACRO_PARAMETERS = /* @__PURE__ */ new Map([["option", [{
       name: "value",
@@ -30156,6 +30501,7 @@ var init_story_variables = __esm({
     DEFAULT_PRETTIER_OPTIONS = { tabWidth: 2 };
     SVG_PLACEHOLDERS = (i2) => [`<!--SVG:${i2}-->`];
     SPINDLE_PLACEHOLDERS = (i2) => [`<!--SP:${i2}-->`, `__SP${i2}__`];
+    PLACEHOLDER_PATTERN = /<!--(?:SP|SVG):\d+-->|__SP\d+__/g;
     DEFAULT_DEDENTING = /* @__PURE__ */ new Set([
       "else",
       "elseif",
@@ -30166,6 +30512,21 @@ var init_story_variables = __esm({
     WHITESPACE_AS_WRITTEN = /<(?:pre|textarea)[\s>]|white-space\s*:/i;
     LIST_ITEM_REGEX = /^(?:[-+*]|\d{1,9}[.)])(?:[ \t]|$)/;
     CODE_FENCE_REGEX = /^(?:`{3,}|~{3,})/;
+    NO_WRAP = /* @__PURE__ */ new Set([
+      "atxHeading",
+      "setextHeading",
+      "table",
+      "listOrdered",
+      "listUnordered",
+      "blockQuote",
+      "definition",
+      "thematicBreak",
+      "htmlFlow",
+      "codeText",
+      "codeFenced",
+      "link",
+      "image"
+    ]);
     NOT_MARKUP_TAGS = ["script", "stylesheet"];
   }
 });
@@ -31284,6 +31645,10 @@ var init_macro_registry2 = __esm({
       getMacro(name) {
         return this.resolve(name.toLowerCase());
       }
+      /** A project's explicit schema takes precedence over runtime signature metadata. */
+      hasConfiguredParameters(name) {
+        return this.configEntries.get(name.toLowerCase())?.parameters !== void 0;
+      }
       /** Check if a macro is a block (container) macro. */
       isBlock(name) {
         return this.getMacro(name)?.block ?? false;
@@ -31568,7 +31933,7 @@ function usagesOf(byUri, name) {
   }
   return results;
 }
-var STORY_SCRIPT_PASSAGE, BUILTIN_CONTEXT, ARRAY_MEMBERS, DeclarationSet, VariableTracker;
+var BUILTIN_CONTEXT, ARRAY_MEMBERS, DeclarationSet, VariableTracker;
 var init_variable_tracker = __esm({
   "src/core/workspace/variable-tracker.ts"() {
     "use strict";
@@ -31578,7 +31943,6 @@ var init_variable_tracker = __esm({
     init_text();
     init_passage_index();
     init_declaration_check();
-    STORY_SCRIPT_PASSAGE = "StoryScript";
     BUILTIN_CONTEXT = { macros: builtinMacros, isBlock: isBlockMacro };
     ARRAY_MEMBERS = /* @__PURE__ */ new Set([
       ...Object.getOwnPropertyNames(Array.prototype),
@@ -31682,7 +32046,6 @@ var init_variable_tracker = __esm({
         const usages = [];
         const transientUsages = [];
         for (const passage of markup.passages) {
-          if (passage.passage.name === STORY_SCRIPT_PASSAGE) continue;
           for (const ref2 of collectVariableReferences2(passage)) {
             const usage = {
               uri,
@@ -31816,6 +32179,25 @@ var init_tokens = __esm({
   }
 });
 
+// src/core/markup/widgets.ts
+function widgetSources(passages, macros) {
+  const sources = /* @__PURE__ */ new Map();
+  for (const passage of passages) {
+    if (!passage.isMarkup) continue;
+    const { name, tags } = passage.passage;
+    for (const definition2 of widgetDefinitions([{ name, tags, content: passage.content }], macros)) {
+      sources.set(definition2, passage);
+    }
+  }
+  return sources;
+}
+var init_widgets = __esm({
+  "src/core/markup/widgets.ts"() {
+    "use strict";
+    init_tooling();
+  }
+});
+
 // src/core/workspace/widget-registry.ts
 var WidgetRegistry;
 var init_widget_registry = __esm({
@@ -31823,40 +32205,45 @@ var init_widget_registry = __esm({
     "use strict";
     init_tooling();
     init_tokens();
+    init_widgets();
     WidgetRegistry = class {
       /** Widgets keyed by lower-cased name; Spindle resolves widgets case-insensitively. */
       widgets = /* @__PURE__ */ new Map();
+      /** Half-typed declarations remain discoverable in the editor, without replacing effective widgets. */
+      incomplete = /* @__PURE__ */ new Map();
       /** Per-URI set of lower-cased macro names opened in that document. */
       invokedByUri = /* @__PURE__ */ new Map();
       /**
        * Read the widget definitions of `passages` (all of them, in workspace
-       * order; a name defined twice keeps the later definition, as when the
-       * runtime registers them).
+       * order). Public tooling selects the closed definitions in runtime phase
+       * order, preserving their identities so the original source is retained.
        */
       scan(passages, macros) {
         this.widgets.clear();
-        const known = [...macros];
-        for (const markup of passages) {
-          if (!markup.isMarkup) continue;
-          const { name, tags } = markup.passage;
-          for (const definition2 of widgetDefinitions([{ name, tags, content: markup.content }], known)) {
-            this.widgets.set(definition2.name.toLowerCase(), {
-              tooling: definition2,
-              name: definition2.name,
-              params: definition2.params,
-              uri: markup.passage.uri,
-              range: markup.range(definition2.start, definition2.end),
-              nameRange: markup.range(definition2.nameStart, definition2.nameEnd),
-              block: definition2.block
-            });
-          }
+        this.incomplete.clear();
+        const sources = widgetSources(passages, [...macros]);
+        const effective = new Set(effectiveWidgetDefinitions([...sources.keys()]));
+        for (const [definition2, markup] of sources) {
+          const widget = {
+            tooling: definition2,
+            name: definition2.name,
+            params: definition2.params,
+            uri: markup.passage.uri,
+            range: markup.range(definition2.start, definition2.end),
+            nameRange: markup.range(definition2.nameStart, definition2.nameEnd),
+            block: definition2.block
+          };
+          const key = definition2.name.toLowerCase();
+          if (effective.has(definition2)) this.widgets.set(key, widget);
+          else if (definition2.closeStart === void 0) this.incomplete.set(key, widget);
         }
       }
-      /** Get a widget definition by name (case-insensitive). */
+      /** The effective definition, or an incomplete declaration while its first definition is being typed. */
       getWidget(name) {
-        return this.widgets.get(name.toLowerCase());
+        const key = name.toLowerCase();
+        return this.widgets.get(key) ?? this.incomplete.get(key);
       }
-      /** Get all registered widget definitions. */
+      /** Get the effective registered definitions, excluding incomplete editor declarations. */
       getAllWidgets() {
         return Array.from(this.widgets.values());
       }
@@ -31937,7 +32324,7 @@ var init_markup_index = __esm({
 
 // src/core/workspace/spindle-version.ts
 import { existsSync as existsSync3, readFileSync as readFileSync5 } from "node:fs";
-import { dirname as dirname2, join as join3, resolve as resolve3 } from "node:path";
+import { dirname as dirname2, join as join3, resolve as resolve4 } from "node:path";
 import { fileURLToPath } from "node:url";
 function parseSpindleVersion(text3) {
   const m = /^\s*v?(\d+)\.(\d+)\.(\d+)(?:[-+].*)?\s*$/.exec(text3);
@@ -31993,7 +32380,7 @@ function readSpindlePackageVersion(file2) {
   });
 }
 function findUp(startDir, visit) {
-  let dir = resolve3(startDir);
+  let dir = resolve4(startDir);
   for (; ; ) {
     const found = visit(dir);
     if (found) return found.version;
@@ -32270,11 +32657,7 @@ var init_macro_supplements = __esm({
       },
       computed: {
         name: "computed",
-        description: "Evaluates an expression and outputs the result.\n\nUsage: `{computed expression}`",
-        parameters: ["...text"],
-        parameterDocs: [
-          { name: "expression", documentation: "Expression whose result is output." }
-        ]
+        description: "Assigns an expression's value to a variable and recomputes it when its dependencies change. The target must be a story ($), temporary (_) or local (@) variable. This macro produces no output; display the variable to show its value.\n\nUsage: `{computed _total = 1 + 2}Value: {_total}`"
       },
       print: {
         name: "print",
@@ -32287,7 +32670,7 @@ var init_macro_supplements = __esm({
       do: {
         name: "do",
         container: true,
-        description: "Displays its contents. Can be updated dynamically.\n\nUsage:\n\n```\n{do}\n  ...\n{/do}\n```",
+        description: "Executes JavaScript statements in its body. The body is code and produces no markup output.\n\nUsage:\n\n```\n{do}\n  _total = 1 + 2;\n{/do}\nValue: {_total}\n```",
         parameters: []
       },
       link: {
@@ -32427,7 +32810,7 @@ var init_macro_supplements = __esm({
       },
       passage: {
         name: "passage",
-        description: "Outputs the name of the current passage.\n\nUsage: `{passage}`",
+        description: "Renders the current passage's contents in a layout. Put this slot in StoryInterface; placing it in the current passage itself recursively renders that passage. To display the passage's name, use `{print currentPassage().name}`.\n\nUsage in StoryInterface: `<main>{passage}</main>`",
         parameters: []
       },
       textbox: {
@@ -33891,16 +34274,15 @@ function buildReport(documents, workspace) {
     if (list3) list3.push(diagnostic);
     else markup.set(passage, [diagnostic]);
   }
-  const widgets = /* @__PURE__ */ new Map();
-  const widgetList = [];
+  const sources = widgetSources(passages, macros);
+  const widgetList = [...sources].map(([definition2, passage]) => ({ definition: definition2, passage }));
+  const widgets = new Map(effectiveWidgetDefinitions([...sources.keys()]).map((definition2) => [
+    definition2.name.toLowerCase(),
+    { definition: definition2, passage: sources.get(definition2) }
+  ]));
   const invoked = /* @__PURE__ */ new Set();
   for (const passage of passages) {
     if (!passage.isMarkup) continue;
-    for (const definition2 of widgetDefinitions([{ name: passage.passage.name, content: passage.content, tags: passage.passage.tags }], macros)) {
-      const widget = { definition: definition2, passage };
-      widgets.set(definition2.name.toLowerCase(), widget);
-      widgetList.push(widget);
-    }
     for (const token of macroTokens(passage)) {
       if (!token.isClose) invoked.add(token.name.toLowerCase());
     }
@@ -34075,6 +34457,7 @@ function parentDiagnostics(passage, token, ancestors, workspace) {
   const name = token.name.toLowerCase();
   const parents = workspace.macros.getMacro(name)?.parents;
   if (!parents || parents.length === 0 || BRANCH_MACROS2.has(name)) return [];
+  if (workspace.macros.getAllMacros().some((macro) => macro.source === "user" && macro.name.toLowerCase() !== "listbox" && macro.subMacros.some((sub) => sub.toLowerCase() === name))) return [];
   const allowed = new Set(parents.map((parent) => parent.toLowerCase()));
   const parentList = parents.join(", ");
   const range2 = passage.range(token.start, token.end);
@@ -34213,14 +34596,12 @@ function isReadInBody(passage, bodyStart, bodyEnd, name, macroStart, macroEnd) {
   }
   for (const piece of passage.pieces) {
     if (piece.kind !== "code") continue;
-    let read = false;
-    lexJs(piece.code, {
-      variable(sigil, found, index, _nesting, end) {
-        if (sigil !== "_" || found !== name || !eligible(pieceOffset(piece, index))) return;
-        if (!/^\s*=(?![=>])/.test(maskLiterals(piece.code.slice(end)))) read = true;
-      }
-    }, piece.goal);
-    if (read) return true;
+    try {
+      if (parseCode(piece.code, piece.goal).refs.some(
+        (ref2) => ref2.sigil === "_" && ref2.name === name && ref2.read && eligible(pieceOffset(piece, ref2.start))
+      )) return true;
+    } catch {
+    }
   }
   return false;
 }
@@ -34390,6 +34771,7 @@ var init_diagnostics = __esm({
     init_diagnostic_codes();
     init_tokens();
     init_source_view();
+    init_widgets();
     init_argument_lexer();
     init_parameter_validator();
     init_link_parser();
@@ -34631,7 +35013,7 @@ var check_exports = {};
 __export(check_exports, {
   runCheck: () => runCheck
 });
-import { resolve as resolve4 } from "node:path";
+import { resolve as resolve5 } from "node:path";
 import { pathToFileURL as pathToFileURL3 } from "node:url";
 function parseArgs(args2) {
   const options = {
@@ -34707,7 +35089,7 @@ async function runCheck(args2) {
   let explicitConfig = null;
   if (options.configPath) {
     try {
-      explicitConfig = loadConfigFile(resolve4(cwd, options.configPath));
+      explicitConfig = loadConfigFile(resolve5(cwd, options.configPath));
     } catch (err) {
       console.error(`spindle-lsp check: ${err instanceof Error ? err.message : String(err)}`);
       return 2;
@@ -35964,7 +36346,7 @@ var init_escape = __esm({
 });
 
 // node_modules/minimatch/dist/esm/index.js
-var minimatch, starDotExtRE, starDotExtTest, starDotExtTestDot, starDotExtTestNocase, starDotExtTestNocaseDot, starDotStarRE, starDotStarTest, starDotStarTestDot, dotStarRE, dotStarTest, starRE, starTest, starTestDot, qmarksRE, qmarksTestNocase, qmarksTestNocaseDot, qmarksTestDot, qmarksTest, qmarksTestNoExt, qmarksTestNoExtDot, defaultPlatform, path, sep2, GLOBSTAR, qmark2, star2, twoStarDot, twoStarNoDot, filter, ext, defaults, braceExpand, makeRe, match, globMagic, regExpEscape2, Minimatch;
+var minimatch, starDotExtRE, starDotExtTest, starDotExtTestDot, starDotExtTestNocase, starDotExtTestNocaseDot, starDotStarRE, starDotStarTest, starDotStarTestDot, dotStarRE, dotStarTest, starRE, starTest, starTestDot, qmarksRE, qmarksTestNocase, qmarksTestNocaseDot, qmarksTestDot, qmarksTest, qmarksTestNoExt, qmarksTestNoExtDot, defaultPlatform, path, sep3, GLOBSTAR, qmark2, star2, twoStarDot, twoStarNoDot, filter, ext, defaults, braceExpand, makeRe, match, globMagic, regExpEscape2, Minimatch;
 var init_esm3 = __esm({
   "node_modules/minimatch/dist/esm/index.js"() {
     init_esm2();
@@ -36037,8 +36419,8 @@ var init_esm3 = __esm({
       win32: { sep: "\\" },
       posix: { sep: "/" }
     };
-    sep2 = defaultPlatform === "win32" ? path.win32.sep : path.posix.sep;
-    minimatch.sep = sep2;
+    sep3 = defaultPlatform === "win32" ? path.win32.sep : path.posix.sep;
+    minimatch.sep = sep3;
     GLOBSTAR = /* @__PURE__ */ Symbol("globstar **");
     minimatch.GLOBSTAR = GLOBSTAR;
     qmark2 = "[^/]";
@@ -36787,7 +37169,7 @@ var init_esm3 = __esm({
 
 // src/plugins/format/prettier-bridge.ts
 import { readFile } from "node:fs/promises";
-import { basename, dirname as dirname3, extname, relative as relative3, resolve as resolve5 } from "node:path";
+import { basename, dirname as dirname3, extname, relative as relative3, resolve as resolve6 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 async function loadPrettier(filePath) {
   prettier ??= import("prettier").catch(() => null);
@@ -36796,7 +37178,7 @@ async function loadPrettier(filePath) {
   let resolved = null;
   try {
     const path2 = filePath?.startsWith("file:") ? fileURLToPath3(filePath) : filePath;
-    const target = path2 ?? resolve5(process.cwd(), "story.tw");
+    const target = path2 ?? resolve6(process.cwd(), "story.tw");
     resolved = process.env.SPINDLE_LSP_TRUSTED_FORMAT === "1" ? await p.resolveConfig(target, { useCache: false }) : await loadDataConfig(p, target);
   } catch {
   }
@@ -36811,7 +37193,7 @@ async function loadDataConfig(p, target) {
   if (!config2 || typeof config2 !== "object" || Array.isArray(config2)) return null;
   const { overrides, ...base } = config2;
   let options = base;
-  const file2 = relative3(dirname3(configFile), resolve5(target)).replaceAll("\\", "/");
+  const file2 = relative3(dirname3(configFile), resolve6(target)).replaceAll("\\", "/");
   for (const override of Array.isArray(overrides) ? overrides : []) {
     if (matchesPatterns(file2, override.files, override.excludeFiles)) {
       options = { ...options, ...override.options };
@@ -59325,7 +59707,7 @@ var init_protocol = __esm({
               return;
             }
             const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
-            await new Promise((resolve7) => setTimeout(resolve7, pollInterval));
+            await new Promise((resolve8) => setTimeout(resolve8, pollInterval));
             options?.signal?.throwIfAborted();
           }
         } catch (error48) {
@@ -59342,7 +59724,7 @@ var init_protocol = __esm({
        */
       request(request, resultSchema, options) {
         const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-        return new Promise((resolve7, reject) => {
+        return new Promise((resolve8, reject) => {
           const earlyReject = (error48) => {
             reject(error48);
           };
@@ -59420,7 +59802,7 @@ var init_protocol = __esm({
               if (!parseResult.success) {
                 reject(parseResult.error);
               } else {
-                resolve7(parseResult.data);
+                resolve8(parseResult.data);
               }
             } catch (error48) {
               reject(error48);
@@ -59682,12 +60064,12 @@ var init_protocol = __esm({
           }
         } catch {
         }
-        return new Promise((resolve7, reject) => {
+        return new Promise((resolve8, reject) => {
           if (signal.aborted) {
             reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
             return;
           }
-          const timeoutId = setTimeout(resolve7, interval);
+          const timeoutId = setTimeout(resolve8, interval);
           signal.addEventListener("abort", () => {
             clearTimeout(timeoutId);
             reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -62714,7 +63096,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref2];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve7.call(this, root, ref2);
+      let _sch = resolve8.call(this, root, ref2);
       if (_sch === void 0) {
         const schema = (_a3 = root.localRefs) === null || _a3 === void 0 ? void 0 : _a3[ref2];
         const { schemaId } = this.opts;
@@ -62741,7 +63123,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve7(root, ref2) {
+    function resolve8(root, ref2) {
       let sch;
       while (typeof (sch = this.refs[ref2]) == "string")
         ref2 = sch;
@@ -63316,7 +63698,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve7(baseURI, relativeURI, options) {
+    function resolve8(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const resolved = resolveComponent(parse6(baseURI, schemelessOptions), parse6(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
@@ -63543,7 +63925,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize,
-      resolve: resolve7,
+      resolve: resolve8,
       resolveComponent,
       equal,
       serialize,
@@ -67701,7 +68083,7 @@ var init_mcp = __esm({
         let task = createTaskResult.task;
         const pollInterval = task.pollInterval ?? 5e3;
         while (task.status !== "completed" && task.status !== "failed" && task.status !== "cancelled") {
-          await new Promise((resolve7) => setTimeout(resolve7, pollInterval));
+          await new Promise((resolve8) => setTimeout(resolve8, pollInterval));
           const updatedTask = await extra.taskStore.getTask(taskId);
           if (!updatedTask) {
             throw new McpError(ErrorCode.InternalError, `Task ${taskId} not found during polling`);
@@ -68310,12 +68692,12 @@ var init_stdio2 = __esm({
         this.onclose?.();
       }
       send(message) {
-        return new Promise((resolve7) => {
+        return new Promise((resolve8) => {
           const json2 = serializeMessage(message);
           if (this._stdout.write(json2)) {
-            resolve7();
+            resolve8();
           } else {
-            this._stdout.once("drain", resolve7);
+            this._stdout.once("drain", resolve8);
           }
         });
       }
@@ -68326,7 +68708,7 @@ var init_stdio2 = __esm({
 // src/mcp/play/sessions.ts
 import { randomBytes } from "node:crypto";
 import { statSync as statSync2 } from "node:fs";
-import { dirname as dirname4, resolve as resolve6 } from "node:path";
+import { dirname as dirname4, resolve as resolve7 } from "node:path";
 function missingPlayMessage() {
   return `spindle_play needs @rohal12/spindle ${PLAY_SPINDLE_VERSION} or later`;
 }
@@ -68416,7 +68798,7 @@ var init_sessions = __esm({
         this.starting++;
         try {
           const play = await this.load();
-          const path2 = resolve6(process.cwd(), storyPath);
+          const path2 = resolve7(process.cwd(), storyPath);
           const { html, notes: storyNotes } = await play.resolveStoryHtml({ path: path2 });
           const notes = [...storyNotes, ...runtimeNote(path2, play.version)];
           const sessionOptions = { html, trusted: this.trustedHostCode };
@@ -70156,8 +70538,8 @@ var require_semaphore = __commonJS({
         this._waiting = [];
       }
       lock(thunk) {
-        return new Promise((resolve7, reject) => {
-          this._waiting.push({ thunk, resolve: resolve7, reject });
+        return new Promise((resolve8, reject) => {
+          this._waiting.push({ thunk, resolve: resolve8, reject });
           this.runNext();
         });
       }
@@ -71783,9 +72165,9 @@ ${JSON.stringify(message, null, 4)}`);
           if (typeof cancellationStrategy.sender.enableCancellation === "function") {
             cancellationStrategy.sender.enableCancellation(requestMessage);
           }
-          return new Promise(async (resolve7, reject) => {
+          return new Promise(async (resolve8, reject) => {
             const resolveWithCleanup = (r) => {
-              resolve7(r);
+              resolve8(r);
               cancellationStrategy.sender.cleanup(id);
               disposable?.dispose();
             };
@@ -77427,8 +77809,8 @@ var require_server = __commonJS({
         if (value instanceof Promise) {
           return value;
         } else if (Is3.thenable(value)) {
-          return new Promise((resolve7, reject) => {
-            value.then((resolved) => resolve7(resolved), (error48) => reject(error48));
+          return new Promise((resolve8, reject) => {
+            value.then((resolved) => resolve8(resolved), (error48) => reject(error48));
           });
         } else {
           return Promise.resolve(value);
@@ -77712,7 +78094,7 @@ var require_files = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.FileSystem = void 0;
     exports.uriToFilePath = uriToFilePath;
-    exports.resolve = resolve7;
+    exports.resolve = resolve8;
     exports.resolveGlobalNodePath = resolveGlobalNodePath;
     exports.resolveGlobalYarnPath = resolveGlobalYarnPath;
     exports.resolveModulePath = resolveModulePath;
@@ -77741,7 +78123,7 @@ var require_files = __commonJS({
     function isWindows() {
       return process.platform === "win32";
     }
-    function resolve7(moduleName, nodePath, cwd, tracer) {
+    function resolve8(moduleName, nodePath, cwd, tracer) {
       const nodePathKey = "NODE_PATH";
       const app = [
         "var p = process;",
@@ -77760,7 +78142,7 @@ var require_files = __commonJS({
         "}",
         "});"
       ].join("");
-      return new Promise((resolve8, reject) => {
+      return new Promise((resolve9, reject) => {
         const env = process.env;
         const newEnv = /* @__PURE__ */ Object.create(null);
         Object.keys(env).forEach((key) => newEnv[key] = env[key]);
@@ -77792,7 +78174,7 @@ var require_files = __commonJS({
             if (message2.c === "r") {
               cp.send({ c: "e" });
               if (message2.s) {
-                resolve8(message2.r);
+                resolve9(message2.r);
               } else {
                 reject(new Error(`Failed to resolve module: ${moduleName}`));
               }
@@ -77920,17 +78302,17 @@ var require_files = __commonJS({
         if (!path2.isAbsolute(nodePath)) {
           nodePath = path2.join(workspaceRoot, nodePath);
         }
-        return resolve7(moduleName, nodePath, nodePath, tracer).then((value) => {
+        return resolve8(moduleName, nodePath, nodePath, tracer).then((value) => {
           if (FileSystem.isParent(nodePath, value)) {
             return value;
           } else {
             return Promise.reject(new Error(`Failed to load ${moduleName} from node path location.`));
           }
         }).then(void 0, (_error) => {
-          return resolve7(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
+          return resolve8(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
         });
       } else {
-        return resolve7(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
+        return resolve8(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
       }
     }
   }
@@ -78012,10 +78394,10 @@ var require_ril = __commonJS({
         return api_1.Disposable.create(() => this.stream.off("end", listener));
       }
       write(data2, encoding) {
-        return new Promise((resolve7, reject) => {
+        return new Promise((resolve8, reject) => {
           const callback = (error48) => {
             if (error48 === void 0 || error48 === null) {
-              resolve7();
+              resolve8();
             } else {
               reject(error48);
             }
@@ -78307,10 +78689,10 @@ var require_main = __commonJS({
     }
     function createClientPipeTransport(pipeName, encoding = "utf-8") {
       let connectResolve;
-      const connected = new Promise((resolve7, _reject) => {
-        connectResolve = resolve7;
+      const connected = new Promise((resolve8, _reject) => {
+        connectResolve = resolve8;
       });
-      return new Promise((resolve7, reject) => {
+      return new Promise((resolve8, reject) => {
         const server = (0, net_1.createServer)((socket) => {
           server.close();
           connectResolve([
@@ -78321,7 +78703,7 @@ var require_main = __commonJS({
         server.on("error", reject);
         server.listen(pipeName, () => {
           server.removeListener("error", reject);
-          resolve7({
+          resolve8({
             onConnected: () => {
               return connected;
             }
@@ -78338,10 +78720,10 @@ var require_main = __commonJS({
     }
     function createClientSocketTransport(port, encoding = "utf-8") {
       let connectResolve;
-      const connected = new Promise((resolve7, _reject) => {
-        connectResolve = resolve7;
+      const connected = new Promise((resolve8, _reject) => {
+        connectResolve = resolve8;
       });
-      return new Promise((resolve7, reject) => {
+      return new Promise((resolve8, reject) => {
         const server = (0, net_1.createServer)((socket) => {
           server.close();
           connectResolve([
@@ -78358,7 +78740,7 @@ var require_main = __commonJS({
             return;
           }
           const boundPort = address.port;
-          resolve7({
+          resolve8({
             port: () => boundPort,
             onConnected: () => {
               return connected;
@@ -79434,9 +79816,8 @@ function getDocumentVariableCompletions(sigil, cursor, workspace) {
   for (const passage of doc.passages) {
     for (const use of variableUses(passage)) if (use.sigil === sigil) names.add(use.name);
   }
-  for (const widget of workspace.widgets.getAllWidgets()) {
-    if (widget.uri !== doc.uri) continue;
-    for (const param of widget.params) if (param[0] === sigil) names.add(param.slice(1));
+  for (const definition2 of widgetSources(doc.passages, doc.context.macros).keys()) {
+    for (const param of definition2.params) if (param[0] === sigil) names.add(param.slice(1));
   }
   return [...names].map((name) => ({
     label: `${sigil}${name}`,
@@ -79475,6 +79856,7 @@ var init_completions = __esm({
   "src/plugins/completions.ts"() {
     "use strict";
     init_tooling();
+    init_widgets();
     init_passage_refs();
     init_link_runtime();
     init_markup_cursor();
@@ -79665,10 +80047,11 @@ function getSignatureHelp(uri, position, workspace) {
   const typing = argumentsBeingTyped(argsBefore);
   const argument = typing.length - 1;
   const macroInfo = workspace.macros.getMacro(macroName);
-  if (macroInfo && macroInfo.parameters && macroInfo.parameters.length > 0) {
+  const schema = macroInfo?.parameterDefs?.length && !workspace.macros.hasConfiguredParameters(macroName) ? void 0 : macroInfo?.parameters;
+  if (macroInfo && schema && schema.length > 0) {
     const described = describeSignatures(
       macroName,
-      macroInfo.parameters,
+      schema,
       macroInfo.description ?? void 0,
       macroInfo.parameterDocs
     );
@@ -79683,10 +80066,10 @@ function getSignatureHelp(uri, position, workspace) {
     }
   }
   if (macroInfo) {
-    const definitions = macroInfo.parameters === void 0 ? macroInfo.parameterDefs : void 0;
+    const definitions = schema === void 0 ? macroInfo.parameterDefs : void 0;
     if (!definitions?.length) return null;
     const parameters = definitions.map((parameter) => ({
-      label: parameter.required ? parameter.name : `[${parameter.name}]`,
+      label: parameter.required || parameter.type === "separator" ? parameter.name : `[${parameter.name}]`,
       documentation: [parameter.description, `Type: ${parameter.type}`].filter(Boolean).join("\n\n")
     }));
     const positional = definitions.every((p) => p.type === "string" || p.type === "number") && argument < parameters.length;