@rohal12/spindle-lsp 0.7.0 → 0.8.0

package/dist/bin.js

@@ -448,8 +448,10 @@ var init_variable_tracker = __esm({
     VariableTracker = class {
       declared = /* @__PURE__ */ new Map();
       _hasStoryVariables = false;
+      _nullDeclarations = [];
       declaredTransient = /* @__PURE__ */ new Map();
       _hasStoryTransients = false;
+      _nullTransientDeclarations = [];
       /** Per-URI list of variable usages. */
       usagesByUri = /* @__PURE__ */ new Map();
       /** Per-URI list of transient variable usages. */
@@ -458,17 +460,32 @@ var init_variable_tracker = __esm({
        * Parse the StoryVariables passage content for declarations.
        * Each line like `$name = value` becomes a declaration.
        */
-      parseStoryVariables(content) {
+      parseStoryVariables(content, contentStartLine = 0) {
         this.declared.clear();
         this._hasStoryVariables = true;
+        this._nullDeclarations = [];
         const lines = content.split("\n");
-        for (const line of lines) {
-          const trimmed = line.trim();
+        for (let i = 0; i < lines.length; i++) {
+          const trimmed = lines[i].trim();
           if (!trimmed || trimmed.startsWith("//") || trimmed.startsWith("<!--")) continue;
           const match = /^\$([A-Za-z_$][\w$]*)\s*=\s*(.*)$/.exec(trimmed);
           if (!match) continue;
           const name = match[1];
           const expr = match[2].trim();
+          if (expr === "null") {
+            const charIdx = lines[i].indexOf("null", lines[i].indexOf("="));
+            const absLine = contentStartLine + i;
+            this._nullDeclarations.push({
+              name,
+              sigil: "$",
+              range: {
+                start: { line: absLine, character: charIdx },
+                end: { line: absLine, character: charIdx + 4 }
+              }
+            });
+            this.declared.set(name, { name, sigil: "$" });
+            continue;
+          }
           const decl = { name, sigil: "$" };
           if (expr.startsWith("{")) {
             const fieldRegex = /(\w+)\s*:/g;
@@ -488,17 +505,32 @@ var init_variable_tracker = __esm({
        * Parse the StoryTransients passage content for declarations.
        * Each line like `%name = value` becomes a declaration.
        */
-      parseStoryTransients(content) {
+      parseStoryTransients(content, contentStartLine = 0) {
         this.declaredTransient.clear();
         this._hasStoryTransients = true;
+        this._nullTransientDeclarations = [];
         const lines = content.split("\n");
-        for (const line of lines) {
-          const trimmed = line.trim();
+        for (let i = 0; i < lines.length; i++) {
+          const trimmed = lines[i].trim();
           if (!trimmed || trimmed.startsWith("//") || trimmed.startsWith("<!--")) continue;
           const match = /^%([A-Za-z_$][\w$]*)\s*=\s*(.*)$/.exec(trimmed);
           if (!match) continue;
           const name = match[1];
           const expr = match[2].trim();
+          if (expr === "null") {
+            const charIdx = lines[i].indexOf("null", lines[i].indexOf("="));
+            const absLine = contentStartLine + i;
+            this._nullTransientDeclarations.push({
+              name,
+              sigil: "%",
+              range: {
+                start: { line: absLine, character: charIdx },
+                end: { line: absLine, character: charIdx + 4 }
+              }
+            });
+            this.declaredTransient.set(name, { name, sigil: "%" });
+            continue;
+          }
           const decl = { name, sigil: "%" };
           if (expr.startsWith("{")) {
             const fieldRegex = /(\w+)\s*:/g;
@@ -660,6 +692,14 @@ var init_variable_tracker = __esm({
       hasStoryTransients() {
         return this._hasStoryTransients;
       }
+      /** Get variables declared with null values in StoryVariables. */
+      getNullDeclarations() {
+        return this._nullDeclarations;
+      }
+      /** Get transient variables declared with null values in StoryTransients. */
+      getNullTransientDeclarations() {
+        return this._nullTransientDeclarations;
+      }
     };
   }
 });
@@ -1238,7 +1278,7 @@ var init_workspace_model = __esm({
               }
             }
             const content = lines.slice(contentStart, contentEnd).join("\n");
-            this.variables.parseStoryVariables(content);
+            this.variables.parseStoryVariables(content, contentStart);
           }
         }
         const storyTransients = this.passages.getStoryTransients();
@@ -1255,7 +1295,7 @@ var init_workspace_model = __esm({
               }
             }
             const content = lines.slice(contentStart, contentEnd).join("\n");
-            this.variables.parseStoryTransients(content);
+            this.variables.parseStoryTransients(content, contentStart);
           }
         }
         for (const uri of this.documents.getUris()) {
@@ -1306,6 +1346,7 @@ var init_diagnostic_codes = __esm({
       UndeclaredField: "SP201",
       NoStoryVariables: "SP202",
       UndeclaredTransient: "SP203",
+      NullVariableValue: "SP204",
       BrokenPassageLink: "SP300",
       WidgetArgCountMismatch: "SP301",
       DeadEndPassage: "SP400",
@@ -1324,10 +1365,11 @@ var init_diagnostic_codes = __esm({
       SP112: "warning",
       SP114: "error",
       SP115: "error",
-      SP200: "warning",
+      SP200: "error",
       SP201: "warning",
       SP202: "info",
       SP203: "warning",
+      SP204: "error",
       SP300: "warning",
       SP301: "warning",
       SP400: "hint",
@@ -2434,6 +2476,16 @@ function validateVariables(uri, workspace, diagnostics) {
         `Variable '$${u.name}' is not declared in StoryVariables`
       ));
     }
+    const storyVars = workspace.passages.getStoryVariables();
+    if (storyVars && storyVars.uri === uri) {
+      for (const nd of workspace.variables.getNullDeclarations()) {
+        diagnostics.push(makeDiag(
+          nd.range,
+          DiagnosticCode.NullVariableValue,
+          `Variable '$${nd.name}' is set to null. Spindle does not support null \u2014 use a valid default (number, string, boolean, array, or object).`
+        ));
+      }
+    }
   }
   if (workspace.variables.hasStoryTransients()) {
     const undeclaredTransient = workspace.variables.getUndeclaredTransient(uri);
@@ -2444,6 +2496,16 @@ function validateVariables(uri, workspace, diagnostics) {
         `Transient variable '%${u.name}' is not declared in StoryTransients`
       ));
     }
+    const storyTransients = workspace.passages.getStoryTransients();
+    if (storyTransients && storyTransients.uri === uri) {
+      for (const nd of workspace.variables.getNullTransientDeclarations()) {
+        diagnostics.push(makeDiag(
+          nd.range,
+          DiagnosticCode.NullVariableValue,
+          `Transient variable '%${nd.name}' is set to null. Spindle does not support null \u2014 use a valid default (number, string, boolean, array, or object).`
+        ));
+      }
+    }
   }
 }
 function validateLinks(text, passages, passageNames, diagnostics) {
@@ -3172,6 +3234,50 @@ var init_prettier_bridge = __esm({
 });
 
 // src/plugins/format/placeholders.ts
+function scanSpindleTokens(text) {
+  const matches = [];
+  let i = 0;
+  while (i < text.length) {
+    if (text[i] === "[" && text[i + 1] === "[") {
+      const closeIdx = text.indexOf("]]", i + 2);
+      if (closeIdx !== -1) {
+        const end = closeIdx + 2;
+        matches.push({ start: i, end, token: text.slice(i, end) });
+        i = end;
+        continue;
+      }
+    }
+    if (text[i] === "{" && !(i > 0 && text[i - 1] === "\\")) {
+      const next = i + 1 < text.length ? text[i + 1] : "";
+      let isToken = false;
+      if (next === "/") {
+        isToken = i + 2 < text.length && /[A-Za-z]/.test(text[i + 2]);
+      } else if (next === "#" || next === ".") {
+        isToken = i + 2 < text.length && /[a-zA-Z]/.test(text[i + 2]);
+      } else if (/[A-Za-z]/.test(next)) {
+        isToken = true;
+      } else if (/[$_@%]/.test(next)) {
+        isToken = i + 2 < text.length && /[a-zA-Z]/.test(text[i + 2]);
+      }
+      if (isToken) {
+        let depth = 1;
+        let j = i + 1;
+        while (j < text.length && depth > 0) {
+          if (text[j] === "{") depth++;
+          else if (text[j] === "}") depth--;
+          j++;
+        }
+        if (depth === 0) {
+          matches.push({ start: i, end: j, token: text.slice(i, j) });
+          i = j;
+          continue;
+        }
+      }
+    }
+    i++;
+  }
+  return matches;
+}
 function isInsideAttribute(text, pos) {
   let inQuote = false;
   let quoteChar = "";
@@ -3208,13 +3314,15 @@ function replaceSpindleTokens(html) {
   const resultLines = [];
   for (const line of lines) {
     const trimmed = line.trim();
-    SPINDLE_TOKEN_REGEX.lastIndex = 0;
-    if (!SPINDLE_TOKEN_REGEX.test(trimmed)) {
+    const found = scanSpindleTokens(trimmed);
+    if (found.length === 0) {
       resultLines.push(line);
       continue;
     }
-    SPINDLE_TOKEN_REGEX.lastIndex = 0;
-    const withoutSpindle = trimmed.replace(SPINDLE_TOKEN_REGEX, "");
+    let withoutSpindle = trimmed;
+    for (let fi = found.length - 1; fi >= 0; fi--) {
+      withoutSpindle = withoutSpindle.slice(0, found[fi].start) + withoutSpindle.slice(found[fi].end);
+    }
     const hasHtml = HTML_TAG_REGEX.test(withoutSpindle);
     if (!hasHtml) {
       const idx = tokens.length;
@@ -3222,16 +3330,20 @@ function replaceSpindleTokens(html) {
       const indent = line.match(/^(\s*)/)?.[1] ?? "";
       resultLines.push(`${indent}<!--SP:${idx}-->`);
     } else {
-      SPINDLE_TOKEN_REGEX.lastIndex = 0;
-      const replaced = line.replace(SPINDLE_TOKEN_REGEX, (match, ...args2) => {
-        const matchOffset = args2[args2.length - 2];
+      const indent = line.match(/^(\s*)/)?.[1] ?? "";
+      const indentLen = indent.length;
+      const assignments = found.map((t) => {
+        const lineStart = t.start + indentLen;
         const idx = tokens.length;
-        tokens.push(match);
-        if (isInsideAttribute(line, matchOffset)) {
-          return `__SP${idx}__`;
-        }
-        return `<!--SP:${idx}-->`;
+        tokens.push(t.token);
+        const placeholder = isInsideAttribute(line, lineStart) ? `__SP${idx}__` : `<!--SP:${idx}-->`;
+        return { start: lineStart, end: t.end + indentLen, placeholder };
       });
+      let replaced = line;
+      for (let ai = assignments.length - 1; ai >= 0; ai--) {
+        const a = assignments[ai];
+        replaced = replaced.slice(0, a.start) + a.placeholder + replaced.slice(a.end);
+      }
       resultLines.push(replaced);
     }
   }
@@ -3245,11 +3357,10 @@ function restoreSpindleTokens(text, tokens) {
   }
   return result;
 }
-var SPINDLE_TOKEN_REGEX, HTML_TAG_REGEX;
+var HTML_TAG_REGEX;
 var init_placeholders = __esm({
   "src/plugins/format/placeholders.ts"() {
     "use strict";
-    SPINDLE_TOKEN_REGEX = /(?:\{\/[A-Za-z][\w-]*\s*\}|\{(?:[#.][a-zA-Z][\w-]*\s*)*[A-Za-z][\w-]*(?:\s+(?:[^{}]|\{[^{}]*\})*)?\}|\{[$_@][a-zA-Z][\w.]*\}|\[\[(?:[^\]]*)\]\])/g;
     HTML_TAG_REGEX = /<\/?[a-zA-Z][\w-]*[\s>/]/;
   }
 });
@@ -5338,6 +5449,11 @@ function computeCodeActions(uri, diagnostics, workspace) {
         if (action) actions.push(action);
         break;
       }
+      case DiagnosticCode.NullVariableValue: {
+        const action = fixNullVariableValue(uri, diag);
+        if (action) actions.push(action);
+        break;
+      }
     }
   }
   return actions;
@@ -5394,7 +5510,7 @@ function fixUndeclaredVariable(diag, workspace) {
         start: { line: insertLine, character: 0 },
         end: { line: insertLine, character: 0 }
       },
-      newText: `$${varName} = null
+      newText: `$${varName} = 0
 `
     }]
   };
@@ -5449,11 +5565,23 @@ function fixUndeclaredTransient(diag, workspace) {
         start: { line: insertLine, character: 0 },
         end: { line: insertLine, character: 0 }
       },
-      newText: `%${varName} = null
+      newText: `%${varName} = 0
 `
     }]
   };
 }
+function fixNullVariableValue(uri, diag) {
+  return {
+    title: "Replace null with 0",
+    kind: "quickfix",
+    diagnosticCodes: [DiagnosticCode.NullVariableValue],
+    edits: [{
+      uri,
+      range: diag.range,
+      newText: "0"
+    }]
+  };
+}
 function toLspRange6(r) {
   return {
     start: { line: r.start.line, character: r.start.character },