@eighty4/dank 0.0.4-1 → 0.0.4-3

package/lib_js/services.js

@@ -1,210 +1,191 @@
-import { spawn } from 'node:child_process';
-import { basename, isAbsolute, resolve } from 'node:path';
-// up to date representation of dank.config.ts services
+import { spawn } from "node:child_process";
+import { basename, isAbsolute, resolve } from "node:path";
 const running = [];
 let signal;
-// batch of services that must be stopped before starting new services
 let updating = null;
-export function startDevServices(c, _signal) {
-    signal = _signal;
-    if (c.services?.length) {
-        for (const s of c.services) {
-            running.push({ s, process: startService(s) });
-        }
+function startDevServices(services, _signal) {
+  signal = _signal;
+  if (services?.length) {
+    for (const s of services) {
+      running.push({ s, process: startService(s) });
+    }
+  }
+  return {
+    http: {
+      get running() {
+        return running.map(({ s }) => s.http).filter((http) => !!http);
+      }
     }
-    return {
-        http: {
-            get running() {
-                return running.map(({ s }) => s.http).filter(http => !!http);
-            },
-        },
-    };
+  };
 }
-export function updateDevServices(c) {
-    if (!c.services?.length) {
-        if (running.length) {
-            if (updating === null) {
-                updating = { stopping: [], starting: [] };
-            }
-            running.forEach(({ s, process }) => {
-                if (process) {
-                    stopService(s, process);
-                }
-                else {
-                    removeFromUpdating(s);
-                }
-            });
-            running.length = 0;
+function updateDevServices(services) {
+  if (!services?.length) {
+    if (running.length) {
+      if (updating === null) {
+        updating = { stopping: [], starting: [] };
+      }
+      running.forEach(({ s, process: process2 }) => {
+        if (process2) {
+          stopService(s, process2);
+        } else {
+          removeFromUpdating(s);
         }
+      });
+      running.length = 0;
     }
-    else {
-        if (updating === null) {
-            updating = { stopping: [], starting: [] };
-        }
-        const keep = [];
-        const next = [];
-        for (const s of c.services) {
-            let found = false;
-            for (let i = 0; i < running.length; i++) {
-                const p = running[i].s;
-                if (matchingConfig(s, p)) {
-                    found = true;
-                    keep.push(i);
-                    break;
-                }
-            }
-            if (!found) {
-                next.push(s);
-            }
-        }
-        for (let i = running.length - 1; i >= 0; i--) {
-            if (!keep.includes(i)) {
-                const { s, process } = running[i];
-                if (process) {
-                    stopService(s, process);
-                }
-                else {
-                    removeFromUpdating(s);
-                }
-                running.splice(i, 1);
-            }
+  } else {
+    if (updating === null) {
+      updating = { stopping: [], starting: [] };
+    }
+    const keep = [];
+    const next = [];
+    for (const s of services) {
+      let found = false;
+      for (let i = 0; i < running.length; i++) {
+        const p = running[i].s;
+        if (matchingConfig(s, p)) {
+          found = true;
+          keep.push(i);
+          break;
         }
-        if (updating.stopping.length) {
-            for (const s of next) {
-                if (!updating.starting.find(queued => matchingConfig(queued, s))) {
-                    updating.starting.push(s);
-                }
-            }
+      }
+      if (!found) {
+        next.push(s);
+      }
+    }
+    for (let i = running.length - 1; i >= 0; i--) {
+      if (!keep.includes(i)) {
+        const { s, process: process2 } = running[i];
+        if (process2) {
+          stopService(s, process2);
+        } else {
+          removeFromUpdating(s);
         }
-        else {
-            updating = null;
-            for (const s of next) {
-                running.push({ s, process: startService(s) });
-            }
+        running.splice(i, 1);
+      }
+    }
+    if (updating.stopping.length) {
+      for (const s of next) {
+        if (!updating.starting.find((queued) => matchingConfig(queued, s))) {
+          updating.starting.push(s);
         }
+      }
+    } else {
+      updating = null;
+      for (const s of next) {
+        running.push({ s, process: startService(s) });
+      }
     }
+  }
 }
-function stopService(s, process) {
-    opPrint(s, 'stopping');
-    updating.stopping.push(s);
-    process.kill();
+function stopService(s, process2) {
+  opPrint(s, "stopping");
+  updating.stopping.push(s);
+  process2.kill();
 }
 function matchingConfig(a, b) {
-    if (a.command !== b.command) {
-        return false;
-    }
-    if (a.cwd !== b.cwd) {
-        return false;
-    }
-    if (!a.env && !b.env) {
-        return true;
-    }
-    else if (a.env && !b.env) {
-        return false;
-    }
-    else if (!a.env && b.env) {
+  if (a.command !== b.command) {
+    return false;
+  }
+  if (a.cwd !== b.cwd) {
+    return false;
+  }
+  if (!a.env && !b.env) {
+    return true;
+  } else if (a.env && !b.env) {
+    return false;
+  } else if (!a.env && b.env) {
+    return false;
+  } else if (Object.keys(a.env).length !== Object.keys(b.env).length) {
+    return false;
+  } else {
+    for (const k of Object.keys(a.env)) {
+      if (!b.env[k]) {
         return false;
-    }
-    else if (Object.keys(a.env).length !== Object.keys(b.env).length) {
+      } else if (a.env[k] !== b.env[k]) {
         return false;
+      }
     }
-    else {
-        for (const k of Object.keys(a.env)) {
-            if (!b.env[k]) {
-                return false;
-            }
-            else if (a.env[k] !== b.env[k]) {
-                return false;
-            }
-        }
-    }
-    return true;
+  }
+  return true;
 }
 function startService(s) {
-    opPrint(s, 'starting');
-    const splitCmdAndArgs = s.command.split(/\s+/);
-    const cmd = splitCmdAndArgs[0];
-    const args = splitCmdAndArgs.length === 1 ? [] : splitCmdAndArgs.slice(1);
-    const spawned = spawn(cmd, args, {
-        cwd: resolveCwd(s.cwd),
-        env: s.env,
-        signal,
-        detached: false,
-        shell: false,
-    });
-    const stdoutLabel = logLabel(s.cwd, cmd, args, 32);
-    spawned.stdout.on('data', chunk => printChunk(stdoutLabel, chunk));
-    const stderrLabel = logLabel(s.cwd, cmd, args, 31);
-    spawned.stderr.on('data', chunk => printChunk(stderrLabel, chunk));
-    spawned.on('error', e => {
-        if (e.name !== 'AbortError') {
-            const cause = 'code' in e && e.code === 'ENOENT'
-                ? 'program not found'
-                : e.message;
-            opPrint(s, 'error: ' + cause);
-        }
-        removeFromRunning(s);
-    });
-    spawned.on('exit', () => {
-        opPrint(s, 'exited');
-        removeFromRunning(s);
-        removeFromUpdating(s);
-    });
-    return spawned;
+  opPrint(s, "starting");
+  const splitCmdAndArgs = s.command.split(/\s+/);
+  const cmd = splitCmdAndArgs[0];
+  const args = splitCmdAndArgs.length === 1 ? [] : splitCmdAndArgs.slice(1);
+  const spawned = spawn(cmd, args, {
+    cwd: resolveCwd(s.cwd),
+    env: s.env,
+    signal,
+    detached: false,
+    shell: false
+  });
+  const stdoutLabel = logLabel(s.cwd, cmd, args, 32);
+  spawned.stdout.on("data", (chunk) => printChunk(stdoutLabel, chunk));
+  const stderrLabel = logLabel(s.cwd, cmd, args, 31);
+  spawned.stderr.on("data", (chunk) => printChunk(stderrLabel, chunk));
+  spawned.on("error", (e) => {
+    if (e.name !== "AbortError") {
+      const cause = "code" in e && e.code === "ENOENT" ? "program not found" : e.message;
+      opPrint(s, "error: " + cause);
+    }
+    removeFromRunning(s);
+  });
+  spawned.on("exit", () => {
+    opPrint(s, "exited");
+    removeFromRunning(s);
+    removeFromUpdating(s);
+  });
+  return spawned;
 }
 function removeFromRunning(s) {
-    for (let i = 0; i < running.length; i++) {
-        if (matchingConfig(running[i].s, s)) {
-            running.splice(i, 1);
-            return;
-        }
+  for (let i = 0; i < running.length; i++) {
+    if (matchingConfig(running[i].s, s)) {
+      running.splice(i, 1);
+      return;
     }
+  }
 }
 function removeFromUpdating(s) {
-    if (updating !== null) {
-        for (let i = 0; i < updating.stopping.length; i++) {
-            if (matchingConfig(updating.stopping[i], s)) {
-                updating.stopping.splice(i, 1);
-                if (!updating.stopping.length) {
-                    updating.starting.forEach(startService);
-                    updating = null;
-                    return;
-                }
-            }
+  if (updating !== null) {
+    for (let i = 0; i < updating.stopping.length; i++) {
+      if (matchingConfig(updating.stopping[i], s)) {
+        updating.stopping.splice(i, 1);
+        if (!updating.stopping.length) {
+          updating.starting.forEach(startService);
+          updating = null;
+          return;
         }
+      }
     }
+  }
 }
 function printChunk(label, c) {
-    for (const l of parseChunk(c))
-        console.log(label, l);
+  for (const l of parseChunk(c))
+    console.log(label, l);
 }
 function parseChunk(c) {
-    return c
-        .toString()
-        .replace(/\r?\n$/, '')
-        .split(/\r?\n/);
+  return c.toString().replace(/\r?\n$/, "").split(/\r?\n/);
 }
 function resolveCwd(p) {
-    if (!p || isAbsolute(p)) {
-        return p;
-    }
-    else {
-        return resolve(process.cwd(), p);
-    }
+  if (!p || isAbsolute(p)) {
+    return p;
+  } else {
+    return resolve(process.cwd(), p);
+  }
 }
 function opPrint(s, msg) {
-    console.log(opLabel(s), msg);
+  console.log(opLabel(s), msg);
 }
 function opLabel(s) {
-    return `\`${s.cwd ? s.cwd + ' ' : ''}${s.command}\``;
+  return `\`${s.cwd ? s.cwd + " " : ""}${s.command}\``;
 }
 function logLabel(cwd, cmd, args, ansiColor) {
-    cwd = !cwd
-        ? './'
-        : cwd.startsWith('/')
-            ? `/.../${basename(cwd)}`
-            : cwd.startsWith('.')
-                ? cwd
-                : `./${cwd}`;
-    return `\u001b[${ansiColor}m[\u001b[1m${cmd}\u001b[22m ${args.join(' ')} \u001b[2;3m${cwd}\u001b[22;23m]\u001b[0m`;
+  cwd = !cwd ? "./" : cwd.startsWith("/") ? `/.../${basename(cwd)}` : cwd.startsWith(".") ? cwd : `./${cwd}`;
+  return `\x1B[${ansiColor}m[\x1B[1m${cmd}\x1B[22m ${args.join(" ")} \x1B[2;3m${cwd}\x1B[22;23m]\x1B[0m`;
 }
+export {
+  startDevServices,
+  updateDevServices
+};

package/lib_js/watch.js

@@ -0,0 +1,35 @@
+import { watch as createWatch } from "node:fs/promises";
+async function watch(p, signal, fire) {
+  const delayFire = 90;
+  const timeout = 100;
+  let changes = {};
+  try {
+    for await (const { filename } of createWatch(p, {
+      recursive: true,
+      signal
+    })) {
+      if (filename) {
+        if (!changes[filename]) {
+          const now = Date.now();
+          changes[filename] = now + delayFire;
+          setTimeout(() => {
+            const now2 = Date.now();
+            for (const [filename2, then] of Object.entries(changes)) {
+              if (then <= now2) {
+                fire(filename2);
+                delete changes[filename2];
+              }
+            }
+          }, timeout);
+        }
+      }
+    }
+  } catch (e) {
+    if (e.name !== "AbortError") {
+      throw e;
+    }
+  }
+}
+export {
+  watch
+};

package/lib_types/dank.d.ts

@@ -2,6 +2,7 @@ import type { Plugin as EsbuildPlugin } from 'esbuild';
 export type DankConfig = {
     esbuild?: EsbuildConfig;
     pages: Record<`/${string}`, `${string}.html` | PageMapping>;
+    devPages?: Record<`/__${string}`, `${string}.html` | DevPageMapping>;
     port?: number;
     previewPort?: number;
     services?: Array<DevService>;
@@ -10,6 +11,10 @@ export type PageMapping = {
     pattern?: RegExp;
     webpage: `${string}.html`;
 };
+export type DevPageMapping = {
+    label: string;
+    webpage: `${string}.html`;
+};
 export type DevService = {
     command: string;
     cwd?: string;
@@ -24,4 +29,11 @@ export type EsbuildConfig = {
     port?: number;
 };
 export type EsbuildLoader = 'base64' | 'binary' | 'copy' | 'dataurl' | 'empty' | 'file' | 'json' | 'text';
-export declare function defineConfig(c: Partial<DankConfig>): Promise<DankConfig>;
+export type DankDetails = {
+    dev: boolean;
+    production: boolean;
+    mode: 'build' | 'serve';
+};
+export type DankConfigFunction = (dank: DankDetails) => Partial<DankConfig> | Promise<Partial<DankConfig>>;
+export declare function defineConfig(config: Partial<DankConfig>): Partial<DankConfig>;
+export declare function defineConfig(config: DankConfigFunction): DankConfigFunction;

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@eighty4/dank",
-  "version": "0.0.4-1",
+  "version": "0.0.4-3",
   "type": "module",
   "license": "MIT",
   "author": "Adam McKee Bennett <adam.be.g84d@gmail.com>",
+  "engines": {
+    "node": ">=24"
+  },
   "description": "Multi-page development system for CDN-deployed websites",
   "keywords": [
     "frontend",
@@ -34,17 +37,20 @@
     "typescript": "^5.9.2"
   },
   "files": [
-    "client/esbuild.js",
+    "client/client.js",
     "lib/*.ts",
     "lib_js/*.js",
     "lib_types/*.d.ts"
   ],
   "scripts": {
-    "build": "tsc && tsc -p tsconfig.client.json && tsc -p tsconfig.exports.json",
+    "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",
     "fmt": "prettier --write .",
     "fmtcheck": "prettier --check .",
     "test": "node --test \"test/**/*.test.ts\"",
     "test:rebuild": "pnpm build && pnpm test",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit && tsc -p tsconfig.client.json --noEmit"
   }
 }

package/client/esbuild.js

@@ -1,91 +0,0 @@
-new EventSource('http://127.0.0.1:3995/esbuild').addEventListener('change', (e) => {
-    const { updated } = JSON.parse(e.data);
-    const changes = new Set();
-    for (const c of updated)
-        changes.add(c);
-    const cssUpdates = Array.from(changes).filter(p => p.endsWith('.css'));
-    if (cssUpdates.length) {
-        console.log('esbuild css updates', cssUpdates);
-        const cssLinks = {};
-        for (const elem of document.getElementsByTagName('link')) {
-            if (elem.getAttribute('rel') === 'stylesheet') {
-                const url = new URL(elem.href);
-                if ((url.host = location.host)) {
-                    cssLinks[url.pathname] = elem;
-                }
-            }
-        }
-        let swappedCss = false;
-        for (const cssUpdate of cssUpdates) {
-            const cssLink = cssLinks[cssUpdate];
-            if (cssLink) {
-                const next = cssLink.cloneNode();
-                next.href = `${cssUpdate}?${Math.random().toString(36).slice(2)}`;
-                next.onload = () => cssLink.remove();
-                cssLink.parentNode.insertBefore(next, cssLink.nextSibling);
-                swappedCss = true;
-            }
-        }
-        if (swappedCss) {
-            addCssUpdateIndicator();
-        }
-    }
-    if (cssUpdates.length < changes.size) {
-        const jsUpdates = Array.from(changes).filter(p => !p.endsWith('.css'));
-        const jsScripts = new Set();
-        for (const elem of document.getElementsByTagName('script')) {
-            if (elem.src.length) {
-                const url = new URL(elem.src);
-                if ((url.host = location.host)) {
-                    jsScripts.add(url.pathname);
-                }
-            }
-        }
-        if (jsUpdates.some(jsUpdate => jsScripts.has(jsUpdate))) {
-            console.log('esbuild js updates require reload');
-            addJsReloadIndicator();
-        }
-    }
-});
-export function addCssUpdateIndicator() {
-    const indicator = createUpdateIndicator('green', '9999');
-    indicator.style.opacity = '0';
-    indicator.animate([
-        { opacity: 0 },
-        { opacity: 1 },
-        { opacity: 1 },
-        { opacity: 1 },
-        { opacity: 0.75 },
-        { opacity: 0.5 },
-        { opacity: 0.25 },
-        { opacity: 0 },
-    ], {
-        duration: 400,
-        iterations: 1,
-        direction: 'normal',
-        easing: 'linear',
-    });
-    document.body.appendChild(indicator);
-    Promise.all(indicator.getAnimations().map(a => a.finished)).then(() => indicator.remove());
-}
-function addJsReloadIndicator() {
-    const indicator = createUpdateIndicator('orange', '9000');
-    indicator.style.opacity = '0';
-    indicator.animate([{ opacity: 0 }, { opacity: 1 }], {
-        duration: 400,
-        iterations: 1,
-        direction: 'normal',
-        easing: 'ease-in',
-    });
-    document.body.appendChild(indicator);
-}
-function createUpdateIndicator(color, zIndex) {
-    const indicator = document.createElement('div');
-    indicator.style.border = '6px dashed ' + color;
-    indicator.style.zIndex = zIndex;
-    indicator.style.position = 'fixed';
-    indicator.style.top = indicator.style.left = '1px';
-    indicator.style.height = indicator.style.width = 'calc(100% - 2px)';
-    indicator.style.boxSizing = 'border-box';
-    return indicator;
-}