oxlint-plugin-vize 0.386.0 → 0.388.0

package/README.md

@@ -34,7 +34,7 @@ The bridge is optimized around Oxlint's per-rule execution model:
 ```bash
 vp install
 vp run --filter './npm/native' build
-vp run --filter './npm/oxint' build
+vp run --filter './npm/oxlint' build
 ```
 
 Install `vp` once from the [Vite+ install guide](https://viteplus.dev/guide/install), then add it with:
@@ -155,8 +155,7 @@ You can pass Patina settings through `settings.vize`:
       "locale": "ja",
       "preset": "essential",
       "helpLevel": "short",
-      "typeAware": true,
-      "corsaPath": "./node_modules/.bin/tsgo"
+      "typeAware": true
     }
   }
 }
@@ -172,7 +171,7 @@ You can pass Patina settings through `settings.vize`:
 - `helpLevel` accepts `"full"`, `"short"`, or `"none"`. Short help keeps one actionable sentence and removes inline examples and trailing rationale.
 - `helpLevel: "full"` only expands the Patina remediation text. It does not restore original-SFC formatter anchors or machine-readable range fidelity.
 - `typeAware: true` enables Corsa-backed `vize/type/*` rules during shared Patina passes.
-- `corsaPath` selects the Corsa or `tsgo` executable for type-aware linting. Omit it to use Vize's normal resolver.
+- `corsaPath` selects a Corsa or TypeScript 7 native executable for type-aware linting. Omit it to use Vize's normal resolver.
 - `showHelp` is still accepted for backward compatibility, but `helpLevel` is the preferred setting.
 
 For example, this keeps Oxlint focused on correctness-only Vize diagnostics while still allowing your existing Oxlint rules to run unchanged:

package/dist/cli.mjs

@@ -1,5 +1,5 @@
-import { i as hasVueLikeExtension, n as hasScriptLikeBlock, s as isStandaloneHtmlFile, t as appendScriptlessWorkaround } from "./workaround-DaqWylnm.mjs";
-import { spawn } from "node:child_process";
+import { i as hasVueLikeExtension, n as hasScriptLikeBlock, s as isStandaloneHtmlFile, t as appendScriptlessWorkaround } from "./workaround-DRe3y2CB.mjs";
+import { spawn, spawnSync } from "node:child_process";
 import path from "node:path";
 import fs from "node:fs";
 //#region src/cli/args.ts
