Use cli-util in all CLIs

Author: kraenhansen

packages/cli-utils/src/actions.ts

@@ -1,14 +1,15 @@
 import { SpawnFailure } from "bufout";
 import chalk from "chalk";
+import * as commander from "@commander-js/extra-typings";
 
 import { UsageError } from "./errors.js";
 
-export function wrapAction<Args extends unknown[]>(
-  action: (...args: Args) => void | Promise<void>,
-): (...args: Args) => Promise<void> {
-  return async (...args: Args) => {
+function wrapAction<Command extends commander.Command, Args extends unknown[]>(
+  fn: (this: Command, ...args: Args) => void | Promise<void>,
+) {
+  return async function (this: Command, ...args: Args) {
     try {
-      await action(...args);
+      await fn.call(this, ...args);
     } catch (error) {
       process.exitCode = 1;
       if (error instanceof SpawnFailure) {
@@ -33,3 +34,17 @@ export function wrapAction<Args extends unknown[]>(
     }
   };
 }
+
+import { Command } from "@commander-js/extra-typings";
+
+// Patch Command to wrap all actions with our error handler
+
+// eslint-disable-next-line @typescript-eslint/unbound-method
+const originalAction = Command.prototype.action;
+
+Command.prototype.action = function action<Command extends commander.Command>(
+  this: Command,
+  fn: Parameters<typeof originalAction>[0],
+) {
+  return originalAction.call(this, wrapAction(fn));
+};

packages/cmake-rn/package.json

@@ -22,11 +22,7 @@
     "test": "tsx --test --test-reporter=@reporters/github --test-reporter-destination=stdout --test-reporter=spec --test-reporter-destination=stdout"
   },
   "dependencies": {
-    "@commander-js/extra-typings": "^13.1.0",
-    "bufout": "^0.3.2",
-    "chalk": "^5.4.1",
-    "commander": "^13.1.0",
-    "ora": "^8.2.0",
+    "@react-native-node-api/cli-utils": "0.1.0",
     "react-native-node-api": "0.5.0"
   },
   "peerDependencies": {

packages/cmake-rn/src/cli.ts

@@ -3,10 +3,15 @@ import path from "node:path";
 import fs from "node:fs";
 import { EventEmitter } from "node:events";
 
-import { Command, Option } from "@commander-js/extra-typings";
-import { spawn, SpawnFailure } from "bufout";
-import { oraPromise } from "ora";
-import chalk from "chalk";
+import {
+  chalk,
+  Command,
+  Option,
+  spawn,
+  SpawnFailure,
+  oraPromise,
+} from "@react-native-node-api/cli-utils";
+import { isSupportedTriplet } from "react-native-node-api";
 
 import { getWeakNodeApiVariables } from "./weak-node-api.js";
 import {
@@ -16,7 +21,6 @@ import {
   platformHasTarget,
 } from "./platforms.js";
 import { BaseOpts, TargetContext, Platform } from "./platforms/types.js";
-import { isSupportedTriplet } from "react-native-node-api";
 
 // We're attaching a lot of listeners when spawning in parallel
 EventEmitter.defaultMaxListeners = 100;

packages/cmake-rn/src/platforms/android.ts

@@ -2,16 +2,14 @@ import assert from "node:assert/strict";
 import fs from "node:fs";
 import path from "node:path";
 
-import { Option } from "@commander-js/extra-typings";
+import { Option, oraPromise, chalk } from "@react-native-node-api/cli-utils";
 import {
   createAndroidLibsDirectory,
   determineAndroidLibsFilename,
   AndroidTriplet as Target,
 } from "react-native-node-api";
 
 import type { Platform } from "./types.js";
-import { oraPromise } from "ora";
-import chalk from "chalk";
 
 // This should match https://github.com/react-native-community/template/blob/main/template/android/build.gradle#L7
 const DEFAULT_NDK_VERSION = "27.1.12297006";

packages/cmake-rn/src/platforms/apple.ts

@@ -2,8 +2,7 @@ import assert from "node:assert/strict";
 import path from "node:path";
 import fs from "node:fs";
 
-import { Option } from "@commander-js/extra-typings";
-import { oraPromise } from "ora";
+import { Option, oraPromise, chalk } from "@react-native-node-api/cli-utils";
 import {
   AppleTriplet as Target,
   createAppleFramework,
@@ -12,7 +11,6 @@ import {
 } from "react-native-node-api";
 
 import type { Platform } from "./types.js";
-import chalk from "chalk";
 
 type XcodeSDKName =
   | "iphoneos"

packages/cmake-rn/src/platforms/types.ts

@@ -1,12 +1,13 @@
-import * as commander from "@commander-js/extra-typings";
+import * as cli from "@react-native-node-api/cli-utils";
+
 import type { program } from "../cli.js";
 
-type InferOptionValues<Command extends commander.Command> = ReturnType<
+type InferOptionValues<Command extends cli.Command> = ReturnType<
   Command["opts"]
 >;
 
 type BaseCommand = typeof program;
-type ExtendedCommand<Opts extends commander.OptionValues> = commander.Command<
+type ExtendedCommand<Opts extends cli.OptionValues> = cli.Command<
   [],
   Opts & InferOptionValues<BaseCommand>,
   Record<string, unknown> // Global opts are not supported
@@ -22,7 +23,7 @@ export type TargetContext<Target extends string> = {
 
 export type Platform<
   Targets extends string[] = string[],
-  Opts extends commander.OptionValues = Record<string, unknown>,
+  Opts extends cli.OptionValues = Record<string, unknown>,
   Command = ExtendedCommand<Opts>,
 > = {
   /**

packages/ferric/package.json

@@ -17,11 +17,7 @@
   },
   "dependencies": {
     "@napi-rs/cli": "~3.0.3",
-    "@commander-js/extra-typings": "^13.1.0",
-    "bufout": "^0.3.2",
-    "chalk": "^5.4.1",
-    "commander": "^13.1.0",
-    "react-native-node-api": "0.5.0",
-    "ora": "^8.2.0"
+    "@react-native-node-api/cli-utils": "0.1.0",
+    "react-native-node-api": "0.5.0"
   }
 }

packages/ferric/src/banner.ts

@@ -1,4 +1,4 @@
-import chalk from "chalk";
+import { chalk } from "@react-native-node-api/cli-utils";
 
 const LINES = [
   // Pagga on https://www.asciiart.eu/text-to-ascii-art