@bobfrankston/brother-label 1.0.13 → 1.0.14

package/cli.ts

@@ -6,18 +6,21 @@
 
 import * as fs from "fs";
 import * as path from "path";
-import { program } from "commander";
 import {
     print,
     render,
+    renderSegments,
+    printSegments,
     getConfig,
     setConfig,
     getConfigPath,
     listPrinters,
     TapeSize,
     PrintOptions,
+    Segment,
 } from "./api.js";
 
+const VERSION = "1.0.13";
 const VALID_TAPES: TapeSize[] = [6, 9, 12, 18, 24];
 
 function parseTape(value: string): TapeSize {
@@ -85,53 +88,165 @@ function buildPrintOptions(input: string, opts: { tape?: string; printer?: strin
     return options;
 }
 
-program
-    .name("brother-print")
-    .description("Print labels on Brother P-touch printers")
-    .version("1.0.0");
-
-// Default command - print
-program
-    .argument("[input]", "Text to print, or path to file (auto-detects type)")
-    .option("-t, --tape <size>", "Tape size: 6, 9, 12, 18, 24 (mm)")
-    .option("-p, --printer <name>", "Printer name")
-    .option("-o, --output <file>", "Save to file instead of printing (png, jpg, bmp)")
-    .option("-a, --aspect <ratio>", "Aspect ratio width:height for HTML (e.g., 3.5:2)")
-    .option("-H, --height <size>", "Text height: 12mm, .5in, or 50% (of tape height)")
-    .option("--text", "Force input as literal text")
-    .option("--html", "Force input as HTML file path")
-    .option("--image", "Force input as image file path")
-    .action(async (input: string | undefined, opts) => {
-        if (!input) {
-            program.help();
-            return;
+interface ParsedArgs {
+    command: string | null;
+    opts: Record<string, string | boolean>;
+    segments: Segment[];
+    input: string | null;
+}
+
+// Valued options: flag name(s) → canonical key
+const VALUED_OPTIONS: [string[], string][] = [
+    [["-tape"], "tape"],
+    [["-p", "-printer"], "printer"],
+    [["-o", "-output"], "output"],
+    [["-a", "-aspect"], "aspect"],
+    [["-H", "-height"], "height"],
+    [["-s", "-sp", "-space"], "space"],
+];
+
+// Boolean flags: flag name(s) → canonical key
+const BOOLEAN_FLAGS: [string[], string][] = [
+    [["-w", "-html"], "html"],
+    [["-i", "-image"], "image"],
+    [["-t"], "text"],
+    [["-help", "-h"], "help"],
+    [["-version", "-v"], "version"],
+];
+
+function parseArgs(argv: string[]): ParsedArgs {
+    const args = argv.slice(2).map(a => a.startsWith("--") ? a.slice(1) : a);
+    const command: string | null = null;
+    const opts: Record<string, string | boolean> = {};
+    const segments: Segment[] = [];
+    let input: string | null = null;
+    let i = 0;
+
+    while (i < args.length) {
+        const arg = args[i];
+
+        // Segment flags: -text <value>, -qr <value>
+        if ((arg === "-text" || arg === "-qr") && i + 1 < args.length) {
+            segments.push({ type: arg === "-text" ? "text" : "qr", value: args[i + 1] });
+            i += 2;
+            continue;
         }
 
-        try {
-            const options = buildPrintOptions(input, opts);
+        // Valued options
+        let matched = false;
+        for (const [names, key] of VALUED_OPTIONS) {
+            if (names.includes(arg) && i + 1 < args.length) {
+                opts[key] = args[i + 1];
+                i += 2;
+                matched = true;
+                break;
+            }
+        }
+        if (matched) continue;
 
-            if (opts.output) {
-                // Render only, save to file
-                const buffer = await render(options);
-                fs.writeFileSync(opts.output, buffer);
-                console.log(`Saved to ${opts.output}`);
-            } else {
-                // Print
-                const result = await print(options);
-                const tape = options.tape ?? getConfig().defaultTape ?? 24;
-                console.log(`Printed on ${tape}mm tape`);
+        // Boolean flags
+        for (const [names, key] of BOOLEAN_FLAGS) {
+            if (names.includes(arg)) {
+                opts[key] = true;
+                i++;
+                matched = true;
+                break;
             }
-        } catch (err) {
-            console.error(`Error: ${(err as Error).message}`);
-            process.exit(1);
         }
-    });
+        if (matched) continue;
+
+        // Subcommands
+        if ((arg === "list" || arg === "config") && command === null && input === null) {
+            return { ...parseRest(args, i), command: arg };
+        }
+
+        // Bare string → positional input (first one wins)
+        if (input === null) {
+            input = arg;
+        }
+        i++;
+    }
+
+    return { command, opts, segments, input };
+}
+
+// After recognizing a subcommand, parse the rest for that subcommand's options
+function parseRest(args: string[], startIndex: number): ParsedArgs {
+    const opts: Record<string, string | boolean> = {};
+    const segments: Segment[] = [];
+    let input: string | null = null;
+    let i = startIndex + 1;
+
+    while (i < args.length) {
+        const arg = args[i];
+        let matched = false;
+        for (const [names, key] of VALUED_OPTIONS) {
+            if (names.includes(arg) && i + 1 < args.length) {
+                opts[key] = args[i + 1];
+                i += 2;
+                matched = true;
+                break;
+            }
+        }
+        if (matched) continue;
+
+        for (const [names, key] of BOOLEAN_FLAGS) {
+            if (names.includes(arg)) {
+                opts[key] = true;
+                i++;
+                matched = true;
+                break;
+            }
+        }
+        if (matched) continue;
+
+        if (input === null) input = arg;
+        i++;
+    }
+
+    return { command: null, opts, segments, input };
+}
+
+function showHelp(): void {
+    console.log(`Brother Label Printer CLI v${VERSION}
+
+Usage:
+  brother-print [options] <input>        Print text, file, or image
+  brother-print -text <v> -qr <v> ...    Print ordered segments
+  brother-print list                     List available printers
+  brother-print config                   Show/set configuration
+
+Options:
+  -tape <size>       Tape size: 6, 9, 12, 18, 24 (mm)
+  -p, -printer <n>   Printer name
+  -o, -output <file> Save to file instead of printing (png, jpg, bmp)
+  -a, -aspect <r>    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
+  -t, -text          Force input as literal text (or -text <v> for segments)
+  -qr <data>         QR code segment
+  -w, -html          Force input as HTML file path
+  -i, -image         Force input as image file path
+  -help              Show this help
+  -version           Show version`);
+}
+
+// --- Main ---
 
-// List printers
-program
-    .command("list")
-    .description("List available Brother printers")
-    .action(async () => {
+async function main(): Promise<void> {
+    const parsed = parseArgs(process.argv);
+
+    if (parsed.opts.help) {
+        showHelp();
+        return;
+    }
+    if (parsed.opts.version) {
+        console.log(VERSION);
+        return;
+    }
+
+    // Subcommands
+    if (parsed.command === "list") {
         try {
             const printers = await listPrinters();
             if (printers.length === 0) {
@@ -144,18 +259,12 @@ program
             console.error(`Error: ${(err as Error).message}`);
             process.exit(1);
         }
-    });
-
-// Config
-program
-    .command("config")
-    .description("Show or set configuration")
-    .option("-t, --tape <size>", "Set default tape size: 6, 9, 12, 18, 24 (mm)")
-    .option("-p, --printer <name>", "Set default printer name")
-    .action((opts) => {
+        return;
+    }
+
+    if (parsed.command === "config") {
         try {
-            if (!opts.tape && !opts.printer) {
-                // Show config
+            if (!parsed.opts.tape && !parsed.opts.printer) {
                 const config = getConfig();
                 console.log("Configuration:");
                 console.log(`  File: ${getConfigPath()}`);
@@ -164,21 +273,72 @@ program
                 console.log("\nValid tape sizes: 6, 9, 12, 18, 24");
                 return;
             }
-
-            if (opts.tape) {
-                const tape = parseTape(opts.tape);
+            if (parsed.opts.tape) {
+                const tape = parseTape(parsed.opts.tape as string);
                 setConfig({ defaultTape: tape });
                 console.log(`Default tape set to: ${tape}mm`);
             }
+            if (parsed.opts.printer) {
+                setConfig({ defaultPrinter: parsed.opts.printer as string });
+                console.log(`Default printer set to: ${parsed.opts.printer}`);
+            }
+        } catch (err) {
+            console.error(`Error: ${(err as Error).message}`);
+            process.exit(1);
+        }
+        return;
+    }
 
-            if (opts.printer) {
-                setConfig({ defaultPrinter: opts.printer });
-                console.log(`Default printer set to: ${opts.printer}`);
+    // Multi-segment mode
+    if (parsed.segments.length > 0) {
+        try {
+            const tape = parsed.opts.tape ? parseTape(parsed.opts.tape as string) : undefined;
+            if (parsed.opts.output) {
+                const buffer = await renderSegments(parsed.segments, tape, parsed.opts.height as string | undefined, parsed.opts.space as string | undefined);
+                fs.writeFileSync(parsed.opts.output as string, buffer);
+                console.log(`Saved to ${parsed.opts.output}`);
+            } else {
+                await printSegments(parsed.segments, { tape, printer: parsed.opts.printer as string | undefined, textHeight: parsed.opts.height as string | undefined, space: parsed.opts.space as string | undefined });
+                const effectiveTape = tape ?? getConfig().defaultTape ?? 24;
+                console.log(`Printed ${parsed.segments.length} segments on ${effectiveTape}mm tape`);
             }
         } catch (err) {
             console.error(`Error: ${(err as Error).message}`);
             process.exit(1);
         }
-    });
+        return;
+    }
+
+    // Single input mode
+    if (!parsed.input) {
+        showHelp();
+        return;
+    }
+
+    try {
+        const options = buildPrintOptions(parsed.input, {
+            tape: parsed.opts.tape as string | undefined,
+            printer: parsed.opts.printer as string | undefined,
+            text: parsed.opts.text as boolean | undefined,
+            html: parsed.opts.html as boolean | undefined,
+            image: parsed.opts.image as boolean | undefined,
+            aspect: parsed.opts.aspect as string | undefined,
+            height: parsed.opts.height as string | undefined,
+        });
+
+        if (parsed.opts.output) {
+            const buffer = await render(options);
+            fs.writeFileSync(parsed.opts.output as string, buffer);
+            console.log(`Saved to ${parsed.opts.output}`);
+        } else {
+            await print(options);
+            const tape = options.tape ?? getConfig().defaultTape ?? 24;
+            console.log(`Printed on ${tape}mm tape`);
+        }
+    } catch (err) {
+        console.error(`Error: ${(err as Error).message}`);
+        process.exit(1);
+    }
+}
 
-program.parse();
+main();

package/index.d.ts

@@ -2,5 +2,5 @@
  * Brother Label Printer API
  * @module @bobfrankston/brother-label
  */
-export { TapeSize, Orientation, PrinterConfig, PrinterInfo, PrintOptions, PrintResult, print, render, getConfig, setConfig, getConfigPath, listPrinters, } from "./api.js";
+export { TapeSize, Orientation, PrinterConfig, PrinterInfo, PrintOptions, PrintResult, Segment, print, render, renderSegments, printSegments, getConfig, setConfig, getConfigPath, listPrinters, } from "./api.js";
 //# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAEH,QAAQ,EACR,WAAW,EACX,aAAa,EACb,WAAW,EACX,YAAY,EACZ,WAAW,EAEX,KAAK,EACL,MAAM,EACN,SAAS,EACT,SAAS,EACT,aAAa,EACb,YAAY,GACf,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAEH,QAAQ,EACR,WAAW,EACX,aAAa,EACb,WAAW,EACX,YAAY,EACZ,WAAW,EACX,OAAO,EAEP,KAAK,EACL,MAAM,EACN,cAAc,EACd,aAAa,EACb,SAAS,EACT,SAAS,EACT,aAAa,EACb,YAAY,GACf,MAAM,UAAU,CAAC"}

package/index.js

@@ -4,5 +4,5 @@
  */
 export { 
 // Functions
-print, render, getConfig, setConfig, getConfigPath, listPrinters, } from "./api.js";
+print, render, renderSegments, printSegments, getConfig, setConfig, getConfigPath, listPrinters, } from "./api.js";
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO;AAQH,YAAY;AACZ,KAAK,EACL,MAAM,EACN,SAAS,EACT,SAAS,EACT,aAAa,EACb,YAAY,GACf,MAAM,UAAU,CAAC","sourcesContent":["/**\r\n * Brother Label Printer API\r\n * @module @bobfrankston/brother-label\r\n */\r\n\r\nexport {\r\n    // Types\r\n    TapeSize,\r\n    Orientation,\r\n    PrinterConfig,\r\n    PrinterInfo,\r\n    PrintOptions,\r\n    PrintResult,\r\n    // Functions\r\n    print,\r\n    render,\r\n    getConfig,\r\n    setConfig,\r\n    getConfigPath,\r\n    listPrinters,\r\n} from \"./api.js\";\r\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO;AASH,YAAY;AACZ,KAAK,EACL,MAAM,EACN,cAAc,EACd,aAAa,EACb,SAAS,EACT,SAAS,EACT,aAAa,EACb,YAAY,GACf,MAAM,UAAU,CAAC","sourcesContent":["/**\r\n * Brother Label Printer API\r\n * @module @bobfrankston/brother-label\r\n */\r\n\r\nexport {\r\n    // Types\r\n    TapeSize,\r\n    Orientation,\r\n    PrinterConfig,\r\n    PrinterInfo,\r\n    PrintOptions,\r\n    PrintResult,\r\n    Segment,\r\n    // Functions\r\n    print,\r\n    render,\r\n    renderSegments,\r\n    printSegments,\r\n    getConfig,\r\n    setConfig,\r\n    getConfigPath,\r\n    listPrinters,\r\n} from \"./api.js\";\r\n"]}

package/index.ts

@@ -11,9 +11,12 @@ export {
     PrinterInfo,
     PrintOptions,
     PrintResult,
+    Segment,
     // Functions
     print,
     render,
+    renderSegments,
+    printSegments,
     getConfig,
     setConfig,
     getConfigPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/brother-label",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "API and CLI for printing labels on Brother P-touch printers",
   "type": "module",
   "main": "index.js",
@@ -27,7 +27,8 @@
   "scripts": {
     "build": "tsc",
     "prepublishOnly": "npm run build",
-    "start": "node cli.js"
+    "start": "node cli.js",
+    "release": "npmglobalize"
   },
   "keywords": [
     "brother",
@@ -44,7 +45,6 @@
     "url": "https://github.com/BobFrankston/brother-label.git"
   },
   "dependencies": {
-    "commander": "^12.0.0",
     "jimp": "^1.6.0",
     "puppeteer": "^23.11.1",
     "qrcode": "^1.5.4"

package/brother-print.d.ts

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-export {};
-//# sourceMappingURL=brother-print.d.ts.map

package/brother-print.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"brother-print.d.ts","sourceRoot":"","sources":["brother-print.ts"],"names":[],"mappings":""}