@formicoidea/labre-framework-uml 0.43.1 → 0.46.0

package/dist/actions.d.ts

@@ -293,29 +293,6 @@ export declare function activateUmlEdge(std: BlockStdScope, role: UmlEdgeRole):
  * document is for.
  */
 export declare function umlDiagramsSelected(std: BlockStdScope): UmlDiagramElementModel[];
-/**
- * Draw the legend of what is actually on the selected frame, bottom-left of it.
- *
- * The FIRST selected frame and no other: a legend is placed relative to one
- * background, and two of them would put two boxes on top of whatever sits in
- * that corner. Everything about the gesture — the scan, the placement, the box —
- * is `createBoardLegend`'s; UML contributes nothing but the rows its own
- * commands subscribe (`commands.ts`, `docs/adr/0026`).
- *
- * The one action in this file with no command behind it, exactly as in C4: the
- * legend is reached from the selected frame's contextual toolbar and from
- * nowhere else (PO arbitration, 27/08/2026 — see `toolbar/config.ts`). It is a
- * legend OF something you have in front of you, not an artefact to pick off a
- * palette. Kept here beside its siblings all the same, because it is the same
- * kind of thing — a gesture that writes elements — and because a unit test can
- * drive it without a toolbar.
- *
- * A legend earns its place in UML more than in most packs: the notation's dozen
- * relationships differ by a diamond's fill and a triangle's outline, and a
- * reader who is not fluent in §11.5.4 cannot tell a shared aggregation from a
- * composition without a key on the sheet.
- */
-export declare function createUmlLegend(std: BlockStdScope): void;
 /**
  * The diagrams the export speaks about: the SELECTED ones, or every diagram on
  * the surface when nothing is selected.

package/dist/actions.js

@@ -1,4 +1,4 @@
-import { createBoardLegend, DefaultTool, runInterchangeImportFile, } from '@formicoidea/labre-core/blocks/surface';
+import { DefaultTool, runInterchangeImportFile, } from '@formicoidea/labre-core/blocks/surface';
 import { ConnectorTool } from '@formicoidea/labre-core/gfx/connector';
 import { ConnectorMode, TextAlign, UmlDiagramElementModel, } from '@formicoidea/labre-core/model';
 import { translateKey } from '@formicoidea/labre-core/shared/services';
@@ -12,7 +12,7 @@ import { UML_EDGE_STYLE } from './edge-styles.js';
 import { umlSafeFilename } from './filename.js';
 import { UML_DRAWIO_IMPORT, UML_PLANTUML_EXPORT, UML_PLANTUML_IMPORT, UML_XMI_EXPORT, UML_XMI_IMPORT, } from './interchange.js';
 import { UML_ATTRIBUTES_SEED, UML_ATTRIBUTES_SEED_KEY, UML_NAME_SEED, UML_OPERATIONS_SEED, UML_OPERATIONS_SEED_KEY, UML_SLOTS_SEED, UML_SLOTS_SEED_KEY, UML_UNLABELLED_KINDS, umlSeedKey, } from './keywords.js';
-import { umlNodeProps, umlTextProps } from './presets.js';
+import { umlNameDecoration, umlNodeProps, umlTextProps } from './presets.js';
 import { UML_ROLE, umlDiagramRoleKey, umlRoleKey, umlSubjectRoleKey, } from './roles.js';
 /**
  * Standalone creation/activation actions for the UML toolbox — the same shape
@@ -477,6 +477,7 @@ export function createUmlClassifier(std, kind) {
         fontSize: UML_NAME_FONT_SIZE,
         align: TextAlign.Center,
         bold: true,
+        decoration: umlNameDecoration(kind),
     })] = true;
     if (boxes.attributes) {
         const [bodyKey, bodyText] = BODY_SEED[kind] ?? [
@@ -548,34 +549,6 @@ export function umlDiagramsSelected(std) {
         return [];
     return gfxOf(std).selection.selectedElements.filter((model) => model instanceof UmlDiagramElementModel);
 }
-/**
- * Draw the legend of what is actually on the selected frame, bottom-left of it.
- *
- * The FIRST selected frame and no other: a legend is placed relative to one
- * background, and two of them would put two boxes on top of whatever sits in
- * that corner. Everything about the gesture — the scan, the placement, the box —
- * is `createBoardLegend`'s; UML contributes nothing but the rows its own
- * commands subscribe (`commands.ts`, `docs/adr/0026`).
- *
- * The one action in this file with no command behind it, exactly as in C4: the
- * legend is reached from the selected frame's contextual toolbar and from
- * nowhere else (PO arbitration, 27/08/2026 — see `toolbar/config.ts`). It is a
- * legend OF something you have in front of you, not an artefact to pick off a
- * palette. Kept here beside its siblings all the same, because it is the same
- * kind of thing — a gesture that writes elements — and because a unit test can
- * drive it without a toolbar.
- *
- * A legend earns its place in UML more than in most packs: the notation's dozen
- * relationships differ by a diamond's fill and a triangle's outline, and a
- * reader who is not fluent in §11.5.4 cannot tell a shared aggregation from a
- * composition without a key on the sheet.
- */
-export function createUmlLegend(std) {
-    const diagram = umlDiagramsSelected(std)[0];
-    if (!diagram)
-        return;
-    createBoardLegend(std, diagram, 'uml');
-}
 /* ── Export (PlantUML, XMI 2.5.1) ──────────────────────────────────────── */
 /**
  * The diagrams the export speaks about: the SELECTED ones, or every diagram on

package/dist/element-renderer.d.ts

@@ -13,20 +13,20 @@ import type { UmlDiagramElementModel, UmlFragmentElementModel, UmlPartitionEleme
  * them directly with a canvas stub.
  */
 export declare const umlDiagram: ElementRenderer<UmlDiagramElementModel>;
