oxlint-plugin-vize 0.435.0 → 0.440.0

package/dist/{workaround-CcnA_oWy.mjs → workaround-r91ttnV_.mjs}

@@ -1,3 +1,23 @@
+import fs from "node:fs";
+import { createHash } from "node:crypto";
+import { isUtf8 } from "node:buffer";
+//#region src/file-kinds.ts
+function isVueLikeFile(filename) {
+	return hasVueLikeExtension(filename);
+}
+function isPatinaFile(filename) {
+	return isVueLikeFile(filename) || isScriptLikeFile(filename);
+}
+function isScriptLikeFile(filename) {
+	return /\.(?:[cm]?[jt]sx?)$/u.test(filename);
+}
+function hasVueLikeExtension(filename) {
+	return filename.endsWith(".vue") || filename.endsWith(".html") || filename.endsWith(".htm");
+}
+function isStandaloneHtmlFile(filename) {
+	return filename.endsWith(".html") || filename.endsWith(".htm");
+}
+//#endregion
 //#region src/sfc-blocks.ts
 function extractSfcBlocks(source) {
 	const blocks = [];
@@ -120,38 +140,44 @@ function resolveBlockKind(tagName, openTag) {
 	return "custom";
 }
 //#endregion
-//#region src/file-kinds.ts
-function isVueLikeFile(filename) {
-	return hasVueLikeExtension(filename);
-}
-function isPatinaFile(filename) {
-	return isVueLikeFile(filename) || isScriptLikeFile(filename);
-}
-function isScriptLikeFile(filename) {
-	return /\.(?:[cm]?[jt]sx?)$/u.test(filename);
-}
-function hasVueLikeExtension(filename) {
-	return filename.endsWith(".vue") || filename.endsWith(".html") || filename.endsWith(".htm");
-}
-function isStandaloneHtmlFile(filename) {
-	return filename.endsWith(".html") || filename.endsWith(".htm");
-}
-//#endregion
 //#region src/workaround.ts
 const SCRIPTLESS_WORKAROUND_MARKER = "oxlint-plugin-vize-scriptless";
 const SCRIPTLESS_WORKAROUND_OPEN_TAG_PREFIX = `<script setup lang="ts" data-${SCRIPTLESS_WORKAROUND_MARKER}="`;
 const SCRIPTLESS_WORKAROUND_FILENAME_ATTR = `data-${SCRIPTLESS_WORKAROUND_MARKER}="`;
 const LOCATION_BRIDGE_MARKER = "/*vize-location-bridge*/";
+const ORIGINAL_PAYLOAD_PREFIX = "<!--vize-original-source:";
+/** Validate the original bytes before decoding reuse can enter native linting. */
+function readOriginalWorkaroundSource(filename) {
+	const bytes = fs.readFileSync(filename);
+	if (!isUtf8(bytes)) throw new Error("Vize carrier cannot preserve non-UTF8 original file bytes.");
+	return bytes.toString("utf8");
+}
+function validateWorkaroundAuthority(state, physical) {
+	if (state.usesOriginalLocations && state.filename !== physical && readOriginalWorkaroundSource(state.filename) !== state.source) throw new Error("Vize carrier source no longer matches the original file bytes.");
+}
 function hasScriptLikeBlock(source) {
 	return extractSfcBlocks(source).some((block) => block.kind === "script" || block.kind === "script-setup");
 }
 function appendScriptlessWorkaround(source, filename) {
-	return `${createWorkaroundScript(source, filename)}${source}`;
+	return prepareWorkaroundSource(source, filename).source;
+}
+/** Keep original coordinates in one safe host script and an exact source payload. */
+function prepareWorkaroundSource(source, filename) {
+	const openTag = `${SCRIPTLESS_WORKAROUND_OPEN_TAG_PREFIX}${encodeWorkaroundFilename(filename)}">`;
+	const script = `${openTag}${createWhitespaceMirror(source)}${LOCATION_BRIDGE_MARKER}<\/script>\n`;
+	return {
+		source: `${script}${ORIGINAL_PAYLOAD_PREFIX}${createHash("sha256").update(filename).update("\0").update(source).digest("hex")}:${Buffer.from(source, "utf8").toString("base64url")}-->`,
+		locations: {
+			source,
+			scriptStart: openTag.length,
+			originalStart: Buffer.byteLength(script, "utf8")
+		}
+	};
 }
 function isLocationBridgeProgram(extractedScript) {
 	return extractedScript.trimEnd().endsWith(LOCATION_BRIDGE_MARKER);
 }
-function resolveWorkaroundSource(source, fallbackFilename) {
+function resolveWorkaroundSource(source, fallbackFilename, readOriginalSource) {
 	const workaroundBlock = getPrependedWorkaroundBlock(source);
 	if (workaroundBlock == null) return {
 		filename: fallbackFilename,
@@ -161,9 +187,12 @@ function resolveWorkaroundSource(source, fallbackFilename) {
 	let strippedSourceStart = workaroundBlock.closeTagEnd;
 	if (source.charCodeAt(strippedSourceStart) === 13) strippedSourceStart += 1;
 	if (source.charCodeAt(strippedSourceStart) === 10) strippedSourceStart += 1;
+	const decodedFilename = decodeWorkaroundFilename(workaroundBlock.encodedFilename) ?? fallbackFilename;
+	const strippedSource = workaroundBlock.originalSource ?? source.slice(strippedSourceStart);
+	if (readOriginalSource && readOriginalSource(decodedFilename) !== strippedSource) throw new Error("Vize carrier source no longer matches the original file bytes.");
 	return {
-		filename: decodeWorkaroundFilename(workaroundBlock.encodedFilename) ?? fallbackFilename,
-		source: source.slice(strippedSourceStart),
+		filename: decodedFilename,
+		source: strippedSource,
 		usesOriginalLocations: true
 	};
 }
@@ -179,10 +208,20 @@ function getPrependedWorkaroundBlock(source) {
 	const closeTagEnd = contentEnd + 9;
 	const strippedSourceStart = sourceStartAfterSyntheticBlock(source, closeTagEnd);
 	if (strippedSourceStart == null) return null;
-	if (firstBlock.content !== createWhitespaceMirror(source.slice(strippedSourceStart)) + LOCATION_BRIDGE_MARKER) return null;
+	const tail = source.slice(strippedSourceStart);
+	let originalSource;
+	if (tail.startsWith(ORIGINAL_PAYLOAD_PREFIX)) {
+		const payload = /^<!--vize-original-source:([a-f0-9]{64}):([A-Za-z0-9_-]*)-->$/u.exec(tail);
+		if (payload == null) throw new Error("Invalid Vize original-source carrier payload.");
+		const originalFilename = decodeWorkaroundFilename(encodedFilename);
+		if (originalFilename == null || encodeWorkaroundFilename(originalFilename) !== encodedFilename) throw new Error("Invalid Vize original-source carrier filename.");
+		originalSource = Buffer.from(payload[2], "base64url").toString("utf8");
+		if (Buffer.from(originalSource, "utf8").toString("base64url") !== payload[2] || createHash("sha256").update(originalFilename).update("\0").update(originalSource).digest("hex") !== payload[1] || firstBlock.content !== createWhitespaceMirror(originalSource) + LOCATION_BRIDGE_MARKER) throw new Error("Vize original-source carrier bytes do not match their complete source mirror.");
+	} else if (firstBlock.content !== createWhitespaceMirror(tail) + LOCATION_BRIDGE_MARKER) return null;
 	return {
 		closeTagEnd,
-		encodedFilename
+		encodedFilename,
+		originalSource
 	};
 }
 function sourceStartAfterSyntheticBlock(source, closeTagEnd) {
@@ -197,11 +236,8 @@ function encodedFilenameFromWorkaroundOpenTag(openTag) {
 	if (encodedFilenameStart < SCRIPTLESS_WORKAROUND_FILENAME_ATTR.length || encodedFilenameEnd === -1) return null;
 	return openTag.slice(encodedFilenameStart, encodedFilenameEnd);
 }
-function createWorkaroundScript(source, filename) {
-	return `${SCRIPTLESS_WORKAROUND_OPEN_TAG_PREFIX}${encodeWorkaroundFilename(filename)}">${createWhitespaceMirror(source)}${LOCATION_BRIDGE_MARKER}<\/script>\n`;
-}
 function createWhitespaceMirror(source) {
-	return source.replaceAll(/[^\r\n]/gu, " ");
+	return source.replaceAll(/[^\r\n]/gu, (character) => character.length === 2 ? "  " : " ");
 }
 function encodeWorkaroundFilename(filename) {
 	return Buffer.from(filename, "utf8").toString("base64url");
@@ -255,4 +291,4 @@ if (import.meta.vitest) {
 	});
 }
 //#endregion
-export { isPatinaFile as a, compareLineColumn as c, getDiagnosticBlock as d, hasVueLikeExtension as i, extractSfcBlocks as l, isLocationBridgeProgram as n, isScriptLikeFile as o, resolveWorkaroundSource as r, isStandaloneHtmlFile as s, appendScriptlessWorkaround as t, formatBlockLabel as u };
+export { validateWorkaroundAuthority as a, formatBlockLabel as c, isPatinaFile as d, isScriptLikeFile as f, resolveWorkaroundSource as i, getDiagnosticBlock as l, prepareWorkaroundSource as n, compareLineColumn as o, isStandaloneHtmlFile as p, readOriginalWorkaroundSource as r, extractSfcBlocks as s, isLocationBridgeProgram as t, hasVueLikeExtension as u };

package/package.json

@@ -12,7 +12,7 @@
   "devDependencies": {
     "@tsdown/css": "0.22.14",
     "@types/node": "25.9.2",
-    "@vizejs/native": "0.435.0",
+    "@vizejs/native": "0.440.0",
     "tsdown": "0.22.14",
     "typescript": "6.0.3",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.1.24",
@@ -49,14 +49,14 @@
   },
   "name": "oxlint-plugin-vize",
   "optionalDependencies": {
-    "@vizejs/native-darwin-arm64": "0.435.0",
-    "@vizejs/native-darwin-x64": "0.435.0",
-    "@vizejs/native-linux-arm64-gnu": "0.435.0",
-    "@vizejs/native-linux-arm64-musl": "0.435.0",
-    "@vizejs/native-linux-x64-gnu": "0.435.0",
-    "@vizejs/native-linux-x64-musl": "0.435.0",
-    "@vizejs/native-win32-arm64-msvc": "0.435.0",
-    "@vizejs/native-win32-x64-msvc": "0.435.0"
+    "@vizejs/native-darwin-arm64": "0.440.0",
+    "@vizejs/native-darwin-x64": "0.440.0",
+    "@vizejs/native-linux-arm64-gnu": "0.440.0",
+    "@vizejs/native-linux-arm64-musl": "0.440.0",
+    "@vizejs/native-linux-x64-gnu": "0.440.0",
+    "@vizejs/native-linux-x64-musl": "0.440.0",
+    "@vizejs/native-win32-arm64-msvc": "0.440.0",
+    "@vizejs/native-win32-x64-msvc": "0.440.0"
   },
   "publishConfig": {
     "access": "public"
@@ -68,12 +68,12 @@
   },
   "type": "module",
   "types": "./dist/index.d.mts",
-  "version": "0.435.0",
+  "version": "0.440.0",
   "scripts": {
     "build": "vp pack",
     "check": "vp check src vite.config.ts",
     "check:fix": "vp check --fix 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 && node src/casing-options.test.ts"
+    "test": "vp pack && vp test run src/file-state.test.ts src/batched-rules.test.ts src/script-safe-source.test.ts src/active-rule-collection.test.ts && node src/test.ts && node src/script-location.test.ts && node src/casing-options.test.ts && node src/template-style-fixes.test.mjs"
   }
 }