@rohal12/spindle-lsp 0.15.51 → 0.15.53

package/dist/bin.js

@@ -55,7 +55,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = false ? pkg.version : "0.15.51";
+    VERSION = false ? pkg.version : "0.15.53";
   }
 });
 
@@ -32646,7 +32646,7 @@ function trimmedEnd(text3, end = text3.length) {
 function parsePassageHeader(rawLine, lineNumber) {
   const line = withoutCr(rawLine);
   const bomLength = /^\uFEFF*/.exec(line)[0].length;
-  const escaped = line.replace(/\\./g, "ec");
+  const escaped = line.replace(/\\./gs, "ec");
   const prefix2 = new RegExp("^::\\p{White_Space}*", "u").exec(escaped.slice(bomLength));
   if (!prefix2) return null;
   const nameStart = bomLength + prefix2[0].length;
@@ -32655,7 +32655,7 @@ function parsePassageHeader(rawLine, lineNumber) {
   const first = delimiter.exec(escaped);
   const boundary = first?.index ?? line.length;
   const nameEnd = trimmedEnd(escaped, boundary);
-  const decodedName = line.slice(nameStart, nameEnd).replace(/\\(.|$)/g, "$1").replace(new RegExp("^\\p{White_Space}+", "u"), "");
+  const decodedName = line.slice(nameStart, nameEnd).replace(/\\(.|$)/gs, "$1").replace(new RegExp("^\\p{White_Space}+", "u"), "");
   const name = decodedName.slice(0, trimmedEnd(decodedName));
   if (!name) return null;
   let rest = boundary;
@@ -32663,7 +32663,7 @@ function parsePassageHeader(rawLine, lineNumber) {
   if (escaped[rest] === "[") {
     const end = escaped.indexOf("]", rest + 1);
     if (end === -1 || /[\[{}]/.test(escaped.slice(rest + 1, end))) return null;
-    const decoded = line.slice(rest + 1, end).replace(/\\(.)/g, "$1");
+    const decoded = line.slice(rest + 1, end).replace(/\\(.)/gs, "$1");
     tags = decoded.match(/[^\p{White_Space}]+/gu) ?? [];
     rest = end + 1;
     while (rest < line.length && new RegExp("\\p{White_Space}", "u").test(escaped[rest])) rest++;
@@ -33928,7 +33928,8 @@ var init_passage_markup = __esm({
       get invocations() {
         if (!this.cachedInvocations) {
           const macros = this.doc.context.macros;
-          const definitions = widgetDefinitions([{ ...this.passage, content: this.content }], macros);
+          const customWidgetMacro = macros.find((macro) => macro.name.toLowerCase() === "widget")?.source === "user";
+          const definitions = customWidgetMacro ? [] : widgetDefinitions([{ ...this.passage, content: this.content }], macros);
           const registration = new Set(definitions.map((definition2) => definition2.start));
           this.cachedInvocations = this.isMarkup ? macroCalls(this.content, macros).filter((call) => call.kind === "invocation" && !registration.has(call.token.start)).map((call) => call.token) : [];
         }
@@ -34291,12 +34292,18 @@ var init_variable_tracker = __esm({
 // src/core/markup/widgets.ts
 function widgetSources(passages, macros) {
   const sources = /* @__PURE__ */ new Map();
-  for (const passage of passages) {
-    if (!passage.isMarkup) continue;
-    const { name, tags } = passage.passage;
-    for (const definition2 of widgetDefinitions([{ name, tags, content: passage.content }], macros)) {
-      sources.set(definition2, passage);
-    }
+  const markups = [...passages].filter((passage) => passage.isMarkup);
+  const inputs = markups.map((passage, index) => ({
+    name: String(index),
+    // Keep StoryInit discoverable under its source key; tooling selects all
+    // other passages using their original tags.
+    tags: passage.passage.name === "StoryInit" ? [...passage.passage.tags ?? [], "widget"] : passage.passage.tags,
+    content: passage.content
+  }));
+  for (const definition2 of widgetDefinitions(inputs, macros)) {
+    const passage = markups[Number(definition2.passage)];
+    definition2.passage = passage.passage.name;
+    sources.set(definition2, passage);
   }
   return sources;
 }
@@ -36245,13 +36252,13 @@ function loopDiagnostics(passage, token, ancestors, workspace) {
   const close = loop?.node.body?.close;
   if (!loop || !close) return [];
   const targets = macro === "computed" ? computedTemporaryTarget(token.rawArgs) : setTemporaryTargets(token.rawArgs);
-  const view = sourceView(passage, token.argsStart, token.argsEnd);
-  const argsIndex = viewIndex(view, token.argsStart);
+  let view;
   const bodyStart = loop.node.token.end;
   const diagnostics = [];
   for (const target of targets) {
     if (!isReadInBody(passage, bodyStart, close.start, target.name, token.start, token.end)) continue;
-    const start = argsIndex + target.offset;
+    view ??= sourceView(passage, token.argsStart, token.argsEnd);
+    const start = viewIndex(view, token.argsStart) + target.offset;
     diagnostics.push(makeDiag(
       passage.range(pieceOffset(view, start), pieceOffset(view, start + 1 + target.name.length)),
       DiagnosticCode.TemporaryAssignedInLoop,
@@ -36260,26 +36267,50 @@ function loopDiagnostics(passage, token, ancestors, workspace) {
   }
   return diagnostics;
 }
-function isReadInBody(passage, bodyStart, bodyEnd, name, macroStart, macroEnd) {
-  const eligible = (offset2) => offset2 >= bodyStart && offset2 < bodyEnd && !(offset2 >= macroStart && offset2 < macroEnd);
+function temporaryReads(passage) {
+  const cached2 = temporaryReadIndexes.get(passage);
+  if (cached2) return cached2;
+  const reads = /* @__PURE__ */ new Map();
+  const add = (name, offset2) => {
+    const offsets = reads.get(name);
+    if (offsets) offsets.push(offset2);
+    else reads.set(name, [offset2]);
+  };
   for (const token of markupTokens(passage)) {
-    if (token.type === "variable" && token.scope === "temporary" && token.name.split(".")[0] === name && eligible(token.start)) return true;
+    if (token.type === "variable" && token.scope === "temporary") add(token.name.split(".")[0], token.start);
   }
   for (const piece of passage.pieces) {
     if (piece.kind !== "code") continue;
     try {
-      if (parseCode(piece.code, piece.goal).refs.some(
-        (ref2) => ref2.sigil === "_" && ref2.name === name && ref2.read && eligible(pieceOffset(piece, ref2.start))
-      )) return true;
+      for (const ref2 of parseCode(piece.code, piece.goal).refs) {
+        if (ref2.sigil === "_" && ref2.read) add(ref2.name, pieceOffset(piece, ref2.start));
+      }
     } catch {
     }
   }
-  return false;
+  for (const offsets of reads.values()) offsets.sort((a, b) => a - b);
+  temporaryReadIndexes.set(passage, reads);
+  return reads;
+}
+function isReadInBody(passage, bodyStart, bodyEnd, name, macroStart, macroEnd) {
+  const offsets = temporaryReads(passage).get(name);
+  if (!offsets) return false;
+  const firstAt = (start) => {
+    let low = 0;
+    let high = offsets.length;
+    while (low < high) {
+      const mid = low + high >>> 1;
+      if (offsets[mid] < start) low = mid + 1;
+      else high = mid;
+    }
+    return offsets[low] ?? Infinity;
+  };
+  const first = firstAt(bodyStart);
+  return (first >= macroStart && first < macroEnd ? firstAt(macroEnd) : first) < bodyEnd;
 }
 function argumentDiagnostics(passage, workspace, getPassageNames) {
   const diagnostics = [];
-  for (const token of passage.isMarkup ? macroTokens(passage) : []) {
-    if (token.type !== "macro" || token.isClose) continue;
+  for (const token of passage.invocations) {
     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;
@@ -36290,21 +36321,26 @@ function argumentDiagnostics(passage, workspace, getPassageNames) {
       continue;
     }
     const range2 = passage.range(token.start, token.end);
-    const args2 = lexArguments(token.rawArgs);
-    if (params.isEmpty()) {
-      if (args2.length > 0) {
-        diagnostics.push(makeDiag(range2, DiagnosticCode.ExpectedNoArguments, `Expected no arguments for {${token.name}}, got ${args2.length}`));
+    try {
+      const args2 = lexArguments(token.rawArgs);
+      if (params.isEmpty()) {
+        if (args2.length > 0) {
+          diagnostics.push(makeDiag(range2, DiagnosticCode.ExpectedNoArguments, `Expected no arguments for {${token.name}}, got ${args2.length}`));
+        }
+        continue;
       }
-      continue;
-    }
-    const result2 = params.validate(args2, { passages: getPassageNames() });
-    if (result2.variantIndex === null) continue;
-    for (const error62 of result2.errors) {
-      const code = error62.message.startsWith("Too many arguments") ? DiagnosticCode.TooManyArguments : DiagnosticCode.ParameterTypeError;
-      diagnostics.push(makeDiag(range2, code, `{${token.name}}: ${error62.message}`));
-    }
-    for (const warning of result2.warnings) {
-      diagnostics.push(makeDiag(range2, DiagnosticCode.ParameterWarning, `{${token.name}}: ${warning.message}`));
+      const result2 = params.validate(args2, { passages: getPassageNames() });
+      if (result2.variantIndex === null) continue;
+      for (const error62 of result2.errors) {
+        const code = error62.message.startsWith("Too many arguments") ? DiagnosticCode.TooManyArguments : DiagnosticCode.ParameterTypeError;
+        diagnostics.push(makeDiag(range2, code, `{${token.name}}: ${error62.message}`));
+      }
+      for (const warning of result2.warnings) {
+        diagnostics.push(makeDiag(range2, DiagnosticCode.ParameterWarning, `{${token.name}}: ${warning.message}`));
+      }
+    } catch (error62) {
+      const reason = error62 instanceof Error ? error62.message : String(error62);
+      diagnostics.push(makeDiag(range2, DiagnosticCode.ParameterTypeError, `{${token.name}}: Unable to validate arguments: ${reason}`));
     }
   }
   return diagnostics;
@@ -36327,6 +36363,7 @@ function widgetDiagnostics(passage, story, workspace) {
       ));
     }
   }
+  if (workspace.getEffectiveMacro("include")?.source !== "builtin") return diagnostics;
   for (const piece of passage.pieces) {
     if (piece.kind !== "passage" || piece.macro !== "include") continue;
     const target = workspace.passages.getEffectivePassage(piece.name);
@@ -36432,7 +36469,7 @@ function toLspDiagnostic(d) {
     data: d.data
   };
 }
-var tweeReports, reports, COMPILER_PASSAGES, MARKUP_CODES, text2, list2, VARIABLE_CODES, WILL_NOT_START, BRANCH_MACROS2, DIRECT_CHILD_MACROS, DEFERRED_CONTAINERS, SPINDLE_MACROS, diagnosticsPlugin;
+var tweeReports, reports, COMPILER_PASSAGES, MARKUP_CODES, text2, list2, VARIABLE_CODES, WILL_NOT_START, BRANCH_MACROS2, DIRECT_CHILD_MACROS, DEFERRED_CONTAINERS, temporaryReadIndexes, SPINDLE_MACROS, diagnosticsPlugin;
 var init_diagnostics = __esm({
   "src/plugins/diagnostics.ts"() {
     "use strict";
@@ -36487,6 +36524,7 @@ var init_diagnostics = __esm({
     BRANCH_MACROS2 = /* @__PURE__ */ new Set(["elseif", "else", "case", "default", "next"]);
     DIRECT_CHILD_MACROS = /* @__PURE__ */ new Set(["option"]);
     DEFERRED_CONTAINERS = /* @__PURE__ */ new Set(["link", "button"]);
+    temporaryReadIndexes = /* @__PURE__ */ new WeakMap();
     SPINDLE_MACROS = /* @__PURE__ */ new Set([
       ...builtinMacros.flatMap((macro) => [macro.name, ...macro.subMacros]).map((name) => name.toLowerCase()),
       ...BRANCH_MACROS2