@forwardimpact/libutil 0.1.70 → 0.1.72

package/bin/fit-download-bundle.js

@@ -1,19 +1,41 @@
 #!/usr/bin/env node
 
+import { readFileSync } from "node:fs";
 import { spawn } from "node:child_process";
+import { createCli } from "@forwardimpact/libcli";
 import { createScriptConfig } from "@forwardimpact/libconfig";
 import { createStorage } from "@forwardimpact/libstorage";
 import { createLogger } from "@forwardimpact/libtelemetry";
 import { createBundleDownloader, execLine } from "@forwardimpact/libutil";
 
+const { version: VERSION } = JSON.parse(
+  readFileSync(new URL("../package.json", import.meta.url), "utf8"),
+);
+
+const definition = {
+  name: "fit-download-bundle",
+  version: VERSION,
+  description: "Download generated code bundle from remote storage",
+  options: {
+    help: { type: "boolean", short: "h", description: "Show this help" },
+    version: { type: "boolean", description: "Show version" },
+    json: { type: "boolean", description: "Output help as JSON" },
+  },
+};
+
+const cli = createCli(definition);
+const logger = createLogger("generated");
+
 /**
  * Downloads generated code bundle from remote storage.
  * Used in containerized deployments to fetch pre-generated code.
  * @returns {Promise<void>}
  */
 async function main() {
+  const parsed = cli.parse(process.argv.slice(2));
+  if (!parsed) process.exit(0);
+
   await createScriptConfig("download-bundle");
-  const logger = createLogger("generated");
   const downloader = createBundleDownloader(createStorage, logger);
   await downloader.download();
 
@@ -22,6 +44,7 @@ async function main() {
 }
 
 main().catch((error) => {
-  console.error("Bundle download failed:", error);
+  logger.exception("main", error);
+  cli.error(error.message);
   process.exit(1);
 });

package/bin/fit-tiktoken.js

@@ -1,14 +1,38 @@
 #!/usr/bin/env node
+import { readFileSync } from "node:fs";
+import { createCli } from "@forwardimpact/libcli";
+import { createLogger } from "@forwardimpact/libtelemetry";
 import { countTokens } from "@forwardimpact/libutil";
 
+const { version: VERSION } = JSON.parse(
+  readFileSync(new URL("../package.json", import.meta.url), "utf8"),
+);
+
+const definition = {
+  name: "fit-tiktoken",
+  version: VERSION,
+  description: "Count tokens in text",
+  usage: "fit-tiktoken <text>\n       echo 'text' | fit-tiktoken",
+  options: {
+    help: { type: "boolean", short: "h", description: "Show this help" },
+    version: { type: "boolean", description: "Show version" },
+    json: { type: "boolean", description: "Output help as JSON" },
+  },
+  examples: ['fit-tiktoken "hello world"', "echo 'hello world' | fit-tiktoken"],
+};
+
+const cli = createCli(definition);
+const logger = createLogger("tiktoken");
+
 /**
  * Counts tokens in the provided text
- * Usage: fit-tiktoken <text>
- *        echo "text" | fit-tiktoken
  * @returns {Promise<void>}
  */
 async function main() {
-  let text = process.argv.slice(2).join(" ");
+  const parsed = cli.parse(process.argv.slice(2));
+  if (!parsed) process.exit(0);
+
+  let text = parsed.positionals.join(" ");
 
   if (!text && !process.stdin.isTTY) {
     const chunks = [];
@@ -19,15 +43,15 @@ async function main() {
   }
 
   if (!text) {
-    console.error("Usage: fit-tiktoken <text>");
-    console.error('       echo "text" | fit-tiktoken');
-    process.exit(1);
+    cli.usageError("expected text argument or stdin input");
+    process.exit(2);
   }
 
   console.log(countTokens(text));
 }
 
 main().catch((error) => {
-  console.error(error.message);
+  logger.exception("main", error);
+  cli.error(error.message);
   process.exit(1);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forwardimpact/libutil",
-  "version": "0.1.70",
+  "version": "0.1.72",
   "description": "Utility functions and utilities for Guide",
   "license": "Apache-2.0",
   "author": "D. Olsson <hi@senzilla.io>",
@@ -18,6 +18,7 @@
     "test": "bun run node --test test/*.test.js"
   },
   "dependencies": {
+    "@forwardimpact/libcli": "^0.1.0",
     "@forwardimpact/libtelemetry": "^0.1.22"
   },
   "devDependencies": {