bare-script 3.7.1 → 3.7.3

package/lib/parser.js

@@ -78,20 +78,25 @@ export function parseScript(scriptText, startLineNumber = 1, scriptName = null)
         // Assignment?
         const matchAssignment = line.match(rScriptAssignment);
         if (matchAssignment !== null) {
+            // Parse the expression
+            let assignmentExpr;
             try {
-                const exprStatement = {
-                    'expr': {
-                        'name': matchAssignment.groups.name,
-                        'expr': parseExpression(matchAssignment.groups.expr, lineNumber, scriptName, true),
-                        ...statementBase
-                    }
-                };
-                statements.push(exprStatement);
-                continue;
+                assignmentExpr = parseExpression(matchAssignment.groups.expr, lineNumber, scriptName, true);
             } catch (error) {
                 const columnNumber = line.length - matchAssignment.groups.expr.length + error.columnNumber;
                 throw new BareScriptParserError(error.error, line, columnNumber, startLineNumber + ixLine, scriptName);
             }
+
+            // Add the expression statement
+            const exprStatement = {
+                'expr': {
+                    'name': matchAssignment.groups.name,
+                    'expr': assignmentExpr,
+                    ...statementBase
+                }
+            };
+            statements.push(exprStatement);
+            continue;
         }
 
         // Function definition begin?
