bare-script 2.1.0 → 2.1.1

package/README.md

@@ -33,7 +33,7 @@ import {parseScript} from 'bare-script/lib/parser.js';
 // Parse the script
 const script = parseScript(`\
 # Double a number
-function double(n)
+function double(n):
     return n * 2
 endfunction
 
@@ -58,9 +58,9 @@ This outputs:
 includes a set of built-in functions for mathematical operations, object manipulation, array
 manipulation, regular expressions, HTTP fetch and more. The following example demonstrates the use
 of the
-[systemFetch](https://craigahobbs.github.io/bare-script/library/#var.vName='systemFetch'),
-[objectGet](https://craigahobbs.github.io/bare-script/library/#var.vName='objectGet'), and
-[arrayLength](https://craigahobbs.github.io/bare-script/library/#var.vName='arrayLength')
+[systemFetch](https://craigahobbs.github.io/bare-script/library/#var.vGroup='System'&systemfetch),
+[objectGet](https://craigahobbs.github.io/bare-script/library/#var.vGroup='Object'&objectget), and
+[arrayLength](https://craigahobbs.github.io/bare-script/library/#var.vGroup='Array'&arraylength)
 functions.
 
 ~~~ javascript
@@ -134,7 +134,7 @@ bare script.bare
 ~~~
 
 **Note:** In the BareScript CLI, import statements and the
-[systemFetch](https://craigahobbs.github.io/bare-script/library/#var.vName='systemFetch')
+[systemFetch](https://craigahobbs.github.io/bare-script/library/#var.vGroup='System'&systemfetch)
 function read non-URL paths from the local file system.
 
 

package/lib/model.js

@@ -79,6 +79,9 @@ struct FunctionStatement
     # The function's argument names
     optional string[len > 0] args
 
+    # If true, the function's last argument is the array of all remaining arguments
+    optional bool lastArgArray
+
     # The function's statements
     ScriptStatement[] statements
 

package/lib/parser.js

@@ -9,8 +9,10 @@ const rScriptLineSplit = /\r?\n/;
 const rScriptContinuation = /\\\s*$/;
 const rScriptComment = /^\s*(?:#.*)?$/;
 const rScriptAssignment = /^\s*(?<name>[A-Za-z_]\w*)\s*=\s*(?<expr>.+)$/;
-const rScriptFunctionBegin =
-    /^\s*(?:(?<async>async)\s+)?function\s+(?<name>[A-Za-z_]\w*)\s*\(\s*(?<args>[A-Za-z_]\w*(?:\s*,\s*[A-Za-z_]\w*)*)?\s*\)\s*$/;
+const rScriptFunctionBegin = new RegExp(
+    '^(?<async>\\s*async)?\\s*function\\s+(?<name>[A-Za-z_]\\w*)\\s*\\(' +
+        '\\s*(?<args>[A-Za-z_]\\w*(?:\\s*,\\s*[A-Za-z_]\\w*)*)?(?<lastArgArray>\\s*\\.\\.\\.)?\\s*\\)(?:\\s*:)?\\s*$'
+);
 const rScriptFunctionArgSplit = /\s*,\s*/;
 const rScriptFunctionEnd = /^\s*endfunction\s*$/;
 const rScriptLabel = /^\s*(?<name>[A-Za-z_]\w*)\s*:\s*$/;
@@ -119,14 +121,18 @@ export function parseScript(scriptText, startLineNumber = 1) {
             functionDef = {
                 'function': {
                     'name': matchFunctionBegin.groups.name,
-                    'args': typeof matchFunctionBegin.groups.args !== 'undefined'
-                        ? matchFunctionBegin.groups.args.split(rScriptFunctionArgSplit) : [],
                     'statements': []
                 }
             };
-            if (matchFunctionBegin.groups.async === 'async') {
+            if (typeof matchFunctionBegin.groups.args !== 'undefined') {
+                functionDef.function.args = matchFunctionBegin.groups.args.split(rScriptFunctionArgSplit);
+            }
+            if (typeof matchFunctionBegin.groups.async !== 'undefined') {
                 functionDef.function.async = true;
             }
+            if (typeof matchFunctionBegin.groups.lastArgArray !== 'undefined') {
+                functionDef.function.lastArgArray = true;
+            }
             statements.push(functionDef);
             continue;
         }

package/lib/runtime.js

@@ -134,8 +134,11 @@ export function executeScriptHelper(statements, options, locals) {
                 const funcLocals = {};
                 if ('args' in statement.function) {
                     const argsLength = args.length;
-                    for (let ixArg = 0; ixArg < statement.function.args.length; ixArg++) {
-                        funcLocals[statement.function.args[ixArg]] = (ixArg < argsLength ? args[ixArg] : null);
+                    const funcArgsLength = statement.function.args.length;
+                    const ixArgLast = (statement.function.lastArgArray ?? null) && (funcArgsLength - 1);
+                    for (let ixArg = 0; ixArg < funcArgsLength; ixArg++) {
+                        const argName = statement.function.args[ixArg];
+                        funcLocals[argName] = (ixArg < argsLength ? (ixArg === ixArgLast ? args.slice(ixArg) : args[ixArg]) : null);
                     }
                 }
                 return executeScriptHelper(statement.function.statements, fnOptions, funcLocals);

package/lib/runtimeAsync.js

@@ -104,8 +104,11 @@ async function executeScriptHelperAsync(statements, options, locals) {
                     const funcLocals = {};
                     if ('args' in statement.function) {
                         const argsLength = args.length;
-                        for (let ixArg = 0; ixArg < statement.function.args.length; ixArg++) {
-                            funcLocals[statement.function.args[ixArg]] = (ixArg < argsLength ? args[ixArg] : null);
+                        const funcArgsLength = statement.function.args.length;
+                        const ixArgLast = (statement.function.lastArgArray ?? null) && (funcArgsLength - 1);
+                        for (let ixArg = 0; ixArg < funcArgsLength; ixArg++) {
+                            const argName = statement.function.args[ixArg];
+                            funcLocals[argName] = (ixArg < argsLength ? (ixArg === ixArgLast ? args.slice(ixArg) : args[ixArg]) : null);
                         }
                     }
                     return executeScriptHelperAsync(statement.function.statements, fnOptions, funcLocals);
@@ -115,8 +118,11 @@ async function executeScriptHelperAsync(statements, options, locals) {
                     const funcLocals = {};
                     if ('args' in statement.function) {
                         const argsLength = args.length;
-                        for (let ixArg = 0; ixArg < statement.function.args.length; ixArg++) {
-                            funcLocals[statement.function.args[ixArg]] = (ixArg < argsLength ? args[ixArg] : null);
+                        const funcArgsLength = statement.function.args.length;
+                        const ixArgLast = (statement.function.lastArgArray ?? null) && (funcArgsLength - 1);
+                        for (let ixArg = 0; ixArg < funcArgsLength; ixArg++) {
+                            const argName = statement.function.args[ixArg];
+                            funcLocals[argName] = (ixArg < argsLength ? (ixArg === ixArgLast ? args.slice(ixArg) : args[ixArg]) : null);
                         }
                     }
                     return executeScriptHelper(statement.function.statements, fnOptions, funcLocals);

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "bare-script",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",