@almadar/runtime 3.3.0 → 4.0.1

package/dist/{OrbitalServerRuntime-DMRvEfcT.d.ts → OrbitalServerRuntime-DMe0zqCc.d.ts}

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import { I as IEventBus, g as RuntimeEvent, f as EventListener, U as Unsubscribe, T as TraitDefinition, R as RuntimeConfig, i as TransitionObserver, h as TraitState, j as TransitionResult, E as EvaluationContextExtensions, a as EffectHandlers } from './types-B8OfRFfV.js';
+import { I as IEventBus, g as RuntimeEvent, f as EventListener, U as Unsubscribe, T as TraitDefinition, R as RuntimeConfig, i as TransitionObserver, h as TraitState, j as TransitionResult, E as EvaluationContextExtensions, a as EffectHandlers } from './types-CVSBlnzV.js';
 import { EventPayload, EntityRow, OrbitalSchema, Orbital, Trait, OrbitalDefinition, Entity, TraitTick } from '@almadar/core';
 
 /**
@@ -748,14 +748,16 @@ interface OrbitalEventResponse {
     success: boolean;
     transitioned: boolean;
     states: Record<string, string>;
+    /**
+     * Events emitted during processing, in declaration order. Payloads are
+     * typed against `@almadar/core`'s `EventPayload` — the recursive record of
+     * primitive + nested EventPayload values the state machine already uses
+     * internally. Kept as the single source of truth for emit-payload shape.
+     */
     emittedEvents: Array<{
         event: string;
-        payload?: unknown;
+        payload?: EventPayload;
     }>;
-    /** Entity data fetched by `fetch` effects - keyed by entity type */
-    data?: {
-        [entityType: string]: EntityRow | EntityRow[];
-    };
     /** Client-side effects to execute (render-ui, navigate, notify) */
     clientEffects?: Array<unknown>;
     /**

package/dist/OrbitalServerRuntime.d.ts

@@ -1,4 +1,4 @@
 import 'express';
-export { B as EffectResult, C as LoaderConfig, D as LocalPersistenceAdapter, O as OrbitalEventRequest, e as OrbitalEventResponse, F as OrbitalServerRuntime, f as OrbitalServerRuntimeConfig, P as PersistenceAdapter, R as RegisteredOrbital, k as RuntimeOrbital, l as RuntimeOrbitalSchema, m as RuntimeTrait, G as RuntimeTraitTick, H as createOrbitalServerRuntime } from './OrbitalServerRuntime-DMRvEfcT.js';
-import './types-B8OfRFfV.js';
+export { B as EffectResult, C as LoaderConfig, D as LocalPersistenceAdapter, O as OrbitalEventRequest, e as OrbitalEventResponse, F as OrbitalServerRuntime, f as OrbitalServerRuntimeConfig, P as PersistenceAdapter, R as RegisteredOrbital, k as RuntimeOrbital, l as RuntimeOrbitalSchema, m as RuntimeTrait, G as RuntimeTraitTick, H as createOrbitalServerRuntime } from './OrbitalServerRuntime-DMe0zqCc.js';
+import './types-CVSBlnzV.js';
 import '@almadar/core';

package/dist/OrbitalServerRuntime.js

@@ -1,4 +1,4 @@
-import { EventBus, createUnifiedLoader, preprocessSchema, StateMachineManager, createContextFromBindings, EffectExecutor } from './chunk-II3JSETH.js';
+import { EventBus, createUnifiedLoader, preprocessSchema, StateMachineManager, createContextFromBindings, EffectExecutor } from './chunk-7WP4AE6X.js';
 import './chunk-PZ5AY32C.js';
 import { Router } from 'express';
 import * as fs from 'fs';
@@ -953,10 +953,12 @@ var OrbitalServerRuntime = class {
       for (const trait of registered.traits) {
         if (!trait.listens) continue;
         for (const listener of trait.listens) {
-          const cleanup = this.eventBus.on(listener.event, async (event) => {
+          const { bareEvent, matcher } = parseListenSource(listener, orbitalName);
+          const cleanup = this.eventBus.on(bareEvent, async (event) => {
+            if (!matcher(event.source)) return;
             if (this.config.debug) {
               console.log(
-                `[OrbitalRuntime] ${orbitalName}.${trait.name} received: ${listener.event}`
+                `[OrbitalRuntime] ${orbitalName}.${trait.name} received: ${listener.event} (from ${event.source?.orbital ?? "?"}.${event.source?.trait ?? "?"})`
               );
             }
             let mappedPayload = event.payload;
@@ -1223,32 +1225,6 @@ var OrbitalServerRuntime = class {
         );
       }
     }
-    const persistedTypes = /* @__PURE__ */ new Set();
-    for (const er of effectResults) {
-      if ((er.effect === "persist" || er.effect === "set" || er.effect === "swap") && er.success && er.entityType) {
-        persistedTypes.add(er.entityType);
-      }
-    }
-    const refTypes = /* @__PURE__ */ new Set();
-    for (const trait of registered.traits) {
-      const transitions = trait.stateMachine?.transitions ?? [];
-      for (const trans of transitions) {
-        for (const eff of trans.effects ?? []) {
-          if (Array.isArray(eff) && eff[0] === "ref" && typeof eff[1] === "string") {
-            refTypes.add(eff[1]);
-          }
-        }
-      }
-    }
-    for (const mutatedEntityType of persistedTypes) {
-      if (refTypes.has(mutatedEntityType)) {
-        try {
-          const fresh = await this.persistence.list(mutatedEntityType);
-          fetchedData[mutatedEntityType] = fresh;
-        } catch {
-        }
-      }
-    }
     const states = {};
     for (const [name, state] of registered.manager.getAllStates()) {
       states[name] = state.currentState;
@@ -1259,9 +1235,6 @@ var OrbitalServerRuntime = class {
       states,
       emittedEvents
     };
-    if (Object.keys(fetchedData).length > 0) {
-      response.data = fetchedData;
-    }
     if (clientEffects.length > 0) {
       response.clientEffects = clientEffects;
     }
@@ -1285,11 +1258,15 @@ var OrbitalServerRuntime = class {
     let bindingsRef = null;
     let contextRef = null;
     const handlers = {
-      emit: (event, eventPayload) => {
+      emit: (event, eventPayload, source) => {
         if (this.config.debug) {
-          console.log(`[OrbitalRuntime] Emitting: ${event}`, eventPayload);
+          console.log(`[OrbitalRuntime] Emitting: ${event}`, eventPayload, source);
         }
-        this.eventBus.emit(event, eventPayload);
+        const stamp = source ?? {
+          orbital: registered.schema.name,
+          trait: traitName
+        };
+        this.eventBus.emit(event, eventPayload, stamp);
         emittedEvents.push({ event, payload: eventPayload });
       },
       set: async (targetId, field, value) => {
@@ -1623,7 +1600,7 @@ var OrbitalServerRuntime = class {
         const atomicExecutor = new EffectExecutor({
           handlers,
           bindings: bindingsRef ?? {},
-          context: contextRef ?? { traitName, state: "unknown", transition: "unknown" },
+          context: contextRef ?? { traitName, orbitalName: registered.schema.name, state: "unknown", transition: "unknown" },
           debug: this.config.debug,
           contextExtensions: this.config.contextExtensions
         });
@@ -1684,6 +1661,7 @@ var OrbitalServerRuntime = class {
     bindingsRef = bindings;
     const context = {
       traitName,
+      orbitalName: registered.schema.name,
       state: state?.currentState || "unknown",
       transition: "unknown",
       entityId
@@ -2029,6 +2007,53 @@ var OrbitalServerRuntime = class {
 function createOrbitalServerRuntime(config) {
   return new OrbitalServerRuntime(config);
 }
+function parseListenSource(listener, listenerOrbital) {
+  const explicit = listener.source;
+  if (explicit && typeof explicit === "object") {
+    return {
+      bareEvent: listener.event,
+      matcher: buildMatcher(explicit, listenerOrbital)
+    };
+  }
+  const key = listener.event;
+  const parts = key.split(".");
+  if (parts.length === 1) {
+    return { bareEvent: key, matcher: () => true };
+  }
+  if (parts.length === 2) {
+    const [sourceOrStar, eventName] = parts;
+    if (sourceOrStar === "*") {
+      return { bareEvent: eventName, matcher: () => true };
+    }
+    return {
+      bareEvent: eventName,
+      matcher: buildMatcher(
+        { kind: "trait", trait: sourceOrStar },
+        listenerOrbital
+      )
+    };
+  }
+  if (parts.length >= 3) {
+    const eventName = parts[parts.length - 1];
+    const trait = parts[parts.length - 2];
+    const orbital = parts.slice(0, parts.length - 2).join(".");
+    return {
+      bareEvent: eventName,
+      matcher: buildMatcher({ kind: "orbital", orbital, trait }, listenerOrbital)
+    };
+  }
+  return { bareEvent: key, matcher: () => true };
+}
+function buildMatcher(src, listenerOrbital) {
+  if (src.kind === "any") return () => true;
+  if (src.kind === "trait") {
+    const wantedTrait2 = src.trait;
+    return (source) => !!source && source.orbital === listenerOrbital && source.trait === wantedTrait2;
+  }
+  const wantedOrbital = src.orbital;
+  const wantedTrait = src.trait;
+  return (source) => !!source && source.orbital === wantedOrbital && source.trait === wantedTrait;
+}
 
 export { LocalPersistenceAdapter, OrbitalServerRuntime, createOrbitalServerRuntime };
 //# sourceMappingURL=OrbitalServerRuntime.js.map