bare-script 3.8.2 → 3.8.3

package/lib/model.js

@@ -433,9 +433,15 @@ export function lintScript(script, globals = null) {
             // Iterate function statements
             const fnLabelsDefined = {};
             const fnLabelsUsed = {};
+            let hasAsyncStatement = false;
             for (const [ixFnStatement, fnStatement] of fnStatements.entries()) {
                 const [fnStatementKey] = Object.keys(fnStatement);
 
+                // Any async statements?
+                if (globals !== null) {
+                    hasAsyncStatement ||= isAsyncStatement(fnStatement, globals, statement.function.async ?? false);
+                }
+
                 // Function expression statement checks
                 if (fnStatementKey === 'expr') {
                     // Pointless function expression statement?
@@ -478,6 +484,15 @@ export function lintScript(script, globals = null) {
                 }
             }
 
+            // Async function issues?
+            if (globals !== null) {
+                if (statement.function.async && !hasAsyncStatement) {
+                    lintScriptWarning(warnings, script, statement, `Unecessary async function "${statement.function.name}"`);
+                } else if (!statement.function.async && hasAsyncStatement) {
+                    lintScriptWarning(warnings, script, statement, `Function "${statement.function.name}" requires async`);
+                }
+            }
+
         // Global expression statement checks
         } else if (statementKey === 'expr') {
             // Pointless global expression statement?
@@ -549,6 +564,43 @@ function isPointlessExpression(expr) {
 }
 
 
+// Helper function to determine if a statement requires async
+function isAsyncStatement(statement, globals, isAsync) {
+    const [statementKey] = Object.keys(statement);
+    if (statementKey === 'expr') {
+        return isAsyncExpression(statement.expr.expr, globals, isAsync);
+    } else if (statementKey === 'jump') {
+        return 'expr' in statement.jump ? isAsyncExpression(statement.jump.expr, globals, isAsync) : false;
+    } else if (statementKey === 'return') {
+        return 'expr' in statement.return ? isAsyncExpression(statement.return.expr, globals, isAsync) : false;
+    }
+    return false;
+}
+
+
+// Helper function to determine if an expression statement requires async
+function isAsyncExpression(expr, globals, isAsync) {
+    const [exprKey] = Object.keys(expr);
+    if (exprKey === 'function') {
+        // Global function not exist? Assume its OK for the scope
+        const funcValue = globals[expr.function.name] ?? null;
+        if (funcValue === null) {
+            return isAsync;
+        }
+
+        // Is function async?
+        return typeof funcValue === 'function' && funcValue.constructor.name === 'AsyncFunction';
+    } else if (exprKey === 'binary') {
+        return isAsyncExpression(expr.binary.left, globals, isAsync) || isAsyncExpression(expr.binary.right, globals, isAsync);
+    } else if (exprKey === 'unary') {
+        return isAsyncExpression(expr.unary.expr, globals, isAsync);
+    } else if (exprKey === 'group') {
+        return isAsyncExpression(expr.group, globals, isAsync);
+    }
+    return false;
+}
+
+
 // Helper function to set variable assignments/uses for a statements array
 function getVariableAssignmentsAndUses(statements, assigns, uses) {
     for (const [ixStatement, statement] of statements.entries()) {

package/lib/runtimeAsync.js

@@ -187,9 +187,14 @@ async function executeScriptHelperAsync(script, statements, options, locals) {
                     includeScript.system = true;
                 }
 
+                // Execute the include script
+                const includeOptions = {...options};
+                includeOptions.urlFn = (url) => urlFileRelative(includeURL, url);
+                await executeScriptHelperAsync(includeScript, includeScript.statements, includeOptions, null);
+
                 // Run the bare-script linter?
                 if ('logFn' in options && options.debug) {
-                    const warnings = lintScript(includeScript);
+                    const warnings = lintScript(includeScript, globals);
                     const warningPrefix = `BareScript: Include "${includeURL}" static analysis...`;
                     if (warnings.length) {
                         options.logFn(`${warningPrefix} ${warnings.length} warning${warnings.length > 1 ? 's' : ''}:`);
@@ -198,11 +203,6 @@ async function executeScriptHelperAsync(script, statements, options, locals) {
                         }
                     }
                 }
-
-                // Execute the include script
-                const includeOptions = {...options};
-                includeOptions.urlFn = (url) => urlFileRelative(includeURL, url);
-                await executeScriptHelperAsync(includeScript, includeScript.statements, includeOptions, null);
             }
         }
     }

package/package.json

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