alex-c-line 1.30.1 → 1.31.0

package/dist/configs/index.d.cts

@@ -23,7 +23,7 @@ interface CreatePullRequestTemplateInfrastructureConfig extends CreatePullReques
 }
 type CreatePullRequestTemplateConfig = CreatePullRequestTemplateGeneralConfig | CreatePullRequestTemplateInfrastructureConfig;
 //#endregion
-//#region src/commands/pre-commit/createStepRunner.d.ts
+//#region src/cli/commands/pre-commit/createStepRunner.d.ts
 interface BaseOptions {
   stdio: "inherit";
   reject: false;

package/dist/configs/index.d.ts

@@ -24,7 +24,7 @@ interface CreatePullRequestTemplateInfrastructureConfig extends CreatePullReques
 }
 type CreatePullRequestTemplateConfig = CreatePullRequestTemplateGeneralConfig | CreatePullRequestTemplateInfrastructureConfig;
 //#endregion
-//#region src/commands/pre-commit/createStepRunner.d.ts
+//#region src/cli/commands/pre-commit/createStepRunner.d.ts
 interface BaseOptions {
   stdio: "inherit";
   reject: false;

package/dist/configs/internal/index.d.cts

@@ -22,7 +22,7 @@ interface CreatePullRequestTemplateInfrastructureConfig extends CreatePullReques
 }
 type CreatePullRequestTemplateConfig = CreatePullRequestTemplateGeneralConfig | CreatePullRequestTemplateInfrastructureConfig;
 //#endregion
-//#region src/commands/pre-commit/createStepRunner.d.ts
+//#region src/cli/commands/pre-commit/createStepRunner.d.ts
 interface BaseOptions {
   stdio: "inherit";
   reject: false;

package/dist/configs/internal/index.d.ts

@@ -22,7 +22,7 @@ interface CreatePullRequestTemplateInfrastructureConfig extends CreatePullReques
 }
 type CreatePullRequestTemplateConfig = CreatePullRequestTemplateGeneralConfig | CreatePullRequestTemplateInfrastructureConfig;
 //#endregion
