3941899168

Build Type

github

Committed by GitHub

Commit Message

Merge d797bf809 into 7eefe0e1f

Pull Request Pull Request #27: Web interface

Run Details

537 of 615 branches covered (87.32%)

Branch coverage included in aggregate %.

59 of 66 new or added lines in 4 files covered. (89.39%)

36 existing lines in 4 files now uncovered.

2850 of 3146 relevant lines covered (90.59%)

418.21 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

98.07

/lib/driver.js

import * as ast from './ast.js'
import * as pjson from '../package.js'
import l4js from 'log4js'
const log = l4js.getLogger()

export default class Driver {
  constructor(diag, argv) {
    this.diag = diag
    this.props = diag.props
    this.top = null
    this.argv = argv

    this.width = this.columnx(diag.parts.length)
    this.height = this.timey(diag.max_time + 5)
    this.doc = this.document()
  }

  // eslint-disable-next-line class-methods-use-this
  draw_group(name) {
    // Override if needed
    return null
  }

  group(name, func) {
    const old = this.top
    this.top = this.draw_group(name)

    if (name) {
      log.debug('group:', name)
    }
    func.call(this, this.top)
    this.top = old
  }

  // eslint-disable-next-line class-methods-use-this
  meta(json) {
    // Override
  }

  // eslint-disable-next-line class-methods-use-this
  home_link(json) {
    // Override
  }

  draw(cb) {
    this.meta(pjson)
    if (!this.props.no_clear) {
      this.clear()
    }

    if (this.diag.title) {
      this.draw_label(
        this.pos((this.diag.parts.length - 1) / 2, -4),
        this.diag.title,
        'title'
      )
    }

    if (!this.props.no_link && !this.argv.n) {
      this.home_link(pjson)
    }

    this.group('participants', () => {
      this.diag.parts.forEach((part, i) => {
        this.group(`Paricipant: ${part.desc}`, () => {
          this.draw_label(this.pos(part.col, -2), part.desc, 'rung_label')
          this.draw_line(
            this.pos(part.col, -1),
            this.pos(part.col, this.diag.max_time + 1),
            'rung'
          )
          if (!this.props.no_feet) {
            this.draw_label(
              this.pos(part.col, this.diag.max_time + 3),
              part.desc,
              'rung_label'
            )
          }
        })
      }, this)
    })

    this.diag.data.forEach(x => {
      switch (x.kind) {
        case ast.SELF:
          this.draw_self_arrow(x)
          break
        case ast.MESSAGE:
          this.draw_arrow(x)
          break
        case ast.BLOCK:
          this.draw_block(x)
          break
        case ast.NOTE:
          this.draw_note(x)
          break
      }
    }, this)
    cb(null, this.doc)
  }

  columnx(col) {
    // TODO: make left margin configurable
    return (col + 0.5) * this.diag.props.column_width
  }

  timey(time) {
    // TODO: make top margin configurable
    return (time + 5) * this.diag.props.time_height
  }

  posa(x, y) {
    const that = this
    return {
      x,
      y,
      toString(suff) {
        suff = suff || ''
        return `x${suff}="${x}" y${suff}="${y}" `
      },
      att(el, suff) {
        suff = suff || ''
        el.att(`x${suff}`, x)
        el.att(`y${suff}`, y)
        return el
      },
      adjust(dx, dy) {
        return that.posa(x + dx, y + dy)
      },
    }
  }

  pos(col, tm) {
    if (typeof tm === 'undefined') {
      ({tm, col} = col)
    }
    const p = this.posa(this.columnx(col), this.timey(tm))
    p.col = col
    p.time = tm
    return p
  }

  midpoint(p1, p2) {
    return this.posa((p1.x + p2.x) / 2, (p1.y + p2.y) / 2)
  }

  // Override
  // eslint-disable-next-line class-methods-use-this
  draw_path(cmds, klasses) {
    let d = null
    if (typeof cmds === 'string') {
      d = cmds
    } else {
      d = cmds
        .map(c => {
          if (typeof c === 'string') {
            return c
          }
          return `${c.x} ${c.y}`
        })
        .join(' ')
    }
    return d
  }

