@rohal12/spindle-lsp 0.8.4 → 0.9.0

package/dist/bin.js

@@ -6602,7 +6602,52 @@ var init_macro_registry = __esm({
 });
 
 // src/core/workspace/variable-tracker.ts
-var varRefRegex, transientRefRegex, EXCLUDED_PASSAGES, CLEAN_PATTERNS, VariableTracker;
+function findLiteralEnd(text, start) {
+  const open = text[start];
+  if (open === '"' || open === "'" || open === "`") {
+    for (let i = start + 1; i < text.length; i++) {
+      const ch = text[i];
+      if (ch === "\\") {
+        i++;
+        continue;
+      }
+      if (open === "`" && ch === "$" && text[i + 1] === "{") return -1;
+      if (ch === open) return i;
+    }
+    return -1;
+  }
+  let depth = 0;
+  for (let i = start; i < text.length; i++) {
+    const ch = text[i];
+    if (ch === '"' || ch === "'" || ch === "`") {
+      const end = findLiteralEnd(text, i);
+      if (end === -1) return -1;
+      i = end;
+      continue;
+    }
+    if (ch === "[" || ch === "{" || ch === "(") depth++;
+    else if (ch === "]" || ch === "}" || ch === ")") {
+      depth--;
+      if (depth === 0) return i;
+    }
+  }
+  return -1;
+}
+function inferLiteralType(expr) {
+  const e = expr.trim();
+  if (e === "") return void 0;
+  if (e === "true" || e === "false") return "boolean";
+  if (/^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?$/.test(e)) return "number";
+  const first = e[0];
+  if (first !== "[" && first !== "{" && first !== '"' && first !== "'" && first !== "`") {
+    return void 0;
+  }
+  if (findLiteralEnd(e, 0) !== e.length - 1) return void 0;
+  if (first === "[") return "array";
+  if (first === "{") return "object";
+  return "string";
+}
+var varRefRegex, transientRefRegex, EXCLUDED_PASSAGES, CLEAN_PATTERNS, ARRAY_MEMBERS, VariableTracker;
 var init_variable_tracker = __esm({
   "src/core/workspace/variable-tracker.ts"() {
     "use strict";
@@ -6631,6 +6676,20 @@ var init_variable_tracker = __esm({
       /'(?:\\.|[^'\\])*'/g
       // single-quoted strings
     ];
+    ARRAY_MEMBERS = /* @__PURE__ */ new Set([
+      ...Object.getOwnPropertyNames(Array.prototype),
+      ...Object.getOwnPropertyNames(Object.prototype),
+      "at",
+      "flat",
+      "flatMap",
+      "includes",
+      "findLast",
+      "findLastIndex",
+      "toReversed",
+      "toSorted",
+      "toSpliced",
+      "with"
+    ]);
     VariableTracker = class {
       declared = /* @__PURE__ */ new Map();
       _hasStoryVariables = false;
@@ -6673,6 +6732,8 @@ var init_variable_tracker = __esm({
             continue;
           }
           const decl = { name, sigil: "$" };
+          const type = inferLiteralType(expr);
+          if (type) decl.type = type;
           if (expr.startsWith("{")) {
             const fieldRegex = /(\w+)\s*:/g;
             let fieldMatch;
@@ -6718,6 +6779,8 @@ var init_variable_tracker = __esm({
             continue;
           }
           const decl = { name, sigil: "%" };
+          const type = inferLiteralType(expr);
+          if (type) decl.type = type;
           if (expr.startsWith("{")) {
             const fieldRegex = /(\w+)\s*:/g;
             let fieldMatch;
@@ -6878,6 +6941,29 @@ var init_variable_tracker = __esm({
       hasStoryTransients() {
         return this._hasStoryTransients;
       }
+      /**
+       * Get `$var.member` / `%var.member` accesses in a document where `var` is
+       * declared with an array literal default and `member` is not a property
+       * that JavaScript arrays have (so the access always yields undefined).
+       */
+      getArrayMemberAccesses(uri) {
+        const results = [];
+        const sources = [
+          ["$", this.usagesByUri.get(uri), this.declared],
+          ["%", this.transientUsagesByUri.get(uri), this.declaredTransient]
+        ];
+        for (const [sigil, usages, declared] of sources) {
+          if (!usages) continue;
+          for (const u of usages) {
+            const member = u.fullName.split(".")[1];
+            if (member === void 0) continue;
+            if (declared.get(u.baseName)?.type !== "array") continue;
+            if (ARRAY_MEMBERS.has(member)) continue;
+            results.push({ sigil, name: u.baseName, member, range: u.range });
+          }
+        }
+        return results;
+      }
       /** Get variables declared with null values in StoryVariables. */
       getNullDeclarations() {
         return this._nullDeclarations;
@@ -6899,6 +6985,8 @@ var init_widget_registry = __esm({
     paramRegex = /@([A-Za-z_$][\w$]*)/g;
     WidgetRegistry = class {
       widgets = /* @__PURE__ */ new Map();
+      /** Per-URI set of lower-cased macro names opened in that document. */
+      invokedByUri = /* @__PURE__ */ new Map();
       /**
        * Scan all passages for widget definitions.
        * Only passages tagged `widget` are examined.
@@ -6960,6 +7048,30 @@ var init_widget_registry = __esm({
       getAllWidgets() {
         return Array.from(this.widgets.values());
       }
+      /**
+       * Record the macro names opened in a document, replacing any previous
+       * record for that URI. Spindle resolves widget names case-insensitively,
+       * so names are stored lower-cased.
+       */
+      recordInvocations(uri, macros) {
+        const names = /* @__PURE__ */ new Set();
+        for (const macro of macros) {
+          if (macro.open) names.add(macro.name.toLowerCase());
+        }
+        this.invokedByUri.set(uri, names);
+      }
+      /** Forget all recorded invocations. */
+      clearInvocations() {
+        this.invokedByUri.clear();
+      }
+      /** Whether any recorded document invokes the widget `{name}`. */
+      isInvoked(name) {
+        const key = name.toLowerCase();
+        for (const names of this.invokedByUri.values()) {
+          if (names.has(key)) return true;
+        }
+        return false;
+      }
     };
   }
 });
@@ -7484,11 +7596,13 @@ var init_workspace_model = __esm({
             this.variables.parseStoryTransients(content, contentStart);
           }
         }
+        this.widgets.clearInvocations();
         for (const uri of this.documents.getUris()) {
           const text = this.documents.getText(uri);
           if (text) {
             const macros = parseMacros(text);
             this.variables.scanDocument(uri, text, macros);
+            this.widgets.recordInvocations(uri, macros);
           }
         }
         const allPassages = this.passages.getAllPassages();
@@ -7533,8 +7647,12 @@ var init_diagnostic_codes = __esm({
       NoStoryVariables: "SP202",
       UndeclaredTransient: "SP203",
       NullVariableValue: "SP204",
+      TemporaryAssignedInLoop: "SP205",
+      ArrayMemberAccess: "SP206",
       BrokenPassageLink: "SP300",
       WidgetArgCountMismatch: "SP301",
+      IncludeWidgetPassage: "SP302",
+      UnusedWidget: "SP303",
       DeadEndPassage: "SP400",
       UnreachablePassage: "SP401",
       LineTooLong: "SP500"
@@ -7556,8 +7674,12 @@ var init_diagnostic_codes = __esm({
       SP202: "info",
       SP203: "warning",
       SP204: "error",
+      SP205: "warning",
+      SP206: "warning",
       SP300: "warning",
       SP301: "warning",
+      SP302: "warning",
+      SP303: "hint",
       SP400: "hint",
       SP401: "hint",
       SP500: "warning"
@@ -8471,6 +8593,22 @@ function computeDiagnostics(uri, workspace, options) {
       validateWidgetInvocations(macros, workspace, diagnostics);
     } catch {
     }
+    try {
+      validateArrayMemberAccess(uri, workspace, diagnostics);
+    } catch {
+    }
+    try {
+      validateLoopTemporaries(uri, text, macros, workspace, diagnostics);
+    } catch {
+    }
+    try {
+      validateWidgetIncludes(text, macros, workspace, diagnostics);
+    } catch {
+    }
+    try {
+      validateUnusedWidgets(uri, workspace, diagnostics);
+    } catch {
+    }
     if (options?.maxLineLength) {
       try {
         validateLineLength(text, passages, options.maxLineLength, diagnostics);
@@ -8725,6 +8863,226 @@ function validateWidgetInvocations(macros, workspace, diagnostics) {
     }
   }
 }
+function validateArrayMemberAccess(uri, workspace, diagnostics) {
+  for (const a of workspace.variables.getArrayMemberAccesses(uri)) {
+    const passage = a.sigil === "%" ? "StoryTransients" : "StoryVariables";
+    const ref = `${a.sigil}${a.name}`;
+    diagnostics.push(makeDiag(
+      a.range,
+      DiagnosticCode.ArrayMemberAccess,
+      `'${ref}' is declared as an array in ${passage}, and arrays have no '${a.member}' property: '${ref}.${a.member}' is always undefined. If you meant to test membership, use ${ref}.includes("${a.member}").`
+    ));
+  }
+}
+function temporaryRefRegex(name) {
+  const ident = name ? escapeRegex(name) : "[A-Za-z_$][\\w$]*";
+  return new RegExp(`(?<![.\\w$@%])_(${ident})(?![\\w$])`, "g");
+}
+function escapeRegex(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function maskStrings(code) {
+  let out = "";
+  let i = 0;
+  while (i < code.length) {
+    const ch = code[i];
+    if (ch === '"' || ch === "'" || ch === "`") {
+      out += ch;
+      i++;
+      while (i < code.length && code[i] !== ch) {
+        if (code[i] === "\\" && i + 1 < code.length) {
+          out += "  ";
+          i += 2;
+        } else if (ch === "`" && code[i] === "$" && code[i + 1] === "{") {
+          const end = interpolationEnd(code, i + 2);
+          out += maskStrings(code.slice(i, end));
+          i = end;
+        } else {
+          out += code[i] === "\n" ? "\n" : " ";
+          i++;
+        }
+      }
+      if (i < code.length) {
+        out += ch;
+        i++;
+      }
+      continue;
+    }
+    out += ch;
+    i++;
+  }
+  return out;
+}
+function interpolationEnd(code, from) {
+  let depth = 1;
+  for (let i = from; i < code.length; i++) {
+    if (code[i] === "{") depth++;
+    else if (code[i] === "}" && --depth === 0) return i + 1;
+  }
+  return code.length;
+}
+function computedTemporaryTarget(rawArgs) {
+  const lead = rawArgs.length - rawArgs.trimStart().length;
+  const trimmed = rawArgs.trim();
+  let depth = 0;
+  for (let i = 0; i < trimmed.length; i++) {
+    const ch = trimmed[i];
+    if (ch === "(" || ch === "[" || ch === "{") depth++;
+    else if (ch === ")" || ch === "]" || ch === "}") depth--;
+    else if (ch === "=" && depth === 0) {
+      if (trimmed[i + 1] === "=") {
+        i++;
+        continue;
+      }
+      if (i > 0 && trimmed[i - 1] === "!") continue;
+      const target = trimmed.slice(0, i).trim();
+      const m = /^_(\w+)$/.exec(target);
+      return m ? [{ name: m[1], offset: lead }] : [];
+    }
+  }
+  return [];
+}
+function setTemporaryTargets(rawArgs) {
+  const code = maskStrings(rawArgs);
+  const targets = [];
+  const assignRe = /(?<![.\w$@%])_([A-Za-z_$][\w$]*)\s*=(?![=>])/g;
+  let m;
+  while ((m = assignRe.exec(code)) !== null) {
+    const name = m[1];
+    const rhs = code.slice(m.index + m[0].length, statementEnd(code, m.index + m[0].length));
+    if (temporaryRefRegex(name).test(rhs)) continue;
+    targets.push({ name, offset: m.index });
+  }
+  return targets;
+}
+function statementEnd(code, from) {
+  let depth = 0;
+  for (let i = from; i < code.length; i++) {
+    const ch = code[i];
+    if (ch === "(" || ch === "[" || ch === "{") depth++;
+    else if (ch === ")" || ch === "]" || ch === "}") depth--;
+    else if ((ch === ";" || ch === ",") && depth <= 0) return i;
+  }
+  return code.length;
+}
+function enclosingLoop(macros, index, uri, workspace) {
+  for (let j = index - 1; j >= 0; j--) {
+    const candidate = macros[j];
+    if (!candidate.open || candidate.pair === -1 || candidate.pair < index) continue;
+    const name = candidate.name.toLowerCase();
+    if (DEFERRED_CONTAINERS.has(name)) return -1;
+    if (name !== "for") continue;
+    const loopPassage = workspace.passages.getPassageAt(uri, candidate.range.start.line);
+    const macroPassage = workspace.passages.getPassageAt(uri, macros[index].range.start.line);
+    return loopPassage === macroPassage ? j : -1;
+  }
+  return -1;
+}
+function positionToOffset(pos, lineStarts) {
+  return (lineStarts[pos.line] ?? 0) + pos.character;
+}
+function sourceArgs(macro, text, lineStarts) {
+  const end = positionToOffset(macro.range.end, lineStarts) - 1;
+  const start = end - (macro.rawArgs?.length ?? 0);
+  return { args: text.slice(start, end), start };
+}
+function validateLoopTemporaries(uri, text, macros, workspace, diagnostics) {
+  const lineStarts = buildLineStarts(text);
+  for (let k = 0; k < macros.length; k++) {
+    const macro = macros[k];
+    if (!macro.open || !macro.rawArgs) continue;
+    const name = macro.name.toLowerCase();
+    if (name !== "computed" && name !== "set") continue;
+    const { args: args2, start: argsStart } = sourceArgs(macro, text, lineStarts);
+    const targets = name === "computed" ? computedTemporaryTarget(args2) : setTemporaryTargets(args2);
+    if (targets.length === 0) continue;
+    const loopIndex = enclosingLoop(macros, k, uri, workspace);
+    if (loopIndex === -1) continue;
+    const loop = macros[loopIndex];
+    const bodyStart = positionToOffset(loop.range.end, lineStarts);
+    const bodyEnd = positionToOffset(macros[loop.pair].range.start, lineStarts);
+    const macroStart = positionToOffset(macro.range.start, lineStarts);
+    const macroEnd = positionToOffset(macro.range.end, lineStarts);
+    const body = text.slice(bodyStart, bodyEnd);
+    for (const target of targets) {
+      if (!isReadInBody(body, bodyStart, target.name, macroStart, macroEnd)) continue;
+      const start = argsStart + target.offset;
+      diagnostics.push(makeDiag(
+        {
+          start: offsetToPosition(start, lineStarts),
+          end: offsetToPosition(start + 1 + target.name.length, lineStarts)
+        },
+        DiagnosticCode.TemporaryAssignedInLoop,
+        `Temporary '_${target.name}' is assigned inside {${loop.name}} and read in the loop body. Temporaries are shared by every iteration, so all iterations end up seeing the value assigned by the last one. Use the iteration-local '@${target.name}' instead, or assign it once before the loop if the value does not depend on the iteration.`
+      ));
+    }
+  }
+}
+function isReadInBody(body, bodyOffset, name, macroStart, macroEnd) {
+  const re = temporaryRefRegex(name);
+  let m;
+  while ((m = re.exec(body)) !== null) {
+    const offset = bodyOffset + m.index;
+    if (offset >= macroStart && offset < macroEnd) continue;
+    const after = body.slice(m.index + m[0].length);
+    if (/^\s*=(?![=>])/.test(after)) continue;
+    return true;
+  }
+  return false;
+}
+function resolveIncludeTarget(rawArgs) {
+  const expr = rawArgs.replace(/\binline\b/, "").trim();
+  if (expr === "") return null;
+  const literal2 = /^(["'`])((?:\\.|(?!\1)[^\\])*)\1$/s.exec(expr);
+  if (literal2) {
+    if (literal2[1] === "`" && literal2[2].includes("${")) return null;
+    return literal2[2].replace(/\\(.)/g, "$1");
+  }
+  if (/[$@%"'`(]/.test(expr) || temporaryRefRegex().test(expr)) return null;
+  if (EXPRESSION_BUILTINS.has(expr)) return null;
+  return expr;
+}
+function widgetDefinitionNames(content) {
+  const names = [];
+  const re = /\{widget\s+(["']?)([^\s"'}]+)\1/gi;
+  let m;
+  while ((m = re.exec(content)) !== null) names.push(m[2]);
+  return names;
+}
+function passageContent(passage, workspace) {
+  const text = workspace.documents.getText(passage.uri) ?? "";
+  return text.split("\n").slice(passage.range.start.line + 1, passage.range.end.line + 1).join("\n");
+}
+function validateWidgetIncludes(text, macros, workspace, diagnostics) {
+  let lineStarts = null;
+  for (const macro of macros) {
+    if (!macro.open || !macro.rawArgs || macro.name.toLowerCase() !== "include") continue;
+    lineStarts ??= buildLineStarts(text);
+    const target = resolveIncludeTarget(sourceArgs(macro, text, lineStarts).args);
+    if (target === null) continue;
+    const passage = workspace.passages.getPassage(target);
+    if (!passage?.tags?.includes("widget")) continue;
+    const widgets = widgetDefinitionNames(passageContent(passage, workspace));
+    if (widgets.length === 0) continue;
+    const list = widgets.map((w) => `{${w}}`).join(", ");
+    diagnostics.push(makeDiag(
+      macro.range,
+      DiagnosticCode.IncludeWidgetPassage,
+      `{include}: passage "${target}" is tagged [widget] and defines ${list}. Including it does not invoke ${widgets.length === 1 ? "it" : "them"}: {widget} definitions render nothing. Invoke the widget instead, e.g. {${widgets[0]}}.`
+    ));
+  }
+}
+function validateUnusedWidgets(uri, workspace, diagnostics) {
+  for (const widget of workspace.widgets.getAllWidgets()) {
+    if (widget.uri !== uri) continue;
+    if (workspace.widgets.isInvoked(widget.name)) continue;
+    diagnostics.push(makeDiag(
+      widget.range,
+      DiagnosticCode.UnusedWidget,
+      `Widget "${widget.name}" is defined but never invoked in the workspace`
+    ));
+  }
+}
 function validateLineLength(text, passages, maxLength, diagnostics) {
   const excludedTags = /* @__PURE__ */ new Set(["script", "stylesheet"]);
   const excludedPassages = new Set(passages.filter((p) => p.tags?.some((t) => excludedTags.has(t))).map((p) => p.name));
@@ -8772,7 +9130,7 @@ function toLspDiagnostic(d) {
     message: d.message
   };
 }
-var diagnosticsPlugin;
+var DEFERRED_CONTAINERS, EXPRESSION_BUILTINS, diagnosticsPlugin;
 var init_diagnostics = __esm({
   "src/plugins/diagnostics.ts"() {
     "use strict";
@@ -8781,6 +9139,21 @@ var init_diagnostics = __esm({
     init_argument_lexer();
     init_parameter_validator();
     init_link_parser();
+    DEFERRED_CONTAINERS = /* @__PURE__ */ new Set(["link", "button"]);
+    EXPRESSION_BUILTINS = /* @__PURE__ */ new Set([
+      "currentPassage",
+      "previousPassage",
+      "visited",
+      "hasVisited",
+      "hasVisitedAny",
+      "hasVisitedAll",
+      "rendered",
+      "hasRendered",
+      "hasRenderedAny",
+      "hasRenderedAll",
+      "random",
+      "randomInt"
+    ]);
     diagnosticsPlugin = {
       id: "diagnostics",
       capabilities: {},
@@ -21275,7 +21648,7 @@ __export(util_exports, {
   createTransparentProxy: () => createTransparentProxy,
   defineLazy: () => defineLazy,
   esc: () => esc,
-  escapeRegex: () => escapeRegex,
+  escapeRegex: () => escapeRegex2,
   extend: () => extend,
   finalizeIssue: () => finalizeIssue,
   floatSafeRemainder: () => floatSafeRemainder2,
@@ -21487,7 +21860,7 @@ function numKeys(data) {
   }
   return keyCount;
 }
-function escapeRegex(str) {
+function escapeRegex2(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function clone(inst, def, params) {
@@ -22293,7 +22666,7 @@ var init_regexes = __esm({
     ipv4 = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$/;
     ipv6 = /^(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:))$/;
     mac = (delimiter) => {
-      const escapedDelim = escapeRegex(delimiter ?? ":");
+      const escapedDelim = escapeRegex2(delimiter ?? ":");
       return new RegExp(`^(?:[0-9A-F]{2}${escapedDelim}){5}[0-9A-F]{2}$|^(?:[0-9a-f]{2}${escapedDelim}){5}[0-9a-f]{2}$`);
     };
     cidrv4 = /^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\/([0-9]|[1-2][0-9]|3[0-2])$/;
@@ -22783,7 +23156,7 @@ var init_checks = __esm({
     });
     $ZodCheckIncludes = /* @__PURE__ */ $constructor("$ZodCheckIncludes", (inst, def) => {
       $ZodCheck.init(inst, def);
-      const escapedRegex = escapeRegex(def.includes);
+      const escapedRegex = escapeRegex2(def.includes);
       const pattern = new RegExp(typeof def.position === "number" ? `^.{${def.position}}${escapedRegex}` : escapedRegex);
       def.pattern = pattern;
       inst._zod.onattach.push((inst2) => {
@@ -22807,7 +23180,7 @@ var init_checks = __esm({
     });
     $ZodCheckStartsWith = /* @__PURE__ */ $constructor("$ZodCheckStartsWith", (inst, def) => {
       $ZodCheck.init(inst, def);
-      const pattern = new RegExp(`^${escapeRegex(def.prefix)}.*`);
+      const pattern = new RegExp(`^${escapeRegex2(def.prefix)}.*`);
       def.pattern ?? (def.pattern = pattern);
       inst._zod.onattach.push((inst2) => {
         const bag = inst2._zod.bag;
@@ -22830,7 +23203,7 @@ var init_checks = __esm({
     });
     $ZodCheckEndsWith = /* @__PURE__ */ $constructor("$ZodCheckEndsWith", (inst, def) => {
       $ZodCheck.init(inst, def);
-      const pattern = new RegExp(`.*${escapeRegex(def.suffix)}$`);
+      const pattern = new RegExp(`.*${escapeRegex2(def.suffix)}$`);
       def.pattern ?? (def.pattern = pattern);
       inst._zod.onattach.push((inst2) => {
         const bag = inst2._zod.bag;
@@ -24468,7 +24841,7 @@ var init_schemas = __esm({
       const values = getEnumValues(def.entries);
       const valuesSet = new Set(values);
       inst._zod.values = valuesSet;
-      inst._zod.pattern = new RegExp(`^(${values.filter((k) => propertyKeyTypes.has(typeof k)).map((o) => typeof o === "string" ? escapeRegex(o) : o.toString()).join("|")})$`);
+      inst._zod.pattern = new RegExp(`^(${values.filter((k) => propertyKeyTypes.has(typeof k)).map((o) => typeof o === "string" ? escapeRegex2(o) : o.toString()).join("|")})$`);
       inst._zod.parse = (payload, _ctx) => {
         const input = payload.value;
         if (valuesSet.has(input)) {
@@ -24490,7 +24863,7 @@ var init_schemas = __esm({
       }
       const values = new Set(def.values);
       inst._zod.values = values;
-      inst._zod.pattern = new RegExp(`^(${def.values.map((o) => typeof o === "string" ? escapeRegex(o) : o ? escapeRegex(o.toString()) : String(o)).join("|")})$`);
+      inst._zod.pattern = new RegExp(`^(${def.values.map((o) => typeof o === "string" ? escapeRegex2(o) : o ? escapeRegex2(o.toString()) : String(o)).join("|")})$`);
       inst._zod.parse = (payload, _ctx) => {
         const input = payload.value;
         if (values.has(input)) {
@@ -24785,7 +25158,7 @@ var init_schemas = __esm({
           const end = source.endsWith("$") ? source.length - 1 : source.length;
           regexParts.push(source.slice(start, end));
         } else if (part === null || primitiveTypes.has(typeof part)) {
-          regexParts.push(escapeRegex(`${part}`));
+          regexParts.push(escapeRegex2(`${part}`));
         } else {
           throw new Error(`Invalid template literal part: ${part}`);
         }
@@ -59858,7 +60231,7 @@ var init_server4 = __esm({
 
 // src/bin.ts
 var args = process.argv.slice(2);
-var VERSION = "0.8.4";
+var VERSION = "0.9.0";
 var HELP = `spindle-lsp v${VERSION}
 Language Server Protocol server for Spindle story format