@adecore/diagram 0.23.1 → 0.24.1

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-export { type NodeBox, type GroupBox, type EdgeLabelBox, type EdgeRoute, type DiagramLayout, NODE_MAX_WIDTH, CYLINDER_LID, EDGE_LABEL_MAX_WIDTH, EDGE_LABEL_PADDING, GROUP_PADDING, GROUP_LABEL_BAND, GROUP_LABEL_INSET, type NodeSize, sizeOfNode, sizeOfEdgeLabel, layersOf, layoutOf, LABEL_LINE, LABEL_SIZE, SUB_LINE, SUB_SIZE, estimateTextWidth, wrapText, type Point, type Rect } from './layout.ts';
+export { type NodeBox, type GroupBox, type EdgeLabelBox, type EdgeRoute, type DiagramLayout, GROUP_LABEL_BAND, layoutOf, type Point, type Rect } from './layout.ts';
+export { LABEL_SIZE, SUB_SIZE } from './text.ts';
 export { readingOrder } from './reading-order.ts';
 export { type ShapePaths, shapePaths, type TextLine, textLinesOf, edgeLabelLinesOf, edgePath, arrowHeadPath, dashOf } from './shapes.ts';
 export { type DiagramSvgOptions, DEFAULT_DIAGRAM_MARGIN, DEFAULT_NODE_TONE, DEFAULT_GROUP_TONE, DEFAULT_EDGE_TONE, toSvg } from './svg.ts';

package/dist/index.js

@@ -1,4 +1,5 @@
-export { NODE_MAX_WIDTH, CYLINDER_LID, EDGE_LABEL_MAX_WIDTH, EDGE_LABEL_PADDING, GROUP_PADDING, GROUP_LABEL_BAND, GROUP_LABEL_INSET, sizeOfNode, sizeOfEdgeLabel, layersOf, layoutOf, LABEL_LINE, LABEL_SIZE, SUB_LINE, SUB_SIZE, estimateTextWidth, wrapText } from './layout.js';
+export { GROUP_LABEL_BAND, layoutOf } from './layout.js';
+export { LABEL_SIZE, SUB_SIZE } from './text.js';
 export { readingOrder } from './reading-order.js';
 export { shapePaths, textLinesOf, edgeLabelLinesOf, edgePath, arrowHeadPath, dashOf } from './shapes.js';
 export { DEFAULT_DIAGRAM_MARGIN, DEFAULT_NODE_TONE, DEFAULT_GROUP_TONE, DEFAULT_EDGE_TONE, toSvg } from './svg.js';

package/dist/layout.d.ts

@@ -1,6 +1,5 @@
 import type { DiagramDocument, DiagramEdge, DiagramNode } from './protocol.ts';
 import { type Point, type Rect } from '@adecore/drawing';
