babel-plugin-essor 0.0.17-beta.1 → 0.0.17-beta.2

package/dist/index.cjs

@@ -61,7 +61,6 @@ var IMPORTS_MAPS = [
   "reactive",
   "memoEffect",
   "omitProps",
-  "resolveDefaultProps",
   // component
   "createComponent",
   "Fragment",
@@ -83,9 +82,7 @@ var IMPORTS_MAPS = [
   "addEventListener",
   // rendering related
   "render",
-  "toRawHtmlString",
-  "toEscapedHtmlString",
-  "markAsRawHtml",
+  "escape",
   "escapeHTML",
   "getHydrationKey",
   "hydrationAnchor",
@@ -113,31 +110,13 @@ var HYDRATE_IMPORT_REMAPS = {
   patchAttr: "patchAttrHydrate",
   patchStyle: "patchStyleHydrate"
 };
-var SERVER_ONLY_NAMES = [
-  "render",
-  "toRawHtmlString",
-  "toEscapedHtmlString",
-  "markAsRawHtml",
-  "escapeHTML",
-  "Fragment",
-  "Portal",
-  "Suspense",
-  "getHydrationKey",
-  "ssrAttr",
-  "ssrBind",
-  "ssrClass",
-  "ssrSelected",
-  "ssrStyle",
-  "ssrSpread",
-  "ssrTextValue",
-  "createComponent",
-  "patchAttr"
-];
-var _remaps = SERVER_IMPORT_REMAPS;
-var SERVER_EXPORTS = new Set(SERVER_ONLY_NAMES.map((name) => {
-  var _a;
-  return (_a = _remaps[name]) != null ? _a : name;
-}));
+var UNIVERSAL_IMPORTS = /* @__PURE__ */ new Set([
+  "signal",
+  "computed",
+  "reactive",
+  "memoEffect",
+  "omitProps"
+]);
 var importMap = Object.fromEntries(IMPORTS_MAPS.map((name) => [name, name]));
 var TRANSFORM_PROPERTY_NAME = "__props";
 var FRAGMENT_NAME = "Fragment";
@@ -224,7 +203,7 @@ function computeDeclarationCacheKey(expression) {
   const parts = [];
   for (const el of expression.elements) {
     if (el == null) {
-      parts.push("\0null");
+      parts.push(" null");
       continue;
     }
     if (core.types.isStringLiteral(el)) {
@@ -257,23 +236,26 @@ function createImport(path) {
   const ctx = getCompileContext();
   if (!ctx.imports.size) return;
   const { mode } = ctx.options;
-  const serverSpecifiers = [];
-  const clientSpecifiers = [];
-  for (const name of ctx.imports) {
-    const local = ctx.importIdentifiers[name];
-    const importedName = resolveImportedName(name, mode);
-    const specifier = core.types.importSpecifier(local, core.types.identifier(importedName));
-    if (mode === "server" /* SERVER */ && SERVER_EXPORTS.has(importedName)) {
-      serverSpecifiers.push(specifier);
-    } else {
-      clientSpecifiers.push(specifier);
-    }
-  }
-  if (serverSpecifiers.length > 0) {
-    path.node.body.unshift(core.types.importDeclaration(serverSpecifiers, core.types.stringLiteral("essor/server")));
-  }
-  if (clientSpecifiers.length > 0) {
-    path.node.body.unshift(core.types.importDeclaration(clientSpecifiers, core.types.stringLiteral("essor")));
+  const emit = (names, source) => {
+    if (!names.length) return;
+    const specifiers = names.map(
+      (name) => core.types.importSpecifier(
+        ctx.importIdentifiers[name],
+        core.types.identifier(resolveImportedName(name, mode))
+      )
+    );
+    path.node.body.unshift(core.types.importDeclaration(specifiers, core.types.stringLiteral(source)));
+  };
+  if (mode === "server" /* SERVER */) {
+    const universal = [];
+    const server = [];
+    for (const name of ctx.imports) {
+      (UNIVERSAL_IMPORTS.has(name) ? universal : server).push(name);
+    }
+    emit(server, "essor/server");
+    emit(universal, "essor");
+  } else {
+    emit([...ctx.imports], "essor");
   }
 }
 
@@ -821,38 +803,55 @@ function applyHmr(programPath, ctx) {
     ])
   );
 }
-function isMemberAccessingProperty(node, propertyName) {
-  if (!node.computed && core.types.isIdentifier(node.property) && node.property.name === propertyName) {
-    return true;
-  }
-  if (node.computed && core.types.isStringLiteral(node.property) && node.property.value === propertyName) {
-    return true;
+var DEFAULT_PREFIX = "$";
+var cachedContext = null;
+var cachedPrefix = DEFAULT_PREFIX;
+function getSignalPrefix() {
+  var _a;
+  const ctx = getCompileContext();
+  if (ctx !== cachedContext) {
+    cachedContext = ctx;
+    cachedPrefix = (_a = ctx.options.signalPrefix) != null ? _a : DEFAULT_PREFIX;
   }
-  return false;
+  return cachedPrefix;
 }
 function isSignal(name) {
-  var _a;
-  const prefix = (_a = getCompileContext().options.signalPrefix) != null ? _a : "$";
-  return !!name && x(name, prefix);
+  return !!name && x(name, getSignalPrefix());
 }
 function stripSignalPrefix(name) {
-  var _a;
-  const prefix = (_a = getCompileContext().options.signalPrefix) != null ? _a : "$";
+  const prefix = getSignalPrefix();
   return x(name, prefix) ? name.slice(prefix.length) : name;
 }
+function isMemberLike(node) {
+  return core.types.isMemberExpression(node) || core.types.isOptionalMemberExpression(node);
+}
+function isMemberAccessingProperty(node, propertyName) {
+  if (node.computed) {
+    return core.types.isStringLiteral(node.property) && node.property.value === propertyName;
+  }
+  return core.types.isIdentifier(node.property) && node.property.name === propertyName;
+}
+function clone(node) {
+  return core.types.cloneNode(node, true);
+}
+function valueAccess(object) {
+  return core.types.memberExpression(object, core.types.identifier("value"));
+}
+function makeComputed(access) {
+  return core.types.callExpression(useImport("computed"), [core.types.arrowFunctionExpression([], access)]);
+}
 function replaceSymbol(path) {
   const { init, id } = path.node;
   if (core.types.isObjectPattern(id) || core.types.isArrayPattern(id)) {
     transformDestructuring(path);
     return;
   }
-  if (!core.types.isIdentifier(id)) return;
-  if (!isSignal(id.name)) return;
-  if (isAlreadySignalCall(init)) return;
+  if (!core.types.isIdentifier(id) || !isSignal(id.name) || isAlreadySignalCall(init)) return;
   const isComputed = isFunctionLikeExpression(init) && path.parent.kind === "const";
-  const importName = isComputed ? "computed" : "signal";
-  const args = init ? [init] : [];
-  path.node.init = core.types.callExpression(useImport(importName), args);
+  path.node.init = core.types.callExpression(
+    useImport(isComputed ? "computed" : "signal"),
+    init ? [init] : []
+  );
 }
 function isAlreadySignalCall(init) {
   if (!init || !core.types.isCallExpression(init) || !core.types.isIdentifier(init.callee)) return false;
@@ -876,26 +875,22 @@ function transformDestructuring(path) {
     path.skip();
     return;
   }
-  const base = signalSourceBase(init);
-  const declarators = bindPattern(pattern, base);
+  const declarators = bindPattern(pattern, signalSourceBase(init));
   const declaration = declPath.node;
   const index = declaration.declarations.indexOf(path.node);
   declaration.declarations.splice(index, 1, ...declarators);
   path.skip();
 }
-function clone(node) {
-  return core.types.cloneNode(node, true);
-}
 function isSignalSource(init) {
   if (core.types.isIdentifier(init)) return isSignal(init.name);
-  if (core.types.isMemberExpression(init) && core.types.isIdentifier(init.object) && isSignal(init.object.name)) {
+  if (isMemberLike(init) && core.types.isIdentifier(init.object) && isSignal(init.object.name)) {
     return isMemberAccessingProperty(init, "value");
   }
   return false;
 }
 function signalSourceBase(init) {
   if (core.types.isIdentifier(init) && isSignal(init.name)) {
-    return core.types.memberExpression(core.types.identifier(init.name), core.types.identifier("value"));
+    return valueAccess(core.types.identifier(init.name));
   }
   return clone(init);
 }
@@ -926,8 +921,7 @@ function bindObjectPattern(pattern, base) {
     }
     const { keyExpr, computed, target } = resolveObjectProp(prop);
     handledKeys.push({ key: clone(keyExpr), computed });
-    const access = core.types.memberExpression(clone(base), keyExpr, computed);
-    out.push(...bindTarget(target, access));
+    out.push(...bindTarget(target, core.types.memberExpression(clone(base), keyExpr, computed)));
   }
   return out;
 }
@@ -953,8 +947,7 @@ function bindArrayPattern(pattern, base) {
       out.push(...bindTarget(el.argument, slice));
       return;
     }
-    const access = core.types.memberExpression(clone(base), core.types.numericLiteral(i2), true);
-    out.push(...bindTarget(el, access));
+    out.push(...bindTarget(el, core.types.memberExpression(clone(base), core.types.numericLiteral(i2), true)));
   });
   return out;
 }
@@ -970,9 +963,6 @@ function bindTarget(target, access) {
   if (core.types.isArrayPattern(target)) return bindArrayPattern(target, access);
   return [core.types.variableDeclarator(target, access)];
 }
-function makeComputed(access) {
-  return core.types.callExpression(useImport("computed"), [core.types.arrowFunctionExpression([], access)]);
-}
 function applyDefault(access, def) {
   return core.types.conditionalExpression(
     core.types.binaryExpression("===", clone(access), core.types.identifier("undefined")),
@@ -997,23 +987,24 @@ function buildObjectRest(rest, base, handledKeys) {
   return core.types.variableDeclarator(omits(arg), clone(base));
 }
 function symbolIdentifier(path) {
-  const name = path.node.name;
+  const { name } = path.node;
   if (!isSignal(name)) return;
-  if (!shouldProcessIdentifier(path, path.parentPath)) return;
+  if (!shouldProcessIdentifier(path)) return;
   if (isAlreadyValueAccess(path)) return;
   const parent = path.parent;
-  if (core.types.isMemberExpression(parent) && parent.property === path.node) return;
-  path.replaceWith(core.types.memberExpression(core.types.identifier(name), core.types.identifier("value")));
+  if (isMemberLike(parent) && parent.property === path.node && !parent.computed) return;
+  path.replaceWith(valueAccess(core.types.identifier(name)));
   path.skip();
 }
-function shouldProcessIdentifier(path, parentPath) {
+function shouldProcessIdentifier(path) {
+  const parentPath = path.parentPath;
   if (!parentPath) return false;
   const parent = parentPath.node;
   const node = path.node;
-  if (core.types.isVariableDeclarator(parent) || core.types.isArrayPattern(parent) || core.types.isObjectPattern(parent)) {
+  if (core.types.isVariableDeclarator(parent) || core.types.isArrayPattern(parent) || core.types.isObjectPattern(parent) || core.types.isRestElement(parent)) {
     return false;
   }
-  if (core.types.isImportSpecifier(parent) || core.types.isImportDefaultSpecifier(parent) || core.types.isImportNamespaceSpecifier(parent)) {
+  if (core.types.isImportSpecifier(parent) || core.types.isImportDefaultSpecifier(parent) || core.types.isImportNamespaceSpecifier(parent) || core.types.isExportSpecifier(parent)) {
     return false;
   }
   if (core.types.isFunctionDeclaration(parent) || core.types.isFunctionExpression(parent)) {
@@ -1024,7 +1015,7 @@ function shouldProcessIdentifier(path, parentPath) {
   }
   if (core.types.isClassDeclaration(parent) && parent.id === node) return false;
   if (core.types.isObjectMethod(parent) || core.types.isClassMethod(parent)) return false;
-  if (core.types.isObjectProperty(parent) && parent.key === node) return false;
+  if (core.types.isObjectProperty(parent) && parent.key === node && !parent.computed) return false;
   if (core.types.isLabeledStatement(parent) && parent.label === node) return false;
   if ((core.types.isBreakStatement(parent) || core.types.isContinueStatement(parent)) && parent.label === node) {
     return false;
@@ -1033,38 +1024,27 @@ function shouldProcessIdentifier(path, parentPath) {
 }
 function isAlreadyValueAccess(path) {
   const parent = path.parent;
-  if (core.types.isMemberExpression(parent) && parent.object === path.node) {
+  if (isMemberLike(parent) && parent.object === path.node) {
     return isMemberAccessingProperty(parent, "value");
   }
   if (!core.types.isParenthesizedExpression(parent) && !core.types.isTSAsExpression(parent) && !core.types.isTSNonNullExpression(parent)) {
     return false;
   }
   const ancestor = path.findParent((p2) => {
-    if (!p2.isMemberExpression()) return false;
-    const m = p2.node;
-    return m.object === path.node && isMemberAccessingProperty(m, "value");
+    if (!isMemberLike(p2.node)) return false;
+    return isMemberAccessingProperty(p2.node, "value");
   });
   return !!ancestor;
 }
 function symbolAssignment(path) {
   const { left } = path.node;
-  if (!core.types.isIdentifier(left)) return;
-  if (!isSignal(left.name)) return;
-  if (isAlreadyValueAssignment(left)) return;
-  path.node.left = core.types.memberExpression(core.types.identifier(left.name), core.types.identifier("value"));
-}
-function isAlreadyValueAssignment(left) {
-  return core.types.isMemberExpression(left) && isMemberAccessingProperty(left, "value");
+  if (!core.types.isIdentifier(left) || !isSignal(left.name)) return;
+  path.node.left = valueAccess(core.types.identifier(left.name));
 }
 function symbolUpdate(path) {
   const { argument } = path.node;
-  if (!core.types.isIdentifier(argument)) return;
-  if (!isSignal(argument.name)) return;
-  if (isAlreadyValueUpdate(argument)) return;
-  path.node.argument = core.types.memberExpression(core.types.identifier(argument.name), core.types.identifier("value"));
-}
-function isAlreadyValueUpdate(argument) {
-  return core.types.isMemberExpression(argument) && isMemberAccessingProperty(argument, "value");
+  if (!core.types.isIdentifier(argument) || !isSignal(argument.name)) return;
+  path.node.argument = valueAccess(core.types.identifier(argument.name));
 }
 var symbolVisitors = {
   VariableDeclarator: replaceSymbol,
@@ -1072,114 +1052,174 @@ var symbolVisitors = {
   AssignmentExpression: symbolAssignment,
   UpdateExpression: symbolUpdate
 };
-function transformProperty(path, properties, parentPath, defaults = {}) {
-  for (const property of properties) {
-    if (!core.types.isObjectProperty(property)) continue;
-    const key = property.key;
-    const keyName = core.types.isIdentifier(key) ? key.name : core.types.isStringLiteral(key) ? key.value : "";
-    if (!keyName) continue;
-    const value = property.value;
-    const childPath = `${parentPath}.${keyName}`;
-    if (core.types.isAssignmentPattern(value)) {
-      const left = value.left;
-      if (core.types.isIdentifier(left)) {
-        defaults[keyName] = value.right;
-        path.scope.rename(left.name, childPath);
-      } else if (core.types.isObjectPattern(left)) {
-        transformProperty(path, left.properties, childPath, defaults);
-        defaults[keyName] = value.right;
-      }
-    } else if (core.types.isIdentifier(value)) {
-      path.scope.rename(value.name, childPath);
-    } else if (core.types.isObjectPattern(value)) {
-      const nested = {};
-      transformProperty(path, value.properties, childPath, nested);
-      if (Object.keys(nested).length > 0) defaults[keyName] = nested;
-    }
-  }
-  return defaults;
-}
-function buildRestVariableDeclaration(restName, parentPath, excludeProps) {
-  const validExcludeProps = excludeProps.filter(Boolean);
-  const pathParts = parentPath.split(".").filter(Boolean);
-  let sourceObject = core.types.identifier(pathParts[0] || "__props");
-  for (let i2 = 1; i2 < pathParts.length; i2++) {
-    sourceObject = core.types.memberExpression(sourceObject, core.types.identifier(pathParts[i2]));
-  }
-  const init = validExcludeProps.length === 0 ? sourceObject : core.types.callExpression(useImport(importMap.omitProps), [
-    sourceObject,
-    core.types.arrayExpression(validExcludeProps.map((name) => core.types.stringLiteral(name)))
+function clone2(node) {
+  return core.types.cloneNode(node, true);
+}
+function applyDefault2(access, def) {
+  return core.types.conditionalExpression(
+    core.types.binaryExpression("===", clone2(access), core.types.identifier("undefined")),
+    def,
+    clone2(access)
+  );
+}
+function resolveKey(prop) {
+  const key = prop.key;
+  if (prop.computed) {
+    return { keyExpr: key, computed: true, excludeKey: key };
+  }
+  if (core.types.isIdentifier(key)) {
+    return {
+      keyExpr: core.types.identifier(key.name),
+      computed: false,
+      excludeKey: core.types.stringLiteral(key.name)
+    };
+  }
+  if (core.types.isStringLiteral(key)) {
+    return {
+      keyExpr: core.types.stringLiteral(key.value),
+      computed: true,
+      excludeKey: core.types.stringLiteral(key.value)
+    };
+  }
+  if (core.types.isNumericLiteral(key)) {
+    return {
+      keyExpr: core.types.numericLiteral(key.value),
+      computed: true,
+      excludeKey: core.types.stringLiteral(String(key.value))
+    };
+  }
+  return { keyExpr: key, computed: true, excludeKey: null };
+}
+function restName(argument) {
+  return core.types.isIdentifier(argument) ? argument.name : null;
+}
+function buildObjectRestInit(base, excludeKeys) {
+  if (excludeKeys.length === 0) return clone2(base);
+  return core.types.callExpression(useImport(importMap.omitProps), [
+    clone2(base),
+    core.types.arrayExpression(excludeKeys.map((key) => clone2(key)))
   ]);
-  return core.types.variableDeclaration("const", [core.types.variableDeclarator(core.types.identifier(restName), init)]);
 }
-function transformRestProperties(path, restProperties, notRestNames = []) {
-  if (!core.types.isIdentifier(restProperties.argument)) return;
-  const restName = restProperties.argument.name;
-  if (notRestNames.length === 0) {
-    path.node.params[0] = core.types.identifier(restName);
+function collectTarget(target, access, leaves, rests) {
+  if (core.types.isAssignmentPattern(target)) {
+    collectTarget(target.left, applyDefault2(access, target.right), leaves, rests);
     return;
   }
-  const declaration = buildRestVariableDeclaration(restName, TRANSFORM_PROPERTY_NAME, notRestNames);
-  const body = path.node.body;
-  body.body.unshift(declaration);
-}
-function buildDefaultValueObject(defaults) {
-  if (!P(defaults)) return core.types.objectExpression([]);
-  const properties = [];
-  for (const [key, value] of Object.entries(defaults)) {
-    if (!key) continue;
-    let propertyValue;
-    if (P(value) && !core.types.isNode(value)) {
-      propertyValue = buildDefaultValueObject(value);
-    } else if (core.types.isExpression(value)) {
-      propertyValue = value;
-    } else {
+  if (core.types.isIdentifier(target)) {
+    leaves.push({ name: target.name, accessor: access });
+    return;
+  }
+  if (core.types.isObjectPattern(target)) {
+    collectObjectPattern(target, access, leaves, rests);
+    return;
+  }
+  if (core.types.isArrayPattern(target)) {
+    collectArrayPattern(target, access, leaves, rests);
+    return;
+  }
+}
+function collectObjectPattern(pattern, base, leaves, rests) {
+  const excludeKeys = [];
+  for (const prop of pattern.properties) {
+    if (core.types.isRestElement(prop)) {
+      const name = restName(prop.argument);
+      if (name) rests.push({ name, init: buildObjectRestInit(base, excludeKeys) });
       continue;
     }
-    properties.push(core.types.objectProperty(core.types.identifier(key), propertyValue));
-  }
-  return core.types.objectExpression(properties);
+    const { keyExpr, computed, excludeKey } = resolveKey(prop);
+    if (excludeKey !== null) excludeKeys.push(excludeKey);
+    const access = core.types.memberExpression(clone2(base), keyExpr, computed);
+    collectTarget(prop.value, access, leaves, rests);
+  }
+}
+function spreadOf(base) {
+  return core.types.arrayExpression([core.types.spreadElement(clone2(base))]);
+}
+function collectArrayPattern(pattern, base, leaves, rests) {
+  pattern.elements.forEach((element, index) => {
+    if (element == null) return;
+    if (core.types.isRestElement(element)) {
+      const name = restName(element.argument);
+      if (name) {
+        const init = core.types.callExpression(core.types.memberExpression(spreadOf(base), core.types.identifier("slice")), [
+          core.types.numericLiteral(index)
+        ]);
+        rests.push({ name, init });
+      }
+      return;
+    }
+    const access = core.types.memberExpression(spreadOf(base), core.types.numericLiteral(index), true);
+    collectTarget(element, access, leaves, rests);
+  });
 }
-function buildDefaultValue(path, defaults) {
-  path.node.params[0] = core.types.identifier(TRANSFORM_PROPERTY_NAME);
-  if (Object.keys(defaults).length === 0) return;
-  const resolveDefaultProps = useImport(importMap.resolveDefaultProps);
-  const body = core.types.isBlockStatement(path.node.body) ? path.node.body : core.types.blockStatement([core.types.returnStatement(path.node.body)]);
-  path.node.body = body;
-  body.body.unshift(
-    core.types.expressionStatement(
-      core.types.assignmentExpression(
-        "=",
-        core.types.identifier(TRANSFORM_PROPERTY_NAME),
-        core.types.callExpression(resolveDefaultProps, [
-          core.types.identifier(TRANSFORM_PROPERTY_NAME),
-          buildDefaultValueObject(defaults)
-        ])
-      )
-    )
-  );
+function ensureBlockBody(path) {
+  if (core.types.isBlockStatement(path.node.body)) return path.node.body;
+  const block = core.types.blockStatement([core.types.returnStatement(path.node.body)]);
+  path.node.body = block;
+  return block;
+}
+function isInsidePattern(ref, pattern) {
+  return !!ref.findParent((p2) => p2.node === pattern);
+}
+function accessorFor(pattern, base, name) {
+  var _a;
+  const leaves = [];
+  collectObjectPattern(pattern, base, leaves, []);
+  return (_a = leaves.find((leaf) => leaf.name === name)) == null ? void 0 : _a.accessor;
 }
 function transformFnProps(path) {
+  var _a, _b;
   const firstParam = path.node.params[0];
   if (!firstParam || !core.types.isObjectPattern(firstParam) || !checkHasJSXReturn(path)) return;
   const ctx = getCompileContext();
-  const properties = firstParam.properties;
   const signalPrefix = ctx.options.signalPrefix || "$";
-  const notRestProperties = properties.filter((prop) => !core.types.isRestElement(prop));
-  const restProperties = properties.find((prop) => core.types.isRestElement(prop));
-  const notRestNames = notRestProperties.map((prop) => core.types.isIdentifier(prop.key) ? prop.key.name : null).filter((name) => name !== null);
-  const signalConflicts = notRestNames.filter((name) => x(name, signalPrefix));
-  if (signalConflicts.length > 0) {
-    re("transformProps", "Property names cannot start with signal prefix", signalConflicts);
-  }
-  if (notRestProperties.length > 0) {
-    const defaults = transformProperty(path, notRestProperties, TRANSFORM_PROPERTY_NAME);
-    if (restProperties) transformRestProperties(path, restProperties, notRestNames);
-    buildDefaultValue(path, defaults);
+  const base = core.types.identifier(TRANSFORM_PROPERTY_NAME);
+  const initLeaves = [];
+  const initRests = [];
+  collectObjectPattern(firstParam, base, initLeaves, initRests);
+  const conflicts = [...initLeaves, ...initRests].map((b2) => b2.name).filter((name) => x(name, signalPrefix));
+  if (conflicts.length > 0) {
+    re("transformProps", "Property names cannot start with signal prefix", conflicts);
+  }
+  if (initLeaves.length === 0 && initRests.length === 1 && firstParam.properties.length === 1 && core.types.isRestElement(firstParam.properties[0])) {
+    path.node.params[0] = core.types.identifier(initRests[0].name);
     return;
   }
-  buildDefaultValue(path, {});
-  if (restProperties) transformRestProperties(path, restProperties, notRestNames);
+  const inPatternRefs = /* @__PURE__ */ new Map();
+  const bodyRefs = /* @__PURE__ */ new Map();
+  for (const leaf of initLeaves) {
+    const inside = [];
+    const outside = [];
+    for (const ref of (_b = (_a = path.scope.getBinding(leaf.name)) == null ? void 0 : _a.referencePaths) != null ? _b : []) {
+      (isInsidePattern(ref, firstParam) ? inside : outside).push(ref);
+    }
+    if (inside.length > 0) inPatternRefs.set(leaf.name, inside);
+    bodyRefs.set(leaf.name, outside);
+  }
+  for (const leaf of initLeaves) {
+    const refs = inPatternRefs.get(leaf.name);
+    if (!refs) continue;
+    const accessor = accessorFor(firstParam, base, leaf.name);
+    if (!accessor) continue;
+    for (const ref of refs) ref.replaceWith(clone2(accessor));
+  }
+  const leaves = [];
+  const rests = [];
+  collectObjectPattern(firstParam, base, leaves, rests);
+  const accessorByName = new Map(leaves.map((leaf) => [leaf.name, leaf.accessor]));
+  path.node.params[0] = core.types.identifier(TRANSFORM_PROPERTY_NAME);
+  for (const [name, refs] of bodyRefs) {
+    const accessor = accessorByName.get(name);
+    if (!accessor) continue;
+    for (const ref of refs) ref.replaceWith(clone2(accessor));
+  }
+  if (rests.length > 0) {
+    const body = ensureBlockBody(path);
+    const declarations = rests.map(
+      (rest) => core.types.variableDeclaration("const", [core.types.variableDeclarator(core.types.identifier(rest.name), rest.init)])
+    );
+    body.body.unshift(...declarations);
+  }
 }
 var propsVisitors = {
   FunctionDeclaration: transformFnProps,
@@ -1595,8 +1635,8 @@ function setNodeText(path, text) {
 function createComponentPropKey(name, forceStringLiteralKeys = false) {
   return forceStringLiteralKeys || !core.types.isValidIdentifier(name) ? core.types.stringLiteral(name) : core.types.identifier(name);
 }
-function cloneValue(value, clone2 = false) {
-  return clone2 ? core.types.cloneNode(value, true) : value;
+function cloneValue(value, clone3 = false) {
+  return clone3 ? core.types.cloneNode(value, true) : value;
 }
 function createPropNode(name, value, kind, options) {
   const key = createComponentPropKey(name, options.forceStringLiteralKeys);
@@ -1742,44 +1782,6 @@ var SERVER_TEXT_ESCAPES = {
   ">": "&gt;"
 };
 var serverTextEscapeRE = /[&<>]/g;
-function markSafeHtmlCall(expression) {
-  return core.types.callExpression(useImport("markAsRawHtml"), [expression]);
-}
-function isGeneratedServerHtmlCall(expression) {
-  const { importIdentifiers } = getCompileContext();
-  const renderId = importIdentifiers.render;
-  const componentId = importIdentifiers.createComponent;
-  return core.types.isIdentifier(expression.callee) && (expression.callee.name === renderId.name || expression.callee.name === componentId.name);
-}
-function visitServerHtmlSubexpressions(node) {
-  var _a;
-  if (!node) return node;
-  if (core.types.isJSXElement(node) || core.types.isJSXFragment(node)) {
-    return markSafeHtmlCall(node);
-  }
-  if (core.types.isCallExpression(node) && isGeneratedServerHtmlCall(node)) {
-    return markSafeHtmlCall(node);
-  }
-  const keys = (_a = core.types.VISITOR_KEYS[node.type]) != null ? _a : [];
-  for (const key of keys) {
-    const record = node;
-    const value = record[key];
-    if (Array.isArray(value)) {
-      for (let i2 = 0; i2 < value.length; i2++) {
-        const child = value[i2];
-        if (child && typeof child === "object" && "type" in child) {
-          value[i2] = visitServerHtmlSubexpressions(child);
-        }
-      }
-    } else if (value && typeof value === "object" && "type" in value) {
-      record[key] = visitServerHtmlSubexpressions(value);
-    }
-  }
-  return node;
-}
-function markServerHtmlSubexpressions(expression) {
-  return visitServerHtmlSubexpressions(expression);
-}
 function escapeServerTemplateText(value) {
   return value.replaceAll(serverTextEscapeRE, (char) => {
     var _a;
@@ -1864,14 +1866,50 @@ function createSSRSelectedExpression(selectValue, optionValue) {
     core.types.cloneNode(optionValue, true)
   ]);
 }
+function isSafeServerHtml(expr) {
+  if (core.types.isJSXElement(expr) || core.types.isJSXFragment(expr)) return true;
+  if (!core.types.isCallExpression(expr) || !core.types.isIdentifier(expr.callee)) return false;
+  const { importIdentifiers } = getCompileContext();
+  return expr.callee.name === importIdentifiers.render.name || expr.callee.name === importIdentifiers.createComponent.name;
+}
+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);
+    } else {
+      expr.left = escapeChildExpression(expr.left);
+      expr.right = escapeChildExpression(expr.right);
+    }
+    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]);
+}
 function generateServerNode(node, ctx, withHydrationKey = true) {
   switch (node.type) {
     case 2 /* TEXT */:
       return core.types.stringLiteral(node.value);
     case 3 /* EXPRESSION */: {
-      const expression = node.asRawChildren ? core.types.cloneNode(node.value, true) : markServerHtmlSubexpressions(core.types.cloneNode(node.value, true));
-      const converter = node.asRawChildren ? "toRawHtmlString" : "toEscapedHtmlString";
-      return core.types.callExpression(useImport(converter), [expression]);
+      if (node.asRawChildren) {
+        return core.types.cloneNode(node.value, true);
+      }
+      return escapeChildExpression(core.types.cloneNode(node.value, true));
     }
     case 1 /* COMPONENT */:
       return generateServerComponent(node, ctx);