@markdy/core 1.0.18 → 1.0.20

package/README.md

@@ -68,7 +68,8 @@ try {
 | `ParseError` | class | Error with `.line` number for diagnostics |
 | `DiagramAST` | type | Parsed scene: meta, nodes, edges, groups, patterns, beats |
 | `RenderPlan` | type | Positioned nodes, routed edges, group zones, sequence messages, timed cues, beat ranges |
-| `SceneMeta` | type | Scene configuration (width, height, fps, theme, direction, controls, interactive, progressColor, playbackRate, loop, autoplay, copyright) |
+| `SceneMeta` | type | Scene configuration; `meta.player` is authoritative, with deprecated flat mirrors retained for compatibility |
+| `PlayerConfig` / `resolvePlayer` | type / function | Grouped playback, controls, interaction, and chrome configuration with host resolution |
 | `NodeDecl` | type | Node declaration (kind, id, label, style) |
 | `EdgeDecl` | type | Edge declaration (kind, from, to, label) |
 | `BeatDecl` | type | Named beat with cues |

package/dist/index.d.ts

@@ -409,7 +409,7 @@ declare const PLAYER_FLAT_KEYS: string[];
  * key is unknown or the value does not fit the setting type.
  */
 declare function applyPlayerSetting(config: PlayerConfig, scope: PlayerScope, key: string, rawValue: string): string | undefined;
-/** Host-supplied overrides always win over script configuration. */
+/** Host behavior overrides. `false` gates a feature off; `true` supplies legacy defaults when script values are absent. */
 type PlayerOverrides = {
     autoplay?: boolean;
     loop?: boolean;

package/dist/index.js

@@ -611,25 +611,26 @@ function unquote(raw) {
 }
 function resolvePlayer(config = {}, overrides = {}) {
   const playback = config.playback ?? {};
+  const configuredControls = config.controls ?? {};
   const interaction = config.interaction ?? {};
   const chrome = config.chrome ?? {};
-  const controlsOn = overrides.controls !== false && (overrides.controls === true || config.controls !== void 0);
-  const controls = {
-    play: controlsOn && (config.controls?.play ?? true),
-    restart: controlsOn && (config.controls?.restart ?? true),
-    prevBeat: controlsOn && (config.controls?.prevBeat ?? false),
-    nextBeat: controlsOn && (config.controls?.nextBeat ?? false),
-    seek: controlsOn && (config.controls?.seek ?? true),
-    speed: controlsOn && (config.controls?.speed ?? true),
-    fit: controlsOn && (config.controls?.fit ?? true),
-    resetView: controlsOn && (config.controls?.resetView ?? true),
-    fullscreen: controlsOn && (config.controls?.fullscreen ?? true),
-    svg: controlsOn && (config.controls?.svg ?? true),
-    share: controlsOn && (config.controls?.share ?? true),
-    // `code` is opt-in: off by default, on only when explicitly declared true.
-    code: controlsOn && (config.controls?.code ?? false),
-    // `theme` is opt-in: off by default, on only when explicitly declared true.
-    theme: controlsOn && (config.controls?.theme ?? false)
+  const controlsAllowed = overrides.controls !== false;
+  const hostControlDefault = overrides.controls === true;
+  const resolveControl = (value, fallback = hostControlDefault) => controlsAllowed && (value ?? fallback);
+  const requestedControls = {
+    play: resolveControl(configuredControls.play),
+    restart: resolveControl(configuredControls.restart),
+    prevBeat: resolveControl(configuredControls.prevBeat, false),
+    nextBeat: resolveControl(configuredControls.nextBeat, false),
+    seek: resolveControl(configuredControls.seek),
+    speed: resolveControl(configuredControls.speed),
+    fit: resolveControl(configuredControls.fit),
+    resetView: resolveControl(configuredControls.resetView),
+    fullscreen: resolveControl(configuredControls.fullscreen),
+    svg: resolveControl(configuredControls.svg),
+    share: resolveControl(configuredControls.share),
+    code: resolveControl(configuredControls.code, false),
+    theme: resolveControl(configuredControls.theme, hostControlDefault)
   };
   const interactionOn = overrides.interactiveViewport !== false && (overrides.interactiveViewport === true || config.interaction !== void 0 || overrides.controls === true);
   const gestures = {
@@ -638,8 +639,16 @@ function resolvePlayer(config = {}, overrides = {}) {
     doubleClickToReset: interactionOn && (interaction.doubleClickToReset ?? true)
   };
   const interactionEnabled = gestures.zoom || gestures.pan || gestures.doubleClickToReset;
-  const resetView = controls.resetView && interactionEnabled;
-  const controlsEnabled = controls.play || controls.restart || controls.prevBeat || controls.nextBeat || controls.seek || controls.speed || controls.fit || controls.resetView || controls.fullscreen || controls.svg || controls.share || controls.code || controls.theme || resetView;
+  const configuredSpeeds = configuredControls.speeds?.length ? configuredControls.speeds : [0.25, 1];
+  const speeds = configuredSpeeds.filter(
+    (rate2, index) => Number.isFinite(rate2) && rate2 > 0 && configuredSpeeds.indexOf(rate2) === index
+  );
+  const controls = {
+    ...requestedControls,
+    speed: requestedControls.speed && speeds.length > 1,
+    resetView: requestedControls.resetView && interactionEnabled
+  };
+  const controlsEnabled = Object.values(controls).some(Boolean);
   const rate = overrides.playbackRate ?? playback.rate ?? 1;
   return {
     playback: {
@@ -649,9 +658,8 @@ function resolvePlayer(config = {}, overrides = {}) {
     },
     controls: {
       ...controls,
-      resetView,
       enabled: controlsEnabled,
-      speeds: config.controls?.speeds?.length ? config.controls.speeds : [0.25, 1]
+      speeds
     },
     interaction: {
       ...gestures,
@@ -887,12 +895,33 @@ function layoutRanked(ast, edges, opts) {
       nodeGroupIndex.set(memberId, gIdx);
     }
   });
-  for (const ids of byRank.values()) {
+  const nodeDeclOrder = new Map(nodeIds.map((id, idx) => [id, idx]));
+  const incomingParents = /* @__PURE__ */ new Map();
+  for (const id of nodeIds) incomingParents.set(id, []);
+  for (const e of edges) {
+    if (e.kind !== "response" && !e.selfLoop && ast.nodes[e.from] && ast.nodes[e.to]) {
+      incomingParents.get(e.to)?.push(e.from);
+    }
+  }
+  const rankOrder = /* @__PURE__ */ new Map();
+  const sortedRanks = [...byRank.keys()].sort((a, b) => a - b);
+  for (const r of sortedRanks) {
+    const ids = byRank.get(r);
     ids.sort((a, b) => {
       const ga = nodeGroupIndex.has(a) ? nodeGroupIndex.get(a) : 9999;
       const gb = nodeGroupIndex.has(b) ? nodeGroupIndex.get(b) : 9999;
       if (ga !== gb) return ga - gb;
-      return a.localeCompare(b);
+      const parentsA = (incomingParents.get(a) ?? []).filter((p) => rankOrder.has(p));
+      const parentsB = (incomingParents.get(b) ?? []).filter((p) => rankOrder.has(p));
+      if (parentsA.length > 0 && parentsB.length > 0) {
+        const avgA = parentsA.reduce((sum, p) => sum + (rankOrder.get(p) ?? 0), 0) / parentsA.length;
+        const avgB = parentsB.reduce((sum, p) => sum + (rankOrder.get(p) ?? 0), 0) / parentsB.length;
+        if (Math.abs(avgA - avgB) > 1e-3) return avgA - avgB;
+      }
+      return (nodeDeclOrder.get(a) ?? 0) - (nodeDeclOrder.get(b) ?? 0);
+    });
+    ids.forEach((id, idx) => {
+      rankOrder.set(id, idx);
     });
   }
   const isVertical = direction === "TB" || direction === "BT";
@@ -1673,7 +1702,7 @@ function layoutNodes(ast, edges) {
   const dtype = diagramType(ast);
   switch (dtype) {
     case "flowchart":
-      return layoutRanked(ast, edges, { forceVertical: true });
+      return layoutRanked(ast, edges, { forceVertical: ast.meta.direction === "TB" || ast.meta.direction === "BT" });
     case "tree":
       return layoutTree(ast, edges.some((edge) => edge.structural) ? edges.filter((edge) => edge.structural) : edges);
     case "sequence":
@@ -2970,6 +2999,9 @@ function parse(source, opts = {}) {
             diagnostics.push({ severity: "warning", message: `unknown diagram type '${v}'`, line: lineNo });
           } else {
             meta.type = t;
+            if (t === "flowchart" && !props.direction && !props.layout && !inlineLayout) {
+              meta.direction = "TB";
+            }
           }
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markdy/core",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "Diagram-native MarkdyScript parser and compiler (auto-layout, edge routing, cue scheduling) — zero runtime dependencies.",
   "license": "MIT",
   "type": "module",