babel-plugin-essor 0.0.17-beta.6 → 0.0.17-beta.7

package/dist/index.cjs

@@ -101,7 +101,8 @@ var IMPORTS_MAPS = [
   "nthChild"
 ];
 var SERVER_IMPORT_REMAPS = {
-  createComponent: "createSSRComponent",
+  createComponent: "ssrComponent",
+  render: "ssr",
   patchAttr: "ssrAttrDynamic"
 };
 var HYDRATE_IMPORT_REMAPS = {
@@ -1073,7 +1074,7 @@ function bindObjectPattern(pattern, base) {
 }
 function resolveObjectProp(prop) {
   const target = prop.value;
-  const shorthandId = core.types.isAssignmentPattern(target) ? target.left : target;
+  const shorthandId = unwrapBindingTarget(core.types.isAssignmentPattern(target) ? target.left : target);
   if (prop.shorthand && core.types.isIdentifier(shorthandId) && isSignal(shorthandId.name)) {
     return { keyExpr: core.types.identifier(stripSignalPrefix(shorthandId.name)), computed: false, target };
   }
@@ -1093,7 +1094,9 @@ function bindArrayPattern(pattern, base) {
       out.push(...bindTarget(el.argument, slice));
       return;
     }
-    out.push(...bindTarget(el, core.types.memberExpression(clone(base), core.types.numericLiteral(i2), true)));
+    out.push(
+      ...bindTarget(el, core.types.memberExpression(clone(base), core.types.numericLiteral(i2), true))
+    );
   });
   return out;
 }
@@ -1101,14 +1104,28 @@ function bindTarget(target, access) {
   if (core.types.isAssignmentPattern(target)) {
     return bindTarget(target.left, applyDefault(access, target.right));
   }
+  if (isTSWrappedBindingTarget(target)) {
+    return bindTarget(unwrapBindingTarget(target), access);
+  }
   if (core.types.isIdentifier(target)) {
     const value = isSignal(target.name) ? makeComputed(access) : access;
     return [core.types.variableDeclarator(core.types.identifier(target.name), value)];
   }
   if (core.types.isObjectPattern(target)) return bindObjectPattern(target, access);
   if (core.types.isArrayPattern(target)) return bindArrayPattern(target, access);
+  if (core.types.isMemberExpression(target)) return [];
   return [core.types.variableDeclarator(target, access)];
 }
