@getforma/core 1.1.0 → 1.3.0

package/dist/runtime.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
-var chunkJRQNDXX7_cjs = require('./chunk-JRQNDXX7.cjs');
+var chunkFBM7V4NE_cjs = require('./chunk-FBM7V4NE.cjs');
 var chunk263HW3KN_cjs = require('./chunk-263HW3KN.cjs');
-var chunk2Y5US35K_cjs = require('./chunk-2Y5US35K.cjs');
-var chunkW7OUWVRA_cjs = require('./chunk-W7OUWVRA.cjs');
+var chunkKUXNZ5MG_cjs = require('./chunk-KUXNZ5MG.cjs');
+var chunkH7MDUHS5_cjs = require('./chunk-H7MDUHS5.cjs');
 
 // src/dom/reconcile.ts
 function getBindTargets(el) {
@@ -275,12 +275,12 @@ function findInsertionPoint(parent, newChild, newChildren) {
   return null;
 }
 function createReconciler(config) {
-  let _lastHtml = "";
+  const lastHtmlByContainer = /* @__PURE__ */ new WeakMap();
   return function reconcile2(container, html) {
     const trimmed = html.trim();
     if (!trimmed) return;
-    if (trimmed === _lastHtml && container.hasChildNodes()) return;
-    _lastHtml = trimmed;
+    if (lastHtmlByContainer.get(container) === trimmed && container.hasChildNodes()) return;
+    lastHtmlByContainer.set(container, trimmed);
     config.disconnectObserver();
     try {
       if (!container.hasChildNodes() || container.children.length === 0) {
@@ -571,9 +571,97 @@ var RE_TERNARY = /^(.+?)\s*\?\s*(.+?)\s*:\s*(.+)$/;
 var RE_NULLISH = /^(.+?)\s*\?\?\s*(.+)$/;
 var RE_AND = /^(.+?)\s*&&\s*(.+)$/;
 var RE_OR = /^(.+?)\s*\|\|\s*(.+)$/;
-var RE_COMPARISON = /^(.+?)\s*(===|!==|==|!=|>=|<=|>|<)\s*(.+)$/;
-var RE_MUL = /^(.+?)\s*([*/%])\s*(.+)$/;
-var RE_ADD = /^(.+?)\s*([+-])\s*(.+)$/;
+var UNARY_PRECEDERS = "+-*/%<>=!&|^~(,[{?:";
+function matchBinaryOp(expr, ops) {
+  const SQ = String.fromCharCode(39);
+  const DQ = String.fromCharCode(34);
+  const BT = String.fromCharCode(96);
+  const BS = String.fromCharCode(92);
+  let depth = 0;
+  let inSingle = false, inDouble = false, inTemplate = false, escaped = false;
+  let prevSig = "";
+  let bestIdx = -1;
+  let bestOp = "";
+  for (let i = 0; i < expr.length; i++) {
+    const ch = expr[i];
+    if (escaped) {
+      escaped = false;
+      continue;
+    }
+    if (ch === BS && (inSingle || inDouble || inTemplate)) {
+      escaped = true;
+      continue;
+    }
+    if (inSingle) {
+      if (ch === SQ) {
+        inSingle = false;
+        prevSig = DQ;
+      }
+      continue;
+    }
+    if (inDouble) {
+      if (ch === DQ) {
+        inDouble = false;
+        prevSig = DQ;
+      }
+      continue;
+    }
+    if (inTemplate) {
+      if (ch === BT) {
+        inTemplate = false;
+        prevSig = DQ;
+      }
+      continue;
+    }
+    if (ch === SQ) {
+      inSingle = true;
+      continue;
+    }
+    if (ch === DQ) {
+      inDouble = true;
+      continue;
+    }
+    if (ch === BT) {
+      inTemplate = true;
+      continue;
+    }
+    if (ch === "(" || ch === "[" || ch === "{") {
+      depth++;
+      prevSig = ch;
+      continue;
+    }
+    if (ch === ")" || ch === "]" || ch === "}") {
+      if (depth > 0) depth--;
+      prevSig = ch;
+      continue;
+    }
+    if (depth !== 0) continue;
+    if (ch === " " || ch === "	" || ch === "\n") continue;
+    if (i > 0) {
+      let matchedOp = "";
+      for (const op of ops) {
+        if (expr.startsWith(op, i)) {
+          matchedOp = op;
+          break;
+        }
+      }
+      if (matchedOp) {
+        const isPlusMinus = matchedOp === "+" || matchedOp === "-";
+        const unary = isPlusMinus && (prevSig === "" || UNARY_PRECEDERS.includes(prevSig));
+        if (!unary) {
+          bestIdx = i;
+          bestOp = matchedOp;
+        }
+        i += matchedOp.length - 1;
+        prevSig = matchedOp[matchedOp.length - 1];
+        continue;
+      }
+    }
+    prevSig = ch;
+  }
+  if (bestIdx === -1) return null;
+  return { left: expr.slice(0, bestIdx).trim(), op: bestOp, right: expr.slice(bestIdx + bestOp.length).trim() };
+}
 var RE_TEMPLATE_LIT = /^`([^`]*)`$/;
 var RE_TEMPLATE_INTERP = /\$\{([^}]+)\}/g;
 var RE_GROUP_METHOD_CALL = /^\((.+)\)\.(\w+)\((.*)\)$/;
@@ -974,7 +1062,7 @@ function parseIfHandler(expr, scope) {
   }
   if (rest.length > 0) return null;
   return (e) => {
-    chunk2Y5US35K_cjs.batch(() => {
+    chunkKUXNZ5MG_cjs.batch(() => {
       if (condExpr()) thenHandler(e);
       else elseHandler?.(e);
     });
@@ -1568,12 +1656,12 @@ function parseExpressionUncached(expr, scope) {
       return () => left() && right();
     }
   }
-  const compMatch = expr.match(RE_COMPARISON);
+  const compMatch = matchBinaryOp(expr, ["===", "!==", "==", "!=", ">=", "<=", ">", "<"]);
   if (compMatch) {
-    const left = parseExpression(compMatch[1].trim(), scope);
-    const right = parseExpression(compMatch[3].trim(), scope);
+    const left = parseExpression(compMatch.left, scope);
+    const right = parseExpression(compMatch.right, scope);
     if (left && right) {
-      const op = compMatch[2];
+      const op = compMatch.op;
       return () => {
         const l = left(), r = right();
         switch (op) {
@@ -1597,12 +1685,12 @@ function parseExpressionUncached(expr, scope) {
       };
     }
   }
-  const addMatch = expr.match(RE_ADD);
+  const addMatch = matchBinaryOp(expr, ["+", "-"]);
   if (addMatch) {
-    const left = parseExpression(addMatch[1].trim(), scope);
-    const right = parseExpression(addMatch[3].trim(), scope);
+    const left = parseExpression(addMatch.left, scope);
+    const right = parseExpression(addMatch.right, scope);
     if (left && right) {
-      const op = addMatch[2];
+      const op = addMatch.op;
       return () => {
         const l = left(), r = right();
         if (op === "+") return l + r;
@@ -1610,12 +1698,12 @@ function parseExpressionUncached(expr, scope) {
       };
     }
   }
-  const mulMatch = expr.match(RE_MUL);
+  const mulMatch = matchBinaryOp(expr, ["*", "/", "%"]);
   if (mulMatch) {
-    const left = parseExpression(mulMatch[1].trim(), scope);
-    const right = parseExpression(mulMatch[3].trim(), scope);
+    const left = parseExpression(mulMatch.left, scope);
+    const right = parseExpression(mulMatch.right, scope);
     if (left && right) {
-      const op = mulMatch[2];
+      const op = mulMatch.op;
       return () => {
         const l = left(), r = right();
         switch (op) {
@@ -1728,7 +1816,7 @@ function parseHandler(expr, scope) {
     const handlers = stmts.map((s) => parseHandler(s, scope));
     if (handlers.every((h) => h !== null)) {
       return (e) => {
-        chunk2Y5US35K_cjs.batch(() => {
+        chunkKUXNZ5MG_cjs.batch(() => {
           for (const h of handlers) h(e);
         });
       };
@@ -1741,7 +1829,7 @@ function parseHandler(expr, scope) {
     const name = incrMatch[1];
     const op = incrMatch[2];
     return () => {
-      chunk2Y5US35K_cjs.batch(() => {
+      chunkKUXNZ5MG_cjs.batch(() => {
         const val = scope.getters[name]?.() ?? 0;
         scope.setters[name]?.(op === "++" ? val + 1 : val - 1);
       });
@@ -1752,7 +1840,7 @@ function parseHandler(expr, scope) {
     const op = preIncrMatch[1];
     const name = preIncrMatch[2];
     return () => {
-      chunk2Y5US35K_cjs.batch(() => {
+      chunkKUXNZ5MG_cjs.batch(() => {
         const val = scope.getters[name]?.() ?? 0;
         scope.setters[name]?.(op === "++" ? val + 1 : val - 1);
       });
@@ -1762,7 +1850,7 @@ function parseHandler(expr, scope) {
   if (toggleMatch && toggleMatch[1] === toggleMatch[2]) {
     const name = toggleMatch[1];
     return () => {
-      chunk2Y5US35K_cjs.batch(() => {
+      chunkKUXNZ5MG_cjs.batch(() => {
         scope.setters[name]?.(!scope.getters[name]?.());
       });
     };
@@ -1774,7 +1862,7 @@ function parseHandler(expr, scope) {
     if (valExpr) {
       if (_debug) dbg(`parseHandler: assignment "${name} = ..." \u2014 setter exists:`, !!scope.setters[name], ", getter exists:", !!scope.getters[name]);
       return () => {
-        chunk2Y5US35K_cjs.batch(() => {
+        chunkKUXNZ5MG_cjs.batch(() => {
           const val = valExpr();
           if (_debug) dbg(`SETTER: ${name} = ${val} (was: ${scope.getters[name]?.()})`);
           scope.setters[name]?.(val);
@@ -1789,7 +1877,7 @@ function parseHandler(expr, scope) {
     const valExpr = parseExpression(compoundMatch[3].trim(), scope);
     if (valExpr) {
       return () => {
-        chunk2Y5US35K_cjs.batch(() => {
+        chunkKUXNZ5MG_cjs.batch(() => {
           const current = scope.getters[name]?.() ?? 0;
           const val = valExpr();
           switch (op) {
@@ -1870,7 +1958,7 @@ function buildHandler(expr, scope) {
       }
     });
     const unsafeHandler = (e) => {
-      chunk2Y5US35K_cjs.batch(() => fn(proxy, e, e));
+      chunkKUXNZ5MG_cjs.batch(() => fn(proxy, e, e));
     };
     const result = {
       handler: unsafeHandler,
@@ -1918,7 +2006,7 @@ function initScope(stateEl) {
   const getters = {};
   const setters = {};
   for (const [key, initial] of Object.entries(state)) {
-    const [get, set] = chunkW7OUWVRA_cjs.createSignal(initial);
+    const [get, set] = chunkH7MDUHS5_cjs.createSignal(initial);
     getters[key] = get;
     setters[key] = set;
   }
@@ -2030,7 +2118,7 @@ function bindElement(el, scope, disposers) {
         const prevGetter = scope.getters[name];
         delete scope.getters[name];
         const evaluate = buildEvaluator(`{${expr}}`, scope);
-        const getter = chunkW7OUWVRA_cjs.createComputed(evaluate);
+        const getter = chunkH7MDUHS5_cjs.createComputed(evaluate);
         scope.getters[name] = getter;
         if (!prevGetter) {
           delete scope.setters[name];
@@ -2041,7 +2129,7 @@ function bindElement(el, scope, disposers) {
   const textExpr = !known || known.has("data-text") ? el.getAttribute("data-text") : null;
   if (textExpr) {
     const evaluate = buildEvaluator(textExpr, scope);
-    const dispose = chunk2Y5US35K_cjs.internalEffect(() => {
+    const dispose = chunkKUXNZ5MG_cjs.internalEffect(() => {
       setElementTextFast(el, toTextValue(evaluate()));
     });
     disposers.push(dispose);
@@ -2056,7 +2144,7 @@ function bindElement(el, scope, disposers) {
       dbg(`bindElement: data-show="${showExpr}" on <${tag}${cls}>`);
     }
     let initialized = false;
-    const dispose = chunk2Y5US35K_cjs.internalEffect(() => {
+    const dispose = chunkKUXNZ5MG_cjs.internalEffect(() => {
       const visible = !!evaluate();
       if (_debug) dbg(`data-show effect: "${showExpr}" \u2192 ${visible}`);
       applyShowVisibility(el, visible, transition, !initialized);
@@ -2075,7 +2163,7 @@ function bindElement(el, scope, disposers) {
     const parent = el.parentNode;
     let inserted = true;
     let initialized = false;
-    const dispose = chunk2Y5US35K_cjs.internalEffect(() => {
+    const dispose = chunkKUXNZ5MG_cjs.internalEffect(() => {
       const show = !!evaluate();
       if (show && !inserted) {
         clearTransitionState(el);
@@ -2110,25 +2198,61 @@ function bindElement(el, scope, disposers) {
   const modelExpr = !known || known.has("data-model") ? el.getAttribute("data-model") : null;
   if (modelExpr) {
     const prop = modelExpr.replace(RE_STRIP_BRACES, "").trim();
-    const getter = scope.getters[prop];
-    const setter = scope.setters[prop];
+    let getter = scope.getters[prop];
+    let setter = scope.setters[prop];
+    if ((!getter || !setter) && prop.includes(".")) {
+      getter = buildEvaluator(prop, scope);
+      const lastDot = prop.lastIndexOf(".");
+      const basePath = prop.slice(0, lastDot);
+      const key = prop.slice(lastDot + 1);
+      const baseGet = buildEvaluator(basePath, scope);
+      setter = (v) => {
+        const base = baseGet();
+        if (base != null && typeof base === "object") base[key] = v;
+      };
+    }
     if (getter && setter) {
       const input = el;
-      const dispose = chunk2Y5US35K_cjs.internalEffect(() => {
+      const tag = input.tagName;
+      const dispose = chunkKUXNZ5MG_cjs.internalEffect(() => {
         const val = getter();
-        if (input.type === "checkbox") {
+        const type = input.type;
+        if (type === "checkbox") {
           input.checked = !!val;
+          const indetExpr = el.getAttribute("data-model-indeterminate");
+          if (indetExpr) {
+            const indetGetter = scope.getters[indetExpr.replace(RE_STRIP_BRACES, "").trim()];
+            if (indetGetter) input.indeterminate = !!indetGetter();
+          }
+        } else if (type === "radio") {
+          input.checked = String(val) === input.value;
+        } else if (tag === "SELECT" && input.multiple) {
+          const sel = input;
+          const arr = Array.isArray(val) ? val.map(String) : [];
+          for (const opt of Array.from(sel.options)) opt.selected = arr.includes(opt.value);
         } else {
           input.value = String(val ?? "");
         }
       });
       disposers.push(dispose);
-      const event = input.type === "checkbox" ? "change" : "input";
+      const event = input.type === "checkbox" || input.type === "radio" || tag === "SELECT" ? "change" : "input";
       const onModelInput = () => {
-        if (input.type === "checkbox") {
+        const type = input.type;
+        if (type === "checkbox") {
           setter(input.checked);
-        } else if (input.type === "number" || input.type === "range") {
-          setter(Number(input.value));
+        } else if (type === "radio") {
+          if (input.checked) setter(input.value);
+        } else if (tag === "SELECT" && input.multiple) {
+          const sel = input;
+          setter(Array.from(sel.selectedOptions).map((o) => o.value));
+        } else if (type === "number" || type === "range") {
+          const raw = input.value;
+          if (raw === "") {
+            setter(null);
+          } else {
+            const n = Number(raw);
+            if (!Number.isNaN(n)) setter(n);
+          }
         } else {
           setter(input.value);
         }
@@ -2178,14 +2302,14 @@ function bindElement(el, scope, disposers) {
     } else if (name.startsWith("data-class:")) {
       const cls = name.slice(11);
       const evaluate = buildEvaluator(attr.value, scope);
-      const dispose = chunk2Y5US35K_cjs.internalEffect(() => {
+      const dispose = chunkKUXNZ5MG_cjs.internalEffect(() => {
         el.classList.toggle(cls, !!evaluate());
       });
       disposers.push(dispose);
     } else if (name.startsWith("data-bind:")) {
       const attrName = name.slice(10);
       const evaluate = buildEvaluator(attr.value, scope);
-      const dispose = chunk2Y5US35K_cjs.internalEffect(() => {
+      const dispose = chunkKUXNZ5MG_cjs.internalEffect(() => {
         const val = evaluate();
         if (val == null || val === false) {
           el.removeAttribute(attrName);
@@ -2213,7 +2337,7 @@ function bindElement(el, scope, disposers) {
         if (saved !== null) setter(JSON.parse(saved));
       } catch {
       }
-      const dispose = chunk2Y5US35K_cjs.internalEffect(() => {
+      const dispose = chunkKUXNZ5MG_cjs.internalEffect(() => {
         try {
           localStorage.setItem(key, JSON.stringify(getter()));
         } catch {
@@ -2300,7 +2424,7 @@ function bindElement(el, scope, disposers) {
           });
         }
       } : void 0;
-      const dispose = chunk2Y5US35K_cjs.internalEffect(() => {
+      const dispose = chunkKUXNZ5MG_cjs.internalEffect(() => {
         const rawItems = evaluate();
         if (!Array.isArray(rawItems)) {
           for (const n of oldNodes) {
@@ -2320,59 +2444,30 @@ function bindElement(el, scope, disposers) {
           }
         }
         const prevNodes = new Set(oldNodes);
-        if (keyProp) {
-          const result = chunkJRQNDXX7_cjs.reconcileList(
-            el,
-            oldItems,
-            rawItems,
-            oldNodes,
-            (item) => String(item?.[keyProp] ?? ""),
-            (item) => {
-              const idx = rawItems.indexOf(item);
-              return createBoundClone2(item, idx);
-            },
-            (node, item) => {
-              const idx = rawItems.indexOf(item);
-              updateBoundClone2(node, item, idx);
-            },
-            void 0,
-            // beforeNode
-            listHooks
-          );
-          const nextNodes = new Set(result.nodes);
-          for (const n of prevNodes) {
-            if (!nextNodes.has(n)) {
-              if (n.hasAttribute?.("data-forma-leaving")) continue;
-              disposeCloneBindings2(n);
-            }
-          }
-          oldItems = result.items;
-          oldNodes = result.nodes;
-        } else {
-          const wrapped = rawItems.map((item, i) => ({ __idx: i, __item: item }));
-          const oldWrapped = oldItems;
-          const result = chunkJRQNDXX7_cjs.reconcileList(
-            el,
-            oldWrapped,
-            wrapped,
-            oldNodes,
-            (w) => w.__idx,
-            (w) => createBoundClone2(w.__item, w.__idx),
-            (node, w) => updateBoundClone2(node, w.__item, w.__idx),
-            void 0,
-            // beforeNode
-            listHooks
-          );
-          const nextNodes = new Set(result.nodes);
-          for (const n of prevNodes) {
-            if (!nextNodes.has(n)) {
-              if (n.hasAttribute?.("data-forma-leaving")) continue;
-              disposeCloneBindings2(n);
-            }
+        const wrapped = rawItems.map((item, i) => ({ __idx: i, __item: item }));
+        const oldWrapped = oldItems;
+        const keyFn = keyProp ? (w) => String(w.__item?.[keyProp] ?? "") : (w) => w.__idx;
+        const result = chunkFBM7V4NE_cjs.reconcileList(
+          el,
+          oldWrapped,
+          wrapped,
+          oldNodes,
+          keyFn,
+          (w) => createBoundClone2(w.__item, w.__idx),
+          (node, w) => updateBoundClone2(node, w.__item, w.__idx),
+          void 0,
+          // beforeNode
+          listHooks
+        );
+        const nextNodes = new Set(result.nodes);
+        for (const n of prevNodes) {
+          if (!nextNodes.has(n)) {
+            if (n.hasAttribute?.("data-forma-leaving")) continue;
+            disposeCloneBindings2(n);
           }
-          oldItems = result.items;
-          oldNodes = result.nodes;
         }
+        oldItems = result.items;
+        oldNodes = result.nodes;
       });
       disposers.push(dispose);
     }
@@ -2400,16 +2495,16 @@ function bindElement(el, scope, disposers) {
         else if (k === "error") errorTarget = v;
         else if (k === "poll") interval = parseInt(v ?? "0", 10);
       }
-      const [getTarget, setTarget] = chunkW7OUWVRA_cjs.createSignal(null);
+      const [getTarget, setTarget] = chunkH7MDUHS5_cjs.createSignal(null);
       scope.getters[target] = getTarget;
       scope.setters[target] = setTarget;
       if (loadingTarget) {
-        const [gl, sl] = chunkW7OUWVRA_cjs.createSignal(false);
+        const [gl, sl] = chunkH7MDUHS5_cjs.createSignal(false);
         scope.getters[loadingTarget] = gl;
         scope.setters[loadingTarget] = sl;
       }
       if (errorTarget) {
-        const [ge, se] = chunkW7OUWVRA_cjs.createSignal(null);
+        const [ge, se] = chunkH7MDUHS5_cjs.createSignal(null);
         scope.getters[errorTarget] = ge;
         scope.setters[errorTarget] = se;
       }
@@ -2738,7 +2833,7 @@ function getScopes() {
 function setScopeValue(element, key, value) {
   const scope = element.__formaScope;
   if (!scope?.setters[key]) return;
-  chunk2Y5US35K_cjs.batch(() => {
+  chunkKUXNZ5MG_cjs.batch(() => {
     scope.setters[key](value);
   });
 }
@@ -2747,7 +2842,7 @@ function resetScope(element) {
   const initialJSON = element.__formaInitialState;
   if (!scope || !initialJSON) return;
   const initial = parseState(initialJSON);
-  chunk2Y5US35K_cjs.batch(() => {
+  chunkKUXNZ5MG_cjs.batch(() => {
     for (const [key, val] of Object.entries(initial)) {
       scope.setters[key]?.(val);
     }
@@ -2777,7 +2872,7 @@ function getReconciler() {
           }
         }
       },
-      batch: chunk2Y5US35K_cjs.batch
+      batch: chunkKUXNZ5MG_cjs.batch
     });
   }
   return _reconciler;