@eighty4/dank 0.0.4-3 → 0.0.5-0

package/lib/config.ts

@@ -45,14 +45,15 @@ export async function loadConfig(
         throw Error()
     }
     const modulePath = resolve(projectRootAbs, DEFAULT_CONFIG_PATH)
+    const dirs = await defaultProjectDirs(projectRootAbs)
     LOG({
         realm: 'config',
         message: 'loading config module',
         data: {
+            dirs,
             modulePath,
         },
     })
-    const dirs = await defaultProjectDirs(projectRootAbs)
     const c = new DankConfigInternal(mode, modulePath, dirs)
     await c.reload()
     return c
@@ -149,7 +150,7 @@ async function resolveConfig(
     modulePath: string,
     details: DankDetails,
 ): Promise<DankConfig> {
-    const module = await import(`${modulePath}?${Date.now()}`)
+    const module = await import(`file:${modulePath}?${Date.now()}`)
     const c: Partial<DankConfig> =
         typeof module.default === 'function'
             ? await module.default(details)

package/lib/dirs.ts

@@ -1,6 +1,5 @@
 import { realpath } from 'node:fs/promises'
 import { dirname, isAbsolute, join, resolve } from 'node:path'
-import { cwd } from 'node:process'
 
 export type DankDirectories = {
     buildRoot: string
@@ -17,9 +16,7 @@ export type DankDirectories = {
 export async function defaultProjectDirs(
     projectRootAbs: string,
 ): Promise<Readonly<DankDirectories>> {
-    if (!projectRootAbs) {
-        projectRootAbs = cwd()
-    } else if (!isAbsolute(projectRootAbs)) {
+    if (!isAbsolute(projectRootAbs)) {
         throw Error()
     }
     const projectResolved = await realpath(projectRootAbs)
@@ -40,9 +37,17 @@ export async function defaultProjectDirs(
 export type ResolveError = 'outofbounds'
 
 export class Resolver {
+    static create(dirs: DankDirectories): Resolver {
+        if (process.platform === 'win32') {
+            return new WindowsResolver(dirs)
+        } else {
+            return new Resolver(dirs)
+        }
+    }
+
     #dirs: DankDirectories
 
-    constructor(dirs: DankDirectories) {
+    protected constructor(dirs: DankDirectories) {
         this.#dirs = dirs
     }
 
@@ -68,6 +73,10 @@ export class Resolver {
         return this.isProjectSubpathInPagesDir(join(this.#dirs.pages, p))
     }
 
+    projectPathFromAbsolute(p: string) {
+        return p.replace(this.#dirs.projectRootAbs, '').substring(1)
+    }
+
     // resolve a pages subpath from a resource within the pages directory by a relative href
     // `from` is expected to be a pages resource fs path starting with `pages/` and ending with filename
     // the result will be a pages subpath and will not have the pages dir prefix
@@ -81,3 +90,17 @@ export class Resolver {
         }
     }
 }
+
+class WindowsResolver extends Resolver {
+    constructor(dirs: DankDirectories) {
+        super(dirs)
+    }
+
+    projectPathFromAbsolute(p: string): string {
+        return super.projectPathFromAbsolute(p).replaceAll('\\', '/')
+    }
+
+    resolveHrefInPagesDir(from: string, href: string): string | ResolveError {
+        return super.resolveHrefInPagesDir(from, href).replaceAll('\\', '/')
+    }
+}

package/lib/esbuild.ts

@@ -1,4 +1,6 @@
 import { readFile } from 'node:fs/promises'
+// import { sep as windowsSep } from 'node:path/win32'
+// import { sep as posixSep } from 'node:path/posix'
 import esbuild, {
     type BuildContext,
     type BuildOptions,
@@ -123,6 +125,7 @@ export function workersPlugin(r: BuildRegistry): Plugin {
                 let contents = await readFile(args.path, 'utf8')
                 let offset = 0
                 let errors: Array<PartialMessage> | undefined = undefined
+                let clientScript: string | undefined = undefined
                 for (const workerCtorMatch of contents.matchAll(
                     WORKER_CTOR_REGEX,
                 )) {
@@ -143,9 +146,11 @@ export function workersPlugin(r: BuildRegistry): Plugin {
                     if (isIndexCommented(contents, workerCtorMatch.index)) {
                         continue
                     }
-                    const clientScript = args.path
-                        .replace(r.dirs.projectResolved, '')
-                        .substring(1)
+                    if (!clientScript) {
+                        clientScript = r.resolver.projectPathFromAbsolute(
+                            args.path,
+                        )
+                    }
                     const workerUrl = workerCtorMatch.groups!.url.substring(
                         1,
                         workerCtorMatch.groups!.url.length - 1,
@@ -174,6 +179,7 @@ export function workersPlugin(r: BuildRegistry): Plugin {
                     const workerUrlPlaceholder = workerEntryPoint
                         .replace(/^pages/, '')
                         .replace(/\.(t|m?j)s$/, '.js')
+                        .replaceAll('\\', '/')
                     const workerCtorReplacement = `new ${workerCtor}('${workerUrlPlaceholder}'${workerCtorMatch.groups!.end}`
                     contents =
                         contents.substring(0, workerCtorMatch.index + offset) +

package/lib/html.ts

@@ -1,6 +1,7 @@
 import EventEmitter from 'node:events'
 import { readFile } from 'node:fs/promises'
-import { dirname, isAbsolute, join, relative, resolve } from 'node:path'
+import { dirname, isAbsolute, relative, resolve } from 'node:path'
+import { join } from 'node:path/posix'
 import { extname } from 'node:path/posix'
 import {
     defaultTreeAdapter,

package/lib/registry.ts

@@ -1,13 +1,13 @@
 import EventEmitter from 'node:events'
 import { writeFile } from 'node:fs/promises'
-import { join } from 'node:path'
+import { join } from 'node:path/posix'
 import type { BuildResult } from 'esbuild'
 import type { ResolvedDankConfig } from './config.ts'
+import type { PageMapping } from './dank.ts'
 import { LOG } from './developer.ts'
 import { Resolver, type DankDirectories } from './dirs.ts'
 import type { EntryPoint } from './esbuild.ts'
 import { HtmlEntrypoint } from './html.ts'
-import type { PageMapping } from './dank.ts'
 
 // summary of a website build
 export type WebsiteManifest = {
@@ -80,7 +80,7 @@ export class WebsiteRegistry extends EventEmitter<WebsiteRegistryEvents> {
     constructor(config: ResolvedDankConfig) {
         super()
         this.#c = config
-        this.#resolver = new Resolver(config.dirs)
+        this.#resolver = Resolver.create(config.dirs)
     }
 
     get config(): ResolvedDankConfig {
@@ -257,6 +257,7 @@ export class WebsiteRegistry extends EventEmitter<WebsiteRegistryEvents> {
             this.#setWebpageBundles(html.url, entrypoints),
         )
         this.emit('webpage', html)
+        html.emit('change')
     }
 
     #configPageUpdate(urlPath: `/${string}`, mapping: PageMapping) {
@@ -399,9 +400,7 @@ export class BuildRegistry {
         return this.#resolver
     }
 
-    // resolve web worker imported by a webpage module
     addWorker(worker: Omit<WorkerManifest, 'dependentEntryPoint'>) {
-        // todo normalize path
         if (!this.#workers) {
             this.#workers = [worker]
         } else {
@@ -433,7 +432,6 @@ export class BuildRegistry {
                 }
             }
         }
-
         this.#onComplete({
             bundles,
             workers,

package/lib/serve.ts

@@ -66,7 +66,14 @@ async function startDevMode(signal: AbortSignal) {
     await mkdir(c.dirs.buildWatch, { recursive: true })
     let buildContext: BuildContextState = null
 
-    watch('dank.config.ts', signal, async () => {
+    watch('dank.config.ts', signal, async filename => {
+        LOG({
+            realm: 'serve',
+            message: 'config watch event',
+            data: {
+                file: filename,
+            },
+        })
         try {
             await c.reload()
         } catch (ignore) {

package/lib_js/config.js

@@ -84,7 +84,7 @@ function resolveEsbuildPort(flags, userConfig) {
   return flags.esbuildPort || userConfig.esbuild?.port || DEFAULT_ESBUILD_PORT;
 }
 async function resolveConfig(modulePath, details) {
-  const module = await import(__rewriteRelativeImportExtension(`${modulePath}?${Date.now()}`));
+  const module = await import(__rewriteRelativeImportExtension(`file:${modulePath}?${Date.now()}`));
   const c = typeof module.default === "function" ? await module.default(details) : module.default;
   validateDankConfig(c);
   return c;

package/lib_js/dirs.js

@@ -1,10 +1,7 @@
 import { realpath } from "node:fs/promises";
 import { dirname, isAbsolute, join, resolve } from "node:path";
-import { cwd } from "node:process";
 async function defaultProjectDirs(projectRootAbs) {
-  if (!projectRootAbs) {
-    projectRootAbs = cwd();
-  } else if (!isAbsolute(projectRootAbs)) {
+  if (!isAbsolute(projectRootAbs)) {
     throw Error();
   }
   const projectResolved = await realpath(projectRootAbs);
@@ -22,6 +19,13 @@ async function defaultProjectDirs(projectRootAbs) {
   });
 }
 class Resolver {
+  static create(dirs) {
+    if (process.platform === "win32") {
+      return new WindowsResolver(dirs);
+    } else {
+      return new Resolver(dirs);
+    }
+  }
   #dirs;
   constructor(dirs) {
     this.#dirs = dirs;
@@ -42,6 +46,9 @@ class Resolver {
   isPagesSubpathInPagesDir(p) {
     return this.isProjectSubpathInPagesDir(join(this.#dirs.pages, p));
   }
+  projectPathFromAbsolute(p) {
+    return p.replace(this.#dirs.projectRootAbs, "").substring(1);
+  }
   // resolve a pages subpath from a resource within the pages directory by a relative href
   // `from` is expected to be a pages resource fs path starting with `pages/` and ending with filename
   // the result will be a pages subpath and will not have the pages dir prefix
@@ -55,6 +62,17 @@ class Resolver {
     }
   }
 }
+class WindowsResolver extends Resolver {
+  constructor(dirs) {
+    super(dirs);
+  }
+  projectPathFromAbsolute(p) {
+    return super.projectPathFromAbsolute(p).replaceAll("\\", "/");
+  }
+  resolveHrefInPagesDir(from, href) {
+    return super.resolveHrefInPagesDir(from, href).replaceAll("\\", "/");
+  }
+}
 export {
   Resolver,
   defaultProjectDirs

package/lib_js/esbuild.js

@@ -83,6 +83,7 @@ function workersPlugin(r) {
         let contents = await readFile(args.path, "utf8");
         let offset = 0;
         let errors = void 0;
+        let clientScript = void 0;
         for (const workerCtorMatch of contents.matchAll(WORKER_CTOR_REGEX)) {
           if (!WORKER_URL_REGEX.test(workerCtorMatch.groups.url)) {
             if (!errors)
@@ -93,7 +94,9 @@ function workersPlugin(r) {
           if (isIndexCommented(contents, workerCtorMatch.index)) {
             continue;
           }
-          const clientScript = args.path.replace(r.dirs.projectResolved, "").substring(1);
+          if (!clientScript) {
+            clientScript = r.resolver.projectPathFromAbsolute(args.path);
+          }
           const workerUrl = workerCtorMatch.groups.url.substring(1, workerCtorMatch.groups.url.length - 1);
           const workerEntryPoint = r.resolver.resolveHrefInPagesDir(clientScript, workerUrl);
           if (workerEntryPoint === "outofbounds") {
@@ -103,7 +106,7 @@ function workersPlugin(r) {
             continue;
           }
           const workerCtor = workerCtorMatch.groups.ctor;
-          const workerUrlPlaceholder = workerEntryPoint.replace(/^pages/, "").replace(/\.(t|m?j)s$/, ".js");
+          const workerUrlPlaceholder = workerEntryPoint.replace(/^pages/, "").replace(/\.(t|m?j)s$/, ".js").replaceAll("\\", "/");
           const workerCtorReplacement = `new ${workerCtor}('${workerUrlPlaceholder}'${workerCtorMatch.groups.end}`;
           contents = contents.substring(0, workerCtorMatch.index + offset) + workerCtorReplacement + contents.substring(workerCtorMatch.index + workerCtorMatch[0].length + offset);
           offset += workerCtorReplacement.length - workerCtorMatch[0].length;

package/lib_js/html.js

@@ -1,6 +1,7 @@
 import EventEmitter from "node:events";
 import { readFile } from "node:fs/promises";
-import { dirname, isAbsolute, join, relative, resolve } from "node:path";
+import { dirname, isAbsolute, relative, resolve } from "node:path";
+import { join } from "node:path/posix";
 import { extname } from "node:path/posix";
 import { defaultTreeAdapter, parse, parseFragment, serialize } from "parse5";
 import { DankError } from "./errors.js";

package/lib_js/registry.js

@@ -1,6 +1,6 @@
 import EventEmitter from "node:events";
 import { writeFile } from "node:fs/promises";
-import { join } from "node:path";
+import { join } from "node:path/posix";
 import { Resolver } from "./dirs.js";
 import { HtmlEntrypoint } from "./html.js";
 class WebsiteRegistry extends EventEmitter {
@@ -17,7 +17,7 @@ class WebsiteRegistry extends EventEmitter {
   constructor(config) {
     super();
     this.#c = config;
-    this.#resolver = new Resolver(config.dirs);
+    this.#resolver = Resolver.create(config.dirs);
   }
   get config() {
     return this.#c;
@@ -132,6 +132,7 @@ class WebsiteRegistry extends EventEmitter {
     };
     html.on("entrypoints", (entrypoints) => this.#setWebpageBundles(html.url, entrypoints));
     this.emit("webpage", html);
+    html.emit("change");
   }
   #configPageUpdate(urlPath, mapping) {
     const existingRegistration = this.#pages[urlPath];
@@ -218,7 +219,6 @@ class BuildRegistry {
   get resolver() {
     return this.#resolver;
   }
-  // resolve web worker imported by a webpage module
   addWorker(worker) {
     if (!this.#workers) {
       this.#workers = [worker];

package/lib_js/serve.js

@@ -36,7 +36,7 @@ async function startDevMode(signal) {
   const registry = new WebsiteRegistry(c);
   await mkdir(c.dirs.buildWatch, { recursive: true });
   let buildContext = null;
-  watch("dank.config.ts", signal, async () => {
+  watch("dank.config.ts", signal, async (filename) => {
     try {
       await c.reload();
     } catch (ignore) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eighty4/dank",
-  "version": "0.0.4-3",
+  "version": "0.0.5-0",
   "type": "module",
   "license": "MIT",
   "author": "Adam McKee Bennett <adam.be.g84d@gmail.com>",
@@ -46,7 +46,7 @@
     "build": "pnpm build:client && pnpm build:lib",
     "build:client": "node scripts/build_client.ts",
     "build:lib": "tsc && tsc -p tsconfig.exports.json",
-    "build:release": "pnpm build && ./scripts/prepare_release.ts",
+    "build:release": "pnpm build && node scripts/prepare_release.ts",
     "fmt": "prettier --write .",
     "fmtcheck": "prettier --check .",
     "test": "node --test \"test/**/*.test.ts\"",