+function isTSWrappedBindingTarget(target) {
+  return core.types.isTSAsExpression(target) || core.types.isTSSatisfiesExpression(target) || core.types.isTSTypeAssertion(target) || core.types.isTSNonNullExpression(target);
+}
+function unwrapBindingTarget(target) {
+  let current = target;
+  while (isTSWrappedBindingTarget(current)) {
+    current = current.expression;
+  }
+  return current;
+}
 function applyDefault(access, def) {
   return core.types.conditionalExpression(
     core.types.binaryExpression("===", clone(access), core.types.identifier("undefined")),
@@ -1907,7 +1924,7 @@ function renderChildExpressions(children, render, options = {}) {
 }
 function buildComponentInvocation(tag, node, options) {
   const createComponentId = options.wrap ? useImport("createComponent") : null;
-  const callee = resolveComponentCallee(tag, core.types.identifier(tag));
+  const callee = resolveComponentCallee(tag, buildComponentTagExpression(tag));
   const props = buildComponentPropsExpression(node, {
     dynamicPropsAsGetters: options.dynamicPropsAsGetters,
     cloneValues: options.cloneValues,
@@ -1920,6 +1937,13 @@ function buildComponentInvocation(tag, node, options) {
   }
   return core.types.callExpression(callee, [props]);
 }
+function buildComponentTagExpression(tag) {
+  const [head, ...parts] = tag.split(".");
+  return parts.reduce(
+    (expr, part) => core.types.memberExpression(expr, core.types.identifier(part)),
+    core.types.identifier(head)
+  );
+}
 
 // src/jsx/server.ts
 var SERVER_TEXT_ESCAPES = {
@@ -2022,28 +2046,13 @@ function escapeChildExpression(expr) {
   if (isSafeServerHtml(expr)) {
     return expr;
   }
-  if (core.types.isParenthesizedExpression(expr)) {
-    expr.expression = escapeChildExpression(expr.expression);
-    return expr;
-  }
   if (core.types.isLogicalExpression(expr)) {
     if (expr.operator === "&&") {
       expr.right = escapeChildExpression(expr.right);
+      return expr;
     } else {
-      expr.left = escapeChildExpression(expr.left);
-      expr.right = escapeChildExpression(expr.right);
+      return core.types.callExpression(useImport("escape"), [expr]);
     }
-    return expr;
-  }
-  if (core.types.isConditionalExpression(expr)) {
-    expr.consequent = escapeChildExpression(expr.consequent);
-    expr.alternate = escapeChildExpression(expr.alternate);
-    return expr;
-  }
-  if (core.types.isSequenceExpression(expr) && expr.expressions.length > 0) {
-    const last = expr.expressions.length - 1;
-    expr.expressions[last] = escapeChildExpression(expr.expressions[last]);
-    return expr;
   }
   return core.types.callExpression(useImport("escape"), [expr]);
 }

package/dist/index.d.cts

@@ -1,11 +1,11 @@
-import { PluginObj } from '@babel/core';
+import { PluginObject } from '@babel/core';
 
 /**
  * Babel plugin for Essor framework.
  * Transforms Essor JSX and reactivity syntax into runtime calls.
  *
- * @returns {PluginObj} The Babel plugin object.
+ * @returns {PluginObject} The Babel plugin object.
  */
-declare function export_default(): PluginObj;
+declare function export_default(): PluginObject;
 
 export { export_default as default };

package/dist/index.d.ts

@@ -1,11 +1,11 @@
-import { PluginObj } from '@babel/core';
+import { PluginObject } from '@babel/core';
 
 /**
  * Babel plugin for Essor framework.
  * Transforms Essor JSX and reactivity syntax into runtime calls.
  *
- * @returns {PluginObj} The Babel plugin object.
+ * @returns {PluginObject} The Babel plugin object.
  */
-declare function export_default(): PluginObj;
+declare function export_default(): PluginObject;
 
 export { export_default as default };

package/dist/index.js

@@ -99,7 +99,8 @@ var IMPORTS_MAPS = [
   "nthChild"
 ];
 var SERVER_IMPORT_REMAPS = {
-  createComponent: "createSSRComponent",
+  createComponent: "ssrComponent",
+  render: "ssr",
   patchAttr: "ssrAttrDynamic"
 };
 var HYDRATE_IMPORT_REMAPS = {
@@ -1071,7 +1072,7 @@ function bindObjectPattern(pattern, base) {
 }
 function resolveObjectProp(prop) {
   const target = prop.value;
-  const shorthandId = types.isAssignmentPattern(target) ? target.left : target;
+  const shorthandId = unwrapBindingTarget(types.isAssignmentPattern(target) ? target.left : target);
   if (prop.shorthand && types.isIdentifier(shorthandId) && isSignal(shorthandId.name)) {
     return { keyExpr: types.identifier(stripSignalPrefix(shorthandId.name)), computed: false, target };
   }
@@ -1091,7 +1092,9 @@ function bindArrayPattern(pattern, base) {
       out.push(...bindTarget(el.argument, slice));
       return;
     }
-    out.push(...bindTarget(el, types.memberExpression(clone(base), types.numericLiteral(i2), true)));
+    out.push(
+      ...bindTarget(el, types.memberExpression(clone(base), types.numericLiteral(i2), true))
+    );
   });
   return out;
 }
@@ -1099,14 +1102,28 @@ function bindTarget(target, access) {
   if (types.isAssignmentPattern(target)) {
     return bindTarget(target.left, applyDefault(access, target.right));
   }
+  if (isTSWrappedBindingTarget(target)) {
+    return bindTarget(unwrapBindingTarget(target), access);
+  }
   if (types.isIdentifier(target)) {
     const value = isSignal(target.name) ? makeComputed(access) : access;
     return [types.variableDeclarator(types.identifier(target.name), value)];
   }
   if (types.isObjectPattern(target)) return bindObjectPattern(target, access);
   if (types.isArrayPattern(target)) return bindArrayPattern(target, access);
+  if (types.isMemberExpression(target)) return [];
   return [types.variableDeclarator(target, access)];
 }
+function isTSWrappedBindingTarget(target) {
+  return types.isTSAsExpression(target) || types.isTSSatisfiesExpression(target) || types.isTSTypeAssertion(target) || types.isTSNonNullExpression(target);
+}
+function unwrapBindingTarget(target) {
+  let current = target;
+  while (isTSWrappedBindingTarget(current)) {
+    current = current.expression;
+  }
+  return current;
+}
 function applyDefault(access, def) {
   return types.conditionalExpression(
     types.binaryExpression("===", clone(access), types.identifier("undefined")),
@@ -1905,7 +1922,7 @@ function renderChildExpressions(children, render, options = {}) {
 }
 function buildComponentInvocation(tag, node, options) {
   const createComponentId = options.wrap ? useImport("createComponent") : null;
-  const callee = resolveComponentCallee(tag, types.identifier(tag));
+  const callee = resolveComponentCallee(tag, buildComponentTagExpression(tag));
   const props = buildComponentPropsExpression(node, {
     dynamicPropsAsGetters: options.dynamicPropsAsGetters,
     cloneValues: options.cloneValues,
@@ -1918,6 +1935,13 @@ function buildComponentInvocation(tag, node, options) {
   }
   return types.callExpression(callee, [props]);
 }
+function buildComponentTagExpression(tag) {
+  const [head, ...parts] = tag.split(".");
+  return parts.reduce(
+    (expr, part) => types.memberExpression(expr, types.identifier(part)),
+    types.identifier(head)
+  );
+}
 
 // src/jsx/server.ts
 var SERVER_TEXT_ESCAPES = {
@@ -2020,28 +2044,13 @@ function escapeChildExpression(expr) {
   if (isSafeServerHtml(expr)) {
     return expr;
   }
-  if (types.isParenthesizedExpression(expr)) {
-    expr.expression = escapeChildExpression(expr.expression);
-    return expr;
-  }
   if (types.isLogicalExpression(expr)) {
     if (expr.operator === "&&") {
       expr.right = escapeChildExpression(expr.right);
+      return expr;
     } else {
-      expr.left = escapeChildExpression(expr.left);
-      expr.right = escapeChildExpression(expr.right);
+      return types.callExpression(useImport("escape"), [expr]);
     }
-    return expr;
-  }
-  if (types.isConditionalExpression(expr)) {
-    expr.consequent = escapeChildExpression(expr.consequent);
-    expr.alternate = escapeChildExpression(expr.alternate);
-    return expr;
-  }
-  if (types.isSequenceExpression(expr) && expr.expressions.length > 0) {
-    const last = expr.expressions.length - 1;
-    expr.expressions[last] = escapeChildExpression(expr.expressions[last]);
-    return expr;
   }
   return types.callExpression(useImport("escape"), [expr]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-essor",
-  "version": "0.0.17-beta.6",
+  "version": "0.0.17-beta.7",
   "description": "",
   "type": "module",
   "keywords": [],
@@ -32,16 +32,16 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@babel/core": "^7.29.7",
-    "@babel/generator": "^7.29.7",
-    "@estjs/shared": "0.0.17-beta.6"
+    "@babel/core": "^8.0.1",
+    "@babel/generator": "^8.0.0",
+    "@estjs/shared": "0.0.17-beta.7"
   },
   "devDependencies": {
-    "@babel/traverse": "^7.29.7",
-    "@babel/types": "^7.29.7",
-    "@types/babel__core": "^7.20.5",
-    "@types/babel__generator": "^7.27.0",
-    "@types/babel__traverse": "^7.28.0"
+    "@babel/traverse": "^8.0.0",
+    "@babel/types": "^8.0.0"
+  },
+  "engines": {
+    "node": "^22.18.0 || >=24.11.0"
   },
   "scripts": {
     "build": "tsup",