@coderook/cli 0.34.2 → 0.34.3

package/dist/cli/src/track_commands.js

@@ -27,11 +27,7 @@ const node_process_1 = __importDefault(require("node:process"));
 const tracks_js_1 = require("../../cbx/src/core/tracks.js");
 const config_js_1 = require("./config.js");
 const project_commands_js_1 = require("./project_commands.js");
-const dim = (value) => `${value}`;
-const bold = (value) => `${value}`;
-const red = (value) => `${value}`;
-const green = (value) => `${value}`;
-const accent = (value) => `${value}`;
+const colour_js_1 = require("./colour.js");
 /** The line a folder saves to when nobody has said otherwise. */
 exports.DEFAULT_TRACK = "main";
 function client() {
@@ -50,8 +46,8 @@ async function trackFor(localPath) {
 }
 function describe(track, current) {
     const here = track.name === current;
-    const mark = here ? accent("*") : " ";
-    const name = here ? bold(track.name) : track.name;
+    const mark = here ? (0, colour_js_1.accent)("*") : " ";
+    const name = here ? (0, colour_js_1.bold)(track.name) : track.name;
     const notes = [];
     if (track.kind === "merge")
         notes.push("waiting on a decision");
@@ -59,7 +55,7 @@ function describe(track, current) {
         notes.push("protected");
     if (!track.headVersionId)
         notes.push("nothing saved yet");
-    return `${mark} ${name}${notes.length ? dim(`  ${notes.join(" · ")}`) : ""}`;
+    return `${mark} ${name}${notes.length ? (0, colour_js_1.dim)(`  ${notes.join(" · ")}`) : ""}`;
 }
 /**
  * Every line and unfinished merge on the project.
@@ -74,24 +70,24 @@ async function commandTracks(parsed) {
         return 1;
     const tracks = await client().list(project.id);
     if (!tracks.length) {
-        console.log(dim("No lines recorded yet. The first save creates ") + bold(exports.DEFAULT_TRACK) + dim("."));
+        console.log((0, colour_js_1.dim)("No lines recorded yet. The first save creates ") + (0, colour_js_1.bold)(exports.DEFAULT_TRACK) + (0, colour_js_1.dim)("."));
         return 0;
     }
     const current = await trackFor(node_process_1.default.cwd());
     const lines = tracks.filter((track) => track.kind === "line");
     const merges = tracks.filter((track) => track.kind === "merge");
-    console.log(bold(`Lines on ${project.slug}`));
+    console.log((0, colour_js_1.bold)(`Lines on ${project.slug}`));
     for (const track of lines)
         console.log(`  ${describe(track, current)}`);
     if (merges.length) {
         console.log("");
-        console.log(bold("Waiting on a decision"));
+        console.log((0, colour_js_1.bold)("Waiting on a decision"));
         for (const track of merges)
             console.log(`  ${describe(track, current)}`);
-        console.log(dim("  Finish one with ") + "cbx merge");
+        console.log((0, colour_js_1.dim)("  Finish one with ") + "cbx merge");
     }
     console.log("");
-    console.log(dim("This folder saves to ") + accent(current));
+    console.log((0, colour_js_1.dim)("This folder saves to ") + (0, colour_js_1.accent)(current));
     return 0;
 }
 /**
@@ -106,21 +102,21 @@ async function commandTrack(parsed) {
     const folder = node_process_1.default.cwd();
     const link = await (0, config_js_1.readLink)(folder);
     if (!link) {
-        console.error(red("This folder is not linked to a project. Run ") + "cbx get" + red(" first."));
+        console.error((0, colour_js_1.red)("This folder is not linked to a project. Run ") + "cbx get" + (0, colour_js_1.red)(" first."));
         return 1;
     }
     const wanted = parsed.positional[0];
     const current = link.track?.trim() || exports.DEFAULT_TRACK;
     if (!wanted) {
-        console.log(accent(current));
-        console.log(dim("Switch with ") + "cbx track <name>");
+        console.log((0, colour_js_1.accent)(current));
+        console.log((0, colour_js_1.dim)("Switch with ") + "cbx track <name>");
         return 0;
     }
     const starting = parsed.flags.has("new") || parsed.flags.has("n");
     const tracks = await client().list(link.repositoryId);
     const existing = tracks.find((track) => track.name === wanted);
     if (existing && starting) {
-        console.error(red(`There is already a line called "${wanted}".`));
+        console.error((0, colour_js_1.red)(`There is already a line called "${wanted}".`));
         return 1;
     }
     if (!existing && !starting) {
@@ -129,13 +125,13 @@ async function commandTrack(parsed) {
           normal thing to do, and silently starting a line called `mian` puts
           work somewhere nobody will look for it.
         */
-        console.error(red(`No line called "${wanted}" on this project.`));
-        console.error(dim("Start one with ") + `cbx track ${wanted} --new`);
+        console.error((0, colour_js_1.red)(`No line called "${wanted}" on this project.`));
+        console.error((0, colour_js_1.dim)("Start one with ") + `cbx track ${wanted} --new`);
         return 1;
     }
     if (existing?.kind === "merge") {
-        console.error(red(`"${wanted}" is a merge waiting on a decision, not a line to save onto.`));
-        console.error(dim("Finish it with ") + "cbx merge");
+        console.error((0, colour_js_1.red)(`"${wanted}" is a merge waiting on a decision, not a line to save onto.`));
+        console.error((0, colour_js_1.dim)("Finish it with ") + "cbx merge");
         return 1;
     }
     if (starting) {
@@ -143,15 +139,15 @@ async function commandTrack(parsed) {
             await client().create(link.repositoryId, wanted);
         }
         catch (error) {
-            console.error(red(error instanceof Error ? error.message : String(error)));
+            console.error((0, colour_js_1.red)(error instanceof Error ? error.message : String(error)));
             return 1;
         }
-        console.log(green(`Started ${bold(wanted)} from where the project is now.`));
+        console.log((0, colour_js_1.green)(`Started ${(0, colour_js_1.bold)(wanted)} from where the project is now.`));
     }
     await (0, config_js_1.writeLink)(folder, { ...link, track: wanted });
-    console.log(dim("This folder now saves to ") + accent(wanted));
+    console.log((0, colour_js_1.dim)("This folder now saves to ") + (0, colour_js_1.accent)(wanted));
     if (existing) {
-        console.log(dim("Its files are not here yet — fetch them with ") + `cbx get`);
+        console.log((0, colour_js_1.dim)("Its files are not here yet — fetch them with ") + `cbx get`);
     }
     return 0;
 }

