@bobfrankston/brother-label 1.0.13 → 1.1.1

package/README.md

@@ -35,6 +35,14 @@ Use `<img qr="data">` to embed QR codes directly in HTML - they're converted to
 <img qr="any data here" class="my-qr">
 ```
 
+### Multi-segment labels
+Combine multiple `-text` and `-qr` segments on a single label, printed side-by-side in order:
+```bash
+brother-print -text "Hello" -qr "https://example.com"
+brother-print -text "Top\nBottom" -qr "https://example.com" -text "More text"
+brother-print -t "Label" -q "data" -o combined.png
+```
+
 ### Print image
 ```bash
 brother-print image photo.png
@@ -48,18 +56,39 @@ brother-print preview "Test Label" -o preview.png
 ### Configuration
 ```bash
 brother-print config --show              # Show current config
-brother-print config -t 12mm             # Set default tape size
+brother-print config -s 12               # Set default tape size
 brother-print config -p "Brother PT-P710BT"  # Set default printer
 brother-print list                       # List Brother printers
 ```
 
+### Print clipboard contents
+```bash
+brother-print -clip                  # auto-detect: image if present, else text
+```
+
 ### Options
 | Option | Description |
 |--------|-------------|
+| `-t, --text` | Force input as literal text; repeatable for multi-segment labels |
+| `-qr <data>` | QR code segment; repeatable for multi-segment labels |
+| `-tape <size>` | Tape size: 6, 9, 12, 18, 24 (mm); auto-detected if omitted |
 | `-p, --printer <name>` | Printer name |
-| `-t, --tape <size>` | Tape size: 6mm, 9mm, 12mm, 18mm, 24mm, or 'auto' |
-| `-l, --label <text>` | Text label beside QR code (qr command only) |
 | `-o, --output <file>` | Save to file instead of printing |
+| `-a, --aspect <ratio>` | Aspect ratio width:height for HTML (e.g., 3.5:2) |
+| `-H, --height <size>` | Text height: 12mm, .5in, or 50% (of tape height) |
+| `-s, --space <size>` | Space between segments: 12px, 1mm, .2in |
+| `-w, --html` | Force input as HTML file path |
+| `-i, --image` | Force input as image file path |
+| `-c, --clip` | Read content from clipboard (image preferred, then text) |
+| `-no-wait` | Fail immediately if printer is offline (default: wait) |
+| `-timeout <secs>` | Max wait time when printer is offline |
+| `-interval <secs>` | Polling interval while waiting (default: 2) |
+
+Single-hyphen long options are supported: `-text` works the same as `--text`, `-tape` as `--tape`, etc. Single letters are strict: `-t` means `--text`, not the start of `-tape`.
+
+### Offline handling
+
+By default `print()` waits for the printer to come online if it's asleep. Use `-no-wait` to fail immediately, or `-timeout <secs>` to bound the wait. Use `brother-print status` to check the current online state. The wait reports any other Brother printers that are online as alternatives.
 
 ## API Usage
 
@@ -114,6 +143,35 @@ await print({ imagePath: "photo.png" });
 await print({ imageBuffer: fs.readFileSync("photo.png") });
 ```
 
+### Print clipboard contents
+```typescript
+await print({ clip: true });          // image if present, else text
+```
+
+### Offline handling
+```typescript
+await print({
+    text: "Hello",
+    onWaiting: (status, elapsedMs, alternatives) => {
+        console.log(`waiting on ${status.name} (${Math.floor(elapsedMs/1000)}s)`);
+    },
+    waitTimeoutMs: 60_000,
+});
+
+await print({ text: "Hello", wait: false });  // fail immediately if offline
+```
+
+### Cross-driver code
+```typescript
+import type { LabelPrinter } from "@bobfrankston/label-core";
+import { brotherPrinter } from "@bobfrankston/brother-label";
+import { dymoPrinter }    from "@bobfrankston/dymo-print";
+
+async function printOn(p: LabelPrinter, text: string) {
+    await p.print({ text });
+}
+```
+
 ### Configuration
 ```typescript
 import { getConfig, setConfig, listPrinters } from "@bobfrankston/brother-label";
