@xano/xanoscript-language-server 11.12.0 → 11.12.2

package/parser/multidoc.js

@@ -6,6 +6,7 @@ import { validateVariables } from "./variableValidator.js";
 
 const SEPARATOR = "\n---\n";
 const SEPARATOR_LENGTH = 5;
+const SEPARATOR_NEWLINES = 2; // number of \n characters in SEPARATOR
 
 /**
  * Find the segment that contains the given global offset.
@@ -38,6 +39,23 @@ export function findSegmentAtOffset(parserResult, offset) {
   return null;
 }
 
+/**
+ * Snapshot a Chevrotain token (or minimal token-like object) into a plain object.
+ * @param {Object|null} token
+ * @returns {Object|null}
+ */
+function snapshotToken(token) {
+  if (!token) return null;
+  return {
+    startOffset: token.startOffset,
+    endOffset: token.endOffset,
+    startLine: token.startLine,
+    startColumn: token.startColumn,
+    image: token.image,
+    tokenTypeName: token.tokenType?.name,
+  };
+}
+
 /**
  * Snapshot parser state into a plain object.
  * Must be called immediately after xanoscriptParser() before parsing next segment,
@@ -49,28 +67,22 @@ function snapshotParser(parser) {
   return {
     errors: parser.errors.map((e) => ({
       message: e.message,
-      token: e.token
-        ? { startOffset: e.token.startOffset, endOffset: e.token.endOffset }
-        : null,
+      token: snapshotToken(e.token),
+      previousToken: snapshotToken(e.previousToken),
     })),
     warnings: parser.warnings.map((w) => ({
       message: w.message,
-      token: w.token
-        ? { startOffset: w.token.startOffset, endOffset: w.token.endOffset }
-        : null,
+      token: snapshotToken(w.token),
     })),
     informations: parser.informations.map((i) => ({
       message: i.message,
-      token: i.token
-        ? { startOffset: i.token.startOffset, endOffset: i.token.endOffset }
-        : null,
+      token: snapshotToken(i.token),
     })),
     hints: parser.hints.map((h) => ({
       message: h.message,
-      token: h.token
-        ? { startOffset: h.token.startOffset, endOffset: h.token.endOffset }
-        : null,
+      token: snapshotToken(h.token),
     })),
+    sectionStack: [...parser.sectionStack],
     __symbolTable: parser.__symbolTable
       ? {
           input: { ...parser.__symbolTable.input },
@@ -94,17 +106,24 @@ function snapshotParser(parser) {
  * 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
+ * @param {number} lineOffset - The line number offset to add
  */
