@airmark/quiver 0.31.0 → 0.32.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airmark/quiver",
-  "version": "0.31.0",
+  "version": "0.32.0",
   "description": "Airmark Quiver — Air Force and DAF document Quills for Quillmark.",
   "type": "module",
   "exports": {
@@ -16,9 +16,9 @@
     "node": ">=24"
   },
   "devDependencies": {
-    "@quillmark/quiver": "0.23.0",
-    "@quillmark/wasm": "^0.105.0",
-    "quillkit": "0.3.0"
+    "@quillmark/quiver": "0.24.0",
+    "@quillmark/wasm": "^0.108.1",
+    "quillkit": "0.5.1"
   },
   "scripts": {
     "test": "quillkit test",

package/quills/af4141/0.1.0/plate.typ

@@ -3,23 +3,15 @@
 
 #set text(font: "NimbusRomNo9L")
 
-// A `type: date` field lowers to a click-to-edit value object
-// `(value: datetime, display: closure)`; `display` is a stored closure on a dict
-// rather than a method, so it is called through parentheses, and the content it
-// returns carries the region that makes the glyphs clickable. A native datetime
-// is still accepted. Missing / blank dates arrive as `none`; empty strings may
-// also appear from input.
+// A `type: date` field arrives as a native `datetime`, blank as `none`. The
+// form's cells are strings, so a date is formatted here rather than placed as
+// ink: `display` would give the glyphs a schema address, but the form draws
+// each cell into a fixed box it builds itself, which takes a `str`.
 #let form-cell(v) = {
   let pattern = "[month padding:none]/[day padding:none]/[year]"
   if v == none { "" }
-  else if type(v) == str and v == "" { "" }
-  else if type(v) == dictionary {
-    (v.display)(pattern)
-  } else if type(v) == datetime {
-    v.display(pattern)
-  } else {
-    str(v)
-  }
+  else if type(v) == datetime { v.display(pattern) }
+  else { str(v) }
 }
 
 // Column order within each 7-field row group

package/quills/afmc_moa/0.0.1/packages/typst-afmc-moa/src/lib.typ

@@ -38,4 +38,4 @@
 #import "mainmatter.typ": mainmatter
 #import "attachment.typ": render-attachment-a as attachment, render-attachment-card as attachment-card
 #import "backmatter.typ": backmatter
-#import "utils.typ": trim-inline
+#import "utils.typ": date-pattern, trim-inline

package/quills/afmc_moa/0.0.1/packages/typst-afmc-moa/src/utils.typ

@@ -82,23 +82,22 @@
   if joined == none { [] } else { joined }
 }
 
+/// The date pattern this package prints ("22 July 2026"). Exported so a caller
+/// that pre-formats a date matches it instead of restating it.
+#let date-pattern = "[day padding:none] [month repr:long] [year]"
+
 /// Format a date value for inline display ("22 July 2026").
 ///
-/// Dispatches on the shape a date field can arrive in:
-/// - str: shown as-is (fixed text like a placeholder).
-/// - datetime: a native Typst datetime (e.g. `datetime.today()`).
-/// - dict: a Quillmark `date`/`datetime` field lowers to a click-to-edit value
-///   object `{ value: datetime, display: closure }`; `display` is a stored
-///   closure, so it must be called through parentheses — a dict has no
-///   `.display` method.
+/// - str, content: shown as-is (a fixed placeholder, or ink the caller already
+///   formatted through [`date-pattern`]).
+/// - datetime: formatted to [`date-pattern`].
 #let format-date(d) = {
   if d == none {
     ""
-  } else if type(d) == str {
+  } else if type(d) in (str, content) {
     d
   } else {
-    let pattern = "[day padding:none] [month repr:long] [year]"
-    if type(d) == datetime { d.display(pattern) } else { (d.display)(pattern) }
+    d.display(date-pattern)
   }
 }
 

package/quills/afmc_moa/0.0.1/plate.typ

@@ -1,6 +1,6 @@
-#import "@local/quillmark-helper:0.1.0": data, signature-field
+#import "@local/quillmark-helper:0.1.0": data, display, signature-field
 #import "@local/typst-afmc-moa:0.1.0": (
-  attachment, attachment-card, backmatter, frontmatter, mainmatter, trim-inline,
+  attachment, attachment-card, backmatter, date-pattern, frontmatter, mainmatter, trim-inline,
 )
 
 // Every text field is `plaintext`/`richtext`, so it arrives as content carrying
