@patterkit/cli 0.2.4 → 0.2.5

package/dist/cli.js

@@ -197579,7 +197579,7 @@ function targetLabel(to, sceneOf, blockTrail) {
 function gameEventLabel(beat) {
   const gd = beat.gameData;
   if (gd && typeof gd === "object") {
-    const parts = Object.entries(gd).slice(0, 3).map(([k, v]) => {
+    const parts = Object.entries(gd).map(([k, v]) => {
       const val = v == null ? "" : typeof v === "object" ? JSON.stringify(v) : String(v);
       return val === "" ? k : `${k}: ${val}`;
     });
@@ -237376,7 +237376,7 @@ var isEmoji = (cp) => cp >= 126976 || cp >= 9728 && cp <= 10175;
 async function scriptToPdf(doc) {
   const { scriptFont: scriptFont2 } = await Promise.resolve().then(() => (init_script_fonts(), script_fonts_exports));
   return new Promise((resolve6, reject2) => {
-    const pdf = new PDFDocument({ size: "A4", margins: { top: MARGIN, bottom: MARGIN, left: MARGIN, right: MARGIN }, info: { Title: doc.project, Author: "Patter" } });
+    const pdf = new PDFDocument({ size: "A4", margins: { top: MARGIN, bottom: MARGIN, left: MARGIN, right: MARGIN }, info: { Title: doc.project, Author: "Patter" }, font: null });
     pdf.registerFont("Serif", scriptFont2("serif"));
     pdf.registerFont("Serif-Bold", scriptFont2("serifBold"));
     pdf.registerFont("Serif-Italic", scriptFont2("serifItalic"));
@@ -237473,13 +237473,12 @@ async function scriptToPdf(doc) {
             bodyX = cueX + pdf.widthOfString(el.character.toUpperCase()) + CUE_GAP;
           }
           const yTop = pdf.y;
-          pdf.fontSize(BODY);
-          draw([...el.direction ? split(`(${el.direction})  `, "Serif-Italic", MUTED) : [], ...bodyPieces(el.runs, INK_READ)], bodyX, { width: Math.max(120, pageRight - bodyX), lineGap: LEAD });
-          const yEnd = pdf.y;
           if (el.character) {
             pdf.font("Sans-Bold").fontSize(CUE).fillColor(hex(characterColour(el.character))).text(el.character.toUpperCase(), cueX, yTop + ascentPt("Serif", BODY) - ascentPt("Sans-Bold", CUE), { lineBreak: false });
+            pdf.y = yTop;
           }
-          pdf.y = yEnd;
+          pdf.fontSize(BODY);
+          draw([...el.direction ? split(`(${el.direction})  `, "Serif-Italic", MUTED) : [], ...bodyPieces(el.runs, INK_READ)], bodyX, { width: Math.max(120, pageRight - bodyX), lineGap: LEAD });
           break;
         }
         case "narration":
@@ -237503,21 +237502,29 @@ async function scriptToPdf(doc) {
           const tag = el.tag ? el.tag.toUpperCase() : "";
           const tagW = tag ? pdf.font("Sans").fontSize(7.5).widthOfString(tag) + 8 : 0;
           const yStart = pdf.y;
-          pdf.fontSize(BODY);
-          draw([...split("\u25C7  ", "Serif", ACCENT), ...bodyPieces(el.runs, INK)], ox, { width: Math.max(80, pageRight - ox - tagW), indent: -HANG2, lineGap: LEAD });
-          const yEnd = pdf.y;
-          if (tag && yEnd >= yStart) {
+          if (tag) {
             pdf.font("Sans").fontSize(7.5).fillColor(MUTED).text(tag, pageRight - tagW, yStart, { width: tagW, align: "right", lineBreak: false });
-            pdf.y = yEnd;
+            pdf.y = yStart;
           }
+          pdf.fontSize(BODY);
+          draw([...split("\u25C7  ", "Serif", ACCENT), ...bodyPieces(el.runs, INK)], ox, { width: Math.max(80, pageRight - ox - tagW), indent: -HANG2, lineGap: LEAD });
           break;
         }
         case "jump":
           drawRight(split(`\u21AA  ${el.text}`, "Sans-Bold", ACCENT), 9.5);
           break;
-        case "gameEvent":
-          drawRight(split(`\u2699  ${el.text}`, "Mono", ACCENT), 9);
+        case "gameEvent": {
+          const pieces = split(`\u2699  ${el.text}`, "Mono", ACCENT);
+          pdf.fontSize(9);
+          let total = 0;
+          for (const p of pieces) {
+            pdf.font(p.font);
+            total += pdf.widthOfString(p.text);
+          }
+          if (total <= pageRight - cx2) drawRight(pieces, 9);
+          else draw(pieces, cx2, { width: pageRight - cx2 });
           break;
+        }
       }
     };
     const leadOf = (k) => k === "scene" ? 24 : k === "block" ? 16 : k === "group" ? 13 : k === "else" ? 9 : 0;
@@ -237531,10 +237538,12 @@ async function scriptToPdf(doc) {
       const sameNext = sid !== void 0 && next !== void 0 && "snippet" in next && next.snippet === sid;
       if (el.kind === "scene") ensure2(90);
       else if (el.kind === "block") ensure2(70);
+      else ensure2(leadOf(el.kind) + BODY + LEAD + 14);
       pdf.y += leadOf(el.kind);
       const base = "indent" in el ? MARGIN + el.indent * INDENT_STEP : MARGIN;
       const cx2 = base + (sid !== void 0 ? EDGE_INSET : 0);
       const yTop = pdf.y;
+      const pageBefore = pdf.page;
       drawContent(el, cx2);
       const bottom = pdf.y;
       const trail = el.kind === "condition" ? TIGHT : el.kind === "scene" ? 12 : el.kind === "block" ? 11 : el.kind === "group" ? 7 : el.kind === "else" ? 4 : sid !== void 0 ? sameNext ? WITHIN2 : BETWEEN : BEAT;
@@ -237544,7 +237553,8 @@ async function scriptToPdf(doc) {
           curBase = "indent" in el ? el.indent : 0;
         }
         const ex = MARGIN + curBase * INDENT_STEP + EDGE_OFF;
-        pdf.strokeColor(EDGE).lineWidth(0.75).moveTo(ex, yTop).lineTo(ex, bottom + (sameNext ? trail : 0)).stroke();
+        const top = pdf.page === pageBefore ? yTop : MARGIN;
+        pdf.strokeColor(EDGE).lineWidth(0.75).moveTo(ex, top).lineTo(ex, bottom + (sameNext ? trail : 0)).stroke();
       }
       pdf.y = bottom + trail;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patterkit/cli",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "The `patter` CLI: validate, format, export, and play a Patter project.",
   "type": "module",
   "license": "MIT",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@patterkit/core": "0.2.0",
-    "@patterkit/ops": "0.3.4",
+    "@patterkit/ops": "0.3.5",
     "@wildwinter/simple-vc-lib": "^0.4.1"
   }
 }