@thermal-print/escpos 0.4.0-beta.0 → 0.4.0-beta.1

package/dist/styles.d.ts

@@ -126,6 +126,18 @@ export declare function distributeGaps(contentWidth: number, totalWidth: number,
  * Aligns text within a column width (using CP860 byte length for accurate padding)
  */
 export declare function alignTextInColumn(text: string, width: number, align: "left" | "center" | "right"): string;
+/**
+ * Lays out one line of a space-between row as the printed lines.
+ *
+ * A row that fits is spread across the paper as always. A row that does not
+ * fit used to go out longer than the paper, and the printer wrapped it
+ * wherever column `totalWidth` fell — splitting "R$ 4,50" into "R$ 4" and
+ * ",50". Now the last cell (the amount) stays whole and right-aligned, and the
+ * cells before it wrap by word in the width the amount leaves free, the amount
+ * sharing the last line of that label. When even that is impossible, the label
+ * takes its own line(s) and the amount goes right-aligned on the next one.
+ */
+export declare function layoutSpaceBetweenLine(parts: string[], totalWidth: number): string[];
 /**
  * Splits text into multiple lines if it exceeds width
  */

package/dist/styles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../src/styles.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../src/styles.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE3D;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,GAAG,GAAG,SAAS,CAOtD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,GAAG,GAAG,SAAS,CAqBtD;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAOhD;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;;;;GAUG;AACH,MAAM,MAAM,SAAS,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAElC,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,SAAS,EAAE,cAAc,CAI9D,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAI7D,CAAC;AAEF,+EAA+E;AAC/E,wBAAgB,aAAa,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,CAErE;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CASzE;AAED,kFAAkF;AAClF,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG5F;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,EAC1B,SAAS,GAAE,SAAa,GACvB,cAAc,CAEhB;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,SAAS,EAChB,eAAe,SAAI,GAClB,MAAM,CAGR;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,CAI5E;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,KAAK,CAAC;AAClC,eAAO,MAAM,iBAAiB,QAAW,CAAC;AAE1C,uEAAuE;AACvE,wBAAgB,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAOzD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAIhE;AAED,+EAA+E;AAC/E,wBAAgB,0BAA0B,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAI1E;AAED,4FAA4F;AAC5F,wBAAgB,oBAAoB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAMhF;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,UAAQ,GAAG,MAAM,CAGzE;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,CAEjD;AAED;;;GAGG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAClC,UAAU,EAAE,MAAM,GACjB,MAAM,CAaR;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,EAAE,EACvC,UAAU,EAAE,MAAM,GACjB,MAAM,EAAE,CAgCV;AAcD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAYnG;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,GACjC,MAAM,CA8BR;AAgCD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAuCpF;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAqC9D"}

package/dist/styles.js

@@ -294,6 +294,82 @@ export function alignTextInColumn(text, width, align) {
         return truncatedText + " ".repeat(padding);
     }
 }
+/** Tokens that belong to the amount after them: "R$ 4,50", "+ 2", "- R$ 1,00". */
+const AMOUNT_PREFIXES = new Set(["R$", "+", "-"]);
+const AMOUNT_START = /^(?:[-+]?\d|R\$)/;
+/**
+ * The words wrapText breaks on. A currency sign or a sign glued to the amount
+ * after it by a space is one token, so a wrap never leaves "R$" at the end of
+ * one line and "4,50" at the start of the next. A group wider than the column
+ * stays apart: breaking it at its space beats slicing the number.
+ */
+function wrapTokens(text, width) {
+    const words = text.split(" ");
+    const tokens = [];
+    for (let i = words.length - 1; i >= 0; i--) {
+        const word = words[i];
+        const next = tokens[0];
+        if (AMOUNT_PREFIXES.has(word) &&
+            next !== undefined &&
+            AMOUNT_START.test(next) &&
+            word.length + 1 + next.length <= width) {
+            tokens[0] = word + " " + next;
+        }
+        else {
+            tokens.unshift(word);
+        }
+    }
+    return tokens;
+}
+/**
+ * Lays out one line of a space-between row as the printed lines.
+ *
+ * A row that fits is spread across the paper as always. A row that does not
+ * fit used to go out longer than the paper, and the printer wrapped it
+ * wherever column `totalWidth` fell — splitting "R$ 4,50" into "R$ 4" and
+ * ",50". Now the last cell (the amount) stays whole and right-aligned, and the
+ * cells before it wrap by word in the width the amount leaves free, the amount
+ * sharing the last line of that label. When even that is impossible, the label
+ * takes its own line(s) and the amount goes right-aligned on the next one.
+ */
+export function layoutSpaceBetweenLine(parts, totalWidth) {
+    const used = parts.reduce((sum, part) => sum + part.length, 0);
+    const gapCount = parts.length - 1;
+    if (gapCount <= 0 || used + gapCount <= totalWidth) {
+        const gaps = distributeGaps(used, totalWidth, gapCount);
+        let rowText = parts[0] ?? "";
+        for (let i = 1; i < parts.length; i++) {
+            rowText += " ".repeat(gaps[i - 1]) + parts[i];
+        }
+        return [rowText];
+    }
+    const value = parts[parts.length - 1];
+    const label = parts
+        .slice(0, -1)
+        .filter((part) => part.length > 0)
+        .join(" ");
+    if (value.length === 0)
+        return wrapText(label, totalWidth);
+    const labelAlone = label.length === 0 ? [] : wrapText(label, totalWidth);
+    // An amount wider than the paper cannot stay whole; wrap it here instead of
+    // letting the printer cut it at an arbitrary column.
+    if (value.length > totalWidth) {
+        const valueLines = wrapText(value, totalWidth);
+        return [...labelAlone, ...valueLines.map((line) => " ".repeat(totalWidth - line.length) + line)];
+    }
+    const rightAligned = " ".repeat(totalWidth - value.length) + value;
+    if (label.length === 0)
+        return [rightAligned];
+    const labelWidth = totalWidth - value.length - 1;
+    // Breaking a word of the label in the middle is worse than giving the amount
+    // a line of its own.
+    const fitsBeside = labelWidth > 0 && wrapTokens(label, labelWidth).every((word) => word.length <= labelWidth);
+    if (!fitsBeside)
+        return [...labelAlone, rightAligned];
+    const labelLines = wrapText(label, labelWidth);
+    const last = labelLines.pop() ?? "";
+    return [...labelLines, last + " ".repeat(totalWidth - last.length - value.length) + value];
+}
 /**
  * Splits text into multiple lines if it exceeds width
  */
