@oddo/lang 0.0.10 → 0.0.12

package/dist/index.js

@@ -179,6 +179,9 @@ var UnsignedRightShiftColonEqual = _chevrotain.createToken.call(void 0, { name:
 var AndColonEqual = _chevrotain.createToken.call(void 0, { name: "AndColonEqual", pattern: /&:=/ });
 var CaretColonEqual = _chevrotain.createToken.call(void 0, { name: "CaretColonEqual", pattern: /\^:=/ });
 var OrColonEqual = _chevrotain.createToken.call(void 0, { name: "OrColonEqual", pattern: /\|:=/ });
+var AndAndColonEqual = _chevrotain.createToken.call(void 0, { name: "AndAndColonEqual", pattern: /&&:=/ });
+var OrOrColonEqual = _chevrotain.createToken.call(void 0, { name: "OrOrColonEqual", pattern: /\|\|:=/ });
+var QuestionQuestionColonEqual = _chevrotain.createToken.call(void 0, { name: "QuestionQuestionColonEqual", pattern: /\?\?:=/ });
 var Equal = _chevrotain.createToken.call(void 0, { name: "Equal", pattern: /=/ });
 var LeftParen = _chevrotain.createToken.call(void 0, { name: "LeftParen", pattern: /\(/ });
 var RightParen = _chevrotain.createToken.call(void 0, { name: "RightParen", pattern: /\)/ });
@@ -271,6 +274,12 @@ var allTokens = [
   // |:= must come before |
   CaretColonEqual,
   // ^:= must come before ^
+  AndAndColonEqual,
+  // &&:= must come before &&
+  OrOrColonEqual,
+  // ||:= must come before ||
+  QuestionQuestionColonEqual,
+  // ??:= must come before ??
   EqualEqual,
   BangEqual,
   LessThanEqual,
@@ -399,6 +408,9 @@ var OddoParser = class extends _chevrotain.CstParser {
       AndColonEqual,
       CaretColonEqual,
       OrColonEqual,
+      AndAndColonEqual,
+      OrOrColonEqual,
+      QuestionQuestionColonEqual,
       Equal,
       // Punctuation
       LeftParen,
@@ -811,7 +823,10 @@ var OddoParser = class extends _chevrotain.CstParser {
                 { ALT: () => this.CONSUME(UnsignedRightShiftColonEqual) },
                 { ALT: () => this.CONSUME(AndColonEqual) },
                 { ALT: () => this.CONSUME(CaretColonEqual) },
-                { ALT: () => this.CONSUME(OrColonEqual) }
+                { ALT: () => this.CONSUME(OrColonEqual) },
+                { ALT: () => this.CONSUME(AndAndColonEqual) },
+                { ALT: () => this.CONSUME(OrOrColonEqual) },
+                { ALT: () => this.CONSUME(QuestionQuestionColonEqual) }
               ]);
               this.SUBRULE1(this.assignment);
             });
@@ -1709,6 +1724,9 @@ var OddoParser = class extends _chevrotain.CstParser {
                   { ALT: () => this.CONSUME(AndColonEqual) },
                   { ALT: () => this.CONSUME(OrColonEqual) },
                   { ALT: () => this.CONSUME(CaretColonEqual) },
+                  { ALT: () => this.CONSUME(AndAndColonEqual) },
+                  { ALT: () => this.CONSUME(OrOrColonEqual) },
+                  { ALT: () => this.CONSUME(QuestionQuestionColonEqual) },
                   { ALT: () => this.CONSUME(EqualEqual) },
                   { ALT: () => this.CONSUME(BangEqual) },
                   { ALT: () => this.CONSUME(LessThanEqual) },
@@ -2372,10 +2390,10 @@ function convertObjectDestructuringList(cst) {
   return properties;
 }
 function convertAssignment(cst) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H;
   const destructuringPattern = getFirstChild(cst, "destructuringPattern");
   if (destructuringPattern) {
-    const opToken2 = ((_a = cst.children.Equal) == null ? void 0 : _a[0]) || ((_b = cst.children.ColonEqual) == null ? void 0 : _b[0]) || ((_c = cst.children.PlusColonEqual) == null ? void 0 : _c[0]) || ((_d = cst.children.MinusColonEqual) == null ? void 0 : _d[0]) || ((_e = cst.children.StarColonEqual) == null ? void 0 : _e[0]) || ((_f = cst.children.SlashColonEqual) == null ? void 0 : _f[0]) || ((_g = cst.children.PercentColonEqual) == null ? void 0 : _g[0]) || ((_h = cst.children.StarStarColonEqual) == null ? void 0 : _h[0]) || ((_i = cst.children.LeftShiftColonEqual) == null ? void 0 : _i[0]) || ((_j = cst.children.RightShiftColonEqual) == null ? void 0 : _j[0]) || ((_k = cst.children.UnsignedRightShiftColonEqual) == null ? void 0 : _k[0]) || ((_l = cst.children.AndColonEqual) == null ? void 0 : _l[0]) || ((_m = cst.children.CaretColonEqual) == null ? void 0 : _m[0]) || ((_n = cst.children.OrColonEqual) == null ? void 0 : _n[0]);
+    const opToken2 = ((_a = cst.children.Equal) == null ? void 0 : _a[0]) || ((_b = cst.children.ColonEqual) == null ? void 0 : _b[0]) || ((_c = cst.children.PlusColonEqual) == null ? void 0 : _c[0]) || ((_d = cst.children.MinusColonEqual) == null ? void 0 : _d[0]) || ((_e = cst.children.StarColonEqual) == null ? void 0 : _e[0]) || ((_f = cst.children.SlashColonEqual) == null ? void 0 : _f[0]) || ((_g = cst.children.PercentColonEqual) == null ? void 0 : _g[0]) || ((_h = cst.children.StarStarColonEqual) == null ? void 0 : _h[0]) || ((_i = cst.children.LeftShiftColonEqual) == null ? void 0 : _i[0]) || ((_j = cst.children.RightShiftColonEqual) == null ? void 0 : _j[0]) || ((_k = cst.children.UnsignedRightShiftColonEqual) == null ? void 0 : _k[0]) || ((_l = cst.children.AndColonEqual) == null ? void 0 : _l[0]) || ((_m = cst.children.CaretColonEqual) == null ? void 0 : _m[0]) || ((_n = cst.children.OrColonEqual) == null ? void 0 : _n[0]) || ((_o = cst.children.AndAndColonEqual) == null ? void 0 : _o[0]) || ((_p = cst.children.OrOrColonEqual) == null ? void 0 : _p[0]) || ((_q = cst.children.QuestionQuestionColonEqual) == null ? void 0 : _q[0]);
     if (opToken2) {
       const left2 = convertDestructuringPattern(destructuringPattern);
       const right = convertExpression(getFirstChild(cst, "assignment"));
@@ -2397,7 +2415,7 @@ function convertAssignment(cst) {
     return convertDestructuringPattern(destructuringPattern);
   }
   const left = convertExpression(getFirstChild(cst, "conditional"));
-  const opToken = ((_o = cst.children.Equal) == null ? void 0 : _o[0]) || ((_p = cst.children.ColonEqual) == null ? void 0 : _p[0]) || ((_q = cst.children.PlusColonEqual) == null ? void 0 : _q[0]) || ((_r = cst.children.MinusColonEqual) == null ? void 0 : _r[0]) || ((_s = cst.children.StarColonEqual) == null ? void 0 : _s[0]) || ((_t = cst.children.SlashColonEqual) == null ? void 0 : _t[0]) || ((_u = cst.children.PercentColonEqual) == null ? void 0 : _u[0]) || ((_v = cst.children.StarStarColonEqual) == null ? void 0 : _v[0]) || ((_w = cst.children.LeftShiftColonEqual) == null ? void 0 : _w[0]) || ((_x = cst.children.RightShiftColonEqual) == null ? void 0 : _x[0]) || ((_y = cst.children.UnsignedRightShiftColonEqual) == null ? void 0 : _y[0]) || ((_z = cst.children.AndColonEqual) == null ? void 0 : _z[0]) || ((_A = cst.children.CaretColonEqual) == null ? void 0 : _A[0]) || ((_B = cst.children.OrColonEqual) == null ? void 0 : _B[0]);
+  const opToken = ((_r = cst.children.Equal) == null ? void 0 : _r[0]) || ((_s = cst.children.ColonEqual) == null ? void 0 : _s[0]) || ((_t = cst.children.PlusColonEqual) == null ? void 0 : _t[0]) || ((_u = cst.children.MinusColonEqual) == null ? void 0 : _u[0]) || ((_v = cst.children.StarColonEqual) == null ? void 0 : _v[0]) || ((_w = cst.children.SlashColonEqual) == null ? void 0 : _w[0]) || ((_x = cst.children.PercentColonEqual) == null ? void 0 : _x[0]) || ((_y = cst.children.StarStarColonEqual) == null ? void 0 : _y[0]) || ((_z = cst.children.LeftShiftColonEqual) == null ? void 0 : _z[0]) || ((_A = cst.children.RightShiftColonEqual) == null ? void 0 : _A[0]) || ((_B = cst.children.UnsignedRightShiftColonEqual) == null ? void 0 : _B[0]) || ((_C = cst.children.AndColonEqual) == null ? void 0 : _C[0]) || ((_D = cst.children.CaretColonEqual) == null ? void 0 : _D[0]) || ((_E = cst.children.OrColonEqual) == null ? void 0 : _E[0]) || ((_F = cst.children.AndAndColonEqual) == null ? void 0 : _F[0]) || ((_G = cst.children.OrOrColonEqual) == null ? void 0 : _G[0]) || ((_H = cst.children.QuestionQuestionColonEqual) == null ? void 0 : _H[0]);
   if (opToken) {
     const right = convertExpression(getFirstChild(cst, "assignment"));
     if (left && left.type === "arraySlice") {
@@ -3706,10 +3724,29 @@ var MODIFIER_TRANSFORMATIONS = {
   state: {
     needsImport: true,
     // @state x = 3 -> const [x, setX] = _state(3);
-    transform: (valueExpr, leftExpr) => {
+    // @state x = reactiveVar -> const [x, setX] = _state(_lift(_reactiveVar => _reactiveVar(), [reactiveVar]));
+    // Receives Oddo AST, extracts deps, lifts if needed
+    transform: (oddoExpr, leftExpr) => {
+      const allIdentifiers = collectOddoIdentifiersOnly(oddoExpr);
+      const reactiveDeps = allIdentifiers.filter((id) => isReactive(id));
+      const convertedExpr = convertExpression2(oddoExpr);
+      let stateArg;
+      if (reactiveDeps.length > 0) {
+        usedModifiers.add("lift");
+        const prefixedParams = reactiveDeps.map((id) => t.identifier("_" + id));
+        const deps = reactiveDeps.map((id) => t.identifier(id));
+        const arrowFunc = t.arrowFunctionExpression(prefixedParams, convertedExpr);
+        wrapDependenciesWithCalls(arrowFunc, reactiveDeps, "_");
+        stateArg = t.callExpression(
+          t.identifier(modifierAliases["lift"]),
+          [arrowFunc, t.arrayExpression(deps)]
+        );
+      } else {
+        stateArg = convertedExpr;
+      }
       const stateCall = t.callExpression(
         t.identifier(modifierAliases["state"]),
-        [valueExpr]
+        [stateArg]
       );
       if (leftExpr && t.isIdentifier(leftExpr)) {
         const getterName = leftExpr.name;
@@ -3725,6 +3762,19 @@ var MODIFIER_TRANSFORMATIONS = {
             stateCall
           )
         ]);
+      } else if (leftExpr && t.isArrayPattern(leftExpr) && leftExpr.elements.length === 2) {
+        const getterName = leftExpr.elements[0].name;
+        const setterName = leftExpr.elements[1].name;
+        stateSetterMap.set(getterName, setterName);
+        return t.variableDeclaration("const", [
+          t.variableDeclarator(
+            t.arrayPattern([
+              t.identifier(getterName),
+              t.identifier(setterName)
+            ]),
+            stateCall
+          )
+        ]);
       }
       return t.expressionStatement(stateCall);
     }
@@ -3762,78 +3812,187 @@ var MODIFIER_TRANSFORMATIONS = {
     // @mutate x = (arg1, arg2) => { x1 := value1; x2 := value2 }
     // -> const x = mutate((finalizer, x1, x2, ...outerDeps, arg1, arg2) => { ... }, finalizerFn, stateContainers, outerDeps)
     transform: (oddoExpr, leftExpr) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
       if (oddoExpr.type !== "arrowFunction") {
         throw new Error("@mutate modifier must be a function");
       }
       const funcParams = (oddoExpr.parameters || []).map((p) => p.name);
-      const assignments = [];
-      const bodyStatements = ((_a = oddoExpr.body) == null ? void 0 : _a.body) || [];
-      for (const stmt of bodyStatements) {
-        if (stmt.type === "expressionStatement" && ((_b = stmt.expression) == null ? void 0 : _b.type) === "assignment" && ((_c = stmt.expression) == null ? void 0 : _c.operator) === ":=") {
-          const leftName = (_d = stmt.expression.left) == null ? void 0 : _d.name;
-          if (!leftName) {
-            throw new Error("@mutate: := assignment must have an identifier on the left side");
+      const mutateScope = oddoExpr._scope;
+      const stateAssignmentsMap = /* @__PURE__ */ new Map();
+      const processedStatements = [];
+      const oddoBodyStatements = ((_a = oddoExpr.body) == null ? void 0 : _a.body) || [];
+      let hasMutation = false;
+      for (const stmt of oddoBodyStatements) {
+        if (stmt.type === "expressionStatement") {
+          if (((_b = stmt.expression) == null ? void 0 : _b.type) === "assignment") {
+            const leftName = (_c = stmt.expression.left) == null ? void 0 : _c.name;
+            if (!leftName && ((_d = stmt.expression.left) == null ? void 0 : _d.type) === "memberAccess") {
+              hasMutation = true;
+              let rightOddo2 = stmt.expression.right;
+              const op2 = stmt.expression.operator;
+              if (op2 !== ":=") {
+                const baseOp = op2.slice(0, -2);
+                let exprType;
+                if (baseOp === "??") {
+                  exprType = "nullishCoalescing";
+                } else if (baseOp === "&&" || baseOp === "||") {
+                  exprType = "logical";
+                } else {
+                  exprType = "binary";
+                }
+                rightOddo2 = {
+                  type: exprType,
+                  operator: baseOp,
+                  left: stmt.expression.left,
+                  right: stmt.expression.right
+                };
+              }
+              processedStatements.push({
+                kind: "member",
+                leftOddo: stmt.expression.left,
+                rightOddo: rightOddo2
+              });
+              continue;
+            }
+            if (!leftName) {
+              throw new Error("@mutate: unsupported left-hand side in assignment");
+            }
+            let rightOddo = stmt.expression.right;
+            const op = stmt.expression.operator;
+            if (op !== ":=") {
+              const baseOp = op.slice(0, -2);
+              let exprType;
+              if (baseOp === "??") {
+                exprType = "nullishCoalescing";
+              } else if (baseOp === "&&" || baseOp === "||") {
+                exprType = "logical";
+              } else {
+                exprType = "binary";
+              }
+              rightOddo = {
+                type: exprType,
+                operator: baseOp,
+                left: stmt.expression.left,
+                right: stmt.expression.right
+              };
+            }
+            if (stateSetterMap.has(leftName)) {
+              hasMutation = true;
+              stateAssignmentsMap.set(leftName, {
+                kind: "state",
+                setter: stateSetterMap.get(leftName)
+              });
+              processedStatements.push({
+                kind: "state",
+                name: leftName,
+                rightOddo
+              });
+            } else if (mutableVariables.has(leftName)) {
+              hasMutation = true;
+              processedStatements.push({
+                kind: "mutable",
+                name: leftName,
+                rightOddo
+              });
+            } else {
+              processedStatements.push({
+                kind: "regular",
+                stmtOddo: stmt
+              });
+            }
+            continue;
           }
-          if (stateSetterMap.has(leftName)) {
-            assignments.push({
-              name: leftName,
-              kind: "state",
-              setter: stateSetterMap.get(leftName),
-              rightOddo: stmt.expression.right
-            });
-          } else if (mutableVariables.has(leftName)) {
-            assignments.push({
-              name: leftName,
-              kind: "mutable",
-              rightOddo: stmt.expression.right
-            });
-          } else {
-            throw new Error(`@mutate: Cannot mutate '${leftName}': not a @state or @mutable variable in current scope`);
+          if (((_e = stmt.expression) == null ? void 0 : _e.type) === "arraySliceAssignment") {
+            const arrayName = (_g = (_f = stmt.expression.slice) == null ? void 0 : _f.object) == null ? void 0 : _g.name;
+            if (!arrayName) {
+              throw new Error("@mutate: array slice assignment must have an identifier as the array");
+            }
+            if (stateSetterMap.has(arrayName)) {
+              hasMutation = true;
+              if (!stateAssignmentsMap.has(arrayName)) {
+                stateAssignmentsMap.set(arrayName, {
+                  kind: "state-slice",
+                  setter: stateSetterMap.get(arrayName)
+                });
+              }
+              processedStatements.push({
+                kind: "state-slice",
+                name: arrayName,
+                sliceOddo: stmt.expression.slice,
+                rightOddo: stmt.expression.value
+              });
+            } else if (mutableVariables.has(arrayName)) {
+              hasMutation = true;
+              processedStatements.push({
+                kind: "mutable-slice",
+                name: arrayName,
+                sliceOddo: stmt.expression.slice,
+                rightOddo: stmt.expression.value
+              });
+            } else {
+              throw new Error(`@mutate: Cannot mutate '${arrayName}': not a @state or @mutable variable in current scope`);
+            }
+            continue;
           }
         }
+        processedStatements.push({
+          kind: "regular",
+          stmtOddo: stmt
+        });
       }
-      if (assignments.length === 0) {
-        throw new Error("@mutate function must contain at least one := assignment");
+      if (!hasMutation) {
+        throw new Error("@mutate function must contain at least one mutation");
       }
-      const stateAssignments = assignments.filter((a) => a.kind === "state");
-      const mutableAssignments = assignments.filter((a) => a.kind === "mutable");
-      const stateContainerNames = stateAssignments.map((a) => a.name);
-      const allAssignmentNames = assignments.map((a) => a.name);
-      const outerDeps = /* @__PURE__ */ new Set();
-      for (const assignment of assignments) {
-        collectOddoIdentifiers(assignment.rightOddo).forEach((id) => {
-          if (!funcParams.includes(id) && !allAssignmentNames.includes(id)) {
-            outerDeps.add(id);
+      const uniqueStateNames = Array.from(stateAssignmentsMap.keys());
+      const savedScopeMutate = currentScope;
+      currentScope = mutateScope;
+      const outerReactiveDeps = /* @__PURE__ */ new Set();
+      for (const processed of processedStatements) {
+        const nodesToScan = [];
+        if (processed.rightOddo) nodesToScan.push(processed.rightOddo);
+        if ((_h = processed.sliceOddo) == null ? void 0 : _h.start) nodesToScan.push(processed.sliceOddo.start);
+        if ((_i = processed.sliceOddo) == null ? void 0 : _i.end) nodesToScan.push(processed.sliceOddo.end);
+        if (processed.stmtOddo) nodesToScan.push(processed.stmtOddo);
+        for (const node of nodesToScan) {
+          const ids = collectOddoIdentifiersOnly(node);
+          for (const id of ids) {
+            if (isReactive(id) && !uniqueStateNames.includes(id)) {
+              outerReactiveDeps.add(id);
+            }
           }
-        });
+        }
       }
-      const outerDepsArray = Array.from(outerDeps);
+      const outerDepsArray = Array.from(outerReactiveDeps);
       const mutateParams = [
         t.identifier("finalizer"),
-        ...stateContainerNames.map((n) => t.identifier(n)),
+        ...uniqueStateNames.map((n) => t.identifier(n)),
         ...outerDepsArray.map((n) => t.identifier(n)),
         ...funcParams.map((n) => t.identifier(n))
       ];
       const mutateBodyStmts = [];
-      if (stateAssignments.length > 0) {
+      const hasStateAssignments = Array.from(stateAssignmentsMap.values()).some((v) => v.kind === "state");
+      if (hasStateAssignments) {
         usedModifiers.add("stateProxy");
       }
       const callableIds = /* @__PURE__ */ new Set([
-        ...stateContainerNames,
-        ...outerDepsArray.filter((id) => !mutableVariables.has(id))
+        ...uniqueStateNames,
+        ...outerDepsArray
       ]);
-      const savedScopeMutate = currentScope;
-      currentScope = Object.create(currentScope);
+      currentScope = Object.create(mutateScope);
       currentScope[reactiveScope] = false;
-      for (const assignment of assignments) {
-        const rightBabel = convertExpression2(assignment.rightOddo);
-        const tempFile = t.file(t.program([t.expressionStatement(rightBabel)]));
+      for (const id of callableIds) {
+        currentScope[id] = { type: "param", reactive: false };
+      }
+      const wrapCallableIds = (babelExpr, skipNode = null) => {
+        const tempFile = t.file(t.program([t.expressionStatement(babelExpr)]));
         const toReplace = [];
         const shorthandToExpand = [];
         traverse(tempFile, {
           noScope: true,
           Identifier(path) {
+            if (skipNode && path.node === skipNode) {
+              return;
+            }
             const parent = path.parent;
             const isMemberProp = (t.isMemberExpression(parent) || t.isOptionalMemberExpression(parent)) && parent.property === path.node && !parent.computed;
             const isObjectKey = t.isObjectProperty(parent) && parent.key === path.node && !parent.shorthand;
@@ -3852,13 +4011,17 @@ var MODIFIER_TRANSFORMATIONS = {
           prop.value = t.callExpression(t.identifier(name), []);
         });
         toReplace.forEach((p) => p.replaceWith(t.callExpression(t.identifier(p.node.name), [])));
-        const wrappedRightExpr = tempFile.program.body[0].expression;
-        if (assignment.kind === "state") {
+        return tempFile.program.body[0].expression;
+      };
+      for (const processed of processedStatements) {
+        if (processed.kind === "state") {
+          const rightBabel = convertExpression2(processed.rightOddo);
+          const wrappedRightExpr = wrapCallableIds(rightBabel);
           mutateBodyStmts.push(
             t.expressionStatement(
               t.assignmentExpression(
                 "=",
-                t.identifier(assignment.name),
+                t.identifier(processed.name),
                 t.callExpression(
                   t.identifier(modifierAliases["stateProxy"]),
                   [wrappedRightExpr]
@@ -3866,25 +4029,59 @@ var MODIFIER_TRANSFORMATIONS = {
               )
             )
           );
-        } else {
+        } else if (processed.kind === "mutable") {
+          const rightBabel = convertExpression2(processed.rightOddo);
+          const wrappedRightExpr = wrapCallableIds(rightBabel);
           mutateBodyStmts.push(
             t.expressionStatement(
               t.assignmentExpression(
                 "=",
-                t.identifier(assignment.name),
+                t.identifier(processed.name),
                 wrappedRightExpr
               )
             )
           );
+        } else if (processed.kind === "state-slice" || processed.kind === "mutable-slice") {
+          const sliceAssignmentOddo = {
+            type: "arraySliceAssignment",
+            slice: processed.sliceOddo,
+            value: processed.rightOddo
+          };
+          const sliceExpr = convertExpression2(sliceAssignmentOddo);
+          const firstArg = sliceExpr.arguments[0];
+          const wrappedSliceExpr = wrapCallableIds(sliceExpr, firstArg);
+          mutateBodyStmts.push(t.expressionStatement(wrappedSliceExpr));
+        } else if (processed.kind === "member") {
+          const leftBabel = convertExpression2(processed.leftOddo);
+          const rightBabel = convertExpression2(processed.rightOddo);
+          const wrappedRightExpr = wrapCallableIds(rightBabel);
+          mutateBodyStmts.push(
+            t.expressionStatement(
+              t.assignmentExpression("=", leftBabel, wrappedRightExpr)
+            )
+          );
+        } else if (processed.kind === "regular") {
+          const convertedStmt = convertStatement2(processed.stmtOddo);
+          if (t.isVariableDeclaration(convertedStmt)) {
+            for (const decl of convertedStmt.declarations) {
+              if (decl.init) {
+                decl.init = wrapCallableIds(decl.init);
+              }
+            }
+          } else if (t.isExpressionStatement(convertedStmt)) {
+            convertedStmt.expression = wrapCallableIds(convertedStmt.expression);
+          }
+          mutateBodyStmts.push(convertedStmt);
         }
       }
       currentScope = savedScopeMutate;
-      if (stateContainerNames.length > 0) {
+      const stateNamesForFinalizer = Array.from(stateAssignmentsMap.entries()).filter(([_, info]) => info.kind === "state").map(([name, _]) => name);
+      if (stateNamesForFinalizer.length > 0) {
         mutateBodyStmts.push(
           t.expressionStatement(
             t.callExpression(
               t.identifier("finalizer"),
-              stateContainerNames.map((n) => t.callExpression(t.identifier(n), []))
+              stateNamesForFinalizer.map((n) => t.callExpression(t.identifier(n), []))
             )
           )
         );
@@ -3893,14 +4090,15 @@ var MODIFIER_TRANSFORMATIONS = {
         mutateParams,
         t.blockStatement(mutateBodyStmts)
       );
-      const finalizerParams = stateContainerNames.map((n) => t.identifier(n));
-      const finalizerCalls = stateAssignments.map(
-        (a) => t.callExpression(t.identifier(a.setter), [t.identifier(a.name)])
-      );
+      const finalizerParams = stateNamesForFinalizer.map((n) => t.identifier(n));
+      const finalizerCalls = stateNamesForFinalizer.map((name) => {
+        const info = stateAssignmentsMap.get(name);
+        return t.callExpression(t.identifier(info.setter), [t.identifier(name)]);
+      });
       const finalizerBody = finalizerCalls.length === 0 ? t.identifier("undefined") : finalizerCalls.length === 1 ? finalizerCalls[0] : t.sequenceExpression(finalizerCalls);
       const finalizerFunc = t.arrowFunctionExpression(finalizerParams, finalizerBody);
       const stateContainersArray = t.arrayExpression(
-        stateContainerNames.map((n) => t.identifier(n))
+        uniqueStateNames.map((n) => t.identifier(n))
       );
       const outerDepsArrayExpr = t.arrayExpression(
         outerDepsArray.map((n) => t.identifier(n))
@@ -4082,7 +4280,7 @@ function generateUniqueId(baseName) {
   return candidate;
 }
 function collectOddoIdentifiers(node, names = /* @__PURE__ */ new Set()) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   if (!node || typeof node !== "object") return names;
   if (node.type === "program") {
     moduleScope = /* @__PURE__ */ Object.create(null);
@@ -4093,15 +4291,21 @@ function collectOddoIdentifiers(node, names = /* @__PURE__ */ new Set()) {
     names.add(node.name);
   }
   if (node.type === "expressionStatement") {
-    const varName = (_b = (_a = node.expression) == null ? void 0 : _a.left) == null ? void 0 : _b.name;
-    if (varName) {
+    const left = (_a = node.expression) == null ? void 0 : _a.left;
+    const varName = left == null ? void 0 : left.name;
+    if (node.modifier === "state" && (left == null ? void 0 : left.type) === "arrayPattern" && ((_b = left.elements) == null ? void 0 : _b.length) === 2) {
+      const getterName = (_c = left.elements[0]) == null ? void 0 : _c.name;
+      const setterName = (_d = left.elements[1]) == null ? void 0 : _d.name;
+      if (getterName) declareVariable(getterName, "state");
+      if (setterName) declareVariable(setterName, "immutable");
+    } else if (varName) {
       if (node.modifier === "state") {
         declareVariable(varName, "state");
       } else if (node.modifier === "computed") {
         declareVariable(varName, "computed");
       } else if (node.modifier === "mutable") {
         declareVariable(varName, "mutable");
-      } else if (!node.modifier && ((_c = node.expression) == null ? void 0 : _c.type) === "variableDeclaration") {
+      } else if (!node.modifier && ((_e = node.expression) == null ? void 0 : _e.type) === "variableDeclaration") {
         declareVariable(varName, "immutable");
       }
     }
@@ -4133,7 +4337,7 @@ function collectOddoIdentifiers(node, names = /* @__PURE__ */ new Set()) {
           for (const name of boundNames) {
             declareVariable(name, "param");
           }
-        } else if (param.type === "restElement" && ((_d = param.argument) == null ? void 0 : _d.name)) {
+        } else if (param.type === "restElement" && ((_f = param.argument) == null ? void 0 : _f.name)) {
           declareVariable(param.argument.name, "param");
         }
       }
@@ -4176,7 +4380,7 @@ function compileToJS(ast, config = {}) {
   moduleScope = null;
   currentScope = null;
   usedNames = collectOddoIdentifiers(ast);
-  const allImports = ["state", "computed", "mutate", "effect", "stateProxy", "lift", "liftFn", "e", "c", "x", "f"];
+  const allImports = ["state", "computed", "mutate", "effect", "stateProxy", "arraySplice", "lift", "liftFn", "e", "c", "x", "f"];
   for (const name of allImports) {
     modifierAliases[name] = `__ODDO_IMPORT_${name}__`;
   }
@@ -4276,13 +4480,13 @@ function convertExpressionStatement2(stmt) {
       let leftExpr = null;
       if (stmt.expression.type === "variableDeclaration" || stmt.expression.type === "assignment") {
         leftExpr = convertExpression2(stmt.expression.left);
-        if (stmt.modifier === "mutate" || stmt.modifier === "effect" || stmt.modifier === "computed" || stmt.modifier === "mutable" || stmt.modifier === "component" || stmt.modifier === "hook") {
+        if (stmt.modifier === "mutate" || stmt.modifier === "effect" || stmt.modifier === "computed" || stmt.modifier === "mutable" || stmt.modifier === "component" || stmt.modifier === "hook" || stmt.modifier === "state") {
           valueExpr = stmt.expression.right;
         } else {
           valueExpr = convertExpression2(stmt.expression.right);
         }
       } else {
-        if (stmt.modifier === "mutate" || stmt.modifier === "effect" || stmt.modifier === "computed" || stmt.modifier === "mutable" || stmt.modifier === "component" || stmt.modifier === "hook") {
+        if (stmt.modifier === "mutate" || stmt.modifier === "effect" || stmt.modifier === "computed" || stmt.modifier === "mutable" || stmt.modifier === "component" || stmt.modifier === "hook" || stmt.modifier === "state") {
           valueExpr = stmt.expression;
         } else {
           valueExpr = convertExpression2(stmt.expression);
@@ -4303,13 +4507,13 @@ function convertExpressionStatement2(stmt) {
           let leftExpr = null;
           if (blockStmt.expression.type === "variableDeclaration" || blockStmt.expression.type === "assignment") {
             leftExpr = convertExpression2(blockStmt.expression.left);
-            if (stmt.modifier === "mutate" || stmt.modifier === "effect" || stmt.modifier === "computed" || stmt.modifier === "mutable" || stmt.modifier === "component" || stmt.modifier === "hook") {
+            if (stmt.modifier === "mutate" || stmt.modifier === "effect" || stmt.modifier === "computed" || stmt.modifier === "mutable" || stmt.modifier === "component" || stmt.modifier === "hook" || stmt.modifier === "state") {
               valueExpr = blockStmt.expression.right;
             } else {
               valueExpr = convertExpression2(blockStmt.expression.right);
             }
           } else {
-            if (stmt.modifier === "mutate" || stmt.modifier === "effect" || stmt.modifier === "computed" || stmt.modifier === "mutable" || stmt.modifier === "component" || stmt.modifier === "hook") {
+            if (stmt.modifier === "mutate" || stmt.modifier === "effect" || stmt.modifier === "computed" || stmt.modifier === "mutable" || stmt.modifier === "component" || stmt.modifier === "hook" || stmt.modifier === "state") {
               valueExpr = blockStmt.expression;
             } else {
               valueExpr = convertExpression2(blockStmt.expression);
@@ -4353,7 +4557,31 @@ function convertExpressionStatement2(stmt) {
   }
   let expression = null;
   if (stmt.expression) {
-    expression = convertExpression2(stmt.expression);
+    const isPlainExpr = stmt.expression.type !== "variableDeclaration" && stmt.expression.type !== "assignment" && stmt.expression.type !== "arraySliceAssignment";
+    if (isPlainExpr) {
+      const allIdentifiers = collectOddoIdentifiersOnly(stmt.expression);
+      const reactiveDeps = allIdentifiers.filter((id) => isReactive(id));
+      if (reactiveDeps.length > 0) {
+        const savedScope = currentScope;
+        currentScope = Object.create(currentScope);
+        currentScope[reactiveScope] = false;
+        const convertedExpr = convertExpression2(stmt.expression);
+        currentScope = savedScope;
+        usedModifiers.add("lift");
+        const prefixedParams = reactiveDeps.map((id) => t.identifier("_" + id));
+        const deps = reactiveDeps.map((id) => t.identifier(id));
+        const arrowFunc = t.arrowFunctionExpression(prefixedParams, convertedExpr);
+        wrapDependenciesWithCalls(arrowFunc, reactiveDeps, "_");
+        expression = t.callExpression(
+          t.identifier(modifierAliases["lift"]),
+          [arrowFunc, t.arrayExpression(deps)]
+        );
+      } else {
+        expression = convertExpression2(stmt.expression);
+      }
+    } else {
+      expression = convertExpression2(stmt.expression);
+    }
   }
   if (stmt.block) {
     const block = convertBlockStatement(stmt.block);
@@ -4777,7 +5005,10 @@ function convertAssignmentExpression(expr) {
     ">>>:=": ">>>=",
     "&:=": "&=",
     "^:=": "^=",
-    "|:=": "|="
+    "|:=": "|=",
+    "&&:=": "&&=",
+    "||:=": "||=",
+    "??:=": "??="
   };
   const operator = operatorMap[expr.operator] || expr.operator;
   return t.assignmentExpression(operator, left, right);
@@ -4821,16 +5052,11 @@ function convertArraySliceAssignment(expr) {
     t.memberExpression(spliceArgs, t.identifier("concat"), false),
     [value]
   );
-  const spliceMethod = t.memberExpression(
-    t.memberExpression(
-      t.memberExpression(t.identifier("Array"), t.identifier("prototype"), false),
-      t.identifier("splice"),
-      false
-    ),
-    t.identifier("apply"),
-    false
+  usedModifiers.add("arraySplice");
+  return t.callExpression(
+    t.identifier(modifierAliases["arraySplice"]),
+    [object, concatCall]
   );
-  return t.callExpression(spliceMethod, [object, concatCall]);
 }
 function convertArrayPattern(expr) {
   const elements = expr.elements.map((el) => {
@@ -5091,6 +5317,9 @@ var tokenClassMap = {
   "AndColonEqual": "operator",
   "OrColonEqual": "operator",
   "CaretColonEqual": "operator",
+  "AndAndColonEqual": "operator",
+  "OrOrColonEqual": "operator",
+  "QuestionQuestionColonEqual": "operator",
   // JSX
   "JSXCloseTagStart": "tag",
   "JSXSelfClosing": "tag",