juxscript 1.1.277 → 1.1.279

package/machinery/autowrap.js

@@ -81,8 +81,8 @@ function isSetupStatement(stmt) {
             expr.argument?.callee?.object?.name === 'jux' &&
             !containsPageStateRef(stmt)) return true;
     }
-    if (stmt.type === 'VariableDeclaration' && !containsPageStateRef(stmt)) return true;
-    if (stmt.type === 'VariableDeclaration' && containsJuxCall(stmt)) return true;
+    if (stmt.type === 'VariableDeclaration' && !containsPageStateRef(stmt) && !containsJuxCall(stmt)) return true;
+    if (stmt.type === 'VariableDeclaration' && containsJuxCall(stmt) && !containsPageStateRef(stmt)) return true;
     return false;
 }
 
@@ -121,26 +121,29 @@ export function autowrap(source, filename = '') {
         if (isSetupStatement(stmt)) { i++; continue; }
         if (isAlreadyWrapped(stmt)) { i++; continue; }
 
-        // VariableDeclaration reading pageState — group with next if uses declared var
+        // VariableDeclaration reading pageState — group with subsequent stmts that use declared vars
         if (stmt.type === 'VariableDeclaration' && containsPageStateRef(stmt)) {
             const varNames = getDeclaredVarNames(stmt);
             const groupStmts = [stmt];
-            const next = ast.body[i + 1];
-            if (next && !isAlreadyWrapped(next) && !isSetupStatement(next)) {
+            let j = i + 1;
+
+            // Greedily consume following statements that use any of the declared variable names
+            while (j < ast.body.length) {
+                const next = ast.body[j];
+                if (isAlreadyWrapped(next) || isSetupStatement(next)) break;
                 if (varNames.some(v => usesIdentifier(next, v))) {
                     groupStmts.push(next);
-                    i += 2;
+                    j++;
                 } else {
-                    i++;
+                    break;
                 }
-            } else {
-                i++;
             }
 
             needsWatch.push({
                 line: getLineNumber(source, groupStmts[0].start),
                 endLine: getLineNumber(source, groupStmts[groupStmts.length - 1].end),
             });
+            i = j;
             continue;
         }
 

package/package.json

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