@swirly/renderer 0.18.1-alpha.0 → 0.19.1
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/LICENSE +1 -1
- package/README.md +1 -1
- package/dist/.tsbuildinfo +1 -1
- package/dist/arrow.d.ts +1 -1
- package/dist/arrow.js +9 -13
- package/dist/arrow.js.map +1 -1
- package/dist/decoration/barrier.d.ts +1 -1
- package/dist/decoration/barrier.js +7 -11
- package/dist/decoration/barrier.js.map +1 -1
- package/dist/decoration/index.d.ts +1 -1
- package/dist/decoration/index.js +5 -9
- package/dist/decoration/index.js.map +1 -1
- package/dist/decoration/range.d.ts +1 -1
- package/dist/decoration/range.js +7 -11
- package/dist/decoration/range.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +17 -26
- package/dist/index.js.map +1 -1
- package/dist/message/complete.d.ts +1 -1
- package/dist/message/complete.js +10 -13
- package/dist/message/complete.js.map +1 -1
- package/dist/message/error.d.ts +1 -1
- package/dist/message/error.js +11 -14
- package/dist/message/error.js.map +1 -1
- package/dist/message/index.d.ts +1 -1
- package/dist/message/index.js +6 -10
- package/dist/message/index.js.map +1 -1
- package/dist/message/non-stream.d.ts +1 -1
- package/dist/message/non-stream.js +7 -10
- package/dist/message/non-stream.js.map +1 -1
- package/dist/message/scalar.d.ts +1 -1
- package/dist/message/scalar.js +13 -16
- package/dist/message/scalar.js.map +1 -1
- package/dist/message/stream.d.ts +1 -1
- package/dist/message/stream.js +12 -15
- package/dist/message/stream.js.map +1 -1
- package/dist/operator.d.ts +1 -1
- package/dist/operator.js +96 -25
- package/dist/operator.js.map +1 -1
- package/dist/stream/core.d.ts +1 -0
- package/dist/stream/core.js +4 -0
- package/dist/stream/core.js.map +1 -0
- package/dist/{stream-factory.d.ts → stream/factory.d.ts} +1 -1
- package/dist/{stream-factory.js → stream/factory.js} +19 -23
- package/dist/stream/factory.js.map +1 -0
- package/dist/{stream.d.ts → stream/full.d.ts} +1 -1
- package/dist/stream/full.js +40 -0
- package/dist/stream/full.js.map +1 -0
- package/dist/types.d.ts +4 -3
- package/dist/types.js +1 -2
- package/dist/util/degrees-to-radians.js +1 -5
- package/dist/util/degrees-to-radians.js.map +1 -1
- package/dist/util/geometry.d.ts +1 -1
- package/dist/util/geometry.js +9 -17
- package/dist/util/geometry.js.map +1 -1
- package/dist/util/hex-to-dec.js +1 -5
- package/dist/util/hex-to-dec.js.map +1 -1
- package/dist/util/merge-styles.js +2 -6
- package/dist/util/merge-styles.js.map +1 -1
- package/dist/util/notification-kind.js +1 -5
- package/dist/util/notification-kind.js.map +1 -1
- package/dist/util/string-to-color.js +5 -9
- package/dist/util/string-to-color.js.map +1 -1
- package/dist/util/svg-xml.d.ts +7 -0
- package/dist/util/svg-xml.js +22 -0
- package/dist/util/svg-xml.js.map +1 -0
- package/dist/util/transform.js +5 -11
- package/dist/util/transform.js.map +1 -1
- package/package.json +8 -9
- package/src/arrow.ts +8 -8
- package/src/decoration/barrier.ts +8 -5
- package/src/decoration/index.ts +3 -3
- package/src/decoration/range.ts +8 -5
- package/src/index.ts +16 -20
- package/src/message/complete.ts +7 -7
- package/src/message/error.ts +8 -8
- package/src/message/index.ts +3 -3
- package/src/message/non-stream.ts +4 -4
- package/src/message/scalar.ts +8 -8
- package/src/message/stream.ts +6 -6
- package/src/operator.ts +152 -27
- package/src/stream/core.ts +4 -0
- package/src/{stream-factory.ts → stream/factory.ts} +10 -10
- package/src/{stream.ts → stream/full.ts} +8 -11
- package/src/types.ts +5 -3
- package/src/util/geometry.ts +1 -1
- package/src/util/merge-styles.ts +1 -1
- package/src/util/string-to-color.ts +2 -2
- package/src/util/svg-xml.ts +44 -0
- package/dist/stream-factory.js.map +0 -1
- package/dist/stream.js +0 -46
- package/dist/stream.js.map +0 -1
- package/dist/util/create-element.d.ts +0 -1
- package/dist/util/create-element.js +0 -15
- package/dist/util/create-element.js.map +0 -1
- package/src/util/create-element.ts +0 -18
package/src/message/index.ts
CHANGED
|
@@ -4,9 +4,9 @@ import {
|
|
|
4
4
|
MessageRendererOptions,
|
|
5
5
|
RendererContext,
|
|
6
6
|
RendererResult
|
|
7
|
-
} from '../types'
|
|
8
|
-
import { nonStreamMessageRenderer } from './non-stream'
|
|
9
|
-
import { streamMessageRenderer } from './stream'
|
|
7
|
+
} from '../types.js'
|
|
8
|
+
import { nonStreamMessageRenderer } from './non-stream.js'
|
|
9
|
+
import { streamMessageRenderer } from './stream.js'
|
|
10
10
|
|
|
11
11
|
export const renderMessage = (
|
|
12
12
|
ctx: RendererContext,
|
|
@@ -4,10 +4,10 @@ import {
|
|
|
4
4
|
MessageRendererOptions,
|
|
5
5
|
RendererContext,
|
|
6
6
|
RendererResult
|
|
7
|
-
} from '../types'
|
|
8
|
-
import { completeMessageRenderer } from './complete'
|
|
9
|
-
import { errorMessageRenderer } from './error'
|
|
10
|
-
import { scalarMessageRenderer } from './scalar'
|
|
7
|
+
} from '../types.js'
|
|
8
|
+
import { completeMessageRenderer } from './complete.js'
|
|
9
|
+
import { errorMessageRenderer } from './error.js'
|
|
10
|
+
import { scalarMessageRenderer } from './scalar.js'
|
|
11
11
|
|
|
12
12
|
const strategies = [
|
|
13
13
|
completeMessageRenderer,
|
package/src/message/scalar.ts
CHANGED
|
@@ -8,11 +8,11 @@ import {
|
|
|
8
8
|
MessageRendererOptions,
|
|
9
9
|
RendererContext,
|
|
10
10
|
RendererResult
|
|
11
|
-
} from '../types'
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
14
|
-
import {
|
|
15
|
-
import { rotate, translate } from '../util/transform'
|
|
11
|
+
} from '../types.js'
|
|
12
|
+
import { mergeStyles } from '../util/merge-styles.js'
|
|
13
|
+
import { stringToColor } from '../util/string-to-color.js'
|
|
14
|
+
import { createSvgElement } from '../util/svg-xml.js'
|
|
15
|
+
import { rotate, translate } from '../util/transform.js'
|
|
16
16
|
|
|
17
17
|
const COLOR_TO_MODE: Record<string, 'light' | 'dark'> = {
|
|
18
18
|
auto: 'light',
|
|
@@ -36,7 +36,7 @@ const render = (
|
|
|
36
36
|
|
|
37
37
|
const x = message.frame * styles.frame_width! - styles.event_radius!
|
|
38
38
|
|
|
39
|
-
const $group =
|
|
39
|
+
const $group = createSvgElement(document, 'g')
|
|
40
40
|
translate($group, x, 0)
|
|
41
41
|
|
|
42
42
|
const fillColorMode = COLOR_TO_MODE[s.fill_color!]
|
|
@@ -44,7 +44,7 @@ const render = (
|
|
|
44
44
|
fillColorMode != null ? stringToColor(value, fillColorMode) : s.fill_color!
|
|
45
45
|
|
|
46
46
|
$group.appendChild(
|
|
47
|
-
|
|
47
|
+
createSvgElement(document, 'ellipse', {
|
|
48
48
|
cx: styles.event_radius,
|
|
49
49
|
cy: streamHeight / 2,
|
|
50
50
|
rx: styles.event_radius! - s.stroke_width! / 2,
|
|
@@ -55,7 +55,7 @@ const render = (
|
|
|
55
55
|
})
|
|
56
56
|
)
|
|
57
57
|
|
|
58
|
-
const $label =
|
|
58
|
+
const $label = createSvgElement(
|
|
59
59
|
document,
|
|
60
60
|
'text',
|
|
61
61
|
{
|
package/src/message/stream.ts
CHANGED
|
@@ -3,16 +3,16 @@ import {
|
|
|
3
3
|
StreamNextNotificationSpecification
|
|
4
4
|
} from '@swirly/types'
|
|
5
5
|
|
|
6
|
-
import { createRenderStream } from '../stream
|
|
6
|
+
import { createRenderStream } from '../stream/factory.js'
|
|
7
7
|
import {
|
|
8
8
|
MessageRendererOptions,
|
|
9
9
|
RendererContext,
|
|
10
10
|
RendererResult
|
|
11
|
-
} from '../types'
|
|
12
|
-
import { degreesToRadians } from '../util/degrees-to-radians'
|
|
13
|
-
import { rotateRectangle, translateRectangle } from '../util/geometry'
|
|
14
|
-
import { rotate, translate } from '../util/transform'
|
|
15
|
-
import { nonStreamMessageRenderer } from './non-stream'
|
|
11
|
+
} from '../types.js'
|
|
12
|
+
import { degreesToRadians } from '../util/degrees-to-radians.js'
|
|
13
|
+
import { rotateRectangle, translateRectangle } from '../util/geometry.js'
|
|
14
|
+
import { rotate, translate } from '../util/transform.js'
|
|
15
|
+
import { nonStreamMessageRenderer } from './non-stream.js'
|
|
16
16
|
|
|
17
17
|
const supports = (message: MessageSpecification) =>
|
|
18
18
|
!nonStreamMessageRenderer.supports(message)
|
package/src/operator.ts
CHANGED
|
@@ -1,23 +1,161 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { streamParser } from '@swirly/parser'
|
|
2
|
+
import {
|
|
3
|
+
Color,
|
|
4
|
+
DiagramContent,
|
|
5
|
+
OperatorSpecification,
|
|
6
|
+
OperatorStyles,
|
|
7
|
+
OperatorTitleSegment,
|
|
8
|
+
StreamSpecification
|
|
9
|
+
} from '@swirly/types'
|
|
2
10
|
|
|
11
|
+
import { renderStreamBase } from './stream/core.js'
|
|
3
12
|
import {
|
|
4
13
|
PostRenderUpdateContext,
|
|
5
14
|
RendererContext,
|
|
6
15
|
UpdatableRendererResult
|
|
7
|
-
} from './types'
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
16
|
+
} from './types.js'
|
|
17
|
+
import { mergeStyles } from './util/merge-styles.js'
|
|
18
|
+
import {
|
|
19
|
+
createSvgDocument,
|
|
20
|
+
createSvgElement,
|
|
21
|
+
setSvgDimensions,
|
|
22
|
+
XHTML_NS
|
|
23
|
+
} from './util/svg-xml.js'
|
|
24
|
+
|
|
25
|
+
const NON_BREAKING_SPACE = '\xA0'
|
|
26
|
+
|
|
27
|
+
const reSpace = / /g
|
|
28
|
+
|
|
29
|
+
const createRootDiv = (document: Document, styles: Record<string, any>) => {
|
|
30
|
+
const $div = document.createElementNS(XHTML_NS, 'div')
|
|
31
|
+
$div.setAttribute(
|
|
32
|
+
'style',
|
|
33
|
+
Object.entries(styles)
|
|
34
|
+
.map(([name, value]) => `${name}: ${value};`)
|
|
35
|
+
.join(' ')
|
|
36
|
+
)
|
|
37
|
+
return $div
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
const renderStream = (text: string, ctx: RendererContext) => {
|
|
41
|
+
const content: DiagramContent = []
|
|
42
|
+
streamParser.run([text], {
|
|
43
|
+
content,
|
|
44
|
+
diagramStyles: {},
|
|
45
|
+
messageStyles: {},
|
|
46
|
+
allValues: {}
|
|
47
|
+
})
|
|
48
|
+
const [spec] = content as StreamSpecification[]
|
|
49
|
+
const {
|
|
50
|
+
element: $group,
|
|
51
|
+
bbox: { x2: width, y2: height }
|
|
52
|
+
} = renderStreamBase(ctx, spec, false, false)
|
|
53
|
+
return {
|
|
54
|
+
$group,
|
|
55
|
+
width,
|
|
56
|
+
height
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
const segmentRenderers = {
|
|
61
|
+
text: (value: string, ctx: RendererContext) => {
|
|
62
|
+
const $div = ctx.document.createElement('div')
|
|
63
|
+
$div.textContent = value.replace(reSpace, NON_BREAKING_SPACE)
|
|
64
|
+
return $div
|
|
65
|
+
},
|
|
66
|
+
stream: (value: string, ctx: RendererContext, styles: OperatorStyles) => {
|
|
67
|
+
const { documentElement: $svg } = createSvgDocument(ctx.DOMParser)
|
|
68
|
+
const { $group, width, height } = renderStream(value, ctx)
|
|
69
|
+
setSvgDimensions($svg, width, height, (styles.stream_scale ?? 100) / 100)
|
|
70
|
+
$svg.appendChild($group)
|
|
71
|
+
return $svg
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
const renderRichTitle = (
|
|
76
|
+
segments: OperatorTitleSegment[],
|
|
77
|
+
ctx: RendererContext,
|
|
78
|
+
color: Color,
|
|
79
|
+
styles: OperatorStyles,
|
|
80
|
+
fontStyles: Record<string, any>
|
|
81
|
+
) => {
|
|
82
|
+
const $foreignObject = createSvgElement(ctx.document, 'foreignObject', {
|
|
83
|
+
y: styles.spacing,
|
|
84
|
+
height: styles.height
|
|
85
|
+
})
|
|
86
|
+
const $container = createRootDiv(ctx.document, {
|
|
87
|
+
width: '100%',
|
|
88
|
+
height: '100%',
|
|
89
|
+
display: 'flex',
|
|
90
|
+
'align-items': 'center',
|
|
91
|
+
'justify-content': 'center',
|
|
92
|
+
color,
|
|
93
|
+
...fontStyles
|
|
94
|
+
})
|
|
95
|
+
$foreignObject.appendChild($container)
|
|
96
|
+
for (const { type, value } of segments) {
|
|
97
|
+
const $element = segmentRenderers[type](value, ctx, styles)
|
|
98
|
+
$container.appendChild($element)
|
|
99
|
+
}
|
|
100
|
+
return $foreignObject
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
const renderTextTitle = (
|
|
104
|
+
text: string,
|
|
105
|
+
ctx: RendererContext,
|
|
106
|
+
color: Color,
|
|
107
|
+
styles: OperatorStyles,
|
|
108
|
+
fontStyles: Record<string, any>
|
|
109
|
+
) =>
|
|
110
|
+
createSvgElement(
|
|
111
|
+
ctx.document,
|
|
112
|
+
'text',
|
|
113
|
+
{
|
|
114
|
+
x: styles.spacing!,
|
|
115
|
+
y: styles.spacing! + styles.height! / 2,
|
|
116
|
+
fill: color,
|
|
117
|
+
'dominant-baseline': 'middle',
|
|
118
|
+
'text-anchor': 'middle',
|
|
119
|
+
...fontStyles
|
|
120
|
+
},
|
|
121
|
+
text
|
|
122
|
+
)
|
|
123
|
+
|
|
124
|
+
const renderTitle = (
|
|
125
|
+
segments: OperatorTitleSegment[],
|
|
126
|
+
ctx: RendererContext,
|
|
127
|
+
styles: OperatorStyles
|
|
128
|
+
) => {
|
|
129
|
+
const color = styles.title_color!
|
|
130
|
+
const fontStyles = {
|
|
131
|
+
'font-family': styles.title_font_family!,
|
|
132
|
+
'font-size': styles.title_font_size! + 'px',
|
|
133
|
+
'font-weight': styles.title_font_weight!,
|
|
134
|
+
'font-style': styles.title_font_style!
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
const isText = segments.length === 1 && segments[0].type === 'text'
|
|
138
|
+
|
|
139
|
+
const $title = isText
|
|
140
|
+
? renderTextTitle(segments[0].value, ctx, color, styles, fontStyles)
|
|
141
|
+
: renderRichTitle(segments, ctx, color, styles, fontStyles)
|
|
142
|
+
|
|
143
|
+
return { $title, shouldCenter: isText }
|
|
144
|
+
}
|
|
10
145
|
|
|
11
146
|
export const renderOperator = (
|
|
12
147
|
ctx: RendererContext,
|
|
13
148
|
operator: OperatorSpecification
|
|
14
149
|
): UpdatableRendererResult => {
|
|
15
|
-
const
|
|
16
|
-
|
|
150
|
+
const s: OperatorStyles = mergeStyles(
|
|
151
|
+
ctx.styles,
|
|
152
|
+
operator.styles,
|
|
153
|
+
'operator_'
|
|
154
|
+
)
|
|
17
155
|
|
|
18
|
-
const $group =
|
|
156
|
+
const $group = createSvgElement(ctx.document, 'g')
|
|
19
157
|
|
|
20
|
-
const $rect =
|
|
158
|
+
const $rect = createSvgElement(ctx.document, 'rect', {
|
|
21
159
|
x: 0,
|
|
22
160
|
y: s.spacing!,
|
|
23
161
|
width: 1,
|
|
@@ -29,23 +167,8 @@ export const renderOperator = (
|
|
|
29
167
|
})
|
|
30
168
|
$group.appendChild($rect)
|
|
31
169
|
|
|
32
|
-
const $
|
|
33
|
-
|
|
34
|
-
'text',
|
|
35
|
-
{
|
|
36
|
-
x: s.spacing!,
|
|
37
|
-
y: s.spacing! + s.height! / 2,
|
|
38
|
-
fill: s.title_color!,
|
|
39
|
-
'font-family': s.title_font_family!,
|
|
40
|
-
'font-size': s.title_font_size! + 'px',
|
|
41
|
-
'font-weight': s.title_font_weight!,
|
|
42
|
-
'font-style': s.title_font_style!,
|
|
43
|
-
'dominant-baseline': 'middle',
|
|
44
|
-
'text-anchor': 'middle'
|
|
45
|
-
},
|
|
46
|
-
operator.title
|
|
47
|
-
)
|
|
48
|
-
$group.appendChild($text)
|
|
170
|
+
const { $title, shouldCenter } = renderTitle(operator.title, ctx, s)
|
|
171
|
+
$group.appendChild($title)
|
|
49
172
|
|
|
50
173
|
const bbox = {
|
|
51
174
|
x1: 0,
|
|
@@ -56,8 +179,10 @@ export const renderOperator = (
|
|
|
56
179
|
|
|
57
180
|
const update = ({ width }: PostRenderUpdateContext) => {
|
|
58
181
|
$rect.setAttribute('width', String(width))
|
|
59
|
-
$
|
|
60
|
-
|
|
182
|
+
$title.setAttribute('width', String(width))
|
|
183
|
+
if (shouldCenter) {
|
|
184
|
+
$title.setAttribute('x', String(width / 2))
|
|
185
|
+
}
|
|
61
186
|
}
|
|
62
187
|
|
|
63
188
|
return {
|
|
@@ -4,21 +4,21 @@ import {
|
|
|
4
4
|
StreamSpecification
|
|
5
5
|
} from '@swirly/types'
|
|
6
6
|
|
|
7
|
-
import { renderArrow } from '
|
|
8
|
-
import { renderDecoration } from '
|
|
7
|
+
import { renderArrow } from '../arrow.js'
|
|
8
|
+
import { renderDecoration } from '../decoration/index.js'
|
|
9
9
|
import {
|
|
10
10
|
MessageRenderer,
|
|
11
11
|
Rectangle,
|
|
12
12
|
RendererContext,
|
|
13
13
|
RendererResult,
|
|
14
14
|
TimeScaler
|
|
15
|
-
} from '
|
|
16
|
-
import {
|
|
17
|
-
import {
|
|
18
|
-
import {
|
|
19
|
-
import {
|
|
20
|
-
import {
|
|
21
|
-
import { translate } from '
|
|
15
|
+
} from '../types.js'
|
|
16
|
+
import { degreesToRadians } from '../util/degrees-to-radians.js'
|
|
17
|
+
import { rectangleUnion } from '../util/geometry.js'
|
|
18
|
+
import { mergeStyles } from '../util/merge-styles.js'
|
|
19
|
+
import { NotificationKind } from '../util/notification-kind.js'
|
|
20
|
+
import { createSvgElement } from '../util/svg-xml.js'
|
|
21
|
+
import { translate } from '../util/transform.js'
|
|
22
22
|
|
|
23
23
|
const nullScaleTime: TimeScaler = (time) => time
|
|
24
24
|
|
|
@@ -59,7 +59,7 @@ export const createRenderStream =
|
|
|
59
59
|
? createScaleTime(styles.higher_order_angle!)
|
|
60
60
|
: nullScaleTime
|
|
61
61
|
|
|
62
|
-
const $group =
|
|
62
|
+
const $group = createSvgElement(
|
|
63
63
|
document,
|
|
64
64
|
'g',
|
|
65
65
|
isGhost
|
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
import { StreamSpecification, StreamStyles } from '@swirly/types'
|
|
2
2
|
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import { translate } from './util/transform'
|
|
9
|
-
|
|
10
|
-
const renderStreamImpl = createRenderStream(renderMessage)
|
|
3
|
+
import { RendererContext, RendererResult } from '../types.js'
|
|
4
|
+
import { mergeStyles } from '../util/merge-styles.js'
|
|
5
|
+
import { createSvgElement } from '../util/svg-xml.js'
|
|
6
|
+
import { translate } from '../util/transform.js'
|
|
7
|
+
import { renderStreamBase } from './core.js'
|
|
11
8
|
|
|
12
9
|
export const renderStream = (
|
|
13
10
|
ctx: RendererContext,
|
|
@@ -16,7 +13,7 @@ export const renderStream = (
|
|
|
16
13
|
const { document, styles, streamHeight, streamTitleEnabled } = ctx
|
|
17
14
|
const s: StreamStyles = mergeStyles(styles, stream.styles, 'stream_')
|
|
18
15
|
|
|
19
|
-
const renderStreamResult =
|
|
16
|
+
const renderStreamResult = renderStreamBase(ctx, stream, false, false)
|
|
20
17
|
|
|
21
18
|
const { element: $streamGroup, bbox } = renderStreamResult
|
|
22
19
|
|
|
@@ -31,11 +28,11 @@ export const renderStream = (
|
|
|
31
28
|
return renderStreamResult
|
|
32
29
|
}
|
|
33
30
|
|
|
34
|
-
const $outerGroup =
|
|
31
|
+
const $outerGroup = createSvgElement(document, 'g')
|
|
35
32
|
|
|
36
33
|
const title = typeof stream.title === 'string' ? stream.title : ''
|
|
37
34
|
$outerGroup.appendChild(
|
|
38
|
-
|
|
35
|
+
createSvgElement(
|
|
39
36
|
document,
|
|
40
37
|
'text',
|
|
41
38
|
{
|
package/src/types.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import {
|
|
2
2
|
DecorationSpecification,
|
|
3
3
|
DiagramStyles,
|
|
4
|
-
MessageSpecification
|
|
4
|
+
MessageSpecification,
|
|
5
|
+
SVGDocument
|
|
5
6
|
} from '@swirly/types'
|
|
6
7
|
|
|
7
8
|
export type Point = {
|
|
@@ -24,7 +25,8 @@ export type RendererOptions = {
|
|
|
24
25
|
}
|
|
25
26
|
|
|
26
27
|
export type RendererContext = {
|
|
27
|
-
|
|
28
|
+
DOMParser?: typeof DOMParser
|
|
29
|
+
document: SVGDocument
|
|
28
30
|
styles: DiagramStyles
|
|
29
31
|
streamHeight: number
|
|
30
32
|
streamTitleEnabled: boolean
|
|
@@ -41,7 +43,7 @@ export type PostRenderUpdateContext = {
|
|
|
41
43
|
}
|
|
42
44
|
|
|
43
45
|
export type UpdatableRendererResult = RendererResult & {
|
|
44
|
-
update
|
|
46
|
+
update?: (ctx: PostRenderUpdateContext) => void
|
|
45
47
|
}
|
|
46
48
|
|
|
47
49
|
export type MessageRendererOptions = {
|
package/src/util/geometry.ts
CHANGED
package/src/util/merge-styles.ts
CHANGED
|
@@ -12,7 +12,7 @@ export const mergeStyles = (
|
|
|
12
12
|
key.startsWith(globalPrefix)
|
|
13
13
|
)
|
|
14
14
|
for (const globalKey of globalKeys) {
|
|
15
|
-
const simpleKey = globalKey.
|
|
15
|
+
const simpleKey = globalKey.substring(globalPrefix.length)
|
|
16
16
|
const localKey = localStylesPrefixed ? globalKey : simpleKey
|
|
17
17
|
result[simpleKey] =
|
|
18
18
|
localStyles != null && localStyles[localKey] != null
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
// @ts-ignore
|
|
2
2
|
import { sync as sha1 } from 'simple-sha1'
|
|
3
3
|
|
|
4
|
-
import { hexToDec } from './hex-to-dec'
|
|
4
|
+
import { hexToDec } from './hex-to-dec.js'
|
|
5
5
|
|
|
6
6
|
export const stringToColor = (str: string, mode: 'light' | 'dark'): string => {
|
|
7
7
|
const hashHex = sha1(str)
|
|
8
|
-
const hash = hexToDec(hashHex.
|
|
8
|
+
const hash = hexToDec(hashHex.substring(4, 8))
|
|
9
9
|
const hue = Math.round((hash / (1 << 16)) * 360)
|
|
10
10
|
const saturation = 60
|
|
11
11
|
const lightness = mode === 'dark' ? 20 : 80
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { SVGDocument } from '@swirly/types'
|
|
2
|
+
|
|
3
|
+
export const SVG_NS = 'http://www.w3.org/2000/svg'
|
|
4
|
+
export const SVG_MIME_TYPE = 'image/svg+xml'
|
|
5
|
+
|
|
6
|
+
export const XHTML_NS = 'http://www.w3.org/1999/xhtml'
|
|
7
|
+
|
|
8
|
+
const EMPTY_SVG_XML = `<svg xmlns="${SVG_NS}"/>`
|
|
9
|
+
|
|
10
|
+
const parseXml = (
|
|
11
|
+
xml: string,
|
|
12
|
+
mimeType: string,
|
|
13
|
+
DOMParserImpl: typeof DOMParser = DOMParser
|
|
14
|
+
) => new DOMParserImpl().parseFromString(xml, mimeType as any) as XMLDocument
|
|
15
|
+
|
|
16
|
+
export const createSvgDocument = (DOMParserImpl?: typeof DOMParser) =>
|
|
17
|
+
parseXml(EMPTY_SVG_XML, SVG_MIME_TYPE, DOMParserImpl) as SVGDocument
|
|
18
|
+
|
|
19
|
+
export const createSvgElement = (
|
|
20
|
+
document: SVGDocument,
|
|
21
|
+
name: string,
|
|
22
|
+
attrs: Record<string, any> = {},
|
|
23
|
+
text: string = ''
|
|
24
|
+
): SVGElement => {
|
|
25
|
+
const $el = document.createElementNS(SVG_NS, name)
|
|
26
|
+
for (const [name, value] of Object.entries(attrs)) {
|
|
27
|
+
$el.setAttribute(name, String(value))
|
|
28
|
+
}
|
|
29
|
+
if (text !== '') {
|
|
30
|
+
$el.textContent = text
|
|
31
|
+
}
|
|
32
|
+
return $el
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export const setSvgDimensions = (
|
|
36
|
+
$svg: SVGSVGElement,
|
|
37
|
+
width: number,
|
|
38
|
+
height: number,
|
|
39
|
+
scale: number = 1
|
|
40
|
+
) => {
|
|
41
|
+
$svg.setAttribute('viewBox', `0 0 ${width} ${height}`)
|
|
42
|
+
$svg.setAttribute('width', String(width * scale))
|
|
43
|
+
$svg.setAttribute('height', String(height * scale))
|
|
44
|
+
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"stream-factory.js","sourceRoot":"","sources":["../src/stream-factory.ts"],"names":[],"mappings":"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"}
|
package/dist/stream.js
DELETED
|
@@ -1,46 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.renderStream = void 0;
|
|
4
|
-
const message_1 = require("./message");
|
|
5
|
-
const stream_factory_1 = require("./stream-factory");
|
|
6
|
-
const create_element_1 = require("./util/create-element");
|
|
7
|
-
const merge_styles_1 = require("./util/merge-styles");
|
|
8
|
-
const transform_1 = require("./util/transform");
|
|
9
|
-
const renderStreamImpl = (0, stream_factory_1.createRenderStream)(message_1.renderMessage);
|
|
10
|
-
const renderStream = (ctx, stream) => {
|
|
11
|
-
const { document, styles, streamHeight, streamTitleEnabled } = ctx;
|
|
12
|
-
const s = (0, merge_styles_1.mergeStyles)(styles, stream.styles, 'stream_');
|
|
13
|
-
const renderStreamResult = renderStreamImpl(ctx, stream, false, false);
|
|
14
|
-
const { element: $streamGroup, bbox } = renderStreamResult;
|
|
15
|
-
if (stream.frame != null && stream.frame > 0) {
|
|
16
|
-
const dx = stream.frame * styles.frame_width;
|
|
17
|
-
(0, transform_1.translate)($streamGroup, dx, 0);
|
|
18
|
-
bbox.x1 += dx;
|
|
19
|
-
bbox.x2 += dx;
|
|
20
|
-
}
|
|
21
|
-
if (!streamTitleEnabled) {
|
|
22
|
-
return renderStreamResult;
|
|
23
|
-
}
|
|
24
|
-
const $outerGroup = (0, create_element_1.createElement)(document, 'g');
|
|
25
|
-
const title = typeof stream.title === 'string' ? stream.title : '';
|
|
26
|
-
$outerGroup.appendChild((0, create_element_1.createElement)(document, 'text', {
|
|
27
|
-
x: 0,
|
|
28
|
-
y: streamHeight / 2,
|
|
29
|
-
fill: s.title_color,
|
|
30
|
-
'font-family': s.title_font_family,
|
|
31
|
-
'font-size': s.title_font_size + 'px',
|
|
32
|
-
'font-weight': s.title_font_weight,
|
|
33
|
-
'font-style': s.title_font_style,
|
|
34
|
-
'dominant-baseline': 'middle'
|
|
35
|
-
}, title));
|
|
36
|
-
$outerGroup.appendChild($streamGroup);
|
|
37
|
-
(0, transform_1.translate)($streamGroup, s.title_width, 0);
|
|
38
|
-
bbox.x1 = 0;
|
|
39
|
-
bbox.x2 += s.title_width;
|
|
40
|
-
return {
|
|
41
|
-
element: $outerGroup,
|
|
42
|
-
bbox
|
|
43
|
-
};
|
|
44
|
-
};
|
|
45
|
-
exports.renderStream = renderStream;
|
|
46
|
-
//# sourceMappingURL=stream.js.map
|
package/dist/stream.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../src/stream.ts"],"names":[],"mappings":";;;AAEA,uCAAyC;AACzC,qDAAqD;AAErD,0DAAqD;AACrD,sDAAiD;AACjD,gDAA4C;AAE5C,MAAM,gBAAgB,GAAG,IAAA,mCAAkB,EAAC,uBAAa,CAAC,CAAA;AAEnD,MAAM,YAAY,GAAG,CAC1B,GAAoB,EACpB,MAA2B,EACX,EAAE;IAClB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,kBAAkB,EAAE,GAAG,GAAG,CAAA;IAClE,MAAM,CAAC,GAAiB,IAAA,0BAAW,EAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IAErE,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;IAEtE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,kBAAkB,CAAA;IAE1D,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,KAAK,GAAG,CAAC,EAAE;QAC5C,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,WAAY,CAAA;QAC7C,IAAA,qBAAS,EAAC,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;QAC9B,IAAI,CAAC,EAAE,IAAI,EAAE,CAAA;QACb,IAAI,CAAC,EAAE,IAAI,EAAE,CAAA;KACd;IAED,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,kBAAkB,CAAA;KAC1B;IAED,MAAM,WAAW,GAAG,IAAA,8BAAa,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;IAEhD,MAAM,KAAK,GAAG,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;IAClE,WAAW,CAAC,WAAW,CACrB,IAAA,8BAAa,EACX,QAAQ,EACR,MAAM,EACN;QACE,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,YAAY,GAAG,CAAC;QACnB,IAAI,EAAE,CAAC,CAAC,WAAY;QACpB,aAAa,EAAE,CAAC,CAAC,iBAAkB;QACnC,WAAW,EAAE,CAAC,CAAC,eAAgB,GAAG,IAAI;QACtC,aAAa,EAAE,CAAC,CAAC,iBAAkB;QACnC,YAAY,EAAE,CAAC,CAAC,gBAAiB;QACjC,mBAAmB,EAAE,QAAQ;KAC9B,EACD,KAAK,CACN,CACF,CAAA;IAED,WAAW,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;IACrC,IAAA,qBAAS,EAAC,YAAY,EAAE,CAAC,CAAC,WAAY,EAAE,CAAC,CAAC,CAAA;IAE1C,IAAI,CAAC,EAAE,GAAG,CAAC,CAAA;IACX,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,WAAY,CAAA;IAEzB,OAAO;QACL,OAAO,EAAE,WAAW;QACpB,IAAI;KACL,CAAA;AACH,CAAC,CAAA;AArDY,QAAA,YAAY,gBAqDxB"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare const createElement: (document: XMLDocument, name: string, attrs?: Record<string, any>, text?: string) => SVGElement;
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createElement = void 0;
|
|
4
|
-
const createElement = (document, name, attrs = {}, text = '') => {
|
|
5
|
-
const $el = document.createElementNS('http://www.w3.org/2000/svg', name);
|
|
6
|
-
for (const [name, value] of Object.entries(attrs)) {
|
|
7
|
-
$el.setAttribute(name, String(value));
|
|
8
|
-
}
|
|
9
|
-
if (text !== '') {
|
|
10
|
-
$el.textContent = text;
|
|
11
|
-
}
|
|
12
|
-
return $el;
|
|
13
|
-
};
|
|
14
|
-
exports.createElement = createElement;
|
|
15
|
-
//# sourceMappingURL=create-element.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"create-element.js","sourceRoot":"","sources":["../../src/util/create-element.ts"],"names":[],"mappings":";;;AAAO,MAAM,aAAa,GAAG,CAC3B,QAAqB,EACrB,IAAY,EACZ,QAA6B,EAAE,EAC/B,OAAe,EAAE,EACL,EAAE;IACd,MAAM,GAAG,GAAG,QAAQ,CAAC,eAAe,CAAC,4BAA4B,EAAE,IAAI,CAAC,CAAA;IAExE,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACjD,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;KACtC;IAED,IAAI,IAAI,KAAK,EAAE,EAAE;QACf,GAAG,CAAC,WAAW,GAAG,IAAI,CAAA;KACvB;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAjBY,QAAA,aAAa,iBAiBzB"}
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
export const createElement = (
|
|
2
|
-
document: XMLDocument,
|
|
3
|
-
name: string,
|
|
4
|
-
attrs: Record<string, any> = {},
|
|
5
|
-
text: string = ''
|
|
6
|
-
): SVGElement => {
|
|
7
|
-
const $el = document.createElementNS('http://www.w3.org/2000/svg', name)
|
|
8
|
-
|
|
9
|
-
for (const [name, value] of Object.entries(attrs)) {
|
|
10
|
-
$el.setAttribute(name, String(value))
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
if (text !== '') {
|
|
14
|
-
$el.textContent = text
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
return $el
|
|
18
|
-
}
|