  draw_line(p1, p2, klass) {
    return this.draw_path(['M', p1, 'L', p2], klass)
  }

  draw_block(block) {
    const pad = ((block.depth + 1) * 5) + (this.props.rung_width / 2)
    const lt = this.pos(0, block.start).adjust(-pad, 0)
    this.group(`${block.typ}: ${block.msg}`, () => {
      this.draw_path(
        [
          'M',
          lt.adjust(0, -15),
          'L',
          lt.adjust(35, -15),
          'L',
          lt.adjust(35, 0),
          'L',
          lt,
          'Z',
        ],
        'block_tab'
      )

      this.draw_label(lt.adjust(5, -2), block.typ, 'start')

      if (block.msg) {
        this.draw_label(lt.adjust(40, -2), block.msg, 'start')
      }

      const right = this.diag.parts.length - 1
      this.draw_path(
        [
          'M',
          lt.adjust(0, -15),
          'L',
          lt.adjust(35, -15),
          'L',
          lt.adjust(35, 0),
          'L',
          this.pos(right, block.start).adjust(pad, 0),
          'L',
          this.pos(right, block.end).adjust(pad, 0),
          'L',
          this.pos(0, block.end).adjust(-pad, 0),
          'Z',
        ],
        'block'
      )
    })
  }

  draw_note(note) {
    const p = this.pos(note.from)
    let adjust_dir = 1
    let align = 'start'

    if (note.from.col === this.diag.parts.length - 1) {
      adjust_dir = -1
      align = 'end'
    }

    this.draw_label(p.adjust(adjust_dir * (3 + (this.props.rung_width / 2)),
      this.diag.props.time_height / 4), note.msg, align)
  }

  draw_self_arrow(start) {
    const p1 = this.pos(start.from)
    const p2 = this.pos(start.to)
    let end = p2
    const self_width = this.props.column_width / 4
    const half_rung = this.props.rung_width / 2
    let begin_adj = 0
    let end_adj = 1
    if (start.arrow.begin) {
      begin_adj = 1
    }

    if (start.arrow.end === '#') {
      end = p2.adjust(self_width / 2, 0)
      end_adj *= 5
    }
    this.group(`message: ${start}`, () => {
      this.draw_path(
        [
          'M',
          p1.adjust(half_rung + begin_adj, 0),
          'L',
          p1.adjust(self_width, 0),
          'L',
          p2.adjust(self_width, 0),
          'L',
          end.adjust(half_rung + end_adj, 0),
        ],
        `${start.arrow.classes()} self`
      )

      this.arrow_head(end.adjust(half_rung, 0), Math.PI, start.arrow.end)
      if (start.arrow.begin) {
        this.arrow_head(p1.adjust(half_rung, 0), Math.PI, start.arrow.begin)
      }

      if (start.msg) {
        const text_anchor = this.midpoint(p1, p2).adjust(
          self_width + this.props.label_space_x,
          -this.props.label_space_y
        )
        this.draw_label(text_anchor, start.msg, 'start')
      }
    })
  }

  // eslint-disable-next-line class-methods-use-this
  transform(x, y, theta, func) {
    throw new Error('transform not implemented')
  }

  arrow_head(p, theta, type) {
    this.transform(p.x, p.y, theta, () => {
      if (type === '>' || type === '<') {
        this.draw_path('M -10 4 L -1 0 L -10 -4 L -9 0 Z', 'closed')
      } else if (type === '#') {
        this.draw_path('M -10 4 L -1 -4', 'open')
        this.draw_path('M -10 -4 L -1 4', 'open')
      } else {
        this.draw_path('M -10 4 L -1 0 L -10 -4', 'open')
      }
    })
    return this.doc
  }

