@wevu/compiler 6.6.16 → 6.7.1

package/dist/index.mjs

@@ -756,9 +756,17 @@ function collectTopLevelReferencedNames(path) {
 		if (binding.scope?.block?.type === "Program") names.add(name);
 	};
 	addIfTopLevelReferenced(path);
-	path.traverse({ Identifier(p) {
-		addIfTopLevelReferenced(p);
-	} });
+	path.traverse({
+		Function(p) {
+			if (p.node !== path.node) p.skip();
+		},
+		Class(p) {
+			if (p.node !== path.node) p.skip();
+		},
+		Identifier(p) {
+			addIfTopLevelReferenced(p);
+		}
+	});
 	return names;
 }
 function collectKeptStatementPaths(programPath, macroStatements) {
@@ -2658,11 +2666,30 @@ function buildInlineMapExpression(inlineExpressions) {
 	});
 	return t.objectExpression(entries);
 }
+function buildMethodsMergeFromSpreadSources(componentExpr, inlineMapExpr) {
+	const spreadSources = [];
+	for (const prop of componentExpr.properties) {
+		if (!t.isSpreadElement(prop) || !t.isExpression(prop.argument)) continue;
+		const methodsAccess = t.optionalMemberExpression(t.cloneNode(prop.argument), t.identifier("methods"), false, true);
+		spreadSources.push(t.logicalExpression("||", methodsAccess, t.objectExpression([])));
+	}
+	if (!spreadSources.length) return null;
+	return t.callExpression(t.memberExpression(t.identifier("Object"), t.identifier("assign")), [
+		t.objectExpression([]),
+		...spreadSources,
+		t.objectExpression([t.objectProperty(createStaticObjectKey("__weapp_vite_inline_map"), inlineMapExpr)])
+	]);
+}
 function injectInlineExpressions(componentExpr, inlineExpressions) {
 	if (!inlineExpressions.length) return false;
 	const inlineMapExpr = buildInlineMapExpression(inlineExpressions);
 	const methodsProp = getObjectPropertyByKey$1(componentExpr, "methods");
 	if (!methodsProp) {
+		const mergedMethods = buildMethodsMergeFromSpreadSources(componentExpr, inlineMapExpr);
+		if (mergedMethods) {
+			componentExpr.properties.push(t.objectProperty(createStaticObjectKey("methods"), mergedMethods));
+			return true;
+		}
 		componentExpr.properties.push(t.objectProperty(createStaticObjectKey("methods"), t.objectExpression([t.objectProperty(createStaticObjectKey("__weapp_vite_inline_map"), inlineMapExpr)])));
 		return true;
 	}
@@ -6410,6 +6437,49 @@ function resolveScriptSetupExtension(lang) {
 function isIdentifierLikeKey(key) {
 	return /^[A-Z_$][\w$]*$/i.test(key);
 }
+const SERIALIZABLE_NATIVE_FUNCTIONS = new Map([
+	[String, "String"],
+	[Number, "Number"],
+	[Boolean, "Boolean"],
+	[Object, "Object"],
+	[Array, "Array"],
+	[Function, "Function"],
+	[Date, "Date"],
+	[RegExp, "RegExp"],
+	[Map, "Map"],
+	[Set, "Set"],
+	[WeakMap, "WeakMap"],
+	[WeakSet, "WeakSet"],
+	[Promise, "Promise"]
+]);
+function isParsableFunctionExpressionSource(source) {
+	try {
+		parse$2(`(${source})`, BABEL_TS_MODULE_PARSER_OPTIONS);
+		return true;
+	} catch {
+		return false;
+	}
+}
+function tryConvertObjectMethodSourceToFunctionExpression(source) {
+	try {
+		const statement = parse$2(`({ ${source} })`, BABEL_TS_MODULE_PARSER_OPTIONS).program.body[0];
+		if (!statement || !t.isExpressionStatement(statement) || !t.isObjectExpression(statement.expression)) return null;
+		const firstProperty = statement.expression.properties[0];
+		if (!firstProperty) return null;
+		if (t.isObjectMethod(firstProperty)) {
+			const functionName = t.isIdentifier(firstProperty.key) ? t.identifier(firstProperty.key.name) : null;
+			return generate(t.functionExpression(functionName, firstProperty.params, firstProperty.body, firstProperty.generator, firstProperty.async)).code;
+		}
+		if (t.isObjectProperty(firstProperty) && (t.isFunctionExpression(firstProperty.value) || t.isArrowFunctionExpression(firstProperty.value))) return generate(firstProperty.value).code;
+	} catch {}
+	return null;
+}
+function normalizeFunctionSourceToExpression(source) {
+	if (isParsableFunctionExpressionSource(source)) return source;
+	const converted = tryConvertObjectMethodSourceToFunctionExpression(source);
+	if (converted && isParsableFunctionExpressionSource(converted)) return converted;
+	throw new Error("defineOptions 的参数中包含无法序列化的函数值。");
+}
 function serializeStaticValueToExpression(value, seen = /* @__PURE__ */ new WeakSet()) {
 	if (value === null) return "null";
 	if (value === void 0) return "undefined";
@@ -6427,8 +6497,12 @@ function serializeStaticValueToExpression(value, seen = /* @__PURE__ */ new Weak
 	if (valueType === "symbol") throw new Error("defineOptions 的参数中不支持 Symbol 值。");
 	if (valueType === "function") {
 		const source = Function.prototype.toString.call(value);
-		if (source.includes("[native code]")) throw new Error("defineOptions 的参数中不支持原生函数值。");
-		return `(${source})`;
+		if (source.includes("[native code]")) {
+			const nativeLiteral = SERIALIZABLE_NATIVE_FUNCTIONS.get(value);
+			if (nativeLiteral) return nativeLiteral;
+			throw new Error("defineOptions 的参数中不支持原生函数值。");
+		}
+		return `(${normalizeFunctionSourceToExpression(source)})`;
 	}
 	if (value instanceof Date) return `new Date(${JSON.stringify(value.toISOString())})`;
 	if (value instanceof RegExp) return value.toString();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "6.6.16",
+  "version": "6.7.1",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -46,7 +46,7 @@
     "@babel/traverse": "^7.29.0",
     "@babel/types": "^7.29.0",
     "@vue/compiler-core": "^3.5.29",
-    "comment-json": "^4.5.1",
+    "comment-json": "^4.6.2",
     "fs-extra": "^11.3.3",
     "lru-cache": "^11.2.6",
     "magic-string": "^0.30.21",