@@ -34,7 +34,12 @@
 
   first_party_signatory: text-field("first_party_signatory"),
   second_party_signatory: text-field("second_party_signatory"),
-  mid_point_review_due_date: data.mid_point_review_due_date,
+  // `data.mid_point_review_due_date` is the native `datetime` and would render
+  // identically, but its ink would be born inside the package and carry no
+  // schema address. `display` places the field's content projection instead, so
+  // the printed date stays click-to-edit; a blank one yields `none`, which
+  // `format-date` renders as nothing.
+  mid_point_review_due_date: display("mid_point_review_due_date", date-pattern),
 )
 
 // ── Frontmatter: page setup, title block, intro paragraph ──────────────────

package/quills/usaf_memo/0.3.0/Quill.yaml

@@ -122,6 +122,28 @@ main:
         group: classification
         compact: true
       description: "Select the classification marking shown in the header and footer banner. Unclassified documents typically omit this banner entirely — leave blank unless the document is CUI or classified. Mark per DAFI 16-1404 (DoDM 5200.48 for CUI) and applicable DoD guidance."
+      variants:
+        CUI:
+          controlled_by:
+            type: plaintext
+            inline: true
+            example: SAF/AA
+            description: "Office or organization that designated this information as CUI. Required by DoDM 5200.48."
+          poc:
+            type: plaintext
+            inline: true
+            example: "Capt J. Smith, DSN 555-1234, john.smith@us.af.mil"
+            description: "Point of contact for CUI questions. Required by DoDM 5200.48."
+          category:
+            type: plaintext
+            inline: true
+            default: ""
+            description: "CUI category from the DoD CUI Registry (e.g., 'Privacy/MED', 'CTI', 'PRVCY'). Leave blank to omit."
+          limited_dissemination:
+            type: plaintext
+            inline: true
+            default: ""
+            description: "Limited dissemination control shown in the indicator block (e.g., 'FEDONLY', 'NOFORN'). Independent from the banner suffix."
 
     dissemination:
       type: plaintext
@@ -132,42 +154,6 @@ main:
         compact: true
       description: "Banner dissemination suffix appended after double slash (e.g. 'NF' renders as CUI//NF in the header/footer). Leave blank for no suffix."
 
-    cui_controlled_by:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: classification
-        compact: true
-      description: "Office or organization that designated this information as CUI (e.g., 'SAF/AA'). Required by DoDM 5200.48 when classification is CUI."
-
-    cui_category:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: classification
-        compact: true
-      description: "CUI category from the DoD CUI Registry (e.g., 'Privacy/MED', 'CTI', 'PRVCY'). Leave blank to omit."
-
-    cui_limited_dissemination:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: classification
-        compact: true
-      description: "Limited dissemination control shown in the indicator block (e.g., 'FEDONLY', 'NOFORN'). Independent from the banner suffix above."
-
-    cui_poc:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: classification
-        compact: true
-      description: "Point of contact for CUI questions (e.g., 'Capt J. Smith, DSN 555-1234, john.smith@us.af.mil'). Required by DoDM 5200.48 when classification is CUI."
-
     references:
       type: array
       items:
@@ -297,14 +283,11 @@ card_kinds:
           - undecided
           - approve
           - disapprove
-          - undecided_concur
-          - concur
-          - nonconcur
         default: ""
         ui:
           group: additional
           compact: true
-        description: "Decision taken by the endorser, shown as an either/or line with the choice circled. Leave blank to hide the line entirely. Approval authority: 'approve' or 'disapprove' (use 'undecided' to print Approve/Disapprove for the endorser to circle by hand). Coordinating official: 'concur' or 'nonconcur' (use 'undecided_concur' to print Concur/Nonconcur unmarked)."
+        description: "Decision taken by the endorser, shown as an either/or line with the choice underlined and the rejected option struck out. Leave blank to hide the line entirely. The wording is automatic: the last indorsement is the approval authority and reads Approve/Disapprove, while every earlier one is a coordinating official and reads Concur/Nonconcur. Use 'undecided' to print the pair unmarked for the endorser to mark by hand."
       date:
         type: date
         default: ""

package/quills/usaf_memo/0.3.0/packages/tonguetoquill-usaf-memo/src/indorsement.typ

