added test for sync edge cases

fixes #20

docs/sequences.typ

@@ -1,7 +1,8 @@
 /// Manually adds an event to the given participant
 /// - participant (str): The participant concerned by the event
 /// - event (str): The event type (see @@EVENTS for ccepted values)
-#let _evt(participant, event) = {}
+/// - lifeline-style (auto, dict): See @@_seq()
+#let _evt(participant, event, lifeline-style: auto) = {}
 
 /// Creates a sequence / message between two participants
 /// - p1 (str): Start participant
@@ -21,6 +22,7 @@
 /// - destroy-src (bool): If true, destroy the source lifeline and participant
 /// - lifeline-style (auto, dict): Optional styling options for lifeline rectangles (see CeTZ documentation for more information on all possible values)
 /// - slant (none, int): Optional slant of the arrow
+/// - outer-lifeline-connect (bool): If true, enables legacy anchoring, making sequences connect to the leftmost lifeline when arriving from the left side. If false, all connections are made with the latest/rightmost lifeline
 /// -> array
 #let _seq(
   p1,
@@ -39,7 +41,8 @@
   disable-src: false,
   destroy-src: false,
   lifeline-style: auto,
-  slant: none
+  slant: none,
+  outer-lifeline-connect: false
 ) = {}
 
 /// Creates a return sequence

src/core/draw/group.typ

@@ -3,6 +3,9 @@
 #import "/src/consts.typ": *
 #import "/src/core/utils.typ": get-ctx, set-ctx, expand-parent-group
 
+#let display-name(name) = text(name, weight: "bold")
+#let display-desc(desc) = text([\[#desc\]], weight: "bold", size: .8em)
+
 #let render-start(grp) = get-ctx(ctx => {
   let grp = grp
   ctx.y -= Y-SPACE
@@ -44,8 +47,8 @@
 
 
 #let draw-group(x0, x1, y0, y1, group) = {