  draw_arrow(msg) {
    let p1 = this.pos(msg.from)
    let p2 = this.pos(msg.to)
    const half_rung = this.props.rung_width / 2

    let begin_adj = 0
    let end_adj = 0
    let end_angle = 0
    let text_anchor = 0
    let text_align = 0
    const l2r = p2.col > p1.col

    if (msg.arrow.end === '#') {
      p2 = this.midpoint(p1, p2)
    }

    // Bring each end of the line to the edge of the rung
    if (l2r) {
      // Left-to-right
      p1 = p1.adjust(half_rung, 0)
      p2 = p2.adjust(-half_rung, 0)
      end_adj = -1

      // Move over from the left a little
      text_align = 'start'
      text_anchor = p1.adjust(this.props.label_space_x, 0)
      end_angle = 0
    } else {
      // Right-to-left
      p1 = p1.adjust(-half_rung, 0)
      p2 = p2.adjust(half_rung, 0)
      end_adj = 1

      // Move over from the right a little
      text_align = 'end'
      text_anchor = p1.adjust(-this.props.label_space_x, 0)
      end_angle = Math.PI
    }
    if (msg.arrow.end === '#') {
      end_adj *= 5
    }

    if (msg.arrow.begin) {
      begin_adj = 1
      text_align = 'center'
      text_anchor = this.midpoint(p1, p2)
    }

    const rangle = Math.atan((p2.y - p1.y) / (p2.x - p1.x))

    this.draw_line(
      p1.adjust(begin_adj * Math.cos(rangle), begin_adj * Math.sin(rangle)),
      p2.adjust(end_adj * Math.cos(rangle), end_adj * Math.sin(rangle)),
      msg.arrow.classes()
    )

    this.arrow_head(p2, rangle + end_angle, msg.arrow.end)

    if (msg.arrow.begin) {
      this.arrow_head(p1, rangle + Math.PI, msg.arrow.begin)
    }

    if (msg.msg) {
      this.draw_label(text_anchor, msg.msg, text_align, rangle)
    }
  }
}