@@ -27,11 +27,15 @@
   // Format of indorsement: "standard" (same page), "informal" (no header), or "separate_page" (starts on new page)
   format: "standard",
   // Decision action. `none` (default) displays no action line at all.
-  // Approval authority pair: "approve" or "disapprove" circles the selected
-  // option; "undecided" displays the pair with neither circled.
-  // Coordination pair: "concur" or "nonconcur" circles the selected option;
-  // "undecided_concur" displays the pair with neither circled.
+  // "approve" or "disapprove" underlines the selected option and strikes the
+  // other; "undecided" displays the pair with neither marked.
   action: none,
+  // Role this indorsement plays in the coordination chain, which selects the
+  // wording of the action line: the approval authority (the last indorsement
+  // in the chain) Approves / Disapproves, every coordinating official before
+  // it Concurs / Nonconcurs. The caller owns this because only it can see
+  // whether further indorsements follow.
+  approval_authority: false,
   content,
 ) = {
   // Validate format parameter
@@ -160,7 +164,11 @@
 
   // Show action line only when an action decision is set (not `none`)
   if effective_action != none {
-    render-action-line(effective_action, trailing-blank-line: not body_empty)
+    render-action-line(
+      effective_action,
+      approval-authority: approval_authority,
+      trailing-blank-line: not body_empty,
+    )
   }
 
   if not body_empty {

package/quills/usaf_memo/0.3.0/packages/tonguetoquill-usaf-memo/src/lib.typ

@@ -55,3 +55,4 @@
 #import "mainmatter.typ": mainmatter
 #import "backmatter.typ": backmatter
 #import "indorsement.typ": indorsement
+#import "utils.typ": date-pattern

package/quills/usaf_memo/0.3.0/packages/tonguetoquill-usaf-memo/src/primitives.typ

@@ -306,37 +306,46 @@
 // plays in a coordination chain: coordinating officials Concur / Nonconcur,
 // while the final approval authority Approves / Disapproves.
 //
-// Each pair also has an "undecided" form that renders both options plain, for
-// printing a memo the endorser circles by hand when signing.
+// Which pair prints is not the endorser's to choose — it follows from the
+// role, so the caller supplies the role via `approval-authority` and the same
+// three `action` values (affirm, reject, or leave open) carry over both pairs.
+//
+// The "undecided" form renders both options plain, for printing a memo the
+// endorser marks by hand when signing.
 //
 // Empty/none suppression is handled by the caller before this is invoked.
 
-// Maps each `action` value to the option pair it renders and the index of the
-// selected option within that pair (`none` selects neither).
-#let ACTION_FORMS = (
-  "undecided": (("Approve", "Disapprove"), none),
-  "approve": (("Approve", "Disapprove"), 0),
-  "disapprove": (("Approve", "Disapprove"), 1),
-  "undecided_concur": (("Concur", "Nonconcur"), none),
-  "concur": (("Concur", "Nonconcur"), 0),
-  "nonconcur": (("Concur", "Nonconcur"), 1),
+// The option pair for each role, ordered (affirmative, negative).
+#let APPROVAL_OPTIONS = ("Approve", "Disapprove")
+#let COORDINATION_OPTIONS = ("Concur", "Nonconcur")
+
+// Maps each `action` value to the index of the option it selects within
+// whichever pair is rendered (`none` selects neither).
+#let ACTION_SELECTIONS = (
+  "undecided": none,
+  "approve": 0,
+  "disapprove": 1,
 )
 
-#let render-action-line(action, trailing-blank-line: true) = {
+#let render-action-line(action, approval-authority: false, trailing-blank-line: true) = {
   assert(
-    action in ACTION_FORMS,
-    message: "action must be one of " + ACTION_FORMS.keys().map(k => "\"" + k + "\"").join(", "),
+    action in ACTION_SELECTIONS,
+    message: "action must be one of " + ACTION_SELECTIONS.keys().map(k => "\"" + k + "\"").join(", "),
   )
-  let (options, selected) = ACTION_FORMS.at(action)
-  // Circle the selected option using a box with rounded corners; strike the
-  // one it was chosen over. When neither is selected both render plain.
-  // Use baseline parameter to maintain vertical text alignment.
+  let options = if approval-authority { APPROVAL_OPTIONS } else { COORDINATION_OPTIONS }
+  let selected = ACTION_SELECTIONS.at(action)
+  // Underline the selected option; strike the one it was chosen over. When
+  // neither is selected both render plain. An underline keeps the option on
+  // the line's own baseline — the box it replaces had to be nudged with
+  // `baseline` to sit straight — and reads as a mark made on the page, where a
+  // ruled rectangle in a PDF carrying real AcroForm widgets reads as one more
+  // fillable field.
   let render-option(index) = {
     let option = options.at(index)
     if selected == none {
       option
     } else if selected == index {
-      box(stroke: 0.5pt + black, radius: 2pt, inset: 2pt, baseline: 2pt)[#option]
+      underline(option)
     } else {
       strike(option)
     }

package/quills/usaf_memo/0.3.0/packages/tonguetoquill-usaf-memo/src/utils.typ

@@ -129,17 +129,24 @@
   ]
 }
 
+/// The date pattern a memo style prints, per AFH 33-337. Exported so a caller
+/// that pre-formats the date matches this package instead of restating it.
+///
+/// - memo-style (str): `"usaf"` or `"daf"`
+/// -> str
+#let date-pattern(memo-style: "usaf") = if memo-style == "daf" {
+  "[month repr:long] [day padding:none], [year]"
+} else {
+  "[day padding:none] [month repr:long] [year]"
+}
+
 /// Formats a date for the memo heading.
 ///