package/dist/cli/src/transfer_command.js

@@ -48,11 +48,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const node_process_1 = __importDefault(require("node:process"));
 const api_js_1 = require("./api.js");
 const forge_url_js_1 = require("./forge_url.js");
-const dim = (value) => `${value}`;
-const bold = (value) => `${value}`;
-const red = (value) => `${value}`;
-const green = (value) => `${value}`;
-const accent = (value) => `${value}`;
+const colour_js_1 = require("./colour.js");
 /** A read token from the environment, or nothing. Never a flag. */
 function forgeToken(forge) {
     for (const name of forge.tokenNames) {
@@ -141,7 +137,7 @@ function run(command, args, cwd) {
 async function commandTransfer(parsed) {
     const address = parsed.positional[0];
     if (!address) {
-        console.error(red("Which repository? Try: cbx transfer https://github.com/owner/project"));
+        console.error((0, colour_js_1.red)("Which repository? Try: cbx transfer https://github.com/owner/project"));
         return 1;
     }
     let forge;
@@ -149,11 +145,11 @@ async function commandTransfer(parsed) {
         forge = (0, forge_url_js_1.readForgeUrl)(address);
     }
     catch (error) {
-        console.error(red(error instanceof Error ? error.message : String(error)));
+        console.error((0, colour_js_1.red)(error instanceof Error ? error.message : String(error)));
         return 1;
     }
     if (!run("git", ["--version"]).ok) {
-        console.error(red("Transferring needs git on this machine."));
+        console.error((0, colour_js_1.red)("Transferring needs git on this machine."));
         return 1;
     }
     /*
@@ -164,10 +160,10 @@ async function commandTransfer(parsed) {
     if (!run("git", ["remote-coderook", "--probe"]).ok) {
         const help = run("git", ["help", "-a"]);
         if (!/remote-coderook/.test(help.out)) {
-            console.error(red("git cannot find `git-remote-coderook` on this machine."));
+            console.error((0, colour_js_1.red)("git cannot find `git-remote-coderook` on this machine."));
             console.error("It ships with this tool, so this usually means cbx was run from a\n" +
                 "checkout rather than installed. Install it globally and try again:\n" +
-                `  ${accent("npm install --global @coderook/cli")}`);
+                `  ${(0, colour_js_1.accent)("npm install --global @coderook/cli")}`);
             return 1;
         }
     }
@@ -176,14 +172,14 @@ async function commandTransfer(parsed) {
         : forge.repo).toLowerCase();
     const existing = await (0, api_js_1.findProject)(wanted);
     if (existing) {
-        console.error(red(`You already have a project called ${existing.slug}.`));
+        console.error((0, colour_js_1.red)(`You already have a project called ${existing.slug}.`));
         console.error(`Transfer creates a project; it does not merge into one. Choose another\n` +
-            `name with ${accent("--name")}, or delete that project first.`);
+            `name with ${(0, colour_js_1.accent)("--name")}, or delete that project first.`);
         return 1;
     }
     const token = forgeToken(forge);
-    console.log(`${bold("Transferring")} ${forge.owner}/${forge.repo} ${dim(`from ${forge.label}`)}`);
-    console.log(dim(token
+    console.log(`${(0, colour_js_1.bold)("Transferring")} ${forge.owner}/${forge.repo} ${(0, colour_js_1.dim)(`from ${forge.label}`)}`);
+    console.log((0, colour_js_1.dim)(token
         ? `  Using the read token in ${forge.tokenNames.find((name) => node_process_1.default.env[name]?.trim())}.`
         : `  No token set. Public repositories work; set ${forge.tokenNames[0]} for a private one or for issues.`));
     const scratch = await (0, promises_1.mkdtemp)(node_path_1.default.join(node_os_1.default.tmpdir(), "cbx-transfer-"));
@@ -195,13 +191,13 @@ async function commandTransfer(parsed) {
           the history, and `--depth 1` would silently deliver a single commit under
           a command whose name promises everything.
         */
-        console.log(`\n${dim("Fetching the repository with its full history…")}`);
+        console.log(`\n${(0, colour_js_1.dim)("Fetching the repository with its full history…")}`);
         const cloned = run("git", ["clone", "--no-single-branch", forge.clone, checkout]);
         if (!cloned.ok) {
-            console.error(red(`\nCould not clone ${forge.clone}`));
+            console.error((0, colour_js_1.red)(`\nCould not clone ${forge.clone}`));
             console.error(cloned.out.trim().split("\n").slice(-4).join("\n"));
             if (!token) {
-                console.error(dim(`\nIf it is private, set ${forge.tokenNames[0]} and try again.`));
+                console.error((0, colour_js_1.dim)(`\nIf it is private, set ${forge.tokenNames[0]} and try again.`));
             }
             return 1;
         }
@@ -231,15 +227,15 @@ async function commandTransfer(parsed) {
             `${remoteBranches.length} branch${remoteBranches.length === 1 ? "" : "es"} · ` +
             `${tags.length} tag${tags.length === 1 ? "" : "s"}`);
         if (commits > 200) {
-            console.log(dim(`  Each commit becomes a version, so this will take a while —\n` +
+            console.log((0, colour_js_1.dim)(`  Each commit becomes a version, so this will take a while —\n` +
                 `  roughly ${Math.round((commits * 11) / 60)} minutes. It resumes if interrupted.`));
         }
         run("git", ["remote", "add", "coderook", `coderook://${wanted}`], checkout);
-        console.log(`\n${dim("Publishing the history…")}`);
+        console.log(`\n${(0, colour_js_1.dim)("Publishing the history…")}`);
         const pushed = run("git", ["push", "coderook", "--all"], checkout);
         node_process_1.default.stderr.write(pushed.out);
         if (!pushed.ok) {
-            console.error(red("\nThe history did not transfer completely."));
+            console.error((0, colour_js_1.red)("\nThe history did not transfer completely."));
             return 1;
         }
         report.push(`${commits} commits across ${remoteBranches.length} branch(es)`);
@@ -252,7 +248,7 @@ async function commandTransfer(parsed) {
         }
         const project = await (0, api_js_1.findProject)(wanted);
         if (!project) {
-            console.error(red("\nThe project was not created. Nothing else was changed."));
+            console.error((0, colour_js_1.red)("\nThe project was not created. Nothing else was changed."));
             return 1;
         }
         // What the repository says about itself.
@@ -314,16 +310,16 @@ async function commandTransfer(parsed) {
                 }
             }
         }
-        console.log(`\n${green("Transferred")} ${bold(project.slug)}`);
+        console.log(`\n${(0, colour_js_1.green)("Transferred")} ${(0, colour_js_1.bold)(project.slug)}`);
         for (const line of report)
-            console.log(`  ${green("·")} ${line}`);
-        console.log(`\n${dim("Not carried across:")}`);
-        console.log(dim("  · pull requests and reviews — CodeRook has no equivalent object"));
-        console.log(dim("  · CI configuration — runs are started deliberately, not by a push"));
-        console.log(dim("  · collaborators — access is an invitation to accept, not a field to copy"));
-        console.log(dim("  · stars, forks and watchers"));
+            console.log(`  ${(0, colour_js_1.green)("·")} ${line}`);
+        console.log(`\n${(0, colour_js_1.dim)("Not carried across:")}`);
+        console.log((0, colour_js_1.dim)("  · pull requests and reviews — CodeRook has no equivalent object"));
+        console.log((0, colour_js_1.dim)("  · CI configuration — runs are started deliberately, not by a push"));
+        console.log((0, colour_js_1.dim)("  · collaborators — access is an invitation to accept, not a field to copy"));
+        console.log((0, colour_js_1.dim)("  · stars, forks and watchers"));
         if (!parsed.flags.has("issues")) {
-            console.log(dim("  · issues — pass --issues to bring the open ones"));
+            console.log((0, colour_js_1.dim)("  · issues — pass --issues to bring the open ones"));
         }
         /*
           Said plainly rather than implied by the word "transfer".
@@ -338,7 +334,7 @@ async function commandTransfer(parsed) {
         */
         console.log([
             "",
-            `${dim("On ownership:")} nothing was checked, and nothing could be.`,
+            `${(0, colour_js_1.dim)("On ownership:")} nothing was checked, and nothing could be.`,
             "A public repository is readable by anyone, which is why cloning one",
             "needs no token — so this is a clone and a publish, not a claim. The",
             "licence that came with the files is still what governs them.",
@@ -346,8 +342,8 @@ async function commandTransfer(parsed) {
                 ? ["Worth reading before you make this project public."]
                 : []),
         ].join("\n"));
-        console.log(`\nFetch it anywhere with ${accent(`cbx clone ${project.slug}`)}` +
-            `${dim(", or ")}${accent(`git clone coderook://${project.slug}`)}${dim(".")}`);
+        console.log(`\nFetch it anywhere with ${(0, colour_js_1.accent)(`cbx clone ${project.slug}`)}` +
+            `${(0, colour_js_1.dim)(", or ")}${(0, colour_js_1.accent)(`git clone coderook://${project.slug}`)}${(0, colour_js_1.dim)(".")}`);
         return 0;
     }
     finally {