normalize supporting files from executeResult

Author: jjallaire

src/command/render/project.ts

@@ -255,16 +255,8 @@ export async function renderProject(
   );
 
   if (outputDirAbsolute) {
-    const handledDirs: string[] = [];
     // move or copy dir
     const relocateDir = (dir: string, copy = false) => {
-      // ignore directories if they're prefixes of
-      // previously-handled directories
-      if (handledDirs.some((prevDir) => dir.startsWith(prevDir))) {
-        console.log(`Skipping ${dir}.`);
-        return;
-      }
-      handledDirs.push(dir);
       const targetDir = join(outputDirAbsolute, dir);
       if (existsSync(targetDir)) {
         Deno.removeSync(targetDir, { recursive: true });

src/command/render/render-files.ts

@@ -5,6 +5,8 @@
 *
 */
 
+import { existsSync } from "fs/exists.ts";
+
 // ensures cell handlers are installed
 import "../../core/handlers/handlers.ts";
 
@@ -56,7 +58,7 @@ import {
 } from "./types.ts";
 import { error, info } from "log/mod.ts";
 import * as ld from "../../core/lodash.ts";
-import { basename, dirname, join, relative } from "path/mod.ts";
+import { basename, dirname, isAbsolute, join, relative } from "path/mod.ts";
 import { Format } from "../../config/types.ts";
 import { figuresDir, inputFilesDir } from "../../core/render.ts";
 import { removeIfEmptyDir, removeIfExists } from "../../core/path.ts";
@@ -417,6 +419,13 @@ export async function renderFiles(
             );
           resourceFiles.push(...ojsResourceFiles);
 
+          // now that all execution is done and supportign files have been
+          // contributed, normalize the supporting files so there is no overlap
+          executeResult.supporting = normalizeSupporting(
+            context.target.source,
+            executeResult.supporting,
+          );
+
           // keep md if requested
           const keepMd = executionEngineKeepMd(context.target.input);
           if (keepMd && context.format.execute[kKeepMd]) {
@@ -486,3 +495,27 @@ class RenderInvalidYAMLError extends YAMLValidationError {
     super("Render failed due to invalid YAML.");
   }
 }
+
+function normalizeSupporting(source: string, supporting: string[]): string[] {
+  // first ensure all paths are absolute and normalized
+  const dir = dirname(source);
+  supporting = supporting.map((file) =>
+    isAbsolute(file) ? file : join(dir, file)
+  );
+
+  // filter on existence
+  supporting = supporting.filter(existsSync);
+
+  // any file that is within another dir in the list is removed
+  const parentDirs = supporting.filter((file) =>
+    Deno.statSync(file).isDirectory
+  );
+  supporting = supporting.filter((file) =>
+    !parentDirs.some((parentDir) =>
+      file.startsWith(parentDir) && file !== parentDir
+    )
+  );
+
+  // now de-dupe and make all paths relative
+  return ld.uniq(supporting.map((file) => relative(dir, file)));
+}