@alint-js/cli 0.0.22 → 0.0.24

package/README.md

@@ -421,11 +421,7 @@ import { defineRule } from '@alint-js/core'
 
 export const checkFunctionRule = defineRule({
   create: ctx => ({
-    async onTarget(target) {
-      if (target.kind !== 'function') {
-        return
-      }
-
+    async onTargetFunction(target) {
       const model = await ctx.model({ capabilities: ['tool-call'], size: 'small' })
 
       ctx.report({
@@ -467,7 +463,7 @@ Rule authors can opt out of caching when a rule depends on external state:
 defineRule({
   cache: false,
   create: ctx => ({
-    onTarget(target) {
+    onTargetFile(target) {
       // Always reruns.
     },
   }),

package/dist/bin/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as executeCli } from "../cli-CmLooFry.mjs";
+import { t as executeCli } from "../cli-BsgD2UWS.mjs";
 import process from "node:process";
 //#region src/bin/index.ts
 executeCli(process.argv, {

package/dist/{cli-CmLooFry.mjs → cli-BsgD2UWS.mjs}

@@ -1,12 +1,12 @@
 import process from "node:process";
 import { inspect } from "node:util";
 import { cac } from "cac";
+import { appendFile, mkdir, readFile, readdir, rm, stat } from "node:fs/promises";
 import { getGlobalSetupConfigPath, getProjectSetupConfigPath, getStatsDir, installStaticPlugins, loadAlintConfig, loadSetupConfig, mergeSetupConfigs, writeSetupConfig } from "@alint-js/config";
-import { AlintRunError, hasDiscoveryFilePatterns, matchesDiscoveryFile, normalizeConfig, resolveConfigForFile, runAlint } from "@alint-js/core";
+import { AlintRunError, hasDiscoveryFilePatterns, matchesDiscoveryFile, normalizeConfig, resolveConfigForDirectory, resolveConfigForFile, runAlint } from "@alint-js/core";
 import { isAbsolute, join, relative, resolve } from "pathe";
 import { getBorderCharacters, table } from "table";
 import { errorMessageFrom } from "@moeru/std/error";
-import { appendFile, mkdir, readFile, readdir, rm, stat } from "node:fs/promises";
 import c, { createColors } from "tinyrainbow";
 import cliSpinners from "cli-spinners";
 import { relative as relative$1 } from "node:path";
@@ -14,7 +14,7 @@ import Gitignore from "gitignore-fs";
 import { Minimatch, minimatch } from "minimatch";
 import { errorMessageFrom as errorMessageFrom$1 } from "@moeru/std";
 //#region package.json
-var version = "0.0.22";
+var version = "0.0.24";
 //#endregion
 //#region src/cli/commands/command.ts
 function defineCommand(node) {
@@ -208,15 +208,17 @@ function shouldSkipOptionValue(arg) {
 //#endregion
 //#region src/cli/commands/config/inspect.ts
 const inspect$2 = defineCommand({
-	action: (context, file, options) => runConfigInspectCommand(file, options.config, context.io),
-	arguments: "<file>",
-	description: "Inspect resolved config for a file",
+	action: (context, path, options) => runConfigInspectCommand(path, options.config, context.io),
+	arguments: "<path>",
+	description: "Inspect resolved config for a file or directory",
 	name: "inspect"
 });
-async function runConfigInspectCommand(file, configPath, io) {
+async function runConfigInspectCommand(path, configPath, io) {
 	const config = await loadAlintConfig(io.cwd, configPath);
-	const result = resolveConfigForFile(resolve(io.cwd, file), config, { cwd: io.cwd });
-	io.stdout.write(`file: ${file}\n`);
+	const targetPath = resolve(io.cwd, path);
+	const isDirectory = await stat(targetPath).then((stats) => stats.isDirectory()).catch(() => false);
+	const result = isDirectory ? resolveConfigForDirectory(targetPath, config, { cwd: io.cwd }) : resolveConfigForFile(targetPath, config, { cwd: io.cwd });
+	io.stdout.write(`${isDirectory ? "directory" : "file"}: ${path}\n`);
 	io.stdout.write(`ignored: ${result.ignored ? "yes" : "no"}\n`);
 	io.stdout.write("matched:\n");
 	for (const item of result.matched) io.stdout.write(`  - ${item.name ?? "<anonymous>"}\n`);
@@ -546,8 +548,9 @@ function formatJson(result) {
 const colors$2 = createColors({ force: true });
 function formatStylish(input, options = {}) {
 	const diagnostics = Array.isArray(input) ? input : input.diagnostics;
-	const totalTokens = Array.isArray(input) ? void 0 : input.usage.totalTokens;
-	if (diagnostics.length === 0) return "";
+	const result = Array.isArray(input) ? void 0 : input;
+	const style = createStyle(options.color === true);
+	if (diagnostics.length === 0) return result?.execution?.cached ? `${formatSummary(diagnostics, result, style)}\n` : "";
 	const diagnosticsByFile = /* @__PURE__ */ new Map();
 	for (const diagnostic of diagnostics) {
 		const fileDiagnostics = diagnosticsByFile.get(diagnostic.filePath);
@@ -558,7 +561,6 @@ function formatStylish(input, options = {}) {
 		diagnosticsByFile.set(diagnostic.filePath, [diagnostic]);
 	}
 	const lines = [];
-	const style = createStyle(options.color === true);
 	for (const [filePath, fileDiagnostics] of diagnosticsByFile) {
 		lines.push(style.file(filePath));
 		for (const diagnostic of fileDiagnostics) {
@@ -569,9 +571,12 @@ function formatStylish(input, options = {}) {
 		}
 		lines.push("");
 	}
-	lines.push("", formatSummary(diagnostics, totalTokens, style));
+	lines.push("", formatSummary(diagnostics, result, style));
 	return `${lines.join("\n")}\n`;
 }
+function countCachedDiagnostics(diagnostics, severity) {
+	return diagnostics.filter((diagnostic) => diagnostic.severity === severity && diagnostic.cached === true).length;
+}
 function countDiagnostics$2(diagnostics, severity) {
 	return diagnostics.filter((diagnostic) => diagnostic.severity === severity).length;
 }
@@ -593,13 +598,32 @@ function createStyle(color) {
 		warning: colors$2.yellow
 	};
 }
-function formatSummary(diagnostics, totalTokens, style) {
+function formatDiagnosticCount(total, cached, label) {
+	return `${total} ${label}${cached > 0 ? ` (${cached} cached)` : ""}`;
+}
+function formatExecutionSummary(execution) {
+	if (!execution || execution.cached === 0) return;
+	return `${execution.cached}/${execution.planned} cached`;
+}
+function formatSummary(diagnostics, result, style) {
 	const warnCount = countDiagnostics$2(diagnostics, "warn");
 	const errorCount = countDiagnostics$2(diagnostics, "error");
-	const tokens = totalTokens === void 0 ? void 0 : `${totalTokens.toLocaleString("en-US")} tokens`;
-	const problemSummary = [style.warning(`${warnCount} warn`), style.error(`${errorCount} error`)].join(" / ");
+	const cachedWarnCount = countCachedDiagnostics(diagnostics, "warn");
+	const cachedErrorCount = countCachedDiagnostics(diagnostics, "error");
+	const tokens = result === void 0 ? void 0 : formatTokenSummary(result);
+	const problemSummary = [style.warning(formatDiagnosticCount(warnCount, cachedWarnCount, "warn")), style.error(formatDiagnosticCount(errorCount, cachedErrorCount, "error"))].join(" / ");
 	if (tokens === void 0) return problemSummary;
-	return `${problemSummary} | ${style.summaryToken(tokens)}`;
+	const execution = formatExecutionSummary(result?.execution);
+	return [
+		problemSummary,
+		style.summaryToken(tokens),
+		execution
+	].filter((segment) => segment !== void 0).join(" | ");
+}
+function formatTokenSummary(result) {
+	const liveTokens = result.usage.totalTokens.toLocaleString("en-US");
+	const cachedTokens = result.usage.cached?.totalTokens ?? 0;
+	return `${liveTokens} tokens${cachedTokens > 0 ? ` (${cachedTokens.toLocaleString("en-US")} cached)` : ""}`;
 }
 function identity(value) {
 	return value;
@@ -640,7 +664,7 @@ function countDiagnostics$1(diagnostics, severity) {
 //#region src/cli/reporters/progress/summary.ts
 const colors$1 = createColors({ force: true });
 function createSummaryProgressReporter(options) {
-	const now = () => options.clock?.() ?? Date.now();
+	const now = Date.now;
 	const state = {
 		cached: 0,
 		completed: 0,
@@ -988,10 +1012,10 @@ var NoFilesFoundError = class extends Error {
 		this.pattern = pattern;
 	}
 };
-async function findFiles(options) {
+async function findLintTargets(options) {
 	const { config, cwd, errorOnUnmatchedPattern = true, globInputPaths = true, inputs } = options;
 	const gitignore = shouldFilterGitignoredFiles(config) ? new Gitignore() : void 0;
-	const candidates = await resolveInputFiles({
+	const targets = await resolveInputFiles({
 		config,
 		cwd,
 		errorOnUnmatchedPattern,
@@ -999,13 +1023,16 @@ async function findFiles(options) {
 		globInputPaths,
 		inputs: inputs.length > 0 ? inputs : ["."]
 	});
-	if (!gitignore || candidates.length === 0) return candidates;
+	if (!gitignore || targets.files.length === 0) return targets;
 	const lintFiles = [];
-	for (const file of candidates) {
+	for (const file of targets.files) {
 		if (await gitignore.ignores(resolve(cwd, file))) continue;
 		lintFiles.push(file);
 	}
-	return lintFiles;
+	return {
+		directories: targets.directories,
+		files: lintFiles
+	};
 }
 function collectGlobalIgnorePatterns(config) {
 	return normalizeConfig(config).flatMap((item) => isGlobalIgnoreItem(item) ? [...item.ignores] : []);
@@ -1046,6 +1073,7 @@ async function resolveInputFiles(options) {
 	const hasFilePatterns = hasDiscoveryFilePatterns(options.config);
 	const ignoredPatterns = collectGlobalIgnorePatterns(options.config);
 	const candidates = [];
+	const directories = [];
 	for (const input of options.inputs) {
 		const path = resolve(options.cwd, input);
 		const stats = await statPath(path);
@@ -1054,12 +1082,13 @@ async function resolveInputFiles(options) {
 			continue;
 		}
 		if (stats?.isDirectory()) {
-			if (!hasFilePatterns) continue;
 			if (await shouldPruneDirectory(path, {
 				cwd: options.cwd,
 				gitignore: options.gitignore,
 				ignoredPatterns
 			})) continue;
+			directories.push(input);
+			if (!hasFilePatterns) continue;
 			const directoryFiles = (await walkFiles(path, {
 				cwd: options.cwd,
 				gitignore: options.gitignore,
@@ -1086,7 +1115,10 @@ async function resolveInputFiles(options) {
 		}
 		if (options.errorOnUnmatchedPattern) throw new NoFilesFoundError(input, { globInputPaths: options.globInputPaths });
 	}
-	return [...new Set(candidates)];
+	return {
+		directories: [...new Set(directories)],
+		files: [...new Set(candidates)]
+	};
 }
 async function searchGlob(options) {
 	const root = resolve(options.cwd, getGlobParent(options.pattern));
@@ -1256,11 +1288,10 @@ function parseSince(time, now) {
 const DEFAULT_RETENTION_MONTHS = 12;
 const STATS_FILE_PATTERN = /^stats-(\d{4})-(\d{2})\.jsonl$/u;
 function createJsonlStatsStore(options) {
-	const now = options.clock ?? Date.now;
 	const retentionMonths = options.retentionMonths ?? DEFAULT_RETENTION_MONTHS;
 	return {
-		query: (filter) => query(options.dir, filter ?? {}, now),
-		record: (input) => record(options.dir, input, now(), retentionMonths)
+		query: (filter) => query(options.dir, filter ?? {}, Date.now),
+		record: (input) => record(options.dir, input, Date.now(), retentionMonths)
 	};
 }
 function accumulate(rows, key, inTok, outTok, totalTok, countRun) {
@@ -1539,9 +1570,9 @@ function isNodeError(error) {
 async function runLintCommand(files, options, io, interceptConsoleOutput) {
 	if (options.config) await assertConfigExists(io.cwd, options.config);
 	const [setupConfig, config] = await Promise.all([loadMergedSetupConfig(io), loadAlintConfig(io.cwd, options.config)]);
-	let lintFiles;
+	let lintTargets;
 	try {
-		lintFiles = await findFiles({
+		lintTargets = await findLintTargets({
 			config,
 			cwd: io.cwd,
 			errorOnUnmatchedPattern: true,
@@ -1571,7 +1602,8 @@ async function runLintCommand(files, options, io, interceptConsoleOutput) {
 		result = await runAlint({
 			config,
 			cwd: io.cwd,
-			files: lintFiles,
+			directories: lintTargets.directories,
+			files: lintTargets.files,
 			modelOverride: options.model,
 			outputLanguage: options.outputLanguage,
 			progress: mergeProgressReporters(progress?.reporter, statsCollector?.reporter),
@@ -1591,7 +1623,7 @@ async function runLintCommand(files, options, io, interceptConsoleOutput) {
 	progress?.dispose();
 	if (statsTarget && statsCollector) await writeRunStats(statsTarget, statsCollector, result, io.cwd);
 	io.stdout.write(formatDiagnostics(options.format, result, { color: io.stdout.isTTY === true }));
-	return result.diagnostics.length > 0 ? 1 : 0;
+	return result.diagnostics.some((diagnostic) => diagnostic.severity === "error") ? 1 : 0;
 }
 function shouldEnableProgress(options, io) {
 	if (options.progress !== void 0) return options.progress;
@@ -1646,7 +1678,7 @@ async function inspectOutputFile(io, file, options) {
 		io.stderr.write(`${errorMessageFrom$1(error)}\n`);
 		return 2;
 	}
-	return parsed.diagnostics.length > 0 ? 1 : 0;
+	return parsed.diagnostics.some((diagnostic) => diagnostic.severity === "error") ? 1 : 0;
 }
 function isDiagnostic(value) {
 	if (!isRecord(value)) return false;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { i as formatJson, n as formatDiagnostics, r as formatStylish, t as executeCli } from "./cli-CmLooFry.mjs";
+import { i as formatJson, n as formatDiagnostics, r as formatStylish, t as executeCli } from "./cli-BsgD2UWS.mjs";
 import { ignorePatternsAIAgents, ignorePatternsBuildOutputs, ignorePatternsCaches, ignorePatternsCommon, ignorePatternsEslintDefaults, ignorePatternsGenerated } from "@alint-js/config";
 import { defineConfig } from "@alint-js/core";
 export { defineConfig, executeCli, formatDiagnostics, formatJson, formatStylish, ignorePatternsAIAgents, ignorePatternsBuildOutputs, ignorePatternsCaches, ignorePatternsCommon, ignorePatternsEslintDefaults, ignorePatternsGenerated };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alint-js/cli",
   "type": "module",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "exports": {
     ".": {
       "types": "./dist/index.d.mts",
@@ -25,8 +25,8 @@
     "pathe": "^2.0.3",
     "table": "^6.9.0",
     "tinyrainbow": "^3.1.0",
-    "@alint-js/config": "0.0.22",
-    "@alint-js/core": "0.0.22"
+    "@alint-js/config": "0.0.24",
+    "@alint-js/core": "0.0.24"
   },
   "devDependencies": {
     "@pnpm/find-workspace-dir": "^1000.1.5",