babel-plugin-vasille 3.1.5 → 4.0.0

package/lib/order-check.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkOrder = checkOrder;
+const call_1 = require("./call");
+const lib_1 = require("./lib");
+const componentOrder = [
+    { nodeType: ["VariableDeclaration"] },
+    { calls: ["watch"] },
+    { nodeType: ["FunctionDeclaration"] },
+    { calls: ["beforeMount"] },
+    { nodeType: ["JSXElement", "JSXFragment"] },
+    { calls: ["afterMount"] },
+    { calls: ["beforeDestroy"] },
+    { nodeType: ["ReturnStatement"] },
+];
+function matchStatement(path, target, internal) {
+    const testPath = path.isExpressionStatement() ? path.get("expression") : path;
+    if (target.nodeType && testPath.node) {
+        return target.nodeType.includes(testPath.node.type);
+    }
+    if (target.calls && testPath.isExpression()) {
+        return (0, call_1.calls)(testPath, target.calls, internal);
+    }
+    return false;
+}
+function checkOrder(paths, internal) {
+    let index = 0;
+    for (const path of paths) {
+        while (index < componentOrder.length && !matchStatement(path, componentOrder[index], internal)) {
+            index++;
+        }
+        if (index === componentOrder.length) {
+            (0, lib_1.err)(lib_1.Errors.RulesOfVasille, path, [
+                "Malformed component detected, required component structure is:",
+                "1. Variable declarations.",
+                "2. Watchers/effects (calls of `watch` function).",
+                "3. Function declarations.",
+                "4. Before mount hint (call of `beforeMount` function)",
+                "5. JSX elements and fragments",
+                "6. After mount hint (call of `afterMount` function)",
+                "7. Before destroy hint (call of `beforeDestroy` function)",
+                "8. Return statement",
+                "All steps are optional, but the order is strict.",
+                "Unlisted statements are not accepted.",
+            ].join("\n"), internal);
+        }
+    }
+}

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

@@ -33,23 +33,14 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.trProgram = trProgram;
+exports.transformProgram = transformProgram;
 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",
-    "ref",
-    "bind",
-    "calculate",
-    "watch",
-    "forward",
-    "arrayModel",
-    "mapModel",
-    "reactiveObject",
-    "setModel",
+    "raw",
     "theme",
     "dark",
     "mobile",
@@ -57,88 +48,143 @@ const ignoreMembers = new Set([
     "laptop",
     "prefersDark",
     "prefersLight",
+    "bridge",
+    "router",
+    "beforeMount",
+    "afterMount",
+    "beforeDestroy",
+    "If",
+    "ElseIf",
+    "Else",
 ]);
 function extractText(node) {
     // no case found for string literal
     return node.name;
 }
