yaroslav
/
SequenceDiagram
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add group component [#46]

This commit is contained in:
David Evans 2018-02-04 15:33:48 +00:00
parent e22381e37d
commit d283fe158c
14 changed files with 100 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/sequence-diagram.js
View File

@ -871,6 +871,14 @@ define('sequence/CodeMirrorMode',['core/ArrayUtilities'], (array) => {
}, connectors)));
}
const group = {type: 'keyword', suggest: true, then: {
'': textToEnd,
':': {type: 'operator', suggest: true, then: {
'': textToEnd,
}},
'\n': end,
}};
const BASE_THEN = {
'title': {type: 'keyword', suggest: true, then: {
'': textToEnd,
@ -922,13 +930,7 @@ define('sequence/CodeMirrorMode',['core/ArrayUtilities'], (array) => {
'as': CM_ERROR,
'\n': end,
}},
'if': {type: 'keyword', suggest: true, then: {
'': textToEnd,
':': {type: 'operator', suggest: true, then: {
'': textToEnd,
}},
'\n': end,
}},
'if': group,
'else': {type: 'keyword', suggest: ['else\n', 'else if: '], then: {
'if': {type: 'keyword', suggest: 'if: ', then: {
'': textToEnd,
@ -938,13 +940,8 @@ define('sequence/CodeMirrorMode',['core/ArrayUtilities'], (array) => {
}},
'\n': end,
}},
'repeat': {type: 'keyword', suggest: true, then: {
'': textToEnd,
':': {type: 'operator', suggest: true, then: {
'': textToEnd,
}},
'\n': end,
}},
'repeat': group,
'group': group,
'note': {type: 'keyword', suggest: true, then: {
'over': {type: 'keyword', suggest: true, then: {
'': agentListToText,
@ -1684,6 +1681,12 @@ define('sequence/Parser',[
tag: 'repeat',
skip: [],
},
'group': {
type: 'block begin',
blockType: 'group',
tag: '',
skip: [],
},
};
const CONNECT = {
@ -4074,7 +4077,10 @@ define('sequence/components/Block',[
SVGTextBlockClass: env.SVGTextBlockClass,
});
const labelHeight = Math.max(tagRender.height, labelRender.height);
const labelHeight = Math.max(
Math.max(tagRender.height, labelRender.height),
config.section.label.minHeight
);
clickable.insertBefore(svg.make('rect', {
'x': agentInfoL.x,
@ -7289,11 +7295,12 @@ define('sequence/themes/Basic',[
},
},
label: {
minHeight: 4,
padding: {
top: 1,
left: 5,
right: 3,
bottom: 0,
bottom: 1,
},
labelAttrs: {
'font-family': FONT,
@ -7684,6 +7691,7 @@ define('sequence/themes/Monospace',[
},
},
label: {
minHeight: 8,
padding: {
top: 2,
left: 8,
@ -8077,11 +8085,12 @@ define('sequence/themes/Chunky',[
},
},
label: {
minHeight: 5,
padding: {
top: 2,
left: 5,
right: 3,
bottom: 0,
bottom: 1,
},
labelAttrs: {
'font-family': FONT,
@ -8889,11 +8898,12 @@ define('sequence/themes/Sketch',[
},
},
label: {
minHeight: 6,
padding: {
top: 2,
left: 5,
right: 3,
bottom: 0,
bottom: 1,
},
labelAttrs: {
'font-family': FONT_FAMILY,

2
lib/sequence-diagram.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
scripts/interface/ComponentsLibrary.js
View File

@ -141,6 +141,20 @@ define([], [
'end myRef'
),
},
{
title: 'Group',
code: (
'group {Label}\n' +
' {Agent1} -> {Agent2}\n' +
'end'
),
preview: (
'begin A, B\n' +
'group Label\n' +
' A -> B\n' +
'end'
),
},
{
title: 'Note over agent',
code: 'note over {Agent1}: {Message}',

25
scripts/sequence/CodeMirrorMode.js
View File

@ -268,6 +268,14 @@ define(['core/ArrayUtilities'], (array) => {
}, connectors)));
}
const group = {type: 'keyword', suggest: true, then: {
'': textToEnd,
':': {type: 'operator', suggest: true, then: {
'': textToEnd,
}},
'\n': end,
}};
const BASE_THEN = {
'title': {type: 'keyword', suggest: true, then: {
'': textToEnd,
@ -319,13 +327,7 @@ define(['core/ArrayUtilities'], (array) => {
'as': CM_ERROR,
'\n': end,
}},
'if': {type: 'keyword', suggest: true, then: {
'': textToEnd,
':': {type: 'operator', suggest: true, then: {
'': textToEnd,
}},
'\n': end,
}},
'if': group,
'else': {type: 'keyword', suggest: ['else\n', 'else if: '], then: {
'if': {type: 'keyword', suggest: 'if: ', then: {
'': textToEnd,
@ -335,13 +337,8 @@ define(['core/ArrayUtilities'], (array) => {
}},
'\n': end,
}},
'repeat': {type: 'keyword', suggest: true, then: {
'': textToEnd,
':': {type: 'operator', suggest: true, then: {
'': textToEnd,
}},
'\n': end,
}},
'repeat': group,
'group': group,
'note': {type: 'keyword', suggest: true, then: {
'over': {type: 'keyword', suggest: true, then: {
'': agentListToText,

9
scripts/sequence/CodeMirrorMode_spec.js
View File

@ -239,7 +239,8 @@ defineDescribe('Code Mirror Mode', [
'else if another thing\n' +
'else\n' +
'end\n' +
'repeat a few times'
'repeat a few times\n' +
'group foo\n'
);
expect(getTokens(0)).toEqual([
@ -272,6 +273,11 @@ defineDescribe('Code Mirror Mode', [
{v: ' few', type: 'string'},
{v: ' times', type: 'string'},
]);
expect(getTokens(6)).toEqual([
{v: 'group', type: 'keyword'},
{v: ' foo', type: 'string'},
]);
});
it('allows colons in block statements', () => {
@ -428,6 +434,7 @@ defineDescribe('Code Mirror Mode', [
expect(hints).toContain('else\n');
expect(hints).toContain('else if: ');
expect(hints).toContain('repeat ');
expect(hints).toContain('group ');
expect(hints).toContain('note ');
expect(hints).toContain('state over ');
expect(hints).toContain('text ');

6
scripts/sequence/Parser.js
View File

@ -30,6 +30,12 @@ define([
tag: 'repeat',
skip: [],
},
'group': {
type: 'block begin',
blockType: 'group',
tag: '',
skip: [],
},
};
const CONNECT = {

11
scripts/sequence/Parser_spec.js
View File

@ -749,6 +749,17 @@ defineDescribe('Sequence Parser', ['./Parser'], (Parser) => {
]);
});
it('converts group blocks', () => {
const parsed = parser.parse('group something');
expect(parsed.stages).toEqual([
PARSED.blockBegin({
blockType: 'group',
tag: '',
label: 'something',
}),
]);
});
it('rejects quoted keywords', () => {
expect(() => parser.parse('"repeat" until something')).toThrow();
});

8
scripts/sequence/SequenceDiagram_spec.js
View File

@ -145,11 +145,11 @@ defineDescribe('SequenceDiagram', [
const content = getSimplifiedContent(diagram);
expect(content).toContain('<svg viewBox="-5 -5 60 37">');
expect(content).toContain('<svg viewBox="-5 -5 60 39">');
expect(content).toContain('<line x1="20" y1="5" x2="20" y2="27"');
expect(content).toContain('<line x1="30" y1="5" x2="30" y2="27"');
expect(content).toContain('<rect x="10" y="0" width="30" height="7"');
expect(content).toContain('<line x1="20" y1="7" x2="20" y2="29"');
expect(content).toContain('<line x1="30" y1="7" x2="30" y2="29"');
expect(content).toContain('<rect x="10" y="0" width="30" height="9"');
expect(content).toContain('<g class="region collapsed"');
});

5
scripts/sequence/components/Block.js
View File

@ -69,7 +69,10 @@ define([
SVGTextBlockClass: env.SVGTextBlockClass,
});
const labelHeight = Math.max(tagRender.height, labelRender.height);
const labelHeight = Math.max(
Math.max(tagRender.height, labelRender.height),
config.section.label.minHeight
);
clickable.insertBefore(svg.make('rect', {
'x': agentInfoL.x,

8
scripts/sequence/test-images/Block.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

3
scripts/sequence/themes/Basic.js
View File

@ -216,11 +216,12 @@ define([
},
},
label: {
minHeight: 4,
padding: {
top: 1,
left: 5,
right: 3,
bottom: 0,
bottom: 1,
},
labelAttrs: {
'font-family': FONT,

3
scripts/sequence/themes/Chunky.js
View File

@ -227,11 +227,12 @@ define([
},
},
label: {
minHeight: 5,
padding: {
top: 2,
left: 5,
right: 3,
bottom: 0,
bottom: 1,
},
labelAttrs: {
'font-family': FONT,

1
scripts/sequence/themes/Monospace.js
View File

@ -223,6 +223,7 @@ define([
},
},
label: {
minHeight: 8,
padding: {
top: 2,
left: 8,

3
scripts/sequence/themes/Sketch.js
View File

@ -200,11 +200,12 @@ define([
},
},
label: {
minHeight: 6,
padding: {
top: 2,
left: 5,
right: 3,
bottom: 0,
bottom: 1,
},
labelAttrs: {
'font-family': FONT_FAMILY,