@vue-jsx-vapor/compiler 2.4.1 → 2.4.3

package/dist/index.cjs

@@ -137,7 +137,12 @@ function getLiteralExpressionValue(exp) {
 }
 const isConstant = (node) => {
 	if (!node) return false;
-	if (node.type === "Identifier") return node.name === "undefined";
+	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));
@@ -166,13 +171,14 @@ function resolveSimpleExpressionNode(exp) {
 	}
 	return exp;
 }
-const resolvedExpressions = new WeakSet();
+const resolvedExpressions = /* @__PURE__ */ new WeakSet();
 function resolveExpression(node, context, effect = false) {
-	node = node?.type === "JSXExpressionContainer" ? node.expression : node;
-	const isStatic = !!node && (node.type === "StringLiteral" || node.type === "JSXText" || node.type === "JSXIdentifier");
-	let source = !node || node.type === "JSXEmptyExpression" ? "" : node.type === "JSXIdentifier" ? node.name : node.type === "StringLiteral" ? node.value : node.type === "JSXText" ? resolveJSXText(node) : node.type === "Identifier" ? node.name : context.ir.source.slice(node.start, node.end);
-	const location = node ? node.loc : null;
-	const isResolved = node && resolvedExpressions.has(node);
+	if (!node) return (0, __vue_compiler_dom.createSimpleExpression)("", true);
+	node = (0, __vue_compiler_dom.unwrapTSNode)(node.type === "JSXExpressionContainer" ? node.expression : node);
+	const isStatic = node.type === "StringLiteral" || node.type === "JSXText" || node.type === "JSXIdentifier";
+	let source = node.type === "JSXEmptyExpression" ? "" : node.type === "JSXIdentifier" ? node.name : node.type === "StringLiteral" ? node.value : node.type === "JSXText" ? resolveJSXText(node) : node.type === "Identifier" ? node.name : context.ir.source.slice(node.start, node.end);
+	const location = node.loc;
+	const isResolved = resolvedExpressions.has(node);
 	if (source && !isStatic && effect && !isConstant(node)) {
 		source = `() => (${source})`;
 		if (location && node && !isResolved) {
@@ -180,7 +186,7 @@ function resolveExpression(node, context, effect = false) {
 			node.start -= 7;
 		}
 	}
-	if (node && !isResolved) {
+	if (!isResolved) {
 		const offset = node.start - 1;
 		(0, __vue_compiler_dom.walkIdentifiers)(node, (id) => {
 			if (!id.loc) return;
@@ -436,8 +442,8 @@ function transform(node, options = {}) {
 		node,
 		source: node.source,
 		template: [],
-		component: new Set(),
-		directive: new Set(),
+		component: /* @__PURE__ */ new Set(),
+		directive: /* @__PURE__ */ new Set(),
 		block: newBlock(node),
 		hasTemplateRef: false
 	};
@@ -687,7 +693,7 @@ function transformProp(prop, node, context) {
 	}
 }
 function dedupeProperties(results) {
-	const knownProps = new Map();
+	const knownProps = /* @__PURE__ */ new Map();
 	const deduped = [];
 	for (const result of results) {
 		const prop = resolveDirectiveResult(result);
@@ -794,9 +800,9 @@ function processLogicalExpression(node, context) {
 
 //#endregion
 //#region src/transforms/transformText.ts
-const seen = new WeakMap();
+const seen = /* @__PURE__ */ new WeakMap();
 const transformText = (node, context) => {
-	if (!seen.has(context.root)) seen.set(context.root, new WeakSet());
+	if (!seen.has(context.root)) seen.set(context.root, /* @__PURE__ */ new WeakSet());
 	if (seen.get(context.root).has(node)) {
 		context.dynamic.flags |= DynamicFlag.NON_TEMPLATE;
 		return;
@@ -836,7 +842,7 @@ function processInterpolation(context) {
 		return;
 	}
 	const id = context.reference();
-	if (isFragmentNode(parent)) context.registerOperation({
+	if (isFragmentNode(parent) || findProp(parent, "v-slot")) context.registerOperation({
 		type: IRNodeTypes.CREATE_NODES,
 		id,
 		values
@@ -984,7 +990,7 @@ const transformVIf = createStructuralDirectiveTransform([
 	"else",
 	"else-if"
 ], processIf);
-const transformedIfNode = new WeakMap();
+const transformedIfNode = /* @__PURE__ */ new WeakMap();
 function processIf(node, attribute, context) {
 	const dir = resolveDirective(attribute, context);
 	if (dir.name !== "else" && (!dir.exp || !dir.exp.content.trim())) {

package/dist/index.d.cts

@@ -49,7 +49,6 @@ declare class TransformContext<T extends BlockIRNode['node'] = BlockIRNode['node
 declare function transform(node: RootNode, options?: TransformOptions): RootIRNode;
 declare function transformNode(context: TransformContext<BlockIRNode['node']>): void;
 declare function createStructuralDirectiveTransform(name: string | string[], fn: StructuralDirectiveTransform): NodeTransform;
-
 //#endregion
 //#region src/ir/component.d.ts
 interface IRProp extends Omit<DirectiveTransformResult, 'value'> {
@@ -107,7 +106,6 @@ interface IRSlotsExpression {
 }
 type IRSlotDynamic = IRSlotDynamicBasic | IRSlotDynamicLoop | IRSlotDynamicConditional;
 type IRSlots = IRSlotsStatic | IRSlotDynamic | IRSlotsExpression;
-
 //#endregion
 //#region src/ir/index.d.ts
 declare enum IRNodeTypes {
@@ -343,7 +341,6 @@ type VaporDirectiveNode = Overwrite<DirectiveNode, {
 }>;
 type InsertionStateTypes = IfIRNode | ForIRNode | SlotOutletIRNode | CreateComponentIRNode;
 declare function isBlockOperation(op: OperationNode): op is InsertionStateTypes;
-
 //#endregion
 //#region src/compile.d.ts
 interface VaporCodegenResult$1 extends Omit<VaporCodegenResult, 'ast'> {
@@ -355,66 +352,50 @@ type CompilerOptions = HackOptions<CompilerOptions$1> & {
   source?: string;
 };
 type TransformPreset = [NodeTransform[], Record<string, DirectiveTransform>];
-
 //#endregion
 //#region src/transforms/transformText.d.ts
 declare const transformText: NodeTransform;
-
 //#endregion
 //#region src/transforms/transformElement.d.ts
 declare const transformElement: NodeTransform;
-
 //#endregion
 //#region src/transforms/transformChildren.d.ts
 declare const transformChildren: NodeTransform;
-
 //#endregion
 //#region src/transforms/transformTemplateRef.d.ts
 declare const transformTemplateRef: NodeTransform;
-
 //#endregion
 //#region src/transforms/vBind.d.ts
 declare const transformVBind: DirectiveTransform;
-
 //#endregion
 //#region src/transforms/vOn.d.ts
 declare const transformVOn: DirectiveTransform;
-
 //#endregion
 //#region src/transforms/vSlot.d.ts
 declare const transformVSlot: NodeTransform;
-
 //#endregion
 //#region src/transforms/vSlots.d.ts
 declare const transformVSlots: DirectiveTransform;
-
 //#endregion
 //#region src/transforms/vModel.d.ts
 declare const transformVModel: DirectiveTransform;
-
 //#endregion
 //#region src/transforms/vShow.d.ts
 declare const transformVShow: DirectiveTransform;
-
 //#endregion
 //#region src/transforms/vHtml.d.ts
 declare const transformVHtml: DirectiveTransform;
-
 //#endregion
 //#region src/transforms/vFor.d.ts
 declare const transformVFor: NodeTransform;
-
 //#endregion
 //#region src/transforms/vIf.d.ts
 declare const transformVIf: NodeTransform;
-
 //#endregion
 //#region src/transforms/vOnce.d.ts
 declare const transformVOnce: NodeTransform;
-
 //#endregion
 //#region src/transforms/vText.d.ts
 declare const transformVText: DirectiveTransform;
-
 //#endregion
 export { BaseIRNode, BlockIRNode, CompilerOptions, CreateComponentIRNode, CreateNodesIRNode, DeclareOldRefIRNode, DirectiveIRNode, DirectiveTransform, DirectiveTransformResult, DynamicFlag, ForIRNode, GetTextChildIRNode, HackOptions, IRDynamicInfo, IRDynamicPropsKind, IREffect, IRFor, IRNode, IRNodeTypes, IRProp, IRProps, IRPropsDynamicAttribute, IRPropsDynamicExpression, IRPropsStatic, IRSlotDynamic, IRSlotDynamicBasic, IRSlotDynamicConditional, IRSlotDynamicLoop, IRSlotType, IRSlots, IRSlotsExpression, IRSlotsStatic, IfIRNode, InsertNodeIRNode, InsertionStateTypes, KeyOverride, NodeTransform, OperationNode, PrependNodeIRNode, RootIRNode, RootNode, SetDynamicEventsIRNode, SetDynamicPropsIRNode, SetEventIRNode, SetHtmlIRNode, SetNodesIRNode, SetPropIRNode, SetTemplateRefIRNode, SetTextIRNode, SlotBlockIRNode, SlotOutletIRNode, StructuralDirectiveTransform, TransformContext, TransformOptions, TransformPreset, VaporDirectiveNode, compile, createStructuralDirectiveTransform, generate, isBlockOperation, transform, transformChildren, transformElement, transformNode, transformTemplateRef, transformText, transformVBind, transformVFor, transformVHtml, transformVIf, transformVModel, transformVOn, transformVOnce, transformVShow, transformVSlot, transformVSlots, transformVText };

package/dist/index.d.ts

@@ -49,7 +49,6 @@ declare class TransformContext<T extends BlockIRNode['node'] = BlockIRNode['node
 declare function transform(node: RootNode, options?: TransformOptions): RootIRNode;
 declare function transformNode(context: TransformContext<BlockIRNode['node']>): void;
 declare function createStructuralDirectiveTransform(name: string | string[], fn: StructuralDirectiveTransform): NodeTransform;
-
 //#endregion
 //#region src/ir/component.d.ts
 interface IRProp extends Omit<DirectiveTransformResult, 'value'> {
@@ -107,7 +106,6 @@ interface IRSlotsExpression {
 }
 type IRSlotDynamic = IRSlotDynamicBasic | IRSlotDynamicLoop | IRSlotDynamicConditional;
 type IRSlots = IRSlotsStatic | IRSlotDynamic | IRSlotsExpression;
-
 //#endregion
 //#region src/ir/index.d.ts
 declare enum IRNodeTypes {
@@ -343,7 +341,6 @@ type VaporDirectiveNode = Overwrite<DirectiveNode, {
 }>;
 type InsertionStateTypes = IfIRNode | ForIRNode | SlotOutletIRNode | CreateComponentIRNode;
 declare function isBlockOperation(op: OperationNode): op is InsertionStateTypes;
-
 //#endregion
 //#region src/compile.d.ts
 interface VaporCodegenResult$1 extends Omit<VaporCodegenResult, 'ast'> {
@@ -355,66 +352,50 @@ type CompilerOptions = HackOptions<CompilerOptions$1> & {
   source?: string;
 };
 type TransformPreset = [NodeTransform[], Record<string, DirectiveTransform>];
-
 //#endregion
 //#region src/transforms/transformText.d.ts
 declare const transformText: NodeTransform;
-
 //#endregion
 //#region src/transforms/transformElement.d.ts
 declare const transformElement: NodeTransform;
-
 //#endregion
 //#region src/transforms/transformChildren.d.ts
 declare const transformChildren: NodeTransform;
-
 //#endregion
 //#region src/transforms/transformTemplateRef.d.ts
 declare const transformTemplateRef: NodeTransform;
-
 //#endregion
 //#region src/transforms/vBind.d.ts
 declare const transformVBind: DirectiveTransform;
-
 //#endregion
 //#region src/transforms/vOn.d.ts
 declare const transformVOn: DirectiveTransform;
-
 //#endregion
 //#region src/transforms/vSlot.d.ts
 declare const transformVSlot: NodeTransform;
-
 //#endregion
 //#region src/transforms/vSlots.d.ts
 declare const transformVSlots: DirectiveTransform;
-
 //#endregion
 //#region src/transforms/vModel.d.ts
 declare const transformVModel: DirectiveTransform;
-
 //#endregion
 //#region src/transforms/vShow.d.ts
 declare const transformVShow: DirectiveTransform;
-
 //#endregion
 //#region src/transforms/vHtml.d.ts
 declare const transformVHtml: DirectiveTransform;
-
 //#endregion
 //#region src/transforms/vFor.d.ts
 declare const transformVFor: NodeTransform;
-
 //#endregion
 //#region src/transforms/vIf.d.ts
 declare const transformVIf: NodeTransform;
-
 //#endregion
 //#region src/transforms/vOnce.d.ts
 declare const transformVOnce: NodeTransform;
-
 //#endregion
 //#region src/transforms/vText.d.ts
 declare const transformVText: DirectiveTransform;
-
 //#endregion
 export { BaseIRNode, BlockIRNode, CompilerOptions, CreateComponentIRNode, CreateNodesIRNode, DeclareOldRefIRNode, DirectiveIRNode, DirectiveTransform, DirectiveTransformResult, DynamicFlag, ForIRNode, GetTextChildIRNode, HackOptions, IRDynamicInfo, IRDynamicPropsKind, IREffect, IRFor, IRNode, IRNodeTypes, IRProp, IRProps, IRPropsDynamicAttribute, IRPropsDynamicExpression, IRPropsStatic, IRSlotDynamic, IRSlotDynamicBasic, IRSlotDynamicConditional, IRSlotDynamicLoop, IRSlotType, IRSlots, IRSlotsExpression, IRSlotsStatic, IfIRNode, InsertNodeIRNode, InsertionStateTypes, KeyOverride, NodeTransform, OperationNode, PrependNodeIRNode, RootIRNode, RootNode, SetDynamicEventsIRNode, SetDynamicPropsIRNode, SetEventIRNode, SetHtmlIRNode, SetNodesIRNode, SetPropIRNode, SetTemplateRefIRNode, SetTextIRNode, SlotBlockIRNode, SlotOutletIRNode, StructuralDirectiveTransform, TransformContext, TransformOptions, TransformPreset, VaporDirectiveNode, compile, createStructuralDirectiveTransform, generate, isBlockOperation, transform, transformChildren, transformElement, transformNode, transformTemplateRef, transformText, transformVBind, transformVFor, transformVHtml, transformVIf, transformVModel, transformVOn, transformVOnce, transformVShow, transformVSlot, transformVSlots, transformVText };

package/dist/index.js

@@ -1,7 +1,7 @@
 import { parse, parseExpression } from "@babel/parser";
 import { NEWLINE, genCall, genExpression, generate } from "@vue/compiler-vapor";
 import { EMPTY_OBJ, NOOP, camelize, extend, isArray, isBuiltInDirective, isGloballyAllowed, isHTMLTag, isSVGTag, isString, isVoidTag, makeMap } from "@vue/shared";
-import { DOMErrorCodes, ErrorCodes, NodeTypes, createCompilerError, createDOMCompilerError, createSimpleExpression, defaultOnError, defaultOnWarn, isConstantNode, isLiteralWhitelisted, isMemberExpression, isStaticNode, isValidHTMLNesting, resolveModifiers, walkIdentifiers } from "@vue/compiler-dom";
+import { DOMErrorCodes, ErrorCodes, NodeTypes, createCompilerError, createDOMCompilerError, createSimpleExpression, defaultOnError, defaultOnWarn, isConstantNode, isLiteralWhitelisted, isMemberExpression, isStaticNode, isValidHTMLNesting, resolveModifiers, unwrapTSNode, walkIdentifiers } from "@vue/compiler-dom";
 import { isLiteral, jsxClosingFragment, jsxExpressionContainer, jsxFragment, jsxOpeningFragment } from "@babel/types";
 
 //#region src/ir/component.ts
@@ -114,7 +114,12 @@ function getLiteralExpressionValue(exp) {
 }
 const isConstant = (node) => {
 	if (!node) return false;
-	if (node.type === "Identifier") return node.name === "undefined";
+	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));
@@ -143,13 +148,14 @@ function resolveSimpleExpressionNode(exp) {
 	}
 	return exp;
 }
-const resolvedExpressions = new WeakSet();
+const resolvedExpressions = /* @__PURE__ */ new WeakSet();
 function resolveExpression(node, context, effect = false) {
-	node = node?.type === "JSXExpressionContainer" ? node.expression : node;
-	const isStatic = !!node && (node.type === "StringLiteral" || node.type === "JSXText" || node.type === "JSXIdentifier");
-	let source = !node || node.type === "JSXEmptyExpression" ? "" : node.type === "JSXIdentifier" ? node.name : node.type === "StringLiteral" ? node.value : node.type === "JSXText" ? resolveJSXText(node) : node.type === "Identifier" ? node.name : context.ir.source.slice(node.start, node.end);
-	const location = node ? node.loc : null;
-	const isResolved = node && resolvedExpressions.has(node);
+	if (!node) return createSimpleExpression("", true);
+	node = unwrapTSNode(node.type === "JSXExpressionContainer" ? node.expression : node);
+	const isStatic = node.type === "StringLiteral" || node.type === "JSXText" || node.type === "JSXIdentifier";
+	let source = node.type === "JSXEmptyExpression" ? "" : node.type === "JSXIdentifier" ? node.name : node.type === "StringLiteral" ? node.value : node.type === "JSXText" ? resolveJSXText(node) : node.type === "Identifier" ? node.name : context.ir.source.slice(node.start, node.end);
+	const location = node.loc;
+	const isResolved = resolvedExpressions.has(node);
 	if (source && !isStatic && effect && !isConstant(node)) {
 		source = `() => (${source})`;
 		if (location && node && !isResolved) {
@@ -157,7 +163,7 @@ function resolveExpression(node, context, effect = false) {
 			node.start -= 7;
 		}
 	}
-	if (node && !isResolved) {
+	if (!isResolved) {
 		const offset = node.start - 1;
 		walkIdentifiers(node, (id) => {
 			if (!id.loc) return;
@@ -413,8 +419,8 @@ function transform(node, options = {}) {
 		node,
 		source: node.source,
 		template: [],
-		component: new Set(),
-		directive: new Set(),
+		component: /* @__PURE__ */ new Set(),
+		directive: /* @__PURE__ */ new Set(),
 		block: newBlock(node),
 		hasTemplateRef: false
 	};
@@ -664,7 +670,7 @@ function transformProp(prop, node, context) {
 	}
 }
 function dedupeProperties(results) {
-	const knownProps = new Map();
+	const knownProps = /* @__PURE__ */ new Map();
 	const deduped = [];
 	for (const result of results) {
 		const prop = resolveDirectiveResult(result);
@@ -771,9 +777,9 @@ function processLogicalExpression(node, context) {
 
 //#endregion
 //#region src/transforms/transformText.ts
-const seen = new WeakMap();
+const seen = /* @__PURE__ */ new WeakMap();
 const transformText = (node, context) => {
-	if (!seen.has(context.root)) seen.set(context.root, new WeakSet());
+	if (!seen.has(context.root)) seen.set(context.root, /* @__PURE__ */ new WeakSet());
 	if (seen.get(context.root).has(node)) {
 		context.dynamic.flags |= DynamicFlag.NON_TEMPLATE;
 		return;
@@ -813,7 +819,7 @@ function processInterpolation(context) {
 		return;
 	}
 	const id = context.reference();
-	if (isFragmentNode(parent)) context.registerOperation({
+	if (isFragmentNode(parent) || findProp(parent, "v-slot")) context.registerOperation({
 		type: IRNodeTypes.CREATE_NODES,
 		id,
 		values
@@ -961,7 +967,7 @@ const transformVIf = createStructuralDirectiveTransform([
 	"else",
 	"else-if"
 ], processIf);
-const transformedIfNode = new WeakMap();
+const transformedIfNode = /* @__PURE__ */ new WeakMap();
 function processIf(node, attribute, context) {
 	const dir = resolveDirective(attribute, context);
 	if (dir.name !== "else" && (!dir.exp || !dir.exp.content.trim())) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/compiler",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "Vue JSX Vapor Compiler",
   "type": "module",
   "keywords": [
@@ -34,11 +34,11 @@
     "./*": "./*"
   },
   "dependencies": {
-    "@babel/parser": "^7.26.8",
-    "@babel/types": "^7.26.8",
-    "@vue/compiler-dom": "https://pkg.pr.new/@vue/compiler-dom@46e707d",
-    "@vue/compiler-vapor": "https://pkg.pr.new/@vue/compiler-vapor@46e707d",
-    "@vue/shared": "https://pkg.pr.new/@vue/shared@46e707d"
+    "@babel/parser": "^7.27.3",
+    "@babel/types": "^7.27.3",
+    "@vue/compiler-dom": "https://pkg.pr.new/@vue/compiler-dom@280bc48",
+    "@vue/compiler-vapor": "https://pkg.pr.new/@vue/compiler-vapor@280bc48",
+    "@vue/shared": "https://pkg.pr.new/@vue/shared@280bc48"
   },
   "scripts": {
     "build": "tsdown",