@batijs/build 0.0.87 → 0.0.90

package/dist/{exec.js → index.js}

@@ -1,8 +1,26 @@
-// src/exec.ts
-import { loadFile, renderSquirrelly, transformAstAndGenerate } from "@batijs/core";
+// src/index.ts
 import { existsSync } from "fs";
 import { copyFile, mkdir, opendir, readFile, writeFile } from "fs/promises";
 import path from "path";
+import { loadFile, renderSquirrelly, transformAstAndGenerate } from "@batijs/core";
+
+// src/queue.ts
+function queue() {
+  const tasks = [];
+  return {
+    add(task) {
+      tasks.push(task);
+    },
+    async run() {
+      let task;
+      while (task = tasks.shift()) {
+        await task();
+      }
+    }
+  };
+}
+
+// src/index.ts
 var reIgnoreFile = /^(chunk-|asset-|#)/gi;
 var isWin = process.platform === "win32";
 function toDist(filepath, source, dist) {
@@ -58,9 +76,16 @@ async function fileContainsBatiMeta(filepath) {
   const code = await readFile(filepath, { encoding: "utf-8" });
   return code.includes("import.meta.BATI_");
 }
+async function importTransformer(p) {
+  const importFile = isWin ? "file://" + p : p;
+  const f = await import(importFile);
+  return f.default;
+}
 async function main(options, meta) {
   const sources = Array.isArray(options.source) ? options.source : [options.source];
   const targets = /* @__PURE__ */ new Set();
+  const simpleCopyQ = queue();
+  const transformAndWriteQ = queue();
   for (const source of sources) {
     for await (const p of walk(source)) {
       const target = toDist(p, source, options.dist);
@@ -73,42 +98,57 @@ async function main(options, meta) {
 Please report this issue to https://github.com/magne4000/bati`
         );
       } else if (parsed.name.startsWith("$") && parsed.ext.match(/\.jsx?$/)) {
-        const importFile = isWin ? "file://" + p : p;
-        const f = await import(importFile);
-        const fileContent = transformFileAfterExec(
-          target,
-          await f.default(targets.has(target) ? () => readFile(target, { encoding: "utf-8" }) : void 0, meta)
-        );
-        if (fileContent !== null) {
-          await safeWriteFile(target, fileContent);
-        }
-        targets.add(target);
+        transformAndWriteQ.add(async () => {
+          const transformer = await importTransformer(p);
+          const rf = () => {
+            return readFile(target, { encoding: "utf-8" });
+          };
+          const fileContent = transformFileAfterExec(
+            target,
+            await transformer({
+              readfile: targets.has(target) ? rf : void 0,
+              meta,
+              source,
+              target
+            })
+          );
+          if (fileContent !== null) {
+            await safeWriteFile(target, fileContent);
+            targets.add(target);
+          }
+        });
       } else if (await fileContainsBatiMeta(p)) {
-        let fileContent = "";
-        if (parsed.ext.match(/\.[tj]sx?$/)) {
-          const mod = await loadFile(p);
-          fileContent = await transformAstAndGenerate(mod.$ast, meta, {
-            filepath: p
-          });
-        } else {
-          const template = await readFile(p, { encoding: "utf-8" });
-          try {
-            fileContent = renderSquirrelly(template, meta);
-          } catch (e) {
-            console.error("SquirrellyJS error while rendering", p);
-            throw e;
+        transformAndWriteQ.add(async () => {
+          let fileContent = "";
+          if (parsed.ext.match(/\.[tj]sx?$/)) {
+            const mod = await loadFile(p);
+            fileContent = await transformAstAndGenerate(mod.$ast, meta, {
+              filepath: p
+            });
+          } else {
+            const template = await readFile(p, { encoding: "utf-8" });
+            try {
+              fileContent = renderSquirrelly(template, meta);
+            } catch (e) {
+              console.error("SquirrellyJS error while rendering", p);
+              throw e;
+            }
+          }
+          if (fileContent) {
+            await safeWriteFile(target, fileContent);
+            targets.add(target);
           }
-        }
-        if (fileContent) {
-          await safeWriteFile(target, fileContent);
-        }
-        targets.add(target);
+        });
       } else {
-        await safeCopyFile(p, target);
-        targets.add(target);
+        simpleCopyQ.add(async () => {
+          await safeCopyFile(p, target);
+          targets.add(target);
+        });
       }
     }
   }
+  await simpleCopyQ.run();
+  await transformAndWriteQ.run();
 }
 export {
   main as default,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/build",
-  "version": "0.0.87",
+  "version": "0.0.90",
   "description": "",
   "type": "module",
   "keywords": [],
@@ -10,20 +10,20 @@
   "devDependencies": {
     "@types/node": "^16.18.40",
     "tsup": "^7.2.0",
-    "@batijs/tsup": "0.0.87"
+    "@batijs/tsup": "0.0.90"
   },
   "dependencies": {
-    "@batijs/core": "0.0.87"
+    "@batijs/core": "0.0.90"
   },
-  "main": "./dist/exec.js",
-  "module": "./dist/exec.js",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
   "exports": {
-    ".": "./dist/exec.js"
+    ".": "./dist/index.js"
   },
   "typesVersions": {
     "*": {
       ".": [
-        "./dist/exec.d.ts"
+        "./dist/index.d.ts"
       ]
     }
   },