@nowline/embed 0.0.0-dev.20261020002921.g70f418b → 0.0.0-dev.20261020015516.g0053ade

package/dist/meta.json

@@ -4908,7 +4908,7 @@
       "format": "esm"
     },
     "../layout/dist/capacity.js": {
-      "bytes": 8839,
+      "bytes": 8827,
       "imports": [
         {
           "path": "../core/dist/internal.js",
@@ -5035,7 +5035,7 @@
       "format": "esm"
     },
     "../layout/dist/frame-tab-geometry.js": {
-      "bytes": 5033,
+      "bytes": 5765,
       "imports": [],
       "format": "esm"
     },
@@ -6291,8 +6291,13 @@
       "format": "esm"
     },
     "../layout/dist/layout-context.js": {
-      "bytes": 3490,
+      "bytes": 4220,
       "imports": [
+        {
+          "path": "../core/dist/index.js",
+          "kind": "import-statement",
+          "original": "@nowline/core"
+        },
         {
           "path": "../layout/dist/calendar.js",
           "kind": "import-statement",
@@ -6328,7 +6333,7 @@
       "format": "esm"
     },
     "../layout/dist/nodes/item-measure.js": {
-      "bytes": 24908,
+      "bytes": 25246,
       "imports": [
         {
           "path": "../layout/dist/calendar.js",
@@ -6698,7 +6703,7 @@
       "format": "esm"
     },
     "../layout/dist/nodes/swimlane-node.js": {
-      "bytes": 10707,
+      "bytes": 10428,
       "imports": [
         {
           "path": "../layout/dist/capacity.js",
@@ -9899,7 +9904,7 @@
       "format": "esm"
     },
     "../layout/dist/index.js": {
-      "bytes": 5046,
+      "bytes": 5102,
       "imports": [
         {
           "path": "../layout/dist/calendar-resolver.js",
@@ -10226,7 +10231,7 @@
       "format": "esm"
     },
     "../renderer/dist/svg/item.js": {
-      "bytes": 25642,
+      "bytes": 25891,
       "imports": [
         {
           "path": "../layout/dist/index.js",
@@ -10262,13 +10267,18 @@
       "format": "esm"
     },
     "../renderer/dist/svg/swimlanes.js": {
-      "bytes": 10852,
+      "bytes": 10947,
       "imports": [
         {
           "path": "../layout/dist/index.js",
           "kind": "import-statement",
           "original": "@nowline/layout"
         },
+        {
+          "path": "../renderer/dist/svg/icons.js",
+          "kind": "import-statement",
+          "original": "./icons.js"
+        },
         {
           "path": "../renderer/dist/svg/item.js",
           "kind": "import-statement",
@@ -10636,7 +10646,7 @@
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 3704853
+      "bytes": 3707866
     },
     "dist/nowline.min.js": {
       "imports": [],
@@ -11451,7 +11461,7 @@
           "bytesInOutput": 474
         },
         "../layout/dist/capacity.js": {
-          "bytesInOutput": 1013
+          "bytesInOutput": 1036
         },
         "../layout/dist/dsl-utils.js": {
           "bytesInOutput": 50
@@ -11484,7 +11494,7 @@
           "bytesInOutput": 3272
         },
         "../layout/dist/frame-tab-geometry.js": {
-          "bytesInOutput": 357
+          "bytesInOutput": 374
         },
         "../layout/dist/header-logo.js": {
           "bytesInOutput": 450
@@ -11649,13 +11659,13 @@
           "bytesInOutput": 100
         },
         "../layout/dist/layout-context.js": {
-          "bytesInOutput": 1132
+          "bytesInOutput": 1290
         },
         "../layout/dist/nodes/item-node.js": {
           "bytesInOutput": 1704
         },
         "../layout/dist/nodes/item-measure.js": {
-          "bytesInOutput": 4804
+          "bytesInOutput": 4828
         },
         "../layout/dist/nodes/sequence-item.js": {
           "bytesInOutput": 3064
@@ -11685,7 +11695,7 @@
           "bytesInOutput": 1503
         },
         "../layout/dist/nodes/swimlane-node.js": {
-          "bytesInOutput": 1866
+          "bytesInOutput": 1878
         },
         "../layout/dist/nodes/include-node.js": {
           "bytesInOutput": 1433
@@ -11814,10 +11824,10 @@
           "bytesInOutput": 5375
         },
         "../renderer/dist/svg/item.js": {
-          "bytesInOutput": 6255
+          "bytesInOutput": 6308
         },
         "../renderer/dist/svg/swimlanes.js": {
-          "bytesInOutput": 2943
+          "bytesInOutput": 3086
         },
         "../renderer/dist/svg/timeline.js": {
           "bytesInOutput": 2753
@@ -11856,7 +11866,7 @@
           "bytesInOutput": 257
         }
       },
-      "bytes": 674913
+      "bytes": 675343
     }
   }
 }

package/dist/nowline.esm.js

@@ -1,4 +1,4 @@
-/*! @nowline/embed 0.0.0-dev.20261020002921.g70f418b sha=70f418b built=2026-10-20T00:24:12Z */
+/*! @nowline/embed 0.0.0-dev.20261020015516.g0053ade sha=0053ade built=2026-10-20T01:49:32Z */
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -21897,19 +21897,22 @@ function estimateCapacitySuffixWidth(text, icon, fontSizePx) {
     return (text.length + 1) * fontSizePx * 0.58;
   }
   const glyphWidthEm = 1;
-  const gapEm = 0.1;
+  const gapEm = icon.kind === "builtin" ? CAPACITY_ICON_GAP_EM : 0.1;
   return text.length * fontSizePx * 0.58 + (gapEm + glyphWidthEm) * fontSizePx;
 }
 var META_SUFFIX_DX_EM = 0.6;
-var META_ICON_EM_PER_CHAR = 0.5;
-var CAPACITY_ICON_GAP_EM = 0.1;
+var CAPACITY_ICON_GAP_EM = 0.25;
 function capacityIconDxTerms(text, icon, fontSizePx, metaText) {
   if (icon?.kind !== "builtin" || icon.name === "multiplier")
     return void 0;
   const gapPx = fontSizePx * CAPACITY_ICON_GAP_EM;
   if (metaText) {
-    const tightWidth = (s) => s.length * fontSizePx * META_ICON_EM_PER_CHAR;
-    return [tightWidth(metaText), fontSizePx * META_SUFFIX_DX_EM, tightWidth(text), gapPx];
+    return [
+      estimateTextWidth(metaText, fontSizePx),
+      fontSizePx * META_SUFFIX_DX_EM,
+      estimateTextWidth(text, fontSizePx),
+      gapPx
+    ];
   }
   return [estimateTextWidth(text, fontSizePx), gapPx];
 }
@@ -23270,6 +23273,8 @@ function routeDependencies(requests, obstacles, pixelsPerDay) {
 // ../layout/dist/frame-tab-geometry.js
 var FRAME_TAB_TITLE_PX_PER_CHAR = 6.5;
 var FRAME_TAB_OWNER_PX_PER_CHAR = 5;
+var FRAME_TAB_OWNER_GLYPH_PX = 10;
+var FRAME_TAB_OWNER_GLYPH_GAP_PX = 3;
 var FRAME_TAB_INNER_GAP_PX = 6;
 var FRAME_TAB_LEFT_INSET_PX = 12;
 var FRAME_TAB_RIGHT_INSET_PX = 12;
@@ -23282,9 +23287,11 @@ function frameTabGeometry(boxX, title, owner, capacityBadgeWidth = 0, footnoteIn
   let cursorX = titleX + titleTextWidth;
   let ownerTextWidth = 0;
   let ownerX = 0;
+  let ownerTextX = 0;
   if (owner) {
-    ownerTextWidth = `owner: ${owner}`.length * FRAME_TAB_OWNER_PX_PER_CHAR;
+    ownerTextWidth = FRAME_TAB_OWNER_GLYPH_PX + FRAME_TAB_OWNER_GLYPH_GAP_PX + owner.length * FRAME_TAB_OWNER_PX_PER_CHAR;
     ownerX = cursorX + FRAME_TAB_INNER_GAP_PX;
+    ownerTextX = ownerX + FRAME_TAB_OWNER_GLYPH_PX + FRAME_TAB_OWNER_GLYPH_GAP_PX;
     cursorX = ownerX + ownerTextWidth;
   }
   let badgeX = 0;
@@ -23306,6 +23313,7 @@ function frameTabGeometry(boxX, title, owner, capacityBadgeWidth = 0, footnoteIn
     footnoteIndicatorWidth,
     titleX,
     ownerX,
+    ownerTextX,
     badgeX,
     footnoteRightX,
     tabX,
@@ -32764,6 +32772,21 @@ function scheduledItemDays(ctx, item) {
   }
   return scheduled.days;
 }
+function withNestedTeams(teams) {
+  const out = new Map(teams);
+  const visit = (team) => {
+    for (const member of team.content) {
+      if (!isTeamDeclaration(member))
+        continue;
+      if (member.name && !out.has(member.name))
+        out.set(member.name, member);
+      visit(member);
+    }
+  };
+  for (const team of teams.values())
+    visit(team);
+  return out;
+}
 function createLayoutContext(source, shared, chart, init2) {
   return {
     cal: shared.cal,
@@ -32779,7 +32802,7 @@ function createLayoutContext(source, shared, chart, init2) {
     // pixels-per-day scale.
     sizes: resolveSizes(source.content.sizes, shared.cal),
     labels: source.content.labels,
-    teams: source.content.teams,
+    teams: withNestedTeams(source.content.teams),
     persons: source.content.persons,
     symbols: source.config.symbols,
     footnoteIndex: init2.footnotes?.index ?? /* @__PURE__ */ new Map(),
@@ -33044,7 +33067,8 @@ function resolveItemMeta(props, ctx, sizeResolved, status, progress, capacityIco
       icon: capacityIcon,
       ...iconDxTerms !== void 0 ? { iconDxTerms } : {}
     };
-    const separatorWidth = metaText ? estimateTextWidth(" ", META_FONT_SIZE_PX_LOCAL) : 0;
+    const separatorPx = iconDxTerms !== void 0 ? META_FONT_SIZE_PX_LOCAL * META_SUFFIX_DX_EM : estimateTextWidth(" ", META_FONT_SIZE_PX_LOCAL);
+    const separatorWidth = metaText ? separatorPx : 0;
     capacityTrailingWidth = separatorWidth + estimateCapacitySuffixWidth(capacityText, capacityIcon, META_FONT_SIZE_PX_LOCAL);
   }
   return { metaText, ownerDisplay, capacity, capacityTrailingWidth };
@@ -34494,12 +34518,17 @@ function resolveLaneCapacity(lane, style, symbols) {
 var TAB_TOP_Y = 10;
 var TAB_BOTTOM_Y = 38;
 var TAB_GUTTER_PX = 8;
-function computeLaneTabRightX(lane, capacityBadgeWidthPx, footnoteIndicatorWidthPx) {
-  const title = lane.title ?? lane.name ?? "";
-  if (!title)
-    return 0;
+function resolveLaneOwner(lane, ctx) {
   const ownerRaw = propValue(lane.properties, "owner");
-  return frameTabGeometry(0, title, ownerRaw ?? void 0, capacityBadgeWidthPx, footnoteIndicatorWidthPx).rightX;
+  if (!ownerRaw)
+    return void 0;
+  const team = ctx.teams.get(ownerRaw);
+  if (team)
+    return { text: team.title ?? ownerRaw, kind: "team" };
+  const person = ctx.persons.get(ownerRaw);
+  if (person)
+    return { text: person.title ?? ownerRaw, kind: "person" };
+  return { text: ownerRaw, kind: "team" };
 }
 function collectFootnoteIndicators(lane, ctx) {
   if (!lane.name)
@@ -34544,7 +34573,11 @@ var SwimlaneNode = class {
     const { capacity, badgeWidthPx } = resolveLaneCapacity(lane, style, ctx.symbols);
     const footnoteIndicators = collectFootnoteIndicators(lane, ctx);
     const footnoteIndicatorWidthPx = footnoteIndicators.length > 0 ? estimateTextWidth(footnoteIndicators.join(","), LANE_CAPACITY_BADGE_FONT_SIZE_PX) : 0;
-    const tabRightX = computeLaneTabRightX(lane, badgeWidthPx, footnoteIndicatorWidthPx);
+    const boxX = 0;
+    const owner = resolveLaneOwner(lane, ctx);
+    const title = lane.title ?? lane.name ?? "";
+    const tab = title ? frameTabGeometry(boxX, title, owner?.text, badgeWidthPx, footnoteIndicatorWidthPx) : null;
+    const tabRightX = tab?.rightX ?? 0;
     const firstChildDesiredX = firstChildStartX(lane, laneLeftX, ctx);
     const canAlignFirstRowWithTab = !lane.title || firstChildDesiredX === void 0 || firstChildDesiredX >= tabRightX + TAB_GUTTER_PX;
     const startY = origin.y + (canAlignFirstRowWithTab ? TAB_TOP_Y : TAB_BOTTOM_Y);
@@ -34554,18 +34587,11 @@ var SwimlaneNode = class {
     const bandHeight = Math.max(step + 32, tabOffset + track.packer.usedHeight() + 16);
     const usedRightX = Math.max(track.packer.usedRightX(), tabRightX);
     const box = {
-      x: 0,
+      x: boxX,
       y: origin.y,
       width: 0,
       height: bandHeight
     };
-    const ownerRaw = propValue(lane.properties, "owner");
-    let ownerDisplay;
-    if (ownerRaw) {
-      const team = ctx.teams.get(ownerRaw);
-      const person = ctx.persons.get(ownerRaw);
-      ownerDisplay = team?.title ?? person?.title ?? ownerRaw;
-    }
     const utilization = capacity ? (() => {
       const { warn, over } = resolveLaneUtilizationThresholds(lane, ctx.styleCtx.defaults);
       return computeLaneUtilization({
@@ -34579,17 +34605,17 @@ var SwimlaneNode = class {
     return {
       positioned: {
         id: lane.name,
-        title: lane.title ?? lane.name ?? "",
+        title,
         box,
         bandIndex,
         children,
         nested: [],
         style,
-        owner: ownerDisplay,
+        owner: owner?.text,
+        ownerKind: owner?.kind,
         footnoteIndicators,
         capacity,
-        capacityBadgeWidth: badgeWidthPx,
-        footnoteIndicatorWidth: footnoteIndicatorWidthPx,
+        tab,
         utilization
       },
       usedHeight: bandHeight,
@@ -39119,11 +39145,15 @@ function renderItemMetaLine(opts) {
     const glyphDx = num(fontSize * 0.1);
     return openText + escText(metaText) + `<tspan dx="${sepDx}">${escText(numberStr)}</tspan><tspan dx="${glyphDx}">${escText(icon.text)}</tspan></text>`;
   }
+  const terms = capacity.iconDxTerms ?? [];
+  let numberX = x2;
+  for (const term of terms.slice(0, 2))
+    numberX += term;
   const def = CAPACITY_ICON_SVG[icon.name];
   const iconSize = fontSize;
   const iconX = iconXFrom(x2, capacity);
   const iconY = baselineY - fontSize * 0.85;
-  const textPart = openText + escText(metaText) + `<tspan dx="${sepDx}">${escText(numberStr)}</tspan></text>`;
+  const textPart = openText + escText(metaText) + "</text>" + textTag({ x: num(numberX), y: num(baselineY), ...baseAttrs }, numberStr);
   const iconPart = `<svg x="${num(iconX)}" y="${num(iconY)}" width="${num(iconSize)}" height="${num(iconSize)}" viewBox="${def.viewBox}" style="color:${escAttr(color)}" aria-hidden="true">${def.body}</svg>`;
   return textPart + iconPart;
 }
@@ -39492,10 +39522,10 @@ function renderSwimlane(s, options, idPrefix, palette, fonts) {
   const ownerText3 = palette.swimlane.ownerText;
   const footnoteColor = palette.swimlane.footnoteIndicator;
   const parts = [];
-  if (s.title) {
+  const tab = s.tab;
+  if (tab) {
     const LANE_BADGE_FONT_SIZE_PX = 10;
     const footnoteIndicatorText = s.footnoteIndicators.length > 0 ? s.footnoteIndicators.join(",") : "";
-    const tab = frameTabGeometry(s.box.x, s.title, s.owner, s.capacityBadgeWidth, s.footnoteIndicatorWidth);
     const tabH = FRAME_TAB_HEIGHT_PX;
     const tabY = s.box.y + 10;
     const labelY = tabY + FRAME_TAB_LABEL_BASELINE_OFFSET_PX;
@@ -39519,13 +39549,16 @@ function renderSwimlane(s, options, idPrefix, palette, fonts) {
       fill: tabText
     }, s.title));
     if (s.owner) {
+      const glyph = CAPACITY_ICON_SVG[s.ownerKind === "person" ? "person" : "people"];
+      const glyphSize = FRAME_TAB_OWNER_GLYPH_PX;
+      parts.push(`<svg x="${num(tab.ownerX)}" y="${num(labelY - glyphSize * 0.85)}" width="${num(glyphSize)}" height="${num(glyphSize)}" viewBox="${glyph.viewBox}" style="color:${escAttr(ownerText3)}" aria-hidden="true">${glyph.body}</svg>`);
       parts.push(textTag({
-        x: num(tab.ownerX),
+        x: num(tab.ownerTextX),
         y: num(labelY),
         "font-family": fonts[s.style.font],
         "font-size": 10,
         fill: ownerText3
-      }, `owner: ${s.owner}`));
+      }, s.owner));
     }
     if (s.capacity) {
       parts.push(renderCapacitySuffix(s.capacity, tab.badgeX, labelY, LANE_BADGE_FONT_SIZE_PX, fonts[s.style.font], ownerText3));
@@ -40874,8 +40907,8 @@ function effectiveTheme(theme, systemTheme) {
 }
 
 // src/index.ts
-var version = true ? "0.0.0-dev.20261020002921.g70f418b" : "0.0.0";
-var sha = true ? "70f418b" : "unknown";
+var version = true ? "0.0.0-dev.20261020015516.g0053ade" : "0.0.0";
+var sha = true ? "0053ade" : "unknown";
 var DEFAULT_SELECTOR = "pre code.language-nowline, code.language-nowline";
 var initialConfig = {
   theme: "auto",