-export { LABEL_LINE, LABEL_SIZE, SUB_LINE, SUB_SIZE, estimateTextWidth, wrapText } from './text.ts';
 export type { Point, Rect } from '@adecore/drawing';
 export interface NodeBox extends Rect {
     id: string;
@@ -29,16 +28,12 @@ export interface DiagramLayout {
     edges: EdgeRoute[];
     bounds: Rect;
 }
-export declare const NODE_MAX_WIDTH = 280;
 export declare const CYLINDER_LID = 10;
-export declare const EDGE_LABEL_MAX_WIDTH = 160;
 export declare const EDGE_LABEL_PADDING: {
     x: number;
     y: number;
 };
-export declare const GROUP_PADDING = 20;
 export declare const GROUP_LABEL_BAND = 24;
-export declare const GROUP_LABEL_INSET = 12;
 export interface NodeSize {
     w: number;
     h: number;
@@ -46,10 +41,5 @@ export interface NodeSize {
     sub: string[];
 }
 export declare function sizeOfNode(node: Pick<DiagramNode, 'label' | 'sub' | 'shape'>): NodeSize;
-export declare function sizeOfEdgeLabel(text: string): {
-    w: number;
-    h: number;
-    lines: string[];
-};
 export declare function layersOf(nodes: readonly Pick<DiagramNode, 'id'>[], edges: readonly Pick<DiagramEdge, 'from' | 'to'>[]): Map<string, number>;
 export declare function layoutOf(document: Pick<DiagramDocument, 'meta' | 'nodes' | 'groups' | 'edges'>): DiagramLayout;

package/dist/layout.js

@@ -4,23 +4,22 @@ import { DUMMY_MARGIN, NODE_MARGIN, bandCode } from './graph.js';
 import { orderLayers } from './order.js';
 import { routeChannel } from './route.js';
 import { LABEL_LINE, LABEL_SIZE, SUB_LINE, SUB_SIZE, estimateTextWidth, widestLine, wrapText } from './text.js';
-export { LABEL_LINE, LABEL_SIZE, SUB_LINE, SUB_SIZE, estimateTextWidth, wrapText } from './text.js';
 const NODE_PADDING_X = 16;
 const NODE_PADDING_Y = 13;
 const NODE_MIN_WIDTH = 120;
-export const NODE_MAX_WIDTH = 280;
+const NODE_MAX_WIDTH = 280;
 const TEXT_MAX_WIDTH = NODE_MAX_WIDTH - NODE_PADDING_X * 2;
 /* A diamond holds its text in the middle of its box, so its lines are shorter and the box is twice their size. */
 const DIAMOND_TEXT_MAX_WIDTH = 160;
 const DIAMOND_MIN = { w: 168, h: 72 };
 /* The extra height of a cylinder, for the lid its text stays under. */
 export const CYLINDER_LID = 10;
-export const EDGE_LABEL_MAX_WIDTH = 160;
+const EDGE_LABEL_MAX_WIDTH = 160;
 export const EDGE_LABEL_PADDING = { x: 4, y: 2 };
-export const GROUP_PADDING = 20;
+const GROUP_PADDING = 20;
 /* The band on top of a group where its label sits. */
 export const GROUP_LABEL_BAND = 24;
-export const GROUP_LABEL_INSET = 12;
+const GROUP_LABEL_INSET = 12;
 /* Room between a layer's widest box and the first thing in the channel after it. */
 const EDGE_CLEAR = 20;
 /* How far a loop on one node reaches out of its box. */
@@ -54,7 +53,7 @@ export function sizeOfNode(node) {
     return { w: even(Math.max(NODE_MIN_WIDTH, textWidth + paddingX * 2)), h: even(h), label, sub };
 }
 /* The box of an edge's label before it is placed: wrapped narrower than a node, on a padding of its own. */
-export function sizeOfEdgeLabel(text) {
+function sizeOfEdgeLabel(text) {
     const lines = wrapText(text, SUB_SIZE, false, EDGE_LABEL_MAX_WIDTH);
     return {
         w: even(widestLine(lines, SUB_SIZE, false) + EDGE_LABEL_PADDING.x * 2),

package/dist/svg.js

@@ -1,4 +1,4 @@
-import { DEFAULT_FONT_STACKS, DEFAULT_PALETTE, DEFAULT_PAPER } from '@adecore/drawing';
+import { DEFAULT_FONT_STACKS, DEFAULT_PALETTE, DEFAULT_PAPER, escapeXml } from '@adecore/drawing';
 import { GROUP_LABEL_BAND, layoutOf } from './layout.js';
 import { arrowHeadPath, dashOf, edgeLabelLinesOf, edgePath, shapePaths, textLinesOf } from './shapes.js';
 import { SUB_SIZE } from './text.js';
@@ -7,12 +7,6 @@ export const DEFAULT_DIAGRAM_MARGIN = 32;
 export const DEFAULT_NODE_TONE = 'ink';
 export const DEFAULT_GROUP_TONE = 'muted';
 export const DEFAULT_EDGE_TONE = 'muted';
-// XML has no way to write a control character other than tab and the line breaks, not even escaped.
-// oxlint-disable-next-line no-control-regex
-const NOT_XML = /[\u0000-\u0008\u000B\u000C\u000E-\u001F\uFFFE\uFFFF]/g;
-function escapeXml(value) {
-    return value.replace(NOT_XML, '').replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&apos;');
-}
 /* The whole diagram as one SVG string, from the same layout and paths a view draws with its own elements. */
 export function toSvg(document, options = {}) {
     const palette = options.palette ?? DEFAULT_PALETTE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/diagram",
-  "version": "0.23.1",
+  "version": "0.24.1",
   "description": "Directed graph schemas, layered layout, SVG export and reading order.",
   "license": "FSL-1.1-MIT",
   "author": "Bas Milius",
@@ -19,6 +19,7 @@
     "dist",
     "src",
     "!src/**/*.test.ts",
+    "!src/**/__snapshots__",
     "!src/fixtures"
   ],
   "exports": {
@@ -44,7 +45,7 @@
     "typescript": "^7.0.2"
   },
   "dependencies": {
-    "@adecore/drawing": "0.23.1",
+    "@adecore/drawing": "0.24.1",
     "zod": "^4.6.5"
   }
 }

package/src/index.ts

@@ -4,27 +4,12 @@ export {
     type EdgeLabelBox,
     type EdgeRoute,
     type DiagramLayout,
-    NODE_MAX_WIDTH,
-    CYLINDER_LID,
-    EDGE_LABEL_MAX_WIDTH,
-    EDGE_LABEL_PADDING,
-    GROUP_PADDING,
     GROUP_LABEL_BAND,
-    GROUP_LABEL_INSET,
-    type NodeSize,
-    sizeOfNode,
-    sizeOfEdgeLabel,
-    layersOf,
     layoutOf,
-    LABEL_LINE,
-    LABEL_SIZE,
-    SUB_LINE,
-    SUB_SIZE,
-    estimateTextWidth,
-    wrapText,
     type Point,
     type Rect
 } from './layout.ts';
+export { LABEL_SIZE, SUB_SIZE } from './text.ts';
 export { readingOrder } from './reading-order.ts';
 export { type ShapePaths, shapePaths, type TextLine, textLinesOf, edgeLabelLinesOf, edgePath, arrowHeadPath, dashOf } from './shapes.ts';
 export { type DiagramSvgOptions, DEFAULT_DIAGRAM_MARGIN, DEFAULT_NODE_TONE, DEFAULT_GROUP_TONE, DEFAULT_EDGE_TONE, toSvg } from './svg.ts';

package/src/layout.ts

@@ -6,8 +6,6 @@ import { orderLayers } from './order.ts';
 import { routeChannel, type ChannelHop, type ChannelLabel } from './route.ts';
 import { LABEL_LINE, LABEL_SIZE, SUB_LINE, SUB_SIZE, estimateTextWidth, widestLine, wrapText } from './text.ts';
 
-export { LABEL_LINE, LABEL_SIZE, SUB_LINE, SUB_SIZE, estimateTextWidth, wrapText } from './text.ts';
-
 export type { Point, Rect } from '@adecore/drawing';
 
 export interface NodeBox extends Rect {
@@ -56,19 +54,19 @@ export interface DiagramLayout {
 const NODE_PADDING_X = 16;
 const NODE_PADDING_Y = 13;
 const NODE_MIN_WIDTH = 120;
-export const NODE_MAX_WIDTH = 280;
+const NODE_MAX_WIDTH = 280;
 const TEXT_MAX_WIDTH = NODE_MAX_WIDTH - NODE_PADDING_X * 2;
 /* A diamond holds its text in the middle of its box, so its lines are shorter and the box is twice their size. */
 const DIAMOND_TEXT_MAX_WIDTH = 160;
 const DIAMOND_MIN = { w: 168, h: 72 };
 /* The extra height of a cylinder, for the lid its text stays under. */
 export const CYLINDER_LID = 10;
-export const EDGE_LABEL_MAX_WIDTH = 160;
+const EDGE_LABEL_MAX_WIDTH = 160;
 export const EDGE_LABEL_PADDING = { x: 4, y: 2 };
-export const GROUP_PADDING = 20;
+const GROUP_PADDING = 20;
 /* The band on top of a group where its label sits. */
 export const GROUP_LABEL_BAND = 24;
-export const GROUP_LABEL_INSET = 12;
+const GROUP_LABEL_INSET = 12;
 /* Room between a layer's widest box and the first thing in the channel after it. */
 const EDGE_CLEAR = 20;
 /* How far a loop on one node reaches out of its box. */
@@ -112,7 +110,7 @@ export function sizeOfNode(node: Pick<DiagramNode, 'label' | 'sub' | 'shape'>):
 }
 
 /* The box of an edge's label before it is placed: wrapped narrower than a node, on a padding of its own. */
-export function sizeOfEdgeLabel(text: string): { w: number; h: number; lines: string[] } {
+function sizeOfEdgeLabel(text: string): { w: number; h: number; lines: string[] } {
     const lines = wrapText(text, SUB_SIZE, false, EDGE_LABEL_MAX_WIDTH);
     return {
         w: even(widestLine(lines, SUB_SIZE, false) + EDGE_LABEL_PADDING.x * 2),

package/src/svg.ts

@@ -1,6 +1,6 @@
 import type { DrawingColor } from '@adecore/drawing/protocol';
 import type { DiagramDocument } from './protocol.ts';
-import { DEFAULT_FONT_STACKS, DEFAULT_PALETTE, DEFAULT_PAPER } from '@adecore/drawing';
+import { DEFAULT_FONT_STACKS, DEFAULT_PALETTE, DEFAULT_PAPER, escapeXml } from '@adecore/drawing';
 import { GROUP_LABEL_BAND, layoutOf, type DiagramLayout } from './layout.ts';
 import { arrowHeadPath, dashOf, edgeLabelLinesOf, edgePath, shapePaths, textLinesOf } from './shapes.ts';
 import { SUB_SIZE } from './text.ts';
@@ -26,14 +26,6 @@ export const DEFAULT_NODE_TONE: DrawingColor = 'ink';
 export const DEFAULT_GROUP_TONE: DrawingColor = 'muted';
 export const DEFAULT_EDGE_TONE: DrawingColor = 'muted';
 
-// XML has no way to write a control character other than tab and the line breaks, not even escaped.
-// oxlint-disable-next-line no-control-regex
-const NOT_XML = /[\u0000-\u0008\u000B\u000C\u000E-\u001F\uFFFE\uFFFF]/g;
-
-function escapeXml(value: string): string {
-    return value.replace(NOT_XML, '').replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&apos;');
-}
-
 /* The whole diagram as one SVG string, from the same layout and paths a view draws with its own elements. */
 export function toSvg(document: Pick<DiagramDocument, 'meta' | 'nodes' | 'groups' | 'edges'>, options: DiagramSvgOptions = {}): string {
     const palette = options.palette ?? DEFAULT_PALETTE;