@wevu/compiler 6.16.46 → 6.17.0

package/dist/index.d.mts

@@ -1,8 +1,8 @@
 import { MpPlatform } from "@weapp-core/shared";
 import * as t from "@weapp-vite/ast/babelTypes";
 import { Expression } from "@weapp-vite/ast/babelTypes";
-import { AstEngineName, AstEngineName as AstEngineName$1 } from "@weapp-vite/ast";
 import { LRUCache } from "lru-cache";
+import { AstEngineName, AstEngineName as AstEngineName$1 } from "@weapp-vite/ast";
 import { SFCBlock, SFCDescriptor, SFCParseResult, SFCStyleBlock } from "vue/compiler-sfc";
 //#region src/auto-import-components/builtin.d.ts
 /**
@@ -865,10 +865,14 @@ type ImportBinding = {
   kind: 'namespace';
   source: string;
 };
+type ModuleAst = t.File | {
+  type: string;
+  [key: string]: any;
+};
 interface ModuleAnalysis {
   id: string;
   engine: AstEngineName$1;
-  ast?: t.File;
+  ast?: ModuleAst;
   wevuNamedHookLocals: Map<string, WevuPageFeatureFlag>;
   wevuNamespaceLocals: Set<string>;
   importedBindings: Map<string, ImportBinding>;
@@ -877,10 +881,15 @@ interface ModuleAnalysis {
 }
 //#endregion
 //#region src/plugins/wevu/pageFeatures/optionsObjects.d.ts
+type OptionsObject = t.ObjectExpression | {
+  type: 'ObjectExpression';
+  properties: any[];
+  [key: string]: any;
+};
 declare function collectTargetOptionsObjectsFromCode(code: string, moduleId: string, options?: {
   astEngine?: AstEngineName$1;
 }): {
-  optionsObjects: t.ObjectExpression[];
+  optionsObjects: OptionsObject[];
   module: ModuleAnalysis;
 };
 //#endregion

package/dist/index.mjs

@@ -11,8 +11,8 @@ import { BABEL_TS_MODULE_PARSER_OPTIONS, generate, parse as parse$3, parseJsLike
 import fs from "node:fs";
 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 { collectJsxImportedComponentsAndDefaultExportFromBabelAst, collectJsxTemplateTagsFromBabelExpression, getRenderPropertyFromComponentOptions, parseJsLikeWithEngine, resolveRenderExpressionFromComponentOptions, toStaticObjectKey, unwrapTypeScriptExpression } from "@weapp-vite/ast";
 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";
@@ -490,6 +490,10 @@ function rewriteJsLikeImportsForTempDir(source, fromDir, tempDir) {
 			const sourceNode = p.node?.source;
 			if (sourceNode && t.isStringLiteral(sourceNode)) rewriteLiteral(sourceNode, sourceNode.value);
 		},
+		ImportExpression(p) {
+			const sourceNode = p.node?.source;
+			if (sourceNode && t.isStringLiteral(sourceNode)) rewriteLiteral(sourceNode, sourceNode.value);
+		},
 		CallExpression(p) {
 			const callee = p.node?.callee;
 			if (!callee) return;
@@ -918,34 +922,6 @@ function injectWevuPageFeatureFlagsIntoOptionsObject(optionsObject, enabled) {
 	return changed;
 }
 //#endregion
-//#region src/ast/operations/pageFeatures.ts
-function collectWithBabel(code) {
-	return collectWevuPageFeatureFlags(parseJsLike(code));
-}
-function collectWithOxc(code) {
-	const enabled = /* @__PURE__ */ new Set();
-	for (const moduleId of WE_VU_RUNTIME_MODULE_IDS) {
-		const flags = collectFeatureFlagsFromCode(code, {
-			astEngine: "oxc",
-			moduleId,
-			hookToFeature: WE_VU_PAGE_HOOK_TO_FEATURE
-		});
-		for (const flag of flags) enabled.add(flag);
-	}
-	return enabled;
-}
-/**
-* 从源码中收集 wevu 页面特性。
-*/
-function collectWevuPageFeatureFlagsFromCode(code, options) {
-	const engine = options?.astEngine ?? "babel";
-	try {
-		return engine === "oxc" ? collectWithOxc(code) : collectWithBabel(code);
-	} catch {
-		return /* @__PURE__ */ new Set();
-	}
-}
-//#endregion
 //#region src/plugins/wevu/pageFeatures/moduleAnalysis/shared.ts
 function createEmptyModuleAnalysis(id, engine) {
 	return {
@@ -1231,6 +1207,7 @@ function createModuleAnalysisWithOxc(id, code) {
 	return {
 		id,
 		engine: "oxc",
+		ast,
 		wevuNamedHookLocals,
 		wevuNamespaceLocals,
 		importedBindings,
@@ -1267,6 +1244,59 @@ function getOrCreateExternalModuleAnalysis(moduleId, code, options) {
 	return analysis;
 }
 //#endregion
+//#region src/ast/operations/pageFeatures.ts
+const CALL_EXPRESSION_TEXT_RE = /\b[a-z_$][\w$]*(?:\s*<[^(){};]+>)?\s*(?:\?\.\s*)?\(/i;
+const WEVU_PAGE_HOOK_NAMES = Object.keys(WE_VU_PAGE_HOOK_TO_FEATURE);
+function mayContainWevuPageFeatureHints(code) {
+	return WE_VU_RUNTIME_MODULE_IDS.some((moduleId) => code.includes(moduleId)) && CALL_EXPRESSION_TEXT_RE.test(code) && WEVU_PAGE_HOOK_NAMES.some((hookName) => code.includes(hookName));
+}
+function collectWithBabel(code) {
+	return collectWevuPageFeatureFlags(parseJsLike(code));
+}
+function collectWithOxc(code) {
+	const enabled = /* @__PURE__ */ new Set();
+	const module = createModuleAnalysisFromCode("<inline>", code, { astEngine: "oxc" });
+	if (module.wevuNamedHookLocals.size === 0 && module.wevuNamespaceLocals.size === 0) return enabled;
+	const visit = (node) => {
+		if (!node) return;
+		if (node.type === "CallExpression") {
+			const callee = node.callee;
+			if (callee?.type === "Identifier") {
+				const matched = module.wevuNamedHookLocals.get(callee.name);
+				if (matched) enabled.add(matched);
+			} else if (callee?.type === "MemberExpression" && !callee.computed && callee.object?.type === "Identifier" && callee.property?.type === "Identifier") {
+				if (module.wevuNamespaceLocals.has(callee.object.name)) {
+					const matched = WE_VU_PAGE_HOOK_TO_FEATURE[callee.property.name];
+					if (matched) enabled.add(matched);
+				}
+			}
+		} else if (node.type === "ChainExpression") {
+			visit(node.expression);
+			return;
+		}
+		for (const value of Object.values(node)) {
+			if (!value) continue;
+			if (Array.isArray(value)) {
+				for (const child of value) if (child && typeof child === "object" && typeof child.type === "string") visit(child);
+			} else if (typeof value === "object" && typeof value.type === "string") visit(value);
+		}
+	};
+	visit(module.ast);
+	return enabled;
+}
+/**
+* 从源码中收集 wevu 页面特性。
+*/
+function collectWevuPageFeatureFlagsFromCode(code, options) {
+	if (!mayContainWevuPageFeatureHints(code)) return /* @__PURE__ */ new Set();
+	const engine = options?.astEngine ?? "babel";
+	try {
+		return engine === "oxc" ? collectWithOxc(code) : collectWithBabel(code);
+	} catch {
+		return /* @__PURE__ */ new Set();
+	}
+}
+//#endregion
 //#region src/plugins/wevu/pageFeatures/optionsObjects.ts
 const WEVU_FACTORY_NAMES = new Set([WE_VU_RUNTIME_APIS.defineComponent, WE_VU_RUNTIME_APIS.createWevuComponent]);
 const REGEXP_META_CHARS_RE = /[.*+?^${}()|[\]\\]/g;
@@ -1311,10 +1341,17 @@ function resolveOptionsObjectFromExpression(node) {
 	}
 	return null;
 }
+function getOxcStaticPropertyName(node) {
+	if (node?.type === "Identifier") return node.name;
+	if ((node?.type === "StringLiteral" || node?.type === "Literal") && typeof node.value === "string") return node.value;
+}
 function getSetupFunctionFromOptionsObject(options) {
 	for (const prop of options.properties) if (t.isObjectProperty(prop) && !prop.computed && isStaticObjectKeyMatch$1(prop.key, "setup")) {
 		if (t.isFunctionExpression(prop.value) || t.isArrowFunctionExpression(prop.value)) return prop.value;
 	} else if (t.isObjectMethod(prop) && !prop.computed && isStaticObjectKeyMatch$1(prop.key, "setup")) return prop;
+	else if (prop?.type === "Property" && !prop.computed && getOxcStaticPropertyName(prop.key) === "setup") {
+		if (prop.value?.type === "FunctionExpression" || prop.value?.type === "ArrowFunctionExpression") return prop.value;
+	}
 	return null;
 }
 function collectTargetOptionsObjectsWithModule(ast, module) {
@@ -1385,6 +1422,69 @@ function collectTargetOptionsObjectsWithModule(ast, module) {
 		module
 	};
 }
+function unwrapOxcTypeLikeExpression(node) {
+	if (node?.type === "TSAsExpression" || node?.type === "TSSatisfiesExpression" || node?.type === "TSNonNullExpression" || node?.type === "TSTypeAssertion" || node?.type === "ParenthesizedExpression") return unwrapOxcTypeLikeExpression(node.expression);
+	return node;
+}
+function getOxcCallExpression(node) {
+	if (node?.type === "ChainExpression") return getOxcCallExpression(node.expression);
+	if (node?.type === "CallExpression") return node;
+	return null;
+}
+function resolveOxcOptionsObjectFromExpression(node, bindings) {
+	const normalized = unwrapOxcTypeLikeExpression(node);
+	if (normalized?.type === "ObjectExpression") return normalized;
+	if (normalized?.type === "Identifier") return bindings.get(normalized.name) ?? null;
+	if (normalized?.type !== "CallExpression") return null;
+	const callee = unwrapOxcTypeLikeExpression(normalized.callee);
+	if (callee?.type !== "MemberExpression" || callee.computed || callee.object?.type !== "Identifier" || callee.object.name !== "Object" || callee.property?.type !== "Identifier" || callee.property.name !== "assign") return null;
+	for (let index = normalized.arguments.length - 1; index >= 0; index -= 1) {
+		const argument = normalized.arguments[index];
+		if (argument?.type === "SpreadElement") continue;
+		const candidate = resolveOxcOptionsObjectFromExpression(argument, bindings);
+		if (candidate) return candidate;
+	}
+	return null;
+}
+function isOxcWevuFactoryCall(call, module) {
+	const callee = unwrapOxcTypeLikeExpression(call.callee);
+	if (callee?.type === "Identifier") {
+		const binding = module.importedBindings.get(callee.name);
+		return binding?.kind === "named" && isWevuRuntimeModuleId(binding.source) && WEVU_FACTORY_NAMES.has(binding.importedName);
+	}
+	if (callee?.type === "MemberExpression" && !callee.computed && callee.object?.type === "Identifier" && callee.property?.type === "Identifier") {
+		const binding = module.importedBindings.get(callee.object.name);
+		return binding?.kind === "namespace" && isWevuRuntimeModuleId(binding.source) && WEVU_FACTORY_NAMES.has(callee.property.name);
+	}
+	return false;
+}
+function collectTargetOptionsObjectsWithOxcModule(ast, module) {
+	const optionsObjects = [];
+	const constObjectBindings = /* @__PURE__ */ new Map();
+	const pendingConstObjectRefs = [];
+	for (const stmt of ast?.body ?? []) {
+		if (stmt?.type === "VariableDeclaration") {
+			for (const decl of stmt.declarations ?? []) if (decl?.id?.type === "Identifier" && decl.init?.type === "ObjectExpression") constObjectBindings.set(decl.id.name, decl.init);
+			continue;
+		}
+		if (stmt?.type !== "ExpressionStatement") continue;
+		const call = getOxcCallExpression(stmt.expression);
+		if (!call || !isOxcWevuFactoryCall(call, module)) continue;
+		const first = call.arguments?.[0];
+		if (!first) continue;
+		const inlineObject = resolveOxcOptionsObjectFromExpression(first, constObjectBindings);
+		if (inlineObject) optionsObjects.push(inlineObject);
+		else if (first.type === "Identifier") pendingConstObjectRefs.push(first.name);
+	}
+	for (const name of pendingConstObjectRefs) {
+		const target = constObjectBindings.get(name);
+		if (target) optionsObjects.push(target);
+	}
+	return {
+		optionsObjects,
+		module
+	};
+}
 function collectTargetOptionsObjects(ast, moduleId) {
 	return collectTargetOptionsObjectsWithModule(ast, createModuleAnalysis(moduleId, ast));
 }
@@ -1403,10 +1503,7 @@ function collectTargetOptionsObjectsFromCode(code, moduleId, options) {
 			optionsObjects: [],
 			module
 		};
-		return {
-			optionsObjects: collectTargetOptionsObjects(parseJsLike(code), moduleId).optionsObjects,
-			module
-		};
+		return collectTargetOptionsObjectsWithOxcModule(module.ast, module);
 	}
 	const module = createModuleAnalysisFromCode(moduleId, code, options);
 	return collectTargetOptionsObjectsWithModule(module.ast, module);
@@ -1424,6 +1521,11 @@ function getCallCalleeName(callee) {
 		object: callee.object.name,
 		property: callee.property.name
 	};
+	if (t.isOptionalMemberExpression(callee) && !callee.computed && t.isIdentifier(callee.object) && t.isIdentifier(callee.property)) return {
+		type: "member",
+		object: callee.object.name,
+		property: callee.property.name
+	};
 	return null;
 }
 function collectCalledBindingsFromFunctionBody(fn, engine = "babel") {
@@ -1469,6 +1571,23 @@ function collectCalledBindingsFromFunctionBody(fn, engine = "babel") {
 }
 //#endregion
 //#region src/plugins/wevu/pageFeatures/reachability/hooks.ts
+function getMemberHookName(callee) {
+	if (t.isMemberExpression(callee) && !callee.computed && t.isIdentifier(callee.object) && t.isIdentifier(callee.property)) return {
+		object: callee.object.name,
+		hook: callee.property.name
+	};
+	if (t.isOptionalMemberExpression(callee) && !callee.computed && t.isIdentifier(callee.object) && t.isIdentifier(callee.property)) return {
+		object: callee.object.name,
+		hook: callee.property.name
+	};
+	return null;
+}
+function addNamespaceHookFeature(module, callee, enabled) {
+	const memberHook = getMemberHookName(callee);
+	if (!memberHook || !module.wevuNamespaceLocals.has(memberHook.object)) return;
+	const matched = WE_VU_PAGE_HOOK_TO_FEATURE[memberHook.hook];
+	if (matched) enabled.add(matched);
+}
 function collectWevuHookCallsInFunctionBody(module, fn) {
 	const enabled = /* @__PURE__ */ new Set();
 	if (module.engine === "oxc") {
@@ -1507,11 +1626,7 @@ function collectWevuHookCallsInFunctionBody(module, fn) {
 				if (matched) enabled.add(matched);
 				return;
 			}
-			if (t.isMemberExpression(callee) && !callee.computed && t.isIdentifier(callee.object) && t.isIdentifier(callee.property)) {
-				if (!module.wevuNamespaceLocals.has(callee.object.name)) return;
-				const matched = WE_VU_PAGE_HOOK_TO_FEATURE[callee.property.name];
-				if (matched) enabled.add(matched);
-			}
+			addNamespaceHookFeature(module, callee, enabled);
 		} else if (t.isOptionalCallExpression(node)) {
 			const callee = node.callee;
 			if (t.isIdentifier(callee)) {
@@ -1519,11 +1634,7 @@ function collectWevuHookCallsInFunctionBody(module, fn) {
 				if (matched) enabled.add(matched);
 				return;
 			}
-			if (t.isMemberExpression(callee) && !callee.computed && t.isIdentifier(callee.object) && t.isIdentifier(callee.property)) {
-				if (!module.wevuNamespaceLocals.has(callee.object.name)) return;
-				const matched = WE_VU_PAGE_HOOK_TO_FEATURE[callee.property.name];
-				if (matched) enabled.add(matched);
-			}
+			addNamespaceHookFeature(module, callee, enabled);
 		}
 	});
 	return enabled;
@@ -2382,6 +2493,18 @@ function stripOptionalFromPattern(pattern) {
 }
 //#endregion
 //#region src/plugins/vue/transform/transformScript/macros/stripTypes.ts
+function stripTypeArguments(node) {
+	let stripped = false;
+	if (node.typeParameters) {
+		node.typeParameters = null;
+		stripped = true;
+	}
+	if (node.typeArguments) {
+		node.typeArguments = null;
+		stripped = true;
+	}
+	return stripped;
+}
 function createStripTypesVisitors(state) {
 	return {
 		ExportNamedDeclaration(path) {
@@ -2413,16 +2536,10 @@ function createStripTypesVisitors(state) {
 					return;
 				}
 			}
-			if (path.node.typeParameters) {
-				path.node.typeParameters = null;
-				state.transformed = true;
-			}
+			if (stripTypeArguments(path.node)) state.transformed = true;
 		},
 		NewExpression(path) {
-			if (path.node.typeParameters) {
-				path.node.typeParameters = null;
-				state.transformed = true;
-			}
+			if (stripTypeArguments(path.node)) state.transformed = true;
 		},
 		ObjectProperty(path) {
 			if (t.isIdentifier(path.node.key, { name: "__name" }) || t.isStringLiteral(path.node.key, { value: "__name" })) {
@@ -2479,10 +2596,7 @@ function createStripTypesVisitors(state) {
 				path.node.returnType = null;
 				state.transformed = true;
 			}
-			if (path.node.typeParameters) {
-				path.node.typeParameters = null;
-				state.transformed = true;
-			}
+			if (stripTypeArguments(path.node)) state.transformed = true;
 			for (const param of path.node.params) if (stripOptionalFromPattern(param)) state.transformed = true;
 		},
 		ClassMethod(path) {
@@ -9309,7 +9423,7 @@ function detectDefinePropsReservedName(scriptSetupCode) {
 				path.stop();
 				return;
 			}
-			const typeParam = path.node.typeParameters?.params?.[0];
+			const typeParam = (path.node.typeParameters ?? path.node.typeArguments)?.params?.[0];
 			if (typePropsContainReservedName(typeParam, typeScope)) {
 				result = { location: getDefinePropsLocation(path.node) };
 				path.stop();

package/package.json

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