npm - @rohal12/spindle-lsp - Versions diffs - 0.15.13 → 0.15.15 - Mend

@rohal12/spindle-lsp 0.15.13 → 0.15.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/bin.js CHANGED Viewed

@@ -55,7 +55,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = false ? pkg.version : "0.15.13";
+    VERSION = false ? pkg.version : "0.15.15";
   }
 });
@@ -10618,27 +10618,6 @@ var init_file_inputs = __esm({
 });
 // node_modules/@rohal12/spindle/dist/pkg/story-variables.js
-function checkParameterTypes(macro, parameters) {
-  const holdsFix = `Give a \`string\` or \`text\` parameter one of ${STRING_HOLDS.join(", ")} to hold (see docs/custom-macros.md#what-a-string-holds).`;
-  for (const param of parameters) {
-    const type = param.type;
-    if (!PARAMETER_TYPES.includes(type)) throw parameterError(macro, param, type === void 0 ? "has no type" : `has the unknown type ${JSON.stringify(type)}`, `Give it one of the types ${PARAMETER_TYPES.join(", ")} (see docs/custom-macros.md#parameter-types), or declare no parameters and read props.rawArgs.`);
-    const holds = param.holds;
-    if (holds !== void 0 && type !== "string" && type !== "text") throw parameterError(macro, param, `is of the type ${type}, which holds what it is`, holdsFix);
-    if (holds !== void 0 && !STRING_HOLDS.includes(holds)) throw parameterError(macro, param, `holds the unknown ${JSON.stringify(holds)}`, holdsFix);
-    if (param.parameters) checkParameterTypes(macro, param.parameters);
-  }
-}
-function parameterError(macro, param, problem, fix) {
-  return /* @__PURE__ */ new Error(`spindle: The parameter "${param.name}" of the macro {${macro}} ${problem}. ${fix}`);
-}
-function branchParents(name, macros) {
-  if (!macros) return [...companionParents.get(name) ?? []].filter((parent) => parent !== "listbox");
-  return macros.filter((macro) => macro.name.toLowerCase() !== "listbox" && macro.subMacros.some((sub) => sub.toLowerCase() === name.toLowerCase())).map((macro) => macro.name.toLowerCase());
-}
-function getMacroRegistry() {
-  return Array.from(metadataRegistry.values());
-}
 function isSigil(c) {
   return c !== void 0 && SIGIL_CHARS.has(c);
 }
@@ -11111,23 +11090,29 @@ function peg$parse(input, options) {
     return [body ? lexeme("text", loc, { value: body }) : null, end];
   }
   function peg$f16() {
+    return completionMode;
+  }
+  function peg$f17(body) {
+    return lexeme("text", location(), { value: body });
+  }
+  function peg$f18() {
     return offset2();
   }
