babel-plugin-essor 0.0.16-beta.9 → 0.0.17-beta.1

package/dist/index.cjs

@@ -835,8 +835,17 @@ function isSignal(name) {
   const prefix = (_a = getCompileContext().options.signalPrefix) != null ? _a : "$";
   return !!name && x(name, prefix);
 }
+function stripSignalPrefix(name) {
+  var _a;
+  const prefix = (_a = getCompileContext().options.signalPrefix) != null ? _a : "$";
+  return x(name, prefix) ? name.slice(prefix.length) : name;
+}
 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;
@@ -852,6 +861,141 @@ function isAlreadySignalCall(init) {
   const { importIdentifiers } = getCompileContext();
   return calleeName === importIdentifiers.signal.name || calleeName === importIdentifiers.computed.name;
 }
+function transformDestructuring(path) {
+  var _a;
+  const { init, id } = path.node;
+  const pattern = id;
+  if (!init) {
+    if (patternHasSignalBinding(pattern)) path.skip();
+    return;
+  }
+  if (!isSignalSource(init) && !patternHasSignalBinding(pattern)) return;
+  const declPath = path.parentPath;
+  if (!declPath || !declPath.isVariableDeclaration()) return;
+  if ((_a = declPath.parentPath) == null ? void 0 : _a.isForStatement()) {
+    path.skip();
+    return;
+  }
+  const base = signalSourceBase(init);
+  const declarators = bindPattern(pattern, base);
+  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)) {
+    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 clone(init);
+}
+function patternHasSignalBinding(node) {
+  if (core.types.isIdentifier(node)) return isSignal(node.name);
+  if (core.types.isObjectPattern(node)) {
+    return node.properties.some(
+      (p2) => core.types.isRestElement(p2) ? patternHasSignalBinding(p2.argument) : patternHasSignalBinding(p2.value)
+    );
+  }
+  if (core.types.isArrayPattern(node)) {
+    return node.elements.some((el) => el != null && patternHasSignalBinding(el));
+  }
+  if (core.types.isAssignmentPattern(node)) return patternHasSignalBinding(node.left);
+  if (core.types.isRestElement(node)) return patternHasSignalBinding(node.argument);
+  return false;
+}
+function bindPattern(pattern, base) {
+  return core.types.isObjectPattern(pattern) ? bindObjectPattern(pattern, base) : bindArrayPattern(pattern, base);
+}
+function bindObjectPattern(pattern, base) {
+  const out = [];
+  const handledKeys = [];
+  for (const prop of pattern.properties) {
+    if (core.types.isRestElement(prop)) {
+      out.push(buildObjectRest(prop, base, handledKeys));
+      continue;
+    }
+    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));
+  }
+  return out;
+}
+function resolveObjectProp(prop) {
+  const target = prop.value;
+  const shorthandId = 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 };
+  }
+  if (prop.computed) {
+    return { keyExpr: prop.key, computed: true, target };
+  }
+  return { keyExpr: prop.key, computed: !core.types.isIdentifier(prop.key), target };
+}
+function bindArrayPattern(pattern, base) {
+  const out = [];
+  pattern.elements.forEach((el, i2) => {
+    if (el == null) return;
+    if (core.types.isRestElement(el)) {
+      const slice = core.types.callExpression(core.types.memberExpression(clone(base), core.types.identifier("slice")), [
+        core.types.numericLiteral(i2)
+      ]);
+      out.push(...bindTarget(el.argument, slice));
+      return;
+    }
+    const access = core.types.memberExpression(clone(base), core.types.numericLiteral(i2), true);
+    out.push(...bindTarget(el, access));
+  });
+  return out;
+}
+function bindTarget(target, access) {
+  if (core.types.isAssignmentPattern(target)) {
+    return bindTarget(target.left, applyDefault(access, target.right));
+  }
+  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);
+  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")),
+    def,
+    clone(access)
+  );
+}
+function buildObjectRest(rest, base, handledKeys) {
+  const omits = (target) => core.types.objectPattern([
+    ...handledKeys.map(({ key, computed }) => core.types.objectProperty(key, genUid("_omit$"), computed)),
+    core.types.restElement(target)
+  ]);
+  const arg = rest.argument;
+  if (core.types.isIdentifier(arg) && isSignal(arg.name)) {
+    const inner = genUid("_rest$");
+    const body = core.types.blockStatement([
+      core.types.variableDeclaration("const", [core.types.variableDeclarator(omits(inner), clone(base))]),
+      core.types.returnStatement(clone(inner))
+    ]);
+    return core.types.variableDeclarator(core.types.identifier(arg.name), makeComputed(body));
+  }
+  return core.types.variableDeclarator(omits(arg), clone(base));
+}
 function symbolIdentifier(path) {
   const name = path.node.name;
   if (!isSignal(name)) return;
@@ -1451,8 +1595,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, clone = false) {
-  return clone ? core.types.cloneNode(value, true) : value;
+function cloneValue(value, clone2 = false) {
+  return clone2 ? core.types.cloneNode(value, true) : value;
 }
 function createPropNode(name, value, kind, options) {
   const key = createComponentPropKey(name, options.forceStringLiteralKeys);

package/dist/index.js

@@ -833,8 +833,17 @@ function isSignal(name) {
   const prefix = (_a = getCompileContext().options.signalPrefix) != null ? _a : "$";
   return !!name && x(name, prefix);
 }
+function stripSignalPrefix(name) {
+  var _a;
+  const prefix = (_a = getCompileContext().options.signalPrefix) != null ? _a : "$";
+  return x(name, prefix) ? name.slice(prefix.length) : name;
+}
 function replaceSymbol(path) {
   const { init, id } = path.node;
+  if (types.isObjectPattern(id) || types.isArrayPattern(id)) {
+    transformDestructuring(path);
+    return;
+  }
   if (!types.isIdentifier(id)) return;
   if (!isSignal(id.name)) return;
   if (isAlreadySignalCall(init)) return;
@@ -850,6 +859,141 @@ function isAlreadySignalCall(init) {
   const { importIdentifiers } = getCompileContext();
   return calleeName === importIdentifiers.signal.name || calleeName === importIdentifiers.computed.name;
 }
+function transformDestructuring(path) {
+  var _a;
+  const { init, id } = path.node;
+  const pattern = id;
+  if (!init) {
+    if (patternHasSignalBinding(pattern)) path.skip();
+    return;
+  }
+  if (!isSignalSource(init) && !patternHasSignalBinding(pattern)) return;
+  const declPath = path.parentPath;
+  if (!declPath || !declPath.isVariableDeclaration()) return;
+  if ((_a = declPath.parentPath) == null ? void 0 : _a.isForStatement()) {
+    path.skip();
+    return;
+  }
+  const base = signalSourceBase(init);
+  const declarators = bindPattern(pattern, base);
+  const declaration = declPath.node;
+  const index = declaration.declarations.indexOf(path.node);
+  declaration.declarations.splice(index, 1, ...declarators);
+  path.skip();
+}
+function clone(node) {
+  return types.cloneNode(node, true);
+}
+function isSignalSource(init) {
+  if (types.isIdentifier(init)) return isSignal(init.name);
+  if (types.isMemberExpression(init) && types.isIdentifier(init.object) && isSignal(init.object.name)) {
+    return isMemberAccessingProperty(init, "value");
+  }
+  return false;
+}
+function signalSourceBase(init) {
+  if (types.isIdentifier(init) && isSignal(init.name)) {
+    return types.memberExpression(types.identifier(init.name), types.identifier("value"));
+  }
+  return clone(init);
+}
+function patternHasSignalBinding(node) {
+  if (types.isIdentifier(node)) return isSignal(node.name);
+  if (types.isObjectPattern(node)) {
+    return node.properties.some(
+      (p2) => types.isRestElement(p2) ? patternHasSignalBinding(p2.argument) : patternHasSignalBinding(p2.value)
+    );
+  }
+  if (types.isArrayPattern(node)) {
+    return node.elements.some((el) => el != null && patternHasSignalBinding(el));
+  }
+  if (types.isAssignmentPattern(node)) return patternHasSignalBinding(node.left);
+  if (types.isRestElement(node)) return patternHasSignalBinding(node.argument);
+  return false;
+}
+function bindPattern(pattern, base) {
+  return types.isObjectPattern(pattern) ? bindObjectPattern(pattern, base) : bindArrayPattern(pattern, base);
+}
+function bindObjectPattern(pattern, base) {
+  const out = [];
+  const handledKeys = [];
+  for (const prop of pattern.properties) {
+    if (types.isRestElement(prop)) {
+      out.push(buildObjectRest(prop, base, handledKeys));
+      continue;
+    }
+    const { keyExpr, computed, target } = resolveObjectProp(prop);
+    handledKeys.push({ key: clone(keyExpr), computed });
+    const access = types.memberExpression(clone(base), keyExpr, computed);
+    out.push(...bindTarget(target, access));
+  }
+  return out;
+}
+function resolveObjectProp(prop) {
+  const target = prop.value;
+  const shorthandId = 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 };
+  }
+  if (prop.computed) {
+    return { keyExpr: prop.key, computed: true, target };
+  }
+  return { keyExpr: prop.key, computed: !types.isIdentifier(prop.key), target };
+}
+function bindArrayPattern(pattern, base) {
+  const out = [];
+  pattern.elements.forEach((el, i2) => {
+    if (el == null) return;
+    if (types.isRestElement(el)) {
+      const slice = types.callExpression(types.memberExpression(clone(base), types.identifier("slice")), [
+        types.numericLiteral(i2)
+      ]);
+      out.push(...bindTarget(el.argument, slice));
+      return;
+    }
+    const access = types.memberExpression(clone(base), types.numericLiteral(i2), true);
+    out.push(...bindTarget(el, access));
+  });
+  return out;
+}
+function bindTarget(target, access) {
+  if (types.isAssignmentPattern(target)) {
+    return bindTarget(target.left, applyDefault(access, target.right));
+  }
+  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);
+  return [types.variableDeclarator(target, access)];
+}
+function makeComputed(access) {
+  return types.callExpression(useImport("computed"), [types.arrowFunctionExpression([], access)]);
+}
+function applyDefault(access, def) {
+  return types.conditionalExpression(
+    types.binaryExpression("===", clone(access), types.identifier("undefined")),
+    def,
+    clone(access)
+  );
+}
+function buildObjectRest(rest, base, handledKeys) {
+  const omits = (target) => types.objectPattern([
+    ...handledKeys.map(({ key, computed }) => types.objectProperty(key, genUid("_omit$"), computed)),
+    types.restElement(target)
+  ]);
+  const arg = rest.argument;
+  if (types.isIdentifier(arg) && isSignal(arg.name)) {
+    const inner = genUid("_rest$");
+    const body = types.blockStatement([
+      types.variableDeclaration("const", [types.variableDeclarator(omits(inner), clone(base))]),
+      types.returnStatement(clone(inner))
+    ]);
+    return types.variableDeclarator(types.identifier(arg.name), makeComputed(body));
+  }
+  return types.variableDeclarator(omits(arg), clone(base));
+}
 function symbolIdentifier(path) {
   const name = path.node.name;
   if (!isSignal(name)) return;
@@ -1449,8 +1593,8 @@ function setNodeText(path, text) {
 function createComponentPropKey(name, forceStringLiteralKeys = false) {
   return forceStringLiteralKeys || !types.isValidIdentifier(name) ? types.stringLiteral(name) : types.identifier(name);
 }
-function cloneValue(value, clone = false) {
-  return clone ? types.cloneNode(value, true) : value;
+function cloneValue(value, clone2 = false) {
+  return clone2 ? types.cloneNode(value, true) : value;
 }
 function createPropNode(name, value, kind, options) {
   const key = createComponentPropKey(name, options.forceStringLiteralKeys);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-essor",
-  "version": "0.0.16-beta.9",
+  "version": "0.0.17-beta.1",
   "description": "",
   "type": "module",
   "keywords": [],
@@ -34,7 +34,7 @@
   "dependencies": {
     "@babel/core": "^7.29.7",
     "@babel/generator": "^7.29.7",
-    "@estjs/shared": "0.0.16-beta.9"
+    "@estjs/shared": "0.0.17-beta.1"
   },
   "devDependencies": {
     "@babel/traverse": "^7.29.7",