@sandro-sikic/maker 1.0.6 → 1.0.8

package/example.js

@@ -0,0 +1,13 @@
+import * as maker from './index.js';
+
+(async () => {
+	maker.init();
+
+	const spinner = await maker.spinner('Testing maker.run()...').start();
+
+	await new Promise((resolve) => setTimeout(resolve, 1000));
+
+	await maker.run('echo "Hello, World!"');
+
+	spinner.succeed('Done!');
+})();

package/index.d.ts

@@ -16,13 +16,8 @@ export function run(
 
 export function onExit(cb: () => void | Promise<void>): () => void;
 
-// runtime-forwarded objects (exported as values in JS)
-export const prompt: <T = any>(...args: any[]) => Promise<T | null>;
-export const spinner: (
-	text?: string,
-	options?: any,
-) => Promise<import('ora').Ora | null>;
+export const prompt: typeof import('@inquirer/prompts');
+export const spinner: typeof import('ora');
 
-// type forwarding for downstream consumers
 export type { Ora } from 'ora';
 export * from '@inquirer/prompts';

package/index.js

@@ -1,37 +1,11 @@
-const { spawn } = require('child_process');
-const path = require('path');
-
-// small helper to lazily load (CJS-first, ESM dynamic import fallback)
-function makeLazyLoader(moduleId) {
-	let _cached = null;
-	return async function load() {
-		if (_cached) return _cached;
-		try {
-			/* eslint-disable global-require, import/no-dynamic-require */
-			const mod = require(moduleId);
-			_cached = mod && (mod.default || mod);
-			return _cached;
-		} catch (err) {
-			try {
-				const ns = await import(moduleId);
-				_cached = ns && (ns.default || ns);
-				return _cached;
-			} catch (e) {
-				// unable to load in this environment — return null so callers can continue
-				return null;
-			}
-		}
-	};
-}
-
-const loadPrompts = makeLazyLoader('@inquirer/prompts');
-const loadOra = makeLazyLoader('ora');
+import * as inquirer from '@inquirer/prompts';
+import * as ora from 'ora';
 
 function init() {
 	// Ensure we're running in an interactive terminal
 	if (!process.stdin.isTTY || !process.stdout.isTTY) {
 		console.error(
-			'\n️This TUI requires an interactive terminal. Run this in a terminal (not the Node REPL or a non-interactive/debug console).\n',
+			'\n⚠ This TUI requires an interactive terminal. Run this in a terminal (not the Node REPL or a non-interactive/debug console).\n',
 		);
 		process.exit(1);
 	}
@@ -49,21 +23,28 @@ function init() {
  * @param {number} [opts.maxLines=10000] - Maximum number of lines to retain in captured output.
  * @returns {Promise<{output:string, stdout:string, stderr:string, code:number|null, isError:boolean, error:Error|null}>}
  */
-function run(command, opts = {}) {
+async function run(command, opts = {}) {
+	if (typeof command !== 'string' || !command.trim()) {
+		throw new TypeError('run() requires a non-empty string command');
+	}
+
 	const { maxLines = 10000 } = opts;
-	const normalized = path.normalize(command);
-	const split = normalized.split('/');
-	const convertedCommand = path.join(...split);
+	// import spawn at runtime so test mocks (vi.mock) take effect per-test
+	const { spawn } = await import('child_process');
 
 	function trimToLastNLines(s, n) {
 		if (!s) return s;
-		const lines = s.split(/\r?\n/);
-		if (lines.length <= n) return s;
-		return lines.slice(-n).join('\n');
+		// remove trailing newlines for accurate line counting
+		const hadTrailingNewline = /(?:\r?\n)$/.test(s);
+		const trimmed = s.replace(/(?:\r?\n)+$/g, '');
+		const lines = trimmed.split(/\r?\n/);
+		if (lines.length <= n) return hadTrailingNewline ? trimmed + '\n' : trimmed;
+		const out = lines.slice(-n).join('\n');
+		return hadTrailingNewline ? out + '\n' : out;
 	}
 
 	return new Promise((resolve) => {
-		const child = spawn(convertedCommand, { shell: true, stdio: 'pipe' });
+		const child = spawn(command, { shell: true, stdio: 'pipe' });
 
 		let stdout = '';
 		let stderr = '';
@@ -118,34 +99,19 @@ function run(command, opts = {}) {
 	});
 }
 
-/**
- * Register a callback to run when the process receives SIGINT (Ctrl+C).
- * - Accepts a function (may be async).
- * - Returns a disposer function that removes the listener.
- *
- * Note: spinner is started asynchronously (ora is lazy-loaded); onExit itself
- * remains synchronous so callers can register the handler immediately.
- */
 function onExit(cb) {
 	if (typeof cb !== 'function') {
 		throw new TypeError('onExit requires a callback function');
 	}
 
 	let called = false;
-	let exiting = null;
-
-	// start spinner asynchronously (best-effort; ignore load errors)
-	loadOra().then((o) => {
-		try {
-			exiting = o('Gracefully shutting down...').start();
-		} catch (e) {
-			/* ignore */
-		}
-	});
 
 	const handler = async () => {
 		if (called) return;
 		called = true;
+
+		const exiting = spinner('Gracefully shutting down...').start();
+
 		try {
 			await Promise.resolve(cb());
 		} catch (err) {
@@ -159,28 +125,17 @@ function onExit(cb) {
 	};
 
 	process.on('SIGINT', handler);
+	process.on('SIGTERM', handler);
+	process.on('SIGQUIT', handler);
 
-	// return a function that removes the listener in case the caller wants to cancel
-	return () => process.off('SIGINT', handler);
-}
-
-// `prompt` is an async wrapper around the ESM-only `@inquirer/prompts` package.
-// `prompt(...args)` forwards the call to the underlying module and returns its result.
-async function prompt(...args) {
-	const p = await loadPrompts();
-	if (!p) return null; // prompts unavailable in this environment
-	return p(...args);
+	return () => {
+		process.off('SIGINT', handler);
+		process.off('SIGTERM', handler);
+		process.off('SIGQUIT', handler);
+	};
 }
 
-async function spinner(...args) {
-	const s = await loadOra();
-	return s(...args);
-}
+const prompt = inquirer.default ?? inquirer;
+const spinner = ora.default ?? ora;
 
-module.exports = {
-	init,
-	run,
-	onExit,
-	prompt,
-	spinner,
-};
+export { init, run, onExit, prompt, spinner };

package/package.json

@@ -1,11 +1,12 @@
 {
 	"name": "@sandro-sikic/maker",
-	"version": "1.0.6",
+	"version": "1.0.8",
+	"type": "module",
 	"description": "A library to create dev cli",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"scripts": {
-		"test": "jest"
+		"test": "vitest"
 	},
 	"author": "sandro-sikic",
 	"repository": {
@@ -18,12 +19,6 @@
 		"ora": "^9.3.0"
 	},
 	"devDependencies": {
-		"archiver": "^5.3.1",
-		"pkg": "^5.8.1",
-		"rimraf": "^5.0.1",
-		"jest": "^29.7.0",
-		"babel-jest": "^29.7.0",
-		"@babel/core": "^7.23.0",
-		"@babel/preset-env": "^7.23.0"
+		"vitest": "^4.0.18"
 	}
 }