rename exports and cli script

Author: Adam McKee

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 ## [Unreleased]
 
-- ???
+### Fixed
+
+- Cleaning up error and CLI usage output
 
 ## [v0.0.3] - 2025-06-26
 

lib/c2.api.ts lib/api.tslib/c2.api.ts renamed to lib/api.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(

lib/attachments.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`
+}

lib/c2.bin.ts lib/bin.tslib/c2.bin.ts renamed to lib/bin.ts

@@ -5,7 +5,7 @@ test('parseArgs with ts entrypoint', () => {
     expect(
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/lib/c2.bin.ts',
+            '/Users/who/user-data/lib/bin.ts',
             'user_data_dir',
         ]),
     ).toStrictEqual({
@@ -31,7 +31,7 @@ test('parseArgs with js entrypoint', () => {
     expect(
         parseArgs([
             '/Users/who/.nvm/versions/node/v23.7.0/bin/node',
-            '/Users/who/user-data/lib_js/c2.bin.js',
+            '/Users/who/user-data/lib_js/bin.js',
             'user_data_dir',
         ]),
     ).toStrictEqual({
@@ -50,7 +50,7 @@ test('parseArgs errors without USER_DATA_DIR', () => {
     expect(() =>
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/lib/c2.bin.ts',
+            '/Users/who/user-data/lib/bin.ts',
         ]),
     ).toThrow()
 })
@@ -59,7 +59,7 @@ test('parseArgs errors with extra USER_DATA_DIR', () => {
     expect(() =>
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/lib/c2.bin.ts',
+            '/Users/who/user-data/lib/bin.ts',
             'user_data_dir',
             'some_other_arg',
         ]),
@@ -70,7 +70,7 @@ test('parseArgs with --base64', () => {
     expect(
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/lib/c2.bin.ts',
+            '/Users/who/user-data/lib/bin.ts',
             '--base64',
             'user_data_dir',
         ]),
@@ -84,7 +84,7 @@ test('parseArgs with --http PORT', () => {
     expect(
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/lib/c2.bin.ts',
+            '/Users/who/user-data/lib/bin.ts',
             '--http',
             '6666',
             'user_data_dir',
@@ -96,7 +96,7 @@ test('parseArgs with --http bunk', () => {
     expect(() =>
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/lib/c2.bin.ts',
+            '/Users/who/user-data/lib/bin.ts',
             '--http',
             'bunk',
             'user_data_dir',
@@ -108,7 +108,7 @@ test('parseArgs with --http without PORT', () => {
     expect(() =>
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/lib/c2.bin.ts',
+            '/Users/who/user-data/lib/bin.ts',
             'user_data_dir',
             '--http',
         ]),

lib/cli.spec.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) {

lib/cli.ts

@@ -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": {