babel-plugin-vasille 3.1.5 → 3.2.1

package/lib-node/jsx.js

@@ -60,6 +60,7 @@ function transformJsxArray(paths, internal) {
                     .replace(/\s*\n\s*/gm, "\n");
                 const call = t.callExpression(t.memberExpression(internal_js_1.ctx, t.identifier("text")), [t.stringLiteral(fixed)]);
                 call.loc = path.node.loc;
+                /* istanbul ignore else */
                 if (call.loc) {
                     for (const char of path.node.value) {
                         if (!/\s/.test(char)) {
@@ -96,7 +97,7 @@ function transformJsxExpressionContainer(path, internal, acceptSlots, isInternal
     if (acceptSlots &&
         (t.isFunctionExpression(expression) || t.isArrowFunctionExpression(expression)) &&
         (0, jsx_detect_js_1.bodyHasJsx)(expression.body)) {
-        (0, mesh_js_1.compose)(path.get("expression"), internal, isInternalSlot);
+        (0, mesh_js_1.compose)(path.get("expression"), internal, isInternalSlot, "slot");
         if (!isInternalSlot) {
             if (expression.params.length < 1) {
                 expression.params.push(t.identifier(`_${internal.prefix}`));
@@ -112,11 +113,12 @@ function transformJsxExpressionContainer(path, internal, acceptSlots, isInternal
     else if (isInternalSlot && (t.isFunctionExpression(expression) || t.isArrowFunctionExpression(expression))) {
         expression.params.unshift(internal_js_1.ctx);
     }
-    let call = (0, lib_js_1.exprCall)(path.get("expression"), expression, internal);
+    const exprPath = path.get("expression");
+    let call = (0, lib_js_1.exprCall)(exprPath, expression, internal);
     if (!call && t.isIdentifier(expression) && internal.stack.get(expression.name) === 3 /* VariableState.ReactiveObject */) {
         call = t.callExpression(t.memberExpression(internal.id, t.identifier("rop")), [expression]);
     }
-    const result = call !== null && call !== void 0 ? call : expression;
+    const result = call !== null && call !== void 0 ? call : exprPath.node;
     result.loc = loc;
     return result;
 }
@@ -136,7 +138,7 @@ function idToProp(id, value, from) {
     return t.objectProperty(expr, value);
 }
 function transformJsxElement(path, internal) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     const name = path.node.openingElement.name;
     if (t.isJSXIdentifier(name) && name.name[0].toLowerCase() === name.name[0]) {
         const opening = path.get("openingElement");
@@ -152,10 +154,12 @@ function transformJsxElement(path, internal) {
             const attr = attrPath.node;
             if (t.isJSXAttribute(attr)) {
                 const name = attr.name;
+                /* istanbul ignore else */
                 if (t.isJSXIdentifier(name)) {
                     if (name.name.startsWith("on")) {
                         if (t.isJSXExpressionContainer(attr.value) && t.isExpression(attr.value.expression)) {
                             const path = attrPath.get("value");
+                            /* istanbul ignore else */
                             if (t.isExpression(path.node.expression)) {
                                 (0, mesh_js_1.meshExpression)(path.get("expression"), internal);
                             }
@@ -169,6 +173,7 @@ function transformJsxElement(path, internal) {
                     }
                     else if (name.name === "class") {
                         // class={[..]}
+                        /* istanbul ignore else */
                         if (t.isJSXExpressionContainer(attr.value) && t.isArrayExpression(attr.value.expression)) {
                             const valuePath = attrPath.get("value");
                             const arrayExprPath = valuePath.get("expression");
@@ -233,8 +238,9 @@ function transformJsxElement(path, internal) {
                             }
                         }
                         // class={name}
-                        else if (t.isJSXExpressionContainer(attr.value) && t.isIdentifier(attr.value.expression)) {
-                            attrs.push(t.objectProperty(t.identifier("class"), attr.value.expression));
+                        else if (t.isJSXExpressionContainer(attr.value) && t.isExpression(attr.value.expression)) {
+                            const expr = (_b = (0, lib_js_1.exprCall)(attrPath.get("value"), attr.value.expression, internal)) !== null && _b !== void 0 ? _b : attr.value.expression;
+                            attrs.push(t.objectProperty(t.identifier("class"), expr));
                         }
                         // class="a b"
                         else if (t.isStringLiteral(attr.value)) {
@@ -243,6 +249,7 @@ function transformJsxElement(path, internal) {
                     }
                     else if (name.name === "style") {
                         // style={{..}}
+                        /* istanbul ignore else */
                         if (t.isJSXExpressionContainer(attr.value) && t.isObjectExpression(attr.value.expression)) {
                             const valuePath = attrPath.get("value");
                             const objectPath = valuePath.get("expression");
@@ -250,7 +257,7 @@ function transformJsxElement(path, internal) {
                                 // style={{a: b}}
                                 if (t.isObjectProperty(propPath.node)) {
                                     const prop = propPath;
-                                    const value = (_b = (0, lib_js_1.exprCall)(prop.get("value"), prop.node.value, internal)) !== null && _b !== void 0 ? _b : prop.node.value;
+                                    const value = (_c = (0, lib_js_1.exprCall)(prop.get("value"), prop.node.value, internal)) !== null && _c !== void 0 ? _c : prop.node.value;
                                     if (t.isExpression(prop.node.key) && !t.isIdentifier(prop.node.key)) {
                                         (0, mesh_js_1.meshExpression)(prop.get("key"), internal);
                                     }
@@ -309,10 +316,15 @@ function transformJsxElement(path, internal) {
                                 console.warn(attrPath.buildCodeFrameError("Vasille: This will slow down your application"));
                             }
                         }
+                        else if (t.isJSXExpressionContainer(attr.value) && t.isExpression(attr.value.expression)) {
+                            const expr = (_d = (0, lib_js_1.exprCall)(attrPath.get("value"), attr.value.expression, internal)) !== null && _d !== void 0 ? _d : attr.value.expression;
+                            attrs.push(t.objectProperty(t.identifier("style"), expr));
+                        }
                     }
                     else {
+                        /* istanbul ignore else */
                         if (!attr.value || t.isJSXExpressionContainer(attr.value)) {
-                            attrs.push(idToProp(name, t.isExpression((_c = attr.value) === null || _c === void 0 ? void 0 : _c.expression) ? attr.value.expression : t.booleanLiteral(true)));
+                            attrs.push(idToProp(name, t.isExpression((_e = attr.value) === null || _e === void 0 ? void 0 : _e.expression) ? attr.value.expression : t.booleanLiteral(true)));
                         }
                         else if (t.isStringLiteral(attr.value)) {
                             attrs.push(idToProp(name, attr.value));
@@ -321,11 +333,12 @@ function transformJsxElement(path, internal) {
                 }
                 if (t.isJSXNamespacedName(name)) {
                     if (name.namespace.name === "bind") {
+                        /* istanbul ignore else */
                         if (t.isJSXExpressionContainer(attr.value) || !attr.value) {
-                            const value = t.isExpression((_d = attr.value) === null || _d === void 0 ? void 0 : _d.expression)
+                            const value = t.isExpression((_f = attr.value) === null || _f === void 0 ? void 0 : _f.expression)
                                 ? (0, lib_js_1.exprCall)(attrPath.get("value").get("expression"), attr.value.expression, internal)
                                 : undefined;
-                            bind.push(idToProp(name.name, value !== null && value !== void 0 ? value : (t.isExpression((_e = attr.value) === null || _e === void 0 ? void 0 : _e.expression) ? attr.value.expression : t.booleanLiteral(true))));
+                            bind.push(idToProp(name.name, value !== null && value !== void 0 ? value : (t.isExpression((_g = attr.value) === null || _g === void 0 ? void 0 : _g.expression) ? attr.value.expression : t.booleanLiteral(true))));
                         }
                         else if (t.isStringLiteral(attr.value)) {
                             bind.push(idToProp(name.name, attr.value));
@@ -385,6 +398,7 @@ function transformJsxElement(path, internal) {
             // <A prop=../>
             if (t.isJSXAttribute(attr) && t.isJSXIdentifier(attr.name)) {
                 // <A prop=".."/>
+                /* istanbul ignore else */
                 if (t.isStringLiteral(attr.value)) {
                     props.push(idToProp(attr.name, attr.value));
                 }
@@ -431,7 +445,7 @@ function transformJsxElement(path, internal) {
                 run = t.arrowFunctionExpression(params, t.blockStatement(statements));
             }
         }
-        const call = t.callExpression(t.identifier(name.name), [internal_js_1.ctx, t.objectExpression(props), ...(run ? [run] : [])]);
+        const call = t.callExpression(t.identifier(name.name), [t.objectExpression(props), internal_js_1.ctx, ...(run ? [run] : [])]);
         call.loc = path.node.loc;
         return t.expressionStatement(call);
     }

package/lib-node/lib.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.named = named;
+exports.processCalculateCall = processCalculateCall;
 exports.parseCalculateCall = parseCalculateCall;
 exports.exprCall = exprCall;
 exports.forwardOnlyExpr = forwardOnlyExpr;
@@ -56,23 +57,24 @@ function named(call, name, internal, argPos) {
     }
     return call;
 }
-function parseCalculateCall(path, internal) {
-    if (t.isCallExpression(path.node) && (0, call_js_1.calls)(path.node, ["calculate", "watch"], internal)) {
-        const call = path.node.arguments[0];
-        if (path.node.arguments.length !== 1) {
-            throw path.buildCodeFrameError("Vasille: Incorrect number of arguments");
-        }
-        if (t.isFunctionExpression(call) || t.isArrowFunctionExpression(call)) {
-            if (call.params.length > 0) {
-                throw path.buildCodeFrameError("Vasille: Argument of calculate cannot have parameters");
-            }
-            const exprData = (0, expression_js_1.checkNode)(path.get("arguments")[0], internal);
-            call.params = [...exprData.found.keys()].map(name => (0, expression_js_1.encodeName)(name));
-            return [call, t.arrayExpression([...exprData.found.values()])];
-        }
-        else {
-            throw path.buildCodeFrameError("Vasille: Argument of calculate must be a function");
+function processCalculateCall(path, internal) {
+    const call = path.node.arguments[0];
+    if (path.node.arguments.length !== 1) {
+        throw path.buildCodeFrameError("Vasille: Incorrect number of arguments");
+    }
+    if (t.isFunctionExpression(call) || t.isArrowFunctionExpression(call)) {
+        if (call.params.length > 0) {
+            throw path.buildCodeFrameError("Vasille: Argument of calculate cannot have parameters");
         }
+        const exprData = (0, expression_js_1.checkNode)(path.get("arguments")[0], internal);
+        call.params = [...exprData.found.keys()].map(name => (0, expression_js_1.encodeName)(name));
+        return [call, t.arrayExpression([...exprData.found.values()])];
+    }
+    throw path.buildCodeFrameError("Vasille: Argument of calculate must be a function");
+}
+function parseCalculateCall(path, internal) {
+    if (t.isCallExpression(path.node) && (0, call_js_1.calls)(path, ["calculate", "watch"], internal)) {
+        return processCalculateCall(path, internal);
     }
     return null;
 }
@@ -84,10 +86,11 @@ function exprCall(path, expr, internal, name) {
             : t.memberExpression(internal_js_1.ctx, t.identifier("expr")), calculateCall), name, internal);
     }
     if (t.isCallExpression(expr) &&
-        (0, call_js_1.calls)(expr, ["forward"], internal) &&
+        (0, call_js_1.calls)(path, ["forward"], internal) &&
         expr.arguments.length === 1 &&
         t.isExpression(expr.arguments[0])) {
         const data = exprCall(path.get("arguments")[0], expr.arguments[0], internal);
+        /* istanbul ignore else */
         if (data && !t.isCallExpression(data)) {
             return t.callExpression(t.memberExpression(internal.id, t.identifier("fo")), [data]);
         }
@@ -96,12 +99,15 @@ function exprCall(path, expr, internal, name) {
     if (exprData.self) {
         return exprData.self;
     }
-    const names = [...exprData.found.keys()].map(name => (0, expression_js_1.encodeName)(name));
+    const names = [...exprData.found.keys()].map(expression_js_1.encodeName);
     const dependencies = t.arrayExpression([...exprData.found.values()]);
-    if (names.length > 0 && expr) {
+    if (expr !== path.node && names.length === 1 && t.isIdentifier(path.node) && path.node.name === names[0].name) {
+        return [...exprData.found.values()][0];
+    }
+    if (names.length > 0 && path.node) {
         return named(t.callExpression(internal.stateOnly
             ? t.memberExpression(internal.id, t.identifier("ex"))
-            : t.memberExpression(internal_js_1.ctx, t.identifier("expr")), [t.arrowFunctionExpression(names, expr), dependencies]), name, internal);
+            : t.memberExpression(internal_js_1.ctx, t.identifier("expr")), [t.arrowFunctionExpression(names, path.node), dependencies]), name, internal);
     }
     return null;
 }