@eighty4/dank 0.0.5-0 → 0.0.5-1

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/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/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.5-0",
+  "version": "0.0.5-1",
   "type": "module",
   "license": "MIT",
   "author": "Adam McKee Bennett <adam.be.g84d@gmail.com>",