@@ -12,7 +12,6 @@ const OPTION_NAMES_WITH_VALUES = new Set([
 	"--config",
 	"--cwd",
 	"--deny",
-	"--fix-suggestions",
 	"--format",
 	"--ignore-path",
 	"--ignore-pattern",
@@ -31,6 +30,35 @@ const OPTION_NAMES_WITH_VALUES = new Set([
 	"--vitest-plugin",
 	"--warn"
 ]);
+/**
+* Formats whose reports contain output even for a completely clean run.
+*
+* The auto, stylish, and unix formats legitimately print nothing when no
+* diagnostics are found, so an empty report proves nothing for them. These
+* formats always emit at least a summary or document skeleton, which makes a
+* fully silent exit-0 run attributable to a child that never linted at all.
+*/
+const ALWAYS_REPORTING_FORMATS = new Set([
+	"checkstyle",
+	"default",
+	"json",
+	"junit"
+]);
+/** Whether the requested output format guarantees a non-empty report. */
+function expectsLintReport(argv) {
+	let format = null;
+	for (let index = 0; index < argv.length; index += 1) {
+		const arg = argv[index];
+		if (arg === "--") break;
+		if (arg === "-f" || arg === "--format") {
+			format = argv[index + 1] ?? null;
+			index += 1;
+			continue;
+		}
+		if (arg.startsWith("--format=")) format = arg.slice(9);
+	}
+	return format != null && ALWAYS_REPORTING_FORMATS.has(format);
+}
 function getLintTargets(argv) {
 	const targets = [];
 	let collectEverything = false;
@@ -110,6 +138,31 @@ function resolveOxlintCliEntrypoint(cwd) {
 		currentDir = parentDir;
 	}
 }
+/** Real oxlint prints `Version: <semver>`; any semver-shaped token passes. */
+const VERSION_HANDSHAKE_PATTERN = /\b\d+\.\d+\.\d+/u;
+/**
+* Confirms the resolved entrypoint actually behaves like the oxlint CLI.
+*
+* Workspaces can place a non-lint wrapper at the oxlint bin path — vite-plus
+* ships an LSP-only shim there, for example. Spawning such a wrapper yields no
+* diagnostics, which the caller would otherwise forward as a clean lint run: a
+* silent false green. A `--version` handshake separates the real CLI from
+* wrappers before any lint output is trusted.
+*/
+function verifyOxlintCliEntrypoint(executable, entrypoint) {
+	const handshake = spawnSync(executable, [entrypoint, "--version"], {
+		encoding: "utf8",
+		stdio: [
+			"ignore",
+			"pipe",
+			"pipe"
+		]
+	});
+	const output = `${handshake.stdout ?? ""}${handshake.stderr ?? ""}`.trim();
+	if (handshake.error == null && handshake.status === 0 && VERSION_HANDSHAKE_PATTERN.test(output)) return;
+	const detail = handshake.error == null ? `exit ${String(handshake.status)}${output === "" ? " with no output" : `: ${output.split("\n", 1)[0]}`}` : handshake.error.message;
+	throw new Error(`The oxlint entrypoint at ${entrypoint} did not answer the \`--version\` handshake (${detail}). It appears to be a non-lint wrapper shim, so its runs cannot be trusted as lint results. Install the real \`oxlint\` package where \`oxlint-vize\` can resolve it.`);
+}
 //#endregion
 //#region src/cli/output.ts
 function rewriteReportedPaths(output, replacements) {
@@ -224,9 +277,12 @@ function getReportedOriginalFilename(cwd, filename) {
 async function main() {
 	const cwd = process.cwd();
 	const forwardedArgs = process.argv.slice(2);
-	const prepared = prepareScriptlessWorkaroundFiles(cwd, collectVueLikeFilesFromTargets(cwd, getLintTargets(forwardedArgs)));
+	const lintFiles = collectVueLikeFilesFromTargets(cwd, getLintTargets(forwardedArgs));
+	const oxlintEntrypoint = resolveOxlintCliEntrypoint(cwd);
+	verifyOxlintCliEntrypoint(process.execPath, oxlintEntrypoint);
+	const prepared = prepareScriptlessWorkaroundFiles(cwd, lintFiles);
 	const args = [
-		resolveOxlintCliEntrypoint(cwd),
+		oxlintEntrypoint,
 		...forwardedArgs,
 		...prepared.appendedArgs
 	];
@@ -236,7 +292,13 @@ async function main() {
 		const stderr = rewriteReportedPaths(result.stderr, prepared.pathReplacements);
 		if (stdout) await writeStream(process.stdout, stdout);
 		if (stderr) await writeStream(process.stderr, stderr);
-		if (prepared.usedScriptlessWorkaround && forwardedArgs.includes("--fix")) await writeStream(process.stderr, "\n[oxlint-plugin-vize] Temporary Vue workaround is active; fixes are not applied back to original files yet.\n");
+		if (result.status === 0 && stdout === "" && stderr === "" && expectsLintReport(forwardedArgs)) {
+			await writeStream(process.stderr, `The oxlint run at ${oxlintEntrypoint} exited 0 but produced no report, although the requested format always emits one. Refusing to treat the silent run as a clean lint result.
+`);
+			process.exitCode = 1;
+			return;
+		}
+		if (prepared.usedScriptlessWorkaround && (forwardedArgs.includes("--fix") || forwardedArgs.includes("--fix-suggestions"))) await writeStream(process.stderr, "\n[oxlint-plugin-vize] Temporary Vue workaround is active; fixes are not applied back to original files yet.\n");
 		process.exitCode = result.status ?? 1;
 	} finally {
 		prepared.cleanup();

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { a as isPatinaFile, c as compareLineColumn, d as getDiagnosticBlock, l as extractSfcBlocks, o as isScriptLikeFile, r as resolveWorkaroundSource, u as formatBlockLabel } from "./workaround-DaqWylnm.mjs";
+import { a as isPatinaFile, c as compareLineColumn, d as getDiagnosticBlock, l as extractSfcBlocks, o as isScriptLikeFile, r as resolveWorkaroundSource, u as formatBlockLabel } from "./workaround-DRe3y2CB.mjs";
 import { createRequire } from "node:module";
 import { definePlugin, defineRule } from "@oxlint/plugins";
 import { spawnSync } from "node:child_process";
@@ -111,17 +111,20 @@ function getPatinaRules() {
 }
 //#endregion
 //#region src/script-map.ts
-function createSingleScriptMap(source, extractedScript) {
+function createSingleScriptMap(source, extractedScript, sfcBlocks = extractSfcBlocks(source)) {
 	if (!extractedScript) return null;
-	const blocks = extractSfcBlocks(source).filter((block) => block.kind === "script" || block.kind === "script-setup");
-	if (blocks.length !== 1) return null;
-	const [block] = blocks;
-	const skipped = countSkippedPrefix(block.content, extractedScript);
-	if (skipped === null) return null;
-	return {
-		block,
-		scriptStart: advancePosition(block.contentStart, block.content.slice(0, skipped))
-	};
+	const blocks = sfcBlocks.filter((block) => block.kind === "script" || block.kind === "script-setup");
+	let match = null;
+	for (const block of blocks) {
+		const skipped = countSkippedPrefix(block.content, extractedScript);
+		if (skipped === null) continue;
+		if (match !== null) return null;
+		match = {
+			block,
+			scriptStart: advancePosition(block.contentStart, block.content.slice(0, skipped))
+		};
+	}
+	return match;
 }
 /**
 * Oxlint trims the leading newline (and any indentation on that line) from a
@@ -256,13 +259,13 @@ if (import.meta.vitest) {
 				helpLevel: "short",
 				preset: "essential",
 				typeAware: true,
-				corsaPath: "./node_modules/.bin/tsgo"
+				corsaPath: "./node_modules/@typescript/typescript-linux-x64/lib/tsc"
 			})).toEqual({
 				locale: "ja",
 				helpLevel: "short",
 				preset: "essential",
 				typeAware: true,
-				corsaPath: "./node_modules/.bin/tsgo"
+				corsaPath: "./node_modules/@typescript/typescript-linux-x64/lib/tsc"
 			});
 		});
 		it("normalizes preset aliases", () => {
@@ -326,7 +329,7 @@ function getFileState(context) {
 		source: resolvedSource.source,
 		extractedScript: context.sourceCode.text,
 		usesOriginalLocations: resolvedSource.usesOriginalLocations || isScriptLikeFile(resolvedSource.filename),
-		reportedRules: /* @__PURE__ */ new Set(),
+		reportedDiagnostics: /* @__PURE__ */ new Set(),
 		sfcBlocks: void 0,
 		scriptMap: void 0,
 		allDiagnosticsByRule: null,
@@ -387,7 +390,7 @@ function getDiagnosticsForRule(context, state, ruleName) {
 }
 function getScriptMap(state) {
 	if (state.scriptMap !== void 0) return state.scriptMap;
-	state.scriptMap = createSingleScriptMap(state.source, state.extractedScript);
+	state.scriptMap = createSingleScriptMap(state.source, state.extractedScript, getSfcBlocks(state));
 	return state.scriptMap;
 }
 function getSfcBlocks(state) {
@@ -395,11 +398,26 @@ function getSfcBlocks(state) {
 	state.sfcBlocks = extractSfcBlocks(state.source);
 	return state.sfcBlocks;
 }
-function markRuleAsReported(state, ruleName) {
-	if (state.reportedRules.has(ruleName)) return false;
-	state.reportedRules.add(ruleName);
+function markDiagnosticAsReported(state, diagnostic) {
+	const key = diagnosticIdentity(diagnostic);
+	if (state.reportedDiagnostics.has(key)) return false;
+	state.reportedDiagnostics.add(key);
 	return true;
 }
+function diagnosticIdentity(diagnostic) {
+	const { start, end } = diagnostic.location;
+	return [
+		diagnostic.rule,
+		diagnostic.severity,
+		diagnostic.message,
+		start.line,
+		start.column,
+		start.offset,
+		end.line,
+		end.column,
+		end.offset
+	].join("\0");
+}
 function nextFileStateCacheClock() {
 	fileStateCacheClock += 1;
 	return fileStateCacheClock;
@@ -491,8 +509,7 @@ function createSummaryLine(message) {
 }
 //#endregion
 //#region src/plugin.ts
-function createOxlintDiagnostic(diagnostic, state, helpLevel) {
-	const scriptMap = getScriptMap(state);
+function createOxlintDiagnostic(diagnostic, state, scriptMap, helpLevel) {
 	const loc = state.usesOriginalLocations ? createOriginalSfcLoc(diagnostic) : mapToScriptLoc(diagnostic, scriptMap);
 	const block = loc === null ? getDiagnosticBlock(diagnostic, getSfcBlocks(state)) : null;
 	return {
@@ -513,6 +530,14 @@ function createOxlintDiagnostic(diagnostic, state, helpLevel) {
 		})
 	};
 }
+function shouldReportForCurrentProgram(diagnostic, state, scriptMap) {
+	if (state.usesOriginalLocations || scriptMap == null) return true;
+	const block = getDiagnosticBlock(diagnostic, getSfcBlocks(state));
+	return !isScriptBlock(block) || block === scriptMap.block;
+}
+function isScriptBlock(block) {
+	return block?.kind === "script" || block?.kind === "script-setup";
+}
 function createOriginalSfcLoc(diagnostic) {
 	return {
 		start: {
@@ -539,10 +564,13 @@ function createPatinaRule(ruleMeta) {
 				if (ruleMeta.presets.length > 0 && !isIncrementalPreset(settings) && !ruleMeta.presets.includes(activePreset)) return;
 				const helpLevel = settings.helpLevel ?? "full";
 				const state = getFileState(context);
-				const diagnostics = getDiagnosticsForRule(context, state, ruleMeta.name);
+				const scriptMap = getScriptMap(state);
+				const diagnostics = getDiagnosticsForRule(context, state, ruleMeta.name).filter((diagnostic) => shouldReportForCurrentProgram(diagnostic, state, scriptMap));
 				if (diagnostics.length === 0) return;
-				if (!markRuleAsReported(state, ruleMeta.name)) return;
-				for (const diagnostic of diagnostics) context.report(createOxlintDiagnostic(diagnostic, state, helpLevel));
+				for (const diagnostic of diagnostics) {
+					if (!markDiagnosticAsReported(state, diagnostic)) continue;
+					context.report(createOxlintDiagnostic(diagnostic, state, scriptMap, helpLevel));
+				}
 			} };
 		}
 	});

package/dist/{workaround-DaqWylnm.mjs → workaround-DRe3y2CB.mjs}

@@ -1,16 +1,12 @@
 //#region src/sfc-blocks.ts
-const rootBlockPattern = /<([A-Za-z][\w-]*)\b[^>]*>/gu;
 function extractSfcBlocks(source) {
 	const blocks = [];
 	const lineStarts = createLineStartOffsets(source);
 	let cursor = 0;
 	for (;;) {
-		rootBlockPattern.lastIndex = cursor;
-		const match = rootBlockPattern.exec(source);
+		const match = findNextOpenTag(source, cursor);
 		if (match == null) return blocks;
-		const tagName = match[1];
-		const openTag = match[0];
-		const openTagEnd = match.index + openTag.length;
+		const { tagName, openTag, openTagEnd } = match;
 		const closeTag = `</${tagName}>`;
 		const closeTagStart = source.indexOf(closeTag, openTagEnd);
 		if (closeTagStart === -1) {
@@ -27,6 +23,47 @@ function extractSfcBlocks(source) {
 		cursor = closeTagStart + closeTag.length;
 	}
 }
+function findNextOpenTag(source, cursor) {
+	let index = cursor;
+	for (;;) {
+		const openTagStart = source.indexOf("<", index);
+		if (openTagStart === -1) return null;
+		const tagNameStart = openTagStart + 1;
+		if (!isAsciiLetter(source.charCodeAt(tagNameStart))) {
+			index = tagNameStart;
+			continue;
+		}
+		let tagNameEnd = tagNameStart + 1;
+		while (isTagNameCharacter(source.charCodeAt(tagNameEnd))) tagNameEnd += 1;
+		if (!isTagNameBoundary(source.charCodeAt(tagNameEnd))) {
+			index = tagNameEnd;
+			continue;
+		}
+		const openTagEnd = findOpenTagEnd(source, tagNameEnd);
+		if (openTagEnd == null) return null;
+		return {
+			tagName: source.slice(tagNameStart, tagNameEnd),
+			openTag: source.slice(openTagStart, openTagEnd),
+			openTagEnd
+		};
+	}
+}
+function findOpenTagEnd(source, from) {
+	let quote = null;
+	for (let index = from; index < source.length; index += 1) {
+		const code = source.charCodeAt(index);
+		if (quote != null) {
+			if (code === quote) quote = null;
+			continue;
+		}
+		if (code === 34 || code === 39) {
+			quote = code;
+			continue;
+		}
+		if (code === 62) return index + 1;
+	}
+	return null;
+}
 function getDiagnosticBlock(diagnostic, blocks) {
 	for (const block of blocks) if (compareLineColumn(diagnostic.location.start, block.contentStart) >= 0 && compareLineColumn(diagnostic.location.end, block.contentEnd) <= 0) return block;
 	return null;
@@ -45,6 +82,15 @@ function compareLineColumn(left, right) {
 	if (left.line !== right.line) return left.line - right.line;
 	return left.column - right.column;
 }
+function isAsciiLetter(code) {
+	return code >= 65 && code <= 90 || code >= 97 && code <= 122;
+}
+function isTagNameCharacter(code) {
+	return code >= 48 && code <= 57 || code >= 65 && code <= 90 || code === 45 || code === 95 || code >= 97 && code <= 122;
+}
+function isTagNameBoundary(code) {
+	return code === 9 || code === 10 || code === 12 || code === 13 || code === 32 || code === 47 || code === 62;
+}
 function createLineStartOffsets(source) {
 	const lineStarts = [0];
 	for (let index = 0; index < source.length; index += 1) if (source.charCodeAt(index) === 10) lineStarts.push(index + 1);
@@ -126,11 +172,20 @@ function getPrependedWorkaroundBlock(source) {
 	const contentEnd = offsetFromLineColumn(source, firstBlock.contentEnd);
 	const encodedFilename = encodedFilenameFromWorkaroundOpenTag(source.slice(0, contentStart));
 	if (encodedFilename == null) return null;
+	const closeTagEnd = contentEnd + 9;
+	const strippedSourceStart = sourceStartAfterSyntheticBlock(source, closeTagEnd);
+	if (strippedSourceStart == null) return null;
+	if (firstBlock.content !== createWhitespaceMirror(source.slice(strippedSourceStart))) return null;
 	return {
-		closeTagEnd: contentEnd + 9,
+		closeTagEnd,
 		encodedFilename
 	};
 }
+function sourceStartAfterSyntheticBlock(source, closeTagEnd) {
+	if (source.charCodeAt(closeTagEnd) === 13 && source.charCodeAt(closeTagEnd + 1) === 10) return closeTagEnd + 2;
+	if (source.charCodeAt(closeTagEnd) === 10) return closeTagEnd + 1;
+	return null;
+}
 function encodedFilenameFromWorkaroundOpenTag(openTag) {
 	if (!openTag.startsWith(SCRIPTLESS_WORKAROUND_OPEN_TAG_PREFIX)) return null;
 	const encodedFilenameStart = openTag.indexOf(SCRIPTLESS_WORKAROUND_FILENAME_ATTR) + SCRIPTLESS_WORKAROUND_FILENAME_ATTR.length;

package/package.json

@@ -1,73 +1,73 @@
 {
-  "name": "oxlint-plugin-vize",
-  "version": "0.386.0",
-  "description": "Oxlint JS plugin bridge for Vize Patina",
-  "keywords": [
-    "lint",
-    "oxlint",
-    "plugin",
-    "vize",
-    "vue"
-  ],
-  "homepage": "https://github.com/ubugeeei-prod/vize",
-  "bugs": {
-    "url": "https://github.com/ubugeeei-prod/vize/issues"
-  },
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ubugeeei-prod/vize",
-    "directory": "npm/oxint"
-  },
   "bin": {
     "oxlint-vize": "bin/oxlint-vize"
   },
-  "files": [
-    "bin",
-    "dist"
-  ],
-  "type": "module",
-  "main": "./dist/index.mjs",
-  "types": "./dist/index.d.mts",
-  "exports": {
-    ".": {
-      "import": "./dist/index.mjs",
-      "types": "./dist/index.d.mts"
-    }
-  },
-  "publishConfig": {
-    "access": "public"
+  "bugs": {
+    "url": "https://github.com/ubugeeei-prod/vize/issues"
   },
   "dependencies": {
     "@oxlint/plugins": "1.78.0"
   },
+  "description": "Oxlint JS plugin bridge for Vize Patina",
   "devDependencies": {
     "@tsdown/css": "0.22.14",
     "@types/node": "25.9.2",
-    "@vizejs/native": "0.386.0",
+    "@vizejs/native": "0.388.0",
     "tsdown": "0.22.14",
     "typescript": "6.0.3",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.1.24",
     "vite-plus": "0.1.24"
   },
-  "optionalDependencies": {
-    "@vizejs/native-darwin-arm64": "0.386.0",
-    "@vizejs/native-darwin-x64": "0.386.0",
-    "@vizejs/native-linux-arm64-gnu": "0.386.0",
-    "@vizejs/native-linux-arm64-musl": "0.386.0",
-    "@vizejs/native-linux-x64-gnu": "0.386.0",
-    "@vizejs/native-linux-x64-musl": "0.386.0",
-    "@vizejs/native-win32-arm64-msvc": "0.386.0",
-    "@vizejs/native-win32-x64-msvc": "0.386.0"
-  },
   "engines": {
     "node": "^22 || >= 24"
   },
+  "exports": {
+    ".": {
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.mts"
+    }
+  },
+  "files": [
+    "bin",
+    "dist"
+  ],
+  "homepage": "https://github.com/ubugeeei-prod/vize",
+  "keywords": [
+    "lint",
+    "oxlint",
+    "plugin",
+    "vize",
+    "vue"
+  ],
+  "license": "MIT",
+  "main": "./dist/index.mjs",
+  "name": "oxlint-plugin-vize",
+  "optionalDependencies": {
+    "@vizejs/native-darwin-arm64": "0.388.0",
+    "@vizejs/native-darwin-x64": "0.388.0",
+    "@vizejs/native-linux-arm64-gnu": "0.388.0",
+    "@vizejs/native-linux-arm64-musl": "0.388.0",
+    "@vizejs/native-linux-x64-gnu": "0.388.0",
+    "@vizejs/native-linux-x64-musl": "0.388.0",
+    "@vizejs/native-win32-arm64-msvc": "0.388.0",
+    "@vizejs/native-win32-x64-msvc": "0.388.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "directory": "npm/oxlint",
+    "type": "git",
+    "url": "https://github.com/ubugeeei-prod/vize"
+  },
+  "type": "module",
+  "types": "./dist/index.d.mts",
+  "version": "0.388.0",
   "scripts": {
     "build": "vp pack",
-    "test": "vp pack && vp test run src/file-state.test.ts && node src/test.ts && node src/script-location.test.ts",
     "check": "vp check src vite.config.ts",
     "check:fix": "vp check --fix src vite.config.ts",
-    "fmt": "vp fmt --write src vite.config.ts"
+    "fmt": "vp fmt --write src vite.config.ts",
+    "test": "vp pack && vp test run src/file-state.test.ts && node src/test.ts && node src/script-location.test.ts"
   }
 }