@vue-jsx-vapor/compiler 2.5.2 → 2.5.4-beta.1

package/dist/index.cjs

@@ -144,18 +144,7 @@ function getLiteralExpressionValue(exp) {
 const isConstant = (node) => {
 	if (!node) return false;
 	if (node.type === "Identifier") return node.name === "undefined" || (0, __vue_shared.isGloballyAllowed)(node.name);
-	if ([
-		"JSXElement",
-		"JSXFragment",
-		"NullLiteral"
-	].includes(node.type)) return true;
-	if (node.type === "ArrayExpression") {
-		const { elements } = node;
-		return elements.every((element) => element && isConstant(element));
-	}
-	if (node.type === "ObjectExpression") return node.properties.every((property) => isConstant(property.value));
-	if (node.type === "TemplateLiteral" ? !node.expressions.length : (0, __babel_types.isLiteral)(node)) return true;
-	return false;
+	return (0, __vue_compiler_dom.isConstantNode)(node, {});
 };
 const EMPTY_TEXT_REGEX = /^[\t\v\f \u00A0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*[\n\r]\s*$/;
 const START_EMPTY_TEXT_REGEX = /^\s*[\n\r]/;
@@ -1214,7 +1203,7 @@ function matchSelectorPattern(effect, keyAst, idMap) {
 			}
 		}
 		const content = effect.expressions[0].content;
-		if (typeof ast === "object" && ast && ast.type === "ConditionalExpression" && ast.test.type === "BinaryExpression" && ast.test.operator === "===" && ast.test.left.type !== "PrivateName" && (0, __vue_compiler_dom.isStaticNode)(ast.consequent) && (0, __vue_compiler_dom.isStaticNode)(ast.alternate)) {
+		if (typeof ast === "object" && ast && ast.type === "ConditionalExpression" && ast.test.type === "BinaryExpression" && ast.test.operator === "===" && ast.test.left.type !== "PrivateName" && isConstant(ast.consequent) && isConstant(ast.alternate)) {
 			const left = ast.test.left;
 			const right = ast.test.right;
 			for (const [a, b] of [[left, right], [right, left]]) {
@@ -1668,7 +1657,7 @@ var TransformContext = class TransformContext {
 	registerEffect(expressions, operation, getEffectIndex = () => this.block.effect.length, getOperationIndex = () => this.block.operation.length) {
 		const operations = [operation].flat();
 		expressions = expressions.filter((exp) => !isConstantExpression(exp));
-		if (this.inVOnce || expressions.length === 0 || expressions.every((e) => e.ast && (0, __vue_compiler_dom.isConstantNode)(e.ast, {}))) return this.registerOperation(operations, getOperationIndex);
+		if (this.inVOnce || expressions.length === 0 || expressions.every((e) => e.ast && isConstant(e.ast))) return this.registerOperation(operations, getOperationIndex);
 		this.block.effect.splice(getEffectIndex(), 0, {
 			expressions,
 			operations
@@ -2017,7 +2006,7 @@ function processConditionalExpression(node, context) {
 		id,
 		condition,
 		positive: branch,
-		once: context.inVOnce || (0, __vue_compiler_dom.isStaticNode)(test)
+		once: context.inVOnce || isConstant(test)
 	};
 	return [() => {
 		onExit();
@@ -2185,7 +2174,7 @@ function processFor(node, dir, context) {
 	return () => {
 		exitBlock();
 		const { parent } = context;
-		const isOnlyChild = parent && parent.block.node !== parent.node && parent.node.children.length === 1;
+		const isOnlyChild = parent && parent.block.node !== parent.node && parent.node.children.filter((child) => !isEmptyText(child)).length === 1;
 		context.dynamic.operation = {
 			type: IRNodeTypes.FOR,
 			id,
@@ -2195,7 +2184,7 @@ function processFor(node, dir, context) {
 			index,
 			keyProp: keyProperty,
 			render,
-			once: context.inVOnce || !!(source.ast && (0, __vue_compiler_dom.isConstantNode)(source.ast, {})),
+			once: context.inVOnce || !!(source.ast && isConstant(source.ast)),
 			component: isComponent,
 			onlyChild: !!isOnlyChild
 		};
@@ -2270,7 +2259,7 @@ function processIf(node, attribute, context) {
 				id,
 				condition: dir.exp,
 				positive: branch,
-				once: context.inVOnce || (0, __vue_compiler_dom.isConstantNode)(attribute.value, {})
+				once: context.inVOnce || isConstant(attribute.value)
 			};
 		};
 	} else {

package/dist/index.js

@@ -1,8 +1,8 @@
 import { parse, parseExpression } from "@babel/parser";
 import { NOOP, camelize, canSetValueDirectly, capitalize, extend, isArray, isBuiltInDirective, isGloballyAllowed, isHTMLTag, isSVGTag, isString, isVoidTag, makeMap, remove, shouldSetAsAttr, toHandlerKey } from "@vue/shared";
-import { DOMErrorCodes, ErrorCodes, NewlineType, NodeTypes, TS_NODE_TYPES, advancePositionWithClone, advancePositionWithMutation, createCompilerError, createDOMCompilerError, createSimpleExpression, defaultOnError, defaultOnWarn, isConstantNode, isFnExpression, isLiteralWhitelisted, isMemberExpression, isSimpleIdentifier, isStaticNode, isStaticProperty, isValidHTMLNesting, locStub, resolveModifiers, toValidAssetId, unwrapTSNode, walkIdentifiers } from "@vue/compiler-dom";
+import { DOMErrorCodes, ErrorCodes, NewlineType, NodeTypes, TS_NODE_TYPES, advancePositionWithClone, advancePositionWithMutation, createCompilerError, createDOMCompilerError, createSimpleExpression, defaultOnError, defaultOnWarn, isConstantNode, isFnExpression, isLiteralWhitelisted, isMemberExpression, isSimpleIdentifier, isStaticProperty, isValidHTMLNesting, locStub, resolveModifiers, toValidAssetId, unwrapTSNode, walkIdentifiers } from "@vue/compiler-dom";
 import { walkAST, walkIdentifiers as walkIdentifiers$1 } from "ast-kit";
-import { isLiteral, isNodesEquivalent, jsxClosingFragment, jsxExpressionContainer, jsxFragment, jsxOpeningFragment } from "@babel/types";
+import { isNodesEquivalent, jsxClosingFragment, jsxExpressionContainer, jsxFragment, jsxOpeningFragment } from "@babel/types";
 import { SourceMapGenerator } from "source-map-js";
 
 //#region src/ir/component.ts
@@ -121,18 +121,7 @@ function getLiteralExpressionValue(exp) {
 const isConstant = (node) => {
 	if (!node) return false;
 	if (node.type === "Identifier") return node.name === "undefined" || isGloballyAllowed(node.name);
-	if ([
-		"JSXElement",
-		"JSXFragment",
-		"NullLiteral"
-	].includes(node.type)) return true;
-	if (node.type === "ArrayExpression") {
-		const { elements } = node;
-		return elements.every((element) => element && isConstant(element));
-	}
-	if (node.type === "ObjectExpression") return node.properties.every((property) => isConstant(property.value));
-	if (node.type === "TemplateLiteral" ? !node.expressions.length : isLiteral(node)) return true;
-	return false;
+	return isConstantNode(node, {});
 };
 const EMPTY_TEXT_REGEX = /^[\t\v\f \u00A0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*[\n\r]\s*$/;
 const START_EMPTY_TEXT_REGEX = /^\s*[\n\r]/;
@@ -1191,7 +1180,7 @@ function matchSelectorPattern(effect, keyAst, idMap) {
 			}
 		}
 		const content = effect.expressions[0].content;
-		if (typeof ast === "object" && ast && ast.type === "ConditionalExpression" && ast.test.type === "BinaryExpression" && ast.test.operator === "===" && ast.test.left.type !== "PrivateName" && isStaticNode(ast.consequent) && isStaticNode(ast.alternate)) {
+		if (typeof ast === "object" && ast && ast.type === "ConditionalExpression" && ast.test.type === "BinaryExpression" && ast.test.operator === "===" && ast.test.left.type !== "PrivateName" && isConstant(ast.consequent) && isConstant(ast.alternate)) {
 			const left = ast.test.left;
 			const right = ast.test.right;
 			for (const [a, b] of [[left, right], [right, left]]) {
@@ -1645,7 +1634,7 @@ var TransformContext = class TransformContext {
 	registerEffect(expressions, operation, getEffectIndex = () => this.block.effect.length, getOperationIndex = () => this.block.operation.length) {
 		const operations = [operation].flat();
 		expressions = expressions.filter((exp) => !isConstantExpression(exp));
-		if (this.inVOnce || expressions.length === 0 || expressions.every((e) => e.ast && isConstantNode(e.ast, {}))) return this.registerOperation(operations, getOperationIndex);
+		if (this.inVOnce || expressions.length === 0 || expressions.every((e) => e.ast && isConstant(e.ast))) return this.registerOperation(operations, getOperationIndex);
 		this.block.effect.splice(getEffectIndex(), 0, {
 			expressions,
 			operations
@@ -1994,7 +1983,7 @@ function processConditionalExpression(node, context) {
 		id,
 		condition,
 		positive: branch,
-		once: context.inVOnce || isStaticNode(test)
+		once: context.inVOnce || isConstant(test)
 	};
 	return [() => {
 		onExit();
@@ -2162,7 +2151,7 @@ function processFor(node, dir, context) {
 	return () => {
 		exitBlock();
 		const { parent } = context;
-		const isOnlyChild = parent && parent.block.node !== parent.node && parent.node.children.length === 1;
+		const isOnlyChild = parent && parent.block.node !== parent.node && parent.node.children.filter((child) => !isEmptyText(child)).length === 1;
 		context.dynamic.operation = {
 			type: IRNodeTypes.FOR,
 			id,
@@ -2172,7 +2161,7 @@ function processFor(node, dir, context) {
 			index,
 			keyProp: keyProperty,
 			render,
-			once: context.inVOnce || !!(source.ast && isConstantNode(source.ast, {})),
+			once: context.inVOnce || !!(source.ast && isConstant(source.ast)),
 			component: isComponent,
 			onlyChild: !!isOnlyChild
 		};
@@ -2247,7 +2236,7 @@ function processIf(node, attribute, context) {
 				id,
 				condition: dir.exp,
 				positive: branch,
-				once: context.inVOnce || isConstantNode(attribute.value, {})
+				once: context.inVOnce || isConstant(attribute.value)
 			};
 		};
 	} else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/compiler",
-  "version": "2.5.2",
+  "version": "2.5.4-beta.1",
   "description": "Vue JSX Vapor Compiler",
   "type": "module",
   "keywords": [
@@ -36,8 +36,8 @@
   "dependencies": {
     "@babel/parser": "^7.28.0",
     "@babel/types": "^7.28.0",
-    "@vue/compiler-dom": "https://pkg.pr.new/@vue/compiler-dom@5771104",
-    "@vue/shared": "https://pkg.pr.new/@vue/shared@5771104",
+    "@vue/compiler-dom": "3.6.0-alpha.2",
+    "@vue/shared": "3.6.0-alpha.2",
     "ast-kit": "^2.1.1",
     "source-map-js": "^1.2.1"
   },