@aklinker1/check 2.3.0 → 2.3.1

package/dist/cli.js

@@ -1,8 +1,7 @@
-import { i as ALL_TOOLS, t as check } from "./src-B6y5RIK9.js";
-import { isCI } from "ci-info";
+import { a as isCi, i as ALL_TOOLS, t as check } from "./src-35ZaX6Fv.js";
 
 //#region package.json
-var version = "2.3.0";
+var version = "2.3.1";
 
 //#endregion
 //#region src/cli.ts
@@ -28,7 +27,7 @@ if (boolArg("-h") || boolArg("--help")) {
 	process.exit(0);
 }
 await check({
-	fix: boolArg("-f") ?? boolArg("--fix") ?? !isCI,
+	fix: boolArg("-f") ?? boolArg("--fix") ?? !isCi,
 	debug: boolArg("-d") ?? boolArg("--debug") ?? false,
 	root: args.find((arg) => !arg.startsWith("-")) ?? "."
 });

package/dist/index.js

@@ -1,3 +1,3 @@
-import { n as renderProblem, r as renderProblemGroup, t as check } from "./src-B6y5RIK9.js";
+import { n as renderProblem, r as renderProblemGroup, t as check } from "./src-35ZaX6Fv.js";
 
 export { check, renderProblem, renderProblemGroup };

package/dist/{src-B6y5RIK9.js → src-35ZaX6Fv.js}

@@ -1,10 +1,12 @@
-import { isCI } from "ci-info";
 import { readFile } from "node:fs/promises";
 import { join, relative, resolve, sep } from "node:path";
 import readline from "node:readline";
 import { spawn } from "node:child_process";
 
 //#region src/utils.ts
