nesquick 0.0.23 → 0.0.25

package/lib/cli/transformer.js

@@ -35,22 +35,32 @@ function hasIdentifier(node) {
 }
 const transformer = context => {
     return sourceFile => {
-        let isComponent = false;
-        const visitorGeneric = node => {
-            if (TS.isJsxOpeningElement(node)) {
+        const visitGeneric = (node, options) => {
+            if (TS.isJsxOpeningLikeElement(node)) {
                 const firstLetter = node.tagName.getText()[0];
-                isComponent = firstLetter !== firstLetter.toLowerCase();
+                const userComponent = firstLetter !== firstLetter.toLowerCase();
+                return TS.visitEachChild(node, node => visitGeneric(node, { userComponent }), context);
             }
-            if (TS.isJsxExpression(node)) {
-                return TS.visitEachChild(node, visitorExpression, context);
+            if (TS.isJsxAttribute(node)) {
+                return TS.visitEachChild(node, node => visitGeneric(node, { ...options, isJsxAttribute: true }), context);
             }
-            return TS.visitEachChild(node, visitorGeneric, context);
+            else if (TS.isJsxExpression(node)) {
+                return TS.visitEachChild(node, node => visitorExpression(node, { ...options, isJsxAttribute: false }), context);
+            }
+            else if (options.isJsxAttribute && TS.isStringLiteral(node)) {
+                const returnNode = TS.visitNode(node, node => visitorExpression(node, { ...options, isJsxAttribute: false }), TS.isExpression);
+                if (!TS.isStringLiteral(returnNode)) {
+                    return TS.factory.createJsxExpression(undefined, returnNode);
+                }
+                return returnNode;
+            }
+            return TS.visitEachChild(node, node => visitGeneric(node, { ...options, isJsxAttribute: false }), context);
         };
-        const visitorExpression = node => {
+        const visitorExpression = (node, options) => {
             if (TS.isParenthesizedExpression(node)) {
                 const body = getSingleBody(node);
                 if (body) {
-                    return TS.visitNode(body, visitorExpression, TS.isSourceFile);
+                    return TS.visitNode(body, node => visitorExpression(node, options));
                 }
             }
             else if (TS.isCallExpression(node)) {
@@ -59,15 +69,15 @@ const transformer = context => {
                     return identifier;
                 }
                 else {
-                    return TS.factory.createArrowFunction(undefined, undefined, [], undefined, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), node);
+                    return TS.factory.createArrowFunction(undefined, undefined, [], undefined, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), TS.visitNode(node, node => visitGeneric(node, {}), TS.isConciseBody));
                 }
             }
-            else if (!TS.isFunctionLike(node) && TS.isExpression(node) && (isComponent || hasIdentifier(node))) {
-                return TS.factory.createArrowFunction(undefined, undefined, [], undefined, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), node);
+            else if (!TS.isFunctionLike(node) && TS.isExpression(node) && (options.userComponent || hasIdentifier(node))) {
+                return TS.factory.createArrowFunction(undefined, undefined, [], undefined, TS.factory.createToken(TS.SyntaxKind.EqualsGreaterThanToken), TS.visitNode(node, node => visitGeneric(node, {}), TS.isConciseBody));
             }
-            return node;
+            return TS.visitNode(node, node => visitGeneric(node, {}));
         };
-        return TS.visitNode(sourceFile, visitorGeneric, TS.isSourceFile);
+        return TS.visitNode(sourceFile, node => visitGeneric(node, {}), TS.isSourceFile);
     };
 };
 exports.transformer = transformer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nesquick",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "description": "React-like library with focus on drawing performance",
   "types": "./lib/types",
   "main": "./lib",