@wevu/compiler 6.16.47 → 6.17.1

package/dist/index.mjs

@@ -242,7 +242,7 @@ function resolveWevuInternalImportModuleId(apiName) {
 }
 //#endregion
 //#region src/utils/vueTemplateTags.ts
-const RESERVED_VUE_COMPONENT_TAGS = new Set([
+const RESERVED_VUE_COMPONENT_TAGS = /* @__PURE__ */ new Set([
 	"template",
 	"slot",
 	"component",
@@ -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;
@@ -614,7 +618,7 @@ const __weapp_defineThemeJson = (config) => (__weapp_json_macro_values.push(conf
 }
 //#endregion
 //#region src/plugins/vue/transform/jsonMacros/parse.ts
-const JSON_MACROS = new Set([
+const JSON_MACROS = /* @__PURE__ */ new Set([
 	"defineAppJson",
 	"definePageJson",
 	"defineComponentJson",
@@ -1294,7 +1298,7 @@ function collectWevuPageFeatureFlagsFromCode(code, options) {
 }
 //#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 WEVU_FACTORY_NAMES = /* @__PURE__ */ new Set([WE_VU_RUNTIME_APIS.defineComponent, WE_VU_RUNTIME_APIS.createWevuComponent]);
 const REGEXP_META_CHARS_RE = /[.*+?^${}()|[\]\\]/g;
 function escapeRegExp(value) {
 	return value.replace(REGEXP_META_CHARS_RE, "\\$&");
@@ -1517,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") {
@@ -1562,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") {
@@ -1600,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)) {
@@ -1612,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;
@@ -1768,7 +1786,7 @@ async function collectWevuFeaturesFromSetupReachableImports(pageModule, setupFn,
 async function collectWevuFeaturesFromCodeReachableImports(code, options) {
 	const { optionsObjects, module } = collectTargetOptionsObjectsFromCode(code, options.id, { astEngine: options.astEngine });
 	if (!optionsObjects.length) return /* @__PURE__ */ new Set();
-	const moduleCache = new Map([[options.id, module]]);
+	const moduleCache = /* @__PURE__ */ new Map([[options.id, module]]);
 	const enabled = /* @__PURE__ */ new Set();
 	for (const optionsObject of optionsObjects) {
 		const setupFn = getSetupFunctionFromOptionsObject(optionsObject);
@@ -2144,7 +2162,7 @@ function ensureRuntimeImport(program, importedName, localName = importedName) {
 }
 //#endregion
 //#region src/plugins/vue/transform/transformScript/imports.ts
-const INTERNAL_RUNTIME_VALUE_EXPORTS = new Set([
+const INTERNAL_RUNTIME_VALUE_EXPORTS = /* @__PURE__ */ new Set([
 	"addMutationRecorder",
 	"batch",
 	"computed",
@@ -2314,7 +2332,7 @@ function splitWevuNamedImportsToInternalRuntime(path, program, state) {
 function createImportVisitors(program, state) {
 	return { ImportDeclaration(path) {
 		if (path.node.source.value === "vue") {
-			const movedVueRuntimeAPIs = new Set([
+			const movedVueRuntimeAPIs = /* @__PURE__ */ new Set([
 				"useAttrs",
 				"useSlots",
 				"useModel",
@@ -2475,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) {
@@ -2506,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" })) {
@@ -2572,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) {
@@ -3444,7 +3465,7 @@ function hasStaticPropertyInComponentExpression(componentExpr, keyName, program)
 		if (t.isObjectExpression(expr) && hasStaticPropertyWithSpreads(expr, keyName, program)) return true;
 		if (t.isIdentifier(expr)) {
 			const resolved = resolveObjectExpressionFromProgram(program, expr.name);
-			if (resolved && hasStaticPropertyWithSpreads(resolved, keyName, program, new Set([expr.name]))) return true;
+			if (resolved && hasStaticPropertyWithSpreads(resolved, keyName, program, /* @__PURE__ */ new Set([expr.name]))) return true;
 		}
 	}
 	return false;
@@ -3520,7 +3541,7 @@ function transformScript(source, options) {
 	const warn = resolveWarnHandler(options?.warn);
 	const state = {
 		transformed: false,
-		defineComponentAliases: new Set([WE_VU_RUNTIME_APIS.defineComponent, "_defineComponent"]),
+		defineComponentAliases: /* @__PURE__ */ new Set([WE_VU_RUNTIME_APIS.defineComponent, "_defineComponent"]),
 		defineComponentDecls: /* @__PURE__ */ new Map(),
 		defaultExportPath: null
 	};
@@ -3778,7 +3799,7 @@ function stripRenderOptionFromScript(source, filename, warn) {
 	} catch {
 		return source;
 	}
-	const defineComponentAliases = new Set(["defineComponent", "_defineComponent"]);
+	const defineComponentAliases = /* @__PURE__ */ new Set(["defineComponent", "_defineComponent"]);
 	const defineComponentDecls = /* @__PURE__ */ new Map();
 	let removedRender = false;
 	let removedJsonMacroImport = false;
@@ -4859,7 +4880,7 @@ function normalizeFsResolvedId(id, options) {
 }
 //#endregion
 //#region src/plugins/utils/vueSfcBlockSrc.ts
-const SCRIPT_LANG_EXT = new Map([
+const SCRIPT_LANG_EXT = /* @__PURE__ */ new Map([
 	[".ts", "ts"],
 	[".tsx", "tsx"],
 	[".js", "js"],
@@ -4867,7 +4888,7 @@ const SCRIPT_LANG_EXT = new Map([
 	[".mjs", "js"],
 	[".cjs", "js"]
 ]);
-const STYLE_LANG_EXT = new Map([
+const STYLE_LANG_EXT = /* @__PURE__ */ new Map([
 	[".css", "css"],
 	[".scss", "scss"],
 	[".sass", "sass"],
@@ -4875,7 +4896,7 @@ const STYLE_LANG_EXT = new Map([
 	[".styl", "styl"],
 	[".stylus", "styl"]
 ]);
-const TEMPLATE_LANG_EXT = new Map([
+const TEMPLATE_LANG_EXT = /* @__PURE__ */ new Map([
 	[".html", "html"],
 	[".htm", "html"],
 	[".pug", "pug"],
@@ -5794,7 +5815,7 @@ function findSlotDirective(node) {
 }
 //#endregion
 //#region src/plugins/vue/compiler/template/expression/scopedSlot.ts
-const SCOPED_SLOT_GLOBALS = new Set([
+const SCOPED_SLOT_GLOBALS = /* @__PURE__ */ new Set([
 	"Math",
 	"Number",
 	"Date",
@@ -6016,7 +6037,7 @@ function normalizeStyleBindingExpression(exp, context) {
 }
 //#endregion
 //#region src/plugins/vue/compiler/template/expression/inline.ts
-const INLINE_GLOBALS = new Set([
+const INLINE_GLOBALS = /* @__PURE__ */ new Set([
 	"Math",
 	"Number",
 	"Date",
@@ -6063,7 +6084,7 @@ const INLINE_GLOBALS = new Set([
 ]);
 const IDENTIFIER_RE$2 = /^[A-Z_$][\w$]*$/i;
 const SIMPLE_PATH_RE = /^[A-Z_$][\w$]*(?:\.[A-Z_$][\w$]*)*$/i;
-const SCRIPT_SETUP_REF_BINDINGS = new Set(["setup-ref", "setup-maybe-ref"]);
+const SCRIPT_SETUP_REF_BINDINGS = /* @__PURE__ */ new Set(["setup-ref", "setup-maybe-ref"]);
 function createMemberAccess$1(target, prop) {
 	if (IDENTIFIER_RE$2.test(prop)) return t.memberExpression(t.identifier(target), t.identifier(prop));
 	return t.memberExpression(t.identifier(target), t.stringLiteral(prop), true);
@@ -6244,7 +6265,7 @@ function registerInlineExpression(exp, context) {
 }
 //#endregion
 //#region src/plugins/vue/compiler/template/expression/js.ts
-const JS_RUNTIME_GLOBALS = new Set([
+const JS_RUNTIME_GLOBALS = /* @__PURE__ */ new Set([
 	"Math",
 	"Number",
 	"Date",
@@ -6696,7 +6717,7 @@ const SIMPLE_IDENTIFIER_RE$1 = /^[A-Z_$][\w$]*$/i;
 const SIMPLE_MEMBER_PATH_RE = /^[A-Z_$][\w$]*(?:\.[A-Z_$][\w$]*)*$/i;
 const isSimpleIdentifier = (value) => SIMPLE_IDENTIFIER_RE$1.test(value);
 const isSimpleMemberPath = (value) => SIMPLE_MEMBER_PATH_RE.test(value);
-const COMPONENT_NON_PROP_BINDINGS = new Set([
+const COMPONENT_NON_PROP_BINDINGS = /* @__PURE__ */ new Set([
 	"class",
 	"style",
 	"id",
@@ -6802,7 +6823,7 @@ function transformBindDirective(node, context, forInfo, options) {
 //#region src/plugins/vue/compiler/template/directives/custom.ts
 const IDENTIFIER_RE$1 = /^[a-z_$][\w$]*$/i;
 function transformCustomDirective(name, exp, arg, context) {
-	if (new Set([
+	if ((/* @__PURE__ */ new Set([
 		"bind",
 		"on",
 		"model",
@@ -6816,7 +6837,7 @@ function transformCustomDirective(name, exp, arg, context) {
 		"slot",
 		"cloak",
 		"once"
-	]).has(name)) return null;
+	])).has(name)) return null;
 	const dataAttrName = `data-v-${name}`;
 	if (exp && exp.type === NodeTypes.SIMPLE_EXPRESSION) {
 		const expValue = normalizeWxmlExpressionWithContext(exp.content, context);
@@ -6839,7 +6860,7 @@ function getElementType(element) {
 const QUOTE_RE$1 = /"/g;
 const CAMELIZE_RE = /-([a-z0-9])/gi;
 const IDENTIFIER_RE = /^[A-Z_$][\w$]*$/i;
-const NATIVE_MODEL_TAGS = new Set([
+const NATIVE_MODEL_TAGS = /* @__PURE__ */ new Set([
 	"input",
 	"textarea",
 	"select",
@@ -8274,7 +8295,7 @@ function transformNode(node, context) {
 }
 //#endregion
 //#region src/plugins/vue/compiler/template.ts
-const HTML_VOID_TAGS = new Set([
+const HTML_VOID_TAGS = /* @__PURE__ */ new Set([
 	"area",
 	"base",
 	"br",
@@ -8834,7 +8855,7 @@ function isIdentifierLikeKey(key) {
 function getObjectTag(value) {
 	return OBJECT_TO_STRING.call(value);
 }
-const SERIALIZABLE_NATIVE_FUNCTIONS = new Map([
+const SERIALIZABLE_NATIVE_FUNCTIONS = /* @__PURE__ */ new Map([
 	[String, "String"],
 	[Number, "Number"],
 	[Boolean, "Boolean"],
@@ -9245,7 +9266,7 @@ async function parseVueFile(source, filename, options) {
 				const resolvedNext = await resolveSfcBlockSrc(nextDescriptor, filename, options.sfcSrc);
 				descriptorForCompile = resolvedNext.descriptor;
 				if (resolvedNext.deps.length) {
-					sfcSrcDeps = [...new Set([...sfcSrcDeps ?? [], ...resolvedNext.deps])];
+					sfcSrcDeps = [.../* @__PURE__ */ new Set([...sfcSrcDeps ?? [], ...resolvedNext.deps])];
 					meta.sfcSrcDeps = sfcSrcDeps;
 				}
 			} else descriptorForCompile = nextDescriptor;
@@ -9282,7 +9303,7 @@ async function parseVueFile(source, filename, options) {
 				const resolvedNext = await resolveSfcBlockSrc(nextDescriptor, filename, options.sfcSrc);
 				descriptorForCompile = resolvedNext.descriptor;
 				if (resolvedNext.deps.length) {
-					sfcSrcDeps = [...new Set([...sfcSrcDeps ?? [], ...resolvedNext.deps])];
+					sfcSrcDeps = [.../* @__PURE__ */ new Set([...sfcSrcDeps ?? [], ...resolvedNext.deps])];
 					meta.sfcSrcDeps = sfcSrcDeps;
 				}
 			} else descriptorForCompile = nextDescriptor;
@@ -9316,7 +9337,7 @@ function composeSourceMaps(transformedMap, originalMap) {
 }
 //#endregion
 //#region src/plugins/vue/transform/compileVueFile/reservedProps.ts
-const RESERVED_SCRIPT_SETUP_PROPS = new Set([
+const RESERVED_SCRIPT_SETUP_PROPS = /* @__PURE__ */ new Set([
 	"id",
 	"class",
 	"slot"
@@ -9402,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();
@@ -9454,7 +9475,7 @@ function resolveScriptSetupPropsDerivedKeys(bindings) {
 }
 function collectScriptSetupReturnInfo(scriptCode) {
 	const keys = /* @__PURE__ */ new Set();
-	const propsObjectAliases = new Set(["__props"]);
+	const propsObjectAliases = /* @__PURE__ */ new Set(["__props"]);
 	const propsRefsAliases = /* @__PURE__ */ new Set();
 	const destructuredPropsKeys = /* @__PURE__ */ new Set();
 	const addObjectPatternKeys = (pattern) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.16.47",
+  "version": "6.17.1",
   "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.47",
+    "@weapp-vite/ast": "6.17.1",
     "rolldown-require": "2.0.19"
   },
   "publishConfig": {