@yalehwang/plantuml-js 0.5.0 → 0.5.1

package/README.md

@@ -72,7 +72,7 @@ console.log(svg);
 |---|---|
 | `createRenderer({ layout })` | Build a renderer. `layout` is `'elk'` (default), `'viz'` (experimental), or a custom `LayoutEngine`. |
 | `renderer.render(puml)` | Parse + layout + emit SVG. Returns `{ svg, diagramType, warnings }`. Throws `RenderError` on structurally invalid puml. |
-| `renderDetailed(pumlOrModel, options?)` | Run the same pipeline as `renderer.render` and return every intermediate: `{ model, layout, svg, layoutMs, hiddenTransitive }`. Accepts a puml string (throws `RenderError` on invalid input) or an already-parsed `PlantUmlModel`. `DetailedRender.layout` carries the **stable** node/package/edge rectangles — see [Stable layout geometry](#stable-layout-geometry-renderdetailed) — so tooling never has to re-read bounding boxes from the SVG. Exported from both `.` and `./elk`. |
+| `renderDetailed(pumlOrModel, options?)` | Run the same pipeline as `renderer.render` and return every intermediate: `{ model, sourceModel, layout, svg, layoutMs, hiddenTransitive }`. Accepts a puml string (throws `RenderError` on invalid input) or an already-parsed `PlantUmlModel`. `model` is the post-detail model that was drawn — **not suitable for export** (detail truncation may have replaced member rows); `sourceModel` is the complete pre-detail model, so export with `toPlantUml(sourceModel)`. `DetailedRender.layout` carries the **stable** node/package/edge rectangles — see [Stable layout geometry](#stable-layout-geometry-renderdetailed) — so tooling never has to re-read bounding boxes from the SVG. Exported from both `.` and `./elk`. |
 | `parsePlantUml(puml)` | Parse a puml string into a `PlantUmlModel`. |
 | `checkSyntax(puml)` | Validate without throwing. Returns `{ ok, errors, warnings }` of line-accurate `SyntaxDiagnostic`s. |
 | `explain(puml)` | Explain each line. Returns `LineExplanation[]` (line, kind, explanation). |
@@ -98,6 +98,28 @@ without re-routing. `model` is the diagram actually drawn (after view,
 transforms and detail), and `hiddenTransitive` counts the edges dropped by
 transitive reduction.
 
+`model` is a **drawing** model: `detail`/`memberMaxRows` may have replaced rows
+with a synthetic `… +N more (M members)` marker, so serializing it is lossy.
+For a lossless export (copy/download the current diagram as PlantUML), serialize
+`sourceModel` — the same model after view/transforms but before detail:
+
+```ts
+const { sourceModel } = await renderDetailed(puml, { detail: 'compact' });
+const text = toPlantUml(sourceModel); // every authored member, no marker rows
+```
+
+`toPlantUml` skips synthetic members, so `toPlantUml(model)` never emits a
+`+ … +N more` line either — it is simply only as complete as what was drawn.
+
+The canvas is fitted to **the routes and labels that are drawn**, not only to
+the boxes the layout engine measures: `layout.width`/`height` (and therefore
+the SVG `viewBox`) contain every edge route point and every edge label box, with
+a margin of at least **16px** on all four sides. An edge label beside an outer
+detour route is therefore never clipped at the SVG border, and a host can rely
+on `0 0 width height` containing the whole drawing. Engine geometry that
+already fits is left untouched, so the canvas never shrinks and unchanged
+diagrams render identically.
+
 ### Error semantics
 
 `createRenderer` fails closed on an unknown layout name (`'elk'`, `'viz'`, or a

package/dist/core.d.ts

@@ -79,8 +79,8 @@ export interface RenderResult {
 }
 /**
  * Everything {@link renderDetailed} computed for one diagram: the model that was
- * actually laid out and drawn, the geometry the renderer used, the SVG it
- * emitted, and the reduction bookkeeping.
+ * actually laid out and drawn, the pre-detail model to export from, the geometry
+ * the renderer used, the SVG it emitted, and the reduction bookkeeping.
  *
  * This is a **public, stable API** (available from both the `.` and `./elk`
  * entries). Consumers such as an architecture tab should read geometry from
@@ -101,8 +101,20 @@ export interface RenderResult {
  * they can be translated into a thumbnail directly.
  */
 export interface DetailedRender {
-    /** The model actually laid out and drawn (after view, transforms and detail). */
+    /**
+     * The model actually laid out and drawn (after view, transforms **and**
+     * detail). Detail truncation has already dropped members here — row caps
+     * replace them with a `synthetic` `… +N more` marker — so this model is for
+     * drawing/inspection, **not for export**. Export from {@link sourceModel}.
+     */
     model: PlantUmlModel;
+    /**
+     * The complete model after view/transforms but **before** detail truncation:
+     * every authored member, with `raw` intact. Serialize this to export what was
+     * parsed — `toPlantUml(renderDetailed(input).sourceModel)` — instead of
+     * `model`, whose rows detail may have capped.
+     */
+    sourceModel: PlantUmlModel;
     /** Geometry actually used by the renderer; its node/package/edge rectangles are a stable contract (see above). */
     layout: LayoutResult;
     svg: string;
@@ -138,6 +150,8 @@ export declare function createRenderer(options?: RendererOptions): Renderer;
  * Render one diagram through the exact pipeline `createRenderer` uses
  * (view/transforms → detail → layout → svg) and return every intermediate, so
  * tooling can read real geometry instead of reverse-engineering the SVG.
+ * `model` is the post-detail model that was drawn; `sourceModel` is the
+ * pre-detail model to serialize for a lossless export.
  *
  * Accepts either a puml string (the counterpart of
  * `createRenderer(options).render(puml)`, with the same fail-closed

package/dist/core.js

@@ -7,7 +7,8 @@
  * engine + `renderDot`.
  */
 import { parsePlantUml, parseWithDiagnostics, ENTITY_LINE, ENTITY_KEYWORD, extractDeclaredName, stripComment } from './parse/parser.js';
-import { applyDetail } from './foundation/layout.js';
+import { applyDetail, fitLayoutToContent } from './foundation/layout.js';
+import { placeEdgeLabels } from './foundation/labels.js';
 import { ElkLayoutEngine } from './layout/elk.js';
 import { renderSvg, SvgRenderer, } from './render/svg.js';
 import { applyView, transformModel, transformModelDetailed, shouldAutoReduce, INTER_PACKAGE_AGGREGATE_ENTITY_THRESHOLD } from './transform/transform.js';
@@ -67,16 +68,22 @@ export function createRenderer(options = {}) {
     };
 }
 async function renderParsed(parsed, options, engine, renderEngine) {
-    const { model: transformed, hiddenTransitive } = transformForRender(parsed, options);
-    const model = applyDetail(transformed, options.detail, {
+    const { model: sourceModel, hiddenTransitive } = transformForRender(parsed, options);
+    const model = applyDetail(sourceModel, options.detail, {
         memberMaxRows: options.memberMaxRows,
         memberMaxChars: options.memberMaxChars,
     });
     const started = performance.now();
-    const layout = await engine.layout(model);
+    const raw = await engine.layout(model);
     const layoutMs = Math.round((performance.now() - started) * 100) / 100;
+    // The engines size the canvas from boxes and routes; edge labels are placed
+    // by the renderer and can hang outside that box (a plain label beside an
+    // outer detour route lands at a negative x). Fit the canvas to the routes and
+    // labels, so the returned layout and the SVG viewBox both contain them with
+    // a margin.
+    const layout = fitLayoutToContent(raw, placeEdgeLabels(model, raw).map((label) => label.rect));
     const svg = renderEngine.render(model, layout, { hiddenTransitive });
-    return { model, layout, svg, layoutMs, hiddenTransitive };
+    return { sourceModel, model, layout, svg, layoutMs, hiddenTransitive };
 }
 export async function renderDetailed(input, options = {}) {
     const parsed = typeof input === 'string' ? parseForDetailed(input) : input;

package/dist/foundation/layout.d.ts

@@ -40,6 +40,28 @@ export interface LayoutResult {
 export interface LayoutEngine {
     layout(model: PlantUmlModel): Promise<LayoutResult>;
 }
+/** Empty border the canvas keeps around every drawn mark (px). */
+export declare const CANVAS_CONTENT_MARGIN = 16;
+/** Axis-aligned rectangle, structurally compatible with `labels`/`edge-router` rects. */
+export interface ContentRect {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+}
+/**
+ * Grow and translate a layout so every edge route point and the supplied extra
+ * rectangles (edge labels) stays at least `margin` from the canvas side. Routes
+ * and labels are drawn from the layout coordinates but are not part of
+ * `layout.width`/`height` as produced by the engines, so a label hung beside an
+ * outer detour route can sit at a negative x and be clipped by a `0 0 w h`
+ * viewBox.
+ *
+ * Boxes are left alone — the engines already place them inside their own
+ * margin — so this never moves a diagram whose routes and labels already fit:
+ * the input is returned untouched and the canvas never shrinks.
+ */
+export declare function fitLayoutToContent(layout: LayoutResult, extraRects?: readonly ContentRect[], margin?: number): LayoutResult;
 /**
  * Shared drawing metrics. The renderer reads these so entity sizing and the
  * emitted SVG stay in lockstep: the font family and size are bound to the same
@@ -125,6 +147,12 @@ export interface MemberDisplayLimits {
  * of each drawn line (`memberMaxChars`). Truncation only sets
  * `PlantUmlMember.display`; `raw` keeps the full declaration. Without limits
  * the result is byte-for-byte what it always was.
+ *
+ * Row caps replace dropped members with one `… +N more (M members)` row marked
+ * `synthetic: true`: it is drawing scaffolding, not authored content, so the
+ * serializer skips it and a lossless export reads the pre-detail model
+ * (`renderDetailed().sourceModel`). Re-applying `applyDetail` to an already
+ * detailed model counts only the real members, so markers never stack.
  */
 export declare function applyDetail(model: PlantUmlModel, detail?: DetailLevel, limits?: MemberDisplayLimits): PlantUmlModel;
 /**

package/dist/foundation/layout.js

@@ -5,6 +5,64 @@
  * engines (ELK, Graphviz, a custom tuner) is an injection, not a rewrite.
  */
 import { measureTextWidth, MONOSPACE_FONT_SIZE } from './text-measure.js';
+/** Empty border the canvas keeps around every drawn mark (px). */
+export const CANVAS_CONTENT_MARGIN = 16;
+/**
+ * Grow and translate a layout so every edge route point and the supplied extra
+ * rectangles (edge labels) stays at least `margin` from the canvas side. Routes
+ * and labels are drawn from the layout coordinates but are not part of
+ * `layout.width`/`height` as produced by the engines, so a label hung beside an
+ * outer detour route can sit at a negative x and be clipped by a `0 0 w h`
+ * viewBox.
+ *
+ * Boxes are left alone — the engines already place them inside their own
+ * margin — so this never moves a diagram whose routes and labels already fit:
+ * the input is returned untouched and the canvas never shrinks.
+ */
+export function fitLayoutToContent(layout, extraRects = [], margin = CANVAS_CONTENT_MARGIN) {
+    let minX = Infinity;
+    let minY = Infinity;
+    let maxX = -Infinity;
+    let maxY = -Infinity;
+    const take = (x, y) => {
+        if (x < minX)
+            minX = x;
+        if (x > maxX)
+            maxX = x;
+        if (y < minY)
+            minY = y;
+        if (y > maxY)
+            maxY = y;
+    };
+    for (const edge of layout.edges ?? []) {
+        for (const point of edge.points)
+            take(point.x, point.y);
+    }
+    for (const rect of extraRects) {
+        take(rect.x, rect.y);
+        take(rect.x + rect.width, rect.y + rect.height);
+    }
+    if (minX === Infinity)
+        return layout;
+    const dx = Math.max(0, margin - minX);
+    const dy = Math.max(0, margin - minY);
+    const width = Math.max(layout.width + dx, maxX + dx + margin);
+    const height = Math.max(layout.height + dy, maxY + dy + margin);
+    if (dx === 0 && dy === 0 && width === layout.width && height === layout.height) {
+        return layout;
+    }
+    return {
+        ...layout,
+        nodes: layout.nodes.map((n) => ({ ...n, x: n.x + dx, y: n.y + dy })),
+        edges: layout.edges.map((e) => ({
+            ...e,
+            points: e.points.map((p) => ({ x: p.x + dx, y: p.y + dy })),
+        })),
+        packages: layout.packages?.map((p) => ({ ...p, x: p.x + dx, y: p.y + dy })),
+        width,
+        height,
+    };
+}
 /**
  * Shared drawing metrics. The renderer reads these so entity sizing and the
  * emitted SVG stay in lockstep: the font family and size are bound to the same
@@ -104,6 +162,12 @@ export function autoDetail(entityCount) {
  * of each drawn line (`memberMaxChars`). Truncation only sets
  * `PlantUmlMember.display`; `raw` keeps the full declaration. Without limits
  * the result is byte-for-byte what it always was.
+ *
+ * Row caps replace dropped members with one `… +N more (M members)` row marked
+ * `synthetic: true`: it is drawing scaffolding, not authored content, so the
+ * serializer skips it and a lossless export reads the pre-detail model
+ * (`renderDetailed().sourceModel`). Re-applying `applyDetail` to an already
+ * detailed model counts only the real members, so markers never stack.
  */
 export function applyDetail(model, detail, limits = {}) {
     const level = detail ?? autoDetail(model.entities.length);
@@ -122,24 +186,28 @@ export function applyDetail(model, detail, limits = {}) {
     return {
         ...model,
         entities: model.entities.map((entity) => {
-            const total = entity.members.length;
+            const authored = entity.members.filter((member) => member.synthetic !== true);
+            const total = authored.length;
             if (level === 'names')
-                return total === 0 ? entity : { ...entity, members: [] };
+                return entity.members.length === 0 ? entity : { ...entity, members: [] };
             const rowCap = memberMaxRows !== undefined
                 ? memberMaxRows
                 : level === 'compact'
                     ? COMPACT_MEMBER_ROWS
                     : total;
             if (total <= rowCap) {
-                return hasLimits ? { ...entity, members: entity.members.map(limitMember) } : entity;
+                if (!hasLimits && authored.length === entity.members.length)
+                    return entity;
+                return { ...entity, members: authored.map(limitMember) };
             }
-            const kept = entity.members.slice(0, rowCap).map(limitMember);
+            const kept = authored.slice(0, rowCap).map(limitMember);
             const more = {
                 visibility: 'public',
                 name: '…',
                 kind: 'field',
                 modifiers: [],
                 raw: `… +${total - rowCap} more (${total} members)`,
+                synthetic: true,
             };
             return { ...entity, members: [...kept, more] };
         }),

package/dist/foundation/model.d.ts

@@ -27,6 +27,14 @@ export interface PlantUmlMember {
      * inspector views keep the full declaration.
      */
     display?: string;
+    /**
+     * True when the member never existed in the source: it is a drawn-only
+     * stand-in synthesized by `applyDetail` (the `… +N more (M members)` count
+     * row) to stand for the rows the detail level dropped. It is not part of the
+     * parsed model, so it must never be exported: [[toPlantUml]] skips it, and
+     * the lossless export path serializes `renderDetailed().sourceModel` instead.
+     */
+    synthetic?: true;
 }
 export interface PlantUmlEntity {
     /** Stable node identity inside the diagram (the alias when `as` is used). */

package/dist/parse/serialize.d.ts

@@ -1,13 +1,19 @@
 /**
  * PlantUmlModel → PlantUML class-diagram text.
  *
- * The inverse of [[parsePlantUml]]: `toPlantUml(renderDetailed(...).model)`
- * reproduces the diagram that was actually drawn (after view/transform/detail)
- * as source a user can copy and paste. Pure and synchronous — the model is the
- * only input, so the caller composes the scope by picking the model
+ * The inverse of [[parsePlantUml]]. The model is the only input, so the caller
+ * composes the scope by picking the model
  * (`toPlantUml(applyView(model, {kind: 'neighborhood', entity, hops}))`); this
  * function never chooses a range on its own.
  *
+ * For a **lossless export** of what `renderDetailed` parsed, pass its
+ * `sourceModel` (the post-view/transform, pre-detail model):
+ * `toPlantUml(renderDetailed(input).sourceModel)`. Passing `model` instead
+ * serializes the model that was drawn — detail truncation has already dropped
+ * rows there, so the text is only as complete as the drawing. Members marked
+ * `synthetic` (the `… +N more (M members)` count row `applyDetail` adds) are
+ * drawing scaffolding, not authored content, and are always skipped.
+ *
  * Shapes that only exist after parsing (stub/external/usageCount, aggregated
  * edge weights, cycle markers) are rendering semantics with no PlantUML
  * spelling; they serialize as their plain-text equivalent (stub → class,

package/dist/parse/serialize.js

@@ -1,13 +1,19 @@
 /**
  * PlantUmlModel → PlantUML class-diagram text.
  *
- * The inverse of [[parsePlantUml]]: `toPlantUml(renderDetailed(...).model)`
- * reproduces the diagram that was actually drawn (after view/transform/detail)
- * as source a user can copy and paste. Pure and synchronous — the model is the
- * only input, so the caller composes the scope by picking the model
+ * The inverse of [[parsePlantUml]]. The model is the only input, so the caller
+ * composes the scope by picking the model
  * (`toPlantUml(applyView(model, {kind: 'neighborhood', entity, hops}))`); this
  * function never chooses a range on its own.
  *
+ * For a **lossless export** of what `renderDetailed` parsed, pass its
+ * `sourceModel` (the post-view/transform, pre-detail model):
+ * `toPlantUml(renderDetailed(input).sourceModel)`. Passing `model` instead
+ * serializes the model that was drawn — detail truncation has already dropped
+ * rows there, so the text is only as complete as the drawing. Members marked
+ * `synthetic` (the `… +N more (M members)` count row `applyDetail` adds) are
+ * drawing scaffolding, not authored content, and are always skipped.
+ *
  * Shapes that only exist after parsing (stub/external/usageCount, aggregated
  * edge weights, cycle markers) are rendering semantics with no PlantUML
  * spelling; they serialize as their plain-text equivalent (stub → class,
@@ -131,10 +137,13 @@ function entityLines(entity, depth, aliases) {
     const indent = INDENT.repeat(depth);
     const alias = aliases.alias(entity.id, entity.name);
     const head = `${entityKeyword(entity)} ${quoteName(entity.name)}${genericSuffix(entity)} as ${alias}`;
-    if (entity.members.length === 0)
+    // Synthetic rows (applyDetail's `… +N more` marker) stand in for members the
+    // drawing dropped; they are not authored content, so they never serialize.
+    const members = entity.members.filter((member) => member.synthetic !== true);
+    if (members.length === 0)
         return [`${indent}${head}`];
     const lines = [`${indent}${head} {`];
-    for (const member of entity.members) {
+    for (const member of members) {
         lines.push(`${indent}${INDENT}${memberLine(member)}`);
     }
     lines.push(`${indent}}`);
@@ -146,10 +155,9 @@ function genericSuffix(entity) {
 }
 /**
  * One member row. The authored `raw` text is authoritative (it carries the
- * visibility symbol and the exact signature), except for synthesized rows —
- * the detail pipeline's `… +N more (M members)` truncation marker has no
- * visibility symbol, so it gets one prefixed to stay parseable as a member
- * row while keeping the marker text verbatim.
+ * visibility symbol and the exact signature); a declaration without a leading
+ * visibility symbol gets one prefixed so the row stays parseable. Synthetic
+ * detail markers never reach this function (see [[entityLines]]).
  */
 function memberLine(member) {
     const raw = (member.raw ?? '').trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yalehwang/plantuml-js",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Pure-TypeScript PlantUML class diagram renderer (MIT)",
   "type": "module",
   "license": "MIT",