oxlint-plugin-vize 0.463.0 → 0.467.0

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { m as loadBinding, n as prepareWorkaroundSource, p as isStandaloneHtmlFile, s as extractSfcBlocks, u as hasVueLikeExtension } from "./workaround-CiQUFJw0.mjs";
+import { m as loadBinding, n as prepareWorkaroundSource, p as isStandaloneHtmlFile, s as extractSfcBlocks, u as hasVueLikeExtension } from "./workaround-FRBXv1sV.mjs";
 import { spawn, spawnSync } from "node:child_process";
 import path from "node:path";
 import fs from "node:fs";

package/dist/{configs-BWrI9B41.mjs → configs-CcanGVPM.mjs}

@@ -1,4 +1,4 @@
-import { a as validateWorkaroundAuthority, c as formatBlockLabel, d as isPatinaFile, f as isScriptLikeFile, i as resolveWorkaroundSource, l as getDiagnosticBlock, m as loadBinding, o as compareLineColumn, r as readOriginalWorkaroundSource, s as extractSfcBlocks, t as isLocationBridgeProgram } from "./workaround-CiQUFJw0.mjs";
+import { a as validateWorkaroundAuthority, c as formatBlockLabel, d as isPatinaFile, f as isScriptLikeFile, i as resolveWorkaroundSource, l as getDiagnosticBlock, m as loadBinding, o as compareLineColumn, r as readOriginalWorkaroundSource, s as extractSfcBlocks, t as isLocationBridgeProgram } from "./workaround-FRBXv1sV.mjs";
 import { definePlugin, defineRule } from "@oxlint/plugins";
 import fs from "node:fs";
 //#region src/plugin-option-guards.ts

package/dist/eslint.mjs

