juxscript 1.1.288 → 1.1.289

package/machinery/autowrap.js

@@ -110,6 +110,14 @@ function getLineNumber(source, pos) {
     return line;
 }
 
+function containsAwait(node) {
+    let found = false;
+    walkSimple(node, {
+        AwaitExpression() { found = true; }
+    });
+    return found;
+}
+
 /**
  * @param {string} source - Raw .jux source code
  * @param {string} [filename] - For logging
@@ -236,7 +244,8 @@ export function autowrap(source, filename = '') {
             const indent = lines[startIdx].match(/^(\s*)/)[1];
             const newLines = [];
             for (const group of item.groups) {
-                newLines.push(`${indent}pageState.__watch(() => {`);
+                const needsAsync = group.stmts && group.stmts.some(s => containsAwait(s));
+                newLines.push(`${indent}pageState.__watch(${needsAsync ? 'async ' : ''}() => {`);
                 for (const gLine of group.lines) {
                     newLines.push(`${indent}    ${gLine.trim()}`);
                 }
@@ -248,8 +257,16 @@ export function autowrap(source, filename = '') {
             const blockLines = lines.slice(startIdx, endIdx + 1);
             const indent = blockLines[0].match(/^(\s*)/)[1];
 
+            // Check if any of the original AST statements in this range contain await
+            const stmtsInRange = ast.body.filter(s => {
+                const sLine = getLineNumber(source, s.start);
+                const eLine = getLineNumber(source, s.end);
+                return sLine >= item.line && eLine <= item.endLine;
+            });
+            const needsAsync = stmtsInRange.some(s => containsAwait(s));
+
             const wrapped = [
-                `${indent}pageState.__watch(() => {`,
+                `${indent}pageState.__watch(${needsAsync ? 'async ' : ''}() => {`,
                 ...blockLines.map(l => `${indent}    ${l.trim()}`),
                 `${indent}});`,
             ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "juxscript",
-  "version": "1.1.288",
+  "version": "1.1.289",
   "type": "module",
   "description": "A JavaScript UX authorship platform",
   "main": "./dist/lib/index.js",