@xano/xanoscript-language-server 11.9.0 → 11.10.0

package/.claude/memory/feedback_no_git.md

@@ -0,0 +1,11 @@
+---
+name: no-git-interactions
+description: User does not want Claude to interact with git (no commits, no staging, no git commands)
+type: feedback
+---
+
+Do not interact with git — no commits, no staging, no git commands. Focus purely on implementation and testing.
+
+**Why:** User manages their own git workflow.
+
+**How to apply:** Skip all git-related steps in plans. When dispatching subagents, explicitly tell them not to run any git commands. Remove commit steps from task instructions.

package/.claude/settings.local.json

@@ -2,18 +2,13 @@
   "permissions": {
     "allow": [
       "Bash(npm test:*)",
-      "Bash(node -e:*)",
-      "Bash(node --input-type=module -e:*)",
       "Bash(git checkout:*)",
       "Bash(ls:*)",
       "Bash(npm run lint:*)",
       "Bash(grep:*)",
-      "Bash(node --input-type=module:*)",
       "Bash(find:*)",
       "Read(//tmp/**)",
       "Bash(git stash:*)",
-      "Bash(node:*)",
-      "Bash(for:*)",
       "Bash(do)",
       "Bash(if ! grep -q \"guidFieldAttribute\" \"$f\")",
       "Bash(then)",

package/cache/documentCache.js

@@ -1,4 +1,5 @@
 import { lexDocument } from "../lexer/lexer.js";
+import { multidocParser } from "../parser/multidoc.js";
 import { xanoscriptParser } from "../parser/parser.js";
 import { getSchemeFromContent } from "../utils.js";
 
@@ -34,14 +35,30 @@ class DocumentCache {
       cached.version === version &&
       cached.textLength === textLength
     ) {
-      // Re-lex (cheap) to provide tokens; return cached parser state
       return {
-        lexResult: lexDocument(text),
+        lexResult: cached.scheme === "multidoc" ? { tokens: [] } : lexDocument(text),
         parser: cached.parserState,
         scheme: cached.scheme,
       };
     }
 
+    // Multidoc detection — split on \n---\n separator
+    if (text.includes("\n---\n")) {
+      const parserState = multidocParser(text);
+      const cacheEntry = {
+        version,
+        textLength,
+        parserState,
+        scheme: "multidoc",
+      };
+      this.cache.set(uri, cacheEntry);
+      return {
+        lexResult: { tokens: [] },
+        parser: parserState,
+        scheme: "multidoc",
+      };
+    }
+
     // Parse and cache a snapshot of the parser state
     const scheme = getSchemeFromContent(text);
     const lexResult = lexDocument(text);

package/onDidChangeContent/onDidChangeContent.js

@@ -73,6 +73,10 @@ export function onDidChangeContent(params, connection, features = {}) {
   const text = document.getText();
 
   try {
+    // Capture previous segment count before getOrParse overwrites the cache
+    const prevCached = documentCache.cache.get(document.uri);
+    const prevSegmentCount = prevCached?.parserState?.segmentCount ?? 0;
+
     // Parse the XanoScript file using cache
     const { lexResult, parser, scheme } = documentCache.getOrParse(
       document.uri,
@@ -80,8 +84,28 @@ export function onDidChangeContent(params, connection, features = {}) {
       text,
     );
 
-    // Update workspace index with already-parsed data (no re-parse needed)
-    workspaceIndex.addParsed(document.uri, text, parser.__symbolTable);
+    // Update workspace index
+    // Clean up old fragment URIs from previous parse
+    for (let i = 0; i < prevSegmentCount; i++) {
+      workspaceIndex.removeFile(`${document.uri}#${i}`);
+    }
+    if (parser.isMultidoc) {
+      // Remove the base URI in case document switched from single to multidoc
+      workspaceIndex.removeFile(document.uri);
+      // Index each segment with fragment URIs
+      if (parser.segments) {
+        for (let i = 0; i < parser.segments.length; i++) {
+          const seg = parser.segments[i];
+          workspaceIndex.addParsed(
+            `${document.uri}#${i}`,
+            seg.text,
+            seg.symbolTable,
+          );
+        }
+      }
+    } else {
+      workspaceIndex.addParsed(document.uri, text, parser.__symbolTable);
+    }
 
     for (const error of parser.errors) {
       console.error(
@@ -92,8 +116,8 @@ export function onDidChangeContent(params, connection, features = {}) {
     // Create diagnostics in a single pass
     const diagnostics = createDiagnostics(parser, document);
 
-    // Run cross-file validation and append as warnings
-    if (features.crossFileValidation !== false && parser.__symbolTable?.references) {
+    // Run cross-file validation (skip for multidoc — already done internally)
+    if (!parser.isMultidoc && features.crossFileValidation !== false && parser.__symbolTable?.references) {
       const crossFileWarnings = crossFileValidate(
         parser.__symbolTable.references,
         workspaceIndex,
@@ -110,8 +134,8 @@ export function onDidChangeContent(params, connection, features = {}) {
       }
     }
 
-    // Run variable validation and append warnings/hints
-    if (features.variableValidation !== false && parser.__symbolTable?.varDeclarations) {
+    // Run variable validation (skip for multidoc — already done per-segment internally)
+    if (!parser.isMultidoc && features.variableValidation !== false && parser.__symbolTable?.varDeclarations) {
       const varResult = validateVariables(
         parser.__symbolTable,
         lexResult.tokens,

package/onHover/onHoverDocument.js

@@ -1,4 +1,6 @@
 import { documentCache } from "../cache/documentCache.js";
+import { lexDocument } from "../lexer/lexer.js";
+import { findSegmentAtOffset } from "../parser/multidoc.js";
 
 /**
  * Binary search to find token index at the given offset.
@@ -54,9 +56,50 @@ export function onHoverDocument(params, documents, hoverProviders = []) {
     text,
   );
 
+  let tokens;
+  let hoverParser;
+  let tokenOffsetAdjustment = 0;
+
+  if (parser.isMultidoc) {
+    // For multidoc, find the segment at the cursor position and lex it
+    const match = findSegmentAtOffset(parser, offset);
+    if (!match) return null;
+
+    const segLexResult = lexDocument(match.segment.text);
+    if (segLexResult.errors.length > 0) return null;
+
+    tokens = segLexResult.tokens;
+    hoverParser = match.segment.parser;
+    tokenOffsetAdjustment = match.segment.globalOffset;
+
+    // Find token using segment-local offset
+    const tokenIdx = findTokenAtOffset(tokens, match.localOffset);
+    if (tokenIdx === -1) return null;
+
+    const messageProvider = hoverProviders.find((provider) =>
+      provider.isMatch(tokenIdx, tokens, hoverParser),
+    );
+
+    if (messageProvider) {
+      return {
+        contents: {
+          kind: "markdown",
+          value: messageProvider.render(tokenIdx, tokens, hoverParser),
+        },
+        range: {
+          // Convert segment-local token offsets to global document positions
+          start: document.positionAt(tokens[tokenIdx].startOffset + tokenOffsetAdjustment),
+          end: document.positionAt(tokens[tokenIdx].endOffset + 1 + tokenOffsetAdjustment),
+        },
+      };
+    }
+
+    return null;
+  }
+
   if (lexResult.errors.length > 0) return null;
 
-  const tokens = lexResult.tokens;
+  tokens = lexResult.tokens;
 
   // Find the token under the cursor using binary search (O(log n))
   const tokenIdx = findTokenAtOffset(tokens, offset);

package/onHover/onHoverDocument.spec.js

@@ -452,6 +452,180 @@ describe("onHoverDocument", () => {
     expect(result).to.have.property("range");
   });
 
+  it("should return hover info for var in second segment of multidoc", () => {
+    const code = `function foo {
+  input {
+  }
+
+  stack {
+  }
+
+  response = null
+}
+---
+query test verb=GET {
+  stack {
+    var $result {
+      value = "hello"
+    }
+  }
+}`;
+
+    const document = TextDocument.create(
+      "file://test-multidoc.xs",
+      "xanoscript",
+      1,
+      code
+    );
+    const params = {
+      textDocument: { uri: "file://test-multidoc.xs" },
+      position: { line: 12, character: 4 }, // Position on "var" in second segment
+    };
+
+    const result = onHoverDocument(
+      params,
+      { get: () => document },
+      hoverProviders
+    );
+
+    expect(result).to.not.be.null;
+    expect(result.contents.value).to.include("Create a variable");
+    expect(result).to.have.property("range");
+    // Range should be in the global document, not segment-local
+    expect(result.range.start.line).to.be.at.least(10);
+  });
+
+  it("should return hover info for input variable in multidoc segment", () => {
+    const code = `function foo {
+  input {
+  }
+
+  stack {
+  }
+
+  response = null
+}
+---
+query test verb=GET {
+  input {
+    text username
+  }
+
+  stack {
+    var $result {
+      value = $input.username
+    }
+  }
+
+  response = $result
+}`;
+
+    const document = TextDocument.create(
+      "file://test-multidoc-input.xs",
+      "xanoscript",
+      1,
+      code
+    );
+    // "username" after $input. in the second segment
+    const params = {
+      textDocument: { uri: "file://test-multidoc-input.xs" },
+      position: { line: 17, character: 20 },
+    };
+
+    const result = onHoverDocument(
+      params,
+      { get: () => document },
+      hoverProviders
+    );
+
+    if (result) {
+      expect(result.contents.value).to.include("username");
+      expect(result.range.start.line).to.be.at.least(10);
+    }
+  });
+
+  it("should return hover info for first segment of multidoc", () => {
+    const code = `query test verb=GET {
+  stack {
+    var $result {
+      value = "hello"
+    }
+  }
+}
+---
+function bar {
+  input {
+  }
+
+  stack {
+  }
+
+  response = null
+}`;
+
+    const document = TextDocument.create(
+      "file://test-multidoc-first.xs",
+      "xanoscript",
+      1,
+      code
+    );
+    const params = {
+      textDocument: { uri: "file://test-multidoc-first.xs" },
+      position: { line: 2, character: 4 }, // "var" in first segment
+    };
+
+    const result = onHoverDocument(
+      params,
+      { get: () => document },
+      hoverProviders
+    );
+
+    expect(result).to.not.be.null;
+    expect(result.contents.value).to.include("Create a variable");
+    expect(result.range.start.line).to.equal(2);
+  });
+
+  it("should return null for hover on separator line in multidoc", () => {
+    const code = `function foo {
+  input {
+  }
+
+  stack {
+  }
+
+  response = null
+}
+---
+function bar {
+  input {
+  }
+
+  stack {
+  }
+
+  response = null
+}`;
+
+    const document = TextDocument.create(
+      "file://test-multidoc-sep.xs",
+      "xanoscript",
+      1,
+      code
+    );
+    const params = {
+      textDocument: { uri: "file://test-multidoc-sep.xs" },
+      position: { line: 9, character: 1 }, // On the "---" separator line
+    };
+
+    const result = onHoverDocument(
+      params,
+      { get: () => document },
+      hoverProviders
+    );
+
+    expect(result).to.be.null;
+  });
+
   it("should return hover info for query filter tokens in search context", () => {
     const code = `query books verb=GET {
   where = $db.embedding.vector|inner_product:$input.query_vector

package/package.json

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

package/parser/functions/db/dbQueryFn.spec.js

@@ -83,6 +83,13 @@ describe("dbQueryFn", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("dbQueryFn accepts a search expression with dynamic field", () => {
+    const parser = parse(`query user {
+      where = $db.my_table["$search value"] search? $input.values
+    } as $user`);
+    expect(parser.errors).to.be.empty;
+  });
+
   it("dbQueryFn accepts sub addon", () => {
     const parser = parse(`query user {
       where = $db.array_columns @> $db.array_columns.id

package/parser/generic/expressionFn.js

@@ -98,6 +98,7 @@ const OperatorAcceptingOptionalIfNull = [
   JsonNotOverlapsToken,
   JsonNotRegexToken,
   JsonOverlapsToken,
+  JsonSearchToken,
 ];
 
 /**

package/parser/multidoc.js

@@ -0,0 +1,273 @@
+import { lexDocument } from "../lexer/lexer.js";
+import { crossFileValidate } from "../workspace/crossFileValidator.js";
+import { WorkspaceIndex } from "../workspace/workspaceIndex.js";
+import { xanoscriptParser } from "./parser.js";
+import { validateVariables } from "./variableValidator.js";
+
+const SEPARATOR = "\n---\n";
+const SEPARATOR_LENGTH = 5;
+
+/**
+ * Find the segment that contains the given global offset.
+ * @param {Object} parserResult - The multidoc parser result (must have segments array)
+ * @param {number} offset - Global character offset in the full document
+ * @returns {{ segment: Object, localOffset: number } | null}
+ */
+export function findSegmentAtOffset(parserResult, offset) {
+  if (!parserResult?.segments) return null;
+
+  for (const segment of parserResult.segments) {
+    const segEnd = segment.globalOffset + segment.text.length;
+    if (offset >= segment.globalOffset && offset < segEnd) {
+      return {
+        segment,
+        localOffset: offset - segment.globalOffset,
+      };
+    }
+  }
+
+  // Offset might be at the very end of the last segment
+  const last = parserResult.segments[parserResult.segments.length - 1];
+  if (last && offset === last.globalOffset + last.text.length) {
+    return {
+      segment: last,
+      localOffset: offset - last.globalOffset,
+    };
+  }
+
+  return null;
+}
+
+/**
+ * Snapshot parser state into a plain object.
+ * Must be called immediately after xanoscriptParser() before parsing next segment,
+ * because the parser is a singleton that gets mutated on each call.
+ * @param {import('./base_parser.js').XanoBaseParser} parser
+ * @returns {Object} Plain object snapshot
+ */
+function snapshotParser(parser) {
+  return {
+    errors: parser.errors.map((e) => ({
+      message: e.message,
+      token: e.token
+        ? { startOffset: e.token.startOffset, endOffset: e.token.endOffset }
+        : null,
+    })),
+    warnings: parser.warnings.map((w) => ({
+      message: w.message,
+      token: w.token
+        ? { startOffset: w.token.startOffset, endOffset: w.token.endOffset }
+        : null,
+    })),
+    informations: parser.informations.map((i) => ({
+      message: i.message,
+      token: i.token
+        ? { startOffset: i.token.startOffset, endOffset: i.token.endOffset }
+        : null,
+    })),
+    hints: parser.hints.map((h) => ({
+      message: h.message,
+      token: h.token
+        ? { startOffset: h.token.startOffset, endOffset: h.token.endOffset }
+        : null,
+    })),
+    __symbolTable: parser.__symbolTable
+      ? {
+          input: { ...parser.__symbolTable.input },
+          var: { ...parser.__symbolTable.var },
+          auth: { ...parser.__symbolTable.auth },
+          env: { ...parser.__symbolTable.env },
+          references: parser.__symbolTable.references.map((r) => ({
+            ...r,
+            args: r.args ? { ...r.args } : undefined,
+            dataKeys: r.dataKeys ? [...r.dataKeys] : undefined,
+          })),
+          varDeclarations: parser.__symbolTable.varDeclarations.map((d) => ({
+            ...d,
+          })),
+        }
+      : null,
+  };
+}
+
+/**
+ * Apply a global offset to all position-bearing fields in a parser snapshot.
+ * @param {Object} snapshot - The parser state snapshot
+ * @param {number} globalOffset - The character offset to add
+ */
+function offsetResult(snapshot, globalOffset) {
+  if (globalOffset === 0) return;
+
+  const offsetToken = (token) => {
+    if (!token) return;
+    token.startOffset += globalOffset;
+    token.endOffset += globalOffset;
+  };
+
+  for (const err of snapshot.errors) offsetToken(err.token);
+  for (const warn of snapshot.warnings) offsetToken(warn.token);
+  for (const info of snapshot.informations) offsetToken(info.token);
+  for (const hint of snapshot.hints) offsetToken(hint.token);
+
+  if (!snapshot.__symbolTable) return;
+
+  for (const ref of snapshot.__symbolTable.references) {
+    ref.startOffset += globalOffset;
+    ref.endOffset += globalOffset;
+    if (ref.fieldNameStartOffset != null) {
+      ref.fieldNameStartOffset += globalOffset;
+      ref.fieldNameEndOffset += globalOffset;
+    }
+    if (ref.args) {
+      for (const arg of Object.values(ref.args)) {
+        if (arg && arg.startOffset != null) {
+          arg.startOffset += globalOffset;
+          arg.endOffset += globalOffset;
+        }
+      }
+    }
+    if (ref.dataKeys) {
+      for (const dk of ref.dataKeys) {
+        if (dk.startOffset != null) {
+          dk.startOffset += globalOffset;
+          dk.endOffset += globalOffset;
+        }
+      }
+    }
+  }
+
+  for (const decl of snapshot.__symbolTable.varDeclarations) {
+    if (decl.startOffset != null) {
+      decl.startOffset += globalOffset;
+      decl.endOffset += globalOffset;
+    }
+  }
+}
+
+/**
+ * Parse a multidoc or single-doc XanoScript text.
+ * Detects `\n---\n` separator. If absent, delegates to xanoscriptParser as-is.
+ * If present, splits, parses each segment, offsets positions, and merges results.
+ * @param {string} text - The full document text
+ * @returns {Object} Merged parser result
+ */
+export function multidocParser(text) {
+  if (!text.includes(SEPARATOR)) {
+    // Single document — delegate as-is
+    const parser = xanoscriptParser(text);
+    return snapshotParser(parser);
+  }
+
+  const segments = text.split(SEPARATOR);
+  const results = [];
+  let globalOffset = 0;
+
+  for (const segmentText of segments) {
+    const parser = xanoscriptParser(segmentText);
+    const snapshot = snapshotParser(parser);
+
+    // Variable validation with segment-local offsets and tokens
+    const segLexResult = lexDocument(segmentText);
+    if (snapshot.__symbolTable?.varDeclarations) {
+      const varResult = validateVariables(
+        snapshot.__symbolTable,
+        segLexResult.tokens,
+      );
+      for (const warning of varResult.warnings) {
+        snapshot.warnings.push({
+          message: warning.message,
+          token: {
+            startOffset: warning.startOffset,
+            endOffset: warning.endOffset,
+          },
+        });
+      }
+      for (const hint of varResult.hints) {
+        snapshot.hints.push({
+          message: hint.message,
+          token: {
+            startOffset: hint.startOffset,
+            endOffset: hint.endOffset,
+          },
+        });
+      }
+    }
+
+    // Save a copy of the segment's symbol table before offsetting (for workspace indexing and hover)
+    const segmentSymbolTable = snapshot.__symbolTable
+      ? { input: { ...snapshot.__symbolTable.input } }
+      : null;
+    // Deep-copy the snapshot before offsetResult mutates it (needed for hover providers)
+    const localSnapshot = JSON.parse(JSON.stringify(snapshot));
+    results.push({ snapshot, localSnapshot, segmentText, segmentSymbolTable, globalOffset });
+    globalOffset += segmentText.length + SEPARATOR_LENGTH;
+  }
+
+  // For now, merge without offsetting (next task)
+  const merged = {
+    errors: [],
+    warnings: [],
+    informations: [],
+    hints: [],
+    __symbolTable: {
+      input: {},
+      var: {},
+      auth: {},
+      env: {},
+      references: [],
+      varDeclarations: [],
+    },
+    isMultidoc: true,
+    segmentCount: segments.length,
+  };
+
+  for (const { snapshot, globalOffset } of results) {
+    offsetResult(snapshot, globalOffset);
+    merged.errors.push(...snapshot.errors);
+    merged.warnings.push(...snapshot.warnings);
+    merged.informations.push(...snapshot.informations);
+    merged.hints.push(...snapshot.hints);
+    if (snapshot.__symbolTable) {
+      merged.__symbolTable.references.push(
+        ...snapshot.__symbolTable.references,
+      );
+      merged.__symbolTable.varDeclarations.push(
+        ...snapshot.__symbolTable.varDeclarations,
+      );
+    }
+  }
+
+  // Build local workspace index from all segments for cross-reference validation
+  const localIndex = new WorkspaceIndex();
+  for (let i = 0; i < results.length; i++) {
+    const { segmentText, segmentSymbolTable } = results[i];
+    localIndex.addParsed(`multidoc#${i}`, segmentText, segmentSymbolTable);
+  }
+
+  // Validate references against local index only (self-contained)
+  if (merged.__symbolTable.references.length > 0) {
+    const crossRefWarnings = crossFileValidate(
+      merged.__symbolTable.references,
+      localIndex,
+    );
+    for (const warning of crossRefWarnings) {
+      merged.warnings.push({
+        message: warning.message,
+        token: {
+          startOffset: warning.startOffset,
+          endOffset: warning.endOffset,
+        },
+      });
+    }
+  }
+
+  // Store segment info for workspace indexing and hover support
+  merged.segments = results.map(({ segmentText, segmentSymbolTable, localSnapshot, globalOffset }) => ({
+    text: segmentText,
+    symbolTable: segmentSymbolTable,
+    parser: localSnapshot,
+    globalOffset,
+  }));
+
+  return merged;
+}