babel-plugin-vasille 0.99.5 → 3.1.0

package/lib-node/expression.js

@@ -15,26 +15,41 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+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.encodeName = encodeName;
+exports.idIsIValue = idIsIValue;
+exports.idIsLocal = idIsLocal;
+exports.memberIsIValue = memberIsIValue;
+exports.nodeIsReactiveObject = nodeIsReactiveObject;
 exports.checkNode = checkNode;
 exports.checkOrIgnoreAllExpressions = checkOrIgnoreAllExpressions;
 exports.checkAllExpressions = checkAllExpressions;
 exports.checkAllUnknown = checkAllUnknown;
-exports.chekOrIgnoreExpression = chekOrIgnoreExpression;
+exports.checkOrIgnoreExpression = checkOrIgnoreExpression;
 exports.checkExpression = checkExpression;
 exports.checkStatements = checkStatements;
 exports.checkStatement = checkStatement;
 exports.checkFunction = checkFunction;
 const t = __importStar(require("@babel/types"));
-const internal_1 = require("./internal");
+const call_js_1 = require("./call.js");
+const internal_js_1 = require("./internal.js");
 function encodeName(name) {
     return t.identifier(`Vasille_${name}`);
 }
@@ -45,16 +60,17 @@ function addIdentifier(path, search) {
     path.replaceWith(encodeName(path.node.name));
 }
 function stringify(node) {
-    if (t.isIdentifier(node)) {
-        return node.name;
-    }
+    let name = "";
     if (t.isStringLiteral(node)) {
-        return node.value;
+        name = node.value;
     }
     if (t.isPrivateName(node)) {
-        return node.id.name;
+        name = node.id.name;
     }
-    return "$";
+    if (t.isIdentifier(node)) {
+        name = node.name;
+    }
+    return name;
 }
 function extractMemberName(path, search) {
     const names = [];
@@ -65,10 +81,11 @@ function extractMemberName(path, search) {
             throw path.buildCodeFrameError("Vasille: The reactive/observable value is nested");
         }
         it = it.object;
-        names.push();
+        names.push(name);
     }
     names.push(stringify(it));
