@airmark/quiver 0.35.7 → 0.36.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airmark/quiver",
-  "version": "0.35.7",
+  "version": "0.36.0",
   "description": "Airmark Quiver — Air Force and DAF document Quills for Quillmark.",
   "type": "module",
   "exports": {
@@ -18,9 +18,9 @@
     "node": ">=24"
   },
   "devDependencies": {
-    "@quillmark/quiver": "0.36.0",
-    "@quillmark/wasm": "^0.124.0",
-    "quillkit": "0.16.0"
+    "@quillmark/quiver": "0.37.0",
+    "@quillmark/wasm": "^0.125.0",
+    "quillkit": "0.17.0"
   },
   "scripts": {
     "test": "quillkit test && node scripts/check-examples.mjs && node scripts/check-templates.mjs",

package/quills/af4141/0.1.0/Quill.yaml

@@ -35,60 +35,50 @@ card_kinds:
   experience:
     title: Record of Experience
     description: One row of the Record of Experience. The form holds up to 37 rows across two pages.
-    ui:
-      groups: [record]
     body:
       enabled: false
-    fields:
-      date:
-        type: date
-        default: ""
-        ui:
-          group: record
-        description: The date of the action.
+    sections:
+      record:
+        fields:
+          date:
+            type: date
+            default: ""
+            description: The date of the action.
 
-      action:
-        type: string
-        default: ""
-        ui:
-          group: record
-        description: The action taken. Use one row per type of action.
+          action:
+            type: string
+            default: ""
+            description: The action taken. Use one row per type of action.
 
-      written_grade:
-        type: string
-        default: ""
-        ui:
-          group: record
-          compact: true
-        description: The written grade, if any, for example 3.
+          written_grade:
+            type: string
+            default: ""
+            ui:
+              compact: true
+            description: The written grade, if any, for example 3.
 
-      written_grade_date:
-        type: date
-        default: ""
-        ui:
-          group: record
-          compact: true
-        description: The date of the written grade.
+          written_grade_date:
+            type: date
+            default: ""
+            ui:
+              compact: true
+            description: The date of the written grade.
 
-      positional_grade:
-        type: string
-        default: ""
-        ui:
-          group: record
-          compact: true
-        description: The positional grade, if any, for example 2.
+          positional_grade:
+            type: string
+            default: ""
+            ui:
+              compact: true
+            description: The positional grade, if any, for example 2.
 
-      positional_grade_date:
-        type: date
-        default: ""
-        ui:
-          group: record
-          compact: true
-        description: The date of the positional grade.
+          positional_grade_date:
+            type: date
+            default: ""
+            ui:
+              compact: true
+            description: The date of the positional grade.
 
-      auth_or_remarks:
-        type: string
-        default: ""
-        ui:
-          group: record
-        description: Authenticating initials, for example J.A.D., or remarks.
+          auth_or_remarks:
+            type: string
+            default: ""
+            description: Authenticating initials, for example J.A.D., or remarks.

package/quills/af4141/0.1.0/plate.typ

@@ -1,11 +1,11 @@
-#import "@local/quillmark-helper:0.1.0": data
+#import "@local/quillmark-helper:0.2.0" as qm
 #import "@local/typst-af4141:0.1.0": form
 
 #set text(font: "NimbusRomNo9L")
 
 // 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
+// ink: `qm.ink` 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]"
@@ -29,10 +29,10 @@
 #let vals = (:)
 
 // --- Admin fields (page 1 header) ---
-#if data.name != "" { vals.insert("commonforms_text_p1_1", data.name) }
-#if data.unit != "" { vals.insert("commonforms_text_p1_2", data.unit) }
-#if data.grade != "" { vals.insert("commonforms_text_p1_3", data.grade) }
-#if data.commanders_auth != "" { vals.insert("commonforms_text_p1_116", data.commanders_auth) }
+#if qm.data.name != "" { vals.insert("commonforms_text_p1_1", qm.data.name) }
+#if qm.data.unit != "" { vals.insert("commonforms_text_p1_2", qm.data.unit) }
+#if qm.data.grade != "" { vals.insert("commonforms_text_p1_3", qm.data.grade) }
+#if qm.data.commanders_auth != "" { vals.insert("commonforms_text_p1_116", qm.data.commanders_auth) }
 
 // --- Experience table rows from CARDS ---
 // The form supports 16 rows on page 1 and 21 rows on page 2 (37 total).
@@ -40,7 +40,7 @@
 #let max-rows = 37
 #{
   let row = 0
-  for card in data.at("$cards") {
+  for card in qm.data.at("$cards") {
     if card.at("$kind", default: none) == "experience" {
       if row < max-rows {
         for (col, key) in col-keys.enumerate() {

package/quills/afmc_moa/0.0.1/Quill.yaml

@@ -9,152 +9,127 @@ typst:
 
 main:
   description: "Add a card for each section of the agreement. Sections print in DoDI 4000.19 order, whatever order you add them in."
-  ui:
-    groups: [parties, correspondence, terms, financial_details, signatures]
   body:
     enabled: false
-  fields:
-    first_party_name:
-      type: plaintext
-      inline: true
-      ui:
-        group: parties
-      description: "Full name and acronym of the organization proposing the agreement."
-
-    second_party_name:
-      type: plaintext
-      inline: true
-      ui:
-        group: parties
-      description: "Full name and acronym of the other organization."
-
-    second_party_is_non_government:
-      type: boolean
-      default: false
-      ui:
-        group: parties
-        compact: true
-      description: "Whether the second party is outside the government. If so, its mailing address appears in the opening paragraph."
-
-    subject:
-      type: plaintext
-      inline: true
-      ui:
-        group: parties
-      description: "What the agreement covers. It follows 'FOR' in the title."
-
-    agreement_number:
-      type: plaintext
-      inline: true
-      ui:
-        group: parties
-      description: The agreement's identification number.
-
-    second_party_mailing_address:
-      type: array
-      items:
-        type: plaintext
-      default: []
-      ui:
-        group: correspondence
-      description: "The second party's mailing address for correspondence."
-
-    reimbursable:
-      type: boolean
-      default: false
-      ui:
-        group: terms
-        compact: true
-      description: "Whether the parties reimburse each other. If so, fill in Financial Details, which prints as Attachment A."
-
-    reimbursable_support:
-      type: richtext
-      inline: true
-      default: ""
-      ui:
-        group: financial_details
-      description: "The support being reimbursed."
-
-    estimated_amount:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: financial_details
-        compact: true
-      description: "Estimated amount to be reimbursed, for example $50,000."
-
-    appropriation_fy:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: financial_details
-        compact: true
-      description: "Fiscal year of the appropriation, for example 2027."
-
-    cost_center_provider:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: financial_details
-        compact: true
-      description: "The provider's cost center number, if required."
-
-    cost_center_receiver:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: financial_details
-        compact: true
-      description: "The receiver's cost center number, if required."
-
-    financial_poc_provider:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: financial_details
-      description: "The provider's financial point of contact."
-
-    financial_poc_receiver:
-      type: plaintext
-      inline: true
-      default: ""
-      ui:
-        group: financial_details
-      description: "The receiver's financial point of contact."
-
-    financial_additional_info:
-      type: richtext
-      inline: true
-      default: ""
-      ui:
-        group: financial_details
-      description: "Any other financial terms the agreement needs."
-
-    first_party_signatory:
-      type: plaintext
-      inline: true
-      ui:
-        group: signatures
-      description: "Name and title of the first party's approving official."
-
-    second_party_signatory:
-      type: plaintext
-      inline: true
-      ui:
-        group: signatures
-      description: "Name and title of the second party's approving official."
-
-    mid_point_review_due_date:
-      type: date
-      ui:
-        group: signatures
-        compact: true
-      description: "When the mid-point review of the agreement is due."
+  sections:
+    parties:
+      fields:
+        first_party_name:
+          type: plaintext
+          inline: true
+          description: "Full name and acronym of the organization proposing the agreement."
+
+        second_party_name:
+          type: plaintext
+          inline: true
+          description: "Full name and acronym of the other organization."
+
+        second_party_is_non_government:
+          type: boolean
+          default: false
+          ui:
+            compact: true
+          description: "Whether the second party is outside the government. If so, its mailing address appears in the opening paragraph."
+
+        subject:
+          type: plaintext
+          inline: true
+          description: "What the agreement covers. It follows 'FOR' in the title."
+
+        agreement_number:
+          type: plaintext
+          inline: true
+          description: The agreement's identification number.
+    correspondence:
+      fields:
+        second_party_mailing_address:
+          type: array
+          items:
+            type: plaintext
+          default: []
+          description: "The second party's mailing address for correspondence."
+    terms:
+      fields:
+        reimbursable:
+          type: boolean
+          default: false
+          ui:
+            compact: true
+          description: "Whether the parties reimburse each other. If so, fill in Financial Details, which prints as Attachment A."
+    financial_details:
+      fields:
+        reimbursable_support:
+          type: richtext
+          inline: true
+          default: ""
+          description: "The support being reimbursed."
+
+        estimated_amount:
+          type: plaintext
+          inline: true
+          default: ""
+          ui:
+            compact: true
+          description: "Estimated amount to be reimbursed, for example $50,000."
+
+        appropriation_fy:
+          type: plaintext
+          inline: true
+          default: ""
+          ui:
+            compact: true
+          description: "Fiscal year of the appropriation, for example 2027."
+
+        cost_center_provider:
+          type: plaintext
+          inline: true
+          default: ""
+          ui:
+            compact: true
+          description: "The provider's cost center number, if required."
+
+        cost_center_receiver:
+          type: plaintext
+          inline: true
+          default: ""
+          ui:
+            compact: true
+          description: "The receiver's cost center number, if required."
+
+        financial_poc_provider:
+          type: plaintext
+          inline: true
+          default: ""
+          description: "The provider's financial point of contact."
+
+        financial_poc_receiver:
+          type: plaintext
+          inline: true
+          default: ""
+          description: "The receiver's financial point of contact."
+
+        financial_additional_info:
+          type: richtext
+          inline: true
+          default: ""
+          description: "Any other financial terms the agreement needs."
+    signatures:
+      fields:
+        first_party_signatory:
+          type: plaintext
+          inline: true
+          description: "Name and title of the first party's approving official."
+
+        second_party_signatory:
+          type: plaintext
+          inline: true
+          description: "Name and title of the second party's approving official."
+
+        mid_point_review_due_date:
+          type: date
+          ui:
+            compact: true
+          description: "When the mid-point review of the agreement is due."
 
 card_kinds:
   background:
@@ -252,16 +227,14 @@ card_kinds:
   attachment:
     title: Attachment
     description: "An attachment on its own page, lettered from B. Attachment A is reserved for financial details and is added for you when the agreement is reimbursable."
-    ui:
-      groups: [attachment]
     seed:
       title: "[Insert Attachment Title]"
       $body: |
         [Describe the attachment's content here.]
-    fields:
-      title:
-        type: plaintext
-        inline: true
-        ui:
-          group: attachment
-        description: "The attachment's title."
+    sections:
+      attachment:
+        fields:
+          title:
+            type: plaintext
+            inline: true
+            description: "The attachment's title."

package/quills/afmc_moa/0.0.1/plate.typ

@@ -1,4 +1,4 @@
-#import "@local/quillmark-helper:0.1.0": data, display, signature-field
+#import "@local/quillmark-helper:0.2.0" as qm
 #import "@local/typst-afmc-moa:0.1.0": (
   attachment, attachment-card, backmatter, date-pattern, frontmatter, mainmatter, trim-inline,
 )
@@ -8,21 +8,21 @@
 // package can interpolate a field straight into prose without it printing as
 // "the Foo  and" or "(NASA) ." — and without boxing, which would stop a long
 // party name from wrapping.
-#let text-field(key) = trim-inline(data.at(key))
+#let text-field(key) = trim-inline(qm.data.at(key))
 
 // Resolve optional fields with defaults; required fields are read directly
 // since Quill.yaml enforces their presence.
 #let resolved = (
   first_party_name: text-field("first_party_name"),
   second_party_name: text-field("second_party_name"),
-  second_party_is_non_government: data.second_party_is_non_government,
+  second_party_is_non_government: qm.data.second_party_is_non_government,
   subject: text-field("subject"),
   agreement_number: text-field("agreement_number"),
 
   // Joined inline by the package, which trims each line itself.
-  second_party_mailing_address: data.second_party_mailing_address,
+  second_party_mailing_address: qm.data.second_party_mailing_address,
 
-  reimbursable: data.reimbursable,
+  reimbursable: qm.data.reimbursable,
   reimbursable_support: text-field("reimbursable_support"),
   estimated_amount: text-field("estimated_amount"),
   appropriation_fy: text-field("appropriation_fy"),
@@ -36,10 +36,10 @@
   second_party_signatory: text-field("second_party_signatory"),
   // `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
+  // schema address. `qm.ink` 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),
+  mid_point_review_due_date: qm.ink(qm.data, "mid_point_review_due_date", date-pattern),
 )
 
 // ── Frontmatter: page setup, title block, intro paragraph ──────────────────
@@ -59,7 +59,7 @@
 // each kind is used.
 #let card-body(kind) = {
   let bodies = ()
-  for card in data.at("$cards") {
+  for card in qm.data.at("$cards") {
     if card.at("$kind", default: none) == kind and "$body" in card {
       bodies.push(card.at("$body"))
     }
@@ -95,8 +95,8 @@
   first_party_signatory: resolved.first_party_signatory,
   second_party_signatory: resolved.second_party_signatory,
   mid_point_review_due_date: resolved.mid_point_review_due_date,
-  first_signing_field: signature-field("first_party_signature"),
-  second_signing_field: signature-field("second_party_signature"),
+  first_signing_field: qm.signature-field("first_party_signature"),
+  second_signing_field: qm.signature-field("second_party_signature"),
 )
 
 // ── Attachment A: only for reimbursable MOAs ────────────────────────────────
@@ -106,7 +106,7 @@
 // by their position among *attachments*. The standard sections above are also
 // cards in the same `$cards` array, so enumerating the array as a whole would
 // letter the first attachment by its global index (J, not B).
-#let attachment_cards = data.at("$cards").filter(card => card.at("$kind", default: none) == "attachment")
+#let attachment_cards = qm.data.at("$cards").filter(card => card.at("$kind", default: none) == "attachment")
 #for (i, card) in attachment_cards.enumerate() {
   // The quillmark helper leaves an unset/whitespace-only markdown body as
   // the empty string `""`; only non-empty bodies are eval'd into content.

package/quills/classic_resume/0.1.0/Quill.yaml

@@ -12,53 +12,47 @@ typst:
 # are the section's own, so an entry cannot land under the wrong heading.
 main:
   description: "Your name and contact details go at the top. Add a card for each section, in the order you want them."
-  ui:
-    groups: [identity, page]
   # Everything prints under a section heading, so main carries no body: a
   # summary is a Summary card.
   body:
     enabled: false
-  fields:
-    name:
-      type: string
-      ui:
-        group: identity
-      description: "Your name as you want it read. It also names the PDF."
+  sections:
+    identity:
+      fields:
+        name:
+          type: string
+          description: "Your name as you want it read. It also names the PDF."
 
-    contacts:
-      type: array
-      items:
-        type: string
-      ui:
-        group: identity
-      description: "How to reach you, one per line, most preferred first: email, phone, a profile such as linkedin.com/in/you, your city. Email addresses, web addresses, and phone numbers become links."
-
-    paper:
-      type: enum
-      values:
-        - us-letter
-        - a4
-      default: us-letter
-      ui:
-        group: page
-        compact: true
-      description: "Page size."
+        contacts:
+          type: array
+          items:
+            type: string
+          description: "How to reach you, one per line, most preferred first: email, phone, a profile such as linkedin.com/in/you, your city. Email addresses, web addresses, and phone numbers become links."
+    page:
+      fields:
+        paper:
+          type: enum
+          values:
+            - us-letter
+            - a4
+          default: us-letter
+          ui:
+            compact: true
+          description: "Page size."
 
-    font_size:
-      type: number
-      default: 12
-      ui:
-        group: page
-        compact: true
-      description: "Body text size in points. To fit one page, try a half point smaller before cutting content."
+        font_size:
+          type: number
+          default: 12
+          ui:
+            compact: true
+          description: "Body text size in points. To fit one page, try a half point smaller before cutting content."
 
-    margin:
-      type: number
-      default: 0.5
-      ui:
-        group: page
-        compact: true
-      description: "Margin in inches on all sides. Below about 0.4, printers may clip the edges."
+        margin:
+          type: number
+          default: 0.5
+          ui:
+            compact: true
+          description: "Margin in inches on all sides. Below about 0.4, printers may clip the edges."
 
 
 # Each kind opens with the heading it prints. Its `default:` is the usual one,