zag-ripple 0.0.14 → 0.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zag-ripple",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "RippleJS Adapter for Zag JS",
   "keywords": [
     "js",
@@ -16,6 +16,9 @@
   "homepage": "https://github.com/anubra266/zag-ripple#readme",
   "license": "MIT",
   "main": "src/index.ripple",
+  "files": [
+    "src"
+  ],
   "exports": {
     ".": {
       "import": "./src/index.ripple",
@@ -32,9 +35,9 @@
     "url": "https://github.com/anubra266i/zag-ripple/issues"
   },
   "dependencies": {
-    "@zag-js/core": "^1.34.1",
-    "@zag-js/types": "^1.34.1",
-    "@zag-js/utils": "^1.34.1"
+    "@zag-js/core": "^1.35.0",
+    "@zag-js/types": "^1.35.0",
+    "@zag-js/utils": "^1.35.0"
   },
   "peerDependencies": {
     "ripple": ">=0.2.0"

package/src/index.d.ts

@@ -58,6 +58,8 @@ export declare function createTrack(
     effectCallback: VoidFunction
 ): void;
 
+// Utils
+export declare function onMount(mount: () => void): void;
 
 
 

package/src/index.ripple

@@ -1,6 +1,7 @@
 export * from "./normalize-props.ripple"
 export * from "./machine.ripple"
 export * from "./portal.ripple"
+export * from "./utils.ripple"
 
 export function mergeProps<T extends Record<string, any>>(...args: T[]): T {
     let result: any = {}

package/src/machine.ripple

@@ -10,18 +10,22 @@ import type {
   Params,
   Service,
 } from "@zag-js/core"
-import { createScope, INIT_STATE, MachineStatus } from "@zag-js/core"
+import {
+  createScope,
+  findTransition,
+  getExitEnterStates,
+  hasTag,
+  INIT_STATE,
+  MachineStatus,
+  matchesState,
+  resolveStateValue,
+} from "@zag-js/core"
 import { ensure, isFunction, isPlainObject, isString, toArray, warn } from "@zag-js/utils"
-import { track, effect, flushSync, untrack } from "ripple"
+import { track, flushSync } from "ripple"
 import { bindable } from "./bindable.ripple"
 import { useRefs } from "./refs.ripple"
 import { createTrack } from "./track.ripple"
-
-function onMount(mount) {
-  effect(() => {
-    return untrack(mount);
-  });
-}
+import { onMount } from "./utils.ripple"
 
 function compact<T extends Record<string, unknown> | undefined>(obj: T): T {
   if (!isPlainObject(obj) || obj === undefined) return obj
@@ -109,13 +113,11 @@ export function useMachine<T extends MachineSchema>(
 
   const getState = () => ({
     ...state,
-    hasTag(tag) {
-      const currentState = state.get()
-      return !!machine.states[currentState]?.tags?.includes(tag)
-    },
     matches(...values) {
-      const currentState = state.get()
-      return values.includes(currentState)
+      return values.some((value) => matchesState(state.get(), value))
+    },
+    hasTag(tag) {
+      return hasTag(machine, state.get(), tag)
     },
   })
 
@@ -194,38 +196,36 @@ export function useMachine<T extends MachineSchema>(
   }
 
   const state = bindable(() => ({
-    defaultValue: machine.initialState({ prop }),
+    defaultValue: resolveStateValue(machine, machine.initialState({ prop })),
     onChange(nextState: string, prevState: string | undefined) {
-      // compute effects: exit -> transition -> enter
+      const { exiting, entering } = getExitEnterStates(machine, prevState, nextState, transitionRef.current?.reenter)
 
-      // exit effects
-      if (prevState) {
-        const exitEffects = effects.get(prevState)
+      exiting.forEach((item) => {
+        const exitEffects = effects.get(item.path)
         exitEffects?.()
-        effects.delete(prevState)
-      }
+        effects.delete(item.path)
+      })
 
-      // exit actions
-      if (prevState) {
-        action(machine.states[prevState]?.exit)
-      }
+      exiting.forEach((item) => {
+        action(item.state?.exit)
+      })
 
-      // transition actions
       action(transitionRef.current?.actions)
 
-      // enter effects
-      const cleanup = effectFn( machine.states[nextState]?.effects)
-      if (cleanup) effects.set(nextState, cleanup)
+      entering.forEach((item) => {
+        const cleanup = effectFn(item.state?.effects)
+        if (cleanup) effects.set(item.path, cleanup)
+      })
 
-      // root entry actions
       if (prevState === INIT_STATE) {
         action(machine.entry)
         const cleanup = effectFn(machine.effects)
         if (cleanup) effects.set(INIT_STATE, cleanup)
       }
 
-      // enter actions
-      action(machine.states[nextState]?.entry)
+      entering.forEach((item) => {
+        action(item.state?.entry)
+      })
     },
   }))
 
@@ -258,14 +258,14 @@ export function useMachine<T extends MachineSchema>(
 
     let currentState = state.get()
 
-    const transitions = machine.states[currentState].on?.[event.type] ?? machine.on?.[event.type]
+    const { transitions, source } = findTransition(machine, currentState, event.type)
 
     const transition = choose(transitions)
     if (!transition) return
 
     // save current transition
     transitionRef.current = transition
-    const target = transition.target ?? currentState
+    const target = resolveStateValue(machine, transition.target ?? currentState, source)
 
     debug("transition", event.type, transition.target || currentState, `(${transition.actions})`)
 
@@ -273,7 +273,7 @@ export function useMachine<T extends MachineSchema>(
     if (changed) {
       // state change is high priority
       state.set(target)
-    } else if (transition.reenter && !changed) {
+    } else if (transition.reenter) {
       // reenter will re-invoke the current state
       state.invoke?.(currentState, currentState)
     } else {

package/src/utils.ripple

@@ -0,0 +1,7 @@
+import { effect, untrack } from "ripple"
+
+export function onMount(mount) {
+    effect(() => {
+      return untrack(mount);
+    });
+  }

package/tsconfig.json

@@ -1,6 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "tsBuildInfoFile": "node_modules/.cache/.tsbuildinfo",
-  }
-}