@stll/oxlint-config 1.4.0 → 1.5.0

package/dist/toolchain-changed.mjs

@@ -1,9 +1,10 @@
+import { t as parseJsonc } from "./jsonc.mjs";
 import { a as isMiseConfigPath, d as containerDocumentImages, f as isComposeDefinitionPath, i as isDockerDefinitionPath, m as workspaceContains, n as githubAutomationFileKind, p as isKubernetesDefinitionPath } from "./toolchain-inputs.mjs";
 import { n as isCompilerPackage } from "./compiler-packages.mjs";
-import { execFile, spawn } from "node:child_process";
 import path from "node:path";
+import { parse } from "smol-toml";
+import { execFile, spawn } from "node:child_process";
 import { satisfies, valid, validRange } from "semver";
-import { parse as parse$1 } from "smol-toml";
 import { promisify } from "node:util";
 import { parseAllDocuments, parseDocument } from "yaml";
 //#region src/toolchain-changed-locks.ts
@@ -56,62 +57,6 @@ const changedCompilerPatches = ({ value, stringsArePaths, compilerNames }) => {
 	}
 	return patches;
 };
-/** JSONC permits comments and trailing commas, never alterations inside strings. */
-const parseChangedJson = (text) => {
-	let clean = "";
-	let quote = false;
-	for (let index = 0; index < text.length; index++) {
-		const char = text[index];
-		if (quote) {
-			clean += char;
-			if (char === "\\") {
-				index++;
-				clean += text[index] ?? "";
-			} else if (char === "\"") quote = false;
-			continue;
-		}
-		if (char === "\"") {
-			quote = true;
-			clean += char;
-			continue;
-		}
-		if (char === "/" && text[index + 1] === "/") {
-			while (index < text.length && text[index] !== "\n") index++;
-			clean += "\n";
-			continue;
-		}
-		if (char === "/" && text[index + 1] === "*") {
-			index += 2;
-			while (index < text.length && !(text[index] === "*" && text[index + 1] === "/")) index++;
-			if (index >= text.length) throw new Error("Unterminated JSONC comment");
-			index++;
-			clean += " ";
-			continue;
-		}
-		clean += char;
-	}
-	let result = "";
-	quote = false;
-	for (let index = 0; index < clean.length; index++) {
-		const char = clean[index];
-		if (quote) {
-			result += char;
-			if (char === "\\") {
-				index++;
-				result += clean[index] ?? "";
-			} else if (char === "\"") quote = false;
-			continue;
-		}
-		if (char === "\"") quote = true;
-		if (char === ",") {
-			let next = index + 1;
-			while (/\s/.test(clean[next] ?? "") && next < clean.length) next++;
-			if (clean[next] === "}" || clean[next] === "]") continue;
-		}
-		result += char;
-	}
-	return JSON.parse(result);
-};
 const changedYarnSelectors = (location) => location.replace(/"/g, "").split(/,\s*/).map((selector) => selector.trim());
 const packageDescriptor = (descriptor) => {
 	const match = /^(@[^/]+\/[^@]+|[^@]+)@(.+)$/.exec(descriptor.replace(/^\//, ""));
@@ -285,7 +230,7 @@ const parseChangedLock = ({ file, text }) => {
 	const resolutions = [];
 	const importers = {};
 	if (file.endsWith("bun.lock")) {
-		const parsed = parseChangedJson(text);
+		const parsed = parseJsonc(text);
 		if (!changedRecord(parsed) || !BUN_TEXT_LOCKFILE_VERSIONS.has(Number(parsed["lockfileVersion"])) || !changedRecord(parsed["packages"]) || !changedRecord(parsed["workspaces"])) throw new Error("Unsupported Bun lockfile shape");
 		for (const [directory, workspace] of Object.entries(parsed["workspaces"])) importers[directory || "."] = importerDependencies(workspace);
 		for (const [location, value] of Object.entries(parsed["packages"])) {
@@ -383,7 +328,7 @@ const parseChangedLock = ({ file, text }) => {
 			}
 		}
 	} else {
-		const parsed = parseChangedJson(text);
+		const parsed = parseJsonc(text);
 		if (!changedRecord(parsed) || ![
 			1,
 			2,
@@ -709,7 +654,7 @@ const compilerInstallationNames = (snapshot) => {
 	for (const file of snapshot.entries.keys()) {
 		const basename = path.posix.basename(file);
 		if (basename === "package.json") {
-			const manifest = parseChangedJson(snapshotText({
+			const manifest = parseJsonc(snapshotText({
 				snapshot,
 				file
 			}));
@@ -769,7 +714,7 @@ const effectiveCatalogSpecifier = ({ snapshot, file, dependency, specifier }) =>
 			const document = parseDocument(text);
 			if (document.errors.length > 0) throw new Error(`Invalid catalog YAML: ${owner}`);
 			value = document.toJS({ maxAliasCount: 100 });
-		} else value = parseChangedJson(text);
+		} else value = parseJsonc(text);
 		if (!changedRecord(value)) continue;
 		const sources = [value];
 		if (changedRecord(value["workspaces"])) sources.push(value["workspaces"]);
@@ -806,7 +751,7 @@ const compilerPatches = (snapshot) => {
 			const document = parseDocument(text);
 			if (document.errors.length > 0) throw new Error(`Invalid compiler patch YAML: ${file}`);
 			value = document.toJS({ maxAliasCount: 100 });
-		} else value = parseChangedJson(text);
+		} else value = parseJsonc(text);
 		const sources = [value];
 		if (name === "package.json" && changedRecord(value)) sources.push(value["pnpm"]);
 		for (const source of sources) for (const patch of changedCompilerPatches({
@@ -998,7 +943,7 @@ const setupRuntimeFileVersion = ({ snapshot, file, runtime }) => {
 		file
 	}).trim();
 	if (runtime === "bun" && file.endsWith(".json")) {
-		const manifest = parseChangedJson(text);
+		const manifest = parseJsonc(text);
 		const manager = changedRecord(manifest) ? manifest["packageManager"] : void 0;
 		if (typeof manager !== "string" || !manager.startsWith("bun@")) throw new Error("Bun selector manifest lacks an exact Bun packageManager");
 		return stableVersion(manager.slice(4));
@@ -1016,7 +961,7 @@ const setupRuntimeFileVersion = ({ snapshot, file, runtime }) => {
 		return stableVersion(toolchain.slice(2));
 	}
 	if (file.endsWith(".toml")) {
-		const value = parse$1(text);
+		const value = parse(text);
 		if (!changedRecord(value)) throw new Error("Unclassifiable setup runtime TOML");
 		if (runtime === "rust" && changedRecord(value["toolchain"])) return setupRuntimeVersion(value["toolchain"]["channel"]);
 		if (runtime === "python") return setupRuntimeVersion(value["python-version"]);
@@ -1194,7 +1139,7 @@ const parseSnapshot = (snapshot) => {
 		if (compilerPatchPackageFile(file, compilerNames)) tools.typescript.add(`patch-package:${file}:${text}`);
 		for (const tool of selectedFiles.get(file) ?? []) tools[tool].add(`selector-file:${file}:${text}`);
 		if (name === "package.json") {
-			const manifest = parseChangedJson(text);
+			const manifest = parseJsonc(text);
 			if (!changedRecord(manifest)) throw new Error(`Invalid tracked manifest: ${file}`);
 			if (typeof manifest["name"] === "string" && changedPackageTool(manifest["name"]) === "typescript") throw new Error(`Tracked compiler source has no immutable artifact identity: ${file}`);
 			manifests.set(file, manifest);
@@ -1230,7 +1175,7 @@ const parseSnapshot = (snapshot) => {
 		else if (otherRuntimeFiles.has(name)) tools.shared.add(`${file}:${text}`);
 		else if (name === ".node-version" || name === ".nvmrc") tools.node.add(`${file}:${stableVersion(text)}`);
 		else if (name === "toolchain.json") {
-			const policy = parseChangedJson(text);
+			const policy = parseJsonc(text);
 			if (!changedRecord(policy)) throw new Error("Invalid shared toolchain policy");
 			tools.shared.add(`${file}:${stableJson(policy)}`);
 			if (typeof policy["bun"] === "string") addBun(policy["bun"]);
@@ -1246,7 +1191,7 @@ const parseSnapshot = (snapshot) => {
 		} else if (isMiseConfigPath(file)) {
 			tools.bun.add(`${file}:${text}`);
 			tools.typescript.add(`${file}:${text}`);
-			const parsed = parse$1(text);
+			const parsed = parse(text);
 			if (changedRecord(parsed) && changedRecord(parsed["tools"])) for (const [tool, selector] of Object.entries(parsed["tools"])) {
 				const value = changedRecord(selector) ? selector["version"] : selector;
 				const values = Array.isArray(value) ? value : [value];