@wevu/compiler 6.12.3 → 6.13.0

package/dist/index.d.mts

@@ -38,6 +38,7 @@ declare const WE_VU_RUNTIME_APIS: {
   readonly createApp: "createApp";
   readonly createWevuComponent: "createWevuComponent";
   readonly createWevuScopedSlotComponent: "createWevuScopedSlotComponent";
+  readonly defineAppSetup: "defineAppSetup";
   readonly defineComponent: "defineComponent";
   readonly setWevuDefaults: "setWevuDefaults";
 };
@@ -559,6 +560,7 @@ declare function stripJsonMacroCallsFromCode(code: string, filename: string): st
  */
 declare function extractJsonMacroFromScriptSetup(content: string, filename: string, lang?: string, options?: {
   merge?: (target: Record<string, any>, source: Record<string, any>) => Record<string, any> | void;
+  preambleContent?: string;
 }): Promise<{
   stripped: string;
   config?: Record<string, any>;

package/dist/index.mjs

@@ -3,19 +3,20 @@ import path from "pathe";
 import { NodeTypes, baseParse } from "@vue/compiler-core";
 import { createHash } from "node:crypto";
 import * as t from "@weapp-vite/ast/babelTypes";
-import fs from "fs-extra";
 import MagicString from "magic-string";
 import { recursive } from "merge";
 import { bundleRequire } from "rolldown-require";
-import { BABEL_TS_MODULE_PARSER_OPTIONS, generate, parse as parse$2, parseJsLike, traverse } from "@weapp-vite/ast/babel";
-import fs$1 from "node:fs";
+import { access, mkdir, readFile as readFile$1, rm, stat, writeFile } from "node:fs/promises";
+import { BABEL_TS_MODULE_PARSER_OPTIONS, generate, parse as parse$3, parseJsLike, traverse } from "@weapp-vite/ast/babel";
+import fs from "node:fs";
 import os from "node:os";
 import process from "node:process";
 import { collectFeatureFlagsFromCode, collectJsxImportedComponentsAndDefaultExportFromBabelAst, collectJsxTemplateTagsFromBabelExpression, getRenderPropertyFromComponentOptions, parseJsLikeWithEngine, resolveRenderExpressionFromComponentOptions, toStaticObjectKey, unwrapTypeScriptExpression } from "@weapp-vite/ast";
 import { LRUCache } from "lru-cache";
 import { compileScript, parse } from "vue/compiler-sfc";
 import { fileURLToPath } from "node:url";
-import { parse as parse$1 } from "comment-json";
+import { parse as parse$1 } from "@vue/compiler-dom";
+import { parse as parse$2 } from "comment-json";
 import vm from "node:vm";
 //#region src/auto-import-components/builtin.auto.ts
 const components = [
@@ -145,6 +146,7 @@ const WE_VU_RUNTIME_APIS = {
 	createApp: "createApp",
 	createWevuComponent: "createWevuComponent",
 	createWevuScopedSlotComponent: "createWevuScopedSlotComponent",
+	defineAppSetup: "defineAppSetup",
 	defineComponent: "defineComponent",
 	setWevuDefaults: "setWevuDefaults"
 };
@@ -296,6 +298,34 @@ function collectKeptStatementPaths(programPath, macroStatements) {
 	};
 }
 //#endregion
+//#region src/utils/fs.ts
+/**
+* 创建目录，行为等价于 ensureDir。
+*/
+async function ensureDir(path) {
+	await mkdir(path, { recursive: true });
+}
+/**
+* 删除文件或目录，行为等价于 remove。
+*/
+async function remove(path) {
+	await rm(path, {
+		recursive: true,
+		force: true
+	});
+}
+/**
+* 判断路径是否存在。
+*/
+async function pathExists$1(path) {
+	try {
+		await access(path);
+		return true;
+	} catch {
+		return false;
+	}
+}
+//#endregion
 //#region src/plugins/vue/transform/tempDirLock.ts
 const locks = /* @__PURE__ */ new Map();
 async function withTempDirLock(tempDir, fn) {
@@ -386,7 +416,7 @@ function getWevuConfigCacheRoot() {
 	if (env) return path.resolve(env);
 	const cwd = process.cwd();
 	const projectCacheDir = path.join(cwd, ".wevu-config");
-	if (fs$1.existsSync(projectCacheDir)) return projectCacheDir;
+	if (fs.existsSync(projectCacheDir)) return projectCacheDir;
 	return path.join(os.tmpdir(), "weapp-vite", "wevu-config");
 }
 function resolveWevuConfigTempDir(fromDir) {
@@ -411,8 +441,8 @@ function resolveMacroAlias(macroName) {
 	return macroName === "defineAppJson" ? "__weapp_defineAppJson" : macroName === "definePageJson" ? "__weapp_definePageJson" : macroName === "defineComponentJson" ? "__weapp_defineComponentJson" : macroName === "defineSitemapJson" ? "__weapp_defineSitemapJson" : "__weapp_defineThemeJson";
 }
 async function evaluateScriptSetupJsonMacro(params) {
-	const { originalContent, filename, lang, macroName, macroStatements, bodyPaths, keptStatementPaths, options } = params;
-	const ms = new MagicString(originalContent);
+	const { preambleContent, originalContent, filename, lang, macroName, macroStatements, bodyPaths, keptStatementPaths, options } = params;
+	const ms = new MagicString(preambleContent ? `${preambleContent}\n${originalContent}` : originalContent);
 	const dir = path.dirname(filename);
 	const tempRoot = resolveWevuConfigTempDir(dir);
 	const basename = path.basename(filename, path.extname(filename));
@@ -448,9 +478,9 @@ const __weapp_defineThemeJson = (config) => (__weapp_json_macro_values.push(conf
 `.trimStart() + ms.toString() + `\nexport default __weapp_json_macro_values\n`;
 	const extension = resolveScriptSetupExtension$1(lang);
 	return await withTempDirLock(tempRoot, async () => {
-		await fs.ensureDir(tempDir);
+		await ensureDir(tempDir);
 		const tempFile = path.join(tempDir, `${basename}.json-macro.${unique}.${extension}`);
-		await fs.writeFile(tempFile, evalSource, "utf8");
+		await writeFile(tempFile, evalSource, "utf8");
 		try {
 			const { mod, dependencies } = await bundleRequire({
 				filepath: tempFile,
@@ -478,7 +508,7 @@ const __weapp_defineThemeJson = (config) => (__weapp_json_macro_values.push(conf
 			};
 		} finally {
 			try {
-				await fs.remove(tempDir);
+				await remove(tempDir);
 			} catch {}
 		}
 	});
@@ -494,7 +524,7 @@ const JSON_MACROS = new Set([
 ]);
 function parseScriptSetupAst(content, filename) {
 	try {
-		return parse$2(content, BABEL_TS_MODULE_PARSER_OPTIONS);
+		return parse$3(content, BABEL_TS_MODULE_PARSER_OPTIONS);
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
 		throw new Error(`解析 ${filename} 中的 <script setup> 失败：${message}`);
@@ -558,7 +588,7 @@ function stripScriptSetupMacroStatements(content, ast, filename) {
 function stripJsonMacroCallsFromCode(code, filename) {
 	let ast;
 	try {
-		ast = parse$2(code, BABEL_TS_MODULE_PARSER_OPTIONS);
+		ast = parse$3(code, BABEL_TS_MODULE_PARSER_OPTIONS);
 	} catch (error) {
 		try {
 			ast = parseJsLike(code);
@@ -581,6 +611,26 @@ function stripJsonMacroCallsFromCode(code, filename) {
 }
 //#endregion
 //#region src/plugins/vue/transform/jsonMacros/index.ts
+async function evaluateJsonMacroConfig(content, filename, lang, options) {
+	const ast = parseScriptSetupAst(options?.preambleContent ? `${options.preambleContent}\n${content}` : content, filename);
+	const { macroNames, macroStatements } = collectMacroCallPaths(ast, filename);
+	const macroName = assertSingleMacro(macroNames, filename);
+	if (!macroName || !macroStatements.length) return;
+	const programPath = findProgramPath(ast);
+	if (!programPath) return;
+	const { bodyPaths, keptStatementPaths } = collectKeptStatementPaths(programPath, macroStatements);
+	return await evaluateScriptSetupJsonMacro({
+		preambleContent: options?.preambleContent,
+		originalContent: content,
+		filename,
+		lang,
+		macroName,
+		macroStatements,
+		bodyPaths,
+		keptStatementPaths,
+		options
+	});
+}
 /**
 * 从 `<script setup>` 中提取 JSON 宏配置并返回剥离后的代码。
 */
@@ -602,25 +652,6 @@ async function extractJsonMacroFromScriptSetup(content, filename, lang, options)
 		macroHash
 	};
 }
-async function evaluateJsonMacroConfig(content, filename, lang, options) {
-	const ast = parseScriptSetupAst(content, filename);
-	const { macroNames, macroStatements } = collectMacroCallPaths(ast, filename);
-	const macroName = assertSingleMacro(macroNames, filename);
-	if (!macroName || !macroStatements.length) return;
-	const programPath = findProgramPath(ast);
-	if (!programPath) return;
-	const { bodyPaths, keptStatementPaths } = collectKeptStatementPaths(programPath, macroStatements);
-	return await evaluateScriptSetupJsonMacro({
-		originalContent: content,
-		filename,
-		lang,
-		macroName,
-		macroStatements,
-		bodyPaths,
-		keptStatementPaths,
-		options
-	});
-}
 //#endregion
 //#region src/plugins/vue/transform/jsonMerge.ts
 function toPlainRecord(value) {
@@ -1900,6 +1931,18 @@ function createImportVisitors(program, state) {
 		}
 	} };
 }
+//#endregion
+//#region src/plugins/vue/transform/transformScript/macros/appSetup.ts
+/**
+* 为 defineAppSetup 宏注入 wevu 运行时导入，允许在 <script setup> 中免导入调用。
+*/
+function createAppSetupVisitors(program, state) {
+	return { CallExpression(path) {
+		if (!t.isIdentifier(path.node.callee, { name: WE_VU_RUNTIME_APIS.defineAppSetup })) return;
+		ensureRuntimeImport(program, WE_VU_RUNTIME_APIS.defineAppSetup);
+		state.transformed = true;
+	} };
+}
 function isPlainRecord(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return false;
 	const proto = Object.getPrototypeOf(value);
@@ -2127,15 +2170,18 @@ function createStripTypesVisitors(state) {
 }
 //#endregion
 //#region src/plugins/vue/transform/transformScript/macros/index.ts
-function createMacroVisitors(state) {
+function createMacroVisitors(program, state) {
+	const appSetupVisitors = createAppSetupVisitors(program, state);
 	const setupExposeVisitors = createSetupExposeVisitors(state);
 	const stripTypesVisitors = createStripTypesVisitors(state);
 	const pageMetaVisitors = createPageMetaVisitors(state);
 	return {
+		...appSetupVisitors,
 		...setupExposeVisitors,
 		...stripTypesVisitors,
 		...pageMetaVisitors,
 		CallExpression(path) {
+			appSetupVisitors.CallExpression?.(path);
 			setupExposeVisitors.CallExpression?.(path);
 			stripTypesVisitors.CallExpression?.(path);
 			if (!path.removed) pageMetaVisitors.CallExpression?.(path);
@@ -2451,7 +2497,7 @@ function parseBabelExpression(exp) {
 	const cached = babelExpressionCache.get(exp);
 	if (cached !== void 0) return cached === false ? null : cached;
 	try {
-		const stmt = parse$2(`(${exp})`, {
+		const stmt = parse$3(`(${exp})`, {
 			sourceType: "module",
 			plugins: ["typescript"]
 		}).program.body[0];
@@ -2469,7 +2515,7 @@ function parseBabelExpression(exp) {
 }
 function parseBabelExpressionFile(exp) {
 	try {
-		const ast = parse$2(`(${exp})`, {
+		const ast = parse$3(`(${exp})`, {
 			sourceType: "module",
 			plugins: ["typescript"]
 		});
@@ -2877,7 +2923,7 @@ function rewriteDefaultExport(ast, state, options, enabledPageFeatures, serializ
 * 转换 Vue SFC 脚本：处理宏、导入、默认导出与 wevu 相关注入。
 */
 function transformScript(source, options) {
-	const ast = parse$2(source, BABEL_TS_MODULE_PARSER_OPTIONS);
+	const ast = parse$3(source, BABEL_TS_MODULE_PARSER_OPTIONS);
 	const warn = resolveWarnHandler(options?.warn);
 	const state = {
 		transformed: false,
@@ -2890,7 +2936,7 @@ function transformScript(source, options) {
 	const parsedWevuDefaults = serializedWevuDefaults ? JSON.parse(serializedWevuDefaults) : void 0;
 	traverse(ast, vueSfcTransformPlugin().visitor);
 	traverse(ast, {
-		...createMacroVisitors(state),
+		...createMacroVisitors(ast.program, state),
 		...createImportVisitors(ast.program, state),
 		...createCollectVisitors(state)
 	});
@@ -2979,7 +3025,7 @@ const TRAILING_EMPTY_CONCAT_RE = /\s*\+\s*''\s*$/g;
 function normalizeWxmlExpression(exp) {
 	if (!exp.includes("`") && !exp.includes("??") && !exp.includes("?.")) return exp;
 	try {
-		const ast = parse$2(`(${exp})`, {
+		const ast = parse$3(`(${exp})`, {
 			sourceType: "module",
 			plugins: ["typescript"]
 		});
@@ -3117,7 +3163,7 @@ function removeRenderOptionFromObjectExpression(node) {
 function stripRenderOptionFromScript(source, filename, warn) {
 	let ast;
 	try {
-		ast = parse$2(source, BABEL_TS_MODULE_PARSER_OPTIONS);
+		ast = parse$3(source, BABEL_TS_MODULE_PARSER_OPTIONS);
 	} catch {
 		return source;
 	}
@@ -3753,7 +3799,7 @@ function createJsxCompileContext(options) {
 * 单次解析同时编译模板和收集自动组件上下文，避免重复 babelParse 和 traverse。
 */
 function compileJsxTemplateAndCollectComponents(source, filename, options) {
-	const ast = parse$2(source, BABEL_TS_MODULE_PARSER_OPTIONS);
+	const ast = parse$3(source, BABEL_TS_MODULE_PARSER_OPTIONS);
 	const context = createJsxCompileContext(options);
 	const { renderExpression, autoComponentContext } = analyzeJsxAst(ast, context);
 	let template;
@@ -3877,7 +3923,7 @@ const pathExistsCache = new LRUCache({ max: 4096 });
 */
 async function isInvalidate(id) {
 	const cached = mtimeCache.get(id);
-	const stats = await fs.stat(id);
+	const stats = await stat(id);
 	const mtimeMs = typeof stats?.mtimeMs === "number" ? stats.mtimeMs : NaN;
 	const size = typeof stats?.size === "number" ? stats.size : NaN;
 	if (!Number.isFinite(mtimeMs)) return true;
@@ -3902,7 +3948,7 @@ async function readFile(id, options) {
 	if (!checkMtime) {
 		const cached = loadCache.get(id);
 		if (cached !== void 0) return cached;
-		const content = normalizeLineEndings(await fs.readFile(id, encoding));
+		const content = normalizeLineEndings(await readFile$1(id, encoding));
 		loadCache.set(id, content);
 		return content;
 	}
@@ -3910,7 +3956,7 @@ async function readFile(id, options) {
 		const cached = loadCache.get(id);
 		if (cached !== void 0) return cached;
 	}
-	const content = normalizeLineEndings(await fs.readFile(id, encoding));
+	const content = normalizeLineEndings(await readFile$1(id, encoding));
 	loadCache.set(id, content);
 	return content;
 }
@@ -3921,7 +3967,7 @@ async function pathExists(id, options) {
 	const ttlMs = options?.ttlMs;
 	const cached = pathExistsCache.get(id);
 	if (cached !== void 0) return cached;
-	const exists = await fs.pathExists(id);
+	const exists = await pathExists$1(id);
 	if (typeof ttlMs === "number" && Number.isFinite(ttlMs) && ttlMs > 0) pathExistsCache.set(id, exists, { ttl: ttlMs });
 	else pathExistsCache.set(id, exists);
 	return exists;
@@ -5969,7 +6015,7 @@ function parseSlotPropsExpression(exp, context) {
 	const trimmed = exp.trim();
 	if (!trimmed) return {};
 	try {
-		const stmt = parse$2(`(${trimmed}) => {}`, {
+		const stmt = parse$3(`(${trimmed}) => {}`, {
 			sourceType: "module",
 			plugins: ["typescript"]
 		}).program.body[0];
@@ -6588,7 +6634,7 @@ function compileVueTemplateToWxml(template, filename, options) {
 	const wxsExtension = options?.wxsExtension;
 	const scopedSlotsRequireProps = options?.scopedSlotsRequireProps ?? options?.scopedSlotsCompiler !== "augmented";
 	try {
-		const ast = baseParse(template, {
+		const ast = parse$1(template, {
 			isVoidTag: (tag) => HTML_VOID_TAGS.has(tag),
 			onError: (error) => {
 				warnings.push(`模板解析失败：${error.message}`);
@@ -6683,10 +6729,9 @@ async function evaluateJsLikeConfig(source, filename, lang) {
 	const unique = `${Date.now()}-${Math.random().toString(16).slice(2)}`;
 	const tempDir = path.join(tempRoot, `${basename}.config.${unique}`);
 	return await withTempDirLock(tempRoot, async () => {
-		await fs.ensureDir(tempDir);
+		await ensureDir(tempDir);
 		const tempFile = path.join(tempDir, `${basename}.${unique}.${extension}`);
-		const rewritten = rewriteJsLikeImportsForTempDir(source, dir, tempDir);
-		await fs.writeFile(tempFile, rewritten, "utf8");
+		await writeFile(tempFile, rewriteJsLikeImportsForTempDir(source, dir, tempDir), "utf8");
 		try {
 			const { mod } = await bundleRequire({
 				filepath: tempFile,
@@ -6699,7 +6744,7 @@ async function evaluateJsLikeConfig(source, filename, lang) {
 			throw new Error("配置块必须导出对象或返回对象的函数。");
 		} finally {
 			try {
-				await fs.remove(tempDir);
+				await remove(tempDir);
 			} catch {}
 		}
 	});
@@ -6715,7 +6760,7 @@ async function compileConfigBlocks(blocks, filename, options) {
 		const lang = normalizeConfigLang(block.lang);
 		try {
 			if (isJsonLikeLang(lang)) {
-				const parsed = parse$1(block.content, void 0, true);
+				const parsed = parse$2(block.content, void 0, true);
 				if (options?.merge) {
 					const merged = options.merge(accumulator, parsed);
 					if (merged && typeof merged === "object" && !Array.isArray(merged)) accumulator = merged;
@@ -6849,7 +6894,7 @@ const SERIALIZABLE_NATIVE_FUNCTIONS = new Map([
 ]);
 function isParsableFunctionExpressionSource(source) {
 	try {
-		parse$2(`(${source})`, BABEL_TS_MODULE_PARSER_OPTIONS);
+		parse$3(`(${source})`, BABEL_TS_MODULE_PARSER_OPTIONS);
 		return true;
 	} catch {
 		return false;
@@ -6857,7 +6902,7 @@ function isParsableFunctionExpressionSource(source) {
 }
 function tryConvertObjectMethodSourceToFunctionExpression(source) {
 	try {
-		const statement = parse$2(`({ ${source} })`, BABEL_TS_MODULE_PARSER_OPTIONS).program.body[0];
+		const statement = parse$3(`({ ${source} })`, BABEL_TS_MODULE_PARSER_OPTIONS).program.body[0];
 		if (!statement || !t.isExpressionStatement(statement) || !t.isObjectExpression(statement.expression)) return null;
 		const firstProperty = statement.expression.properties[0];
 		if (!firstProperty) return null;
@@ -6876,13 +6921,13 @@ function normalizeFunctionSourceToExpression(source) {
 	throw new Error("defineOptions 的参数中包含无法序列化的函数值。");
 }
 function parseExpressionFromSource(source) {
-	const statement = parse$2(`(${source})`, BABEL_TS_MODULE_PARSER_OPTIONS).program.body[0];
+	const statement = parse$3(`(${source})`, BABEL_TS_MODULE_PARSER_OPTIONS).program.body[0];
 	if (!statement || !t.isExpressionStatement(statement)) throw new Error("defineOptions 的函数源码解析失败。");
 	return statement.expression;
 }
 function rewriteFunctionSourceWithScopeValues(source, scopeValues) {
 	if (!Object.keys(scopeValues).length) return source;
-	const wrappedAst = parse$2(`(${source})`, BABEL_TS_MODULE_PARSER_OPTIONS);
+	const wrappedAst = parse$3(`(${source})`, BABEL_TS_MODULE_PARSER_OPTIONS);
 	traverse(wrappedAst, { Identifier(path) {
 		if (!path.isReferencedIdentifier()) return;
 		if (path.scope.hasBinding(path.node.name)) return;
@@ -6939,7 +6984,7 @@ function serializeStaticValueToExpression(value, seen = /* @__PURE__ */ new Weak
 //#endregion
 //#region src/plugins/vue/transform/defineOptions/inline.ts
 function collectDefineOptionsStatements(content, filename) {
-	const ast = parse$2(content, BABEL_TS_MODULE_PARSER_OPTIONS);
+	const ast = parse$3(content, BABEL_TS_MODULE_PARSER_OPTIONS);
 	const statements = [];
 	traverse(ast, { CallExpression(path) {
 		const callee = path.node.callee;
@@ -6958,7 +7003,7 @@ function evaluateStaticExpression(source) {
 	return vm.runInNewContext(`(${source})`, {});
 }
 function collectStaticTopLevelScopeValues(content) {
-	const ast = parse$2(content, BABEL_TS_MODULE_PARSER_OPTIONS);
+	const ast = parse$3(content, BABEL_TS_MODULE_PARSER_OPTIONS);
 	const scopeValues = {};
 	for (const statement of ast.program.body) {
 		if (!t.isVariableDeclaration(statement) || statement.kind !== "const") continue;
@@ -7045,9 +7090,9 @@ const __weapp_defineOptions = (value) => (__weapp_define_options_values.push(val
 export const __weapp_define_options = __weapp_define_options_values
 `;
 	return await withTempDirLock(tempRoot, async () => {
-		await fs.ensureDir(tempDir);
+		await ensureDir(tempDir);
 		const tempFile = path.join(tempDir, `${basename}.define-options.${unique}.${extension}`);
-		await fs.writeFile(tempFile, evalSource, "utf8");
+		await writeFile(tempFile, evalSource, "utf8");
 		try {
 			const { mod, dependencies } = await bundleRequire({
 				filepath: tempFile,
@@ -7061,7 +7106,7 @@ export const __weapp_define_options = __weapp_define_options_values
 			};
 		} finally {
 			try {
-				await fs.remove(tempDir);
+				await remove(tempDir);
 			} catch {}
 		}
 	});
@@ -7122,10 +7167,19 @@ async function inlineScriptSetupDefineOptionsArgs(content, filename, lang) {
 const SETUP_CALL_RE = /\bsetup\s*\(/;
 const DEFINE_OPTIONS_CALL_RE = /\bdefineOptions\s*\(/;
 const APP_VUE_FILE_RE = /[\\/]app\.vue$/;
+function resolveSfcScriptLangLabel(lang) {
+	return typeof lang === "string" && lang.length > 0 ? lang : "(default)";
+}
+function assertMatchingSfcScriptLang(descriptor, filename) {
+	const scriptLang = descriptor.script?.lang;
+	const scriptSetupLang = descriptor.scriptSetup?.lang;
+	if (!descriptor.script || !descriptor.scriptSetup || scriptLang === scriptSetupLang) return;
+	throw new Error(`解析 ${filename} 失败：同一个 SFC 中 <script> 与 <script setup> 的 lang 必须一致，当前分别为 ${resolveSfcScriptLangLabel(scriptLang)} 与 ${resolveSfcScriptLangLabel(scriptSetupLang)}`);
+}
 function extractDefineOptionsHash(content) {
 	let ast;
 	try {
-		ast = parse$2(content, BABEL_TS_MODULE_PARSER_OPTIONS);
+		ast = parse$3(content, BABEL_TS_MODULE_PARSER_OPTIONS);
 	} catch {
 		return;
 	}
@@ -7154,6 +7208,7 @@ async function parseVueFile(source, filename, options) {
 		const error = errors[0];
 		throw new Error(`解析 ${filename} 失败：${error.message}`);
 	}
+	assertMatchingSfcScriptLang(descriptor, filename);
 	let resolvedDescriptor = descriptor;
 	let sfcSrcDeps;
 	if (options?.sfcSrc) {
@@ -7178,7 +7233,10 @@ async function parseVueFile(source, filename, options) {
 	});
 	const scriptSetup = resolvedDescriptor.scriptSetup;
 	if (scriptSetup?.content) {
-		const extracted = await extractJsonMacroFromScriptSetup(scriptSetup.content, filename, scriptSetup.lang, { merge: (target, source) => mergeJson(target, source, "macro") });
+		const extracted = await extractJsonMacroFromScriptSetup(scriptSetup.content, filename, scriptSetup.lang, {
+			merge: (target, source) => mergeJson(target, source, "macro"),
+			preambleContent: resolvedDescriptor.script?.content
+		});
 		if (extracted.stripped !== scriptSetup.content) if (scriptSetup.src) descriptorForCompile = {
 			...descriptorForCompile,
 			scriptSetup: {
@@ -7201,6 +7259,7 @@ async function parseVueFile(source, filename, options) {
 				const error = nextErrors[0];
 				throw new Error(`解析 ${filename} 失败：${error.message}`);
 			}
+			assertMatchingSfcScriptLang(nextDescriptor, filename);
 			if (options?.sfcSrc) {
 				const resolvedNext = await resolveSfcBlockSrc(nextDescriptor, filename, options.sfcSrc);
 				descriptorForCompile = resolvedNext.descriptor;
@@ -7240,6 +7299,7 @@ async function parseVueFile(source, filename, options) {
 				const error = nextErrors[0];
 				throw new Error(`解析 ${filename} 失败：${error.message}`);
 			}
+			assertMatchingSfcScriptLang(nextDescriptor, filename);
 			if (options?.sfcSrc) {
 				const resolvedNext = await resolveSfcBlockSrc(nextDescriptor, filename, options.sfcSrc);
 				descriptorForCompile = resolvedNext.descriptor;
@@ -7284,7 +7344,7 @@ async function compileScriptPhase(descriptor, descriptorForCompile, filename, op
 	if (autoUsingComponents && descriptor.scriptSetup && descriptor.template) {
 		const templateComponentNames = collectTemplateComponentNames(descriptor.template.content, filename, autoUsingComponents.warn ?? options?.warn);
 		if (templateComponentNames.size) try {
-			const setupAst = parse$2(descriptorForCompile.scriptSetup.content, BABEL_TS_MODULE_PARSER_OPTIONS);
+			const setupAst = parse$3(descriptorForCompile.scriptSetup.content, BABEL_TS_MODULE_PARSER_OPTIONS);
 			const pending = [];
 			traverse(setupAst, { ImportDeclaration(path) {
 				if (path.node.importKind === "type") return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.12.3",
+  "version": "6.13.0",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -9,7 +9,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/weapp-vite/weapp-vite.git",
-    "directory": "packages/wevu-compiler"
+    "directory": "packages-runtime/wevu-compiler"
   },
   "bugs": {
     "url": "https://github.com/weapp-vite/weapp-vite/issues"
@@ -42,15 +42,15 @@
   ],
   "dependencies": {
     "@vue/compiler-core": "^3.5.31",
+    "@vue/compiler-dom": "^3.5.31",
     "comment-json": "^4.6.2",
-    "fs-extra": "^11.3.4",
     "lru-cache": "^11.2.7",
     "magic-string": "^0.30.21",
     "merge": "^2.1.1",
     "pathe": "^2.0.3",
     "vue": "^3.5.31",
     "@weapp-core/shared": "3.0.2",
-    "@weapp-vite/ast": "6.12.3",
+    "@weapp-vite/ast": "6.13.0",
     "rolldown-require": "2.0.12"
   },
   "publishConfig": {