@haltcase/run 4.0.0 → 5.0.0-beta.1

package/dist/cli/handler.mjs

@@ -1,10 +1,10 @@
 import { isBrandedTask } from "../tasks/guards.mjs";
 import { getSchemaProperties } from "../util/getSchemaProperties.mjs";
 import { extensions } from "../util/resolveTaskFile.mjs";
-import { bold, gray, yellow } from "colorette";
+import { Spinner } from "./spinner.mjs";
+import { styleText } from "node:util";
 import { readdirSync } from "node:fs";
 import { extname } from "node:path";
-import { Spinner } from "@favware/colorette-spinner";
 import cliui from "cliui";
 //#region src/cli/handler.ts
 const failWith = (spinner, message) => {
@@ -17,7 +17,7 @@ const failWith = (spinner, message) => {
 const write = (message) => {
 	process.stdout.write(`${message}\n`);
 };
-const usage = `Usage: ${yellow("hr")} <taskFile> [task]`;
+const usage = `Usage: ${styleText("yellow", "hr")} <taskFile> [task]`;
 const commandHandler = (_context) => {
 	return usage;
 };
@@ -49,10 +49,10 @@ const taskListHandler = (context) => {
 	const nameColumnWidth = Object.keys(config).reduce((previous, current) => Math.max(previous, current.length), 1) + 2 + taskListPaddingX * 2;
 	for (const [name, value] of Object.entries(config)) {
 		if (!value) continue;
-		const formattedName = bold(name);
+		const formattedName = styleText("bold", name);
 		if (isBrandedTask(value)) {
 			if (value.kind === "strictTask") {
-				const properties = getSchemaProperties(value.schema) || gray("not available");
+				const properties = getSchemaProperties(value.schema) || styleText("gray", "not available");
 				ui.div({
 					text: formattedName,
 					width: nameColumnWidth,

package/dist/cli/spinner.mjs

@@ -0,0 +1,128 @@
+import { styleText } from "node:util";
+import tty from "node:tty";
+//#region src/cli/spinner.ts
+/**
+* Based on `nanospinner` and `@favware/colorette-spinner` but using
+*
+* @see https://github.com/usmanyunusov/nanospinner (ISC © 2021 Usman Yunusov)
+* @see https://github.com/favware/colorette-spinner (MIT © 2022 Favware)
+*/
+var Spinner = class {
+	#isCI = process.env.CI || process.env.WT_SESSION || process.env.ConEmuTask === "{cmd::Cmder}" || process.env.TERM_PROGRAM === "vscode" || process.env.TERM === "xterm-256color" || process.env.TERM === "alacritty";
+	#isTTY = tty.isatty(1) && process.env.TERM !== "dumb" && !("CI" in process.env);
+	#supportUnicode = process.platform === "win32" ? this.#isCI : process.env.TERM !== "linux";
+	#symbols = {
+		frames: this.#isTTY ? this.#supportUnicode ? [
+			"⠋",
+			"⠙",
+			"⠹",
+			"⠸",
+			"⠼",
+			"⠴",
+			"⠦",
+			"⠧",
+			"⠇",
+			"⠏"
+		] : [
+			"-",
+			"\\",
+			"|",
+			"/"
+		] : ["-"],
+		tick: this.#supportUnicode ? "✔" : "√",
+		cross: this.#supportUnicode ? "✖" : "×"
+	};
+	#text = "";
+	#current = 0;
+	#interval = 50;
+	#stream = process.stderr;
+	#frames = this.#symbols.frames;
+	#color = "greenBright";
+	#lines = 0;
+	#timer;
+	constructor(text, options) {
+		this.#text = text ?? this.#text;
+		this.#interval = options?.interval ?? this.#interval;
+		this.#stream = options?.stream ?? this.#stream;
+		if (options?.frames?.length) this.#frames = options.frames;
+		this.#color = options?.color ?? this.#color;
+	}
+	clear() {
+		this.write("\x1B[1G");
+		for (let index = 0; index < this.#lines; index++) {
+			if (index > 0) this.write("\x1B[1A");
+			this.write("\x1B[2K\x1B[1G");
+		}
+		this.#lines = 0;
+		return this;
+	}
+	error(...[options = {}]) {
+		const mark = styleText("red", this.#symbols.cross);
+		return this.stop({
+			mark,
+			...options
+		});
+	}
+	reset() {
+		this.#current = 0;
+		this.#lines = 0;
+		if (this.#timer) clearTimeout(this.#timer);
+		return this;
+	}
+	spin() {
+		this.render();
+		this.#current = ++this.#current % this.#frames.length;
+		return this;
+	}
+	start(...[options = {}]) {
+		if (this.#timer) this.reset();
+		return this.update({
+			text: options.text ?? this.#text,
+			color: options.color ?? this.#color
+		}).loop();
+	}
+	stop(...[options = {}]) {
+		if (this.#timer) clearTimeout(this.#timer);
+		const mark = styleText(options.color || this.#color, this.#frames[this.#current] || "");
+		const optionsMark = options.mark && options.color ? styleText(options.color, options.mark) : options.mark;
+		this.write(`${optionsMark || mark} ${options.text || this.#text}\n`, true);
+		return this.#isTTY ? this.write(`\u001B[?25h`) : this;
+	}
+	success(...[options = {}]) {
+		const mark = styleText("green", this.#symbols.tick);
+		return this.stop({
+			mark,
+			...options
+		});
+	}
+	update(...[options = {}]) {
+		this.#text = options.text || this.#text;
+		this.#interval = options.interval ?? this.#interval;
+		this.#stream = options.stream ?? this.#stream;
+		if (options.frames?.length) this.#frames = options.frames;
+		this.#color = options.color ?? this.#color;
+		if (this.#frames.length - 1 < this.#current) this.#current = 0;
+		return this;
+	}
+	loop() {
+		if (this.#isTTY) this.#timer = setTimeout(() => this.loop(), this.#interval);
+		return this.spin();
+	}
+	write(value, clear = false) {
+		if (clear && this.#isTTY) this.clear();
+		this.#stream.write(value);
+		return this;
+	}
+	render() {
+		let value = `${styleText(this.#color, this.#frames[this.#current] || "")} ${this.#text}`;
+		if (this.#isTTY) this.write(`\u001B[?25l`);
+		else value += "\n";
+		this.write(value, true);
+		if (this.#isTTY) this.#lines = this.getLines(value, this.#stream.columns);
+	}
+	getLines(value = "", width = 80) {
+		return value.replaceAll(/\u001B[^m]*m/g, "").split("\n").reduce((column, line) => column + Math.max(1, Math.ceil(line.length / width)), 0);
+	}
+};
+//#endregion
+export { Spinner };

package/dist/tasks/executeTask.mjs

@@ -20,10 +20,59 @@ const executeTask = async (context, options) => {
 		context.handler.failWith([`Task file '${context.taskFile.name}' does not export '${context.taskName}'`, `Resolved to: ${context.taskFile.path}`]);
 	}
 	try {
-		await taskFunction({
+		const optionsWithEnvironment = {
 			...options,
 			env: process.env
-		}, taskUtilities);
+		};
+		const isSpinnerEnabled = !context.config.quiet;
+		const pinnedSpinnerRenderInterval = 80;
+		if (isSpinnerEnabled) {
+			context.handler.spinner.start({ text: `Running ${specifier}` });
+			context.handler.spinner.update({ interval: pinnedSpinnerRenderInterval });
+		}
+		const originalStdoutWrite = Reflect.get(process.stdout, "write");
+		const originalStderrWrite = Reflect.get(process.stderr, "write");
+		const passthroughStdoutWrite = originalStdoutWrite.bind(process.stdout);
+		const passthroughStderrWrite = originalStderrWrite.bind(process.stderr);
+		let isSpinnerWrite = false;
+		let lastForcedRender = 0;
+		const clearPinnedSpinner = () => {
+			if (!isSpinnerEnabled) return;
+			isSpinnerWrite = true;
+			context.handler.spinner.clear();
+			isSpinnerWrite = false;
+		};
+		const renderPinnedSpinner = () => {
+			if (!isSpinnerEnabled) return;
+			const now = Date.now();
+			if (now - lastForcedRender < pinnedSpinnerRenderInterval) return;
+			lastForcedRender = now;
+			isSpinnerWrite = true;
+			context.handler.spinner.spin();
+			isSpinnerWrite = false;
+		};
+		const interceptWrite = (passthroughWrite) => {
+			return ((chunk, encoding, callback) => {
+				const writeArgs = [
+					chunk,
+					encoding,
+					callback
+				].filter((value) => value != null);
+				if (!isSpinnerEnabled || isSpinnerWrite) return Reflect.apply(passthroughWrite, process.stdout, writeArgs);
+				clearPinnedSpinner();
+				const didWrite = Reflect.apply(passthroughWrite, process.stdout, writeArgs);
+				renderPinnedSpinner();
+				return didWrite;
+			});
+		};
+		process.stdout.write = interceptWrite(passthroughStdoutWrite);
+		process.stderr.write = interceptWrite(passthroughStderrWrite);
+		try {
+			await taskFunction(optionsWithEnvironment, taskUtilities);
+		} finally {
+			process.stdout.write = originalStdoutWrite;
+			process.stderr.write = originalStderrWrite;
+		}
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
 		if (message.includes("is not a function")) context.handler.failWith([`Failed to execute ${specifier}`, `Exported value '${context.taskName}' is not a function`]);

package/dist/tasks/task.mjs

@@ -1,15 +1,15 @@
+import { styleText } from "node:util";
 import { type } from "arktype";
-import { red } from "colorette";
 //#region src/tasks/task.ts
 const formatValidationIssues = (errors) => errors.map((error) => {
 	const propertyName = String(error.path[0]);
 	const dottedPath = error.path.join(".");
 	if (!propertyName) return error.message;
 	const messageWithoutProperty = error.message.startsWith(dottedPath) ? error.message.slice(dottedPath.length + 1) : error.message;
-	if (propertyName === "env") return `${red(`Environment variable '${String(error.path[1])}'`)}: ${messageWithoutProperty}`;
+	if (propertyName === "env") return `${styleText("red", `Environment variable '${String(error.path[1])}'`)}: ${messageWithoutProperty}`;
 	const optionText = propertyName === "_" ? "Positionals" : `--${propertyName}`;
-	if (error.code === "predicate" && error.expected === "removed") return `${red(optionText)}: unknown option`;
-	return `${red(optionText)}: ${messageWithoutProperty}`;
+	if (error.code === "predicate" && error.expected === "removed") return `${styleText("red", optionText)}: unknown option`;
+	return `${styleText("red", optionText)}: ${messageWithoutProperty}`;
 }).join("\n");
 const task = (fn) => {
 	fn.kind = "task";

package/dist/util/getSchemaProperties.mjs

@@ -1,6 +1,6 @@
 import { reservedNames } from "../cli/parseOptions.mjs";
+import { styleText } from "node:util";
 import { type } from "arktype";
-import { dim } from "colorette";
 //#region src/util/getSchemaProperties.ts
 const propertyEntry = type({
 	key: "string",
@@ -26,7 +26,7 @@ const getSchemaProperties = (schema) => {
 	const properties = [...requiredProperties, ...optionalProperties];
 	if (properties.length === 0) return "";
 	return `{ ${properties.filter(({ key }) => !reservedNames.has(key)).map(({ key, isOptional }) => {
-		if (isOptional) return dim(`[${key}]`);
+		if (isOptional) return styleText("dim", `[${key}]`);
 		return key;
 	}).join(", ")} }`;
 };

package/dist/util/loadTaskFile.mjs

@@ -9,7 +9,8 @@ const loadTaskFile = async (context) => {
 			configFile: context.taskFile.base,
 			dotenv: false,
 			rcFile: false,
-			packageJson: false
+			packageJson: false,
+			jitiOptions: { tsconfigPaths: true }
 		});
 		if (!collection.configFile || collection.layers?.length === 0) return {
 			ok: false,

package/dist/util/resolveTaskFile.mjs

@@ -1,10 +1,10 @@
 import { existsSync } from "node:fs";
-import { join, resolve } from "node:path";
+import { join } from "node:path";
 import { SUPPORTED_EXTENSIONS } from "c12";
 //#region src/util/resolveTaskFile.ts
 const extensions = SUPPORTED_EXTENSIONS.filter((extension) => extension.endsWith("js") || extension.endsWith("ts"));
 const resolveTaskFile = (context) => {
-	if (context.taskFile.ext) return resolve(context.taskFile.dir, context.taskFile.name);
+	if (context.taskFile.ext) return context.taskFile.path;
 	const foundConfigs = extensions.map((it) => join(context.taskFile.dir, `${context.taskFile.name}${it}`)).filter((path) => existsSync(path));
 	if (foundConfigs.length === 1) return foundConfigs[0];
 	return foundConfigs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haltcase/run",
-  "version": "4.0.0",
+  "version": "5.0.0-beta.1",
   "description": "Flexible, function-based task runner where command line options are props",
   "keywords": [
     "arktype",
@@ -38,11 +38,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@favware/colorette-spinner": "^1.0.1",
     "arktype": "^2.2.0",
-    "c12": "^3.3.4",
+    "c12": "^4.0.0-beta.5",
     "cliui": "^9.0.1",
-    "colorette": "^2.0.20",
     "execa": "^9.6.1"
   },
   "devDependencies": {
@@ -51,6 +49,7 @@
     "@types/node": "^24.13.1",
     "@typescript/native-preview": "7.0.0-dev.20260608.1",
     "eslint": "^9.39.4",
+    "jiti": "^2.7.0",
     "oxlint-tsgolint": "^0.23.0",
     "tsx": "^4.22.4",
     "typescript": "^6.0.3",
@@ -58,12 +57,20 @@
     "vite-plus": "0.1.24",
     "vitest": "npm:@voidzero-dev/vite-plus-test@0.1.24"
   },
+  "peerDependencies": {
+    "jiti": "^2.7.0"
+  },
+  "peerDependenciesMeta": {
+    "jiti": {
+      "optional": true
+    }
+  },
   "engines": {
     "node": ">=22"
   },
   "haltcase.run": {
     "taskDirectory": "./scripts",
-    "quiet": true
+    "quiet": false
   },
   "scripts": {
     "build": "vp pack",