bimba-cli 0.2.1 → 0.2.3

package/index.js

@@ -64,6 +64,7 @@ if(!entrypoint || !flags.outdir) {
 }
 
 // build
+let bundling = false;
 bundle();
 watch(bundle);
 
@@ -83,6 +84,9 @@ function watch(callback) {
 }
 
 async function bundle() {
+    if (bundling) return;
+    bundling = true;
+
     if (!fs.existsSync(entrypoint)) {
         console.log(theme.failure('Error.') + ` The specified entrypoint does not exist: ${theme.filedir(entrypoint)}`);
         process.exit(0);
@@ -106,7 +110,7 @@ async function bundle() {
         minify: flags.minify || true,
         plugins: [imbaPlugin]
     });
-
+    
     if(stats.failed)
         console.log(theme.start(theme.failure("Failure.") +` Imba compiler failed to proceed ${theme.count(stats.failed)} file${stats.failed > 1 ? 's' : ''}`));
     else
@@ -117,4 +121,6 @@ async function bundle() {
             console.log(log);
         }
     }
+    
+    bundling = false;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bimba-cli",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "repository": "github:HeapVoid/bimba",
   "module": "index.js",
   "bin": {
@@ -11,6 +11,6 @@
   "license": "MIT",
   "type": "module",
   "devDependencies": {
-    "imba": "^2.0.0-alpha.234"
+    "imba": "latest"
   }
 }

package/plugin.js

@@ -1,12 +1,12 @@
 import { plugin } from "bun";
 import {theme} from './utils.js';
 import * as compiler from 'imba/compiler'
-import {resolve, join, dirname, parse} from 'path'
+import dir from 'path'
 import fs from 'fs'
 import { Glob } from "bun";
 import { unlink } from "node:fs/promises";
 
-export const cache = join(process.cwd(),'.cache');
+export const cache = process.cwd() + '/.cache/';
 if (!fs.existsSync(cache)){ fs.mkdirSync(cache);}
 
 // this should be reset from outside to get results of entrypoint building
@@ -27,7 +27,7 @@ export const imbaPlugin = {
       
       let filename = path;
       // resolve relative path
-      if (path.startsWith('.')) { filename = resolve(dirname(importer), filename) };
+      if (path.startsWith('.')) { filename = dir.resolve(dir.dirname(importer), filename) };
 
       // assume that the file is .js
       try { return {path: Bun.resolveSync(filename + '.js', '.')}}
@@ -45,13 +45,13 @@ export const imbaPlugin = {
               filename += '.imba';
               
               // assume that the relative path should be resolved relative to importer
-              let fn = resolve(dirname(importer), filename);
+              let fn = dir.resolve(dir.dirname(importer), filename);
               if (fs.existsSync(fn)) return {path: fn};
               // assume that the relative path should be resolved relative to node_modules
-              fn = resolve('./node_modules', filename);
+              fn = dir.resolve('./node_modules', filename);
               if (fs.existsSync(fn)) return {path: fn};
               // assume that the relative path should be resolved relative to project root
-              fn = resolve(process.cwd(), filename);
+              fn = dir.resolve(process.cwd(), filename);
               if (fs.existsSync(fn)) return {path: fn};
               
               // if the path still is unresolved throw error and leave the further resolution on Bun's resolver
@@ -69,16 +69,15 @@ export const imbaPlugin = {
     // when an .imba file is imported...
     build.onLoad({ filter: /\.imba$/ }, async ({ path }) => {
       
-      const f = parse(path)
+      const f = dir.parse(path)
       let contents = '';
       
       // return the cached version if it exists
-      const path_hash = Bun.hash(path)
-      const time_hash = Bun.hash(fs.statSync(path).mtimeMs)
-      const cached = join(cache, path_hash + '_' + time_hash + '.js');
+      const cached = cache + Bun.hash(path) + '_' + fs.statSync(path).mtimeMs + '.js';
       if (fs.existsSync(cached)) {
         stats.bundled++;
         stats.cached++;
+        //console.log(theme.action("cached: ") + theme.folder(f.dir + '/') + theme.filename(f.base) + " - " + theme.success("ok"));
         return {
           contents: await Bun.file(cached).text(),
           loader: "js",
@@ -86,11 +85,8 @@ export const imbaPlugin = {
       }
 
       // clear previous cached version
-      const glob = new Glob(path_hash + '_' + "*.js");
-      for await (const file of glob.scan(cache)) {
-        const prev_cached = join(cache, file);
-        if (fs.existsSync(prev_cached)) unlink(prev_cached);
-      }
+      const glob = new Glob(Bun.hash(path) + '_' + "*.js");
+      for await (const file of glob.scan(cache)) if (fs.existsSync(cache + file)) unlink(cache + file);
 
       // if no cached version read and compile it with the imba compiler
       const file = await Bun.file(path).text();
@@ -100,19 +96,19 @@ export const imbaPlugin = {
       })
       
       // print about file complitaion
-      console.write(theme.action("compiling: ") + theme.folder(f.dir + '/') + theme.filename(f.base) + " - ");
+      
 
       // the file has been successfully compiled
       if (!out.errors || !out.errors.length) {
+        console.log(theme.action("compiling: ") + theme.folder(dir.join(f.dir,'/')) + theme.filename(f.base) + " - " + theme.success("cached"));
         stats.bundled++;
         stats.compiled++;
         contents = out.js;
         await Bun.write(cached, contents);
-        console.write(theme.success("cached" + "\n"));
       }
       // there were errors during compilation
       else {
-        console.write(theme.failure(" fail ") + "\n");
+        console.log(theme.action("compiling: ") + theme.folder(dir.join(f.dir,'/')) + theme.filename(f.base) + " - " + theme.failure(" fail "));
         stats.failed++;
         for (let i = 0; i < out.errors.length; i++) {
           if(out.errors[i]) printerr(out.errors[i]);