@weapp-vite/volar 2.1.13 → 2.2.0

package/dist/index.cjs

@@ -1,4 +1,4 @@
-//#region \0rolldown/runtime.js
+// \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -19,17 +19,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
-//#endregion
 let node_module = require("node:module");
 let node_path = require("node:path");
 node_path = __toESM(node_path);
 let node_process = require("node:process");
 node_process = __toESM(node_process);
 let _weapp_core_schematics = require("@weapp-core/schematics");
-//#region package.json
+// package.json
 var name = "@weapp-vite/volar";
-//#endregion
-//#region src/constants.ts
+// src/constants.ts
 const BLOCK_TYPE = "json";
 const JSONC_LANG = "jsonc";
 const JSON_LANG = "json";
@@ -54,8 +52,7 @@ const VOID_CAPABILITIES = {
 	structure: false,
 	format: false
 };
-//#endregion
-//#region src/schema.ts
+// src/schema.ts
 /**
 * 为小程序配置生成 JSON Schema
 * 为支持 JSON Schema 的编辑器提供验证和自动补全
@@ -72,8 +69,7 @@ function getSchemaForType(type) {
 	if (!definition) return null;
 	return definition.schema;
 }
-//#endregion
-//#region src/jsonBlock.ts
+// src/jsonBlock.ts
 function normalizeFilename(filename) {
 	if (!filename) return "";
 	return filename.replace(BACKSLASH_RE, "/");
@@ -237,8 +233,7 @@ function resolveEmbeddedJsonBlock(fileName, sfc, embeddedCode, tsModule, hasSche
 		FULL_CAPABILITIES
 	]);
 }
-//#endregion
-//#region src/parseSfc.ts
+// src/parseSfc.ts
 function advancePosition(position, source, start = 0, end = source.length) {
 	let lines = 0;
 	let lastNewline = -1;
@@ -407,8 +402,7 @@ function updateSfc(sfc, change) {
 	sfc.descriptor.source = source.slice(0, change.start) + change.newText + source.slice(change.end);
 	return sfc;
 }
-//#endregion
-//#region src/scriptSetup.ts
+// src/scriptSetup.ts
 function collectWxsModuleNames(templateContent) {
 	if (!templateContent) return [];
 	const names = /* @__PURE__ */ new Set();
