@udohjeremiah/moniq 0.3.2 → 0.3.3

package/dist/cli.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-import { n as loadConfig } from "./dist-B1TNZsla.js";
+import { n as loadConfig } from "./dist-DVPiOZCC.js";
 import path from "node:path";
-import { stdin } from "node:process";
-import { styleText } from "node:util";
 import { execFile, execFileSync } from "node:child_process";
+import { styleText } from "node:util";
+import { stdin } from "node:process";
 import { createInterface } from "node:readline/promises";
 //#region ../../node_modules/.pnpm/cac@7.0.0/node_modules/cac/dist/index.js
 function toArr(any) {
@@ -917,7 +917,7 @@ async function resolve(config, root, packages_) {
 }
 //#endregion
 //#region ../cli/dist/index.js
-var version = "0.3.2";
+var version = "0.3.3";
 function formatDiagnostics(diagnostics, options) {
 	if ((options?.format ?? "pretty") === "json") return formatJson(diagnostics);
 	return formatPretty(diagnostics, options?.isDryRun);
@@ -926,7 +926,7 @@ function formatJson(diagnostics) {
 	return `${JSON.stringify(diagnostics, void 0, 2)}\n`;
 }
 function formatPretty(diagnostics, isDryRun) {
-	if (diagnostics.length === 0) return styleText(["bold", "green"], "✅ No issues found.");
+	if (diagnostics.length === 0) return styleText(["bold", "green"], "✔ No issues found.");
 	const lines = [];
 	const byPackage = /* @__PURE__ */ new Map();
 	for (const d of diagnostics) {
@@ -935,7 +935,7 @@ function formatPretty(diagnostics, isDryRun) {
 		else byPackage.set(d.packageName, [d]);
 	}
 	for (const [packageName, diags] of byPackage) {
-		lines.push("", `📦 ${styleText(["bold", "cyan"], packageName)}`);
+		lines.push("", styleText(["bold", "cyan"], packageName));
 		for (const d of diags) pushDiagnostic(lines, d, isDryRun);
 	}
 	const errorCount = diagnostics.filter((d) => d.severity === "error").length;
@@ -944,25 +944,24 @@ function formatPretty(diagnostics, isDryRun) {
 	if (errorCount > 0) countParts.push(styleText("red", `${String(errorCount)} error(s)`));
 	if (warningCount > 0) countParts.push(styleText("yellow", `${String(warningCount)} warning(s)`));
 	const summary = countParts.join(", ");
-	const summaryLine = `📋 Found ${String(diagnostics.length)} issue(s) — ${summary.length > 0 ? summary : "all clear"}`;
+	const summaryLine = `${styleText("cyan", "ℹ")} Found ${String(diagnostics.length)} issue(s) — ${summary.length > 0 ? summary : "all clear"}`;
 	lines.push("", styleText("dim", summaryLine));
 	if (isDryRun) {
 		const fixableCount = diagnostics.filter((d) => d.fix && d.severity !== "off").length;
-		lines.push("", styleText("dim", `🔮 Dry-run: ${String(fixableCount)} fix(es) available`));
+		lines.push("", styleText("dim", `${styleText("cyan", "ℹ")} Dry-run: ${String(fixableCount)} fix(es) available`));
 	}
 	return lines.join("\n");
 }
 function pushDiagnostic(lines, d, isDryRun) {
 	const badge = severityBadge(d.severity);
-	const emoji = severityEmoji(d.severity);
-	lines.push(`  ${emoji} ${badge} ${d.message}`);
+	const icon = severityIcon(d.severity);
+	lines.push(`  ${icon} ${badge} ${d.message}`);
 	if (d.expected && d.actual) lines.push(`         ${styleText("dim", "Expected:")} ${styleText("cyan", d.expected)}`, `         ${styleText("dim", "Actual:")}   ${styleText("red", d.actual)}`);
 	else if (d.expected) lines.push(`         ${styleText("dim", "Expected:")} ${styleText("cyan", d.expected)}`);
 	else if (d.actual) lines.push(`         ${styleText("dim", "Actual:")}   ${styleText("red", d.actual)}`);
 	if (d.fix) {
 		const label = styleText("dim", isDryRun ? "Would fix:" : "Fix:");
-		const icon = isDryRun ? "🔮" : "🔧";
-		lines.push(`         ${icon} ${label} ${d.fix}`);
+		lines.push(`         ${label} ${d.fix}`);
 	}
 }
 function severityBadge(severity) {
@@ -970,10 +969,10 @@ function severityBadge(severity) {
 	if (severity === "warn") return styleText(["bold", "yellow"], "WARN");
 	return styleText("gray", "OFF");
 }
-function severityEmoji(severity) {
-	if (severity === "error") return "❌";
-	if (severity === "warn") return "⚠️ ";
-	return "⚪";
+function severityIcon(severity) {
+	if (severity === "error") return "✘";
+	if (severity === "warn") return "⚠";
+	return " ";
 }
 async function applyScriptFixes(diagnostics, options) {
 	const fixable = diagnostics.filter((d) => d.fix && d.severity !== "off");
@@ -1022,8 +1021,8 @@ async function check(options) {
 	let config;
 	try {
 		config = await loadConfig(cwd);
-	} catch {
-		throw new Error("No moniq.config file found in or above the current directory.");
+	} catch (error) {
+		throw new Error(`Failed to load moniq.config: ${String(error)}`, { cause: error });
 	}
 	const packages = await discoverWorkspace(cwd);
 	if (packages.length === 0) throw new Error("No workspace packages found.");
@@ -1031,7 +1030,7 @@ async function check(options) {
 	let fixSummary;
 	if (options.fix) fixSummary = await applyScriptFixes(diagnostics, { isDryRun: options.isDryRun });
 	if (options.format !== "json") {
-		console.log(`  🔍 Scanned ${String(packages.length)} package(s)`);
+		console.log(`  ${styleText("cyan", "ℹ")} Scanned ${String(packages.length)} package(s)`);
 		console.log();
 	}
 	console.log(formatDiagnostics(diagnostics, {
@@ -1039,29 +1038,18 @@ async function check(options) {
 		isDryRun: options.isDryRun
 	}));
 	if (fixSummary) if (fixSummary.isDryRun) {
-		const message = `🔮 Dry-run: ${String(fixSummary.fixed)} fix(es) available, ${String(fixSummary.errors)} error(s)`;
+		const message = `${styleText("cyan", "ℹ")} Dry-run: ${String(fixSummary.fixed)} fix(es) available, ${String(fixSummary.errors)} error(s)`;
 		console.log(styleText("dim", message));
 	} else {
-		const message = `✅ Fixed ${String(fixSummary.fixed)} issue(s) across ${String(fixSummary.packageCount)} package(s)`;
+		const message = `✔ Fixed ${String(fixSummary.fixed)} issue(s) across ${String(fixSummary.packageCount)} package(s)`;
 		console.log(styleText(["bold", "green"], message));
 	}
 }
 async function doctor() {
 	const cwd = process.cwd();
 	const issues = [];
-	try {
-		const config = await loadConfig(cwd);
-		issues.push({
-			message: "moniq.config file found and loadable.",
-			severity: "warn"
-		});
-		checkScriptPolicies(config, issues);
-	} catch {
-		issues.push({
-			message: "No moniq.config file found in or above the current directory.",
-			severity: "error"
-		});
-	}
+	console.log();
+	console.log(`  ${styleText("bold", "Configuration Doctor")}`);
 	try {
 		const packageCount = (await discoverWorkspace(cwd)).length;
 		if (packageCount === 0) issues.push({
@@ -1070,7 +1058,7 @@ async function doctor() {
 		});
 		else issues.push({
 			message: `Detected ${String(packageCount)} workspace package(s).`,
-			severity: "warn"
+			severity: "info"
 		});
 	} catch {
 		issues.push({
@@ -1078,25 +1066,33 @@ async function doctor() {
 			severity: "error"
 		});
 	}
+	try {
+		const config = await loadConfig(cwd);
+		issues.push({
+			message: "moniq.config file found and loadable.",
+			severity: "info"
+		});
+		checkScriptPolicies(config, issues);
+	} catch (error) {
+		issues.push({
+			message: `Failed to load moniq.config: ${String(error)}`,
+			severity: "error"
+		});
+	}
 	console.log();
-	console.log(`  ${styleText("bold", "🏥 Configuration Doctor")}`);
-	console.log();
-	if (issues.length === 0) {
-		console.log(`  ${styleText(["bold", "green"], "✅ Everything looks good!")}`);
+	issues.sort((a, b) => severityIndex(a.severity) - severityIndex(b.severity));
+	if (!issues.some((issue) => issue.severity !== "info")) {
+		console.log(`  ${styleText(["bold", "green"], "✔ Everything looks good!")}`);
 		return;
 	}
-	for (const issue of issues) {
-		const icon = issue.severity === "error" ? "❌" : "⚠️ ";
-		const label = issue.severity === "error" ? styleText(["bold", "red"], "ERROR") : styleText(["bold", "yellow"], "WARN");
-		console.log(`  ${icon} ${label} ${issue.message}`);
-	}
-	const errorCount = issues.filter((index) => index.severity === "error").length;
-	const warningCount = issues.filter((index) => index.severity === "warn").length;
+	for (const issue of issues) console.log(formatIssue(issue));
+	const errorCount = issues.filter((issue) => issue.severity === "error").length;
+	const warningCount = issues.filter((issue) => issue.severity === "warn").length;
 	const summary = styleText("dim", `Found ${`${String(errorCount)} error(s)`}, ${`${String(warningCount)} warning(s)`}`);
 	console.log();
 	console.log(`  ${summary}`);
 	if (errorCount > 0) {
-		const tip = styleText(["bold", "cyan"], "💡 Tip:");
+		const tip = styleText(["bold", "cyan"], "Tip:");
 		const hint = styleText("dim", "moniq init");
 		console.log();
 		console.log(`  ${tip} Run ${hint} to scaffold a starter configuration.`);
@@ -1120,6 +1116,30 @@ function checkScriptPolicies(config, issues) {
 		}
 	}
 }
+function formatIssue(issue) {
+	let icon;
+	let label;
+	let iconColor;
+	if (issue.severity === "error") {
+		icon = "✘";
+		label = styleText(["bold", "red"], "ERROR");
+		iconColor = "dim";
+	} else if (issue.severity === "warn") {
+		icon = "⚠";
+		label = styleText(["bold", "yellow"], "WARN");
+		iconColor = "dim";
+	} else {
+		icon = "ℹ";
+		label = styleText(["bold", "cyan"], "INFO");
+		iconColor = "cyan";
+	}
+	return `  ${styleText(iconColor, icon)} ${label} ${issue.message}`;
+}
+function severityIndex(severity) {
+	if (severity === "error") return 2;
+	if (severity === "warn") return 1;
+	return 0;
+}
 const colorFns = [
 	(s) => styleText("cyan", s),
 	(s) => styleText("magenta", s),
@@ -1166,7 +1186,7 @@ const letterRows = [
 		"██║   ██║",
 		"██║   ██║",
 		"╚██████╔╝",
-		" ╚════╝╗ "
+		" ╚════╝╲╲ "
 	]
 ];
 const DESCRIPTION = "Policy-driven workspace linter for JavaScript/TypeScript monorepos.";
@@ -1217,14 +1237,15 @@ export default defineConfig({
 async function detectLang(cwd, packageJson) {
 	const rawDependencies = packageJson["dependencies"];
 	const rawDevelopmentDependencies = packageJson["devDependencies"];
+	const isModule = packageJson["type"] === "module";
 	const { access } = await import("node:fs/promises");
 	try {
 		await access(path.join(cwd, "tsconfig.json"));
-		return "ts";
+		return isModule ? "ts" : "mts";
 	} catch {}
-	if (typeof rawDependencies === "object" && rawDependencies !== null && Object.hasOwn(rawDependencies, "typescript")) return "ts";
-	if (typeof rawDevelopmentDependencies === "object" && rawDevelopmentDependencies !== null && Object.hasOwn(rawDevelopmentDependencies, "typescript")) return "ts";
-	return "js";
+	if (typeof rawDependencies === "object" && rawDependencies !== null && Object.hasOwn(rawDependencies, "typescript")) return isModule ? "ts" : "mts";
+	if (typeof rawDevelopmentDependencies === "object" && rawDevelopmentDependencies !== null && Object.hasOwn(rawDevelopmentDependencies, "typescript")) return isModule ? "ts" : "mts";
+	return isModule ? "js" : "mjs";
 }
 async function init(options) {
 	const { _cwd, lang: explicitLang } = options;
@@ -1243,10 +1264,10 @@ async function init(options) {
 	const configPath = path.join(cwd, filename);
 	if (!await handleExistingConfig(configPath, filename)) return;
 	let workspaceLabel = "single package";
-	let packages = [];
+	let childPackages = [];
 	try {
-		packages = await discoverWorkspace(cwd);
-		if (packages.length > 1) workspaceLabel = `monorepo with ${String(packages.length)} packages`;
+		childPackages = (await discoverWorkspace(cwd)).filter((p) => path.resolve(cwd, p.path) !== path.resolve(cwd));
+		if (childPackages.length > 1) workspaceLabel = `monorepo with ${String(childPackages.length)} packages`;
 	} catch {
 		workspaceLabel = "unknown (workspace detection failed)";
 	}
@@ -1264,7 +1285,7 @@ async function init(options) {
 	const labelIndent = " ".repeat(19);
 	console.log(topDivider);
 	console.log(`    ${dim(labelPad("Workspace:"))} ${cyan(workspaceLabel)}`);
-	if (packages.length > 1) for (const package_ of packages) {
+	if (childPackages.length > 1) for (const package_ of childPackages) {
 		const bullet = dim(`• ${path.relative(cwd, package_.path)}`);
 		console.log(`    ${labelIndent}${bullet}`);
 	}
@@ -1277,11 +1298,10 @@ async function init(options) {
 		try {
 			await installPackage(pm, cwd, options.version);
 			stopSpinner();
-			console.log(`  ✅ Installed @udohjeremiah/moniq as devDependency`);
-			console.log();
+			console.log(`  ✔ Installed @udohjeremiah/moniq as devDependency`);
 		} catch (error) {
 			stopSpinner();
-			const styledError = styleText("red", `❌ ${`Installation failed: ${String(error)}`}`);
+			const styledError = styleText("red", `✘ ${`Installation failed: ${String(error)}`}`);
 			console.log(`  ${styledError}`);
 			console.log(`  ${styleText("dim", "Make sure you have a working internet connection and try again.")}`);
 			console.log();
@@ -1291,11 +1311,9 @@ async function init(options) {
 	}
 	const { writeFile } = await import("node:fs/promises");
 	await writeFile(configPath, STARTER_CONFIG, "utf8");
-	const createdMessage = `✅ Created ${filename}`;
+	const createdMessage = `✔ Created ${filename}`;
 	console.log(`  ${styleText(["bold", "green"], createdMessage)}`);
 	console.log();
-	await doctor();
-	console.log();
 	console.log(`  ${styleText("dim", "Next steps:")}`);
 	console.log(`   1. ${styleText("dim", "Edit")} ${styleText("cyan", filename)} ${styleText("dim", "to configure your policies.")}`);
 	console.log(`   2. ${styleText("dim", "Run")} ${styleText("cyan", "moniq check")} ${styleText("dim", "to validate your workspace.")}`);