@eighty4/c2 0.0.3-1 → 0.0.4

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## [Unreleased]
 
+- ???
+
+## [v0.0.4] - 2025-06-30
+
+### Fixed
+
+- Cleaning up console output of errors and CLI usage
+
+## [v0.0.3] - 2025-06-26
+
 ### Fixed
 
 - TypeScript type declarations were broken because subpath imports
@@ -18,5 +28,7 @@
 - Evaluate env() and file() expressions in user data
 - Merge multiple user data into a MIME multipart message
 
-[Unreleased]: https://github.com/eighty4/c2/compare/v0.0.2...HEAD
+[Unreleased]: https://github.com/eighty4/c2/compare/v0.0.4...HEAD
+[v0.0.4]: https://github.com/eighty4/c2/compare/v0.0.3...v0.0.4
+[v0.0.3]: https://github.com/eighty4/c2/compare/v0.0.2...v0.0.3
 [v0.0.2]: https://github.com/eighty4/c2/releases/tag/v0.0.2

package/lib/attachments.ts

@@ -31,9 +31,9 @@ function compareAttachmentFilenames(
     a1: Attachment,
     a2: Attachment,
 ): 1 | 0 | -1 {
-    if (a1.filename === a2.filename) return 0
+    if (a1.filename < a2.filename) return -1
     if (a1.filename > a2.filename) return 1
-    return -1
+    return 0
 }
 
 export function resolveAttachmentType(

package/lib/{c2.bin.ts → bin.ts}

@@ -9,17 +9,16 @@ let args: ParsedArgs | undefined
 try {
     args = parseArgs()
 } catch (e: any) {
-    if (e.message) {
-        console.error(e.message)
-    }
+    errorExit(e.message)
 }
 
 if (!args || args.help) {
     const optional = (s: string) => `\u001b[90m${s}\u001b[0m`
     const required = (s: string) => `\u001b[1m${s}\u001b[0m`
-    errorExit(
+    console.error(
         `c2 ${optional('[[--base64] | [--http PORT]]')} ${required('USER_DATA_DIR')}`,
     )
+    process.exit(1)
 }
 
 if (!(await doesDirExist(args.userDataDir))) {
@@ -46,6 +45,10 @@ try {
 }
 
 function errorExit(msg: string): never {
-    console.error(msg)
+    console.error(errorText('error:'), msg)
     process.exit(1)
 }
+
+function errorText(s: string): string {
+    return `\u001b[1;31m${s}\u001b[0m`
+}

package/lib/cli.ts

@@ -7,11 +7,7 @@ export type ParsedArgs =
           userDataDir: string
       }
 
-const SCRIPT_SUFFIXES = Object.freeze([
-    '/c2',
-    '/lib_js/c2.bin.js',
-    '/lib/c2.bin.ts',
-])
+const SCRIPT_SUFFIXES = Object.freeze(['/c2', '/lib_js/bin.js', '/lib/bin.ts'])
 
 export function parseArgs(input?: Array<string>): ParsedArgs {
     if (!input) {

package/lib_js/attachments.js

@@ -12,11 +12,11 @@ export async function collectAttachments(dir) {
     return attachments.sort(compareAttachmentFilenames);
 }
 function compareAttachmentFilenames(a1, a2) {
-    if (a1.filename === a2.filename)
-        return 0;
+    if (a1.filename < a2.filename)
+        return -1;
     if (a1.filename > a2.filename)
         return 1;
-    return -1;
+    return 0;
 }
 export function resolveAttachmentType(filename, source) {
     if (filename.endsWith('.yml') || filename.endsWith('.yaml')) {

package/lib_js/{c2.bin.js → bin.js}

@@ -8,14 +8,13 @@ try {
     args = parseArgs();
 }
 catch (e) {
-    if (e.message) {
-        console.error(e.message);
-    }
+    errorExit(e.message);
 }
 if (!args || args.help) {
     const optional = (s) => `\u001b[90m${s}\u001b[0m`;
     const required = (s) => `\u001b[1m${s}\u001b[0m`;
-    errorExit(`c2 ${optional('[[--base64] | [--http PORT]]')} ${required('USER_DATA_DIR')}`);
+    console.error(`c2 ${optional('[[--base64] | [--http PORT]]')} ${required('USER_DATA_DIR')}`);
+    process.exit(1);
 }
 if (!(await doesDirExist(args.userDataDir))) {
     errorExit(`${args.userDataDir} directory does not exist`);
@@ -39,6 +38,9 @@ catch (e) {
     errorExit(e.message);
 }
 function errorExit(msg) {
-    console.error(msg);
+    console.error(errorText('error:'), msg);
     process.exit(1);
 }
+function errorText(s) {
+    return `\u001b[1;31m${s}\u001b[0m`;
+}

package/lib_js/cli.js

@@ -1,8 +1,4 @@
-const SCRIPT_SUFFIXES = Object.freeze([
-    '/c2',
-    '/lib_js/c2.bin.js',
-    '/lib/c2.bin.ts',
-]);
+const SCRIPT_SUFFIXES = Object.freeze(['/c2', '/lib_js/bin.js', '/lib/bin.ts']);
 export function parseArgs(input) {
     if (!input) {
         input = process.argv;

package/lib_types/{c2.api.d.ts → api.d.ts}

@@ -1,2 +1,2 @@
 export { type BuildUserDataOpts, buildUserData } from './build.ts';
-//# sourceMappingURL=c2.api.d.ts.map
+//# sourceMappingURL=api.d.ts.map

package/lib_types/api.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../lib/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA"}

package/lib_types/bin.d.ts

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

package/lib_types/bin.d.ts.map

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

package/lib_types/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../lib/cli.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAChB;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,GACd;IACI,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CACtB,CAAA;AAQP,wBAAgB,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,UAAU,CAqD3D"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../lib/cli.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAChB;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,GACd;IACI,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CACtB,CAAA;AAIP,wBAAgB,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,UAAU,CAqD3D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eighty4/c2",
-  "version": "0.0.3-1",
+  "version": "0.0.4",
   "author": "Adam McKee <adam.be.g84d@gmail.com>",
   "repository": "https://github.com/eighty4/c2",
   "homepage": "https://github.com/eighty4/c2",
@@ -20,13 +20,13 @@
     "node": ">=23"
   },
   "bin": {
-    "c2": "./lib_js/c2.bin.js"
+    "c2": "./lib_js/bin.js"
   },
   "exports": {
     ".": {
-      "bun": "./lib/c2.api.ts",
-      "node": "./lib_js/c2.api.js",
-      "types": "./lib_types/c2.api.d.ts"
+      "bun": "./lib/api.ts",
+      "node": "./lib_js/api.js",
+      "types": "./lib_types/api.d.ts"
     }
   },
   "scripts": {

package/lib_types/c2.api.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"c2.api.d.ts","sourceRoot":"","sources":["../lib/c2.api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA"}

package/lib_types/c2.bin.d.ts

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

package/lib_types/c2.bin.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"c2.bin.d.ts","sourceRoot":"","sources":["../lib/c2.bin.ts"],"names":[],"mappings":""}