@xano/xanoscript-language-server 11.10.0 → 11.10.1

package/language-server-worker.js

@@ -11,6 +11,7 @@ import { onDidChangeContent } from "./onDidChangeContent/onDidChangeContent.js";
 import { onHover } from "./onHover/onHover.js";
 import { onSemanticCheck } from "./onSemanticCheck/onSemanticCheck.js";
 import { TOKEN_TYPES } from "./onSemanticCheck/tokens.js";
+import pkg from "./package.json" with { type: "json" };
 
 const messageReader = new BrowserMessageReader(self);
 const messageWriter = new BrowserMessageWriter(self);
@@ -47,6 +48,6 @@ connection.onRequest("textDocument/semanticTokens/full", (params) =>
 documents.onDidChangeContent((params) =>
   onDidChangeContent(params, connection)
 );
-connection.onInitialized(() => console.log("lang server init"));
+connection.onInitialized(() => console.log(`XanoScript Language Server v${pkg.version}`));
 documents.listen(connection);
 connection.listen();

package/onCompletion/onCompletion.js

@@ -1,4 +1,6 @@
+import { documentCache } from "../cache/documentCache.js";
 import { mapToVirtualJS } from "../embedded/embeddedContent.js";
+import { findSegmentAtOffset } from "../parser/multidoc.js";
 import { getSchemeFromContent } from "../utils.js";
 import { workspaceIndex } from "../workspace/workspaceIndex.js";
 import { getContentAssistSuggestions } from "./contentAssist.js";
@@ -32,9 +34,28 @@ export function onCompletion(params, documents) {
     return null;
   }
 
-  // Otherwise, handle as regular XanoScript
-  const scheme = getSchemeFromContent(text);
-  const prefix = text.slice(0, offset);
+  // For multidoc, resolve to the correct segment
+  const { parser } = documentCache.getOrParse(
+    params.textDocument.uri,
+    document.version,
+    text,
+  );
+
+  let scheme;
+  let prefix;
+
+  if (parser.isMultidoc) {
+    const match = findSegmentAtOffset(parser, offset);
+    if (!match) return null;
+    scheme = getSchemeFromContent(match.segment.text);
+    // Prefix is everything in the full text up to the cursor — contentAssist
+    // parses backwards from the cursor to find context, so it needs the segment
+    // text up to the local offset
+    prefix = match.segment.text.slice(0, match.localOffset);
+  } else {
+    scheme = getSchemeFromContent(text);
+    prefix = text.slice(0, offset);
+  }
 
   const suggestions = getContentAssistSuggestions(prefix, scheme);
 

package/onSemanticCheck/highlight.js

@@ -10,10 +10,51 @@ import { encodeTokenType } from "./tokens.js";
  * @returns {SemanticTokensBuilder} Returns null if the scheme is not supported
  */
 export function higlightText(scheme, text, SemanticTokensBuilder) {
-  return higlightDefault(text, SemanticTokensBuilder);
+  return higlightDefault(text, 0, SemanticTokensBuilder);
 }
 
-function higlightDefault(text, SemanticTokensBuilder) {
+/**
+ * Highlight a multidoc by highlighting each segment independently.
+ * @param {Array<{text: string, globalOffset: number}>} segments - The segments from multidocParser
+ * @param {SemanticTokensBuilder} SemanticTokensBuilder - The semantic tokens builder constructor
+ */
+/**
+ * Highlight a multidoc by highlighting each segment independently.
+ * @param {Array<{text: string, globalOffset: number}>} segments - The segments from multidocParser
+ * @param {SemanticTokensBuilder} SemanticTokensBuilder - The semantic tokens builder constructor
+ */
+export function higlightSegments(segments, SemanticTokensBuilder) {
+  const builder = new SemanticTokensBuilder();
+
+  // Pre-compute line offsets: count newlines in each previous segment + separator
+  let lineOffset = 0;
+
+  for (const segment of segments) {
+    const lexResult = lexDocument(segment.text, true);
+
+    for (const token of lexResult.tokens) {
+      const tokenType = mapTokenToType(token.tokenType.name);
+      if (tokenType) {
+        builder.push(
+          token.startLine - 1 + lineOffset,
+          token.startColumn - 1,
+          token.image.length,
+          encodeTokenType(tokenType),
+          0,
+        );
+      }
+    }
+
+    // Advance lineOffset: lines in this segment's text + 2 for the \n---\n separator
+    // (separator has 2 newlines: one before --- and one after)
+    const segmentLines = segment.text.split("\n").length - 1;
+    lineOffset += segmentLines + 2;
+  }
+
+  return builder.build();
+}
+
+function higlightDefault(text, lineOffset, SemanticTokensBuilder) {
   const builder = new SemanticTokensBuilder();
 
   // Map Chevrotain tokens to semantic token types
@@ -23,8 +64,8 @@ function higlightDefault(text, SemanticTokensBuilder) {
   lexResult.tokens.forEach((token) => {
     const tokenType = mapTokenToType(token.tokenType.name);
     if (tokenType) {
-      const line = token.startLine - 1; // Convert to 0-based for LSP
-      const character = token.startColumn - 1; // Convert to 0-based for LSP
+      const line = token.startLine - 1 + lineOffset;
+      const character = token.startColumn - 1;
       builder.push(
         line,
         character,

package/onSemanticCheck/onSemanticCheck.js

@@ -1,5 +1,6 @@
-import { getSchemeFromContent } from "../utils";
-import { higlightText } from "./highlight";
+import { documentCache } from "../cache/documentCache.js";
+import { getSchemeFromContent } from "../utils.js";
+import { higlightSegments,higlightText } from "./highlight.js";
 
 /**
  * Handles a semantic tokens request for the full document.
@@ -19,7 +20,17 @@ export function onSemanticCheck(params, documents, SemanticTokensBuilder) {
   }
 
   const text = document.getText();
-  const scheme = getSchemeFromContent(text);
 
+  const { parser } = documentCache.getOrParse(
+    params.textDocument.uri,
+    document.version,
+    text,
+  );
+
+  if (parser.isMultidoc) {
+    return higlightSegments(parser.segments, SemanticTokensBuilder);
+  }
+
+  const scheme = getSchemeFromContent(text);
   return higlightText(scheme, text, SemanticTokensBuilder);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xano/xanoscript-language-server",
-  "version": "11.10.0",
+  "version": "11.10.1",
   "description": "Language Server Protocol implementation for XanoScript",
   "type": "module",
   "main": "server.js",

package/parser/multidoc.spec.js

@@ -860,6 +860,64 @@ function foo {
       // Both segments are empty strings — should not crash
     });
 
+    it("should parse workspace + table multidoc without errors on separator", () => {
+      const text = `workspace "car-coverage" {
+  acceptance = {ai_terms: false}
+  preferences = {
+    internal_docs    : false
+    track_performance: true
+    sql_names        : false
+    sql_columns      : true
+  }
+
+  realtime = {canonical: "UJCEVaoiEJN-wjghNzMxj324-8w"}
+  env = {api_key: "12345"}
+}
+---
+table user {
+  auth = true
+
+  schema {
+    int id
+    timestamp created_at?=now
+    text name filters=trim
+    email? email filters=trim|lower
+    password? password filters=min:8|minAlpha:1|minDigit:1
+    text? refresh_token {
+      sensitive = true
+      visibility = "private"
+    }
+
+    timestamp? refresh_token_expires
+
+    // some description
+    enum my_enum {
+      values = ["true", "false", "2"]
+      sensitive = true
+      visibility = "private"
+    }
+
+    object test_visibility? {
+      schema {
+        text internal? filters=trim {
+          visibility = "internal"
+        }
+      }
+    }
+  }
+
+  index = [
+    {type: "primary", field: [{name: "id"}]}
+    {type: "btree", field: [{name: "created_at", op: "desc"}]}
+    {type: "btree|unique", field: [{name: "email", op: "asc"}]}
+  ]
+}`;
+      const result = multidocParser(text);
+      expect(result.isMultidoc).to.be.true;
+      expect(result.segmentCount).to.equal(2);
+      expect(result.errors).to.be.empty;
+    });
+
     it("should not treat --- inside a string literal as separator", () => {
       // This is a known limitation — but test current behavior
       const text = `function foo {