@vue-jsx-vapor/compiler 0.2.6 → 0.2.7

package/dist/index.cjs

@@ -248,10 +248,11 @@ function resolveNode(node, context) {
 var namespaceRE = /^(?:\$([\w-]+)\$)?([\w-]+)?/;
 function resolveDirectiveNode(node, context, withFn = false) {
   const { value, name } = node;
-  const nameString = name.type === "JSXNamespacedName" ? name.namespace.name : name.type === "JSXIdentifier" ? name.name : "";
+  let nameString = name.type === "JSXNamespacedName" ? name.namespace.name : name.type === "JSXIdentifier" ? name.name : "";
   let argString = name.type === "JSXNamespacedName" ? name.name.name : "";
   if (name.type !== "JSXNamespacedName" && !argString) {
-    const [, modifiers2] = nameString.split("_");
+    const [newName, modifiers2] = nameString.split("_");
+    nameString = newName;
     argString = `_${modifiers2}`;
   }
   let modifiers = [];
@@ -274,7 +275,7 @@ function resolveDirectiveNode(node, context, withFn = false) {
   const exp = value ? withFn && value.type === "JSXExpressionContainer" ? resolveExpressionWithFn(value.expression, context) : resolveExpression(value, context) : void 0;
   return {
     type: _compilerdom.NodeTypes.DIRECTIVE,
-    name: nameString,
+    name: nameString.slice(2),
     rawName: `${nameString}:${argString}`,
     exp,
     arg,
@@ -852,7 +853,7 @@ var transformTemplateRef = (node, context) => {
   };
 };
 
-// src/transforms/vIf.ts
+// src/transforms/expression.ts
 
 function processConditionalExpression(node, context) {
   const { test, consequent, alternate } = node;
@@ -948,8 +949,12 @@ function processTextLike(context) {
   const nexts = _optionalChain([context, 'access', _11 => _11.parent, 'access', _12 => _12.node, 'access', _13 => _13.children, 'optionalAccess', _14 => _14.slice, 'call', _15 => _15(context.index)]);
   const idx = nexts.findIndex((n) => !isTextLike(n));
   const nodes = idx > -1 ? nexts.slice(0, idx) : nexts;
-  const id = context.reference();
   const values = createTextLikeExpressions(nodes, context);
+  if (!values.length) {
+    context.dynamic.flags |= 2 /* NON_TEMPLATE */;
+    return;
+  }
+  const id = context.reference();
   context.dynamic.flags |= 4 /* INSERT */ | 2 /* NON_TEMPLATE */;
   context.registerOperation({
     type: 11 /* CREATE_TEXT_NODE */,
@@ -1230,7 +1235,7 @@ function transformComponentSlot(node, dir, context) {
     }
   };
 }
-var elseIfRE = /^else(-if)?$/;
+var elseIfRE = /^v-else(-if)?$/;
 function transformTemplateSlot(node, dir, context) {
   context.dynamic.flags |= 2 /* NON_TEMPLATE */;
   const arg = dir.arg && resolveSimpleExpressionNode(dir.arg);
@@ -1413,6 +1418,104 @@ var transformVOnce = (node, context) => {
   }
 };
 
+// src/transforms/vIf.ts
+
+
+
+
+
+
+var transformVIf = createStructuralDirectiveTransform(
+  ["if", "else", "else-if"],
+  processIf
+);
+var transformedIfNode = /* @__PURE__ */ new WeakMap();
+function processIf(node, attribute, context) {
+  const dir = resolveDirectiveNode(attribute, context);
+  if (dir.name !== "else" && (!dir.exp || !dir.exp.content.trim())) {
+    const loc = dir.exp ? dir.exp.loc : resolveLocation(node.loc, context);
+    context.options.onError(
+      _compilerdom.createCompilerError.call(void 0, _compilerdom.ErrorCodes.X_V_IF_NO_EXPRESSION, dir.loc)
+    );
+    dir.exp = _compilerdom.createSimpleExpression.call(void 0, `true`, false, loc);
+  }
+  context.dynamic.flags |= 2 /* NON_TEMPLATE */;
+  transformedIfNode.set(node, dir);
+  if (dir.name === "if") {
+    const id = context.reference();
+    context.dynamic.flags |= 4 /* INSERT */;
+    const [branch, onExit] = createBranch(node, context);
+    return () => {
+      onExit();
+      context.registerOperation({
+        type: 16 /* IF */,
+        id,
+        condition: dir.exp,
+        positive: branch,
+        once: context.inVOnce || _compilerdom.isConstantNode.call(void 0, attribute.value, context.options.bindingMetadata)
+      });
+    };
+  } else {
+    const siblingIf = getSiblingIf(context);
+    const { operation } = context.block;
+    let lastIfNode = operation.at(-1);
+    if (
+      // check if v-if is the sibling node
+      !siblingIf || // check if IfNode is the last operation and get the root IfNode
+      !lastIfNode || lastIfNode.type !== 16 /* IF */
+    ) {
+      context.options.onError(
+        _compilerdom.createCompilerError.call(void 0, 
+          _compilerdom.ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
+          resolveLocation(node.loc, context)
+        )
+      );
+      return;
+    }
+    while (lastIfNode.negative && lastIfNode.negative.type === 16 /* IF */) {
+      lastIfNode = lastIfNode.negative;
+    }
+    if (dir.name === "else-if" && lastIfNode.negative) {
+      context.options.onError(
+        _compilerdom.createCompilerError.call(void 0, 
+          _compilerdom.ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
+          resolveLocation(node.loc, context)
+        )
+      );
+    }
+    context.root.comment = [];
+    const [branch, onExit] = createBranch(node, context);
+    if (dir.name === "else") {
+      lastIfNode.negative = branch;
+    } else {
+      lastIfNode.negative = {
+        type: 16 /* IF */,
+        id: -1,
+        condition: dir.exp,
+        positive: branch,
+        once: context.inVOnce
+      };
+    }
+    return () => onExit();
+  }
+}
+function getSiblingIf(context) {
+  const parent = context.parent;
+  if (!parent) return;
+  const siblings = parent.node.children;
+  let sibling;
+  let i = siblings.indexOf(context.node);
+  while (--i >= 0) {
+    if (!isEmptyText(siblings[i])) {
+      sibling = siblings[i];
+      break;
+    }
+  }
+  if (sibling && sibling.type === "JSXElement" && transformedIfNode.has(sibling)) {
+    return sibling;
+  }
+}
+
 // src/compile.ts
 function compile(source, options = {}) {
   const resolvedOptions = _shared.extend.call(void 0, {}, options, {
@@ -1465,6 +1568,7 @@ function getBaseTransformPreset() {
   return [
     [
       transformVOnce,
+      transformVIf,
       transformVFor,
       transformTemplateRef,
       transformText,
@@ -1483,6 +1587,19 @@ function getBaseTransformPreset() {
   ];
 }
 
+// src/transforms/vText.ts
+
+var transformVText = (dir, node, context) => {
+  return _compilervapor.transformVText.call(void 0, 
+    resolveDirectiveNode(dir, context),
+    resolveNode(node, context),
+    context
+  );
+};
+
+
+
+
 
 
 
@@ -1507,4 +1624,4 @@ function getBaseTransformPreset() {
 
 
 
-exports.DynamicFlag = DynamicFlag; exports.IRDynamicPropsKind = IRDynamicPropsKind; exports.IRNodeTypes = IRNodeTypes; exports.IRSlotType = IRSlotType; exports.TransformContext = TransformContext; exports.compile = compile; exports.createStructuralDirectiveTransform = createStructuralDirectiveTransform; exports.generate = _compilervapor.generate; exports.resolveDirectiveNode = resolveDirectiveNode; exports.resolveNode = resolveNode; exports.transform = transform; exports.transformChildren = transformChildren; exports.transformElement = transformElement; exports.transformNode = transformNode; exports.transformTemplateRef = transformTemplateRef; exports.transformText = transformText; exports.transformVBind = transformVBind; exports.transformVFor = transformVFor; exports.transformVHtml = transformVHtml; exports.transformVModel = transformVModel; exports.transformVOn = transformVOn; exports.transformVShow = transformVShow; exports.transformVSlot = transformVSlot; exports.transformVSlots = transformVSlots;
+exports.DynamicFlag = DynamicFlag; exports.IRDynamicPropsKind = IRDynamicPropsKind; exports.IRNodeTypes = IRNodeTypes; exports.IRSlotType = IRSlotType; exports.TransformContext = TransformContext; exports.compile = compile; exports.createStructuralDirectiveTransform = createStructuralDirectiveTransform; exports.generate = _compilervapor.generate; exports.resolveDirectiveNode = resolveDirectiveNode; exports.resolveNode = resolveNode; exports.transform = transform; exports.transformChildren = transformChildren; exports.transformElement = transformElement; exports.transformNode = transformNode; exports.transformTemplateRef = transformTemplateRef; exports.transformText = transformText; exports.transformVBind = transformVBind; exports.transformVFor = transformVFor; exports.transformVHtml = transformVHtml; exports.transformVIf = transformVIf; exports.transformVModel = transformVModel; exports.transformVOn = transformVOn; exports.transformVOnce = transformVOnce; exports.transformVShow = transformVShow; exports.transformVSlot = transformVSlot; exports.transformVSlots = transformVSlots; exports.transformVText = transformVText;

package/dist/index.d.cts

@@ -360,4 +360,10 @@ declare const transformVHtml: DirectiveTransform;
 
 declare const transformVFor: NodeTransform;
 
-export { type BaseIRNode, type BlockIRNode, type CompilerOptions, type CreateComponentIRNode, type CreateTextNodeIRNode, type DeclareOldRefIRNode, type DirectiveIRNode, type DirectiveTransform, type DirectiveTransformResult, DynamicFlag, type ForIRNode, type GetTextChildIRNode, 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 SetPropIRNode, type SetTemplateRefIRNode, type SetTextIRNode, type SlotBlockIRNode, type SlotOutletIRNode, type StructuralDirectiveTransform, TransformContext, type TransformOptions, type TransformPreset, type VaporDirectiveNode, compile, createStructuralDirectiveTransform, resolveDirectiveNode, resolveNode, transform, transformChildren, transformElement, transformNode, transformTemplateRef, transformText, transformVBind, transformVFor, transformVHtml, transformVModel, transformVOn, transformVShow, transformVSlot, transformVSlots };
+declare const transformVIf: NodeTransform;
+
+declare const transformVOnce: NodeTransform;
+
+declare const transformVText: DirectiveTransform;
+
+export { type BaseIRNode, type BlockIRNode, type CompilerOptions, type CreateComponentIRNode, type CreateTextNodeIRNode, type DeclareOldRefIRNode, type DirectiveIRNode, type DirectiveTransform, type DirectiveTransformResult, DynamicFlag, type ForIRNode, type GetTextChildIRNode, 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 SetPropIRNode, type SetTemplateRefIRNode, type SetTextIRNode, type SlotBlockIRNode, type SlotOutletIRNode, type StructuralDirectiveTransform, TransformContext, type TransformOptions, type TransformPreset, type VaporDirectiveNode, compile, createStructuralDirectiveTransform, resolveDirectiveNode, resolveNode, transform, transformChildren, transformElement, transformNode, transformTemplateRef, transformText, transformVBind, transformVFor, transformVHtml, transformVIf, transformVModel, transformVOn, transformVOnce, transformVShow, transformVSlot, transformVSlots, transformVText };

package/dist/index.d.ts

@@ -360,4 +360,10 @@ declare const transformVHtml: DirectiveTransform;
 
 declare const transformVFor: NodeTransform;
 
-export { type BaseIRNode, type BlockIRNode, type CompilerOptions, type CreateComponentIRNode, type CreateTextNodeIRNode, type DeclareOldRefIRNode, type DirectiveIRNode, type DirectiveTransform, type DirectiveTransformResult, DynamicFlag, type ForIRNode, type GetTextChildIRNode, 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 SetPropIRNode, type SetTemplateRefIRNode, type SetTextIRNode, type SlotBlockIRNode, type SlotOutletIRNode, type StructuralDirectiveTransform, TransformContext, type TransformOptions, type TransformPreset, type VaporDirectiveNode, compile, createStructuralDirectiveTransform, resolveDirectiveNode, resolveNode, transform, transformChildren, transformElement, transformNode, transformTemplateRef, transformText, transformVBind, transformVFor, transformVHtml, transformVModel, transformVOn, transformVShow, transformVSlot, transformVSlots };
+declare const transformVIf: NodeTransform;
+
+declare const transformVOnce: NodeTransform;
+
+declare const transformVText: DirectiveTransform;
+
+export { type BaseIRNode, type BlockIRNode, type CompilerOptions, type CreateComponentIRNode, type CreateTextNodeIRNode, type DeclareOldRefIRNode, type DirectiveIRNode, type DirectiveTransform, type DirectiveTransformResult, DynamicFlag, type ForIRNode, type GetTextChildIRNode, 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 SetPropIRNode, type SetTemplateRefIRNode, type SetTextIRNode, type SlotBlockIRNode, type SlotOutletIRNode, type StructuralDirectiveTransform, TransformContext, type TransformOptions, type TransformPreset, type VaporDirectiveNode, compile, createStructuralDirectiveTransform, resolveDirectiveNode, resolveNode, transform, transformChildren, transformElement, transformNode, transformTemplateRef, transformText, transformVBind, transformVFor, transformVHtml, transformVIf, transformVModel, transformVOn, transformVOnce, transformVShow, transformVSlot, transformVSlots, transformVText };

package/dist/index.js

@@ -248,10 +248,11 @@ function resolveNode(node, context) {
 var namespaceRE = /^(?:\$([\w-]+)\$)?([\w-]+)?/;
 function resolveDirectiveNode(node, context, withFn = false) {
   const { value, name } = node;
-  const nameString = name.type === "JSXNamespacedName" ? name.namespace.name : name.type === "JSXIdentifier" ? name.name : "";
+  let nameString = name.type === "JSXNamespacedName" ? name.namespace.name : name.type === "JSXIdentifier" ? name.name : "";
   let argString = name.type === "JSXNamespacedName" ? name.name.name : "";
   if (name.type !== "JSXNamespacedName" && !argString) {
-    const [, modifiers2] = nameString.split("_");
+    const [newName, modifiers2] = nameString.split("_");
+    nameString = newName;
     argString = `_${modifiers2}`;
   }
   let modifiers = [];
@@ -274,7 +275,7 @@ function resolveDirectiveNode(node, context, withFn = false) {
   const exp = value ? withFn && value.type === "JSXExpressionContainer" ? resolveExpressionWithFn(value.expression, context) : resolveExpression(value, context) : void 0;
   return {
     type: NodeTypes.DIRECTIVE,
-    name: nameString,
+    name: nameString.slice(2),
     rawName: `${nameString}:${argString}`,
     exp,
     arg,
@@ -852,7 +853,7 @@ var transformTemplateRef = (node, context) => {
   };
 };
 
-// src/transforms/vIf.ts
+// src/transforms/expression.ts
 import { isStaticNode } from "@vue/compiler-dom";
 function processConditionalExpression(node, context) {
   const { test, consequent, alternate } = node;
@@ -948,8 +949,12 @@ function processTextLike(context) {
   const nexts = context.parent.node.children?.slice(context.index);
   const idx = nexts.findIndex((n) => !isTextLike(n));
   const nodes = idx > -1 ? nexts.slice(0, idx) : nexts;
-  const id = context.reference();
   const values = createTextLikeExpressions(nodes, context);
+  if (!values.length) {
+    context.dynamic.flags |= 2 /* NON_TEMPLATE */;
+    return;
+  }
+  const id = context.reference();
   context.dynamic.flags |= 4 /* INSERT */ | 2 /* NON_TEMPLATE */;
   context.registerOperation({
     type: 11 /* CREATE_TEXT_NODE */,
@@ -1230,7 +1235,7 @@ function transformComponentSlot(node, dir, context) {
     }
   };
 }
-var elseIfRE = /^else(-if)?$/;
+var elseIfRE = /^v-else(-if)?$/;
 function transformTemplateSlot(node, dir, context) {
   context.dynamic.flags |= 2 /* NON_TEMPLATE */;
   const arg = dir.arg && resolveSimpleExpressionNode(dir.arg);
@@ -1413,6 +1418,104 @@ var transformVOnce = (node, context) => {
   }
 };
 
+// src/transforms/vIf.ts
+import {
+  ErrorCodes as ErrorCodes5,
+  createCompilerError as createCompilerError5,
+  createSimpleExpression as createSimpleExpression4,
+  isConstantNode as isConstantNode2
+} from "@vue/compiler-dom";
+var transformVIf = createStructuralDirectiveTransform(
+  ["if", "else", "else-if"],
+  processIf
+);
+var transformedIfNode = /* @__PURE__ */ new WeakMap();
+function processIf(node, attribute, context) {
+  const dir = resolveDirectiveNode(attribute, context);
+  if (dir.name !== "else" && (!dir.exp || !dir.exp.content.trim())) {
+    const loc = dir.exp ? dir.exp.loc : resolveLocation(node.loc, context);
+    context.options.onError(
+      createCompilerError5(ErrorCodes5.X_V_IF_NO_EXPRESSION, dir.loc)
+    );
+    dir.exp = createSimpleExpression4(`true`, false, loc);
+  }
+  context.dynamic.flags |= 2 /* NON_TEMPLATE */;
+  transformedIfNode.set(node, dir);
+  if (dir.name === "if") {
+    const id = context.reference();
+    context.dynamic.flags |= 4 /* INSERT */;
+    const [branch, onExit] = createBranch(node, context);
+    return () => {
+      onExit();
+      context.registerOperation({
+        type: 16 /* IF */,
+        id,
+        condition: dir.exp,
+        positive: branch,
+        once: context.inVOnce || isConstantNode2(attribute.value, context.options.bindingMetadata)
+      });
+    };
+  } else {
+    const siblingIf = getSiblingIf(context);
+    const { operation } = context.block;
+    let lastIfNode = operation.at(-1);
+    if (
+      // check if v-if is the sibling node
+      !siblingIf || // check if IfNode is the last operation and get the root IfNode
+      !lastIfNode || lastIfNode.type !== 16 /* IF */
+    ) {
+      context.options.onError(
+        createCompilerError5(
+          ErrorCodes5.X_V_ELSE_NO_ADJACENT_IF,
+          resolveLocation(node.loc, context)
+        )
+      );
+      return;
+    }
+    while (lastIfNode.negative && lastIfNode.negative.type === 16 /* IF */) {
+      lastIfNode = lastIfNode.negative;
+    }
+    if (dir.name === "else-if" && lastIfNode.negative) {
+      context.options.onError(
+        createCompilerError5(
+          ErrorCodes5.X_V_ELSE_NO_ADJACENT_IF,
+          resolveLocation(node.loc, context)
+        )
+      );
+    }
+    context.root.comment = [];
+    const [branch, onExit] = createBranch(node, context);
+    if (dir.name === "else") {
+      lastIfNode.negative = branch;
+    } else {
+      lastIfNode.negative = {
+        type: 16 /* IF */,
+        id: -1,
+        condition: dir.exp,
+        positive: branch,
+        once: context.inVOnce
+      };
+    }
+    return () => onExit();
+  }
+}
+function getSiblingIf(context) {
+  const parent = context.parent;
+  if (!parent) return;
+  const siblings = parent.node.children;
+  let sibling;
+  let i = siblings.indexOf(context.node);
+  while (--i >= 0) {
+    if (!isEmptyText(siblings[i])) {
+      sibling = siblings[i];
+      break;
+    }
+  }
+  if (sibling && sibling.type === "JSXElement" && transformedIfNode.has(sibling)) {
+    return sibling;
+  }
+}
+
 // src/compile.ts
 function compile(source, options = {}) {
   const resolvedOptions = extend5({}, options, {
@@ -1465,6 +1568,7 @@ function getBaseTransformPreset() {
   return [
     [
       transformVOnce,
+      transformVIf,
       transformVFor,
       transformTemplateRef,
       transformText,
@@ -1482,6 +1586,16 @@ function getBaseTransformPreset() {
     }
   ];
 }
+
+// src/transforms/vText.ts
+import { transformVText as _transformVText } from "@vue/compiler-vapor";
+var transformVText = (dir, node, context) => {
+  return _transformVText(
+    resolveDirectiveNode(dir, context),
+    resolveNode(node, context),
+    context
+  );
+};
 export {
   DynamicFlag,
   IRDynamicPropsKind,
@@ -1502,9 +1616,12 @@ export {
   transformVBind,
   transformVFor,
   transformVHtml,
+  transformVIf,
   transformVModel,
   transformVOn,
+  transformVOnce,
   transformVShow,
   transformVSlot,
-  transformVSlots
+  transformVSlots,
+  transformVText
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/compiler",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Vue JSX Vapor Compiler",
   "type": "module",
   "keywords": [