-function trProgram(path, devMode) {
-    let id;
-    let stylesConnected = false;
+// Handles import declarations and updates internal state
+function handleImportDeclaration(statementPath, internal, ids, used, stylesConnected) {
+    const statement = statementPath.node;
+    const name = imports.get(statement.source.value);
+    if (!name)
+        return;
+    internal.prefix = name;
+    for (const specifier of statement.specifiers) {
+        /* istanbul ignore else */
+        if (t.isImportNamespaceSpecifier(specifier)) {
+            internal.global = specifier.local.name;
+            stylesConnected.value = true;
+        }
+        else if (t.isImportSpecifier(specifier)) {
+            const imported = extractText(specifier.imported);
+            const local = specifier.local.name;
+            if (imported === "bind" || imported === "calculate" || imported === "watch") {
+                ids.expr = local;
+            }
+            if (imported in ids) {
+                ids[imported] = local;
+            }
+            internal.mapping.set(local, imported);
+            if (imported === "styleSheet") {
+                stylesConnected.value = true;
+            }
+            internal.importStatement = statementPath;
+        }
+    }
+    statement.specifiers = statement.specifiers.filter(spec => {
+        if (!t.isImportSpecifier(spec))
+            return true;
+        return !(ignoreMembers.has(extractText(spec.imported)) ||
+            (!internal.devMode && extractText(spec.imported) === "Debug"));
+    });
+}
+// Handles mesh and style transformation
+function handleStatement(statementPath, internal, stylesConnected) {
+    if (!stylesConnected || !(0, css_transformer_js_1.findStyleInNode)(statementPath, internal)) {
+        (0, mesh_js_1.meshStatement)(statementPath, internal);
+    }
+}
+// Handles import insertion and cleanup
+function updateImports(path, internal, ids, used) {
+    if (used.size > 0 && !internal.importStatement && !internal.global) {
+        path.get("body")[0].insertBefore(t.importDeclaration([...used].map(name => t.importSpecifier(t.identifier(ids[name]), t.identifier(name))), t.stringLiteral("vasille-web")));
+    }
+    if (used.size > 0 && !internal.global && internal.importStatement) {
+        const statementPath = internal.importStatement;
+        const statement = statementPath.node;
+        const specifiers = statement.specifiers.filter(item => {
+            /* istanbul ignore else */
+            if (t.isImportSpecifier(item) && t.isIdentifier(item.local)) {
+                return statementPath.scope.bindings[item.local.name].referenced;
+            }
+        });
+        for (const name of used) {
+            if (!specifiers.find(specifier => t.isImportSpecifier(specifier) && [name, ids[name]].includes(extractText(specifier.imported)))) {
+                specifiers.push(t.importSpecifier(t.identifier(ids[name]), t.identifier(name)));
+            }
+        }
+        statement.specifiers = specifiers;
+    }
+}
+// Main transformer function
+function transformProgram(path, filename, opts) {
+    const stylesConnected = { value: false };
+    const used = new Set();
+    const ids = {
+        ref: "VasilleRef",
+        expr: "VasilleExpr",
+        forward: "VasilleForward",
+        backward: "VasilleBackward",
+        setModel: "VasilleSetModel",
+        mapModel: "VasilleMapModel",
+        arrayModel: "VasilleArrayModel",
+        ensure: "VasilleEnsure",
+        match: "VasilleMatch",
+        set: "VasilleSet",
+        Switch: "VasilleSwitch",
+    };
+    function call(key, args) {
+        used.add(key);
+        if (internal.global) {
+            return t.callExpression(t.memberExpression(t.identifier(internal.global), t.identifier(key)), args);
+        }
+        return t.callExpression(t.identifier(ids[key]), args);
+    }
     const internal = {
-        get id() {
-            this.internalUsed = true;
-            return id;
-        },
-        set id(expr) {
-            id = expr;
-        },
         stack: new internal_js_1.StackedStates(),
         mapping: new Map(),
         global: "",
         prefix: "Vasille_",
         importStatement: null,
-        internalUsed: false,
         stateOnly: false,
-        devMode: devMode,
+        filename,
+        devMode: opts.devMode,
+        strictFolders: opts.strictFolders,
+        ref: arg => call("ref", arg ? [arg] : []),
+        expr: (func, values) => call("expr", [getCtx(), func, values]),
+        forward: arg => call("forward", [getCtx(), arg]),
+        setModel: arg => call("setModel", arg ? [getCtx(), arg] : [getCtx()]),
+        mapModel: arg => call("mapModel", arg ? [getCtx(), arg] : [getCtx()]),
+        arrayModel: arg => call("arrayModel", arg ? [getCtx(), arg] : [getCtx()]),
+        ensure: arg => call("ensure", [arg]),
+        match: (name, arg) => call("match", arg ? [name, arg] : [name]),
+        set: (obj, field, value) => call("set", [obj, field, value]),
+        Switch: arg => call("Switch", [arg, internal_js_1.ctx]),
     };
+    function getCtx() {
+        if (internal.isComposing)
+            return internal_js_1.ctx;
+        return t.nullLiteral();
+    }
     for (const statementPath of path.get("body")) {
         const statement = statementPath.node;
         if (t.isImportDeclaration(statement)) {
-            const name = imports.get(statement.source.value);
-            if (name) {
-                internal.prefix = name;
-                for (const specifier of statement.specifiers) {
-                    if (t.isImportNamespaceSpecifier(specifier)) {
-                        internal.global = specifier.local.name;
-                        if (statement.source.value === "vasille-web") {
-                            stylesConnected = true;
-                        }
-                        internal.id = t.memberExpression(t.identifier(internal.global), t.identifier("$"));
-                    }
-                    else if (t.isImportSpecifier(specifier)) {
-                        const imported = extractText(specifier.imported);
-                        const local = specifier.local.name;
-                        internal.mapping.set(local, imported);
-                        if (imported === "styleSheet") {
-                            stylesConnected = true;
-                        }
-                        if (!id) {
-                            internal.id = t.identifier(name);
-                        }
-                        internal.importStatement = statementPath;
-                    }
-                }
-                statement.specifiers = statement.specifiers.filter(spec => {
-                    if (!t.isImportSpecifier(spec)) {
-                        return true;
-                    }
-                    else {
-                        return !(ignoreMembers.has(extractText(spec.imported)) ||
-                            (!internal.devMode && extractText(spec.imported) === "Debug"));
-                    }
-                });
-            }
+            handleImportDeclaration(statementPath, internal, ids, used, stylesConnected);
         }
         else {
-            if (!id) {
-                return;
-            }
-            else if (!stylesConnected || !(0, css_transformer_js_1.findStyleInNode)(statementPath, internal)) {
-                (0, mesh_js_1.meshStatement)(statementPath, internal);
-            }
+            handleStatement(statementPath, internal, stylesConnected.value);
         }
     }
-    if (internal.internalUsed && !internal.global && internal.importStatement) {
-        const statementPath = internal.importStatement;
-        const statement = statementPath.node;
-        statementPath.replaceWith(t.importDeclaration([
-            ...statement.specifiers.filter(item => {
-                if (t.isImportSpecifier(item) && t.isIdentifier(item.local)) {
-                    return statementPath.scope.bindings[item.local.name].referenced;
-                }
-            }),
-            t.importSpecifier(internal.id, t.identifier("$")),
-        ], statement.source));
-    }
+    updateImports(path, internal, ids, used);
+    if (internal.firstError)
+        throw internal.firstError;
 }

package/{lib-node/internal.js → lib/utils.js}

@@ -33,45 +33,18 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ctx = exports.StackedStates = exports.VariableScope = void 0;
+exports.stringify = stringify;
 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();
+function stringify(node) {
+    let name = "";
+    if (t.isStringLiteral(node)) {
+        name = node.value;
     }
-    fixLocalIndex() {
-        this.localIndex = this.maps.length;
+    if (t.isPrivateName(node)) {
+        name = node.id.name;
     }
-    resetLocalIndex() {
-        this.localIndex = -1;
-    }
-    push() {
-        this.maps.push(new Map());
-    }
-    pop() {
-        this.maps.pop();
-    }
-    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);
-            }
-        }
-        return undefined;
-    }
-    set(name, state) {
-        this.maps[this.maps.length - 1].set(name, state);
+    if (t.isIdentifier(node)) {
+        name = node.name;
     }
+    return name;
 }