-    if (t.isIdentifier(it) && search.stack.get(it.name) === 1 /* VariableState.Ignored */) {
+    if (t.isIdentifier(it) &&
+        search.stack.get(it.name, internal_js_1.VariableScope.Local) === 1 /* VariableState.Ignored */) {
         throw path.buildCodeFrameError("Vasille: This node cannot be processed, the root of expression is a local variable");
     }
     return names.reverse().join("_");
@@ -88,35 +105,65 @@ function addExternalIValue(path, search) {
     path.replaceWith(encodeName(name));
 }
 function meshIdentifier(path, internal) {
-    const state = internal.stack.get(path.node.name);
-    if (state === 2 /* VariableState.Reactive */ || state === 4 /* VariableState.ReactivePointer */) {
+    if (idIsIValue(path, internal)) {
         path.replaceWith(t.memberExpression(path.node, t.identifier("$")));
     }
 }
+function idIsIValue(path, internal, scope) {
+    const node = path.node;
+    return (REACTIVE_STATES.includes(internal.stack.get(node.name, scope)) &&
+        (!t.isMemberExpression(path.parent) || path.parent.object === node));
+}
+function idIsLocal(path, internal) {
+    return internal.stack.get(path.node.name, internal_js_1.VariableScope.Local) !== undefined;
+}
+function memberIsIValue(node, internal, scope) {
+    return ((t.isIdentifier(node.object) &&
+        (internal.stack.get(node.object.name, scope) === 3 /* VariableState.ReactiveObject */ ||
+            (t.isIdentifier(node.property) &&
+                node.property.name.startsWith("$") &&
+                !node.property.name.startsWith("$$") &&
+                node.property.name !== "$") ||
+            (t.isStringLiteral(node.property) &&
+                node.property.value.startsWith("$") &&
+                !node.property.value.startsWith("$$") &&
+                node.property.value !== "$"))) ||
+        (t.isMemberExpression(node.object) &&
+            ((t.isIdentifier(node.object.property) && node.object.property.name.startsWith("$$")) ||
+                (t.isStringLiteral(node.object.property) && node.object.property.value.startsWith("$$")))));
+}
+function nodeIsReactiveObject(path, internal) {
+    const node = path.node;
+    if (t.isIdentifier(node)) {
+        return internal.stack.get(node.name) === 3 /* VariableState.ReactiveObject */;
+    }
+    if (t.isOptionalMemberExpression(node) || t.isMemberExpression(node)) {
+        return ((t.isIdentifier(node.property) && node.property.name.startsWith("$$")) ||
+            (t.isStringLiteral(node.property) && node.property.value.startsWith("$$")));
+    }
+}
 function meshMember(path, internal) {
-    if (t.isIdentifier(path.node.object) && internal.stack.get(path.node.object.name) === 3 /* VariableState.ReactiveObject */) {
+    if (memberIsIValue(path.node, internal)) {
         path.replaceWith(t.memberExpression(path.node, t.identifier("$")));
     }
 }
 function meshLValue(path, internal) {
-    if (t.isIdentifier(path.node)) {
+    const node = path.node;
+    if (t.isIdentifier(node)) {
         meshIdentifier(path, internal);
     }
-    else if (t.isMemberExpression(path.node) || t.isOptionalMemberExpression(path.node)) {
+    else if (t.isMemberExpression(node) || t.isOptionalMemberExpression(node)) {
         meshMember(path, internal);
     }
-    else {
-        path.traverse({
-            Identifier(path) {
-                meshIdentifier(path, internal);
-            },
-            MemberExpression(path) {
-                meshMember(path, internal);
-            },
-            OptionalMemberExpression(path) {
-                meshMember(path, internal);
-            },
-        });
+    else if (t.isArrayPattern(node)) {
+        for (const item of path.get("elements")) {
+            if (t.isOptionalMemberExpression(item.node) || t.isLVal(item.node)) {
+                meshLValue(item, internal);
+            }
+        }
+    }
+    else if (t.isRestElement(node)) {
+        meshLValue(path.get("argument"), internal);
     }
 }
 function checkNode(path, internal) {
@@ -124,29 +171,31 @@ function checkNode(path, internal) {
         external: internal,
         found: new Map(),
         self: null,
-        stack: new internal_1.StackedStates(),
+        stack: internal.stack,
     };
     if (t.isIdentifier(path.node)) {
-        const state = internal.stack.get(path.node.name);
-        if (state === 2 /* VariableState.Reactive */ || state == 4 /* VariableState.ReactivePointer */) {
+        if (idIsIValue(path, internal)) {
             search.self = path.node;
         }
     }
     if (t.isMemberExpression(path.node)) {
-        if (t.isIdentifier(path.node.object) &&
-            internal.stack.get(path.node.object.name) === 3 /* VariableState.ReactiveObject */) {
+        if (memberIsIValue(path.node, internal)) {
             search.self = path.node;
         }
-        if (t.isIdentifier(path.node.property) && path.node.property.name === "$") {
+        else if (t.isIdentifier(path.node.property) && path.node.property.name === "$") {
             search.self = path.node.object;
         }
     }
     if (search.self) {
         return search;
     }
+    internal.stack.fixLocalIndex();
+    internal.stack.push();
     if (t.isExpression(path.node)) {
         checkExpression(path, search);
     }
+    internal.stack.pop();
+    internal.stack.resetLocalIndex();
     return search;
 }
 function checkOrIgnoreAllExpressions(nodePaths, search) {
@@ -171,17 +220,15 @@ function checkAllUnknown(paths, internal) {
         }
     }
 }
-function chekOrIgnoreExpression(path, search) {
+function checkOrIgnoreExpression(path, search) {
     if (t.isExpression(path.node)) {
         checkExpression(path, search);
     }
 }
+const REACTIVE_STATES = [2 /* VariableState.Reactive */, 4 /* VariableState.ReactivePointer */];
 function checkExpression(nodePath, search) {
     const expr = nodePath.node;
-    if (!expr) {
-        return;
-    }
-    switch (expr.type) {
+    switch (expr && expr.type) {
         case "TemplateLiteral": {
             const path = nodePath;
             checkOrIgnoreAllExpressions(path.get("expressions"), search);
@@ -190,11 +237,13 @@ function checkExpression(nodePath, search) {
         case "TaggedTemplateExpression": {
             const path = nodePath;
             checkExpression(path.get("quasi"), search);
+            path.get("");
             break;
         }
         case "Identifier": {
-            if (search.stack.get(expr.name) !== 1 /* VariableState.Ignored */) {
-                if (search.external.stack.get(expr.name) === 2 /* VariableState.Reactive */) {
+            if (expr && t.isIdentifier(expr)) {
+                if (idIsIValue(nodePath, search.external, internal_js_1.VariableScope.Global) &&
+                    !idIsLocal(nodePath, search.external)) {
                     addIdentifier(nodePath, search);
                 }
             }
@@ -205,14 +254,12 @@ function checkExpression(nodePath, search) {
             checkAllUnknown(path.get("elements"), search);
             break;
         }
-        case "TupleExpression": {
-            const path = nodePath;
-            checkAllUnknown(path.get("elements"), search);
-            break;
-        }
         case "CallExpression": {
             const path = nodePath;
-            chekOrIgnoreExpression(path.get("callee"), search);
+            if ((0, call_js_1.calls)(path.node, call_js_1.composeOnly, search.external)) {
+                throw path.buildCodeFrameError("Vasille: Usage of hints is restricted here");
+            }
+            checkOrIgnoreExpression(path.get("callee"), search);
             checkAllUnknown(path.get("arguments"), search);
             break;
         }
@@ -232,19 +279,21 @@ function checkExpression(nodePath, search) {
         case "OptionalMemberExpression": {
             const path = nodePath;
             const node = path.node;
-            checkExpression(path.get("object"), search);
-            chekOrIgnoreExpression(path.get("property"), search);
-            if (t.isIdentifier(node.object) && search.external.stack.get(node.object.name) === 3 /* VariableState.ReactiveObject */) {
+            if (memberIsIValue(node, search.external, internal_js_1.VariableScope.Global)) {
                 addMemberExpr(path, search);
             }
             else if (t.isIdentifier(node.property) && node.property.name === "$") {
                 addExternalIValue(path, search);
             }
+            else {
+                checkExpression(path.get("object"), search);
+                checkOrIgnoreExpression(path.get("property"), search);
+            }
             break;
         }
         case "BinaryExpression": {
             const path = nodePath;
-            chekOrIgnoreExpression(path.get("left"), search);
+            checkOrIgnoreExpression(path.get("left"), search);
             checkExpression(path.get("right"), search);
             break;
         }
@@ -263,7 +312,7 @@ function checkExpression(nodePath, search) {
         }
         case "NewExpression": {
             const path = nodePath;
-            chekOrIgnoreExpression(path.get("callee"), search);
+            checkOrIgnoreExpression(path.get("callee"), search);
             checkAllUnknown(path.get("arguments"), search);
             break;
         }
@@ -272,11 +321,6 @@ function checkExpression(nodePath, search) {
             checkAllExpressions(path.get("expressions"), search);
             break;
         }
-        case "ParenthesizedExpression": {
-            const path = nodePath;
-            checkExpression(path.get("expression"), search);
-            break;
-        }
         case "UnaryExpression": {
             const path = nodePath;
             checkExpression(path.get("argument"), search);
@@ -284,7 +328,10 @@ function checkExpression(nodePath, search) {
         }
         case "UpdateExpression": {
             const path = nodePath;
-            checkExpression(path.get("argument"), search);
+            const arg = path.node.argument;
+            if (t.isLVal(arg)) {
+                meshLValue(path.get("argument"), search.external);
+            }
             break;
         }
         case "YieldExpression": {
@@ -297,27 +344,6 @@ function checkExpression(nodePath, search) {
             checkExpression(path.get("argument"), search);
             break;
         }
-        case "TypeCastExpression": {
-            const path = nodePath;
-            checkExpression(path.get("expression"), search);
-            break;
-        }
-        case "BindExpression": {
-            const path = nodePath;
-            checkExpression(path.get("callee"), search);
-            checkExpression(path.get("object"), search);
-            break;
-        }
-        case "PipelineTopicExpression": {
-            const path = nodePath;
-            checkExpression(path.get("expression"), search);
-            break;
-        }
-        case "PipelineBareFunction": {
-            const path = nodePath;
-            checkExpression(path.get("callee"), search);
-            break;
-        }
         case "TSInstantiationExpression": {
             const path = nodePath;
             checkExpression(path.get("expression"), search);
@@ -345,12 +371,10 @@ function checkExpression(nodePath, search) {
                 if (t.isObjectProperty(prop)) {
                     const path = propPath;
                     const valuePath = path.get("value");
-                    if (valuePath instanceof Array) {
-                        checkAllExpressions(valuePath, search);
-                    }
-                    else {
-                        chekOrIgnoreExpression(valuePath, search);
+                    if (path.node.computed) {
+                        checkOrIgnoreExpression(path.get("key"), search);
                     }
+                    checkOrIgnoreExpression(valuePath, search);
                 }
                 else if (t.isObjectMethod(prop)) {
                     checkFunction(propPath, search);
@@ -383,9 +407,6 @@ function checkStatements(paths, search) {
     }
 }
 function ignoreLocals(val, search) {
-    if (t.isAssignmentPattern(val)) {
-        val = val.left;
-    }
     if (t.isIdentifier(val)) {
         search.stack.set(val.name, 1 /* VariableState.Ignored */);
     }
@@ -397,18 +418,23 @@ function ignoreLocals(val, search) {
             else if (t.isRestElement(prop) && t.isIdentifier(prop.argument)) {
                 search.stack.set(prop.argument.name, 1 /* VariableState.Ignored */);
             }
+            else if (t.isObjectProperty(prop) && t.isAssignmentPattern(prop.value)) {
+                ignoreLocals(prop.value.left, search);
+            }
         }
     }
     else if (t.isArrayPattern(val)) {
         for (const element of val.elements) {
-            if (element) {
+            if (element && !t.isVoidPattern(element)) {
                 ignoreLocals(element, search);
             }
         }
     }
     else if (t.isVariableDeclaration(val)) {
         for (const declarator of val.declarations) {
-            ignoreLocals(declarator.id, search);
+            if (!t.isVoidPattern(declarator.id)) {
+                ignoreLocals(declarator.id, search);
+            }
         }
     }
 }
@@ -507,12 +533,16 @@ function checkStatement(path, search) {
             checkExpression(path.get("argument"), search);
             break;
         case "TryStatement":
+            const handlerPath = path.get("handler");
             checkStatement(path.get("block"), search);
+            if (handlerPath.node) {
+                checkStatement(handlerPath.get("body"), search);
+            }
+            checkStatement(path.get("finalizer"), search);
             break;
         case "VariableDeclaration": {
             const _path = path;
             for (const declaration of _path.get("declarations")) {
-                const expr = declaration.node.init;
                 ignoreLocals(declaration.node.id, search);
                 checkExpression(declaration.get("init"), search);
             }
@@ -526,22 +556,13 @@ function checkStatement(path, search) {
             search.stack.pop();
             break;
         }
-        case "WithStatement": {
-            const _path = path;
-            checkExpression(_path.get("object"), search);
-            search.stack.push();
-            checkStatement(_path.get("body"), search);
-            search.stack.pop();
-            break;
-        }
-        case "ExportNamedDeclaration": {
-            checkStatement(path.get("declaration"), search);
-            break;
-        }
     }
 }
 function checkFunction(path, search) {
     const node = path.node;
+    for (const param of node.params) {
+        ignoreLocals(param, search);
+    }
     if (t.isExpression(node.body)) {
         checkExpression(path.get("body"), search);
     }

package/lib-node/index.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
-const transformer_1 = require("./transformer");
+const transformer_js_1 = require("./transformer.js");
 function default_1() {
     return {
         name: "Vasille",
         visitor: {
             Program(path, params) {
-                (0, transformer_1.trProgram)(path, params.opts.devMode !== false);
+                (0, transformer_js_1.trProgram)(path, params.opts.devMode !== false);
             },
         },
     };

package/lib-node/internal.js

@@ -15,29 +15,54 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+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.ctx = exports.StackedStates = void 0;
+exports.ctx = exports.StackedStates = exports.VariableScope = void 0;
 const t = __importStar(require("@babel/types"));
+var VariableScope;
+(function (VariableScope) {
+    VariableScope[VariableScope["Any"] = 0] = "Any";
+    VariableScope[VariableScope["Local"] = 1] = "Local";
+    VariableScope[VariableScope["Global"] = 2] = "Global";
+})(VariableScope || (exports.VariableScope = VariableScope = {}));
 class StackedStates {
     constructor() {
         this.maps = [];
+        this.localIndex = -1;
         this.push();
     }
+    fixLocalIndex() {
+        this.localIndex = this.maps.length;
+    }
+    resetLocalIndex() {
+        this.localIndex = -1;
+    }
     push() {
         this.maps.push(new Map());
     }
     pop() {
         this.maps.pop();
     }
-    get(name) {
-        for (let i = this.maps.length - 1; i >= 0; i--) {
+    get(name, scope) {
+        for (let i = (this.localIndex === -1 || scope !== VariableScope.Global
+            ? this.maps.length
+            : Math.min(this.maps.length, this.localIndex)) - 1; i >= (this.localIndex === -1 || scope !== VariableScope.Local ? 0 : this.localIndex); i--) {
             if (this.maps[i].has(name)) {
                 return this.maps[i].get(name);
             }

package/lib-node/jsx-detect.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+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.exprHasJsx = exprHasJsx;
 exports.statementHasJsx = statementHasJsx;
@@ -37,15 +47,6 @@ function exprHasJsx(node) {
     if (t.isLogicalExpression(node)) {
         return exprHasJsx(node.left) || exprHasJsx(node.right);
     }
-    if (t.isSequenceExpression(node)) {
-        return node.expressions.some(item => exprHasJsx(item));
-    }
-    if (t.isParenthesizedExpression(node)) {
-        return exprHasJsx(node.expression);
-    }
-    if (t.isDoExpression(node)) {
-        return bodyHasJsx(node.body);
-    }
     return t.isJSXElement(node) || t.isJSXFragment(node);
 }
 function statementHasJsx(statement) {
@@ -78,6 +79,17 @@ function statementHasJsx(statement) {
     if (t.isReturnStatement(statement)) {
         return !!statement.argument && exprHasJsx(statement.argument);
     }
+    if (t.isTryStatement(statement)) {
+        return (statementHasJsx(statement.block) ||
+            (!!statement.handler && statementHasJsx(statement.handler.body)) ||
+            (!!statement.finalizer && statementHasJsx(statement.finalizer)));
+    }
+    if (t.isIfStatement(statement)) {
+        return statementHasJsx(statement.consequent) || (!!statement.alternate && statementHasJsx(statement.alternate));
+    }
+    if (t.isForStatement(statement)) {
+        return statementHasJsx(statement.body);
+    }
     return false;
 }
 function bodyHasJsx(node) {