@batijs/build 0.0.176 → 0.0.178

package/dist/index.js

@@ -1,8 +1,41 @@
 // src/index.ts
 import { existsSync } from "fs";
-import { mkdir, opendir, readFile, writeFile } from "fs/promises";
+import { mkdir, opendir, readFile as readFile2, writeFile } from "fs/promises";
 import path from "path";
-import { transformAndFormat } from "@batijs/core";
+import { transformAndFormat as transformAndFormat2 } from "@batijs/core";
+
+// src/merge-dts.ts
+import { readFile } from "fs/promises";
+import { parseModule, transformAndFormat } from "@batijs/core";
+async function mergeDts({
+  target,
+  fileContent,
+  filepath,
+  meta
+}) {
+  const previousCode = await readFile(target, { encoding: "utf-8" });
+  const previousAst = parseModule(previousCode);
+  const currentAst = parseModule(fileContent);
+  for (const imp of previousAst.imports.$items) {
+    currentAst.imports[imp.local] = imp;
+  }
+  const index = currentAst.$ast.body.findIndex(
+    (node) => node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration"
+  );
+  for (const node of previousAst.$ast.body) {
+    if (node.type === "ImportDeclaration" || node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration") {
+      continue;
+    }
+    if (index === -1) {
+      currentAst.$ast.body.push(node);
+    } else {
+      currentAst.$ast.body.splice(index, 0, node);
+    }
+  }
+  return transformAndFormat(currentAst.generate().code, meta, {
+    filepath
+  });
+}
 
 // src/queue.ts
 function queue() {
@@ -82,7 +115,7 @@ async function importTransformer(p) {
 async function main(options, meta) {
   const sources = Array.isArray(options.source) ? options.source : [options.source];
   const targets = /* @__PURE__ */ new Set();
-  const simpleCopyQ = queue();
+  const priorityQ = queue();
   const transformAndWriteQ = queue();
   for (const source of sources) {
     for await (const p of walk(source)) {
@@ -93,13 +126,13 @@ async function main(options, meta) {
       } else if (parsed.name.startsWith("$") && parsed.ext.match(/\.tsx?$/)) {
         throw new Error(
           `Typescript file needs to be compiled before it can be executed: '${p}'.
-Please report this issue to https://github.com/magne4000/bati`
+Please report this issue to https://github.com/batijs/bati`
         );
       } else if (parsed.name.startsWith("$") && parsed.ext.match(/\.jsx?$/)) {
         transformAndWriteQ.add(async () => {
           const transformer = await importTransformer(p);
           const rf = () => {
-            return readFile(target, { encoding: "utf-8" });
+            return readFile2(target, { encoding: "utf-8" });
           };
           const fileContent = transformFileAfterExec(
             target,
@@ -116,20 +149,29 @@ Please report this issue to https://github.com/magne4000/bati`
           }
         });
       } else {
-        transformAndWriteQ.add(async () => {
-          const code = await readFile(p, { encoding: "utf-8" });
-          const fileContent = await transformAndFormat(code, meta, {
-            filepath: path.relative(source, p)
+        priorityQ.add(async () => {
+          const code = await readFile2(p, { encoding: "utf-8" });
+          const filepath = path.relative(source, p);
+          let fileContent = await transformAndFormat2(code, meta, {
+            filepath
           });
+          if (p.endsWith(".d.ts") && targets.has(target)) {
+            fileContent = await mergeDts({
+              fileContent,
+              target,
+              meta,
+              filepath
+            });
+          }
           if (fileContent) {
-            await safeWriteFile(target, fileContent);
+            await safeWriteFile(target, fileContent.trimStart());
             targets.add(target);
           }
         });
       }
     }
   }
-  await simpleCopyQ.run();
+  await priorityQ.run();
   await transformAndWriteQ.run();
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/build",
-  "version": "0.0.176",
+  "version": "0.0.178",
   "description": "",
   "type": "module",
   "keywords": [],
@@ -10,10 +10,10 @@
   "devDependencies": {
     "@types/node": "^18.19.14",
     "tsup": "^8.0.2",
-    "@batijs/compile": "0.0.176"
+    "@batijs/compile": "0.0.178"
   },
   "dependencies": {
-    "@batijs/core": "0.0.176"
+    "@batijs/core": "0.0.178"
   },
   "main": "./dist/index.js",
   "module": "./dist/index.js",