@almadar/runtime 3.1.2 → 3.1.4

package/dist/{OrbitalServerRuntime-DrZB9ksb.d.ts → OrbitalServerRuntime-DWJYcIJG.d.ts}

@@ -96,6 +96,11 @@ declare function findInitialState(trait: TraitDefinition): string;
 declare function createInitialTraitState(trait: TraitDefinition): TraitState;
 /**
  * Find a matching transition from the current state for the given event.
+ *
+ * **Guard-unaware**: returns the first transition matching `from` /
+ * `event` regardless of any attached guard. Use `findMatchingTransitions`
+ * when multiple sibling transitions share the same `from`/`event` and
+ * disambiguate by guard.
  */
 declare function findTransition(trait: TraitDefinition, currentState: string, eventKey: string): TraitDefinition['transitions'][0] | undefined;
 /**

package/dist/OrbitalServerRuntime.d.ts

@@ -1,4 +1,4 @@
 import 'express';
-export { v as EffectResult, L as LoaderConfig, w as LocalPersistenceAdapter, O as OrbitalEventRequest, c as OrbitalEventResponse, x as OrbitalServerRuntime, d as OrbitalServerRuntimeConfig, P as PersistenceAdapter, R as RegisteredOrbital, i as RuntimeOrbital, j as RuntimeOrbitalSchema, k as RuntimeTrait, y as RuntimeTraitTick, z as createOrbitalServerRuntime } from './OrbitalServerRuntime-DrZB9ksb.js';
+export { v as EffectResult, L as LoaderConfig, w as LocalPersistenceAdapter, O as OrbitalEventRequest, c as OrbitalEventResponse, x as OrbitalServerRuntime, d as OrbitalServerRuntimeConfig, P as PersistenceAdapter, R as RegisteredOrbital, i as RuntimeOrbital, j as RuntimeOrbitalSchema, k as RuntimeTrait, y as RuntimeTraitTick, z as createOrbitalServerRuntime } from './OrbitalServerRuntime-DWJYcIJG.js';
 import './types-CM6txTNy.js';
 import '@almadar/core';

package/dist/OrbitalServerRuntime.js

@@ -1,4 +1,4 @@
-import { EventBus, createUnifiedLoader, preprocessSchema, StateMachineManager, createContextFromBindings, EffectExecutor } from './chunk-KCXJNXQZ.js';
+import { EventBus, createUnifiedLoader, preprocessSchema, StateMachineManager, createContextFromBindings, EffectExecutor } from './chunk-6PAKTVTR.js';
 import './chunk-PZ5AY32C.js';
 import { Router } from 'express';
 import * as fs from 'fs';

package/dist/{chunk-KCXJNXQZ.js → chunk-6PAKTVTR.js}

@@ -304,17 +304,20 @@ function createInitialTraitState(trait) {
     context: {}
   };
 }
-function findTransition(trait, currentState, eventKey) {
+function findMatchingTransitions(trait, currentState, eventKey) {
   if (!trait.transitions || trait.transitions.length === 0) {
-    return void 0;
+    return [];
   }
-  return trait.transitions.find((t) => {
+  return trait.transitions.filter((t) => {
     if (Array.isArray(t.from)) {
       return t.from.includes(currentState) && t.event === eventKey;
     }
     return t.from === currentState && t.event === eventKey;
   });
 }
+function findTransition(trait, currentState, eventKey) {
+  return findMatchingTransitions(trait, currentState, eventKey)[0];
+}
 function normalizeEventKey(eventKey) {
   if (!eventKey) return "";
   return eventKey.startsWith("UI:") ? eventKey.slice(3) : eventKey;
@@ -331,8 +334,8 @@ function processEvent(options) {
     contextExtensions
   } = options;
   const normalizedEvent = normalizeEventKey(eventKey);
-  const transition = findTransition(trait, traitState.currentState, normalizedEvent);
-  if (!transition) {
+  const candidates = findMatchingTransitions(trait, traitState.currentState, normalizedEvent);
+  if (candidates.length === 0) {
     smLog.debug("noTransition", { trait: trait.name, event: normalizedEvent, currentState: traitState.currentState });
     return {
       executed: false,
@@ -341,8 +344,22 @@ function processEvent(options) {
       effects: []
     };
   }
-  smLog.debug("processEvent", { trait: trait.name, event: normalizedEvent, currentState: traitState.currentState, to: transition.to });
-  if (transition.guard) {
+  let lastFailedGuardTransition;
+  for (const transition of candidates) {
+    smLog.debug("processEvent", { trait: trait.name, event: normalizedEvent, currentState: traitState.currentState, to: transition.to });
+    if (!transition.guard) {
+      return {
+        executed: true,
+        newState: transition.to,
+        previousState: traitState.currentState,
+        effects: transition.effects || [],
+        transition: {
+          from: traitState.currentState,
+          to: transition.to,
+          event: normalizedEvent
+        }
+      };
+    }
     const ctx = createContextFromBindings({
       entity: entityData,
       payload,
@@ -354,20 +371,21 @@ function processEvent(options) {
         ctx
       );
       smLog.debug("guard:evaluate", { trait: trait.name, event: normalizedEvent, guardResult: guardPasses });
-      if (!guardPasses) {
+      if (guardPasses) {
         return {
-          executed: false,
-          newState: traitState.currentState,
+          executed: true,
+          newState: transition.to,
           previousState: traitState.currentState,
-          effects: [],
+          effects: transition.effects || [],
           transition: {
             from: traitState.currentState,
             to: transition.to,
             event: normalizedEvent
           },
-          guardResult: false
+          guardResult: true
         };
       }
+      lastFailedGuardTransition = transition;
     } catch (error) {
       if (guardMode === "strict") {
         console.error(
@@ -388,19 +406,31 @@ function processEvent(options) {
         };
       }
       console.error("[StateMachineCore] Guard evaluation error:", error);
+      return {
+        executed: true,
+        newState: transition.to,
+        previousState: traitState.currentState,
+        effects: transition.effects || [],
+        transition: {
+          from: traitState.currentState,
+          to: transition.to,
+          event: normalizedEvent
+        },
+        guardResult: true
+      };
     }
   }
   return {
-    executed: true,
-    newState: transition.to,
+    executed: false,
+    newState: traitState.currentState,
     previousState: traitState.currentState,
-    effects: transition.effects || [],
-    transition: {
+    effects: [],
+    transition: lastFailedGuardTransition ? {
       from: traitState.currentState,
-      to: transition.to,
+      to: lastFailedGuardTransition.to,
       event: normalizedEvent
-    },
-    guardResult: transition.guard ? true : void 0
+    } : void 0,
+    guardResult: false
   };
 }
 var SINGLETON_SCOPE = "__singleton__";
@@ -856,7 +886,16 @@ var EffectExecutor = class {
     }
     const { operator, args } = parsed;
     const isCompound = operator === "do" || operator === "when";
-    const resolvedArgs = isCompound ? args : resolveArgs(args, this.bindings, this.strictBindings, this.contextExtensions);
+    const isSet3Elem = operator === "set" && args.length === 2 && typeof args[0] === "string" && args[0].startsWith("@entity.");
+    let resolvedArgs;
+    if (isCompound) {
+      resolvedArgs = args;
+    } else if (isSet3Elem) {
+      const ctx = createContextFromBindings(this.bindings, this.strictBindings, this.contextExtensions);
+      resolvedArgs = [args[0], interpolateValue(args[1], ctx)];
+    } else {
+      resolvedArgs = resolveArgs(args, this.bindings, this.strictBindings, this.contextExtensions);
+    }
     effectLog.debug("execute", { operator, argCount: resolvedArgs.length, context: this.context.traitName });
     if (this.debug) {
       console.log("[EffectExecutor] Executing:", operator, resolvedArgs);
@@ -945,9 +984,25 @@ var EffectExecutor = class {
         break;
       }
       case "set": {
-        const [entityId, field, value] = args;
-        this.handlers.set(entityId, field, value);
         const entity = this.bindings.entity;
+        let entityId;
+        let field;
+        let value;
+        if (args.length === 2 && typeof args[0] === "string" && args[0].startsWith("@entity.")) {
+          const path = args[0];
+          field = path.slice("@entity.".length);
+          value = args[1];
+          entityId = typeof entity?.["id"] === "string" ? entity["id"] : void 0;
+          if (!entityId) {
+            effectLog.warn("set:missing-entity-id", { path });
+            break;
+          }
+        } else {
+          entityId = args[0];
+          field = args[1];
+          value = args[2];
+        }
+        this.handlers.set(entityId, field, value);
         if (entity && entity["id"] === entityId) {
           entity[field] = value;
         }
@@ -2504,5 +2559,5 @@ function parseNamespacedEvent(eventName) {
 }
 
 export { EffectExecutor, EventBus, HANDLER_MANIFEST, StateMachineManager, containsBindings, createContextFromBindings, createInitialTraitState, createTestExecutor, createUnifiedLoader, extractBindings, findInitialState, findTransition, getIsolatedCollectionName, getNamespacedEvent, interpolateProps, interpolateValue, isNamespacedEvent, normalizeEventKey, parseNamespacedEvent, preprocessSchema, processEvent };
-//# sourceMappingURL=chunk-KCXJNXQZ.js.map
-//# sourceMappingURL=chunk-KCXJNXQZ.js.map
+//# sourceMappingURL=chunk-6PAKTVTR.js.map
+//# sourceMappingURL=chunk-6PAKTVTR.js.map