@dxos/diagram 0.11.1 → 0.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/chunk-parse.mjs +9396 -0
- package/dist/lib/chunk-parse.mjs.map +1 -0
- package/dist/lib/extension.mjs +204 -0
- package/dist/lib/extension.mjs.map +1 -0
- package/dist/lib/index.mjs +497 -2846
- package/dist/lib/index.mjs.map +1 -1
- package/dist/types/src/aesthetics.d.ts +12 -0
- package/dist/types/src/aesthetics.d.ts.map +1 -0
- package/dist/types/src/aesthetics.test.d.ts +2 -0
- package/dist/types/src/aesthetics.test.d.ts.map +1 -0
- package/dist/types/src/appeal.d.ts +55 -0
- package/dist/types/src/appeal.d.ts.map +1 -0
- package/dist/types/src/appeal.test.d.ts +2 -0
- package/dist/types/src/appeal.test.d.ts.map +1 -0
- package/dist/types/src/architecture.d.ts +86 -0
- package/dist/types/src/architecture.d.ts.map +1 -0
- package/dist/types/src/architecture.test.d.ts +2 -0
- package/dist/types/src/architecture.test.d.ts.map +1 -0
- package/dist/types/src/compact.d.ts +39 -0
- package/dist/types/src/compact.d.ts.map +1 -0
- package/dist/types/src/compact.test.d.ts +2 -0
- package/dist/types/src/compact.test.d.ts.map +1 -0
- package/dist/types/src/diagnostics.d.ts +70 -3
- package/dist/types/src/diagnostics.d.ts.map +1 -1
- package/dist/types/src/dsl/cli.d.ts +2 -0
- package/dist/types/src/dsl/cli.d.ts.map +1 -0
- package/dist/types/src/dsl/compile.d.ts +12 -0
- package/dist/types/src/dsl/compile.d.ts.map +1 -0
- package/dist/types/src/dsl/convert.d.ts +45 -0
- package/dist/types/src/dsl/convert.d.ts.map +1 -0
- package/dist/types/src/dsl/convert.test.d.ts +2 -0
- package/dist/types/src/dsl/convert.test.d.ts.map +1 -0
- package/dist/types/src/dsl/dsl.test.d.ts +2 -0
- package/dist/types/src/dsl/dsl.test.d.ts.map +1 -0
- package/dist/types/src/dsl/gen/diagram.d.ts +3 -0
- package/dist/types/src/dsl/gen/diagram.d.ts.map +1 -0
- package/dist/types/src/dsl/index.d.ts +7 -0
- package/dist/types/src/dsl/index.d.ts.map +1 -0
- package/dist/types/src/dsl/parse.d.ts +49 -0
- package/dist/types/src/dsl/parse.d.ts.map +1 -0
- package/dist/types/src/dsl/print.d.ts +19 -0
- package/dist/types/src/dsl/print.d.ts.map +1 -0
- package/dist/types/src/dsl/semantic.test.d.ts +2 -0
- package/dist/types/src/dsl/semantic.test.d.ts.map +1 -0
- package/dist/types/src/dsl/vocabulary.d.ts +61 -0
- package/dist/types/src/dsl/vocabulary.d.ts.map +1 -0
- package/dist/types/src/dx-svg.d.ts +12 -0
- package/dist/types/src/dx-svg.d.ts.map +1 -0
- package/dist/types/src/dx-svg.test.d.ts +2 -0
- package/dist/types/src/dx-svg.test.d.ts.map +1 -0
- package/dist/types/src/extension/complete.d.ts +3 -0
- package/dist/types/src/extension/complete.d.ts.map +1 -0
- package/dist/types/src/extension/extension.test.d.ts +2 -0
- package/dist/types/src/extension/extension.test.d.ts.map +1 -0
- package/dist/types/src/extension/highlight.d.ts +14 -0
- package/dist/types/src/extension/highlight.d.ts.map +1 -0
- package/dist/types/src/extension/index.d.ts +6 -0
- package/dist/types/src/extension/index.d.ts.map +1 -0
- package/dist/types/src/extension/language.d.ts +13 -0
- package/dist/types/src/extension/language.d.ts.map +1 -0
- package/dist/types/src/extension/lint.d.ts +21 -0
- package/dist/types/src/extension/lint.d.ts.map +1 -0
- package/dist/types/src/extension/syntax.d.ts +3 -0
- package/dist/types/src/extension/syntax.d.ts.map +1 -0
- package/dist/types/src/index.d.ts +14 -0
- package/dist/types/src/index.d.ts.map +1 -1
- package/dist/types/src/mermaid-engine.d.ts +40 -1
- package/dist/types/src/mermaid-engine.d.ts.map +1 -1
- package/dist/types/src/mermaid.d.ts +3 -3
- package/dist/types/src/mermaid.d.ts.map +1 -1
- package/dist/types/src/nudge.d.ts +30 -0
- package/dist/types/src/nudge.d.ts.map +1 -0
- package/dist/types/src/nudge.test.d.ts +2 -0
- package/dist/types/src/nudge.test.d.ts.map +1 -0
- package/dist/types/src/objective.d.ts +4 -0
- package/dist/types/src/objective.d.ts.map +1 -1
- package/dist/types/src/ortho-router.d.ts +13 -1
- package/dist/types/src/ortho-router.d.ts.map +1 -1
- package/dist/types/src/ports.d.ts +40 -0
- package/dist/types/src/ports.d.ts.map +1 -0
- package/dist/types/src/ports.test.d.ts +2 -0
- package/dist/types/src/ports.test.d.ts.map +1 -0
- package/dist/types/src/relations.test.d.ts +2 -0
- package/dist/types/src/relations.test.d.ts.map +1 -0
- package/dist/types/src/rules.d.ts +30 -0
- package/dist/types/src/rules.d.ts.map +1 -0
- package/dist/types/src/scene.d.ts +99 -65
- package/dist/types/src/scene.d.ts.map +1 -1
- package/dist/types/src/score.d.ts +54 -0
- package/dist/types/src/score.d.ts.map +1 -0
- package/dist/types/src/score.test.d.ts +2 -0
- package/dist/types/src/score.test.d.ts.map +1 -0
- package/dist/types/src/semantic-engine.d.ts +41 -0
- package/dist/types/src/semantic-engine.d.ts.map +1 -0
- package/dist/types/src/semantic-engine.test.d.ts +2 -0
- package/dist/types/src/semantic-engine.test.d.ts.map +1 -0
- package/dist/types/src/semantic-place.d.ts +81 -0
- package/dist/types/src/semantic-place.d.ts.map +1 -0
- package/dist/types/src/semantic-route.d.ts +133 -0
- package/dist/types/src/semantic-route.d.ts.map +1 -0
- package/dist/types/src/semantic.d.ts +164 -0
- package/dist/types/src/semantic.d.ts.map +1 -0
- package/dist/types/src/uml-grid.d.ts.map +1 -1
- package/dist/types/src/uml.d.ts +3 -5
- package/dist/types/src/uml.d.ts.map +1 -1
- package/dist/types/src/view.d.ts +53 -0
- package/dist/types/src/view.d.ts.map +1 -0
- package/dist/types/src/view.test.d.ts +2 -0
- package/dist/types/src/view.test.d.ts.map +1 -0
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +23 -5
- package/rules/DIAGRAM.mdl +388 -0
- package/src/aesthetics.test.ts +89 -0
- package/src/aesthetics.ts +148 -0
- package/src/appeal.test.ts +144 -0
- package/src/appeal.ts +586 -0
- package/src/architecture.test.ts +94 -0
- package/src/architecture.ts +215 -0
- package/src/compact.test.ts +67 -0
- package/src/compact.ts +219 -0
- package/src/diagnostics.test.ts +207 -1
- package/src/diagnostics.ts +481 -37
- package/src/dsl/cli.ts +46 -0
- package/src/dsl/compile.ts +28 -0
- package/src/dsl/convert.test.ts +51 -0
- package/src/dsl/convert.ts +98 -0
- package/src/dsl/diagram.grammar +195 -0
- package/src/dsl/dsl.test.ts +286 -0
- package/src/dsl/gen/diagram.ts +22 -0
- package/src/dsl/index.ts +44 -0
- package/src/dsl/parse.ts +1054 -0
- package/src/dsl/print.ts +198 -0
- package/src/dsl/semantic.test.ts +200 -0
- package/src/dsl/vocabulary.ts +150 -0
- package/src/dx-svg.test.ts +44 -0
- package/src/dx-svg.ts +77 -0
- package/src/extension/complete.ts +105 -0
- package/src/extension/extension.test.ts +135 -0
- package/src/extension/highlight.ts +23 -0
- package/src/extension/index.ts +9 -0
- package/src/extension/language.ts +31 -0
- package/src/extension/lint.ts +60 -0
- package/src/extension/syntax.ts +62 -0
- package/src/index.ts +14 -0
- package/src/mermaid-engine.test.ts +6 -6
- package/src/mermaid-engine.ts +569 -119
- package/src/mermaid.test.ts +17 -1
- package/src/mermaid.ts +30 -18
- package/src/nudge.test.ts +155 -0
- package/src/nudge.ts +385 -0
- package/src/objective.test.ts +2 -0
- package/src/objective.ts +17 -1
- package/src/ortho-router.ts +240 -80
- package/src/ports.test.ts +157 -0
- package/src/ports.ts +186 -0
- package/src/relations.test.ts +98 -0
- package/src/rules.ts +117 -0
- package/src/scene.ts +64 -3
- package/src/score.test.ts +64 -0
- package/src/score.ts +130 -0
- package/src/semantic-engine.test.ts +635 -0
- package/src/semantic-engine.ts +888 -0
- package/src/semantic-place.ts +1508 -0
- package/src/semantic-route.ts +1136 -0
- package/src/semantic.ts +278 -0
- package/src/typings.d.ts +8 -0
- package/src/uml-grid.ts +6 -1
- package/src/uml.test.ts +5 -1
- package/src/uml.ts +24 -11
- package/src/view.test.ts +139 -0
- package/src/view.ts +376 -0
|
@@ -0,0 +1,144 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2026 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import { describe, test } from 'vitest';
|
|
6
|
+
|
|
7
|
+
import { EVALUATORS, measure, overall, visionRules } from './appeal.ts';
|
|
8
|
+
import { RULES, keyOf, parse } from './rules.ts';
|
|
9
|
+
import type * as Scene from './scene.ts';
|
|
10
|
+
|
|
11
|
+
const box = (id: string, x: number, y: number, w = 128, h = 64): Scene.WorldObject => ({
|
|
12
|
+
id,
|
|
13
|
+
origin: { x, y },
|
|
14
|
+
elements: [{ kind: 'rect', id: 'box', x: 0, y: 0, w, h, text: id }],
|
|
15
|
+
});
|
|
16
|
+
|
|
17
|
+
const arrow = (id: string, points: Scene.Point[]): Scene.WorldObject[] => [
|
|
18
|
+
{
|
|
19
|
+
id: `edge-${id}`,
|
|
20
|
+
elements: [
|
|
21
|
+
{ kind: 'line', id: `${id}-path`, points: points.slice(0, -1) },
|
|
22
|
+
{ kind: 'arrow', id, start: points[points.length - 2], end: points[points.length - 1] },
|
|
23
|
+
],
|
|
24
|
+
},
|
|
25
|
+
];
|
|
26
|
+
|
|
27
|
+
const scoreOf = (objects: Scene.WorldObject[], id: string) => measure(objects).find((rule) => rule.id === id)?.score;
|
|
28
|
+
|
|
29
|
+
describe('rules', () => {
|
|
30
|
+
test('the library parses, and every code rule has an evaluator and every evaluator a rule', ({ expect }) => {
|
|
31
|
+
expect(RULES.length).toBeGreaterThan(20);
|
|
32
|
+
const measured = RULES.filter(({ evaluator }) => evaluator !== 'vision').map(({ id }) => id);
|
|
33
|
+
expect(Object.keys(EVALUATORS).sort()).toEqual([...measured].sort());
|
|
34
|
+
expect(RULES.find(({ id }) => id === 'no-edge-crossings')?.weight).toBe(10);
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
test('a rule the image judge asks needs a question', ({ expect }) => {
|
|
38
|
+
expect(() =>
|
|
39
|
+
parse('```mdl\ndiagram-rule bad: A rule\n category: space\n evaluator: vision\n weight: 1\n Prose.\n```'),
|
|
40
|
+
).toThrow(/needs a question/);
|
|
41
|
+
expect(parse('```mdl\nrule other: Not a diagram rule\n files: x\n```')).toEqual([]);
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
test('vision rules become judge questions keyed in camelCase', ({ expect }) => {
|
|
45
|
+
const rules = visionRules();
|
|
46
|
+
expect(rules.map(({ key }) => key)).toContain('tidyOverall');
|
|
47
|
+
expect(rules.every(({ instructions }) => instructions.includes('attached image'))).toBe(true);
|
|
48
|
+
expect(keyOf('no-edge-crossings')).toBe('noEdgeCrossings');
|
|
49
|
+
});
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
describe('appeal', () => {
|
|
53
|
+
test('a straight chain aligned in a column scores well on flow, alignment and bends', ({ expect }) => {
|
|
54
|
+
const objects = [
|
|
55
|
+
box('a', 0, 0),
|
|
56
|
+
box('b', 0, 160),
|
|
57
|
+
box('c', 0, 320),
|
|
58
|
+
...arrow('a-b', [
|
|
59
|
+
{ x: 64, y: 64 },
|
|
60
|
+
{ x: 64, y: 160 },
|
|
61
|
+
]),
|
|
62
|
+
...arrow('b-c', [
|
|
63
|
+
{ x: 64, y: 224 },
|
|
64
|
+
{ x: 64, y: 320 },
|
|
65
|
+
]),
|
|
66
|
+
];
|
|
67
|
+
expect(scoreOf(objects, 'consistent-flow')).toBe(1);
|
|
68
|
+
expect(scoreOf(objects, 'grid-alignment')).toBe(1);
|
|
69
|
+
expect(scoreOf(objects, 'few-bends')).toBe(1);
|
|
70
|
+
expect(scoreOf(objects, 'straight-when-aligned')).toBe(1);
|
|
71
|
+
expect(scoreOf(objects, 'continuous-paths')).toBe(1);
|
|
72
|
+
expect(scoreOf(objects, 'no-edge-crossings')).toBe(1);
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
test('a detour, a near miss and an arrow turning back are each penalised', ({ expect }) => {
|
|
76
|
+
const objects = [
|
|
77
|
+
box('a', 0, 0),
|
|
78
|
+
box('b', 6, 160),
|
|
79
|
+
...arrow('a-b', [
|
|
80
|
+
{ x: 64, y: 64 },
|
|
81
|
+
{ x: 64, y: 100 },
|
|
82
|
+
{ x: 600, y: 100 },
|
|
83
|
+
{ x: 600, y: 140 },
|
|
84
|
+
{ x: 70, y: 140 },
|
|
85
|
+
{ x: 70, y: 160 },
|
|
86
|
+
]),
|
|
87
|
+
];
|
|
88
|
+
expect(scoreOf(objects, 'edges-head-toward-target')).toBeLessThan(0.5);
|
|
89
|
+
expect(scoreOf(objects, 'no-near-misses')).toBeLessThan(1);
|
|
90
|
+
expect(scoreOf(objects, 'few-bends')).toBeLessThan(0.5);
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
test('a bus is judged hub to spoke, and a self-loop scores without NaN', ({ expect }) => {
|
|
94
|
+
const objects: Scene.WorldObject[] = [
|
|
95
|
+
box('hub', 64, 0),
|
|
96
|
+
box('left', -64, 200),
|
|
97
|
+
box('right', 192, 200),
|
|
98
|
+
{
|
|
99
|
+
id: 'edges',
|
|
100
|
+
elements: [
|
|
101
|
+
{
|
|
102
|
+
kind: 'line',
|
|
103
|
+
id: 'hub-bus-0-trunk',
|
|
104
|
+
points: [
|
|
105
|
+
{ x: 128, y: 64 },
|
|
106
|
+
{ x: 128, y: 180 },
|
|
107
|
+
],
|
|
108
|
+
},
|
|
109
|
+
{
|
|
110
|
+
kind: 'line',
|
|
111
|
+
id: 'hub-left-path',
|
|
112
|
+
points: [
|
|
113
|
+
{ x: 128, y: 180 },
|
|
114
|
+
{ x: 0, y: 180 },
|
|
115
|
+
],
|
|
116
|
+
},
|
|
117
|
+
{ kind: 'arrow', id: 'hub-left', start: { x: 0, y: 180 }, end: { x: 0, y: 200 } },
|
|
118
|
+
{
|
|
119
|
+
kind: 'line',
|
|
120
|
+
id: 'hub-right-path',
|
|
121
|
+
points: [
|
|
122
|
+
{ x: 128, y: 180 },
|
|
123
|
+
{ x: 256, y: 180 },
|
|
124
|
+
],
|
|
125
|
+
},
|
|
126
|
+
{ kind: 'arrow', id: 'hub-right', start: { x: 256, y: 180 }, end: { x: 256, y: 200 } },
|
|
127
|
+
{ kind: 'arrow', id: 'hub-hub', from: 'hub/box', to: 'hub/box' },
|
|
128
|
+
],
|
|
129
|
+
},
|
|
130
|
+
];
|
|
131
|
+
// Read as pieces, a spoke would start at the box nearest the junction, beside it, and run sideways.
|
|
132
|
+
expect(scoreOf(objects, 'consistent-flow')).toBe(1);
|
|
133
|
+
expect(measure(objects).every(({ score }) => Number.isFinite(score))).toBe(true);
|
|
134
|
+
});
|
|
135
|
+
|
|
136
|
+
test('overall is the weighted mean', ({ expect }) => {
|
|
137
|
+
expect(
|
|
138
|
+
overall([
|
|
139
|
+
{ weight: 3, score: 1 },
|
|
140
|
+
{ weight: 1, score: 0 },
|
|
141
|
+
]),
|
|
142
|
+
).toBe(0.75);
|
|
143
|
+
});
|
|
144
|
+
});
|