@wevu/compiler 6.16.43 → 6.16.44

package/dist/index.d.mts

@@ -748,7 +748,7 @@ interface TransformScriptOptions {
    */
   isPage?: boolean;
   /**
-   * <script setup> 中引入的组件：编译时移除 import，并提供同名元信息对象占位，避免运行时访问时报错。
+   * <script setup> 中仅由模板使用的导入组件：编译时移除 import 与 Vue 编译器自动返回的 getter。
    * key: 组件别名（需与模板标签一致），value: usingComponents 的 from（如 `/components/foo/index`）
    */
   templateComponentMeta?: Record<string, string>;

package/dist/index.mjs

@@ -1821,18 +1821,83 @@ function createPageEntryMatcher(source) {
 }
 //#endregion
 //#region src/plugins/vue/transform/scriptTemplateMeta.ts
-function injectTemplateComponentMeta(ast, templateComponentMeta) {
+function isScriptSetupReturnedObject(path) {
+	const parent = path.parentPath;
+	if (parent?.isVariableDeclarator() && t.isIdentifier(parent.node.id, { name: "__returned__" })) return true;
+	if (parent?.isReturnStatement()) return true;
+	return false;
+}
+function isTemplateReturnGetterReference(path) {
+	const objectMethod = path.findParent((parent) => parent.isObjectMethod());
+	if (objectMethod?.isObjectMethod() && objectMethod.node.kind === "get" && !objectMethod.node.computed && t.isIdentifier(objectMethod.node.key, { name: path.node.name }) && objectMethod.parentPath?.isObjectExpression() && isScriptSetupReturnedObject(objectMethod.parentPath)) {
+		const getter = objectMethod.node.body.body.find((statement) => t.isReturnStatement(statement));
+		return Boolean(getter && t.isReturnStatement(getter) && t.isIdentifier(getter.argument, { name: path.node.name }));
+	}
+	return false;
+}
+function isTemplateReturnPropertyReference(path) {
+	const property = path.parentPath;
+	if (!property?.isObjectProperty()) return false;
+	if (!property.parentPath?.isObjectExpression() || !isScriptSetupReturnedObject(property.parentPath) || property.node.computed) return false;
+	const key = property.node.key;
+	const value = property.node.value;
+	if (!t.isIdentifier(value, { name: path.node.name })) return false;
+	if (t.isIdentifier(key, { name: path.node.name }) || t.isStringLiteral(key, { value: path.node.name })) return true;
+	return false;
+}
+function isReferencedOutsideTemplateReturn(path) {
+	if (!path.isReferencedIdentifier()) return false;
+	if (isTemplateReturnGetterReference(path) || isTemplateReturnPropertyReference(path)) return false;
+	return true;
+}
+function collectReferencedNames(ast, candidateNames) {
+	const referencedNames = /* @__PURE__ */ new Set();
+	traverse(ast, { Identifier(path) {
+		const name = path.node.name;
+		if (!candidateNames.has(name)) return;
+		if (isReferencedOutsideTemplateReturn(path)) referencedNames.add(name);
+	} });
+	return referencedNames;
+}
+function removeSetupReturnProperties(ast, removableNames) {
+	if (!removableNames.size) return false;
+	let changed = false;
+	traverse(ast, {
+		ObjectMethod(path) {
+			if (!path.parentPath?.isObjectExpression() || !isScriptSetupReturnedObject(path.parentPath)) return;
+			if (path.node.computed || !t.isIdentifier(path.node.key)) return;
+			const name = path.node.key.name;
+			if (!removableNames.has(name)) return;
+			if (path.node.kind !== "get") return;
+			const getter = path.node.body.body.find((statement) => t.isReturnStatement(statement));
+			if (!getter || !t.isReturnStatement(getter) || !t.isIdentifier(getter.argument, { name })) return;
+			path.remove();
+			changed = true;
+		},
+		ObjectProperty(path) {
+			if (!path.parentPath?.isObjectExpression() || !isScriptSetupReturnedObject(path.parentPath)) return;
+			if (path.node.computed || !t.isIdentifier(path.node.value)) return;
+			const name = path.node.value.name;
+			if (!removableNames.has(name)) return;
+			if (!t.isIdentifier(path.node.key, { name }) && !t.isStringLiteral(path.node.key, { value: name })) return;
+			path.remove();
+			changed = true;
+		}
+	});
+	return changed;
+}
+function pruneTemplateComponentMeta(ast, templateComponentMeta) {
 	if (!Object.keys(templateComponentMeta).length) return false;
-	const metaMap = templateComponentMeta;
-	const candidateNames = new Set(Object.keys(metaMap));
-	const injectedNames = /* @__PURE__ */ new Set();
+	const candidateNames = new Set(Object.keys(templateComponentMeta));
+	const referencedNames = collectReferencedNames(ast, candidateNames);
+	const removableNames = new Set([...candidateNames].filter((name) => !referencedNames.has(name)));
 	let changed = false;
 	traverse(ast, { ImportDeclaration(path) {
 		if (!path.node.specifiers.length) return;
 		const kept = path.node.specifiers.filter((specifier) => {
 			if (!("local" in specifier) || !t.isIdentifier(specifier.local)) return true;
 			const localName = specifier.local.name;
-			return !candidateNames.has(localName);
+			return !removableNames.has(localName);
 		});
 		if (kept.length !== path.node.specifiers.length) {
 			changed = true;
@@ -1843,23 +1908,7 @@ function injectTemplateComponentMeta(ast, templateComponentMeta) {
 			path.node.specifiers = kept;
 		}
 	} });
-	const decls = [];
-	for (const name of Object.keys(metaMap)) {
-		if (injectedNames.has(name)) continue;
-		injectedNames.add(name);
-		decls.push(t.variableDeclaration("const", [t.variableDeclarator(t.identifier(name), t.objectExpression([
-			t.objectProperty(t.identifier("__weappViteUsingComponent"), t.booleanLiteral(true)),
-			t.objectProperty(t.identifier("name"), t.stringLiteral(name)),
-			t.objectProperty(t.identifier("from"), t.stringLiteral(metaMap[name]))
-		]))]));
-	}
-	if (decls.length) {
-		const body = ast.program.body;
-		let insertAt = 0;
-		while (insertAt < body.length && t.isImportDeclaration(body[insertAt])) insertAt += 1;
-		body.splice(insertAt, 0, ...decls);
-		changed = true;
-	}
+	changed = removeSetupReturnProperties(ast, removableNames) || changed;
 	return changed;
 }
 //#endregion
@@ -2867,6 +2916,7 @@ function rewriteComponentExport(params) {
 	ensureRuntimeImport(ast.program, WE_VU_RUNTIME_APIS.createWevuComponent);
 	exportPath.replaceWith(t.variableDeclaration("const", [t.variableDeclarator(t.identifier(DEFAULT_OPTIONS_IDENTIFIER), componentExpr)]));
 	exportPath.insertAfter(t.expressionStatement(t.callExpression(t.identifier(WE_VU_RUNTIME_APIS.createWevuComponent), [t.identifier(DEFAULT_OPTIONS_IDENTIFIER)])));
+	exportPath.insertAfter(t.exportDefaultDeclaration(t.identifier(DEFAULT_OPTIONS_IDENTIFIER)));
 	return true;
 }
 //#endregion
@@ -3390,7 +3440,7 @@ function transformScript(source, options) {
 		...createImportVisitors(ast.program, state),
 		...createCollectVisitors(state)
 	});
-	if (options?.templateComponentMeta) state.transformed = injectTemplateComponentMeta(ast, options.templateComponentMeta) || state.transformed;
+	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 {
 		code: source,
@@ -7763,7 +7813,7 @@ function transformComponentWithSlots(node, context, transformNode, options) {
 	if (scopedSlotDeclarations.length) {
 		const scopePropsExp = buildScopePropsExpression(context);
 		if (scopePropsExp) mergedAttrs.push(`${WEVU_SLOT_SCOPE_ATTR}="${renderMustache(scopePropsExp, context)}"`);
-		const ownerIdExp = context.rewriteScopedSlot ? `${WEVU_SLOT_OWNER_ID_PROP} || ${WEVU_SLOT_OWNER_ID_KEY} || ''` : `${WEVU_SLOT_OWNER_ID_KEY} || ''`;
+		const ownerIdExp = context.rewriteScopedSlot ? `${WEVU_SLOT_OWNER_ID_PROP} || ${WEVU_SLOT_OWNER_ID_KEY} || ''` : `${WEVU_SLOT_OWNER_ID_PROP} || ${WEVU_SLOT_OWNER_ID_KEY} || ''`;
 		mergedAttrs.push(`${WEVU_SLOT_OWNER_ID_ATTR}="${renderMustache(ownerIdExp, context)}"`);
 	}
 	const attrString = mergedAttrs.length ? ` ${mergedAttrs.join(" ")}` : "";
@@ -9280,6 +9330,20 @@ function warnReservedScriptSetupProps(scriptSetupCode, warn, context = {}) {
 //#endregion
 //#region src/plugins/vue/transform/compileVueFile/script.ts
 const TYPE_ONLY_DEFINE_PROPS_RE = /\bdefineProps\s*</;
+const EXPORT_DEFAULT_RE = /\bexport\s+default\b/;
+function hasDefaultExport(scriptCode) {
+	try {
+		const ast = parseJsLike(scriptCode);
+		let found = false;
+		traverse(ast, { ExportDefaultDeclaration(path) {
+			found = true;
+			path.stop();
+		} });
+		return found;
+	} catch {
+		return EXPORT_DEFAULT_RE.test(scriptCode);
+	}
+}
 function resolveScriptSetupPropsAliases(bindings) {
 	const aliases = bindings?.__propsAliases;
 	if (!aliases || typeof aliases !== "object") return;
@@ -9387,7 +9451,7 @@ async function compileScriptPhase(descriptor, descriptorForCompile, filename, op
 		propsDerivedKeys = resolveEffectivePropsDerivedKeys(scriptCompiled.bindings, scriptCode);
 		scriptMap = scriptCompiled.map && typeof scriptCompiled.map === "object" ? scriptCompiled.map : null;
 		if (scriptCode.includes("defineAppJson") || scriptCode.includes("definePageJson") || scriptCode.includes("defineComponentJson")) scriptCode = stripJsonMacroCallsFromCode(scriptCode, filename);
-		if (!isAppFile && !scriptCode.includes("export default")) scriptCode += "\nexport default {}";
+		if (!isAppFile && !hasDefaultExport(scriptCode)) scriptCode += "\nexport default {}";
 	} else scriptCode = "export default {}";
 	if (scriptCode) {
 		const transformed = transformScript(scriptCode, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.16.43",
+  "version": "6.16.44",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -42,18 +42,18 @@
   ],
   "dependencies": {
     "@jridgewell/remapping": "^2.3.5",
-    "@vue/compiler-core": "^3.5.35",
-    "@vue/compiler-dom": "^3.5.35",
+    "@vue/compiler-core": "^3.5.38",
+    "@vue/compiler-dom": "^3.5.38",
     "comment-json": "^5.0.0",
     "lru-cache": "^11.5.1",
     "magic-string": "^0.30.21",
     "merge": "^2.1.1",
     "pathe": "^2.0.3",
-    "vue": "^3.5.35",
+    "vue": "^3.5.38",
     "@weapp-core/constants": "0.1.12",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.16.43",
-    "rolldown-require": "2.0.18"
+    "@weapp-vite/ast": "6.16.44",
+    "rolldown-require": "2.0.19"
   },
   "publishConfig": {
     "access": "public",