@wevu/compiler 6.20.3 → 6.20.5

package/dist/index.mjs

@@ -2061,9 +2061,25 @@ function isTemplateReturnPropertyReference(path) {
 	if (t.isIdentifier(key, { name: path.node.name }) || t.isStringLiteral(key, { value: path.node.name })) return true;
 	return false;
 }
+function isStaticPropertyNamed(node, name) {
+	return !node.computed && (t.isIdentifier(node.key, { name }) || t.isStringLiteral(node.key, { value: name }));
+}
+function isOptionsApiComponentsObject(path) {
+	const componentsProperty = path.parentPath;
+	if (!componentsProperty?.isObjectProperty() || !isStaticPropertyNamed(componentsProperty.node, "components")) return false;
+	const optionsObject = componentsProperty.parentPath;
+	if (!optionsObject?.isObjectExpression()) return false;
+	const optionsParent = optionsObject.parentPath;
+	if (optionsParent?.isExportDefaultDeclaration()) return true;
+	return Boolean(optionsParent?.isCallExpression() && optionsParent.node.arguments[0] === optionsObject.node && optionsParent.parentPath?.isExportDefaultDeclaration());
+}
+function isOptionsApiComponentRegistrationReference(path) {
+	const property = path.parentPath;
+	return Boolean(property?.isObjectProperty() && property.node.value === path.node && property.parentPath?.isObjectExpression() && isOptionsApiComponentsObject(property.parentPath));
+}
 function isReferencedOutsideTemplateReturn(path) {
 	if (!path.isReferencedIdentifier()) return false;
-	if (isTemplateReturnGetterReference(path) || isTemplateReturnPropertyReference(path)) return false;
+	if (isTemplateReturnGetterReference(path) || isTemplateReturnPropertyReference(path) || isOptionsApiComponentRegistrationReference(path)) return false;
 	return true;
 }
 function collectReferencedNames(ast, candidateNames) {
@@ -2102,6 +2118,21 @@ function removeSetupReturnProperties(ast, removableNames) {
 	});
 	return changed;
 }
+function removeOptionsApiComponentRegistrations(ast, removableNames) {
+	if (!removableNames.size) return false;
+	let changed = false;
+	traverse(ast, { ObjectProperty(path) {
+		if (!path.parentPath?.isObjectExpression() || !isOptionsApiComponentsObject(path.parentPath) || !t.isIdentifier(path.node.value) || !removableNames.has(path.node.value.name)) return;
+		path.remove();
+		changed = true;
+	} });
+	traverse(ast, { ObjectProperty(path) {
+		if (!t.isObjectExpression(path.node.value) || !isStaticPropertyNamed(path.node, "components") || path.node.value.properties.length > 0 || !path.parentPath?.isObjectExpression()) return;
+		const optionsParent = path.parentPath.parentPath;
+		if (optionsParent?.isExportDefaultDeclaration() || optionsParent?.isCallExpression() && optionsParent.node.arguments[0] === path.parentPath.node && optionsParent.parentPath?.isExportDefaultDeclaration()) path.remove();
+	} });
+	return changed;
+}
 function pruneTemplateComponentMeta(ast, templateComponentMeta) {
 	if (!Object.keys(templateComponentMeta).length) return false;
 	const candidateNames = new Set(Object.keys(templateComponentMeta));
@@ -2125,6 +2156,7 @@ function pruneTemplateComponentMeta(ast, templateComponentMeta) {
 		}
 	} });
 	changed = removeSetupReturnProperties(ast, removableNames) || changed;
+	changed = removeOptionsApiComponentRegistrations(ast, removableNames) || changed;
 	return changed;
 }
 //#endregion
@@ -10104,6 +10136,49 @@ function collectTemplateComponentTagInfo(template, filename, warn) {
 		tagsByComponentName
 	};
 }
