nanos-lint 2.2.1 → 2.3.0

package/dist/{cli-Dx-1zSOk.js → cli-DnmSA08r.js}

@@ -2,7 +2,7 @@ import { fileURLToPath } from "node:url";
 import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
-import childProcess, { execFile } from "node:child_process";
+import childProcess, { execFile, execFileSync } from "node:child_process";
 import { promisify, stripVTControlCharacters } from "node:util";
 import { EventEmitter } from "node:events";
 import process$1 from "node:process";
@@ -161,6 +161,7 @@ function mergeConfigs(base, override = {}, definitionsDir = getDefinitionsDir(),
 	const defaultIgnore = [
 		".git",
 		".vscode",
+		".nanos-lint",
 		"node_modules",
 		"dist",
 		"bin",
@@ -290,12 +291,18 @@ function initWorkspace(workspacePath, options) {
 	const template = loadConfigFile(getDefaultTemplatePath());
 	const definitionsDir = getDefinitionsDir();
 	const sourceAnnotations = path.join(definitionsDir, "annotations.lua");
+	if (!fs.existsSync(sourceAnnotations)) throw new Error(`Definitions file not found at ${sourceAnnotations}. Make sure submodules are initialized.`);
 	const targetNanosDir = path.join(workspacePath, ".nanos-lint");
 	fs.mkdirSync(targetNanosDir, { recursive: true });
 	const targetAnnotations = path.join(targetNanosDir, "annotations.lua");
-	if (fs.existsSync(sourceAnnotations)) fs.copyFileSync(sourceAnnotations, targetAnnotations);
+	fs.copyFileSync(sourceAnnotations, targetAnnotations);
 	template.workspace = template.workspace ?? {};
 	template.workspace.library = [".nanos-lint/annotations.lua"];
+	const existingIgnore = template.workspace.ignoreDir ?? [];
+	if (!existingIgnore.includes(".nanos-lint")) template.workspace.ignoreDir = [".nanos-lint", ...existingIgnore];
+	template.files = template.files ?? {};
+	const existingExclude = template.files.exclude ?? [];
+	if (!existingExclude.includes(".nanos-lint/**")) template.files.exclude = [".nanos-lint/**", ...existingExclude];
 	fs.writeFileSync(targetFile, JSON.stringify(template, null, 2), "utf-8");
 	return targetFile;
 }
@@ -374,15 +381,50 @@ function getCacheDir(version = FALLBACK_LUALS_VERSION) {
 	const base = process.platform === "win32" ? process.env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local") : process.env.XDG_CACHE_HOME || path.join(os.homedir(), ".cache");
 	return path.join(base, "nanos-lint", "luals", version);
 }
+/**
+* Verifies that a LuaLS binary exists, has non-trivial size, and is executable.
+*/
+function isBinaryValid(binaryPath) {
+	if (!fs.existsSync(binaryPath)) return false;
+	try {
+		const stats = fs.statSync(binaryPath);
+		if (!stats.isFile() || stats.size < 1e5) return false;
+		const output = execFileSync(binaryPath, ["--version"], {
+			timeout: 5e3,
+			stdio: "pipe",
+			encoding: "utf-8"
+		});
+		return /^\d+\.\d+\.\d+/.test(output.trim());
+	} catch {
+		return false;
+	}
+}
 async function downloadAndExtractLuaLS(version = DEFAULT_LUALS_VERSION, targetDir, options) {
 	const resolvedVersion = await resolveLuaLSVersion(version);
 	const info = getPlatformInfo(resolvedVersion);
 	const destDir = targetDir || getCacheDir(resolvedVersion);
 	const binaryPath = path.join(destDir, info.binaryRelativePath);
-	if (fs.existsSync(binaryPath)) return binaryPath;
-	fs.mkdirSync(destDir, { recursive: true });
+	const completeMarker = path.join(destDir, ".complete");
+	if (fs.existsSync(destDir)) {
+		if (fs.existsSync(binaryPath) && isBinaryValid(binaryPath)) {
+			if (!fs.existsSync(completeMarker)) try {
+				fs.writeFileSync(completeMarker, resolvedVersion, "utf-8");
+			} catch {}
+			return binaryPath;
+		}
+		try {
+			fs.rmSync(destDir, {
+				recursive: true,
+				force: true
+			});
+		} catch {}
+	}
+	const parentDir = path.dirname(destDir);
+	fs.mkdirSync(parentDir, { recursive: true });
+	const tempDir = path.join(parentDir, `.${path.basename(destDir)}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`);
+	fs.mkdirSync(tempDir, { recursive: true });
 	const url = `https://github.com/LuaLS/lua-language-server/releases/download/${resolvedVersion}/${info.assetName}`;
-	const archivePath = path.join(destDir, info.assetName);
+	const archivePath = path.join(tempDir, info.assetName);
 	if (!options?.quiet) console.log(`[luals] Downloading LuaLS ${resolvedVersion} from ${url}...`);
 	let response = null;
 	let lastErr = null;
@@ -393,54 +435,108 @@ async function downloadAndExtractLuaLS(version = DEFAULT_LUALS_VERSION, targetDi
 				response = res;
 				break;
 			}
+			await res.body?.cancel();
 			lastErr = /* @__PURE__ */ new Error(`Failed to download ${url}: ${res.status} ${res.statusText}`);
 		} catch (err) {
 			lastErr = err;
 		}
 		if (attempt < 3) await new Promise((resolve) => setTimeout(resolve, attempt * 1e3));
 	}
-	if (!response || !response.body) throw lastErr || /* @__PURE__ */ new Error(`Failed to download ${url}`);
-	const arrayBuffer = await response.arrayBuffer();
-	fs.writeFileSync(archivePath, Buffer.from(arrayBuffer));
-	if (!options?.quiet) console.log(`[luals] Extracting to ${destDir}...`);
-	try {
-		await execFileAsync("tar", [
-			"-xf",
-			archivePath,
-			"-C",
-			destDir
-		]);
-	} catch (tarErr) {
-		if (process.platform === "win32" && info.assetName.endsWith(".zip")) await execFileAsync("powershell.exe", [
-			"-NoProfile",
-			"-Command",
-			`Expand-Archive -Path '${escapePowerShellSingleQuote(archivePath)}' -DestinationPath '${escapePowerShellSingleQuote(destDir)}' -Force`
-		]);
-		else throw tarErr;
+	if (!response || !response.body) {
+		try {
+			fs.rmSync(tempDir, {
+				recursive: true,
+				force: true
+			});
+		} catch {}
+		throw lastErr || /* @__PURE__ */ new Error(`Failed to download ${url}`);
 	}
 	try {
-		fs.unlinkSync(archivePath);
-	} catch {}
-	if (process.platform !== "win32") try {
-		fs.chmodSync(binaryPath, 493);
-	} catch {}
-	if (!fs.existsSync(binaryPath)) throw new Error(`Failed to extract LuaLS binary to expected path: ${binaryPath}`);
-	if (!options?.quiet) console.log(`[luals] Ready: ${binaryPath}`);
-	return binaryPath;
+		const arrayBuffer = await response.arrayBuffer();
+		fs.writeFileSync(archivePath, Buffer.from(arrayBuffer));
+		if (!options?.quiet) console.log(`[luals] Extracting to ${destDir}...`);
+		try {
+			await execFileAsync("tar", [
+				"-xf",
+				archivePath,
+				"-C",
+				tempDir
+			]);
+		} catch (tarErr) {
+			if (process.platform === "win32" && info.assetName.endsWith(".zip")) await execFileAsync("powershell.exe", [
+				"-NoProfile",
+				"-Command",
+				`Expand-Archive -Path '${escapePowerShellSingleQuote(archivePath)}' -DestinationPath '${escapePowerShellSingleQuote(tempDir)}' -Force`
+			]);
+			else throw tarErr;
+		}
+		try {
+			fs.unlinkSync(archivePath);
+		} catch {}
+		const tempBinaryPath = path.join(tempDir, info.binaryRelativePath);
+		if (process.platform !== "win32") try {
+			fs.chmodSync(tempBinaryPath, 493);
+		} catch {}
+		if (!fs.existsSync(tempBinaryPath) || fs.statSync(tempBinaryPath).size < 1e5) throw new Error(`Failed to extract valid LuaLS binary to expected path: ${tempBinaryPath}`);
+		fs.writeFileSync(path.join(tempDir, ".complete"), resolvedVersion, "utf-8");
+		for (let attempt = 0; attempt < 5; attempt++) try {
+			fs.renameSync(tempDir, destDir);
+			break;
+		} catch (renameErr) {
+			if (fs.existsSync(binaryPath) && isBinaryValid(binaryPath)) {
+				try {
+					fs.rmSync(tempDir, {
+						recursive: true,
+						force: true
+					});
+				} catch {}
+				if (!options?.quiet) console.log(`[luals] Ready: ${binaryPath}`);
+				return binaryPath;
+			}
+			if (attempt < 4) await new Promise((resolve) => setTimeout(resolve, 100 * (attempt + 1)));
+			else throw renameErr;
+		}
+		if (!isBinaryValid(binaryPath)) throw new Error(`Extracted LuaLS binary at ${binaryPath} is invalid or non-functional.`);
+		if (!options?.quiet) console.log(`[luals] Ready: ${binaryPath}`);
+		return binaryPath;
+	} finally {
+		if (fs.existsSync(tempDir)) try {
+			fs.rmSync(tempDir, {
+				recursive: true,
+				force: true
+			});
+		} catch {}
+	}
 }
 async function resolveLuaLSBinary(version = DEFAULT_LUALS_VERSION, options) {
 	if (process.env.LUALS_BIN && fs.existsSync(process.env.LUALS_BIN)) return process.env.LUALS_BIN;
 	const resolvedVersion = await resolveLuaLSVersion(version);
 	const info = getPlatformInfo(resolvedVersion);
 	const bundledPath = path.join(getPackageRoot(), info.binaryRelativePath);
-	if (fs.existsSync(bundledPath)) return bundledPath;
-	const cachedPath = path.join(getCacheDir(resolvedVersion), info.binaryRelativePath);
-	if (fs.existsSync(cachedPath)) return cachedPath;
+	if (fs.existsSync(bundledPath) && isBinaryValid(bundledPath)) return bundledPath;
+	const cachedDir = getCacheDir(resolvedVersion);
+	const cachedPath = path.join(cachedDir, info.binaryRelativePath);
+	const completeMarker = path.join(cachedDir, ".complete");
+	if (fs.existsSync(cachedPath)) {
+		if (isBinaryValid(cachedPath)) {
+			if (!fs.existsSync(completeMarker)) try {
+				fs.writeFileSync(completeMarker, resolvedVersion, "utf-8");
+			} catch {}
+			return cachedPath;
+		}
+		if (!options?.quiet) console.warn(`[luals] Cached LuaLS binary at ${cachedPath} is corrupted or incomplete. Repairing...`);
+		try {
+			fs.rmSync(cachedDir, {
+				recursive: true,
+				force: true
+			});
+		} catch {}
+	}
 	try {
 		const cmd = process.platform === "win32" ? "where.exe" : "which";
 		const { stdout } = await execFileAsync(cmd, ["lua-language-server"]);
 		const found = stdout.trim().split(/\r?\n/)[0];
-		if (found && fs.existsSync(found)) return found;
+		if (found && fs.existsSync(found) && isBinaryValid(found)) return found;
 	} catch {}
 	return await downloadAndExtractLuaLS(resolvedVersion, void 0, options);
 }
