@almadar/runtime 5.9.2 → 5.10.0

package/dist/{OrbitalServerRuntime-Bv8y7nIu.d.ts → OrbitalServerRuntime-VQBv8J8m.d.ts}

@@ -713,6 +713,17 @@ interface RegisteredOrbital {
     configByTrait: Map<string, TraitConfig>;
     manager: StateMachineManager;
     entityData: Map<string, EntityRow>;
+    /**
+     * Last-fetched collection per entityType. Mirrors the compiled path's
+     * per-trait reducer `state.data[<EntityName>]`: the trait's `@entity`
+     * binding resolves from this cache so a filter narrows the rendered
+     * list across events. Without this, executeEffects re-reads the full
+     * persistence list on every event and clobbers the prior fetch's
+     * filtered subset. Populated by the fetch handler on success; seeded
+     * lazily from `persistence.list()` when a collection-scope binding is
+     * first read with no cache entry.
+     */
+    dataCache: Map<string, EntityRow | EntityRow[]>;
 }
 /**
  * Event sent from client to server

package/dist/OrbitalServerRuntime.d.ts

@@ -1,5 +1,5 @@
 import '@almadar/core';
 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-Bv8y7nIu.js';
+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-VQBv8J8m.js';
 import './types-ByLpy6yj.js';
 export { I as InMemoryPersistence, P as PersistenceAdapter } from './PersistenceAdapter-B6dQCbbU.js';

package/dist/OrbitalServerRuntime.js

@@ -1,4 +1,4 @@
-export { InMemoryPersistence, OrbitalServerRuntime, collectDeclaredConfigDefaults, createOrbitalServerRuntime } from './chunk-LZYY2JJR.js';
+export { InMemoryPersistence, OrbitalServerRuntime, collectDeclaredConfigDefaults, createOrbitalServerRuntime } from './chunk-6W6XCOLH.js';
 import './chunk-PZ5AY32C.js';
 //# sourceMappingURL=OrbitalServerRuntime.js.map
 //# sourceMappingURL=OrbitalServerRuntime.js.map

package/dist/{chunk-LZYY2JJR.js → chunk-6W6XCOLH.js}

@@ -288,7 +288,15 @@ function interpolateArray(value, ctx) {
     return value;
   }
   if (isSExpression(value)) {
-    return evaluate(value, ctx);
+    const result = evaluate(value, ctx);
+    bindLog.info("sexpr:eval", {
+      operator: typeof value[0] === "string" ? value[0] : "<non-string>",
+      argCount: value.length - 1,
+      inputJson: JSON.stringify(value).slice(0, 300),
+      resultType: typeof result,
+      resultJson: typeof result === "object" && result !== null ? JSON.stringify(result).slice(0, 200) : String(result)
+    });
+    return result;
   }
   const mapped = [];
   let anyChanged = false;
@@ -988,12 +996,29 @@ var EffectExecutor = class {
     const { operator, args } = parsed;
     const isCompound = operator === "do" || operator === "when";
     const isSetPathForm = operator === "set" && args.length >= 2 && typeof args[0] === "string" && args[0].startsWith("@entity.");
+    const isFetchLike = (operator === "fetch" || operator === "ref" || operator === "deref" || operator === "os/watch-collection" || operator === "os/watch") && args.length >= 2 && args[1] !== null && typeof args[1] === "object" && !Array.isArray(args[1]);
     let resolvedArgs;
     if (isCompound) {
       resolvedArgs = args;
     } else if (isSetPathForm) {
       const ctx = createContextFromBindings(this.bindings, this.strictBindings, this.contextExtensions);
       resolvedArgs = [args[0], ...args.slice(1).map((a) => interpolateValue(a, ctx))];
+    } else if (isFetchLike) {
+      const ctx = createContextFromBindings(this.bindings, this.strictBindings, this.contextExtensions);
+      const opts = args[1];
+      const resolvedOpts = {
+        ...opts.id !== void 0 && { id: interpolateValue(opts.id, ctx) },
+        ...opts.filter !== void 0 && { filter: opts.filter },
+        ...opts.limit !== void 0 && { limit: interpolateValue(opts.limit, ctx) },
+        ...opts.offset !== void 0 && { offset: interpolateValue(opts.offset, ctx) },
+        ...opts.include !== void 0 && { include: interpolateValue(opts.include, ctx) },
+        ...opts.emit !== void 0 && { emit: interpolateValue(opts.emit, ctx) }
+      };
+      resolvedArgs = [
+        interpolateValue(args[0], ctx),
+        resolvedOpts,
+        ...args.slice(2).map((a) => interpolateValue(a, ctx))
+      ];
     } else {
       resolvedArgs = resolveArgs(args, this.bindings, this.strictBindings, this.contextExtensions);
     }
@@ -3971,7 +3996,8 @@ var OrbitalServerRuntime = class {
       traits: inlineTraits,
       configByTrait,
       manager,
-      entityData: /* @__PURE__ */ new Map()
+      entityData: /* @__PURE__ */ new Map(),
+      dataCache: /* @__PURE__ */ new Map()
     });
     if (entity?.name && entity.instances && Array.isArray(entity.instances)) {
       const instances = entity.instances;
@@ -4670,6 +4696,17 @@ var OrbitalServerRuntime = class {
       },
       fetch: async (fetchEntityType, options) => {
         try {
+          xOrbitalLog.info("fetch:enter", {
+            entityType: fetchEntityType,
+            hasOptions: options !== void 0 && options !== null,
+            optionsKeys: options && typeof options === "object" ? Object.keys(options).join(",") : "",
+            filterType: typeof options?.filter,
+            filterIsArray: Array.isArray(options?.filter),
+            filterJson: JSON.stringify(
+              options?.filter ?? null
+            ).slice(0, 300),
+            payloadJson: JSON.stringify(bindingsRef?.payload ?? null).slice(0, 300)
+          });
           let result = null;
           if (options?.id) {
             const entity = await this.persistence.getById(fetchEntityType, options.id);
@@ -4712,14 +4749,32 @@ var OrbitalServerRuntime = class {
             fetchedData[fetchEntityType] = entities;
             result = entities;
           }
-          if (bindingsRef && result) {
+          if (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;
+              const merged = Object.assign(
+                [...records],
+                records[0]
+              );
+              if (bindingsRef) {
+                bindingsRef[fetchEntityType] = merged;
+                if (fetchEntityType === entityType) {
+                  bindingsRef.entity = merged;
+                }
               }
+              registered.dataCache.set(fetchEntityType, merged);
+            } else {
+              const emptyCollection = Object.assign(
+                [],
+                {}
+              );
+              if (bindingsRef) {
+                bindingsRef[fetchEntityType] = emptyCollection;
+                if (fetchEntityType === entityType) {
+                  bindingsRef.entity = emptyCollection;
+                }
+              }
+              registered.dataCache.set(fetchEntityType, emptyCollection);
             }
           }
           return result;
@@ -4918,16 +4973,22 @@ var OrbitalServerRuntime = class {
       bindings.config = { ...declaredDefaults ?? {}, ...callSiteOverride ?? {} };
     }
     if (traitDef?.scope === "collection" && entityType && !entityId) {
-      try {
-        const all = await this.persistence.list(entityType);
-        if (Array.isArray(all) && all.length > 0) {
-          const merged = Object.assign(
-            [...all],
-            all[0]
-          );
-          bindings.entity = merged;
+      const cached = registered.dataCache.get(entityType);
+      if (cached !== void 0) {
+        bindings.entity = cached;
+      } else {
+        try {
+          const all = await this.persistence.list(entityType);
+          if (Array.isArray(all) && all.length > 0) {
+            const merged = Object.assign(
+              [...all],
+              all[0]
+            );
+            bindings.entity = merged;
+            registered.dataCache.set(entityType, merged);
+          }
+        } catch {
         }
-      } catch {
       }
     }
     if (entityType) {
@@ -5344,5 +5405,5 @@ function buildMatcher(src, listenerOrbital) {
 }
 
 export { EffectExecutor, EventBus, HANDLER_MANIFEST, InMemoryPersistence, MockPersistenceAdapter, OrbitalServerRuntime, StateMachineManager, buildEmitsFromTraits, collectDeclaredConfigDefaults, containsBindings, createContextFromBindings, createInitialTraitState, createLogger, createMockPersistence, createOrbitalServerRuntime, createTestExecutor, createUnifiedLoader, extractBindings, findInitialState, findTransition, formatPayloadValidationError, getIsolatedCollectionName, getNamespacedEvent, interpolateProps, interpolateValue, isBrowser, isElectron, isNamespacedEvent, isNode, normalizeEventKey, parseNamespacedEvent, preprocessSchema, processEvent, validateEventPayload, validatePayloadShapes };
-//# sourceMappingURL=chunk-LZYY2JJR.js.map
-//# sourceMappingURL=chunk-LZYY2JJR.js.map
+//# sourceMappingURL=chunk-6W6XCOLH.js.map
+//# sourceMappingURL=chunk-6W6XCOLH.js.map