@eighty4/dank 0.0.5-4 → 0.0.5-5

package/lib/config.ts

@@ -3,6 +3,7 @@ import { createBuildTag } from './build_tag.ts'
 import type {
     DankConfig,
     DankDetails,
+    DevPageMapping,
     EsbuildConfig,
     PageMapping,
     ServiceWorkerBuilder,
@@ -33,12 +34,16 @@ export type ResolvedDankConfig = {
     get esbuildPort(): number
     get esbuild(): Readonly<Omit<EsbuildConfig, 'port'>> | undefined
     get pages(): Readonly<Record<`/${string}`, PageMapping>>
-    get devPages(): Readonly<DankConfig['devPages']>
+    get devPages(): Readonly<
+        Record<`/${string}`, Omit<DevPageMapping & PageMapping, 'pattern'>>
+    >
     get services(): Readonly<DankConfig['services']>
     get serviceWorkerBuilder(): DankConfig['serviceWorker']
 
     buildTag(): Promise<string>
 
+    pageMappings(): Record<`/${string}`, PageMapping>
+
     reload(): Promise<void>
 }
 
@@ -77,7 +82,7 @@ class DankConfigInternal implements ResolvedDankConfig {
     #esbuildPort: number = DEFAULT_ESBUILD_PORT
     #esbuild: Readonly<Omit<EsbuildConfig, 'port'>> | undefined
     #pages: Readonly<Record<`/${string}`, PageMapping>> = {}
-    #devPages: Readonly<DankConfig['devPages']>
+    #devPages: Readonly<ResolvedDankConfig['devPages']> = {}
     #services: Readonly<DankConfig['services']>
 
     constructor(
@@ -119,7 +124,7 @@ class DankConfigInternal implements ResolvedDankConfig {
         return this.#pages
     }
 
-    get devPages(): Readonly<DankConfig['devPages']> {
+    get devPages(): Readonly<ResolvedDankConfig['devPages']> {
         return this.#devPages
     }
 
@@ -142,6 +147,17 @@ class DankConfigInternal implements ResolvedDankConfig {
         return this.#buildTag
     }
 
+    pageMappings(): ResolvedDankConfig['pages'] {
+        if (this.#mode === 'serve') {
+            return {
+                ...this.#pages,
+                ...this.#devPages,
+            }
+        } else {
+            return this.#pages
+        }
+    }
+
     async reload() {
         const userConfig = await resolveConfig(
             this.#modulePath,
@@ -153,7 +169,7 @@ class DankConfigInternal implements ResolvedDankConfig {
         this.#esbuildPort = resolveEsbuildPort(this.#flags, userConfig)
         this.#esbuild = Object.freeze(userConfig.esbuild)
         this.#pages = Object.freeze(normalizePages(userConfig.pages))
-        this.#devPages = Object.freeze(userConfig.devPages)
+        this.#devPages = Object.freeze(normalizeDevPages(userConfig.devPages))
         this.#services = Object.freeze(userConfig.services)
         this.#serviceWorkerBuilder = userConfig.serviceWorker
     }
@@ -433,3 +449,27 @@ function normalizePages(
     }
     return result
 }
+
+function normalizeDevPages(
+    pages: DankConfig['devPages'],
+): Record<string, Omit<DevPageMapping & PageMapping, 'pattern'>> {
+    if (pages) {
+        const result: Record<
+            string,
+            Omit<DevPageMapping & PageMapping, 'pattern'>
+        > = {}
+        for (const [url, mapping] of Object.entries(pages)) {
+            if (typeof mapping === 'string') {
+                result[url] = {
+                    label: '',
+                    webpage: mapping,
+                }
+            } else {
+                result[url] = mapping
+            }
+        }
+        return result
+    } else {
+        return {}
+    }
+}

package/lib/registry.ts

@@ -231,11 +231,10 @@ export class WebsiteRegistry extends EventEmitter<WebsiteRegistryEvents> {
     }
 
     #configDiff() {
-        const updatePages: ResolvedDankConfig['pages'] = this.#c.devPages
-            ? { ...this.#c.pages, ...this.#c.devPages }
-            : { ...this.#c.pages }
         const prevPages = new Set(Object.keys(this.#pages))
-        for (const [urlPath, mapping] of Object.entries(updatePages)) {
+        for (const [urlPath, mapping] of Object.entries(
+            this.#c.pageMappings(),
+        )) {
             const existingPage = prevPages.delete(urlPath as `/${string}`)
             if (existingPage) {
                 this.#configPageUpdate(urlPath as `/${string}`, mapping)

package/lib_js/config.js

@@ -36,7 +36,7 @@ class DankConfigInternal {
   #esbuildPort = DEFAULT_ESBUILD_PORT;
   #esbuild;
   #pages = {};
-  #devPages;
+  #devPages = {};
   #services;
   constructor(mode, modulePath, dirs) {
     this.#dirs = dirs;
@@ -80,6 +80,16 @@ class DankConfigInternal {
     }
     return this.#buildTag;
   }
+  pageMappings() {
+    if (this.#mode === "serve") {
+      return {
+        ...this.#pages,
+        ...this.#devPages
+      };
+    } else {
+      return this.#pages;
+    }
+  }
   async reload() {
     const userConfig = await resolveConfig(this.#modulePath, resolveDankDetails(this.#mode, this.#flags));
     this.#buildTag = null;
@@ -88,7 +98,7 @@ class DankConfigInternal {
     this.#esbuildPort = resolveEsbuildPort(this.#flags, userConfig);
     this.#esbuild = Object.freeze(userConfig.esbuild);
     this.#pages = Object.freeze(normalizePages(userConfig.pages));
-    this.#devPages = Object.freeze(userConfig.devPages);
+    this.#devPages = Object.freeze(normalizeDevPages(userConfig.devPages));
     this.#services = Object.freeze(userConfig.services);
     this.#serviceWorkerBuilder = userConfig.serviceWorker;
   }
@@ -280,6 +290,24 @@ function normalizePages(pages) {
   }
   return result;
 }
+function normalizeDevPages(pages) {
+  if (pages) {
+    const result = {};
+    for (const [url, mapping] of Object.entries(pages)) {
+      if (typeof mapping === "string") {
+        result[url] = {
+          label: "",
+          webpage: mapping
+        };
+      } else {
+        result[url] = mapping;
+      }
+    }
+    return result;
+  } else {
+    return {};
+  }
+}
 export {
   loadConfig
 };

package/lib_js/registry.js

@@ -125,9 +125,8 @@ class WebsiteRegistry extends EventEmitter {
     return manifest;
   }
   #configDiff() {
-    const updatePages = this.#c.devPages ? { ...this.#c.pages, ...this.#c.devPages } : { ...this.#c.pages };
     const prevPages = new Set(Object.keys(this.#pages));
-    for (const [urlPath, mapping] of Object.entries(updatePages)) {
+    for (const [urlPath, mapping] of Object.entries(this.#c.pageMappings())) {
       const existingPage = prevPages.delete(urlPath);
       if (existingPage) {
         this.#configPageUpdate(urlPath, mapping);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eighty4/dank",
-  "version": "0.0.5-4",
+  "version": "0.0.5-5",
   "type": "module",
   "license": "MIT",
   "author": "Adam McKee Bennett <adam.be.g84d@gmail.com>",