@@ -147,11 +152,20 @@ export function parseScript(scriptText, startLineNumber = 1, scriptName = null)
         // If-then begin?
         const matchIfBegin = line.match(rScriptIfBegin);
         if (matchIfBegin !== null) {
+            // Parse the if-then expression
+            let ifthenExpr;
+            try {
+                ifthenExpr = parseExpression(matchIfBegin.groups.expr, lineNumber, scriptName, true);
+            } catch (error) {
+                const columnNumber = matchIfBegin.groups.if.length + error.columnNumber;
+                throw new BareScriptParserError(error.error, line, columnNumber, startLineNumber + ixLine, scriptName);
+            }
+
             // Add the if-then label definition
             const ifthen = {
                 'jump': {
                     'label': `__bareScriptIf${labelIndex}`,
-                    'expr': {'unary': {'op': '!', 'expr': parseExpression(matchIfBegin.groups.expr, lineNumber, scriptName, true)}},
+                    'expr': {'unary': {'op': '!', 'expr': ifthenExpr}},
                     ...statementBase
                 },
                 'done': `__bareScriptDone${labelIndex}`,
@@ -170,7 +184,7 @@ export function parseScript(scriptText, startLineNumber = 1, scriptName = null)
         // Else-if-then?
         const matchIfElseIf = line.match(rScriptIfElseIf);
         if (matchIfElseIf !== null) {
-            // Get the if-then definition
+            // Get the else-if-then definition
             const labelDefDepth = (functionDef !== null ? functionLabelDefDepth : 0);
             const ifthen = (labelDefs.length > labelDefDepth ? (labelDefs[labelDefs.length - 1].if ?? null) : null);
             if (ifthen === null) {
@@ -182,11 +196,20 @@ export function parseScript(scriptText, startLineNumber = 1, scriptName = null)
                 throw new BareScriptParserError('Elif statement following else statement', line, 1, startLineNumber + ixLine, scriptName);
             }
 
+            // Parse the else-if-then expression
+            let ifElseIfExpr;
+            try {
+                ifElseIfExpr = parseExpression(matchIfElseIf.groups.expr, lineNumber, scriptName, true);
+            } catch (error) {
+                const columnNumber = matchIfElseIf.groups.elif.length + error.columnNumber;
+                throw new BareScriptParserError(error.error, line, columnNumber, startLineNumber + ixLine, scriptName);
+            }
+
             // Generate the next if-then jump statement
             const prevLabel = ifthen.jump.label;
             ifthen.jump = {
                 'label': `__bareScriptIf${labelIndex}`,
-                'expr': {'unary': {'op': '!', 'expr': parseExpression(matchIfElseIf.groups.expr, lineNumber, scriptName, true)}},
+                'expr': {'unary': {'op': '!', 'expr': ifElseIfExpr}},
                 ...statementBase
             };
             labelIndex += 1;
@@ -247,12 +270,21 @@ export function parseScript(scriptText, startLineNumber = 1, scriptName = null)
         // While-do begin?
         const matchWhileBegin = line.match(rScriptWhileBegin);
         if (matchWhileBegin !== null) {
+            // Parse the while-do expression
+            let whileBeginExpr;
+            try {
+                whileBeginExpr = parseExpression(matchWhileBegin.groups.expr, lineNumber, scriptName, true);
+            } catch (error) {
+                const columnNumber = matchWhileBegin.groups.while.length + error.columnNumber;
+                throw new BareScriptParserError(error.error, line, columnNumber, startLineNumber + ixLine, scriptName);
+            }
+
             // Add the while-do label
             const whiledo = {
                 'loop': `__bareScriptLoop${labelIndex}`,
                 'continue': `__bareScriptLoop${labelIndex}`,
                 'done': `__bareScriptDone${labelIndex}`,
-                'expr': parseExpression(matchWhileBegin.groups.expr, lineNumber, scriptName, true),
+                'expr': whileBeginExpr,
                 line,
                 'lineNumber': startLineNumber + ixLine
             };
@@ -303,11 +335,20 @@ export function parseScript(scriptText, startLineNumber = 1, scriptName = null)
             labelDefs.push({'for': foreach});
             labelIndex += 1;
 
+            // Parse the for-each expression
+            let forBeginExpr;
+            try {
+                forBeginExpr = parseExpression(matchForBegin.groups.values, lineNumber, scriptName, true);
+            } catch (error) {
+                const columnNumber = matchForBegin.groups.for.length + error.columnNumber;
+                throw new BareScriptParserError(error.error, line, columnNumber, startLineNumber + ixLine, scriptName);
+            }
+
             // Add the for-each header statements
             statements.push(
                 {'expr': {
                     'name': foreach.values,
-                    'expr': parseExpression(matchForBegin.groups.values, lineNumber, scriptName, true),
+                    'expr': forBeginExpr,
                     ...statementBase
                 }},
                 {'expr': {
@@ -489,15 +530,15 @@ const rScriptJump = new RegExp(`^(?<jump>\\s*(?:jump|jumpif\\s*\\((?<expr>.+)\\)
 const rScriptReturn = new RegExp(`^(?<return>\\s*return(?:\\s+(?<expr>[^#\\s].*))?)${rPartComment}`);
 const rScriptInclude = new RegExp(`^\\s*include\\s+(?<delim>')(?<url>(?:\\'|[^'])*)'${rPartComment}`);
 const rScriptIncludeSystem = new RegExp(`^\\s*include\\s+(?<delim><)(?<url>[^>]*)>${rPartComment}`);
-const rScriptIfBegin = new RegExp(`^\\s*if\\s+(?<expr>.+)\\s*:${rPartComment}`);
-const rScriptIfElseIf = new RegExp(`^\\s*elif\\s+(?<expr>.+)\\s*:${rPartComment}`);
+const rScriptIfBegin = new RegExp(`^(?<if>\\s*if\\s+)(?<expr>.+)\\s*:${rPartComment}`);
+const rScriptIfElseIf = new RegExp(`^(?<elif>\\s*elif\\s+)(?<expr>.+)\\s*:${rPartComment}`);
 const rScriptIfElse = new RegExp(`^\\s*else\\s*:${rPartComment}`);
 const rScriptIfEnd = new RegExp(`^\\s*endif${rPartComment}`);
 const rScriptForBegin = new RegExp(
-    `^\\s*for\\s+(?<value>[A-Za-z_]\\w*)(?:\\s*,\\s*(?<index>[A-Za-z_]\\w*))?\\s+in\\s+(?<values>.+)\\s*:${rPartComment}`
+    `^(?<for>\\s*for\\s+(?<value>[A-Za-z_]\\w*)(?:\\s*,\\s*(?<index>[A-Za-z_]\\w*))?\\s+in\\s+)(?<values>.+)\\s*:${rPartComment}`
 );
 const rScriptForEnd = new RegExp(`^\\s*endfor${rPartComment}`);
-const rScriptWhileBegin = new RegExp(`^\\s*while\\s+(?<expr>.+)\\s*:${rPartComment}`);
+const rScriptWhileBegin = new RegExp(`^(?<while>\\s*while\\s+)(?<expr>.+)\\s*:${rPartComment}`);
 const rScriptWhileEnd = new RegExp(`^\\s*endwhile${rPartComment}`);
 const rScriptBreak = new RegExp(`^\\s*break${rPartComment}`);
 const rScriptContinue = new RegExp(`^\\s*continue${rPartComment}`);
@@ -702,9 +743,9 @@ function parseUnaryExpression(exprText, arrayLiterals) {
                 break;
             }
 
-            // Object key/value separator
+            // Key/value pair separator
             if (args.length !== 0) {
-                const matchObjectSeparator = argText.match(rExprObjectSeparator2);
+                const matchObjectSeparator = argText.match(rExprObjectSeparator);
                 if (matchObjectSeparator === null) {
                     throw new BareScriptParserError('Syntax error', argText, 1, null, null);
                 }
@@ -716,13 +757,13 @@ function parseUnaryExpression(exprText, arrayLiterals) {
             argText = nextArgText;
             args.push(argKey);
 
-            // Object key separator
+            // Key/value separator
             if (args.length !== 0) {
-                const matchObjectSeparator = argText.match(rExprObjectSeparator);
-                if (matchObjectSeparator === null) {
+                const matchObjectSeparatorKey = argText.match(rExprObjectSeparatorKey);
+                if (matchObjectSeparatorKey === null) {
                     throw new BareScriptParserError('Syntax error', argText, 1, null, null);
                 }
-                argText = argText.slice(matchObjectSeparator[0].length);
+                argText = argText.slice(matchObjectSeparatorKey[0].length);
             }
 
             // Get the value
@@ -802,8 +843,8 @@ const rExprArrayOpen = /^\s*\[/;
 const rExprArraySeparator = /^\s*,/;
 const rExprArrayClose = /^\s*\]/;
 const rExprObjectOpen = /^\s*\{/;
-const rExprObjectSeparator = /^\s*:/;
-const rExprObjectSeparator2 = /^\s*,/;
+const rExprObjectSeparatorKey = /^\s*:/;
+const rExprObjectSeparator = /^\s*,/;
 const rExprObjectClose = /^\s*\}/;
 const rExprString = /^\s*'((?:\\\\|\\'|[^'])*)'/;
 const rExprStringDouble = /^\s*"((?:\\\\|\\"|[^"])*)"/;
@@ -842,7 +883,7 @@ const exprStringEscapes = {
  * @property {string} line - The line text
  * @property {number} columnNumber - The error column number
  * @property {?number} lineNumber - The error line number
- * @property {?string} scriptName - The error line number
+ * @property {?string} scriptName - The script name
  */
 export class BareScriptParserError extends Error {
     /**

package/lib/runtimeAsync.js

@@ -173,7 +173,7 @@ async function executeScriptHelperAsync(script, statements, options, locals) {
                     if (warnings.length) {
                         options.logFn(`${warningPrefix} ${warnings.length} warning${warnings.length > 1 ? 's' : ''}:`);
                         for (const warning of warnings) {
-                            options.logFn(`BareScript:     ${warning}`);
+                            options.logFn(`BareScript: ${warning}`);
                         }
                     }
                 }

package/package.json

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