@eighty4/dank 0.0.4-0 → 0.0.4-2

package/lib_js/metadata.js

@@ -1,198 +1,190 @@
-import EventEmitter from 'node:events';
-import { writeFile } from 'node:fs/promises';
-import { dirname, join, resolve, sep } from 'node:path';
-// manages website resources during `dank build` and `dank serve`
-export class WebsiteRegistry extends EventEmitter {
-    #build;
-    // paths of bundled esbuild outputs
-    #bundles = new Set();
-    // public dir assets
-    #copiedAssets = null;
-    // map of entrypoints to their output path
-    #entrypointHrefs = {};
-    #pageUrls = [];
-    #workers = null;
-    constructor(build) {
-        super();
-        this.#build = build;
-    }
-    // bundleOutputs(type?: 'css' | 'js'): Array<string> {
-    //     if (!type) {
-    //         return Array.from(this.#bundles)
-    //     } else {
-    //         return Array.from(this.#bundles).filter(p => p.endsWith(type))
-    //     }
-    // }
-    buildRegistry() {
-        return new BuildRegistry(this.#build, this.#onBuildManifest);
-    }
-    files() {
-        const files = new Set();
-        for (const pageUrl of this.#pageUrls)
-            files.add(pageUrl === '/' ? '/index.html' : `${pageUrl}/index.html`);
-        for (const f of this.#bundles)
-            files.add(f);
-        if (this.#copiedAssets)
-            for (const f of this.#copiedAssets)
-                files.add(f);
-        return files;
-    }
-    mappedHref(lookup) {
-        const found = this.#entrypointHrefs[lookup];
-        if (found) {
-            return found;
-        }
-        else {
-            throw Error(`mapped href for ${lookup} not found`);
-        }
-    }
-    resolve(from, href) {
-        return resolveImpl(this.#build, from, href);
-    }
-    workerEntryPoints() {
-        return (this.#workers?.map(({ workerEntryPoint }) => ({
-            in: workerEntryPoint,
-            out: workerEntryPoint
-                .replace(/^pages[\//]/, '')
-                .replace(/\.(mj|t)s$/, '.js'),
-        })) || null);
-    }
-    workers() {
-        return this.#workers;
-    }
-    async writeManifest(buildTag) {
-        const manifest = this.#manifest(buildTag);
-        await writeFile(join(this.#build.dirs.projectRootAbs, this.#build.dirs.buildRoot, 'website.json'), JSON.stringify({
-            buildTag,
-            files: Array.from(manifest.files),
-            pageUrls: Array.from(manifest.pageUrls),
-        }, null, 4));
-        return manifest;
-    }
-    set copiedAssets(copiedAssets) {
-        this.#copiedAssets =
-            copiedAssets === null ? null : new Set(copiedAssets);
-    }
-    set pageUrls(pageUrls) {
-        this.#pageUrls = pageUrls;
-    }
-    #manifest(buildTag) {
-        return {
-            buildTag,
-            files: this.files(),
-            pageUrls: new Set(this.#pageUrls),
-        };
-    }
-    #onBuildManifest = (build) => {
-        // collect built bundle entrypoint hrefs
-        for (const [outPath, entrypoint] of Object.entries(build.bundles)) {
-            this.#bundles.add(outPath);
-            if (entrypoint) {
-                this.#entrypointHrefs[entrypoint] = outPath;
-            }
-        }
-        // determine if worker entrypoints have changed
-        let updatedWorkerEntrypoints = false;
-        const previousWorkers = this.#workers === null
-            ? null
-            : new Set(this.#workers.map(w => w.workerEntryPoint));
-        if (build.workers) {
-            if (!previousWorkers ||
-                previousWorkers.size !==
-                    new Set(build.workers.map(w => w.workerEntryPoint)).size) {
-                updatedWorkerEntrypoints = true;
-            }
-            else {
-                updatedWorkerEntrypoints = !build.workers.every(w => previousWorkers.has(w.workerEntryPoint));
-            }
-        }
-        else if (previousWorkers) {
-            updatedWorkerEntrypoints = true;
-        }
-        // merge unique entrypoints from built workers with registry state
-        // todo filtering out unique occurrences of clientScript and workerUrl
-        //  drops reporting/summary/debugging capabilities, but currently
-        //  this.#workers is used for unique worker/client entrypoints
-        if (build.workers) {
-            if (!this.#workers) {
-                this.#workers = build.workers;
-            }
-            else {
-                for (const w of build.workers) {
-                    const found = this.#workers.find(w2 => {
-                        return (w.dependentEntryPoint === w2.dependentEntryPoint &&
-                            w.workerEntryPoint === w2.workerEntryPoint);
-                    });
-                    if (!found) {
-                        this.#workers.push(w);
-                    }
-                }
-            }
-        }
-        if (updatedWorkerEntrypoints) {
-            this.emit('workers');
-        }
-    };
+import EventEmitter from "node:events";
+import { writeFile } from "node:fs/promises";
+import { dirname, join, resolve } from "node:path";
+class ResolverImpl {
+  #dirs;
+  constructor(dirs) {
+    this.#dirs = dirs;
+  }
+  isProjectSubpathInPagesDir(p) {
+    return resolve(join(this.#dirs.projectResolved, p)).startsWith(this.#dirs.pagesResolved);
+  }
+  isPagesSubpathInPagesDir(p) {
+    return this.isProjectSubpathInPagesDir(join(this.#dirs.pages, p));
+  }
+  resolveHrefInPagesDir(from, href) {
+    const p = join(dirname(from), href);
+    if (this.isProjectSubpathInPagesDir(p)) {
+      return p;
+    } else {
+      return "outofbounds";
+    }
+  }
 }
-// result accumulator of an esbuild `build` or `Context.rebuild`
-export class BuildRegistry {
-    #build;
-    #onComplete;
-    #workers = null;
-    constructor(build, onComplete) {
-        this.#build = build;
-        this.#onComplete = onComplete;
-    }
-    // resolve web worker imported by a webpage module
-    addWorker(worker) {
-        // todo normalize path
-        if (!this.#workers) {
-            this.#workers = [worker];
-        }
-        else {
-            this.#workers.push(worker);
-        }
-    }
-    completeBuild(result) {
-        const bundles = {};
-        for (const [outPath, output] of Object.entries(result.metafile.outputs)) {
-            bundles[outPath.replace(/^build[/\\]dist/, '')] =
-                output.entryPoint || null;
-        }
-        let workers = null;
-        if (this.#workers) {
-            workers = [];
-            for (const output of Object.values(result.metafile.outputs)) {
-                if (!output.entryPoint)
-                    continue;
-                const inputs = Object.keys(output.inputs);
-                for (const worker of this.#workers) {
-                    if (inputs.includes(worker.clientScript)) {
-                        workers.push({
-                            ...worker,
-                            dependentEntryPoint: output.entryPoint,
-                        });
-                    }
-                }
-            }
+class WebsiteRegistry extends EventEmitter {
+  #build;
+  // paths of bundled esbuild outputs
+  #bundles = /* @__PURE__ */ new Set();
+  // public dir assets
+  #copiedAssets = null;
+  // map of entrypoints to their output path
+  #entrypointHrefs = {};
+  #pageUrls = [];
+  #resolver;
+  #workers = null;
+  constructor(build) {
+    super();
+    this.#build = build;
+    this.#resolver = new ResolverImpl(build.dirs);
+  }
+  set copiedAssets(copiedAssets) {
+    this.#copiedAssets = copiedAssets === null ? null : new Set(copiedAssets);
+  }
+  set pageUrls(pageUrls) {
+    this.#pageUrls = pageUrls;
+  }
+  get resolver() {
+    return this.#resolver;
+  }
+  // bundleOutputs(type?: 'css' | 'js'): Array<string> {
+  //     if (!type) {
+  //         return Array.from(this.#bundles)
+  //     } else {
+  //         return Array.from(this.#bundles).filter(p => p.endsWith(type))
+  //     }
+  // }
+  buildRegistry() {
+    return new BuildRegistry(this.#build, this.#onBuildManifest);
+  }
+  files() {
+    const files = /* @__PURE__ */ new Set();
+    for (const pageUrl of this.#pageUrls)
+      files.add(pageUrl === "/" ? "/index.html" : `${pageUrl}/index.html`);
+    for (const f of this.#bundles)
+      files.add(f);
+    if (this.#copiedAssets)
+      for (const f of this.#copiedAssets)
+        files.add(f);
+    return files;
+  }
+  mappedHref(lookup) {
+    const found = this.#entrypointHrefs[lookup];
+    if (found) {
+      return found;
+    } else {
+      throw Error(`mapped href for ${lookup} not found`);
+    }
+  }
+  workerEntryPoints() {
+    return this.#workers?.map(({ workerEntryPoint }) => ({
+      in: workerEntryPoint,
+      out: workerEntryPoint.replace(/^pages[\//]/, "").replace(/\.(mj|t)s$/, ".js")
+    })) || null;
+  }
+  workers() {
+    return this.#workers;
+  }
+  async writeManifest(buildTag) {
+    const manifest = this.#manifest(buildTag);
+    await writeFile(join(this.#build.dirs.projectRootAbs, this.#build.dirs.buildRoot, "website.json"), JSON.stringify({
+      buildTag,
+      files: Array.from(manifest.files),
+      pageUrls: Array.from(manifest.pageUrls)
+    }, null, 4));
+    return manifest;
+  }
+  #manifest(buildTag) {
+    return {
+      buildTag,
+      files: this.files(),
+      pageUrls: new Set(this.#pageUrls)
+    };
+  }
+  #onBuildManifest = (build) => {
+    for (const [outPath, entrypoint] of Object.entries(build.bundles)) {
+      this.#bundles.add(outPath);
+      if (entrypoint) {
+        this.#entrypointHrefs[entrypoint] = outPath;
+      }
+    }
+    let updatedWorkerEntrypoints = false;
+    const previousWorkers = this.#workers === null ? null : new Set(this.#workers.map((w) => w.workerEntryPoint));
+    if (build.workers) {
+      if (!previousWorkers || previousWorkers.size !== new Set(build.workers.map((w) => w.workerEntryPoint)).size) {
+        updatedWorkerEntrypoints = true;
+      } else {
+        updatedWorkerEntrypoints = !build.workers.every((w) => previousWorkers.has(w.workerEntryPoint));
+      }
+    } else if (previousWorkers) {
+      updatedWorkerEntrypoints = true;
+    }
+    if (build.workers) {
+      if (!this.#workers) {
+        this.#workers = build.workers;
+      } else {
+        for (const w of build.workers) {
+          const found = this.#workers.find((w2) => {
+            return w.dependentEntryPoint === w2.dependentEntryPoint && w.workerEntryPoint === w2.workerEntryPoint;
+          });
+          if (!found) {
+            this.#workers.push(w);
+          }
         }
-        this.#onComplete({
-            bundles,
-            workers,
-        });
+      }
     }
-    resolve(from, href) {
-        return resolveImpl(this.#build, from, href);
+    if (updatedWorkerEntrypoints) {
+      this.emit("workers");
     }
+  };
 }
-function resolveImpl(build, from, href) {
-    const { pagesResolved, projectRootAbs } = build.dirs;
-    const fromDir = dirname(from);
-    const resolvedFromProjectRoot = join(projectRootAbs, fromDir, href);
-    if (!resolve(resolvedFromProjectRoot).startsWith(pagesResolved)) {
-        throw Error(`href ${href} cannot be resolved from pages${sep}${from} to a path outside of the pages directory`);
-    }
-    else {
-        return join(fromDir, href);
+class BuildRegistry {
+  #onComplete;
+  #resolver;
+  #workers = null;
+  constructor(build, onComplete) {
+    this.#onComplete = onComplete;
+    this.#resolver = new ResolverImpl(build.dirs);
+  }
+  get resolver() {
+    return this.#resolver;
+  }
+  // resolve web worker imported by a webpage module
+  addWorker(worker) {
+    if (!this.#workers) {
+      this.#workers = [worker];
+    } else {
+      this.#workers.push(worker);
+    }
+  }
+  completeBuild(result) {
+    const bundles = {};
+    for (const [outPath, output] of Object.entries(result.metafile.outputs)) {
+      bundles[outPath.replace(/^build[/\\]dist/, "")] = output.entryPoint || null;
+    }
+    let workers = null;
+    if (this.#workers) {
+      workers = [];
+      for (const output of Object.values(result.metafile.outputs)) {
+        if (!output.entryPoint)
+          continue;
+        const inputs = Object.keys(output.inputs);
+        for (const worker of this.#workers) {
+          if (inputs.includes(worker.clientScript)) {
+            workers.push({
+              ...worker,
+              dependentEntryPoint: output.entryPoint
+            });
+          }
+        }
+      }
     }
+    this.#onComplete({
+      bundles,
+      workers
+    });
+  }
 }
+export {
+  BuildRegistry,
+  WebsiteRegistry
+};

package/lib_js/public.js

@@ -1,51 +1,50 @@
-import { copyFile, mkdir, readdir, stat } from 'node:fs/promises';
-import { platform } from 'node:os';
-import { join } from 'node:path';
-export async function copyAssets(build) {
-    try {
-        const stats = await stat(build.dirs.public);
-        if (stats.isDirectory()) {
-            await mkdir(build.dirs.buildDist, { recursive: true });
-            return await recursiveCopyAssets(build);
-        }
-        else {
-            throw Error('./public cannot be a file');
-        }
-    }
-    catch (e) {
-        return null;
+import { copyFile, mkdir, readdir, stat } from "node:fs/promises";
+import { platform } from "node:os";
+import { join } from "node:path";
+async function copyAssets(build) {
+  try {
+    const stats = await stat(build.dirs.public);
+    if (stats.isDirectory()) {
+      await mkdir(build.dirs.buildDist, { recursive: true });
+      return await recursiveCopyAssets(build);
+    } else {
+      throw Error("./public cannot be a file");
     }
+  } catch (e) {
+    return null;
+  }
 }
-const IGNORE = platform() === 'darwin' ? ['.DS_Store'] : [];
-async function recursiveCopyAssets(build, dir = '') {
-    const copied = [];
-    const to = join(build.dirs.buildDist, dir);
-    let madeDir = dir === '';
-    const listingDir = join(build.dirs.public, dir);
-    for (const p of await readdir(listingDir)) {
-        if (IGNORE.includes(p)) {
-            continue;
-        }
-        try {
-            const stats = await stat(join(listingDir, p));
-            if (stats.isDirectory()) {
-                copied.push(...(await recursiveCopyAssets(build, join(dir, p))));
-            }
-            else {
-                if (!madeDir) {
-                    await mkdir(join(build.dirs.buildDist, dir), {
-                        recursive: true,
-                    });
-                    madeDir = true;
-                }
-                await copyFile(join(listingDir, p), join(to, p));
-                copied.push('/' + join(dir, p).replaceAll('\\', '/'));
-            }
-        }
-        catch (e) {
-            console.error('stat error', e);
-            process.exit(1);
+const IGNORE = platform() === "darwin" ? [".DS_Store"] : [];
+async function recursiveCopyAssets(build, dir = "") {
+  const copied = [];
+  const to = join(build.dirs.buildDist, dir);
+  let madeDir = dir === "";
+  const listingDir = join(build.dirs.public, dir);
+  for (const p of await readdir(listingDir)) {
+    if (IGNORE.includes(p)) {
+      continue;
+    }
+    try {
+      const stats = await stat(join(listingDir, p));
+      if (stats.isDirectory()) {
+        copied.push(...await recursiveCopyAssets(build, join(dir, p)));
+      } else {
+        if (!madeDir) {
+          await mkdir(join(build.dirs.buildDist, dir), {
+            recursive: true
+          });
+          madeDir = true;
         }
+        await copyFile(join(listingDir, p), join(to, p));
+        copied.push("/" + join(dir, p).replaceAll("\\", "/"));
+      }
+    } catch (e) {
+      console.error("stat error", e);
+      process.exit(1);
     }
-    return copied;
+  }
+  return copied;
 }
+export {
+  copyAssets
+};