bare-script 2.2.9 → 2.2.11

package/README.md

@@ -83,7 +83,7 @@ console.log(await executeScriptAsync(script, {'fetchFn': fetch}));
 This outputs:
 
 ~~~
-The BareScript Library has 89 functions
+The BareScript Library has 100 functions
 ~~~
 
 

package/lib/library.js

@@ -257,15 +257,17 @@ export const scriptFunctions = {
     // $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
-    'datetimeDay': ([datetime]) => (datetime instanceof Date ? datetime.getDate() : null),
+    'datetimeDay': ([datetime, utc = false]) => (datetime instanceof Date ? (utc ? datetime.getUTCDate() : datetime.getDate()) : null),
 
     // $function: datetimeHour
     // $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
-    'datetimeHour': ([datetime]) => (datetime instanceof Date ? datetime.getHours() : null),
+    'datetimeHour': ([datetime, utc = false]) => (datetime instanceof Date ? (utc ? datetime.getUTCHours() : datetime.getHours()) : null),
 
     // $function: datetimeISOFormat
     // $group: Datetime
@@ -295,15 +297,21 @@ export const scriptFunctions = {
     // $group: Datetime
     // $doc: Get the number of minutes of a datetime
     // $arg datetime: The datetime
+    // $arg utc: Optional (default is false). If true, return the UTC minutes.
     // $return: The number of minutes
-    'datetimeMinute': ([datetime]) => (datetime instanceof Date ? datetime.getMinutes() : null),
+    'datetimeMinute': ([datetime, utc = false]) => (
+        datetime instanceof Date ? (utc ? datetime.getUTCMinutes() : datetime.getMinutes()) : null
+    ),
 
     // $function: datetimeMonth
     // $group: Datetime
     // $doc: Get the number of 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
-    'datetimeMonth': ([datetime]) => (datetime instanceof Date ? datetime.getMonth() + 1 : null),
+    'datetimeMonth': ([datetime, utc = false]) => (
+        datetime instanceof Date ? (utc ? datetime.getUTCMonth() + 1 : datetime.getMonth() + 1) : null
+    ),
 
     // $function: datetimeNew
     // $group: Datetime
@@ -345,8 +353,11 @@ export const scriptFunctions = {
     // $group: Datetime
     // $doc: Get the number of seconds of a datetime
     // $arg datetime: The datetime
+    // $arg utc: Optional (default is false). If true, return the UTC seconds.
     // $return: The number of seconds
-    'datetimeSecond': ([datetime]) => (datetime instanceof Date ? datetime.getSeconds() : null),
+    'datetimeSecond': ([datetime, utc = false]) => (
+        datetime instanceof Date ? (utc ? datetime.getUTCSeconds() : datetime.getSeconds()) : null
+    ),
 
     // $function: datetimeToday
     // $group: Datetime
@@ -361,8 +372,11 @@ export const scriptFunctions = {
     // $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
-    'datetimeYear': ([datetime]) => (datetime instanceof Date ? datetime.getFullYear() : null),
+    'datetimeYear': ([datetime, utc = false]) => (
+        datetime instanceof Date ? (utc ? datetime.getUTCFullYear() : datetime.getFullYear()) : null
+    ),
 
 
     //

package/lib/parser.js

@@ -56,6 +56,7 @@ export function parseScript(scriptText, startLineNumber = 1) {
     // Process each line
     const lineContinuation = [];
     let functionDef = null;
+    let functionLabelDefDepth = null;
     const labelDefs = [];
     let labelIndex = 0;
     let ixLine;
@@ -118,6 +119,7 @@ export function parseScript(scriptText, startLineNumber = 1) {
             }
 
             // Add the function definition statement
+            functionLabelDefDepth = labelDefs.length;
             functionDef = {
                 'function': {
                     'name': matchFunctionBegin.groups.name,
@@ -143,7 +145,17 @@ export function parseScript(scriptText, startLineNumber = 1) {
             if (functionDef === null) {
                 throw new BareScriptParserError('No matching function definition', line, 1, startLineNumber + ixLine);
             }
+
+            // Check for un-matched label definitions
+            if (labelDefs.length > functionLabelDefDepth) {
+                const labelDef = labelDefs.pop();
+                const [defKey] = Object.keys(labelDef);
+                const def = labelDef[defKey];
+                throw new BareScriptParserError(`Missing end${defKey} statement`, def.line, 1, def.lineNumber);
+            }
+
             functionDef = null;
+            functionLabelDefDepth = null;
             continue;
         }
 
@@ -173,7 +185,8 @@ export function parseScript(scriptText, startLineNumber = 1) {
         const matchIfElseIf = line.match(rScriptIfElseIf);
         if (matchIfElseIf !== null) {
             // Get the if-then definition
-            const ifthen = (labelDefs.length > 0 ? (labelDefs[labelDefs.length - 1].if ?? null) : null);
+            const labelDefDepth = (functionDef !== null ? functionLabelDefDepth : 0);
+            const ifthen = (labelDefs.length > labelDefDepth ? (labelDefs[labelDefs.length - 1].if ?? null) : null);
             if (ifthen === null) {
                 throw new BareScriptParserError('No matching if statement', line, 1, startLineNumber + ixLine);
             }
@@ -204,7 +217,8 @@ export function parseScript(scriptText, startLineNumber = 1) {
         const matchIfElse = line.match(rScriptIfElse);
         if (matchIfElse !== null) {
             // Get the if-then definition
-            const ifthen = (labelDefs.length > 0 ? (labelDefs[labelDefs.length - 1].if ?? null) : null);
+            const labelDefDepth = (functionDef !== null ? functionLabelDefDepth : 0);
+            const ifthen = (labelDefs.length > labelDefDepth ? (labelDefs[labelDefs.length - 1].if ?? null) : null);
             if (ifthen === null) {
                 throw new BareScriptParserError('No matching if statement', line, 1, startLineNumber + ixLine);
             }
@@ -227,7 +241,8 @@ export function parseScript(scriptText, startLineNumber = 1) {
         const matchIfEnd = line.match(rScriptIfEnd);
         if (matchIfEnd !== null) {
             // Pop the if-then definition
-            const ifthen = (labelDefs.length > 0 ? (labelDefs.pop().if ?? null) : null);
+            const labelDefDepth = (functionDef !== null ? functionLabelDefDepth : 0);
+            const ifthen = (labelDefs.length > labelDefDepth ? (labelDefs.pop().if ?? null) : null);
             if (ifthen === null) {
                 throw new BareScriptParserError('No matching if statement', line, 1, startLineNumber + ixLine);
             }
@@ -269,7 +284,8 @@ export function parseScript(scriptText, startLineNumber = 1) {
         const matchWhileEnd = line.match(rScriptWhileEnd);
         if (matchWhileEnd !== null) {
             // Pop the while-do definition
-            const whiledo = (labelDefs.length > 0 ? (labelDefs.pop().while ?? null) : null);
+            const labelDefDepth = (functionDef !== null ? functionLabelDefDepth : 0);
+            const whiledo = (labelDefs.length > labelDefDepth ? (labelDefs.pop().while ?? null) : null);
             if (whiledo === null) {
                 throw new BareScriptParserError('No matching while statement', line, 1, startLineNumber + ixLine);
             }
@@ -319,7 +335,8 @@ export function parseScript(scriptText, startLineNumber = 1) {
         const matchForEnd = line.match(rScriptForEnd);
         if (matchForEnd !== null) {
             // Pop the foreach definition
-            const foreach = (labelDefs.length > 0 ? (labelDefs.pop().for ?? null) : null);
+            const labelDefDepth = (functionDef !== null ? functionLabelDefDepth : 0);
+            const foreach = (labelDefs.length > labelDefDepth ? (labelDefs.pop().for ?? null) : null);
             if (foreach === null) {
                 throw new BareScriptParserError('No matching for statement', line, 1, startLineNumber + ixLine);
             }
@@ -346,7 +363,9 @@ export function parseScript(scriptText, startLineNumber = 1) {
         const matchBreak = line.match(rScriptBreak);
         if (matchBreak !== null) {
             // Get the loop definition
-            const labelDef = (labelDefs.length > 0 ? (labelDefs.findLast((def) => !('if' in def)) ?? null) : null);
+            const labelDefDepth = (functionDef !== null ? functionLabelDefDepth : 0);
+            const ixLabelDef = labelDefs.findLastIndex((def) => !('if' in def));
+            const labelDef = (ixLabelDef >= labelDefDepth ? labelDefs[ixLabelDef] : null);
             if (labelDef === null) {
                 throw new BareScriptParserError('Break statement outside of loop', line, 1, startLineNumber + ixLine);
             }
@@ -362,7 +381,9 @@ export function parseScript(scriptText, startLineNumber = 1) {
         const matchContinue = line.match(rScriptContinue);
         if (matchContinue !== null) {
             // Get the loop definition
-            const labelDef = (labelDefs.length > 0 ? (labelDefs.findLast((def) => !('if' in def)) ?? null) : null);
+            const labelDefDepth = (functionDef !== null ? functionLabelDefDepth : 0);
+            const ixLabelDef = labelDefs.findLastIndex((def) => !('if' in def));
+            const labelDef = (ixLabelDef >= labelDefDepth ? labelDefs[ixLabelDef] : null);
             if (labelDef === null) {
                 throw new BareScriptParserError('Continue statement outside of loop', line, 1, startLineNumber + ixLine);
             }

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "bare-script",
-    "version": "2.2.9",
+    "version": "2.2.11",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",
@@ -31,7 +31,7 @@
     },
     "devDependencies": {
         "c8": "~8.0",
-        "eslint": "~8.50",
+        "eslint": "~8.52",
         "jsdoc": "~4.0"
     }
 }