@weapp-vite/volar 2.1.12 → 2.1.14

package/dist/index.cjs

@@ -688,6 +688,78 @@ function resolveScriptSetupLang(lang) {
 	return lang === "js" ? "js" : "ts";
 }
 //#endregion
+//#region 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`);
+		}
+	};
+}
+//#endregion
 //#region 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;
@@ -748,7 +820,7 @@ const plugin = (ctx) => {
 			syncScriptBlockSource(scriptSetup);
 		} else descriptor.scriptSetup = createSyntheticScriptSetup(wxsModuleNames);
 	}
-	return {
+	const parserPlugin = {
 		name,
 		version: PLUGIN_VERSION,
 		order: -1,
@@ -772,6 +844,7 @@ 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

@@ -664,6 +664,78 @@ function resolveScriptSetupLang(lang) {
 	return lang === "js" ? "js" : "ts";
 }
 //#endregion
+//#region 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`);
+		}
+	};
+}
+//#endregion
 //#region src/index.ts
 const require = createRequire(typeof module !== "undefined" && module.filename ? module.filename : path.join(process.cwd(), "weapp-vite-volar.cjs"));
 let hasSchematicsTypes = false;
@@ -724,7 +796,7 @@ const plugin = (ctx) => {
 			syncScriptBlockSource(scriptSetup);
 		} else descriptor.scriptSetup = createSyntheticScriptSetup(wxsModuleNames);
 	}
-	return {
+	const parserPlugin = {
 		name,
 		version: PLUGIN_VERSION,
 		order: -1,
@@ -748,6 +820,7 @@ 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.12",
+  "version": "2.1.14",
   "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",
@@ -48,7 +48,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@weapp-core/schematics": "6.2.8"
+    "@weapp-core/schematics": "6.2.10"
   },
   "scripts": {
     "benchmark": "node --import tsx benchmark/sfc.ts",