babel-plugin-vasille 0.99.5 → 3.1.0

package/lib/transformer.js

@@ -1,17 +1,15 @@
 import * as t from "@babel/types";
-import { StackedStates } from "./internal";
-import { meshStatement } from "./mesh";
-import { findStyleInNode } from "./css-transformer";
-const imports = new Map([
-    ["vasille-dx", "VasilleDX"],
-    ["vasille-web", "VasilleWeb"],
-]);
+import { StackedStates } from "./internal.js";
+import { meshStatement } from "./mesh.js";
+import { findStyleInNode } from "./css-transformer.js";
+const imports = new Map([["vasille-web", "VasilleWeb"]]);
 const ignoreMembers = new Set([
     "value",
     "ref",
     "bind",
     "calculate",
     "watch",
+    "forward",
     "arrayModel",
     "mapModel",
     "reactiveObject",
@@ -23,9 +21,11 @@ const ignoreMembers = new Set([
     "laptop",
     "prefersDark",
     "prefersLight",
+    "state",
 ]);
 function extractText(node) {
-    return t.isIdentifier(node) ? node.name : node.value;
+    // no case found for string literal
+    return node.name;
 }
 export function trProgram(path, devMode) {
     let id;
@@ -41,10 +41,10 @@ export function trProgram(path, devMode) {
         stack: new StackedStates(),
         mapping: new Map(),
         global: "",
-        cssGlobal: "",
         prefix: "Vasille_",
         importStatement: null,
         internalUsed: false,
+        stateOnly: false,
         devMode: devMode,
     };
     for (const statementPath of path.get("body")) {
@@ -52,25 +52,24 @@ export function trProgram(path, devMode) {
         if (t.isImportDeclaration(statement)) {
             const name = imports.get(statement.source.value);
             if (name) {
-                internal.prefix = `${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") {
-                            internal.cssGlobal = internal.global;
                             stylesConnected = true;
                         }
-                        id = t.memberExpression(t.identifier(internal.global), t.identifier("$"));
+                        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 === "webStyleSheet") {
+                        if (imported === "styleSheet") {
                             stylesConnected = true;
                         }
                         if (!id) {
-                            id = t.identifier(name);
+                            internal.id = t.identifier(name);
                         }
                         internal.importStatement = statementPath;
                     }
@@ -80,38 +79,15 @@ export function trProgram(path, devMode) {
                         return true;
                     }
                     else {
-                        return !ignoreMembers.has(extractText(spec.imported));
+                        return !(ignoreMembers.has(extractText(spec.imported)) ||
+                            (!internal.devMode && extractText(spec.imported) === "Debug"));
                     }
                 });
             }
-            else if (statement.source.value === "vasille-css") {
-                for (const specifier of statement.specifiers) {
-                    if (t.isImportSpecifier(specifier)) {
-                        internal.mapping.set(specifier.local.name, extractText(specifier.imported));
-                    }
-                    else if (t.isImportNamespaceSpecifier(specifier)) {
-                        internal.cssGlobal = specifier.local.name;
-                    }
-                }
-                statement.specifiers = statement.specifiers.filter(spec => {
-                    if (!t.isImportSpecifier(spec)) {
-                        return true;
-                    }
-                    else {
-                        return !ignoreMembers.has(extractText(spec.imported));
-                    }
-                });
-                stylesConnected = true;
-            }
         }
         else {
             if (!id) {
-                if (stylesConnected) {
-                    findStyleInNode(statementPath, internal);
-                }
-                else {
-                    return;
-                }
+                return;
             }
             else if (!stylesConnected || !findStyleInNode(statementPath, internal)) {
                 meshStatement(statementPath, internal);

package/lib-node/call.js

@@ -15,24 +15,35 @@ 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.requiresContext = exports.styleOnly = exports.composeOnly = void 0;
 exports.calls = calls;
 const t = __importStar(require("@babel/types"));
-const internal_1 = require("./internal");
+const internal_js_1 = require("./internal.js");
 exports.composeOnly = [
     "forward",
     "watch",
     "ref",
     "bind",
     "value",
+    "awaited",
     "arrayModel",
     "mapModel",
     "setModel",
@@ -46,9 +57,9 @@ exports.styleOnly = [
     "laptop",
     "prefersDark",
     "prefersLight",
-    "webStyleSheet",
+    "styleSheet",
 ];
-exports.requiresContext = ["awaited", "forward"];
+exports.requiresContext = ["awaited"];
 const requiresContextSet = new Set(exports.requiresContext);
 function calls(node, names, internal) {
     const set = new Set(names);
@@ -58,34 +69,35 @@ function calls(node, names, internal) {
             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_1.ctx);
+                    node.arguments.unshift(internal_js_1.ctx);
+                }
+                if (mapped === "state") {
+                    internal.stateOnly = true;
+                }
+                if (mapped === "compose" || mapped === "extend") {
+                    internal.stateOnly = false;
                 }
                 return mapped;
             }
             return false;
         }
         const global = internal.stack.get(internal.global) === undefined;
-        const cssGlobal = internal.stack.get(internal.cssGlobal) === undefined;
-        if (!global && !cssGlobal) {
-            return;
+        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;
+            }
         }
-        const propName = t.isMemberExpression(callee)
-            ? t.isIdentifier(callee.property)
-                ? callee.property.name
-                : t.isStringLiteral(callee.property)
-                    ? callee.property.value
-                    : null
-            : null;
         if (t.isMemberExpression(callee) && t.isIdentifier(callee.object) && propName) {
             if (global && callee.object.name === internal.global && set.has(propName)) {
-                if (requiresContextSet.has(callee.object.name) && t.isCallExpression(node)) {
-                    node.arguments.unshift(internal_1.ctx);
+                if (requiresContextSet.has(propName) && t.isCallExpression(node)) {
+                    node.arguments.unshift(internal_js_1.ctx);
                 }
                 return callee.object.name;
             }
-            if (cssGlobal && callee.object.name === internal.cssGlobal && set.has(propName)) {
-                return callee.object.name;
-            }
         }
     }
     return false;

package/lib-node/css-transformer.js

@@ -15,32 +15,42 @@ 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.findStyleInNode = findStyleInNode;
 const t = __importStar(require("@babel/types"));
-const call_1 = require("./call");
+const call_js_1 = require("./call.js");
 function tryProcessProp(path, pseudo, media, internal) {
     if (t.isObjectMethod(path.node)) {
-        throw path.buildCodeFrameError("Object methods not supported here");
+        throw path.buildCodeFrameError("Vasille: Object methods not supported here");
     }
     if (t.isSpreadElement(path.node)) {
-        throw path.buildCodeFrameError("Spread element not suppored here");
+        throw path.buildCodeFrameError("Vasille: Spread element not supported here");
     }
     return processProp(path, pseudo, media, internal);
 }
 const mediaDefaults = ["mobile", "tablet", "laptop", "prefersDark", "prefersLight"];
 function processValue(name, path, pseudo, theme, media, mediaDefault, allowFallback, internal) {
-    if ((0, call_1.calls)(path.node, ["theme"], internal)) {
+    if ((0, call_js_1.calls)(path.node, ["theme"], internal)) {
         const call = path.node;
         if (theme) {
-            throw path.buildCodeFrameError("Vasille: Theme seem the be defined twince");
+            throw path.buildCodeFrameError("Vasille: The theme seems the be defined twice");
         }
         if (t.isStringLiteral(call.arguments[0])) {
             return processValue(name, path.get("arguments")[1], pseudo, `body.${call.arguments[0].value}`, media, mediaDefault, false, internal);
@@ -51,14 +61,14 @@ function processValue(name, path, pseudo, theme, media, mediaDefault, allowFallb
                 .buildCodeFrameError("Vasille: Expected string literal");
         }
     }
-    if ((0, call_1.calls)(path.node, ["dark"], internal)) {
+    if ((0, call_js_1.calls)(path.node, ["dark"], internal)) {
         if (theme) {
-            throw path.buildCodeFrameError("Vasille: Theme seem the be defined twince");
+            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_1.calls)(path.node, mediaDefaults, internal))) {
+    if ((callee = (0, call_js_1.calls)(path.node, 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);
@@ -105,32 +115,32 @@ function processValue(name, path, pseudo, theme, media, mediaDefault, allowFallb
                         return processValue(name, path, pseudo, theme, media, mediaDefault, false, internal);
                     }
                     else {
-                        throw path.buildCodeFrameError("Vasille: Exprected expression");
+                        throw path.buildCodeFrameError("Vasille: Expected expression");
                     }
                 })
                     .flat(1),
             ];
         }
         else {
-            throw path.buildCodeFrameError("Vasille: Only numbers arrays are suppored here");
+            throw path.buildCodeFrameError("Vasille: Only numbers arrays are supported here");
         }
     }
     throw path.buildCodeFrameError("Vasille: Failed o parse value, it is not a string, number or array");
 }
 function processProp(path, pseudo, media, internal) {
     let name;
-    if (t.isIdentifier(path.node.key)) {
+    if (t.isIdentifier(path.node.key) && !path.node.computed) {
         name = path.node.key.name;
     }
     else if (t.isStringLiteral(path.node.key)) {
         name = path.node.key.value;
     }
     else {
-        throw path.get("key").buildCodeFrameError("Vasille: Incompaible key, exprect idenifier or string literal");
+        throw path.get("key").buildCodeFrameError("Vasille: Incompatible key, expect identifier or string literal");
     }
     if (name.startsWith("@")) {
         if (media || pseudo) {
-            throw path.get("key").buildCodeFrameError("Vasille: Media queries allowed inly in the root of style");
+            throw path.get("key").buildCodeFrameError("Vasille: Media queries allowed only in the root of style");
         }
         if (t.isObjectExpression(path.node.value)) {
             return path.get("value")
@@ -141,12 +151,12 @@ function processProp(path, pseudo, media, internal) {
                 .flat(1);
         }
         else {
-            throw path.get("value").buildCodeFrameError("Vasille: Exprected object expression");
+            throw path.get("value").buildCodeFrameError("Vasille: Expected object expression");
         }
     }
     if (name.startsWith(":")) {
         if (pseudo) {
-            throw path.get("key").buildCodeFrameError("Recursive pseudo classes are restriced");
+            throw path.get("key").buildCodeFrameError("Vasille: Recursive pseudo classes are restricted");
         }
         if (t.isObjectExpression(path.node.value)) {
             return path.get("value")
@@ -157,31 +167,28 @@ function processProp(path, pseudo, media, internal) {
                 .flat(1);
         }
         else {
-            throw path.get("value").buildCodeFrameError("Vasille: Exprected object expression");
+            throw path.get("value").buildCodeFrameError("Vasille: Expected object expression");
         }
     }
     return processValue(name, path.get("value"), pseudo, "", media, [], true, internal);
 }
 function findStyleInNode(path, internal) {
-    if (t.isExpressionStatement(path.node)) {
-        return findStyleInNode(path.get("expression"), internal);
-    }
     if (t.isExportNamedDeclaration(path.node)) {
         return findStyleInNode(path.get("declaration"), internal);
     }
     if (t.isVariableDeclaration(path.node) &&
         path.node.declarations.length === 1 &&
-        (0, call_1.calls)(path.node.declarations[0].init, ["webStyleSheet"], internal)) {
+        (0, call_js_1.calls)(path.node.declarations[0].init, ["styleSheet"], internal)) {
         const call = path.node.declarations[0].init;
         const callPath = path
             .get("declarations")[0]
             .get("init");
         const objPath = callPath.get("arguments")[0];
         if (call.arguments.length !== 1) {
-            throw callPath.buildCodeFrameError("Vasille: webStyleSheet function has 1 parameter");
+            throw callPath.buildCodeFrameError("Vasille: styleSheet function has 1 parameter");
         }
         if (!t.isObjectExpression(call.arguments[0])) {
-            throw objPath.buildCodeFrameError("Vasille: expected object expression");
+            throw objPath.buildCodeFrameError("Vasille: Expected object expression");
         }
         for (const path of objPath.get("properties")) {
             if (!t.isObjectProperty(path.node)) {
@@ -189,9 +196,9 @@ function findStyleInNode(path, internal) {
             }
             const prop = path;
             if (!t.isObjectExpression(prop.node.value)) {
-                throw prop.get("value").buildCodeFrameError("Vasille: Exprected object expression");
+                throw prop.get("value").buildCodeFrameError("Vasille: Expected object expression");
             }
-            if (!(t.isIdentifier(prop.node.key) || t.isStringLiteral(prop.node.key))) {
+            if (!((t.isIdentifier(prop.node.key) && !prop.node.computed) || t.isStringLiteral(prop.node.key))) {
                 throw prop.get("key").buildCodeFrameError("Vasille: Expected identifier of string literal");
             }
             const unsorted = [];