-function offsetResult(snapshot, globalOffset) {
+function offsetResult(snapshot, globalOffset, lineOffset) {
   if (globalOffset === 0) return;
 
   const offsetToken = (token) => {
     if (!token) return;
     token.startOffset += globalOffset;
     token.endOffset += globalOffset;
+    if (token.startLine != null) {
+      token.startLine += lineOffset;
+    }
   };
 
-  for (const err of snapshot.errors) offsetToken(err.token);
+  for (const err of snapshot.errors) {
+    offsetToken(err.token);
+    offsetToken(err.previousToken);
+  }
   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);
@@ -161,6 +180,7 @@ export function multidocParser(text) {
   const segments = text.split(SEPARATOR);
   const results = [];
   let globalOffset = 0;
+  let lineOffset = 0;
 
   for (const segmentText of segments) {
     const parser = xanoscriptParser(segmentText);
@@ -199,8 +219,9 @@ export function multidocParser(text) {
       : 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 });
+    results.push({ snapshot, localSnapshot, segmentText, segmentSymbolTable, globalOffset, lineOffset });
     globalOffset += segmentText.length + SEPARATOR_LENGTH;
+    lineOffset += (segmentText.match(/\n/g) || []).length + SEPARATOR_NEWLINES;
   }
 
   // For now, merge without offsetting (next task)
@@ -221,8 +242,8 @@ export function multidocParser(text) {
     segmentCount: segments.length,
   };
 
-  for (const { snapshot, globalOffset } of results) {
-    offsetResult(snapshot, globalOffset);
+  for (const { snapshot, globalOffset, lineOffset } of results) {
+    offsetResult(snapshot, globalOffset, lineOffset);
     merged.errors.push(...snapshot.errors);
     merged.warnings.push(...snapshot.warnings);
     merged.informations.push(...snapshot.informations);

package/parser/multidoc.spec.js

@@ -299,6 +299,10 @@ function bar {
     var.update $x {
       value = 2
     }
+      
+    var $y {
+      value = 2
+    }
   }
 
   response = null
@@ -691,7 +695,9 @@ function bar {
       // The error must be within seg3's global range
       const error = result.errors[0];
       expect(error.token.startOffset).to.be.at.least(expectedSeg3Start);
-      expect(error.token.startOffset).to.be.lessThan(expectedSeg3Start + seg3.length);
+      expect(error.token.startOffset).to.be.lessThan(
+        expectedSeg3Start + seg3.length,
+      );
     });
 
     it("should isolate errors — bad seg1 should not prevent seg2 from parsing", () => {

package/parser/query_parser.js

@@ -30,6 +30,7 @@ export function queryDeclaration($) {
     let hasTags = false;
     let hasApiGroup = false;
     let hasResponseType = false;
+    let responseType = "standard";
 
     const testNames = [];
 
@@ -80,8 +81,8 @@ export function queryDeclaration($) {
             $.CONSUME(ResponseTypeToken);
             $.CONSUME8(EqualToken);
             const valueToken = $.CONSUME2(StringLiteral);
-            const value = getVarName(valueToken);
-            if (!["stream", "standard"].includes(value)) {
+            responseType = getVarName(valueToken);
+            if (!["stream", "standard"].includes(responseType)) {
               $.addInvalidValueError(
                 valueToken,
                 "response_type must be either 'stream' or 'standard'",
@@ -193,10 +194,17 @@ export function queryDeclaration($) {
       $.addMissingError(parent, "{} is missing a stack clause");
     }
 
-    if (!hasResponse) {
+    if (!hasResponse && responseType === "standard") {
       $.addMissingError(parent, "{} is missing a response clause");
     }
 
+    if (hasResponse && responseType === "stream") {
+      $.addInvalidValueError(
+        parent,
+        "response clause is not allowed when response_type is 'stream'",
+      );
+    }
+
     $.MANY1(() => $.CONSUME1(NewlineToken)); // optional new line
     $.CONSUME(RCurly); // "}"
     $.MANY2(() => $.CONSUME2(NewlineToken)); // optional new line

package/parser/query_parser.spec.js

@@ -74,7 +74,6 @@ describe("query_parser", () => {
     expect(parser.errors).to.be.empty;
 
     parser = xanoscriptParser(`query foo verb=GET {
-
       response_type = "stream"
 
       input {
@@ -82,8 +81,6 @@ describe("query_parser", () => {
 
       stack {
       }
-
-      response = null
     }`);
     expect(parser.errors).to.be.empty;
   });

package/parser/tests/function/function_parser.spec.js

@@ -9,12 +9,12 @@ describe("Xanoscript Function Parser", () => {
   it("parses all the valid sources", () => {
     const errors = [];
     const files = readdirSync(
-      join(dirname("./"), "parser/tests/function/valid_sources")
+      join(dirname("./"), "parser/tests/function/valid_sources"),
     );
     files.forEach((file) => {
       const source = readFileSync(
         join(dirname("./"), "parser/tests/function/valid_sources", file),
-        "utf8"
+        "utf8",
       );
       const parser = xanoscriptParser(source);
 
@@ -26,7 +26,7 @@ describe("Xanoscript Function Parser", () => {
                   error.previousToken.image,
                   {
                     length: 20,
-                  }
+                  },
                 )})`
               : "N/A",
             file: `parser/tests/function/valid_sources/${file}:${error.token.startLine}:${error.token.startColumn}`,
@@ -36,7 +36,7 @@ describe("Xanoscript Function Parser", () => {
               error.token.image,
               {
                 length: 20,
-              }
+              },
             )})`,
           });
         });

package/parser/tests/query/query_parser.spec.js

@@ -9,13 +9,13 @@ describe("Xanoscript Query Parser", () => {
   it("parses all the valid sources", () => {
     const errors = [];
     const files = readdirSync(
-      join(dirname("./"), "parser/tests/query/valid_sources")
+      join(dirname("./"), "parser/tests/query/valid_sources"),
     );
 
     files.forEach((file) => {
       const source = readFileSync(
         join(dirname("./"), "parser/tests/query/valid_sources", file),
-        "utf8"
+        "utf8",
       );
       const parser = xanoscriptParser(source);
 
@@ -27,7 +27,7 @@ describe("Xanoscript Query Parser", () => {
                   error.previousToken.image,
                   {
                     length: 20,
-                  }
+                  },
                 )})`
               : "N/A",
             file: error.token

package/parser/tool_parser.js

@@ -111,15 +111,24 @@ export function toolDeclaration($) {
     });
 
     if (!hasInput) {
-      $.addMissingError(parent, "{} is missing an input clause");
+      $.addMissingError(
+        parent,
+        `{} ${nameToken.image} is missing an input clause`,
+      );
     }
 
     if (!hasStack) {
-      $.addMissingError(parent, "{} is missing a stack clause");
+      $.addMissingError(
+        parent,
+        `{} ${nameToken.image} is missing a stack clause`,
+      );
     }
 
     if (!hasResponse) {
-      $.addMissingError(parent, "{} is missing a response clause");
+      $.addMissingError(
+        parent,
+        `{} ${nameToken.image} is missing a response clause`,
+      );
     }
 
     $.MANY1(() => $.CONSUME1(NewlineToken)); // optional new line

package/parser/tool_parser.spec.js

@@ -19,15 +19,28 @@ describe("tool_parser", () => {
 
   it("should parse a basic a string tool url", () => {
     const parser = xanoscriptParser(`tool "foo/bar" {
-      input {
-      }
+  input {
+  }
 
-      stack {
-      }
+  stack {
+  }
 
-      response = null
-    }`);
+  response = null
+}`);
+
+    expect(parser.errors).to.be.empty;
+  });
+
+  it("should parse a tool with a string as a response", () => {
+    const parser = xanoscriptParser(`tool silent_exception {
+  input {
+  }
+
+  stack {
+  }
 
+  response = "something is wrong"
+}`);
     expect(parser.errors).to.be.empty;
   });