@wevu/compiler 6.19.1 → 6.19.2

package/dist/index.mjs

@@ -1319,9 +1319,10 @@ function createModuleAnalysisFromCode(id, code, options) {
 	const cached = moduleAnalysisCache.get(cacheKey);
 	if (cached && cached.code === code) return cached.analysis;
 	let analysis;
-	if (engine === "oxc") if (!code.includes("import") && !code.includes("export")) analysis = createEmptyModuleAnalysis(id, "oxc");
-	else analysis = createModuleAnalysisWithOxc(id, code);
-	else analysis = createModuleAnalysis(id, parseModuleAnalysisAst(id, code));
+	if (engine === "oxc") {
+		if (!code.includes("import") && !code.includes("export")) analysis = createEmptyModuleAnalysis(id, "oxc");
+		else analysis = createModuleAnalysisWithOxc(id, code);
+	} else analysis = createModuleAnalysis(id, parseModuleAnalysisAst(id, code));
 	moduleAnalysisCache.set(cacheKey, {
 		code,
 		analysis
@@ -3738,25 +3739,35 @@ function rewriteDefaultExport(ast, state, options, enabledPageFeatures, serializ
 		transformed = injectPropsDerivedKeys(componentOptionsObject, options?.propsDerivedKeys) || transformed;
 	}
 	const classStyleBindings = options?.classStyleBindings ?? [];
-	if (classStyleBindings.length) if (componentOptionsObject) {
-		ensureClassStyleRuntimeImports(ast.program);
-		transformed = injectClassStyleComputed(componentOptionsObject, classStyleBindings, options?.propsAliases, warn) || transformed;
-	} else warn("无法自动注入 class/style 计算属性：组件选项不是对象字面量。");
+	if (classStyleBindings.length) {
+		if (componentOptionsObject) {
+			ensureClassStyleRuntimeImports(ast.program);
+			transformed = injectClassStyleComputed(componentOptionsObject, classStyleBindings, options?.propsAliases, warn) || transformed;
+		} else warn("无法自动注入 class/style 计算属性：组件选项不是对象字面量。");
+	}
 	const templateRefs = options?.templateRefs ?? [];
-	if (templateRefs.length) if (componentOptionsObject) transformed = injectTemplateRefs(componentOptionsObject, templateRefs, warn) || transformed;
-	else warn("无法自动注入 template ref 元数据：组件选项不是对象字面量。");
+	if (templateRefs.length) {
+		if (componentOptionsObject) transformed = injectTemplateRefs(componentOptionsObject, templateRefs, warn) || transformed;
+		else warn("无法自动注入 template ref 元数据：组件选项不是对象字面量。");
+	}
 	const layoutHosts = options?.layoutHosts ?? [];
-	if (layoutHosts.length) if (componentOptionsObject) transformed = injectLayoutHosts(componentOptionsObject, layoutHosts, warn) || transformed;
-	else warn("无法自动注入 layout host 元数据：组件选项不是对象字面量。");
+	if (layoutHosts.length) {
+		if (componentOptionsObject) transformed = injectLayoutHosts(componentOptionsObject, layoutHosts, warn) || transformed;
+		else warn("无法自动注入 layout host 元数据：组件选项不是对象字面量。");
+	}
 	const inlineExpressions = options?.inlineExpressions ?? [];
-	if (inlineExpressions.length) if (componentOptionsObject) {
-		const injected = injectInlineExpressions(componentOptionsObject, inlineExpressions);
-		if (!injected) warn("无法自动注入内联表达式元数据：methods 不是对象字面量。");
-		transformed = injected || transformed;
-	} else warn("无法自动注入内联表达式元数据：组件选项不是对象字面量。");
+	if (inlineExpressions.length) {
+		if (componentOptionsObject) {
+			const injected = injectInlineExpressions(componentOptionsObject, inlineExpressions);
+			if (!injected) warn("无法自动注入内联表达式元数据：methods 不是对象字面量。");
+			transformed = injected || transformed;
+		} else warn("无法自动注入内联表达式元数据：组件选项不是对象字面量。");
+	}
 	const functionPropPaths = options?.functionPropPaths ?? [];
-	if (functionPropPaths.length) if (componentOptionsObject) transformed = injectFunctionPropPaths(componentOptionsObject, functionPropPaths) || transformed;
-	else warn("无法自动注入函数 prop 元数据：组件选项不是对象字面量。");
+	if (functionPropPaths.length) {
+		if (componentOptionsObject) transformed = injectFunctionPropPaths(componentOptionsObject, functionPropPaths) || transformed;
+		else warn("无法自动注入函数 prop 元数据：组件选项不是对象字面量。");
+	}
 	if (componentExpr) {
 		if (options?.isApp) transformed = injectWevuDefaultsForApp({
 			astProgram: ast.program,
@@ -5319,6 +5330,14 @@ function normalizeLineEndings(source) {
 const mtimeCache = /* @__PURE__ */ new Map();
 const loadCache = new LRUCache({ max: 1024 });
 const pathExistsCache = new LRUCache({ max: 4096 });
+const transientRenameRetryDelays = [
+	10,
+	25,
+	50
+];
+function isMissingFileError(error) {
+	return error instanceof Error && "code" in error && error.code === "ENOENT";
+}
 /**
 * 返回 true 的时候需要重新 fs 读取
 * @param id 文件路径
@@ -5363,13 +5382,19 @@ async function readFile(id, options) {
 		loadCache.set(id, content);
 		return content;
 	}
-	if (!await isInvalidate(id)) {
-		const cached = loadCache.get(id);
-		if (cached !== void 0) return cached;
+	for (let attempt = 0;; attempt += 1) try {
+		if (!await isInvalidate(id)) {
+			const cached = loadCache.get(id);
+			if (cached !== void 0) return cached;
+		}
+		const content = normalizeLineEndings(await readFile$1(id, encoding));
+		loadCache.set(id, content);
+		return content;
+	} catch (error) {
+		const retryDelay = transientRenameRetryDelays[attempt];
+		if (!isMissingFileError(error) || retryDelay === void 0) throw error;
+		await new Promise((resolve) => setTimeout(resolve, retryDelay));
 	}
-	const content = normalizeLineEndings(await readFile$1(id, encoding));
-	loadCache.set(id, content);
-	return content;
 }
 /**
 * 判断文件或路径是否存在，可选缓存。
@@ -6392,12 +6417,14 @@ function parseForExpression(exp) {
 	if (!segments.length || segments.length > 3) return { listExp: split.list };
 	const result = { listExp: split.list };
 	const rawItem = segments[0]?.trim();
-	if (rawItem) if (isIdentifier(rawItem)) result.item = rawItem;
-	else {
-		const aliases = parseItemAliases(rawItem);
-		if (Object.keys(aliases).length) {
-			result.item = FOR_ITEM_ALIAS_PLACEHOLDER;
-			result.itemAliases = aliases;
+	if (rawItem) {
+		if (isIdentifier(rawItem)) result.item = rawItem;
+		else {
+			const aliases = parseItemAliases(rawItem);
+			if (Object.keys(aliases).length) {
+				result.item = FOR_ITEM_ALIAS_PLACEHOLDER;
+				result.itemAliases = aliases;
+			}
 		}
 	}
 	if (segments.length === 2) {
@@ -7132,13 +7159,14 @@ function normalizeJsExpressionWithContext(exp, context, options) {
 		}
 		if (locals.has(name)) return;
 		let replacement;
-		if (context.rewriteScopedSlot) if (hasOwn(slotProps, name)) {
-			const prop = slotProps[name];
-			const base = createThisMemberAccess(WEVU_SLOT_PROPS_DATA_KEY);
-			replacement = createUnrefCall(prop ? createMemberAccess(base, prop) : base);
-		} else if (name === WEVU_SLOT_OWNER_KEY || name === WEVU_SLOT_PROPS_DATA_KEY || name === WEVU_SLOT_PROPS_KEY || name === WEVU_SLOT_SCOPE_KEY) replacement = createUnrefCall(createThisMemberAccess(name));
-		else replacement = createUnrefCall(createMemberAccess(createThisMemberAccess(WEVU_SLOT_OWNER_PROXY_KEY), name));
-		else {
+		if (context.rewriteScopedSlot) {
+			if (hasOwn(slotProps, name)) {
+				const prop = slotProps[name];
+				const base = createThisMemberAccess(WEVU_SLOT_PROPS_DATA_KEY);
+				replacement = createUnrefCall(prop ? createMemberAccess(base, prop) : base);
+			} else if (name === WEVU_SLOT_OWNER_KEY || name === WEVU_SLOT_PROPS_DATA_KEY || name === WEVU_SLOT_PROPS_KEY || name === WEVU_SLOT_SCOPE_KEY) replacement = createUnrefCall(createThisMemberAccess(name));
+			else replacement = createUnrefCall(createMemberAccess(createThisMemberAccess(WEVU_SLOT_OWNER_PROXY_KEY), name));
+		} else {
 			const propsAlias = context.propsAliases?.[name];
 			replacement = createUnrefCall(propsAlias ? createAliasedPropsAccess(name, propsAlias) : createIdentifierAccessWithPropsFallback(name, context, options?.runtimePropAccess === "helper"));
 		}
@@ -7477,11 +7505,12 @@ function transformBindDirective(node, context, forInfo, options) {
 	if (!rawExpValue) return null;
 	if (options?.isComponent && !COMPONENT_NON_PROP_BINDINGS.has(argValue)) {
 		const path = collectFunctionPropPath(rawExpValue);
-		if (path) if (shouldWrapStaticMemberFunctionProp(argValue, path, context)) {
-			const runtimeAttr = createFunctionPropRuntimeAttr(argValue, rawExpValue, context);
-			if (runtimeAttr) return runtimeAttr;
-		} else context.functionPropPaths.add(path);
-		else if (shouldUseRuntimeFunctionPropBinding(argValue, context) && isComputedMemberExpression(rawExpValue)) {
+		if (path) {
+			if (shouldWrapStaticMemberFunctionProp(argValue, path, context)) {
+				const runtimeAttr = createFunctionPropRuntimeAttr(argValue, rawExpValue, context);
+				if (runtimeAttr) return runtimeAttr;
+			} else context.functionPropPaths.add(path);
+		} else if (shouldUseRuntimeFunctionPropBinding(argValue, context) && isComputedMemberExpression(rawExpValue)) {
 			const runtimeAttr = createFunctionPropRuntimeAttr(argValue, rawExpValue, context);
 			if (runtimeAttr) return runtimeAttr;
 		}
@@ -7880,24 +7909,26 @@ function collectElementAttributes(node, context, options) {
 			kind: isComponentElement ? "component" : "element"
 		});
 	}
-	if (layoutHostKey) if (!staticId && hasDynamicIdBinding) context.warnings.push("layout-host 暂不支持与动态 id 同时使用，当前节点已忽略。");
-	else {
-		const hostIndex = context.layoutHostIndexSeed++;
-		const hostId = staticId || `${WEVU_LAYOUT_HOST_ID_PREFIX}${hostIndex}`;
-		const hostRefName = `${WEVU_LAYOUT_HOST_REF_PREFIX}${hostIndex}`;
-		staticId = hostId;
-		context.templateRefs.push({
-			selector: `#${hostId}`,
-			inFor: false,
-			name: hostRefName,
-			kind: "component"
-		});
-		context.layoutHosts.push({
-			key: layoutHostKey,
-			refName: hostRefName,
-			selector: `#${hostId}`,
-			kind: "component"
-		});
+	if (layoutHostKey) {
+		if (!staticId && hasDynamicIdBinding) context.warnings.push("layout-host 暂不支持与动态 id 同时使用，当前节点已忽略。");
+		else {
+			const hostIndex = context.layoutHostIndexSeed++;
+			const hostId = staticId || `${WEVU_LAYOUT_HOST_ID_PREFIX}${hostIndex}`;
+			const hostRefName = `${WEVU_LAYOUT_HOST_REF_PREFIX}${hostIndex}`;
+			staticId = hostId;
+			context.templateRefs.push({
+				selector: `#${hostId}`,
+				inFor: false,
+				name: hostRefName,
+				kind: "component"
+			});
+			context.layoutHosts.push({
+				key: layoutHostKey,
+				refName: hostRefName,
+				selector: `#${hostId}`,
+				kind: "component"
+			});
+		}
 	}
 	if (staticId) attrs.unshift(`id="${staticId}"`);
 	const classAttr = renderClassAttribute(staticClass, dynamicClassExp, context);
@@ -8617,12 +8648,13 @@ function transformComponentWithSlots(node, context, transformNode, options) {
 		if (slotDeclarations.length) context.warnings.push("组件上的 v-slot 与 <template v-slot> 不能同时使用；仅使用组件上的 v-slot。");
 		slotDeclarations.length = 0;
 		slotDeclarations.push(buildSlotDeclaration(resolveSlotNameFromDirective(slotDirective), slotDirective.exp?.type === NodeTypes.SIMPLE_EXPRESSION ? slotDirective.exp.content : void 0, node.children, context, { wrapper: ownerWrapper }));
-	} else if (slotDeclarations.length && defaultSlotChildren.length) if (slotDeclarations.some((decl) => decl.name.type === "default" || decl.name.type === "static" && decl.name.value === "default")) context.warnings.push("存在显式的 v-slot:default，默认插槽内容将被忽略。");
-	else {
-		implicitDefaultDeclaration = buildSlotDeclaration({ type: "default" }, void 0, defaultSlotChildren, context, { implicitDefault: true });
-		slotDeclarations.push(implicitDefaultDeclaration);
-	}
-	else if (!slotDeclarations.length && defaultSlotChildren.length && !context.scopedSlotsRequireProps && !hasLegacySlotAttribute(defaultSlotChildren)) {
+	} else if (slotDeclarations.length && defaultSlotChildren.length) {
+		if (slotDeclarations.some((decl) => decl.name.type === "default" || decl.name.type === "static" && decl.name.value === "default")) context.warnings.push("存在显式的 v-slot:default，默认插槽内容将被忽略。");
+		else {
+			implicitDefaultDeclaration = buildSlotDeclaration({ type: "default" }, void 0, defaultSlotChildren, context, { implicitDefault: true });
+			slotDeclarations.push(implicitDefaultDeclaration);
+		}
+	} else if (!slotDeclarations.length && defaultSlotChildren.length && !context.scopedSlotsRequireProps && !hasLegacySlotAttribute(defaultSlotChildren)) {
 		implicitDefaultDeclaration = buildSlotDeclaration({ type: "default" }, void 0, defaultSlotChildren, context, { implicitDefault: true });
 		slotDeclarations.push(implicitDefaultDeclaration);
 	}
@@ -8724,10 +8756,12 @@ function transformComponentWithSlotsFallback(node, context, transformNode, optio
 		if (slotDeclarations.length) context.warnings.push("组件上的 v-slot 与 <template v-slot> 不能同时使用；仅使用组件上的 v-slot。");
 		slotDeclarations.length = 0;
 		slotDeclarations.push(buildSlotDeclaration(resolveSlotNameFromDirective(slotDirective), slotDirective.exp?.type === NodeTypes.SIMPLE_EXPRESSION ? slotDirective.exp.content : void 0, node.children, context, { wrapper: ownerWrapper }));
-	} else if (slotDeclarations.length && defaultSlotChildren.length) if (slotDeclarations.some((decl) => decl.name.type === "default" || decl.name.type === "static" && decl.name.value === "default")) context.warnings.push("存在显式的 v-slot:default，默认插槽内容将被忽略。");
-	else {
-		implicitDefaultDeclaration = buildSlotDeclaration({ type: "default" }, void 0, defaultSlotChildren, context);
-		slotDeclarations.push(implicitDefaultDeclaration);
+	} else if (slotDeclarations.length && defaultSlotChildren.length) {
+		if (slotDeclarations.some((decl) => decl.name.type === "default" || decl.name.type === "static" && decl.name.value === "default")) context.warnings.push("存在显式的 v-slot:default，默认插槽内容将被忽略。");
+		else {
+			implicitDefaultDeclaration = buildSlotDeclaration({ type: "default" }, void 0, defaultSlotChildren, context);
+			slotDeclarations.push(implicitDefaultDeclaration);
+		}
 	}
 	if (!slotDeclarations.length) {
 		const { attrs, vTextExp } = collectElementAttributes(node, context, {
@@ -10101,18 +10135,59 @@ async function parseVueFile(source, filename, options) {
 				merge: (target, source) => mergeJson(target, source, "macro"),
 				preambleContent: resolvedDescriptor.script?.content
 			});
-			if (extracted.stripped !== scriptSetup.content) if (scriptSetup.src) descriptorForCompile = {
+			if (extracted.stripped !== scriptSetup.content) {
+				if (scriptSetup.src) descriptorForCompile = {
+					...descriptorForCompile,
+					scriptSetup: {
+						...descriptorForCompile.scriptSetup,
+						content: extracted.stripped
+					}
+				};
+				else {
+					const setupLoc = scriptSetup.loc;
+					const startOffset = setupLoc.start.offset;
+					const endOffset = setupLoc.end.offset;
+					const nextSource = descriptorForCompileSource.slice(0, startOffset) + extracted.stripped + descriptorForCompileSource.slice(endOffset);
+					const { descriptor: nextDescriptor, errors: nextErrors } = await parseSfc(nextSource, filename, false);
+					restoreScriptSetupSrc(nextDescriptor);
+					restoreScriptSrc(nextDescriptor);
+					if (nextErrors.length > 0) {
+						const error = nextErrors[0];
+						throw new Error(`解析 ${filename} 失败：${error.message}`);
+					}
+					assertMatchingSfcScriptLang(nextDescriptor, filename);
+					if (options?.sfcSrc) {
+						const resolvedNext = await resolveSfcBlockSrc(nextDescriptor, filename, options.sfcSrc);
+						descriptorForCompile = resolvedNext.descriptor;
+						if (resolvedNext.deps.length) {
+							sfcSrcDeps = [.../* @__PURE__ */ new Set([...sfcSrcDeps ?? [], ...resolvedNext.deps])];
+							meta.sfcSrcDeps = sfcSrcDeps;
+						}
+					} else descriptorForCompile = nextDescriptor;
+					descriptorForCompileSource = nextSource;
+				}
+			}
+			scriptSetupMacroConfig = extracted.config;
+			scriptSetupMacroHash = extracted.macroHash;
+		}
+		if (DEFINE_OPTIONS_CALL_RE.test(scriptSetup.content)) defineOptionsHash = extractDefineOptionsHash(scriptSetup.content);
+	}
+	const compileScriptSetup = descriptorForCompile.scriptSetup;
+	if (compileScriptSetup?.content && DEFINE_OPTIONS_CALL_RE.test(compileScriptSetup.content)) {
+		const inlined = await inlineScriptSetupDefineOptionsArgs(compileScriptSetup.content, filename, compileScriptSetup.lang);
+		if (inlined.code !== compileScriptSetup.content) {
+			if (compileScriptSetup.src) descriptorForCompile = {
 				...descriptorForCompile,
 				scriptSetup: {
-					...descriptorForCompile.scriptSetup,
-					content: extracted.stripped
+					...compileScriptSetup,
+					content: inlined.code
 				}
 			};
 			else {
-				const setupLoc = scriptSetup.loc;
+				const setupLoc = compileScriptSetup.loc;
 				const startOffset = setupLoc.start.offset;
 				const endOffset = setupLoc.end.offset;
-				const nextSource = descriptorForCompileSource.slice(0, startOffset) + extracted.stripped + descriptorForCompileSource.slice(endOffset);
+				const nextSource = descriptorForCompileSource.slice(0, startOffset) + inlined.code + descriptorForCompileSource.slice(endOffset);
 				const { descriptor: nextDescriptor, errors: nextErrors } = await parseSfc(nextSource, filename, false);
 				restoreScriptSetupSrc(nextDescriptor);
 				restoreScriptSrc(nextDescriptor);
@@ -10131,43 +10206,6 @@ async function parseVueFile(source, filename, options) {
 				} else descriptorForCompile = nextDescriptor;
 				descriptorForCompileSource = nextSource;
 			}
-			scriptSetupMacroConfig = extracted.config;
-			scriptSetupMacroHash = extracted.macroHash;
-		}
-		if (DEFINE_OPTIONS_CALL_RE.test(scriptSetup.content)) defineOptionsHash = extractDefineOptionsHash(scriptSetup.content);
-	}
-	const compileScriptSetup = descriptorForCompile.scriptSetup;
-	if (compileScriptSetup?.content && DEFINE_OPTIONS_CALL_RE.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 } = await parseSfc(nextSource, filename, false);
-			restoreScriptSetupSrc(nextDescriptor);
-			restoreScriptSrc(nextDescriptor);
-			if (nextErrors.length > 0) {
-				const error = nextErrors[0];
-				throw new Error(`解析 ${filename} 失败：${error.message}`);
-			}
-			assertMatchingSfcScriptLang(nextDescriptor, filename);
-			if (options?.sfcSrc) {
-				const resolvedNext = await resolveSfcBlockSrc(nextDescriptor, filename, options.sfcSrc);
-				descriptorForCompile = resolvedNext.descriptor;
-				if (resolvedNext.deps.length) {
-					sfcSrcDeps = [.../* @__PURE__ */ new Set([...sfcSrcDeps ?? [], ...resolvedNext.deps])];
-					meta.sfcSrcDeps = sfcSrcDeps;
-				}
-			} else descriptorForCompile = nextDescriptor;
-			descriptorForCompileSource = nextSource;
 		}
 	}
 	const isAppFile = APP_VUE_FILE_RE.test(filename);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.19.1",
+  "version": "6.19.2",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -42,19 +42,19 @@
   ],
   "dependencies": {
     "@jridgewell/remapping": "^2.3.5",
-    "@vue/compiler-core": "^3.5.40",
-    "@vue/compiler-dom": "^3.5.40",
+    "@vue/compiler-core": "^3.5.41",
+    "@vue/compiler-dom": "^3.5.41",
     "comment-json": "^5.0.0",
     "lru-cache": "^11.5.2",
     "magic-string": "^1.1.0",
     "merge": "^2.1.1",
     "pathe": "^2.0.3",
-    "postcss": "^8.5.25",
+    "postcss": "^8.5.26",
     "postcss-selector-parser": "^7.1.4",
-    "vue": "^3.5.40",
-    "@weapp-core/constants": "0.1.15",
+    "vue": "^3.5.41",
+    "@weapp-core/constants": "0.1.16",
     "@weapp-core/shared": "3.1.0",
-    "@weapp-vite/ast": "6.19.1",
+    "@weapp-vite/ast": "6.19.2",
     "rolldown-require": "2.0.23"
   },
   "publishConfig": {