bare-script 2.1.0 → 2.2.0

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/data.js

@@ -0,0 +1,537 @@
+// Licensed under the MIT License
+// https://github.com/craigahobbs/bare-script/blob/main/LICENSE
+
+/** @module lib/data */
+
+import {evaluateExpression} from './runtime.js';
+import {jsonStringifySortKeys} from 'schema-markdown/lib/encode.js';
+import {parseExpression} from './parser.js';
+import {parseSchemaMarkdown} from 'schema-markdown/lib/parser.js';
+import {validateType} from 'schema-markdown/lib/schema.js';
+
+
+/**
+ * Parse and validate CSV text to a data array
+ *
+ * @param {string} text - The CSV text
+ * @returns {Object[]} The data array
+ */
+export function parseCSV(text) {
+    // Line-split the text
+    const lines = [];
+    if (typeof text === 'string') {
+        lines.push(...text.split(rCSVLineSplit));
+    } else {
+        for (const textPart of text) {
+            lines.push(...textPart.split(rCSVLineSplit));
+        }
+    }
+
+    // Split lines into rows
+    const rows = lines.filter((line) => !line.match(rCSVBlankLine)).map((line) => {
+        const row = [];
+        let linePart = line;
+        while (linePart !== '') {
+            // Quoted field?
+            const mQuoted = linePart.match(rCSVQuotedField) ?? linePart.match(rCSVQuotedFieldEnd);
+            if (mQuoted !== null) {
+                row.push(mQuoted[1].replaceAll(rCSVQuoteEscape, '"'));
+                linePart = linePart.slice(mQuoted[0].length);
+                continue;
+            }
+
+            // Non-quoted field
+            const ixComma = linePart.indexOf(',');
+            row.push(ixComma !== -1 ? linePart.slice(0, ixComma) : linePart);
+            linePart = (ixComma !== -1 ? linePart.slice(ixComma + 1) : '');
+        }
+        return row;
+    });
+
+    // Assemble the data rows
+    const result = [];
+    if (rows.length >= 2) {
+        const [fields] = rows;
+        for (let ixLine = 1; ixLine < rows.length; ixLine += 1) {
+            const row = rows[ixLine];
+            result.push(Object.fromEntries(fields.map(
+                (field, ixField) => [field, ixField < row.length ? row[ixField] : 'null']
+            )));
+        }
+    }
+
+    return result;
+}
+
+const rCSVLineSplit = /\r?\n/;
+const rCSVBlankLine = /^\s*$/;
+const rCSVQuotedField = /^"((?:""|[^"])*)",/;
+const rCSVQuotedFieldEnd = /^"((?:""|[^"])*)"\s*$/;
+const rCSVQuoteEscape = /""/g;
+
+
+/**
+ * Determine data field types and parse/validate field values
+ *
+ * @param {Object[]} data - The data array. Row objects are updated with parsed/validated values.
+ * @param {boolean} [csv=false] - If true, parse number and null strings
+ * @returns {Object} The map of field name to field type ("datetime", "number", "string")
+ * @throws Throws an error if data is invalid
+ */
+export function validateData(data, csv = false) {
+    // Determine field types
+    const types = {};
+    for (const row of data) {
+        for (const [field, value] of Object.entries(row)) {
+            if (!(field in types)) {
+                if (typeof value === 'number') {
+                    types[field] = 'number';
+                } else if (value instanceof Date) {
+                    types[field] = 'datetime';
+                } else if (typeof value === 'string' && (!csv || value !== 'null')) {
+                    if (parseDatetime(value) !== null) {
+                        types[field] = 'datetime';
+                    } else if (csv && parseNumber(value) !== null) {
+                        types[field] = 'number';
+                    } else {
+                        types[field] = 'string';
+                    }
+                }
+            }
+        }
+    }
+
+    // Validate field values
+    const throwFieldError = (field, fieldType, fieldValue) => {
+        throw new Error(`Invalid "${field}" field value ${JSON.stringify(fieldValue)}, expected type ${fieldType}`);
+    };
+    for (const row of data) {
+        for (const [field, value] of Object.entries(row)) {
+            const fieldType = types[field];
+
+            // Null string?
+            if (csv && value === 'null') {
+                row[field] = null;
+
+            // Number field
+            } else if (fieldType === 'number') {
+                if (csv && typeof value === 'string') {
+                    const numberValue = parseNumber(value);
+                    if (numberValue === null) {
+                        throwFieldError(field, fieldType, value);
+                    }
+                    row[field] = numberValue;
+                } else if (value !== null && typeof value !== 'number') {
+                    throwFieldError(field, fieldType, value);
+                }
+
+            // Datetime field
+            } else if (fieldType === 'datetime') {
+                if (typeof value === 'string') {
+                    const datetimeValue = parseDatetime(value);
+                    if (datetimeValue === null) {
+                        throwFieldError(field, fieldType, value);
+                    }
+                    row[field] = datetimeValue;
+                } else if (value !== null && !(value instanceof Date)) {
+                    throwFieldError(field, fieldType, value);
+                }
+
+            // String field
+            } else {
+                if (value !== null && typeof value !== 'string') {
+                    throwFieldError(field, fieldType, value);
+                }
+            }
+        }
+    }
+
+    return types;
+}
+
+
+function parseNumber(text) {
+    const value = Number.parseFloat(text);
+    if (Number.isNaN(value) || !Number.isFinite(value)) {
+        return null;
+    }
+    return value;
+}
+
+
+export function parseDatetime(text) {
+    if (rDate.test(text)) {
+        const localDate = new Date(text);
+        return new Date(localDate.getUTCFullYear(), localDate.getUTCMonth(), localDate.getUTCDate());
+    } else if (rDatetime.test(text)) {
+        return new Date(text);
+    }
+    return null;
+}
+
+const rDate = /^\d{4}-\d{2}-\d{2}$/;
+const rDatetime = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{3})?(?:Z|[+-]\d{2}:\d{2})$/;
+
+
+/**
+ * Join two data arrays
+ *
+ * @param {Object} leftData - The left data array
+ * @param {Object} rightData - The left data array
+ * @param {string} joinExpr - The join [expression]{@link https://craigahobbs.github.io/bare-script/language/#expressions}
+ * @param {?string} [rightExpr = null] - The right join [expression]{@link https://craigahobbs.github.io/bare-script/language/#expressions}
+ * @param {boolean} [isLeftJoin = false] - If true, perform a left join (always include left row)
+ * @param {?Object} [variables = null] - Additional variables for expression evaluation
+ * @param {?Object} [options = null] - The [script execution options]{@link module:lib/runtime~ExecuteScriptOptions}
+ * @returns {Object[]} The joined data array
+ */
+export function joinData(leftData, rightData, joinExpr, rightExpr = null, isLeftJoin = false, variables = null, options = null) {
+    // Compute the map of row field name to joined row field name
+    const leftNames = {};
+    for (const row of leftData) {
+        for (const fieldName of Object.keys(row)) {
+            if (!(fieldName in leftNames)) {
+                leftNames[fieldName] = fieldName;
+            }
+        }
+    }
+    const rightNames = {};
+    for (const row of rightData) {
+        for (const fieldName of Object.keys(row)) {
+            if (!(fieldName in rightNames)) {
+                if (!(fieldName in leftNames)) {
+                    rightNames[fieldName] = fieldName;
+                } else {
+                    let uniqueName = fieldName;
+                    let ixUnique = 2;
+                    do {
+                        uniqueName = `${fieldName}${ixUnique}`;
+                        ixUnique += 1;
+                    } while (uniqueName in leftNames || uniqueName in rightNames);
+                    rightNames[fieldName] = uniqueName;
+                }
+            }
+        }
+    }
+
+    // Create the evaluation options object
+    let evalOptions = options;
+    if (variables !== null) {
+        evalOptions = (options !== null ? {...options} : {});
+        if ('globals' in evalOptions) {
+            evalOptions.globals = {...evalOptions.globals, ...variables};
+        } else {
+            evalOptions.globals = variables;
+        }
+    }
+
+    // Parse the left and right expressions
+    const leftExpression = parseExpression(joinExpr);
+    const rightExpression = (rightExpr !== null ? parseExpression(rightExpr) : leftExpression);
+
+    // Bucket the right rows by the right expression value
+    const rightCategoryRows = {};
+    for (const rightRow of rightData) {
+        const categoryKey = jsonStringifySortKeys(evaluateExpression(rightExpression, evalOptions, rightRow));
+        if (!(categoryKey in rightCategoryRows)) {
+            rightCategoryRows[categoryKey] = [];
+        }
+        rightCategoryRows[categoryKey].push(rightRow);
+    }
+
+    // Join the left with the right
+    const data = [];
+    for (const leftRow of leftData) {
+        const categoryKey = jsonStringifySortKeys(evaluateExpression(leftExpression, evalOptions, leftRow));
+        if (categoryKey in rightCategoryRows) {
+            for (const rightRow of rightCategoryRows[categoryKey]) {
+                const joinRow = {...leftRow};
+                for (const [rightName, rightValue] of Object.entries(rightRow)) {
+                    joinRow[rightNames[rightName]] = rightValue;
+                }
+                data.push(joinRow);
+            }
+        } else if (!isLeftJoin) {
+            data.push({...leftRow});
+        }
+    }
+
+    return data;
+}
+
+
+/**
+ * Add a calculated field to each row of a data array
+ *
+ * @param {Object[]} data - The data array. Row objects are updated with the calculated field values.
+ * @param {string} fieldName - The calculated field name
+ * @param {string} expr - The calculated field expression
+ * @param {?Object} [variables = null] -  Additional variables for expression evaluation
+ * @param {?Object} [options = null] - The [script execution options]{@link module:lib/runtime~ExecuteScriptOptions}
+ * @returns {Object[]} The updated data array
+ */
+export function addCalculatedField(data, fieldName, expr, variables = null, options = null) {
+    // Parse the calculation expression
+    const calcExpr = parseExpression(expr);
+
+    // Create the evaluation options object
+    let evalOptions = options;
+    if (variables !== null) {
+        evalOptions = (options !== null ? {...options} : {});
+        if ('globals' in evalOptions) {
+            evalOptions.globals = {...evalOptions.globals, ...variables};
+        } else {
+            evalOptions.globals = variables;
+        }
+    }
+
+    // Compute the calculated field for each row
+    for (const row of data) {
+        row[fieldName] = evaluateExpression(calcExpr, evalOptions, row);
+    }
+    return data;
+}
+
+
+/**
+ * Filter data rows
+ *
+ * @param {Object[]} data - The data array
+ * @param {string} expr - The boolean filter [expression]{@link https://craigahobbs.github.io/bare-script/language/#expressions}
+ * @param {?Object} [variables = null] -  Additional variables for expression evaluation
+ * @param {?Object} [options = null] - The [script execution options]{@link module:lib/runtime~ExecuteScriptOptions}
+ * @returns {Object[]} The filtered data array
+ */
+export function filterData(data, expr, variables = null, options = null) {
+    const result = [];
+
+    // Parse the filter expression
+    const filterExpr = parseExpression(expr);
+
+    // Create the evaluation options object
+    let evalOptions = options;
+    if (variables !== null) {
+        evalOptions = (options !== null ? {...options} : {});
+        if ('globals' in evalOptions) {
+            evalOptions.globals = {...evalOptions.globals, ...variables};
+        } else {
+            evalOptions.globals = variables;
+        }
+    }
+
+    // Filter the data
+    for (const row of data) {
+        if (evaluateExpression(filterExpr, evalOptions, row)) {
+            result.push(row);
+        }
+    }
+
+    return result;
+}
+
+
+// The aggregation model
+export const aggregationTypes = parseSchemaMarkdown(`\
+group "Aggregation"
+
+
+# A data aggregation specification
+struct Aggregation
+
+    # The aggregation category fields
+    optional string[len > 0] categories
+
+    # The aggregation measures
+    AggregationMeasure[len > 0] measures
+
+
+# An aggregation measure specification
+struct AggregationMeasure
+
+    # The aggregation measure field
+    string field
+
+    # The aggregation function
+    AggregationFunction function
+
+    # The aggregated-measure field name
+    optional string name
+
+
+# An aggregation function
+enum AggregationFunction
+
+    # The average of the measure's values
+    average
+
+    # The count of the measure's values
+    count
+
+    # The greatest of the measure's values
+    max
+
+    # The least of the measure's values
+    min
+
+    # The sum of the measure's values
+    sum
+`);
+
+
+/**
+ * Validate an aggregation model
+ *
+ * @param {Object} aggregation - The
+ *     [aggregation model]{@link https://craigahobbs.github.io/bare-script/library/model.html#var.vName='Aggregation'}
+ * @returns {Object} The validated
+ *     [aggregation model]{@link https://craigahobbs.github.io/bare-script/library/model.html#var.vName='Aggregation'}
+ * @throws [ValidationError]{@link https://craigahobbs.github.io/schema-markdown-js/module-lib_schema.ValidationError.html}
+ */
+export function validateAggregation(aggregation) {
+    return validateType(aggregationTypes, 'Aggregation', aggregation);
+}
+
+
+/**
+ * Aggregate data rows
+ *
+ * @param {Object[]} data - The data array
+ * @param {Object} aggregation - The
+ *     [aggregation model]{@link https://craigahobbs.github.io/bare-script/library/model.html#var.vName='Aggregation'}
+ * @returns {Object[]} The aggregated data array
+ */
+export function aggregateData(data, aggregation) {
+    const categories = aggregation.categories ?? null;
+
+    // Create the aggregate rows
+    const categoryRows = {};
+    for (const row of data) {
+        // Compute the category values
+        const categoryValues = (categories !== null ? categories.map((categoryField) => row[categoryField]) : null);
+
+        // Get or create the aggregate row
+        let aggregateRow;
+        const rowKey = (categoryValues !== null ? jsonStringifySortKeys(categoryValues) : '');
+        if (rowKey in categoryRows) {
+            aggregateRow = categoryRows[rowKey];
+        } else {
+            aggregateRow = {};
+            categoryRows[rowKey] = aggregateRow;
+            if (categories !== null) {
+                for (let ixCategoryField = 0; ixCategoryField < categories.length; ixCategoryField++) {
+                    aggregateRow[categories[ixCategoryField]] = categoryValues[ixCategoryField];
+                }
+            }
+        }
+
+        // Add to the aggregate measure values
+        for (const measure of aggregation.measures) {
+            const field = measure.name ?? measure.field;
+            const value = row[measure.field] ?? null;
+            if (!(field in aggregateRow)) {
+                aggregateRow[field] = [];
+            }
+            aggregateRow[field].push(value);
+        }
+    }
+
+    // Compute the measure values aggregate function value
+    const aggregateRows = Object.values(categoryRows);
+    for (const aggregateRow of aggregateRows) {
+        for (const measure of aggregation.measures) {
+            const field = measure.name ?? measure.field;
+            const func = measure.function;
+            const measureValues = aggregateRow[field];
+            if (func === 'count') {
+                aggregateRow[field] = measureValues.length;
+            } else if (func === 'max') {
+                aggregateRow[field] = measureValues.reduce((max, val) => (val > max ? val : max));
+            } else if (func === 'min') {
+                aggregateRow[field] = measureValues.reduce((min, val) => (val < min ? val : min));
+            } else if (func === 'sum') {
+                aggregateRow[field] = measureValues.reduce((sum, val) => sum + val, 0);
+            } else {
+                aggregateRow[field] = measureValues.reduce((sum, val) => sum + val, 0) / measureValues.length;
+            }
+        }
+    }
+
+    return aggregateRows;
+}
+
+
+/**
+ * Sort data rows
+ *
+ * @param {Object[]} data - The data array
+ * @param {Object[]} sorts - The sort field-name/descending-sort tuples
+ * @returns {Object[]} The sorted data array
+ */
+export function sortData(data, sorts) {
+    return data.sort((row1, row2) => sorts.reduce((result, sort) => {
+        if (result !== 0) {
+            return result;
+        }
+        const [field, desc = false] = sort;
+        const value1 = row1[field] ?? null;
+        const value2 = row2[field] ?? null;
+        const compare = compareValues(value1, value2);
+        return desc ? -compare : compare;
+    }, 0));
+}
+
+
+/**
+ * Top data rows
+ *
+ * @param {Object[]} data - The data array
+ * @param {number} count - The number of rows to keep
+ * @param {?string[]} [categoryFields = null] - The category fields
+ * @returns {Object[]} The top data array
+ */
+export function topData(data, count, categoryFields = null) {
+    // Bucket rows by category
+    const categoryRows = {};
+    const categoryOrder = [];
+    for (const row of data) {
+        const categoryKey = categoryFields === null ? ''
+            : jsonStringifySortKeys(categoryFields.map((field) => (field in row ? row[field] : null)));
+        if (!(categoryKey in categoryRows)) {
+            categoryRows[categoryKey] = [];
+            categoryOrder.push(categoryKey);
+        }
+        categoryRows[categoryKey].push(row);
+    }
+    // Take only the top rows
+    const dataTop = [];
+    const topCount = count;
+    for (const categoryKey of categoryOrder) {
+        const categoryKeyRows = categoryRows[categoryKey];
+        const categoryKeyLength = categoryKeyRows.length;
+        for (let ixRow = 0; ixRow < topCount && ixRow < categoryKeyLength; ixRow++) {
+            dataTop.push(categoryKeyRows[ixRow]);
+        }
+    }
+    return dataTop;
+}
+
+
+/**
+ * Compare two data values
+ *
+ * @param {*} value1 - The first value
+ * @param {*} value2 - The second value
+ * @returns {number} -1 if the first value is less, 1 if the first value is greater, and 0 if they are equal
+ */
+export function compareValues(value1, value2) {
+    if (value1 === null) {
+        return value2 === null ? 0 : -1;
+    } else if (value2 === null) {
+        return 1;
+    } else if (value1 instanceof Date) {
+        const time1 = value1.getTime();
+        const time2 = value2.getTime();
+        return time1 < time2 ? -1 : (time1 === time2 ? 0 : 1);
+    }
+    return value1 < value2 ? -1 : (value1 === value2 ? 0 : 1);
+}