-/// Dispatches on the shape a date field can arrive in:
-/// - str: shown as-is (fixed text like a placeholder).
-/// - datetime: a native Typst datetime (e.g. `datetime.today()`) — USAF style
-///   `DD Month YYYY`, DAF style `Month DD, YYYY`.
-/// - dict: a Quillmark `date`/`datetime` field lowers to a click-to-edit value
-///   object `{ value: datetime, display: closure }`; `display` is a stored closure
-///   over `.display`, so call it through parentheses — a dict has no `.display` method.
+/// - str, content: shown as-is (a fixed placeholder, or ink the caller already
+///   formatted through [`date-pattern`]).
+/// - datetime: USAF style `DD Month YYYY`; DAF style `Month DD, YYYY`.
 ///
-/// - date (str | datetime | dict): Date to format for display
+/// - date (str | content | datetime): Date to format for display
 /// - memo-style (str): `"usaf"` or `"daf"`
 /// -> content
 #let display-date(date, memo-style: "usaf") = {
@@ -147,19 +154,12 @@
     memo-style in ("usaf", "daf"),
     message: "memo-style for display-date must be \"usaf\" or \"daf\"",
   )
-  if type(date) == str {
+  // A caller that pre-formatted — to keep a click-to-edit region the package
+  // cannot mint itself — passes the finished ink through untouched.
+  if type(date) in (str, content) {
     date
   } else {
-    let pattern = if memo-style == "daf" {
-      "[month repr:long] [day padding:none], [year]"
-    } else {
-      "[day padding:none] [month repr:long] [year]"
-    }
-    if type(date) == datetime {
-      date.display(pattern)
-    } else {
-      (date.display)(pattern)
-    }
+    date.display(date-pattern(memo-style: memo-style))
   }
 }
 

package/quills/usaf_memo/0.3.0/plate.typ

@@ -1,5 +1,11 @@
-#import "@local/quillmark-helper:0.1.0": data, form-field, signature-field
-#import "@local/tonguetoquill-usaf-memo:4.0.0": backmatter, frontmatter, indorsement, mainmatter
+#import "@local/quillmark-helper:0.1.0": data, display, form-field, signature-field
+#import "@local/tonguetoquill-usaf-memo:4.0.0": (
+  backmatter, date-pattern, frontmatter, indorsement, mainmatter,
+)
+
+// A memo has no "no style" state, so the blank takes the package's default.
+// Resolved once here: `frontmatter` and the date's pattern must agree.
+#let memo_style = if data.memo_style != "" { data.memo_style } else { "usaf" }
 
 // The letterhead arrives as one ordered array of lines. Element 0 is the title,
 // set larger; the rest are caption lines beneath it. A single element renders
@@ -31,8 +37,13 @@
     ))
   },
 