-  let name = text(group.name, weight: "bold")
-  let m = measure(box(name))
+  let name = display-name(group.name)
+  let m = measure(name)
   let w = m.width / 1pt + 15
   let h = m.height / 1pt + 6
   draw.rect(
@@ -71,7 +74,7 @@
   if group.desc != none {
     draw.content(
       (x0 + w, y0),
-      text([\[#group.desc\]], weight: "bold", size: .8em),
+      display-desc(group.desc),
       anchor: "north-west",
       padding: 3pt
     )
@@ -86,7 +89,7 @@
   )
   draw.content(
     (x0, y),
-    text([\[#elmt.desc\]], weight: "bold", size: .8em),
+    display-desc(elmt.desc),
     anchor: "north-west",
     padding: 3pt
   )
@@ -105,6 +108,22 @@
   let x0 = min-x - 10
   let x1 = max-x + 10
   
+  // Fit name and descriptions
+  let name-m = measure(display-name(group.name))
+  let width = name-m.width / 1pt + 15
+  if group.desc != none {
+    let desc-m = measure(display-desc(group.desc))
+    width += desc-m.width / 1pt + 6
+  }
+  if group.grp-type == "alt" {
+    width = calc.max(width, ..group.elses.map(e => {
+      let elmt = e.at(1)
+      let desc-m = measure(display-desc(elmt.desc))
+      return desc-m.width / 1pt + 6
+    }))
+  }
+  x1 = calc.max(x1, x0 + width + 3)
+  
   draw-group(x0, x1, start-y, ctx.y, group)
 
   if group.grp-type == "alt" {

src/core/draw/sequence.typ

@@ -1,8 +1,8 @@
-#import "/src/cetz.typ": draw, vector
+#import "/src/cetz.typ": draw, vector, coordinate
 
 #import "note.typ"
 #import "/src/consts.typ": *
-#import "/src/core/utils.typ": get-ctx, set-ctx
+#import "/src/core/utils.typ": get-ctx, set-ctx, expand-parent-group
 
 #let get-arrow-marks(sym, color) = {
   if sym == none {
@@ -137,13 +137,19 @@
   end-info.ll-lvl = ctx.lifelines.at(i2).level * LIFELINE-W / 2
 
   // Compute left/right position at start/end
-  start-info.insert("lx", start-info.x)
-  if start-info.ll-lvl != 0 { start-info.lx -= LIFELINE-W / 2 }
-  end-info.insert("lx", end-info.x)
-  if end-info.ll-lvl != 0 { end-info.lx -= LIFELINE-W / 2 }
-
   start-info.insert("rx", start-info.x + start-info.ll-lvl)
   end-info.insert("rx", end-info.x + end-info.ll-lvl)
+  let start-lx = start-info.x
+  let end-lx = end-info.x
+  if seq.outer-lifeline-connect {
+    if start-info.ll-lvl != 0 {start-lx -= LIFELINE-W / 2}
+    if end-info.ll-lvl != 0 {end-lx -= LIFELINE-W / 2}
+  } else {
+    if start-info.ll-lvl != 0 {start-lx = start-info.rx - LIFELINE-W}
+    if end-info.ll-lvl != 0 {end-lx = end-info.rx - LIFELINE-W}
+  }
+  start-info.insert("lx", start-lx)
+  end-info.insert("lx", end-lx)
 
   // Choose correct points to link
   let x1 = start-info.rx
@@ -223,6 +229,11 @@
       ).at(seq.comment-align)
     }
 
+    expand-parent-group(
+      calc.min(x1, x2, x-mid),
+      calc.max(x1, x2, x-mid)
+    )
+
   } else {
     pts = (
       (x1, start-info.y),
@@ -261,6 +272,11 @@
       (p1, p2) = (p2, p1)
     }
     comment-angle = vector.angle2(p1, p2)
+
+    expand-parent-group(
+      calc.min(x1, x2),
+      calc.max(x1, x2)
+    )
   }
 
   // Start circle tip
@@ -335,8 +351,23 @@
       comment,
       anchor: comment-anchor,
       angle: comment-angle,
-      padding: 3pt
+      padding: 3pt,
+      name: "comment"
     )
+
+    // TODO: Improve this
+    draw.get-ctx(c => {
+      let (_, left, right) = coordinate.resolve(
+        c,
+        "comment.west",
+        "comment.east"
+      )
+      expand-parent-group(
+        left.at(0),
+        right.at(0)
+      )
+    })
+
   }
 
   if seq.create-dst {
@@ -363,6 +394,11 @@
   set-ctx(c => {
     c.y = end-info.y
     c.lifelines = ctx.lifelines
+    c.last-drawn = (
+      type: "seq",
+      start-info: start-info,
+      end-info: end-info
+    )
     return c
   })
 })

src/core/draw/sync.typ

@@ -1,32 +1,66 @@
 #import "/src/core/utils.typ": get-ctx, is-elmt, set-ctx
+#import "/src/cetz.typ": draw
 
 #let render(sync) = get-ctx(ctx => {
   set-ctx(c => {
-    c.sync-ys = ()
+    c.sync = (
+      ctx: ctx,
+      bottoms: (),
+      starts: (),
+      start-y: ctx.y,
+      align-y: ctx.y
+    )
+    c.in-sync = true
     return c
   })
+})
 
+#let in-sync-render(elmt) = {
+  set-ctx(c => {
+    c.y = c.sync.start-y
+    return c
+  })
+  draw.hide({
+    (elmt.draw)(elmt)
+  })
+  set-ctx(c => {
+    c.sync.starts.push(c.last-drawn.start-info.y)
+    c.sync.bottoms.push(c.y)
+    return c
+  })
+}
+
+#let render-end(sync) = get-ctx(ctx => {
   for e in sync.elmts {
     assert(is-elmt(e), message: "Sync element can only contain chronos elements, found " + repr(e))
     assert(
       e.type == "seq",
       message: "Sync element can only contain sequences, found '" + e.type + "'"
     )
-
-    set-ctx(c => {
-      c.y = ctx.y
-      return c
-    })
-    (e.draw)(e)
-    set-ctx(c => {
-      c.sync-ys.push(c.y)
-      return c
-    })
   }
 
   set-ctx(c => {
-    c.y = calc.min(..c.sync-ys)
-    c.remove("sync-ys")
+    let new-sync = c.sync
+    if new-sync.starts.len() != 0 {
+      new-sync.align-y = calc.min(..new-sync.starts)
+    }
+    new-sync.remove("ctx")
+    return c.sync.ctx + (sync: new-sync)
+  })
+
+  for (i, e) in sync.elmts.enumerate() {
+    set-ctx(c => {
+      let dy = c.sync.starts.at(i) - c.sync.start-y
+      c.y = c.sync.align-y - dy
+      return c
+    })
+    (e.draw)(e)
+  }
+
+  set-ctx(c => {
+    let heights = c.sync.starts.zip(c.sync.bottoms).map(((s, b)) => b - s)
+    c.y = c.sync.align-y + calc.min(..heights)
+    c.remove("sync")
     return c
   })
 })