+async function resolveScriptComponentRegistrations(options) {
+	const { pending, filename, compileOptions, autoUsingComponents, result } = options;
+	const resolvedComponents = await Promise.all(pending.map(async ({ localName, importSource, importedName, kind, templateTags }) => {
+		let resolved = autoUsingComponents?.resolveUsingComponentPath ? normalizeResolvedUsingComponent(await autoUsingComponents.resolveUsingComponentPath(importSource, filename, {
+			localName,
+			importedName,
+			kind
+		})) : void 0;
+		if (!resolved?.from && importSource.startsWith("/")) resolved = {
+			from: removeExtensionDeep(importSource),
+			resolvedId: importSource
+		};
+		if (!resolved?.resolvedId && isVueSfcSource(importSource) && importSource.startsWith(".")) resolved = {
+			...resolved ?? {},
+			resolvedId: path.resolve(path.dirname(filename), importSource)
+		};
+		const componentMeta = await resolveVueSfcStaticComponentMeta(resolved?.resolvedId, {
+			cache: compileOptions?.componentMetaCache,
+			warn: autoUsingComponents?.warn ?? compileOptions?.warn
+		});
+		return {
+			localName,
+			importSource,
+			resolved,
+			componentMeta,
+			templateTags
+		};
+	}));
+	for (const { localName, importSource, resolved, componentMeta, templateTags } of resolvedComponents) {
+		if (resolved?.from) {
+			for (const tag of templateTags) result.autoUsingComponentsMap[tag] = resolved.from;
+			result.autoComponentMeta[localName] = resolved.from;
+		}
+		if (isVueSfcSource(importSource) || isWevuSfcComponent(resolved)) {
+			result.wevuComponentTags.add(localName);
+			result.wevuComponentTags.add(normalizeTemplateTagName(localName));
+		}
+		registerComponentName(result, localName, componentMeta.componentName);
+		for (const tag of templateTags) registerComponentName(result, tag, componentMeta.componentName);
+		registerMiniProgramComponentTag(result, localName, componentMeta.isMiniProgramComponent);
+		for (const tag of templateTags) registerMiniProgramComponentTag(result, tag, componentMeta.isMiniProgramComponent);
+	}
+}
 async function collectScriptSetupUsingComponents(options) {
 	const { descriptor, descriptorForCompile, filename, compileOptions, autoUsingComponents, templateComponentNames, templateTagsByComponentName, result } = options;
 	if (!descriptor.scriptSetup || !descriptor.template) return;
@@ -10140,49 +10215,89 @@ async function collectScriptSetupUsingComponents(options) {
 				}
 			}
 		} });
