Move prettyPath to cli-utils

Author: kraenhansen

packages/cli-utils/src/index.ts

@@ -5,3 +5,4 @@ export * from "bufout";
 
 export * from "./actions.js";
 export * from "./errors.js";
+export * from "./paths.js";

packages/cli-utils/src/paths.ts

@@ -0,0 +1,8 @@
+import chalk from "chalk";
+import path from "node:path";
+
+export function prettyPath(p: string) {
+  return chalk.dim(
+    path.relative(process.cwd(), p) || chalk.italic("current directory"),
+  );
+}

packages/ferric/src/build.ts

@@ -8,6 +8,7 @@ import {
   oraPromise,
   assertFixable,
   wrapAction,
+  prettyPath,
 } from "@react-native-node-api/cli-utils";
 
 import {
@@ -19,7 +20,6 @@ import {
   createXCframework,
   createUniversalAppleLibrary,
   determineLibraryBasename,
-  prettyPath,
 } from "react-native-node-api";
 
 import { ensureCargo, build } from "./cargo.js";

packages/gyp-to-cmake/src/cli.ts

@@ -1,7 +1,11 @@
 import fs from "node:fs";
 import path from "node:path";
-
-import { Command, wrapAction } from "@react-native-node-api/cli-utils";
+import {
+  Command,
+  prettyPath,
+  wrapAction,
+  Option,
+} from "@react-native-node-api/cli-utils";
 
 import { readBindingFile } from "./gyp.js";
 import {
@@ -29,15 +33,18 @@ export function transformBindingGypFile(
     ...restOfOptions
   }: TransformOptions,
 ) {
-  console.log("Transforming", gypPath);
-  const gyp = readBindingFile(gypPath, disallowUnknownProperties);
   const parentPath = path.dirname(gypPath);
+  const cmakeListsPath = path.join(parentPath, "CMakeLists.txt");
+  console.log(
+    `Transforming ${prettyPath(gypPath)} → ${prettyPath(cmakeListsPath)}`,
+  );
+
+  const gyp = readBindingFile(gypPath, disallowUnknownProperties);
   const result = bindingGypToCmakeLists({
     gyp,
     projectName,
     ...restOfOptions,
   });
-  const cmakeListsPath = path.join(parentPath, "CMakeLists.txt");
   fs.writeFileSync(cmakeListsPath, result, "utf-8");
 }
 

packages/host/src/node/cli/hermes.ts

@@ -9,11 +9,10 @@ import {
   spawn,
   UsageError,
   wrapAction,
+  prettyPath,
 } from "@react-native-node-api/cli-utils";
 import { packageDirectorySync } from "pkg-dir";
 
-import { prettyPath } from "../path-utils";
-
 const HOST_PACKAGE_ROOT = path.resolve(__dirname, "../../..");
 // FIXME: make this configurable with reasonable fallback before public release
 const HERMES_GIT_URL = "https://github.com/kraenhansen/hermes.git";

packages/host/src/node/cli/link-modules.ts

@@ -1,7 +1,11 @@
 import path from "node:path";
 import fs from "node:fs";
 
-import { chalk, SpawnFailure } from "@react-native-node-api/cli-utils";
+import {
+  chalk,
+  SpawnFailure,
+  prettyPath,
+} from "@react-native-node-api/cli-utils";
 
 import {
   findNodeApiModulePathsByDependency,
@@ -10,7 +14,6 @@ import {
   logModulePaths,
   NamingStrategy,
   PlatformName,
-  prettyPath,
 } from "../path-utils";
 
 export type ModuleLinker = (

packages/host/src/node/cli/program.ts

@@ -8,6 +8,7 @@ import {
   SpawnFailure,
   oraPromise,
   wrapAction,
+  prettyPath,
 } from "@react-native-node-api/cli-utils";
 
 import {
@@ -19,7 +20,6 @@ import {
   normalizeModulePath,
   PlatformName,
   PLATFORMS,
-  prettyPath,
 } from "../path-utils";
 
 import { command as vendorHermes } from "./hermes";

packages/host/src/node/index.ts

@@ -22,6 +22,6 @@ export {
   determineXCFrameworkFilename,
 } from "./prebuilds/apple.js";
 
-export { determineLibraryBasename, prettyPath } from "./path-utils.js";
+export { determineLibraryBasename } from "./path-utils.js";
 
 export { weakNodeApiPath } from "./weak-node-api.js";

packages/host/src/node/path-utils.ts

@@ -5,7 +5,7 @@ import { packageDirectorySync } from "pkg-dir";
 import { readPackageSync } from "read-pkg";
 import { createRequire } from "node:module";
 
-import { chalk } from "@react-native-node-api/cli-utils";
+import { chalk, prettyPath } from "@react-native-node-api/cli-utils";
 
 import { findDuplicates } from "./duplicates";
 
@@ -194,12 +194,6 @@ export function getLibraryName(modulePath: string, naming: NamingStrategy) {
       )}`;
 }
 
-export function prettyPath(p: string) {
-  return chalk.dim(
-    path.relative(process.cwd(), p) || chalk.italic("current directory"),
-  );
-}
-
 export function resolvePackageRoot(
   requireFromPackageRoot: NodeJS.Require,
   packageName: string,