@wevu/compiler 6.6.15 → 6.6.16

package/dist/index.mjs

@@ -895,19 +895,19 @@ function resolveWevuConfigTempDir(fromDir) {
 
 //#endregion
 //#region src/plugins/vue/transform/jsonMacros/execute.ts
-function normalizeScriptSetupLang(lang) {
+function normalizeScriptSetupLang$1(lang) {
 	if (!lang) return "ts";
 	const lower = lang.toLowerCase();
 	if (lower === "txt") return "ts";
 	return lower;
 }
-function resolveScriptSetupExtension(lang) {
-	const normalized = normalizeScriptSetupLang(lang);
+function resolveScriptSetupExtension$1(lang) {
+	const normalized = normalizeScriptSetupLang$1(lang);
 	if (normalized === "ts" || normalized === "tsx" || normalized === "cts" || normalized === "mts") return "ts";
 	return "js";
 }
 function resolveMacroAlias(macroName) {
-	return macroName === "defineAppJson" ? "__weapp_defineAppJson" : macroName === "definePageJson" ? "__weapp_definePageJson" : "__weapp_defineComponentJson";
+	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;
@@ -939,8 +939,10 @@ const __weapp_json_macro_values = []
 const __weapp_defineAppJson = (config) => (__weapp_json_macro_values.push(config), config)
 const __weapp_definePageJson = (config) => (__weapp_json_macro_values.push(config), config)
 const __weapp_defineComponentJson = (config) => (__weapp_json_macro_values.push(config), config)
+const __weapp_defineSitemapJson = (config) => (__weapp_json_macro_values.push(config), config)
+const __weapp_defineThemeJson = (config) => (__weapp_json_macro_values.push(config), config)
 `.trimStart() + ms.toString() + `\nexport default __weapp_json_macro_values\n`;
-	const extension = resolveScriptSetupExtension(lang);
+	const extension = resolveScriptSetupExtension$1(lang);
 	return await withTempDirLock(tempDir, async () => {
 		await fs.ensureDir(tempDir);
 		const basename = path.basename(filename, path.extname(filename));
@@ -988,7 +990,9 @@ const __weapp_defineComponentJson = (config) => (__weapp_json_macro_values.push(
 const JSON_MACROS = new Set([
 	"defineAppJson",
 	"definePageJson",
-	"defineComponentJson"
+	"defineComponentJson",
+	"defineSitemapJson",
+	"defineThemeJson"
 ]);
 function parseScriptSetupAst(content, filename) {
 	try {
@@ -6390,6 +6394,171 @@ function finalizeResult(result, options) {
 	if (result.meta && options.defineOptionsHash) result.meta.defineOptionsHash = options.defineOptionsHash;
 }
 
+//#endregion
+//#region src/plugins/vue/transform/defineOptions/inline.ts
+function normalizeScriptSetupLang(lang) {
+	if (!lang) return "ts";
+	const lower = lang.toLowerCase();
+	if (lower === "txt") return "ts";
+	return lower;
+}
+function resolveScriptSetupExtension(lang) {
+	const normalized = normalizeScriptSetupLang(lang);
+	if (normalized === "ts" || normalized === "tsx" || normalized === "cts" || normalized === "mts") return "ts";
+	return "js";
+}
+function isIdentifierLikeKey(key) {
+	return /^[A-Z_$][\w$]*$/i.test(key);
+}
+function serializeStaticValueToExpression(value, seen = /* @__PURE__ */ new WeakSet()) {
+	if (value === null) return "null";
+	if (value === void 0) return "undefined";
+	const valueType = typeof value;
+	if (valueType === "string") return JSON.stringify(value);
+	if (valueType === "boolean") return value ? "true" : "false";
+	if (valueType === "number") {
+		if (Number.isNaN(value)) return "Number.NaN";
+		if (value === Number.POSITIVE_INFINITY) return "Number.POSITIVE_INFINITY";
+		if (value === Number.NEGATIVE_INFINITY) return "Number.NEGATIVE_INFINITY";
+		if (Object.is(value, -0)) return "-0";
+		return String(value);
+	}
+	if (valueType === "bigint") return `${String(value)}n`;
+	if (valueType === "symbol") throw new Error("defineOptions 的参数中不支持 Symbol 值。");
+	if (valueType === "function") {
+		const source = Function.prototype.toString.call(value);
+		if (source.includes("[native code]")) throw new Error("defineOptions 的参数中不支持原生函数值。");
+		return `(${source})`;
+	}
+	if (value instanceof Date) return `new Date(${JSON.stringify(value.toISOString())})`;
+	if (value instanceof RegExp) return value.toString();
+	if (Array.isArray(value)) return `[${value.map((item) => serializeStaticValueToExpression(item, seen)).join(", ")}]`;
+	if (value && typeof value === "object") {
+		if (seen.has(value)) throw new Error("defineOptions 的参数中不支持循环引用。");
+		seen.add(value);
+		const proto = Object.getPrototypeOf(value);
+		if (proto !== Object.prototype && proto !== null) throw new Error("defineOptions 的参数仅支持普通对象。");
+		const objectValue = value;
+		return `{ ${Object.keys(objectValue).map((key) => {
+			return `${isIdentifierLikeKey(key) ? key : JSON.stringify(key)}: ${serializeStaticValueToExpression(objectValue[key], seen)}`;
+		}).join(", ")} }`;
+	}
+	throw new Error(`defineOptions 的参数中包含不支持的值类型：${valueType}`);
+}
+function collectDefineOptionsStatements(content, filename) {
+	const ast = parse$2(content, BABEL_TS_MODULE_PARSER_OPTIONS);
+	const statements = [];
+	traverse(ast, { CallExpression(path) {
+		const callee = path.node.callee;
+		if (!t.isIdentifier(callee, { name: "defineOptions" })) return;
+		if (!(path.parentPath?.isExpressionStatement() && path.parentPath.parentPath?.isProgram())) return;
+		if (path.node.arguments.length !== 1) throw new Error(`defineOptions() 在 ${filename} 中必须且只能传 1 个参数。`);
+		statements.push({
+			statementPath: path.parentPath,
+			callPath: path,
+			argPath: path.get("arguments.0")
+		});
+	} });
+	return { statements };
+}
+async function evaluateDefineOptionsValues(params) {
+	const { content, filename, lang, statements } = params;
+	const ms = new MagicString(content);
+	const dir = path.dirname(filename);
+	const tempDir = resolveWevuConfigTempDir(dir);
+	const programPath = statements[0]?.statementPath.parentPath;
+	if (!programPath) return {
+		values: [],
+		dependencies: []
+	};
+	const bodyPaths = programPath?.get("body") ?? [];
+	const macroStatementPaths = statements.map((item) => item.statementPath);
+	const { keptStatementPaths } = collectKeptStatementPaths(programPath, macroStatementPaths);
+	for (const statementPath of keptStatementPaths) {
+		if (!statementPath.isImportDeclaration()) continue;
+		const sourceNode = statementPath.node.source;
+		if (!sourceNode || !t.isStringLiteral(sourceNode)) continue;
+		const originalSource = sourceNode.value;
+		if (!originalSource.startsWith(".")) continue;
+		const next = rewriteRelativeImportSource(originalSource, dir, tempDir);
+		if (typeof sourceNode.start === "number" && typeof sourceNode.end === "number") ms.overwrite(sourceNode.start, sourceNode.end, JSON.stringify(next));
+	}
+	for (const statementPath of macroStatementPaths) {
+		const calleePath = statementPath.get("expression").get("callee");
+		if (calleePath?.isIdentifier() && typeof calleePath.node.start === "number" && typeof calleePath.node.end === "number") ms.overwrite(calleePath.node.start, calleePath.node.end, "__weapp_defineOptions");
+	}
+	for (const statementPath of bodyPaths) {
+		if (keptStatementPaths.has(statementPath)) continue;
+		const start = statementPath.node.start;
+		const end = statementPath.node.end;
+		if (typeof start === "number" && typeof end === "number") ms.remove(start, end);
+	}
+	const extension = resolveScriptSetupExtension(lang);
+	const evalSource = `
+const __weapp_define_options_values = []
+const __weapp_defineOptions = (value) => (__weapp_define_options_values.push(value), value)
+`.trimStart() + ms.toString() + "\nexport default __weapp_define_options_values\n";
+	return await withTempDirLock(tempDir, async () => {
+		await fs.ensureDir(tempDir);
+		const basename = path.basename(filename, path.extname(filename));
+		const unique = `${Date.now()}-${Math.random().toString(16).slice(2)}`;
+		const tempFile = path.join(tempDir, `${basename}.define-options.${unique}.${extension}`);
+		await fs.writeFile(tempFile, evalSource, "utf8");
+		try {
+			const { mod, dependencies } = await bundleRequire({
+				filepath: tempFile,
+				cwd: dir
+			});
+			const exported = mod?.default ?? mod;
+			return {
+				values: Array.isArray(exported) ? exported : [exported],
+				dependencies
+			};
+		} finally {
+			try {
+				await fs.remove(tempFile);
+			} catch {}
+			try {
+				if ((await fs.readdir(tempDir)).length === 0) await fs.remove(tempDir);
+			} catch {}
+		}
+	});
+}
+async function resolveDefineOptionsValue(raw) {
+	let next = raw;
+	if (typeof next === "function") next = next();
+	if (next && typeof next.then === "function") next = await next;
+	if (!next || typeof next !== "object" || Array.isArray(next)) throw new Error("defineOptions 的参数最终必须解析为对象。");
+	return next;
+}
+/**
+* 将 defineOptions 的参数内联为静态字面量，允许参数引用局部变量或导入值。
+*/
+async function inlineScriptSetupDefineOptionsArgs(content, filename, lang) {
+	const { statements } = collectDefineOptionsStatements(content, filename);
+	if (!statements.length) return {
+		code: content,
+		dependencies: []
+	};
+	const { values, dependencies } = await evaluateDefineOptionsValues({
+		content,
+		filename,
+		lang,
+		statements
+	});
+	const ms = new MagicString(content);
+	for (let index = 0; index < statements.length; index += 1) {
+		const argNode = statements[index].argPath?.node;
+		if (!argNode || typeof argNode.start !== "number" || typeof argNode.end !== "number") continue;
+		const literal = serializeStaticValueToExpression(await resolveDefineOptionsValue(values[index]));
+		ms.overwrite(argNode.start, argNode.end, literal);
+	}
+	return {
+		code: ms.toString(),
+		dependencies: dependencies.filter(Boolean)
+	};
+}
+
 //#endregion
 //#region src/plugins/vue/transform/compileVueFile/parse.ts
 function extractDefineOptionsHash(content) {
@@ -6413,6 +6582,7 @@ function extractDefineOptionsHash(content) {
 async function parseVueFile(source, filename, options) {
 	const normalizedInputSource = normalizeLineEndings(source);
 	const normalizedSource = preprocessScriptSrc(preprocessScriptSetupSrc(normalizedInputSource));
+	let descriptorForCompileSource = normalizedSource;
 	const { descriptor, errors } = parse(normalizedSource, {
 		filename,
 		ignoreEmpty: normalizedSource === normalizedInputSource
@@ -6459,7 +6629,8 @@ async function parseVueFile(source, filename, options) {
 			const setupLoc = scriptSetup.loc;
 			const startOffset = setupLoc.start.offset;
 			const endOffset = setupLoc.end.offset;
-			const { descriptor: nextDescriptor, errors: nextErrors } = parse(normalizedSource.slice(0, startOffset) + extracted.stripped + normalizedSource.slice(endOffset), {
+			const nextSource = descriptorForCompileSource.slice(0, startOffset) + extracted.stripped + descriptorForCompileSource.slice(endOffset);
+			const { descriptor: nextDescriptor, errors: nextErrors } = parse(nextSource, {
 				filename,
 				ignoreEmpty: false
 			});
@@ -6478,11 +6649,49 @@ async function parseVueFile(source, filename, options) {
 					meta.sfcSrcDeps = sfcSrcDeps;
 				}
 			} else descriptorForCompile = nextDescriptor;
+			descriptorForCompileSource = nextSource;
 		}
 		scriptSetupMacroConfig = extracted.config;
 		scriptSetupMacroHash = extracted.macroHash;
 		defineOptionsHash = extractDefineOptionsHash(scriptSetup.content);
 	}
+	const compileScriptSetup = descriptorForCompile.scriptSetup;
+	if (compileScriptSetup?.content && /\bdefineOptions\s*\(/.test(compileScriptSetup.content)) {
+		const inlined = await inlineScriptSetupDefineOptionsArgs(compileScriptSetup.content, filename, compileScriptSetup.lang);
+		if (inlined.code !== compileScriptSetup.content) if (compileScriptSetup.src) descriptorForCompile = {
+			...descriptorForCompile,
+			scriptSetup: {
+				...compileScriptSetup,
+				content: inlined.code
+			}
+		};
+		else {
+			const setupLoc = compileScriptSetup.loc;
+			const startOffset = setupLoc.start.offset;
+			const endOffset = setupLoc.end.offset;
+			const nextSource = descriptorForCompileSource.slice(0, startOffset) + inlined.code + descriptorForCompileSource.slice(endOffset);
+			const { descriptor: nextDescriptor, errors: nextErrors } = parse(nextSource, {
+				filename,
+				ignoreEmpty: false
+			});
+			restoreScriptSetupSrc(nextDescriptor);
+			restoreScriptSrc(nextDescriptor);
+			if (nextErrors.length > 0) {
+				const error = nextErrors[0];
+				throw new Error(`解析 ${filename} 失败：${error.message}`);
+			}
+			if (options?.sfcSrc) {
+				const resolvedNext = await resolveSfcBlockSrc(nextDescriptor, filename, options.sfcSrc);
+				descriptorForCompile = resolvedNext.descriptor;
+				if (resolvedNext.deps.length) {
+					const deps = new Set([...sfcSrcDeps ?? [], ...resolvedNext.deps]);
+					sfcSrcDeps = Array.from(deps);
+					meta.sfcSrcDeps = sfcSrcDeps;
+				}
+			} else descriptorForCompile = nextDescriptor;
+			descriptorForCompileSource = nextSource;
+		}
+	}
 	const isAppFile = /[\\/]app\.vue$/.test(filename);
 	return {
 		descriptor: resolvedDescriptor,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.6.15",
+  "version": "6.6.16",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",