@doeixd/machine 0.0.22 → 1.0.1

package/dist/esm/development/index.js

@@ -128,8 +128,8 @@ function guard(condition, transition, options = {}) {
     const ctx = isMachine ? this.context : this;
     const conditionResult = condition(ctx, ...args);
     if (conditionResult) {
-      const contextForTransition = isMachine ? this.context : this;
-      return transition.apply(contextForTransition, args);
+      const machineForTransition = isMachine ? this : { context: this };
+      return transition.apply(machineForTransition, args);
     } else {
       if (onFail === "throw") {
         const message = errorMessage || "Guard condition failed";
@@ -169,8 +169,8 @@ function guardAsync(condition, transition, options = {}) {
     const ctx = isMachine ? this.context : this;
     const conditionResult = await Promise.resolve(condition(ctx, ...args));
     if (conditionResult) {
-      const contextForTransition = isMachine ? this.context : this;
-      return transition.apply(contextForTransition, args);
+      const machineForTransition = isMachine ? this : { context: this };
+      return transition.apply(machineForTransition, args);
     } else {
       if (onFail === "throw") {
         const message = errorMessage || "Guard condition failed";
@@ -251,7 +251,7 @@ function createRunner(initialMachine, onChange) {
         return void 0;
       }
       return (...args) => {
-        const nextState = transition.apply(currentMachine.context, args);
+        const nextState = transition.apply(currentMachine, args);
         const nextStateWithTransitions = Object.assign(
           { context: nextState.context },
           originalTransitions
@@ -294,7 +294,7 @@ function createEnsemble(store, factories, getDiscriminant) {
         );
       }
       return (...args) => {
-        return action2.apply(currentMachine.context, args);
+        return action2.apply(currentMachine, args);
       };
     }
   });
@@ -445,7 +445,7 @@ function createMutableMachine(sharedContext, factories, getDiscriminant) {
       const transition = currentMachine[prop];
       if (typeof transition === "function") {
         return (...args) => {
-          const nextContext = transition.apply(currentMachine.context, args);
+          const nextContext = transition.apply(currentMachine, args);
           if (typeof nextContext !== "object" || nextContext === null) {
             console.warn(`[MutableMachine] Transition "${String(prop)}" did not return a valid context object. State may be inconsistent.`);
             return;
@@ -567,14 +567,14 @@ function createParallelMachine(m1, m2) {
   for (const key in transitions1) {
     const transitionFn = transitions1[key];
     combinedTransitions[key] = (...args) => {
-      const nextM1 = transitionFn.apply(m1.context, args);
+      const nextM1 = transitionFn.apply(m1, args);
       return createParallelMachine(nextM1, m2);
     };
   }
   for (const key in transitions2) {
     const transitionFn = transitions2[key];
     combinedTransitions[key] = (...args) => {
-      const nextM2 = transitionFn.apply(m2.context, args);
+      const nextM2 = transitionFn.apply(m2, args);
       return createParallelMachine(m1, nextM2);
     };
   }
@@ -1045,7 +1045,7 @@ function withTimeTravel(machine, options = {}) {
     for (const entry of transitionsToReplay) {
       const transitionFn = replayedMachine[entry.transitionName];
       if (transitionFn) {
-        replayedMachine = transitionFn.apply(replayedMachine.context, entry.args);
+        replayedMachine = transitionFn.apply(replayedMachine, entry.args);
       }
     }
     return replayedMachine;
@@ -1563,8 +1563,8 @@ function createTransition(getTransitions, transformer) {
     return createMachine(nextContext, getTransitions());
   };
 }
-function call(fn, context, ...args) {
-  return fn.apply(context, args);
+function call(fn, machine, ...args) {
+  return fn.apply(machine, args);
 }
 function bindTransitions(machine) {
   return new Proxy(machine, {
@@ -1572,7 +1572,7 @@ function bindTransitions(machine) {
       const value = target[prop];
       if (typeof value === "function") {
         return function(...args) {
-          const result = value.apply(target.context, args);
+          const result = value.apply(target, args);
           if (result && typeof result === "object" && "context" in result) {
             return bindTransitions(result);
           }
@@ -1597,7 +1597,7 @@ var BoundMachine = class _BoundMachine {
         const value = this.wrappedMachine[prop];
         if (typeof value === "function") {
           return (...args) => {
-            const result = value.apply(this.wrappedMachine.context, args);
+            const result = value.apply(this.wrappedMachine, args);
             if (result && typeof result === "object" && "context" in result) {
               return new _BoundMachine(result);
             }
@@ -1873,7 +1873,7 @@ var _Actor = class _Actor {
       }
       let result;
       try {
-        result = fn.apply(this._state.context, event.args);
+        result = fn.apply(this._state, event.args);
       } catch (error) {
         console.error(`[Actor] Error in transition '${String(event.type)}':`, error);
         continue;
@@ -1951,28 +1951,43 @@ function fromObservable(observable) {
   return actor;
 }
 
+// src/context-bound.ts
+function createContextBoundMachine(initialContext, transformers) {
+  const savedTransformers = transformers;
+  const boundTransitions = Object.fromEntries(
+    Object.entries(transformers).map(([key, transformer]) => [
+      key,
+      function(...args) {
+        const contextOnly = { context: this.context };
+        const newContext = transformer.apply(contextOnly, args);
+        return createContextBoundMachine(newContext, savedTransformers);
+      }
+    ])
+  );
+  return Object.assign({ context: initialContext }, boundTransitions);
+}
+function callWithContext(machine, transitionName, ...args) {
+  const fn = machine[transitionName];
+  const contextOnly = { context: machine.context };
+  return fn.apply(contextOnly, args);
+}
+function isContextBound(machine) {
+  const firstTransition = Object.values(machine).find(
+    (v) => typeof v === "function"
+  );
+  if (!firstTransition) return false;
+  return firstTransition.__contextBound === true;
+}
+
 // src/index.ts
 function createMachine(context, fnsOrFactory) {
   if (typeof fnsOrFactory === "function") {
     let transitions2;
     const transition = (newContext) => {
-      const machine2 = createMachine(newContext, transitions2);
-      const boundTransitions2 = Object.fromEntries(
-        Object.entries(transitions2).map(([key, fn]) => [
-          key,
-          fn.bind(newContext)
-        ])
-      );
-      return Object.assign(machine2, boundTransitions2);
+      return createMachine(newContext, transitions2);
     };
     transitions2 = fnsOrFactory(transition);
-    const boundTransitions = Object.fromEntries(
-      Object.entries(transitions2).map(([key, fn]) => [
-        key,
-        fn.bind(context)
-      ])
-    );
-    return Object.assign({ context }, boundTransitions);
+    return Object.assign({ context }, transitions2);
   }
   const transitions = "context" in fnsOrFactory ? Object.fromEntries(
     Object.entries(fnsOrFactory).filter(([key]) => key !== "context")
@@ -1984,23 +1999,10 @@ function createAsyncMachine(context, fnsOrFactory) {
   if (typeof fnsOrFactory === "function") {
     let transitions2;
     const transition = (newContext) => {
-      const machine2 = createAsyncMachine(newContext, transitions2);
-      const boundTransitions2 = Object.fromEntries(
-        Object.entries(transitions2).map(([key, fn]) => [
-          key,
-          fn.bind(newContext)
-        ])
-      );
-      return Object.assign(machine2, boundTransitions2);
+      return createAsyncMachine(newContext, transitions2);
     };
     transitions2 = fnsOrFactory(transition);
-    const boundTransitions = Object.fromEntries(
-      Object.entries(transitions2).map(([key, fn]) => [
-        key,
-        fn.bind(context)
-      ])
-    );
-    return Object.assign({ context }, boundTransitions);
+    return Object.assign({ context }, transitions2);
   }
   const transitions = "context" in fnsOrFactory ? Object.fromEntries(
     Object.entries(fnsOrFactory).filter(([key]) => key !== "context")
@@ -2085,7 +2087,7 @@ function runMachine(initial, onChange) {
     const controller = new AbortController();
     activeController = controller;
     try {
-      const nextStatePromise = fn.apply(current.context, [...event.args, { signal: controller.signal }]);
+      const nextStatePromise = fn.apply(current, [...event.args, { signal: controller.signal }]);
       const nextState = await nextStatePromise;
       if (controller.signal.aborted) {
         return current;
@@ -2142,6 +2144,7 @@ export {
   bindTransitions,
   branch,
   call,
+  callWithContext,
   chain,
   classCase,
   combine,
@@ -2151,6 +2154,7 @@ export {
   createActor,
   createAsyncMachine,
   createContext,
+  createContextBoundMachine,
   createCustomMiddleware,
   createEnsemble,
   createEnsembleFactory,
@@ -2188,6 +2192,7 @@ export {
   inDevelopment,
   invoke,
   isConditionalMiddleware,
+  isContextBound,
   isMiddlewareContext,
   isMiddlewareError,
   isMiddlewareFn,