babel-plugin-vasille 3.1.1 → 3.2.1

package/lib/mesh.js

@@ -1,40 +1,116 @@
-import * as t from "@babel/types";
-import { calls, composeOnly, styleOnly } from "./call.js";
-import { idIsIValue, memberIsIValue, nodeIsReactiveObject } from "./expression.js";
-import { ctx } from "./internal.js";
-import { transformJsx } from "./jsx.js";
-import { arrayModel, exprCall, forwardOnlyExpr, mapModel, named, own, parseCalculateCall, reactiveObject, ref, setModel, } from "./lib.js";
-export function meshOrIgnoreAllExpressions(nodePaths, internal) {
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.meshOrIgnoreAllExpressions = meshOrIgnoreAllExpressions;
+exports.meshAllExpressions = meshAllExpressions;
+exports.meshComposeCall = meshComposeCall;
+exports.meshAllUnknown = meshAllUnknown;
+exports.meshLValue = meshLValue;
+exports.meshOrIgnoreExpression = meshOrIgnoreExpression;
+exports.meshExpression = meshExpression;
+exports.meshStatements = meshStatements;
+exports.ignoreParams = ignoreParams;
+exports.reactiveArrayPattern = reactiveArrayPattern;
+exports.meshStatement = meshStatement;
+exports.meshFunction = meshFunction;
+exports.composeExpression = composeExpression;
+exports.composeStatements = composeStatements;
+exports.composeStatement = composeStatement;
+exports.compose = compose;
+const t = __importStar(require("@babel/types"));
+const bridge_1 = require("./bridge");
+const call_js_1 = require("./call.js");
+const expression_js_1 = require("./expression.js");
+const internal_js_1 = require("./internal.js");
+const jsx_js_1 = require("./jsx.js");
+const lib_js_1 = require("./lib.js");
+const router_1 = require("./router");
+const utils_1 = require("./utils");
+const composePropsIndex = {
+    slot: 0,
+    compose: 0,
+    view: 0,
+    mvvmView: 0,
+    mvcView: -1,
+    hybridView: 1,
+    store: 0,
+    screen: -1,
+};
+const composeArgsNumber = {
+    slot: 1,
+    compose: 1,
+    view: 1,
+    mvvmView: 1,
+    mvcView: 1,
+    hybridView: 2,
+    store: 1,
+    screen: 1,
+};
+function meshOrIgnoreAllExpressions(nodePaths, internal) {
     for (const path of nodePaths) {
+        /* istanbul ignore else */
         if (t.isExpression(path.node)) {
             meshExpression(path, internal);
         }
     }
 }
-export function meshAllExpressions(nodePaths, internal) {
+function meshAllExpressions(nodePaths, internal) {
     for (const path of nodePaths) {
         meshExpression(path, internal);
     }
 }
-export function meshComposeCall(call, name, nodePath, internal) {
+function meshComposeCall(call, name, nodePath, method, internal) {
     const arg = call.arguments[0];
     if (call.arguments.length !== 1 || !(t.isFunctionExpression(arg) || t.isArrowFunctionExpression(arg))) {
         throw nodePath.buildCodeFrameError("Vasille: Invalid arguments");
     }
     const fnPath = nodePath.get("arguments")[0];
-    compose(fnPath, internal, false);
+    const nonePropsFields = compose(fnPath, internal, false, method);
+    if (composeArgsNumber[method] > 1) {
+        call.arguments.push(t.arrayExpression(nonePropsFields.map(item => t.stringLiteral(item))));
+    }
     if (!internal.stateOnly) {
-        arg.params.unshift(ctx);
+        arg.params.unshift(internal_js_1.ctx);
     }
     if (internal.devMode) {
         call.arguments.push(t.stringLiteral(`${internal.prefix}:${name ? name.name : "#anonymouse"}`));
     }
-    if (t.isIdentifier(call.callee) && call.callee.name === "state") {
-        nodePath.replaceWith(call.arguments[0]);
-    }
 }
-export function meshAllUnknown(paths, internal) {
+function meshAllUnknown(paths, internal) {
     for (const path of paths) {
+        /* istanbul ignore else */
         if (t.isSpreadElement(path.node)) {
             meshExpression(path.get("argument"), internal);
         }
@@ -43,24 +119,27 @@ export function meshAllUnknown(paths, internal) {
         }
     }
 }
-export function meshLValue(path, internal) {
+function meshLValue(path, internal) {
     const node = path.node;
+    /* istanbul ignore else */
     if (t.isExpression(node)) {
         meshExpression(path, internal);
     }
 }
-export function meshOrIgnoreExpression(path, internal) {
+function meshOrIgnoreExpression(path, internal) {
+    /* istanbul ignore else */
     if (t.isExpression(path.node)) {
         meshExpression(path, internal);
     }
 }
-export function meshExpression(nodePath, internal, isRoot) {
+function meshExpression(nodePath, internal, isRoot) {
     const expr = nodePath.node;
     if (!expr) {
         return;
     }
-    if (calls(expr, ["compose", "extend", "state"], internal)) {
-        meshComposeCall(expr, null, nodePath, internal);
+    let composeMethod = (0, call_js_1.calls)(nodePath, ["compose", "store", "view", "mvvmView", "mvcView", "hybridView"], internal);
+    if (composeMethod) {
+        meshComposeCall(expr, null, nodePath, composeMethod, internal);
         return;
     }
     switch (expr.type) {
@@ -76,7 +155,7 @@ export function meshExpression(nodePath, internal, isRoot) {
         }
         case "Identifier": {
             const state = internal.stack.get(expr.name);
-            if (idIsIValue(nodePath, internal)) {
+            if ((0, expression_js_1.idIsIValue)(nodePath, internal)) {
                 nodePath.replaceWith(t.memberExpression(expr, t.identifier(state === 4 /* VariableState.ReactivePointer */ ? "$$" : "$")));
             }
             break;
@@ -89,23 +168,26 @@ export function meshExpression(nodePath, internal, isRoot) {
         case "CallExpression":
         case "OptionalCallExpression": {
             const path = nodePath;
-            const callsFn = calls(path.node, composeOnly, internal);
-            const callsStyleHint = calls(path.node, styleOnly, internal);
-            if (callsFn) {
-                throw path.buildCodeFrameError(`Vasille: Usage of hint "${callsFn}" is restricted here`);
-            }
-            if (callsStyleHint) {
-                throw path.buildCodeFrameError(`Vasille: Usage of style hint "${callsStyleHint}" is restricted here`);
-            }
-            meshOrIgnoreExpression(path.get("callee"), internal);
-            meshAllUnknown(path.get("arguments"), internal);
-            if (calls(path.node, ["calculate"], internal)) {
-                if (path.node.arguments.length === 1 &&
-                    (t.isFunctionExpression(path.node.arguments[0]) || t.isArrowFunctionExpression(path.node.arguments[0]))) {
-                    path.replaceWith(t.callExpression(path.node.arguments[0], []));
+            if (internal.isComposing && (0, call_js_1.calls)(path, ["router"], internal)) {
+                if (!internal.stateOnly) {
+                    (0, router_1.routerReplace)(path);
                 }
                 else {
-                    throw path.buildCodeFrameError("Vasille: Incorrect calculate argument");
+                    throw path.buildCodeFrameError("Vasille: The router is not available in stores");
+                }
+            }
+            else {
+                const callsFn = (0, call_js_1.calls)(path, call_js_1.composeOnly, internal);
+                const callsStyleHint = (0, call_js_1.calls)(path, call_js_1.styleOnly, internal);
+                if (callsFn) {
+                    throw path.buildCodeFrameError(`Vasille: Usage of hint "${callsFn}" is restricted here`);
+                }
+                if (callsStyleHint) {
+                    throw path.buildCodeFrameError(`Vasille: Usage of style hint "${callsStyleHint}" is restricted here`);
+                }
+                if (!(0, bridge_1.processBridgeCall)(path, internal)) {
+                    meshOrIgnoreExpression(path.get("callee"), internal);
+                    meshAllUnknown(path.get("arguments"), internal);
                 }
             }
             break;
@@ -116,7 +198,7 @@ export function meshExpression(nodePath, internal, isRoot) {
             let replaced = false;
             meshLValue(path.get("left"), internal);
             if (t.isIdentifier(left) && internal.stack.get(left.name) === 4 /* VariableState.ReactivePointer */) {
-                const replaceWith = forwardOnlyExpr(path.get("right"), path.node.right, internal);
+                const replaceWith = (0, lib_js_1.forwardOnlyExpr)(path.get("right"), path.node.right, internal);
                 if (replaceWith) {
                     path.get("right").replaceWith(replaceWith);
                     replaced = true;
@@ -136,7 +218,7 @@ export function meshExpression(nodePath, internal, isRoot) {
             if (t.isExpression(property) && !t.isIdentifier(property)) {
                 meshOrIgnoreExpression(path.get("property"), internal);
             }
-            if (memberIsIValue(node, internal)) {
+            if ((0, expression_js_1.memberIsIValue)(node, internal)) {
                 path.replaceWith(t.memberExpression(node, t.identifier("$")));
             }
             break;
@@ -221,12 +303,12 @@ export function meshExpression(nodePath, internal, isRoot) {
                     let replaced = false;
                     if (isRoot &&
                         internal.stateOnly &&
-                        !path.node.computed &&
-                        t.isIdentifier(path.node.key) &&
+                        (!path.node.computed || t.isStringLiteral(path.node.key)) &&
+                        (t.isIdentifier(path.node.key) || t.isStringLiteral(path.node.key)) &&
                         t.isExpression(valuePath.node)) {
-                        const call = exprCall(valuePath, valuePath.node, internal);
+                        const call = (0, lib_js_1.exprCall)(valuePath, valuePath.node, internal);
                         if (call) {
-                            if (path.node.key.name.startsWith("$")) {
+                            if ((0, utils_1.stringify)(path.node.key).startsWith("$")) {
                                 valuePath.replaceWith(call);
                             }
                             else {
@@ -235,9 +317,13 @@ export function meshExpression(nodePath, internal, isRoot) {
                             replaced = true;
                         }
                         else if (t.isIdentifier(valuePath.node) &&
-                            internal.stack.get(valuePath.node.name) === 3 /* VariableState.ReactiveObject */ &&
-                            !path.node.key.name.startsWith("$$")) {
-                            throw path.buildCodeFrameError("Vasille: Reactive object property name must start with $$");
+                            internal.stack.get(valuePath.node.name) === 3 /* VariableState.ReactiveObject */) {
+                            if (!(0, utils_1.stringify)(path.node.key).startsWith("$$")) {
+                                throw path.buildCodeFrameError("Vasille: Reactive object property name must start with $$");
+                            }
+                        }
+                        else if ((0, utils_1.stringify)(path.node.key).startsWith("$")) {
+                            throw path.buildCodeFrameError("Vasille: This property is not a reactive value or object");
                         }
                     }
                     if (!replaced) {
@@ -245,6 +331,9 @@ export function meshExpression(nodePath, internal, isRoot) {
                     }
                 }
                 else if (t.isObjectMethod(prop)) {
+                    if ((0, utils_1.stringify)(prop.key).startsWith("$")) {
+                        throw propPath.buildCodeFrameError("Vasille: Method name stating with $ is not allowed");
+                    }
                     meshFunction(propPath, internal);
                 }
                 else if (isRoot && internal.stateOnly && t.isSpreadElement(prop)) {
@@ -276,15 +365,17 @@ export function meshExpression(nodePath, internal, isRoot) {
         }
     }
 }
-export function meshStatements(paths, internal) {
+function meshStatements(paths, internal) {
     for (const path of paths) {
         meshStatement(path, internal);
     }
 }
-export function ignoreParams(val, internal) {
+function ignoreParams(val, internal) {
+    /* istanbul ignore else */
     if (t.isAssignmentPattern(val)) {
         val = val.left;
     }
+    /* istanbul ignore else */
     if (t.isIdentifier(val)) {
         internal.stack.set(val.name, 1 /* VariableState.Ignored */);
     }
@@ -301,7 +392,9 @@ export function ignoreParams(val, internal) {
 }
 function ignoreObjectPattern(pattern, internal) {
     for (const property of pattern.properties) {
+        /* istanbul ignore else */
         if (t.isObjectProperty(property)) {
+            /* istanbul ignore else */
             if (t.isObjectPattern(property.value)) {
                 ignoreObjectPattern(property.value, internal);
             }
@@ -312,14 +405,16 @@ function ignoreObjectPattern(pattern, internal) {
                 internal.stack.set(property.value.name, 1 /* VariableState.Ignored */);
             }
         }
+        /* istanbul ignore else */
         if (t.isRestElement(property)) {
             internal.stack.set(property.argument.name, 1 /* VariableState.Ignored */);
         }
     }
 }
-export function reactiveArrayPattern(path, internal) {
+function reactiveArrayPattern(path, internal) {
     if (t.isArrayPattern(path.node)) {
         path.node.elements.forEach((element, index) => {
+            /* istanbul ignore else */
             if (t.isIdentifier(element)) {
                 internal.stack.set(element.name, index < 2 ? 2 /* VariableState.Reactive */ : 1 /* VariableState.Ignored */);
             }
@@ -332,12 +427,14 @@ export function reactiveArrayPattern(path, internal) {
 function meshForEachHeader(path, internal) {
     const left = path.node.left;
     meshExpression(path.get("right"), internal);
+    /* istanbul ignore else */
     if (t.isVariableDeclaration(left) && t.isVariableDeclarator(left.declarations[0])) {
         ignoreParams(left.declarations[0].id, internal);
     }
 }
 function meshForHeader(path, internal) {
     const node = path.node;
+    /* istanbul ignore else */
     if (node.init) {
         if (t.isExpression(node.init)) {
             meshExpression(path.get("init"), internal);
@@ -355,12 +452,18 @@ function meshForHeader(path, internal) {
 }
 function meshClassBody(path, internal) {
     for (const item of path.get("body")) {
+        /* istanbul ignore else */
         if (t.isClassMethod(item.node) || t.isClassPrivateMethod(item.node)) {
             meshFunction(item, internal);
         }
+        else if (t.isClassAccessorProperty(item.node) ||
+            t.isClassPrivateProperty(item.node) ||
+            t.isClassProperty(item.node)) {
+            meshExpression(item.get("value"), internal);
+        }
     }
 }
-export function meshStatement(path, internal) {
+function meshStatement(path, internal) {
     const statement = path.node;
     switch (statement && statement.type) {
         case "BlockStatement":
@@ -439,6 +542,7 @@ export function meshStatement(path, internal) {
             break;
         case "TryStatement":
             meshStatement(path.get("block"), internal);
+            /* istanbul ignore else */
             if (path.node.handler) {
                 meshStatement(path.get("handler").get("body"), internal);
             }
@@ -448,8 +552,10 @@ export function meshStatement(path, internal) {
             const _path = path;
             for (const declaration of _path.get("declarations")) {
                 const expr = declaration.node.init;
-                if (expr && t.isIdentifier(declaration.node.id) && calls(expr, ["compose", "extend", "state"], internal)) {
-                    meshComposeCall(expr, declaration.node.id, declaration.get("init"), internal);
+                const initPath = declaration.get("init");
+                const composeMethod = (0, call_js_1.calls)(initPath, ["compose", "store", "view", "mvvmView", "mvcView", "hybridView", "screen"], internal);
+                if (expr && t.isIdentifier(declaration.node.id) && composeMethod) {
+                    meshComposeCall(expr, declaration.node.id, declaration.get("init"), composeMethod, internal);
                 }
                 else {
                     meshExpression(declaration.get("init"), internal);
@@ -475,6 +581,7 @@ export function meshStatement(path, internal) {
             break;
         case "ExportDefaultDeclaration": {
             const declarationPath = path.get("declaration");
+            /* istanbul ignore else */
             if (t.isExpression(declarationPath.node)) {
                 meshExpression(declarationPath, internal);
             }
@@ -487,7 +594,7 @@ export function meshStatement(path, internal) {
         }
     }
 }
-export function meshFunction(path, internal) {
+function meshFunction(path, internal) {
     if (t.isFunctionDeclaration(path.node) && path.node.id) {
         internal.stack.set(path.node.id.name, 1 /* VariableState.Ignored */);
     }
@@ -508,7 +615,7 @@ export function meshFunction(path, internal) {
     }
     internal.stack.pop();
 }
-export function composeExpression(path, internal, isRoot) {
+function composeExpression(path, internal, isRoot) {
     const expr = path.node;
     switch (expr && expr.type) {
         case "AssignmentExpression": {
@@ -517,18 +624,26 @@ export function composeExpression(path, internal, isRoot) {
         }
         case "CallExpression":
         case "OptionalCallExpression": {
-            const call = expr;
-            if (calls(call, ["watch"], internal)) {
-                const args = parseCalculateCall(path, internal);
+            if ((0, call_js_1.calls)(path, ["watch"], internal)) {
+                const args = (0, lib_js_1.parseCalculateCall)(path, internal);
+                /* istanbul ignore else */
                 if (args) {
                     if (args[1].elements.length > 0) {
-                        path.replaceWith(t.callExpression(t.memberExpression(ctx, t.identifier("watch")), args));
+                        path.replaceWith(t.callExpression(internal.stateOnly
+                            ? t.memberExpression(internal.id, t.identifier("ex"))
+                            : t.memberExpression(internal_js_1.ctx, t.identifier("watch")), args));
                     }
                     else {
                         path.replaceWith(t.callExpression(args[0], []));
                     }
                 }
             }
+            else if ((0, call_js_1.calls)(path, ["runOnDestroy"], internal)) {
+                if (internal.stateOnly) {
+                    throw path.buildCodeFrameError("Vasille: Stores in Vasille.JS are not destroyable");
+                }
+                path.get("callee").replaceWith(t.memberExpression(internal_js_1.ctx, t.identifier("runOnDestroy")));
+            }
             else {
                 meshExpression(path, internal);
             }
@@ -548,18 +663,18 @@ export function composeExpression(path, internal, isRoot) {
             if (internal.stateOnly) {
                 throw path.buildCodeFrameError("Vasille: JSX is not allowed in states");
             }
-            path.replaceWithMultiple(transformJsx(path, internal));
+            path.replaceWithMultiple((0, jsx_js_1.transformJsx)(path, internal));
             break;
         default:
             meshExpression(path, internal, isRoot);
     }
 }
-export function composeStatements(paths, internal, isRoot) {
+function composeStatements(paths, internal, isRoot) {
     for (const path of paths) {
         composeStatement(path, internal, isRoot);
     }
 }
-export function composeStatement(path, internal, isRoot) {
+function composeStatement(path, internal, isRoot) {
     const statement = path.node;
     if (!statement) {
         return;
@@ -641,14 +756,14 @@ export function composeStatement(path, internal, isRoot) {
             const _path = path;
             const kind = _path.node.kind;
             const declares = kind === "const" ? 1 /* VariableState.Ignored */ : 2 /* VariableState.Reactive */;
-            if (kind === "let" || kind === "var") {
-                _path.node.kind = "const";
-            }
+            let switchToConst = true;
             for (const declaration of _path.get("declarations")) {
                 const id = declaration.node.id;
+                const bridgeMethod = (0, bridge_1.processBridgeCall)(declaration.get("init"), internal);
                 let meshInit = true;
                 function idName(target = id) {
                     let name = "#";
+                    /* istanbul ignore else */
                     if (t.isIdentifier(target)) {
                         name = target.name;
                     }
@@ -659,35 +774,49 @@ export function composeStatement(path, internal, isRoot) {
                     return [idName(pattern.elements[0]), idName(pattern.elements[1])];
                 }
                 ignoreParams(declaration.node.id, internal);
-                if (calls(declaration.node.init, ["awaited"], internal)) {
+                /* istanbul ignore else */
+                if (bridgeMethod === "value" && declares === 2 /* VariableState.Reactive */ && t.isIdentifier(declaration.node.id)) {
+                    switchToConst = true;
+                    meshInit = false;
+                    internal.stack.set(declaration.node.id.name, 2 /* VariableState.Reactive */);
+                    declaration.get("init").replaceWith((0, lib_js_1.ref)(declaration.node.init, internal, declaration.node.id.name));
+                }
+                else if (bridgeMethod) {
+                    switchToConst = false;
+                    meshInit = false;
+                }
+                else if ((0, call_js_1.calls)(declaration.get("init"), ["awaited"], internal)) {
                     reactiveArrayPattern(declaration.get("id"), internal);
                     meshAllUnknown(declaration.get("init").get("arguments"), internal);
-                    named(declaration.node.init, idDoubleName(), internal);
+                    (0, lib_js_1.named)(declaration.node.init, idDoubleName(), internal);
                     meshInit = false;
                 }
                 else if (t.isIdentifier(id)) {
                     internal.stack.set(id.name, declares);
                     const init = declaration.node.init;
-                    if (calls(init, ["value"], internal)) {
+                    const initPath = declaration.get("init");
+                    let callName = false;
+                    if ((0, call_js_1.calls)(initPath, ["value"], internal)) {
                         internal.stack.set(id.name, 1 /* VariableState.Ignored */);
                         declaration.get("init").replaceWith(init.arguments[0]);
                         _path.node.kind = kind;
+                        switchToConst = false;
                     }
-                    else if (calls(init, ["bind"], internal)) {
+                    else if ((0, call_js_1.calls)(initPath, ["bind"], internal)) {
                         const argument = init.arguments[0];
                         const argumentPath = declaration.get("init").get("arguments")[0];
                         let replaceWith = declares === 2 /* VariableState.Reactive */
-                            ? forwardOnlyExpr(argumentPath, argument, internal)
-                            : exprCall(argumentPath, argument, internal, idName());
+                            ? (0, lib_js_1.forwardOnlyExpr)(argumentPath, argument, internal)
+                            : (0, lib_js_1.exprCall)(argumentPath, argument, internal, idName());
                         if (!replaceWith) {
                             replaceWith =
                                 declares === 2 /* VariableState.Reactive */
                                     ? t.callExpression(t.memberExpression(internal.id, t.identifier("r")), [argument])
-                                    : ref(argument, internal, idName());
+                                    : (0, lib_js_1.ref)(argument, internal, idName());
                         }
                         if (declares === 2 /* VariableState.Reactive */) {
                             internal.stack.set(id.name, 4 /* VariableState.ReactivePointer */);
-                            replaceWith = own(replaceWith, internal, idName());
+                            replaceWith = (0, lib_js_1.own)(replaceWith, internal, idName());
                         }
                         else {
                             internal.stack.set(id.name, 2 /* VariableState.Reactive */);
@@ -695,58 +824,57 @@ export function composeStatement(path, internal, isRoot) {
                         declaration.get("init").replaceWith(replaceWith);
                         meshInit = !replaceWith;
                     }
-                    else if (calls(init, ["ref"], internal)) {
+                    else if ((0, call_js_1.calls)(initPath, ["ref"], internal)) {
                         const argument = init.arguments[0];
                         internal.stack.set(id.name, 2 /* VariableState.Reactive */);
-                        declaration.get("init").replaceWith(ref(t.isExpression(argument) ? argument : null, internal, idName()));
+                        declaration.get("init").replaceWith((0, lib_js_1.ref)(t.isExpression(argument) ? argument : null, internal, idName()));
                     }
-                    else if (calls(init, ["reactiveObject"], internal)) {
+                    else if ((0, call_js_1.calls)(initPath, ["reactiveObject"], internal)) {
                         const value = init.arguments[0];
                         if (kind !== "const") {
                             throw declaration.buildCodeFrameError(`Vasille: Reactive objects must be must be declared as constants`);
                         }
                         if (t.isObjectExpression(value)) {
-                            declaration.get("init").replaceWith(reactiveObject(value, internal, idName()));
+                            declaration.get("init").replaceWith((0, lib_js_1.reactiveObject)(value, internal, idName()));
                             internal.stack.set(id.name, 3 /* VariableState.ReactiveObject */);
                         }
                         else {
                             throw declaration.buildCodeFrameError(`Vasille: reactiveObject requires object expression as argument`);
                         }
                     }
-                    else if (calls(init, ["arrayModel"], internal)) {
+                    else if ((0, call_js_1.calls)(initPath, ["arrayModel"], internal)) {
                         const value = init.arguments[0];
                         if (kind !== "const") {
                             throw declaration.buildCodeFrameError(`Vasille: Array models must be must be declared as constants`);
                         }
                         if (t.isArrayExpression(value)) {
-                            declaration.get("init").replaceWith(arrayModel(value, internal, idName()));
+                            declaration.get("init").replaceWith((0, lib_js_1.arrayModel)(value, internal, idName()));
                         }
                         else {
-                            declaration.get("init").replaceWith(arrayModel(null, internal, idName()));
+                            declaration.get("init").replaceWith((0, lib_js_1.arrayModel)(null, internal, idName()));
                         }
                     }
-                    else if (calls(init, ["mapModel", "setModel"], internal)) {
+                    else if ((callName = (0, call_js_1.calls)(initPath, ["mapModel", "setModel"], internal))) {
                         const args = init.arguments;
-                        const name = calls(init, ["mapModel", "setModel"], internal);
                         if (kind !== "const") {
-                            throw declaration.buildCodeFrameError(`Vasille: ${name === "mapModel" ? "Map" : "Set"} models must be declared as constants`);
+                            throw declaration.buildCodeFrameError(`Vasille: ${callName === "mapModel" ? "Map" : "Set"} models must be declared as constants`);
                         }
                         declaration
                             .get("init")
-                            .replaceWith(name === "mapModel" ? mapModel(args, internal, idName()) : setModel(args, internal, idName()));
+                            .replaceWith(callName === "mapModel" ? (0, lib_js_1.mapModel)(args, internal, idName()) : (0, lib_js_1.setModel)(args, internal, idName()));
                     }
                     else if (t.isObjectExpression(init)) {
                         if (kind !== "const") {
                             throw declaration.buildCodeFrameError(`Vasille: Objects must be must be declared as constants`);
                         }
-                        declaration.get("init").replaceWith(reactiveObject(init, internal, idName()));
+                        declaration.get("init").replaceWith((0, lib_js_1.reactiveObject)(init, internal, idName()));
                         internal.stack.set(id.name, 3 /* VariableState.ReactiveObject */);
                     }
                     else if (t.isArrayExpression(init)) {
                         if (kind !== "const") {
                             throw declaration.buildCodeFrameError(`Vasille: Arrays must be must be declared as constants`);
                         }
-                        declaration.get("init").replaceWith(arrayModel(init, internal, idName()));
+                        declaration.get("init").replaceWith((0, lib_js_1.arrayModel)(init, internal, idName()));
                     }
                     else if (t.isNewExpression(init) && t.isIdentifier(init.callee)) {
                         if (init.callee.name === "Map" || init.callee.name === "Set") {
@@ -756,35 +884,49 @@ export function composeStatement(path, internal, isRoot) {
                             declaration
                                 .get("init")
                                 .replaceWith(init.callee.name === "Map"
-                                ? mapModel(init.arguments, internal, idName())
-                                : setModel(init.arguments, internal, idName()));
+                                ? (0, lib_js_1.mapModel)(init.arguments, internal, idName())
+                                : (0, lib_js_1.setModel)(init.arguments, internal, idName()));
                         }
                     }
                     else if (declares === 2 /* VariableState.Reactive */) {
-                        const replaceWith = forwardOnlyExpr(declaration.get("init"), declaration.node.init, internal);
+                        const replaceWith = (0, lib_js_1.forwardOnlyExpr)(declaration.get("init"), declaration.node.init, internal);
                         meshInit = !replaceWith;
                         internal.stack.set(id.name, replaceWith ? 4 /* VariableState.ReactivePointer */ : 2 /* VariableState.Reactive */);
                         declaration
                             .get("init")
-                            .replaceWith(replaceWith ? own(replaceWith, internal, idName()) : ref(declaration.node.init, internal, idName()));
+                            .replaceWith(replaceWith ? (0, lib_js_1.own)(replaceWith, internal, idName()) : (0, lib_js_1.ref)(declaration.node.init, internal, idName()));
                     }
                     else {
-                        const replaceWith = exprCall(declaration.get("init"), declaration.node.init, internal, idName());
+                        const replaceWith = (0, lib_js_1.exprCall)(declaration.get("init"), declaration.node.init, internal, idName());
                         if (replaceWith) {
                             declaration.get("init").replaceWith(replaceWith);
                         }
                         internal.stack.set(id.name, replaceWith
                             ? 2 /* VariableState.Reactive */
-                            : nodeIsReactiveObject(declaration.get("init"), internal)
+                            : (0, expression_js_1.nodeIsReactiveObject)(declaration.get("init"), internal)
                                 ? 3 /* VariableState.ReactiveObject */
                                 : 1 /* VariableState.Ignored */);
                         meshInit = !replaceWith;
                     }
                 }
+                else if (t.isObjectPattern(id)) {
+                    for (const prop of id.properties) {
+                        /* istanbul ignore else */
+                        if (t.isObjectProperty(prop) && t.isIdentifier(prop.value)) {
+                            internal.stack.set(prop.value.name, 2 /* VariableState.Reactive */);
+                        }
+                        else if (t.isRestElement(prop) && t.isIdentifier(prop.argument)) {
+                            internal.stack.set(prop.argument.name, 3 /* VariableState.ReactiveObject */);
+                        }
+                    }
+                }
                 if (meshInit) {
                     meshExpression(declaration.get("init"), internal);
                 }
             }
+            if (switchToConst && (kind === "let" || kind === "var")) {
+                _path.node.kind = "const";
+            }
             break;
         }
         case "WhileStatement": {
@@ -807,26 +949,50 @@ export function composeStatement(path, internal, isRoot) {
             meshStatement(path, internal);
     }
 }
-export function compose(path, internal, isInternalSlot) {
+function compose(path, internal, isInternalSlot, composeMethod) {
     internal.stack.push();
     const node = path.node;
     const params = node.params;
     const body = node.body;
+    const argsNumber = composeArgsNumber[composeMethod];
     if (t.isFunctionExpression(node) && node.id) {
         internal.stack.set(node.id.name, 1 /* VariableState.Ignored */);
     }
-    if (params.length > 1 && !isInternalSlot) {
-        throw path.get("params")[1].buildCodeFrameError("Vasille: JSX component must have no more then 1 parameter");
+    if (params.length > argsNumber && !isInternalSlot) {
+        throw path.get("params")[argsNumber].buildCodeFrameError("Vasille: Extra parameters are not allowed");
     }
+    const cumulativeFields = new Set();
+    const nonPropsFields = [];
+    let index = 0;
     for (const param of path.get("params")) {
         const node = param.node;
+        const isProps = index === composePropsIndex[composeMethod];
         if (t.isAssignmentPattern(node)) {
             throw param.buildCodeFrameError("Vasille: No default value allowed here");
         }
-        if (t.isIdentifier(node)) {
-            internal.stack.set(node.name, isInternalSlot ? 1 /* VariableState.Ignored */ : 3 /* VariableState.ReactiveObject */);
+        if (argsNumber !== 1) {
+            if (t.isObjectPattern(node)) {
+                for (const prop of node.properties) {
+                    if (t.isObjectProperty(prop)) {
+                        const name = (0, utils_1.stringify)(prop.key);
+                        if (cumulativeFields.has(name)) {
+                            throw param.buildCodeFrameError(`Vasille: Field "${name}" is defined twice`);
+                        }
+                        cumulativeFields.add(name);
+                        if (!isProps) {
+                            nonPropsFields.push(name);
+                        }
+                    }
+                    else {
+                        throw param.buildCodeFrameError("Vasille: Rest element is not supported here");
+                    }
+                }
+            }
         }
-        else if (isInternalSlot && t.isObjectPattern(node)) {
+        if (t.isIdentifier(node) && argsNumber === 1) {
+            internal.stack.set(node.name, isInternalSlot || !isProps ? 1 /* VariableState.Ignored */ : 3 /* VariableState.ReactiveObject */);
+        }
+        else if ((isInternalSlot || !isProps) && t.isObjectPattern(node)) {
             ignoreObjectPattern(node, internal);
         }
         else if (t.isObjectPattern(node)) {
@@ -835,6 +1001,7 @@ export function compose(path, internal, isInternalSlot) {
                 if (t.isObjectProperty(node)) {
                     const key = node.key;
                     let keyName = "";
+                    /* istanbul ignore else */
                     if (t.isIdentifier(node.value)) {
                         keyName = node.value.name;
                     }
@@ -858,14 +1025,27 @@ export function compose(path, internal, isInternalSlot) {
             }
         }
         else {
-            throw param.buildCodeFrameError("Vasille: Expected identifier or object pattern");
+            throw param.buildCodeFrameError(argsNumber === 1 ? "Vasille: Expected identifier or object pattern" : "Vasille: Expected object pattern here");
         }
+        index++;
+    }
+    if (argsNumber !== 1) {
+        node.params = [
+            t.objectPattern([
+                ...params[0].properties,
+                ...params[1].properties,
+            ]),
+        ];
     }
+    internal.isComposing = true;
+    /* istanbul ignore else */
     if (t.isExpression(body)) {
         composeExpression(path.get("body"), internal, true);
     }
     else if (t.isBlockStatement(body)) {
         composeStatement(path.get("body"), internal, true);
     }
+    internal.isComposing = false;
     internal.stack.pop();
+    return nonPropsFields;
 }