3865362973

Build Type

push

github

Committed by GitHub

Commit Message

Merge pull request #17 from hildjj/updates

Run Details

532 of 716 branches covered (74.3%)

Branch coverage included in aggregate %.

193 of 213 new or added lines in 7 files covered. (90.61%)

117 existing lines in 1 file now uncovered.

1392 of 1567 relevant lines covered (88.83%)

411.38 hits per line

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

94.18

/lib/driver.js

/* eslint-disable no-invalid-this */
'use strict'

const log = require('log4js').getLogger()
const ast = require('./ast')
const pjson = require('../package')

module.exports = 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', function() {
      this.diag.parts.forEach(function(part, i) {
        this.group(`Paricipant: ${part.desc}`, function() {
          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(function(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
      }
    }, 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}`, function() {
      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_self_arrow(start) {
    const p1 = this.pos(start.from)
    const p2 = this.pos(start.to)
    const self_width = this.props.column_width / 4
    const half_rung = this.props.rung_width / 2
    let begin_adj = 0

    if (start.arrow.begin) {
      begin_adj = 1
    }
    this.group(`message: ${start}`, function() {
      this.draw_path(
        [
          'M',
          p1.adjust(half_rung + begin_adj, 0),
          'L',
          p1.adjust(self_width, 0),
          'L',
          p2.adjust(self_width, 0),
          'L',
          p2.adjust(half_rung + 1, 0),
        ],
        `${start.arrow.classes()} self`
      )

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

hildjj / quence / 3865362973

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