-  // Date
-  date: data.date,
+  // Date. `data.date` is the native `datetime` and would render identically,
+  // but its ink would be born inside the package and carry no schema address.
+  // `display` places the field's *content* projection instead: the glyphs are
+  // born in the generated helper, so the memo date stays click-to-edit however
+  // deep the package formats it. A blank date yields `none`, which is what
+  // `frontmatter`'s `datetime.today()` fallback keys on.
+  date: display("date", date-pattern(memo-style: memo_style)),
 
   // Receiver information
   memo_for: data.memo_for,
@@ -49,20 +60,28 @@
   // Optional footer tag line
   footer_tag_line: data.tag_line,
 
-  // Optional classification level
-  ..if data.classification != "" { (classification_level: data.classification) },
+  // The blank reads as no banner, which is what the package's own
+  // `classification_level: none` default means.
+  classification_level: data.classification.value,
 
   dissemination: data.dissemination,
 
-  // CUI designation indicator block fields (DoDM 5200.48)
-  cui_controlled_by: data.cui_controlled_by,
-  cui_category: data.cui_category,
-  cui_limited_dissemination: data.cui_limited_dissemination,
-  cui_poc: data.cui_poc,
+  // CUI designation indicator block fields (DoDM 5200.48). `classification`
+  // declares a `CUI` variant, so these four exist only where the discriminant
+  // reads CUI, and the branch is what makes reading them total: inside it every
+  // declared field of that world is present, outside it none is. The package's
+  // own `cui_*: none` defaults cover the worlds that omit them.
+  ..if data.classification.value == "CUI" {
+    (
+      cui_controlled_by: data.classification.controlled_by,
+      cui_category: data.classification.category,
+      cui_limited_dissemination: data.classification.limited_dissemination,
+      cui_poc: data.classification.poc,
+    )
+  },
 
-  // USAF vs DAF memorandum style (date format, body indentation). Blank
-  // falls through to the package's `"usaf"` default.
-  ..if data.memo_style != "" { (memo_style: data.memo_style) },
+  // USAF vs DAF memorandum style (date format, body indentation).
+  memo_style: memo_style,
 
   // Font size
   font_size: body_font_size,
@@ -95,6 +114,26 @@
   ..if data.attachments.len() > 0 { (attachments: data.attachments) },
 )
 
+// The action line's wording follows the indorsement's place in the chain, not
+// an endorser's choice: the last indorsement is the approval authority and
+// reads Approve / Disapprove, every one before it is a coordinating official
+// and reads Concur / Nonconcur. Only this loop can see whether an indorsement
+// is the last one, so the position is resolved here and passed down. Cards of
+// other kinds may interleave, so the last indorsement is the last card *of
+// this kind*, not the last card. `-1` never matches a real index, which is the
+// wanted result when there are no indorsements at all.
+// Parenthesized so the method chain can span lines: in markup, a `#let` whose
+// expression ends at a line break stops there, and the next line's leading
+// `.at(…)` would be read as text.
+#let last_indorsement_index = (
+  data
+    .at("$cards")
+    .enumerate()
+    .filter(entry => entry.at(1).at("$kind", default: none) == "indorsement")
+    .map(entry => entry.at(0))
+    .at(-1, default: -1)
+)
+
 // Indorsements - iterate through CARDS array and filter by CARD tag
 #for (i, card) in data.at("$cards").enumerate() {
   if card.at("$kind", default: none) == "indorsement" {
@@ -108,12 +147,13 @@
     // it (distinct from the originating memo's date). The signing date is
     // generally unknown at compile time, so a blank or omitted date leaves the
     // date slot fillable rather than stamping the compile date into it.
-    let card_date = card.date
-    let resolved_date = if card_date == none or card_date == "" {
-      none
-    } else {
-      card_date
-    }
+    // `display` takes an address, so a per-card call yields a per-card region
+    // even though every iteration shares one `card` loop variable, and it
+    // returns `none` for a blank date — the fill-in case below.
+    let resolved_date = display(
+      card.at("$path") + "date",
+      date-pattern(memo-style: memo_style),
+    )
     // The card's `$path` prefix composes its canonical schema addresses
     // (`$cards.indorsement.<n>.…`, per-kind ordinal) — the absolute loop
     // index `i` is NOT that ordinal once kinds interleave, so it stays a
@@ -144,6 +184,7 @@
         ))
       },
       ..if card.action != "" { (action: card.action) },
+      approval_authority: i == last_indorsement_index,
       body_content,
     )
   }