@wevu/compiler 6.15.18 → 6.16.1

package/dist/index.mjs

@@ -13,7 +13,7 @@ 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 { WEVU_CLASS_STYLE_RUNTIME_FILE, WEVU_CLASS_STYLE_RUNTIME_MODULE, WEVU_EXPRESSION_ERROR_IDENTIFIER, WEVU_INLINE_HANDLER, WEVU_INLINE_MAP_KEY, WEVU_IS_PAGE_KEY, WEVU_LAYOUT_HOSTS_KEY, WEVU_LAYOUT_HOST_ID_PREFIX, WEVU_LAYOUT_HOST_REF_PREFIX, WEVU_MODEL_HANDLER, WEVU_OWNER_HANDLER, WEVU_PROPS_KEY, WEVU_SLOT_NAMES_ATTR, WEVU_SLOT_OWNER_ATTR, WEVU_SLOT_OWNER_ID_ATTR, WEVU_SLOT_OWNER_ID_KEY, WEVU_SLOT_OWNER_ID_PROP, WEVU_SLOT_OWNER_KEY, WEVU_SLOT_PROPS_ATTR, WEVU_SLOT_PROPS_DATA_KEY, WEVU_SLOT_PROPS_KEY, WEVU_SLOT_SCOPE_ATTR, WEVU_SLOT_SCOPE_KEY, WEVU_TEMPLATE_REFS_KEY } from "@weapp-core/constants";
+import { WEVU_CLASS_STYLE_RUNTIME_FILE, WEVU_CLASS_STYLE_RUNTIME_MODULE, WEVU_EXPRESSION_ERROR_IDENTIFIER, WEVU_INLINE_HANDLER, WEVU_INLINE_MAP_KEY, WEVU_IS_PAGE_KEY, WEVU_LAYOUT_HOSTS_KEY, WEVU_LAYOUT_HOST_ID_PREFIX, WEVU_LAYOUT_HOST_REF_PREFIX, WEVU_MODEL_HANDLER, WEVU_OWNER_HANDLER, WEVU_PROPS_KEY, WEVU_SLOT_NAMES_ATTR, WEVU_SLOT_NAMES_PROP, WEVU_SLOT_OWNER_ATTR, WEVU_SLOT_OWNER_ID_ATTR, WEVU_SLOT_OWNER_ID_KEY, WEVU_SLOT_OWNER_ID_PROP, WEVU_SLOT_OWNER_KEY, WEVU_SLOT_PROPS_ATTR, WEVU_SLOT_PROPS_DATA_KEY, WEVU_SLOT_PROPS_KEY, WEVU_SLOT_SCOPE_ATTR, WEVU_SLOT_SCOPE_KEY, WEVU_TEMPLATE_REFS_KEY } from "@weapp-core/constants";
 import { compileScript, parse } from "vue/compiler-sfc";
 import { fileURLToPath } from "node:url";
 import { parse as parse$1 } from "@vue/compiler-dom";
@@ -6328,6 +6328,16 @@ function stringifySlotName(info, context) {
 	if (info.type === "static") return info.value === "default" ? "'default'" : `'${info.value}'`;
 	return normalizeWxmlExpressionWithContext(info.exp, context);
 }
