@almadar/runtime 6.16.1 → 6.18.0

package/dist/{OrbitalServerRuntime-CcJfn8Hy.d.ts → OrbitalServerRuntime-CJWejtSD.d.ts}

@@ -1,6 +1,6 @@
 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, C as ConfigContext, h as TraitState, j as TransitionResult, E as EvaluationContextExtensions, a as EffectHandlers } from './types-BA7GoDni.js';
-import { EventPayload, EntityRow, DeclaredTraitConfig, TraitConfig, OrbitalSchema, Orbital, Trait, PatternConfig, ResolvedPatternProps, SExpr, BusEventSource, OrbitalDefinition, Entity, TraitTick } from '@almadar/core';
+import { EventPayload, EntityRow, DeclaredTraitConfig, TraitConfig, Entity, OrbitalSchema, Orbital, Trait, PatternConfig, ResolvedPatternProps, SExpr, BusEventSource, OrbitalDefinition, TraitTick } from '@almadar/core';
 import { P as PersistenceAdapter } from './PersistenceAdapter-B6dQCbbU.js';
 
 /**
@@ -325,6 +325,16 @@ declare class StateMachineManager {
 declare function collectDeclaredConfigDefaults(trait: {
     config?: DeclaredTraitConfig;
 } | undefined): TraitConfig | undefined;
+/**
+ * Walk an entity's `fields` array and return a flat `{ fieldName: default, … }`
+ * map. Seeds the `@entity` binding context with declared field defaults before
+ * any explicit `(set @entity.X Y)` effect or fetched persistence data is merged
+ * on top. Mirrors `collectDeclaredConfigDefaults` for the entity axis.
+ *
+ * Precedence (outermost wins): `traitFieldState` (set effects) > `entityData`
+ * (persistence row) > returned defaults (declared schema defaults).
+ */
+declare function collectDeclaredEntityDefaults(entity: Entity | undefined): EntityRow | undefined;
 
 /**
  * External Orbital Loader
@@ -782,9 +792,9 @@ interface RegisteredOrbital {
     entityData: Map<string, EntityRow>;
     /**
      * Per-trait scalar state set by `(set @entity.X Y)`. Mirrors compiled's
-     * `state.fields`. The trait's `@entity` binding resolves from this map
-     * during effect interpolation. Initial empty; mutated only by the `set`
-     * effect handler. No implicit seeding from persistence.
+     * `state.fields`. The trait's `@entity` binding is a three-layer merge:
+     * declared entity field defaults < persistence entityData < this map.
+     * Mutated only by the `set` effect handler.
      */
     traitFieldStates: Map<string, EntityRow>;
 }
