@almadar/ui 5.111.0 → 5.113.0

package/dist/runtime/index.cjs

@@ -41,7 +41,7 @@ var core$1 = require('@dnd-kit/core');
 var sortable = require('@dnd-kit/sortable');
 var utilities = require('@dnd-kit/utilities');
 var react = require('@xyflow/react');
-var patterns = require('@almadar/patterns');
+var patterns = require('@almadar/core/patterns');
 var runtime = require('@almadar/runtime');
 var OrbitalServerRuntime = require('@almadar/runtime/OrbitalServerRuntime');
 
@@ -9273,8 +9273,12 @@ var init_MiniMap = __esm({
     MiniMap.displayName = "MiniMap";
   }
 });
-function useCamera() {
-  const cameraRef = React81.useRef({ x: 0, y: 0, zoom: 1 });
+function useCamera(initial) {
+  const cameraRef = React81.useRef({
+    x: initial?.x ?? 0,
+    y: initial?.y ?? 0,
+    zoom: initial?.zoom ?? 1
+  });
   const targetCameraRef = React81.useRef(null);
   const isDraggingRef = React81.useRef(false);
   const dragDistanceRef = React81.useRef(0);
@@ -9843,8 +9847,18 @@ function Canvas2D({
   scale = 0.4,
   showMinimap = true,
   followTarget,
+  cameraPos,
   bgColor
 }) {
+  const instanceId = React81.useMemo(() => Math.random().toString(36).slice(2, 8), []);
+  function isDrawableLayer(node) {
+    return node.type === "draw-sprite-layer" || node.type === "draw-shape-layer" || node.type === "draw-text-layer";
+  }
+  const layerSummaries = drawables?.map((d) => {
+    if (!isDrawableLayer(d)) return { type: d.type };
+    return { type: d.type, itemsLen: d.items.length, firstItem: d.items[0] };
+  });
+  canvas2DLog.debug("Canvas2D render", { instanceId, projection, scale, cameraMode: camera, cameraPos: cameraPos ? JSON.stringify(cameraPos) : void 0, drawablesCount: drawables?.length, layerSummaries: layerSummaries ? JSON.stringify(layerSummaries) : void 0 });
   const backgroundImage = normalizeBackdrop(backgroundImageRaw);
   const isFree = projection === "free";
   const squareGrid = projection === "flat" || isFree || projection === "side";
@@ -9927,7 +9941,7 @@ function Canvas2D({
     zoomAtPoint,
     screenToWorld,
     lerpToTarget
-  } = useCamera();
+  } = useCamera({ zoom: scale });
   const [atlasVersion, setAtlasVersion] = React81.useState(0);
   const bumpAtlas = React81.useCallback(() => setAtlasVersion((v) => v + 1), []);
   const miniMapTiles = React81.useMemo(() => {
@@ -9973,6 +9987,14 @@ function Canvas2D({
     }
     if (!drawables || drawables.length === 0) return;
     const cam = cameraRef.current;
+    if (cameraPos && dragDistance() === 0) {
+      const p = projector.anchorPoint(cameraPos, "center");
+      cam.x = p.x - viewportSize.width / 2;
+      cam.y = p.y - viewportSize.height / 2;
+    }
+    const containerRect = containerRef.current?.getBoundingClientRect();
+    const canvasRect = canvas.getBoundingClientRect();
+    canvas2DLog.debug("Canvas2D draw", { instanceId, viewportSize, baseOffsetX, cam: { x: cam.x, y: cam.y, zoom: cam.zoom }, cameraPos: cameraPos ? JSON.stringify(cameraPos) : void 0, containerRect: containerRect ? { width: containerRect.width, height: containerRect.height } : null, canvasRect: canvasRect ? { width: canvasRect.width, height: canvasRect.height } : null });
     const painter = createWebPainter(ctx, bumpAtlas);
     painter.save();
     painter.translate(viewportSize.width / 2, viewportSize.height / 2);
@@ -10184,6 +10206,7 @@ function Canvas2D({
     }
   );
 }
+var canvas2DLog;
 var init_Canvas2D = __esm({
   "components/game/molecules/Canvas2D.tsx"() {
     "use client";
@@ -10205,6 +10228,7 @@ var init_Canvas2D = __esm({
     init_paintDispatch();
     init_hitTest();
     init_isometric();
+    canvas2DLog = logger.createLogger("almadar:ui:game-canvas");
     Canvas2D.displayName = "Canvas2D";
   }
 });
@@ -10243,6 +10267,7 @@ function Canvas({
   keyMap,
   keyUpMap
 }) {
+  canvasLog.debug("Canvas render", { mode, drawablesCount: drawables?.length, projection, camera: camera ? JSON.stringify(camera) : void 0 });
   const zoom = camera?.zoom;
   if (mode === "3d") {
     const props3d = {
@@ -10282,6 +10307,7 @@ function Canvas({
       camera: to2DCamera(camera?.mode),
       ...zoom !== void 0 ? { scale: zoom } : {},
       ...camera?.target !== void 0 ? { followTarget: camera.target } : {},
+      ...camera?.pos !== void 0 ? { cameraPos: camera.pos } : {},
       showMinimap,
       backgroundImage,
       ...backgroundColor !== void 0 ? { bgColor: backgroundColor } : {},
@@ -10294,7 +10320,7 @@ function Canvas({
     }
   );
 }
-var Canvas3DHost;
+var Canvas3DHost, canvasLog;
 var init_Canvas = __esm({
   "components/game/molecules/Canvas.tsx"() {
     "use client";
@@ -10302,6 +10328,7 @@ var init_Canvas = __esm({
     Canvas3DHost = React81.lazy(
       () => import('@almadar/ui/components/molecules/game/three').then((m) => ({ default: m.Canvas3DHost }))
     );
+    canvasLog = logger.createLogger("almadar:ui:game-canvas");
     Canvas.displayName = "Canvas";
   }
 });
@@ -43696,7 +43723,7 @@ function SlotContentRenderer({
     const childrenConfig = content.props.children;
     const isSingleChild = typeof childrenConfig === "string" || typeof childrenConfig === "object" && childrenConfig !== null && !Array.isArray(childrenConfig) && "type" in childrenConfig;
     const hasChildren = PATTERNS_WITH_CHILDREN.has(content.pattern) || Array.isArray(childrenConfig) && childrenConfig.length > 0 || isSingleChild;
-    const isDrawHost = patterns.getPatternDefinition(content.pattern)?.drawHost === true;
+    const isDrawHost = patterns.isDrawHostPattern(content.pattern);
     const myPath = patternPath ?? "root";
     const renderedChildren = hasChildren && !isDrawHost ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath, content.sourceTrait, {
       slot: content.slot,
@@ -44215,6 +44242,8 @@ var flushLog = logger.createLogger("almadar:ui:slot-flush");
 var stateLog = logger.createLogger("almadar:ui:state-transitions");
 var tickLog = logger.createLogger("almadar:ui:tick-effects");
 logger.setNamespaceLevel("almadar:ui:tick-effects", "WARN");
+var sharedEntityLog = logger.createLogger("almadar:ui:shared-entity");
+logger.setNamespaceLevel("almadar:ui:shared-entity", "WARN");
 var SYNC_TICK_OPERATORS = /* @__PURE__ */ new Set([
   "set",
   "emit",
@@ -44267,6 +44296,14 @@ function effectsCallOp(effects, ops) {
   }
   return false;
 }
+function classifySharedTick(tick) {
+  const writes = effectsCallOp(tick.effects, SHARED_ENTITY_WRITE_OPS);
+  const renders = effectsCallOp(tick.effects, SHARED_ENTITY_RENDER_OPS);
+  if (writes && renders) return "both";
+  if (writes) return "writer";
+  if (renders) return "renderer";
+  return "neither";
+}
 function createSharedEntityWriter(binding, tick, traitStatesRef, emit) {
   return (scratch) => {
     const traitName = binding.trait.name;
@@ -44276,7 +44313,7 @@ function createSharedEntityWriter(binding, tick, traitStatesRef, emit) {
     const writes = [];
     const ctx = evaluator.createMinimalContext(scratchEntity, {}, currentState);
     const declaredDefaults = runtime.collectDeclaredConfigDefaults(binding.trait);
-    const callSiteConfig = binding.config;
+    const callSiteConfig = getBindingConfig(binding);
     if (declaredDefaults || callSiteConfig) {
       ctx.config = { ...declaredDefaults ?? {}, ...callSiteConfig ?? {} };
     }
@@ -44298,7 +44335,25 @@ function createSharedEntityWriter(binding, tick, traitStatesRef, emit) {
     return writes;
   };
 }
+function getBindingConfig(binding) {
+  const raw = binding.config;
+  const normalized = runtime.normalizeCallSiteConfigToValues(raw);
+  sharedEntityLog.debug("getBindingConfig", { traitName: binding.trait.name, rawKeys: raw ? Object.keys(raw) : void 0, hasTiles: raw ? "tiles" in raw : false });
+  return normalized;
+}
+function evalFieldDefault(value) {
+  if (!Array.isArray(value) || value.length === 0) return value;
+  const head = value[0];
+  const isSExpr = typeof head === "string" && (head.includes("/") || head === "let" || head === "if" || head === "lambda");
+  if (!isSExpr) return value;
+  try {
+    return evaluator.evaluate(value, evaluator.createMinimalContext({}, {}, ""));
+  } catch {
+    return value;
+  }
+}
 function useTraitStateMachine(traitBindings, uiSlots, options) {
+  sharedEntityLog.debug("useTraitStateMachine start", { traitBindingsCount: traitBindings.length, traitNames: traitBindings.map((b) => b.trait.name) });
   const eventBus = useEventBus();
   const { entities } = providers.useEntitySchema();
   const traitConfigsByName = options?.traitConfigsByName;
@@ -44317,8 +44372,17 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       if (!group) {
         let defaults;
         for (const field of entityDef.fields) {
-          if (field.default !== void 0) {
-            (defaults ?? (defaults = {}))[field.name] = field.default;
+          if (field.default !== void 0 && field.default !== null) {
+            const evaluated = evalFieldDefault(field.default);
+            if (field.name === "tiles") {
+              sharedEntityLog.debug("seed tiles", {
+                linkedEntityName,
+                type: typeof evaluated,
+                length: Array.isArray(evaluated) ? evaluated?.length : void 0,
+                head: Array.isArray(evaluated) && evaluated.length > 0 ? JSON.stringify(evaluated[0]).slice(0, 80) : void 0
+              });
+            }
+            (defaults ?? (defaults = {}))[field.name] = evaluated;
           }
         }
         group = { storeKey, entityName: linkedEntityName, writerBindings: [], renderBindings: [], defaults };
@@ -44331,7 +44395,15 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     return groups;
   }, [traitBindings, entities, orbitalsByTrait]);
   for (const group of sharedGroups.values()) {
-    if (group.defaults) sharedEntityStore.seed(group.storeKey, group.defaults);
+    if (group.defaults) {
+      sharedEntityStore.seed(group.storeKey, group.defaults);
+      sharedEntityLog.debug("shared-seed", {
+        storeKey: group.storeKey,
+        writers: group.writerBindings.map((b) => b.trait.name),
+        renderers: group.renderBindings.map((b) => b.trait.name),
+        tilesLength: Array.isArray(group.defaults.tiles) ? group.defaults.tiles.length : group.defaults.tiles
+      });
+    }
   }
   const sharedKeyByTraitNameRef = React81.useRef(/* @__PURE__ */ new Map());
   React81.useEffect(() => {
@@ -44341,12 +44413,13 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       for (const binding of group.renderBindings) map.set(binding.trait.name, group.storeKey);
     }
     sharedKeyByTraitNameRef.current = map;
+    sharedEntityLog.debug("shared-map", { map: Array.from(map.entries()).map(([k, v]) => `${k}->${v}`) });
   }, [sharedGroups]);
   const manager = React81.useMemo(() => {
     const traitDefs = traitBindings.map(toTraitDefinition);
     const m = new runtime.StateMachineManager(traitDefs);
     for (const binding of traitBindings) {
-      const cfg = binding.config ?? traitConfigsByName?.[binding.trait.name];
+      const cfg = getBindingConfig(binding) ?? traitConfigsByName?.[binding.trait.name];
       if (cfg !== void 0) {
         m.setTraitConfig(binding.trait.name, cfg);
       }
@@ -44529,6 +44602,9 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     const linkedEntity = binding.linkedEntity || "";
     const entityId = payload?.entityId;
     const sharedKey = sharedKeyByTraitNameRef.current.get(traitName);
+    if (traitName === "Hero" || traitName === "Authority") {
+      sharedEntityLog.debug("executeTransitionEffects sharedKey", { traitName, sharedKey, storeTilesLength: sharedKey ? sharedEntityStore.getSnapshot(sharedKey).tiles?.length : void 0 });
+    }
     let liveEntity;
     if (sharedKey !== void 0) {
       liveEntity = { ...sharedEntityStore.getSnapshot(sharedKey) };
@@ -44552,6 +44628,18 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       eventBus,
       slotSetter: {
         addPattern: (slot, pattern, props) => {
+          if (traitName === "Hero" && slot === "main" && props && typeof props === "object") {
+            const canvasChild = Array.isArray(props.children) ? props.children[0] : null;
+            const grandChildren = canvasChild && typeof canvasChild === "object" && !Array.isArray(canvasChild) ? canvasChild.children : null;
+            const firstLayer = Array.isArray(grandChildren) && grandChildren.length > 0 ? grandChildren[0] : null;
+            const firstLayerItems = firstLayer && typeof firstLayer === "object" && !Array.isArray(firstLayer) ? firstLayer.items : null;
+            sharedEntityLog.debug("render-ui main slot", {
+              traitName,
+              slot,
+              canvasChildType: canvasChild && typeof canvasChild === "object" && !Array.isArray(canvasChild) ? canvasChild.type : "none",
+              firstLayerItemsLength: Array.isArray(firstLayerItems) ? firstLayerItems.length : firstLayerItems
+            });
+          }
           const existing = pendingSlots.get(slot) || [];
           existing.push({ pattern, props: props || {} });
           pendingSlots.set(slot, existing);
@@ -44583,7 +44671,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         state: previousState
       };
       const sharedDeclared = runtime.collectDeclaredConfigDefaults(binding.trait);
-      const sharedCallSite = binding.config;
+      const sharedCallSite = getBindingConfig(binding);
       if (sharedDeclared || sharedCallSite) {
         sharedBindings.config = {
           ...sharedDeclared ?? {},
@@ -44634,13 +44722,21 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       state: previousState
     };
     const declaredDefaults = runtime.collectDeclaredConfigDefaults(binding.trait);
-    const callSiteConfig = binding.config;
+    const callSiteConfig = getBindingConfig(binding);
     if (declaredDefaults || callSiteConfig) {
       bindingCtx.config = {
         ...declaredDefaults ?? {},
         ...callSiteConfig ?? {}
       };
     }
+    if (traitName === "Authority" || traitName === "Hero") {
+      sharedEntityLog.debug("executeTransitionEffects config tiles", {
+        traitName,
+        tilesType: typeof bindingCtx.config?.tiles,
+        tilesLength: Array.isArray(bindingCtx.config?.tiles) ? bindingCtx.config?.tiles?.length : void 0,
+        configKeys: bindingCtx.config ? Object.keys(bindingCtx.config) : void 0
+      });
+    }
     const effectContext = {
       traitName,
       state: previousState,
@@ -44657,9 +44753,25 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         baseEmit(event, eventPayload, source);
       }
     };
+    if (traitName === "Hero") {
+      sharedEntityLog.debug("executeTransitionEffects effects summary", {
+        traitName,
+        effectsCount: effects.length,
+        hasRenderUI: typeof handlers.renderUI === "function",
+        effectHeads: effects.map((e) => Array.isArray(e) ? String(e[0]) : "??")
+      });
+    }
     const executor = new runtime.EffectExecutor({ handlers: trackingHandlers, bindings: bindingCtx, context: effectContext });
     try {
       await executor.executeAll(effects);
+      if (traitName === "Authority" || traitName === "Hero") {
+        sharedEntityLog.debug("executeTransitionEffects after executeAll", {
+          traitName,
+          tilesType: typeof liveEntity.tiles,
+          tilesLength: Array.isArray(liveEntity.tiles) ? liveEntity.tiles?.length : void 0,
+          firstTilePos: Array.isArray(liveEntity.tiles) && liveEntity.tiles.length > 0 ? JSON.stringify(liveEntity.tiles[0]).slice(0, 120) : void 0
+        });
+      }
       if (sharedKey !== void 0) {
         sharedEntityStore.commit(sharedKey, liveEntity);
       }
@@ -44710,8 +44822,9 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         payload: {},
         state: currentState
       };
-      if (binding.config) {
-        guardCtx.config = binding.config;
+      const bindingCfg = getBindingConfig(binding);
+      if (bindingCfg) {
+        guardCtx.config = bindingCfg;
       }
       const passed = evaluator.evaluateGuard(
         tick.guard,
@@ -44738,12 +44851,14 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
   }, [eventBus]);
   React81.useEffect(() => {
     const scheduler = runtime.createTickScheduler();
-    const writerTraitNames = /* @__PURE__ */ new Set();
+    const pureWriterTickKeys = /* @__PURE__ */ new Set();
     for (const group of sharedGroups.values()) {
       const ticksByInterval = /* @__PURE__ */ new Map();
       for (const binding of group.writerBindings) {
-        writerTraitNames.add(binding.trait.name);
         for (const tick of binding.trait.ticks ?? []) {
+          const classification = classifySharedTick(tick);
+          if (classification !== "writer") continue;
+          pureWriterTickKeys.add(`${binding.trait.name}::${tick.name}`);
           const intervalKey = String(tick.interval);
           const entries = ticksByInterval.get(intervalKey) ?? [];
           entries.push({ binding, tick });
@@ -44770,8 +44885,11 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       }
     }
     for (const binding of traitBindings) {
-      if (writerTraitNames.has(binding.trait.name)) continue;
       for (const tick of binding.trait.ticks ?? []) {
+        const sharedKey = sharedKeyByTraitNameRef.current.get(binding.trait.name);
+        if (sharedKey !== void 0 && pureWriterTickKeys.has(`${binding.trait.name}::${tick.name}`)) {
+          continue;
+        }
         if (tick.interval === "frame") {
           scheduler.add(0, () => runTickEffects(tick, binding));
         } else if (typeof tick.interval === "number") {
@@ -45616,6 +45734,7 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFa
       hadPrev: prevTraitsRef.current !== void 0
     }));
     if (refChanged) {
+      navLog.info("page:traits-reset", { traitsCount: Array.isArray(traits2) ? traits2.length : -1 });
       uiSlots.clearAll();
       initSentRef.current = false;
     }