@@ -485,8 +581,9 @@ async function runLuaLSCheck(targetPath, configPath, options) {
 		} catch {}
 	}
 	if (!parseSucceeded) {
-		if (execError) throw new Error(`LuaLS check failed to execute or produce diagnostic output: ${execError instanceof Error ? execError.message : String(execError)}`);
-		throw new Error(`LuaLS check failed to produce diagnostic output at: ${checkOutPath}`);
+		const cacheHint = `(Cache location: ${getCacheDir()})`;
+		if (execError) throw new Error(`LuaLS check failed to execute or produce diagnostic output: ${execError instanceof Error ? execError.message : String(execError)}. ${cacheHint}`);
+		throw new Error(`LuaLS check failed to produce diagnostic output at: ${checkOutPath}. ${cacheHint}`);
 	}
 	if (targetFileOnly) {
 		const filtered = {};
@@ -529,6 +626,7 @@ function countCheckedFiles(targetPath, configPath) {
 	let ignoreDirs = [
 		".git",
 		".vscode",
+		".nanos-lint",
 		"node_modules"
 	];
 	let excludePatterns = [];
@@ -3832,6 +3930,6 @@ if (isDirectExecution()) runCLI().then((code) => {
 	process.exit(1);
 });
 //#endregion
-export { parseJsonc as A, runLuaLSCheck as C, initWorkspace as D, getPackageRoot as E, stripJsonComments as M, fileUriToPath as N, loadConfigFile as O, resolveLuaLSVersion as S, getDefinitionsDir as T, escapePowerShellSingleQuote as _, formatGitHubAnnotations as a, resolveLatestLuaLSVersion as b, formatReport as c, pluralize as d, shouldEnableColor as f, downloadAndExtractLuaLS as g, countCheckedFiles as h, runCLI as i, resolveWorkspaceConfig as j, mergeConfigs as k, formatSeverityBadge as l, FALLBACK_LUALS_VERSION as m, createProgram as n, formatPretty as o, DEFAULT_LUALS_VERSION as p, isDirectExecution as r, formatProblemSummary as s, collectIgnorePatterns as t, getColors as u, getCacheDir as v, getDefaultTemplatePath as w, resolveLuaLSBinary as x, getPlatformInfo as y };
+export { mergeConfigs as A, resolveLuaLSVersion as C, getPackageRoot as D, getDefinitionsDir as E, resolveWorkspaceConfig as M, stripJsonComments as N, initWorkspace as O, fileUriToPath as P, resolveLuaLSBinary as S, getDefaultTemplatePath as T, escapePowerShellSingleQuote as _, formatGitHubAnnotations as a, isBinaryValid as b, formatReport as c, pluralize as d, shouldEnableColor as f, downloadAndExtractLuaLS as g, countCheckedFiles as h, runCLI as i, parseJsonc as j, loadConfigFile as k, formatSeverityBadge as l, FALLBACK_LUALS_VERSION as m, createProgram as n, formatPretty as o, DEFAULT_LUALS_VERSION as p, isDirectExecution as r, formatProblemSummary as s, collectIgnorePatterns as t, getColors as u, getCacheDir as v, runLuaLSCheck as w, resolveLatestLuaLSVersion as x, getPlatformInfo as y };
 
-//# sourceMappingURL=cli-Dx-1zSOk.js.map
+//# sourceMappingURL=cli-DnmSA08r.js.map