oxlint-plugin-vize 0.284.0 → 0.286.0

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { a as isStandaloneHtmlFile, i as hasVueLikeExtension, n as hasScriptLikeBlock, t as appendScriptlessWorkaround } from "./workaround-BKap0lsB.mjs";
+import { a as isStandaloneHtmlFile, i as hasVueLikeExtension, n as hasScriptLikeBlock, t as appendScriptlessWorkaround } from "./workaround-1vv4vvr7.mjs";
 import { spawn } from "node:child_process";
 import path from "node:path";
 import fs from "node:fs";

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { c as extractSfcBlocks, l as formatBlockLabel, o as isVueLikeFile, r as resolveWorkaroundSource, s as compareLineColumn, u as getDiagnosticBlock } from "./workaround-BKap0lsB.mjs";
+import { c as extractSfcBlocks, l as formatBlockLabel, o as isVueLikeFile, r as resolveWorkaroundSource, s as compareLineColumn, u as getDiagnosticBlock } from "./workaround-1vv4vvr7.mjs";
 import { createRequire } from "node:module";
 import { definePlugin, defineRule } from "@oxlint/plugins";
 import { spawnSync } from "node:child_process";

package/dist/{workaround-BKap0lsB.mjs → workaround-1vv4vvr7.mjs}

@@ -86,8 +86,9 @@ function isStandaloneHtmlFile(filename) {
 }
 //#endregion
 //#region src/workaround.ts
-const SCRIPTLESS_WORKAROUND_OPEN_TAG_PREFIX = `<script setup lang="ts" data-oxlint-plugin-vize-scriptless="`;
-const SCRIPTLESS_WORKAROUND_CLOSE_TAG = "<\/script>";
+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}="`;
 function hasScriptLikeBlock(source) {
 	return extractSfcBlocks(source).some((block) => block.kind === "script" || block.kind === "script-setup");
 }
