@xano/xanoscript-language-server 11.11.0 → 11.12.1

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 = [];
 
@@ -43,6 +44,7 @@ export function queryDeclaration($) {
       { ALT: () => $.CONSUME(Identifier) }, // foo
     ]);
 
+    $.validateDeclarationName(nameToken, "query");
     if (nameToken?.image && getVarName(nameToken).startsWith("/")) {
       $.addInvalidValueError(nameToken, "query name must not start with '/'");
     }
@@ -79,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'",
@@ -192,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

@@ -16,6 +16,20 @@ describe("query_parser", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("should raise an error when a query name is empty", () => {
+    const parser = xanoscriptParser(`query "" verb=GET {
+      input {
+      }
+
+      stack {
+      }
+
+      response = null
+    }`);
+    expect(parser.errors).to.not.be.empty;
+    expect(parser.errors[0].message).to.include("must not be empty");
+  });
+
   it("should raise an error when a query starts with /", () => {
     const parser = xanoscriptParser(`query "/foo" verb=GET {
       input {
@@ -60,7 +74,6 @@ describe("query_parser", () => {
     expect(parser.errors).to.be.empty;
 
     parser = xanoscriptParser(`query foo verb=GET {
-
       response_type = "stream"
 
       input {
@@ -68,8 +81,6 @@ describe("query_parser", () => {
 
       stack {
       }
-
-      response = null
     }`);
     expect(parser.errors).to.be.empty;
   });

package/parser/realtime_channel_parser.js

@@ -9,10 +9,11 @@ export function realtimeChannelDeclaration($) {
     $.SUBRULE($.optionalCommentBlockFn);
 
     const parent = $.CONSUME(RealtimeChannelToken); // realtime_channel
-    $.OR([
+    const nameToken = $.OR([
       { ALT: () => $.CONSUME(StringLiteral) },
       { ALT: () => $.CONSUME(Identifier) },
     ]);
+    $.validateDeclarationName(nameToken, "realtime_channel");
 
     $.SUBRULE($.schemaParseAttributeFn, {
       ARGS: [

package/parser/realtime_trigger_parser.js

@@ -25,10 +25,11 @@ export function realtimeTriggerDeclaration($) {
     $.SUBRULE($.optionalCommentBlockFn);
 
     const parent = $.CONSUME(RealtimeTriggerToken); // realtime_trigger
-    $.OR([
+    const nameToken = $.OR([
       { ALT: () => $.CONSUME(StringLiteral) },
       { ALT: () => $.CONSUME(Identifier) },
     ]);
+    $.validateDeclarationName(nameToken, "realtime_trigger");
     $.CONSUME(LCurly); // "{"
     $.MANY(() => {
       $.AT_LEAST_ONE(() => $.CONSUME(NewlineToken)); // at least one new line

package/parser/run_parser.js

@@ -25,10 +25,11 @@ export function runJobClause($) {
   return () => {
     const parent = $.CONSUME(JobToken); // "job"
 
-    $.OR([
+    const nameToken = $.OR([
       { ALT: () => $.CONSUME(StringLiteral) },
       { ALT: () => $.CONSUME(Identifier) },
     ]);
+    $.validateDeclarationName(nameToken, "job");
 
     $.SUBRULE($.schemaParseAttributeFn, {
       ARGS: [
@@ -49,10 +50,11 @@ export function runServiceClause($) {
   return () => {
     const parent = $.CONSUME(ServiceToken); // "service"
 
-    $.OR([
+    const nameToken = $.OR([
       { ALT: () => $.CONSUME(StringLiteral) },
       { ALT: () => $.CONSUME(Identifier) },
     ]);
+    $.validateDeclarationName(nameToken, "service");
 
     $.SUBRULE($.schemaParseAttributeFn, {
       ARGS: [

package/parser/table_parser.js

@@ -25,7 +25,7 @@ export function tableDeclaration($) {
     $.SUBRULE($.optionalCommentBlockFn);
 
     $.CONSUME(TableToken); // "table"
-    $.OR1([
+    const nameToken = $.OR1([
       {
         ALT: () =>
           $.CONSUME(StringLiteral, {
@@ -39,6 +39,7 @@ export function tableDeclaration($) {
           }),
       },
     ]);
+    $.validateDeclarationName(nameToken, "table");
 
     let hasSchema = false;
     let hasView = false;

package/parser/table_trigger_parser.js

@@ -30,10 +30,11 @@ export function tableTriggerDeclaration($) {
     $.SUBRULE($.optionalCommentBlockFn);
 
     const parent = $.CONSUME(TableTriggerToken); // table_trigger
-    $.OR([
+    const nameToken = $.OR([
       { ALT: () => $.CONSUME(StringLiteral) },
       { ALT: () => $.CONSUME(Identifier) },
     ]);
+    $.validateDeclarationName(nameToken, "table_trigger");
     $.CONSUME(LCurly); // "{"
     $.MANY(() => {
       $.AT_LEAST_ONE(() => $.CONSUME(NewlineToken)); // at least one new line

package/parser/task_parser.js

@@ -25,10 +25,11 @@ export function taskDeclaration($) {
     $.SUBRULE($.optionalCommentBlockFn);
 
     $.CONSUME(TaskToken);
-    $.OR([
+    const nameToken = $.OR([
       { ALT: () => $.CONSUME(StringLiteral) },
       { ALT: () => $.CONSUME(Identifier) },
     ]);
+    $.validateDeclarationName(nameToken, "task");
     $.CONSUME(LCurly); // "{"
     $.MANY(() => {
       $.AT_LEAST_ONE(() => $.CONSUME(NewlineToken)); // at least one new line

package/parser/task_parser.spec.js

@@ -13,6 +13,17 @@ describe("task_parser", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("should raise an error when a task name is empty", () => {
+    const parser = xanoscriptParser(`task "" {
+  stack {
+  }
+
+  schedule = []
+}`);
+    expect(parser.errors).to.not.be.empty;
+    expect(parser.errors[0].message).to.include("must not be empty");
+  });
+
   it("should parse an active task", () => {
     const parser = xanoscriptParser(`task task_for_listing {
   active = true

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/multidoc/multidoc_parser.spec.js

@@ -0,0 +1,55 @@
+import { expect } from "chai";
+import { readdirSync, readFileSync } from "fs";
+import { truncate } from "lodash-es";
+import { describe, it } from "mocha";
+import { dirname, join } from "path";
+import { multidocParser } from "../../multidoc.js";
+
+describe("Xanoscript multidoc Parser", () => {
+  it("parses all the valid sources", () => {
+    const errors = [];
+    const files = readdirSync(
+      join(dirname("./"), "parser/tests/multidoc/valid_sources"),
+    );
+
+    files.forEach((file) => {
+      const source = readFileSync(
+        join(dirname("./"), "parser/tests/multidoc/valid_sources", file),
+        "utf8",
+      );
+      const parser = multidocParser(source);
+
+      if (parser.errors.length > 0) {
+        parser.errors.forEach((error) => {
+          errors.push({
+            previous: error.previousToken
+              ? `${error.previousToken.tokenTypeName} (${truncate(
+                  error.previousToken.image,
+                  {
+                    length: 20,
+                  },
+                )})`
+              : "N/A",
+            file: error.token
+              ? `parser/tests/multidoc/valid_sources/${file}:${error.token.startLine}:${error.token.startColumn}`
+              : `parser/tests/multidoc/valid_sources/${file}`,
+            stack:
+              parser.sectionStack?.[parser.sectionStack.length - 1] ?? "N/A",
+            message: truncate(error.message, { length: 50 }),
+            token: error.token
+              ? `${error.token.tokenTypeName} (${truncate(error.token.image, {
+                  length: 20,
+                })})`
+              : "N/A",
+          });
+        });
+      }
+    });
+
+    if (errors.length > 0) {
+      console.table(errors);
+    }
+
+    expect(errors).to.be.empty;
+  });
+});