src/core/renderer.typ

@@ -2,6 +2,7 @@
 
 #import "draw/note.typ": get-box as get-note-box, get-size as get-note-size
 #import "draw/participant.typ"
+#import "draw/sync.typ": in-sync-render
 #import "utils.typ": *
 #import "/src/consts.typ": *
 
@@ -15,22 +16,6 @@
   })
 }
 
-#let unwrap-syncs(elements) = {
-  let i = 0
-  while i < elements.len() {
-    let elmt = elements.at(i)
-    if elmt.type == "sync" {
-      elements = (
-        elements.slice(0, i + 1) +
-        elmt.elmts +
-        elements.slice(i + 1)
-      )
-    }
-    i += 1
-  }
-  return elements
-}
-
 #let seq-update-lifelines(participants, pars-i, seq) = {
   let participants = participants
   let com = if seq.comment == none {""} else {seq.comment}
@@ -308,7 +293,6 @@
 
 #let compute-columns-width(participants, elements, pars-i) = {
   elements = elements.filter(is-elmt)
-  elements = unwrap-syncs(elements)
 
   let cells
   (participants, elements, cells) = compute-max-lifeline-levels(participants, elements, pars-i)
@@ -334,7 +318,8 @@
     lifelines: participants.map(_ => (
       level: 0,
       lines: ()
-    ))
+    )),
+    in-sync: false
   )
   chronos-ctx.insert(
     "widths",
@@ -393,8 +378,14 @@
     if not is-elmt(elmt) {
       (elmt,)
     } else if "draw" in elmt and elmt.type != "par" {
+      get-ctx(ctx => {
+        if ctx.in-sync and elmt.type != "sync-end" {
+          in-sync-render(elmt)
+        } else {
           (elmt.draw)(elmt)
         }
+      })
+    }
   }
 
   set-ctx(ctx => {

src/core/setup.typ

@@ -1,4 +1,5 @@
 #import "draw/group.typ": render-end as grp-render-end
+#import "draw/sync.typ": render-end as sync-render-end
 #import "utils.typ": get-group-span, is-elmt
 #import "/src/participant.typ": _exists as par-exists, _par
 #import "/src/sequence.typ": _seq
@@ -18,6 +19,24 @@
   )
 }
 
+#let flatten-sync(elmts, i) = {
+  let sync = elmts.at(i)
+  elmts.at(i) = sync
+  let start = sync
+  start.remove("elmts")
+  return (
+    elmts.slice(0, i) +
+    (start,) +
+    sync.elmts +
+    ((
+      type: "sync-end",
+      draw: sync-render-end,
+      elmts: sync.elmts
+    ),) +
+    elmts.slice(i + 1)
+  )
+}
+
 #let update-group-children(elmts, i) = {
   let elmts = elmts
   let group-end = elmts.at(i)
@@ -59,6 +78,9 @@
     if elmt.type == "grp" {
       elmts = flatten-group(elmts, i)
     
+    } else if elmt.type == "sync" {
+      elmts = flatten-sync(elmts, i)
+
     } else if elmt.type == "seq" {
       if elmt.enable-dst {
         activation-history.push(elmt)

src/group.typ

@@ -39,5 +39,5 @@
   }
   _grp(name, desc: desc, type: "loop", elmts)
 }
-#let _opt(desc, elmts) = grp("opt", desc: desc, type: "opt", elmts)
-#let _break(desc, elmts) = grp("break", desc: desc, type: "break", elmts)
+#let _opt(desc, elmts) = _grp("opt", desc: desc, type: "opt", elmts)
+#let _break(desc, elmts) = _grp("break", desc: desc, type: "break", elmts)

src/misc.typ

@@ -42,13 +42,13 @@
   ),)
 }
 
