@lokascript/language-server 2.11.1 → 3.1.0

package/dist/server.js

@@ -9,7 +9,6 @@ import {
   CompletionItemKind,
   MarkupKind,
   DiagnosticSeverity as DiagnosticSeverity2,
-  SymbolKind,
   CodeActionKind,
   DidChangeConfigurationNotification,
   TextEdit
@@ -138,8 +137,6 @@ var LOKASCRIPT_ONLY_COMMANDS = [
   "process",
   // `process "<p>x</p>"`     → Unexpected Token : process
   // Added by Arc A step 4.1 — the omissions that produced NO diagnostic.
-  "async",
-  //   `async do log "x" end`   → Unexpected Token : async
   "copy",
   //    `copy "x"`               → Unexpected Token : copy
   "push",
@@ -163,10 +160,11 @@ var LOKASCRIPT_ONLY_COMMANDS = [
 var ALL_COMMANDS = [...HYPERSCRIPT_COMMANDS, ...LOKASCRIPT_ONLY_COMMANDS];
 var LOKASCRIPT_SYNTAX_PATTERNS = {
   /**
-   * Possessive dot notation: my.textContent, its.value, your.classList
-   * Original _hyperscript uses space: my textContent
+   * Possessive dot notation on `its`: its.value
+   * Upstream resolves `my.x` and `your.x` (they are plain symbols), so only
+   * `its.` is non-portable; write `its value` for _hyperscript compatibility.
    */
-  dotNotation: /\b(my|your|its)\.\w+/,
+  dotNotation: /\bits\.\w+/,
   /**
    * Optional chaining: my?.value
    */
@@ -174,17 +172,49 @@ var LOKASCRIPT_SYNTAX_PATTERNS = {
   /**
    * Extended 'as' conversions
    */
-  extendedAsConversion: /\bas\s+(Int|Integer|Float|JSON|FormData|Date|URLSearchParams|Set|Map)\b/i,
+  extendedAsConversion: /\bas\s+(Math|Values)\b/i,
   /**
    * Debounce/throttle modifiers with duration: .debounce(300), .throttle(1s)
    */
   temporalModifiers: /\.(debounce|throttle)\s*\(\s*\d+/i
 };
+function blankStringsAndComments(code) {
+  let out = "";
+  let i = 0;
+  while (i < code.length) {
+    const ch = code[i];
+    if (ch === "-" && code[i + 1] === "-") {
+      const eol = code.indexOf("\n", i);
+      const end = eol === -1 ? code.length : eol;
+      out += " ".repeat(end - i);
+      i = end;
+      continue;
+    }
+    const prev = i === 0 ? " " : code[i - 1];
+    const opensString = ch === '"' || ch === "`" || ch === "'" && /[\s(,\[=]/.test(prev);
+    if (opensString) {
+      let j = i + 1;
+      while (j < code.length && code[j] !== ch) {
+        if (code[j] === "\\") j++;
+        if (code[j] === "\n" && ch !== "`") break;
+        j++;
+      }
+      const end = Math.min(j + 1, code.length);
+      out += " ".repeat(end - i);
+      i = end;
+      continue;
+    }
+    out += ch;
+    i++;
+  }
+  return out;
+}
 function detectLokascriptFeatures(code) {
   const detected = [];
+  const scannable = blankStringsAndComments(code);
   for (const cmd of LOKASCRIPT_ONLY_COMMANDS) {
-    const pattern = new RegExp(`\\b${cmd}\\b`, "i");
-    if (pattern.test(code)) {
+    const pattern = cmd === "unless" ? /(?<=^[ \t]*|\bthen\s+|\bend\s+|\belse\s+)unless(?![\w-])/im : new RegExp(`(?<![\\w.:$@^#-])${cmd}(?![\\w-])(?!\\s*\\()`, "i");
+    if (pattern.test(scannable)) {
       detected.push({
         feature: "command",
         description: `'${cmd}' command is a LokaScript extension`,
@@ -228,6 +258,7 @@ function detectLokascriptFeatures(code) {
 // src/extraction.ts
 function isHtmlDocument(uri, content) {
   if (uri.endsWith(".html") || uri.endsWith(".htm")) return true;
+  if (/\.(hs|_hs|hyperscript)$/i.test(uri)) return false;
   if (content.trim().startsWith("<!DOCTYPE") || content.trim().startsWith("<html")) return true;
   if (/<\w+[^>]*>/.test(content) && !content.trim().startsWith("on ")) return true;
   return false;
@@ -378,6 +409,9 @@ function getWordAtPosition(line, character) {
   if (start === end) return null;
   return { text: line.slice(start, end), start, end };
 }
+function escapeRegExp(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
 function findNextNonEmptyLine(lines, startIndex) {
   for (let i = startIndex; i < lines.length; i++) {
     const trimmed = lines[i].trim();
@@ -427,7 +461,7 @@ import { DiagnosticSeverity } from "vscode-languageserver/node.js";
 function isPossessive(code, i) {
   if (i === 0) return false;
   const prev = code[i - 1];
-  if (!/[\w\-#.]/.test(prev)) return false;
+  if (!/[\w\-#.)\]>]/.test(prev)) return false;
   if (i + 1 >= code.length || code[i + 1] !== "s") return false;
   if (i + 2 >= code.length) return true;
   const after = code[i + 2];
@@ -461,6 +495,13 @@ function runSimpleDiagnostics(code, _language = "en") {
       col++;
       continue;
     }
+    if (ch === "-" && code[i + 1] === "-") {
+      const eol = code.indexOf("\n", i);
+      if (eol === -1) break;
+      col += eol - i;
+      i = eol - 1;
+      continue;
+    }
     switch (ch) {
       case "'":
         if (isPossessive(code, i)) {
@@ -634,14 +675,15 @@ function buildSymbolTable(regions, getKeywordVariants2) {
   const defaultKws = variants("default");
   const installKws = variants("install");
   const callKws = variants("call");
-  const behaviorDefPat = new RegExp(`\\b(${behaviorKws.join("|")})\\s+(\\w+)`, "gi");
-  const funcDefPat = new RegExp(`\\b(${defKws.join("|")})\\s+(\\w+)`, "gi");
-  const varDefPat = new RegExp(`\\b(${[...setKws, ...defaultKws].join("|")})\\s+([:$]\\w+)`, "gi");
-  const installPat = new RegExp(`\\b(${installKws.join("|")})\\s+(\\w+)`, "gi");
-  const callPat = new RegExp(`\\b(${callKws.join("|")})\\s+(\\w+)`, "gi");
-  const varRefPat = /[:$]\w+/g;
+  const kw = (words) => `(?<![\\p{L}\\p{N}_])(${words.map(escapeRegExp).join("|")})(?![\\p{L}\\p{N}_])`;
+  const behaviorDefPat = new RegExp(`${kw(behaviorKws)}\\s+(\\w+)`, "giu");
+  const funcDefPat = new RegExp(`${kw(defKws)}\\s+(\\w+)`, "giu");
+  const varDefPat = new RegExp(`${kw([...setKws, ...defaultKws])}\\s+([:$]\\w+)`, "giu");
+  const installPat = new RegExp(`${kw(installKws)}\\s+(\\w+)`, "giu");
+  const callPat = new RegExp(`${kw(callKws)}\\s+(\\w+)`, "giu");
+  const varRefPat = /(?<![\p{L}\p{N}_)\]\-])[:$]\w+/gu;
   const funcCallPat = /\b(\w+)\s*\(/g;
-  const caretWritePat = new RegExp(`\\b(${setKws.join("|")})\\s+\\^([A-Za-z_]\\w*)`, "gi");
+  const caretWritePat = new RegExp(`${kw(setKws)}\\s+\\^([A-Za-z_]\\w*)`, "giu");
   const caretRefPat = /\^([A-Za-z_]\w*)/g;
   const attrsRefPat = /\battrs\.([A-Za-z_]\w*)/g;
   function getOrCreate(name, kind, scope) {
@@ -664,6 +706,11 @@ function buildSymbolTable(regions, getKeywordVariants2) {
       character: toDocChar(region, localLine, localChar),
       length
     };
+    if (locationIndex.some(
+      (l) => l.name === entry.name && l.line === loc.line && l.start === loc.character
+    )) {
+      return;
+    }
     if (kind === "def") {
       entry.definitions.push(loc);
     } else {
@@ -844,7 +891,6 @@ function buildSymbolTable(regions, getKeywordVariants2) {
       "def",
       "install",
       "init",
-      "async",
       ...behaviorKws,
       ...defKws,
       ...setKws,
@@ -884,6 +930,82 @@ function getSymbolTable(uri, version, regions, getKeywordVariants2) {
   return table;
 }
 
+// src/completion-context.ts
+function inferContext(beforeCursor) {
+  if (/\^\w*$/.test(beforeCursor)) return "caret";
+  if (/\battrs\.\w*$/.test(beforeCursor)) return "attrs-property";
+  const trimmed = beforeCursor.trim();
+  if (/\bon\s*$/.test(trimmed)) return "event";
+  if (/\bthen\s*$/.test(trimmed)) return "command";
+  if (/^(on\s+\w+\s*)$/.test(trimmed)) return "command";
+  if (/(to|from|into|on)\s*$/.test(trimmed)) return "selector";
+  if (/\bif\s*$/.test(trimmed)) return "expression";
+  if (/\bset\s+:\w+\s+to\s*$/.test(trimmed)) return "expression";
+  return "default";
+}
+
+// src/document-symbols.ts
+import { SymbolKind } from "vscode-languageserver/node.js";
+var COMMAND_POSITION = "(?<=^[ \\t]*|(?<![\\p{L}\\p{N}_])end\\s+)";
+var NOT_WORD_AFTER = "(?![\\p{L}\\p{N}_])";
+var NAME = "([\\p{L}\\p{N}_]+)";
+function alternation(words) {
+  return `(${words.map(escapeRegExp).join("|")})`;
+}
+function symbol(name, detail, kind, line, start, length) {
+  const range = {
+    start: { line, character: start },
+    end: { line, character: start + length }
+  };
+  return { name, detail, kind, range, selectionRange: range };
+}
+function extractDocumentSymbols(code, getVariants = (eng) => [eng]) {
+  const symbols = [];
+  const lines = code.split("\n");
+  const onPattern = new RegExp(
+    `${COMMAND_POSITION}${alternation(getVariants("on"))}\\s+(${NAME.slice(1, -1)}(?::[\\p{L}\\p{N}_]+)?(?:\\[.*?\\])?)`,
+    "giu"
+  );
+  const behaviorPattern = new RegExp(
+    `${COMMAND_POSITION}${alternation(getVariants("behavior"))}\\s+${NAME}`,
+    "giu"
+  );
+  const defPattern = new RegExp(
+    `${COMMAND_POSITION}${alternation(getVariants("def"))}\\s+${NAME}`,
+    "giu"
+  );
+  const initPattern = new RegExp(
+    `${COMMAND_POSITION}${alternation(getVariants("init"))}${NOT_WORD_AFTER}`,
+    "giu"
+  );
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    for (const m of line.matchAll(onPattern)) {
+      const at = m.index ?? 0;
+      symbols.push(
+        symbol(`${m[1]} ${m[2]}`, "Event Handler", SymbolKind.Event, i, at, m[0].length)
+      );
+    }
+    for (const m of line.matchAll(behaviorPattern)) {
+      const at = m.index ?? 0;
+      symbols.push(
+        symbol(`${m[1]} ${m[2]}`, "Behavior Definition", SymbolKind.Class, i, at, m[0].length)
+      );
+    }
+    for (const m of line.matchAll(defPattern)) {
+      const at = m.index ?? 0;
+      symbols.push(
+        symbol(`${m[1]} ${m[2]}`, "Function Definition", SymbolKind.Function, i, at, m[0].length)
+      );
+    }
+    for (const m of line.matchAll(initPattern)) {
+      const at = m.index ?? 0;
+      symbols.push(symbol(m[1], "Initialization", SymbolKind.Constructor, i, at, m[1].length));
+    }
+  }
+  return symbols;
+}
+
 // src/localized-descriptions.ts
 var DESCRIPTIONS = {
   en: {
@@ -1239,7 +1361,18 @@ var lspMetadata = null;
 try {
   const core = await import("@hyperfixi/core");
   parseFunction = core.parse;
-  fromCoreASTFn = core.fromCoreAST;
+  let inferRoles = null;
+  try {
+    ({ schemaRoleInferrer: inferRoles } = await import("@hyperfixi/core/multilingual"));
+  } catch {
+    console.error(
+      "[lokascript-ls] @hyperfixi/core/multilingual not available \u2014 hover shows roles for `set` and `go` only. Install a core build that ships the multilingual entry."
+    );
+  }
+  fromCoreASTFn = (node) => core.fromCoreAST(
+    node,
+    inferRoles ? { inferRoles } : void 0
+  );
   interchangeLSP = await import("@hyperfixi/core/ast-utils");
   console.error("[lokascript-ls] @hyperfixi/core loaded \u2014 AST parsing + interchange LSP enabled");
 } catch {
@@ -1254,7 +1387,7 @@ try {
 }
 var frameworkIR = null;
 try {
-  const fw = await import("./dist-QIYYJ23V.js");
+  const fw = await import("@lokascript/framework");
   frameworkIR = { fromInterchangeNode: fw.fromInterchangeNode, renderExplicit: fw.renderExplicit };
   console.error(
     "[lokascript-ls] @lokascript/framework loaded \u2014 LSE bracket notation in hover enabled"
@@ -1478,11 +1611,6 @@ var FALLBACK_HOVER_DOCS = {
     description: "Closes a block (event handler, behavior, if, repeat).",
     example: "on click\\n  toggle .active\\nend"
   },
-  async: {
-    title: "async",
-    description: "Runs a command asynchronously without blocking.",
-    example: "async fetch /api/data"
-  },
   tell: {
     title: "tell",
     description: "Sets the default target for subsequent commands.",
@@ -1561,8 +1689,60 @@ function getSemanticAnalyzer() {
   }
   return cachedAnalyzer;
 }
-var globalSettings = envDefaultMode ? { ...defaultSettings, mode: envDefaultMode } : defaultSettings;
-connection.onInitialize((_params) => {
+var VALID_MODES = /* @__PURE__ */ new Set([
+  "hyperscript",
+  "hyperscript-i18n",
+  "lokascript",
+  "auto"
+]);
+function baseSettings() {
+  return envDefaultMode ? { ...defaultSettings, mode: envDefaultMode } : { ...defaultSettings };
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function mergeSettings(base, partial) {
+  const out = { ...base };
+  if (!isRecord(partial)) return out;
+  const p = partial;
+  if (typeof p.mode === "string" && VALID_MODES.has(p.mode)) out.mode = p.mode;
+  if (typeof p.language === "string" && p.language.trim()) out.language = p.language.trim();
+  if (typeof p.maxDiagnostics === "number" && p.maxDiagnostics > 0) {
+    out.maxDiagnostics = Math.floor(p.maxDiagnostics);
+  }
+  return out;
+}
+var globalSettings = baseSettings();
+var hasConfigurationCapability = false;
+var configSections = envDefaultMode ? ["hyperscript", "lokascript"] : ["lokascript", "hyperscript"];
+function applySettings(next) {
+  globalSettings = next;
+  const previousMode = resolvedMode;
+  resolvedMode = resolveMode(globalSettings);
+  if (previousMode !== resolvedMode) {
+    connection.console.log(`Mode changed to '${resolvedMode}' (${getBranding(resolvedMode)})`);
+  }
+  translationCache = null;
+  reverseKeywordCache = null;
+  documents.all().forEach(validateDocument);
+}
+async function pullConfiguration() {
+  if (!hasConfigurationCapability) return;
+  try {
+    const items = await connection.workspace.getConfiguration(
+      configSections.map((section) => ({ section }))
+    );
+    const [primary, fallback] = Array.isArray(items) ? items : [];
+    let merged = mergeSettings(baseSettings(), fallback);
+    merged = mergeSettings(merged, primary);
+    applySettings(merged);
+  } catch (e) {
+    connection.console.log(`[lokascript-ls] workspace/configuration failed: ${e}`);
+  }
+}
+connection.onInitialize((params) => {
+  hasConfigurationCapability = !!params.capabilities.workspace?.configuration;
+  globalSettings = mergeSettings(baseSettings(), params.initializationOptions);
   resolvedMode = resolveMode(globalSettings);
   const brand = getBranding(resolvedMode);
   connection.console.log(`${brand} Language Server initializing (mode: ${resolvedMode})...`);
@@ -1589,19 +1769,20 @@ connection.onInitialized(() => {
   connection.client.register(DidChangeConfigurationNotification.type, void 0);
   const brand = getBranding(resolvedMode);
   connection.console.log(`${brand} Language Server initialized`);
+  void pullConfiguration();
 });
 connection.onDidChangeConfiguration((change) => {
-  const envDefaults = envDefaultMode ? { ...defaultSettings, mode: envDefaultMode } : defaultSettings;
-  globalSettings = change.settings?.lokascript || change.settings?.hyperscript || envDefaults;
-  const previousMode = resolvedMode;
-  resolvedMode = resolveMode(globalSettings);
-  if (previousMode !== resolvedMode) {
-    const brand = getBranding(resolvedMode);
-    connection.console.log(`Mode changed to '${resolvedMode}' (${brand})`);
+  const settings = change.settings;
+  const pushed = isRecord(settings) ? settings[configSections[0]] ?? settings[configSections[1]] : void 0;
+  if (pushed !== void 0) {
+    applySettings(mergeSettings(baseSettings(), pushed));
+    return;
   }
-  translationCache = null;
-  reverseKeywordCache = null;
-  documents.all().forEach(validateDocument);
+  if (hasConfigurationCapability) {
+    void pullConfiguration();
+    return;
+  }
+  applySettings(baseSettings());
 });
 documents.onDidChangeContent((change) => {
   validateDocument(change.document);
@@ -1657,6 +1838,7 @@ async function getDiagnostics(code, language) {
     }
   }
   const analyzer = isMultilingualEnabled(resolvedMode) ? getSemanticAnalyzer() : null;
+  let semanticParsedForeign = false;
   if (analyzer) {
     try {
       let result = analyzer.analyze(code, language);
@@ -1703,6 +1885,7 @@ async function getDiagnostics(code, language) {
           message: `Code could not be fully parsed (${(result.confidence * 100).toFixed(0)}% confidence)`
         });
       }
+      semanticParsedForeign = result.confidence >= 0.5 && usedLanguage !== "en";
       if (result.confidence >= 0.5 && result.command) {
         const cmd = result.command.name;
         const roles = result.command.roles;
@@ -1732,7 +1915,7 @@ async function getDiagnostics(code, language) {
   if (parseFunction && fromCoreASTFn) {
     try {
       const parseResult = parseFunction(code);
-      if (parseResult.errors?.length) {
+      if (parseResult.errors?.length && !semanticParsedForeign) {
         for (const err of parseResult.errors) {
           diagnostics.push({
             range: {
@@ -1763,16 +1946,18 @@ async function getDiagnostics(code, language) {
         }
       }
     } catch (parseError) {
-      diagnostics.push({
-        range: {
-          start: { line: 0, character: 0 },
-          end: { line: 0, character: Math.min(code.length, 80) }
-        },
-        severity: DiagnosticSeverity2.Error,
-        code: "parse-error",
-        source: brand,
-        message: parseError.message || "Failed to parse"
-      });
+      if (!semanticParsedForeign) {
+        diagnostics.push({
+          range: {
+            start: { line: 0, character: 0 },
+            end: { line: 0, character: Math.min(code.length, 80) }
+          },
+          severity: DiagnosticSeverity2.Error,
+          code: "parse-error",
+          source: brand,
+          message: parseError.message || "Failed to parse"
+        });
+      }
     }
   }
   if (diagnostics.length === 0) {
@@ -1904,18 +2089,6 @@ function getAttrsCompletions() {
     }
   ];
 }
-function inferContext(beforeCursor) {
-  if (/\^\w*$/.test(beforeCursor)) return "caret";
-  if (/\battrs\.\w*$/.test(beforeCursor)) return "attrs-property";
-  const trimmed = beforeCursor.trim();
-  if (/\bon\s*$/.test(trimmed)) return "event";
-  if (/\bthen\s*$/.test(trimmed)) return "command";
-  if (/^(on\s+\w+\s*)$/.test(trimmed)) return "command";
-  if (/(to|from|into|on)\s*$/.test(trimmed)) return "selector";
-  if (/\bif\s*$/.test(trimmed)) return "expression";
-  if (/\bset\s+:\w+\s+to\s*$/.test(trimmed)) return "expression";
-  return "default";
-}
 function getContextualCompletions(context, language) {
   const completions = [];
   const effectiveLanguage = isMultilingualEnabled(resolvedMode) ? language : "en";
@@ -2548,27 +2721,27 @@ connection.onDocumentSymbol((params) => {
     const allSymbols = [];
     for (const region of regions) {
       const symbols = extractSymbols(region.code, language);
-      for (const symbol of symbols) {
+      for (const symbol2 of symbols) {
         allSymbols.push({
-          ...symbol,
+          ...symbol2,
           range: {
             start: {
-              line: region.startLine + symbol.range.start.line,
-              character: symbol.range.start.line === 0 ? region.startChar + symbol.range.start.character : symbol.range.start.character
+              line: region.startLine + symbol2.range.start.line,
+              character: symbol2.range.start.line === 0 ? region.startChar + symbol2.range.start.character : symbol2.range.start.character
             },
             end: {
-              line: region.startLine + symbol.range.end.line,
-              character: symbol.range.end.line === 0 ? region.startChar + symbol.range.end.character : symbol.range.end.character
+              line: region.startLine + symbol2.range.end.line,
+              character: symbol2.range.end.line === 0 ? region.startChar + symbol2.range.end.character : symbol2.range.end.character
             }
           },
           selectionRange: {
             start: {
-              line: region.startLine + symbol.selectionRange.start.line,
-              character: symbol.selectionRange.start.line === 0 ? region.startChar + symbol.selectionRange.start.character : symbol.selectionRange.start.character
+              line: region.startLine + symbol2.selectionRange.start.line,
+              character: symbol2.selectionRange.start.line === 0 ? region.startChar + symbol2.selectionRange.start.character : symbol2.selectionRange.start.character
             },
             end: {
-              line: region.startLine + symbol.selectionRange.end.line,
-              character: symbol.selectionRange.end.line === 0 ? region.startChar + symbol.selectionRange.end.character : symbol.selectionRange.end.character
+              line: region.startLine + symbol2.selectionRange.end.line,
+              character: symbol2.selectionRange.end.line === 0 ? region.startChar + symbol2.selectionRange.end.character : symbol2.selectionRange.end.character
             }
           }
         });
@@ -2580,8 +2753,6 @@ connection.onDocumentSymbol((params) => {
   }
 });
 function extractSymbols(code, language) {
-  const symbols = [];
-  const lines = code.split("\n");
   const getVariants = (eng) => {
     const variants = [eng];
     if (!semanticPackage || language === "en") return variants;
@@ -2599,82 +2770,7 @@ function extractSymbols(code, language) {
     }
     return variants;
   };
-  const onVariants = getVariants("on");
-  const behaviorVariants = getVariants("behavior");
-  const defVariants = getVariants("def");
-  const initVariants = getVariants("init");
-  const onPattern = new RegExp(`\\b(${onVariants.join("|")})\\s+(\\w+(?:\\[.*?\\])?)`, "gi");
-  const behaviorPattern = new RegExp(`\\b(${behaviorVariants.join("|")})\\s+(\\w+)`, "gi");
-  const defPattern = new RegExp(`\\b(${defVariants.join("|")})\\s+(\\w+)`, "gi");
-  const initPattern = new RegExp(`\\b(${initVariants.join("|")})\\b`, "gi");
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    for (const match of line.matchAll(onPattern)) {
-      const matchIndex = match.index ?? 0;
-      symbols.push({
-        name: `${match[1]} ${match[2]}`,
-        detail: "Event Handler",
-        kind: SymbolKind.Event,
-        range: {
-          start: { line: i, character: matchIndex },
-          end: { line: i, character: matchIndex + match[0].length }
-        },
-        selectionRange: {
-          start: { line: i, character: matchIndex },
-          end: { line: i, character: matchIndex + match[0].length }
-        }
-      });
-    }
-    for (const match of line.matchAll(behaviorPattern)) {
-      const matchIndex = match.index ?? 0;
-      symbols.push({
-        name: `${match[1]} ${match[2]}`,
-        detail: "Behavior Definition",
-        kind: SymbolKind.Class,
-        range: {
-          start: { line: i, character: matchIndex },
-          end: { line: i, character: matchIndex + match[0].length }
-        },
-        selectionRange: {
-          start: { line: i, character: matchIndex },
-          end: { line: i, character: matchIndex + match[0].length }
-        }
-      });
-    }
-    for (const match of line.matchAll(defPattern)) {
-      const matchIndex = match.index ?? 0;
-      symbols.push({
-        name: `${match[1]} ${match[2]}`,
-        detail: "Function Definition",
-        kind: SymbolKind.Function,
-        range: {
-          start: { line: i, character: matchIndex },
-          end: { line: i, character: matchIndex + match[0].length }
-        },
-        selectionRange: {
-          start: { line: i, character: matchIndex },
-          end: { line: i, character: matchIndex + match[0].length }
-        }
-      });
-    }
-    for (const match of line.matchAll(initPattern)) {
-      const matchIndex = match.index ?? 0;
-      symbols.push({
-        name: match[1],
-        detail: "Initialization",
-        kind: SymbolKind.Constructor,
-        range: {
-          start: { line: i, character: matchIndex },
-          end: { line: i, character: matchIndex + match[1].length }
-        },
-        selectionRange: {
-          start: { line: i, character: matchIndex },
-          end: { line: i, character: matchIndex + match[1].length }
-        }
-      });
-    }
-  }
-  return symbols;
+  return extractDocumentSymbols(code, getVariants);
 }
 connection.onCodeAction((params) => {
   const diagnostics = params.context.diagnostics;

package/package.json

@@ -1,19 +1,20 @@
 {
   "name": "@lokascript/language-server",
-  "version": "2.11.1",
-  "description": "Language Server Protocol implementation for LokaScript/hyperscript with 21 language support",
+  "version": "3.1.0",
+  "description": "Language Server Protocol implementation for LokaScript/hyperscript with 24 language support",
   "type": "module",
   "main": "dist/server.js",
   "bin": {
     "lokascript-language-server": "./dist/server.js"
   },
   "scripts": {
-    "build": "tsup src/server.ts --format esm --dts",
+    "build": "tsup src/server.ts --format esm --clean",
     "start": "node dist/server.js --stdio",
     "dev": "tsx src/server.ts --stdio",
     "test": "vitest",
     "typecheck": "tsc --noEmit",
-    "test:check": "VITEST_QUIET=1 bash ../../scripts/vitest-run.sh --reporter=dot"
+    "test:check": "npm run pretest --silent && VITEST_QUIET=1 bash ../../scripts/vitest-run.sh --reporter=dot",
+    "pretest": "bash ../../scripts/ensure-fresh.sh ../intent ../framework ../semantic ../core && npm run build --silent"
   },
   "keywords": [
     "lsp",
@@ -27,24 +28,21 @@
   "author": "LokaScript Contributors",
   "license": "MIT",
   "dependencies": {
+    "@lokascript/framework": "^3.1.0",
+    "@lokascript/semantic": "^3.1.0",
     "vscode-languageserver": "^9.0.1",
     "vscode-languageserver-textdocument": "^1.0.11"
   },
   "peerDependencies": {
-    "@hyperfixi/core": "^2.11.1",
-    "@lokascript/semantic": "^2.11.1"
+    "@hyperfixi/core": "^3.1.0"
   },
   "peerDependenciesMeta": {
-    "@lokascript/semantic": {
-      "optional": true
-    },
     "@hyperfixi/core": {
       "optional": true
     }
   },
   "devDependencies": {
-    "@hyperfixi/core": "^2.11.1",
-    "@lokascript/semantic": "^2.11.1",
+    "@hyperfixi/core": "^3.1.0",
     "@types/node": "^26.1.2",
     "@vitest/coverage-v8": "^4.0.0",
     "tsup": "^8.0.0",