@@ -95,33 +96,41 @@ function appendScriptlessWorkaround(source, filename) {
 	return `${createWorkaroundScript(source, filename)}${source}`;
 }
 function resolveWorkaroundSource(source, fallbackFilename) {
-	if (!source.startsWith(SCRIPTLESS_WORKAROUND_OPEN_TAG_PREFIX)) return {
+	const workaroundBlock = getPrependedWorkaroundBlock(source);
+	if (workaroundBlock == null) return {
 		filename: fallbackFilename,
 		source,
 		usesOriginalLocations: false
 	};
-	const encodedFilenameStart = SCRIPTLESS_WORKAROUND_OPEN_TAG_PREFIX.length;
-	const encodedFilenameEnd = source.indexOf(`">`, encodedFilenameStart);
-	if (encodedFilenameEnd === -1) return {
-		filename: fallbackFilename,
-		source,
-		usesOriginalLocations: false
-	};
-	const closeTagStart = source.indexOf(SCRIPTLESS_WORKAROUND_CLOSE_TAG, encodedFilenameEnd + 2);
-	if (closeTagStart === -1) return {
-		filename: fallbackFilename,
-		source,
-		usesOriginalLocations: false
-	};
-	let strippedSourceStart = closeTagStart + 9;
+	let strippedSourceStart = workaroundBlock.closeTagEnd;
 	if (source.charCodeAt(strippedSourceStart) === 13) strippedSourceStart += 1;
 	if (source.charCodeAt(strippedSourceStart) === 10) strippedSourceStart += 1;
 	return {
-		filename: decodeWorkaroundFilename(source.slice(encodedFilenameStart, encodedFilenameEnd)) ?? fallbackFilename,
+		filename: decodeWorkaroundFilename(workaroundBlock.encodedFilename) ?? fallbackFilename,
 		source: source.slice(strippedSourceStart),
 		usesOriginalLocations: true
 	};
 }
+function getPrependedWorkaroundBlock(source) {
+	const [firstBlock] = extractSfcBlocks(source);
+	if (!firstBlock || firstBlock.kind !== "script-setup") return null;
+	if (!isWhitespaceOnly(firstBlock.content)) return null;
+	const contentStart = offsetFromLineColumn(source, firstBlock.contentStart);
+	const contentEnd = offsetFromLineColumn(source, firstBlock.contentEnd);
+	const encodedFilename = encodedFilenameFromWorkaroundOpenTag(source.slice(0, contentStart));
+	if (encodedFilename == null) return null;
+	return {
+		closeTagEnd: contentEnd + 9,
+		encodedFilename
+	};
+}
+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;
+	const encodedFilenameEnd = openTag.indexOf("\"", encodedFilenameStart);
+	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)}<\/script>\n`;
 }
@@ -138,6 +147,18 @@ function decodeWorkaroundFilename(encoded) {
 		return null;
 	}
 }
+function isWhitespaceOnly(value) {
+	return /^\s*$/u.test(value);
+}
+function offsetFromLineColumn(source, loc) {
+	let line = 1;
+	let lineStart = 0;
+	for (let index = 0; index < source.length && line < loc.line; index += 1) if (source.charCodeAt(index) === 10) {
+		line += 1;
+		lineStart = index + 1;
+	}
+	return lineStart + loc.column - 1;
+}
 if (import.meta.vitest) {
 	const { describe, expect, it } = import.meta.vitest;
 	describe("scriptless workaround helpers", () => {
@@ -156,6 +177,15 @@ if (import.meta.vitest) {
 				usesOriginalLocations: true
 			});
 		});
+		it("does not strip real script setup blocks that mimic the marker", () => {
+			const fallbackFilename = "/Users/example/fallback.vue";
+			const source = `${SCRIPTLESS_WORKAROUND_OPEN_TAG_PREFIX}${encodeWorkaroundFilename("/Users/example/Real.vue")}">const userCode = true;<\/script>\n<template />`;
+			expect(resolveWorkaroundSource(source, fallbackFilename)).toEqual({
+				filename: fallbackFilename,
+				source,
+				usesOriginalLocations: false
+			});
+		});
 	});
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxlint-plugin-vize",
-  "version": "0.284.0",
+  "version": "0.286.0",
   "description": "Oxlint JS plugin bridge for Vize Patina",
   "keywords": [
     "lint",
@@ -44,21 +44,21 @@
   "devDependencies": {
     "@tsdown/css": "0.22.0",
     "@types/node": "25.9.2",
-    "@vizejs/native": "0.284.0",
+    "@vizejs/native": "0.286.0",
     "tsdown": "0.22.0",
     "typescript": "6.0.3",
     "vite": "npm:@voidzero-dev/vite-plus-core@0.1.21",
     "vite-plus": "0.1.21"
   },
   "optionalDependencies": {
-    "@vizejs/native-darwin-arm64": "0.284.0",
-    "@vizejs/native-darwin-x64": "0.284.0",
-    "@vizejs/native-linux-arm64-gnu": "0.284.0",
-    "@vizejs/native-linux-arm64-musl": "0.284.0",
-    "@vizejs/native-linux-x64-gnu": "0.284.0",
-    "@vizejs/native-linux-x64-musl": "0.284.0",
-    "@vizejs/native-win32-arm64-msvc": "0.284.0",
-    "@vizejs/native-win32-x64-msvc": "0.284.0"
+    "@vizejs/native-darwin-arm64": "0.286.0",
+    "@vizejs/native-darwin-x64": "0.286.0",
+    "@vizejs/native-linux-arm64-gnu": "0.286.0",
+    "@vizejs/native-linux-arm64-musl": "0.286.0",
+    "@vizejs/native-linux-x64-gnu": "0.286.0",
+    "@vizejs/native-linux-x64-musl": "0.286.0",
+    "@vizejs/native-win32-arm64-msvc": "0.286.0",
+    "@vizejs/native-win32-x64-msvc": "0.286.0"
   },
   "engines": {
     "node": "^22 || >= 24"