@@ -1,5 +1,5 @@
-import { a as getPatinaRules, c as isTypeAwareRuleName, d as getRuleOptions, i as formatPatinaMessage, l as createRuleSelection, n as createVizeRuleConfig, o as getActivePreset, r as plugin_default, s as getVizeSettings, t as configs } from "./configs-BWrI9B41.mjs";
-import { d as isPatinaFile, m as loadBinding } from "./workaround-CiQUFJw0.mjs";
+import { a as getPatinaRules, c as isTypeAwareRuleName, d as getRuleOptions, i as formatPatinaMessage, l as createRuleSelection, n as createVizeRuleConfig, o as getActivePreset, r as plugin_default, s as getVizeSettings, t as configs } from "./configs-CcanGVPM.mjs";
+import { d as isPatinaFile, m as loadBinding } from "./workaround-FRBXv1sV.mjs";
 import { definePlugin, defineRule, eslintCompatPlugin } from "@oxlint/plugins";
 //#region src/eslint-source.ts
 /** Native UTF-8 text cannot preserve an unpaired UTF-16 surrogate. */

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { a as getPatinaRules, n as createVizeRuleConfig, r as plugin_default, t as configs, u as selectVizeRuleConfig } from "./configs-BWrI9B41.mjs";
+import { a as getPatinaRules, n as createVizeRuleConfig, r as plugin_default, t as configs, u as selectVizeRuleConfig } from "./configs-CcanGVPM.mjs";
 //#region src/vite-plus.ts
 /**
 * Bare specifier Oxlint uses to load this bridge as a JS plugin.

package/dist/{workaround-CiQUFJw0.mjs → workaround-FRBXv1sV.mjs}

@@ -2,8 +2,8 @@ import { createRequire } from "node:module";
 import { spawnSync } from "node:child_process";
 import path from "node:path";
 import fs from "node:fs";
-import { createHash } from "node:crypto";
 import { isUtf8 } from "node:buffer";
+import { createHash } from "node:crypto";
 //#region src/native.ts
 const require = createRequire(import.meta.url);
 const FALLBACK_BINDING_PACKAGE = "@vizejs/native";
@@ -113,69 +113,112 @@ function isStandaloneHtmlFile(filename) {
 //#endregion
 //#region src/sfc-blocks.ts
 function extractSfcBlocks(source) {
-	const blocks = [];
-	const lineStarts = createLineStartOffsets(source);
-	let cursor = 0;
-	for (;;) {
-		const match = findNextOpenTag(source, cursor);
-		if (match == null) return blocks;
-		const { tagName, openTag, openTagEnd } = match;
-		const closeTag = `</${tagName}>`;
-		const closeTagStart = source.indexOf(closeTag, openTagEnd);
-		if (closeTagStart === -1) {
-			cursor = openTagEnd;
-			continue;
-		}
-		blocks.push({
-			kind: resolveBlockKind(tagName, openTag),
-			name: tagName,
-			content: source.slice(openTagEnd, closeTagStart),
-			contentStart: offsetToLineColumn(lineStarts, openTagEnd),
-			contentEnd: offsetToLineColumn(lineStarts, closeTagStart)
+	const binding = loadBinding();
+	if (typeof binding.parseSfc !== "function") throw new Error("Vize native binding does not expose the SFC parser.");
+	let descriptor;
+	try {
+		descriptor = binding.parseSfc(source);
+	} catch (error) {
+		if (error !== null && typeof error === "object" && "code" in error && error.code === "InvalidSfc") return [];
+		throw error;
+	}
+	return projectSfcBlocks(source, descriptor);
+}
+/** Project checked native geometry; never rediscover tags from the source text. */
+function projectSfcBlocks(source, descriptor) {
+	if (descriptor.source !== source || !Array.isArray(descriptor.styles) || !Array.isArray(descriptor.customBlocks)) throw new Error("Vize SFC descriptor does not describe the complete original source.");
+	const parsed = [];
+	const add = (block, kind, name) => {
+		if (block !== null) parsed.push({
+			block,
+			kind,
+			name
 		});
-		cursor = closeTagStart + closeTag.length;
+	};
+	add(descriptor.template, "template", "template");
+	if (descriptor.script !== null && descriptor.script.setup !== false) throw new Error("Vize SFC script descriptor has invalid setup ownership.");
+	if (descriptor.scriptSetup !== null && descriptor.scriptSetup.setup !== true) throw new Error("Vize SFC setup descriptor has invalid setup ownership.");
+	add(descriptor.script, "script", "script");
+	add(descriptor.scriptSetup, "script-setup", "script");
+	for (const block of descriptor.styles) add(block, "style", "style");
+	for (const block of descriptor.customBlocks) {
+		if (typeof block.type !== "string" || block.type.length === 0) throw new Error("Vize SFC custom descriptor has no block name.");
+		add(block, "custom", block.type);
 	}
-}
-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;
+	const bytes = Buffer.from(source, "utf8");
+	if (bytes.toString("utf8") !== source) throw new Error("Vize SFC source cannot round-trip through UTF-8.");
+	for (const { block } of parsed) {
+		const loc = block.loc;
+		if (!loc || typeof block.content !== "string" || ![
+			loc.start,
+			loc.end,
+			loc.tagStart,
+			loc.tagEnd
+		].every((offset) => Number.isSafeInteger(offset) && offset >= 0 && offset <= bytes.length) || loc.tagStart > loc.start || loc.start > loc.end || loc.end > loc.tagEnd) throw new Error("Vize SFC descriptor has invalid byte geometry.");
+	}
+	parsed.sort((left, right) => left.block.loc.tagStart - right.block.loc.tagStart);
+	let previousEnd = 0;
+	for (const { block } of parsed) {
+		if (block.loc.tagStart < previousEnd) throw new Error("Vize SFC descriptor contains overlapping top-level blocks.");
+		previousEnd = block.loc.tagEnd;
+	}
+	const positions = projectPositions(bytes, parsed.flatMap(({ block }) => [
+		block.loc.tagStart,
+		block.loc.start,
+		block.loc.end,
+		block.loc.tagEnd
+	]));
+	return parsed.map(({ block, kind, name }) => {
+		const { loc, content } = block;
+		const start = positions.get(loc.start);
+		const end = positions.get(loc.end);
+		if (source.slice(start.index, end.index) !== content || loc.startLine !== start.line || loc.startColumn !== start.byteColumn || loc.endLine !== end.line || loc.endColumn !== end.byteColumn) throw new Error("Vize SFC descriptor content and geometry disagree with the original source.");
 		return {
-			tagName: source.slice(tagNameStart, tagNameEnd),
-			openTag: source.slice(openTagStart, openTagEnd),
-			openTagEnd
+			kind,
+			name,
+			content,
+			contentStart: {
+				line: start.line,
+				column: start.column
+			},
+			contentEnd: {
+				line: end.line,
+				column: end.column
+			}
 		};
-	}
+	});
 }
