bare-script 2.3.2 → 3.0.1

package/lib/library.js

@@ -2,10 +2,12 @@
 // https://github.com/craigahobbs/bare-script/blob/main/LICENSE
 
 import {
-    addCalculatedField, aggregateData, filterData, joinData, parseCSV, parseDatetime, sortData, topData, validateAggregation, validateData
+    addCalculatedField, aggregateData, filterData, joinData, parseCSV, sortData, topData, validateData
 } from './data.js';
 import {validateType, validateTypeModel} from 'schema-markdown/lib/schema.js';
-import {jsonStringifySortKeys} from 'schema-markdown/lib/encode.js';
+import {
+    valueBoolean, valueCompare, valueIs, valueJSON, valueParseDatetime, valueParseInteger, valueParseNumber, valueString, valueType
+} from './value.js';
 import {parseSchemaMarkdown} from 'schema-markdown/lib/parser.js';
 import {typeModel} from 'schema-markdown/lib/typeModel.js';
 
@@ -27,8 +29,12 @@ export const defaultMaxStatements = 1e9;
 // $doc: Create a copy of an array
 // $arg array: The array to copy
 // $return: The array copy
-function arrayCopy([array]) {
-    return Array.isArray(array) ? [...array] : [];
+function arrayCopy([array = null]) {
+    if (valueType(array) !== 'array') {
+        return null;
+    }
+
+    return [...array];
 }
 
 
@@ -38,10 +44,12 @@ function arrayCopy([array]) {
 // $arg array: The array to extend
 // $arg array2: The array to extend with
 // $return: The extended array
-function arrayExtend([array, array2]) {
-    if (Array.isArray(array) && Array.isArray(array2)) {
-        array.push(...array2);
+function arrayExtend([array = null, array2 = null]) {
+    if (valueType(array) !== 'array' || valueType(array2) !== 'array') {
+        return null;
     }
+
+    array.push(...array2);
     return array;
 }
 
@@ -52,8 +60,13 @@ function arrayExtend([array, array2]) {
 // $arg array: The array
 // $arg index: The array element's index
 // $return: The array element
-function arrayGet([array, index]) {
-    return Array.isArray(array) ? array[index] ?? null : null;
+function arrayGet([array = null, index = null]) {
+    if (valueType(array) !== 'array' ||
+        valueType(index) !== 'number' || Math.floor(index) !== index || index < 0 || index >= array.length) {
+        return null;
+    }
+
+    return array[index];
 }
 
 
@@ -61,11 +74,24 @@ function arrayGet([array, index]) {
 // $group: Array
 // $doc: Find the index of a value in an array
 // $arg array: The array
-// $arg value: The value to find in the array
+// $arg value: The value to find in the array, or a match function, f(value) -> bool
 // $arg index: Optional (default is 0). The index at which to start the search.
 // $return: The first index of the value in the array; -1 if not found.
-function arrayIndexOf([array, value, index = 0]) {
-    return Array.isArray(array) ? array.indexOf(value, index) : -1;
+function arrayIndexOf([array = null, value = null, index = 0], options) {
+    if (valueType(array) !== 'array' ||
+        valueType(index) !== 'number' || Math.floor(index) !== index || index < 0 || index >= array.length) {
+        return -1;
+    }
+
+    if (valueType(value) === 'function') {
+        for (let ix = index; ix < array.length; ix += 1) {
+            if (valueBoolean(value([array[ix]], options))) {
+                return ix;
+            }
+        }
+    }
+
+    return array.indexOf(value, index);
 }
 
 
@@ -75,8 +101,12 @@ function arrayIndexOf([array, value, index = 0]) {
 // $arg array: The array
 // $arg separator: The separator string
 // $return: The joined string
-function arrayJoin([array, separator]) {
-    return Array.isArray(array) ? array.join(separator) : '';
+function arrayJoin([array = null, separator = null]) {
+    if (valueType(array) !== 'array' || valueType(separator) !== 'string') {
+        return null;
+    }
+
+    return array.map((value) => valueString(value)).join(separator);
 }
 
 
@@ -84,11 +114,28 @@ function arrayJoin([array, separator]) {
 // $group: Array
 // $doc: Find the last index of a value in an array
 // $arg array: The array
-// $arg value: The value to find in the array
+// $arg value: The value to find in the array, or a match function, f(value) -> bool
 // $arg index: Optional (default is the end of the array). The index at which to start the search.
 // $return: The last index of the value in the array; -1 if not found.
-function arrayLastIndexOf([array, value, index = null]) {
-    return Array.isArray(array) ? (index === null ? array.lastIndexOf(value) : array.lastIndexOf(value, index)) : -1;
+function arrayLastIndexOf([array = null, value = null, indexArg = null], options) {
+    let index = indexArg;
+    if (valueType(array) === 'array' && index === null) {
+        index = array.length - 1;
+    }
+    if (valueType(array) !== 'array' ||
+        valueType(index) !== 'number' || Math.floor(index) !== index || index < 0 || index >= array.length) {
+        return -1;
+    }
+
+    if (valueType(value) === 'function') {
+        for (let ix = index; ix >= 0; ix -= 1) {
+            if (valueBoolean(value([array[ix]], options))) {
+                return ix;
+            }
+        }
+    }
+
+    return array.lastIndexOf(value, index);
 }
 
 
@@ -96,9 +143,13 @@ function arrayLastIndexOf([array, value, index = null]) {
 // $group: Array
 // $doc: Get the length of an array
 // $arg array: The array
-// $return: The array's length; null if not an array
-function arrayLength([array]) {
-    return Array.isArray(array) ? array.length : null;
+// $return: The array's length; zero if not an array
+function arrayLength([array = null]) {
+    if (valueType(array) !== 'array') {
+        return 0;
+    }
+
+    return array.length;
 }
 
 
@@ -119,6 +170,10 @@ function arrayNew(values) {
 // $arg value: Optional (default is 0). The value with which to fill the new array.
 // $return: The new array
 function arrayNewSize([size = 0, value = 0]) {
+    if (valueType(size) !== 'number' || Math.floor(size) !== size || size < 0) {
+        return null;
+    }
+
     return new Array(size).fill(value);
 }
 
@@ -128,8 +183,12 @@ function arrayNewSize([size = 0, value = 0]) {
 // $doc: Remove the last element of the array and return it
 // $arg array: The array
 // $return: The last element of the array; null if the array is empty.
-function arrayPop([array]) {
-    return Array.isArray(array) ? array.pop() ?? null : null;
+function arrayPop([array = null]) {
+    if (valueType(array) !== 'array' || array.length === 0) {
+        return null;
+    }
+
+    return array.pop();
 }
 
 
@@ -139,10 +198,12 @@ function arrayPop([array]) {
 // $arg array: The array
 // $arg values...: The values to add to the end of the array
 // $return: The array
-function arrayPush([array, ...values]) {
-    if (Array.isArray(array)) {
-        array.push(...values);
+function arrayPush([array = null, ...values]) {
+    if (valueType(array) !== 'array') {
+        return null;
     }
+
+    array.push(...values);
     return array;
 }
 
@@ -154,10 +215,13 @@ function arrayPush([array, ...values]) {
 // $arg index: The index of the element to set
 // $arg value: The value to set
 // $return: The value
-function arraySet([array, index, value]) {
-    if (Array.isArray(array)) {
-        array[index] = value;
+function arraySet([array = null, index = null, value = null]) {
+    if (valueType(array) !== 'array' ||
+        valueType(index) !== 'number' || Math.floor(index) !== index || index < 0 || index >= array.length) {
+        return null;
     }
+
+    array[index] = value;
     return value;
 }
 
@@ -167,8 +231,12 @@ function arraySet([array, index, value]) {
 // $doc: Remove the first element of the array and return it
 // $arg array: The array
 // $return: The first element of the array; null if the array is empty.
-function arrayShift([array]) {
-    return Array.isArray(array) ? array.shift() ?? null : null;
+function arrayShift([array = null]) {
+    if (valueType(array) !== 'array' || array.length === 0) {
+        return null;
+    }
+
+    return array.shift();
 }
 
 
@@ -179,8 +247,18 @@ function arrayShift([array]) {
 // $arg start: Optional (default is 0). The start index of the slice.
 // $arg end: Optional (default is the end of the array). The end index of the slice.
 // $return: The new array slice
-function arraySlice([array, start, end]) {
-    return Array.isArray(array) ? array.slice(start, end) : null;
+function arraySlice([array = null, start = 0, endArg = null]) {
+    let end = endArg;
+    if (valueType(array) === 'array' && end === null) {
+        end = array.length;
+    }
+    if (valueType(array) !== 'array' ||
+        valueType(start) !== 'number' || Math.floor(start) !== start || start < 0 || start > array.length ||
+        valueType(end) !== 'number' || Math.floor(end) !== end || end < 0 || end > array.length) {
+        return null;
+    }
+
+    return array.slice(start, end);
 }
 
 
@@ -190,8 +268,15 @@ function arraySlice([array, start, end]) {
 // $arg array: The array
 // $arg compareFn: Optional (default is null). The comparison function.
 // $return: The sorted array
-function arraySort([array, compareFn = null], options) {
-    return Array.isArray(array) ? (compareFn === null ? array.sort() : array.sort((...args) => compareFn(args, options))) : null;
+function arraySort([array = null, compareFn = null], options) {
+    if (valueType(array) !== 'array' || (compareFn !== null && valueType(compareFn) !== 'function')) {
+        return null;
+    }
+
+    if (compareFn === null) {
+        return array.sort(valueCompare);
+    }
+    return array.sort((...args) => compareFn(args, options));
 }
 
 
@@ -204,10 +289,14 @@ function arraySort([array, compareFn = null], options) {
 // $group: Data
 // $doc: Aggregate a data array
 // $arg data: The data array
-// $arg aggregation: The [aggregation model](https://craigahobbs.github.io/bare-script/library/model.html#var.vName='Aggregation')
+// $arg aggregation: The [aggregation model](model.html#var.vName='Aggregation')
 // $return: The aggregated data array
-function dataAggregate([data, aggregation]) {
-    return aggregateData(data, validateAggregation(aggregation));
+function dataAggregate([data = null, aggregation = null]) {
+    if (valueType(data) !== 'array' || (aggregation !== null && valueType(aggregation) !== 'object')) {
+        return null;
+    }
+
+    return aggregateData(data, aggregation);
 }
 
 
@@ -219,7 +308,12 @@ function dataAggregate([data, aggregation]) {
 // $arg expr: The calculated field expression
 // $arg variables: Optional (default is null). A variables object the expression evaluation.
 // $return: The updated data array
-function dataCalculatedField([data, fieldName, expr, variables = null], options) {
+function dataCalculatedField([data = null, fieldName = null, expr = null, variables = null], options) {
+    if (valueType(data) !== 'array' || valueType(fieldName) !== 'string' || valueType(expr) !== 'string' ||
+        (variables !== null && valueType(variables) !== 'object')) {
+        return null;
+    }
+
     return addCalculatedField(data, fieldName, expr, variables, options);
 }
 
@@ -230,7 +324,11 @@ function dataCalculatedField([data, fieldName, expr, variables = null], options)
 // $arg expr: The filter expression
 // $arg variables: Optional (default is null). A variables object the expression evaluation.
 // $return: The filtered data array
-function dataFilter([data, expr, variables = null], options) {
+function dataFilter([data = null, expr = null, variables = null], options) {
+    if (valueType(data) !== 'array' || valueType(expr) !== 'string' || (variables !== null && valueType(variables) !== 'object')) {
+        return null;
+    }
+
     return filterData(data, expr, variables, options);
 }
 
@@ -246,7 +344,12 @@ function dataFilter([data, expr, variables = null], options) {
 // $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
-function dataJoin([leftData, rightData, joinExpr, rightExpr = null, isLeftJoin = false, variables = null], options) {
+function dataJoin([leftData = null, rightData = null, joinExpr = null, rightExpr = null, isLeftJoin = false, variables = null], options) {
+    if (valueType(leftData) !== 'array' || valueType(rightData) !== 'array' || valueType(joinExpr) !== 'string' ||
+        (rightExpr !== null && valueType(rightExpr) !== 'string') || (variables !== null && valueType(variables) !== 'object')) {
+        return null;
+    }
+
     return joinData(leftData, rightData, joinExpr, rightExpr, isLeftJoin, variables, options);
 }
 
@@ -256,8 +359,20 @@ function dataJoin([leftData, rightData, joinExpr, rightExpr = null, isLeftJoin =
 // $doc: Parse CSV text to a data array
 // $arg text...: The CSV text
 // $return: The data array
-function dataParseCSV(text) {
-    const data = parseCSV(text);
+function dataParseCSV(args) {
+    // Split the input CSV parts into lines
+    const lines = [];
+    for (const arg of args) {
+        if (arg === null) {
+            continue;
+        }
+        if (valueType(arg) !== 'string') {
+            return null;
+        }
+        lines.push(arg);
+    }
+
+    const data = parseCSV(lines);
     validateData(data, true);
     return data;
 }
@@ -269,7 +384,11 @@ function dataParseCSV(text) {
 // $arg data: The data array
 // $arg sorts: The sort field-name/descending-sort tuples
 // $return: The sorted data array
-function dataSort([data, sorts]) {
+function dataSort([data = null, sorts = null]) {
+    if (valueType(data) !== 'array' || valueType(sorts) !== 'array') {
+        return null;
+    }
+
     return sortData(data, sorts);
 }
 
@@ -278,10 +397,16 @@ function dataSort([data, sorts]) {
 // $group: Data
 // $doc: Keep the top rows for each category
 // $arg data: The data array
-// $arg count: The number of rows to keep
+// $arg count: The number of rows to keep (default is 1)
 // $arg categoryFields: Optional (default is null). The category fields.
 // $return: The top data array
-function dataTop([data, count, categoryFields = null]) {
+function dataTop([data = null, count = null, categoryFields = null]) {
+    if (valueType(data) !== 'array' ||
+        valueType(count) !== 'number' || Math.floor(count) !== count || count < 1 ||
+        (categoryFields !== null && valueType(categoryFields) !== 'array')) {
+        return null;
+    }
+
     return topData(data, count, categoryFields);
 }
 
@@ -291,7 +416,11 @@ function dataTop([data, count, categoryFields = null]) {
 // $doc: Validate a data array
 // $arg data: The data array
 // $return: The validated data array
-function dataValidate([data]) {
+function dataValidate([data = null]) {
+    if (valueType(data) !== 'array') {
+        return null;
+    }
+
     validateData(data);
     return data;
 }
@@ -306,10 +435,13 @@ function dataValidate([data]) {
 // $group: Datetime
 // $doc: Get the day of the month of a datetime
 // $arg datetime: The datetime
-// $arg utc: Optional (default is false). If true, return the UTC day of the month.
 // $return: The day of the month
-function datetimeDay([datetime, utc = false]) {
-    return datetime instanceof Date ? (utc ? datetime.getUTCDate() : datetime.getDate()) : null;
+function datetimeDay([datetime = null]) {
+    if (valueType(datetime) !== 'datetime') {
+        return null;
+    }
+
+    return datetime.getDate();
 }
 
 
@@ -317,10 +449,13 @@ function datetimeDay([datetime, utc = false]) {
 // $group: Datetime
 // $doc: Get the hour of a datetime
 // $arg datetime: The datetime
-// $arg utc: Optional (default is false). If true, return the UTC hour.
 // $return: The hour
-function datetimeHour([datetime, utc = false]) {
-    return datetime instanceof Date ? (utc ? datetime.getUTCHours() : datetime.getHours()) : null;
+function datetimeHour([datetime = null]) {
+    if (valueType(datetime) !== 'datetime') {
+        return null;
+    }
+
+    return datetime.getHours();
 }
 
 
@@ -330,51 +465,75 @@ function datetimeHour([datetime, utc = false]) {
 // $arg datetime: The datetime
 // $arg isDate: If true, format the datetime as an ISO date
 // $return: The formatted datetime string
-function datetimeISOFormat([datetime, isDate = false]) {
-    let result = null;
-    if (datetime instanceof Date) {
-        if (isDate) {
-            const year = datetime.getFullYear();
-            const month = datetime.getMonth() + 1;
-            const day = datetime.getDate();
-            result = `${year}-${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
-        } else {
-            result = datetime.toISOString();
-        }
+function datetimeISOFormat([datetime = null, isDate = false]) {
+    if (valueType(datetime) !== 'datetime') {
+        return null;
     }
-    return result;
+
+    if (valueBoolean(isDate)) {
+        const year = datetime.getFullYear();
+        const month = datetime.getMonth() + 1;
+        const day = datetime.getDate();
+        return `${year}-${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
+    }
+
+    return valueString(datetime);
 }
 
 
 // $function: datetimeISOParse
 // $group: Datetime
 // $doc: Parse an ISO date/time string
-// $arg str: The ISO date/time string
+// $arg string: The ISO date/time string
 // $return: The datetime, or null if parsing fails
-function datetimeISOParse([str]) {
-    return parseDatetime(str);
+function datetimeISOParse([string]) {
+    if (valueType(string) !== 'string') {
+        return null;
+    }
+
+    return valueParseDatetime(string);
+}
+
+
+// $function: datetimeMillisecond
+// $group: Datetime
+// $doc: Get the millisecond of a datetime
+// $arg datetime: The datetime
+// $return: The millisecond
+function datetimeMillisecond([datetime = null]) {
+    if (valueType(datetime) !== 'datetime') {
+        return null;
+    }
+
+    return datetime.getMilliseconds();
 }
 
 
 // $function: datetimeMinute
 // $group: Datetime
-// $doc: Get the number of minutes of a datetime
+// $doc: Get the minute of a datetime
 // $arg datetime: The datetime
-// $arg utc: Optional (default is false). If true, return the UTC minutes.
-// $return: The number of minutes
-function datetimeMinute([datetime, utc = false]) {
-    return datetime instanceof Date ? (utc ? datetime.getUTCMinutes() : datetime.getMinutes()) : null;
+// $return: The minute
+function datetimeMinute([datetime = null]) {
+    if (valueType(datetime) !== 'datetime') {
+        return null;
+    }
+
+    return datetime.getMinutes();
 }
 
 
 // $function: datetimeMonth
 // $group: Datetime
-// $doc: Get the number of the month (1-12) of a datetime
+// $doc: Get the month (1-12) of a datetime
 // $arg datetime: The datetime
-// $arg utc: Optional (default is false). If true, return the UTC month.
-// $return: The number of the month
-function datetimeMonth([datetime, utc = false]) {
-    return datetime instanceof Date ? (utc ? datetime.getUTCMonth() + 1 : datetime.getMonth() + 1) : null;
+// $return: The month
+function datetimeMonth([datetime = null]) {
+    if (valueType(datetime) !== 'datetime') {
+        return null;
+    }
+
+    return datetime.getMonth() + 1;
 }
 
 
@@ -384,29 +543,23 @@ function datetimeMonth([datetime, utc = false]) {
 // $arg year: The full year
 // $arg month: The month (1-12)
 // $arg day: The day of the month
-// $arg hours: Optional (default is 0). The hour (0-23)
-// $arg minutes: Optional (default is 0). The number of minutes.
-// $arg seconds: Optional (default is 0). The number of seconds.
-// $arg milliseconds: Optional (default is 0). The number of milliseconds.
+// $arg hour: Optional (default is 0). The hour (0-23).
+// $arg minute: Optional (default is 0). The minute.
+// $arg second: Optional (default is 0). The second.
+// $arg millisecond: Optional (default is 0). The millisecond.
 // $return: The new datetime
-function datetimeNew([year, month, day, hours = 0, minutes = 0, seconds = 0, milliseconds = 0]) {
-    return new Date(year, month - 1, day, hours, minutes, seconds, milliseconds);
-}
-
+function datetimeNew([year, month, day, hour = 0, minute = 0, second = 0, millisecond = 0]) {
+    if (valueType(year) !== 'number' || Math.floor(year) !== year ||
+        valueType(month) !== 'number' || Math.floor(month) !== month ||
+        valueType(day) !== 'number' || Math.floor(day) !== day || day < -10000 || day > 10000 ||
+        valueType(hour) !== 'number' || Math.floor(hour) !== hour ||
+        valueType(minute) !== 'number' || Math.floor(minute) !== minute ||
+        valueType(second) !== 'number' || Math.floor(second) !== second ||
+        valueType(millisecond) !== 'number' || Math.floor(millisecond) !== millisecond) {
+        return null;
+    }
 
-// $function: datetimeNewUTC
-// $group: Datetime
-// $doc: Create a new UTC datetime
-// $arg year: The full year
-// $arg month: The month (1-12)
-// $arg day: The day of the month
-// $arg hours: Optional (default is 0). The hour (0-23)
-// $arg minutes: Optional (default is 0). The number of minutes.
-// $arg seconds: Optional (default is 0). The number of seconds.
-// $arg milliseconds: Optional (default is 0). The number of milliseconds.
-// $return: The new UTC datetime
-function datetimeNewUTC([year, month, day, hours = 0, minutes = 0, seconds = 0, milliseconds = 0]) {
-    return new Date(Date.UTC(year, month - 1, day, hours, minutes, seconds, milliseconds));
+    return new Date(year, month - 1, day, hour, minute, second, millisecond);
 }
 
 
@@ -421,12 +574,15 @@ function datetimeNow() {
 
 // $function: datetimeSecond
 // $group: Datetime
-// $doc: Get the number of seconds of a datetime
+// $doc: Get the second of a datetime
 // $arg datetime: The datetime
-// $arg utc: Optional (default is false). If true, return the UTC seconds.
-// $return: The number of seconds
-function datetimeSecond([datetime, utc = false]) {
-    return datetime instanceof Date ? (utc ? datetime.getUTCSeconds() : datetime.getSeconds()) : null;
+// $return: The second
+function datetimeSecond([datetime = null]) {
+    if (valueType(datetime) !== 'datetime') {
+        return null;
+    }
+
+    return datetime.getSeconds();
 }
 
 
@@ -444,10 +600,13 @@ function datetimeToday() {
 // $group: Datetime
 // $doc: Get the full year of a datetime
 // $arg datetime: The datetime
-// $arg utc: Optional (default is false). If true, return the UTC year.
 // $return: The full year
-function datetimeYear([datetime, utc = false]) {
-    return datetime instanceof Date ? (utc ? datetime.getUTCFullYear() : datetime.getFullYear()) : null;
+function datetimeYear([datetime = null]) {
+    if (valueType(datetime) !== 'datetime') {
+        return null;
+    }
+
+    return datetime.getFullYear();
 }
 
 
@@ -455,12 +614,17 @@ function datetimeYear([datetime, utc = false]) {
 // JSON functions
 //
 
+
 // $function: jsonParse
 // $group: JSON
 // $doc: Convert a JSON string to an object
 // $arg string: The JSON string
 // $return: The object
-function jsonParse([string]) {
+function jsonParse([string = null]) {
+    if (valueType(string) !== 'string') {
+        return null;
+    }
+
     return JSON.parse(string);
 }
 
@@ -469,10 +633,14 @@ function jsonParse([string]) {
 // $group: JSON
 // $doc: Convert an object to a JSON string
 // $arg value: The object
-// $arg space: Optional (default is null). The indentation string or number.
+// $arg indent: Optional (default is null). The indentation number.
 // $return: The JSON string
-function jsonStringify([value, space]) {
-    return jsonStringifySortKeys(value, space);
+function jsonStringify([value = null, indent = null]) {
+    if (indent !== null && (valueType(indent) !== 'number' || Math.floor(indent) !== indent || indent < 1)) {
+        return null;
+    }
+
+    return valueJSON(value, indent);
 }
 
 
@@ -485,7 +653,11 @@ function jsonStringify([value, space]) {
 // $doc: Compute the absolute value of a number
 // $arg x: The number
 // $return: The absolute value of the number
-function mathAbs([x]) {
+function mathAbs([x = null]) {
+    if (valueType(x) !== 'number') {
+        return null;
+    }
+
     return Math.abs(x);
 }
 
@@ -495,7 +667,11 @@ function mathAbs([x]) {
 // $doc: Compute the arccosine, in radians, of a number
 // $arg x: The number
 // $return: The arccosine, in radians, of the number
-function mathAcos([x]) {
+function mathAcos([x = null]) {
+    if (valueType(x) !== 'number') {
+        return null;
+    }
+
     return Math.acos(x);
 }
 
@@ -505,7 +681,11 @@ function mathAcos([x]) {
 // $doc: Compute the arcsine, in radians, of a number
 // $arg x: The number
 // $return: The arcsine, in radians, of the number
-function mathAsin([x]) {
+function mathAsin([x = null]) {
+    if (valueType(x) !== 'number') {
+        return null;
+    }
+
     return Math.asin(x);
 }
 
@@ -515,7 +695,11 @@ function mathAsin([x]) {
 // $doc: Compute the arctangent, in radians, of a number
 // $arg x: The number
 // $return: The arctangent, in radians, of the number
-function mathAtan([x]) {
+function mathAtan([x = null]) {
+    if (valueType(x) !== 'number') {
+        return null;
+    }
+
     return Math.atan(x);
 }
 
@@ -526,7 +710,11 @@ function mathAtan([x]) {
 // $arg y: The Y-coordinate of the point
 // $arg x: The X-coordinate of the point
 // $return: The angle, in radians
-function mathAtan2([y, x]) {
+function mathAtan2([y = null, x = null]) {
+    if (valueType(y) !== 'number' || valueType(x) !== 'number') {
+        return null;
+    }
+
     return Math.atan2(y, x);
 }
 
@@ -536,7 +724,11 @@ function mathAtan2([y, x]) {
 // $doc: Compute the ceiling of a number (round up to the next highest integer)
 // $arg x: The number
 // $return: The ceiling of the number
-function mathCeil([x]) {
+function mathCeil([x = null]) {
+    if (valueType(x) !== 'number') {
+        return null;
+    }
+
     return Math.ceil(x);
 }
 
@@ -546,7 +738,11 @@ function mathCeil([x]) {
 // $doc: Compute the cosine of an angle, in radians
 // $arg x: The angle, in radians
 // $return: The cosine of the angle
-function mathCos([x]) {
+function mathCos([x = null]) {
+    if (valueType(x) !== 'number') {
+        return null;
+    }
+
     return Math.cos(x);
 }
 
@@ -556,7 +752,11 @@ function mathCos([x]) {
 // $doc: Compute the floor of a number (round down to the next lowest integer)
 // $arg x: The number
 // $return: The floor of the number
-function mathFloor([x]) {
+function mathFloor([x = null]) {
+    if (valueType(x) !== 'number') {
+        return null;
+    }
+
     return Math.floor(x);
 }
 
@@ -566,7 +766,11 @@ function mathFloor([x]) {
 // $doc: Compute the natural logarithm (base e) of a number
 // $arg x: The number
 // $return: The natural logarithm of the number
-function mathLn([x]) {
+function mathLn([x = null]) {
+    if (valueType(x) !== 'number' || x <= 0) {
+        return null;
+    }
+
     return Math.log(x);
 }
 
@@ -577,7 +781,11 @@ function mathLn([x]) {
 // $arg x: The number
 // $arg base: Optional (default is 10). The logarithm base.
 // $return: The logarithm of the number
-function mathLog([x, base = 10]) {
+function mathLog([x = null, base = 10]) {
+    if (valueType(x) !== 'number' || x <= 0 || valueType(base) !== 'number' || base <= 0 || base === 1) {
+        return null;
+    }
+
     return Math.log(x) / Math.log(base);
 }
 
@@ -588,6 +796,10 @@ function mathLog([x, base = 10]) {
 // $arg values...: The values
 // $return: The maximum value
 function mathMax(values) {
+    if (values.some((value) => valueType(value) !== 'number')) {
+        return null;
+    }
+
     return Math.max(...values);
 }
 
@@ -598,6 +810,10 @@ function mathMax(values) {
 // $arg values...: The values
 // $return: The minimum value
 function mathMin(values) {
+    if (values.some((value) => valueType(value) !== 'number')) {
+        return null;
+    }
+
     return Math.min(...values);
 }
 
@@ -626,7 +842,11 @@ function mathRandom() {
 // $arg x: The number
 // $arg digits: Optional (default is 0). The number of decimal digits to round to.
 // $return: The rounded number
-function mathRound([x, digits = 0]) {
+function mathRound([x = null, digits = 0]) {
+    if (valueType(x) !== 'number' || valueType(digits) !== 'number' || Math.floor(digits) !== digits || digits < 0) {
+        return null;
+    }
+
     const multiplier = 10 ** digits;
     return Math.round(x * multiplier) / multiplier;
 }
@@ -637,7 +857,11 @@ function mathRound([x, digits = 0]) {
 // $doc: Compute the sign of a number
 // $arg x: The number
 // $return: -1 for a negative number, 1 for a positive number, and 0 for zero
-function mathSign([x]) {
+function mathSign([x = null]) {
+    if (valueType(x) !== 'number') {
+        return null;
+    }
+
     return Math.sign(x);
 }
 
@@ -647,7 +871,11 @@ function mathSign([x]) {
 // $doc: Compute the sine of an angle, in radians
 // $arg x: The angle, in radians
 // $return: The sine of the angle
-function mathSin([x]) {
+function mathSin([x = null]) {
+    if (valueType(x) !== 'number') {
+        return null;
+    }
+
     return Math.sin(x);
 }
 
@@ -657,7 +885,11 @@ function mathSin([x]) {
 // $doc: Compute the square root of a number
 // $arg x: The number
 // $return: The square root of the number
-function mathSqrt([x]) {
+function mathSqrt([x = null]) {
+    if (valueType(x) !== 'number' || x < 0) {
+        return null;
+    }
+
     return Math.sqrt(x);
 }
 
@@ -667,7 +899,11 @@ function mathSqrt([x]) {
 // $doc: Compute the tangent of an angle, in radians
 // $arg x: The angle, in radians
 // $return: The tangent of the angle
-function mathTan([x]) {
+function mathTan([x = null]) {
+    if (valueType(x) !== 'number') {
+        return null;
+    }
+
     return Math.tan(x);
 }
 
@@ -676,13 +912,18 @@ function mathTan([x]) {
 // Number functions
 //
 
+
 // $function: numberParseFloat
 // $group: Number
 // $doc: Parse a string as a floating point number
 // $arg string: The string
 // $return: The number
-function numberParseFloat([string]) {
-    return Number.parseFloat(string);
+function numberParseFloat([string = null]) {
+    if (valueType(string) !== 'string') {
+        return null;
+    }
+
+    return valueParseNumber(string);
 }
 
 
@@ -692,8 +933,12 @@ function numberParseFloat([string]) {
 // $arg string: The string
 // $arg radix: Optional (default is 10). The number base.
 // $return: The integer
-function numberParseInt([string, radix = 10]) {
-    return Number.parseInt(string, radix);
+function numberParseInt([string = null, radix = 10]) {
+    if (valueType(string) !== 'string' || valueType(radix) !== 'number' || Math.floor(radix) !== radix || radix < 2 || radix > 36) {
+        return null;
+    }
+
+    return valueParseInteger(string, radix);
 }
 
 
@@ -704,13 +949,14 @@ function numberParseInt([string, radix = 10]) {
 // $arg digits: Optional (default is 2). The number of digits to appear after the decimal point.
 // $arg trim: Optional (default is false). If true, trim trailing zeroes and decimal point.
 // $return: The fixed-point notation string
-function numberToFixed([x, digits = 2, trim = false]) {
-    let result = null;
-    if (typeof x === 'number') {
-        result = x.toFixed(digits);
-        if (trim) {
-            result = result.replace(rNumberCleanup, '');
-        }
+function numberToFixed([x = null, digits = 2, trim = false]) {
+    if (valueType(x) !== 'number' || valueType(digits) !== 'number' || Math.floor(digits) !== digits || digits < 0) {
+        return null;
+    }
+
+    let result = x.toFixed(digits);
+    if (valueBoolean(trim)) {
+        result = result.replace(rNumberCleanup, '');
     }
     return result;
 }
@@ -722,17 +968,19 @@ const rNumberCleanup = /\.0*$/;
 // Object functions
 //
 
+
 // $function: objectAssign
 // $group: Object
 // $doc: Assign the keys/values of one object to another
 // $arg object: The object to assign to
 // $arg object2: The object to assign
 // $return: The updated object
-function objectAssign([object, object2]) {
-    if (object !== null && typeof object === 'object' && !Array.isArray(object) &&
-        object2 !== null && typeof object2 === 'object' && !Array.isArray(object2)) {
-        Object.assign(object, object2);
+function objectAssign([object = null, object2 = null]) {
+    if (valueType(object) !== 'object' || valueType(object2) !== 'object') {
+        return null;
     }
+
+    Object.assign(object, object2);
     return object;
 }
 
@@ -742,8 +990,12 @@ function objectAssign([object, object2]) {
 // $doc: Create a copy of an object
 // $arg object: The object to copy
 // $return: The object copy
-function objectCopy([object]) {
-    return (object !== null && typeof object === 'object' && !Array.isArray(object) ? {...object} : {});
+function objectCopy([object = null]) {
+    if (valueType(object) !== 'object') {
+        return null;
+    }
+
+    return {...object};
 }
 
 
@@ -752,10 +1004,13 @@ function objectCopy([object]) {
 // $doc: Delete an object key
 // $arg object: The object
 // $arg key: The key to delete
-function objectDelete([object, key]) {
-    if (object !== null && typeof object === 'object' && !Array.isArray(object)) {
-        delete object[key];
+function objectDelete([object = null, key = null]) {
+    if (valueType(object) !== 'object' || valueType(key) !== 'string') {
+        return null;
     }
+
+    delete object[key];
+    return null;
 }
 
 
@@ -766,8 +1021,12 @@ function objectDelete([object, key]) {
 // $arg key: The key
 // $arg defaultValue: The default value (optional)
 // $return: The value or null if the key does not exist
-function objectGet([object, key, defaultValue = null]) {
-    return object !== null && typeof object === 'object' ? (Object.hasOwn(object, key) ? object[key] : defaultValue) : defaultValue;
+function objectGet([object = null, key = null, defaultValue = null]) {
+    if (valueType(object) !== 'object' || valueType(key) !== 'string') {
+        return defaultValue;
+    }
+
+    return object[key] ?? defaultValue;
 }
 
 
@@ -777,8 +1036,12 @@ function objectGet([object, key, defaultValue = null]) {
 // $arg object: The object
 // $arg key: The key
 // $return: true if the object contains the key, false otherwise
-function objectHas([object, key]) {
-    return object !== null && typeof object === 'object' && Object.hasOwn(object, key);
+function objectHas([object = null, key = null]) {
+    if (valueType(object) !== 'object' || valueType(key) !== 'string') {
+        return false;
+    }
+
+    return key in object;
 }
 
 
@@ -786,9 +1049,13 @@ function objectHas([object, key]) {
 // $group: Object
 // $doc: Get an object's keys
 // $arg object: The object
-// $return: The array of keys; null if not an object
-function objectKeys([object]) {
-    return object !== null && typeof object === 'object' && !Array.isArray(object) ? Object.keys(object) : null;
+// $return: The array of keys
+function objectKeys([object = null]) {
+    if (valueType(object) !== 'object') {
+        return null;
+    }
+
+    return Object.keys(object);
 }
 
 
@@ -797,10 +1064,15 @@ function objectKeys([object]) {
 // $doc: Create a new object
 // $arg keyValues...: The object's initial key and value pairs
 // $return: The new object
-function objectNew(keyValues) {
+function objectNew(keyValues = null) {
     const object = {};
     for (let ix = 0; ix < keyValues.length; ix += 2) {
-        object[keyValues[ix]] = (ix + 1 < keyValues.length ? keyValues[ix + 1] : null);
+        const key = keyValues[ix];
+        const value = ix + 1 < keyValues.length ? keyValues[ix + 1] : null;
+        if (valueType(key) !== 'string') {
+            return null;
+        }
+        object[key] = value;
     }
     return object;
 }
@@ -813,10 +1085,12 @@ function objectNew(keyValues) {
 // $arg key: The key
 // $arg value: The value to set
 // $return: The value to set
-function objectSet([object, key, value]) {
-    if (object !== null && typeof object === 'object' && !Array.isArray(object)) {
-        object[key] = value;
+function objectSet([object = null, key = null, value = null]) {
+    if (valueType(object) !== 'object' || valueType(key) !== 'string') {
+        return null;
     }
+
+    object[key] = value;
     return value;
 }
 
@@ -831,8 +1105,12 @@ function objectSet([object, key, value]) {
 // $doc: Escape a string for use in a regular expression
 // $arg string: The string to escape
 // $return: The escaped string
-function regexEscape([string]) {
-    return typeof string === 'string' ? string.replace(rRegexEscape, '\\$&') : null;
+function regexEscape([string = null]) {
+    if (valueType(string) !== 'string') {
+        return null;
+    }
+
+    return string.replace(rRegexEscape, '\\$&');
 }
 
 const rRegexEscape = /[.*+?^${}()|[\]\\]/g;
@@ -843,11 +1121,19 @@ const rRegexEscape = /[.*+?^${}()|[\]\\]/g;
 // $doc: Find the first match of a regular expression in a string
 // $arg regex: The regular expression
 // $arg string: The string
-// $return: The [match object
-// $return: ](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/match#return_value)
-// $return: or null if no matches are found
-function regexMatch([regex, string]) {
-    return typeof string === 'string' ? string.match(regex) : null;
+// $return: The [match object](model.html#var.vName='RegexMatch'), or null if no matches are found
+function regexMatch([regex = null, string = null]) {
+    if (valueType(regex) !== 'regex' || valueType(string) !== 'string') {
+        return null;
+    }
+
+    // Match?
+    const match = string.match(regex);
+    if (match === null) {
+        return null;
+    }
+
+    return regexMatchGroups(match);
 }
 
 
@@ -856,23 +1142,82 @@ function regexMatch([regex, string]) {
 // $doc: Find all matches of regular expression in a string
 // $arg regex: The regular expression
 // $arg string: The string
-// $return: The [match object
-// $return: ](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/match#return_value)
-// $return: array or null if no matches are found
-function regexMatchAll([regex, string]) {
-    return typeof string === 'string' ? Array.from(string.matchAll(regex)) : null;
+// $return: The array of [match objects](model.html#var.vName='RegexMatch')
+function regexMatchAll([regex = null, string = null]) {
+    if (valueType(regex) !== 'regex' || valueType(string) !== 'string') {
+        return null;
+    }
+
+    // Re-compile the regex with the "g" flag, if necessary
+    const regexGlobal = (regex.flags.indexOf('g') !== -1 ? regex : new RegExp(regex.source, `${regex.flags}g`));
+
+    return Array.from(string.matchAll(regexGlobal)).map((match) => regexMatchGroups(match));
 }
 
 
+// Helper function to create a match model from a metch object
+function regexMatchGroups(match) {
+    const groups = {};
+    for (let ixMatch = 0; ixMatch < match.length; ixMatch++) {
+        groups[`${ixMatch}`] = match[ixMatch];
+    }
+    if (match.groups) {
+        for (const groupName of Object.keys(match.groups)) {
+            groups[groupName] = match.groups[groupName];
+        }
+    }
+    return {
+        'index': match.index,
+        'input': match.input,
+        'groups': groups
+    };
+}
+
+
+// The regex match model
+export const regexMatchTypes = parseSchemaMarkdown(`\
+group "RegexMatch"
+
+
+# A regex match model
+struct RegexMatch
+
+    # The zero-based index of the match in the input string
+    int(>= 0) index
+
+    # The input string
+    string input
+
+    # The matched groups. The "0" key is the full match text. Ordered (non-named) groups use keys "1", "2", and so on.
+    string{} groups
+`);
+
+
 // $function: regexNew
 // $group: Regex
 // $doc: Create a regular expression
-// $arg pattern: The regular expression pattern string
-// $arg flags: The [regular expression flags
-// $arg flags: ](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#advanced_searching_with_flags)
+// eslint-disable-next-line max-len
+// $arg pattern: The [regular expression pattern string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_expressions#writing_a_regular_expression_pattern)
+// $arg flags: The regular expression flags. The string may contain the following characters:
+// $arg flags: - **i** - case-insensitive search
+// $arg flags: - **m** - multi-line search - "^" and "$" matches next to newline characters
+// $arg flags: - **s** - "." matches newline characters
 // $return: The regular expression or null if the pattern is invalid
-function regexNew([pattern, flags]) {
-    return new RegExp(pattern, flags);
+function regexNew([pattern = null, flags = null]) {
+    if (valueType(pattern) !== 'string' || (flags !== null && valueType(flags) !== 'string')) {
+        return null;
+    }
+
+    // Valid flags mask?
+    if (flags !== null) {
+        for (const flag of flags) {
+            if (flag !== 'i' && flag !== 'm' && flag !== 's') {
+                return null;
+            }
+        }
+    }
+
+    return flags !== null ? new RegExp(pattern, flags) : new RegExp(pattern);
 }
 
 
@@ -883,8 +1228,8 @@ function regexNew([pattern, flags]) {
 // $arg string: The string
 // $arg substr: The replacement string
 // $return: The updated string
-function regexReplace([regex, string, substr]) {
-    if (!(regex instanceof RegExp) || typeof string !== 'string' || typeof substr !== 'string') {
+function regexReplace([regex = null, string = null, substr = null]) {
+    if (valueType(regex) !== 'regex' || valueType(string) !== 'string' || valueType(substr) !== 'string') {
         return null;
     }
 
@@ -901,29 +1246,20 @@ function regexReplace([regex, string, substr]) {
 // $arg regex: The regular expression
 // $arg string: The string
 // $return: The array of split parts
-function regexSplit([regex, string]) {
-    if (!(regex instanceof RegExp) || typeof string !== 'string') {
+function regexSplit([regex = null, string = null]) {
+    if (valueType(regex) !== 'regex' || valueType(string) !== 'string') {
         return null;
     }
 
     return string.split(regex);
 }
 
-// $function: regexTest
-// $group: Regex
-// $doc: Test if a regular expression matches a string
-// $arg regex: The regular expression
-// $arg string: The string
-// $return: true if the regular expression matches, false otherwise
-function regexTest([regex, string]) {
-    return regex instanceof RegExp ? regex.test(string) : null;
-}
-
 
 //
 // Schema functions
 //
 
+
 // $function: schemaParse
 // $group: Schema
 // $doc: Parse the [Schema Markdown](https://craigahobbs.github.io/schema-markdown-js/language/) text
@@ -943,7 +1279,12 @@ function schemaParse(lines) {
 // $arg types: Optional. The [type model](https://craigahobbs.github.io/schema-markdown-doc/doc/#var.vName='Types').
 // $arg filename: Optional (default is ""). The file name.
 // $return: The schema's [type model](https://craigahobbs.github.io/schema-markdown-doc/doc/#var.vName='Types')
-function schemaParseEx([lines, types = {}, filename = '']) {
+function schemaParseEx([lines = null, types = {}, filename = '']) {
+    if (!(valueType(lines) === 'array' || valueType(lines) === 'string') ||
+        valueType(types) !== 'object' || valueType(filename) !== 'string') {
+        return null;
+    }
+
     return parseSchemaMarkdown(lines, {types, filename});
 }
 
@@ -964,7 +1305,12 @@ function schemaTypeModel() {
 // $arg typeName: The type name
 // $arg value: The object to validate
 // $return: The validated object or null if validation fails
-function schemaValidate([types, typeName, value]) {
+function schemaValidate([types = null, typeName = null, value = null]) {
+    if (valueType(types) !== 'object' || valueType(typeName) !== 'string') {
+        return null;
+    }
+
+    validateTypeModel(types);
     return validateType(types, typeName, value);
 }
 
@@ -974,7 +1320,11 @@ function schemaValidate([types, typeName, value]) {
 // $doc: Validate a [Schema Markdown Type Model](https://craigahobbs.github.io/schema-markdown-doc/doc/#var.vName='Types')
 // $arg types: The [type model](https://craigahobbs.github.io/schema-markdown-doc/doc/#var.vName='Types') to validate
 // $return: The validated [type model](https://craigahobbs.github.io/schema-markdown-doc/doc/#var.vName='Types')
-function schemaValidateTypeModel([types]) {
+function schemaValidateTypeModel([types = null]) {
+    if (valueType(types) !== 'object') {
+        return null;
+    }
+
     return validateTypeModel(types);
 }
 
@@ -990,8 +1340,13 @@ function schemaValidateTypeModel([types]) {
 // $arg string: The string
 // $arg index: The character index
 // $return: The character code
-function stringCharCodeAt([string, index]) {
-    return typeof string === 'string' ? string.charCodeAt(index) : null;
+function stringCharCodeAt([string = null, index = null]) {
+    if (valueType(string) !== 'string' ||
+        valueType(index) !== 'number' || Math.floor(index) !== index || index < 0 || index >= string.length) {
+        return null;
+    }
+
+    return string.charCodeAt(index);
 }
 
 
@@ -999,10 +1354,14 @@ function stringCharCodeAt([string, index]) {
 // $group: String
 // $doc: Determine if a string ends with a search string
 // $arg string: The string
-// $arg searchString: The search string
+// $arg search: The search string
 // $return: true if the string ends with the search string, false otherwise
-function stringEndsWith([string, searchString]) {
-    return typeof string === 'string' ? string.endsWith(searchString) : null;
+function stringEndsWith([string = null, search = null]) {
+    if (valueType(string) !== 'string' || valueType(search) !== 'string') {
+        return null;
+    }
+
+    return string.endsWith(search);
 }
 
 
@@ -1011,7 +1370,11 @@ function stringEndsWith([string, searchString]) {
 // $doc: Create a string of characters from character codes
 // $arg charCodes...: The character codes
 // $return: The string of characters
-function stringFromCharCode(charCodes) {
+function stringFromCharCode(charCodes = null) {
+    if (charCodes.some((code) => valueType(code) !== 'number' || Math.floor(code) !== code || code < 0)) {
+        return null;
+    }
+
     return String.fromCharCode(...charCodes);
 }
 
@@ -1020,11 +1383,16 @@ function stringFromCharCode(charCodes) {
 // $group: String
 // $doc: Find the first index of a search string in a string
 // $arg string: The string
-// $arg searchString: The search string
+// $arg search: The search string
 // $arg index: Optional (default is 0). The index at which to start the search.
 // $return: The first index of the search string; -1 if not found.
-function stringIndexOf([string, searchString, index]) {
-    return typeof string === 'string' ? string.indexOf(searchString, index) : -1;
+function stringIndexOf([string = null, search = null, index = 0]) {
+    if (valueType(string) !== 'string' || valueType(search) !== 'string' ||
+        valueType(index) !== 'number' || Math.floor(index) !== index || index < 0  || index >= string.length) {
+        return -1;
+    }
+
+    return string.indexOf(search, index);
 }
 
 
@@ -1032,11 +1400,20 @@ function stringIndexOf([string, searchString, index]) {
 // $group: String
 // $doc: Find the last index of a search string in a string
 // $arg string: The string
-// $arg searchString: The search string
+// $arg search: The search string
 // $arg index: Optional (default is the end of the string). The index at which to start the search.
 // $return: The last index of the search string; -1 if not found.
-function stringLastIndexOf([string, searchString, index]) {
-    return typeof string === 'string' ? string.lastIndexOf(searchString, index) : -1;
+function stringLastIndexOf([string = null, search = null, indexArg = null]) {
+    let index = indexArg;
+    if (index === null && valueType(string) === 'string') {
+        index = string.length - 1;
+    }
+    if (valueType(string) !== 'string' || valueType(search) !== 'string' ||
+        valueType(index) !== 'number' || Math.floor(index) !== index || index < 0  || index >= string.length) {
+        return -1;
+    }
+
+    return string.lastIndexOf(search, index);
 }
 
 
@@ -1044,9 +1421,13 @@ function stringLastIndexOf([string, searchString, index]) {
 // $group: String
 // $doc: Get the length of a string
 // $arg string: The string
-// $return: The string's length; null if not a string
-function stringLength([string]) {
-    return typeof string === 'string' ? string.length : null;
+// $return: The string's length; zero if not a string
+function stringLength([string = null]) {
+    if (valueType(string) !== 'string') {
+        return 0;
+    }
+
+    return string.length;
 }
 
 
@@ -1055,8 +1436,12 @@ function stringLength([string]) {
 // $doc: Convert a string to lower-case
 // $arg string: The string
 // $return: The lower-case string
-function stringLower([string]) {
-    return typeof string === 'string' ? string.toLowerCase() : null;
+function stringLower([string = null]) {
+    if (valueType(string) !== 'string') {
+        return null;
+    }
+
+    return string.toLowerCase();
 }
 
 
@@ -1065,8 +1450,8 @@ function stringLower([string]) {
 // $doc: Create a new string from a value
 // $arg value: The value
 // $return: The new string
-function stringNew([value]) {
-    return `${value}`;
+function stringNew([value = null]) {
+    return valueString(value);
 }
 
 
@@ -1076,8 +1461,12 @@ function stringNew([value]) {
 // $arg string: The string to repeat
 // $arg count: The number of times to repeat the string
 // $return: The repeated string
-function stringRepeat([string, count]) {
-    return typeof string === 'string' ? string.repeat(count) : null;
+function stringRepeat([string = null, count = null]) {
+    if (valueType(string) !== 'string' || valueType(count) !== 'number' || Math.floor(count) !== count || count < 0) {
+        return null;
+    }
+
+    return string.repeat(count);
 }
 
 
@@ -1088,14 +1477,11 @@ function stringRepeat([string, count]) {
 // $arg substr: The string to replace
 // $arg newSubstr: The replacement string
 // $return: The updated string
-function stringReplace([string, substr, newSubstr], options) {
-    if (typeof string !== 'string') {
+function stringReplace([string = null, substr = null, newSubstr = null]) {
+    if (valueType(string) !== 'string' || valueType(substr) !== 'string' || valueType(newSubstr) !== 'string') {
         return null;
     }
-    if (typeof newSubstr === 'function') {
-        const replacerFunction = (...args) => newSubstr(args, options);
-        return string.replaceAll(substr, replacerFunction);
-    }
+
     return string.replaceAll(substr, newSubstr);
 }
 
@@ -1104,11 +1490,21 @@ function stringReplace([string, substr, newSubstr], options) {
 // $group: String
 // $doc: Copy a portion of a string
 // $arg string: The string
-// $arg start: Optional (default is 0). The start index of the slice.
+// $arg start: The start index of the slice
 // $arg end: Optional (default is the end of the string). The end index of the slice.
 // $return: The new string slice
-function stringSlice([string, beginIndex, endIndex]) {
-    return typeof string === 'string' ? string.slice(beginIndex, endIndex) : null;
+function stringSlice([string = null, begin = null, endArg = null]) {
+    let end = endArg;
+    if (end === null && valueType(string) === 'string') {
+        end = string.length;
+    }
+    if (valueType(string) !== 'string' ||
+        valueType(begin) !== 'number' || Math.floor(begin) !== begin || begin < 0 || begin > string.length ||
+        valueType(end) !== 'number' || Math.floor(end) !== end || end < 0 || end > string.length) {
+        return null;
+    }
+
+    return string.slice(begin, end);
 }
 
 
@@ -1116,11 +1512,14 @@ function stringSlice([string, beginIndex, endIndex]) {
 // $group: String
 // $doc: Split a string
 // $arg string: The string to split
-// $arg separator: The separator string or regular expression
-// $arg limit: The maximum number of strings to split into
+// $arg separator: The separator string
 // $return: The array of split-out strings
-function stringSplit([string, separator, limit]) {
-    return typeof string === 'string' ? string.split(separator, limit) : null;
+function stringSplit([string = null, separator = null]) {
+    if (valueType(string) !== 'string' || valueType(separator) !== 'string') {
+        return null;
+    }
+
+    return string.split(separator);
 }
 
 
@@ -1128,10 +1527,14 @@ function stringSplit([string, separator, limit]) {
 // $group: String
 // $doc: Determine if a string starts with a search string
 // $arg string: The string
-// $arg searchString: The search string
+// $arg search: The search string
 // $return: true if the string starts with the search string, false otherwise
-function stringStartsWith([string, searchString]) {
-    return typeof string === 'string' ? string.startsWith(searchString) : null;
+function stringStartsWith([string = null, search = null]) {
+    if (valueType(string) !== 'string' || valueType(search) !== 'string') {
+        return null;
+    }
+
+    return string.startsWith(search);
 }
 
 
@@ -1140,8 +1543,12 @@ function stringStartsWith([string, searchString]) {
 // $doc: Trim the whitespace from the beginning and end of a string
 // $arg string: The string
 // $return: The trimmed string
-function stringTrim([string]) {
-    return typeof string === 'string' ? string.trim() : null;
+function stringTrim([string = null]) {
+    if (valueType(string) !== 'string') {
+        return null;
+    }
+
+    return string.trim();
 }
 
 
@@ -1150,8 +1557,12 @@ function stringTrim([string]) {
 // $doc: Convert a string to upper-case
 // $arg string: The string
 // $return: The upper-case string
-function stringUpper([string]) {
-    return typeof string === 'string' ? string.toUpperCase() : null;
+function stringUpper([string = null]) {
+    if (valueType(string) !== 'string') {
+        return null;
+    }
+
+    return string.toUpperCase();
 }
 
 
@@ -1160,51 +1571,128 @@ function stringUpper([string]) {
 //
 
 
+// $function: systemBoolean
+// $group: System
+// $doc: Interpret a value as a boolean
+// $arg value: The value
+// $return: true or false
+function systemBoolean([value = null]) {
+    return valueBoolean(value);
+}
+
+
+// $function: systemCompare
+// $group: System
+// $doc: Compare two values
+// $arg left: The left value
+// $arg right: The right value
+// $return: -1 if the left value is less than the right value, 0 if equal, and 1 if greater than
+function systemCompare([left = null, right = null]) {
+    return valueCompare(left, right);
+}
+
+
 // $function: systemFetch
 // $group: System
-// $doc: Retrieve a remote JSON or text resource
-// $arg url: The resource URL or array of URLs
-// $arg options: Optional (default is null). The [fetch options](https://developer.mozilla.org/en-US/docs/Web/API/fetch#parameters).
-// $arg isText: Optional (default is false). If true, retrieve the resource as text.
-// $return: The resource object/string or array of objects/strings; null if an error occurred.
-async function systemFetch([url, fetchOptions = null, isText = false], options) {
-    const isArray = Array.isArray(url);
-    const urls = (isArray ? url : [url]).map((mURL) => (options !== null && 'urlFn' in options ? options.urlFn(mURL) : mURL));
-    const responses = await Promise.all(urls.map(async (fURL) => {
+// $doc: Retrieve a URL resource
+// $arg url: The resource URL, [request model](model.html#var.vName='SystemFetchRequest'), or array of URL and
+// $arg url: [request model](model.html#var.vName='SystemFetchRequest')
+// $return: The response string or array of strings; null if an error occurred
+async function systemFetch([url = null], options) {
+    // Options
+    const fetchFn = options !== null ? (options.fetchFn ?? null) : null;
+    const logFn = options !== null && options.debug ? (options.logFn ?? null) : null;
+    const urlFn = options !== null ? (options.urlFn ?? null) : null;
+
+    // Validate the URL argument
+    const requests = [];
+    let isResponseArray = false;
+    if (valueType(url) === 'string') {
+        requests.push({'url': url});
+    } else if (valueType(url) === 'object') {
+        requests.push(validateType(systemFetchTypes, 'SystemFetchRequest', url));
+    } else if (valueType(url) === 'array') {
+        isResponseArray = true;
+        for (const urlItem of url) {
+            if (valueType(urlItem) === 'string') {
+                requests.push({'url': urlItem});
+            } else {
+                requests.push(validateType(systemFetchTypes, 'SystemFetchRequest', urlItem));
+            }
+        }
+    } else {
+        return null;
+    }
+
+    // Fetch in parallel
+    const fetchResponses = await Promise.all(requests.map((request) => {
         try {
-            return 'fetchFn' in options ? await (fetchOptions ? options.fetchFn(fURL, fetchOptions) : options.fetchFn(fURL)) : null;
+            const fetchURL = urlFn !== null ? urlFn(request.url) : request.url;
+            const fetchOptions = {};
+            if ((request.body ?? null) !== null) {
+                fetchOptions.body = request.body;
+            }
+            if ((request.headers ?? null) !== null) {
+                fetchOptions.headers = request.headers;
+            }
+            return fetchFn !== null ? fetchFn(fetchURL, fetchOptions) : null;
         } catch {
             return null;
         }
     }));
-    const values = await Promise.all(responses.map(async (response) => {
+    const responses = await Promise.all(fetchResponses.map(async (fetchResponse, ixResponse) => {
+        let response;
         try {
-            return response !== null && response.ok ? await (isText ? response.text() : response.json()) : null;
+            response = fetchResponse !== null && fetchResponse.ok ? await fetchResponse.text() : null;
         } catch {
-            return null;
+            response = null;
         }
-    }));
 
-    // Log failures
-    for (const [ixValue, value] of values.entries()) {
-        if (value === null && options !== null && 'logFn' in options && options.debug) {
-            const errorURL = urls[ixValue];
-            options.logFn(`BareScript: Function "systemFetch" failed for ${isText ? 'text' : 'JSON'} resource "${errorURL}"`);
+        // Log failure
+        if (response === null && logFn !== null) {
+            const errorURL = requests[ixResponse].url;
+            logFn(`BareScript: Function "systemFetch" failed for resource "${errorURL}"`);
         }
-    }
 
-    return isArray ? values : values[0];
+        return response;
+    }));
+
+    return isResponseArray ? responses : responses[0];
 }
 
 
+// The aggregation model
+export const systemFetchTypes = parseSchemaMarkdown(`\
+group "SystemFetch"
+
+
+# A fetch request model
+struct SystemFetchRequest
+
+    # The resource URL
+    string url
+
+    # The request body
+    optional string body
+
+    # The request headers
+    optional string{} headers
+`);
+
+
 // $function: systemGlobalGet
 // $group: System
 // $doc: Get a global variable value
 // $arg name: The global variable name
+// $arg defaultValue: The default value (optional)
 // $return: The global variable's value or null if it does not exist
-function systemGlobalGet([name], options) {
+function systemGlobalGet([name = null, defaultValue = null], options) {
+    if (valueType(name) !== 'string') {
+        return defaultValue;
+    }
+
     const globals = (options !== null ? (options.globals ?? null) : null);
-    return (globals !== null ? (globals[name] ?? null) : null);
+    return globals !== null ? (globals[name] ?? defaultValue) : defaultValue;
 }
 
 
@@ -1214,24 +1702,37 @@ function systemGlobalGet([name], options) {
 // $arg name: The global variable name
 // $arg value: The global variable's value
 // $return: The global variable's value
-function systemGlobalSet([name, value], options) {
-    if (options !== null) {
-        const globals = options.globals ?? null;
-        if (globals !== null) {
-            globals[name] = value;
-        }
+function systemGlobalSet([name = null, value = null], options) {
+    if (valueType(name) !== 'string') {
+        return null;
+    }
+
+    const globals = (options !== null ? (options.globals ?? null) : null);
+    if (globals !== null) {
+        globals[name] = value;
     }
     return value;
 }
 
 
+// $function: systemIs
+// $group: System
+// $doc: Test if one value is the same object as another
+// $arg value1: The first value
+// $arg value2: The second value
+// $return: true if values are the same object, false otherwise
+function systemIs([value1 = null, value2 = null]) {
+    return valueIs(value1, value2);
+}
+
+
 // $function: systemLog
 // $group: System
 // $doc: Log a message to the console
-// $arg string: The message
-function systemLog([string], options) {
+// $arg message: The log message
+function systemLog([message = null], options) {
     if (options !== null && 'logFn' in options) {
-        options.logFn(string);
+        options.logFn(valueString(message));
     }
 }
 
@@ -1239,10 +1740,10 @@ function systemLog([string], options) {
 // $function: systemLogDebug
 // $group: System
 // $doc: Log a message to the console, if in debug mode
-// $arg string: The message
-function systemLogDebug([string], options) {
+// $arg message: The log message
+function systemLogDebug([message = null], options) {
     if (options !== null && 'logFn' in options && options.debug) {
-        options.logFn(string);
+        options.logFn(valueString(message));
     }
 }
 
@@ -1254,7 +1755,11 @@ function systemLogDebug([string], options) {
 // $arg func: The function
 // $arg args...: The function arguments
 // $return: The new function called with "args"
-function systemPartial([func, ...args]) {
+function systemPartial([func = null, ...args]) {
+    if (valueType(func) !== 'function' || args.length < 1) {
+        return null;
+    }
+
     return (argsExtra, options) => func([...args, ...argsExtra], options);
 }
 
@@ -1265,20 +1770,8 @@ function systemPartial([func, ...args]) {
 // $arg value: The value
 // $return: The type string of the value.
 // $return: Valid values are: 'array', 'boolean', 'datetime', 'function', 'null', 'number', 'object', 'regex', 'string'.
-function systemType([value]) {
-    const type = typeof value;
-    if (type === 'object') {
-        if (value === null) {
-            return 'null';
-        } else if (Array.isArray(value)) {
-            return 'array';
-        } else if (value instanceof Date) {
-            return 'datetime';
-        } else if (value instanceof RegExp) {
-            return 'regex';
-        }
-    }
-    return type;
+function systemType([value = null]) {
+    return valueType(value);
 }
 
 
@@ -1293,9 +1786,13 @@ function systemType([value]) {
 // $arg url: The URL string
 // $arg extra: Optional (default is true). If true, encode extra characters for wider compatibility.
 // $return: The encoded URL string
-function urlEncode([url, extra = true]) {
+function urlEncode([url = null, extra = true]) {
+    if (valueType(url) !== 'string') {
+        return null;
+    }
+
     let urlEncoded = encodeURI(url);
-    if (extra) {
+    if (valueBoolean(extra)) {
         // Replace ')' with '%29' for Markdown links
         urlEncoded = urlEncoded.replaceAll(')', '%29');
     }
@@ -1309,13 +1806,17 @@ function urlEncode([url, extra = true]) {
 // $arg url: The URL component string
 // $arg extra: Optional (default is true). If true, encode extra characters for wider compatibility.
 // $return: The encoded URL component string
-function urlEncodeComponent([urlComponent, extra = true]) {
-    let urlComponentEncoded = encodeURIComponent(urlComponent);
-    if (extra) {
+function urlEncodeComponent([url = null, extra = true]) {
+    if (valueType(url) !== 'string') {
+        return null;
+    }
+
+    let urlEncoded = encodeURIComponent(url);
+    if (valueBoolean(extra)) {
         // Replace ')' with '%29' for Markdown links
-        urlComponentEncoded = urlComponentEncoded.replaceAll(')', '%29');
+        urlEncoded = urlEncoded.replaceAll(')', '%29');
     }
-    return urlComponentEncoded;
+    return urlEncoded;
 }
 
 
@@ -1348,10 +1849,10 @@ export const scriptFunctions = {
     datetimeHour,
     datetimeISOFormat,
     datetimeISOParse,
+    datetimeMillisecond,
     datetimeMinute,
     datetimeMonth,
     datetimeNew,
-    datetimeNewUTC,
     datetimeNow,
     datetimeSecond,
     datetimeToday,
@@ -1394,7 +1895,6 @@ export const scriptFunctions = {
     regexNew,
     regexReplace,
     regexSplit,
-    regexTest,
     schemaParse,
     schemaParseEx,
     schemaTypeModel,
@@ -1415,9 +1915,12 @@ export const scriptFunctions = {
     stringStartsWith,
     stringTrim,
     stringUpper,
+    systemBoolean,
+    systemCompare,
     systemFetch,
     systemGlobalGet,
     systemGlobalSet,
+    systemIs,
     systemLog,
     systemLogDebug,
     systemPartial,