@wevu/compiler 0.0.5 → 0.0.7

package/dist/index.d.mts

@@ -319,6 +319,9 @@ declare const CLASS_STYLE_WXS_MODULE = "__weapp_vite";
  * class/style WXS 文件名（不含扩展名）。
  */
 declare const CLASS_STYLE_WXS_FILE = "__weapp_vite_class_style";
+interface ClassStyleWxsSourceOptions {
+  extension?: string;
+}
 /**
  * 构建 class/style WXS 引用标签。
  */
@@ -337,12 +340,13 @@ declare function resolveClassStyleWxsLocation(options: {
 /**
  * 获取内置 class/style WXS 运行时代码。
  */
-declare function getClassStyleWxsSource(): string;
+declare function getClassStyleWxsSource(options?: ClassStyleWxsSourceOptions): string;
 //#endregion
 //#region src/plugins/vue/transform/classStyleComputed.d.ts
 interface ClassStyleHelperNames {
   normalizeClassName: string;
   normalizeStyleName: string;
+  unrefName?: string;
 }
 declare function buildClassStyleComputedCode(bindings: ClassStyleBinding[], helpers: ClassStyleHelperNames): string | null;
 //#endregion

package/dist/index.mjs

@@ -617,23 +617,46 @@ function resolveClassStyleWxsLocation(options) {
 /**
 * 获取内置 class/style WXS 运行时代码。
 */
-function getClassStyleWxsSource() {
-	return [
-		"var objectCtor = ({}).constructor",
-		"var hasOwn = objectCtor && objectCtor.prototype ? objectCtor.prototype.hasOwnProperty : null",
-		"",
+function getClassStyleWxsSource(options = {}) {
+	const isSjs = (options.extension?.startsWith(".") ? options.extension.slice(1) : options.extension) === "sjs";
+	const isArrayFunctionLines = isSjs ? [
 		"function isArray(value) {",
-		"  if (typeof Array !== 'undefined' && Array.isArray) {",
-		"    return Array.isArray(value)",
+		"  if (!toString) {",
+		"    return false",
 		"  }",
-		"  return value && typeof value.length === 'number' && typeof value.splice === 'function'",
-		"}",
+		"  return toString.call(value) === '[object Array]'",
+		"}"
+	] : [
+		"function isArray(value) {",
+		"  if (!value) {",
+		"    return false",
+		"  }",
+		"  if (typeof Array !== 'undefined' && Array.isArray && Array.isArray(value)) {",
+		"    return true",
+		"  }",
+		"  if (toString && toString.call(value) === '[object Array]') {",
+		"    return true",
+		"  }",
+		"  return typeof value.length === 'number' && typeof value.join === 'function'",
+		"}"
+	];
+	const hyphenateUpperCaseLine = isSjs ? "      res += str.charAt(i).toLowerCase()" : "      res += String.fromCharCode(code + 32)";
+	const bodyLines = [
+		"var objectCtor = ({}).constructor",
+		"var objectProto = objectCtor ? objectCtor.prototype : null",
+		"var hasOwn = objectProto ? objectProto.hasOwnProperty : null",
+		"var toString = objectProto ? objectProto.toString : null",
+		"",
+		...isArrayFunctionLines,
 		"",
 		"function getObjectKeys(obj) {",
-		"  if (!objectCtor || !objectCtor.keys) {",
-		"    return null",
+		"  if (objectCtor && objectCtor.keys) {",
+		"    return objectCtor.keys(obj)",
+		"  }",
+		"  if (objectCtor && objectCtor.getOwnPropertyNames) {",
+		"    return objectCtor.getOwnPropertyNames(obj)",
 		"  }",
-		"  return objectCtor.keys(obj)",
+		"  return null",
 		"}",
 		"",
 		"function isWordCharCode(code) {",
@@ -661,7 +684,7 @@ function getClassStyleWxsSource() {
 		"      if (i > 0 && isWordCharCode(str.charCodeAt(i - 1))) {",
 		"        res += '-'",
 		"      }",
-		"      res += String.fromCharCode(code + 32)",
+		hyphenateUpperCaseLine,
 		"      continue",
 		"    }",
 		"    res += str.charAt(i)",
@@ -790,12 +813,24 @@ function getClassStyleWxsSource() {
 		"  }",
 		"  return ''",
 		"}",
-		"",
+		""
+	];
+	const exportLines = isSjs ? [
+		"export default {",
+		"  cls: normalizeClass,",
+		"  style: normalizeStyle,",
+		"  stylePair: stylePair,",
+		"}"
+	] : [
 		"module.exports = {",
 		"  cls: normalizeClass,",
 		"  style: normalizeStyle,",
 		"  stylePair: stylePair,",
-		"}",
+		"}"
+	];
+	return [
+		...bodyLines,
+		...exportLines,
 		""
 	].join("\n");
 }
@@ -1498,6 +1533,36 @@ function mergeJsExpressionParts(parts) {
 	if (parts.length === 1) return parts[0];
 	return t.arrayExpression(parts);
 }
+function unwrapTsExpression(node) {
+	if (t.isTSAsExpression(node) || t.isTSNonNullExpression(node) || t.isTSTypeAssertion(node)) return unwrapTsExpression(node.expression);
+	return node;
+}
+function shouldPreferJsClassStyleRuntime(exp) {
+	const ast = parseBabelExpression(exp);
+	if (!ast) return true;
+	const visit = (node) => {
+		const current = unwrapTsExpression(node);
+		if (t.isIdentifier(current) || t.isMemberExpression(current) || t.isOptionalMemberExpression(current) || t.isCallExpression(current) || t.isOptionalCallExpression(current) || t.isThisExpression(current) || t.isSuper(current) || t.isAwaitExpression(current) || t.isYieldExpression(current) || t.isNewExpression(current)) return true;
+		if (t.isStringLiteral(current) || t.isNumericLiteral(current) || t.isBooleanLiteral(current) || t.isNullLiteral(current) || t.isBigIntLiteral(current) || t.isRegExpLiteral(current)) return false;
+		if (t.isTemplateLiteral(current)) return current.expressions.some((exp) => visit(exp));
+		if (t.isArrayExpression(current)) {
+			for (const element of current.elements) {
+				if (!element || t.isSpreadElement(element)) return true;
+				if (visit(element)) return true;
+			}
+			return false;
+		}
+		if (t.isObjectExpression(current)) {
+			for (const property of current.properties) if (t.isSpreadElement(property) || !t.isObjectProperty(property)) return true;
+			return false;
+		}
+		if (t.isConditionalExpression(current)) return visit(current.test) || visit(current.consequent) || visit(current.alternate);
+		if (t.isLogicalExpression(current) || t.isBinaryExpression(current)) return visit(current.left) || visit(current.right);
+		if (t.isUnaryExpression(current)) return visit(current.argument);
+		return true;
+	};
+	return visit(ast);
+}
 function createClassStyleBinding(context, type, exp, expAst) {
 	const index = context.classStyleBindings.length;
 	return {
@@ -1513,7 +1578,7 @@ function renderClassAttribute(staticClass, dynamicClassExp, context) {
 	if (!dynamicClassExp) return staticValue ? `class="${staticValue}"` : void 0;
 	const parts = [];
 	if (staticValue) parts.push(toWxmlStringLiteral(staticValue));
-	if (context.classStyleRuntime === "wxs") {
+	if (context.classStyleRuntime === "wxs" && !shouldPreferJsClassStyleRuntime(dynamicClassExp)) {
 		const normalizedParts = normalizeClassBindingExpression(dynamicClassExp, context);
 		for (const part of normalizedParts) parts.push(`(${part})`);
 		const mergedExp = parts.length > 1 ? `[${parts.join(",")}]` : parts[0];
@@ -1535,7 +1600,7 @@ function renderStyleAttribute(staticStyle, dynamicStyleExp, vShowExp, context) {
 	if (!Boolean(dynamicStyleExp || vShowExp)) return staticValue ? `style="${staticValue}"` : void 0;
 	const parts = [];
 	if (staticValue) parts.push(toWxmlStringLiteral(staticValue));
-	if (context.classStyleRuntime === "wxs") {
+	if (context.classStyleRuntime === "wxs" && (!dynamicStyleExp || !shouldPreferJsClassStyleRuntime(dynamicStyleExp))) {
 		if (dynamicStyleExp) {
 			const normalizedParts = normalizeStyleBindingExpression(dynamicStyleExp, context);
 			for (const part of normalizedParts) parts.push(`(${part})`);
@@ -1685,6 +1750,17 @@ function buildInlineScopeAttrs(scopeBindings) {
 		return `data-wv-s${index}="{{${binding.replace(/"/g, """)}}}"`;
 	});
 }
+function resolveEventPrefix(modifiers) {
+	const hasCatch = modifiers.some((modifier) => modifier.content === "catch");
+	const hasStop = modifiers.some((modifier) => modifier.content === "stop");
+	const hasCapture = modifiers.some((modifier) => modifier.content === "capture");
+	const hasMut = modifiers.some((modifier) => modifier.content === "mut");
+	if ((hasCatch || hasStop) && hasCapture) return "capture-catch";
+	if (hasCatch || hasStop) return "catch";
+	if (hasMut) return "mut-bind";
+	if (hasCapture) return "capture-bind";
+	return "bind";
+}
 function transformOnDirective(node, context) {
 	const { exp, arg } = node;
 	if (!arg) return null;
@@ -1694,7 +1770,8 @@ function transformOnDirective(node, context) {
 	const isInlineExpression = rawExpValue && !isSimpleHandler(rawExpValue);
 	const inlineExpression = isInlineExpression ? registerInlineExpression(rawExpValue, context) : null;
 	const mappedEvent = context.platform.mapEventName(argValue);
-	const bindAttr = context.platform.eventBindingAttr(mappedEvent);
+	const eventPrefix = resolveEventPrefix(node.modifiers);
+	const bindAttr = context.platform.eventBindingAttr(`${eventPrefix}:${mappedEvent}`);
 	if (context.rewriteScopedSlot) {
 		if (inlineExpression) {
 			const scopeAttrs = buildInlineScopeAttrs(inlineExpression.scopeBindings);
@@ -2260,7 +2337,7 @@ function transformForElement(node, context, transformNode) {
 	const forInfo = parseForExpression(forDirective.exp.type === NodeTypes.SIMPLE_EXPRESSION ? forDirective.exp.content : "");
 	if (context.classStyleRuntime === "js" && !forInfo.index) forInfo.index = `__wv_index_${context.forIndexSeed++}`;
 	const listExp = forInfo.listExp ? normalizeWxmlExpressionWithContext(forInfo.listExp, context) : void 0;
-	const listExpAst = context.classStyleRuntime === "js" && forInfo.listExp ? normalizeJsExpressionWithContext(forInfo.listExp, context, { hint: "v-for 列表" }) : void 0;
+	const listExpAst = forInfo.listExp ? normalizeJsExpressionWithContext(forInfo.listExp, context, { hint: "v-for 列表" }) : void 0;
 	const scopedForInfo = listExp ? {
 		...forInfo,
 		listExp,
@@ -2436,6 +2513,27 @@ function toOnEventName(eventName) {
 	if (!eventName) return "on";
 	return `on${(eventName[0] ?? "").toUpperCase()}${eventName.slice(1)}`;
 }
+function parseEventBinding$3(eventName) {
+	const prefixed = /^(bind|catch|capture-bind|capture-catch|mut-bind):(.+)$/.exec(eventName);
+	if (prefixed) return {
+		prefix: prefixed[1],
+		name: prefixed[2]
+	};
+	return {
+		prefix: "bind",
+		name: eventName
+	};
+}
+function toAlipayDirectiveEvent(prefix, eventName) {
+	if (!eventName) return "on";
+	const pascalEvent = `${(eventName[0] ?? "").toUpperCase()}${eventName.slice(1)}`;
+	switch (prefix) {
+		case "catch": return `catch${pascalEvent}`;
+		case "capture-bind": return `capture${pascalEvent}`;
+		case "capture-catch": return `captureCatch${pascalEvent}`;
+		default: return toOnEventName(eventName);
+	}
+}
 /**
 * 支付宝小程序平台适配器。
 */
@@ -2454,8 +2552,9 @@ const alipayPlatform = {
 	keyAttr: (value) => `a:key="${value}"`,
 	mapEventName: (eventName) => eventMap$3[eventName] || eventName,
 	eventBindingAttr: (eventName) => {
-		if (eventName.includes(":")) return `on:${eventName}`;
-		return toOnEventName(eventName);
+		const { prefix, name } = parseEventBinding$3(eventName);
+		if (name.includes(":")) return `on:${name}`;
+		return toAlipayDirectiveEvent(prefix, name);
 	}
 };
 
@@ -2483,6 +2582,17 @@ const eventMap$2 = {
 	longtap: "longtap",
 	longpress: "longpress"
 };
+function parseEventBinding$2(eventName) {
+	const prefixed = /^(bind|catch|capture-bind|capture-catch|mut-bind):(.+)$/.exec(eventName);
+	if (prefixed) return {
+		prefix: prefixed[1],
+		name: prefixed[2]
+	};
+	return {
+		prefix: "bind",
+		name: eventName
+	};
+}
 /**
 * 百度智能小程序平台适配器。
 */
@@ -2501,7 +2611,14 @@ const swanPlatform = {
 	keyAttr: (value) => `s-key="${value}"`,
 	mapEventName: (eventName) => eventMap$2[eventName] || eventName,
 	eventBindingAttr: (eventName) => {
-		return eventName.includes(":") ? `bind:${eventName}` : `bind${eventName}`;
+		const { prefix, name } = parseEventBinding$2(eventName);
+		switch (prefix) {
+			case "catch": return name.includes(":") ? `catch:${name}` : `catch${name}`;
+			case "capture-bind": return `capture-bind:${name}`;
+			case "capture-catch": return `capture-catch:${name}`;
+			case "mut-bind": return `mut-bind:${name}`;
+			default: return name.includes(":") ? `bind:${name}` : `bind${name}`;
+		}
 	}
 };
 
@@ -2529,6 +2646,17 @@ const eventMap$1 = {
 	longtap: "longtap",
 	longpress: "longpress"
 };
+function parseEventBinding$1(eventName) {
+	const prefixed = /^(bind|catch|capture-bind|capture-catch|mut-bind):(.+)$/.exec(eventName);
+	if (prefixed) return {
+		prefix: prefixed[1],
+		name: prefixed[2]
+	};
+	return {
+		prefix: "bind",
+		name: eventName
+	};
+}
 /**
 * 抖音小程序平台适配器。
 */
@@ -2547,7 +2675,14 @@ const ttPlatform = {
 	keyAttr: (value) => `tt:key="${value}"`,
 	mapEventName: (eventName) => eventMap$1[eventName] || eventName,
 	eventBindingAttr: (eventName) => {
-		return eventName.includes(":") ? `bind:${eventName}` : `bind${eventName}`;
+		const { prefix, name } = parseEventBinding$1(eventName);
+		switch (prefix) {
+			case "catch": return name.includes(":") ? `catch:${name}` : `catch${name}`;
+			case "capture-bind": return `capture-bind:${name}`;
+			case "capture-catch": return `capture-catch:${name}`;
+			case "mut-bind": return `mut-bind:${name}`;
+			default: return name.includes(":") ? `bind:${name}` : `bind${name}`;
+		}
 	}
 };
 
@@ -2575,6 +2710,17 @@ const eventMap = {
 	longtap: "longtap",
 	longpress: "longpress"
 };
+function parseEventBinding(eventName) {
+	const prefixed = /^(bind|catch|capture-bind|capture-catch|mut-bind):(.+)$/.exec(eventName);
+	if (prefixed) return {
+		prefix: prefixed[1],
+		name: prefixed[2]
+	};
+	return {
+		prefix: "bind",
+		name: eventName
+	};
+}
 /**
 * 微信小程序平台适配器。
 */
@@ -2593,7 +2739,14 @@ const wechatPlatform = {
 	keyAttr: (value) => `wx:key="${value}"`,
 	mapEventName: (eventName) => eventMap[eventName] || eventName,
 	eventBindingAttr: (eventName) => {
-		return eventName.includes(":") ? `bind:${eventName}` : `bind${eventName}`;
+		const { prefix, name } = parseEventBinding(eventName);
+		switch (prefix) {
+			case "catch": return name.includes(":") ? `catch:${name}` : `catch${name}`;
+			case "capture-bind": return `capture-bind:${name}`;
+			case "capture-catch": return `capture-catch:${name}`;
+			case "mut-bind": return `mut-bind:${name}`;
+			default: return name.includes(":") ? `bind:${name}` : `bind${name}`;
+		}
 	}
 };
 
@@ -2737,13 +2890,20 @@ function buildForExpression(binding, forStack, level, helpers) {
 	const info = forStack[level];
 	const listId = t.identifier(`__wv_list_${level}`);
 	const listExp = info.listExpAst ? t.cloneNode(info.listExpAst, true) : t.arrayExpression([]);
-	const listDecl = t.variableDeclaration("const", [t.variableDeclarator(listId, listExp)]);
+	const unrefHelper = helpers.unref ? t.cloneNode(helpers.unref) : t.identifier("unref");
+	const listUnrefExp = t.callExpression(unrefHelper, [listExp]);
+	const listDecl = t.variableDeclaration("let", [t.variableDeclarator(listId, t.arrayExpression([]))]);
+	const listSafeAssign = t.tryStatement(t.blockStatement([t.expressionStatement(t.assignmentExpression("=", listId, listUnrefExp))]), t.catchClause(t.identifier(`__wv_err_${level}`), t.blockStatement([t.expressionStatement(t.assignmentExpression("=", listId, t.arrayExpression([])))])), null);
 	const arrayCheck = t.callExpression(t.memberExpression(t.identifier("Array"), t.identifier("isArray")), [listId]);
 	const arrayMap = buildArrayMapExpression(binding, forStack, level, listId, helpers);
 	const objectCheck = t.logicalExpression("&&", t.binaryExpression("!=", listId, t.nullLiteral()), t.binaryExpression("===", t.unaryExpression("typeof", listId), t.stringLiteral("object")));
 	const objectBlock = buildObjectMapExpression(binding, forStack, level, listId, helpers);
 	const fallbackReturn = t.returnStatement(t.arrayExpression([]));
-	const body = t.blockStatement([listDecl, t.ifStatement(arrayCheck, t.blockStatement([t.returnStatement(arrayMap)]), t.ifStatement(objectCheck, objectBlock, t.blockStatement([fallbackReturn])))]);
+	const body = t.blockStatement([
+		listDecl,
+		listSafeAssign,
+		t.ifStatement(arrayCheck, t.blockStatement([t.returnStatement(arrayMap)]), t.ifStatement(objectCheck, objectBlock, t.blockStatement([fallbackReturn])))
+	]);
 	return t.callExpression(t.arrowFunctionExpression([], body), []);
 }
 function buildComputedFunctionBody(binding, helpers) {
@@ -2770,7 +2930,8 @@ function buildClassStyleComputedCode(bindings, helpers) {
 	if (!bindings.length) return null;
 	const obj = buildClassStyleComputedObject(bindings, {
 		normalizeClass: t.identifier(helpers.normalizeClassName),
-		normalizeStyle: t.identifier(helpers.normalizeStyleName)
+		normalizeStyle: t.identifier(helpers.normalizeStyleName),
+		unref: t.identifier(helpers.unrefName ?? "unref")
 	});
 	if (!obj) return null;
 	const { code } = generate(obj, { compact: true });
@@ -4668,7 +4829,8 @@ function injectClassStyleComputed(optionsObject, bindings, warn) {
 	const warnHandler = resolveWarnHandler(warn);
 	const entries = buildClassStyleComputedEntries(bindings, {
 		normalizeClass: t.identifier("__wevuNormalizeClass"),
-		normalizeStyle: t.identifier("__wevuNormalizeStyle")
+		normalizeStyle: t.identifier("__wevuNormalizeStyle"),
+		unref: t.identifier("__wevuUnref")
 	});
 	if (!entries.length) return false;
 	const computedProp = getObjectPropertyByKey(optionsObject, "computed");
@@ -4690,6 +4852,7 @@ function injectClassStyleComputed(optionsObject, bindings, warn) {
 function ensureClassStyleRuntimeImports(program) {
 	ensureRuntimeImport(program, "normalizeClass", "__wevuNormalizeClass");
 	ensureRuntimeImport(program, "normalizeStyle", "__wevuNormalizeStyle");
+	ensureRuntimeImport(program, "unref", "__wevuUnref");
 }
 
 //#endregion
@@ -4926,7 +5089,7 @@ function rewriteDefaultExport(ast, state, options, enabledPageFeatures, serializ
 		parsedWevuDefaults,
 		options
 	}) || transformed;
-	const classStyleBindings = options?.classStyleRuntime === "js" ? options?.classStyleBindings ?? [] : [];
+	const classStyleBindings = options?.classStyleBindings ?? [];
 	if (classStyleBindings.length) if (componentExpr && t.isObjectExpression(componentExpr)) {
 		ensureClassStyleRuntimeImports(ast.program);
 		transformed = injectClassStyleComputed(componentExpr, classStyleBindings, warn) || transformed;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/compiler",
   "type": "module",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "wevu 编译器基础包，面向小程序模板的编译与转换",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -45,16 +45,16 @@
     "@babel/parser": "^7.29.0",
     "@babel/traverse": "^7.29.0",
     "@babel/types": "^7.29.0",
-    "@vue/compiler-core": "^3.5.27",
+    "@vue/compiler-core": "^3.5.28",
     "comment-json": "^4.5.1",
     "fs-extra": "^11.3.3",
     "lru-cache": "^11.2.5",
     "magic-string": "^0.30.21",
     "merge": "^2.1.1",
     "pathe": "^2.0.3",
-    "vue": "^3.5.27",
+    "vue": "^3.5.28",
     "@weapp-core/shared": "3.0.1",
-    "rolldown-require": "2.0.5"
+    "rolldown-require": "2.0.6"
   },
   "publishConfig": {
     "access": "public",