-#let _evt(participant, event) = {
+#let _evt(participant, event, lifeline-style: auto) = {
   return ((
     type: "evt",
     draw: evt-render,
     participant: participant,
     event: event,
-    lifeline-style: auto
+    lifeline-style: lifeline-style
   ),)
 }
 

src/sequence.typ

@@ -17,7 +17,8 @@
   disable-src: false,
   destroy-src: false,
   lifeline-style: auto,
-  slant: none
+  slant: none,
+  outer-lifeline-connect: false
 ) = {
   return ((
     type: "seq",
@@ -39,6 +40,7 @@
     destroy-src: destroy-src,
     lifeline-style: lifeline-style,
     slant: slant,
+    outer-lifeline-connect: outer-lifeline-connect,
     linked-notes: ()
   ),)
 }

tests/lifeline/create-destroy/.gitignore

@@ -0,0 +1,4 @@
+# generated by tytanic, do not edit
+
+diff/**
+out/**

tests/lifeline/create-destroy/test.typ

@@ -0,0 +1,32 @@
+#set page(width: auto, height: auto)
+#import "/src/lib.typ": *
+
+#diagram({
+  _par("a", display-name: "Alice")
+  _par("b", display-name: "Bob")
+
+  // Left to right
+  _seq("a", "b", create-dst: true)
+  _seq("a", "b", enable-dst: true)
+  _seq("a", "b", enable-dst: true)
+  _gap()
+  _seq("a", "b", destroy-dst: true)
+  _gap()
+  _seq("a", "b", destroy-dst: true)
+})
+
+#pagebreak()
+
+#diagram({
+  _par("a", display-name: "Alice")
+  _par("b", display-name: "Bob")
+
+  // Right to left
+  _seq("b", "a", create-dst: true)
+  _seq("b", "a", enable-dst: true)
+  _seq("b", "a", enable-dst: true)
+  _gap()
+  _seq("b", "a", destroy-dst: true)
+  _gap()
+  _seq("b", "a", destroy-dst: true)
+})

tests/lifeline/enable-disable/.gitignore

@@ -0,0 +1,4 @@
+# generated by tytanic, do not edit
+
+diff/**
+out/**

tests/lifeline/enable-disable/test.typ

@@ -0,0 +1,110 @@
+#set page(width: auto, height: auto)
+#import "/src/lib.typ": *
+
+#diagram({
+  _par("a", display-name: "Alice")
+  _par("b", display-name: "Bob")
+
+  // Left to right
+  _seq("a", "b")
+  _seq("a", "b", enable-dst: true)
+  _seq("a", "b")
+  _seq("a", "b", enable-dst: true)
+  _seq("a", "b")
+  _seq("a", "b", disable-dst: true)
+  _seq("a", "b")
+  _seq("a", "b", disable-dst: true)
+  _seq("a", "b")
+})
+
+#pagebreak()
+
+#diagram({
+  _par("a", display-name: "Alice")
+  _par("b", display-name: "Bob")
+
+  // Right to left
+  _seq("b", "a")
+  _seq("b", "a", enable-dst: true)
+  _seq("b", "a")
+  _seq("b", "a", enable-dst: true)
+  _seq("b", "a")
+  _seq("b", "a", disable-dst: true)
+  _seq("b", "a")
+  _seq("b", "a", disable-dst: true)
+  _seq("b", "a")
+})
+
+#pagebreak()
+
+#diagram({
+  _par("a", display-name: "Alice")
+  _par("b", display-name: "Bob")
+
+  // Self right
+  _seq("a", "a")
+  _seq("a", "a", enable-dst: true)
+  _seq("a", "a")
+  _seq("a", "a", enable-dst: true)
+  _seq("a", "a")
+  _seq("a", "a", disable-dst: true)
+  _seq("a", "a")
+  _seq("a", "a", disable-dst: true)
+  _seq("a", "a")
+})
+
+#pagebreak()
+
+#diagram({
+  _par("a", display-name: "Alice")
+  _par("b", display-name: "Bob")
+
+  let _seq = _seq.with(flip: true)
+
+  // Self left
+  _seq("b", "b")
+  _seq("b", "b", enable-dst: true)
+  _seq("b", "b")
+  _seq("b", "b", enable-dst: true)
+  _seq("b", "b")
+  _seq("b", "b", disable-dst: true)
+  _seq("b", "b")
+  _seq("b", "b", disable-dst: true)
+  _seq("b", "b")
+})
+
+#pagebreak()
+
+#diagram({
+  _par("a", display-name: "Alice")
+  _par("b", display-name: "Bob")
+
+  // Disable src (rtl)
+  _seq("a", "b")
+  _seq("a", "b", enable-dst: true)
+  _seq("a", "b")
+  _seq("a", "b", enable-dst: true)
+  _seq("a", "b")
+  _seq("b", "a", disable-src: true)
+  _seq("a", "b")
+  _seq("b", "a", disable-src: true)
+  _seq("a", "b")
+})
+
+#pagebreak()
+
+#diagram({
+  _par("a", display-name: "Alice")
+  _par("b", display-name: "Bob")
+
+  // Disable src (ltr)
+  _seq("b", "a")
+  _seq("b", "a", enable-dst: true)
+  _seq("b", "a")
+  _seq("b", "a", enable-dst: true)
+  _seq("b", "a")
+  _seq("a", "b", disable-src: true)
+  _seq("b", "a")
+  _seq("a", "b", disable-src: true)
+  _seq("b", "a")
+})

tests/lifeline/event/.gitignore

@@ -0,0 +1,4 @@
+# generated by tytanic, do not edit
+
+diff/**
+out/**

tests/lifeline/event/test.typ

@@ -0,0 +1,75 @@
+#set page(width: auto, height: auto)
+#import "/src/lib.typ": *
+
+#diagram({
+  _par("a", display-name: "Alice")
+  _par("b", display-name: "Bob")
+
+  _evt("a", "enable")
+  _gap()
+  _seq("a", "b")
+  _evt("a", "disable")
+  _gap()
+  _evt("a", "enable")
+  _evt("b", "enable")
+  _seq("a", "b")
+  _evt("a", "enable")
+  _evt("b", "enable")
+  _gap()
+  _seq("a", "b")
+  _evt("a", "disable")
+  _evt("b", "disable")
+  _gap()
+  _evt("a", "disable")
+  _evt("b", "disable")
+})
+
+#pagebreak()
+
+#diagram({
+  _par("a", display-name: "Alice")
+  _par("b", display-name: "Bob")
+  _par("c", display-name: "Charlie")
+  
+  _seq("a", "b")
+  _gap()
+  _seq("a", "b", enable-dst: true)
+  _evt("c", "create")
+  _seq("c", "a")
+  _evt("b", "destroy")
+})
+
+#pagebreak()
+
+#diagram({
+  _par("a", display-name: "Alice")
+  _par("b", display-name: "Bob")
+
+  _seq("a", "b")
+  _evt("b", "enable")
+  _seq("a", "b")
+  _evt("b", "enable", lifeline-style: (fill: red))
+  _gap()
+  _seq("b", "a")
+  _evt("b", "disable")
+  _seq("a", "b")
+  _evt("b", "enable", lifeline-style: (
+    stroke: (
+      paint: green,
+      dash: "dashed",
+      thickness: 2pt
+    )
+  ))
+  _gap()
+  _seq("b", "a")
+  _evt("b", "disable")
+  _seq("b", "a")
+  _evt("b", "disable")
+  _seq("a", "b")
+  _evt("b", "enable", lifeline-style: (
+    radius: 4pt
+  ))
+  _gap()
+  _seq("b", "a")
+  _evt("b", "disable")
+})

tests/lifeline/style/.gitignore

@@ -0,0 +1,4 @@
+# generated by tytanic, do not edit
+
+diff/**
+out/**

tests/lifeline/style/test.typ

@@ -0,0 +1,27 @@
+#set page(width: auto, height: auto)
+#import "/src/lib.typ": *
+
+#diagram({
+  _par("a", display-name: "Alice")
+  _par("b", display-name: "Bob")
+
+  _seq("a", "b", enable-dst: true)
+  _seq("a", "b", enable-dst: true, lifeline-style: (fill: red))
+  _gap()
+  _seq("b", "a", disable-src: true)
+  _seq("a", "b", enable-dst: true, lifeline-style: (
+    stroke: (
+      paint: green,
+      dash: "dashed",
+      thickness: 2pt
+    )
+  ))
+  _gap()
+  _seq("b", "a", disable-src: true)
+  _seq("b", "a", disable-src: true)
+  _seq("a", "b", enable-dst: true, lifeline-style: (
+    radius: 4pt
+  ))
+  _gap()
+  _seq("b", "a", disable-src: true)
+})

tests/sequence/outer-lifeline/.gitignore

@@ -0,0 +1,4 @@
+# generated by tytanic, do not edit
+
+diff/**
+out/**

tests/sequence/outer-lifeline/test.typ

@@ -0,0 +1,29 @@
+#set page(width: auto, height: auto)
+#import "/src/lib.typ": *
+
+#let make-diagram(_seq) = {
+  diagram({
+    _par("a")
+    _par("b")
+    _par("c")
+    _seq("a", "b")
+    _seq("c", "b")
+    _seq("a", "b", enable-dst: true)
+    _seq("a", "b")
+    _seq("c", "b")
+    _seq("a", "b", enable-dst: true)
+    _seq("a", "b")
+    _seq("c", "b")
+    _seq("a", "b", enable-dst: true)
+    _seq("a", "b")
+    _seq("c", "b")
+
+    _evt("b", "disable")
+    _evt("b", "disable")
+    _evt("b", "disable")
+  })
+}
+
+#make-diagram(_seq)
+#pagebreak()
+#make-diagram(_seq.with(outer-lifeline-connect: true))

tests/sequence/sync/.gitignore

@@ -0,0 +1,4 @@
+# generated by tytanic, do not edit
+
+diff/**
+out/**

tests/sequence/sync/test.typ

@@ -0,0 +1,47 @@
+#set page(width: auto, height: auto)
+#import "/src/lib.typ": *
+
+#diagram({
+  _par("a")
+  _par("b")
+  _par("c")
+  _sync({
+    _seq("b", "a")
+    _seq("b", "c")
+  })
+  _gap()
+  _sync({
+    _seq("b", "a", comment: [Comment])
+    _seq("b", "c")
+  })
+  _gap()
+  _sync({
+    _seq("b", "a")
+    _seq("b", "c", comment: [Comment])
+  })
+  _gap()
+  _sync({
+    _seq("b", "a", comment: [Two\ lines])
+    _seq("b", "c", comment: [Comment])
+  })
+
+  _sync({
+    _seq("b", "a")
+    _seq("b", "c", slant: 10)
+  })
+
+  _sync({
+    _seq("b", "a")
+    _seq("b", "b")
+  })
+})
+
+#pagebreak()
+
+#diagram({
+  _sync({
+    _seq("a", "b", comment: [Abcdefgh])
+    _seq("b", "c", comment: [Foo\ bar], slant: 10)
+    _seq("c", "c", slant: 20)
+  })
+})

tests/special-group/.gitignore

@@ -0,0 +1,4 @@
+# generated by tytanic, do not edit
+
+diff/**
+out/**

tests/special-group/test.typ

@@ -0,0 +1,71 @@
+#set page(width: auto, height: auto)
+#import "/src/lib.typ": *
+
+#let preamble = {
+  _par("a", display-name: [Alice])
+  _par("b", display-name: [Bob])
+  _col("a", "b", width: 2cm)
+}
+
+#diagram({
+  preamble
+  _grp("Group 1", {
+    _seq("a", "b")
+  })
+  _grp("Group 2", desc: [Description], {
+    _seq("a", "b")
+  })
+})
+
+#pagebreak()
+
+#diagram({
+  preamble
+  _alt(
+    "case 1", {
+      _seq("a", "b")
+    },
+    "case 2", {
+      _seq("a", "b")
+    },
+    "case 3", {
+      _seq("a", "b")
+    }
+  )
+})
+
+#pagebreak()
+
+#diagram({
+  preamble
+  _loop("loop 1", {
+    _seq("a", "b")
+  })
+  _loop("loop 2", min: 1, {
+    _seq("a", "b")
+  })
+  _loop("loop 3", max: 10, {
+    _seq("a", "b")
+  })
+  _loop("loop 3", min: 1, max: 10, {
+    _seq("a", "b")
+  })
+})
+
+#pagebreak()
+
+#diagram({
+  preamble
+  _opt("Optional", {
+    _seq("a", "b")
+  })
+})
+
+#pagebreak()
+
+#diagram({
+  preamble
+  _break("Break", {
+    _seq("a", "b")
+  })
+})