@batijs/cli 0.0.87 → 0.0.88

package/dist/index.js

@@ -448,11 +448,25 @@ async function runMain(cmd, opts = {}) {
   }
 }
 
-// ../build/dist/exec.js
-import { loadFile, renderSquirrelly, transformAstAndGenerate } from "@batijs/core";
+// ../build/dist/index.js
 import { existsSync } from "fs";
 import { copyFile, mkdir, opendir, readFile, writeFile } from "fs/promises";
 import path from "path";
+import { loadFile, renderSquirrelly, transformAstAndGenerate } from "@batijs/core";
+function queue() {
+  const tasks = [];
+  return {
+    add(task) {
+      tasks.push(task);
+    },
+    async run() {
+      let task;
+      while (task = tasks.shift()) {
+        await task();
+      }
+    }
+  };
+}
 var reIgnoreFile = /^(chunk-|asset-|#)/gi;
 var isWin = process.platform === "win32";
 function toDist(filepath, source, dist) {
@@ -508,9 +522,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);
@@ -523,48 +544,63 @@ 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();
 }
 
 // package.json
 var package_default = {
   name: "@batijs/cli",
-  version: "0.0.87",
+  version: "0.0.88",
   type: "module",
   scripts: {
     prerelease: "rimraf ./dist",
@@ -900,13 +936,13 @@ async function retrieveHooks(hooks) {
   return map;
 }
 function testFlags(flags, bl) {
-  if (flags.includes(bl.config.flag)) {
-    return true;
+  if (bl.config.flag) {
+    return flags.includes(bl.config.flag);
   }
   if (Array.isArray(bl.config.includeIf)) {
     return bl.config.includeIf.every((f) => flags.includes(f));
   }
-  return false;
+  return true;
 }
 async function run() {
   const dir = boilerplatesDir();
@@ -929,15 +965,18 @@ async function run() {
       const features = [];
       const flags = Object.entries(args).filter(([, val]) => val === true).map(([key]) => key);
       checkRules(flags);
-      for (const bl of boilerplates.filter((b) => !b.config.flag && !b.config.includeIf)) {
-        if (bl.subfolders.includes("files")) {
-          sources.push(join(dir, bl.folder, "files"));
-        }
-        if (bl.subfolders.includes("hooks")) {
-          hooks.push(join(dir, bl.folder, "hooks"));
-        }
-      }
-      for (const bl of boilerplates.filter((b) => Boolean(b.config.flag) || Array.isArray(b.config.includeIf))) {
+      boilerplates.sort((b1, b2) => {
+        if (b1.config.enforce === "pre")
+          return -1;
+        if (b1.config.enforce === "post")
+          return 1;
+        if (b2.config.enforce === "pre")
+          return 1;
+        if (b2.config.enforce === "post")
+          return -1;
+        return 0;
+      });
+      for (const bl of boilerplates) {
         if (testFlags(flags, bl)) {
           if (bl.subfolders.includes("files")) {
             sources.push(join(dir, bl.folder, "files"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/cli",
-  "version": "0.0.87",
+  "version": "0.0.88",
   "type": "module",
   "keywords": [],
   "description": "Next-gen scaffolder. Get started with fully-functional apps, and choose any tool you want",
@@ -18,11 +18,11 @@
     "tsup": "^7.2.0",
     "typescript": "^5.2.2",
     "vite": "^4.4.11",
-    "@batijs/build": "0.0.87",
-    "@batijs/tsup": "0.0.87"
+    "@batijs/build": "0.0.88",
+    "@batijs/tsup": "0.0.88"
   },
   "dependencies": {
-    "@batijs/core": "0.0.87"
+    "@batijs/core": "0.0.88"
   },
   "bin": "./dist/index.js",
   "exports": {