Move prettyPath to cli-utils package (#279)

* Move prettyPath to cli-utils

* Use prettyPath more

* Removed unused Option

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/cmake-rn/src/platforms/android.ts

@@ -2,7 +2,11 @@ import assert from "node:assert/strict";
 import fs from "node:fs";
 import path from "node:path";
 
-import { Option, oraPromise, chalk } from "@react-native-node-api/cli-utils";
+import {
+  Option,
+  oraPromise,
+  prettyPath,
+} from "@react-native-node-api/cli-utils";
 import {
   createAndroidLibsDirectory,
   AndroidTriplet as Triplet,
@@ -177,9 +181,7 @@ export const platform: Platform<Triplet[], AndroidOpts> = {
         }),
         {
           text: `Assembling Android libs directory (${libraryName})`,
-          successText: `Android libs directory (${libraryName}) assembled into ${chalk.dim(
-            path.relative(process.cwd(), prebuildOutputPath),
-          )}`,
+          successText: `Android libs directory (${libraryName}) assembled into ${prettyPath(prebuildOutputPath)}`,
           failText: ({ message }) =>
             `Failed to assemble Android libs directory (${libraryName}): ${message}`,
         },

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

@@ -2,7 +2,11 @@ import assert from "node:assert/strict";
 import path from "node:path";
 import fs from "node:fs";
 
-import { Option, oraPromise, chalk } from "@react-native-node-api/cli-utils";
+import {
+  Option,
+  oraPromise,
+  prettyPath,
+} from "@react-native-node-api/cli-utils";
 import {
   AppleTriplet as Triplet,
   createAppleFramework,
@@ -187,9 +191,7 @@ export const platform: Platform<Triplet[], AppleOpts> = {
         }),
         {
           text: `Assembling XCFramework (${libraryName})`,
-          successText: `XCFramework (${libraryName}) assembled into ${chalk.dim(
-            path.relative(process.cwd(), xcframeworkOutputPath),
-          )}`,
+          successText: `XCFramework (${libraryName}) assembled into ${prettyPath(xcframeworkOutputPath)}`,
           failText: ({ message }) =>
             `Failed to assemble XCFramework (${libraryName}): ${message}`,
         },

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";
@@ -258,9 +258,7 @@ export const buildCommand = new Command("build")
             }),
             {
               text: "Assembling XCFramework",
-              successText: `XCFramework assembled into ${chalk.dim(
-                path.relative(process.cwd(), xcframeworkOutputPath),
-              )}`,
+              successText: `XCFramework assembled into ${prettyPath(xcframeworkOutputPath)}`,
               failText: ({ message }) =>
                 `Failed to assemble XCFramework: ${message}`,
             },

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

@@ -1,7 +1,10 @@
 import fs from "node:fs";
 import path from "node:path";
-
-import { Command, wrapAction } from "@react-native-node-api/cli-utils";
+import {
+  Command,
+  prettyPath,
+  wrapAction,
+} from "@react-native-node-api/cli-utils";
 
 import { readBindingFile } from "./gyp.js";
 import {
@@ -29,15 +32,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";