@vue-jsx-vapor/compiler 0.0.1 → 0.0.3

package/dist/index.cjs

@@ -20,6 +20,7 @@ var _parser = require('@babel/parser');
 
 
 
+
 // src/transforms/utils.ts
 
 
@@ -288,15 +289,16 @@ var IRNodeTypes = /* @__PURE__ */ ((IRNodeTypes2) => {
   IRNodeTypes2[IRNodeTypes2["SET_HTML"] = 7] = "SET_HTML";
   IRNodeTypes2[IRNodeTypes2["SET_TEMPLATE_REF"] = 8] = "SET_TEMPLATE_REF";
   IRNodeTypes2[IRNodeTypes2["SET_MODEL_VALUE"] = 9] = "SET_MODEL_VALUE";
-  IRNodeTypes2[IRNodeTypes2["INSERT_NODE"] = 10] = "INSERT_NODE";
-  IRNodeTypes2[IRNodeTypes2["PREPEND_NODE"] = 11] = "PREPEND_NODE";
-  IRNodeTypes2[IRNodeTypes2["CREATE_TEXT_NODE"] = 12] = "CREATE_TEXT_NODE";
-  IRNodeTypes2[IRNodeTypes2["CREATE_COMPONENT_NODE"] = 13] = "CREATE_COMPONENT_NODE";
-  IRNodeTypes2[IRNodeTypes2["SLOT_OUTLET_NODE"] = 14] = "SLOT_OUTLET_NODE";
-  IRNodeTypes2[IRNodeTypes2["WITH_DIRECTIVE"] = 15] = "WITH_DIRECTIVE";
-  IRNodeTypes2[IRNodeTypes2["DECLARE_OLD_REF"] = 16] = "DECLARE_OLD_REF";
-  IRNodeTypes2[IRNodeTypes2["IF"] = 17] = "IF";
-  IRNodeTypes2[IRNodeTypes2["FOR"] = 18] = "FOR";
+  IRNodeTypes2[IRNodeTypes2["SET_INHERIT_ATTRS"] = 10] = "SET_INHERIT_ATTRS";
+  IRNodeTypes2[IRNodeTypes2["INSERT_NODE"] = 11] = "INSERT_NODE";
+  IRNodeTypes2[IRNodeTypes2["PREPEND_NODE"] = 12] = "PREPEND_NODE";
+  IRNodeTypes2[IRNodeTypes2["CREATE_TEXT_NODE"] = 13] = "CREATE_TEXT_NODE";
+  IRNodeTypes2[IRNodeTypes2["CREATE_COMPONENT_NODE"] = 14] = "CREATE_COMPONENT_NODE";
+  IRNodeTypes2[IRNodeTypes2["SLOT_OUTLET_NODE"] = 15] = "SLOT_OUTLET_NODE";
+  IRNodeTypes2[IRNodeTypes2["WITH_DIRECTIVE"] = 16] = "WITH_DIRECTIVE";
+  IRNodeTypes2[IRNodeTypes2["DECLARE_OLD_REF"] = 17] = "DECLARE_OLD_REF";
+  IRNodeTypes2[IRNodeTypes2["IF"] = 18] = "IF";
+  IRNodeTypes2[IRNodeTypes2["FOR"] = 19] = "FOR";
   return IRNodeTypes2;
 })(IRNodeTypes || {});
 var DynamicFlag2 = /* @__PURE__ */ ((DynamicFlag3) => {
@@ -391,21 +393,24 @@ var TransformContext = class _TransformContext {
     if (this.inVOnce || expressions.length === 0) {
       return this.registerOperation(...operations);
     }
+    const ids = /* @__PURE__ */ new Set();
+    expressions.forEach((exp) => extractIdentifiers(ids, exp));
     const existing = this.block.effect.find(
-      (e) => isSameExpression(e.expressions, expressions)
+      (e) => _shared.looseEqual.call(void 0, e.identifiers, Array.from(ids))
     );
     if (existing) {
       existing.operations.push(...operations);
     } else {
       this.block.effect.push({
         expressions,
-        operations
+        operations,
+        earlyCheckExps: [],
+        declareNames: /* @__PURE__ */ new Set(),
+        rewrittenNames: /* @__PURE__ */ new Set(),
+        inVFor: this.inVFor > 0,
+        identifiers: Array.from(ids)
       });
     }
-    function isSameExpression(a, b) {
-      if (a.length !== b.length) return false;
-      return a.every((exp, i) => exp.content === b[i].content);
-    }
   }
   registerOperation(...node) {
     this.block.operation.push(...node);
@@ -463,6 +468,13 @@ function transformNode(context) {
     context.registerTemplate();
   }
 }
+function extractIdentifiers(ids, node) {
+  if (node.ast) {
+    _compilerdom.walkIdentifiers.call(void 0, node.ast, (n) => ids.add(n.name), true);
+  } else if (node.ast === null) {
+    ids.add(node.content);
+  }
+}
 
 // src/transforms/transformElement.ts
 
@@ -663,14 +675,16 @@ var transformElement = (node, context) => {
       context,
       isComponent
     );
+    const singleRoot = context.root === context.parent && context.parent.node.children.filter((child) => !isJSXComponent(child)).length === 1;
     (isComponent ? transformComponentElement : transformNativeElement)(
       tag,
       propsResult,
+      singleRoot,
       context
     );
   };
 };
