@wevu/compiler 6.16.27 → 6.16.28

package/dist/index.d.mts

@@ -251,6 +251,7 @@ interface TemplateCompileResult {
   code: string;
   warnings: string[];
   scopedSlotComponents?: ScopedSlotComponentAsset[];
+  slotFallbackWrapperComponent?: SlotFallbackWrapperComponentAsset;
   componentGenerics?: Record<string, true>;
   classStyleRuntime?: ClassStyleRuntime;
   classStyleBindings?: ClassStyleBinding[];
@@ -288,6 +289,7 @@ interface TemplateCompileOptions {
   scopedSlotsRequireProps?: boolean;
   slotSingleRootNoWrapper?: boolean;
   slotFallbackWrapper?: SlotFallbackWrapperConfig;
+  slotFallbackWrapperStrategy?: SlotFallbackWrapperStrategy;
   slotMultipleInstance?: boolean;
   classStyleRuntime?: ClassStyleRuntime | 'auto';
   objectLiteralBindMode?: ObjectLiteralBindMode;
@@ -303,6 +305,20 @@ interface TemplateCompileOptions {
  * 作用域插槽编译模式。
  */
 type ScopedSlotsCompilerMode = 'auto' | 'augmented' | 'off';
+/**
+ * 命名插槽 fallback 容器默认策略。
+ */
+type SlotFallbackWrapperStrategy = 'view' | 'virtual-host';
+/**
+ * 命名插槽 fallback 虚拟宿主组件资源描述。
+ */
+interface SlotFallbackWrapperComponentAsset {
+  tagName: string;
+  componentBase: string;
+  template: string;
+  script: string;
+  config: Record<string, any>;
+}
 /**
  * 命名插槽 fallback 容器策略匹配器。
  */
@@ -440,6 +456,7 @@ interface VueTransformResult {
   config?: string;
   cssModules?: Record<string, Record<string, string>>;
   scopedSlotComponents?: TemplateCompileResult['scopedSlotComponents'];
+  slotFallbackWrapperComponent?: TemplateCompileResult['slotFallbackWrapperComponent'];
   componentGenerics?: TemplateCompileResult['componentGenerics'];
   classStyleWxs?: boolean;
   meta?: {
@@ -917,4 +934,4 @@ interface CollectVueTemplateTagsOptions {
  */
 declare function collectVueTemplateTags(template: string, options: CollectVueTemplateTagsOptions): Set<string>;
 //#endregion
-export { type AstEngineName, type AutoImportTagsOptions, type AutoUsingComponentsOptions, CLASS_STYLE_WXS_FILE, CLASS_STYLE_WXS_MODULE, type ClassStyleBinding, type ClassStyleRuntime, type CollectVueTemplateTagsOptions, type CompileVueFileOptions, type ForParseResult, type InlineExpressionAsset, type JsLikeLang, type JsonConfig, type JsonMergeContext, type JsonMergeStage, type JsonMergeStrategy, type MiniProgramPlatform, type ModuleResolver, type MpPlatform, RESERVED_VUE_COMPONENT_TAGS, type ReadAndParseSfcOptions, type ResolveSfcBlockSrcOptions, type ResolvedUsingComponentInfo, type ResolvedUsingComponentPath, type ScopedSlotComponentAsset, type StyleCompileOptions, type StyleCompileResult, type TemplateCompileOptions, type TemplateCompileResult, type TemplateRefBinding, type TransformResult, type TransformScriptOptions, VUE_COMPONENT_TAG_RE, type VueTransformResult, WE_VU_MODULE_ID, WE_VU_PAGE_HOOK_TO_FEATURE, WE_VU_RUNTIME_APIS, type WevuDefaults, WevuPageFeatureFlag, WevuPageHookName, WevuRuntimeApiName, alipayPlatform, buildClassStyleComputedCode, buildClassStyleWxsTag, builtinComponentsSet, clearFileCaches, collectTargetOptionsObjectsFromCode, collectVueTemplateTags, collectWevuFeaturesFromCodeReachableImports, collectWevuPageFeatureFlags, collectWevuPageFeatureFlagsFromCode, compileConfigBlocks, compileJsxFile, compileVueFile as compileSfc, compileVueFile, compileVueStyleToWxss as compileStyle, compileVueStyleToWxss, compileVueTemplateToWxml as compileTemplate, compileVueTemplateToWxml, createJsonMerger, createPageEntryMatcher, defaultMiniProgramPlatform, defaultMiniProgramTemplatePlatform, defaultPlatform, evaluateJsLikeConfig, extractJsonMacroFromScriptSetup, generateScopedId, getClassStyleWxsSource, getDefaultMiniProgramPlatform, getDefaultMiniProgramTemplatePlatform, getMiniProgramTemplatePlatform, getSfcCheckMtime, injectWevuPageFeatureFlagsIntoOptionsObject, injectWevuPageFeaturesInJs, injectWevuPageFeaturesInJsWithResolver, invalidateFileCache, isAutoImportCandidateTag, isBuiltinComponent, isInvalidate, isJsonLikeLang, loadCache, mergeJsonWithStrategy, mtimeCache, normalizeConfigLang, pathExists, preprocessScriptSetupSrc, preprocessScriptSrc, readAndParseSfc, readFile, resolveClassStyleWxsLocation, resolveJsLikeLang, resolveSfcBlockSrc, restoreScriptSetupSrc, restoreScriptSrc, stripJsonMacroCallsFromCode, swanPlatform, transformScript, transformScript as transformSfcScript, ttPlatform, wechatPlatform };
+export { type AstEngineName, type AutoImportTagsOptions, type AutoUsingComponentsOptions, CLASS_STYLE_WXS_FILE, CLASS_STYLE_WXS_MODULE, type ClassStyleBinding, type ClassStyleRuntime, type CollectVueTemplateTagsOptions, type CompileVueFileOptions, type ForParseResult, type InlineExpressionAsset, type JsLikeLang, type JsonConfig, type JsonMergeContext, type JsonMergeStage, type JsonMergeStrategy, type MiniProgramPlatform, type ModuleResolver, type MpPlatform, RESERVED_VUE_COMPONENT_TAGS, type ReadAndParseSfcOptions, type ResolveSfcBlockSrcOptions, type ResolvedUsingComponentInfo, type ResolvedUsingComponentPath, type ScopedSlotComponentAsset, type SlotFallbackWrapperComponentAsset, type SlotFallbackWrapperStrategy, type StyleCompileOptions, type StyleCompileResult, type TemplateCompileOptions, type TemplateCompileResult, type TemplateRefBinding, type TransformResult, type TransformScriptOptions, VUE_COMPONENT_TAG_RE, type VueTransformResult, WE_VU_MODULE_ID, WE_VU_PAGE_HOOK_TO_FEATURE, WE_VU_RUNTIME_APIS, type WevuDefaults, WevuPageFeatureFlag, WevuPageHookName, WevuRuntimeApiName, alipayPlatform, buildClassStyleComputedCode, buildClassStyleWxsTag, builtinComponentsSet, clearFileCaches, collectTargetOptionsObjectsFromCode, collectVueTemplateTags, collectWevuFeaturesFromCodeReachableImports, collectWevuPageFeatureFlags, collectWevuPageFeatureFlagsFromCode, compileConfigBlocks, compileJsxFile, compileVueFile as compileSfc, compileVueFile, compileVueStyleToWxss as compileStyle, compileVueStyleToWxss, compileVueTemplateToWxml as compileTemplate, compileVueTemplateToWxml, createJsonMerger, createPageEntryMatcher, defaultMiniProgramPlatform, defaultMiniProgramTemplatePlatform, defaultPlatform, evaluateJsLikeConfig, extractJsonMacroFromScriptSetup, generateScopedId, getClassStyleWxsSource, getDefaultMiniProgramPlatform, getDefaultMiniProgramTemplatePlatform, getMiniProgramTemplatePlatform, getSfcCheckMtime, injectWevuPageFeatureFlagsIntoOptionsObject, injectWevuPageFeaturesInJs, injectWevuPageFeaturesInJsWithResolver, invalidateFileCache, isAutoImportCandidateTag, isBuiltinComponent, isInvalidate, isJsonLikeLang, loadCache, mergeJsonWithStrategy, mtimeCache, normalizeConfigLang, pathExists, preprocessScriptSetupSrc, preprocessScriptSrc, readAndParseSfc, readFile, resolveClassStyleWxsLocation, resolveJsLikeLang, resolveSfcBlockSrc, restoreScriptSetupSrc, restoreScriptSrc, stripJsonMacroCallsFromCode, swanPlatform, transformScript, transformScript as transformSfcScript, ttPlatform, wechatPlatform };

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_FUNCTION_PROP_PATHS_KEY, 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_ALIASES_KEY, WEVU_PROPS_DERIVED_KEYS_KEY, WEVU_PROPS_KEY, WEVU_SLOT_NAMES_ATTR, WEVU_SLOT_NAMES_PROP, WEVU_SLOT_OWNER_ID_ATTR, WEVU_SLOT_OWNER_ID_KEY, WEVU_SLOT_OWNER_ID_PROP, WEVU_SLOT_OWNER_KEY, WEVU_SLOT_OWNER_PROXY_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, WEVU_TEMPLATE_REF_CLASS_PREFIX } from "@weapp-core/constants";
+import { WEVU_CLASS_STYLE_RUNTIME_FILE, WEVU_CLASS_STYLE_RUNTIME_MODULE, WEVU_EXPRESSION_ERROR_IDENTIFIER, WEVU_FUNCTION_PROP_PATHS_KEY, 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_ALIASES_KEY, WEVU_PROPS_DERIVED_KEYS_KEY, WEVU_PROPS_KEY, WEVU_SLOT_FALLBACK_VIRTUAL_HOST_BASE, WEVU_SLOT_FALLBACK_VIRTUAL_HOST_TAG_NAME, WEVU_SLOT_NAMES_ATTR, WEVU_SLOT_NAMES_PROP, WEVU_SLOT_OWNER_ID_ATTR, WEVU_SLOT_OWNER_ID_KEY, WEVU_SLOT_OWNER_ID_PROP, WEVU_SLOT_OWNER_KEY, WEVU_SLOT_OWNER_PROXY_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, WEVU_TEMPLATE_REF_CLASS_PREFIX } 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";
@@ -7766,13 +7766,23 @@ const HTML_VOID_TAGS = new Set([
 	"track",
 	"wbr"
 ]);
-function resolveSlotFallbackWrapperConfig(config) {
+function resolveSlotFallbackWrapperComponent(strategy) {
+	if (strategy !== "virtual-host") return;
+	return {
+		tagName: WEVU_SLOT_FALLBACK_VIRTUAL_HOST_TAG_NAME,
+		componentBase: WEVU_SLOT_FALLBACK_VIRTUAL_HOST_BASE,
+		template: "<slot></slot>",
+		script: "Component({options:{virtualHost:true,multipleSlots:true}})",
+		config: { component: true }
+	};
+}
+function resolveSlotFallbackWrapperConfig(config, strategy) {
 	if (typeof config === "string") return {
 		tag: config || "view",
 		rules: []
 	};
 	return {
-		tag: config?.tag || "view",
+		tag: config?.tag || (strategy === "virtual-host" ? WEVU_SLOT_FALLBACK_VIRTUAL_HOST_TAG_NAME : "view"),
 		attrs: config?.attrs,
 		singleRootNoWrapper: config?.singleRootNoWrapper,
 		rules: config?.rules ?? []
@@ -7788,7 +7798,9 @@ function compileVueTemplateToWxml(template, filename, options) {
 	const wxsExtension = options?.wxsExtension;
 	const scopedSlotsRequireProps = options?.scopedSlotsRequireProps ?? options?.scopedSlotsCompiler !== "augmented";
 	const slotSingleRootNoWrapper = options?.slotSingleRootNoWrapper ?? false;
-	const slotFallbackWrapper = resolveSlotFallbackWrapperConfig(options?.slotFallbackWrapper);
+	const slotFallbackWrapperStrategy = options?.slotFallbackWrapperStrategy ?? "view";
+	const slotFallbackWrapper = resolveSlotFallbackWrapperConfig(options?.slotFallbackWrapper, slotFallbackWrapperStrategy);
+	const slotFallbackWrapperComponent = slotFallbackWrapper.tag === WEVU_SLOT_FALLBACK_VIRTUAL_HOST_TAG_NAME ? resolveSlotFallbackWrapperComponent(slotFallbackWrapperStrategy) : void 0;
 	const htmlTagToWxmlMap = resolveHtmlTagToWxmlMap(options?.htmlTagToWxml);
 	try {
 		const ast = parse$1(template, {
@@ -7811,6 +7823,7 @@ function compileVueTemplateToWxml(template, filename, options) {
 			scopedSlotsRequireProps,
 			slotSingleRootNoWrapper,
 			slotFallbackWrapper,
+			slotFallbackWrapperComponent,
 			slotMultipleInstance: options?.slotMultipleInstance ?? true,
 			scopedSlotComponents: [],
 			componentGenerics: {},
@@ -7846,6 +7859,7 @@ function compileVueTemplateToWxml(template, filename, options) {
 			warnings
 		};
 		if (context.scopedSlotComponents.length) result.scopedSlotComponents = context.scopedSlotComponents;
+		if (context.slotFallbackWrapperComponent && wxml.includes(`<${context.slotFallbackWrapperComponent.tagName}`)) result.slotFallbackWrapperComponent = context.slotFallbackWrapperComponent;
 		if (Object.keys(context.componentGenerics).length) result.componentGenerics = context.componentGenerics;
 		if (context.classStyleWxs) result.classStyleWxs = true;
 		if (context.classStyleBindings.length) {
@@ -8715,6 +8729,89 @@ function composeSourceMaps(transformedMap, originalMap) {
 	return null;
 }
 //#endregion
+//#region src/plugins/vue/transform/compileVueFile/reservedProps.ts
+const RESERVED_SCRIPT_SETUP_PROPS = new Set([
+	"id",
+	"class",
+	"slot"
+]);
+const RESERVED_PROPS_WARNING = "defineProps 中声明 id/class/slot 可能无法在小程序 properties 中正确取值，请改用其他 prop 名称。";
+function getStaticKeyName(key) {
+	if (t.isIdentifier(key)) return key.name;
+	if (t.isStringLiteral(key)) return key.value;
+}
+function getTypePropertyName(key) {
+	if (t.isIdentifier(key)) return key.name;
+	if (t.isStringLiteral(key)) return key.value;
+}
+function isReservedScriptSetupProp(name) {
+	return name != null && RESERVED_SCRIPT_SETUP_PROPS.has(name);
+}
+function runtimePropsContainReservedName(node) {
+	if (t.isObjectExpression(node)) return node.properties.some((prop) => t.isObjectProperty(prop) && !prop.computed && isReservedScriptSetupProp(getStaticKeyName(prop.key)));
+	if (t.isArrayExpression(node)) return node.elements.some((element) => t.isStringLiteral(element) && isReservedScriptSetupProp(element.value));
+	return false;
+}
+function createTypeScope(ast) {
+	const scope = /* @__PURE__ */ new Map();
+	traverse(ast, {
+		TSInterfaceDeclaration(path) {
+			scope.set(path.node.id.name, path.node.body);
+		},
+		TSTypeAliasDeclaration(path) {
+			scope.set(path.node.id.name, path.node.typeAnnotation);
+		}
+	});
+	return scope;
+}
+function typePropsContainReservedName(typeNode, scope, seen = /* @__PURE__ */ new Set()) {
+	if (!typeNode) return false;
+	if (t.isTSTypeLiteral(typeNode)) return typeNode.members.some((member) => {
+		return t.isTSPropertySignature(member) && !member.computed && isReservedScriptSetupProp(getTypePropertyName(member.key));
+	});
+	if (t.isTSInterfaceBody(typeNode)) return typeNode.body.some((member) => {
+		return t.isTSPropertySignature(member) && !member.computed && isReservedScriptSetupProp(getTypePropertyName(member.key));
+	});
+	if (t.isTSIntersectionType(typeNode)) return typeNode.types.some((item) => typePropsContainReservedName(item, scope, seen));
+	if (t.isTSTypeReference(typeNode) && t.isIdentifier(typeNode.typeName)) {
+		const typeName = typeNode.typeName.name;
+		if (seen.has(typeName)) return false;
+		const resolved = scope.get(typeName);
+		if (!resolved) return false;
+		seen.add(typeName);
+		return typePropsContainReservedName(resolved, scope, seen);
+	}
+	return false;
+}
+function hasDefinePropsReservedName(scriptSetupCode) {
+	let hasReservedName = false;
+	try {
+		const ast = parseJsLike(scriptSetupCode);
+		const typeScope = createTypeScope(ast);
+		traverse(ast, { CallExpression(path) {
+			const callee = path.node.callee;
+			if (!t.isIdentifier(callee, { name: "defineProps" })) return;
+			if (runtimePropsContainReservedName(path.node.arguments[0])) {
+				hasReservedName = true;
+				path.stop();
+				return;
+			}
+			const typeParam = path.node.typeParameters?.params?.[0];
+			if (typePropsContainReservedName(typeParam, typeScope)) {
+				hasReservedName = true;
+				path.stop();
+			}
+		} });
+	} catch {
+		return false;
+	}
+	return hasReservedName;
+}
+function warnReservedScriptSetupProps(scriptSetupCode, warn) {
+	if (!scriptSetupCode || !hasDefinePropsReservedName(scriptSetupCode)) return;
+	warn?.(RESERVED_PROPS_WARNING);
+}
+//#endregion
 //#region src/plugins/vue/transform/compileVueFile/script.ts
 const TYPE_ONLY_DEFINE_PROPS_RE = /\bdefineProps\s*</;
 function resolveScriptSetupPropsAliases(bindings) {
@@ -8815,6 +8912,7 @@ async function compileScriptPhase(descriptor, descriptorForCompile, filename, op
 			id: filename,
 			isProd: false
 		});
+		warnReservedScriptSetupProps(descriptorForCompile.scriptSetup?.content, options?.warn);
 		propsAliases ??= resolveScriptSetupPropsAliases(scriptCompiled.bindings);
 		scriptCode = scriptCompiled.content;
 		propsDerivedKeys = resolveEffectivePropsDerivedKeys(scriptCompiled.bindings, scriptCode);
@@ -8898,6 +8996,7 @@ function compileTemplatePhase(descriptor, filename, options, result) {
 	const templateCompiled = compileVueTemplateToWxml(descriptor.template.content, filename, options);
 	result.template = templateCompiled.code;
 	if (templateCompiled.scopedSlotComponents?.length) result.scopedSlotComponents = templateCompiled.scopedSlotComponents;
+	if (templateCompiled.slotFallbackWrapperComponent) result.slotFallbackWrapperComponent = templateCompiled.slotFallbackWrapperComponent;
 	if (templateCompiled.componentGenerics && Object.keys(templateCompiled.componentGenerics).length) result.componentGenerics = templateCompiled.componentGenerics;
 	if (templateCompiled.classStyleWxs) result.classStyleWxs = true;
 	return templateCompiled;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.16.27",
+  "version": "6.16.28",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -45,14 +45,14 @@
     "@vue/compiler-core": "^3.5.35",
     "@vue/compiler-dom": "^3.5.35",
     "comment-json": "^5.0.0",
-    "lru-cache": "^11.5.0",
+    "lru-cache": "^11.5.1",
     "magic-string": "^0.30.21",
     "merge": "^2.1.1",
     "pathe": "^2.0.3",
     "vue": "^3.5.35",
-    "@weapp-core/constants": "0.1.10",
+    "@weapp-core/constants": "0.1.11",
     "@weapp-core/shared": "3.0.4",
-    "@weapp-vite/ast": "6.16.27",
+    "@weapp-vite/ast": "6.16.28",
     "rolldown-require": "2.0.18"
   },
   "publishConfig": {