@@ -175,6 +233,8 @@ interface PrintResult {
 |----------|-------------|
 | `print(options)` | Render and print a label |
 | `render(options)` | Render label to PNG buffer |
+| `renderSegments(segments, tape?, textHeight?)` | Render multiple text/qr segments side-by-side |
+| `printSegments(segments, options?)` | Render and print multiple segments |
 | `getConfig()` | Get current configuration |
 | `setConfig(config)` | Set default tape/printer |
 | `getConfigPath()` | Get config file path |

package/api.d.ts

@@ -1,9 +1,17 @@
 /**
  * Brother Label Printer API
- * Programmatic interface for printing labels on Brother P-touch printers
+ * Programmatic interface for printing labels on Brother P-touch printers.
+ *
+ * Implements the unified LabelPrinter interface from @bobfrankston/label-core.
+ * All printer-agnostic logic (rendering, segments, clipboard, CLI primitives,
+ * online-wait) lives in label-core. This file holds the Brother-specific bits:
+ * TAPE_SIZES catalog, MEDIA_OPTIONS (CustomMediaSize* names), XPS PrintTicket
+ * builder with the Brother namespace, and detectTapeSize.
  */
+import { LabelPrinter, PrintOptions as CorePrintOptions, SegmentOptions as CoreSegmentOptions, Segment } from "@bobfrankston/label-core";
 export type TapeSize = 6 | 9 | 12 | 18 | 24;
 export type Orientation = "landscape" | "portrait";
+/** Backward-compat: brother-label's config kept the `defaultTape` name. */
 export interface PrinterConfig {
     defaultTape?: TapeSize;
     defaultPrinter?: string;
@@ -11,30 +19,33 @@ export interface PrinterConfig {
 export interface PrinterInfo {
     name: string;
 }
-export interface PrintOptions {
-    text?: string;
-    html?: string;
-    htmlPath?: string;
-    textFile?: string;
-    imagePath?: string;
-    imageBuffer?: Buffer;
-    qr?: string;
+/** Brother-specific PrintOptions: same as core but with tape alias for media. */
+export interface PrintOptions extends Omit<CorePrintOptions, "media"> {
+    tape?: TapeSize; /** Tape size in mm — alias for core.media */
+    orientation?: Orientation; /** Reserved (Brother PT prints landscape only) */
+    length?: number; /** Reserved — explicit length in mm */
+}
+export interface SegmentOptions extends Omit<CoreSegmentOptions, "media"> {
     tape?: TapeSize;
-    printer?: string;
-    orientation?: Orientation;
-    length?: number;
-    basePath?: string;
-    aspect?: string;
-    qrLabel?: string;
-    textHeight?: string;
 }
 export interface PrintResult {
     image: Buffer;
 }
+export type { Segment };
 export declare function getConfig(): PrinterConfig;
 export declare function setConfig(config: Partial<PrinterConfig>): void;
 export declare function getConfigPath(): string;
 export declare function listPrinters(): Promise<PrinterInfo[]>;
+/**
+ * Auto-detect tape size from printer's default print ticket. Returns null if
+ * detection fails. Brother's driver embeds the loaded tape's CustomMediaSize
+ * name in the default PrintTicket XML.
+ */
+export declare function detectTapeSize(printerName?: string): Promise<TapeSize>;
+/** Public Brother singleton (implements LabelPrinter). */
+export declare const brotherPrinter: LabelPrinter;
 export declare function render(options: PrintOptions): Promise<Buffer>;
 export declare function print(options: PrintOptions): Promise<PrintResult>;
+export declare function renderSegments(segments: Segment[], tape?: TapeSize, textHeight?: string, space?: string): Promise<Buffer>;
+export declare function printSegments(segments: Segment[], options?: SegmentOptions): Promise<PrintResult>;
 //# sourceMappingURL=api.d.ts.map

package/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["api.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAYH,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAC5C,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG,UAAU,CAAC;AAEnD,MAAM,WAAW,aAAa;IAC1B,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,YAAY;IAEzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;IAGZ,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,WAAW;IACxB,KAAK,EAAE,MAAM,CAAC;CACjB;AA0BD,wBAAgB,SAAS,IAAI,aAAa,CAczC;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAI9D;AAED,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAGD,wBAAsB,YAAY,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAuB3D;AA8WD,wBAAsB,MAAM,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAInE;AAED,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAMvE"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,EACH,YAAY,EACZ,YAAY,IAAI,gBAAgB,EAChC,cAAc,IAAI,kBAAkB,EAMpC,OAAO,EAWV,MAAM,0BAA0B,CAAC;AAIlC,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAC5C,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG,UAAU,CAAC;AAEnD,2EAA2E;AAC3E,MAAM,WAAW,aAAa;IAC1B,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,iFAAiF;AACjF,MAAM,WAAW,YAAa,SAAQ,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACjE,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAY,6CAA6C;IACzE,WAAW,CAAC,EAAE,WAAW,CAAC,CAAE,kDAAkD;IAC9E,MAAM,CAAC,EAAE,MAAM,CAAC,CAAY,uCAAuC;CACtE;AAED,MAAM,WAAW,cAAe,SAAQ,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC;IACrE,IAAI,CAAC,EAAE,QAAQ,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IACxB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,YAAY,EAAE,OAAO,EAAE,CAAC;AA8BxB,wBAAgB,SAAS,IAAI,aAAa,CAMzC;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAE9D;AAED,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAID,wBAAsB,YAAY,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAG3D;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAyB5E;AAuGD,0DAA0D;AAC1D,eAAO,MAAM,cAAc,EAAE,YAAuC,CAAC;AAsBrE,wBAAsB,MAAM,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAEnE;AAED,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAGvE;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK/H;AAED,wBAAsB,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAGvG"}