@@ -311,7 +387,7 @@ export function wrapText(text, width) {
             currentLine = "";
         }
     };
-    for (const word of text.split(" ")) {
+    for (const word of wrapTokens(text, width)) {
         if ((currentLine + " " + word).trim().length <= width) {
             currentLine = (currentLine + " " + word).trim();
             continue;

package/dist/traverser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"traverser.d.ts","sourceRoot":"","sources":["../src/traverser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AA6B9C;;;GAGG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,SAAS,CAAkB;IAEnC;;;;OAIG;IACH,OAAO,CAAC,gBAAgB,CAAiB;IAEzC,uFAAuF;IACvF,OAAO,CAAC,aAAa,CAAqB;gBAE9B,SAAS,EAAE,eAAe;IAItC;;OAEG;IACG,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BvD;;OAEG;YACW,cAAc;IAO5B;;;;;;OAMG;YACW,UAAU;IAyBxB;;OAEG;YACW,UAAU;IAyDxB;;OAEG;YACW,kBAAkB;IAMhC;;OAEG;YACW,eAAe;IA+H7B;;;;OAIG;IACH,OAAO,CAAC,YAAY;IAkCpB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAczB;;;OAGG;YACW,kBAAkB;IAyChC;;;OAGG;YACW,UAAU;IA+BxB;;OAEG;YACW,cAAc;IAM5B;;OAEG;YACW,WAAW;IAuCzB;;OAEG;YACW,gBAAgB;CAK/B"}
+{"version":3,"file":"traverser.d.ts","sourceRoot":"","sources":["../src/traverser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AA6B9C;;;GAGG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,SAAS,CAAkB;IAEnC;;;;OAIG;IACH,OAAO,CAAC,gBAAgB,CAAiB;IAEzC,uFAAuF;IACvF,OAAO,CAAC,aAAa,CAAqB;gBAE9B,SAAS,EAAE,eAAe;IAItC;;OAEG;IACG,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BvD;;OAEG;YACW,cAAc;IAO5B;;;;;;OAMG;YACW,UAAU;IAyBxB;;OAEG;YACW,UAAU;IAyDxB;;OAEG;YACW,kBAAkB;IAMhC;;OAEG;YACW,eAAe;IA6H7B;;;;OAIG;IACH,OAAO,CAAC,YAAY;IAkCpB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAczB;;;OAGG;YACW,kBAAkB;IAyChC;;;OAGG;YACW,UAAU;IA+BxB;;OAEG;YACW,cAAc;IAM5B;;OAEG;YACW,WAAW;IAuCzB;;OAEG;YACW,gBAAgB;CAK/B"}

package/dist/traverser.js

@@ -1,4 +1,4 @@
-import { alignTextInColumn, calculateHorizontalSpacing, distributeColumnWidths, distributeGaps, extractTextStyle, extractViewStyle, FONT_LEVEL_COLUMN_UNITS, isBold, mapTextAlign, mergeStyles, parsePercentageWidth, parseSize, wrapText, } from "./styles";
+import { alignTextInColumn, calculateHorizontalSpacing, distributeColumnWidths, extractTextStyle, extractViewStyle, FONT_LEVEL_COLUMN_UNITS, isBold, layoutSpaceBetweenLine, mapTextAlign, mergeStyles, parsePercentageWidth, parseSize, wrapText, } from "./styles";
 /**
  * Tree Traverser
  * Walks through the element tree and generates ESC/POS commands
@@ -223,13 +223,12 @@ export class TreeTraverser {
             }
             else if (isSpaceBetween) {
                 const parts = columnLines.map((lines) => lines[lineIdx] || "");
-                const used = parts.reduce((sum, part) => sum + part.length, 0);
-                const gaps = distributeGaps(used, paperWidth, parts.length - 1);
-                let rowText = parts[0];
-                for (let i = 1; i < parts.length; i++) {
-                    rowText += " ".repeat(gaps[i - 1]) + parts[i];
-                }
-                this.generator.addTextLine(rowText);
+                const rowLines = layoutSpaceBetweenLine(parts, paperWidth);
+                rowLines.forEach((rowText, i) => {
+                    if (i > 0)
+                        this.generator.addNewline();
+                    this.generator.addTextLine(rowText);
+                });
             }
             else {
                 const parts = columnLines.map((lines) => lines[lineIdx] || "");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thermal-print/escpos",
-  "version": "0.4.0-beta.0",
+  "version": "0.4.0-beta.1",
   "type": "module",
   "description": "ESC/POS command generation and thermal printer control",
   "main": "dist/index.js",
@@ -26,7 +26,7 @@
     "@thermal-print/core": "0.3.1-beta.7"
   },
   "devDependencies": {
-    "typescript": "5.0.0"
+    "typescript": "5.9.3"
   },
   "publishConfig": {
     "access": "public"