-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;
+/** Decode disjoint byte segments once. LF is the parser's line boundary; CR stays exact. */
+function projectPositions(bytes, offsets) {
+	const positions = /* @__PURE__ */ new Map();
+	let previous = 0;
+	let index = 0;
+	let line = 1;
+	let column = 1;
+	let byteColumn = 1;
+	for (const offset of [...new Set(offsets)].sort((left, right) => left - right)) {
+		const segment = bytes.subarray(previous, offset);
+		if (!isUtf8(segment)) throw new Error("Vize SFC byte endpoint splits a UTF-8 scalar.");
+		const text = segment.toString("utf8");
+		index += text.length;
+		const newline = text.lastIndexOf("\n");
+		if (newline === -1) {
+			column += text.length;
+			byteColumn += segment.length;
+		} else {
+			for (const character of text) if (character === "\n") line += 1;
+			column = text.length - newline;
+			byteColumn = segment.length - segment.lastIndexOf(10);
 		}
-		if (code === 62) return index + 1;
+		positions.set(offset, {
+			index,
+			line,
+			column,
+			byteColumn
+		});
+		previous = offset;
 	}
-	return null;
+	return positions;
 }
 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;
@@ -195,43 +238,6 @@ 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);
-	return lineStarts;
-}
-function offsetToLineColumn(lineStarts, offset) {
-	let low = 0;
-	let high = lineStarts.length - 1;
-	while (low <= high) {
-		const middle = low + high >> 1;
-		if (lineStarts[middle] <= offset) {
-			low = middle + 1;
-			continue;
-		}
-		high = middle - 1;
-	}
-	const lineIndex = Math.max(0, low - 1);
-	return {
-		line: lineIndex + 1,
-		column: offset - lineStarts[lineIndex] + 1
-	};
-}
-function resolveBlockKind(tagName, openTag) {
-	if (tagName === "template") return "template";
-	if (tagName === "script") return /\bsetup(?:\s|>|=)/u.test(openTag) ? "script-setup" : "script";
-	if (tagName === "style") return "style";
-	return "custom";
-}
 //#endregion
 //#region src/workaround.ts
 const SCRIPTLESS_WORKAROUND_MARKER = "oxlint-plugin-vize-scriptless";

package/package.json

@@ -12,7 +12,7 @@
   "devDependencies": {
     "@tsdown/css": "0.22.14",
     "@types/node": "25.9.2",
-    "@vizejs/native": "0.463.0",
+    "@vizejs/native": "0.467.0",
     "tsdown": "0.22.14",
     "typescript": "6.0.3",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.1.24",
@@ -53,14 +53,14 @@
   },
   "name": "oxlint-plugin-vize",
   "optionalDependencies": {
-    "@vizejs/native-darwin-arm64": "0.463.0",
-    "@vizejs/native-darwin-x64": "0.463.0",
-    "@vizejs/native-linux-arm64-gnu": "0.463.0",
-    "@vizejs/native-linux-arm64-musl": "0.463.0",
-    "@vizejs/native-linux-x64-gnu": "0.463.0",
-    "@vizejs/native-linux-x64-musl": "0.463.0",
-    "@vizejs/native-win32-arm64-msvc": "0.463.0",
-    "@vizejs/native-win32-x64-msvc": "0.463.0"
+    "@vizejs/native-darwin-arm64": "0.467.0",
+    "@vizejs/native-darwin-x64": "0.467.0",
+    "@vizejs/native-linux-arm64-gnu": "0.467.0",
+    "@vizejs/native-linux-arm64-musl": "0.467.0",
+    "@vizejs/native-linux-x64-gnu": "0.467.0",
+    "@vizejs/native-linux-x64-musl": "0.467.0",
+    "@vizejs/native-win32-arm64-msvc": "0.467.0",
+    "@vizejs/native-win32-x64-msvc": "0.467.0"
   },
   "publishConfig": {
     "access": "public"
@@ -72,7 +72,7 @@
   },
   "type": "module",
   "types": "./dist/index.d.mts",
-  "version": "0.463.0",
+  "version": "0.467.0",
   "scripts": {
     "build": "vp pack",
     "check": "vp check src vite.config.ts",