@almadar/runtime 6.60.0 → 6.62.0

package/dist/{OrbitalServerRuntime-Cvw0CUfG.d.ts → OrbitalServerRuntime-CZHHxo_A.d.ts}

@@ -478,8 +478,15 @@ interface LoadedSchema {
  * Result of loading a single orbital from a schema.
  */
 interface LoadedOrbital {
-    /** The loaded orbital */
+    /** The loaded orbital — the named one when requested, else the first. */
     orbital: Orbital;
+    /**
+     * EVERY orbital in the loaded schema. `Alias.traits.X` carries no orbital
+     * segment, so a multi-orbital behavior's traits and pages must all stay
+     * reachable; resolving against `orbital` alone silently loses everything
+     * outside it. Mirrors the compiled path's `AliasEntry.orbitals`.
+     */
+    orbitals?: Orbital[];
     /** Source path/URL (resolved) */
     sourcePath: string;
     /** Original import path */

package/dist/OrbitalServerRuntime.d.ts

@@ -1,4 +1,4 @@
 import 'express';
-export { F as ClientEffectTuple, G as ClientNavigateBackTuple, H as ClientNavigateTuple, J as ClientNotifyTuple, K as ClientRenderUITuple, M as EffectResult, e as InMemoryPersistence, N as LiveBroadcastItem, Q as LoaderConfig, O as OrbitalEventRequest, f as OrbitalEventResponse, T as OrbitalServerRuntime, g as OrbitalServerRuntimeConfig, P as PersistenceAdapter, R as RegisteredOrbital, l as RuntimeOrbital, m as RuntimeOrbitalSchema, n as RuntimeTrait, V as RuntimeTraitTick, p as collectDeclaredConfigDefaults, W as createOrbitalServerRuntime } from './OrbitalServerRuntime-Cvw0CUfG.js';
+export { F as ClientEffectTuple, G as ClientNavigateBackTuple, H as ClientNavigateTuple, J as ClientNotifyTuple, K as ClientRenderUITuple, M as EffectResult, e as InMemoryPersistence, N as LiveBroadcastItem, Q as LoaderConfig, O as OrbitalEventRequest, f as OrbitalEventResponse, T as OrbitalServerRuntime, g as OrbitalServerRuntimeConfig, P as PersistenceAdapter, R as RegisteredOrbital, l as RuntimeOrbital, m as RuntimeOrbitalSchema, n as RuntimeTrait, V as RuntimeTraitTick, p as collectDeclaredConfigDefaults, W as createOrbitalServerRuntime } from './OrbitalServerRuntime-CZHHxo_A.js';
 import './types-BaD_ox7e.js';
 import '@almadar/core';

package/dist/OrbitalServerRuntime.js

@@ -1,5 +1,5 @@
-import { createTickScheduler, EventBus, createUnifiedLoader, MockPersistenceAdapter, InMemoryPersistence, preprocessSchema, normalizeCallSiteConfigToValues, StateMachineManager, parseDurationString, validateEventPayload, formatPayloadValidationError, collectDeclaredConfigDefaults, collectDeclaredEntityDefaults, EffectExecutor } from './chunk-5IFHQDW2.js';
-export { InMemoryPersistence, collectDeclaredConfigDefaults } from './chunk-5IFHQDW2.js';
+import { createTickScheduler, EventBus, createUnifiedLoader, MockPersistenceAdapter, InMemoryPersistence, preprocessSchema, normalizeCallSiteConfigToValues, StateMachineManager, parseDurationString, validateEventPayload, formatPayloadValidationError, collectDeclaredConfigDefaults, collectDeclaredEntityDefaults, EffectExecutor } from './chunk-MEBKFZC4.js';
+export { InMemoryPersistence, collectDeclaredConfigDefaults } from './chunk-MEBKFZC4.js';
 import { isValidCronExpression } from './chunk-OU3ITB5S.js';
 import { createContextFromBindings, resolveCallSitePayloadCaptures, applyRowAccess, checkMutationAccess, accessDeniedMessage } from './chunk-ZJ62H3ES.js';
 import './chunk-T4VDAB4C.js';
@@ -1613,8 +1613,9 @@ var OrbitalServerRuntime = class {
           const readPolicy = this.resolvedSchema ? entityAccessPolicies(this.resolvedSchema, fetchEntityType)?.read : void 0;
           const accessBindings = { user: bindingsRef?.user, payload: bindingsRef?.payload, config: bindingsRef?.config };
           if (options?.id) {
-            const entity = await this.persistence.getById(fetchEntityType, options.id);
-            if (entity && applyRowAccess([entity], readPolicy, void 0, accessBindings).length > 0) {
+            const stored = await this.persistence.getById(fetchEntityType, options.id);
+            if (stored && applyRowAccess([stored], readPolicy, void 0, accessBindings).length > 0) {
+              const entity = { ...stored };
               if (options?.include && options.include.length > 0) {
                 await this.populateRelations([entity], fetchEntityType, options.include);
               }
@@ -1638,6 +1639,7 @@ var OrbitalServerRuntime = class {
               entities = entities.slice(0, options.limit);
             }
             if (options?.include && options.include.length > 0) {
+              entities = entities.map((row) => ({ ...row }));
               await this.populateRelations(entities, fetchEntityType, options.include);
             }
             fetchedData[fetchEntityType] = entities;

package/dist/{chunk-5IFHQDW2.js → chunk-MEBKFZC4.js}

@@ -2635,6 +2635,7 @@ var HttpLoader = class {
       success: true,
       data: {
         orbital,
+        orbitals: schema.orbitals,
         sourcePath: schemaResult.data.sourcePath,
         importPath
       }
@@ -2844,7 +2845,7 @@ async function getExternalLoaderModule() {
     return null;
   }
   try {
-    externalLoaderModule = await import('./external-loader-WYQAS3BS.js');
+    externalLoaderModule = await import('./external-loader-YUUADLAP.js');
     return externalLoaderModule;
   } catch {
     return null;
@@ -3017,6 +3018,7 @@ var UnifiedLoader = class {
         success: true,
         data: {
           orbital: found,
+          orbitals: schema.orbitals,
           sourcePath: schemaResult.data.sourcePath,
           importPath
         }
@@ -3032,6 +3034,7 @@ var UnifiedLoader = class {
       success: true,
       data: {
         orbital: schema.orbitals[0],
+        orbitals: schema.orbitals,
         sourcePath: schemaResult.data.sourcePath,
         importPath
       }
@@ -3400,10 +3403,13 @@ function buildIdIndex(orbital, orbitals) {
   const idIndex = /* @__PURE__ */ new Map();
   indexOrbitalNodes(orbital, idIndex);
   for (const imported of orbitals.values()) {
-    indexOrbitalNodes(imported.orbital, idIndex);
+    for (const o of importedOrbitals(imported)) indexOrbitalNodes(o, idIndex);
   }
   return idIndex;
 }
+function importedOrbitals(imported) {
+  return imported.orbitals?.length ? imported.orbitals : [imported.orbital];
+}
 function renameEventsInRenderUiConfig(node, rename) {
   if (node === null || node === void 0) return node;
   if (Array.isArray(node)) {
@@ -3442,16 +3448,50 @@ function renameEventsInRenderUiConfig(node, rename) {
   return next;
 }
 function renameEventsInEffects(effects, rename) {
-  return effects.map((effect) => {
-    if (!Array.isArray(effect)) return effect;
-    if (effect[0] === "render-ui" && effect.length >= 3) {
-      const slot = effect[1];
-      const config = effect[2];
-      const nextConfig = renameEventsInRenderUiConfig(config, rename);
-      return [effect[0], slot, nextConfig, ...effect.slice(3)];
-    }
-    return effect;
-  });
+  return effects.map((effect) => renameEventRefsInNode(effect, rename));
+}
+var EMIT_OPTION_SLOTS = /* @__PURE__ */ new Set(["success", "failure", "on_message", "on_change"]);
+function renameEventRefsInNode(node, rename) {
+  if (node === null || node === void 0) return node;
+  if (Array.isArray(node)) {
+    if (node[0] === "render-ui" && node.length >= 3) {
+      const nextConfig = renameEventsInRenderUiConfig(node[2], rename);
+      return [
+        node[0],
+        node[1],
+        nextConfig,
+        ...node.slice(3).map((x) => renameEventRefsInNode(x, rename))
+      ];
+    }
+    const out = node.map((x) => renameEventRefsInNode(x, rename));
+    if (node[0] === "emit" && typeof node[1] === "string") {
+      out[1] = rename(node[1]) ?? node[1];
+    }
+    return out;
+  }
+  if (typeof node === "object") {
+    const obj = node;
+    const next = {};
+    for (const [k, v] of Object.entries(obj)) {
+      if (k === "emit") {
+        if (typeof v === "string") {
+          next[k] = rename(v) ?? v;
+        } else if (v !== null && typeof v === "object" && !Array.isArray(v)) {
+          const slots = {};
+          for (const [slot, slotV] of Object.entries(v)) {
+            slots[slot] = EMIT_OPTION_SLOTS.has(slot) && typeof slotV === "string" ? rename(slotV) ?? slotV : renameEventRefsInNode(slotV, rename);
+          }
+          next[k] = slots;
+        } else {
+          next[k] = renameEventRefsInNode(v, rename);
+        }
+        continue;
+      }
+      next[k] = renameEventRefsInNode(v, rename);
+    }
+    return next;
+  }
+  return node;
 }
 var REBIND_ENTITY_PROPS = /* @__PURE__ */ new Set(["entity"]);
 var ID_ENTITY_PROPS = /* @__PURE__ */ new Set(["entity", "entityType", "source"]);
@@ -3745,13 +3785,12 @@ function applyEventRenames(trait, renames) {
   if (!renames || Object.keys(renames).length === 0) return trait;
   const rename = (k) => k !== void 0 && k in renames ? renames[k] : k;
   const sm = trait.stateMachine;
-  if (!sm) return trait;
-  const nextTransitions = (sm.transitions ?? []).map((t) => {
+  const nextTransitions = (sm?.transitions ?? []).map((t) => {
     const nextEvent = rename(t.event) ?? t.event;
     const nextEffects = t.effects ? renameEventsInEffects(t.effects, rename) : t.effects;
     return { ...t, event: nextEvent, effects: nextEffects };
   });
-  const nextEvents = (sm.events ?? []).map((e) => {
+  const nextEvents = (sm?.events ?? []).map((e) => {
     const newKey = rename(e.key);
     if (newKey === e.key) return e;
     return { ...e, key: newKey ?? e.key };
@@ -3761,13 +3800,30 @@ function applyEventRenames(trait, renames) {
     const newEvent = rename(em.event);
     return newEvent === em.event ? em : { ...em, event: newEvent ?? em.event };
   });
+  const nextTicks = (trait.ticks ?? []).map(
+    (tk) => tk.effects ? {
+      ...tk,
+      effects: renameEventsInEffects(
+        tk.effects,
+        rename
+      )
+    } : tk
+  );
+  const nextListens = (trait.listens ?? []).map((l) => {
+    const sourced = l.source !== void 0 && l.source.kind !== "any";
+    const nextEvent = sourced ? l.event : rename(l.event) ?? l.event;
+    const nextTriggers = rename(l.triggers) ?? l.triggers;
+    return nextEvent === l.event && nextTriggers === l.triggers ? l : { ...l, event: nextEvent, triggers: nextTriggers };
+  });
   return {
     ...trait,
-    stateMachine: {
+    stateMachine: sm ? {
       ...sm,
       transitions: nextTransitions,
       events: nextEvents
-    },
+    } : sm,
+    ...trait.ticks ? { ticks: nextTicks } : {},
+    ...trait.listens ? { listens: nextListens } : {},
     emits: nextEmits
   };
 }
@@ -3821,7 +3877,7 @@ var ReferenceResolver = class {
     if (this.loader || this.loaderInitialized) return;
     this.loaderInitialized = true;
     try {
-      const { ExternalOrbitalLoader } = await import('./external-loader-WYQAS3BS.js');
+      const { ExternalOrbitalLoader } = await import('./external-loader-YUUADLAP.js');
       this.loader = new ExternalOrbitalLoader(this.options);
     } catch {
     }
@@ -3929,6 +3985,7 @@ var ReferenceResolver = class {
         alias: use.as,
         from: use.from,
         orbital: loadResult.data.orbital,
+        orbitals: loadResult.data.orbitals ?? [loadResult.data.orbital],
         sourcePath: loadResult.data.sourcePath
       });
     }
@@ -4133,7 +4190,11 @@ var ReferenceResolver = class {
       visited.add(pullKey);
       const imported = imports.orbitals.get(alias);
       if (!imported) continue;
-      const atomEntry = findTraitEntryInOrbital(imported.orbital, sibling);
+      let atomEntry = null;
+      for (const o of importedOrbitals(imported)) {
+        atomEntry = findTraitEntryInOrbital(o, sibling);
+        if (atomEntry) break;
+      }
       if (!atomEntry) continue;
       let atomTrait;
       if ("stateMachine" in atomEntry) {
@@ -4282,12 +4343,17 @@ var ReferenceResolver = class {
           ]
         };
       }
-      const trait = this.findTraitInOrbital(imported.orbital, parsed.traitName, refId, imports.idIndex);
+      let trait = null;
+      for (const o of importedOrbitals(imported)) {
+        trait = this.findTraitInOrbital(o, parsed.traitName, refId, imports.idIndex);
+        if (trait) break;
+      }
       if (!trait) {
+        const available = importedOrbitals(imported).flatMap((o) => this.listTraitsInOrbital(o));
         return {
           success: false,
           errors: [
-            `Trait "${parsed.traitName}" not found in imported orbital "${parsed.alias}". Available traits: ${this.listTraitsInOrbital(imported.orbital).join(", ") || "none"}`
+            `Trait "${parsed.traitName}" not found in imported orbital "${parsed.alias}". Available traits: ${available.join(", ") || "none"}`
           ]
         };
       }
@@ -4456,12 +4522,17 @@ var ReferenceResolver = class {
         ]
       };
     }
-    const page = this.findPageInOrbital(imported.orbital, parsed.pageName, refId, imports.idIndex);
+    let page = null;
+    for (const o of importedOrbitals(imported)) {
+      page = this.findPageInOrbital(o, parsed.pageName, refId, imports.idIndex);
+      if (page) break;
+    }
     if (!page) {
+      const available = importedOrbitals(imported).flatMap((o) => this.listPagesInOrbital(o));
       return {
         success: false,
         errors: [
-          `Page "${parsed.pageName}" not found in imported orbital "${parsed.alias}". Available pages: ${this.listPagesInOrbital(imported.orbital).join(", ") || "none"}`
+          `Page "${parsed.pageName}" not found in imported orbital "${parsed.alias}". Available pages: ${available.join(", ") || "none"}`
         ]
       };
     }

package/dist/{external-loader-WYQAS3BS.js → external-loader-YUUADLAP.js}

@@ -154,6 +154,7 @@ var ExternalOrbitalLoader = class {
       success: true,
       data: {
         orbital,
+        orbitals: schema.orbitals,
         sourcePath: schemaResult.data.sourcePath,
         importPath
       }

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { g as RuntimePatternValue, B as BindingContext, f as EvaluationContextExtensions, P as PatternProps, E as EffectHandlers, h as EffectContext, i as ExecutionEnvironment, j as EffectResult, S as ServiceCallContext, T as TraitDefinition } from './types-BaD_ox7e.js';
 export { k as BrowserFileMeta, l as BrowserFilePickerOptions, m as BrowserGeolocationOptions, n as BrowserGeolocationPosition, C as ConfigContext, o as Effect, a as EventListener, H as HANDLER_MANIFEST, I as IEventBus, b as RuntimeConfig, R as RuntimeEvent, d as TraitState, c as TransitionObserver, e as TransitionResult, U as Unsubscribe } from './types-BaD_ox7e.js';
-import { U as UnifiedLoaderOptions, S as SchemaLoader, I as ImportChainLike, L as LoadResult, a as LoadedSchema, b as LoadedOrbital, P as PersistenceAdapter } from './OrbitalServerRuntime-Cvw0CUfG.js';
-export { E as EntitySharingMap, c as EventBus, d as EventNamespaceMap, e as InMemoryPersistence, O as OrbitalEventRequest, f as OrbitalEventResponse, g as OrbitalServerRuntimeConfig, h as PreprocessOptions, i as PreprocessResult, j as PreprocessedSchema, k as ProcessEventOptions, R as RegisteredOrbital, l as RuntimeOrbital, m as RuntimeOrbitalSchema, n as RuntimeTrait, o as StateMachineManager, p as collectDeclaredConfigDefaults, q as collectDeclaredEntityDefaults, r as createInitialTraitState, s as findInitialState, t as findTransition, u as getIsolatedCollectionName, v as getNamespacedEvent, w as isBrowser, x as isElectron, y as isNamespacedEvent, z as isNode, A as normalizeEventKey, B as parseNamespacedEvent, C as preprocessSchema, D as processEvent } from './OrbitalServerRuntime-Cvw0CUfG.js';
+import { U as UnifiedLoaderOptions, S as SchemaLoader, I as ImportChainLike, L as LoadResult, a as LoadedSchema, b as LoadedOrbital, P as PersistenceAdapter } from './OrbitalServerRuntime-CZHHxo_A.js';
+export { E as EntitySharingMap, c as EventBus, d as EventNamespaceMap, e as InMemoryPersistence, O as OrbitalEventRequest, f as OrbitalEventResponse, g as OrbitalServerRuntimeConfig, h as PreprocessOptions, i as PreprocessResult, j as PreprocessedSchema, k as ProcessEventOptions, R as RegisteredOrbital, l as RuntimeOrbital, m as RuntimeOrbitalSchema, n as RuntimeTrait, o as StateMachineManager, p as collectDeclaredConfigDefaults, q as collectDeclaredEntityDefaults, r as createInitialTraitState, s as findInitialState, t as findTransition, u as getIsolatedCollectionName, v as getNamespacedEvent, w as isBrowser, x as isElectron, y as isNamespacedEvent, z as isNode, A as normalizeEventKey, B as parseNamespacedEvent, C as preprocessSchema, D as processEvent } from './OrbitalServerRuntime-CZHHxo_A.js';
 import { EvaluationContext, SExpressionEvaluator } from '@almadar/evaluator';
 export { EvaluationContext, createMinimalContext } from '@almadar/evaluator';
 import { RenderBindingMarker, SExpr, RuntimeValue, TraitConfigObject, EventPayload, PatternConfig, EntityId, EntityField, EntityRow, EntityPersistence, ServiceParams, EntityAccessPolicies, PayloadField, OrbitalDefinition, OrbitalSchema } from '@almadar/core';

package/dist/index.js

@@ -1,5 +1,5 @@
-import { EffectExecutor } from './chunk-5IFHQDW2.js';
-export { EffectExecutor, EventBus, HANDLER_MANIFEST, InMemoryPersistence, MockPersistenceAdapter, StateMachineManager, TickScheduler, buildEmitsFromTraits, collectDeclaredConfigDefaults, collectDeclaredEntityDefaults, createInitialTraitState, createMockPersistence, createTestExecutor, createTickScheduler, createUnifiedLoader, findInitialState, findTransition, formatPayloadValidationError, getIsolatedCollectionName, getNamespacedEvent, isBrowser, isElectron, isNamespacedEvent, isNode, isValidDurationString, normalizeCallSiteConfigToValues, normalizeEventKey, parseDurationString, parseNamespacedEvent, preprocessSchema, processEvent, validateEventPayload, validatePayloadShapes } from './chunk-5IFHQDW2.js';
+import { EffectExecutor } from './chunk-MEBKFZC4.js';
+export { EffectExecutor, EventBus, HANDLER_MANIFEST, InMemoryPersistence, MockPersistenceAdapter, StateMachineManager, TickScheduler, buildEmitsFromTraits, collectDeclaredConfigDefaults, collectDeclaredEntityDefaults, createInitialTraitState, createMockPersistence, createTestExecutor, createTickScheduler, createUnifiedLoader, findInitialState, findTransition, formatPayloadValidationError, getIsolatedCollectionName, getNamespacedEvent, isBrowser, isElectron, isNamespacedEvent, isNode, isValidDurationString, normalizeCallSiteConfigToValues, normalizeEventKey, parseDurationString, parseNamespacedEvent, preprocessSchema, processEvent, validateEventPayload, validatePayloadShapes } from './chunk-MEBKFZC4.js';
 export { cronMatches, cronMinuteKey, isValidCronExpression, parseCron, parseCronField } from './chunk-OU3ITB5S.js';
 import { createContextFromBindings, applyRowAccess, checkMutationAccess, accessDeniedMessage } from './chunk-ZJ62H3ES.js';
 export { CALLSITE_PAYLOAD_PREFIX, applyRowAccess, checkMutationAccess, containsBindings, createContextFromBindings, createMinimalContext, deferEntityBindings, extractBindings, interpolateProps, interpolateValue, resolveCallSitePayloadCaptures } from './chunk-ZJ62H3ES.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/runtime",
-  "version": "6.60.0",
+  "version": "6.62.0",
   "description": "Interpreted runtime for Almadar orbital applications (OrbitalServerRuntime)",
   "type": "module",
   "main": "./dist/index.js",
@@ -57,11 +57,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@almadar/core": "^10.69.0",
+    "@almadar/core": "^10.71.0",
     "@almadar/evaluator": "^2.42.0",
     "@almadar/logger": "^1.11.0",
     "@almadar/server": "^2.38.0",
-    "@almadar/std": "^16.185.0"
+    "@almadar/std": "^16.190.0"
   },
   "peerDependencies": {
     "express": "^5.0.0"
@@ -72,7 +72,7 @@
     }
   },
   "devDependencies": {
-    "@almadar/eslint-plugin": "^2.15.0",
+    "@almadar/eslint-plugin": "^2.16.0",
     "@types/express": "^5.0.0",
     "@types/node": "^20.0.0",
     "@typescript-eslint/parser": "8.65.0",