@@ -1191,4 +1201,4 @@ declare class OrbitalServerRuntime {
  */
 declare function createOrbitalServerRuntime(config?: OrbitalServerRuntimeConfig): OrbitalServerRuntime;
 
-export { processEvent as A, type ClientNavigateTuple as B, type ClientEffectTuple as C, type ClientNotifyTuple as D, type EntitySharingMap as E, type ClientRenderUITuple as F, type EffectResult as G, type LoaderConfig as H, type ImportChainLike as I, OrbitalServerRuntime as J, type RuntimeTraitTick as K, type LoadResult as L, createOrbitalServerRuntime as M, type OrbitalEventRequest as O, type PreprocessOptions as P, type RegisteredOrbital as R, type SchemaLoader as S, type UnifiedLoaderOptions as U, type LoadedSchema as a, type LoadedOrbital as b, EventBus as c, type EventNamespaceMap as d, type OrbitalEventResponse as e, type OrbitalServerRuntimeConfig as f, type PreprocessResult as g, type PreprocessedSchema as h, type ProcessEventOptions as i, type RuntimeOrbital as j, type RuntimeOrbitalSchema as k, type RuntimeTrait as l, StateMachineManager as m, collectDeclaredConfigDefaults as n, createInitialTraitState as o, findInitialState as p, findTransition as q, getIsolatedCollectionName as r, getNamespacedEvent as s, isBrowser as t, isElectron as u, isNamespacedEvent as v, isNode as w, normalizeEventKey as x, parseNamespacedEvent as y, preprocessSchema as z };
+export { preprocessSchema as A, processEvent as B, type ClientEffectTuple as C, type ClientNavigateTuple as D, type EntitySharingMap as E, type ClientNotifyTuple as F, type ClientRenderUITuple as G, type EffectResult as H, type ImportChainLike as I, type LoaderConfig as J, OrbitalServerRuntime as K, type LoadResult as L, type RuntimeTraitTick as M, createOrbitalServerRuntime as N, type OrbitalEventRequest as O, type PreprocessOptions as P, type RegisteredOrbital as R, type SchemaLoader as S, type UnifiedLoaderOptions as U, type LoadedSchema as a, type LoadedOrbital as b, EventBus as c, type EventNamespaceMap as d, type OrbitalEventResponse as e, type OrbitalServerRuntimeConfig as f, type PreprocessResult as g, type PreprocessedSchema as h, type ProcessEventOptions as i, type RuntimeOrbital as j, type RuntimeOrbitalSchema as k, type RuntimeTrait as l, StateMachineManager as m, collectDeclaredConfigDefaults as n, collectDeclaredEntityDefaults as o, createInitialTraitState as p, findInitialState as q, findTransition as r, getIsolatedCollectionName as s, getNamespacedEvent as t, isBrowser as u, isElectron as v, isNamespacedEvent as w, isNode as x, normalizeEventKey as y, parseNamespacedEvent as z };

package/dist/OrbitalServerRuntime.d.ts

@@ -1,5 +1,5 @@
 import 'express';
-export { C as ClientEffectTuple, B as ClientNavigateTuple, D as ClientNotifyTuple, F as ClientRenderUITuple, G as EffectResult, H as LoaderConfig, O as OrbitalEventRequest, e as OrbitalEventResponse, J as OrbitalServerRuntime, f as OrbitalServerRuntimeConfig, R as RegisteredOrbital, j as RuntimeOrbital, k as RuntimeOrbitalSchema, l as RuntimeTrait, K as RuntimeTraitTick, n as collectDeclaredConfigDefaults, M as createOrbitalServerRuntime } from './OrbitalServerRuntime-CcJfn8Hy.js';
+export { C as ClientEffectTuple, D as ClientNavigateTuple, F as ClientNotifyTuple, G as ClientRenderUITuple, H as EffectResult, J as LoaderConfig, O as OrbitalEventRequest, e as OrbitalEventResponse, K as OrbitalServerRuntime, f as OrbitalServerRuntimeConfig, R as RegisteredOrbital, j as RuntimeOrbital, k as RuntimeOrbitalSchema, l as RuntimeTrait, M as RuntimeTraitTick, n as collectDeclaredConfigDefaults, N as createOrbitalServerRuntime } from './OrbitalServerRuntime-CJWejtSD.js';
 import './types-BA7GoDni.js';
 import '@almadar/core';
 export { I as InMemoryPersistence, P as PersistenceAdapter } from './PersistenceAdapter-B6dQCbbU.js';

package/dist/OrbitalServerRuntime.js

@@ -1,5 +1,5 @@
-import { EventBus, createUnifiedLoader, MockPersistenceAdapter, InMemoryPersistence, preprocessSchema, StateMachineManager, createContextFromBindings, validateEventPayload, formatPayloadValidationError, collectDeclaredConfigDefaults, EffectExecutor } from './chunk-GNVHMOHZ.js';
-export { InMemoryPersistence, collectDeclaredConfigDefaults } from './chunk-GNVHMOHZ.js';
+import { EventBus, createUnifiedLoader, MockPersistenceAdapter, InMemoryPersistence, preprocessSchema, StateMachineManager, createContextFromBindings, validateEventPayload, formatPayloadValidationError, collectDeclaredConfigDefaults, collectDeclaredEntityDefaults, EffectExecutor } from './chunk-G2VW5WJZ.js';
+export { InMemoryPersistence, collectDeclaredConfigDefaults } from './chunk-G2VW5WJZ.js';
 import './chunk-PZ5AY32C.js';
 import { createLogger } from '@almadar/logger';
 import * as nodeModule from 'module';
@@ -1431,9 +1431,14 @@ var OrbitalServerRuntime = class {
     if (declaredDefaults || callSiteOverride) {
       bindings.config = { ...declaredDefaults ?? {}, ...callSiteOverride ?? {} };
     }
+    const entityFieldDefaults = collectDeclaredEntityDefaults(registered.entity);
     const traitFieldState = registered.traitFieldStates.get(traitName);
-    if (traitFieldState) {
-      bindings.entity = traitFieldState;
+    if (entityFieldDefaults || traitFieldState) {
+      bindings.entity = {
+        ...entityFieldDefaults ?? {},
+        ...bindings.entity ?? {},
+        ...traitFieldState ?? {}
+      };
     }
     if (entityType) {
       bindings[entityType] = bindings.entity ?? entityData;