+const env = process.env;
+const isCi = Boolean(env.CI || env.JENKINS_URL);
+const isDebug = env.DEBUG === "true" || env.DEBUG === "1";
 function exec(cmd, opts) {
 	return new Promise((resolve$1, reject) => {
 		const child = spawn(cmd, {
@@ -31,12 +33,12 @@ function exec(cmd, opts) {
 		});
 	});
 }
-async function execAndParse(cmd, cwd, parser) {
-	const res = await exec(cmd, { cwd });
+async function execAndParse(cmd, cwd$1, parser) {
+	const res = await exec(cmd, { cwd: cwd$1 });
 	if (res.exitCode == null) throw Error("Exit code was null");
-	if (isDebug()) console.debug({
+	if (isDebug) console.debug({
 		cmd,
-		cwd,
+		cwd: cwd$1,
 		...res
 	});
 	return parser({
@@ -45,9 +47,6 @@ async function execAndParse(cmd, cwd, parser) {
 		stdout: res.stdout
 	});
 }
-function isDebug() {
-	return process.env.DEBUG === "true" || process.env.DEBUG === "1";
-}
 const bold = (str) => `\x1b[1m${str}\x1b[0m`;
 const dim = (str) => `\x1b[2m${str}\x1b[0m`;
 const red = (str) => `\x1b[31m${str}\x1b[0m`;
@@ -60,7 +59,7 @@ function humanMs(ms) {
 	return `${minutes > 0 ? `${minutes}m ` : ""}${seconds}s`;
 }
 function debug(message) {
-	if (isDebug()) console.debug(dim("⚙ " + message));
+	if (isDebug) console.debug(dim("⚙ " + message));
 }
 
 //#endregion
@@ -157,9 +156,11 @@ const eslint = ({ root }) => {
 		fix: () => execAndParse(fixCmd, root, parseOutput$6)
 	};
 };
+const NEWLINE_REGEX$5 = /\r?\n/;
+const LINT_REGEX$1 = /^(?<file>.*?): line (?<line>[0-9]+), col (?<column>[0-9]+), (?<kind>\S+) - (?<message>.*?) \((?<rule>\S*?)\)$/;
 const parseOutput$6 = ({ stdout, stderr }) => {
-	return `${stdout}\n${stderr}`.split(/\r?\n/).reduce((acc, line) => {
-		const groups = /^(?<file>.*?): line (?<line>[0-9]+), col (?<column>[0-9]+), (?<kind>\S+) - (?<message>.*?) \((?<rule>\S*?)\)$/.exec(line)?.groups;
+	return `${stdout}\n${stderr}`.split(NEWLINE_REGEX$5).reduce((acc, line) => {
+		const groups = LINT_REGEX$1.exec(line)?.groups;
 		if (groups) acc.push({
 			file: groups.file,
 			kind: groups.kind === "Warning" ? "warning" : "error",
@@ -213,7 +214,7 @@ const oxfmt = ({ root }) => {
 		fix: () => execAndParse(fixCmd, root, parseOutput$4)
 	};
 };
-const NEWLINE_REGEX = /\r?\n/;
+const NEWLINE_REGEX$4 = /\r?\n/;
 const SYNTAX_ERROR_REGEX = /^\s*?[×✕]\s+(?<message>.+?)\r?\n\s+╭─\[(?<file>.+?):(?<line>[0-9]+):(?<column>[0-9]+)\]/;
 const parseOutput$4 = ({ stdout, stderr }) => {
 	const problems = [];
@@ -226,7 +227,7 @@ const parseOutput$4 = ({ stdout, stderr }) => {
 			column: parseInt(groups.column, 10)
 		}
 	});
-	for (const line of stdout.trim().split(NEWLINE_REGEX)) {
+	for (const line of stdout.trim().split(NEWLINE_REGEX$4)) {
 		if (!line || line.includes(" ")) continue;
 		problems.push({
 			file: line.trim(),
@@ -249,9 +250,11 @@ const oxlint = ({ root }) => {
 		fix: () => execAndParse(fixCmd, root, parseOutput$3)
 	};
 };
+const NEWLINE_REGEX$3 = /\r?\n/;
+const LINT_REGEX = /^(?<file>.+?):(?<line>[0-9]+):(?<column>[0-9]+):\s?(?<message>.*?)\s?\[(?<kind>Warning|Error)\/?(?<rule>.*?)\]\s?$/;
 const parseOutput$3 = ({ stdout }) => {
-	if (stdout.trim()) return stdout.split(/\r?\n/).reduce((acc, line) => {
-		const groups = /^(?<file>.+?):(?<line>[0-9]+):(?<column>[0-9]+):\s?(?<message>.*?)\s?\[(?<kind>Warning|Error)\/?(?<rule>.*?)\]\s?$/.exec(line)?.groups;
+	return stdout.split(NEWLINE_REGEX$3).reduce((acc, line) => {
+		const groups = LINT_REGEX.exec(line)?.groups;
 		if (groups) acc.push({
 			file: groups.file,
 			kind: groups.kind === "Error" ? "error" : "warning",
@@ -264,11 +267,6 @@ const parseOutput$3 = ({ stdout }) => {
 		});
 		return acc;
 	}, []);
-	return stdout.trim().split(/\r?\n/).map((line) => line.trim()).filter((line) => !!line && !line.includes(" ")).map((line) => ({
-		file: line.trim(),
-		kind: "warning",
-		message: "Not formatted."
-	}));
 };
 
 //#endregion
@@ -283,9 +281,11 @@ const prettier = ({ root }) => {
 		fix: () => execAndParse(fixCmd, root, parseOutput$2)
 	};
 };
+const NEWLINE_REGEX$2 = /\r?\n/;
+const ERROR_REGEX$2 = /^\[(?<kind>.+?)\]\s?(?<file>.+?):\s?(?<message>.*?)\s?\((?<line>[0-9]+):(?<column>[0-9]+)\)$/;
 const parseOutput$2 = ({ stdout, stderr }) => {
-	if (stderr.trim()) return stderr.split(/\r?\n/).reduce((acc, line) => {
-		const groups = /^\[(?<kind>.+?)\]\s?(?<file>.+?):\s?(?<message>.*?)\s?\((?<line>[0-9]+):(?<column>[0-9]+)\)$/.exec(line)?.groups;
+	if (stderr.trim()) return stderr.split(NEWLINE_REGEX$2).reduce((acc, line) => {
+		const groups = ERROR_REGEX$2.exec(line)?.groups;
 		if (groups) acc.push({
 			file: groups.file,
 			kind: groups.kind === "error" ? "error" : "warning",
@@ -297,7 +297,7 @@ const parseOutput$2 = ({ stdout, stderr }) => {
 		});
 		return acc;
 	}, []);
-	return stdout.trim().split(/\r?\n/).map((line) => line.trim()).filter((line) => !!line && !line.includes(" ")).map((line) => ({
+	return stdout.trim().split(NEWLINE_REGEX$2).map((line) => line.trim()).filter((line) => !!line && !line.includes(" ")).map((line) => ({
 		file: line.trim(),
 		kind: "warning",
 		message: "Not formatted."
@@ -314,14 +314,16 @@ const publint = ({ root }) => {
 		check: () => execAndParse(cmd, root, parseOutput$1)
 	};
 };
+const NEWLINE_REGEX$1 = /\r?\n/;
+const ERROR_REGEX$1 = /^[0-9]+\.\s?(?<message>.*)$/;
 const parseOutput$1 = ({ stdout }) => {
 	let kind = "warning";
-	return stdout.split(/\r?\n/).reduce((acc, line) => {
+	return stdout.split(NEWLINE_REGEX$1).reduce((acc, line) => {
 		if (line.includes("Errors:")) {
 			kind = "error";
 			return acc;
 		}
-		const groups = /^[0-9]+\.\s?(?<message>.*)$/.exec(line)?.groups;
+		const groups = ERROR_REGEX$1.exec(line)?.groups;
 		if (groups == null) return acc;
 		acc.push({
 			kind,
@@ -361,9 +363,11 @@ const typescript = async ({ root, packageJson }) => {
 		check: async () => execAndParse(mod.cmd, root, parseOutput)
 	};
 };
+const NEWLINE_REGEX = /\r?\n/;
+const ERROR_REGEX = /^(?<file>\S+?)\((?<line>[0-9]+),(?<column>[0-9]+)\): \w+? (?<rule>TS[0-9]+): (?<message>.*)$/;
 const parseOutput = ({ stdout }) => {
-	return stdout.split(/\r?\n/).reduce((acc, line) => {
-		const groups = /^(?<file>\S+?)\((?<line>[0-9]+),(?<column>[0-9]+)\): \w+? (?<rule>TS[0-9]+): (?<message>.*)$/.exec(line)?.groups;
+	return stdout.split(NEWLINE_REGEX).reduce((acc, line) => {
+		const groups = ERROR_REGEX.exec(line)?.groups;
 		if (groups) acc.push({
 			file: groups.file,
 			kind: "error",
@@ -392,8 +396,9 @@ const ALL_TOOLS = [
 
 //#endregion
 //#region src/index.ts
+const cwd = process.cwd();
 async function check(options = {}) {
-	const { debug: debug$1, fix = !isCI, root = process.cwd() } = options;
+	const { debug: debug$1, fix = !isCi, root = cwd } = options;
 	const packageJson = JSON.parse(await readFile(join(root, "package.json"), "utf8"));
 	if (debug$1) process.env.DEBUG = "true";
 	console.log();
@@ -409,7 +414,7 @@ async function check(options = {}) {
 		packageJson
 	});
 	if (tools.length === 0) {
-		if (isDebug()) console.log("No tools detected!");
+		if (isDebug) console.log("No tools detected!");
 		else console.log("No tools detected! Run with --debug for more info");
 		console.log();
 		process.exit(1);
@@ -418,7 +423,7 @@ async function check(options = {}) {
 		const startTime = performance.now();
 		const problems$1 = await (fix ? tool.fix ?? tool.check : tool.check)();
 		problems$1.forEach((problem) => {
-			problem.file = resolve(root ?? process.cwd(), problem.file);
+			problem.file = resolve(root, problem.file);
 		});
 		const duration = humanMs(performance.now() - startTime);
 		const title = `${tool.name} ${dim(`(${duration})`)}`;
@@ -446,7 +451,7 @@ async function check(options = {}) {
 	}, /* @__PURE__ */ new Map());
 	console.log([...groupedProblems.values()].map(renderProblemGroup).join("\n"));
 	const files = Object.entries(problems.reduce((acc, problem) => {
-		const file = "." + sep + relative(process.cwd(), problem.file);
+		const file = "." + sep + relative(root, problem.file);
 		acc[file] ??= 0;
 		acc[file]++;
 		return acc;
@@ -468,7 +473,7 @@ async function findInstalledTools(opts) {
 			isInstalled: !!opts.packageJson.devDependencies?.[tool.packageName]
 		};
 	}));
-	if (isDebug()) {
+	if (isDebug) {
 		const getTools = (isInstalled) => status.filter((item) => item.isInstalled === isInstalled).map((item) => item.tool.name).join(", ");
 		debug(`Installed: ${getTools(true) || "(none)"}`);
 		debug(`Skipping: ${getTools(false) || "(none)"} `);
@@ -481,7 +486,7 @@ function plural(count, singular, plural$1) {
 function renderProblemGroup(problems) {
 	const renderedProblems = problems.map(renderProblem);
 	const problem = problems[0];
-	const path = relative(process.cwd(), problem.file);
+	const path = relative(cwd, problem.file);
 	const link = dim(`→ .${sep}${problem.location ? `${path}:${problem.location.line}:${problem.location.column}` : path}`);
 	return `${renderedProblems.join("\n")}\n  ${link}`;
 }
@@ -492,4 +497,4 @@ function renderProblem(problem) {
 }
 
 //#endregion
-export { ALL_TOOLS as i, renderProblem as n, renderProblemGroup as r, check as t };
+export { isCi as a, ALL_TOOLS as i, renderProblem as n, renderProblemGroup as r, check as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aklinker1/check",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "keywords": [
     "check",
     "eslint",
@@ -39,11 +39,7 @@
   "scripts": {
     "build": "tsdown src/index.ts src/cli.ts",
     "check": "bun src/cli.ts",
-    "prepack": "bun run build",
-    "prepublish": "bun run build"
-  },
-  "dependencies": {
-    "ci-info": "*"
+    "prepack": "bun run build"
   },
   "devDependencies": {
     "@types/bun": "latest",