-export declare const UmlDiagramRendererExtension: import("@formicoidea/labre-core/store/index.js").ExtensionType & {
+export declare const UmlDiagramRendererExtension: import("@formicoidea/labre-core/_pkgs/store/index.js").ExtensionType & {
     identifier: import("@formicoidea/labre-core/_pkgs/global/di/types.js").ServiceIdentifier<ElementRenderer<UmlDiagramElementModel>>;
 };
 export declare const umlSubject: ElementRenderer<UmlSubjectElementModel>;
-export declare const UmlSubjectRendererExtension: import("@formicoidea/labre-core/store/index.js").ExtensionType & {
+export declare const UmlSubjectRendererExtension: import("@formicoidea/labre-core/_pkgs/store/index.js").ExtensionType & {
     identifier: import("@formicoidea/labre-core/_pkgs/global/di/types.js").ServiceIdentifier<ElementRenderer<UmlSubjectElementModel>>;
 };
 export declare const umlPartition: ElementRenderer<UmlPartitionElementModel>;
-export declare const UmlPartitionRendererExtension: import("@formicoidea/labre-core/store/index.js").ExtensionType & {
+export declare const UmlPartitionRendererExtension: import("@formicoidea/labre-core/_pkgs/store/index.js").ExtensionType & {
     identifier: import("@formicoidea/labre-core/_pkgs/global/di/types.js").ServiceIdentifier<ElementRenderer<UmlPartitionElementModel>>;
 };
 /** The composite state (§14.2.4) — one declaration, no orientation to turn. */
 export declare const umlRegion: ElementRenderer<UmlRegionElementModel>;
-export declare const UmlRegionRendererExtension: import("@formicoidea/labre-core/store/index.js").ExtensionType & {
+export declare const UmlRegionRendererExtension: import("@formicoidea/labre-core/_pkgs/store/index.js").ExtensionType & {
     identifier: import("@formicoidea/labre-core/_pkgs/global/di/types.js").ServiceIdentifier<ElementRenderer<UmlRegionElementModel>>;
 };
 /**
@@ -59,6 +59,6 @@ export declare const UmlRegionRendererExtension: import("@formicoidea/labre-core
  */
 export declare function umlFragmentAsPainted(model: UmlFragmentElementModel): UmlFragmentElementModel;
 export declare const umlFragment: ElementRenderer<UmlFragmentElementModel>;
-export declare const UmlFragmentRendererExtension: import("@formicoidea/labre-core/store/index.js").ExtensionType & {
+export declare const UmlFragmentRendererExtension: import("@formicoidea/labre-core/_pkgs/store/index.js").ExtensionType & {
     identifier: import("@formicoidea/labre-core/_pkgs/global/di/types.js").ServiceIdentifier<ElementRenderer<UmlFragmentElementModel>>;
 };

package/dist/filename.d.ts

@@ -1,16 +1,8 @@
 /**
- * A name a file system will accept, minus the extension.
+ * A name a file system will accept, minus the extension: the shared
+ * `safeFilename`, held to it by `safe-filename-parity.unit.spec.ts`.
  *
- * The same transformations `c4SafeFilename` and `bpmnSafeFilename` apply, and
- * for the same reasons — reserved characters become `-`, whitespace runs
- * collapse, the result is capped, and the Windows tail of dots and spaces is
- * trimmed AFTER the cap so the extension is not the thing that gets eaten.
- *
- * Duplicated rather than imported, which is the trade the two packs before this
- * one made explicitly: a filename rule is not API, and coupling three frameworks
- * so they can share eight lines buys nothing and costs a shared thing to break.
- *
- * `fallback` is a parameter here where the other two hard-code theirs, because
+ * `fallback` is a parameter here where the other frameworks hard-code theirs, because
  * UML writes two formats out of one pack and the word a nameless document should
  * take is the FORMAT's rather than the framework's.
  */

package/dist/filename.js

@@ -1,26 +1,12 @@
+import { safeFilename } from '@formicoidea/labre-core/shared/utils';
 /**
- * A name a file system will accept, minus the extension.
+ * A name a file system will accept, minus the extension: the shared
+ * `safeFilename`, held to it by `safe-filename-parity.unit.spec.ts`.
  *
- * The same transformations `c4SafeFilename` and `bpmnSafeFilename` apply, and
- * for the same reasons — reserved characters become `-`, whitespace runs
- * collapse, the result is capped, and the Windows tail of dots and spaces is
- * trimmed AFTER the cap so the extension is not the thing that gets eaten.
- *
- * Duplicated rather than imported, which is the trade the two packs before this
- * one made explicitly: a filename rule is not API, and coupling three frameworks
- * so they can share eight lines buys nothing and costs a shared thing to break.
- *
- * `fallback` is a parameter here where the other two hard-code theirs, because
+ * `fallback` is a parameter here where the other frameworks hard-code theirs, because
  * UML writes two formats out of one pack and the word a nameless document should
  * take is the FORMAT's rather than the framework's.
  */
 export function umlSafeFilename(raw, fallback = 'diagram') {
-    const safe = (raw ?? '')
-        .trim()
-        .replaceAll(/[\\/:*?"<>|]/g, '-')
-        .replaceAll(/\s+/g, ' ')
-        .trim()
-        .slice(0, 120)
-        .replace(/[. ]+$/, '');
-    return safe || fallback;
+    return safeFilename(raw, fallback);
 }

package/dist/import.js

@@ -6,7 +6,7 @@ import { UML_EDGE_STYLE } from './edge-styles.js';
 import { formatActivityEdgeLabel, formatEndLabel, formatTransitionLabel, } from './grammar.js';
 import { guillemets, UML_UNLABELLED_KINDS } from './keywords.js';
 import { umlGuardText, } from './model.js';
-import { umlNodeProps, umlTextProps } from './presets.js';
+import { umlNameDecoration, umlNodeProps, umlTextProps } from './presets.js';
 import { UML_ROLE } from './roles.js';
 /**
  * The **one materializer** every UML importer ends on — a model in, the
@@ -1006,6 +1006,8 @@ export function umlElementsFromModel(models, options) {
                         // The classifier's name is the heading of a divided box; a
                         // glyph's one word is not.
                         ...(compartmented ? { bold: true } : {}),
+                        // The toolbox's own preset: an instance's name is underlined.
+                        decoration: umlNameDecoration(kind),
                     }),
                     id: tierId,
                     text: tiers.name,

package/dist/node/node-renderer.d.ts

@@ -9,7 +9,13 @@ import { type UmlCompartmentBoxes } from '../component.js';
  * they are already on the canvas — so a renderer holding them would be holding a
  * second opinion about where words it does not draw ought to be.
  */
-type UmlSeparators = Pick<UmlCompartmentBoxes, 'name' | 'splits'>;
+type UmlSeparators = Pick<UmlCompartmentBoxes, 'name' | 'splits'> & {
+    /**
+     * Whether the name tier carries a `textDecoration` of its own, whatever its
+     * value: the text then owns the instance underline (ADR 0030 §4).
+     */
+    nameDecorated?: boolean;
+};
 /**
  * The compartment layout to stroke this node's separators from: the one its
  * TIERS describe if they can be reached, and the default stack otherwise.
@@ -43,7 +49,7 @@ type UmlSeparators = Pick<UmlCompartmentBoxes, 'name' | 'splits'>;
  */
 export declare function umlNodeCompartments(model: UmlNodeElementModel, w: number, h: number): UmlSeparators;
 export declare const umlNode: ElementRenderer<UmlNodeElementModel>;
-export declare const UmlNodeRendererExtension: import("@formicoidea/labre-core/store/index.js").ExtensionType & {
+export declare const UmlNodeRendererExtension: import("@formicoidea/labre-core/_pkgs/store/index.js").ExtensionType & {
     identifier: import("@formicoidea/labre-core/_pkgs/global/di/types.js").ServiceIdentifier<ElementRenderer<UmlNodeElementModel>>;
 };
 export {};

package/dist/node/node-renderer.js

@@ -179,10 +179,15 @@ function paintGlyph(kind, ctx, w, h, inset, boxes) {
             line(ctx, x0, split, x1, split);
         }
         // An instance's name is UNDERLINED (§9.8.4) — the one mark that tells a
-        // reader an object from the class it is an instance of. Drawn under the NAME
-        // box and only as wide as it, so it reads as a rule under the words rather
-        // than as a fifth compartment line.
-        if (kind === 'object') {
+        // reader an object from the class it is an instance of. Since ADR 0030 the
+        // name is CREATED underlined and the text renderer draws the line under the
+        // words; this rule under the NAME box is the paint-time fallback for a name
+        // that never carried the field (an object drawn before, or by an older
+        // client). Any stored value — `none` included — hands the line to the text.
+        // ponytail: an old object keeps this box-wide rule until its author touches
+        // the decoration toggle once; a deliberate "normalise decorations" command
+        // is the upgrade, if ever asked — never a migration on open.
+        if (kind === 'object' && !boxes.nameDecorated) {
             const { name } = boxes;
             const under = name.y + name.h;
             if (under > y0 && under < y1 && name.w > 0) {
@@ -551,27 +556,36 @@ export function umlNodeCompartments(model, w, h) {
     const group = model.group;
     // No splits at all is a kind that is a PICTURE (a package, an actor, a cube):
     // there are no compartments to read off, and nothing below would mean
-    // anything. A rotated shape is the documented ceiling above.
-    if (defaults.splits.length === 0 || model.rotate || !group)
+    // anything.
+    if (defaults.splits.length === 0 || !group)
         return defaults;
     const children = group.childElements;
     const component = umlComponentSiblings({ id: group.id, childIds: group.childIds }, children);
+    const name = children.find(child => child.id === component.name?.id);
+    // Read before any fallback below, so a rotated or displaced node never draws
+    // the legacy rule under a name that already decorates itself.
+    const nameDecorated = name?.textDecoration !==
+        undefined;
+    const fallback = { ...defaults, nameDecorated };
+    // A rotated shape is the documented ceiling above.
+    if (model.rotate)
+        return fallback;
     // The BODY tier is what both separators hang off: the line above it is where
     // the name compartment stops, the line below it where the operations start.
     // Its role is `uml:attributes` on all seven compartmented kinds — a slot list,
     // a component's parts, a state's activities included (`component.ts`).
     const body = children.find(child => child.id === component.attributes?.id);
     if (!body)
-        return defaults;
+        return fallback;
     const [nodeX, nodeY] = model.deserializedXYWH;
     const top = body.y - nodeY;
     const bottom = top + body.h;
     // A tier dragged clean off its node says nothing useful about where a line
     // INSIDE the node goes.
     if (!(top > 0) || !(bottom > top))
-        return defaults;
-    const name = children.find(child => child.id === component.name?.id);
+        return fallback;
     return {
+        nameDecorated,
         // The name box is read for the one thing it is used for: the rule under an
         // INSTANCE's name (§9.8.4), which has to stay under the words once a
         // two-line name has pushed them down.

package/dist/presets.d.ts

@@ -1,4 +1,4 @@
-import { TextAlign, type UmlNodeKind } from '@formicoidea/labre-core/model';
+import { TextAlign, TextDecoration, type UmlNodeKind } from '@formicoidea/labre-core/model';
 import type { UmlBox } from './component.js';
 /**
  * What a UML shape IS, as props — the ONE description the creation site, the
@@ -139,11 +139,29 @@ export declare function umlMorphClears(kind: UmlNodeKind): readonly string[];
  * by size alone. Everything else is Regular, because UML reserves its type
  * variations for meanings the grammar reads (italics for abstract, §9.2.4) and
  * a decorative weight would compete with them.
+ *
+ * `decoration` is written only when given — see {@link umlNameDecoration}. A
+ * decoration is not a remembered style, so `applyLastProps` has none to merge
+ * and its absence is the plain text every other tier is.
  */
 export declare function umlTextProps(role: string, box: UmlBox, options: {
     fontSize: number;
     align: TextAlign;
     bold?: boolean;
+    decoration?: TextDecoration;
 }): Record<string, unknown> & {
     type: string;
 };
+/**
+ * The decoration a kind's NAME tier is created with: an instance's name is
+ * underlined (§9.8.4), every other name is left undecided — no key at all, so
+ * it stores what it stored before ADR 0030.
+ *
+ * One preset, read by every creation site (the toolbox, the importers, and the
+ * templates that record the toolbox), so none restates the notation. The
+ * underline lives on the TEXT since ADR 0030 §4: it runs under the words, not
+ * across the compartment, and the author can restyle it from the text toolbar.
+ * The glyph's old rule survives only as a paint-time fallback for a name that
+ * never carried the field (`node/node-renderer.ts`).
+ */
+export declare function umlNameDecoration(kind: UmlNodeKind): TextDecoration | undefined;

package/dist/presets.js

@@ -1,4 +1,4 @@
-import { FontFamily, FontStyle, FontWeight, ShapeStyle, StrokeStyle, TextAlign, } from '@formicoidea/labre-core/model';
+import { FontFamily, FontStyle, FontWeight, ShapeStyle, StrokeStyle, TextAlign, TextDecoration, } from '@formicoidea/labre-core/model';
 import { Bound } from '@formicoidea/labre-core/global/gfx';
 import { UML_CARD, UML_INK, UML_NAME_FONT_SIZE, UML_NODE_BOX, UML_NODE_RADIUS, UML_NODE_STROKE_WIDTH, } from './consts.js';
 import { UML_ROLE_OF_KIND } from './roles.js';
@@ -285,6 +285,10 @@ export function umlMorphClears(kind) {
  * by size alone. Everything else is Regular, because UML reserves its type
  * variations for meanings the grammar reads (italics for abstract, §9.2.4) and
  * a decorative weight would compete with them.
+ *
+ * `decoration` is written only when given — see {@link umlNameDecoration}. A
+ * decoration is not a remembered style, so `applyLastProps` has none to merge
+ * and its absence is the plain text every other tier is.
  */
 export function umlTextProps(role, box, options) {
     return {
@@ -298,5 +302,21 @@ export function umlTextProps(role, box, options) {
         textAlign: options.align,
         hasMaxWidth: true,
         xywh: new Bound(box.x, box.y, box.w, box.h).serialize(),
+        ...(options.decoration ? { textDecoration: options.decoration } : {}),
     };
 }
+/**
+ * The decoration a kind's NAME tier is created with: an instance's name is
+ * underlined (§9.8.4), every other name is left undecided — no key at all, so
+ * it stores what it stored before ADR 0030.
+ *
+ * One preset, read by every creation site (the toolbox, the importers, and the
+ * templates that record the toolbox), so none restates the notation. The
+ * underline lives on the TEXT since ADR 0030 §4: it runs under the words, not
+ * across the compartment, and the author can restyle it from the text toolbar.
+ * The glyph's old rule survives only as a paint-time fallback for a name that
+ * never carried the field (`node/node-renderer.ts`).
+ */
+export function umlNameDecoration(kind) {
+    return kind === 'object' ? TextDecoration.Underline : undefined;
+}

package/dist/toolbar/config.d.ts

@@ -45,7 +45,7 @@ export declare const umlDiagramToolbarConfig: {
     }, import("@formicoidea/labre-core/shared/services").ToolbarActionGenerator, import("@formicoidea/labre-core/shared/services").ToolbarActionGenerator];
     readonly when: (ctx: ToolbarContext) => boolean;
 };
-export declare const umlDiagramToolbarExtension: import("@formicoidea/labre-core/store/index.js").ExtensionType;
+export declare const umlDiagramToolbarExtension: import("@formicoidea/labre-core/_pkgs/store/index.js").ExtensionType;
 /**
  * The legend button — the flag-gated half of the row.
  *
@@ -97,7 +97,7 @@ export declare const umlLegendToolbarConfig: {
  * modules were registered in.
  */
 export declare const umlDiagramToolingToolbarConfig: ToolbarModuleConfig;
-export declare const umlDiagramToolingToolbarExtension: import("@formicoidea/labre-core/store/index.js").ExtensionType;
+export declare const umlDiagramToolingToolbarExtension: import("@formicoidea/labre-core/_pkgs/store/index.js").ExtensionType;
 /**
  * The ACTIVITY PARTITION's row: the resize toggle, and the one thing a swimlane
  * can be said differently — which way its bands run.
@@ -153,7 +153,7 @@ export declare const umlPartitionToolbarConfig: {
     }];
     readonly when: (ctx: ToolbarContext) => boolean;
 };
-export declare const umlPartitionToolbarExtension: import("@formicoidea/labre-core/store/index.js").ExtensionType;
+export declare const umlPartitionToolbarExtension: import("@formicoidea/labre-core/_pkgs/store/index.js").ExtensionType;
 /**
  * The REGION's row: the resize toggle, and nothing else.
  *
@@ -177,7 +177,7 @@ export declare const umlRegionToolbarConfig: {
     }];
     readonly when: (ctx: ToolbarContext) => boolean;
 };
-export declare const umlRegionToolbarExtension: import("@formicoidea/labre-core/store/index.js").ExtensionType;
+export declare const umlRegionToolbarExtension: import("@formicoidea/labre-core/_pkgs/store/index.js").ExtensionType;
 /**
  * The COMBINED FRAGMENT's always-on row: the resize toggle, and nothing else.
  *
@@ -196,7 +196,7 @@ export declare const umlFragmentToolbarConfig: {
     }];
     readonly when: (ctx: ToolbarContext) => boolean;
 };
-export declare const umlFragmentToolbarExtension: import("@formicoidea/labre-core/store/index.js").ExtensionType;
+export declare const umlFragmentToolbarExtension: import("@formicoidea/labre-core/_pkgs/store/index.js").ExtensionType;
 /**
  * The fragment's FLAG-GATED row: add an operand, pick the operator, and the
  * generic Validation dropdown.
@@ -225,4 +225,4 @@ export declare const umlFragmentToolbarExtension: import("@formicoidea/labre-cor
  * all, so one module is the honest grouping rather than a workaround.
  */
 export declare const umlFragmentToolingToolbarConfig: ToolbarModuleConfig;
-export declare const umlFragmentToolingToolbarExtension: import("@formicoidea/labre-core/store/index.js").ExtensionType;
+export declare const umlFragmentToolingToolbarExtension: import("@formicoidea/labre-core/_pkgs/store/index.js").ExtensionType;

package/dist/toolbar/senior-tool.d.ts

@@ -8,4 +8,4 @@
  * `all/src/__tests__/toolbar/senior-row-order.unit.spec.ts`, which reads this
  * very file.
  */
-export declare const umlSeniorTool: import("@formicoidea/labre-core/store").ExtensionType;
+export declare const umlSeniorTool: import("@formicoidea/labre-core/_pkgs/store").ExtensionType;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@formicoidea/labre-framework-uml",
   "description": "Labre uml framework for @formicoidea/labre-core.",
-  "version": "0.43.1",
+  "version": "0.46.0",
   "type": "module",
   "sideEffects": false,
   "author": "lajola",
@@ -31,8 +31,8 @@
     "dist"
   ],
   "dependencies": {
-    "@formicoidea/labre-core": "0.43.1",
-    "@formicoidea/labre-ddd-shared": "0.43.1",
+    "@formicoidea/labre-core": "0.46.0",
+    "@formicoidea/labre-ddd-shared": "0.46.0",
     "lit": "^3.2.0"
   }
 }