babel-plugin-vasille 3.1.1 → 3.2.1

package/lib/router.js

@@ -0,0 +1,41 @@
+"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.routerReplace = routerReplace;
+const t = __importStar(require("@babel/types"));
+const internal_1 = require("./internal");
+function routerReplace(path) {
+    path.replaceWith(t.memberExpression(t.memberExpression(internal_1.ctx, t.identifier("runner")), t.identifier("router")));
+}

package/lib/transformer.js

@@ -1,7 +1,43 @@
-import * as t from "@babel/types";
-import { StackedStates } from "./internal.js";
-import { meshStatement } from "./mesh.js";
-import { findStyleInNode } from "./css-transformer.js";
+"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.trProgram = trProgram;
+const t = __importStar(require("@babel/types"));
+const internal_js_1 = require("./internal.js");
+const mesh_js_1 = require("./mesh.js");
+const css_transformer_js_1 = require("./css-transformer.js");
 const imports = new Map([["vasille-web", "VasilleWeb"]]);
 const ignoreMembers = new Set([
     "value",
@@ -21,13 +57,15 @@ const ignoreMembers = new Set([
     "laptop",
     "prefersDark",
     "prefersLight",
-    "state",
+    "bridge",
+    "router",
+    "runOnDestroy",
 ]);
 function extractText(node) {
     // no case found for string literal
     return node.name;
 }
-export function trProgram(path, devMode) {
+function trProgram(path, devMode) {
     let id;
     let stylesConnected = false;
     const internal = {
@@ -38,7 +76,7 @@ export function trProgram(path, devMode) {
         set id(expr) {
             id = expr;
         },
-        stack: new StackedStates(),
+        stack: new internal_js_1.StackedStates(),
         mapping: new Map(),
         global: "",
         prefix: "Vasille_",
@@ -54,8 +92,10 @@ export function trProgram(path, devMode) {
             if (name) {
                 internal.prefix = name;
                 for (const specifier of statement.specifiers) {
+                    /* istanbul ignore else */
                     if (t.isImportNamespaceSpecifier(specifier)) {
                         internal.global = specifier.local.name;
+                        /* istanbul ignore else */
                         if (statement.source.value === "vasille-web") {
                             stylesConnected = true;
                         }
@@ -89,8 +129,8 @@ export function trProgram(path, devMode) {
             if (!id) {
                 return;
             }
-            else if (!stylesConnected || !findStyleInNode(statementPath, internal)) {
-                meshStatement(statementPath, internal);
+            else if (!stylesConnected || !(0, css_transformer_js_1.findStyleInNode)(statementPath, internal)) {
+                (0, mesh_js_1.meshStatement)(statementPath, internal);
             }
         }
     }
@@ -99,6 +139,7 @@ export function trProgram(path, devMode) {
         const statement = statementPath.node;
         statementPath.replaceWith(t.importDeclaration([
             ...statement.specifiers.filter(item => {
+                /* istanbul ignore else */
                 if (t.isImportSpecifier(item) && t.isIdentifier(item.local)) {
                     return statementPath.scope.bindings[item.local.name].referenced;
                 }

package/lib/utils.js

@@ -0,0 +1,50 @@
+"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.stringify = stringify;
+const t = __importStar(require("@babel/types"));
+function stringify(node) {
+    let name = "";
+    if (t.isStringLiteral(node)) {
+        name = node.value;
+    }
+    if (t.isPrivateName(node)) {
+        name = node.id.name;
+    }
+    if (t.isIdentifier(node)) {
+        name = node.name;
+    }
+    return name;
+}

package/lib-node/bridge.js

@@ -0,0 +1,173 @@
+"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.processBridgeCall = processBridgeCall;
+const t = __importStar(require("@babel/types"));
+const expression_1 = require("./expression");
+const lib_1 = require("./lib");
+const mesh_1 = require("./mesh");
+const utils_1 = require("./utils");
+const bridgeConstName = "bridge";
+function processBridgeCall(path, internal, search) {
+    const node = path.node;
+    if (t.isCallExpression(node) && t.isMemberExpression(node.callee)) {
+        const callee = node.callee;
+        let propName = null;
+        if (t.isIdentifier(callee.object)) {
+            const mapped = internal.mapping.get(callee.object.name);
+            if (mapped && mapped === bridgeConstName && internal.stack.get(callee.object.name) === undefined) {
+                propName = (0, utils_1.stringify)(callee.property);
+            }
+        }
+        if (t.isMemberExpression(callee.object) && t.isIdentifier(callee.object.object)) {
+            const rootName = callee.object.object.name;
+            if (rootName === internal.global &&
+                internal.stack.get(rootName) === undefined &&
+                (0, utils_1.stringify)(callee.object.property) === bridgeConstName) {
+                propName = (0, utils_1.stringify)(callee.property);
+            }
+        }
+        if (propName) {
+            const getArg = (mesh = true) => {
+                if (node.arguments.length !== 1 || !t.isExpression(node.arguments[0])) {
+                    throw path.buildCodeFrameError("Vasille: Expected 1 argument");
+                }
+                if (mesh) {
+                    (0, mesh_1.meshExpression)(path.get("arguments")[0], internal);
+                }
+                return node.arguments[0];
+            };
+            const callWithArg = (name) => {
+                path.replaceWith(t.callExpression(t.memberExpression(internal.id, t.identifier(name)), [getArg()]));
+            };
+            const callWithOptionalArg = (name) => {
+                if (node.arguments.length === 0) {
+                    path.replaceWith(t.callExpression(t.memberExpression(internal.id, t.identifier(name)), []));
+                }
+                else {
+                    callWithArg(name);
+                }
+            };
+            switch (propName) {
+                case "ref": {
+                    callWithArg("r");
+                    break;
+                }
+                case "bind": {
+                    const arg = getArg(false);
+                    const result = (0, expression_1.checkNode)(path.get("arguments")[0], internal);
+                    if (result.self) {
+                        path.replaceWith(result.self);
+                    }
+                    else if (result.found.size > 0) {
+                        const found = result.found;
+                        path.replaceWith(t.callExpression(t.memberExpression(internal.id, t.identifier("ex")), [
+                            t.arrowFunctionExpression([...found.keys()].map(expression_1.encodeName), arg),
+                            t.arrayExpression([...found.values()]),
+                        ]));
+                    }
+                    else {
+                        callWithArg("r");
+                    }
+                    break;
+                }
+                case "calculate":
+                case "watch": {
+                    const args = (0, lib_1.processCalculateCall)(path, internal);
+                    path.replaceWith(t.callExpression(t.memberExpression(internal.id, t.identifier("ex")), args));
+                    break;
+                }
+                case "arrayModel": {
+                    callWithOptionalArg("sam");
+                    break;
+                }
+                case "setModel": {
+                    callWithOptionalArg("ssm");
+                    break;
+                }
+                case "mapModel": {
+                    callWithOptionalArg("smm");
+                    break;
+                }
+                case "reactiveObject": {
+                    callWithArg("sro");
+                    break;
+                }
+                case "value": {
+                    if (!search) {
+                        path.replaceWith(t.memberExpression(getArg(), t.identifier("$")));
+                    }
+                    else {
+                        path.replaceWith(getArg());
+                    }
+                    break;
+                }
+                case "setValue": {
+                    if (node.arguments.length !== 2 || !t.isExpression(node.arguments[0]) || !t.isExpression(node.arguments[1])) {
+                        throw path.buildCodeFrameError("Vasille: Expected 2 arguments");
+                    }
+                    (0, mesh_1.meshExpression)(path.get("arguments")[0], internal);
+                    if (search) {
+                        (0, expression_1.checkExpression)(path.get("arguments")[1], search);
+                    }
+                    else {
+                        (0, mesh_1.meshExpression)(path.get("arguments")[1], internal);
+                    }
+                    path.replaceWith(t.assignmentExpression("=", t.memberExpression(node.arguments[0], t.identifier("$")), node.arguments[1]));
+                    break;
+                }
+                case "stored": {
+                    const arg = getArg(false);
+                    if ((t.isIdentifier(arg) && (0, expression_1.idIsIValue)(path.get("arguments")[0], internal)) ||
+                        (t.isMemberExpression(arg) && (0, expression_1.memberIsIValue)(arg, internal))) {
+                        path.replaceWith(t.memberExpression(arg, t.identifier("$")));
+                    }
+                    else {
+                        callWithArg("rv");
+                    }
+                    break;
+                }
+                case "destroy": {
+                    path.replaceWith(t.callExpression(t.memberExpression(getArg(true), t.identifier("destroy")), []));
+                    break;
+                }
+                default:
+                    throw path.buildCodeFrameError(`Vasille: Unknown bridge method "${propName}"`);
+            }
+            return propName;
+        }
+    }
+    return false;
+}

package/lib-node/call.js

@@ -40,6 +40,7 @@ const internal_js_1 = require("./internal.js");
 exports.composeOnly = [
     "forward",
     "watch",
+    "calculate",
     "ref",
     "bind",
     "value",
@@ -48,6 +49,8 @@ exports.composeOnly = [
     "mapModel",
     "setModel",
     "reactiveObject",
+    "router",
+    "runOnDestroy",
 ];
 exports.styleOnly = [
     "theme",
@@ -61,29 +64,37 @@ exports.styleOnly = [
 ];
 exports.requiresContext = ["awaited"];
 const requiresContextSet = new Set(exports.requiresContext);
-function calls(node, names, internal) {
+function checkCall(path, name, internal) {
+    const node = path.node;
+    if (requiresContextSet.has(name) && t.isCallExpression(node)) {
+        if (internal.stateOnly) {
+            throw path.buildCodeFrameError(`Vasille: ${name} function can be used only in components`);
+        }
+        node.arguments.unshift(internal_js_1.ctx);
+    }
+    if (name === "store") {
+        internal.stateOnly = true;
+    }
+    if (["compose", "view", "mvcView", "mvvmView", "hybridView", "screen"].includes(name)) {
+        internal.stateOnly = false;
+    }
+    return name;
+}
+function calls(path, names, internal) {
+    const node = path.node;
     const set = new Set(names);
     const callee = t.isCallExpression(node) ? node.callee : null;
     if (callee) {
         if (t.isIdentifier(callee)) {
             const mapped = internal.mapping.get(callee.name);
             if (mapped && set.has(mapped) && internal.stack.get(callee.name) === undefined) {
-                if (requiresContextSet.has(callee.name) && t.isCallExpression(node)) {
-                    node.arguments.unshift(internal_js_1.ctx);
-                }
-                if (mapped === "state") {
-                    internal.stateOnly = true;
-                }
-                if (mapped === "compose" || mapped === "extend") {
-                    internal.stateOnly = false;
-                }
-                return mapped;
+                return checkCall(path, mapped, internal);
             }
             return false;
         }
-        const global = internal.stack.get(internal.global) === undefined;
         let propName = null;
         if (t.isMemberExpression(callee)) {
+            /* istanbul ignore else */
             if (t.isIdentifier(callee.property)) {
                 propName = callee.property.name;
             }
@@ -91,13 +102,13 @@ function calls(node, names, internal) {
                 propName = callee.property.value;
             }
         }
-        if (t.isMemberExpression(callee) && t.isIdentifier(callee.object) && propName) {
-            if (global && callee.object.name === internal.global && set.has(propName)) {
-                if (requiresContextSet.has(propName) && t.isCallExpression(node)) {
-                    node.arguments.unshift(internal_js_1.ctx);
-                }
-                return callee.object.name;
-            }
+        if (propName &&
+            set.has(propName) &&
+            t.isMemberExpression(callee) &&
+            t.isIdentifier(callee.object) &&
+            callee.object.name === internal.global &&
+            internal.stack.get(internal.global) === undefined) {
+            return checkCall(path, propName, internal);
         }
     }
     return false;

package/lib-node/css-transformer.js

@@ -47,7 +47,7 @@ function tryProcessProp(path, pseudo, media, internal) {
 }
 const mediaDefaults = ["mobile", "tablet", "laptop", "prefersDark", "prefersLight"];
 function processValue(name, path, pseudo, theme, media, mediaDefault, allowFallback, internal) {
-    if ((0, call_js_1.calls)(path.node, ["theme"], internal)) {
+    if ((0, call_js_1.calls)(path, ["theme"], internal)) {
         const call = path.node;
         if (theme) {
             throw path.buildCodeFrameError("Vasille: The theme seems the be defined twice");
@@ -61,14 +61,14 @@ function processValue(name, path, pseudo, theme, media, mediaDefault, allowFallb
                 .buildCodeFrameError("Vasille: Expected string literal");
         }
     }
-    if ((0, call_js_1.calls)(path.node, ["dark"], internal)) {
+    if ((0, call_js_1.calls)(path, ["dark"], internal)) {
         if (theme) {
             throw path.buildCodeFrameError("Vasille: The theme seem the be defined twice");
         }
         return processValue(name, path.get("arguments")[0], pseudo, `.dark`, media, mediaDefault, false, internal);
     }
     let callee;
-    if ((callee = (0, call_js_1.calls)(path.node, mediaDefaults, internal))) {
+    if ((callee = (0, call_js_1.calls)(path, mediaDefaults, internal))) {
         const index = mediaDefaults.indexOf(callee) + 1;
         if (mediaDefault.includes(index)) {
             return processValue(name, path.get("arguments")[0], pseudo, theme, media, mediaDefault, false, internal);
@@ -178,7 +178,7 @@ function findStyleInNode(path, internal) {
     }
     if (t.isVariableDeclaration(path.node) &&
         path.node.declarations.length === 1 &&
-        (0, call_js_1.calls)(path.node.declarations[0].init, ["styleSheet"], internal)) {
+        (0, call_js_1.calls)(path.get("declarations")[0].get("init"), ["styleSheet"], internal)) {
         const call = path.node.declarations[0].init;
         const callPath = path
             .get("declarations")[0]