@eighty4/dank 0.0.4 → 0.0.5-1

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/developer.ts

@@ -32,44 +32,101 @@ export type LogEvent = {
 
 type LogEventData =
     | LogEventDatum
-    | Array<LogEventDatum>
-    | Set<LogEventDatum>
-    | Record<string, LogEventDatum>
+    | LogEventDataArray
+    | LogEventDataRecord
+    | LogEventDataSet
 
 type LogEventDatum = boolean | number | string | null | undefined
 
+type LogEventDataArray = Array<LogEventDatum> | Array<LogEventDataRecord>
+
+type LogEventDataRecord = Record<
+    string,
+    LogEventDatum | LogEventDataArray | LogEventDataSet
+>
+
+type LogEventDataSet = Set<LogEventDatum>
+
 function toStringLogEvent(logEvent: LogEvent): string {
     const when = new Date().toISOString()
     const message = `[${logEvent.realm}] ${logEvent.message}\n${when}\n`
-    if (!logEvent.data) {
+    if (logEvent.data) {
+        const data: string = Object.keys(logEvent.data)
+            .sort()
+            .map(key => toStringData(key, logEvent.data![key]))
+            .join('')
+        return `${message}\n${data}`
+    } else {
         return message
     }
-    let data = ''
-    for (const k of Object.keys(logEvent.data).sort()) {
-        data += `\n    ${k} = ${toStringData(logEvent.data[k])}`
-    }
-    return `${message}${data}\n`
 }
 
-function toStringData(datum: LogEventData): string {
-    if (datum instanceof Set) {
-        datum = Array.from(datum)
+const PAD = '    '
+const nextIndent = (pad: string) => pad + PAD
+
+function toStringData(
+    key: string,
+    data: LogEventData,
+    pad: string = PAD,
+): string {
+    const prepend = `${pad}${key} = `
+    if (isDataAbsentOrScalar(data)) {
+        return `${prepend}${toStringDatum(data)}`
     }
-    if (
-        datum !== null &&
-        typeof datum === 'object' &&
-        datum.constructor.name === 'Object'
-    ) {
-        datum = Object.entries(datum).map(([k, v]) => `${k} = ${v}`)
+    if (data instanceof Set) {
+        data = Array.from(data)
     }
-    if (Array.isArray(datum)) {
-        if (datum.length === 0) {
-            return '[]'
-        } else {
-            return `[\n        ${datum.join('\n        ')}\n    ]`
-        }
+    if (Array.isArray(data)) {
+        return `${prepend}${toStringArray(data, pad)}`
     } else {
-        return `${datum}`
+        return `${prepend}${toStringRecord(data, pad)}`
+    }
+}
+
+function toStringDatum(datum: LogEventDatum): string {
+    return `${datum}\n`
+}
+
+function toStringArray(array: LogEventDataArray, padEnding: string): string {
+    if (array.length === 0) {
+        return '[]'
+    }
+    const padIndent = nextIndent(padEnding)
+    const content = array
+        .map(datum => {
+            if (isDataAbsentOrScalar(datum)) {
+                return toStringDatum(datum)
+            } else {
+                return toStringRecord(datum, padIndent)
+            }
+        })
+        .join(padIndent)
+    return `[\n${padIndent}${content}${padEnding}]\n`
+}
+
+function toStringRecord(record: LogEventDataRecord, padEnding: string): string {
+    const keys = Object.keys(record)
+    if (keys.length === 0) {
+        return '{}'
+    }
+    const padIndent = nextIndent(padEnding)
+    const content = keys
+        .map(key => toStringData(key, record[key], padIndent))
+        .join('')
+    return `{\n${content}${padEnding}}\n`
+}
+
+function isDataAbsentOrScalar(
+    data: LogEventData,
+): data is undefined | null | string | boolean | number {
+    switch (typeof data) {
+        case 'undefined':
+        case 'string':
+        case 'boolean':
+        case 'number':
+            return true
+        default:
+            return data === null
     }
 }
 
@@ -79,7 +136,7 @@ function logToConsoleAndFile(out: string) {
 }
 
 function logToConsole(out: string) {
-    console.log('\n' + out)
+    console.log(out)
 }
 
 function logToFile(out: string) {

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/services.ts

@@ -1,4 +1,9 @@
-import { type ChildProcess, spawn } from 'node:child_process'
+import {
+    type ChildProcess,
+    type ChildProcessWithoutNullStreams,
+    execSync,
+    spawn,
+} from 'node:child_process'
 import { basename, isAbsolute, resolve } from 'node:path'
 import type { DevService, ResolvedDankConfig } from './config.ts'
 
@@ -15,6 +20,18 @@ export type HttpService = NonNullable<DevService['http']>
 // up to date representation of dank.config.ts services
 const running: Array<{ s: DevService; process: ChildProcess | null }> = []
 
+// on Windows process.kill() and AbortSignal will not kill the process spawned with cmd.exe
+if (process.platform === 'win32') {
+    process.once('SIGINT', () => process.exit())
+    process.once('exit', () => {
+        for (const { process } of running) {
+            if (process) {
+                execSync(`taskkill /pid ${process.pid} /T /F`)
+            }
+        }
+    })
+}
+
 let signal: AbortSignal
 
 // batch of services that must be stopped before starting new services
@@ -140,34 +157,23 @@ function matchingConfig(a: DevService, b: DevService): boolean {
 
 function startService(s: DevService): ChildProcess {
     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 spawned = spawnService(s)
 
-    const stdoutLabel = logLabel(s.cwd, cmd, args, 32)
+    const stdoutLabel = logLabel(s, 32)
     spawned.stdout.on('data', chunk => printChunk(stdoutLabel, chunk))
 
-    const stderrLabel = logLabel(s.cwd, cmd, args, 31)
+    const stderrLabel = logLabel(s, 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)
+        if (e.name === 'AbortError') {
+            return
+        }
+        const cause =
+            'code' in e && e.code === 'ENOENT' ? 'program not found' : e.message
+        opPrint(s, 'error: ' + cause)
     })
-
     spawned.on('exit', () => {
         opPrint(s, 'exited')
         removeFromRunning(s)
@@ -176,6 +182,31 @@ function startService(s: DevService): ChildProcess {
     return spawned
 }
 
+function spawnService(s: DevService): ChildProcessWithoutNullStreams {
+    const splitCmdAndArgs = s.command.split(/\s+/)
+    const program = splitCmdAndArgs[0]
+    const args = splitCmdAndArgs.length === 1 ? [] : splitCmdAndArgs.slice(1)
+    const env = s.env ? { ...process.env, ...s.env } : undefined
+    const cwd = resolveCwd(s.cwd)
+    if (process.platform === 'win32') {
+        return spawn('cmd', ['/c', program, ...args], {
+            cwd,
+            env,
+            detached: false,
+            shell: false,
+            windowsHide: true,
+        })
+    } else {
+        return spawn(program, args, {
+            cwd,
+            env,
+            signal,
+            detached: false,
+            shell: false,
+        })
+    }
+}
+
 function removeFromRunning(s: DevService) {
     for (let i = 0; i < running.length; i++) {
         if (matchingConfig(running[i].s, s)) {
@@ -227,18 +258,13 @@ function opLabel(s: DevService) {
     return `\`${s.cwd ? s.cwd + ' ' : ''}${s.command}\``
 }
 
-function logLabel(
-    cwd: string | undefined,
-    cmd: string,
-    args: Array<string>,
-    ansiColor: number,
-): string {
-    cwd = !cwd
+function logLabel(s: DevService, ansiColor: number): string {
+    s.cwd = !s.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`
+        : s.cwd.startsWith('/')
+          ? `/.../${basename(s.cwd)}`
+          : s.cwd.startsWith('.')
+            ? s.cwd
+            : `./${s.cwd}`
+    return `\u001b[${ansiColor}m[\u001b[1m${s.command}\u001b[22m \u001b[2;3m${s.cwd}\u001b[22;23m]\u001b[0m`
 }

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/lib_js/services.js

@@ -1,6 +1,16 @@
-import { spawn } from "node:child_process";
+import { execSync, spawn } from "node:child_process";
 import { basename, isAbsolute, resolve } from "node:path";
 const running = [];
+if (process.platform === "win32") {
+  process.once("SIGINT", () => process.exit());
+  process.once("exit", () => {
+    for (const { process: process2 } of running) {
+      if (process2) {
+        execSync(`taskkill /pid ${process2.pid} /T /F`);
+      }
+    }
+  });
+}
 let signal;
 let updating = null;
 function startDevServices(services, _signal) {
@@ -111,26 +121,18 @@ function matchingConfig(a, b) {
 }
 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);
+  const spawned = spawnService(s);
+  const stdoutLabel = logLabel(s, 32);
   spawned.stdout.on("data", (chunk) => printChunk(stdoutLabel, chunk));
-  const stderrLabel = logLabel(s.cwd, cmd, args, 31);
+  const stderrLabel = logLabel(s, 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);
+    if (e.name === "AbortError") {
+      return;
+    }
+    const cause = "code" in e && e.code === "ENOENT" ? "program not found" : e.message;
+    opPrint(s, "error: " + cause);
   });
   spawned.on("exit", () => {
     opPrint(s, "exited");
@@ -139,6 +141,30 @@ function startService(s) {
   });
   return spawned;
 }
+function spawnService(s) {
+  const splitCmdAndArgs = s.command.split(/\s+/);
+  const program = splitCmdAndArgs[0];
+  const args = splitCmdAndArgs.length === 1 ? [] : splitCmdAndArgs.slice(1);
+  const env = s.env ? { ...process.env, ...s.env } : void 0;
+  const cwd = resolveCwd(s.cwd);
+  if (process.platform === "win32") {
+    return spawn("cmd", ["/c", program, ...args], {
+      cwd,
+      env,
+      detached: false,
+      shell: false,
+      windowsHide: true
+    });
+  } else {
+    return spawn(program, args, {
+      cwd,
+      env,
+      signal,
+      detached: false,
+      shell: false
+    });
+  }
+}
 function removeFromRunning(s) {
   for (let i = 0; i < running.length; i++) {
     if (matchingConfig(running[i].s, s)) {
@@ -181,9 +207,9 @@ function opPrint(s, msg) {
 function opLabel(s) {
   return `\`${s.cwd ? s.cwd + " " : ""}${s.command}\``;
 }
-function logLabel(cwd, cmd, args, ansiColor) {
-  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`;
+function logLabel(s, ansiColor) {
+  s.cwd = !s.cwd ? "./" : s.cwd.startsWith("/") ? `/.../${basename(s.cwd)}` : s.cwd.startsWith(".") ? s.cwd : `./${s.cwd}`;
+  return `\x1B[${ansiColor}m[\x1B[1m${s.command}\x1B[22m \x1B[2;3m${s.cwd}\x1B[22;23m]\x1B[0m`;
 }
 export {
   startDevServices,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eighty4/dank",
-  "version": "0.0.4",
+  "version": "0.0.5-1",
   "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\"",