@flemo/core 1.1.1 → 1.1.2

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { create as D } from "zustand";
-import { pathToRegexp as S, match as Y } from "path-to-regexp";
-class B {
+import { create as w } from "zustand";
+import { pathToRegexp as v, match as B } from "path-to-regexp";
+class Q {
   tasks = /* @__PURE__ */ new Map();
   instanceId = Date.now().toString();
   isLocked = !1;
@@ -10,7 +10,7 @@ class B {
   pendingTaskQueue = [];
   isProcessingPending = !1;
   async acquireLock(t) {
-    for (let s = 0; s < 10; s++) {
+    for (let a = 0; a < 10; a++) {
       if (!this.isLocked)
         return this.isLocked = !0, this.currentTaskId = t, !0;
       await new Promise((r) => setTimeout(r, 100));
@@ -25,8 +25,8 @@ class B {
   }
   emitSignal(t) {
     const e = this.signalListeners.get(t);
-    e && (e.forEach((a) => {
-      this.resolveTask(a);
+    e && (e.forEach((s) => {
+      this.resolveTask(s);
     }), this.signalListeners.delete(t));
   }
   // 대기 중인 태스크들을 처리하는 메서드
@@ -53,7 +53,7 @@ class B {
     return new Promise((t) => {
       const e = () => {
         this.pendingTaskQueue.filter(
-          (s) => s.status === "MANUAL_PENDING" || s.status === "SIGNAL_PENDING"
+          (a) => a.status === "MANUAL_PENDING" || a.status === "SIGNAL_PENDING"
         ).length === 0 ? t() : setTimeout(e, 100);
       };
       e();
@@ -61,15 +61,15 @@ class B {
   }
   // 태스크 상태 변경 시 대기 큐 처리
   async onTaskStatusChange(t, e) {
-    (e === "COMPLETED" || e === "FAILED" || e === "ROLLEDBACK") && (this.pendingTaskQueue = this.pendingTaskQueue.filter((a) => a.id !== t), await this.processPendingTasks());
+    (e === "COMPLETED" || e === "FAILED" || e === "ROLLEDBACK") && (this.pendingTaskQueue = this.pendingTaskQueue.filter((s) => s.id !== t), await this.processPendingTasks());
   }
   async addTask(t, e = {}) {
-    const a = e.id || this.generateTaskId();
-    return new Promise((s, r) => {
+    const s = e.id || this.generateTaskId();
+    return new Promise((a, r) => {
       this.taskQueue = this.taskQueue.then(async () => {
         try {
           const { control: o, validate: c, rollback: l, dependencies: u = [], delay: d } = e, m = new AbortController(), i = {
-            id: a,
+            id: s,
             execute: t,
             timestamp: Date.now(),
             retryCount: 0,
@@ -81,7 +81,7 @@ class B {
             control: o,
             abortController: m
           };
-          this.tasks.set(i.id, i), this.pendingTaskQueue.length > 0 && (this.pendingTaskQueue.push(i), await this.waitForPendingTasks(), this.pendingTaskQueue = this.pendingTaskQueue.filter((g) => g.id !== i.id));
+          this.tasks.set(i.id, i), this.pendingTaskQueue.length > 0 && (this.pendingTaskQueue.push(i), await this.waitForPendingTasks(), this.pendingTaskQueue = this.pendingTaskQueue.filter((P) => P.id !== i.id));
           try {
             if (!await this.acquireLock(i.id))
               throw i.status = "FAILED", new Error("FAILED");
@@ -97,7 +97,7 @@ class B {
               d && d > 0 && await new Promise((f) => setTimeout(f, d));
               const p = await i.execute(i.abortController);
               if (i.abortController.signal.aborted) {
-                i.status = "COMPLETED", await this.onTaskStatusChange(i.id, "COMPLETED"), s({
+                i.status = "COMPLETED", await this.onTaskStatusChange(i.id, "COMPLETED"), a({
                   success: !0,
                   result: void 0,
                   taskId: i.id,
@@ -109,19 +109,19 @@ class B {
               if (e.control) {
                 const f = e.control;
                 if (f.delay && f.delay > 0 && await new Promise((y) => setTimeout(y, f.delay)), f.manual) {
-                  i.status = "MANUAL_PENDING", i.manualResolver = { resolve: s, reject: r, result: p }, this.pendingTaskQueue.push(i), await this.onTaskStatusChange(i.id, "MANUAL_PENDING");
+                  i.status = "MANUAL_PENDING", i.manualResolver = { resolve: a, reject: r, result: p }, this.pendingTaskQueue.push(i), await this.onTaskStatusChange(i.id, "MANUAL_PENDING");
                   return;
                 }
                 if (f.signal) {
-                  i.status = "SIGNAL_PENDING", i.manualResolver = { resolve: s, reject: r, result: p }, this.signalListeners.has(f.signal) || this.signalListeners.set(f.signal, /* @__PURE__ */ new Set()), this.signalListeners.get(f.signal).add(i.id), this.pendingTaskQueue.push(i), await this.onTaskStatusChange(i.id, "SIGNAL_PENDING");
+                  i.status = "SIGNAL_PENDING", i.manualResolver = { resolve: a, reject: r, result: p }, this.signalListeners.has(f.signal) || this.signalListeners.set(f.signal, /* @__PURE__ */ new Set()), this.signalListeners.get(f.signal).add(i.id), this.pendingTaskQueue.push(i), await this.onTaskStatusChange(i.id, "SIGNAL_PENDING");
                   return;
                 }
                 if (f.condition && !await f.condition()) {
-                  i.status = "MANUAL_PENDING", i.manualResolver = { resolve: s, reject: r, result: p }, this.pendingTaskQueue.push(i), await this.onTaskStatusChange(i.id, "MANUAL_PENDING");
+                  i.status = "MANUAL_PENDING", i.manualResolver = { resolve: a, reject: r, result: p }, this.pendingTaskQueue.push(i), await this.onTaskStatusChange(i.id, "MANUAL_PENDING");
                   return;
                 }
               }
-              i.status = "COMPLETED", await this.onTaskStatusChange(i.id, "COMPLETED"), s({
+              i.status = "COMPLETED", await this.onTaskStatusChange(i.id, "COMPLETED"), a({
                 success: !0,
                 result: p,
                 taskId: i.id,
@@ -138,8 +138,8 @@ class B {
             } finally {
               this.releaseLock(i.id);
             }
-          } catch (g) {
-            r(g);
+          } catch (P) {
+            r(P);
           }
         } catch (o) {
           r(o);
@@ -155,10 +155,10 @@ class B {
       if (e.control?.condition && !await e.control.condition())
         return !1;
       e.status = "COMPLETED";
-      const a = e.manualResolver;
-      return a.resolve({
+      const s = e.manualResolver;
+      return s.resolve({
         success: !0,
-        result: a.result,
+        result: s.result,
         taskId: e.id,
         timestamp: Date.now(),
         instanceId: this.instanceId
@@ -173,7 +173,7 @@ class B {
     await Promise.all(t.map((e) => this.resolveTask(e.id)));
   }
 }
-const pt = new B(), yt = D((n) => ({
+const yt = new Q(), Pt = w((n) => ({
   index: -1,
   histories: [],
   addHistory: (t) => n((e) => ({
@@ -186,27 +186,27 @@ const pt = new B(), yt = D((n) => ({
   })),
   popHistory: (t) => n((e) => ({
     index: e.index - 1,
-    histories: e.histories.filter((a, s) => s !== t)
+    histories: e.histories.filter((s, a) => a !== t)
   }))
-})), gt = D((n) => ({
+})), gt = w((n) => ({
   status: "IDLE",
   transitionTaskId: null,
   setStatus: (t) => n({ status: t }),
   setTransitionTaskId: (t) => n({ transitionTaskId: t })
 }));
-let N = 0;
-function Pt() {
-  N += 1;
+let L = 0;
+function It() {
+  L += 1;
 }
 function Et() {
-  return N > 0 ? (N -= 1, !0) : !1;
+  return L > 0 ? (L -= 1, !0) : !1;
 }
-function k({
+function T({
   name: n,
   initial: t,
   idle: e,
-  enter: a,
-  enterBack: s,
+  enter: s,
+  enterBack: a,
   exit: r,
   exitBack: o,
   options: c
@@ -218,23 +218,23 @@ function k({
       "IDLE-true": e,
       "IDLE-false": e,
       "PUSHING-false": r,
-      "PUSHING-true": a,
+      "PUSHING-true": s,
       "REPLACING-false": r,
-      "REPLACING-true": a,
+      "REPLACING-true": s,
       "POPPING-false": o,
-      "POPPING-true": s,
+      "POPPING-true": a,
       "COMPLETED-false": r,
-      "COMPLETED-true": a
+      "COMPLETED-true": s
     },
     ...c
   };
 }
-function It({
+function kt({
   name: n,
   initial: t,
   idle: e,
-  pushOnEnter: a,
-  pushOnExit: s,
+  pushOnEnter: s,
+  pushOnExit: a,
   replaceOnEnter: r,
   replaceOnExit: o,
   popOnEnter: c,
@@ -249,8 +249,8 @@ function It({
     variants: {
       "IDLE-true": e,
       "IDLE-false": e,
-      "PUSHING-false": s,
-      "PUSHING-true": a,
+      "PUSHING-false": a,
+      "PUSHING-true": s,
       "REPLACING-false": o,
       "REPLACING-true": r,
       "POPPING-false": l,
@@ -261,12 +261,12 @@ function It({
     ...m
   };
 }
-const Q = (n, t, e) => {
-  const [a, s] = t, [r, o] = e;
-  if (s === a) return r;
-  const c = (n - a) / (s - a);
+const X = (n, t, e) => {
+  const [s, a] = t, [r, o] = e;
+  if (a === s) return r;
+  const c = (n - s) / (a - s);
   return r + c * (o - r);
-}, X = k({
+}, F = T({
   name: "cupertino",
   initial: {
     x: "100%"
@@ -319,10 +319,10 @@ const Q = (n, t, e) => {
     decoratorName: "overlay",
     swipeDirection: "x",
     onSwipeStart: async () => !0,
-    onSwipe: (n, t, { animate: e, currentScreen: a, prevScreen: s, onProgress: r }) => {
-      const { offset: o } = t, c = o.x, l = Q(c, [0, window.innerWidth], [0, 100]);
+    onSwipe: (n, t, { animate: e, currentScreen: s, prevScreen: a, onProgress: r }) => {
+      const { offset: o } = t, c = o.x, l = X(c, [0, window.innerWidth], [0, 100]);
       return r?.(!0, l), e(
-        a,
+        s,
         {
           x: Math.max(0, c)
         },
@@ -330,7 +330,7 @@ const Q = (n, t, e) => {
           duration: 0
         }
       ), e(
-        s,
+        a,
         {
           x: -100 + l
         },
@@ -339,11 +339,11 @@ const Q = (n, t, e) => {
         }
       ), l;
     },
-    onSwipeEnd: async (n, t, { animate: e, currentScreen: a, prevScreen: s, onStart: r }) => {
+    onSwipeEnd: async (n, t, { animate: e, currentScreen: s, prevScreen: a, onStart: r }) => {
       const { offset: o, velocity: c } = t, u = o.x > 50 || c.x > 20;
       return r?.(u), await Promise.all([
         e(
-          a,
+          s,
           {
             x: u ? "100%" : 0
           },
@@ -353,7 +353,7 @@ const Q = (n, t, e) => {
           }
         ),
         e(
-          s,
+          a,
           {
             x: u ? 0 : -100
           },
@@ -365,12 +365,12 @@ const Q = (n, t, e) => {
       ]), u;
     }
   }
-}), F = (n, t, e) => {
-  const [a, s] = t, [r, o] = e;
-  if (s === a) return r;
-  const c = (n - a) / (s - a);
+}), z = (n, t, e) => {
+  const [s, a] = t, [r, o] = e;
+  if (a === s) return r;
+  const c = (n - s) / (a - s);
   return r + c * (o - r);
-}, z = k({
+}, V = T({
   name: "layout",
   initial: {
     opacity: 0.97
@@ -419,10 +419,10 @@ const Q = (n, t, e) => {
     decoratorName: "overlay",
     swipeDirection: "y",
     onSwipeStart: async () => !0,
-    onSwipe: (n, t, { animate: e, currentScreen: a, onProgress: s }) => {
-      const { offset: r } = t, o = r.y, c = Math.max(0, Math.min(56, o)), l = F(c, [0, 56], [1, 0.96]), u = Math.max(0, o - 56), d = Math.min(1, u / 160), m = Math.sqrt(d) * 12, i = Math.max(0, c + m), h = Math.min(56, i);
-      return s?.(!0, 100), e(
-        a,
+    onSwipe: (n, t, { animate: e, currentScreen: s, onProgress: a }) => {
+      const { offset: r } = t, o = r.y, c = Math.max(0, Math.min(56, o)), l = z(c, [0, 56], [1, 0.96]), u = Math.max(0, o - 56), d = Math.min(1, u / 160), m = Math.sqrt(d) * 12, i = Math.max(0, c + m), h = Math.min(56, i);
+      return a?.(!0, 100), e(
+        s,
         {
           y: i,
           opacity: l
@@ -432,11 +432,11 @@ const Q = (n, t, e) => {
         }
       ), h;
     },
-    onSwipeEnd: async (n, t, { animate: e, currentScreen: a, prevScreen: s, onStart: r }) => {
+    onSwipeEnd: async (n, t, { animate: e, currentScreen: s, prevScreen: a, onStart: r }) => {
       const { offset: o, velocity: c } = t, u = o.y > 56 || c.y > 20;
       return r?.(u), await Promise.all([
         e(
-          a,
+          s,
           {
             y: u ? "100%" : 0,
             opacity: u ? 0.96 : 1
@@ -446,7 +446,7 @@ const Q = (n, t, e) => {
           }
         ),
         e(
-          s,
+          a,
           {
             y: 0,
             opacity: u ? 1 : 0.97
@@ -458,7 +458,7 @@ const Q = (n, t, e) => {
       ]), u;
     }
   }
-}), V = k({
+}), Z = T({
   name: "material",
   initial: {
     y: "100%"
@@ -510,10 +510,10 @@ const Q = (n, t, e) => {
   options: {
     swipeDirection: "y",
     onSwipeStart: async () => !0,
-    onSwipe: (n, t, { animate: e, currentScreen: a, prevScreen: s, onProgress: r }) => {
+    onSwipe: (n, t, { animate: e, currentScreen: s, prevScreen: a, onProgress: r }) => {
       const { offset: o } = t, c = o.y, l = Math.max(0, Math.min(56, c)), u = Math.max(0, c - 56), d = Math.min(1, u / 160), m = Math.sqrt(d) * 12, i = Math.max(0, l + m), h = Math.min(56, i);
       return r?.(!0, h), e(
-        a,
+        s,
         {
           y: i
         },
@@ -521,18 +521,18 @@ const Q = (n, t, e) => {
           duration: 0
         }
       ), e(
-        s,
+        a,
         {
           y: -56 + h
         },
         { duration: 0 }
       ), h;
     },
-    onSwipeEnd: async (n, t, { animate: e, currentScreen: a, prevScreen: s, onStart: r }) => {
+    onSwipeEnd: async (n, t, { animate: e, currentScreen: s, prevScreen: a, onStart: r }) => {
       const { offset: o, velocity: c } = t, u = o.y > 56 || c.y > 20;
       return r?.(u), await Promise.all([
         e(
-          a,
+          s,
           {
             y: u ? "100%" : 0
           },
@@ -542,7 +542,7 @@ const Q = (n, t, e) => {
           }
         ),
         e(
-          s,
+          a,
           {
             y: u ? 0 : -56
           },
@@ -554,7 +554,7 @@ const Q = (n, t, e) => {
       ]), u;
     }
   }
-}), Z = k({
+}), j = T({
   name: "none",
   initial: {},
   idle: {
@@ -587,21 +587,21 @@ const Q = (n, t, e) => {
       duration: 0
     }
   }
-}), kt = /* @__PURE__ */ new Map([
-  ["none", Z],
-  ["cupertino", X],
-  ["material", V],
-  ["layout", z]
-]), Tt = D((n) => ({
+}), Tt = /* @__PURE__ */ new Map([
+  ["none", j],
+  ["cupertino", F],
+  ["material", Z],
+  ["layout", V]
+]), Nt = w((n) => ({
   defaultTransitionName: "cupertino",
   setDefaultTransitionName: (t) => n({ defaultTransitionName: t })
 }));
-function j({
+function K({
   name: n,
   initial: t,
   idle: e,
-  enter: a,
-  exit: s,
+  enter: s,
+  exit: a,
   options: r
 }) {
   return {
@@ -611,23 +611,23 @@ function j({
       "IDLE-true": e,
       "IDLE-false": e,
       "PUSHING-true": e,
-      "PUSHING-false": a,
+      "PUSHING-false": s,
       "REPLACING-true": e,
-      "REPLACING-false": a,
+      "REPLACING-false": s,
       "POPPING-true": e,
-      "POPPING-false": s,
+      "POPPING-false": a,
       "COMPLETED-true": e,
-      "COMPLETED-false": a
+      "COMPLETED-false": s
     },
     ...r
   };
 }
-function Nt({
+function Lt({
   name: n,
   initial: t,
   idle: e,
-  pushOnEnter: a,
-  pushOnExit: s,
+  pushOnEnter: s,
+  pushOnExit: a,
   replaceOnEnter: r,
   replaceOnExit: o,
   popOnEnter: c,
@@ -642,8 +642,8 @@ function Nt({
     variants: {
       "IDLE-true": e,
       "IDLE-false": e,
-      "PUSHING-false": s,
-      "PUSHING-true": a,
+      "PUSHING-false": a,
+      "PUSHING-true": s,
       "REPLACING-false": o,
       "REPLACING-true": r,
       "POPPING-false": l,
@@ -654,16 +654,16 @@ function Nt({
     ...m
   };
 }
-const K = j({
+const I = "rgba(0, 0, 0, 0.3)", q = K({
   name: "overlay",
   initial: {
     opacity: 0,
-    backgroundColor: "rgba(0, 0, 0, 0)"
+    backgroundColor: I
   },
   idle: {
     value: {
       opacity: 0,
-      backgroundColor: "rgba(0, 0, 0, 0)"
+      backgroundColor: I
     },
     options: {
       duration: 0
@@ -671,25 +671,31 @@ const K = j({
   },
   // Visible dim — applied when this screen is the one going behind / sitting
   // behind a new active screen (PUSHING-false / REPLACING-false / COMPLETED-false).
+  // Duration + easing track cupertino's enter/exit so the dim arrives in
+  // lockstep with the underlying screen slide and there's no
+  // animation-vs-hold-by-fill window for the rest-rule handoff to race against.
   enter: {
     value: {
       opacity: 1,
-      backgroundColor: "rgba(0, 0, 0, 0.3)"
+      backgroundColor: I
     },
     options: {
-      duration: 0.3
+      duration: 0.7,
+      ease: [0.32, 0.72, 0, 1]
     }
   },
   // POPPING-false target: the previously-behind screen is returning to active.
   // Fades from `enter` (visible dim) back to invisible so the overlay clears
-  // before the screen lands at COMPLETED-true (= idle).
+  // before the screen lands at COMPLETED-true (= idle). Mirrors cupertino's
+  // enterBack (the returning screen's slide-in) duration.
   exit: {
     value: {
       opacity: 0,
-      backgroundColor: "rgba(0, 0, 0, 0)"
+      backgroundColor: I
     },
     options: {
-      duration: 0.3
+      duration: 0.6,
+      ease: [0.32, 0.72, 0, 1]
     }
   },
   options: {
@@ -702,8 +708,8 @@ const K = j({
         duration: 0.3
       }
     ),
-    onSwipe: (n, t, { animate: e, prevDecorator: a }) => e(
-      a,
+    onSwipe: (n, t, { animate: e, prevDecorator: s }) => e(
+      s,
       {
         opacity: Math.max(0, 1 - t / 100)
       },
@@ -721,7 +727,7 @@ const K = j({
       }
     )
   }
-}), Lt = /* @__PURE__ */ new Map([["overlay", K]]), I = {
+}), Dt = /* @__PURE__ */ new Map([["overlay", q]]), k = {
   "IDLE-true": "self",
   "IDLE-false": "self",
   "PUSHING-true": "initial",
@@ -732,7 +738,7 @@ const K = j({
   "POPPING-false": "PUSHING-false",
   "COMPLETED-true": "self",
   "COMPLETED-false": "self"
-}, G = Object.keys(I), q = G, W = (n) => n.replace(/[^a-zA-Z0-9_-]/g, "_"), O = (n) => typeof n == "object" && n !== null && !Array.isArray(n), J = /* @__PURE__ */ new Set([
+}, O = Object.keys(k), W = O, J = (n) => n.replace(/[^a-zA-Z0-9_-]/g, "_"), b = (n) => typeof n == "object" && n !== null && !Array.isArray(n), tt = /* @__PURE__ */ new Set([
   "opacity",
   "scale",
   "scaleX",
@@ -769,7 +775,7 @@ const K = j({
   "strokeDashoffset",
   "strokeMiterlimit",
   "strokeWidth"
-]), tt = (n, t) => t.startsWith("--") ? `${n}` : J.has(t) ? `${n}` : t === "rotate" || t === "rotateX" || t === "rotateY" || t === "rotateZ" ? `${n}deg` : `${n}px`, b = (n, t) => typeof t == "number" ? tt(t, n) : typeof t == "string" ? t : "", $ = (n) => n.replace(/[A-Z]/g, (t) => `-${t.toLowerCase()}`), R = /* @__PURE__ */ new Set([
+]), et = (n, t) => t.startsWith("--") ? `${n}` : tt.has(t) ? `${n}` : t === "rotate" || t === "rotateX" || t === "rotateY" || t === "rotateZ" ? `${n}deg` : `${n}px`, $ = (n, t) => typeof t == "number" ? et(t, n) : typeof t == "string" ? t : "", R = (n) => n.replace(/[A-Z]/g, (t) => `-${t.toLowerCase()}`), _ = /* @__PURE__ */ new Set([
   "x",
   "y",
   "z",
@@ -780,7 +786,7 @@ const K = j({
   "rotateX",
   "rotateY",
   "rotateZ"
-]), et = /^-?0(\.0+)?(px|%|em|rem|vh|vw|vmin|vmax)?$/, nt = /^-?0(\.0+)?(deg|rad|grad|turn)?$/, at = /^1(\.0+)?$/, st = (n, t) => n === "scale" || n === "scaleX" || n === "scaleY" ? t === 1 ? !0 : typeof t == "string" ? at.test(t.trim()) : !1 : n === "rotate" || n === "rotateX" || n === "rotateY" || n === "rotateZ" ? t === 0 ? !0 : typeof t == "string" ? nt.test(t.trim()) : !1 : t === 0 ? !0 : typeof t == "string" ? et.test(t.trim()) : !1, rt = (n, t) => {
+]), nt = /^-?0(\.0+)?(px|%|em|rem|vh|vw|vmin|vmax)?$/, st = /^-?0(\.0+)?(deg|rad|grad|turn)?$/, at = /^1(\.0+)?$/, rt = (n, t) => n === "scale" || n === "scaleX" || n === "scaleY" ? t === 1 ? !0 : typeof t == "string" ? at.test(t.trim()) : !1 : n === "rotate" || n === "rotateX" || n === "rotateY" || n === "rotateZ" ? t === 0 ? !0 : typeof t == "string" ? st.test(t.trim()) : !1 : t === 0 ? !0 : typeof t == "string" ? nt.test(t.trim()) : !1, ot = (n, t) => {
   switch (n) {
     case "x":
       return `translateX(${t})`;
@@ -804,35 +810,35 @@ const K = j({
     default:
       return "";
   }
-}, Dt = (n) => {
+}, wt = (n) => {
   const t = /* @__PURE__ */ new Set();
   let e = !1;
-  const a = (s) => {
-    if (O(s))
-      for (const r of Object.keys(s)) {
-        const o = s[r];
-        b(r, o) !== "" && (R.has(r) ? e = !0 : t.add($(r)));
+  const s = (a) => {
+    if (b(a))
+      for (const r of Object.keys(a)) {
+        const o = a[r];
+        $(r, o) !== "" && (_.has(r) ? e = !0 : t.add(R(r)));
       }
   };
-  a(n.initial);
-  for (const s of Object.values(n.variants))
-    a(s.value);
+  s(n.initial);
+  for (const a of Object.values(n.variants))
+    s(a.value);
   return e && t.add("transform"), Array.from(t);
-}, P = (n) => {
-  if (!O(n)) return [];
+}, g = (n) => {
+  if (!b(n)) return [];
   const t = [];
   let e = !0;
-  const a = [];
-  for (const s of Object.keys(n)) {
-    const r = n[s], o = b(s, r);
-    o !== "" && (R.has(s) ? (t.push(rt(s, o)), st(s, r) || (e = !1)) : a.push({ property: $(s), value: o }));
+  const s = [];
+  for (const a of Object.keys(n)) {
+    const r = n[a], o = $(a, r);
+    o !== "" && (_.has(a) ? (t.push(ot(a, o)), rt(a, r) || (e = !1)) : s.push({ property: R(a), value: o }));
   }
-  return t.length > 0 && a.push({
+  return t.length > 0 && s.push({
     property: "transform",
     value: e ? "none" : t.join(" ")
-  }), a;
+  }), s;
 }, E = (n) => n.map((t) => `  ${t.property}: ${t.value};`).join(`
-`), ot = (n) => Array.isArray(n) ? n.length === 4 && n.every((t) => typeof t == "number") ? `cubic-bezier(${n.join(", ")})` : "linear" : typeof n == "string" ? {
+`), it = (n) => Array.isArray(n) ? n.length === 4 && n.every((t) => typeof t == "number") ? `cubic-bezier(${n.join(", ")})` : "linear" : typeof n == "string" ? {
   linear: "linear",
   easeIn: "ease-in",
   easeOut: "ease-out",
@@ -842,22 +848,22 @@ const K = j({
   backIn: "cubic-bezier(0.31, 0.01, 0.66, -0.59)",
   backOut: "cubic-bezier(0.33, 1.53, 0.69, 0.99)",
   anticipate: "cubic-bezier(0.36, 0, 0.66, -0.56)"
-}[n] ?? "ease" : "ease", _ = (n) => {
+}[n] ?? "ease" : "ease", H = (n) => {
   if (!n) return 0;
   const t = n.duration;
   return typeof t == "number" && t >= 0 ? t : 0;
-}, H = (n) => n && typeof n.delay == "number" && n.delay > 0 ? n.delay : 0, v = (n, t) => {
-  const [e, a] = t.split("-");
-  return `[data-flemo-screen][data-flemo-transition="${n}"][data-flemo-status="${e}"][data-flemo-active="${a}"]`;
-}, A = (n, t) => {
-  const [e, a] = t.split("-");
-  return `[data-flemo-decorator][data-flemo-decorator-name="${n}"][data-flemo-status="${e}"][data-flemo-active="${a}"]`;
-}, it = (n, t) => {
-  const [e, a] = t.split("-");
-  return `[data-flemo-bar][data-flemo-bar-transition="${n}"][data-flemo-bar-status="${e}"][data-flemo-bar-active="${a}"][data-flemo-bar-riding="true"]`;
-}, ct = (n, t, e) => `flemo-${n}-${W(t)}-${e}`, M = (n, t, e, a, s, r) => {
-  const o = P(a), c = P(s.value), l = _(s.options), u = H(s.options), d = ot(s.options?.ease), m = r(t, e), i = n === "screen" ? `${m},
-${it(t, e)}` : m;
+}, U = (n) => n && typeof n.delay == "number" && n.delay > 0 ? n.delay : 0, A = (n, t) => {
+  const [e, s] = t.split("-");
+  return `[data-flemo-screen][data-flemo-transition="${n}"][data-flemo-status="${e}"][data-flemo-active="${s}"]`;
+}, M = (n, t) => {
+  const [e, s] = t.split("-");
+  return `[data-flemo-decorator][data-flemo-decorator-name="${n}"][data-flemo-status="${e}"][data-flemo-active="${s}"]`;
+}, ct = (n, t) => {
+  const [e, s] = t.split("-");
+  return `[data-flemo-bar][data-flemo-bar-transition="${n}"][data-flemo-bar-status="${e}"][data-flemo-bar-active="${s}"][data-flemo-bar-riding="true"]`;
+}, ut = (n, t, e) => `flemo-${n}-${J(t)}-${e}`, C = (n, t, e, s, a, r) => {
+  const o = g(s), c = g(a.value), l = H(a.options), u = U(a.options), d = it(a.options?.ease), m = r(t, e), i = n === "screen" ? `${m},
+${ct(t, e)}` : m;
   if (c.length === 0 && o.length === 0)
     return "";
   if (l <= 0 && u <= 0)
@@ -865,7 +871,7 @@ ${it(t, e)}` : m;
 ${E(c)}
   animation: none;
 }`;
-  const h = ct(n, t, e), g = [
+  const h = ut(n, t, e), P = [
     `@keyframes ${h} {`,
     "  from {",
     E(o).replace(/^/gm, "  "),
@@ -882,142 +888,142 @@ ${E(c)}
     u > 0 ? `${u}s` : null,
     "both"
   ].filter(Boolean).join(" "), f = Array.from(
-    /* @__PURE__ */ new Set([...o.map((T) => T.property), ...c.map((T) => T.property)])
+    /* @__PURE__ */ new Set([...o.map((N) => N.property), ...c.map((N) => N.property)])
   ), y = f.length > 0 ? `  will-change: ${f.join(", ")};
-` : "", w = e.split("-")[0], U = `${i} {
+` : "", S = e.split("-")[0], Y = `${i} {
   animation: ${p};
-${y}${w === "PUSHING" || w === "REPLACING" ? `  contain: layout;
+${y}${S === "PUSHING" || S === "REPLACING" ? `  contain: layout;
   pointer-events: none;
 ` : ""}}`;
-  return `${g}
-${U}`;
-}, x = (n, t, e, a) => {
-  const s = P(a.value);
-  return s.length === 0 ? "" : `${n(t, e)} {
-${E(s)}
+  return `${P}
+${Y}`;
+}, x = (n, t, e, s) => {
+  const a = g(s.value);
+  return a.length === 0 ? "" : `${n(t, e)} {
+${E(a)}
 }`;
-}, wt = (n, t) => {
+}, St = (n, t) => {
   const e = [];
-  for (const a of n) {
-    const s = a.name;
-    for (const r of G) {
-      const o = a.variants[r], c = I[r];
+  for (const s of n) {
+    const a = s.name;
+    for (const r of O) {
+      const o = s.variants[r], c = k[r];
       if (c === "self") {
-        e.push(x(v, s, r, o));
+        e.push(x(A, a, r, o));
         continue;
       }
-      const l = c === "initial" ? a.initial : a.variants[c].value;
+      const l = c === "initial" ? s.initial : s.variants[c].value;
       e.push(
-        M("screen", s, r, l, o, v)
+        C("screen", a, r, l, o, A)
       );
     }
   }
-  for (const a of t) {
-    const s = a.name;
-    for (const r of q) {
-      const o = a.variants[r], c = I[r];
+  for (const s of t) {
+    const a = s.name;
+    for (const r of W) {
+      const o = s.variants[r], c = k[r];
       if (c === "self") {
-        e.push(x(A, s, r, o));
+        e.push(x(M, a, r, o));
         continue;
       }
-      const l = c === "initial" ? a.initial : a.variants[c].value;
+      const l = c === "initial" ? s.initial : s.variants[c].value;
       e.push(
-        M(
+        C(
           "decorator",
-          s,
+          a,
           r,
           l,
           o,
-          A
+          M
         )
       );
     }
   }
-  return e.filter((a) => a.length > 0).join(`
+  return e.filter((s) => s.length > 0).join(`
 
 `);
-}, St = (n, t) => {
-  const e = I[t];
+}, vt = (n, t) => {
+  const e = k[t];
   if (e === "self") return !1;
-  const a = n.variants[t], s = _(a.options), r = H(a.options);
-  if (s <= 0 && r <= 0) return !1;
-  const o = e === "initial" ? n.initial : n.variants[e].value, c = P(o), l = P(a.value);
+  const s = n.variants[t], a = H(s.options), r = U(s.options);
+  if (a <= 0 && r <= 0) return !1;
+  const o = e === "initial" ? n.initial : n.variants[e].value, c = g(o), l = g(s.value);
   return c.length > 0 || l.length > 0;
 };
-function vt() {
+function At() {
   return typeof document > "u";
 }
-function ut(n, t) {
-  return Array.isArray(n) ? n.find((e) => S(e).regexp.test(t)) ?? "" : S(n).regexp.test(t) ? n : "";
+function lt(n, t) {
+  return Array.isArray(n) ? n.find((e) => v(e).regexp.test(t)) ?? "" : v(n).regexp.test(t) ? n : "";
 }
-function At(n, t, e) {
-  const a = ut(n, t), s = Y(a)(t), r = new URLSearchParams(e), o = Object.fromEntries(r.entries());
-  return s ? { ...s.params, ...o } : {};
+function Mt(n, t, e) {
+  const s = lt(n, t), a = B(s)(t), r = new URLSearchParams(e), o = Object.fromEntries(r.entries());
+  return a ? { ...a.params, ...o } : {};
 }
-function Mt(n, t) {
+function Ct(n, t) {
   const {
     direction: e = "x",
-    markerSelector: a = "[data-swipe-at-edge]",
-    depthLimit: s = 24,
+    markerSelector: s = "[data-swipe-at-edge]",
+    depthLimit: a = 24,
     verifyByScroll: r = !1
-  } = t ?? {}, o = lt(n);
+  } = t ?? {}, o = ft(n);
   if (!o) return { element: null, hasMarker: !1 };
-  const c = o.closest?.(a);
-  if (c instanceof HTMLElement && L(c, e) && (!r || C(c, e)))
+  const c = o.closest?.(s);
+  if (c instanceof HTMLElement && D(c, e) && (!r || G(c, e)))
     return { element: c, hasMarker: !0 };
   let l = o, u = 0;
-  for (; l && u < s; ) {
-    if (L(l, e) && (!r || C(l, e)))
+  for (; l && u < a; ) {
+    if (D(l, e) && (!r || G(l, e)))
       return { element: l, hasMarker: !1 };
     l = l.parentElement, u++;
   }
   return { element: null, hasMarker: !1 };
 }
-function lt(n) {
+function ft(n) {
   if (!n) return null;
   const t = n, e = typeof t.composedPath == "function" ? t.composedPath() : void 0;
   if (e && e.length) {
-    for (const a of e)
-      if (a instanceof HTMLElement) return a;
+    for (const s of e)
+      if (s instanceof HTMLElement) return s;
   }
   return n instanceof HTMLElement ? n : null;
 }
-function L(n, t) {
+function D(n, t) {
   return t === "y" ? n.scrollHeight - n.clientHeight > 1 : n.scrollWidth - n.clientWidth > 1;
 }
-function C(n, t) {
-  if (!L(n, t) || typeof window > "u") return !1;
-  const e = window.getComputedStyle(n), a = t === "y" ? e.overflowY : e.overflowX;
-  return a === "auto" || a === "scroll" || a === "overlay";
+function G(n, t) {
+  if (!D(n, t) || typeof window > "u") return !1;
+  const e = window.getComputedStyle(n), s = t === "y" ? e.overflowY : e.overflowX;
+  return s === "auto" || s === "scroll" || s === "overlay";
 }
 export {
-  pt as TaskManger,
-  ct as animationName,
-  C as canProgrammaticallyScroll,
-  Dt as collectAnimatedProperties,
-  wt as compileTransitionStyles,
+  yt as TaskManger,
+  ut as animationName,
+  G as canProgrammaticallyScroll,
+  wt as collectAnimatedProperties,
+  St as compileTransitionStyles,
   Et as consumeSelfInducedPop,
-  j as createDecorator,
-  Nt as createRawDecorator,
-  It as createRawTransition,
-  k as createTransition,
-  X as cupertino,
-  Lt as decoratorMap,
-  ot as easingToCss,
-  Mt as findScrollable,
-  ut as getMatchedPathPattern,
-  At as getParams,
-  vt as isServer,
-  z as layout,
-  Pt as markSelfInducedPop,
-  V as material,
-  Z as none,
-  L as overflowsAxis,
-  K as overlay,
-  P as targetToDecls,
-  kt as transitionMap,
-  yt as useHistoryStore,
+  K as createDecorator,
+  Lt as createRawDecorator,
+  kt as createRawTransition,
+  T as createTransition,
+  F as cupertino,
+  Dt as decoratorMap,
+  it as easingToCss,
+  Ct as findScrollable,
+  lt as getMatchedPathPattern,
+  Mt as getParams,
+  At as isServer,
+  V as layout,
+  It as markSelfInducedPop,
+  Z as material,
+  j as none,
+  D as overflowsAxis,
+  q as overlay,
+  g as targetToDecls,
+  Tt as transitionMap,
+  Pt as useHistoryStore,
   gt as useNavigateStore,
-  Tt as useTransitionStore,
-  St as variantHasAnimation
+  Nt as useTransitionStore,
+  vt as variantHasAnimation
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flemo/core",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Framework-agnostic primitives for flemo: history, navigation, transitions, task manager.",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",