@xano/xanoscript-language-server 11.6.2 → 11.6.4

package/package.json

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

package/parser/function_parser.js

@@ -3,6 +3,7 @@ import { LCurly, RCurly } from "../lexer/control.js";
 import { FunctionToken } from "../lexer/function.js";
 import { StringLiteral } from "../lexer/literal.js";
 import { Identifier, NewlineToken } from "../lexer/tokens.js";
+import { getVarName } from "./generic/utils.js";
 
 export function functionDeclaration($) {
   return () => {
@@ -22,10 +23,15 @@ export function functionDeclaration($) {
     // Allow leading comments and newlines before the function declaration
     $.SUBRULE($.optionalCommentBlockFn);
     const parent = $.CONSUME(FunctionToken);
-    $.OR([
+    const nameToken = $.OR([
       { ALT: () => $.CONSUME(Identifier) },
       { ALT: () => $.CONSUME(StringLiteral) },
     ]);
+
+    if (nameToken?.image && getVarName(nameToken).startsWith("/")) {
+      $.addInvalidValueError(nameToken, "function name must not start with '/'");
+    }
+
     $.CONSUME(LCurly); // "{"
     $.MANY(() => {
       $.AT_LEAST_ONE(() => $.CONSUME(NewlineToken)); // at least one new line

package/parser/function_parser.spec.js

@@ -16,6 +16,19 @@ describe("function_parser", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("should raise an error when a function name starts with /", () => {
+    const parser = xanoscriptParser(`function "/foo" {
+      input {
+      }
+
+      stack {
+      }
+
+      response = null
+    }`);
+    expect(parser.errors).to.not.be.empty;
+  });
+
   it("should parse a function with a test", () => {
     const parser = xanoscriptParser(`function foo {
       input {

package/parser/functions/controls/tryCatchFn.js

@@ -55,8 +55,7 @@ export function tryCatchFn($) {
     }
 
     if (!hasCatch) {
-      $.CONSUME(CatchToken);
-      $.SUBRULE($.nakedStackFn);
+      $.addWarning("try_catch without a catch block will not handle errors");
     }
 
     $.MANY1(() => $.CONSUME1(NewlineToken));

package/parser/functions/controls/tryCatchFn.spec.js

@@ -20,6 +20,18 @@ describe("tryCatchFn", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("tryCatchFn only try is required, catch and finally are optional", () => {
+    const parser = parse(`try_catch {
+      try {
+        var $x1 {
+          value = "try"
+        }
+      }
+    }`);
+    expect(parser.errors).to.be.empty;
+    expect(parser.warnings).to.not.be.empty;
+  });
+
   it("tryCatchFn try and catch can contain a stack", () => {
     const parser = parse(`try_catch {
       try {
@@ -166,7 +178,7 @@ describe("tryCatchFn", () => {
     expect(parser.errors).to.not.be.empty;
   });
 
-  it("tryCatchFn requires a catch block", () => {
+  it("tryCatchFn warns when catch block is missing", () => {
     const parser = parse(`try_catch {
       try {
         var $x1 {
@@ -174,6 +186,8 @@ describe("tryCatchFn", () => {
         }
       }
     }`);
-    expect(parser.errors).to.not.be.empty;
+    expect(parser.errors).to.be.empty;
+    expect(parser.warnings).to.not.be.empty;
+    expect(parser.warnings[0].message).to.include("catch");
   });
 });

package/parser/query_parser.js

@@ -37,10 +37,15 @@ export function queryDeclaration($) {
     $.SUBRULE($.optionalCommentBlockFn);
 
     const parent = $.CONSUME(QueryToken);
-    $.OR([
+    const nameToken = $.OR([
       { ALT: () => $.CONSUME(StringLiteral) }, // "foo/bar"
       { ALT: () => $.CONSUME(Identifier) }, // foo
     ]);
+
+    if (nameToken?.image && getVarName(nameToken).startsWith("/")) {
+      $.addInvalidValueError(nameToken, "query name must not start with '/'");
+    }
+
     $.CONSUME(VerbToken);
     $.CONSUME(EqualToken);
     $.OR1([

package/parser/query_parser.spec.js

@@ -16,6 +16,19 @@ describe("query_parser", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("should raise an error when a query starts with /", () => {
+    const parser = xanoscriptParser(`query "/foo" verb=GET {
+      input {
+      }
+
+      stack {
+      }
+
+      response = null
+    }`);
+    expect(parser.errors).to.not.be.empty;
+  });
+
   it("should accept an api_group", () => {
     const parser = xanoscriptParser(`query foo verb=GET {
       api_group = "Authentication";

package/parser/run_parser.js

@@ -36,7 +36,7 @@ export function runJobClause($) {
         {
           main: {
             name: "[string]",
-            input: { "[string]?": "[constant]" },
+            "input?": { "[string]?": "[constant]" },
           },
           "env?": ["[string]"],
         },

package/parser/run_parser.spec.js

@@ -5,7 +5,7 @@ import { xanoscriptParser } from "./parser.js";
 describe("run", () => {
   it("should parse a basic run.job", () => {
     const parser = xanoscriptParser(`run.job "Average of values" {
-      main = {name: "avg_value", input: {}}
+      main = {name: "avg_value"}
     }`);
     expect(parser.errors).to.be.empty;
   });