@@ -687,8 +681,78 @@ function createDefineOptionsTemplateDeclarations(code, tsModule, lang) {
 function resolveScriptSetupLang(lang) {
 	return lang === "js" ? "js" : "ts";
 }
-//#endregion
-//#region src/index.ts
+// src/templateRef.ts
+const SERVICE_SCRIPT_RE = /^script_([jt]sx?)$/;
+const WHITESPACE_RE = /\s/;
+const LINE_TERMINATOR_RE = /[\n\r\u2028\u2029]/;
+const BROWSER_ELEMENTS = "Omit<SVGElementTagNameMap, keyof HTMLElementTagNameMap> & HTMLElementTagNameMap";
+const MINI_PROGRAM_ELEMENTS = "import('wevu').MiniProgramTemplateRefElements";
+const LOCAL_ELEMENTS = `Omit<${BROWSER_ELEMENTS}, keyof ${MINI_PROGRAM_ELEMENTS}> & ${MINI_PROGRAM_ELEMENTS}`;
+/** 线性扫描首条上游语法指令，保留跨行分隔符及空白 key/value 的匹配边界。 */
+function readCompilerDirective(comment) {
+	let cursor = 0;
+	while (cursor < comment.length) {
+		while (cursor < comment.length && WHITESPACE_RE.test(comment[cursor])) cursor += 1;
+		if (cursor === comment.length) return;
+		if (comment[cursor] !== "@") {
+			while (cursor < comment.length && !LINE_TERMINATOR_RE.test(comment[cursor])) cursor += 1;
+			continue;
+		}
+		const keyStart = cursor + 1;
+		if (keyStart === comment.length || LINE_TERMINATOR_RE.test(comment[keyStart])) {
+			cursor = keyStart;
+			continue;
+		}
+		let separator = keyStart + 1;
+		while (separator < comment.length && !WHITESPACE_RE.test(comment[separator])) separator += 1;
+		if (separator === comment.length) return;
+		let valueStart = separator;
+		while (valueStart < comment.length && WHITESPACE_RE.test(comment[valueStart])) valueStart += 1;
+		const key = comment.slice(keyStart, separator);
+		if (valueStart === comment.length) {
+			valueStart -= 1;
+			while (valueStart > separator && LINE_TERMINATOR_RE.test(comment[valueStart])) valueStart -= 1;
+			return valueStart > separator ? {
+				key,
+				value: comment[valueStart]
+			} : void 0;
+		}
+		let valueEnd = valueStart;
+		while (valueEnd < comment.length && !LINE_TERMINATOR_RE.test(comment[valueEnd])) valueEnd += 1;
+		while (valueEnd > valueStart && WHITESPACE_RE.test(comment[valueEnd - 1])) valueEnd -= 1;
+		return {
+			key,
+			value: comment.slice(valueStart, valueEnd)
+		};
+	}
+}
+/** 仅解析文件级 lib 覆盖，保持上游每条注释首个配置与最后有效配置的语义。 */
+function resolveTemplateRefLib(baseLib, comments) {
+	let lib = baseLib;
+	for (const comment of comments) {
+		const directive = readCompilerDirective(comment);
+		if (directive?.key !== "lib") continue;
+		try {
+			lib = JSON.parse(directive.value);
+		} catch {}
+	}
+	return lib;
+}
+/** 在上游服务脚本生成后，用模块局部类型覆盖小程序原生 ref，避免修改浏览器全局声明。 */
+function createTemplateRefPlugin(baseLib) {
+	return {
+		name: "@weapp-vite/volar:template-ref",
+		version: PLUGIN_VERSION,
+		order: 1,
+		resolveEmbeddedCode(_fileName, sfc, embeddedCode) {
+			const match = SERVICE_SCRIPT_RE.exec(embeddedCode.id);
+			if (!match || resolveTemplateRefLib(baseLib, sfc.comments) !== "wevu") return;
+			const declaration = match[1].startsWith("j") ? `/** @typedef {${LOCAL_ELEMENTS}} __VLS_Elements */` : `type __VLS_Elements = ${LOCAL_ELEMENTS};`;
+			embeddedCode.content.push(`\n${declaration}\n`);
+		}
+	};
+}
+// src/index.ts
 const require$1 = (0, node_module.createRequire)(typeof module !== "undefined" && module.filename ? module.filename : node_path.default.join(node_process.default.cwd(), "weapp-vite-volar.cjs"));
 let hasSchematicsTypes = false;
 try {
@@ -748,7 +812,7 @@ const plugin = (ctx) => {
 			syncScriptBlockSource(scriptSetup);
 		} else descriptor.scriptSetup = createSyntheticScriptSetup(wxsModuleNames);
 	}
-	return {
+	const parserPlugin = {
 		name,
 		version: PLUGIN_VERSION,
 		order: -1,
@@ -772,6 +836,6 @@ const plugin = (ctx) => {
 			resolveEmbeddedJsonBlock(fileName, sfc, embeddedCode, tsModule, hasSchematicsTypes);
 		}
 	};
+	return ctx?.vueCompilerOptions ? [parserPlugin, createTemplateRefPlugin(ctx.vueCompilerOptions.lib)] : parserPlugin;
 };
-//#endregion
 module.exports = plugin;

package/dist/index.mjs

@@ -2,10 +2,9 @@ import { createRequire } from "node:module";
 import path from "node:path";
 import process from "node:process";
 import { JSON_SCHEMA_DEFINITIONS } from "@weapp-core/schematics";
-//#region package.json
+// package.json
 var name = "@weapp-vite/volar";
-//#endregion
-//#region src/constants.ts
+// src/constants.ts
 const BLOCK_TYPE = "json";
 const JSONC_LANG = "jsonc";
 const JSON_LANG = "json";
@@ -30,8 +29,7 @@ const VOID_CAPABILITIES = {
 	structure: false,
 	format: false
 };
-//#endregion
-//#region src/schema.ts
+// src/schema.ts
 /**
 * 为小程序配置生成 JSON Schema
 * 为支持 JSON Schema 的编辑器提供验证和自动补全
@@ -48,8 +46,7 @@ function getSchemaForType(type) {
 	if (!definition) return null;
 	return definition.schema;
 }
-//#endregion
-//#region src/jsonBlock.ts
+// src/jsonBlock.ts
 function normalizeFilename(filename) {
 	if (!filename) return "";
 	return filename.replace(BACKSLASH_RE, "/");
@@ -213,8 +210,7 @@ function resolveEmbeddedJsonBlock(fileName, sfc, embeddedCode, tsModule, hasSche
 		FULL_CAPABILITIES
 	]);
 }
-//#endregion
-//#region src/parseSfc.ts
+// src/parseSfc.ts
 function advancePosition(position, source, start = 0, end = source.length) {
 	let lines = 0;
 	let lastNewline = -1;
@@ -383,8 +379,7 @@ function updateSfc(sfc, change) {
 	sfc.descriptor.source = source.slice(0, change.start) + change.newText + source.slice(change.end);
 	return sfc;
 }
-//#endregion
-//#region src/scriptSetup.ts
+// src/scriptSetup.ts
 function collectWxsModuleNames(templateContent) {
 	if (!templateContent) return [];
 	const names = /* @__PURE__ */ new Set();
@@ -663,8 +658,78 @@ function createDefineOptionsTemplateDeclarations(code, tsModule, lang) {
 function resolveScriptSetupLang(lang) {
 	return lang === "js" ? "js" : "ts";
 }
-//#endregion
-//#region src/index.ts
+// src/templateRef.ts
+const SERVICE_SCRIPT_RE = /^script_([jt]sx?)$/;
+const WHITESPACE_RE = /\s/;
+const LINE_TERMINATOR_RE = /[\n\r\u2028\u2029]/;
+const BROWSER_ELEMENTS = "Omit<SVGElementTagNameMap, keyof HTMLElementTagNameMap> & HTMLElementTagNameMap";
+const MINI_PROGRAM_ELEMENTS = "import('wevu').MiniProgramTemplateRefElements";
+const LOCAL_ELEMENTS = `Omit<${BROWSER_ELEMENTS}, keyof ${MINI_PROGRAM_ELEMENTS}> & ${MINI_PROGRAM_ELEMENTS}`;
+/** 线性扫描首条上游语法指令，保留跨行分隔符及空白 key/value 的匹配边界。 */
+function readCompilerDirective(comment) {
+	let cursor = 0;
+	while (cursor < comment.length) {
+		while (cursor < comment.length && WHITESPACE_RE.test(comment[cursor])) cursor += 1;
+		if (cursor === comment.length) return;
+		if (comment[cursor] !== "@") {
+			while (cursor < comment.length && !LINE_TERMINATOR_RE.test(comment[cursor])) cursor += 1;
+			continue;
+		}
+		const keyStart = cursor + 1;
+		if (keyStart === comment.length || LINE_TERMINATOR_RE.test(comment[keyStart])) {
+			cursor = keyStart;
+			continue;
+		}
+		let separator = keyStart + 1;
+		while (separator < comment.length && !WHITESPACE_RE.test(comment[separator])) separator += 1;
+		if (separator === comment.length) return;
+		let valueStart = separator;
+		while (valueStart < comment.length && WHITESPACE_RE.test(comment[valueStart])) valueStart += 1;
+		const key = comment.slice(keyStart, separator);
+		if (valueStart === comment.length) {
+			valueStart -= 1;
+			while (valueStart > separator && LINE_TERMINATOR_RE.test(comment[valueStart])) valueStart -= 1;
+			return valueStart > separator ? {
+				key,
+				value: comment[valueStart]
+			} : void 0;
+		}
+		let valueEnd = valueStart;
+		while (valueEnd < comment.length && !LINE_TERMINATOR_RE.test(comment[valueEnd])) valueEnd += 1;
+		while (valueEnd > valueStart && WHITESPACE_RE.test(comment[valueEnd - 1])) valueEnd -= 1;
+		return {
+			key,
+			value: comment.slice(valueStart, valueEnd)
+		};
+	}
+}
+/** 仅解析文件级 lib 覆盖，保持上游每条注释首个配置与最后有效配置的语义。 */
+function resolveTemplateRefLib(baseLib, comments) {
+	let lib = baseLib;
+	for (const comment of comments) {
+		const directive = readCompilerDirective(comment);
+		if (directive?.key !== "lib") continue;
+		try {
+			lib = JSON.parse(directive.value);
+		} catch {}
+	}
+	return lib;
+}
+/** 在上游服务脚本生成后，用模块局部类型覆盖小程序原生 ref，避免修改浏览器全局声明。 */
+function createTemplateRefPlugin(baseLib) {
+	return {
+		name: "@weapp-vite/volar:template-ref",
+		version: PLUGIN_VERSION,
+		order: 1,
+		resolveEmbeddedCode(_fileName, sfc, embeddedCode) {
+			const match = SERVICE_SCRIPT_RE.exec(embeddedCode.id);
+			if (!match || resolveTemplateRefLib(baseLib, sfc.comments) !== "wevu") return;
+			const declaration = match[1].startsWith("j") ? `/** @typedef {${LOCAL_ELEMENTS}} __VLS_Elements */` : `type __VLS_Elements = ${LOCAL_ELEMENTS};`;
+			embeddedCode.content.push(`\n${declaration}\n`);
+		}
+	};
+}
+// src/index.ts
 const require = createRequire(typeof module !== "undefined" && module.filename ? module.filename : path.join(process.cwd(), "weapp-vite-volar.cjs"));
 let hasSchematicsTypes = false;
 try {
@@ -724,7 +789,7 @@ const plugin = (ctx) => {
 			syncScriptBlockSource(scriptSetup);
 		} else descriptor.scriptSetup = createSyntheticScriptSetup(wxsModuleNames);
 	}
-	return {
+	const parserPlugin = {
 		name,
 		version: PLUGIN_VERSION,
 		order: -1,
@@ -748,6 +813,6 @@ const plugin = (ctx) => {
 			resolveEmbeddedJsonBlock(fileName, sfc, embeddedCode, tsModule, hasSchematicsTypes);
 		}
 	};
+	return ctx?.vueCompilerOptions ? [parserPlugin, createTemplateRefPlugin(ctx.vueCompilerOptions.lib)] : parserPlugin;
 };
-//#endregion
 export { plugin as default };

package/dist/templateRef.d.ts

@@ -0,0 +1,5 @@
+import type { VueLanguagePluginReturn } from '@vue/language-core';
+/** 仅解析文件级 lib 覆盖，保持上游每条注释首个配置与最后有效配置的语义。 */
+export declare function resolveTemplateRefLib(baseLib: string, comments: readonly string[]): unknown;
+/** 在上游服务脚本生成后，用模块局部类型覆盖小程序原生 ref，避免修改浏览器全局声明。 */
+export declare function createTemplateRefPlugin(baseLib: string): VueLanguagePluginReturn;

package/dist/templateRef.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-vite/volar",
-  "version": "2.1.13",
+  "version": "2.2.0",
   "description": "Volar plugin for weapp-vite - Provides IntelliSense and type checking for WeChat mini-program config blocks",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -41,14 +41,14 @@
     "dist"
   ],
   "engines": {
-    "node": "^20.19.0 || >=22.12.0"
+    "node": "^22.23.4 || ^24.22.1 || >=26.12.1"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@weapp-core/schematics": "6.2.9"
+    "@weapp-core/schematics": "6.3.0"
   },
   "scripts": {
     "benchmark": "node --import tsx benchmark/sfc.ts",