@coderook/cli 0.34.2 → 0.34.3

package/dist/cli/src/version_commands.js

@@ -32,14 +32,10 @@ const node_fs_1 = require("node:fs");
 const node_os_1 = require("node:os");
 const node_path_1 = __importDefault(require("node:path"));
 const node_process_1 = __importDefault(require("node:process"));
+const colour_js_1 = require("./colour.js");
 /* Written out rather than imported: the same four escapes every other command
    file in here declares for itself, and a shared module for four one-line
    functions would be the only thing they all depend on. */
-const dim = (value) => `${value}`;
-const bold = (value) => `${value}`;
-const red = (value) => `${value}`;
-const accent = (value) => `${value}`;
-const green = (value) => `${value}`;
 /**
  * Which of `[n] [project]` the arguments actually were.
  *
@@ -68,7 +64,7 @@ function split(parsed) {
 async function pick(repositoryId, wanted) {
     const all = await (0, api_js_1.versions)(repositoryId);
     if (!all.length) {
-        console.error(red("This project has no versions yet."));
+        console.error((0, colour_js_1.red)("This project has no versions yet."));
         return null;
     }
     /*
@@ -85,7 +81,7 @@ async function pick(repositoryId, wanted) {
     const sequence = wanted.replace(/^v/i, "");
     const found = all.find((one) => String(one.sequence) === sequence);
     if (!found) {
-        console.error(red(`This project has no version ${wanted}.`));
+        console.error((0, colour_js_1.red)(`This project has no version ${wanted}.`));
         return null;
     }
     return found;
@@ -116,7 +112,7 @@ function colourOf(given) {
     return /^#[0-9a-f]{6}$/.test(hex) ? hex : null;
 }
 function paint(label) {
-    return accent(label.name);
+    return (0, colour_js_1.accent)(label.name);
 }
 /**
  * Release info, from wherever the writer keeps it.
@@ -222,7 +218,7 @@ async function commandNotes(parsed) {
         return 1;
     if (parsed.flags.get("clear") === true) {
         await (0, api_js_1.changeVersion)(project.id, target.id, { notes: null });
-        console.log(green(`Cleared the notes on v${target.sequence}.`));
+        console.log((0, colour_js_1.green)(`Cleared the notes on v${target.sequence}.`));
         return 0;
     }
     let next;
@@ -230,13 +226,13 @@ async function commandNotes(parsed) {
         next = notesFrom(parsed);
     }
     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 (parsed.flags.get("edit") === true) {
         const written = writeInEditor(target.notes ?? "");
         if (written === null) {
-            console.log(dim("Left as it was."));
+            console.log((0, colour_js_1.dim)("Left as it was."));
             return 0;
         }
         next = written;
@@ -245,17 +241,17 @@ async function commandNotes(parsed) {
         /* Nothing to write, so this is a read. */
         const text = (target.notes ?? "").trim();
         if (!text) {
-            console.log(dim(`v${target.sequence} has no notes.`) +
-                dim("  Write some with --edit, --notes-file or --notes"));
+            console.log((0, colour_js_1.dim)(`v${target.sequence} has no notes.`) +
+                (0, colour_js_1.dim)("  Write some with --edit, --notes-file or --notes"));
             return 0;
         }
-        console.log(bold(`v${target.sequence}${target.name ? ` ${target.name}` : ""}`));
+        console.log((0, colour_js_1.bold)(`v${target.sequence}${target.name ? ` ${target.name}` : ""}`));
         console.log(text);
         return 0;
     }
     const text = (next ?? "").trim();
     await (0, api_js_1.changeVersion)(project.id, target.id, { notes: text ? next : null });
