@xano/xanoscript-language-server 11.6.3 → 11.6.5

package/lexer/control.js

@@ -302,6 +302,13 @@ export const PipeToken = createUniqToken({
   label: "|",
 });
 
+// ..
+export const DoubleDotToken = createUniqToken({
+  name: "DoubleDotToken",
+  pattern: /\.\./,
+  label: "..",
+});
+
 // ,
 export const CommaToken = createUniqToken({
   name: "CommaToken",
@@ -471,6 +478,7 @@ export const JsonSearchToken = createUniqToken({
 });
 
 export const ControlTokens = [
+  DoubleDotToken,
   JsonNotBetweenToken,
   JsonNotContainsToken,
   JsonNotILikeToken,
@@ -626,6 +634,7 @@ export function mapTokenToType(token) {
     case Question.name:
     case ColonToken.name:
     case PipeToken.name:
+    case DoubleDotToken.name:
     case CommaToken.name:
       return "punctuation";
     default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xano/xanoscript-language-server",
-  "version": "11.6.3",
+  "version": "11.6.5",
   "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/varFn.spec.js

@@ -76,6 +76,20 @@ describe("varFn", () => {
     expect(parser.errors).to.be.empty;
   });
 
+  it("varFn allows range expressions", () => {
+    const parser = parse(`var $numbers {
+      value = (1..100)
+    }`);
+    expect(parser.errors).to.be.empty;
+  });
+
+  it("varFn allows range expressions with variables", () => {
+    const parser = parse(`var $numbers {
+      value = ($var.start..$end_var)
+    }`);
+    expect(parser.errors).to.be.empty;
+  });
+
   it("varFn accepts a system env variable", () => {
     const parser = parse(`var $user {
       value = $env.$remote_ip

package/parser/generic/expressionFn.js

@@ -3,6 +3,7 @@ import {
   AndTestToken,
   ColonToken,
   Divide,
+  DoubleDotToken,
   GreaterThan,
   GreaterThanOrEq,
   IsEqual,
@@ -263,6 +264,7 @@ export function expressionTestFn($) {
       { ALT: () => $.CONSUME(Multiply) }, // "*"
       { ALT: () => $.CONSUME(Divide) }, // "/"
       { ALT: () => $.CONSUME(Modulus) }, // "%"
+      { ALT: () => $.CONSUME(DoubleDotToken) }, // ".."
       { ALT: () => $.CONSUME(NullishCoalescingToken) }, // "??"
       { ALT: () => $.CONSUME(AndTestToken) }, // "&&"
       { ALT: () => $.CONSUME(OrTestToken) }, // "||"

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;
   });