juxscript 1.1.284 → 1.1.286

package/machinery/autowrap.js

@@ -144,16 +144,35 @@ export function autowrap(source, filename = '') {
                 // Check if the body has multiple independent reactive groups
                 const groups = groupBodyStatements(bodyStmts, source);
                 if (groups.length > 1) {
-                    // Replace single watch with multiple watches
-                    // Record the original watch range for removal
-                    const watchStart = getLineNumber(source, stmt.start);
-                    const watchEnd = getLineNumber(source, stmt.end);
-                    needsWatch.push({
-                        line: watchStart,
-                        endLine: watchEnd,
-                        replace: true,
-                        groups: groups,
-                    });
+                    // Verify no cross-group variable dependencies before splitting
+                    const allDeclared = [];
+                    let hasCrossDep = false;
+                    for (const group of groups) {
+                        const groupVars = [];
+                        for (const s of group.stmts) {
+                            groupVars.push(...getDeclaredVarNames(s));
+                        }
+                        // Check if this group uses vars declared in a previous group
+                        for (const s of group.stmts) {
+                            if (allDeclared.some(v => usesIdentifier(s, v))) {
+                                hasCrossDep = true;
+                                break;
+                            }
+                        }
+                        if (hasCrossDep) break;
+                        allDeclared.push(...groupVars);
+                    }
+
+                    if (!hasCrossDep) {
+                        const watchStart = getLineNumber(source, stmt.start);
+                        const watchEnd = getLineNumber(source, stmt.end);
+                        needsWatch.push({
+                            line: watchStart,
+                            endLine: watchEnd,
+                            replace: true,
+                            groups: groups,
+                        });
+                    }
                 }
             }
             i++;
@@ -268,8 +287,11 @@ function groupBodyStatements(bodyStmts, source) {
 
             while (j < bodyStmts.length) {
                 const next = bodyStmts[j];
-                if (varNames.some(v => usesIdentifier(next, v))) {
+                // Also collect any new variable names declared within grouped statements
+                if (varNames.some(v => usesIdentifier(next, v)) || !containsPageStateRef(next)) {
                     groupStmts.push(next);
+                    // Track any new variable declarations in the consumed statement
+                    getDeclaredVarNames(next).forEach(v => varNames.push(v));
                     j++;
                 } else {
                     break;

package/package.json

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