-		const resolvedComponents = await Promise.all(pending.map(async ({ localName, importSource, importedName, kind, templateTags }) => {
-			let resolved = autoUsingComponents?.resolveUsingComponentPath ? normalizeResolvedUsingComponent(await autoUsingComponents.resolveUsingComponentPath(importSource, filename, {
-				localName,
-				importedName,
-				kind
-			})) : void 0;
-			if (!resolved?.from && importSource.startsWith("/")) resolved = {
-				from: removeExtensionDeep(importSource),
-				resolvedId: importSource
-			};
-			if (!resolved?.resolvedId && isVueSfcSource(importSource) && importSource.startsWith(".")) resolved = {
-				...resolved ?? {},
-				resolvedId: path.resolve(path.dirname(filename), importSource)
-			};
-			const componentMeta = await resolveVueSfcStaticComponentMeta(resolved?.resolvedId, {
-				cache: compileOptions?.componentMetaCache,
-				warn: autoUsingComponents?.warn ?? compileOptions?.warn
-			});
-			return {
-				localName,
-				importSource,
-				resolved,
-				componentMeta,
-				templateTags
-			};
-		}));
-		for (const { localName, importSource, resolved, componentMeta, templateTags } of resolvedComponents) {
-			if (resolved?.from) {
-				for (const tag of templateTags) result.autoUsingComponentsMap[tag] = resolved.from;
-				result.autoComponentMeta[localName] = resolved.from;
-			}
-			if (isVueSfcSource(importSource) || isWevuSfcComponent(resolved)) {
-				result.wevuComponentTags.add(localName);
-				result.wevuComponentTags.add(normalizeTemplateTagName(localName));
+		await resolveScriptComponentRegistrations({
+			pending,
+			filename,
+			compileOptions,
+			autoUsingComponents,
+			result
+		});
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		autoUsingComponents?.warn?.(`[Vue 编译] 解析 ${filename} 的 <script setup> 导入失败：${message}`);
+	}
+}
+function getExportDefaultObject(scriptAst) {
+	let options;
+	traverse(scriptAst, { ExportDefaultDeclaration(path) {
+		const declaration = path.node.declaration;
+		if (t.isObjectExpression(declaration)) options = declaration;
+		else if (t.isCallExpression(declaration) && t.isObjectExpression(declaration.arguments[0])) options = declaration.arguments[0];
+		path.stop();
+	} });
+	return options;
+}
+function getObjectProperty(node, keyName) {
+	for (const property of node.properties) {
+		if (!t.isObjectProperty(property) || property.computed) continue;
+		if (t.isIdentifier(property.key) ? property.key.name === keyName : t.isStringLiteral(property.key) && property.key.value === keyName) return property;
+	}
+}
+function getComponentRegistrationName(property) {
+	if (t.isIdentifier(property.key)) return property.key.name;
+	return t.isStringLiteral(property.key) ? property.key.value : void 0;
+}
+async function collectOptionsApiUsingComponents(options) {
+	const { descriptor, filename, compileOptions, autoUsingComponents, templateComponentNames, templateTagsByComponentName, result } = options;
+	if (!descriptor.script || !descriptor.template || !templateComponentNames?.size) return;
+	try {
+		const ast = parse$3(descriptor.script.content, BABEL_TS_MODULE_PARSER_OPTIONS);
+		const imports = /* @__PURE__ */ new Map();
+		traverse(ast, { ImportDeclaration(path) {
+			if (path.node.importKind === "type" || !t.isStringLiteral(path.node.source)) return;
+			for (const specifier of path.node.specifiers) {
+				if ("importKind" in specifier && specifier.importKind === "type") continue;
+				if (!t.isIdentifier(specifier.local)) continue;
+				if (t.isImportDefaultSpecifier(specifier)) imports.set(specifier.local.name, {
+					importSource: path.node.source.value,
+					importedName: "default",
+					kind: "default"
+				});
+				else if (t.isImportSpecifier(specifier)) {
+					const importedName = t.isIdentifier(specifier.imported) ? specifier.imported.name : t.isStringLiteral(specifier.imported) ? specifier.imported.value : void 0;
+					imports.set(specifier.local.name, {
+						importSource: path.node.source.value,
+						importedName,
+						kind: "named"
+					});
+				}
 			}
-			registerComponentName(result, localName, componentMeta.componentName);
-			for (const tag of templateTags) registerComponentName(result, tag, componentMeta.componentName);
-			registerMiniProgramComponentTag(result, localName, componentMeta.isMiniProgramComponent);
-			for (const tag of templateTags) registerMiniProgramComponentTag(result, tag, componentMeta.isMiniProgramComponent);
+		} });
+		const componentOptions = getExportDefaultObject(ast);
+		const componentsProperty = componentOptions && getObjectProperty(componentOptions, "components");
+		if (!componentsProperty || !t.isObjectExpression(componentsProperty.value)) return;
+		const pending = [];
+		for (const property of componentsProperty.value.properties) {
+			if (!t.isObjectProperty(property) || !t.isIdentifier(property.value)) continue;
+			const registrationName = getComponentRegistrationName(property);
+			const imported = imports.get(property.value.name);
+			if (!registrationName || !imported || !templateComponentNames.has(registrationName)) continue;
+			pending.push({
+				localName: property.value.name,
+				...imported,
+				templateTags: [...templateTagsByComponentName?.get(registrationName) ?? [registrationName]]
+			});
 		}
+		await resolveScriptComponentRegistrations({
+			pending,
+			filename,
+			compileOptions,
+			autoUsingComponents,
+			result
+		});
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
-		autoUsingComponents?.warn?.(`[Vue 编译] 解析 ${filename} 的 <script setup> 导入失败：${message}`);
+		autoUsingComponents?.warn?.(`[Vue 编译] 解析 ${filename} 的 Options API 局部组件失败：${message}`);
 	}
 }
 async function collectAutoImportWevuComponents(options) {
@@ -10224,27 +10339,39 @@ async function collectAutoImportWevuComponents(options) {
 async function collectComponentSourceInfo(options) {
 	const result = createComponentSourceInfo();
 	const templateComponentTagInfo = options.descriptor.template ? collectTemplateComponentTagInfo(options.descriptor.template.content, options.filename, options.autoUsingComponents?.warn ?? options.autoImportTags?.warn ?? options.compileOptions?.warn) : void 0;
-	const scriptSetupResult = createComponentSourceInfo();
+	const scriptImportResult = createComponentSourceInfo();
 	const autoImportResult = createComponentSourceInfo();
-	await Promise.all([collectScriptSetupUsingComponents({
-		descriptor: options.descriptor,
-		descriptorForCompile: options.descriptorForCompile,
-		filename: options.filename,
-		compileOptions: options.compileOptions,
-		autoUsingComponents: options.autoUsingComponents,
-		templateComponentNames: templateComponentTagInfo?.componentNames,
-		templateTagsByComponentName: templateComponentTagInfo?.tagsByComponentName,
-		result: scriptSetupResult
-	}), collectAutoImportWevuComponents({
-		descriptor: options.descriptor,
-		filename: options.filename,
-		compileOptions: options.compileOptions,
-		autoImportTags: options.autoImportTags,
-		templateAutoImportTags: templateComponentTagInfo?.autoImportTags,
-		warn: options.compileOptions?.warn,
-		result: autoImportResult
-	})]);
-	mergeComponentSourceInfo(result, scriptSetupResult);
+	await Promise.all([
+		collectScriptSetupUsingComponents({
+			descriptor: options.descriptor,
+			descriptorForCompile: options.descriptorForCompile,
+			filename: options.filename,
+			compileOptions: options.compileOptions,
+			autoUsingComponents: options.autoUsingComponents,
+			templateComponentNames: templateComponentTagInfo?.componentNames,
+			templateTagsByComponentName: templateComponentTagInfo?.tagsByComponentName,
+			result: scriptImportResult
+		}),
+		collectOptionsApiUsingComponents({
+			descriptor: options.descriptor,
+			filename: options.filename,
+			compileOptions: options.compileOptions,
+			autoUsingComponents: options.autoUsingComponents,
+			templateComponentNames: templateComponentTagInfo?.componentNames,
+			templateTagsByComponentName: templateComponentTagInfo?.tagsByComponentName,
+			result: scriptImportResult
+		}),
+		collectAutoImportWevuComponents({
+			descriptor: options.descriptor,
+			filename: options.filename,
+			compileOptions: options.compileOptions,
+			autoImportTags: options.autoImportTags,
+			templateAutoImportTags: templateComponentTagInfo?.autoImportTags,
+			warn: options.compileOptions?.warn,
+			result: autoImportResult
+		})
+	]);
+	mergeComponentSourceInfo(result, scriptImportResult);
 	mergeComponentSourceInfo(result, autoImportResult);
 	return result;
 }
@@ -11348,7 +11475,7 @@ async function compileVueFile(source, filename, options) {
 		...parsed.meta,
 		styleBlocks: parsed.descriptor.styles
 	} };
-	const autoUsingComponents = options?.autoUsingComponents?.enabled && parsed.descriptor.scriptSetup && parsed.descriptor.template && options.autoUsingComponents.resolveUsingComponentPath ? options.autoUsingComponents : void 0;
+	const autoUsingComponents = options?.autoUsingComponents?.enabled && (parsed.descriptor.scriptSetup || parsed.descriptor.script) && parsed.descriptor.template && options.autoUsingComponents.resolveUsingComponentPath ? options.autoUsingComponents : void 0;
 	const autoImportTags = options?.autoImportTags?.enabled && parsed.descriptor.template && options.autoImportTags.resolveUsingComponent ? options.autoImportTags : void 0;
 	const componentSourceInfo = await collectComponentSourceInfo({
 		descriptor: parsed.descriptor,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.20.3",
+  "version": "6.20.5",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -47,7 +47,7 @@
     "@vue/compiler-dom": "^3.5.41",
     "comment-json": "^5.0.0",
     "lru-cache": "^11.5.2",
-    "magic-string": "^1.2.0",
+    "magic-string": "^1.2.2",
     "merge": "^2.1.1",
     "pathe": "^2.0.3",
     "postcss": "^8.5.26",
@@ -55,8 +55,8 @@
     "vue": "^3.5.41",
     "@weapp-core/constants": "0.1.17",
     "@weapp-core/shared": "3.1.1",
-    "@weapp-vite/ast": "6.20.3",
-    "rolldown-require": "2.0.25"
+    "@weapp-vite/ast": "6.20.5",
+    "rolldown-require": "2.0.26"
   },
   "publishConfig": {
     "access": "public",