🐛 Added support for attributes returning JSX

deamme · Oct 13, 2017 · 6c14faa · 6c14faa
1 parent 7323a76
commit 6c14faa
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ts-transform-inferno",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "A typescript transformer for InfernoJS",
   "bugs": {
     "url": "https://github.com/deamme/ts-transform-inferno/issues"

diff --git a/src/index.ts b/src/index.ts
@@ -230,22 +230,16 @@ export default function (CONFIG?: Config) {
         } else {
           let propName = astProp.name.text;
 
-          // if (propName.type === 'JSXIdentifier') {
-          // 	propName = propName.name;
-          // } else if (propName.type === 'JSXNamespacedName') {
-          // 	propName = propName.namespace.name + ':' + propName.name.name;
-          // }
-
           if (
             !isComponent &&
             (propName === "className" || propName === "class")
           ) {
-            className = getValue(initializer);
+            className = getValue(initializer, visitor);
           } else if (!isComponent && propName === "htmlFor") {
             props.push(
               ts.createPropertyAssignment(
                 getName("for"),
-                getValue(initializer)
+                getValue(initializer, visitor)
               )
             );
           } else if (propName.substr(0, 11) === "onComponent" && isComponent) {
@@ -257,15 +251,15 @@ export default function (CONFIG?: Config) {
             ref.properties.push(
               ts.createObjectLiteral(
                 getName(propName),
-                getValue(initializer)
+                getValue(initializer, visitor)
               )
             );
           } else if (!isComponent && propName in svgAttributes) {
             // React compatibility for SVG Attributes
             props.push(
               ts.createPropertyAssignment(
                 getName(svgAttributes[propName]),
-                getValue(initializer)
+                getValue(initializer, visitor)
               )
             );
           } else {
@@ -280,16 +274,16 @@ export default function (CONFIG?: Config) {
                 hasKeyedChildren = true;
                 break;
               case "ref":
-                ref = getValue(initializer);
+                ref = getValue(initializer, visitor);
                 break;
               case "key":
-                key = getValue(initializer);
+                key = getValue(initializer, visitor);
                 break;
               default:
                 props.push(
                   ts.createPropertyAssignment(
                     getName(propName),
-                    initializer ? getValue(initializer) : ts.createTrue()
+                    initializer ? getValue(initializer, visitor) : ts.createTrue()
                   )
                 );
             }

diff --git a/src/utils/getValue.ts b/src/utils/getValue.ts
@@ -1,10 +1,10 @@
 import * as ts from "typescript";
 
-export default function getValue(node) {
+export default function getValue(node, visitor) {
   if (node.kind === ts.SyntaxKind.StringLiteral) {
     return ts.createLiteral(node.text);
   }
   if (node.kind === ts.SyntaxKind.JsxExpression) {
-    return node.expression;
+    return visitor(node.expression);
   }
 }
diff --git a/tests/cases/divWithAttributeReturningJSX.tsx b/tests/cases/divWithAttributeReturningJSX.tsx
@@ -0,0 +1 @@
+<div foo={() => (<div bar />)} />
diff --git a/tests/references/divWithAttributeReturningJSX.jsx b/tests/references/divWithAttributeReturningJSX.jsx
@@ -0,0 +1,3 @@
+var Inferno = require("inferno");
+var createVNode = Inferno.createVNode;
+createVNode(2, "div", null, null, { "foo": function () { return (createVNode(2, "div", null, null, { "bar": true })); } });