package/lib/library.js

@@ -1,6 +1,9 @@
 // Licensed under the MIT License
 // https://github.com/craigahobbs/bare-script/blob/main/LICENSE
 
+import {
+    addCalculatedField, aggregateData, filterData, joinData, parseCSV, parseDatetime, sortData, topData, validateAggregation, validateData
+} from './data.js';
 import {validateType, validateTypeModel} from 'schema-markdown/lib/schema.js';
 import {jsonStringifySortKeys} from 'schema-markdown/lib/encode.js';
 import {parseSchemaMarkdown} from 'schema-markdown/lib/parser.js';
@@ -149,6 +152,93 @@ export const scriptFunctions = {
     ),
 
 
+    //
+    // Data functions
+    //
+
+    // $function: dataAggregate
+    // $group: Data
+    // $doc: Aggregate a data array
+    // $arg data: The data array
+    // $arg aggregation: The [aggregation model](model.html#var.vName='Aggregation')
+    // $return: The aggregated data array
+    'dataAggregate': ([data, aggregation]) => aggregateData(data, validateAggregation(aggregation)),
+
+    // $function: dataCalculatedField
+    // $group: Data
+    // $doc: Add a calculated field to a data array
+    // $arg data: The data array
+    // $arg fieldName: The calculated field name
+    // $arg expr: The calculated field expression
+    // $arg variables: Optional (default is null). A variables object the expression evaluation.
+    // $return: The updated data array
+    'dataCalculatedField': ([data, fieldName, expr, variables = null], options) => (
+        addCalculatedField(data, fieldName, expr, variables, options)
+    ),
+
+    // $function: dataFilter
+    // $group: Data
+    // $doc: Filter a data array
+    // $arg data: The data array
+    // $arg expr: The filter expression
+    // $arg variables: Optional (default is null). A variables object the expression evaluation.
+    // $return: The filtered data array
+    'dataFilter': ([data, expr, variables = null], options) => filterData(data, expr, variables, options),
+
+    // $function: dataJoin
+    // $group: Data
+    // $doc: Join two data arrays
+    // $arg leftData: The left data array
+    // $arg rightData: The right data array
+    // $arg joinExpr: The [join expression](https://craigahobbs.github.io/bare-script/language/#expressions)
+    // $arg rightExpr: Optional (default is null).
+    // $arg rightExpr:     The right [join expression](https://craigahobbs.github.io/bare-script/language/#expressions)
+    // $arg isLeftJoin: Optional (default is false). If true, perform a left join (always include left row).
+    // $arg variables: Optional (default is null). A variables object for join expression evaluation.
+    // $return: The joined data array
+    'dataJoin': ([leftData, rightData, joinExpr, rightExpr = null, isLeftJoin = false, variables = null], options) => (
+        joinData(leftData, rightData, joinExpr, rightExpr, isLeftJoin, variables, options)
+    ),
+
+    // $function: dataParseCSV
+    // $group: Data
+    // $doc: Parse CSV text to a data array
+    // $arg text: The CSV text
+    // $return: The data array
+    'dataParseCSV': (text) => {
+        const data = parseCSV(text);
+        validateData(data, true);
+        return data;
+    },
+
+    // $function: dataSort
+    // $group: Data
+    // $doc: Sort a data array
+    // $arg data: The data array
+    // $arg sorts: The sort field-name/descending-sort tuples
+    // $return: The sorted data array
+    'dataSort': ([data, sorts]) => sortData(data, sorts),
+
+    // $function: dataTop
+    // $group: Data
+    // $doc: Keep the top rows for each category
+    // $arg data: The data array
+    // $arg count: The number of rows to keep
+    // $arg categoryFields: Optional (default is null). The category fields.
+    // $return: The top data array
+    'dataTop': ([data, count, categoryFields = null]) => topData(data, count, categoryFields),
+
+    // $function: dataValidate
+    // $group: Data
+    // $doc: Validate a data array
+    // $arg data: The data array
+    // $return: The validated data array
+    'dataValidate': ([data]) => {
+        validateData(data);
+        return data;
+    },
+
+
     //
     // Datetime functions
     //
@@ -184,6 +274,13 @@ export const scriptFunctions = {
         return result;
     },
 
+    // $function: datetimeISOParse
+    // $group: Datetime
+    // $doc: Parse an ISO date/time string
+    // $arg str: The ISO date/time string
+    // $return: The datetime, or null if parsing fails
+    'datetimeISOParse': ([str]) => parseDatetime(str),
+
     // $function: datetimeMinute
     // $group: Datetime
     // $doc: Get the number of minutes of a datetime

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.2.0",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",