@batijs/build 0.0.462 → 0.0.465

package/dist/index.js

@@ -2,12 +2,11 @@
 import { existsSync } from "fs";
 import { mkdir, opendir, rm, rmdir, writeFile } from "fs/promises";
 import path from "path";
-import "@batijs/core";
 
 // src/operations/file.ts
-import { transformAndFormat as transformAndFormat2 } from "@batijs/core";
 import { readFile } from "fs/promises";
 import { relative } from "path";
+import { transformAndFormat as transformAndFormat2 } from "@batijs/core";
 
 // src/operations/merge-dts.ts
 import { parseModule, transformAndFormat } from "@batijs/core";
@@ -46,7 +45,10 @@ function clearExports(code, meta) {
   }
   if (meta.BATI.has("biome")) {
     const index = code.indexOf("\nexport {};");
-    return code.slice(0, index) + "\n// biome-ignore lint/complexity/noUselessEmptyExport: ensure that the file is considered as a module" + code.slice(index);
+    const foundImport = code.match(/^import .* from /gm);
+    if (index !== -1 && foundImport) {
+      return code.slice(0, index) + "\n// biome-ignore lint/complexity/noUselessEmptyExport: ensure that the file is considered as a module" + code.slice(index);
+    }
   }
   return code;
 }
@@ -80,13 +82,63 @@ async function executeOperationFile(op, {
   };
 }
 
+// src/utils.ts
+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;
+  });
+}
+
+// src/operations/rearranger.ts
+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");
+    }
+  }
+};
+
 // src/operations/transform.ts
 import { parse } from "path";
 import { formatCode } from "@batijs/core";
 var isWin = process.platform === "win32";
 async function transformFileAfterExec(filepath, fileContent) {
   if (fileContent === void 0 || fileContent === null) return null;
-  if (typeof fileContent == "object" && typeof fileContent.finalize === "function") {
+  if (typeof fileContent === "object" && typeof fileContent.finalize === "function") {
     fileContent = fileContent.finalize();
     if (typeof fileContent !== "string") {
       throw new Error("finalize() must return a string");
@@ -127,7 +179,7 @@ async function transformFileAfterExec(filepath, fileContent) {
   throw new Error(`Unsupported file extension ${parsed.base} (${filepath})`);
 }
 async function importTransformer(p) {
-  const importFile = isWin ? "file://" + p : p;
+  const importFile = isWin ? `file://${p}` : p;
   const f = await import(importFile);
   return f.default;
 }
@@ -153,56 +205,6 @@ async function executeOperationTransform(op, {
   };
 }
 
-// src/utils.ts
-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;
-  });
-}
-
-// src/operations/rearranger.ts
-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");
-    }
-  }
-};
-
 // src/relations.ts
 import { extname } from "path";
 var RelationFile = class _RelationFile {
@@ -231,6 +233,7 @@ var RelationImport = class _RelationImport {
         return RelationFile.allPathAbsolute.get(target);
       }
     }
+    return void 0;
   }
   static computeUnimportedFiles() {
     const unimportedFiles = [];
@@ -309,7 +312,7 @@ async function safeRmFile(destination, options) {
       }
     }
   } catch {
-    console.warn(`Failed to remove unecessary file: ${destination}`);
+    console.warn(`Failed to remove unnecessary file: ${destination}`);
   }
 }
 async function* walk(dir) {
@@ -338,7 +341,6 @@ async function main(options, meta) {
       const targetAbsolute = path.isAbsolute(target) ? target : path.resolve(target);
       const parsed = path.parse(p);
       if (parsed.name.match(reIgnoreFile)) {
-        continue;
       } else if (parsed.name.startsWith("$") && parsed.ext.match(/\.tsx?$/)) {
         throw new Error(
           `Typescript file needs to be compiled before it can be executed: '${p}'.
@@ -367,8 +369,8 @@ Please report this issue to https://github.com/vikejs/bati`
       }
     }
   }
-  let previousOp = void 0;
-  let previousOpContent = void 0;
+  let previousOp;
+  let previousOpContent;
   let packageJson = {};
   const packageJsonDistAbsolute = path.join(
     path.isAbsolute(options.dist) ? options.dist : path.resolve(options.dist),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/build",
-  "version": "0.0.462",
+  "version": "0.0.465",
   "description": "",
   "type": "module",
   "keywords": [],
@@ -10,11 +10,11 @@
   "devDependencies": {
     "@types/node": "^20.19.9",
     "tsup": "^8.5.0",
-    "@batijs/features": "0.0.462",
-    "@batijs/compile": "0.0.462"
+    "@batijs/features": "0.0.465",
+    "@batijs/compile": "0.0.465"
   },
   "dependencies": {
-    "@batijs/core": "0.0.462"
+    "@batijs/core": "0.0.465"
   },
   "main": "./dist/index.js",
   "module": "./dist/index.js",