@batijs/build 0.0.213 → 0.0.215

package/dist/index.js

@@ -32,9 +32,10 @@ async function mergeDts({
       currentAst.$ast.body.splice(index, 0, node);
     }
   }
-  return transformAndFormat(currentAst.generate().code, meta, {
+  const res = await transformAndFormat(currentAst.generate().code, meta, {
     filepath
   });
+  return res.code;
 }
 
 // src/queue.ts
@@ -109,14 +110,56 @@ async function importTransformer(p) {
   const f = await import(importFile);
   return f.default;
 }
+function importToPotentialTargets(imp) {
+  let subject = imp;
+  const ext = path.posix.extname(imp);
+  const targets = [];
+  if (ext.match(/^\.[jt]sx?$/)) {
+    subject = subject.replace(/^\.[jt]sx?$/, "");
+  }
+  if (!ext || subject !== imp) {
+    targets.push(...[".js", ".jsx", ".ts", ".tsx", ".cjs", ".mjs"].map((e) => `${subject}${e}`));
+  } else {
+    targets.push(imp);
+  }
+  return targets;
+}
 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();
+  function updateAllImports(target, imports) {
+    if (!imports) return;
+    for (const imp of imports.values()) {
+      const importTarget = path.posix.resolve(path.posix.dirname(target), imp);
+      const importTargets = importToPotentialTargets(importTarget);
+      for (const imp2 of importTargets) {
+        allImports.add(imp2);
+      }
+    }
+  }
+  async function triggerPendingTargets(target, imports) {
+    if (!imports) return;
+    for (const imp of imports.values()) {
+      const importTarget = path.posix.resolve(path.posix.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;
+        }
+      }
+    }
+  }
   for (const source of sources) {
     for await (const p of walk(source)) {
       const target = toDist(p, source, options.dist);
+      const targetAbsolute = path.resolve(target);
       const parsed = path.parse(p);
       if (parsed.name.match(reIgnoreFile)) {
         continue;
@@ -142,16 +185,16 @@ Please report this issue to https://github.com/batijs/bati`
           );
           if (fileContent !== null) {
             await safeWriteFile(target, fileContent);
-            targets.add(target);
           }
         });
       } else {
         priorityQ.add(async () => {
           const code = await readFile2(p, { encoding: "utf-8" });
           const filepath = path.relative(source, p);
-          let fileContent = await transformAndFormat2(code, meta, {
+          const result = await transformAndFormat2(code, meta, {
             filepath
           });
+          let fileContent = result.code;
           if (p.endsWith(".d.ts") && targets.has(target)) {
             fileContent = await mergeDts({
               fileContent,
@@ -161,7 +204,13 @@ Please report this issue to https://github.com/batijs/bati`
             });
           }
           if (fileContent) {
-            await safeWriteFile(target, fileContent.trimStart());
+            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);
           }
         });
@@ -170,6 +219,11 @@ Please report this issue to https://github.com/batijs/bati`
   }
   await priorityQ.run();
   await transformAndWriteQ.run();
+  for (const target of includeIfImported.keys()) {
+    if (allImports.has(target)) {
+      await includeIfImported.get(target)();
+    }
+  }
 }
 export {
   main as default,

package/package.json

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