-  function peg$f17(value) {
+  function peg$f19(value) {
     return lexeme("text", location(), { value });
   }
-  function peg$f18(value) {
+  function peg$f20(value) {
     const node = lexeme("text", location(), { value });
     node.comment = true;
     return node;
   }
-  function peg$f19(bs2) {
+  function peg$f21(bs2) {
     return bs2.length % 2 === 1;
   }
-  function peg$f20(bs2, c) {
+  function peg$f22(bs2, c) {
     return c;
   }
-  function peg$f21(bs2, brace) {
+  function peg$f23(bs2, brace) {
     const loc = location();
     const next = input.charAt(loc.end.offset);
     if (textMode) {
@@ -11144,48 +11129,48 @@ function peg$parse(input, options) {
     escaped.escape = true;
     return bs2.length > 1 ? [before, escaped] : escaped;
   }
-  function peg$f22() {
+  function peg$f24() {
     return lexeme("text", location(), { value: LB });
   }
-  function peg$f23() {
+  function peg$f25() {
     return !textMode;
   }
-  function peg$f24() {
+  function peg$f26() {
     return lexeme("text", location(), { value: "<" });
   }
-  function peg$f25() {
+  function peg$f27() {
     return lexeme("text", location(), { value: "[" });
   }
-  function peg$f26() {
+  function peg$f28() {
     return !textMode;
   }
-  function peg$f27(ss2, s, at3, inner) {
+  function peg$f29(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$f28() {
+  function peg$f30() {
     return !textMode;
   }
-  function peg$f29() {
+  function peg$f31() {
     fail("Unclosed link: [[ without ]]", location(), "unclosed-link");
   }
-  function peg$f30(parts) {
+  function peg$f32(parts) {
     return selectorsOf(parts);
   }
-  function peg$f31() {
+  function peg$f33() {
     return NO_SELECTORS;
   }
-  function peg$f32(s, end) {
+  function peg$f34(s, end) {
     return {
       ...s,
       end
     };
   }
-  function peg$f33(prefix, name) {
+  function peg$f35(prefix, name) {
     return [prefix, name];
   }
-  function peg$f34(ss2, s, sigil, nameStart, name) {
+  function peg$f36(ss2, s, sigil, nameStart, name) {
     const variable = lexeme("variable", location(), {
       name,
       nameStart,
@@ -11195,7 +11180,7 @@ function peg$parse(input, options) {
     variable.selectorSpan = selectorSpan(s, ss2, nameStart - 1);
     return withSelectors(variable, s);
   }
-  function peg$f35(ss2, s, after, expression) {
+  function peg$f37(ss2, s, after, expression) {
     const node = lexeme("expression", location(), {
       expression,
       expressionStart: after,
@@ -11204,28 +11189,33 @@ function peg$parse(input, options) {
     node.selectorSpan = selectorSpan(s, ss2, after);
     return withSelectors(node, s);
   }
-  function peg$f36() {
+  function peg$f38() {
     fail("Unclosed {" + input.substr(location().end.offset, 1) + "\u2026: no } ends it", location(), "unclosed-expression");
   }
-  function peg$f37(start) {
-    return skipTo(hooks.closeBrace(input, start, start));
+  function peg$f39(start) {
+    const end = hooks.closeBrace(input, start, start);
+    return skipTo(end < 0 && completionMode ? input.length : end);
   }
-  function peg$f38(start) {
+  function peg$f40(start) {
     return skipEnd - offset2();
   }
-  function peg$f39(start, code) {
+  function peg$f41(start, code) {
     return code;
   }
-  function peg$f40(ss2, s, start, close, name, nameEnd) {
-    return skipTo(hooks.closeBrace(input, nameEnd, start));
+  function peg$f42() {
+    return completionMode;
+  }
+  function peg$f43(ss2, s, start, close, name, nameEnd) {
+    const end = hooks.closeBrace(input, nameEnd, start);
+    return skipTo(end < 0 && completionMode ? input.length : end);
   }
-  function peg$f41(ss2, s, start, close, name, nameEnd) {
+  function peg$f44(ss2, s, start, close, name, nameEnd) {
     return skipEnd - offset2();
   }
-  function peg$f42(ss2, s, start, close, name, nameEnd, args2) {
+  function peg$f45(ss2, s, start, close, name, nameEnd, args2) {
     return args2;
   }
-  function peg$f43(ss2, s, start, close, name, nameEnd, tail) {
+  function peg$f46(ss2, s, start, close, name, nameEnd, tail) {
     const loc = location();
     const lower = name.toLowerCase();
     const tag = lexeme("macro", loc, {
@@ -11238,7 +11228,7 @@ function peg$parse(input, options) {
     tag.nameEnd = nameEnd;
     tag.selectorSpan = selectorSpan(s, ss2, start);
     if (tail === null) fail("Unclosed {" + (close ? "/" : "") + name + "\u2026: no } ends the macro", loc, "unclosed-macro");
-    tag.rawArgs = tail.trim();
+    tag.rawArgs = completionMode ? tail.trimStart() : tail.trim();
     tag.argsStart = tag.rawArgs ? nameEnd + tail.length - tail.trimStart().length : nameEnd;
     tag.argsEnd = tag.argsStart + tag.rawArgs.length;
     if (close) {
@@ -11251,19 +11241,19 @@ function peg$parse(input, options) {
     }
     return tag;
   }
-  function peg$f44(s) {
+  function peg$f47(s) {
     fail("A closing tag starts with a letter after {/", location(), "invalid-closer");
   }
-  function peg$f45(value) {
+  function peg$f48(value) {
     return EMAIL_AUTOLINK.test(value);
   }
-  function peg$f46(value) {
+  function peg$f49(value) {
     return lexeme("text", location(), { value });
   }
-  function peg$f47(value) {
+  function peg$f50(value) {
     return lexeme("text", location(), { value });
   }
-  function peg$f48(tagStart, tag, list3, slash) {
+  function peg$f51(tagStart, tag, list3, slash) {
     const lower = tag.toLowerCase();
     return lexeme("html", location(), {
       tag,
@@ -11276,7 +11266,7 @@ function peg$parse(input, options) {
       isSelfClose: !!slash || VOID_TAGS.has(lower)
     });
   }
-  function peg$f49(tag, bad) {
+  function peg$f52(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 = {
@@ -11294,7 +11284,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$f50(tagStart, tag) {
+  function peg$f53(tagStart, tag) {
     return lexeme("html", location(), {
       tag,
       lower: tag.toLowerCase(),
@@ -11306,14 +11296,14 @@ function peg$parse(input, options) {
       isSelfClose: false
     });
   }
-  function peg$f51(nameStart, name) {
+  function peg$f54(nameStart, name) {
     attrCode = hooks.isCodeAttribute(name);
     return true;
   }
-  function peg$f52(nameStart, name, v2) {
+  function peg$f55(nameStart, name, v2) {
     return v2;
   }
-  function peg$f53(nameStart, name, value) {
+  function peg$f56(nameStart, name, value) {
     const attribute = {
       name,
       value: value ? value.value : "",
@@ -11327,7 +11317,7 @@ function peg$parse(input, options) {
     }
     return attribute;
   }
-  function peg$f54(start, value, end) {
+  function peg$f57(start, value, end) {
     return {
       value,
       start,
@@ -11335,7 +11325,7 @@ function peg$parse(input, options) {
       quote: '"'
     };
   }
-  function peg$f55(start, value, end) {
+  function peg$f58(start, value, end) {
     return {
       value,
       start,
@@ -11343,35 +11333,36 @@ function peg$parse(input, options) {
       quote: "'"
     };
   }
-  function peg$f56(q2) {
+  function peg$f59(q2) {
     fail("Unclosed attribute value: the " + q2 + " here has no closing " + q2, location(), "unclosed-attribute");
   }
-  function peg$f57(start, value, end) {
+  function peg$f60(start, value, end) {
     return {
       value,
       start,
       end
     };
   }
-  function peg$f58() {
+  function peg$f61() {
     return !attrCode;
   }
-  function peg$f59(bs2) {
+  function peg$f62(bs2) {
     return bs2.length % 2 === 1;
   }
-  function peg$f60() {
+  function peg$f63() {
     return !attrCode;
   }
-  function peg$f61(start, nameEnd) {
-    return skipTo(hooks.closeBrace(input, nameEnd, start));
+  function peg$f64(start, nameEnd) {
+    const end = hooks.closeBrace(input, nameEnd, start);
+    return skipTo(end < 0 && completionMode ? input.length : end);
   }
-  function peg$f62(start, nameEnd) {
+  function peg$f65(start, nameEnd) {
     return skipEnd - offset2();
   }
-  function peg$f63() {
+  function peg$f66() {
     return !attrCode;
   }
-  function peg$f64() {
+  function peg$f67() {
     return attrCode;
   }
   let peg$currPos = options.peg$currPos | 0;
@@ -11710,6 +11701,40 @@ function peg$parse(input, options) {
       peg$currPos = s0;
       s0 = peg$FAILED;
     }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      peg$savedPos = peg$currPos;
+      s1 = peg$f16();
+      if (s1) s1 = void 0;
+      else s1 = peg$FAILED;
+      if (s1 !== peg$FAILED) {
+        s2 = peg$currPos;
+        s3 = [];
+        if (input.length > peg$currPos) {
+          s4 = input.charAt(peg$currPos);
+          peg$currPos++;
+        } else {
+          s4 = peg$FAILED;
+          if (peg$silentFails === 0) peg$fail(peg$e0);
+        }
+        while (s4 !== peg$FAILED) {
+          s3.push(s4);
+          if (input.length > peg$currPos) {
+            s4 = input.charAt(peg$currPos);
+            peg$currPos++;
+          } else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) peg$fail(peg$e0);
+          }
+        }
+        s2 = input.substring(s2, peg$currPos);
+        peg$savedPos = s0;
+        s0 = peg$f17(s2);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
     return s0;
   }
   function peg$parseHere() {
@@ -11717,7 +11742,7 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = "";
     peg$savedPos = s0;
-    s1 = peg$f16();
+    s1 = peg$f18();
     s0 = s1;
     return s0;
   }
@@ -11746,7 +11771,7 @@ function peg$parse(input, options) {
     else s1 = s2;
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f17(s1);
+      s1 = peg$f19(s1);
     }
     s0 = s1;
     return s0;
@@ -11862,6 +11887,7 @@ function peg$parse(input, options) {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) peg$fail(peg$e5);
           }
+          if (s6 === peg$FAILED) s6 = peg$parseOpenEnd();
           if (s6 !== peg$FAILED) {
             s5 = [s5, s6];
             s4 = s5;
@@ -11886,7 +11912,7 @@ function peg$parse(input, options) {
     else s1 = s2;
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f18(s1);
+      s1 = peg$f20(s1);
     }
     s0 = s1;
     return s0;
@@ -11919,7 +11945,7 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s3 = peg$f19(s1);
+      s3 = peg$f21(s1);
       if (s3) s3 = void 0;
       else s3 = peg$FAILED;
       if (s3 !== peg$FAILED) {
@@ -11931,7 +11957,7 @@ function peg$parse(input, options) {
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s2;
-          s2 = peg$f20(s1, s4);
+          s2 = peg$f22(s1, s4);
         } else {
           peg$currPos = s2;
           s2 = peg$FAILED;
@@ -11942,7 +11968,7 @@ function peg$parse(input, options) {
       }
       if (s2 === peg$FAILED) s2 = null;
       peg$savedPos = s0;
-      s0 = peg$f21(s1, s2);
+      s0 = peg$f23(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -11990,7 +12016,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f22();
+        s0 = peg$f24();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -12005,7 +12031,7 @@ function peg$parse(input, options) {
       peg$silentFails++;
       s2 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s3 = peg$f23();
+      s3 = peg$f25();
       if (s3) s3 = void 0;
       else s3 = peg$FAILED;
       if (s3 !== peg$FAILED) {
@@ -12037,7 +12063,7 @@ function peg$parse(input, options) {
         }
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f24();
+          s0 = peg$f26();
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -12057,7 +12083,7 @@ function peg$parse(input, options) {
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f25();
+          s1 = peg$f27();
         }
         s0 = s1;
       }
@@ -12068,7 +12094,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4, s5, s6, s7;
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f26();
+    s1 = peg$f28();
     if (s1) s1 = void 0;
     else s1 = peg$FAILED;
     if (s1 !== peg$FAILED) {
@@ -12094,9 +12120,10 @@ function peg$parse(input, options) {
             s7 = peg$FAILED;
             if (peg$silentFails === 0) peg$fail(peg$e13);
           }
+          if (s7 === peg$FAILED) s7 = peg$parseOpenEnd();
           if (s7 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f27(s3, s4, s5, s6);
+            s0 = peg$f29(s3, s4, s5, s6);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -12116,7 +12143,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s1 = peg$f28();
+      s1 = peg$f30();
       if (s1) s1 = void 0;
       else s1 = peg$FAILED;
       if (s1 !== peg$FAILED) {
@@ -12129,7 +12156,7 @@ function peg$parse(input, options) {
         }
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f29();
+          s0 = peg$f31();
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -12257,7 +12284,7 @@ function peg$parse(input, options) {
       }
       if (s2 === peg$FAILED) s2 = null;
       peg$savedPos = s0;
-      s0 = peg$f30(s1);
+      s0 = peg$f32(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -12266,7 +12293,7 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
       s1 = "";
       peg$savedPos = s0;
-      s1 = peg$f31();
+      s1 = peg$f33();
       s0 = s1;
     }
     return s0;
@@ -12296,7 +12323,7 @@ function peg$parse(input, options) {
         }
       }
       peg$savedPos = s0;
-      s0 = peg$f32(s1, s2);
+      s0 = peg$f34(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -12322,7 +12349,7 @@ function peg$parse(input, options) {
       }
       s2 = input.substring(s2, peg$currPos);
       peg$savedPos = s0;
-      s0 = peg$f33(s1, s2);
+      s0 = peg$f35(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -12440,16 +12467,10 @@ function peg$parse(input, options) {
             }
           }
           s6 = input.substring(s6, peg$currPos);
-          if (input.charCodeAt(peg$currPos) === 125) {
-            s7 = peg$c11;
-            peg$currPos++;
-          } else {
-            s7 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$e19);
-          }
+          s7 = peg$parseBraceEnd();
           if (s7 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f34(s2, s3, s4, s5, s6);
+            s0 = peg$f36(s2, s3, s4, s5, s6);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -12496,16 +12517,10 @@ function peg$parse(input, options) {
           if (s5 !== peg$FAILED) {
             s6 = peg$parseCodeToBrace();
             if (s6 !== peg$FAILED) {
-              if (input.charCodeAt(peg$currPos) === 125) {
-                s7 = peg$c11;
-                peg$currPos++;
-              } else {
-                s7 = peg$FAILED;
-                if (peg$silentFails === 0) peg$fail(peg$e19);
-              }
+              s7 = peg$parseBraceEnd();
               if (s7 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f35(s2, s3, s4, s6);
+                s0 = peg$f37(s2, s3, s4, s6);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -12553,7 +12568,7 @@ function peg$parse(input, options) {
             } else s3 = peg$FAILED;
             if (s3 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f36();
+              s0 = peg$f38();
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -12575,12 +12590,12 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parseHere();
     peg$savedPos = peg$currPos;
-    s2 = peg$f37(s1);
+    s2 = peg$f39(s1);
     if (s2) s2 = void 0;
     else s2 = peg$FAILED;
     if (s2 !== peg$FAILED) {
       s3 = peg$currPos;
-      s4 = peg$f38(s1);
+      s4 = peg$f40(s1);
       s5 = peg$currPos;
       s6 = [];
       if (s6.length >= (s4 | 0)) s7 = peg$FAILED;
@@ -12611,7 +12626,43 @@ function peg$parse(input, options) {
       else s3 = s4;
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f39(s1, s3);
+        s0 = peg$f41(s1, s3);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    return s0;
+  }
+  function peg$parseOpenEnd() {
+    let s0, s1, s2, s3;
+    s0 = peg$currPos;
+    peg$savedPos = peg$currPos;
+    s1 = peg$f42();
+    if (s1) s1 = void 0;
+    else s1 = peg$FAILED;
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      if (input.length > peg$currPos) {
+        s3 = input.charAt(peg$currPos);
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) peg$fail(peg$e0);
+      }
+      peg$silentFails--;
+      if (s3 === peg$FAILED) s2 = void 0;
+      else {
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        s1 = [s1, s2];
+        s0 = s1;
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -12622,6 +12673,18 @@ function peg$parse(input, options) {
     }
     return s0;
   }
+  function peg$parseBraceEnd() {
+    let s0;
+    if (input.charCodeAt(peg$currPos) === 125) {
+      s0 = peg$c11;
+      peg$currPos++;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) peg$fail(peg$e19);
+    }
+    if (s0 === peg$FAILED) s0 = peg$parseOpenEnd();
+    return s0;
+  }
   function peg$parseMacroTag() {
     let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14;
     s0 = peg$currPos;
@@ -12650,12 +12713,12 @@ function peg$parse(input, options) {
           s7 = peg$parseHere();
           s8 = peg$currPos;
           peg$savedPos = peg$currPos;
-          s9 = peg$f40(s2, s3, s4, s5, s6, s7);
+          s9 = peg$f43(s2, s3, s4, s5, s6, s7);
           if (s9) s9 = void 0;
           else s9 = peg$FAILED;
           if (s9 !== peg$FAILED) {
             s10 = peg$currPos;
-            s11 = peg$f41(s2, s3, s4, s5, s6, s7);
+            s11 = peg$f44(s2, s3, s4, s5, s6, s7);
             s12 = peg$currPos;
             s13 = [];
             if (s13.length >= (s11 | 0)) s14 = peg$FAILED;
@@ -12685,16 +12748,10 @@ function peg$parse(input, options) {
             if (s11 !== peg$FAILED) s10 = input.substring(s10, peg$currPos);
             else s10 = s11;
             if (s10 !== peg$FAILED) {
-              if (input.charCodeAt(peg$currPos) === 125) {
-                s11 = peg$c11;
-                peg$currPos++;
-              } else {
-                s11 = peg$FAILED;
-                if (peg$silentFails === 0) peg$fail(peg$e19);
-              }
+              s11 = peg$parseBraceEnd();
               if (s11 !== peg$FAILED) {
                 peg$savedPos = s8;
-                s8 = peg$f42(s2, s3, s4, s5, s6, s7, s10);
+                s8 = peg$f45(s2, s3, s4, s5, s6, s7, s10);
               } else {
                 peg$currPos = s8;
                 s8 = peg$FAILED;
@@ -12709,7 +12766,7 @@ function peg$parse(input, options) {
           }
           if (s8 === peg$FAILED) s8 = null;
           peg$savedPos = s0;
-          s0 = peg$f43(s2, s3, s4, s5, s6, s7, s8);
+          s0 = peg$f46(s2, s3, s4, s5, s6, s7, s8);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -12743,7 +12800,7 @@ function peg$parse(input, options) {
           }
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f44(s2);
+            s0 = peg$f47(s2);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -12893,12 +12950,12 @@ function peg$parse(input, options) {
     else s1 = s2;
     if (s1 !== peg$FAILED) {
       peg$savedPos = peg$currPos;
-      s2 = peg$f45(s1);
+      s2 = peg$f48(s1);
       if (s2) s2 = void 0;
       else s2 = peg$FAILED;
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f46(s1);
+        s0 = peg$f49(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -13075,7 +13132,7 @@ function peg$parse(input, options) {
     else s1 = s2;
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f47(s1);
+      s1 = peg$f50(s1);
     }
     s0 = s1;
     return s0;
@@ -13116,9 +13173,10 @@ function peg$parse(input, options) {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) peg$fail(peg$e3);
         }
+        if (s7 === peg$FAILED) s7 = peg$parseOpenEnd();
         if (s7 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f48(s2, s3, s4, s6);
+          s0 = peg$f51(s2, s3, s4, s6);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -13183,7 +13241,7 @@ function peg$parse(input, options) {
             s5 = peg$parse_();
             s6 = peg$parseHere();
             peg$savedPos = s0;
-            s0 = peg$f49(s2, s6);
+            s0 = peg$f52(s2, s6);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -13223,7 +13281,7 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f50(s2, s3);
+          s0 = peg$f53(s2, s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -13358,7 +13416,7 @@ function peg$parse(input, options) {
     else s3 = s4;
     if (s3 !== peg$FAILED) {
       peg$savedPos = peg$currPos;
-      s4 = peg$f51(s2, s3);
+      s4 = peg$f54(s2, s3);
       if (s4) s4 = void 0;
       else s4 = peg$FAILED;
       if (s4 !== peg$FAILED) {
@@ -13376,7 +13434,7 @@ function peg$parse(input, options) {
           s9 = peg$parseAttrValue();
           if (s9 !== peg$FAILED) {
             peg$savedPos = s5;
-            s5 = peg$f52(s2, s3, s9);
+            s5 = peg$f55(s2, s3, s9);
           } else {
             peg$currPos = s5;
             s5 = peg$FAILED;
@@ -13387,7 +13445,7 @@ function peg$parse(input, options) {
         }
         if (s5 === peg$FAILED) s5 = null;
         peg$savedPos = s0;
-        s0 = peg$f53(s2, s3, s5);
+        s0 = peg$f56(s2, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -13442,9 +13500,10 @@ function peg$parse(input, options) {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) peg$fail(peg$e35);
       }
+      if (s5 === peg$FAILED) s5 = peg$parseOpenEnd();
       if (s5 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f54(s2, s3, s4);
+        s0 = peg$f57(s2, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -13496,9 +13555,10 @@ function peg$parse(input, options) {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) peg$fail(peg$e37);
         }
+        if (s5 === peg$FAILED) s5 = peg$parseOpenEnd();
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f55(s2, s3, s4);
+          s0 = peg$f58(s2, s3, s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -13517,7 +13577,7 @@ function peg$parse(input, options) {
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f56(s1);
+          s1 = peg$f59(s1);
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
@@ -13543,7 +13603,7 @@ function peg$parse(input, options) {
           s2 = input.substring(s2, peg$currPos);
           s3 = peg$parseHere();
           peg$savedPos = s0;
-          s0 = peg$f57(s1, s2, s3);
+          s0 = peg$f60(s1, s2, s3);
         }
       }
     }
@@ -13553,7 +13613,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$f58();
+    s1 = peg$f61();
     if (s1) s1 = void 0;
     else s1 = peg$FAILED;
     if (s1 !== peg$FAILED) {
@@ -13582,7 +13642,7 @@ function peg$parse(input, options) {
       if (s2 !== peg$FAILED) {
         s3 = peg$currPos;
         peg$savedPos = peg$currPos;
-        s4 = peg$f59(s2);
+        s4 = peg$f62(s2);
         if (s4) s4 = void 0;
         else s4 = peg$FAILED;
         if (s4 !== peg$FAILED) {
@@ -13621,7 +13681,7 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       peg$savedPos = peg$currPos;
-      s1 = peg$f60();
+      s1 = peg$f63();
       if (s1) s1 = void 0;
       else s1 = peg$FAILED;
       if (s1 !== peg$FAILED) {
@@ -13648,12 +13708,12 @@ function peg$parse(input, options) {
             if (s6 !== peg$FAILED) {
               s7 = peg$parseHere();
               peg$savedPos = peg$currPos;
-              s8 = peg$f61(s4, s7);
+              s8 = peg$f64(s4, s7);
               if (s8) s8 = void 0;
               else s8 = peg$FAILED;
               if (s8 !== peg$FAILED) {
                 s9 = peg$currPos;
-                s10 = peg$f62(s4, s7);
+                s10 = peg$f65(s4, s7);
                 s11 = peg$currPos;
                 s12 = [];
                 if (s12.length >= (s10 | 0)) s13 = peg$FAILED;
@@ -13683,13 +13743,7 @@ function peg$parse(input, options) {
                 if (s10 !== peg$FAILED) s9 = input.substring(s9, peg$currPos);
                 else s9 = s10;
                 if (s9 !== peg$FAILED) {
-                  if (input.charCodeAt(peg$currPos) === 125) {
-                    s10 = peg$c11;
-                    peg$currPos++;
-                  } else {
-                    s10 = peg$FAILED;
-                    if (peg$silentFails === 0) peg$fail(peg$e19);
-                  }
+                  s10 = peg$parseBraceEnd();
                   if (s10 !== peg$FAILED) {
                     s1 = [
                       s1,
@@ -13735,7 +13789,7 @@ function peg$parse(input, options) {
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
         peg$savedPos = peg$currPos;
-        s1 = peg$f63();
+        s1 = peg$f66();
         if (s1) s1 = void 0;
         else s1 = peg$FAILED;
         if (s1 !== peg$FAILED) {
@@ -13782,13 +13836,7 @@ function peg$parse(input, options) {
               if (s4 !== peg$FAILED) {
                 s5 = peg$parseCodeToBrace();
                 if (s5 !== peg$FAILED) {
-                  if (input.charCodeAt(peg$currPos) === 125) {
-                    s6 = peg$c11;
-                    peg$currPos++;
-                  } else {
-                    s6 = peg$FAILED;
-                    if (peg$silentFails === 0) peg$fail(peg$e19);
-                  }
+                  s6 = peg$parseBraceEnd();
                   if (s6 !== peg$FAILED) {
                     s1 = [
                       s1,
@@ -13826,7 +13874,7 @@ function peg$parse(input, options) {
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           peg$savedPos = peg$currPos;
-          s1 = peg$f64();
+          s1 = peg$f67();
           if (s1) s1 = void 0;
           else s1 = peg$FAILED;
           if (s1 !== peg$FAILED) {
@@ -13854,13 +13902,7 @@ function peg$parse(input, options) {
               if (s3 !== peg$FAILED) {
                 s4 = peg$parseCodeToBrace();
                 if (s4 !== peg$FAILED) {
-                  if (input.charCodeAt(peg$currPos) === 125) {
-                    s5 = peg$c11;
-                    peg$currPos++;
-                  } else {
-                    s5 = peg$FAILED;
-                    if (peg$silentFails === 0) peg$fail(peg$e19);
-                  }
+                  s5 = peg$parseBraceEnd();
                   if (s5 !== peg$FAILED) {
                     s1 = [
                       s1,
@@ -13916,6 +13958,7 @@ function peg$parse(input, options) {
     return s0;
   }
   const textMode = options.text === true;
+  const completionMode = options.completion === true;
   const hooks = options.hooks;
   let skipEnd = -1;
   let attrCode = false;
@@ -13986,8 +14029,8 @@ function peg$parse(input, options) {
   if (peg$success) return peg$result;
   else peg$throw();
 }
-function isRawMacro(name) {
-  return RAW_BODY_MACROS.has(name);
+function isRawMacro(name, widget = WIDGETS.has(name)) {
+  return RAW_BODY_MACROS.has(name.toLowerCase()) && !widget;
 }
 function isBlockMacro(name) {
   return BLOCK_MACROS.has(name) || DEFINED_BLOCK_MACROS.has(name) || BLOCK_WIDGETS.has(name);
@@ -14041,7 +14084,8 @@ function astNode({ token, body }) {
       };
       if (!body) return withSelectors$1(node, token);
       const children = buildAst(body.children);
-      if (!BRANCHING.has(name) && body.branches.length === 0) {
+      const branching = BRANCHING.has(name) && !WIDGETS.has(name);
+      if (!branching && body.branches.length === 0) {
         node.children = children;
         return withSelectors$1(node, token);
       }
@@ -14049,12 +14093,36 @@ function astNode({ token, body }) {
         rawArgs: tag.rawArgs,
         children: branchChildren
       }, tag);
-      if (!BRANCHING.has(name)) node.children = children;
-      node.branches = [...BRANCHING.has(name) ? [branch(token, children)] : [], ...body.branches.map(({ tag, children: c }) => branch(tag, buildAst(c)))];
-      return BRANCHING.has(name) ? node : withSelectors$1(node, token);
+      if (!branching) node.children = children;
+      node.branches = [...branching ? [branch(token, children)] : [], ...body.branches.map(({ tag, children: c }) => branch(tag, buildAst(c)))];
+      return branching ? node : withSelectors$1(node, token);
     }
   }
 }
+function checkParameterTypes(macro, parameters) {
+  const holdsFix = `Give a \`string\` or \`text\` parameter one of ${STRING_HOLDS.join(", ")} to hold (see docs/custom-macros.md#what-a-string-holds).`;
+  for (const param of parameters) {
+    const type = param.type;
+    if (!PARAMETER_TYPES.includes(type)) throw parameterError(macro, param, type === void 0 ? "has no type" : `has the unknown type ${JSON.stringify(type)}`, `Give it one of the types ${PARAMETER_TYPES.join(", ")} (see docs/custom-macros.md#parameter-types), or declare no parameters and read props.rawArgs.`);
+    const holds = param.holds;
+    if (holds !== void 0 && type !== "string" && type !== "text") throw parameterError(macro, param, `is of the type ${type}, which holds what it is`, holdsFix);
+    if (holds !== void 0 && !STRING_HOLDS.includes(holds)) throw parameterError(macro, param, `holds the unknown ${JSON.stringify(holds)}`, holdsFix);
+    if (param.parameters) checkParameterTypes(macro, param.parameters);
+  }
+}
+function parameterError(macro, param, problem, fix) {
+  return /* @__PURE__ */ new Error(`spindle: The parameter "${param.name}" of the macro {${macro}} ${problem}. ${fix}`);
+}
+function branchParents(name, macros) {
+  if (!macros) return [...companionParents.get(name) ?? []].filter((parent) => parent !== "listbox");
+  return macros.filter((macro) => macro.name.toLowerCase() !== "listbox" && macro.subMacros.some((sub) => sub.toLowerCase() === name.toLowerCase())).map((macro) => macro.name.toLowerCase());
+}
+function getMacroParameters(name) {
+  return metadataRegistry.get(name)?.parameters;
+}
+function getMacroRegistry() {
+  return Array.from(metadataRegistry.values());
+}
 function lineColumn(text3, offset2) {
   let line = 1;
   let lineStart = 0;
@@ -14068,6 +14136,24 @@ function lineColumn(text3, offset2) {
     column: offset2 - lineStart + 1
   };
 }
+function sourcePositions(text3) {
+  const starts = [0];
+  for (let i2 = 0; i2 < text3.length; i2++) if (text3[i2] === "\n") starts.push(i2 + 1);
+  return (offset2) => {
+    let low = 0;
+    let high = starts.length;
+    while (low < high) {
+      const mid = low + high >>> 1;
+      if (starts[mid] <= offset2) low = mid + 1;
+      else high = mid;
+    }
+    const line = Math.max(1, low);
+    return {
+      line,
+      column: offset2 - starts[line - 1] + 1
+    };
+  };
+}
 function tagLabel(tag) {
   return tag.type === "html" ? `${tag.isClose ? "</" : "<"}${tag.tag}>` : `{${tag.isClose ? "/" : ""}${tag.name}}`;
 }
@@ -14081,9 +14167,11 @@ function pairMarkup(tokens2, options = {}) {
   };
   const errors = [];
   const noticedAtEnd = (tokens2[tokens2.length - 1]?.end ?? 0) + 1;
+  let position;
   const where2 = (offset2) => {
     if (options.source === void 0) return `offset ${offset2}`;
-    const { line, column } = lineColumn(options.source, offset2);
+    position ?? (position = sourcePositions(options.source));
+    const { line, column } = position(offset2);
     return `line ${line}, column ${column}`;
   };
   const report2 = (code, token, message, noticedAt, data2) => {
@@ -14107,10 +14195,16 @@ function pairMarkup(tokens2, options = {}) {
   };
   const root = [];
   const stack = [];
+  const openPositions = /* @__PURE__ */ new Map();
+  const tagKey = (tag) => `${tag.type}:${lowerName(tag)}`;
   const add = (node) => (last$1(stack)?.into ?? root).push(node);
   const end = (ending, close, owns = ending === "closed") => {
     const { node, body } = stack.pop();
     const open = node.token;
+    const key = tagKey(open);
+    const positions = openPositions.get(key);
+    positions.pop();
+    if (positions.length === 0) openPositions.delete(key);
     const noticedAt = close ? close.end : noticedAtEnd;
     for (const { tag } of body.branches) if (open.type !== "macro" || !parentsOf(tag.name).includes(lowerName(open))) misplaced(tag, open, noticedAt);
     if (ending === "unclosed") report2("unclosed-block", open, `Unclosed ${tagLabel(open)}: no ${closerOf(open)} closes it`, noticedAt, { name: nameOf(open) });
@@ -14129,8 +14223,7 @@ function pairMarkup(tokens2, options = {}) {
       if (!top) report2("stray-closer", token, `${tagLabel(token)} closes nothing: no ${token.type === "html" ? `<${token.tag}>` : `{${token.name}}`} is open here`, token.start, { name: nameOf(token) });
       else if (closes(top.node.token, token)) end("closed", token);
       else {
-        let outer = stack.length - 1;
-        while (outer >= 0 && !closes(stack[outer].node.token, token)) outer--;
+        const outer = last$1(openPositions.get(tagKey(token)) ?? []) ?? -1;
         end("mismatch", token, outer === -1);
         if (outer !== -1) {
           while (stack.length > outer + 1) end("cut", token);
@@ -14174,6 +14267,10 @@ function pairMarkup(tokens2, options = {}) {
       branches: []
     };
     node.body = body;
+    const key = tagKey(token);
+    const positions = openPositions.get(key) ?? [];
+    positions.push(stack.length);
+    openPositions.set(key, positions);
     stack.push({
       node,
       body,
@@ -15075,14 +15172,42 @@ function jsCodeEnd(onOpenEnd) {
     }
   };
 }
+function indexCodeEnds(input) {
+  const possible = /* @__PURE__ */ new Set();
+  const pending = [];
+  let remaining = 0;
+  let lastBrace = -1;
+  for (let i2 = 0; i2 < input.length; i2++) if (input[i2] === "}") {
+    remaining++;
+    lastBrace = i2;
+  }
+  const uncertain = () => {
+    for (let i2 = Math.max(0, pending.length - remaining); i2 < pending.length; i2++) possible.add(pending[i2]);
+    pending.length = 0;
+  };
+  for (let i2 = 0; i2 < input.length; i2++) {
+    const c = input[i2];
+    if (c === "{") pending.push(i2);
+    else if (c === "}") {
+      remaining--;
+      const open = pending.pop();
+      if (open !== void 0) possible.add(open);
+    } else if (/['"`/\\]/.test(c)) uncertain();
+  }
+  return (start) => {
+    if (start > lastBrace) return -1;
+    return possible.has(start - 1) ? defaultCodeEnd.closeBrace(input, start, start) : parsedCodeEnd(input, start, "expression");
+  };
+}
 function isCodeAttribute(name) {
   const lower = name.toLowerCase();
   return lower.startsWith("on") || lower === "pattern" || lower === "srcdoc";
 }
-function splitSigilTemplate(template) {
+function splitSigilTemplate(template, incomplete = false) {
   const parts = [];
   let text3 = "";
   let i2 = 0;
+  const closeBrace = indexCodeEnds(template);
   while (i2 < template.length) {
     const brace = template.indexOf("{", i2);
     if (brace === -1) {
@@ -15091,7 +15216,8 @@ function splitSigilTemplate(template) {
     }
     text3 += template.slice(i2, brace);
     i2 = brace + 1;
-    const end = isSigil(template[i2]) ? defaultCodeEnd.closeBrace(template, i2, i2) : -1;
+    let end = isSigil(template[i2]) ? closeBrace(i2) : -1;
+    if (end === -1 && incomplete && isSigil(template[i2])) end = template.length;
     if (end === -1) {
       text3 += "{";
       continue;
@@ -15099,13 +15225,13 @@ function splitSigilTemplate(template) {
     if (text3) parts.push({ text: text3 });
     text3 = "";
     const block = template.slice(i2, end);
-    parts.push(/^.\w/.test(block) ? { expr: block } : { verbatim: `{${block}}` });
+    parts.push(/^.\w/.test(block) || incomplete && block.length === 1 && end === template.length ? { expr: block } : { verbatim: `{${block}}` });
     i2 = end + 1;
   }
   if (text3) parts.push({ text: text3 });
   return parts;
 }
-function run$1(source, startRule, options) {
+function run$1(source, startRule, options, completion = false) {
   const hooks = options.hooks ? {
     ...defaultHooks,
     ...options.hooks
@@ -15114,7 +15240,8 @@ function run$1(source, startRule, options) {
     return peg$parse(source, {
       startRule,
       text: options.text === true,
-      hooks
+      hooks,
+      completion
     });
   } catch (err) {
     const { location, code } = err;
@@ -15145,7 +15272,8 @@ function analyzeMarkup(source, options = {}) {
   };
   const inDamage = (start) => errors.some((e, i2) => start >= damage[i2] && start <= e.offset);
   const noticed = errors.map((e, i2) => [damage[i2] + 0.5, e]);
-  for (const error48 of paired.errors) if (!inDamage(error48.start)) noticed.push([error48.noticedAt, pairingError(source, error48)]);
+  const position = paired.errors.length ? sourcePositions(source) : void 0;
+  for (const error48 of paired.errors) if (!inDamage(error48.start)) noticed.push([error48.noticedAt, pairingError(position, error48)]);
   noticed.sort((a, b) => a[0] - b[0]);
   return {
     tokens: tokens2,
@@ -15158,8 +15286,8 @@ function parseMarkup(source, options = {}) {
   if (errors.length > 0) throw errors[0];
   return buildAst(nodes);
 }
-function pairingError(source, error48) {
-  const { line, column } = lineColumn(source, error48.start);
+function pairingError(position, error48) {
+  const { line, column } = position(error48.start);
   return new MarkupError(error48.message, error48.start, line, column, error48.code, error48.end, error48.data);
 }
 function tokenizeMarkup(source, options = {}) {
@@ -15179,10 +15307,11 @@ function tokenizeMarkupTolerant(source, options = {}) {
     errors
   };
 }
-function scanMarkupTolerant(source, options = {}) {
+function scanMarkupTolerant(source, options = {}, completion = false) {
   const tokens2 = [];
   const errors = [];
   const damage = [];
+  let position;
   const lastBrace = source.lastIndexOf("}");
   const { closeBrace } = {
     ...defaultHooks,
@@ -15194,10 +15323,10 @@ function scanMarkupTolerant(source, options = {}) {
       closeBrace: (input, codeStart, lenientStart) => base2 + Math.min(codeStart, lenientStart) > lastBrace ? -1 : closeBrace(input, codeStart, lenientStart)
     };
     try {
-      return tokenizeMarkup(text3, {
+      return run$1(text3, "Tokens", {
         ...options,
         hooks
-      }).map((token) => shiftOffsets(token, base2));
+      }, completion).map((token) => shiftOffsets(token, base2));
     } catch (error48) {
       if (!(error48 instanceof MarkupError)) throw error48;
       return error48;
@@ -15212,7 +15341,8 @@ function scanMarkupTolerant(source, options = {}) {
       break;
     }
     const at3 = base + result2.offset;
-    const { line, column } = lineColumn(source, at3);
+    position ?? (position = sourcePositions(source));
+    const { line, column } = position(at3);
     errors.push(new MarkupError(result2.reason, at3, line, column, result2.code, base + result2.end));
     let cut = result2.offset;
     let prefix = attempt(rest.slice(0, cut), base);
@@ -15239,6 +15369,9 @@ function scanMarkupTolerant(source, options = {}) {
     damage
   };
 }
+function completionTokens(source, options = {}) {
+  return scanMarkupTolerant(source, options, true).tokens;
+}
 function mapOffsets(token, map2) {
   const moved = { ...token };
   for (const [key, value] of Object.entries(moved)) if (typeof value === "number" && OFFSET_FIELD.test(key)) moved[key] = map2(value);
@@ -15588,6 +15721,27 @@ function passageTarget(arg) {
     name
   };
 }
+function macroArgumentSpans(rawArgs, parameters) {
+  const spans = /* @__PURE__ */ new Map();
+  parseMacroArgs(rawArgs, parameters, void 0, spans);
+  const result2 = [];
+  const add = (params, path2) => {
+    params.forEach((parameter, index) => {
+      const parameterPath = [...path2, index];
+      const span = spans.get(parameter);
+      if (span) result2.push({
+        parameter,
+        parameterIndex: parameterPath[0],
+        parameterPath,
+        start: span[0],
+        end: span[1]
+      });
+      if (parameter.parameters) add(parameter.parameters, parameterPath);
+    });
+  };
+  add(parameters, []);
+  return result2.sort((a, b) => a.start - b.start || b.end - a.end);
+}
 function subMacroParameters(name) {
   return SUB_MACRO_PARAMETERS.get(name.toLowerCase());
 }
@@ -15640,6 +15794,9 @@ function widgetParameters(params, holds = {}) {
     ...hasOwn(holds, name) ? { holds: holds[name] } : {}
   }));
 }
+function executesRawBody(name, parametersOf2) {
+  return isRawMacro(name, parametersOf2.widget?.(name) !== void 0) && parametersOf2.source?.(name) !== "user";
+}
 function withHolds(params, holds) {
   return params.map((param) => {
     if (param.parameters) return {
@@ -15655,12 +15812,14 @@ function withHolds(params, holds) {
 function parameterLookup(macros) {
   const parameters = new NameMap();
   const widgets = new NameMap();
-  for (const { name, parameters: params, interpolate, widget } of macros) {
+  const sources = new NameMap();
+  for (const { name, parameters: params, interpolate, widget, source } of macros) {
+    sources.set(name, source ?? "user");
     if (params) parameters.set(name, withHolds(params, holdsByDefault(interpolate)));
-    const declared = widget && widgetParameters(widget.params, widget.holds);
-    if (declared) widgets.set(name, declared);
+    if (widget) widgets.set(name, widgetParameters(widget.params, widget.holds) ?? []);
   }
   const lookup = (name) => {
+    if (widgets.has(name)) return void 0;
     let params = parameters.get(name);
     if (!params) {
       const sub = subMacroParameters(name);
@@ -15669,6 +15828,7 @@ function parameterLookup(macros) {
     return params;
   };
   if (widgets.size > 0) lookup.widget = (name) => widgets.get(name);
+  lookup.source = (name) => sources.get(name);
   return lookup;
 }
 function codeGoal(param) {
@@ -15722,7 +15882,8 @@ function* codeAndText(src, tokens2, parametersOf2) {
     }
     else if (token.type === "macro" && !token.isClose) {
       const name = token.name.toLowerCase();
-      if (name === "do") {
+      const widget = parametersOf2.widget?.(name);
+      if (executesRawBody(name, parametersOf2)) {
         const close = closeOfTextBody(t, name);
         if (close < 0) continue;
         yield {
@@ -15736,7 +15897,7 @@ function* codeAndText(src, tokens2, parametersOf2) {
         continue;
       }
       const args2 = token.rawArgs;
-      if (PASSAGE_BODIES.has(name)) {
+      if (PASSAGE_BODIES.has(name) && !widget) {
         const close = closeOfTextBody(t, name);
         if (close > t + 1) {
           const text3 = src.slice(token.end, tokens2[close].start);
@@ -15754,7 +15915,7 @@ function* codeAndText(src, tokens2, parametersOf2) {
       if (!args2) continue;
       const label2 = `{${token.name} ${args2}}`;
       const argsAt = token.argsStart;
-      if (CONDITION_MACROS.has(name)) {
+      if (CONDITION_MACROS.has(name) && !widget) {
         yield {
           kind: "code",
           code: args2,
@@ -15766,15 +15927,16 @@ function* codeAndText(src, tokens2, parametersOf2) {
       }
       const params = parametersOf2(name);
       if (params) yield* argPieces(args2, argsAt, params, token.name, label2);
-      const widget = parametersOf2.widget?.(name);
       if (widget) yield* widgetPieces(args2, argsAt, widget, token.name, label2);
     }
   }
 }
 function* passagePiecesOf(src, tokens2, parametersOf2, options = {}) {
-  yield* expand(src, src, tokens2, parametersOf2, options, (i2) => i2, void 0);
+  let position;
+  const locate2 = (offset2) => (position ?? (position = sourcePositions(src)))(offset2);
+  yield* expand(src, src, tokens2, parametersOf2, options, (i2) => i2, void 0, locate2);
 }
-function* expand(root, src, tokens2, parametersOf2, options, toRoot, where2) {
+function* expand(root, src, tokens2, parametersOf2, options, toRoot, where2, locate2) {
   for (const flat of codeAndText(src, tokens2, parametersOf2)) {
     const piece = where2 ? nestedPiece(flat, toRoot, where2) : flat;
     if (flat.kind !== "text" || !flat.text.includes("{")) {
@@ -15784,17 +15946,20 @@ function* expand(root, src, tokens2, parametersOf2, options, toRoot, where2) {
     const toText = (i2) => toRoot(pieceOffset(flat, i2));
     const inner = analyzeMarkup(flat.text, {
       text: true,
-      hooks: options.isBlock && { isBlock: options.isBlock }
+      hooks: {
+        ...options.isBlock && { isBlock: options.isBlock },
+        isRaw: (name) => isRawMacro(name, parametersOf2.widget?.(name) !== void 0)
+      }
     });
     yield {
       ...piece,
       tokens: inner.tokens.map((t) => mapOffsets(t, toText)),
       errors: inner.errors.map((e) => {
-        const { line, column } = lineColumn(root, toText(e.offset));
+        const { line, column } = locate2(toText(e.offset));
         return new MarkupError(e.reason, toText(e.offset), line, column, e.code, toText(e.end), e.data);
       })
     };
-    yield* expand(root, flat.text, inner.tokens, parametersOf2, options, toText, flat.where);
+    yield* expand(root, flat.text, inner.tokens, parametersOf2, options, toText, flat.where, locate2);
   }
 }
 function nestedPiece(piece, toRoot, where2) {
@@ -16011,50 +16176,153 @@ function locate(text3, part, from) {
   const anywhere = text3.indexOf(part);
   return anywhere >= 0 ? anywhere : from;
 }
-function textContainsChildren(text3, parametersOf2) {
+function completionContext(source, cursor, macros = []) {
+  if (!Number.isInteger(cursor) || cursor < 0 || cursor > source.length) throw new RangeError("cursor must be a UTF-16 offset within source");
+  const parametersOf2 = parameterLookup(macros);
+  const codeContext = (code, goal, map2) => {
+    const probe = code.length + 1;
+    let executable = false;
+    lexJs(code + " __spindle_cursor__", {
+      code(_ch, at3) {
+        if (at3 >= probe) executable = true;
+      },
+      variable(_sigil, _name, at3) {
+        if (at3 >= probe) executable = true;
+      }
+    }, goal);
+    if (!executable) return LITERAL;
+    const offset2 = map2(0);
+    const offsets = Array.from({ length: code.length + 1 }, (_2, i2) => map2(i2));
+    return {
+      kind: "code",
+      code,
+      goal,
+      offset: offset2,
+      cursor: code.length,
+      ...offsets.some((at3, i2) => at3 !== offset2 + i2) ? { sourceOffsets: offsets } : {}
+    };
+  };
+  const read = (src, map2, text3 = false, depth = 0, sigilsOnly = false) => {
+    if (depth >= 64) return LITERAL;
+    if (sigilsOnly) {
+      let at3 = 0;
+      for (const part of splitSigilTemplate(src, true)) if ("expr" in part) {
+        if (at3 + 1 + part.expr.length === src.length) return codeContext(part.expr, "expression", (i2) => map2(at3 + 1 + i2));
+        at3 += part.expr.length + 2;
+      } else at3 += ("text" in part ? part.text : part.verbatim).length;
+      return LITERAL;
+    }
+    const tokens2 = completionTokens(src, {
+      text: text3,
+      hooks: { isRaw: (name) => isRawMacro(name, parametersOf2.widget?.(name) !== void 0) }
+    });
+    const token = tokens2[tokens2.length - 1];
+    if (!token || token.end !== src.length) return LITERAL;
+    const codeAt = (code, at3, goal = "expression") => codeContext(code, goal, (i2) => map2(at3 + i2));
+    const nested = (value, at3, offsets, onlySigils = false) => read(value, (i2) => map2(offsets?.[i2] ?? at3 + i2), true, depth + 1, onlySigils);
+    if (token.type === "variable" && token.nameEnd === src.length) return codeAt(src.slice(token.nameStart - 1), token.nameStart - 1);
+    if (token.type === "expression" && token.expressionEnd === src.length) return codeAt(token.expression, token.expressionStart);
+    if (token.type === "html") {
+      for (const { name, value, at: at3 } of attributeValues(src, token)) if (at3 + value.length === src.length) return nested(value, at3, void 0, isCodeAttribute(name));
+    } else if (token.type === "link" && token.displayEnd === src.length) return nested(token.display, token.displayStart);
+    else if (token.type === "text" && !token.comment) {
+      const opener = tokens2[tokens2.length - 2];
+      if (opener?.type === "macro" && !opener.isClose && executesRawBody(opener.name, parametersOf2)) return codeAt(token.value, token.start, "statements");
+    } else if (token.type === "macro" && !token.isClose && token.argsEnd === src.length) {
+      const name = token.name.toLowerCase();
+      const args2 = token.rawArgs;
+      const widget = parametersOf2.widget?.(name);
+      if (!widget && [
+        "if",
+        "elseif",
+        "case"
+      ].includes(name)) return codeAt(args2, token.argsStart);
+      const stringContext = (raw2, at4, holds, escapes = "quotes") => {
+        const quoted = readQuoted(raw2, 0, true);
+        if (!quoted) {
+          if (holds === "expression" || holds === "statements") return codeAt(raw2, at4, holds);
+          return holds === "markup" ? nested(raw2, at4) : LITERAL;
+        }
+        if (scanStringLiteral(raw2, 0).closed) return LITERAL;
+        const value = escapes === "javascript" ? stringLiteralValue(raw2 + raw2[0]) : quoted.value;
+        if (value == null) return LITERAL;
+        const offsets = escapeOffsets(raw2.slice(1), at4 + 1, value, escapes);
+        if (holds === "expression" || holds === "statements") return codeContext(value, holds, (i2) => map2(offsets?.[i2] ?? at4 + 1 + i2));
+        return holds === "markup" ? nested(value, at4 + 1, offsets) : LITERAL;
+      };
+      if (widget) {
+        const spans2 = splitArgSpans(args2);
+        const span2 = spans2[spans2.length - 1];
+        if (!span2) return LITERAL;
+        const raw2 = args2.slice(span2[0]);
+        const holds = widget[spans2.length - 1]?.holds;
+        return /^["']/.test(raw2) && holds ? stringContext(raw2, token.argsStart + span2[0], holds, "javascript") : codeAt(raw2, token.argsStart + span2[0]);
+      }
+      const params = parametersOf2(name);
+      if (!params) return LITERAL;
+      const spans = macroArgumentSpans(args2, params).filter((span2) => span2.parameter.type !== "options" && span2.end === args2.trimEnd().length);
+      const span = spans[spans.length - 1];
+      if (!span) return LITERAL;
+      const param = span.parameter;
+      let at3 = span.start;
+      if (span.parameterPath.length > 1) {
+        at3 += param.name.length;
+        while (/\s/.test(args2.charAt(at3))) at3++;
+      }
+      const raw = args2.slice(at3);
+      const offset2 = token.argsStart + at3;
+      if (param.type === "expression" || param.type === "passage") return codeAt(raw, offset2);
+      if (param.type === "statements") return codeAt(raw, offset2, "statements");
+      if (param.type === "string" || param.type === "text") return stringContext(raw, offset2, param.holds);
+    }
+    return LITERAL;
+  };
+  return read(source.slice(0, cursor), (i2) => i2);
+}
+function textContainsChildren(text3, parametersOf2, hooks) {
   if (!text3.includes("{")) return false;
   let nodes;
   try {
-    nodes = parseMarkup(text3, { text: true });
+    nodes = parseMarkup(text3, {
+      text: true,
+      hooks
+    });
   } catch {
     return false;
   }
-  return astContainsChildren(nodes, parametersOf2);
+  return astContainsChildren(nodes, parametersOf2, hooks);
 }
-function tokenTextContainsChildren(token, parametersOf2 = registeredParameters, src = "") {
-  for (const piece of codeAndText(src, [token], parametersOf2)) if (piece.kind === "text" && textContainsChildren(piece.text, parametersOf2)) return true;
+function tokenTextContainsChildren(token, parametersOf2 = registeredParameters, src = "", hooks) {
+  for (const piece of codeAndText(src, [token], parametersOf2)) if (piece.kind === "text" && textContainsChildren(piece.text, parametersOf2, hooks)) return true;
   return false;
 }
-function astContainsChildren(nodes, parametersOf2 = registeredParameters) {
+function astContainsChildren(nodes, parametersOf2 = registeredParameters, hooks) {
   for (const node of nodes) {
     if (node.type === "variable" && node.scope === "local" && node.name === "children") return true;
-    if (node.type === "html") {
-      if (tokenTextContainsChildren({
-        isClose: false,
-        isSelfClose: false,
-        tagNameStart: 0,
-        tagNameEnd: 0,
-        attributeSpans: [],
-        ...node,
-        start: 0,
-        end: 0
-      }, parametersOf2) || astContainsChildren(node.children, parametersOf2)) return true;
-    }
-    if (node.type === "macro") {
-      if (node.name.toLowerCase() === "widget") continue;
-      if (tokenTextContainsChildren({
-        isClose: false,
-        nameStart: 0,
-        nameEnd: 0,
-        argsStart: 0,
-        argsEnd: 0,
-        ...node,
-        start: 0,
-        end: 0
-      }, parametersOf2) || astContainsChildren(node.children, parametersOf2)) return true;
-      if (node.branches) {
-        for (const branch of node.branches) if (astContainsChildren(branch.children, parametersOf2)) return true;
-      }
+    if (node.type !== "html" && node.type !== "macro") continue;
+    if (node.type === "macro" && node.name.toLowerCase() === "widget") continue;
+    const span = {
+      isClose: false,
+      start: 0,
+      end: 0
+    };
+    if (tokenTextContainsChildren(node.type === "html" ? {
+      ...node,
+      ...span,
+      isSelfClose: false,
+      tagNameStart: 0,
+      tagNameEnd: 0,
+      attributeSpans: []
+    } : {
+      ...node,
+      ...span,
+      nameStart: 0,
+      nameEnd: 0,
+      argsStart: 0,
+      argsEnd: 0
+    }, parametersOf2, "", hooks) || astContainsChildren(node.children, parametersOf2, hooks)) return true;
+    if (node.type === "macro" && node.branches) {
+      for (const branch of node.branches) if (astContainsChildren(branch.children, parametersOf2, hooks)) return true;
     }
   }
   return false;
@@ -16092,43 +16360,49 @@ function nameSpan(rawArgs) {
   return (quote === '"' || quote === "'") && end - start >= 2 ? [start + 1, rawArgs[end - 1] === quote ? end - 1 : end] : [start, end];
 }
 function widgetDefinitions$1(passages, parametersOf2 = registeredParameters) {
-  const found = [];
-  for (const passage of passages) {
-    if (passage.name !== "StoryInit" && !passage.tags?.includes("widget")) continue;
-    const open = [];
-    const done = [];
-    for (const token of tokenizeMarkupTolerant(passage.content).tokens) if (token.type === "macro" && token.name.toLowerCase() === "widget") {
-      if (!token.isClose) open.push({
-        token,
-        isBlock: false
-      });
-      else {
-        const def = open.pop();
-        if (def) done.push({
-          ...def,
-          closeStart: token.start
+  const list3 = [...passages];
+  const scan = (replacesDo) => {
+    const found = [];
+    const hooks = { isRaw: (name) => isRawMacro(name, replacesDo || parametersOf2.widget?.(name) !== void 0) };
+    for (const passage of list3) {
+      if (passage.name !== "StoryInit" && !passage.tags?.includes("widget")) continue;
+      const open = [];
+      const done = [];
+      for (const token of tokenizeMarkupTolerant(passage.content, { hooks }).tokens) if (token.type === "macro" && token.name.toLowerCase() === "widget") {
+        if (!token.isClose) open.push({
+          token,
+          isBlock: false
         });
+        else {
+          const def = open.pop();
+          if (def) done.push({
+            ...def,
+            closeStart: token.start
+          });
+        }
+      } else if (open.length > 0 && (token.type === "variable" && token.scope === "local" && token.name === "children" || tokenTextContainsChildren(token, parametersOf2, passage.content, hooks))) open[open.length - 1].isBlock = true;
+      done.push(...open);
+      const defs = [];
+      for (const { token, isBlock, closeStart } of done) try {
+        const [from, to] = nameSpan(token.rawArgs);
+        defs.push({
+          ...parseWidgetDef(token.rawArgs),
+          block: isBlock,
+          passage: passage.name,
+          start: token.start,
+          end: token.end,
+          nameStart: token.argsStart + from,
+          nameEnd: token.argsStart + to,
+          ...closeStart === void 0 ? {} : { closeStart }
+        });
+      } catch {
       }
-    } else if (open.length > 0 && (token.type === "variable" && token.scope === "local" && token.name === "children" || tokenTextContainsChildren(token, parametersOf2, passage.content))) open[open.length - 1].isBlock = true;
-    done.push(...open);
-    const defs = [];
-    for (const { token, isBlock, closeStart } of done) try {
-      const [from, to] = nameSpan(token.rawArgs);
-      defs.push({
-        ...parseWidgetDef(token.rawArgs),
-        block: isBlock,
-        passage: passage.name,
-        start: token.start,
-        end: token.end,
-        nameStart: token.argsStart + from,
-        nameEnd: token.argsStart + to,
-        ...closeStart === void 0 ? {} : { closeStart }
-      });
-    } catch {
+      found.push(...defs.sort((a, b) => a.start - b.start));
     }
-    found.push(...defs.sort((a, b) => a.start - b.start));
-  }
-  return found;
+    return found;
+  };
+  const initial = scan(false);
+  return effectiveWidgetDefinitions(initial).some((def) => def.name.toLowerCase() === "do") ? scan(true) : initial;
 }
 function effectiveWidgetDefinitions(definitions) {
   const inInit = (def) => def.passage === "StoryInit";
@@ -16146,14 +16420,23 @@ function distance(a, b) {
   return prev[b.length];
 }
 function closestName(name, names) {
+  if (name.length > 256) return void 0;
   const lower = name.toLowerCase();
   let best;
   let bestDistance = Math.max(2, Math.floor(lower.length / 3)) + 1;
+  let budget = 1e5;
+  let candidates = 1e3;
   for (const candidate of names) {
+    if (--candidates < 0) break;
+    if (candidate.length > 256) continue;
+    if (Math.abs(candidate.length - lower.length) >= bestDistance) continue;
+    budget -= lower.length * candidate.length;
+    if (budget < 0) break;
     const d = distance(lower, candidate.toLowerCase());
     if (d < bestDistance) {
       best = candidate;
       bestDistance = d;
+      if (d === 0) break;
     }
   }
   return best;
@@ -16167,12 +16450,19 @@ function widgetName(rawArgs) {
 }
 function validateMarkup(passages, options) {
   const diagnostics = [];
+  const positions = /* @__PURE__ */ new Map();
   const hooks = {
     ...options.isBlockMacro && { isBlock: options.isBlockMacro },
-    ...options.branchParents && { branchParents: options.branchParents }
+    ...options.branchParents && { branchParents: options.branchParents },
+    isRaw: (name) => isRawMacro(name, options.parametersOf ? options.parametersOf.widget?.(name) !== void 0 : void 0)
   };
   const report2 = (passage, start, end, code, message, data2) => {
-    const { line, column } = lineColumn(passage.content, start);
+    let position = positions.get(passage);
+    if (!position) {
+      position = sourcePositions(passage.content);
+      positions.set(passage, position);
+    }
+    const { line, column } = position(start);
     const d = {
       passage: passage.name,
       line,
@@ -16217,7 +16507,7 @@ function validateMarkup(passages, options) {
       continue;
     }
     try {
-      const tokens2 = tokenizeMarkup(passage.content);
+      const tokens2 = tokenizeMarkup(passage.content, { hooks });
       addWidgets(tokens2);
       if (!reported) continue;
       parseMarkup(passage.content, { hooks });
@@ -16319,10 +16609,14 @@ function bigintValue(digits) {
     return;
   }
 }
-function tokensOf(text3, textMode, { tolerant } = {}) {
-  if (tolerant) return tokenizeMarkupTolerant(text3, { text: textMode }).tokens;
+function tokensOf(text3, textMode, { tolerant, parametersOf: parametersOf2 } = {}) {
+  const options = {
+    text: textMode,
+    hooks: parametersOf2 && { isRaw: (name) => isRawMacro(name, parametersOf2.widget?.(name) !== void 0) }
+  };
+  if (tolerant) return tokenizeMarkupTolerant(text3, options).tokens;
   try {
-    return tokenizeMarkup(text3, { text: textMode });
+    return tokenizeMarkup(text3, options);
   } catch (err) {
     if (err instanceof MarkupError) return [];
     throw err;
@@ -16344,7 +16638,7 @@ function shapeSchema(shape) {
 function initializerSyntaxError(expr) {
   const prefix = "return (";
   try {
-    parse$1(prefix + expr + ")", {
+    parse$1(prefix + expr + "\n)", {
       ecmaVersion: "latest",
       allowReturnOutsideFunction: true
     });
@@ -16581,7 +16875,7 @@ function collectTokenRefs(content2, tokens2, at3, emit, options) {
     else if (token.type === "macro" && !token.isClose) {
       scanArgs(token, parametersOf2, at3, emit, options);
       scanSelectors(content2, token, at3, emit, options);
-      if (storeVarMacros.has(token.name.toLowerCase())) {
+      if (storeVarMacros.has(token.name.toLowerCase()) && !parametersOf2.widget?.(token.name)) {
         const lead = token.rawArgs.length - token.rawArgs.trimStart().length;
         const first = token.rawArgs.trim().split(/\s+/)[0] ?? "";
         const quoted = QUOTED_VAR_ARG_RE.exec(first);
@@ -16597,7 +16891,7 @@ function collectTokenRefs(content2, tokens2, at3, emit, options) {
           });
         } else if (!/^["'`]/.test(first)) scanCode(first, (i2) => at3(token.argsStart + lead + i2), emit);
       }
-      if (token.name.toLowerCase() === "do") {
+      if (executesRawBody(token.name, parametersOf2)) {
         let close = t + 1;
         while (close < tokens2.length) {
           const c = tokens2[close];
@@ -16710,6 +17004,7 @@ function macroOf(config2) {
 function discoverMacros(source) {
   const { code, regexes } = codeOnly(source);
   const found = [];
+  const configs = /* @__PURE__ */ new Map();
   let bindings;
   for (const call of code.matchAll(CALL_RE)) {
     let at3 = call.index + call[0].length;
@@ -16721,12 +17016,15 @@ function discoverMacros(source) {
       if (object3 === void 0) continue;
       at3 = object3;
     }
-    const reader = new ConfigReader(source, {
-      goal: "statements",
-      regexes
-    });
-    reader.i = at3;
-    const config2 = reader.datum();
+    if (!configs.has(at3)) {
+      const reader = new ConfigReader(source, {
+        goal: "statements",
+        regexes
+      });
+      reader.i = at3;
+      configs.set(at3, reader.datum());
+    }
+    const config2 = configs.get(at3);
     const macro = config2 && macroOf(config2);
     if (macro) found.push(macro);
   }
@@ -20596,18 +20894,8 @@ function markdownOptions(options) {
   };
 }
 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);
-  };
+  const position = sourcePositions(source);
+  return (offset2) => position(offset2).line - 1;
 }
 function markdownLines(source, isBlock, types3) {
   const found = /* @__PURE__ */ new Set();
@@ -20996,7 +21284,11 @@ function whitespaceSensitiveLines(source, 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)))) {
+      if (token.type === "html" && ([
+        "pre",
+        "textarea",
+        "svg"
+      ].includes(token.tag.toLowerCase()) || Object.entries(token.attributes).some(([name, value]) => name.toLowerCase() === "style" && /white-space\s*:/i.test(value)))) {
         const first = lineAt(node.start);
         const last2 = lineAt(node.end - 1);
         for (let line = first; line <= last2; line++) lines.add(line);
@@ -21233,7 +21525,9 @@ function blockLookup(macros) {
   return (name) => blocks.has(name.toLowerCase()) || isBlockMacro(name);
 }
 function passagePieces(source, macros = []) {
-  return passagePiecesOfTokens(source, macros, tokenizeMarkupTolerant(source).tokens);
+  const all = [...macros];
+  const parametersOf2 = parameterLookup(all);
+  return passagePiecesOfTokens(source, all, tokenizeMarkupTolerant(source, { hooks: { isRaw: (name) => isRawMacro(name, parametersOf2.widget?.(name) !== void 0) } }).tokens);
 }
 function passagePiecesOfTokens(source, macros, tokens2) {
   const all = [...macros];
@@ -21259,7 +21553,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, PLACEHOLDER_PATTERN, DEFAULT_DEDENTING, WHITESPACE_AS_WRITTEN, LIST_ITEM_REGEX, CODE_FENCE_REGEX, NO_WRAP, NOT_MARKUP_TAGS;
+var __defProp2, __exportAll, 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, NameMap, NameSet, BLOCK_MACROS, BLOCK_WIDGETS, WIDGETS, DEFINED_BLOCK_MACROS, RAW_BODY_MACROS, BRANCHING, quoteArg, PARAMETER_TYPES, STRING_HOLDS, metadataRegistry, companionParents, 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, LITERAL, 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;
@@ -21272,64 +21566,6 @@ var init_story_variables = __esm({
       if (!no_symbols) __defProp2(target, Symbol.toStringTag, { value: "Module" });
       return target;
     };
-    NameMap = class extends Map {
-      get(name) {
-        return super.get(name.toLowerCase());
-      }
-      set(name, value) {
-        return super.set(name.toLowerCase(), value);
-      }
-      has(name) {
-        return super.has(name.toLowerCase());
-      }
-      delete(name) {
-        return super.delete(name.toLowerCase());
-      }
-    };
-    NameSet = class {
-      constructor(names = []) {
-        this.names = new NameMap();
-        for (const name of names) this.add(name);
-      }
-      add(name) {
-        this.names.set(name, true);
-      }
-      has(name) {
-        return this.names.has(name);
-      }
-      delete(name) {
-        this.names.delete(name);
-      }
-      clear() {
-        this.names.clear();
-      }
-    };
-    new NameMap();
-    new NameMap();
-    new NameSet();
-    PARAMETER_TYPES = [
-      "expression",
-      "statements",
-      "passage",
-      "variable",
-      "string",
-      "text",
-      "names",
-      "delay",
-      "number",
-      "flag",
-      "separator",
-      "options"
-    ];
-    STRING_HOLDS = [
-      "markup",
-      "text",
-      "passage",
-      "expression",
-      "statements"
-    ];
-    metadataRegistry = new NameMap();
-    companionParents = new NameMap();
     SIGIL_SCOPES = {
       $: "variable",
       _: "temporary",
@@ -21464,6 +21700,38 @@ var init_story_variables = __esm({
         return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
       }
     };
+    NameMap = class extends Map {
+      get(name) {
+        return super.get(name.toLowerCase());
+      }
+      set(name, value) {
+        return super.set(name.toLowerCase(), value);
+      }
+      has(name) {
+        return super.has(name.toLowerCase());
+      }
+      delete(name) {
+        return super.delete(name.toLowerCase());
+      }
+    };
+    NameSet = class {
+      constructor(names = []) {
+        this.names = new NameMap();
+        for (const name of names) this.add(name);
+      }
+      add(name) {
+        this.names.set(name, true);
+      }
+      has(name) {
+        return this.names.has(name);
+      }
+      delete(name) {
+        this.names.delete(name);
+      }
+      clear() {
+        this.names.clear();
+      }
+    };
     BLOCK_MACROS = new NameSet([
       "if",
       "for",
@@ -21481,6 +21749,7 @@ var init_story_variables = __esm({
       "nobr"
     ]);
     BLOCK_WIDGETS = new NameSet();
+    WIDGETS = new NameSet();
     DEFINED_BLOCK_MACROS = new NameSet();
     RAW_BODY_MACROS = /* @__PURE__ */ new Set(["do"]);
     BRANCHING = /* @__PURE__ */ new Set([
@@ -21489,6 +21758,33 @@ var init_story_variables = __esm({
       "timed"
     ]);
     quoteArg = (value) => `"${value.replace(/[\\"]/g, "\\$&")}"`;
+    new NameMap();
+    new NameMap();
+    new NameSet();
+    PARAMETER_TYPES = [
+      "expression",
+      "statements",
+      "passage",
+      "variable",
+      "string",
+      "text",
+      "names",
+      "delay",
+      "number",
+      "flag",
+      "separator",
+      "options"
+    ];
+    STRING_HOLDS = [
+      "markup",
+      "text",
+      "passage",
+      "expression",
+      "statements"
+    ];
+    metadataRegistry = new NameMap();
+    companionParents = new NameMap();
+    getMacroParameters.source = (name) => metadataRegistry.get(name)?.source;
     last$1 = (items) => items[items.length - 1];
     BRANCH_PARENT = {
       elseif: "if",
@@ -26744,7 +27040,9 @@ var init_story_variables = __esm({
       tokens: [],
       errors: []
     });
+    LITERAL = { kind: "literal" };
     registeredParameters = (name) => parameterLookup(getMacroRegistry())(name);
+    registeredParameters.source = getMacroParameters.source;
     WIDGET_PARAMETERS = [{
       name: "name",
       type: "text",
@@ -27073,22 +27371,40 @@ var init_story_variables = __esm({
       }
       /** Skip an array literal (or any bracketed group) at the cursor. */
       skipBalanced() {
-        const { src } = this;
         const close = {
           "[": "]",
           "{": "}",
           "(": ")"
-        }[src.charAt(this.i)];
-        if (!close) return false;
+        }[this.src.charAt(this.i)];
+        return close ? this.skipNested(close) : false;
+      }
+      /** Skip groups and template interpolations with an explicit stack. */
+      skipNested(close) {
+        const { src } = this;
+        const stack = [close];
         this.i++;
-        while (this.i < src.length) {
-          if (src.charAt(this.i) === close) {
+        while (this.i < src.length && stack.length) {
+          const c = src.charAt(this.i);
+          const top = stack[stack.length - 1];
+          if (c === top) {
+            stack.pop();
             this.i++;
-            return true;
-          }
-          if (!this.skipOne()) return false;
+          } else if (top === "`") {
+            if (c === "\\") this.i += 2;
+            else if (c === "$" && src.charAt(this.i + 1) === "{") {
+              stack.push("}");
+              this.i += 2;
+            } else this.i++;
+          } else if (c === "`" || c === "[" || c === "{" || c === "(") {
+            stack.push(c === "`" ? "`" : {
+              "[": "]",
+              "{": "}",
+              "(": ")"
+            }[c]);
+            this.i++;
+          } else if (!this.skipOne()) return false;
         }
-        return false;
+        return stack.length === 0;
       }
       /** Skip one character, or one string, template, comment or group. */
       skipOne() {
@@ -27115,20 +27431,7 @@ var init_story_variables = __esm({
       }
       /** Skip a template literal, with the expressions in it. */
       skipTemplate() {
-        const { src } = this;
-        this.i++;
-        while (this.i < src.length) {
-          const c = src.charAt(this.i);
-          if (c === "\\") this.i += 2;
-          else if (c === "`") {
-            this.i++;
-            return true;
-          } else if (c === "$" && src.charAt(this.i + 1) === "{") {
-            this.i++;
-            if (!this.skipBalanced()) return false;
-          } else this.i++;
-        }
-        return false;
+        return this.skipNested("`");
       }
     };
     VAR_PATH_RE = /([$%])(\w+(?:\.\w+)*)/y;
@@ -27197,6 +27500,8 @@ var init_story_variables = __esm({
         this.byOpen = /* @__PURE__ */ new Map();
         this.byClose = /* @__PURE__ */ new Map();
         this.functions = /* @__PURE__ */ new Map();
+        this.functionStarts = /* @__PURE__ */ new Map();
+        this.facts = /* @__PURE__ */ new Map();
         this.top = {
           start: -1,
           end: Infinity
@@ -27212,6 +27517,18 @@ var init_story_variables = __esm({
       * (given another, or one of its `properties` set) where the use can follow.
       */
       objectOf(name, at3, properties) {
+        let names = this.facts.get(properties);
+        if (!names) this.facts.set(properties, names = /* @__PURE__ */ new Map());
+        let bindings = names.get(name);
+        if (!bindings) {
+          bindings = this.readBindings(name, properties);
+          names.set(name, bindings);
+        }
+        const found = this.innermostVisible(bindings, at3);
+        return found.length === 1 ? found[0].object : void 0;
+      }
+      /** Declaration and write facts are immutable for this source and property set. */
+      readBindings(name, properties) {
         const { code } = this;
         const escaped = name.replace(/\$/g, "\\$");
         const bindings = [];
@@ -27221,8 +27538,7 @@ var init_story_variables = __esm({
         }
         const declarations = bindings.filter((b) => !b.write);
         for (const b of bindings) if (b.write) b.scope = this.innermostVisible(declarations, b.at)[0]?.scope ?? this.top;
-        const found = this.innermostVisible(bindings, at3);
-        return found.length === 1 ? found[0].object : void 0;
+        return bindings;
       }
       /**
       * Of the `bindings` the use at `at` can see, those in the innermost scope:
@@ -27238,6 +27554,11 @@ var init_story_variables = __esm({
       readGroups() {
         const { code, groups } = this;
         const stack = [];
+        const active = {
+          "{": [],
+          "(": [],
+          "[": []
+        };
         for (let i2 = 0; i2 < code.length; i2++) {
           const c = code.charAt(i2);
           if (c === "{" || c === "(" || c === "[") {
@@ -27248,15 +27569,16 @@ var init_story_variables = __esm({
               parent: stack[stack.length - 1]
             };
             groups.push(group);
+            active[c].push(stack.length);
             stack.push(group);
             this.byOpen.set(i2, group);
           } else if (CLOSERS[c]) {
-            let k2 = stack.length - 1;
-            while (k2 >= 0 && stack[k2].kind !== CLOSERS[c]) k2--;
-            if (k2 >= 0) {
+            const positions = active[CLOSERS[c]];
+            const k2 = positions[positions.length - 1];
+            if (k2 !== void 0) {
               stack[k2].close = i2;
               this.byClose.set(i2, stack[k2]);
-              stack.length = k2;
+              while (stack.length > k2) active[stack.pop().kind].pop();
             }
           }
         }
@@ -27299,7 +27621,13 @@ var init_story_variables = __esm({
       }
       /** The start of the function that has `index` in its body, or -1. */
       functionStart(index) {
-        for (let g = this.innermost(index, "{"); g; g = g.parent) if (g.kind === "{" && this.isFunctionBody(g)) return g.open;
+        const known = this.functionStarts.get(index);
+        if (known !== void 0) return known;
+        for (let g = this.innermost(index, "{"); g; g = g.parent) if (g.kind === "{" && this.isFunctionBody(g)) {
+          this.functionStarts.set(index, g.open);
+          return g.open;
+        }
+        this.functionStarts.set(index, -1);
         return -1;
       }
       scopeOf(group) {
@@ -27613,6 +27941,7 @@ var init_story_variables = __esm({
       constructor(..._args) {
         super(..._args);
         this.failed = false;
+        this.depth = 0;
       }
       /** The static value of a member or element, whatever follows is skipped. */
       member() {
@@ -27680,22 +28009,31 @@ var init_story_variables = __esm({
       * after what it read. False if the text ends first, or cannot be read.
       */
       elements(close, read) {
-        this.i++;
-        for (; ; ) {
-          this.space();
-          const c = this.src.charAt(this.i);
-          if (c === close) {
-            this.i++;
-            return true;
-          }
-          if (c === ",") {
-            this.i++;
-            continue;
+        if (this.depth >= 64) {
+          if (!this.skipBalanced()) this.fail();
+          return false;
+        }
+        this.depth++;
+        try {
+          this.i++;
+          for (; ; ) {
+            this.space();
+            const c = this.src.charAt(this.i);
+            if (c === close) {
+              this.i++;
+              return true;
+            }
+            if (c === ",") {
+              this.i++;
+              continue;
+            }
+            if (this.failed || this.i >= this.src.length) return false;
+            const before = this.i;
+            read();
+            if (this.i === before) this.fail();
           }
-          if (this.failed || this.i >= this.src.length) return false;
-          const before = this.i;
-          read();
-          if (this.i === before) this.fail();
+        } finally {
+          this.depth--;
         }
       }
       array() {
@@ -30509,7 +30847,7 @@ var init_story_variables = __esm({
       "case",
       "default"
     ]);
-    WHITESPACE_AS_WRITTEN = /<(?:pre|textarea)[\s>]|white-space\s*:/i;
+    WHITESPACE_AS_WRITTEN = /<(?:pre|textarea|svg)[\s>]|white-space\s*:/i;
     LIST_ITEM_REGEX = /^(?:[-+*]|\d{1,9}[.)])(?:[ \t]|$)/;
     CODE_FENCE_REGEX = /^(?:`{3,}|~{3,})/;
     NO_WRAP = /* @__PURE__ */ new Set([
@@ -32338,6 +32676,7 @@ var init_macro_registry2 = __esm({
       toolingMacros() {
         return this.getAllMacros().map((m) => ({
           name: m.name,
+          source: m.source,
           block: m.block,
           subMacros: m.subMacros,
           storeVar: m.storeVar,
@@ -32547,6 +32886,10 @@ var init_passage_markup = __esm({
       get pieces() {
         return this.cachedPieces ??= this.isMarkup ? passagePieces(this.content, this.doc.context.macros) : [];
       }
+      /** Whether the cursor is executable, with decoded code mapped back to `content`. */
+      completionAt(offset2) {
+        return this.isMarkup ? completionContext(this.content, offset2, this.doc.context.macros) : { kind: "literal" };
+      }
       /** The declarations of a StoryVariables / StoryTransients passage. */
       get declarations() {
         return this.cachedDeclarations ??= parseDeclarations(this.content, this.passage.name === "StoryTransients" ? "%" : "$");
@@ -32964,6 +33307,10 @@ var init_widget_registry = __esm({
         const key = name.toLowerCase();
         return this.widgets.get(key) ?? this.incomplete.get(key);
       }
+      /** Only a registered, closed widget can override a runtime macro. */
+      getEffectiveWidget(name) {
+        return this.widgets.get(name.toLowerCase());
+      }
       /** Get the effective registered definitions, excluding incomplete editor declarations. */
       getAllWidgets() {
         return Array.from(this.widgets.values());
@@ -33043,6 +33390,20 @@ var init_markup_index = __esm({
   }
 });
+// src/core/workspace/story-data.ts
+import { createRequire as createCompilerRequire2 } from "node:module";
+function readStoryData(content2) {
+  const { StoryBuilder } = createCompilerRequire2(import.meta.url)("@rohal12/twee-ts");
+  const builder = new StoryBuilder();
+  builder.add({ name: "StoryData", tags: [], text: content2 }, []);
+  return builder.build().twine2;
+}
+var init_story_data = __esm({
+  "src/core/workspace/story-data.ts"() {
+    "use strict";
+  }
+});
 // 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 resolve4 } from "node:path";
@@ -33153,31 +33514,14 @@ function isSpindleFormatName(name) {
   return name.trim().toLowerCase() === "spindle";
 }
 function readStoryDataFormat(content2) {
-  let data2;
-  try {
-    data2 = JSON.parse(content2);
-  } catch {
-    return void 0;
-  }
-  if (typeof data2 !== "object" || data2 === null || Array.isArray(data2)) return void 0;
-  const format = data2.format;
-  if (typeof format !== "string") return void 0;
-  return format.trim() || void 0;
+  return readStoryData(content2).format.trim() || void 0;
 }
 function readStoryDataFormatVersion(content2) {
-  let data2;
-  try {
-    data2 = JSON.parse(content2);
-  } catch {
-    return void 0;
-  }
-  if (typeof data2 !== "object" || data2 === null || Array.isArray(data2)) return void 0;
-  const record2 = data2;
-  if (typeof record2.format === "string" && record2.format.trim() && !isSpindleFormatName(record2.format)) {
+  const metadata2 = readStoryData(content2);
+  if (metadata2.format.trim() && !isSpindleFormatName(metadata2.format)) {
     return void 0;
   }
-  const version2 = record2["format-version"];
-  return typeof version2 === "string" && version2.trim() ? version2.trim() : void 0;
+  return metadata2.formatVersion.trim() || void 0;
 }
 function resolveStoryFormat(declared) {
   let foreign;
@@ -33272,6 +33616,7 @@ var init_story_format = __esm({
     "use strict";
     init_document_store();
     init_passage_index();
+    init_story_data();
     init_macro_sources();
     init_spindle_version();
     UNDECLARED_STORY_FORMAT = { name: void 0, isSpindle: true };
@@ -33659,8 +34004,8 @@ var init_macro_supplements = __esm({
 // src/core/workspace/workspace-model.ts
 import { EventEmitter as EventEmitter2 } from "node:events";
-function storyInitMacros(content2) {
-  return passagePieces(content2, builtinMacros).flatMap((piece) => piece.kind === "code" && piece.goal === "statements" ? discoverMacros(piece.code) : []);
+function storyInitMacros(passage) {
+  return passage.pieces.flatMap((piece) => piece.kind === "code" && piece.goal === "statements" ? discoverMacros(piece.code) : []);
 }
 var WorkspaceModel;
 var init_workspace_model = __esm({
@@ -33787,11 +34132,15 @@ var init_workspace_model = __esm({
       /**
        * Whether `{name}` opens a container that needs a `{/name}` closing tag:
        * a block macro, or a block widget (one whose body renders `{@children}`).
-       * Like Spindle's set of block macros, either source makes a name a block.
+       * A same-name block macro retains its syntax when a widget owns the call.
        */
       isContainer(name) {
         return this.macros.isBlock(name) || (this.widgets.getWidget(name)?.block ?? false);
       }
+      /** Runtime macro metadata, after effective widgets have claimed their names. */
+      getEffectiveMacro(name) {
+        return this.widgets.getEffectiveWidget(name) ? void 0 : this.macros.getMacro(name);
+      }
       /**
        * Whether document `uri` declares any passage. A Twee document with no
        * `::` header holds no passage (the compiler ignores text outside one), so
@@ -33915,10 +34264,17 @@ var init_workspace_model = __esm({
             if (!isStoryInit && !isScript) continue;
             const content2 = this.markup.get(passage.uri)?.passages.find((p) => p.passage === passage)?.content ?? "";
             if (isScript) found.push(...discoverMacros(content2));
-            else init.push(...storyInitMacros(content2));
+            else init.push(passage);
           }
         }
-        this.macros.setDiscoveredMacros([...found, ...init]);
+        this.macros.setDiscoveredMacros(found);
+        if (init.length === 0) return;
+        this.rescanWidgets();
+        for (const passage of init) {
+          const markup = this.markup.get(passage.uri)?.passages.find((p) => p.passage === passage);
+          if (markup) found.push(...storyInitMacros(markup));
+        }
+        this.macros.setDiscoveredMacros(found);
       }
       /**
        * Cascade: rescan variables and widgets based on current passages.
@@ -33943,12 +34299,26 @@ var init_workspace_model = __esm({
         const transients = declarations("StoryTransients");
         if (transients) this.variables.parseStoryTransients(transients.content, transients.passage.headerEnd.end.line + 1, transients.doc.uri);
         else this.variables.clearStoryTransients();
-        const readDocuments = () => this.documents.getUris().flatMap((uri) => {
+        this.rescanWidgets();
+        const effective = new Set(this.passages.getEffectivePassages());
+        this.widgets.clearInvocations();
+        for (const doc of this.readDocuments()) {
+          const passages = doc.passages.filter((p) => effective.has(p.passage));
+          this.variables.scanDocument(doc.uri, doc.text, { passages });
+          this.widgets.recordInvocations(doc.uri, passages);
+        }
+      }
+      /** The story documents' markup; JavaScript/TypeScript sources hold no passages. */
+      readDocuments() {
+        return this.documents.getUris().flatMap((uri) => {
           const markup = isMacroSource(uri) ? void 0 : this.markup.get(uri);
           return markup ? [markup] : [];
         });
+      }
+      /** Refresh widget registration before executable analysis reads its metadata. */
+      rescanWidgets() {
         const markups = /* @__PURE__ */ new Map();
-        for (const doc of readDocuments()) for (const passage of doc.passages) markups.set(passage.passage, passage);
+        for (const doc of this.readDocuments()) for (const passage of doc.passages) markups.set(passage.passage, passage);
         const effective = new Set(this.passages.getEffectivePassages());
         this.widgets.scan(
           [...effective].flatMap((passage) => markups.get(passage) ?? []),
@@ -33956,17 +34326,11 @@ var init_workspace_model = __esm({
           [...markups].filter(([passage]) => !effective.has(passage)).map(([, markup]) => markup)
         );
         this.markup.invalidate();
-        this.widgets.clearInvocations();
-        for (const doc of readDocuments()) {
-          const passages = doc.passages.filter((p) => effective.has(p.passage));
-          this.variables.scanDocument(doc.uri, doc.text, { passages });
-          this.widgets.recordInvocations(doc.uri, passages);
-        }
       }
-      /** All runtime metadata, with real macros taking precedence over widgets. */
+      /** All runtime metadata, with effective widgets taking precedence over macros. */
       toolingMacros() {
-        const macros = this.macros.toolingMacros();
-        return [...macros, ...this.widgets.getAllWidgets().filter((widget) => !this.macros.getMacro(widget.name)).map((widget) => ({ name: widget.name, block: widget.block, subMacros: [], widget: widget.tooling }))];
+        const macros = this.macros.toolingMacros().filter((macro) => !this.widgets.getEffectiveWidget(macro.name));
+        return [...macros, ...this.widgets.getAllWidgets().map((widget) => ({ name: widget.name, block: widget.block || this.macros.isBlock(widget.name), subMacros: [], widget: widget.tooling }))];
       }
       /** Coalesce analysis and diagnostics across a burst of document changes. */
       scheduleModelReady() {
@@ -34377,7 +34741,7 @@ function storyReport(workspace) {
 function buildReport(documents, workspace) {
   const toolingMacros = documents[0]?.context.macros ?? workspace.macros.toolingMacros();
   const macros = toolingMacros.map((macro) => {
-    const storeVar = workspace.macros.getMacro(macro.name)?.storeVar;
+    const storeVar = workspace.getEffectiveMacro(macro.name)?.storeVar;
     return storeVar ? { ...macro, storeVar } : macro;
   });
   const markups = /* @__PURE__ */ new Map();
@@ -34388,7 +34752,7 @@ function buildReport(documents, workspace) {
   }
   const passages = workspace.passages.getEffectivePassages().filter(isRuntimePassage).flatMap((passage) => markups.get(passage) ?? []);
   const markup = /* @__PURE__ */ new Map();
-  const validationMacros = toolingMacros.map((macro) => workspace.macros.hasConfiguredParameters(macro.name) ? { ...macro, widget: void 0 } : macro);
+  const validationMacros = toolingMacros.map((macro) => workspace.macros.hasConfiguredParameters(macro.name) && !workspace.widgets.getEffectiveWidget(macro.name) ? { ...macro, widget: void 0 } : macro);
   const found = validateStoryMarkup(
     passages.map((passage, index) => ({
       name: passage.passage.name,
@@ -34589,7 +34953,7 @@ function structureDiagnostics(passage, workspace) {
 }
 function parentDiagnostics(passage, token, ancestors, workspace) {
   const name = token.name.toLowerCase();
-  const parents = workspace.macros.getMacro(name)?.parents;
+  const parents = workspace.getEffectiveMacro(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()));
@@ -34605,7 +34969,7 @@ function parentDiagnostics(passage, token, ancestors, workspace) {
   return [makeDiag(range2, DiagnosticCode.InvalidChildren, `Invalid: {${token.name}} can only be inside {${parentList}}`)];
 }
 function childDiagnostics(passage, node, token, workspace) {
-  const constraints = workspace.macros.getMacro(token.name)?.children;
+  const constraints = workspace.getEffectiveMacro(token.name)?.children;
   if (!constraints || constraints.length === 0 || !node.body?.close) return [];
   const direct = [...node.body.children];
   for (const branch of node.body.branches) direct.push({ token: branch.tag, start: branch.tag.start, end: branch.tag.end }, ...branch.children);
@@ -34613,7 +34977,7 @@ function childDiagnostics(passage, node, token, workspace) {
   for (const child of direct) {
     if (child.token.type !== "macro" || child.token.isClose) continue;
     const key = child.token.name.toLowerCase();
-    if (workspace.macros.getMacro(key)) counts[key] = (counts[key] ?? 0) + 1;
+    if (workspace.getEffectiveMacro(key)) counts[key] = (counts[key] ?? 0) + 1;
   }
   const diagnostics = [];
   const range2 = passage.range(token.start, token.end);
@@ -34696,11 +35060,11 @@ function statementEnd(code, from) {
 }
 function loopDiagnostics(passage, token, ancestors, workspace) {
   const macro = token.name.toLowerCase();
-  if (macro !== "computed" && macro !== "set" || !token.rawArgs || workspace.macros.getMacro(macro)?.source !== "builtin") return [];
+  if (macro !== "computed" && macro !== "set" || !token.rawArgs || workspace.getEffectiveMacro(macro)?.source !== "builtin") return [];
   let loop;
   for (let i2 = ancestors.length - 1; i2 >= 0; i2--) {
     const ancestor = ancestors[i2];
-    if (ancestor.element || workspace.macros.getMacro(ancestor.name)?.source !== "builtin") continue;
+    if (ancestor.element || workspace.getEffectiveMacro(ancestor.name)?.source !== "builtin") continue;
     if (DEFERRED_CONTAINERS.has(ancestor.name)) return [];
     if (ancestor.name === "for") {
       loop = ancestor;
@@ -34744,7 +35108,7 @@ function argumentDiagnostics(passage, workspace) {
   const passageNames = workspace.passages.getEffectivePassages().filter(isRuntimePassage).map((candidate) => candidate.name);
   for (const token of passage.isMarkup ? macroTokens(passage) : []) {
     if (token.type !== "macro" || token.isClose) continue;
-    const info = workspace.macros.getMacro(token.name);
+    const info = workspace.getEffectiveMacro(token.name);
     if (!info?.parameters || info.skipArgs || info.parameterDefs?.length) continue;
     if (SPINDLE_MACROS.has(token.name.toLowerCase()) && !workspace.macros.hasDiscoveredMacro(token.name)) continue;
     let params;
@@ -34779,7 +35143,7 @@ function widgetDiagnostics(passage, story, workspace) {
   const macros = [...macroTokens(passage)];
   for (const token of macros) {
     if (token.isClose) continue;
-    if (workspace.macros.getMacro(token.name)) continue;
+    if (workspace.getEffectiveMacro(token.name)) continue;
     const widget = story.widgets.get(token.name.toLowerCase());
     if (!widget) continue;
     const got = token.rawArgs ? splitArgs(token.rawArgs).length : 0;
@@ -79851,7 +80215,6 @@ function getCompletions(uri, position, triggerChar, workspace) {
   const cursor = markupAt(workspace, uri, position);
   if (!cursor?.passage.isMarkup) return [];
   const { passage, content: content2, at: at3 } = cursor;
-  const before = cursor.lineBefore;
   const editing = (items, start, end) => {
     const range2 = passage.range(start, end);
     return items.map((item) => ({ ...item, textEdit: { range: range2, newText: item.insertText ?? item.label } }));
@@ -79865,6 +80228,11 @@ function getCompletions(uri, position, triggerChar, workspace) {
   const target = cursor.linkTarget();
   if (target) return editing(getPassageNameCompletions(workspace), target.start, target.end);
   if (head && !head.typed.startsWith("_")) return typedEdit(getMacroCompletions(workspace), head.typed.length, /^[\w-]*/);
+  const context = passage.completionAt(at3);
+  if (context.kind !== "code") return [];
+  const before = context.code.slice(0, context.cursor);
+  const codeOffset = (index) => pieceOffset(context, index);
+  const variableEdit = (items, typed) => editing(items, codeOffset(context.cursor - typed), at3 + /^[\w$]*/.exec(content2.slice(at3))[0].length);
   const dotPath = /([$%])([\w$]+)\.([A-Za-z_$][\w$]*)?$/.exec(before);
   if (dotPath) {
     const sigil = dotPath[1];
@@ -79872,7 +80240,7 @@ function getCompletions(uri, position, triggerChar, workspace) {
     const end = at3 + /^[\w$]*/.exec(content2.slice(at3))[0].length;
     return getDotPathCompletions(sigil, dotPath[2], workspace).map((item) => {
       const identifier = /^[A-Za-z_$][\w$]*$/.test(item.label);
-      const start = at3 - typed - (identifier ? 0 : 1);
+      const start = codeOffset(context.cursor - typed - (identifier ? 0 : 1));
       return {
         ...item,
         textEdit: {
@@ -79884,19 +80252,19 @@ function getCompletions(uri, position, triggerChar, workspace) {
   }
   const storyVar = /\$([A-Za-z_$]?[\w$]*)$/.exec(before);
   if (storyVar) {
-    return typedEdit(getVariableCompletions("$", workspace), storyVar[1].length);
+    return variableEdit(getVariableCompletions("$", workspace), storyVar[1].length);
   }
   const tempVar = /_([A-Za-z_$]?[\w$]*)$/.exec(before);
   if (tempVar) {
-    return typedEdit(getDocumentVariableCompletions("_", cursor, workspace), tempVar[1].length);
+    return variableEdit(getDocumentVariableCompletions("_", cursor, workspace), tempVar[1].length);
   }
   const localVar = /@([A-Za-z_$]?[\w$]*)$/.exec(before);
   if (localVar) {
-    return typedEdit(getDocumentVariableCompletions("@", cursor, workspace), localVar[1].length);
+    return variableEdit(getDocumentVariableCompletions("@", cursor, workspace), localVar[1].length);
   }
   const transientVar = /%([A-Za-z_$]?[\w$]*)$/.exec(before);
   if (transientVar) {
-    return typedEdit(getVariableCompletions("%", workspace), transientVar[1].length);
+    return variableEdit(getVariableCompletions("%", workspace), transientVar[1].length);
   }
   return [];
 }
@@ -80035,7 +80403,7 @@ function getMacroHover(passage, at3, workspace) {
   for (const macro of macroTokens(passage)) {
     if (at3 < macro.nameStart || at3 > macro.nameEnd) continue;
     const range2 = passage.range(macro.nameStart, macro.nameEnd);
-    const info = workspace.macros.getMacro(macro.name);
+    const info = workspace.getEffectiveMacro(macro.name);
     if (info) {
       const parts = [];
       parts.push(`**${info.name}** _(${info.block ? "container" : "inline"} macro)_`);
@@ -80182,7 +80550,7 @@ function getSignatureHelp(uri, position, workspace) {
   const { name: macroName, argsBefore } = enclosing;
   const typing = argumentsBeingTyped(argsBefore);
   const argument = typing.length - 1;
-  const macroInfo = workspace.macros.getMacro(macroName);
+  const macroInfo = workspace.getEffectiveMacro(macroName);
   const schema = macroInfo?.parameterDefs?.length && !workspace.macros.hasConfiguredParameters(macroName) ? void 0 : macroInfo?.parameters;
   if (macroInfo && schema && schema.length > 0) {
     const described = describeSignatures(
@@ -80372,7 +80740,7 @@ function getWidgetDefinition(uri, position, workspace) {
   const doc = workspace.markup.get(uri);
   const head = doc && macroHeadAt(doc, position);
   if (!head) return null;
-  if (workspace.macros.getMacro(head.name)) return null;
+  if (workspace.getEffectiveMacro(head.name)) return null;
   const widget = workspace.widgets.getWidget(head.name);
   return widget ? { uri: widget.uri, range: widget.range } : null;
 }
@@ -80435,7 +80803,7 @@ function findReferences(uri, position, workspace, includeDeclaration) {
   const head = doc && macroHeadAt(doc, position);
   if (head) {
     const widget = workspace.widgets.getWidget(head.name);
-    if (!workspace.macros.getMacro(head.name) && widget && (!head.closing || widget.block)) {
+    if (!workspace.getEffectiveMacro(head.name) && widget && (!head.closing || workspace.isContainer(head.name))) {
       return findWidgetReferences(head.name, workspace, includeDeclaration);
     }
   }
@@ -80500,9 +80868,9 @@ function findWidgetReferences(widgetName2, workspace, includeDeclaration, includ
   if (includeDeclaration && widget) {
     locations.push({ uri: widget.uri, range: widget.range });
   }
-  if (workspace.macros.getMacro(widgetName2)) return locations;
+  if (workspace.getEffectiveMacro(widgetName2)) return locations;
   const lowerName2 = widgetName2.toLowerCase();
-  const isBlock = widget?.block ?? false;
+  const isBlock = workspace.isContainer(widgetName2);
   for (const docUri of workspace.documents.getUris()) {
     const doc = workspace.markup.get(docUri);
     if (!doc) continue;
@@ -80596,7 +80964,7 @@ function computeRename(uri, position, newName, workspace) {
         const doc = workspace.markup.get(documentUri);
         if (!doc) continue;
         for (const head of documentMacroHeads(doc)) {
-          if (!head.closing && workspace.macros.hasUnsafeConfiguredPassages(head.name)) {
+          if (!head.closing && workspace.getEffectiveMacro(head.name) && workspace.macros.hasUnsafeConfiguredPassages(head.name)) {
             throw new RenameError(`Cannot rename: {${head.name}} has configured passage parameters whose positions are ambiguous, repeated or conflict with its runtime signature.`).at(documentUri, head.range);
           }
         }
@@ -80677,9 +81045,13 @@ function computeRename(uri, position, newName, workspace) {
           `Cannot rename to ${JSON.stringify(newName)}: a widget name must start with a letter and contain only letters, digits, _ and - to be called as {name}.`
         ).at(uri, symbol2.range);
       }
+      const widget = workspace.widgets.getWidget(symbol2.name);
+      if (widget && !widget.block && workspace.macros.isBlock(symbol2.name)) {
+        throw new RenameError("Cannot rename this inline widget: its current name inherits a macro container body that the new name would lose.").at(uri, symbol2.range);
+      }
       if (workspace.macros.getMacro(newName)) {
         throw new RenameError(
-          `Cannot rename to ${JSON.stringify(newName)}: a macro of that name exists and takes precedence over the widget.`
+          `Cannot rename to ${JSON.stringify(newName)}: a macro of that name already exists.`
         ).at(uri, symbol2.range);
       }
       const destination = workspace.widgets.getWidget(newName);
@@ -80690,7 +81062,6 @@ function computeRename(uri, position, newName, workspace) {
       for (const ref2 of invocationRefs) {
         addEdit(ref2.uri, ref2.range, newName);
       }
-      const widget = workspace.widgets.getWidget(symbol2.name);
       if (widget) {
         addEdit(widget.uri, widget.nameRange, newName);
       }
@@ -80710,9 +81081,9 @@ function preserveEntryPassage(oldName, newName, workspace, addEdit) {
     } catch {
       throw new RenameError("Cannot preserve the entry passage: StoryData must contain a valid JSON object.").at(declaration.uri, declaration.nameRange);
     }
-    const start = typeof data2.start === "string" && data2.start ? data2.start : "Start";
+    const start = readStoryData(passage.content).start || "Start";
     if (start !== oldName) continue;
-    if (Object.hasOwn(data2, "start") && typeof data2.start !== "string") {
+    if (Object.entries(data2).some(([key, value]) => isEntryField(key) && typeof value !== "string")) {
       throw new RenameError("Cannot preserve the entry passage: StoryData.start must be a string.").at(declaration.uri, declaration.nameRange);
     }
     let depth = 0;
@@ -80727,7 +81098,7 @@ function preserveEntryPassage(oldName, newName, workspace, addEdit) {
       literal(text3, index) {
         if (depth !== 1 || !text3.startsWith('"')) return;
         const isKey = /^\s*:/.test(passage.content.slice(index + text3.length));
-        if (isKey) startValue = JSON.parse(text3) === "start";
+        if (isKey) startValue = isEntryField(JSON.parse(text3));
         else if (startValue) {
           addEdit(declaration.uri, passage.range(index, index + text3.length), JSON.stringify(newName));
           replaced = true;
@@ -80747,6 +81118,9 @@ function preserveEntryPassage(oldName, newName, workspace, addEdit) {
     addEdit(declaration.uri, { start: end, end }, `${eol}${eol}:: StoryData${eol}${JSON.stringify({ start: newName })}${eol}`);
   }
 }
+function isEntryField(key) {
+  return readStoryData(JSON.stringify({ [key]: "Start" })).start === "Start";
+}
 function passageHeaderProblem(name) {
   if (name.trim() === "") return "a passage name cannot be empty";
   if (/[\r\n]/.test(name)) return "a passage header is a single line, so the name cannot contain a line break";
@@ -80843,7 +81217,7 @@ function resolveSymbolAtCursor(uri, position, workspace) {
   const head = doc && macroHeadAt(doc, position);
   if (head) {
     const widget = workspace.widgets.getWidget(head.name);
-    if (!workspace.macros.getMacro(head.name) && widget && (!head.closing || widget.block)) {
+    if (!workspace.getEffectiveMacro(head.name) && widget && (!head.closing || workspace.isContainer(head.name))) {
       return { kind: "widget", name: head.name, range: head.range };
     }
   }
@@ -80864,6 +81238,7 @@ var init_rename = __esm({
   "src/plugins/rename.ts"() {
     "use strict";
     import_vscode_languageserver2 = __toESM(require_api3(), 1);
+    init_story_data();
     init_tooling();
     init_source_view();
     init_text();
@@ -81032,7 +81407,7 @@ function addWidgetParamHints(passages, inRange, workspace, hints) {
     for (const token of macroTokens(passage)) {
       if (token.isClose || token.rawArgs === "") continue;
       if (!inRange(passage.position(token.start).line)) continue;
-      if (workspace.macros.getMacro(token.name)) continue;
+      if (workspace.getEffectiveMacro(token.name)) continue;
       const widget = workspace.widgets.getWidget(token.name);
       if (!widget || widget.params.length === 0) continue;
       const args2 = splitArgs(token.rawArgs);
@@ -81139,7 +81514,7 @@ function computeSemanticTokensAbsolute(uri, workspace) {
       tokenModifiers: encodeModifiers(["declaration"])
     });
     for (const macro of macroTokens(passage)) {
-      push2(passage, macro.nameStart, macro.nameEnd, "function", workspace.macros.getMacro(macro.name) ? ["defaultLibrary"] : []);
+      push2(passage, macro.nameStart, macro.nameEnd, "function", workspace.getEffectiveMacro(macro.name) ? ["defaultLibrary"] : []);
     }
     for (const use of variableUses(passage)) {
       push2(passage, use.start, use.end, "variable", VARIABLE_MODIFIERS[use.sigil]);