@wevu/compiler 6.19.0 → 6.19.1

package/dist/index.mjs

@@ -565,7 +565,8 @@ function resolveMacroAlias(macroName) {
 }
 async function evaluateScriptSetupJsonMacro(params) {
 	const { preambleContent, originalContent, filename, lang, macroName, macroStatements, bodyPaths, keptStatementPaths, options } = params;
-	const ms = new MagicString(preambleContent ? `${preambleContent}\n${originalContent}` : originalContent);
+	const combinedContent = preambleContent ? `${preambleContent}\n${originalContent}` : originalContent;
+	const ms = new MagicString(combinedContent);
 	const dir = path.dirname(filename);
 	const tempRoot = resolveWevuConfigTempDir(dir);
 	const basename = path.basename(filename, path.extname(filename));
@@ -930,7 +931,8 @@ function collectWevuPageFeatureFlags(ast) {
 	for (const stmt of ast.program.body) {
 		if (!t.isImportDeclaration(stmt) || !isWevuRuntimeModuleId(stmt.source.value)) continue;
 		for (const specifier of stmt.specifiers) if (t.isImportSpecifier(specifier) && t.isIdentifier(specifier.imported)) {
-			const matched = WE_VU_PAGE_HOOK_TO_FEATURE[specifier.imported.name];
+			const importedName = specifier.imported.name;
+			const matched = WE_VU_PAGE_HOOK_TO_FEATURE[importedName];
 			if (matched) namedHookLocals.set(specifier.local.name, matched);
 		} else if (t.isImportNamespaceSpecifier(specifier)) namespaceLocals.add(specifier.local.name);
 	}
@@ -1071,7 +1073,8 @@ function createModuleAnalysis(id, ast) {
 			for (const specifier of stmt.specifiers) if (t.isImportSpecifier(specifier)) {
 				const imported = specifier.imported;
 				if (isWevuRuntimeModuleId(source) && t.isIdentifier(imported)) {
-					const matched = WE_VU_PAGE_HOOK_TO_FEATURE[imported.name];
+					const importedName = imported.name;
+					const matched = WE_VU_PAGE_HOOK_TO_FEATURE[importedName];
 					if (matched) wevuNamedHookLocals.set(specifier.local.name, matched);
 				}
 				importedBindings.set(specifier.local.name, {
@@ -1304,9 +1307,10 @@ function createModuleAnalysisWithOxc(id, code) {
 //#region src/plugins/wevu/pageFeatures/moduleAnalysis/index.ts
 const TS_WITHOUT_JSX_RE = /\.[cm]?ts(?:[?#].*)?$/i;
 function parseModuleAnalysisAst(id, code) {
+	const plugins = TS_WITHOUT_JSX_RE.test(id) ? BABEL_TS_MODULE_PLUGINS.filter((plugin) => plugin !== "jsx") : BABEL_TS_MODULE_PLUGINS;
 	return parse$3(code, {
 		sourceType: "module",
-		plugins: TS_WITHOUT_JSX_RE.test(id) ? BABEL_TS_MODULE_PLUGINS.filter((plugin) => plugin !== "jsx") : BABEL_TS_MODULE_PLUGINS
+		plugins
 	});
 }
 function createModuleAnalysisFromCode(id, code, options) {
@@ -1358,7 +1362,8 @@ function collectWithOxc(code) {
 				if (matched) enabled.add(matched);
 			} else if (callee?.type === "MemberExpression" && !callee.computed && callee.object?.type === "Identifier" && callee.property?.type === "Identifier") {
 				if (module.wevuNamespaceLocals.has(callee.object.name)) {
-					const matched = WE_VU_PAGE_HOOK_TO_FEATURE[callee.property.name];
+					const hook = callee.property.name;
+					const matched = WE_VU_PAGE_HOOK_TO_FEATURE[hook];
 					if (matched) enabled.add(matched);
 				}
 			}
@@ -1692,7 +1697,8 @@ function collectWevuHookCallsInFunctionBody(module, fn) {
 					if (matched) enabled.add(matched);
 				} else if (callee?.type === "MemberExpression" && !callee.computed && callee.object?.type === "Identifier" && callee.property?.type === "Identifier") {
 					if (module.wevuNamespaceLocals.has(callee.object.name)) {
-						const matched = WE_VU_PAGE_HOOK_TO_FEATURE[callee.property.name];
+						const hook = callee.property.name;
+						const matched = WE_VU_PAGE_HOOK_TO_FEATURE[hook];
 						if (matched) enabled.add(matched);
 					}
 				}
@@ -3793,7 +3799,7 @@ function transformScript(source, options) {
 	const macroVisitors = createMacroVisitors(ast.program, state);
 	const importVisitors = createImportVisitors(ast.program, state);
 	const collectVisitors = createCollectVisitors(state);
-	traverse(ast, {
+	const visitor = {
 		...vueSfcVisitors,
 		...macroVisitors,
 		...importVisitors,
@@ -3806,7 +3812,8 @@ function transformScript(source, options) {
 			runVisitor(vueSfcVisitors.CallExpression, path);
 			if (!path.removed) runVisitor(macroVisitors.CallExpression, path);
 		}
-	});
+	};
+	traverse(ast, visitor);
 	if (options?.templateComponentMeta) state.transformed = pruneTemplateComponentMeta(ast, options.templateComponentMeta) || state.transformed;
 	state.transformed = rewriteDefaultExport(ast, state, options, enabledPageFeatures, serializedWevuDefaults, parsedWevuDefaults) || state.transformed;
 	if (!state.transformed) return {
@@ -4041,7 +4048,8 @@ function collectExpressionScopeBindings(exp, context) {
 	if (!localSet.size) return [];
 	const used = [];
 	const usedSet = /* @__PURE__ */ new Set();
-	traverse(t.file(t.program([t.expressionStatement(t.cloneNode(exp, true))])), { Identifier(path) {
+	const file = t.file(t.program([t.expressionStatement(t.cloneNode(exp, true))]));
+	traverse(file, { Identifier(path) {
 		if (!path.isReferencedIdentifier()) return;
 		const name = path.node.name;
 		if (!localSet.has(name)) return;
@@ -5157,12 +5165,13 @@ function analyzeScript(source, filename) {
 		usesFreeUni: false,
 		virtualHostTrueRanges: []
 	};
+	const isJsx = /\.[cm]?[jt]sx$/i.test(filename);
 	const ast = parse$3(source, {
 		sourceType: "module",
 		plugins: [
 			"typescript",
 			"decorators-legacy",
-			.../\.[cm]?[jt]sx$/i.test(filename) ? ["jsx"] : []
+			...isJsx ? ["jsx"] : []
 		]
 	});
 	const importSources = [];
@@ -7860,7 +7869,8 @@ function collectElementAttributes(node, context, options) {
 	}
 	if (mappedTagClass) staticClass = prependStaticClass(staticClass, mappedTagClass);
 	if (templateRef) {
-		const className = `${WEVU_TEMPLATE_REF_CLASS_PREFIX}${context.templateRefIndexSeed++}`;
+		const refIndex = context.templateRefIndexSeed++;
+		const className = `${WEVU_TEMPLATE_REF_CLASS_PREFIX}${refIndex}`;
 		staticClass = staticClass ? `${staticClass} ${className}` : className;
 		context.templateRefs.push({
 			selector: `.${className}`,
@@ -8069,7 +8079,8 @@ const SLOT_PRESENCE_IDENTIFIER_RE = /^[A-Z_$][\w$]*$/i;
 function createSlotPresenceExpression(info) {
 	const slotName = resolveSlotStaticName(info);
 	if (!slotName) return;
-	return `${WEVU_SLOT_NAMES_PROP}&&${SLOT_PRESENCE_IDENTIFIER_RE.test(slotName) ? `${WEVU_SLOT_NAMES_PROP}.${slotName}` : `${WEVU_SLOT_NAMES_PROP}['${slotName.replace(/\\/g, "\\\\").replace(/'/g, "\\'")}']`}`;
+	const access = SLOT_PRESENCE_IDENTIFIER_RE.test(slotName) ? `${WEVU_SLOT_NAMES_PROP}.${slotName}` : `${WEVU_SLOT_NAMES_PROP}['${slotName.replace(/\\/g, "\\\\").replace(/'/g, "\\'")}']`;
+	return `${WEVU_SLOT_NAMES_PROP}&&${access}`;
 }
 function buildSlotDeclaration(name, propsExp, children, context, options) {
 	return {
@@ -9528,7 +9539,8 @@ async function evaluateJsLikeConfig(source, filename, lang) {
 	return await withTempDirLock(tempRoot, async () => {
 		await ensureDir(tempDir);
 		const tempFile = path.join(tempDir, `${basename}.${unique}.${extension}`);
-		await writeFile(tempFile, rewriteJsLikeImportsForTempDir(source, dir, tempDir), "utf8");
+		const rewritten = rewriteJsLikeImportsForTempDir(source, dir, tempDir);
+		await writeFile(tempFile, rewritten, "utf8");
 		try {
 			const { mod } = await bundleRequire({
 				filepath: tempFile,
@@ -9706,7 +9718,8 @@ function tryConvertObjectMethodSourceToFunctionExpression(source) {
 		if (!firstProperty) return null;
 		if (t.isObjectMethod(firstProperty)) {
 			const functionName = t.isIdentifier(firstProperty.key) ? t.identifier(firstProperty.key.name) : null;
-			return generate(t.functionExpression(functionName, firstProperty.params, firstProperty.body, firstProperty.generator, firstProperty.async)).code;
+			const functionExpression = t.functionExpression(functionName, firstProperty.params, firstProperty.body, firstProperty.generator, firstProperty.async);
+			return generate(functionExpression).code;
 		}
 		if (t.isObjectProperty(firstProperty) && (t.isFunctionExpression(firstProperty.value) || t.isArrowFunctionExpression(firstProperty.value))) return generate(firstProperty.value).code;
 	} catch {}
@@ -10341,7 +10354,8 @@ function collectScriptSetupReturnInfo(scriptCode) {
 		}
 	};
 	try {
-		traverse(parseJsLike(scriptCode), {
+		const ast = parseJsLike(scriptCode);
+		traverse(ast, {
 			VariableDeclarator(path) {
 				const init = path.node.init;
 				if (t.isIdentifier(path.node.id) && t.isIdentifier(init) && propsObjectAliases.has(init.name)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.19.0",
+  "version": "6.19.1",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -49,13 +49,13 @@
     "magic-string": "^1.1.0",
     "merge": "^2.1.1",
     "pathe": "^2.0.3",
-    "postcss": "^8.5.24",
+    "postcss": "^8.5.25",
     "postcss-selector-parser": "^7.1.4",
     "vue": "^3.5.40",
     "@weapp-core/constants": "0.1.15",
     "@weapp-core/shared": "3.1.0",
-    "@weapp-vite/ast": "6.19.0",
-    "rolldown-require": "2.0.22"
+    "@weapp-vite/ast": "6.19.1",
+    "rolldown-require": "2.0.23"
   },
   "publishConfig": {
     "access": "public",