-exports.StackedStates = StackedStates;
-exports.ctx = t.identifier("Vasille");

package/package.json

@@ -1,20 +1,19 @@
 {
   "name": "babel-plugin-vasille",
-  "version": "3.1.5",
+  "version": "4.0.0",
   "description": "Convert Vasille Meta Language code to pure JavaScript",
-  "main": "lib-node/index.js",
+  "main": "lib/index.js",
   "type": "commonjs",
   "exports": {
-    "import": "./lib-node/index.js",
+    "import": "./lib/index.js",
     "browser": "./lib/index.js",
-    "node": "./lib-node/index.js",
-    "require": "./lib-node/index.js"
+    "node": "./lib/index.js",
+    "require": "./lib/index.js"
   },
   "scripts": {
     "prepack": "cp -f ../README.md ./README.md",
-    "prettier": "prettier src test/**/*.ts* --write",
+    "prettier": "prettier src test/**/*.ts* test/*.ts --write",
     "build": "tsc --build tsconfig-build.json",
-    "build-node": "tsc --build tsconfig-build-node.json",
     "tsc-tests": "tsc --build test/tsconfig.json",
     "test": "jest",
     "test-coverage": "jest --coverage"
@@ -40,17 +39,16 @@
     "@types/babel__core": "^7.20.5",
     "@types/jest": "^30.0.0",
     "@types/jsdom": "^21.1.7",
-    "@types/node": "^24.1.0",
+    "@types/node": "^24.2.1",
     "cross-env": "^10.0.0",
     "jest": "^30.0.5",
     "jsdom": "^26.1.0",
     "path": "^0.12.7",
     "prettier": "^3.6.2",
-    "ts-jest": "^29.4.0",
-    "typescript": "^5.8.3",
-    "vasille": "^3.1.0",
-    "vasille-css": "^3.1.0",
-    "vasille-dx": "^3.1.3",
-    "vasille-web": "^3.1.5"
+    "ts-jest": "^29.4.1",
+    "typescript": "^5.9.2",
+    "vasille": "^4.0.0",
+    "vasille-css": "^4.0.0",
+    "vasille-web": "^4.0.0"
   }
 }

package/lib-node/call.js

@@ -1,104 +0,0 @@
-"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.requiresContext = exports.styleOnly = exports.composeOnly = void 0;
-exports.calls = calls;
-const t = __importStar(require("@babel/types"));
-const internal_js_1 = require("./internal.js");
-exports.composeOnly = [
-    "forward",
-    "watch",
-    "ref",
-    "bind",
-    "value",
-    "awaited",
-    "arrayModel",
-    "mapModel",
-    "setModel",
-    "reactiveObject",
-];
-exports.styleOnly = [
-    "theme",
-    "dark",
-    "mobile",
-    "tablet",
-    "laptop",
-    "prefersDark",
-    "prefersLight",
-    "styleSheet",
-];
-exports.requiresContext = ["awaited"];
-const requiresContextSet = new Set(exports.requiresContext);
-function calls(node, names, internal) {
-    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 === "store") {
-                    internal.stateOnly = true;
-                }
-                if (mapped === "compose") {
-                    internal.stateOnly = false;
-                }
-                return mapped;
-            }
-            return false;
-        }
-        const global = internal.stack.get(internal.global) === undefined;
-        let propName = null;
-        if (t.isMemberExpression(callee)) {
-            if (t.isIdentifier(callee.property)) {
-                propName = callee.property.name;
-            }
-            else if (t.isStringLiteral(callee.property)) {
-                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;
-            }
-        }
-    }
-    return false;
-}