+function resolveSlotStaticName(info) {
+	if (info.type === "default") return "default";
+	if (info.type === "static") return info.value || "default";
+}
+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, "\\'")}']`}`;
+}
 function buildSlotDeclaration(name, propsExp, children, context, options) {
 	return {
 		name,
@@ -6421,7 +6431,12 @@ function transformSlotElement(node, context, transformNode) {
 	const nameAttr = renderSlotNameAttribute(slotNameInfo, context, "name");
 	if (nameAttr) slotAttrs.push(nameAttr);
 	const slotAttrString = slotAttrs.length ? ` ${slotAttrs.join(" ")}` : "";
-	const slotTag = fallbackContent ? `<slot${slotAttrString}>${fallbackContent}</slot>` : `<slot${slotAttrString} />`;
+	let slotTag = `<slot${slotAttrString} />`;
+	if (fallbackContent) {
+		const slotPresentExp = createSlotPresenceExpression(slotNameInfo);
+		if (!slotPropsExp && slotPresentExp) slotTag = `${context.platform.wrapIf(slotPresentExp, slotTag, (exp) => renderMustache(exp, context))}${context.platform.wrapElse(fallbackContent)}`;
+		else slotTag = `<slot${slotAttrString}>${fallbackContent}</slot>`;
+	}
 	if (!slotPropsExp && (context.scopedSlotsRequireProps || slotNameInfo.type !== "default")) return slotTag;
 	const genericKey = `scoped-slots-${resolveSlotKey(context, slotNameInfo)}`;
 	context.componentGenerics[genericKey] = true;
@@ -6432,7 +6447,8 @@ function transformSlotElement(node, context, transformNode) {
 		`${WEVU_SLOT_PROPS_ATTR}="${renderMustache(slotPropsExp, context)}"`
 	];
 	if (context.slotMultipleInstance) scopedAttrs.push(`${WEVU_SLOT_SCOPE_ATTR}="${renderMustache(WEVU_SLOT_SCOPE_KEY, context)}"`);
-	return `${slotTag}${`<${genericKey}${scopedAttrs.length ? ` ${scopedAttrs.join(" ")}` : ""} />`}`;
+	const scopedTag = `<${genericKey}${scopedAttrs.length ? ` ${scopedAttrs.join(" ")}` : ""} />`;
+	return `${slotTag}${scopedTag}`;
 }
 function transformSlotElementPlain(node, context, transformNode) {
 	const slotNameInfo = resolveSlotNameFromSlotElement(node);
@@ -6477,14 +6493,30 @@ function resolveTemplateSlotCondition(node, context) {
 function pushSlotNamesAttr(attrs, slotNames, context) {
 	if (!slotNames.length) return;
 	const seen = /* @__PURE__ */ new Set();
-	const entries = [];
+	const entries = /* @__PURE__ */ new Map();
 	for (const item of slotNames) {
 		const dedupeKey = `${item.name}:${item.condition ?? ""}`;
 		if (seen.has(dedupeKey)) continue;
 		seen.add(dedupeKey);
-		entries.push(item.condition ? `((${item.condition}) ? ${item.name} : '')` : item.name);
+		const entry = entries.get(item.name) ?? {
+			conditions: [],
+			unconditional: false
+		};
+		if (item.condition) {
+			if (!entry.unconditional) entry.conditions.push(item.condition);
+		} else {
+			entry.conditions.length = 0;
+			entry.unconditional = true;
+		}
+		entries.set(item.name, entry);
+	}
+	const properties = [];
+	for (const [name, entry] of entries) {
+		const value = entry.conditions.length ? entry.conditions.map((condition) => `(${condition})`).join("||") : "true";
+		properties.push(`[${name}]:${value}`);
 	}
-	attrs.push(`${WEVU_SLOT_NAMES_ATTR}="${renderMustache(`[${entries.join(",")}]`, context)}"`);
+	const slotNamesRef = registerRuntimeBindingExpression(`{${properties.join(",")}}`, context, { hint: "vue-slots 元数据" });
+	if (slotNamesRef) attrs.push(`${WEVU_SLOT_NAMES_ATTR}="${renderMustache(slotNamesRef, context)}"`);
 }
 function shouldExposePlainSlotPresence(node) {
 	return node.tag === "component";
@@ -6988,7 +7020,7 @@ function normalizeResolvedUsingComponent(result) {
 	return result;
 }
 function isWevuSfcComponent(result) {
-	return result?.sourceType === "wevu-sfc" || Boolean(result?.resolvedId?.endsWith(".vue"));
+	return result?.sourceType === "wevu-sfc" || Boolean(result?.resolvedId?.endsWith(".vue")) || Boolean(result?.from?.endsWith(".vue"));
 }
 function isVueSfcSource(source) {
 	return source.endsWith(".vue");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.15.18",
+  "version": "6.16.1",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -52,7 +52,7 @@
     "vue": "^3.5.33",
     "@weapp-core/constants": "^0.1.4",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.15.18",
+    "@weapp-vite/ast": "6.16.1",
     "rolldown-require": "2.0.15"
   },
   "publishConfig": {