1	import * as ast from './ast.js'	4✔
2	import * as pjson from '../package.js'	4✔
3	import l4js from 'log4js'	4✔
4	const log = l4js.getLogger()	4✔
5		4✔
6	export default class Driver {	4✔
7	constructor(diag, argv) {	4✔
8	this.diag = diag	12✔
9	this.props = diag.props	12✔
10	this.top = null	12✔
11	this.argv = argv	12✔
12		12✔
13	this.width = this.columnx(diag.parts.length)	12✔
14	this.height = this.timey(diag.max_time + 5)	12✔
15	this.doc = this.document()	12✔
16	}	12✔
17		4✔
18	// eslint-disable-next-line class-methods-use-this	4✔
19	draw_group(name) {	4✔
20	// Override if needed	92✔
21	return null	92✔
22	}	92✔
23		4✔
24	group(name, func) {	4✔
25	const old = this.top	368✔
26	this.top = this.draw_group(name)	368✔
27		368✔
28	if (name) {	368✔
29	log.debug('group:', name)	184✔
30	}	184✔
31	func.call(this, this.top)	368✔
32	this.top = old	368✔
33	}	368✔
34		4✔
35	// eslint-disable-next-line class-methods-use-this	4✔
36	meta(json) {	4✔
UNCOV 37	// Override	×
38	}	×
39		4✔
40	// eslint-disable-next-line class-methods-use-this	4✔
41	home_link(json) {	4✔
42	// Override	×
UNCOV 43	}	×
44		4✔
45	draw(cb) {	4✔
46	this.meta(pjson)	8✔
47	if (!this.props.no_clear) {	8✔
48	this.clear()	8✔
49	}	8✔
50		8✔
51	if (this.diag.title) {	8✔
52	this.draw_label(	8✔
53	this.pos((this.diag.parts.length - 1) / 2, -4),	8✔
54	this.diag.title,	8✔
55	'title'	8✔
56	)	8✔
57	}	8✔
58		8✔
59	if (!this.props.no_link && !this.argv.n) {	8✔
60	this.home_link(pjson)	8✔
61	}	8✔
62		8✔
63	this.group('participants', () => {	8✔
64	this.diag.parts.forEach((part, i) => {	8✔
65	this.group(`Paricipant: ${part.desc}`, () => {	40✔
66	this.draw_label(this.pos(part.col, -2), part.desc, 'rung_label')	40✔
67	this.draw_line(	40✔
68	this.pos(part.col, -1),	40✔
69	this.pos(part.col, this.diag.max_time + 1),	40✔
70	'rung'	40✔
71	)	40✔
72	if (!this.props.no_feet) {	40✔
73	this.draw_label(	40✔
74	this.pos(part.col, this.diag.max_time + 3),	40✔
75	part.desc,	40✔
76	'rung_label'	40✔
77	)	40✔
78	}	40✔
79	})	40✔
80	}, this)	8✔
81	})	8✔
82		8✔
83	this.diag.data.forEach(x => {	8✔
84	switch (x.kind) {	480✔
85	case ast.SELF:	480✔
86	this.draw_self_arrow(x)	48✔
87	break	48✔
88	case ast.MESSAGE:	480✔
89	this.draw_arrow(x)	232✔
90	break	232✔
91	case ast.BLOCK:	480✔
92	this.draw_block(x)	88✔
93	break	88✔
94	case ast.NOTE:	480✔
95	this.draw_note(x)	16✔
96	break	16✔
97	}	480✔
98	}, this)	8✔
99	cb(null, this.doc)	8✔
100	}	8✔
101		4✔
102	columnx(col) {	4✔
103	// TODO: make left margin configurable	1,108✔
104	return (col + 0.5) * this.diag.props.column_width	1,108✔
105	}	1,108✔
106		4✔
107	timey(time) {	4✔
108	// TODO: make top margin configurable	1,108✔
109	return (time + 5) * this.diag.props.time_height	1,108✔
110	}	1,108✔
111		4✔
112	posa(x, y) {	4✔
113	const that = this	4,092✔
114	return {	4,092✔
115	x,	4,092✔
116	y,	4,092✔
117	toString(suff) {	4,092✔
UNCOV 118	suff = suff \|\| ''	×
UNCOV 119	return `x${suff}="${x}" y${suff}="${y}" `	×
120	},	4,092✔
121	att(el, suff) {	4,092✔
122	suff = suff \|\| ''	264✔
123	el.att(`x${suff}`, x)	264✔
124	el.att(`y${suff}`, y)	264✔
125	return el	264✔
126	},	4,092✔
127	adjust(dx, dy) {	4,092✔
128	return that.posa(x + dx, y + dy)	2,820✔
129	},	4,092✔
130	}	4,092✔
131	}	4,092✔
132		4✔
133	pos(col, tm) {	4✔
134	if (typeof tm === 'undefined') {	1,096✔
135	({tm, col} = col)	576✔
136	}	576✔
137	const p = this.posa(this.columnx(col), this.timey(tm))	1,096✔
138	p.col = col	1,096✔
139	p.time = tm	1,096✔
140	return p	1,096✔
141	}	1,096✔
142		4✔
143	midpoint(p1, p2) {	4✔
144	return this.posa((p1.x + p2.x) / 2, (p1.y + p2.y) / 2)	168✔
145	}	168✔
146		4✔
147	// Override	4✔
148	// eslint-disable-next-line class-methods-use-this	4✔
149	draw_path(cmds, klasses) {	4✔
150	let d = null	920✔
151	if (typeof cmds === 'string') {	920✔
152	d = cmds	424✔
153	} else {	920✔
154	d = cmds	496✔
155	.map(c => {	496✔
156	if (typeof c === 'string') {	3,408✔
157	return c	1,792✔
158	}	1,792✔
159	return `${c.x} ${c.y}`	1,616✔
160	})	496✔
161	.join(' ')	496✔
162	}	496✔
163	return d	920✔
164	}	920✔
165		4✔
166	draw_line(p1, p2, klass) {	4✔
167	return this.draw_path(['M', p1, 'L', p2], klass)	272✔
168	}	272✔
169		4✔
170	draw_block(block) {	4✔
171	const pad = ((block.depth + 1) * 5) + (this.props.rung_width / 2)	88✔
172	const lt = this.pos(0, block.start).adjust(-pad, 0)	88✔
173	this.group(`${block.typ}: ${block.msg}`, () => {	88✔
174	this.draw_path(	88✔
175	[	88✔
176	'M',	88✔
177	lt.adjust(0, -15),	88✔
178	'L',	88✔
179	lt.adjust(35, -15),	88✔
180	'L',	88✔
181	lt.adjust(35, 0),	88✔
182	'L',	88✔
183	lt,	88✔
184	'Z',	88✔
185	],	88✔
186	'block_tab'	88✔
187	)	88✔
188		88✔
189	this.draw_label(lt.adjust(5, -2), block.typ, 'start')	88✔
190		88✔
191	if (block.msg) {	88✔
192	this.draw_label(lt.adjust(40, -2), block.msg, 'start')	88✔
193	}	88✔
194		88✔
195	const right = this.diag.parts.length - 1	88✔
196	this.draw_path(	88✔
197	[	88✔
198	'M',	88✔
199	lt.adjust(0, -15),	88✔
200	'L',	88✔
201	lt.adjust(35, -15),	88✔
202	'L',	88✔
203	lt.adjust(35, 0),	88✔
204	'L',	88✔
205	this.pos(right, block.start).adjust(pad, 0),	88✔
206	'L',	88✔
207	this.pos(right, block.end).adjust(pad, 0),	88✔
208	'L',	88✔
209	this.pos(0, block.end).adjust(-pad, 0),	88✔
210	'Z',	88✔
211	],	88✔
212	'block'	88✔
213	)	88✔
214	})	88✔
215	}	88✔
216		4✔
217	draw_note(note) {	4✔
218	const p = this.pos(note.from)	16✔
219	let adjust_dir = 1	16✔
220	let align = 'start'	16✔
221		16✔
222	if (note.from.col === this.diag.parts.length - 1) {	16✔
223	adjust_dir = -1	8✔
224	align = 'end'	8✔
225	}	8✔
226		16✔
227	this.draw_label(p.adjust(adjust_dir * (3 + (this.props.rung_width / 2)),	16✔
228	this.diag.props.time_height / 4), note.msg, align)	16✔
229	}	16✔
230		4✔
231	draw_self_arrow(start) {	4✔
232	const p1 = this.pos(start.from)	48✔
233	const p2 = this.pos(start.to)	48✔
234	let end = p2	48✔
235	const self_width = this.props.column_width / 4	48✔
236	const half_rung = this.props.rung_width / 2	48✔
237	let begin_adj = 0	48✔
238	let end_adj = 1	48✔
239	if (start.arrow.begin) {	48✔
240	begin_adj = 1	8✔
241	}	8✔
242		48✔
243	if (start.arrow.end === '#') {	48✔
244	end = p2.adjust(self_width / 2, 0)	16✔
245	end_adj *= 5	16✔
246	}	16✔
247	this.group(`message: ${start}`, () => {	48✔
248	this.draw_path(	48✔
249	[	48✔
250	'M',	48✔
251	p1.adjust(half_rung + begin_adj, 0),	48✔
252	'L',	48✔
253	p1.adjust(self_width, 0),	48✔
254	'L',	48✔
255	p2.adjust(self_width, 0),	48✔
256	'L',	48✔
257	end.adjust(half_rung + end_adj, 0),	48✔
258	],	48✔
259	`${start.arrow.classes()} self`	48✔
260	)	48✔
261		48✔
262	this.arrow_head(end.adjust(half_rung, 0), Math.PI, start.arrow.end)	48✔
263	if (start.arrow.begin) {	48✔
264	this.arrow_head(p1.adjust(half_rung, 0), Math.PI, start.arrow.begin)	8✔
265	}	8✔
266		48✔
267	if (start.msg) {	48✔
268	const text_anchor = this.midpoint(p1, p2).adjust(	48✔
269	self_width + this.props.label_space_x,	48✔
270	-this.props.label_space_y	48✔
271	)	48✔
272	this.draw_label(text_anchor, start.msg, 'start')	48✔
273	}	48✔
274	})	48✔
275	}	48✔
276		4✔
277	// eslint-disable-next-line class-methods-use-this	4✔
278	transform(x, y, theta, func) {	4✔
UNCOV 279	throw new Error('transform not implemented')	×
UNCOV 280	}	×
281		4✔
282	arrow_head(p, theta, type) {	4✔
283	this.transform(p.x, p.y, theta, () => {	368✔
284	if (type === '>' \|\| type === '<') {	368✔
285	this.draw_path('M -10 4 L -1 0 L -10 -4 L -9 0 Z', 'closed')	200✔
286	} else if (type === '#') {	368✔
287	this.draw_path('M -10 4 L -1 -4', 'open')	56✔
288	this.draw_path('M -10 -4 L -1 4', 'open')	56✔
289	} else {	168✔
290	this.draw_path('M -10 4 L -1 0 L -10 -4', 'open')	112✔
291	}	112✔
292	})	368✔
293	return this.doc	368✔
294	}	368✔
295		4✔
296	draw_arrow(msg) {	4✔
297	let p1 = this.pos(msg.from)	232✔
298	let p2 = this.pos(msg.to)	232✔
299	const half_rung = this.props.rung_width / 2	232✔
300		232✔
301	let begin_adj = 0	232✔
302	let end_adj = 0	232✔
303	let end_angle = 0	232✔
304	let text_anchor = 0	232✔
305	let text_align = 0	232✔
306	const l2r = p2.col > p1.col	232✔
307		232✔
308	if (msg.arrow.end === '#') {	232✔
309	p2 = this.midpoint(p1, p2)	40✔
310	}	40✔
311		232✔
312	// Bring each end of the line to the edge of the rung	232✔
313	if (l2r) {	232✔
314	// Left-to-right	160✔
315	p1 = p1.adjust(half_rung, 0)	160✔
316	p2 = p2.adjust(-half_rung, 0)	160✔
317	end_adj = -1	160✔
318		160✔
319	// Move over from the left a little	160✔
320	text_align = 'start'	160✔
321	text_anchor = p1.adjust(this.props.label_space_x, 0)	160✔
322	end_angle = 0	160✔
323	} else {	232✔
324	// Right-to-left	72✔
325	p1 = p1.adjust(-half_rung, 0)	72✔
326	p2 = p2.adjust(half_rung, 0)	72✔
327	end_adj = 1	72✔
328		72✔
329	// Move over from the right a little	72✔
330	text_align = 'end'	72✔
331	text_anchor = p1.adjust(-this.props.label_space_x, 0)	72✔
332	end_angle = Math.PI	72✔
333	}	72✔
334	if (msg.arrow.end === '#') {	232✔
335	end_adj *= 5	40✔
336	}	40✔
337		232✔
338	if (msg.arrow.begin) {	232✔
339	begin_adj = 1	80✔
340	text_align = 'center'	80✔
341	text_anchor = this.midpoint(p1, p2)	80✔
342	}	80✔
343		232✔
344	const rangle = Math.atan((p2.y - p1.y) / (p2.x - p1.x))	232✔
345		232✔
346	this.draw_line(	232✔
347	p1.adjust(begin_adj * Math.cos(rangle), begin_adj * Math.sin(rangle)),	232✔
348	p2.adjust(end_adj * Math.cos(rangle), end_adj * Math.sin(rangle)),	232✔
349	msg.arrow.classes()	232✔
350	)	232✔
351		232✔
352	this.arrow_head(p2, rangle + end_angle, msg.arrow.end)	232✔
353		232✔
354	if (msg.arrow.begin) {	232✔
355	this.arrow_head(p1, rangle + Math.PI, msg.arrow.begin)	80✔
356	}	80✔
357		232✔
358	if (msg.msg) {	232✔
359	this.draw_label(text_anchor, msg.msg, text_align, rangle)	192✔
360	}	192✔
361	}	232✔
362	}	4✔

hildjj / quence / 3941899168

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous