@almadar/runtime 2.2.1 → 2.2.2

package/dist/OrbitalServerRuntime.js

@@ -1,4 +1,4 @@
-import { EventBus, createUnifiedLoader, preprocessSchema, StateMachineManager, createContextFromBindings, EffectExecutor } from './chunk-54P2HYHQ.js';
+import { EventBus, createUnifiedLoader, preprocessSchema, StateMachineManager, createContextFromBindings, EffectExecutor } from './chunk-57PUFAKH.js';
 import { Router } from 'express';
 import { evaluateGuard } from '@almadar/evaluator';
 import { faker } from '@faker-js/faker';
@@ -1113,6 +1113,7 @@ var OrbitalServerRuntime = class {
    */
   async executeEffects(registered, traitName, effects, payload, entityData, entityId, emittedEvents, fetchedData, clientEffects, effectResults, user) {
     const entityType = registered.schema.entity.name;
+    let bindingsRef = null;
     const handlers = {
       emit: (event, eventPayload) => {
         if (this.config.debug) {
@@ -1319,6 +1320,16 @@ var OrbitalServerRuntime = class {
             fetchedData[fetchEntityType] = entities;
             result = entities;
           }
+          if (bindingsRef && result) {
+            const records = Array.isArray(result) ? result : [result];
+            if (records.length > 0) {
+              const merged = Object.assign([...records], records[0]);
+              bindingsRef[fetchEntityType] = merged;
+              if (fetchEntityType === entityType) {
+                bindingsRef.entity = merged;
+              }
+            }
+          }
           return result;
         } catch (error) {
           console.error(`[OrbitalRuntime] Fetch error for ${fetchEntityType}:`, error);
@@ -1353,6 +1364,10 @@ var OrbitalServerRuntime = class {
       user
       // @user bindings from Firebase auth
     };
+    if (entityType) {
+      bindings[entityType] = entityData;
+    }
+    bindingsRef = bindings;
     const context = {
       traitName,
       state: state?.currentState || "unknown",