-function transformComponentElement(tag, propsResult, context) {
+function transformComponentElement(tag, propsResult, singleRoot, context) {
   let asset = true;
   if (!__BROWSER__2) {
     const fromSetup = resolveSetupReference(tag, context);
@@ -691,14 +705,13 @@ function transformComponentElement(tag, propsResult, context) {
     context.component.add(tag);
   }
   context.dynamic.flags |= 2 /* NON_TEMPLATE */ | 4 /* INSERT */;
-  const root = context.root === context.parent && context.parent.node.children.length === 1;
   context.registerOperation({
-    type: 13 /* CREATE_COMPONENT_NODE */,
+    type: 14 /* CREATE_COMPONENT_NODE */,
     id: context.reference(),
     tag,
     props: propsResult[0] ? propsResult[1] : [propsResult[1]],
     asset,
-    root,
+    root: singleRoot,
     slots: context.slots,
     once: context.inVOnce
   });
@@ -714,33 +727,47 @@ function resolveSetupReference(name, context) {
   const PascalName = _shared.capitalize.call(void 0, camelName);
   return bindings[name] ? name : bindings[camelName] ? camelName : bindings[PascalName] ? PascalName : void 0;
 }
-function transformNativeElement(tag, propsResult, context) {
+function transformNativeElement(tag, propsResult, singleRoot, context) {
   const { scopeId } = context.options;
   let template = "";
   template += `<${tag}`;
   if (scopeId) template += ` ${scopeId}`;
+  let staticProps = false;
+  const dynamicProps = [];
   if (propsResult[0]) {
     const [, dynamicArgs, expressions] = propsResult;
     context.registerEffect(expressions, {
       type: 3 /* SET_DYNAMIC_PROPS */,
       element: context.reference(),
-      props: dynamicArgs
+      props: dynamicArgs,
+      root: singleRoot
     });
   } else {
     for (const prop of propsResult[1]) {
       const { key, values } = prop;
       if (key.isStatic && values.length === 1 && values[0].isStatic) {
+        staticProps = true;
         template += ` ${key.content}`;
         if (values[0].content) template += `="${values[0].content}"`;
       } else {
+        dynamicProps.push(key.content);
         context.registerEffect(values, {
           type: 2 /* SET_PROP */,
           element: context.reference(),
-          prop
+          prop,
+          tag,
+          root: singleRoot
         });
       }
     }
   }
+  if (singleRoot) {
+    context.registerOperation({
+      type: 10 /* SET_INHERIT_ATTRS */,
+      staticProps,
+      dynamicProps: propsResult[0] ? true : dynamicProps
+    });
+  }
   template += `>${context.childrenTemplate.join("")}`;
   if (!_shared.isVoidTag.call(void 0, tag)) {
     template += `</${tag}>`;
@@ -902,14 +929,14 @@ function processDynamicChildren(context) {
           prevDynamics[0].flags -= 2 /* NON_TEMPLATE */;
           const anchor = prevDynamics[0].anchor = context.increaseId();
           context.registerOperation({
-            type: 10 /* INSERT_NODE */,
+            type: 11 /* INSERT_NODE */,
             elements: prevDynamics.map((child2) => child2.id),
             parent: context.reference(),
             anchor
           });
         } else {
           context.registerOperation({
-            type: 11 /* PREPEND_NODE */,
+            type: 12 /* PREPEND_NODE */,
             elements: prevDynamics.map((child2) => child2.id),
             parent: context.reference()
           });
@@ -921,7 +948,7 @@ function processDynamicChildren(context) {
   }
   if (prevDynamics.length) {
     context.registerOperation({
-      type: 10 /* INSERT_NODE */,
+      type: 11 /* INSERT_NODE */,
       elements: prevDynamics.map((child) => child.id),
       parent: context.reference()
     });
@@ -938,7 +965,7 @@ var transformTemplateRef = (node, context) => {
     const id = context.reference();
     const effect = !isConstantExpression(value);
     effect && context.registerOperation({
-      type: 16 /* DECLARE_OLD_REF */,
+      type: 17 /* DECLARE_OLD_REF */,
       id
     });
     context.registerEffect([value], {
@@ -959,7 +986,7 @@ function processConditionalExpression(node, context) {
   const condition = resolveExpression(test, context);
   const [branch, onExit] = createBranch(consequent, context);
   const operation = {
-    type: 17 /* IF */,
+    type: 18 /* IF */,
     id,
     condition,
     positive: branch,
@@ -989,7 +1016,7 @@ function processLogicalExpression(node, context) {
     context
   );
   const operation = {
-    type: 17 /* IF */,
+    type: 18 /* IF */,
     id,
     condition,
     positive: branch,
@@ -1032,8 +1059,13 @@ function processMapCallExpression(node, context) {
   const keyProperty = keyProp && resolveExpression(keyProp.value, context);
   return () => {
     exitBlock();
+    const { parent } = context;
+    let container;
+    if (parent && parent.block.node !== parent.node && parent.node.children.length === 1) {
+      container = parent.reference();
+    }
     context.registerOperation({
-      type: 18 /* FOR */,
+      type: 19 /* FOR */,
       id,
       source,
       value,
@@ -1041,7 +1073,8 @@ function processMapCallExpression(node, context) {
       index,
       keyProp: keyProperty,
       render,
-      once: context.inVOnce
+      once: context.inVOnce,
+      container
     });
   };
 }
@@ -1085,7 +1118,7 @@ function processTextLike(context) {
   const values = nodes.map((node) => createTextLikeExpression(node, context));
   context.dynamic.flags |= 4 /* INSERT */ | 2 /* NON_TEMPLATE */;
   context.registerOperation({
-    type: 12 /* CREATE_TEXT_NODE */,
+    type: 13 /* CREATE_TEXT_NODE */,
     id,
     values,
     effect: !values.every(isConstantExpression) && !context.inVOnce
@@ -1122,7 +1155,7 @@ function processCallExpression(node, context) {
   const root = context.root === context.parent && context.parent.node.children.length === 1;
   const tag = `() => ${context.ir.source.slice(node.start, node.end)}`;
   context.registerOperation({
-    type: 13 /* CREATE_COMPONENT_NODE */,
+    type: 14 /* CREATE_COMPONENT_NODE */,
     id: context.reference(),
     tag,
     props: [],

package/dist/index.d.cts

@@ -71,15 +71,16 @@ declare enum IRNodeTypes {
     SET_HTML = 7,
     SET_TEMPLATE_REF = 8,
     SET_MODEL_VALUE = 9,
-    INSERT_NODE = 10,
-    PREPEND_NODE = 11,
-    CREATE_TEXT_NODE = 12,
-    CREATE_COMPONENT_NODE = 13,
-    SLOT_OUTLET_NODE = 14,
-    WITH_DIRECTIVE = 15,
-    DECLARE_OLD_REF = 16,// consider make it more general
-    IF = 17,
-    FOR = 18
+    SET_INHERIT_ATTRS = 10,
+    INSERT_NODE = 11,
+    PREPEND_NODE = 12,
+    CREATE_TEXT_NODE = 13,
+    CREATE_COMPONENT_NODE = 14,
+    SLOT_OUTLET_NODE = 15,
+    WITH_DIRECTIVE = 16,
+    DECLARE_OLD_REF = 17,// consider make it more general
+    IF = 18,
+    FOR = 19
 }
 interface BaseIRNode {
     type: IRNodeTypes;
@@ -133,16 +134,20 @@ interface ForIRNode extends BaseIRNode, IRFor {
     keyProp?: SimpleExpressionNode;
     render: BlockIRNode;
     once: boolean;
+    container?: number;
 }
 interface SetPropIRNode extends BaseIRNode {
     type: IRNodeTypes.SET_PROP;
     element: number;
     prop: IRProp;
+    root: boolean;
+    tag: string;
 }
 interface SetDynamicPropsIRNode extends BaseIRNode {
     type: IRNodeTypes.SET_DYNAMIC_PROPS;
     element: number;
     props: IRProps[];
+    root: boolean;
 }
 interface SetDynamicEventsIRNode extends BaseIRNode {
     type: IRNodeTypes.SET_DYNAMIC_EVENTS;
@@ -190,6 +195,11 @@ interface SetModelValueIRNode extends BaseIRNode {
     bindingType?: BindingTypes;
     isComponent: boolean;
 }
+interface SetInheritAttrsIRNode extends BaseIRNode {
+    type: IRNodeTypes.SET_INHERIT_ATTRS;
+    staticProps: boolean;
+    dynamicProps: true | string[];
+}
 interface CreateTextNodeIRNode extends BaseIRNode {
     type: IRNodeTypes.CREATE_TEXT_NODE;
     id: number;
@@ -237,7 +247,7 @@ interface SlotOutletIRNode extends BaseIRNode {
     fallback?: BlockIRNode;
 }
 type IRNode = OperationNode | RootIRNode;
-type OperationNode = SetPropIRNode | SetDynamicPropsIRNode | SetTextIRNode | SetEventIRNode | SetDynamicEventsIRNode | SetHtmlIRNode | SetTemplateRefIRNode | SetModelValueIRNode | CreateTextNodeIRNode | InsertNodeIRNode | PrependNodeIRNode | WithDirectiveIRNode | IfIRNode | ForIRNode | CreateComponentIRNode | DeclareOldRefIRNode | SlotOutletIRNode;
+type OperationNode = SetPropIRNode | SetDynamicPropsIRNode | SetTextIRNode | SetEventIRNode | SetDynamicEventsIRNode | SetHtmlIRNode | SetTemplateRefIRNode | SetModelValueIRNode | SetInheritAttrsIRNode | CreateTextNodeIRNode | InsertNodeIRNode | PrependNodeIRNode | WithDirectiveIRNode | IfIRNode | ForIRNode | CreateComponentIRNode | DeclareOldRefIRNode | SlotOutletIRNode;
 declare enum DynamicFlag {
     NONE = 0,
     /**
@@ -262,7 +272,12 @@ interface IRDynamicInfo {
 }
 interface IREffect {
     expressions: SimpleExpressionNode[];
+    identifiers: string[];
     operations: OperationNode[];
+    declareNames: Set<string>;
+    rewrittenNames: Set<string>;
+    earlyCheckExps: string[];
+    inVFor: boolean;
 }
 type Overwrite<T, U> = Pick<T, Exclude<keyof T, keyof U>> & Pick<U, Extract<keyof U, keyof T>>;
 type HackOptions<T> = Prettify<Overwrite<T, {
@@ -350,4 +365,4 @@ declare const transformVShow: DirectiveTransform;
 
 declare const transformVHtml: DirectiveTransform;
 
-export { type BaseIRNode, type BlockIRNode, type CompilerOptions, type CreateComponentIRNode, type CreateTextNodeIRNode, type DeclareOldRefIRNode, type DirectiveTransform, type DirectiveTransformResult, DynamicFlag, type ForIRNode, type HackOptions, type IRDynamicInfo, IRDynamicPropsKind, type IREffect, type IRFor, type IRNode, IRNodeTypes, type IRProp, type IRProps, type IRPropsDynamicAttribute, type IRPropsDynamicExpression, type IRPropsStatic, type IRSlotDynamic, type IRSlotDynamicBasic, type IRSlotDynamicConditional, type IRSlotDynamicLoop, IRSlotType, type IRSlots, type IRSlotsExpression, type IRSlotsStatic, type IfIRNode, type InsertNodeIRNode, type KeyOverride, type NodeTransform, type OperationNode, type PrependNodeIRNode, type RootIRNode, type RootNode, type SetDynamicEventsIRNode, type SetDynamicPropsIRNode, type SetEventIRNode, type SetHtmlIRNode, type SetModelValueIRNode, type SetPropIRNode, type SetTemplateRefIRNode, type SetTextIRNode, type SlotBlockIRNode, type SlotOutletIRNode, TransformContext, type TransformOptions, type TransformPreset, type VaporDirectiveNode, type VaporHelper, type WithDirectiveIRNode, compile, resolveDirectiveNode, resolveNode, transform, transformChildren, transformElement, transformNode, transformTemplateRef, transformText, transformVBind, transformVHtml, transformVModel, transformVOn, transformVShow, transformVSlot };
+export { type BaseIRNode, type BlockIRNode, type CompilerOptions, type CreateComponentIRNode, type CreateTextNodeIRNode, type DeclareOldRefIRNode, type DirectiveTransform, type DirectiveTransformResult, DynamicFlag, type ForIRNode, type HackOptions, type IRDynamicInfo, IRDynamicPropsKind, type IREffect, type IRFor, type IRNode, IRNodeTypes, type IRProp, type IRProps, type IRPropsDynamicAttribute, type IRPropsDynamicExpression, type IRPropsStatic, type IRSlotDynamic, type IRSlotDynamicBasic, type IRSlotDynamicConditional, type IRSlotDynamicLoop, IRSlotType, type IRSlots, type IRSlotsExpression, type IRSlotsStatic, type IfIRNode, type InsertNodeIRNode, type KeyOverride, type NodeTransform, type OperationNode, type PrependNodeIRNode, type RootIRNode, type RootNode, type SetDynamicEventsIRNode, type SetDynamicPropsIRNode, type SetEventIRNode, type SetHtmlIRNode, type SetInheritAttrsIRNode, type SetModelValueIRNode, type SetPropIRNode, type SetTemplateRefIRNode, type SetTextIRNode, type SlotBlockIRNode, type SlotOutletIRNode, TransformContext, type TransformOptions, type TransformPreset, type VaporDirectiveNode, type VaporHelper, type WithDirectiveIRNode, compile, resolveDirectiveNode, resolveNode, transform, transformChildren, transformElement, transformNode, transformTemplateRef, transformText, transformVBind, transformVHtml, transformVModel, transformVOn, transformVShow, transformVSlot };

package/dist/index.d.ts

@@ -71,15 +71,16 @@ declare enum IRNodeTypes {
     SET_HTML = 7,
     SET_TEMPLATE_REF = 8,
     SET_MODEL_VALUE = 9,
-    INSERT_NODE = 10,
-    PREPEND_NODE = 11,
-    CREATE_TEXT_NODE = 12,
-    CREATE_COMPONENT_NODE = 13,
-    SLOT_OUTLET_NODE = 14,
-    WITH_DIRECTIVE = 15,
-    DECLARE_OLD_REF = 16,// consider make it more general
-    IF = 17,
-    FOR = 18
+    SET_INHERIT_ATTRS = 10,
+    INSERT_NODE = 11,
+    PREPEND_NODE = 12,
+    CREATE_TEXT_NODE = 13,
+    CREATE_COMPONENT_NODE = 14,
+    SLOT_OUTLET_NODE = 15,
+    WITH_DIRECTIVE = 16,
+    DECLARE_OLD_REF = 17,// consider make it more general
+    IF = 18,
+    FOR = 19
 }
 interface BaseIRNode {
     type: IRNodeTypes;
@@ -133,16 +134,20 @@ interface ForIRNode extends BaseIRNode, IRFor {
     keyProp?: SimpleExpressionNode;
     render: BlockIRNode;
     once: boolean;
+    container?: number;
 }
 interface SetPropIRNode extends BaseIRNode {
     type: IRNodeTypes.SET_PROP;
     element: number;
     prop: IRProp;
+    root: boolean;
+    tag: string;
 }
 interface SetDynamicPropsIRNode extends BaseIRNode {
     type: IRNodeTypes.SET_DYNAMIC_PROPS;
     element: number;
     props: IRProps[];
+    root: boolean;
 }
 interface SetDynamicEventsIRNode extends BaseIRNode {
     type: IRNodeTypes.SET_DYNAMIC_EVENTS;
@@ -190,6 +195,11 @@ interface SetModelValueIRNode extends BaseIRNode {
     bindingType?: BindingTypes;
     isComponent: boolean;
 }
+interface SetInheritAttrsIRNode extends BaseIRNode {
+    type: IRNodeTypes.SET_INHERIT_ATTRS;
+    staticProps: boolean;
+    dynamicProps: true | string[];
+}
 interface CreateTextNodeIRNode extends BaseIRNode {
     type: IRNodeTypes.CREATE_TEXT_NODE;
     id: number;
@@ -237,7 +247,7 @@ interface SlotOutletIRNode extends BaseIRNode {
     fallback?: BlockIRNode;
 }
 type IRNode = OperationNode | RootIRNode;
-type OperationNode = SetPropIRNode | SetDynamicPropsIRNode | SetTextIRNode | SetEventIRNode | SetDynamicEventsIRNode | SetHtmlIRNode | SetTemplateRefIRNode | SetModelValueIRNode | CreateTextNodeIRNode | InsertNodeIRNode | PrependNodeIRNode | WithDirectiveIRNode | IfIRNode | ForIRNode | CreateComponentIRNode | DeclareOldRefIRNode | SlotOutletIRNode;
+type OperationNode = SetPropIRNode | SetDynamicPropsIRNode | SetTextIRNode | SetEventIRNode | SetDynamicEventsIRNode | SetHtmlIRNode | SetTemplateRefIRNode | SetModelValueIRNode | SetInheritAttrsIRNode | CreateTextNodeIRNode | InsertNodeIRNode | PrependNodeIRNode | WithDirectiveIRNode | IfIRNode | ForIRNode | CreateComponentIRNode | DeclareOldRefIRNode | SlotOutletIRNode;
 declare enum DynamicFlag {
     NONE = 0,
     /**
@@ -262,7 +272,12 @@ interface IRDynamicInfo {
 }
 interface IREffect {
     expressions: SimpleExpressionNode[];
+    identifiers: string[];
     operations: OperationNode[];
+    declareNames: Set<string>;
+    rewrittenNames: Set<string>;
+    earlyCheckExps: string[];
+    inVFor: boolean;
 }
 type Overwrite<T, U> = Pick<T, Exclude<keyof T, keyof U>> & Pick<U, Extract<keyof U, keyof T>>;
 type HackOptions<T> = Prettify<Overwrite<T, {
@@ -350,4 +365,4 @@ declare const transformVShow: DirectiveTransform;
 
 declare const transformVHtml: DirectiveTransform;
 
-export { type BaseIRNode, type BlockIRNode, type CompilerOptions, type CreateComponentIRNode, type CreateTextNodeIRNode, type DeclareOldRefIRNode, type DirectiveTransform, type DirectiveTransformResult, DynamicFlag, type ForIRNode, type HackOptions, type IRDynamicInfo, IRDynamicPropsKind, type IREffect, type IRFor, type IRNode, IRNodeTypes, type IRProp, type IRProps, type IRPropsDynamicAttribute, type IRPropsDynamicExpression, type IRPropsStatic, type IRSlotDynamic, type IRSlotDynamicBasic, type IRSlotDynamicConditional, type IRSlotDynamicLoop, IRSlotType, type IRSlots, type IRSlotsExpression, type IRSlotsStatic, type IfIRNode, type InsertNodeIRNode, type KeyOverride, type NodeTransform, type OperationNode, type PrependNodeIRNode, type RootIRNode, type RootNode, type SetDynamicEventsIRNode, type SetDynamicPropsIRNode, type SetEventIRNode, type SetHtmlIRNode, type SetModelValueIRNode, type SetPropIRNode, type SetTemplateRefIRNode, type SetTextIRNode, type SlotBlockIRNode, type SlotOutletIRNode, TransformContext, type TransformOptions, type TransformPreset, type VaporDirectiveNode, type VaporHelper, type WithDirectiveIRNode, compile, resolveDirectiveNode, resolveNode, transform, transformChildren, transformElement, transformNode, transformTemplateRef, transformText, transformVBind, transformVHtml, transformVModel, transformVOn, transformVShow, transformVSlot };
+export { type BaseIRNode, type BlockIRNode, type CompilerOptions, type CreateComponentIRNode, type CreateTextNodeIRNode, type DeclareOldRefIRNode, type DirectiveTransform, type DirectiveTransformResult, DynamicFlag, type ForIRNode, type HackOptions, type IRDynamicInfo, IRDynamicPropsKind, type IREffect, type IRFor, type IRNode, IRNodeTypes, type IRProp, type IRProps, type IRPropsDynamicAttribute, type IRPropsDynamicExpression, type IRPropsStatic, type IRSlotDynamic, type IRSlotDynamicBasic, type IRSlotDynamicConditional, type IRSlotDynamicLoop, IRSlotType, type IRSlots, type IRSlotsExpression, type IRSlotsStatic, type IfIRNode, type InsertNodeIRNode, type KeyOverride, type NodeTransform, type OperationNode, type PrependNodeIRNode, type RootIRNode, type RootNode, type SetDynamicEventsIRNode, type SetDynamicPropsIRNode, type SetEventIRNode, type SetHtmlIRNode, type SetInheritAttrsIRNode, type SetModelValueIRNode, type SetPropIRNode, type SetTemplateRefIRNode, type SetTextIRNode, type SlotBlockIRNode, type SlotOutletIRNode, TransformContext, type TransformOptions, type TransformPreset, type VaporDirectiveNode, type VaporHelper, type WithDirectiveIRNode, compile, resolveDirectiveNode, resolveNode, transform, transformChildren, transformElement, transformNode, transformTemplateRef, transformText, transformVBind, transformVHtml, transformVModel, transformVOn, transformVShow, transformVSlot };

package/dist/index.js

@@ -16,9 +16,10 @@ import { parse } from "@babel/parser";
 // src/transform.ts
 import {
   defaultOnError,
-  defaultOnWarn
+  defaultOnWarn,
+  walkIdentifiers
 } from "@vue/compiler-dom";
-import { EMPTY_OBJ, NOOP, extend, isArray } from "@vue/shared";
+import { EMPTY_OBJ, NOOP, extend, isArray, looseEqual } from "@vue/shared";
 
 // src/transforms/utils.ts
 import {
@@ -288,15 +289,16 @@ var IRNodeTypes = /* @__PURE__ */ ((IRNodeTypes2) => {
   IRNodeTypes2[IRNodeTypes2["SET_HTML"] = 7] = "SET_HTML";
   IRNodeTypes2[IRNodeTypes2["SET_TEMPLATE_REF"] = 8] = "SET_TEMPLATE_REF";
   IRNodeTypes2[IRNodeTypes2["SET_MODEL_VALUE"] = 9] = "SET_MODEL_VALUE";
-  IRNodeTypes2[IRNodeTypes2["INSERT_NODE"] = 10] = "INSERT_NODE";
-  IRNodeTypes2[IRNodeTypes2["PREPEND_NODE"] = 11] = "PREPEND_NODE";
-  IRNodeTypes2[IRNodeTypes2["CREATE_TEXT_NODE"] = 12] = "CREATE_TEXT_NODE";
-  IRNodeTypes2[IRNodeTypes2["CREATE_COMPONENT_NODE"] = 13] = "CREATE_COMPONENT_NODE";
-  IRNodeTypes2[IRNodeTypes2["SLOT_OUTLET_NODE"] = 14] = "SLOT_OUTLET_NODE";
-  IRNodeTypes2[IRNodeTypes2["WITH_DIRECTIVE"] = 15] = "WITH_DIRECTIVE";
-  IRNodeTypes2[IRNodeTypes2["DECLARE_OLD_REF"] = 16] = "DECLARE_OLD_REF";
-  IRNodeTypes2[IRNodeTypes2["IF"] = 17] = "IF";
-  IRNodeTypes2[IRNodeTypes2["FOR"] = 18] = "FOR";
+  IRNodeTypes2[IRNodeTypes2["SET_INHERIT_ATTRS"] = 10] = "SET_INHERIT_ATTRS";
+  IRNodeTypes2[IRNodeTypes2["INSERT_NODE"] = 11] = "INSERT_NODE";
+  IRNodeTypes2[IRNodeTypes2["PREPEND_NODE"] = 12] = "PREPEND_NODE";
+  IRNodeTypes2[IRNodeTypes2["CREATE_TEXT_NODE"] = 13] = "CREATE_TEXT_NODE";
+  IRNodeTypes2[IRNodeTypes2["CREATE_COMPONENT_NODE"] = 14] = "CREATE_COMPONENT_NODE";
+  IRNodeTypes2[IRNodeTypes2["SLOT_OUTLET_NODE"] = 15] = "SLOT_OUTLET_NODE";
+  IRNodeTypes2[IRNodeTypes2["WITH_DIRECTIVE"] = 16] = "WITH_DIRECTIVE";
+  IRNodeTypes2[IRNodeTypes2["DECLARE_OLD_REF"] = 17] = "DECLARE_OLD_REF";
+  IRNodeTypes2[IRNodeTypes2["IF"] = 18] = "IF";
+  IRNodeTypes2[IRNodeTypes2["FOR"] = 19] = "FOR";
   return IRNodeTypes2;
 })(IRNodeTypes || {});
 var DynamicFlag2 = /* @__PURE__ */ ((DynamicFlag3) => {
@@ -391,21 +393,24 @@ var TransformContext = class _TransformContext {
     if (this.inVOnce || expressions.length === 0) {
       return this.registerOperation(...operations);
     }
+    const ids = /* @__PURE__ */ new Set();
+    expressions.forEach((exp) => extractIdentifiers(ids, exp));
     const existing = this.block.effect.find(
-      (e) => isSameExpression(e.expressions, expressions)
+      (e) => looseEqual(e.identifiers, Array.from(ids))
     );
     if (existing) {
       existing.operations.push(...operations);
     } else {
       this.block.effect.push({
         expressions,
-        operations
+        operations,
+        earlyCheckExps: [],
+        declareNames: /* @__PURE__ */ new Set(),
+        rewrittenNames: /* @__PURE__ */ new Set(),
+        inVFor: this.inVFor > 0,
+        identifiers: Array.from(ids)
       });
     }
-    function isSameExpression(a, b) {
-      if (a.length !== b.length) return false;
-      return a.every((exp, i) => exp.content === b[i].content);
-    }
   }
   registerOperation(...node) {
     this.block.operation.push(...node);
@@ -463,6 +468,13 @@ function transformNode(context) {
     context.registerTemplate();
   }
 }
+function extractIdentifiers(ids, node) {
+  if (node.ast) {
+    walkIdentifiers(node.ast, (n) => ids.add(n.name), true);
+  } else if (node.ast === null) {
+    ids.add(node.content);
+  }
+}
 
 // src/transforms/transformElement.ts
 import {
@@ -663,14 +675,16 @@ var transformElement = (node, context) => {
       context,
       isComponent
     );
+    const singleRoot = context.root === context.parent && context.parent.node.children.filter((child) => !isJSXComponent(child)).length === 1;
     (isComponent ? transformComponentElement : transformNativeElement)(
       tag,
       propsResult,
+      singleRoot,
       context
     );
   };
 };
-function transformComponentElement(tag, propsResult, context) {
+function transformComponentElement(tag, propsResult, singleRoot, context) {
   let asset = true;
   if (!__BROWSER__2) {
     const fromSetup = resolveSetupReference(tag, context);
@@ -691,14 +705,13 @@ function transformComponentElement(tag, propsResult, context) {
     context.component.add(tag);
   }
   context.dynamic.flags |= 2 /* NON_TEMPLATE */ | 4 /* INSERT */;
-  const root = context.root === context.parent && context.parent.node.children.length === 1;
   context.registerOperation({
-    type: 13 /* CREATE_COMPONENT_NODE */,
+    type: 14 /* CREATE_COMPONENT_NODE */,
     id: context.reference(),
     tag,
     props: propsResult[0] ? propsResult[1] : [propsResult[1]],
     asset,
-    root,
+    root: singleRoot,
     slots: context.slots,
     once: context.inVOnce
   });
@@ -714,33 +727,47 @@ function resolveSetupReference(name, context) {
   const PascalName = capitalize(camelName);
   return bindings[name] ? name : bindings[camelName] ? camelName : bindings[PascalName] ? PascalName : void 0;
 }
-function transformNativeElement(tag, propsResult, context) {
+function transformNativeElement(tag, propsResult, singleRoot, context) {
   const { scopeId } = context.options;
   let template = "";
   template += `<${tag}`;
   if (scopeId) template += ` ${scopeId}`;
+  let staticProps = false;
+  const dynamicProps = [];
   if (propsResult[0]) {
     const [, dynamicArgs, expressions] = propsResult;
     context.registerEffect(expressions, {
       type: 3 /* SET_DYNAMIC_PROPS */,
       element: context.reference(),
-      props: dynamicArgs
+      props: dynamicArgs,
+      root: singleRoot
     });
   } else {
     for (const prop of propsResult[1]) {
       const { key, values } = prop;
       if (key.isStatic && values.length === 1 && values[0].isStatic) {
+        staticProps = true;
         template += ` ${key.content}`;
         if (values[0].content) template += `="${values[0].content}"`;
       } else {
+        dynamicProps.push(key.content);
         context.registerEffect(values, {
           type: 2 /* SET_PROP */,
           element: context.reference(),
-          prop
+          prop,
+          tag,
+          root: singleRoot
         });
       }
     }
   }
+  if (singleRoot) {
+    context.registerOperation({
+      type: 10 /* SET_INHERIT_ATTRS */,
+      staticProps,
+      dynamicProps: propsResult[0] ? true : dynamicProps
+    });
+  }
   template += `>${context.childrenTemplate.join("")}`;
   if (!isVoidTag(tag)) {
     template += `</${tag}>`;
@@ -902,14 +929,14 @@ function processDynamicChildren(context) {
           prevDynamics[0].flags -= 2 /* NON_TEMPLATE */;
           const anchor = prevDynamics[0].anchor = context.increaseId();
           context.registerOperation({
-            type: 10 /* INSERT_NODE */,
+            type: 11 /* INSERT_NODE */,
             elements: prevDynamics.map((child2) => child2.id),
             parent: context.reference(),
             anchor
           });
         } else {
           context.registerOperation({
-            type: 11 /* PREPEND_NODE */,
+            type: 12 /* PREPEND_NODE */,
             elements: prevDynamics.map((child2) => child2.id),
             parent: context.reference()
           });
@@ -921,7 +948,7 @@ function processDynamicChildren(context) {
   }
   if (prevDynamics.length) {
     context.registerOperation({
-      type: 10 /* INSERT_NODE */,
+      type: 11 /* INSERT_NODE */,
       elements: prevDynamics.map((child) => child.id),
       parent: context.reference()
     });
@@ -938,7 +965,7 @@ var transformTemplateRef = (node, context) => {
     const id = context.reference();
     const effect = !isConstantExpression(value);
     effect && context.registerOperation({
-      type: 16 /* DECLARE_OLD_REF */,
+      type: 17 /* DECLARE_OLD_REF */,
       id
     });
     context.registerEffect([value], {
@@ -959,7 +986,7 @@ function processConditionalExpression(node, context) {
   const condition = resolveExpression(test, context);
   const [branch, onExit] = createBranch(consequent, context);
   const operation = {
-    type: 17 /* IF */,
+    type: 18 /* IF */,
     id,
     condition,
     positive: branch,
@@ -989,7 +1016,7 @@ function processLogicalExpression(node, context) {
     context
   );
   const operation = {
-    type: 17 /* IF */,
+    type: 18 /* IF */,
     id,
     condition,
     positive: branch,
@@ -1032,8 +1059,13 @@ function processMapCallExpression(node, context) {
   const keyProperty = keyProp && resolveExpression(keyProp.value, context);
   return () => {
     exitBlock();
+    const { parent } = context;
+    let container;
+    if (parent && parent.block.node !== parent.node && parent.node.children.length === 1) {
+      container = parent.reference();
+    }
     context.registerOperation({
-      type: 18 /* FOR */,
+      type: 19 /* FOR */,
       id,
       source,
       value,
@@ -1041,7 +1073,8 @@ function processMapCallExpression(node, context) {
       index,
       keyProp: keyProperty,
       render,
-      once: context.inVOnce
+      once: context.inVOnce,
+      container
     });
   };
 }
@@ -1085,7 +1118,7 @@ function processTextLike(context) {
   const values = nodes.map((node) => createTextLikeExpression(node, context));
   context.dynamic.flags |= 4 /* INSERT */ | 2 /* NON_TEMPLATE */;
   context.registerOperation({
-    type: 12 /* CREATE_TEXT_NODE */,
+    type: 13 /* CREATE_TEXT_NODE */,
     id,
     values,
     effect: !values.every(isConstantExpression) && !context.inVOnce
@@ -1122,7 +1155,7 @@ function processCallExpression(node, context) {
   const root = context.root === context.parent && context.parent.node.children.length === 1;
   const tag = `() => ${context.ir.source.slice(node.start, node.end)}`;
   context.registerOperation({
-    type: 13 /* CREATE_COMPONENT_NODE */,
+    type: 14 /* CREATE_COMPONENT_NODE */,
     id: context.reference(),
     tag,
     props: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/compiler",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "Vue JSX Vapor Compiler",
   "type": "module",
   "keywords": [
@@ -48,19 +48,18 @@
     "./*": "./*"
   },
   "dependencies": {
-    "@babel/parser": "^7.24.7",
-    "@babel/types": "^7.24.7",
+    "@babel/parser": "^7.26.3",
+    "@babel/types": "^7.26.3",
     "@vue-macros/common": "^1.10.4",
-    "@vue/compiler-core": "https://pkg.pr.new/vuejs/core-vapor/@vue/compiler-core@2eae25e",
-    "@vue/compiler-dom": "https://pkg.pr.new/vuejs/core-vapor/@vue/compiler-dom@2eae25e",
-    "@vue/compiler-vapor": "https://pkg.pr.new/vuejs/core-vapor/@vue/compiler-vapor@2eae25e",
-    "@vue/runtime-vapor": "https://pkg.pr.new/vuejs/core-vapor/@vue/runtime-vapor@2eae25e",
-    "@vue/shared": "https://pkg.pr.new/vuejs/core-vapor/@vue/shared@2eae25e"
+    "@vue/compiler-core": "https://pkg.pr.new/vuejs/vue-vapor/@vue/compiler-core@9f73dbf",
+    "@vue/compiler-dom": "https://pkg.pr.new/vuejs/vue-vapor/@vue/compiler-dom@9f73dbf",
+    "@vue/compiler-vapor": "https://pkg.pr.new/vuejs/vue-vapor/@vue/compiler-vapor@9f73dbf",
+    "@vue/runtime-vapor": "https://pkg.pr.new/vuejs/vue-vapor/@vue/runtime-vapor@9f73dbf",
+    "@vue/shared": "https://pkg.pr.new/vuejs/vue-vapor/@vue/shared@9f73dbf"
   },
   "scripts": {
     "build": "tsup",
     "dev": "DEV=true tsup",
-    "typecheck": "tsc --noEmit",
     "release": "bumpp && npm publish",
     "test": "vitest"
   }