@batijs/build 0.0.281 → 0.0.286

package/dist/index.js

@@ -180,6 +180,80 @@ Please report this issue to https://github.com/vikejs/bati`);
   }
 };
 
+// src/relations.ts
+import { extname } from "node:path";
+var RelationFile = class _RelationFile {
+  constructor(pathAbsolute, includeIfImported) {
+    this.pathAbsolute = pathAbsolute;
+    this.includeIfImported = includeIfImported;
+    _RelationFile.allPathAbsolute.set(pathAbsolute, this);
+    if (includeIfImported) {
+      _RelationFile.allIncludeIfImported.push(this);
+    }
+  }
+  static allPathAbsolute = /* @__PURE__ */ new Map();
+  static allIncludeIfImported = [];
+};
+var RelationImport = class _RelationImport {
+  constructor(source, importTarget) {
+    this.source = source;
+    this.importTarget = importTarget;
+    _RelationImport.allImports.push(this);
+  }
+  static allImports = [];
+  get importTargetRelationFile() {
+    const potentialTargets = importToPotentialTargets(this.importTarget);
+    for (const target of potentialTargets) {
+      if (RelationFile.allPathAbsolute.has(target)) {
+        return RelationFile.allPathAbsolute.get(target);
+      }
+    }
+  }
+  static computeUnimportedFiles() {
+    const unimportedFiles = [];
+    const importedByVolatileFile = [];
+    for (const file of RelationFile.allIncludeIfImported) {
+      const importedFile = _RelationImport.allImports.find((ai) => ai.importTargetRelationFile === file);
+      if (!importedFile) {
+        unimportedFiles.push(file);
+      } else if (importedFile.source.includeIfImported) {
+        importedByVolatileFile.push(importedFile);
+      }
+    }
+    return computeDeepUnimportedFiles(importedByVolatileFile, unimportedFiles);
+  }
+};
+function computeDeepUnimportedFiles(importedByVolatileFile, unimportedFiles) {
+  const copyImportedByVolatileFile = Array.from(importedByVolatileFile);
+  let redo = false;
+  for (const relationImport of copyImportedByVolatileFile) {
+    const found = unimportedFiles.find((uf) => uf === relationImport.source);
+    if (found) {
+      redo = true;
+      unimportedFiles.push(relationImport.importTargetRelationFile);
+      importedByVolatileFile = importedByVolatileFile.filter((i) => i !== relationImport);
+    }
+  }
+  if (redo) {
+    computeDeepUnimportedFiles(importedByVolatileFile, unimportedFiles);
+  }
+  return unimportedFiles;
+}
+function importToPotentialTargets(imp) {
+  let subject = imp;
+  const ext = 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;
+}
+
 // src/index.ts
 var reIgnoreFile = /^(chunk-|asset-|#)/gi;
 function toDist(filepath, source, dist) {
@@ -224,32 +298,16 @@ async function* walk(dir) {
     } else if (d.isFile()) yield entry;
   }
 }
-function importToPotentialTargets(imp) {
-  let subject = imp;
-  const ext = path.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 allImports = /* @__PURE__ */ new Set();
+  const allImports = /* @__PURE__ */ new Map();
   const filesContainingIncludeIfImported = /* @__PURE__ */ new Set();
-  function updateAllImports(target, imports) {
+  function updateAllImports(target, imports, includeIfImported) {
+    const rf = new RelationFile(target, includeIfImported);
     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) {
-        allImports.add(imp2);
-      }
+      new RelationImport(rf, importTarget);
     }
   }
   const rearranger = new OperationsRearranger();
@@ -299,7 +357,11 @@ Please report this issue to https://github.com/vikejs/bati`
         meta,
         previousOperationSameDestination: previousOp
       });
-      updateAllImports(op.destinationAbsolute, report.context?.imports);
+      updateAllImports(
+        op.destinationAbsolute,
+        report.context?.imports,
+        Boolean(report.context?.flags.has("include-if-imported"))
+      );
     } else if (op.kind === "transform") {
       report = await executeOperationTransform(op, {
         meta,
@@ -309,18 +371,13 @@ Please report this issue to https://github.com/vikejs/bati`
     if (report.content) {
       await safeWriteFile(op.destination, report.content.trimStart());
     }
-    if (report.context?.flags.has("include-if-imported")) {
-      filesContainingIncludeIfImported.add(op.destinationAbsolute);
-    }
     previousOp = {
       ...op,
       ...report
     };
   }
-  for (const target of filesContainingIncludeIfImported) {
-    if (!allImports.has(target)) {
-      await safeRmFile(target, { removeEmptyDir: true });
-    }
+  for (const target of RelationImport.computeUnimportedFiles()) {
+    await safeRmFile(target.pathAbsolute, { removeEmptyDir: true });
   }
 }
 export {

package/package.json

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