@litsx/babel-preset-litsx 0.8.0 → 0.8.2

package/dist/index.cjs

@@ -13,7 +13,7 @@ require('./internal/transform-litsx-hooks.cjs');
 require('./internal/transform-litsx-renderer-props.cjs');
 require('@babel/plugin-syntax-jsx');
 require('@litsx/authoring');
-require('./shared/transform-litsx-element-candidates-JMFlPFXK.cjs');
+require('./shared/transform-litsx-element-candidates-D0uvqG4Y.cjs');
 require('@babel/helper-plugin-utils');
 require('@babel/traverse');
 require('@litsx/babel-parser');

package/dist/internal/transform-litsx-components.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxSyntaxPlugin = require('@babel/plugin-syntax-jsx');
 var internal_transformLitsxProperties = require('./transform-litsx-properties.cjs');
-var transformLitsxElementCandidates = require('../shared/transform-litsx-element-candidates-JMFlPFXK.cjs');
+var transformLitsxElementCandidates = require('../shared/transform-litsx-element-candidates-D0uvqG4Y.cjs');
 var authoring = require('@litsx/authoring');
 require('module');
 require('@litsx/typescript-session');
@@ -1693,6 +1693,42 @@ function createThisMemberExpression$2(propName) {
   return t$4.memberExpression(t$4.thisExpression(), t$4.identifier(propName));
 }
 
+function createPropsObjectExpression(bindingInfo, propertyMap = new Map()) {
+  if (
+    bindingInfo &&
+    typeof bindingInfo !== "object" &&
+    bindingInfo !== "props"
+  ) {
+    return null;
+  }
+
+  const propNames = new Set([
+    ...(bindingInfo && typeof bindingInfo === "object" && bindingInfo.kind === "alias"
+      ? Array.from(bindingInfo.properties?.keys?.() || [])
+      : []),
+    ...Array.from(propertyMap.keys?.() || []),
+  ]);
+  const properties = Array.from(propNames)
+    .filter((propName) => typeof propName === "string" && propName.length > 0)
+    .sort()
+    .map((propName) =>
+      t$4.objectProperty(
+        t$4.isValidIdentifier(propName) ? t$4.identifier(propName) : t$4.stringLiteral(propName),
+        createThisMemberExpression$2(propName)
+      )
+    );
+
+  return t$4.objectExpression(properties);
+}
+
+function isObjectDestructuringInitializer(refPath) {
+  return (
+    refPath.parentPath?.isVariableDeclarator() &&
+    refPath.parentKey === "init" &&
+    t$4.isObjectPattern(refPath.parentPath.node.id)
+  );
+}
+
 function transformJSXExpressions(jsxPath, bindings, state = null) {
   const localNames = Array.from(bindings.keys());
 
@@ -1830,10 +1866,20 @@ function replaceParamReferences(functionPath, bindings, propertyMap = new Map(),
           refPath.parentPath.isObjectProperty({ shorthand: true }) &&
           refPath.parentKey === "value"
         ) {
+          const propsObject = createPropsObjectExpression(bindingInfo, propertyMap);
+          if (propsObject) {
+            refPath.parentPath.node.shorthand = false;
+            refPath.replaceWith(propsObject);
+            return;
+          }
           return;
         }
 
-        refPath.replaceWith(t$4.thisExpression());
+        refPath.replaceWith(
+          isObjectDestructuringInitializer(refPath)
+            ? t$4.thisExpression()
+            : createPropsObjectExpression(bindingInfo, propertyMap) ?? t$4.thisExpression()
+        );
         return;
       }
 
@@ -1915,6 +1961,14 @@ function replaceParamReferences(functionPath, bindings, propertyMap = new Map(),
         }
       }
 
+      if (localName === "props") {
+        const propsObject = createPropsObjectExpression(bindingInfo, propertyMap);
+        if (propsObject) {
+          refPath.replaceWith(propsObject);
+          return;
+        }
+      }
+
       refPath.replaceWith(getReplacementForProp(targetProp || localName, refPath));
     });
   });
@@ -2069,12 +2123,20 @@ function throwFirstImplicitChildrenProjectionIssue(functionPath) {
   throw functionPath.buildCodeFrameError(issue.message);
 }
 
+function isRenderableJsx(node) {
+  return t$2.isJSXElement(node) || t$2.isJSXFragment(node);
+}
+
 function collectReturnStatement(functionPath, bindings, state) {
   let returnStatement = null;
 
   functionPath.traverse({
     ReturnStatement(returnPath) {
-      if (t$2.isJSXElement(returnPath.node.argument)) {
+      if (returnPath.getFunctionParent() !== functionPath) {
+        return;
+      }
+
+      if (isRenderableJsx(returnPath.node.argument)) {
         returnStatement = returnPath.node;
         transformJSXRendererCalls(returnPath, bindings, state);
         transformJSXExpressions(returnPath, bindings, state);