@batijs/cli 0.0.247 → 0.0.249

package/dist/boilerplates/@batijs/authjs/files/$package.json.js

@@ -42,9 +42,9 @@ var require_package = __commonJS({
       license: "MIT",
       devDependencies: {
         "@auth/core": "^0.34.2",
-        "@universal-middleware/core": "^0.2.3",
         "@batijs/compile": "workspace:*",
         "@types/node": "^18.19.14",
+        "@universal-middleware/core": "^0.2.5",
         dotenv: "^16.4.5"
       },
       dependencies: {

package/dist/boilerplates/@batijs/drizzle/files/$package.json.js

@@ -44,7 +44,7 @@ var require_package = __commonJS({
         "@batijs/compile": "workspace:*",
         "@types/better-sqlite3": "^7.6.11",
         "@types/node": "^18.19.14",
-        "better-sqlite3": "^11.1.2",
+        "better-sqlite3": "^11.2.1",
         "drizzle-kit": "^0.24.0",
         "drizzle-orm": "^0.33.0",
         tsx: "^4.17.0"

package/dist/boilerplates/@batijs/express/files/$package.json.js

@@ -55,7 +55,7 @@ var require_package = __commonJS({
         "@types/cookie-parser": "^1.4.7",
         "@types/express": "^4.17.21",
         "@types/node": "^18.19.14",
-        "@universal-middleware/express": "^0.2.1",
+        "@universal-middleware/express": "^0.2.2",
         "cookie-parser": "^1.4.6",
         "cross-env": "^7.0.3",
         dotenv: "^16.4.5",

package/dist/boilerplates/@batijs/fastify/files/$package.json.js

@@ -56,7 +56,7 @@ var require_package = __commonJS({
         "@trpc/server": "^10.45.2",
         "@types/express": "^4.17.21",
         "@types/node": "^18.19.14",
-        "@universal-middleware/fastify": "^0.2.1",
+        "@universal-middleware/fastify": "^0.2.2",
         "cross-env": "^7.0.3",
         dotenv: "^16.4.5",
         fastify: "^4.28.1",

package/dist/boilerplates/@batijs/firebase-auth/files/$package.json.js

@@ -44,7 +44,7 @@ var require_package = __commonJS({
         "@batijs/compile": "workspace:*",
         "@types/cookie": "^0.6.0",
         "@types/node": "^18.19.14",
-        "@universal-middleware/core": "^0.2.3",
+        "@universal-middleware/core": "^0.2.5",
         cookie: "^0.6.0",
         dotenv: "^16.4.5",
         firebase: "^10.13.0",

package/dist/boilerplates/@batijs/h3/files/$package.json.js

@@ -56,7 +56,7 @@ var require_package = __commonJS({
         "@types/express": "^4.17.21",
         "@types/node": "^18.19.14",
         "@types/serve-static": "^1.15.7",
-        "@universal-middleware/h3": "^0.2.0",
+        "@universal-middleware/h3": "^0.2.1",
         "cross-env": "^7.0.3",
         dotenv: "^16.4.5",
         h3: "~1.12.0",

package/dist/boilerplates/@batijs/hattip/files/$package.json.js

@@ -58,7 +58,7 @@ var require_package = __commonJS({
         "@hattip/vite": "^0.0.47",
         "@trpc/server": "^10.45.2",
         "@types/node": "^18.19.14",
-        "@universal-middleware/hattip": "^0.2.1",
+        "@universal-middleware/hattip": "^0.2.2",
         "cross-env": "^7.0.3",
         dotenv: "^16.4.5",
         hattip: "^0.0.33",

package/dist/boilerplates/@batijs/hono/files/$package.json.js

@@ -55,10 +55,10 @@ var require_package = __commonJS({
         "@hono/vite-dev-server": "^0.14.0",
         "@trpc/server": "^10.45.2",
         "@types/node": "^18.19.14",
-        "@universal-middleware/hono": "^0.2.1",
+        "@universal-middleware/hono": "^0.2.3",
         "cross-env": "^7.0.3",
         dotenv: "^16.4.5",
-        hono: "^4.5.6",
+        hono: "^4.5.7",
         telefunc: "^0.1.76",
         tsx: "^4.17.0",
         vike: "^0.4.191",

package/dist/boilerplates/@batijs/lucia-auth/files/$package.json.js

@@ -48,9 +48,9 @@ var require_package = __commonJS({
         "@types/better-sqlite3": "^7.6.11",
         "@types/cookie": "^0.6.0",
         "@types/node": "^18.19.14",
-        "@universal-middleware/core": "^0.2.3",
+        "@universal-middleware/core": "^0.2.5",
         arctic: "^1.9.2",
-        "better-sqlite3": "^11.1.2",
+        "better-sqlite3": "^11.2.1",
         cookie: "^0.6.0",
         dotenv: "^16.4.5",
         "drizzle-orm": "^0.33.0",

package/dist/boilerplates/@batijs/react/files/$package.json.js

@@ -51,7 +51,7 @@ var require_package = __commonJS({
         "@batijs/trpc": "workspace:^",
         "@batijs/ts-rest": "workspace:*",
         "@types/node": "^18.19.14",
-        "@types/react": "^18.3.3",
+        "@types/react": "^18.3.4",
         "@types/react-dom": "^18.3.0",
         "@vitejs/plugin-react": "^4.3.1",
         "cross-fetch": "^4.0.0",

package/dist/boilerplates/@batijs/shared-server/files/$package.json.js

@@ -48,7 +48,7 @@ var require_package = __commonJS({
         "@batijs/features": "workspace:*",
         "@batijs/shared-no-db": "workspace:*",
         "@types/node": "^18.19.14",
-        "@universal-middleware/core": "^0.2.3",
+        "@universal-middleware/core": "^0.2.5",
         vike: "^0.4.191",
         vite: "^5.4.2"
       },

package/dist/boilerplates/@batijs/telefunc/files/$package.json.js

@@ -46,7 +46,7 @@ var require_package = __commonJS({
         "@batijs/shared-no-db": "workspace:*",
         "@batijs/shared-todo": "workspace:*",
         "@types/node": "^18.19.14",
-        "@universal-middleware/core": "^0.2.3",
+        "@universal-middleware/core": "^0.2.5",
         telefunc: "^0.1.76",
         vike: "^0.4.191",
         vite: "^5.4.2"

package/dist/boilerplates/@batijs/ts-rest/files/$package.json.js

@@ -47,7 +47,7 @@ var require_package = __commonJS({
         "@ts-rest/core": "^3.50.0",
         "@ts-rest/serverless": "^3.50.0",
         "@types/node": "^18.19.14",
-        "@universal-middleware/core": "^0.2.3",
+        "@universal-middleware/core": "^0.2.5",
         zod: "^3.23.8"
       },
       dependencies: {

package/dist/index.js

@@ -7,25 +7,28 @@ import {
 // index.ts
 import { existsSync as existsSync2, rmSync } from "node:fs";
 import { execSync } from "node:child_process";
-import { access, constants, lstat, readdir, readFile as readFile3 } from "node:fs/promises";
-import { dirname, join, parse } from "node:path";
+import { access, constants, lstat, readdir, readFile as readFile2 } from "node:fs/promises";
+import { dirname, join, parse as parse2 } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // ../build/dist/index.js
 import { existsSync } from "node:fs";
-import { mkdir, opendir, readFile as readFile2, writeFile } from "node:fs/promises";
+import { mkdir, opendir, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
-import { formatCode, transformAndFormat as transformAndFormat2 } from "@batijs/core";
+import "@batijs/core";
+import { transformAndFormat as transformAndFormat2 } from "@batijs/core";
 import { readFile } from "node:fs/promises";
+import { relative } from "node:path";
 import { parseModule, transformAndFormat } from "@batijs/core";
+import { parse } from "path";
+import { formatCode } from "@batijs/core";
 async function mergeDts({
-  target,
   fileContent,
+  previousContent,
   filepath,
   meta
 }) {
-  const previousCode = await readFile(target, { encoding: "utf-8" });
-  const previousAst = parseModule(previousCode);
+  const previousAst = parseModule(previousContent);
   const currentAst = parseModule(fileContent);
   for (const imp of previousAst.imports.$items) {
     currentAst.imports[imp.local] = imp;
@@ -48,46 +51,33 @@ async function mergeDts({
   });
   return res.code;
 }
-function queue() {
-  const tasks = [];
+async function executeOperationFile(op, {
+  meta,
+  previousOperationSameDestination
+}) {
+  const code = await readFile(op.sourceAbsolute, { encoding: "utf-8" });
+  const filepath = relative(op.source, op.sourceAbsolute);
+  const result = await transformAndFormat2(code, meta, {
+    filepath
+  });
+  let fileContent = result.code;
+  if (op.sourceAbsolute.endsWith(".d.ts") && previousOperationSameDestination?.content) {
+    fileContent = await mergeDts({
+      fileContent,
+      previousContent: previousOperationSameDestination.content,
+      meta,
+      filepath
+    });
+  }
   return {
-    add(task) {
-      tasks.push(task);
-    },
-    async run() {
-      let task;
-      while (task = tasks.shift()) {
-        await task();
-      }
-    }
+    context: result.context,
+    content: fileContent ? fileContent.trimStart() : void 0
   };
 }
-var reIgnoreFile = /^(chunk-|asset-|#)/gi;
 var isWin = process.platform === "win32";
-function toDist(filepath, source, dist) {
-  const split = filepath.split(path.sep);
-  split[split.length - 1] = split[split.length - 1].replace(/^\$\$?(.*)\.[tj]sx?$/, "$1");
-  return split.join(path.sep).replace(source, dist);
-}
-async function safeWriteFile(destination, content) {
-  const destinationDir = path.dirname(destination);
-  await mkdir(destinationDir, {
-    recursive: true
-  });
-  await writeFile(destination, content, { encoding: "utf-8" });
-}
-async function* walk(dir) {
-  if (!existsSync(dir)) return;
-  for await (const d of await opendir(dir)) {
-    const entry = path.join(dir, d.name);
-    if (d.isDirectory()) {
-      yield* walk(entry);
-    } else if (d.isFile()) yield entry;
-  }
-}
 async function transformFileAfterExec(filepath, fileContent) {
   if (fileContent === void 0 || fileContent === null) return null;
-  const parsed = path.parse(filepath);
+  const parsed = parse(filepath);
   const toTest = [parsed.base, parsed.ext, parsed.name].filter(Boolean);
   for (const ext of toTest) {
     switch (ext) {
@@ -124,6 +114,105 @@ async function importTransformer(p) {
   const f = await import(importFile);
   return f.default;
 }
+async function executeOperationTransform(op, {
+  meta,
+  previousOperationSameDestination
+}) {
+  const transformer = await importTransformer(op.sourceAbsolute);
+  const previousContent = previousOperationSameDestination?.content;
+  const fileContent = await transformFileAfterExec(
+    op.destination,
+    await transformer({
+      readfile: previousContent ? () => previousContent : void 0,
+      meta,
+      source: op.source,
+      target: op.destination
+    })
+  );
+  return {
+    content: fileContent !== null ? fileContent : void 0
+  };
+}
+function orderBy(array, getter) {
+  return array.slice().sort((a, b) => {
+    const valueA = getter(a);
+    const valueB = getter(b);
+    if (valueA < valueB) return -1;
+    if (valueA > valueB) return 1;
+    return 0;
+  });
+}
+var OperationsRearranger = class {
+  files;
+  constructor() {
+    this.files = /* @__PURE__ */ new Map();
+  }
+  addFile(file) {
+    if (!this.files.has(file.destination)) {
+      this.files.set(file.destination, []);
+    }
+    this.files.get(file.destination).push(file);
+  }
+  *compute() {
+    for (const file of this.files.values()) {
+      if (file.filter((op) => op.important).length >= 2) {
+        throw new Error(`Error while trying to generate file: '${file[0].destination}'.
+Multiple important file is not yet supported.
+Please report this issue to https://github.com/vikejs/bati`);
+      }
+      const newOrder = orderBy(file, (op) => {
+        if (op.kind === "file" && !op.important) return 1;
+        if (op.kind === "file" && op.important) return 2;
+        if (op.kind === "transform" && !op.important) return 3;
+        if (op.kind === "transform" && op.important) return 4;
+        throw new Error("Unhandled OperationsRearranger.compute orderBy case");
+      });
+      if (file[0].sourceAbsolute.endsWith(".d.ts")) {
+        yield* newOrder.filter((op) => op.kind === "file");
+      } else {
+        const input = newOrder.filter((op) => op.kind === "file").at(-1);
+        if (input) {
+          yield input;
+        }
+      }
+      yield* newOrder.filter((op) => op.kind !== "file");
+    }
+  }
+};
+var reIgnoreFile = /^(chunk-|asset-|#)/gi;
+function toDist(filepath, source, dist) {
+  const split = filepath.split(path.sep);
+  split[split.length - 1] = split[split.length - 1].replace(/^\$\$?(.*)\.[tj]sx?$/, "$1").replace(/^!(.*)$/, "$1");
+  return split.join(path.sep).replace(source, dist);
+}
+async function safeWriteFile(destination, content) {
+  const destinationDir = path.dirname(destination);
+  await mkdir(destinationDir, {
+    recursive: true
+  });
+  await writeFile(destination, content, { encoding: "utf-8" });
+}
+async function safeRmFile(destination) {
+  try {
+    await rm(destination, {
+      force: true,
+      maxRetries: 3,
+      recursive: false,
+      retryDelay: 150
+    });
+  } catch {
+    console.warn(`Failed to remove unecessary file: ${destination}`);
+  }
+}
+async function* walk(dir) {
+  if (!existsSync(dir)) return;
+  for await (const d of await opendir(dir)) {
+    const entry = path.join(dir, d.name);
+    if (d.isDirectory()) {
+      yield* walk(entry);
+    } else if (d.isFile()) yield entry;
+  }
+}
 function importToPotentialTargets(imp) {
   let subject = imp;
   const ext = path.extname(imp);
@@ -140,11 +229,8 @@ function importToPotentialTargets(imp) {
 }
 async function main(options, meta) {
   const sources = Array.isArray(options.source) ? options.source : [options.source];
-  const targets = /* @__PURE__ */ new Set();
   const allImports = /* @__PURE__ */ new Set();
-  const includeIfImported = /* @__PURE__ */ new Map();
-  const priorityQ = queue();
-  const transformAndWriteQ = queue();
+  const filesContainingIncludeIfImported = /* @__PURE__ */ new Set();
   function updateAllImports(target, imports) {
     if (!imports) return;
     for (const imp of imports.values()) {
@@ -155,21 +241,7 @@ async function main(options, meta) {
       }
     }
   }
-  async function triggerPendingTargets(target, imports) {
-    if (!imports) return;
-    for (const imp of imports.values()) {
-      const importTarget = path.resolve(path.dirname(target), imp);
-      const importTargets = importToPotentialTargets(importTarget);
-      for (const imp2 of importTargets) {
-        if (includeIfImported.has(imp2)) {
-          const fn = includeIfImported.get(imp2);
-          includeIfImported.delete(imp2);
-          await fn();
-          break;
-        }
-      }
-    }
-  }
+  const rearranger = new OperationsRearranger();
   for (const source of sources) {
     for await (const p of walk(source)) {
       const target = toDist(p, source, options.dist);
@@ -182,61 +254,58 @@ async function main(options, meta) {
           `Typescript file needs to be compiled before it can be executed: '${p}'.
 Please report this issue to https://github.com/vikejs/bati`
         );
-      } else if (parsed.name.startsWith("$") && parsed.ext.match(/\.jsx?$/)) {
-        transformAndWriteQ.add(async () => {
-          const transformer = await importTransformer(p);
-          const rf = () => {
-            return readFile2(target, { encoding: "utf-8" });
-          };
-          const fileContent = await 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 ((parsed.name.startsWith("!$") || parsed.name.startsWith("$")) && parsed.ext.match(/\.jsx?$/)) {
+        rearranger.addFile({
+          source,
+          sourceAbsolute: p,
+          destination: target,
+          destinationAbsolute: targetAbsolute,
+          kind: "transform",
+          parsed,
+          important: parsed.name.startsWith("!")
         });
       } else {
-        priorityQ.add(async () => {
-          const code = await readFile2(p, { encoding: "utf-8" });
-          const filepath = path.relative(source, p);
-          const result = await transformAndFormat2(code, meta, {
-            filepath
-          });
-          let fileContent = result.code;
-          if (p.endsWith(".d.ts") && targets.has(target)) {
-            fileContent = await mergeDts({
-              fileContent,
-              target,
-              meta,
-              filepath
-            });
-          }
-          if (fileContent) {
-            updateAllImports(targetAbsolute, result.context?.imports);
-            if (!result.context?.flags.has("include-if-imported") || allImports.has(targetAbsolute)) {
-              await safeWriteFile(target, fileContent.trimStart());
-              await triggerPendingTargets(targetAbsolute, result.context?.imports);
-            } else {
-              includeIfImported.set(targetAbsolute, () => safeWriteFile(target, fileContent.trimStart()));
-            }
-            targets.add(target);
-          }
+        rearranger.addFile({
+          source,
+          sourceAbsolute: p,
+          destination: target,
+          destinationAbsolute: targetAbsolute,
+          kind: "file",
+          parsed,
+          important: parsed.name.startsWith("!")
         });
       }
     }
   }
-  await priorityQ.run();
-  await transformAndWriteQ.run();
-  for (const target of includeIfImported.keys()) {
-    if (allImports.has(target)) {
-      await includeIfImported.get(target)();
+  let previousOp = void 0;
+  for (const op of rearranger.compute()) {
+    if (previousOp?.destination !== op.destination) {
+      previousOp = void 0;
+    }
+    let report = {};
+    if (op.kind === "file") {
+      report = await executeOperationFile(op, {
+        meta,
+        previousOperationSameDestination: previousOp
+      });
+      updateAllImports(op.destinationAbsolute, report.context?.imports);
+    } else if (op.kind === "transform") {
+      report = await executeOperationTransform(op, {
+        meta,
+        previousOperationSameDestination: previousOp
+      });
+    }
+    if (report.content) {
+      await safeWriteFile(op.destination, report.content.trimStart());
+    }
+    previousOp = {
+      ...op,
+      ...report
+    };
+  }
+  for (const target of filesContainingIncludeIfImported) {
+    if (!allImports.has(target)) {
+      await safeRmFile(target);
     }
   }
 }
@@ -1595,7 +1664,7 @@ var createDefaultQueryTester = function(query, options) {
 // package.json
 var package_default = {
   name: "@batijs/cli",
-  version: "0.0.247",
+  version: "0.0.249",
   type: "module",
   scripts: {
     "check-types": "tsc --noEmit",
@@ -1689,7 +1758,7 @@ function boilerplatesDir() {
   throw new Error("Missing boilerplates.json file. Run `pnpm run build`");
 }
 async function parseBoilerplates(dir) {
-  return JSON.parse(await readFile3(join(dir, "boilerplates.json"), "utf-8"));
+  return JSON.parse(await readFile2(join(dir, "boilerplates.json"), "utf-8"));
 }
 function toArg(flag, description) {
   if (!flag) return {};
@@ -1865,7 +1934,7 @@ async function retrieveHooks(hooks) {
   const map = /* @__PURE__ */ new Map();
   for (const hook of hooks) {
     for await (const file of walk(hook)) {
-      const parsed = parse(file);
+      const parsed = parse2(file);
       const importFile = isWin2 ? "file://" + file : file;
       switch (parsed.name) {
         case "after":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/cli",
-  "version": "0.0.247",
+  "version": "0.0.249",
   "type": "module",
   "keywords": [],
   "description": "Next-gen scaffolder. Get started with fully-functional apps, and choose any tool you want",
@@ -20,12 +20,12 @@
     "typescript": "^5.5.4",
     "unplugin-purge-polyfills": "^0.0.4",
     "vite": "^5.4.2",
-    "@batijs/compile": "0.0.247",
-    "@batijs/build": "0.0.247"
+    "@batijs/build": "0.0.249",
+    "@batijs/compile": "0.0.249"
   },
   "dependencies": {
-    "@batijs/core": "0.0.247",
-    "@batijs/features": "0.0.247"
+    "@batijs/features": "0.0.249",
+    "@batijs/core": "0.0.249"
   },
   "bin": "./dist/index.js",
   "exports": {