-//#region src/commands/pre-commit/createStepRunner.d.ts
+//#region src/cli/commands/pre-commit/createStepRunner.d.ts
 interface BaseOptions {
   stdio: "inherit";
   reject: false;

package/dist/index.cjs

@@ -58,15 +58,19 @@ gray_matter = __toESM(gray_matter);
 let _alextheman_utility_node = require("@alextheman/utility/node");
 let supports_color = require("supports-color");
 supports_color = __toESM(supports_color);
+let node_crypto = require("node:crypto");
 
 //#region src/utility/miscellaneous/asciiToPng.ts
 async function asciiToPng(ascii, options) {
-	const { fileName = "artwork/alex-c-line", width = 3e3, height = 3e3, backgroundColor = "#0b1020", titleColor = "#facc15", subtitleColor = "#22c55e", fontSize = 48, fontFamily = [
+	const { fileName = "artwork/alex-c-line", width = 3e3, height = 3e3, backgroundColor = "#0b1020", titleColor = "#facc15", subtitleColor = {
+		green: "#22c55e",
+		white: "#ffffff"
+	}[options?.subtitleColor ?? "green"], fontSize = 48, fontFamily = [
 		"Menlo",
 		"Monaco",
 		"Consolas",
 		"monospace"
-	], subtitleLineCount = 1 } = options ?? {};
+	], subtitleLineCount = options?.subtitleLineCount ?? 1 } = options ?? {};
 	const canvas$1 = (0, canvas.createCanvas)(width, height);
 	const context = canvas$1.getContext("2d");
 	context.fillStyle = backgroundColor;
@@ -119,28 +123,29 @@ async function createAlexCLineArtwork(options) {
 }
 
 //#endregion
-//#region src/commands/artwork.ts
+//#region src/cli/commands/artwork.ts
 function artwork(program) {
-	program.command("artwork").description("Create the artwork for alex-c-line").option("--subtitle-text <subtitleText>", "Customise the subtitle text").option("--subtitle-color <subtitleColor>", "Customise the subtitle color", (subtitleColor) => {
-		return {
+	program.command("artwork").description("Create the artwork for alex-c-line").option("--subtitle-text <subtitleText>", "Customise the subtitle text").option("--subtitle-color <subtitleColor>", "Customise the subtitle color").option("--save-png [fileName]", "Save the artwork as a PNG file, optionally specifying the path").action(async ({ savePng: fileName, subtitleText, subtitleColor = "green" }) => {
+		if (subtitleColor !== "green" && subtitleColor !== "white") throw new _alextheman_utility.DataError({ subtitleColor }, "INVALID_SUBTITLE_COLOR", "Subtitle color must either be green or white.");
+		const chalkColour = {
 			green: chalk.default.green,
 			white: chalk.default.white
 		}[subtitleColor];
-	}).option("--save-png [fileName]", "Save the artwork as a PNG file, optionally specifying the path").action(async ({ savePng: fileName, subtitleText, subtitleColor }) => {
 		console.info(await createAlexCLineArtwork({
 			includeBox: true,
 			includeColors: true,
 			subtitleText,
-			subtitleColor
+			subtitleColor: chalkColour
 		}));
 		if (fileName) await asciiToPng(await createAlexCLineArtwork({
 			includeBox: false,
 			includeColors: false,
-			subtitleText,
-			subtitleColor
+			subtitleText
 		}), {
 			fileName: typeof fileName === "string" ? fileName : void 0,
-			fontSize: 90
+			fontSize: 90,
+			subtitleColor,
+			subtitleLineCount: subtitleText?.split("\n").length
 		});
 	});
 }
@@ -152,7 +157,7 @@ const { cache: ALEX_C_LINE_GLOBAL_CACHE_DIRECTORY } = alexCLineEnvPaths;
 const ALEX_C_LINE_GLOBAL_CACHE_PATH = node_path.default.join(ALEX_C_LINE_GLOBAL_CACHE_DIRECTORY, "cache.json");
 
 //#endregion
-//#region src/commands/cache-path.ts
+//#region src/cli/commands/cache-path.ts
 function cachePath(program) {
 	program.command("cache-path").description("Log the path to the alex-c-line cache files.").action(() => {
 		console.info(ALEX_C_LINE_GLOBAL_CACHE_PATH);
@@ -160,7 +165,7 @@ function cachePath(program) {
 }
 
 //#endregion
-//#region src/commands/check-for-file-dependencies.ts
+//#region src/cli/commands/check-for-file-dependencies.ts
 function findFileDependencies(dependencies) {
 	const fileDependencies = {};
 	if (!dependencies) return {};
@@ -189,7 +194,7 @@ function checkForFileDependencies(program) {
 }
 
 //#endregion
-//#region src/commands/check-lockfile-version-discrepancy.ts
+//#region src/cli/commands/check-lockfile-version-discrepancy.ts
 function checkLockfileVersionDiscrepancy(program) {
 	program.command("check-lockfile-version-discrepancy").description("Check that version numbers in package.json and package-lock.json match").action(async () => {
 		console.info("Checking for package.json and package-lock.json discrepancies...");
@@ -205,7 +210,7 @@ function checkLockfileVersionDiscrepancy(program) {
 }
 
 //#endregion
-//#region src/commands/deprecated/check-version-number-change.ts
+//#region src/cli/commands/deprecated/check-version-number-change.ts
 function checkVersionNumberChange(program) {
 	program.command("check-version-number-change").description("Check that version number on branch has changed if source code differs between main and current branch").action(async () => {
 		console.info("Checking for version change...");
@@ -301,7 +306,7 @@ function getPullRequestTemplates(packageName) {
 }
 
 //#endregion
-//#region src/commands/deprecated/create-pull-request-templates.ts
+//#region src/cli/commands/deprecated/create-pull-request-templates.ts
 const deprecationMessage$2 = "[DEPRECATED]: This command does not support the new markdown-native templates and alex-c-line config system. Please use `pre-commit-2` instead.";
 function createPullRequestTemplates(program) {
 	program.command("create-pull-request-templates").description(_alextheman_utility.normaliseIndents`
@@ -397,7 +402,7 @@ function getReleaseNoteTemplate(packageName, version, status = "In progress", co
 }
 
 //#endregion
-//#region src/commands/deprecated/create-release-note.ts
+//#region src/cli/commands/deprecated/create-release-note.ts
 function createReleaseNote(program) {
 	program.command("create-release-note").argument("[versionType]", "The version type to increment by (`major|minor|patch`). Note that this performs the version calculation without changing package.json. If left blank it will use the version in package.json", _alextheman_utility.parseVersionType).description("Create release notes based on the current version in package.json.").action(async (versionType) => {
 		const { name, version } = JSON.parse(await (0, node_fs_promises.readFile)(node_path.default.join(process.cwd(), "package.json"), "utf-8"));
@@ -420,7 +425,7 @@ function createReleaseNote(program) {
 }
 
 //#endregion
-//#region src/commands/deprecated/edit-env.ts
+//#region src/cli/commands/deprecated/edit-env.ts
 const deprecationMessage$1 = "[DEPRECATED]: Please use `edit-env-2` instead.";
 function editEnv(program) {
 	program.command("edit-env <key> [value]").description(_alextheman_utility.normaliseIndents`
@@ -443,7 +448,7 @@ function editEnv(program) {
 }
 
 //#endregion
-//#region src/commands/deprecated/pre-commit.ts
+//#region src/cli/commands/deprecated/pre-commit.ts
 const deprecationMessage = "[DEPRECATED]: This command does not support the new alex-c-line config system. Please use `pre-commit-2` instead.";
 function preCommit(program) {
 	program.command("pre-commit").description(_alextheman_utility.normaliseIndents`
@@ -492,7 +497,7 @@ function isValidReleaseDocument(packageName, version, initialDocument) {
 }
 
 //#endregion
-//#region src/commands/deprecated/set-release-status.ts
+//#region src/cli/commands/deprecated/set-release-status.ts
 function setReleaseStatus(program) {
 	program.command("set-release-status").description("Change the release status on a given release document initially generated from the `create-release-note` command.").argument("<documentPath>", "The path to the document").action(async (documentPath) => {
 		const { name: packageName } = JSON.parse(await (0, node_fs_promises.readFile)(node_path.default.join(process.cwd(), "package.json"), "utf-8"));
@@ -526,7 +531,7 @@ async function upsertDotenvFile(contents, envFilePath) {
 }
 
 //#endregion
-//#region src/commands/edit-env-file/addVariable.ts
+//#region src/cli/commands/edit-env-file/addVariable.ts
 async function addVariable(program, envFileContents, file) {
 	const newVariableName = await (0, _inquirer_prompts.input)({ message: "Please enter the name of the environment variable you would like to add." });
 	if (newVariableName in envFileContents) program.error(`
@@ -552,7 +557,7 @@ async function addVariable(program, envFileContents, file) {
 }
 
 //#endregion
-//#region src/commands/edit-env-file/deleteVariable.ts
+//#region src/cli/commands/edit-env-file/deleteVariable.ts
 async function deleteVariable(envFileContents, variableToEdit, file) {
 	if (!await (0, _inquirer_prompts.confirm)({ message: `Are you sure you want to delete \`${String(variableToEdit)}\`?` })) {
 		console.info("Deletion aborted");
@@ -563,7 +568,7 @@ async function deleteVariable(envFileContents, variableToEdit, file) {
 }
 
 //#endregion
-//#region src/commands/edit-env-file/editVariable.ts
+//#region src/cli/commands/edit-env-file/editVariable.ts
 async function editVariable(envFileContents, variableToEdit, file) {
 	const newValue = await (0, _inquirer_prompts.password)({ message: `Please enter new value for \`${String(variableToEdit)}\`` });
 	await upsertDotenvFile({
@@ -582,7 +587,7 @@ function redact(secretString) {
 }
 
 //#endregion
-//#region src/commands/edit-env-file/changeExistingVariable.ts
+//#region src/cli/commands/edit-env-file/changeExistingVariable.ts
 async function changeExistingVariable(envFileContents, variableToEdit, file) {
 	switch (await (0, _inquirer_prompts.select)({
 		message: _alextheman_utility.normaliseIndents`
@@ -620,7 +625,7 @@ async function parseDotenvFile(envFilePath) {
 }
 
 //#endregion
-//#region src/commands/edit-env-file/index.ts
+//#region src/cli/commands/edit-env-file/index.ts
 function editEnvFile(program) {
 	program.command("edit-env-file").description("Edit properties in a .env file").option("--interactive", "Enable interactive mode", true).option("--file <filePath>", "The path to the .env file you want to edit, relative to the working directory this command is run", ".env").action(async ({ interactive, file }) => {
 		if (interactive) {
@@ -667,7 +672,7 @@ function editEnvFile(program) {
 }
 
 //#endregion
-//#region src/commands/encrypt-with-key.ts
+//#region src/cli/commands/encrypt-with-key.ts
 function encryptWithKey(program) {
 	program.command("encrypt-with-key").alias("encrypt").description("Encrypt a secret given the public base64 key and the thing you want to encrypt.").argument("<publicKey>", "The public base64 key to encrypt with").argument("<plaintextValue>", "The value to encrypt in plaintext").action(async (publicKey, plaintextValue) => {
 		try {
@@ -682,7 +687,7 @@ function encryptWithKey(program) {
 }
 
 //#endregion
-//#region src/commands/git-post-merge-cleanup.ts
+//#region src/cli/commands/git-post-merge-cleanup.ts
 function gitPostMergeCleanup(program) {
 	program.command("git-post-merge-cleanup").alias("git-cleanup").description("Run after merging into a given branch to quickly clean up").argument("[branch]", "The branch you want to merge into", "main").option("--rebase", "Enable if your repository mainly rebases into main").action(async (branch, { rebase: rebaseOption }) => {
 		let alexCLineConfigJSON;
@@ -731,7 +736,7 @@ function gitPostMergeCleanup(program) {
 }
 
 //#endregion
-//#region src/commands/pre-commit/createStepRunner.ts
+//#region src/cli/commands/pre-commit/createStepRunner.ts
 const runCommandAndLogToConsole = (0, execa.execa)({
 	stdio: "inherit",
 	reject: false
@@ -767,7 +772,7 @@ function createStepRunner(program) {
 }
 
 //#endregion
-//#region src/commands/pre-commit/getCommandArguments.ts
+//#region src/cli/commands/pre-commit/getCommandArguments.ts
 function getCommandArguments(program, script, scripts, args) {
 	if (!(script in (scripts ?? {}))) program.error(`Could not find script \`${script}\` in package.json.`, {
 		exitCode: 1,
@@ -871,7 +876,7 @@ async function loadAlexCLineConfig(filePath) {
 }
 
 //#endregion
-//#region src/commands/pre-commit/pre-commit-2.ts
+//#region src/cli/commands/pre-commit/pre-commit-2.ts
 function preCommit2(program) {
 	program.command("pre-commit-2").description("Run the pre-commit scripts specified in the alex-c-line config (v2 experiment).").option("--allow-no-staged-changes", "Run even if nothing is staged").option("--no-update-index").option("--update-index", "Update the git index after the run").action(async (options) => {
 		const configPath = await findAlexCLineConfig(process.cwd());
@@ -911,7 +916,7 @@ function preCommit2(program) {
 }
 
 //#endregion
-//#region src/commands/say-hello.ts
+//#region src/cli/commands/say-hello.ts
 function sayHello(program) {
 	program.command("say-hello").description("Quick test command").action(() => {
 		console.info("Hello!");
@@ -1003,7 +1008,7 @@ async function getPullRequestTemplatesFromMarkdown(config) {
 }
 
 //#endregion
-//#region src/commands/template/pullRequest/create-pull-request-template-2.ts
+//#region src/cli/commands/template/pullRequest/create-pull-request-template-2.ts
 function createPullRequestTemplate(program) {
 	program.command("create-pull-request-template").alias("create-pull-request-template-2").option("--category <category>", "The category of pull request templates to get (can be either `general` or `infrastructure`)", (rawValue) => {
 		return (0, _alextheman_utility.parseZodSchema)(zod.default.enum(PullRequestTemplateCategory), rawValue, () => {
@@ -1115,7 +1120,7 @@ async function validateReleaseDocument(projectName, version, content, allowedRel
 }
 
 //#endregion
-//#region src/commands/template/releaseNote/check-release-note.ts
+//#region src/cli/commands/template/releaseNote/check-release-note.ts
 function checkReleaseNote(program) {
 	program.command("check-release-note").argument("<documentPath>", "The path to the document", _alextheman_utility_node.parseFilePath).option("--expected-release-status <expectedReleaseStatus>", "The expected release status of the document once we read it in.", parseReleaseStatus).description("Check whether a given release note is valid according to the templates or not. Returns exit code 0 for valid release note and non-zero otherwise.").action(async (documentPath, { expectedReleaseStatus }) => {
 		const fileContents = await (0, node_fs_promises.readFile)(node_path.default.join(process.cwd(), documentPath.fullPath), "utf-8");
@@ -1165,7 +1170,7 @@ async function getReleaseNoteTemplateFromMarkdown(projectName, version, metadata
 }
 
 //#endregion
-//#region src/commands/template/releaseNote/create-release-note-2.ts
+//#region src/cli/commands/template/releaseNote/create-release-note-2.ts
 function createReleaseNote2(program) {
 	program.command("create-release-note-2").argument("[createFor]", _alextheman_utility.normaliseIndents`
       Decide what version to create a release note for exactly:
@@ -1207,7 +1212,7 @@ function createReleaseNote2(program) {
 }
 
 //#endregion
-//#region src/commands/template/releaseNote/migrate-release-notes.ts
+//#region src/cli/commands/template/releaseNote/migrate-release-notes.ts
 function migrateReleaseNotes(program) {
 	program.command("migrate-release-notes").description(_alextheman_utility.normaliseIndents`
         Migrate the docs/releases folder generated from \`create-release-note\` to be more compatible with v2.
@@ -1263,7 +1268,7 @@ function migrateReleaseNotes(program) {
 }
 
 //#endregion
-//#region src/commands/template/releaseNote/set-release-status-2.ts
+//#region src/cli/commands/template/releaseNote/set-release-status-2.ts
 function setReleaseStatus2(program) {
 	program.command("set-release-status-2").description("Change the release status on a given release document initially generated from the `create-release-note` command.").argument("<documentPath>", "The path to the document").argument("[status]", "The status to set the document to", parseReleaseStatus, ReleaseStatus.RELEASED).action(async (documentPath, status) => {
 		const packageInfo = JSON.parse(await (0, node_fs_promises.readFile)(node_path.default.join(process.cwd(), "package.json"), "utf-8"));
@@ -1311,7 +1316,7 @@ function parseZodSchemaForProgram(programError, schema, data) {
 //#endregion
 //#region package.json
 var name = "alex-c-line";
-var version = "1.30.1";
+var version = "1.31.0";
 var description = "Command-line tool with commands to streamline the developer workflow.";
 
 //#endregion
@@ -1347,7 +1352,7 @@ async function checkUpdate(options) {
 }
 
 //#endregion
-//#region src/commands/update.ts
+//#region src/cli/commands/update.ts
 const optionsSchema = zod.default.object({ check: zod.default.boolean().optional() });
 function update(program) {
 	program.command("update").description("Handle updates of the currently installed alex-c-line").option("--check", "Check for available updates").option("--apply", "Apply the latest update").action(async (rawOptions) => {
@@ -1446,7 +1451,7 @@ async function removeAllTarballs(packagePath, packageName) {
 }
 
 //#endregion
-//#region src/commands/use-local-package.ts
+//#region src/cli/commands/use-local-package.ts
 function useLocalPackage(program) {
 	program.command("use-local-package").description(_alextheman_utility.normaliseIndents`
       ${experimentalHeader}
@@ -1549,7 +1554,27 @@ function useLocalPackage(program) {
 }
 
 //#endregion
-//#region src/commands/versioning/get-major-version.ts
+//#region src/cli/commands/uuid/generate.ts
+function generateUUID(program) {
+	program.command("generate").description("Generate a random UUID").action(() => {
+		console.info((0, node_crypto.randomUUID)());
+	});
+}
+
+//#endregion
+//#region src/utility/miscellaneous/loadCommands.ts
+function loadCommands(program, commandMap) {
+	for (const loader of Object.values(commandMap)) loader(program);
+}
+
+//#endregion
+//#region src/cli/commands/uuid/index.ts
+function uuid(program) {
+	loadCommands(program.command("uuid").description("Commands to help manage UUIDs"), { generateUUID });
+}
+
+//#endregion
+//#region src/cli/commands/versioning/get-major-version.ts
 function getMajorVersion(program) {
 	program.command("get-major-version").description("Get the major representation of a version number (e.g. v2, v3 etc...)").argument("<version>", "The version to get the major representation of", (rawValue) => {
 		return new _alextheman_utility.VersionNumber(rawValue);
@@ -1559,7 +1584,7 @@ function getMajorVersion(program) {
 }
 
 //#endregion
-//#region src/commands/versioning/get-minor-version.ts
+//#region src/cli/commands/versioning/get-minor-version.ts
 function getMinorVersion(program) {
 	program.command("get-minor-version").description("Get the minor representation of a version number (e.g. v2.1, v3.1 etc...)").argument("<version>", "The version to get the minor representation of", (rawValue) => {
 		return new _alextheman_utility.VersionNumber(rawValue);
@@ -1569,7 +1594,7 @@ function getMinorVersion(program) {
 }
 
 //#endregion
-//#region src/commands/versioning/get-version-type.ts
+//#region src/cli/commands/versioning/get-version-type.ts
 function getVersionType(program) {
 	program.command("get-version-type").description("Gets the version type of the given version number.").argument("<version>", "The version to get the version type from", (rawVersion) => {
 		return new _alextheman_utility.VersionNumber(rawVersion);
@@ -1579,7 +1604,7 @@ function getVersionType(program) {
 }
 
 //#endregion
-//#region src/commands/versioning/increment-version.ts
+//#region src/cli/commands/versioning/increment-version.ts
 function incrementVersion(program) {
 	program.command("increment-version").description("Increments the given input version depending on the given increment type.").argument("<version>", "The version to increment", (rawVersion) => {
 		return new _alextheman_utility.VersionNumber(rawVersion);
@@ -1595,13 +1620,7 @@ function incrementVersion(program) {
 }
 
 //#endregion
-//#region src/utility/miscellaneous/loadCommands.ts
-function loadCommands(program, commandMap) {
-	for (const loader of Object.values(commandMap)) loader(program);
-}
-
-//#endregion
-//#region src/commands/index.ts
+//#region src/cli/commands/index.ts
 function createCommands(program) {
 	loadCommands(program, {
 		artwork,
@@ -1629,7 +1648,8 @@ function createCommands(program) {
 		setReleaseStatus,
 		setReleaseStatus2,
 		update,
-		useLocalPackage
+		useLocalPackage,
+		uuid
 	});
 }
 
@@ -1705,7 +1725,7 @@ async function runAutomatedUpdateCheck() {
 }
 
 //#endregion
-//#region src/index.ts
+//#region src/cli/index.ts
 (async () => {
 	try {
 		const program = new commander.Command();

package/dist/index.js

@@ -20,15 +20,19 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import matter from "gray-matter";
 import { parseFilePath } from "@alextheman/utility/node";
 import supportsColor from "supports-color";
+import { randomUUID } from "node:crypto";
 
 //#region src/utility/miscellaneous/asciiToPng.ts
 async function asciiToPng(ascii, options) {
-	const { fileName = "artwork/alex-c-line", width = 3e3, height = 3e3, backgroundColor = "#0b1020", titleColor = "#facc15", subtitleColor = "#22c55e", fontSize = 48, fontFamily = [
+	const { fileName = "artwork/alex-c-line", width = 3e3, height = 3e3, backgroundColor = "#0b1020", titleColor = "#facc15", subtitleColor = {
+		green: "#22c55e",
+		white: "#ffffff"
+	}[options?.subtitleColor ?? "green"], fontSize = 48, fontFamily = [
 		"Menlo",
 		"Monaco",
 		"Consolas",
 		"monospace"
-	], subtitleLineCount = 1 } = options ?? {};
+	], subtitleLineCount = options?.subtitleLineCount ?? 1 } = options ?? {};
 	const canvas = createCanvas(width, height);
 	const context = canvas.getContext("2d");
 	context.fillStyle = backgroundColor;
@@ -81,28 +85,29 @@ async function createAlexCLineArtwork(options) {
 }
 
 //#endregion
-//#region src/commands/artwork.ts
+//#region src/cli/commands/artwork.ts
 function artwork(program) {
-	program.command("artwork").description("Create the artwork for alex-c-line").option("--subtitle-text <subtitleText>", "Customise the subtitle text").option("--subtitle-color <subtitleColor>", "Customise the subtitle color", (subtitleColor) => {
-		return {
+	program.command("artwork").description("Create the artwork for alex-c-line").option("--subtitle-text <subtitleText>", "Customise the subtitle text").option("--subtitle-color <subtitleColor>", "Customise the subtitle color").option("--save-png [fileName]", "Save the artwork as a PNG file, optionally specifying the path").action(async ({ savePng: fileName, subtitleText, subtitleColor = "green" }) => {
+		if (subtitleColor !== "green" && subtitleColor !== "white") throw new DataError({ subtitleColor }, "INVALID_SUBTITLE_COLOR", "Subtitle color must either be green or white.");
+		const chalkColour = {
 			green: chalk.green,
 			white: chalk.white
 		}[subtitleColor];
-	}).option("--save-png [fileName]", "Save the artwork as a PNG file, optionally specifying the path").action(async ({ savePng: fileName, subtitleText, subtitleColor }) => {
 		console.info(await createAlexCLineArtwork({
 			includeBox: true,
 			includeColors: true,
 			subtitleText,
-			subtitleColor
+			subtitleColor: chalkColour
 		}));
 		if (fileName) await asciiToPng(await createAlexCLineArtwork({
 			includeBox: false,
 			includeColors: false,
-			subtitleText,
-			subtitleColor
+			subtitleText
 		}), {
 			fileName: typeof fileName === "string" ? fileName : void 0,
-			fontSize: 90
+			fontSize: 90,
+			subtitleColor,
+			subtitleLineCount: subtitleText?.split("\n").length
 		});
 	});
 }
@@ -114,7 +119,7 @@ const { cache: ALEX_C_LINE_GLOBAL_CACHE_DIRECTORY } = alexCLineEnvPaths;
 const ALEX_C_LINE_GLOBAL_CACHE_PATH = path.join(ALEX_C_LINE_GLOBAL_CACHE_DIRECTORY, "cache.json");
 
 //#endregion
-//#region src/commands/cache-path.ts
+//#region src/cli/commands/cache-path.ts
 function cachePath(program) {
 	program.command("cache-path").description("Log the path to the alex-c-line cache files.").action(() => {
 		console.info(ALEX_C_LINE_GLOBAL_CACHE_PATH);
@@ -122,7 +127,7 @@ function cachePath(program) {
 }
 
 //#endregion
-//#region src/commands/check-for-file-dependencies.ts
+//#region src/cli/commands/check-for-file-dependencies.ts
 function findFileDependencies(dependencies) {
 	const fileDependencies = {};
 	if (!dependencies) return {};
@@ -151,7 +156,7 @@ function checkForFileDependencies(program) {
 }
 
 //#endregion
-//#region src/commands/check-lockfile-version-discrepancy.ts
+//#region src/cli/commands/check-lockfile-version-discrepancy.ts
 function checkLockfileVersionDiscrepancy(program) {
 	program.command("check-lockfile-version-discrepancy").description("Check that version numbers in package.json and package-lock.json match").action(async () => {
 		console.info("Checking for package.json and package-lock.json discrepancies...");
@@ -167,7 +172,7 @@ function checkLockfileVersionDiscrepancy(program) {
 }
 
 //#endregion
-//#region src/commands/deprecated/check-version-number-change.ts
+//#region src/cli/commands/deprecated/check-version-number-change.ts
 function checkVersionNumberChange(program) {
 	program.command("check-version-number-change").description("Check that version number on branch has changed if source code differs between main and current branch").action(async () => {
 		console.info("Checking for version change...");
@@ -263,7 +268,7 @@ function getPullRequestTemplates(packageName) {
 }
 
 //#endregion
-//#region src/commands/deprecated/create-pull-request-templates.ts
+//#region src/cli/commands/deprecated/create-pull-request-templates.ts
 const deprecationMessage$2 = "[DEPRECATED]: This command does not support the new markdown-native templates and alex-c-line config system. Please use `pre-commit-2` instead.";
 function createPullRequestTemplates(program) {
 	program.command("create-pull-request-templates").description(normaliseIndents`
@@ -359,7 +364,7 @@ function getReleaseNoteTemplate(packageName, version, status = "In progress", co
 }
 
 //#endregion
-//#region src/commands/deprecated/create-release-note.ts
+//#region src/cli/commands/deprecated/create-release-note.ts
 function createReleaseNote(program) {
 	program.command("create-release-note").argument("[versionType]", "The version type to increment by (`major|minor|patch`). Note that this performs the version calculation without changing package.json. If left blank it will use the version in package.json", parseVersionType).description("Create release notes based on the current version in package.json.").action(async (versionType) => {
 		const { name, version } = JSON.parse(await readFile(path.join(process.cwd(), "package.json"), "utf-8"));
@@ -382,7 +387,7 @@ function createReleaseNote(program) {
 }
 
 //#endregion
-//#region src/commands/deprecated/edit-env.ts
+//#region src/cli/commands/deprecated/edit-env.ts
 const deprecationMessage$1 = "[DEPRECATED]: Please use `edit-env-2` instead.";
 function editEnv(program) {
 	program.command("edit-env <key> [value]").description(normaliseIndents`
@@ -405,7 +410,7 @@ function editEnv(program) {
 }
 
 //#endregion
-//#region src/commands/deprecated/pre-commit.ts
+//#region src/cli/commands/deprecated/pre-commit.ts
 const deprecationMessage = "[DEPRECATED]: This command does not support the new alex-c-line config system. Please use `pre-commit-2` instead.";
 function preCommit(program) {
 	program.command("pre-commit").description(normaliseIndents`
@@ -454,7 +459,7 @@ function isValidReleaseDocument(packageName, version, initialDocument) {
 }
 
 //#endregion
-//#region src/commands/deprecated/set-release-status.ts
+//#region src/cli/commands/deprecated/set-release-status.ts
 function setReleaseStatus(program) {
 	program.command("set-release-status").description("Change the release status on a given release document initially generated from the `create-release-note` command.").argument("<documentPath>", "The path to the document").action(async (documentPath) => {
 		const { name: packageName } = JSON.parse(await readFile(path.join(process.cwd(), "package.json"), "utf-8"));
@@ -488,7 +493,7 @@ async function upsertDotenvFile(contents, envFilePath) {
 }
 
 //#endregion
-//#region src/commands/edit-env-file/addVariable.ts
+//#region src/cli/commands/edit-env-file/addVariable.ts
 async function addVariable(program, envFileContents, file) {
 	const newVariableName = await input({ message: "Please enter the name of the environment variable you would like to add." });
 	if (newVariableName in envFileContents) program.error(`
@@ -514,7 +519,7 @@ async function addVariable(program, envFileContents, file) {
 }
 
 //#endregion
-//#region src/commands/edit-env-file/deleteVariable.ts
+//#region src/cli/commands/edit-env-file/deleteVariable.ts
 async function deleteVariable(envFileContents, variableToEdit, file) {
 	if (!await confirm({ message: `Are you sure you want to delete \`${String(variableToEdit)}\`?` })) {
 		console.info("Deletion aborted");
@@ -525,7 +530,7 @@ async function deleteVariable(envFileContents, variableToEdit, file) {
 }
 
 //#endregion
-//#region src/commands/edit-env-file/editVariable.ts
+//#region src/cli/commands/edit-env-file/editVariable.ts
 async function editVariable(envFileContents, variableToEdit, file) {
 	const newValue = await password({ message: `Please enter new value for \`${String(variableToEdit)}\`` });
 	await upsertDotenvFile({
@@ -544,7 +549,7 @@ function redact(secretString) {
 }
 
 //#endregion
-//#region src/commands/edit-env-file/changeExistingVariable.ts
+//#region src/cli/commands/edit-env-file/changeExistingVariable.ts
 async function changeExistingVariable(envFileContents, variableToEdit, file) {
 	switch (await select({
 		message: normaliseIndents`
@@ -582,7 +587,7 @@ async function parseDotenvFile(envFilePath) {
 }
 
 //#endregion
-//#region src/commands/edit-env-file/index.ts
+//#region src/cli/commands/edit-env-file/index.ts
 function editEnvFile(program) {
 	program.command("edit-env-file").description("Edit properties in a .env file").option("--interactive", "Enable interactive mode", true).option("--file <filePath>", "The path to the .env file you want to edit, relative to the working directory this command is run", ".env").action(async ({ interactive, file }) => {
 		if (interactive) {
@@ -629,7 +634,7 @@ function editEnvFile(program) {
 }
 
 //#endregion
-//#region src/commands/encrypt-with-key.ts
+//#region src/cli/commands/encrypt-with-key.ts
 function encryptWithKey$1(program) {
 	program.command("encrypt-with-key").alias("encrypt").description("Encrypt a secret given the public base64 key and the thing you want to encrypt.").argument("<publicKey>", "The public base64 key to encrypt with").argument("<plaintextValue>", "The value to encrypt in plaintext").action(async (publicKey, plaintextValue) => {
 		try {
@@ -644,7 +649,7 @@ function encryptWithKey$1(program) {
 }
 
 //#endregion
-//#region src/commands/git-post-merge-cleanup.ts
+//#region src/cli/commands/git-post-merge-cleanup.ts
 function gitPostMergeCleanup(program) {
 	program.command("git-post-merge-cleanup").alias("git-cleanup").description("Run after merging into a given branch to quickly clean up").argument("[branch]", "The branch you want to merge into", "main").option("--rebase", "Enable if your repository mainly rebases into main").action(async (branch, { rebase: rebaseOption }) => {
 		let alexCLineConfigJSON;
@@ -693,7 +698,7 @@ function gitPostMergeCleanup(program) {
 }
 
 //#endregion
-//#region src/commands/pre-commit/createStepRunner.ts
+//#region src/cli/commands/pre-commit/createStepRunner.ts
 const runCommandAndLogToConsole = execa({
 	stdio: "inherit",
 	reject: false
@@ -729,7 +734,7 @@ function createStepRunner(program) {
 }
 
 //#endregion
-//#region src/commands/pre-commit/getCommandArguments.ts
+//#region src/cli/commands/pre-commit/getCommandArguments.ts
 function getCommandArguments(program, script, scripts, args) {
 	if (!(script in (scripts ?? {}))) program.error(`Could not find script \`${script}\` in package.json.`, {
 		exitCode: 1,
@@ -833,7 +838,7 @@ async function loadAlexCLineConfig(filePath) {
 }
 
 //#endregion
-//#region src/commands/pre-commit/pre-commit-2.ts
+//#region src/cli/commands/pre-commit/pre-commit-2.ts
 function preCommit2(program) {
 	program.command("pre-commit-2").description("Run the pre-commit scripts specified in the alex-c-line config (v2 experiment).").option("--allow-no-staged-changes", "Run even if nothing is staged").option("--no-update-index").option("--update-index", "Update the git index after the run").action(async (options) => {
 		const configPath = await findAlexCLineConfig(process.cwd());
@@ -873,7 +878,7 @@ function preCommit2(program) {
 }
 
 //#endregion
-//#region src/commands/say-hello.ts
+//#region src/cli/commands/say-hello.ts
 function sayHello(program) {
 	program.command("say-hello").description("Quick test command").action(() => {
 		console.info("Hello!");
@@ -965,7 +970,7 @@ async function getPullRequestTemplatesFromMarkdown(config) {
 }
 
 //#endregion
-//#region src/commands/template/pullRequest/create-pull-request-template-2.ts
+//#region src/cli/commands/template/pullRequest/create-pull-request-template-2.ts
 function createPullRequestTemplate(program) {
 	program.command("create-pull-request-template").alias("create-pull-request-template-2").option("--category <category>", "The category of pull request templates to get (can be either `general` or `infrastructure`)", (rawValue) => {
 		return parseZodSchema(z.enum(PullRequestTemplateCategory), rawValue, () => {
@@ -1077,7 +1082,7 @@ async function validateReleaseDocument(projectName, version, content, allowedRel
 }
 
 //#endregion
-//#region src/commands/template/releaseNote/check-release-note.ts
+//#region src/cli/commands/template/releaseNote/check-release-note.ts
 function checkReleaseNote(program) {
 	program.command("check-release-note").argument("<documentPath>", "The path to the document", parseFilePath).option("--expected-release-status <expectedReleaseStatus>", "The expected release status of the document once we read it in.", parseReleaseStatus).description("Check whether a given release note is valid according to the templates or not. Returns exit code 0 for valid release note and non-zero otherwise.").action(async (documentPath, { expectedReleaseStatus }) => {
 		const fileContents = await readFile(path.join(process.cwd(), documentPath.fullPath), "utf-8");
@@ -1127,7 +1132,7 @@ async function getReleaseNoteTemplateFromMarkdown(projectName, version, metadata
 }
 
 //#endregion
-//#region src/commands/template/releaseNote/create-release-note-2.ts
+//#region src/cli/commands/template/releaseNote/create-release-note-2.ts
 function createReleaseNote2(program) {
 	program.command("create-release-note-2").argument("[createFor]", normaliseIndents`
       Decide what version to create a release note for exactly:
@@ -1169,7 +1174,7 @@ function createReleaseNote2(program) {
 }
 
 //#endregion
-//#region src/commands/template/releaseNote/migrate-release-notes.ts
+//#region src/cli/commands/template/releaseNote/migrate-release-notes.ts
 function migrateReleaseNotes(program) {
 	program.command("migrate-release-notes").description(normaliseIndents`
         Migrate the docs/releases folder generated from \`create-release-note\` to be more compatible with v2.
@@ -1225,7 +1230,7 @@ function migrateReleaseNotes(program) {
 }
 
 //#endregion
-//#region src/commands/template/releaseNote/set-release-status-2.ts
+//#region src/cli/commands/template/releaseNote/set-release-status-2.ts
 function setReleaseStatus2(program) {
 	program.command("set-release-status-2").description("Change the release status on a given release document initially generated from the `create-release-note` command.").argument("<documentPath>", "The path to the document").argument("[status]", "The status to set the document to", parseReleaseStatus, ReleaseStatus.RELEASED).action(async (documentPath, status) => {
 		const packageInfo = JSON.parse(await readFile(path.join(process.cwd(), "package.json"), "utf-8"));
@@ -1273,7 +1278,7 @@ function parseZodSchemaForProgram(programError, schema, data) {
 //#endregion
 //#region package.json
 var name = "alex-c-line";
-var version = "1.30.1";
+var version = "1.31.0";
 var description = "Command-line tool with commands to streamline the developer workflow.";
 
 //#endregion
@@ -1309,7 +1314,7 @@ async function checkUpdate(options) {
 }
 
 //#endregion
-//#region src/commands/update.ts
+//#region src/cli/commands/update.ts
 const optionsSchema = z.object({ check: z.boolean().optional() });
 function update(program) {
 	program.command("update").description("Handle updates of the currently installed alex-c-line").option("--check", "Check for available updates").option("--apply", "Apply the latest update").action(async (rawOptions) => {
@@ -1408,7 +1413,7 @@ async function removeAllTarballs(packagePath, packageName) {
 }
 
 //#endregion
-//#region src/commands/use-local-package.ts
+//#region src/cli/commands/use-local-package.ts
 function useLocalPackage(program) {
 	program.command("use-local-package").description(normaliseIndents`
       ${experimentalHeader}
@@ -1511,7 +1516,27 @@ function useLocalPackage(program) {
 }
 
 //#endregion
-//#region src/commands/versioning/get-major-version.ts
+//#region src/cli/commands/uuid/generate.ts
+function generateUUID(program) {
+	program.command("generate").description("Generate a random UUID").action(() => {
+		console.info(randomUUID());
+	});
+}
+
+//#endregion
+//#region src/utility/miscellaneous/loadCommands.ts
+function loadCommands(program, commandMap) {
+	for (const loader of Object.values(commandMap)) loader(program);
+}
+
+//#endregion
+//#region src/cli/commands/uuid/index.ts
+function uuid(program) {
+	loadCommands(program.command("uuid").description("Commands to help manage UUIDs"), { generateUUID });
+}
+
+//#endregion
+//#region src/cli/commands/versioning/get-major-version.ts
 function getMajorVersion(program) {
 	program.command("get-major-version").description("Get the major representation of a version number (e.g. v2, v3 etc...)").argument("<version>", "The version to get the major representation of", (rawValue) => {
 		return new VersionNumber(rawValue);
@@ -1521,7 +1546,7 @@ function getMajorVersion(program) {
 }
 
 //#endregion
-//#region src/commands/versioning/get-minor-version.ts
+//#region src/cli/commands/versioning/get-minor-version.ts
 function getMinorVersion(program) {
 	program.command("get-minor-version").description("Get the minor representation of a version number (e.g. v2.1, v3.1 etc...)").argument("<version>", "The version to get the minor representation of", (rawValue) => {
 		return new VersionNumber(rawValue);
@@ -1531,7 +1556,7 @@ function getMinorVersion(program) {
 }
 
 //#endregion
-//#region src/commands/versioning/get-version-type.ts
+//#region src/cli/commands/versioning/get-version-type.ts
 function getVersionType(program) {
 	program.command("get-version-type").description("Gets the version type of the given version number.").argument("<version>", "The version to get the version type from", (rawVersion) => {
 		return new VersionNumber(rawVersion);
@@ -1541,7 +1566,7 @@ function getVersionType(program) {
 }
 
 //#endregion
-//#region src/commands/versioning/increment-version.ts
+//#region src/cli/commands/versioning/increment-version.ts
 function incrementVersion(program) {
 	program.command("increment-version").description("Increments the given input version depending on the given increment type.").argument("<version>", "The version to increment", (rawVersion) => {
 		return new VersionNumber(rawVersion);
@@ -1557,13 +1582,7 @@ function incrementVersion(program) {
 }
 
 //#endregion
-//#region src/utility/miscellaneous/loadCommands.ts
-function loadCommands(program, commandMap) {
-	for (const loader of Object.values(commandMap)) loader(program);
-}
-
-//#endregion
-//#region src/commands/index.ts
+//#region src/cli/commands/index.ts
 function createCommands(program) {
 	loadCommands(program, {
 		artwork,
@@ -1591,7 +1610,8 @@ function createCommands(program) {
 		setReleaseStatus,
 		setReleaseStatus2,
 		update,
-		useLocalPackage
+		useLocalPackage,
+		uuid
 	});
 }
 
@@ -1667,7 +1687,7 @@ async function runAutomatedUpdateCheck() {
 }
 
 //#endregion
-//#region src/index.ts
+//#region src/cli/index.ts
 (async () => {
 	try {
 		const program = new Command();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alex-c-line",
-  "version": "1.30.1",
+  "version": "1.31.0",
   "description": "Command-line tool with commands to streamline the developer workflow.",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "templates"
   ],
   "dependencies": {
-    "@alextheman/utility": "^5.3.0",
+    "@alextheman/utility": "^5.4.1",
     "@inquirer/prompts": "^8.2.1",
     "boxen": "^8.0.1",
     "canvas": "^3.2.1",