-    console.log(green(text
+    console.log((0, colour_js_1.green)(text
         ? `Wrote the notes on v${target.sequence}.`
         : `Cleared the notes on v${target.sequence}.`));
     return 0;
@@ -280,7 +276,7 @@ async function commandVersion(parsed) {
             patch.notes = notes;
     }
     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 (parsed.flags.get("edit") === true) {
@@ -295,7 +291,7 @@ async function commandVersion(parsed) {
     const visibility = parsed.flags.get("visibility");
     if (typeof visibility === "string") {
         if (!["private", "public"].includes(visibility)) {
-            console.error(red("Visibility is private, unlisted or public."));
+            console.error((0, colour_js_1.red)("Visibility is private, unlisted or public."));
             return 1;
         }
         patch.visibility = visibility;
@@ -315,8 +311,8 @@ async function commandVersion(parsed) {
         for (const one of wanted) {
             const found = known.find((label) => label.name.toLowerCase() === one.toLowerCase());
             if (!found) {
-                console.error(red(`This project has no "${one}" label.`) +
-                    dim(`  Make one with cbx labels add ${one} green`));
+                console.error((0, colour_js_1.red)(`This project has no "${one}" label.`) +
+                    (0, colour_js_1.dim)(`  Make one with cbx labels add ${one} green`));
                 return 1;
             }
             ids.push(found.id);
@@ -326,20 +322,20 @@ async function commandVersion(parsed) {
     if (parsed.flags.get("clear-labels") === true)
         patch.labelIds = [];
     if (!Object.keys(patch).length) {
-        console.error(red("Say what to change.") +
-            dim("  --name, --notes, --hide, --show, --visibility, --pin, --labels"));
+        console.error((0, colour_js_1.red)("Say what to change.") +
+            (0, colour_js_1.dim)("  --name, --notes, --hide, --show, --visibility, --pin, --labels"));
         return 1;
     }
     try {
         await (0, api_js_1.changeVersion)(project.id, target.id, patch);
     }
     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;
     }
     const said = [];
     if (patch.name !== undefined) {
-        said.push(patch.name ? `named ${accent(patch.name)}` : "name removed");
+        said.push(patch.name ? `named ${(0, colour_js_1.accent)(patch.name)}` : "name removed");
     }
     if (patch.visibility)
         said.push(patch.visibility);
@@ -348,7 +344,7 @@ async function commandVersion(parsed) {
     if (patch.labelIds) {
         said.push(patch.labelIds.length ? "labelled" : "labels cleared");
     }
-    console.log(`${bold(`v${target.sequence}`)} ${said.join(", ")}.`);
+    console.log(`${(0, colour_js_1.bold)(`v${target.sequence}`)} ${said.join(", ")}.`);
     return 0;
 }
 async function commandLabels(parsed) {
@@ -359,13 +355,13 @@ async function commandLabels(parsed) {
             return 1;
         const labels = await (0, api_js_1.projectLabels)(project.id);
         if (!labels.length) {
-            console.log(dim("No labels yet. Make one with cbx labels add shipped green"));
+            console.log((0, colour_js_1.dim)("No labels yet. Make one with cbx labels add shipped green"));
             return 0;
         }
-        console.log(bold(project.name));
+        console.log((0, colour_js_1.bold)(project.name));
         for (const label of labels) {
-            console.log(`  ${paint(label).padEnd(28)} ${dim(label.colour)}` +
-                (label.description ? `  ${dim(label.description)}` : ""));
+            console.log(`  ${paint(label).padEnd(28)} ${(0, colour_js_1.dim)(label.colour)}` +
+                (label.description ? `  ${(0, colour_js_1.dim)(label.description)}` : ""));
         }
         return 0;
     }
@@ -373,7 +369,7 @@ async function commandLabels(parsed) {
         const name = parsed.positional[1];
         const colour = parsed.positional[2] ?? "grey";
         if (!name) {
-            console.error(red("Name the label: cbx labels add shipped green"));
+            console.error((0, colour_js_1.red)("Name the label: cbx labels add shipped green"));
             return 1;
         }
         const project = await (0, project_commands_js_1.resolveProject)(parsed.positional[3]);
@@ -381,16 +377,16 @@ async function commandLabels(parsed) {
             return 1;
         const hex = colourOf(colour);
         if (!hex) {
-            console.error(red(`"${colour}" is not a colour.`) +
-                dim(`  Try one of ${Object.keys(SWATCH).slice(0, 8).join(", ")}, or #rrggbb`));
+            console.error((0, colour_js_1.red)(`"${colour}" is not a colour.`) +
+                (0, colour_js_1.dim)(`  Try one of ${Object.keys(SWATCH).slice(0, 8).join(", ")}, or #rrggbb`));
             return 1;
         }
         try {
             const made = await (0, api_js_1.createProjectLabel)(project.id, name, hex);
-            console.log(`Added ${paint(made)} ${dim(made.colour)}.`);
+            console.log(`Added ${paint(made)} ${(0, colour_js_1.dim)(made.colour)}.`);
         }
         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;
         }
         return 0;
@@ -398,7 +394,7 @@ async function commandLabels(parsed) {
     if (action === "remove" || action === "rm") {
         const name = parsed.positional[1];
         if (!name) {
-            console.error(red("Name the label to remove: cbx labels remove shipped"));
+            console.error((0, colour_js_1.red)("Name the label to remove: cbx labels remove shipped"));
             return 1;
         }
         const project = await (0, project_commands_js_1.resolveProject)(parsed.positional[2]);
@@ -407,15 +403,15 @@ async function commandLabels(parsed) {
         const labels = await (0, api_js_1.projectLabels)(project.id);
         const found = labels.find((one) => one.name.toLowerCase() === name.toLowerCase());
         if (!found) {
-            console.error(red(`This project has no "${name}" label.`));
+            console.error((0, colour_js_1.red)(`This project has no "${name}" label.`));
             return 1;
         }
         await (0, api_js_1.deleteProjectLabel)(project.id, found.id);
         console.log(`Removed ${found.name}. ` +
-            dim("Versions that wore it keep everything else about them."));
+            (0, colour_js_1.dim)("Versions that wore it keep everything else about them."));
         return 0;
     }
-    console.error(red(`Unknown: cbx labels ${action}`) + dim("  Try list, add or remove"));
+    console.error((0, colour_js_1.red)(`Unknown: cbx labels ${action}`) + (0, colour_js_1.dim)("  Try list, add or remove"));
     return 1;
 }
 /**
@@ -431,15 +427,15 @@ async function commandHeld(parsed) {
         return 1;
     const waiting = (await (0, api_js_1.versions)(project.id)).filter((one) => one.state === "held");
     if (!waiting.length) {
-        console.log(dim("Nothing is waiting for a decision."));
+        console.log((0, colour_js_1.dim)("Nothing is waiting for a decision."));
         return 0;
     }
-    console.log(bold(`${waiting.length} waiting on ${project.name}`));
+    console.log((0, colour_js_1.bold)(`${waiting.length} waiting on ${project.name}`));
     for (const one of waiting) {
-        console.log(`  ${accent(`v${one.sequence}`).padEnd(16)} ${one.authorName.padEnd(20)} ` +
-            dim(one.message));
+        console.log(`  ${(0, colour_js_1.accent)(`v${one.sequence}`).padEnd(16)} ${one.authorName.padEnd(20)} ` +
+            (0, colour_js_1.dim)(one.message));
     }
-    console.log(dim(`\n  cbx review v${waiting[0].sequence} --approve`));
+    console.log((0, colour_js_1.dim)(`\n  cbx review v${waiting[0].sequence} --approve`));
     return 0;
 }
 async function commandReview(parsed) {
@@ -447,7 +443,7 @@ async function commandReview(parsed) {
     const approve = parsed.flags.get("approve") === true;
     const decline = parsed.flags.get("decline") === true;
     if (approve === decline) {
-        console.error(red("Say which: --approve or --decline."));
+        console.error((0, colour_js_1.red)("Say which: --approve or --decline."));
         return 1;
     }
     const project = await (0, project_commands_js_1.resolveProject)(which.project);
@@ -457,7 +453,7 @@ async function commandReview(parsed) {
     if (!target)
         return 1;
     if (target.state !== "held") {
-        console.error(red(`v${target.sequence} is not waiting for a decision.`));
+        console.error((0, colour_js_1.red)(`v${target.sequence} is not waiting for a decision.`));
         return 1;
     }
     const note = parsed.flags.get("note");
@@ -465,12 +461,12 @@ async function commandReview(parsed) {
         await (0, api_js_1.reviewVersion)(project.id, target.id, approve ? "approve" : "decline", typeof note === "string" ? note : null);
     }
     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(approve
-        ? `${bold(`v${target.sequence}`)} approved. It is now the current version.`
-        : `${bold(`v${target.sequence}`)} declined. It stays in the history as a version that was not accepted.`);
+        ? `${(0, colour_js_1.bold)(`v${target.sequence}`)} approved. It is now the current version.`
+        : `${(0, colour_js_1.bold)(`v${target.sequence}`)} declined. It stays in the history as a version that was not accepted.`);
     return 0;
 }
 /**
@@ -491,8 +487,8 @@ async function commandTakeDown(parsed) {
         return 1;
     const reason = parsed.flags.get("reason");
     if (parsed.flags.get("yes") !== true) {
-        console.log(red(`This removes the files in v${target.sequence}. They do not come back.`));
-        console.log(dim(`  The version stays in the history as a gap saying it was removed.\n` +
+        console.log((0, colour_js_1.red)(`This removes the files in v${target.sequence}. They do not come back.`));
+        console.log((0, colour_js_1.dim)(`  The version stays in the history as a gap saying it was removed.\n` +
             `  Add --yes when you are sure.`));
         return 1;
     }
@@ -500,10 +496,10 @@ async function commandTakeDown(parsed) {
         await (0, api_js_1.removeVersionContent)(project.id, target.id, typeof reason === "string" ? reason : null);
     }
     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(`${bold(`v${target.sequence}`)} taken down.`);
+    console.log(`${(0, colour_js_1.bold)(`v${target.sequence}`)} taken down.`);
     return 0;
 }
 /**
@@ -525,7 +521,7 @@ async function commandPromote(parsed) {
         return 1;
     const all = await (0, api_js_1.versions)(project.id);
     if (!all.length) {
-        console.error(red("This project has nothing saved yet."));
+        console.error((0, colour_js_1.red)("This project has nothing saved yet."));
         return 1;
     }
     const named = parsed.flags.get("name");
@@ -536,23 +532,23 @@ async function commandPromote(parsed) {
         ? all.find((one) => String(one.sequence) === asked.replace(/^v/i, ""))
         : null;
     if (asked && !target) {
-        console.error(red(`This project has no ${asked}.`));
+        console.error((0, colour_js_1.red)(`This project has no ${asked}.`));
         return 1;
     }
     if (!target) {
         const recent = all.filter((one) => one.state === "verified").slice(0, 10);
         if (!recent.length) {
-            console.error(red("Nothing here can be promoted yet."));
+            console.error((0, colour_js_1.red)("Nothing here can be promoted yet."));
             return 1;
         }
-        console.log(bold(`Recent commits on ${project.name}`));
+        console.log((0, colour_js_1.bold)(`Recent commits on ${project.name}`));
         recent.forEach((one, at) => {
             const when = one.createdAt
                 ? new Date(one.createdAt).toLocaleString()
                 : "";
-            const already = one.name ? accent(`  → ${one.name}`) : "";
-            console.log(`  ${String(at + 1).padStart(2)}. ${accent(`v${one.sequence}`).padEnd(16)}` +
-                `${when.padEnd(22)}${dim(one.message)}${already}`);
+            const already = one.name ? (0, colour_js_1.accent)(`  → ${one.name}`) : "";
+            console.log(`  ${String(at + 1).padStart(2)}. ${(0, colour_js_1.accent)(`v${one.sequence}`).padEnd(16)}` +
+                `${when.padEnd(22)}${(0, colour_js_1.dim)(one.message)}${already}`);
         });
         const prompt = (0, promises_1.createInterface)({
             input: node_process_1.default.stdin,
@@ -562,11 +558,11 @@ async function commandPromote(parsed) {
         prompt.close();
         const choice = Number(typed.trim());
         if (!typed.trim()) {
-            console.log(dim("Nothing promoted."));
+            console.log((0, colour_js_1.dim)("Nothing promoted."));
             return 0;
         }
         if (!Number.isInteger(choice) || choice < 1 || choice > recent.length) {
-            console.error(red("That was not one of the numbers listed."));
+            console.error((0, colour_js_1.red)("That was not one of the numbers listed."));
             return 1;
         }
         target = recent[choice - 1];
@@ -588,11 +584,11 @@ async function commandPromote(parsed) {
         });
     }
     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(`${bold(versionName)} is now a version. ` +
-        dim("It is what the public side of this project offers."));
+    console.log(`${(0, colour_js_1.bold)(versionName)} is now a version. ` +
+        (0, colour_js_1.dim)("It is what the public side of this project offers."));
     return 0;
 }
 /**
@@ -610,7 +606,7 @@ async function commandUndo(parsed) {
         return 1;
     const all = await (0, api_js_1.versions)(project.id);
     if (all.length < 2) {
-        console.error(red("There is nothing before this to go back to."));
+        console.error((0, colour_js_1.red)("There is nothing before this to go back to."));
         return 1;
     }
     let to = null;
@@ -618,34 +614,34 @@ async function commandUndo(parsed) {
     if (asked) {
         const wanted = all.find((one) => String(one.sequence) === asked.replace(/^v/i, ""));
         if (!wanted) {
-            console.error(red(`This project has no ${asked}.`));
+            console.error((0, colour_js_1.red)(`This project has no ${asked}.`));
             return 1;
         }
         to = wanted.id;
     }
     try {
         const undone = await (0, api_js_1.undoTo)(project.id, to);
-        console.log(`${bold(project.name)} is back on ${accent(`v${undone.to.sequence}`)}.`);
+        console.log(`${(0, colour_js_1.bold)(project.name)} is back on ${(0, colour_js_1.accent)(`v${undone.to.sequence}`)}.`);
         if (undone.skipped.length) {
             /*
               Named rather than counted. "3 commits passed over" tells somebody
               nothing they can act on; the numbers let them look at one, or promote
               one, or put the head back where it was.
             */
-            console.log(dim(`  Passed over: ${undone.skipped
+            console.log((0, colour_js_1.dim)(`  Passed over: ${undone.skipped
                 .map((one) => `v${one.sequence}${one.name ? ` (${one.name})` : ""}`)
                 .join(", ")}`));
-            console.log(dim("  They are still here. Nothing was deleted and nothing renumbered."));
+            console.log((0, colour_js_1.dim)("  They are still here. Nothing was deleted and nothing renumbered."));
             const stillPublic = undone.skipped.filter((one) => one.name);
             if (stillPublic.length) {
-                console.log(dim(`  ${stillPublic.map((one) => one.name).join(", ")} ` +
+                console.log((0, colour_js_1.dim)(`  ${stillPublic.map((one) => one.name).join(", ")} ` +
                     `${stillPublic.length === 1 ? "is" : "are"} still a published version — ` +
                     `use cbx mark to take ${stillPublic.length === 1 ? "it" : "them"} down.`));
             }
         }
     }
     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;
     }
     return 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coderook/cli",
-  "version": "0.34.2",
+  "version": "0.34.3",
   "description": "The command line for CodeRook (coderook.com): version control and project hosting for projects of any size. Every save is a compressed snapshot, private or public, never used to train AI.",
   "license": "Apache-2.0",
   "homepage": "https://coderook.com",