babel-plugin-vasille 4.0.0 → 4.1.1

package/README.md

@@ -97,10 +97,20 @@ All of these are supported:
 * [x] `100%` Test Coverage fot babel plugin.
 * [x] Add CSS support (define styles in components).
 * [x] Add router.
-* [ ] Add SSG (static site generation).
+* [x] Add SSG (static site generation).
 * [ ] Add SSR (server side rendering).
 * [ ] Develop tools extension for debugging.
 
+## Change log
+
+### 4.1.0
+
+Added SSG (static site generation) as build option `vasille-web build static`.
+
+### 4.0.0
+
+Initial version of the framework with file based routing and building scripts (`vasille-web dev` and `vasille-web build spa`).
+
 ## Questions
 
 If you have questions, feel free to contact the maintainer of the project:

package/lib/expression.js

@@ -278,7 +278,7 @@ function checkExpression(nodePath, search) {
                 checkExpression(right, search);
                 /* istanbul ignore else */
                 if (!t.isPrivateName(property)) {
-                    path.replaceWith(search.external.set(left.node.object, property, right.node));
+                    path.replaceWith(search.external.set(left.node.object, !left.node.computed && t.isIdentifier(property) ? t.stringLiteral(property.name) : property, right.node));
                 }
             }
             else {

package/lib/index.js

@@ -10,6 +10,9 @@ function default_1() {
                 (0, transformer_js_1.transformProgram)(path, params.file.opts.filename, {
                     devMode: params.opts.devMode !== false,
                     strictFolders: params.opts.strictFolders !== false,
+                    replaceWeb: typeof params.opts.replaceWeb === "string" ? params.opts.replaceWeb : undefined,
+                    headTag: !!params.opts.headTag,
+                    bodyTag: !!params.opts.bodyTag,
                 });
             },
         },

package/lib/jsx.js

@@ -209,6 +209,9 @@ function processConditions(conditions, internal, _default) {
 function transformJsxElement(path, conditions, internal) {
     const name = path.node.openingElement.name;
     if (t.isJSXIdentifier(name) && name.name[0].toLowerCase() === name.name[0]) {
+        if ((name.name === "head" && !internal.headTag) || (name.name === "body" && !internal.bodyTag)) {
+            return [];
+        }
         const opening = path.get("openingElement");
         const attrs = [];
         const events = [];

package/lib/mesh.js

@@ -209,7 +209,7 @@ function meshExpression(nodePath, internal) {
                 meshExpression(right, internal);
                 /* istanbul ignore else */
                 if (!t.isPrivateName(property)) {
-                    path.replaceWith(internal.set(left.node.object, property, right.node));
+                    path.replaceWith(internal.set(left.node.object, !left.node.computed && t.isIdentifier(property) ? t.stringLiteral(property.name) : property, right.node));
                 }
             }
             else {

package/lib/transformer.js

@@ -62,17 +62,21 @@ function extractText(node) {
     return node.name;
 }
 // Handles import declarations and updates internal state
-function handleImportDeclaration(statementPath, internal, ids, used, stylesConnected) {
+function handleImportDeclaration(statementPath, internal, ids) {
     const statement = statementPath.node;
     const name = imports.get(statement.source.value);
     if (!name)
         return;
+    // replace the web import if is required
+    if (name === "VasilleWeb" && internal.replaceWeb) {
+        statement.source.value = internal.replaceWeb;
+    }
     internal.prefix = name;
     for (const specifier of statement.specifiers) {
         /* istanbul ignore else */
         if (t.isImportNamespaceSpecifier(specifier)) {
             internal.global = specifier.local.name;
-            stylesConnected.value = true;
+            internal.stylesConnected = true;
         }
         else if (t.isImportSpecifier(specifier)) {
             const imported = extractText(specifier.imported);
@@ -85,7 +89,7 @@ function handleImportDeclaration(statementPath, internal, ids, used, stylesConne
             }
             internal.mapping.set(local, imported);
             if (imported === "styleSheet") {
-                stylesConnected.value = true;
+                internal.stylesConnected = true;
             }
             internal.importStatement = statementPath;
         }
@@ -98,15 +102,15 @@ function handleImportDeclaration(statementPath, internal, ids, used, stylesConne
     });
 }
 // Handles mesh and style transformation
-function handleStatement(statementPath, internal, stylesConnected) {
-    if (!stylesConnected || !(0, css_transformer_js_1.findStyleInNode)(statementPath, internal)) {
+function handleStatement(statementPath, internal) {
+    if (!internal.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")));
+        path.get("body")[0].insertBefore(t.importDeclaration([...used].map(name => t.importSpecifier(t.identifier(ids[name]), t.identifier(name))), t.stringLiteral(internal.replaceWeb ?? "vasille-web")));
     }
     if (used.size > 0 && !internal.global && internal.importStatement) {
         const statementPath = internal.importStatement;
@@ -127,7 +131,6 @@ function updateImports(path, internal, ids, used) {
 }
 // Main transformer function
 function transformProgram(path, filename, opts) {
-    const stylesConnected = { value: false };
     const used = new Set();
     const ids = {
         ref: "VasilleRef",
@@ -157,8 +160,12 @@ function transformProgram(path, filename, opts) {
         importStatement: null,
         stateOnly: false,
         filename,
+        stylesConnected: false,
         devMode: opts.devMode,
         strictFolders: opts.strictFolders,
+        replaceWeb: opts.replaceWeb,
+        headTag: opts.headTag,
+        bodyTag: opts.bodyTag,
         ref: arg => call("ref", arg ? [arg] : []),
         expr: (func, values) => call("expr", [getCtx(), func, values]),
         forward: arg => call("forward", [getCtx(), arg]),
@@ -178,10 +185,10 @@ function transformProgram(path, filename, opts) {
     for (const statementPath of path.get("body")) {
         const statement = statementPath.node;
         if (t.isImportDeclaration(statement)) {
-            handleImportDeclaration(statementPath, internal, ids, used, stylesConnected);
+            handleImportDeclaration(statementPath, internal, ids);
         }
         else {
-            handleStatement(statementPath, internal, stylesConnected.value);
+            handleStatement(statementPath, internal);
         }
     }
     updateImports(path, internal, ids, used);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-vasille",
-  "version": "4.0.0",
+  "version": "4.1.1",
   "description": "Convert Vasille Meta Language code to pure JavaScript",
   "main": "lib/index.js",
   "type": "commonjs",