@adviser/cement 0.3.3 → 0.3.5

package/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/node/mock-file-service.ts"],"sourcesContent":["import { NamedWritableStream } from \"../file-service.js\";\nimport { NodeFileService } from \"./node-file-service.js\";\n\nexport interface FileCollector {\n  readonly name: string;\n  content: string;\n}\n\nexport class MockFileService extends NodeFileService {\n  readonly files = {} as Record<string, FileCollector>;\n\n  // override abs(fname: string): string {\n  //   return this.join(\"/mock/\", fname);\n  // }\n\n  override async create(fname: string): Promise<NamedWritableStream> {\n    let oName = fname;\n    if (!this.isAbsolute(fname)) {\n      oName = await this.abs(fname);\n    }\n\n    const fc = {\n      name: oName,\n      content: \"\",\n    };\n    this.files[oName] = fc;\n    this.files[fname] = fc;\n    const decoder = new TextDecoder();\n\n    return {\n      name: oName,\n      stream: new WritableStream<Uint8Array>({\n        write(chunk): void {\n          fc.content = fc.content + decoder.decode(chunk);\n        },\n        close(): void {\n          // do nothing\n        },\n        abort(): void {\n          throw new Error(\"not implemented\");\n        },\n      }),\n    };\n  }\n}\n"],"mappings":";;;;;;;;;;AAQO,IAAM,kBAAN,cAA8B,gBAAgB;AAAA,EAA9C;AAAA;AACL,SAAS,QAAQ,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA,EAMlB,MAAe,OAAO,OAA6C;AACjE,QAAI,QAAQ;AACZ,QAAI,CAAC,KAAK,WAAW,KAAK,GAAG;AAC3B,cAAQ,MAAM,KAAK,IAAI,KAAK;AAAA,IAC9B;AAEA,UAAM,KAAK;AAAA,MACT,MAAM;AAAA,MACN,SAAS;AAAA,IACX;AACA,SAAK,MAAM,KAAK,IAAI;AACpB,SAAK,MAAM,KAAK,IAAI;AACpB,UAAM,UAAU,IAAI,YAAY;AAEhC,WAAO;AAAA,MACL,MAAM;AAAA,MACN,QAAQ,IAAI,eAA2B;AAAA,QACrC,MAAM,OAAa;AACjB,aAAG,UAAU,GAAG,UAAU,QAAQ,OAAO,KAAK;AAAA,QAChD;AAAA,QACA,QAAc;AAAA,QAEd;AAAA,QACA,QAAc;AACZ,gBAAM,IAAI,MAAM,iBAAiB;AAAA,QACnC;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../../src/node/node-file-service.ts","../../../src/node/node-sys-abstraction.ts","../../../src/node/mock-file-service.ts"],"sourcesContent":["import path from \"node:path\";\nimport fs from \"node:fs\";\nimport process from \"node:process\";\nimport { FileService, NamedWritableStream } from \"../file-service.js\";\nimport { TxtEnDecoder, Utf8EnDecoderSingleton } from \"../txt-en-decoder.js\";\n\nexport class NodeFileService implements FileService {\n  readonly baseDir: string;\n  constructor(baseDir: string = process.cwd()) {\n    this.baseDir = this.abs(baseDir);\n  }\n\n  // nodeImport(fname: string): string {\n  //   // console.log('nodeImport:'+ fname);\n  //   if (path.isAbsolute(fname)) {\n  //     return fname;\n  //   } else {\n  //     return \"./\" + path.normalize(fname);\n  //   }\n  // }\n\n  readFileString(fname: string): Promise<string> {\n    return fs.promises.readFile(fname, { encoding: \"utf-8\" });\n  }\n\n  dirname(fname: string): string {\n    return path.dirname(fname);\n  }\n  basename(fname: string): string {\n    return path.basename(fname);\n  }\n\n  join(...paths: string[]): string {\n    return path.join(...paths);\n  }\n\n  relative(from: string, to?: string): string {\n    if (to === undefined) {\n      to = from;\n      from = process.cwd();\n    }\n    const ret = path.relative(from, to);\n    // console.log('relative:'+ from + \" -> \" + to +   \"= \" + ret);\n    return ret;\n  }\n\n  abs(fname: string): string {\n    if (path.isAbsolute(fname)) {\n      return fname;\n    } else {\n      const cwd = process.cwd();\n      return path.resolve(cwd, fname);\n    }\n  }\n\n  isAbsolute(fname: string): boolean {\n    return path.isAbsolute(fname);\n  }\n\n  async writeFileString(fname: string, content: string, ende: TxtEnDecoder = Utf8EnDecoderSingleton()): Promise<void> {\n    const o = await this.create(fname);\n    const wr = o.stream.getWriter();\n    await wr.write(ende.encode(content));\n    await wr.close();\n  }\n\n  async create(fname: string): Promise<NamedWritableStream> {\n    let oName = fname;\n    if (!path.isAbsolute(fname)) {\n      oName = this.abs(fname);\n    }\n\n    const base = path.dirname(oName);\n    await fs.promises.mkdir(base, { recursive: true });\n    const out = fs.createWriteStream(oName);\n    return {\n      name: oName,\n      stream: new WritableStream<Uint8Array>({\n        write(chunk): void {\n          out.write(chunk);\n        },\n        close(): void {\n          out.close();\n        },\n        abort(): void {\n          throw new Error(\"not implemented\");\n        },\n      }),\n    };\n  }\n}\n","import { SysAbstraction, SystemService, VoidFunc } from \"../sys-abstraction.js\";\nimport {\n  BaseSysAbstraction,\n  ExitHandler,\n  ExitService,\n  WrapperSysAbstraction,\n  WrapperSysAbstractionParams,\n} from \"../base-sys-abstraction.js\";\nimport { NodeFileService } from \"./node-file-service.js\";\nimport { Env, envFactory } from \"../sys-env.js\";\nimport { Utf8EnDecoderSingleton } from \"../txt-en-decoder.js\";\nimport process from \"node:process\";\n\nexport class NodeExitServiceImpl implements ExitService {\n  constructor() {\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    process.on(\"unhandledRejection\", (reason: string, p: Promise<unknown>) => {\n      this.exit(19);\n    });\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    process.on(\"uncaughtException\", (error: Error) => {\n      this.exit(18);\n    });\n    process.on(\"close\", () => {\n      this.exit(0);\n    });\n    process.on(\"exit\", () => {\n      this.exit(0);\n    });\n    process.on(\"SIGQUIT\", () => {\n      this.exit(3);\n    });\n    process.on(\"SIGINT\", () => {\n      this.exit(2);\n    });\n    process.on(\"SIGTERM\", () => {\n      this.exit(9);\n    });\n  }\n  _exitHandlers: ExitHandler[] = [];\n  injectExitHandlers(hdls: ExitHandler[]): void {\n    // console.log(\"ExitService: injecting exit handlers\", hdls)\n    this._exitHandlers = hdls;\n  }\n  invoked = false;\n  readonly _handleExit = async (): Promise<void> => {\n    if (this.invoked) {\n      // console.error(\"ExitService: already invoked\");\n      return;\n    }\n    this.invoked = true;\n    for (const h of this._exitHandlers) {\n      try {\n        // console.log(`ExitService: calling handler ${h.id}`)\n        const ret = h.hdl();\n        // console.log(`ExitService: called handler ${h.id}`, ret)\n        if (typeof (ret as Promise<void>).then === \"function\") {\n          await ret;\n        }\n      } finally {\n        // ignore\n      }\n    }\n  };\n\n  exit(code: number): void {\n    // console.log(\"ExitService: exit called\", code)\n    this._handleExit()\n      .then(() => {\n        process.exit(code);\n      })\n      .catch((err) => {\n        // eslint-disable-next-line no-console\n        console.error(\"ExitService: failed to handle exit\", err);\n        process.exit(code);\n      });\n  }\n}\n\nexport class NodeSystemService implements SystemService {\n  static readonly _exitHandlers: ExitHandler[] = [];\n  readonly _exitService: ExitService = new NodeExitServiceImpl();\n  constructor() {\n    this._exitService.injectExitHandlers(NodeSystemService._exitHandlers);\n  }\n\n  Env(): Env {\n    return envFactory();\n  }\n\n  Args(): string[] {\n    return process.argv;\n  }\n\n  OnExit(hdl: VoidFunc): VoidFunc {\n    const id = crypto.randomUUID();\n    NodeSystemService._exitHandlers.push({ hdl, id });\n    return () => {\n      const idx = NodeSystemService._exitHandlers.findIndex((h) => h.id === id);\n      if (idx >= 0) {\n        NodeSystemService._exitHandlers.splice(idx, 1);\n      }\n    };\n  }\n\n  Exit(code: number): void {\n    this._exitService.exit(code);\n  }\n}\n\nlet my: BaseSysAbstraction | undefined = undefined;\nexport function NodeSysAbstraction(param?: WrapperSysAbstractionParams): SysAbstraction {\n  if (!my) {\n    my = new BaseSysAbstraction({\n      TxtEnDecoder: param?.TxtEnDecoder || Utf8EnDecoderSingleton(),\n      FileSystem: new NodeFileService(),\n      SystemService: new NodeSystemService(),\n    });\n  }\n  return new WrapperSysAbstraction(my, param);\n}\n","import { NamedWritableStream } from \"../file-service.js\";\nimport { NodeFileService } from \"./node-file-service.js\";\n\nexport interface FileCollector {\n  readonly name: string;\n  content: string;\n}\n\nexport class MockFileService extends NodeFileService {\n  readonly files = {} as Record<string, FileCollector>;\n\n  // override abs(fname: string): string {\n  //   return this.join(\"/mock/\", fname);\n  // }\n\n  override create(fname: string): Promise<NamedWritableStream> {\n    let oName = fname;\n    if (!this.isAbsolute(fname)) {\n      oName = this.abs(fname);\n    }\n\n    const fc = {\n      name: oName,\n      content: \"\",\n    };\n    this.files[oName] = fc;\n    this.files[fname] = fc;\n    const decoder = new TextDecoder();\n\n    return Promise.resolve({\n      name: oName,\n      stream: new WritableStream<Uint8Array>({\n        write(chunk): void {\n          fc.content = fc.content + decoder.decode(chunk);\n        },\n        close(): void {\n          // do nothing\n        },\n        abort(): void {\n          throw new Error(\"not implemented\");\n        },\n      }),\n    });\n  }\n}\n"],"mappings":"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","names":["process"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adviser/cement",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "better try/catch/finally handling",
   "main": "index.js",
   "type": "module",

package/src/base-sys-abstraction.ts

@@ -152,16 +152,16 @@ function consumeReadableStream(
     });
 }
 
-function CFWriteableStream(writeFn: (chunk: Uint8Array) => Promise<void>): WritableStream {
-  const ts = new TransformStream();
+function CFWriteableStream(writeFn: (chunk: Uint8Array) => Promise<void>): WritableStream<Uint8Array> {
+  const ts = new TransformStream<Uint8Array, Uint8Array>();
   consumeReadableStream(ts.readable.getReader(), writeFn);
   return ts.writable;
 }
 
 export class BaseSysAbstraction {
   readonly _time: SysTime = new SysTime();
-  readonly _stdout: WritableStream;
-  readonly _stderr: WritableStream;
+  readonly _stdout: WritableStream<Uint8Array>;
+  readonly _stderr: WritableStream<Uint8Array>;
 
   readonly _idService: IdService = new IdService();
   readonly _randomService: RandomService = new RandomService(RandomMode.RANDOM);
@@ -174,15 +174,17 @@ export class BaseSysAbstraction {
     this._systemService = params.SystemService;
     this._txtEnDe = params.TxtEnDecoder;
     const decoder = this._txtEnDe;
-    this._stdout = CFWriteableStream(async (chunk) => {
+    this._stdout = CFWriteableStream((chunk) => {
       const decoded = decoder.decode(chunk);
       // eslint-disable-next-line no-console
       console.log(decoded.trimEnd());
+      return Promise.resolve();
     });
-    this._stderr = CFWriteableStream(async (chunk) => {
+    this._stderr = CFWriteableStream((chunk) => {
       const decoded = decoder.decode(chunk);
       // eslint-disable-next-line no-console
       console.error(decoded.trimEnd());
+      return Promise.resolve();
     });
     /* this is not CF worker compatible
     this._stdout = new WritableStream({

package/src/cf/cf-env-actions.ts

@@ -0,0 +1,53 @@
+import { ResolveOnce } from "../resolve-once.js";
+import { runtimeFn } from "../runtime.js";
+import { EnvActions, EnvImpl, EnvFactoryOpts, Env } from "../sys-env.js";
+
+const once = new ResolveOnce<CFEnvActions>();
+export class CFEnvActions implements EnvActions {
+  readonly injectOnRegister: Record<string, string> = {};
+  readonly cfEnv: Map<string, string>;
+  env?: EnvImpl;
+  static new(opts: Partial<EnvFactoryOpts>): EnvActions {
+    return once.once(() => new CFEnvActions(opts));
+  }
+  static inject(o: Record<string, string>): void {
+    const env = CFEnvActions.new({}) as CFEnvActions;
+    for (const key in o) {
+      const value = o[key];
+      if (typeof value === "string") {
+        if (env.env) {
+          env.env.set(key, value);
+        } else {
+          env.injectOnRegister[key] = value;
+        }
+      }
+    }
+  }
+  private constructor(env: Partial<EnvFactoryOpts>) {
+    this.cfEnv = new Map<string, string>(Object.entries(env.presetEnv || {}));
+  }
+  active(): boolean {
+    return runtimeFn().isCFWorker;
+  }
+  register(env: Env): Env {
+    this.env = env as EnvImpl;
+    for (const key in this.injectOnRegister) {
+      env.set(key, this.injectOnRegister[key]);
+    }
+    return env;
+  }
+  get(key: string): string | undefined {
+    return this.cfEnv.get(key);
+  }
+  set(key: string, value?: string): void {
+    if (value) {
+      this.cfEnv.set(key, value);
+    }
+  }
+  delete(key: string): void {
+    this.cfEnv.delete(key);
+  }
+  keys(): string[] {
+    return Array.from(this.cfEnv.keys());
+  }
+}

package/src/cf/cf-sys-abstraction.ts

@@ -1,61 +1,9 @@
 import { BaseSysAbstraction, WrapperSysAbstraction, WrapperSysAbstractionParams } from "../base-sys-abstraction.js";
-import { ResolveOnce } from "../resolve-once.js";
-import { runtimeFn } from "../runtime.js";
 import { SysAbstraction, SystemService, VoidFunc } from "../sys-abstraction.js";
-import { Env, EnvActions, envFactory, EnvFactoryOpts, EnvImpl } from "../sys-env.js";
+import { Env, envFactory } from "../sys-env.js";
 import { Utf8EnDecoderSingleton } from "../txt-en-decoder.js";
 import { WebFileService } from "../web/web-sys-abstraction.js";
 
-const once = new ResolveOnce<CFEnvActions>();
-export class CFEnvActions implements EnvActions {
-  readonly injectOnRegister: Record<string, string> = {};
-  readonly cfEnv: Map<string, string>;
-  env?: EnvImpl;
-  static new(opts: Partial<EnvFactoryOpts>): EnvActions {
-    return once.once(() => new CFEnvActions(opts));
-  }
-  static inject(o: Record<string, string>): void {
-    const env = CFEnvActions.new({}) as CFEnvActions;
-    for (const key in o) {
-      const value = o[key];
-      if (typeof value === "string") {
-        if (env.env) {
-          env.env.set(key, value);
-        } else {
-          env.injectOnRegister[key] = value;
-        }
-      }
-    }
-  }
-  private constructor(env: Partial<EnvFactoryOpts>) {
-    this.cfEnv = new Map<string, string>(Object.entries(env.presetEnv || {}));
-  }
-  active(): boolean {
-    return runtimeFn().isCFWorker;
-  }
-  register(env: Env): Env {
-    this.env = env as EnvImpl;
-    for (const key in this.injectOnRegister) {
-      env.set(key, this.injectOnRegister[key]);
-    }
-    return env;
-  }
-  get(key: string): string | undefined {
-    return this.cfEnv.get(key);
-  }
-  set(key: string, value?: string): void {
-    if (value) {
-      this.cfEnv.set(key, value);
-    }
-  }
-  delete(key: string): void {
-    this.cfEnv.delete(key);
-  }
-  keys(): string[] {
-    return Array.from(this.cfEnv.keys());
-  }
-}
-
 export class CFSystemService implements SystemService {
   Env(): Env {
     return envFactory();

package/src/cf-test-main.ts

@@ -0,0 +1,5 @@
+export default {
+  fetch(): Response {
+    return new Response("Hello World!");
+  },
+};

package/src/deno/deno-env-actions.ts

@@ -0,0 +1,57 @@
+import { ResolveOnce } from "../resolve-once.js";
+import { runtimeFn } from "../runtime.js";
+import { Env, EnvActions, EnvFactoryOpts } from "../sys-env.js";
+
+interface DenoEnv {
+  get: (key: string) => string | undefined;
+  toObject: () => Record<string, string>;
+  set: (key: string, value: string) => void;
+  has: (key: string) => boolean;
+  delete: (key: string) => void;
+}
+
+const once = new ResolveOnce<DenoEnvActions>();
+export class DenoEnvActions implements EnvActions {
+  readonly #deno = globalThis as unknown as {
+    Deno: {
+      env: DenoEnv;
+    };
+  };
+
+  static new(opts: Partial<EnvFactoryOpts>): EnvActions {
+    return once.once(() => new DenoEnvActions(opts));
+  }
+
+  get _env(): DenoEnv {
+    return this.#deno.Deno.env;
+  }
+
+  readonly opts: Partial<EnvFactoryOpts>;
+  private constructor(opts: Partial<EnvFactoryOpts>) {
+    this.opts = opts;
+  }
+
+  register(env: Env): Env {
+    for (const key of env.keys()) {
+      this._env.set(key, env.get(key) || "");
+    }
+    return env;
+  }
+  active(): boolean {
+    return runtimeFn().isDeno;
+  }
+  keys(): string[] {
+    return Object.keys(this._env.toObject());
+  }
+  get(key: string): string | undefined {
+    return this._env.get(key);
+  }
+  set(key: string, value?: string): void {
+    if (value) {
+      this._env.set(key, value);
+    }
+  }
+  delete(key: string): void {
+    this._env.delete(key);
+  }
+}

package/src/deno/deno-file-service.ts

@@ -6,7 +6,7 @@ const Deno = (globalThis as unknown as { Deno: unknown }).Deno as {
   cwd(): string;
   readFile(fname: string): Promise<Uint8Array>;
   mkdir(base: string, options: { recursive: boolean }): Promise<void>;
-  open(fname: string, options: { write: boolean; create: boolean; truncate: boolean }): Promise<WritableStream>;
+  open(fname: string, options: { write: boolean; create: boolean; truncate: boolean }): Promise<WritableStream<Uint8Array>>;
 };
 
 export class DenoFileService implements FileService {

package/src/deno/deno-sys-abstraction.ts

@@ -5,10 +5,8 @@ import {
   WrapperSysAbstractionParams,
   WrapperSysAbstraction,
 } from "../base-sys-abstraction.js";
-import { ResolveOnce } from "../resolve-once.js";
-import { runtimeFn } from "../runtime.js";
 import { SysAbstraction, SystemService, VoidFunc } from "../sys-abstraction.js";
-import { Env, EnvActions, envFactory, EnvFactoryOpts } from "../sys-env.js";
+import { Env, envFactory } from "../sys-env.js";
 import { Utf8EnDecoderSingleton } from "../txt-en-decoder.js";
 // import * as process from "node:process";
 import { DenoFileService } from "./deno-file-service.js";
@@ -19,60 +17,6 @@ const Deno = (globalThis as unknown as { Deno: unknown }).Deno as {
   args: string[];
 };
 
-interface DenoEnv {
-  get: (key: string) => string | undefined;
-  toObject: () => Record<string, string>;
-  set: (key: string, value: string) => void;
-  has: (key: string) => boolean;
-  delete: (key: string) => void;
-}
-
-const once = new ResolveOnce<DenoEnvActions>();
-export class DenoEnvActions implements EnvActions {
-  readonly #deno = globalThis as unknown as {
-    Deno: {
-      env: DenoEnv;
-    };
-  };
-
-  static new(opts: Partial<EnvFactoryOpts>): EnvActions {
-    return once.once(() => new DenoEnvActions(opts));
-  }
-
-  get _env(): DenoEnv {
-    return this.#deno.Deno.env;
-  }
-
-  readonly opts: Partial<EnvFactoryOpts>;
-  private constructor(opts: Partial<EnvFactoryOpts>) {
-    this.opts = opts;
-  }
-
-  register(env: Env): Env {
-    for (const key of env.keys()) {
-      this._env.set(key, env.get(key) || "");
-    }
-    return env;
-  }
-  active(): boolean {
-    return runtimeFn().isDeno;
-  }
-  keys(): string[] {
-    return Object.keys(this._env.toObject());
-  }
-  get(key: string): string | undefined {
-    return this._env.get(key);
-  }
-  set(key: string, value?: string): void {
-    if (value) {
-      this._env.set(key, value);
-    }
-  }
-  delete(key: string): void {
-    this._env.delete(key);
-  }
-}
-
 export class DenoExitServiceImpl implements ExitService {
   constructor() {
     globalThis.addEventListener("unhandledrejection", (e) => {

package/src/http_header.ts

@@ -44,7 +44,7 @@ export class HttpHeader {
     const h = new HttpHeader();
     if (headers) {
       if (Array.isArray(headers)) {
-        for (const [k, v] of headers) {
+        for (const [k, v] of headers as [string, string][]) {
           if (v) {
             h.Add(k, v);
           }

package/src/index.ts

@@ -20,3 +20,6 @@ export * from "./bin2text.js";
 export * from "./version.js";
 export * from "./http_header.js";
 export * as utils from "./utils/index.js";
+// ugly
+import * as utils from "./utils/index.js";
+export const param = utils.param;

package/src/jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@adviser/cement",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "exports": {
     ".": "./index.ts",
     "./web": "./web/index.ts",

package/src/log-writer-impl.ts

@@ -14,7 +14,7 @@ export class LogWriterStream {
         const writer = this._out.getWriter();
         await writer.ready;
         await writer.write(encoded);
-        await writer.releaseLock();
+        writer.releaseLock();
       } catch (err) {
         // eslint-disable-next-line no-console
         console.error("Chunk error:", err);
@@ -50,9 +50,14 @@ export class LogWriterStream {
 
     // console.log(">>>Msg:", this._toFlush.length)
     const my = this._toFlush.shift();
-    my?.().finally(() => {
-      // console.log("<<<Msg:", this._toFlush.length)
-      this._flush(this._toFlush);
-    });
+    my?.()
+      .catch((e) => {
+        // eslint-disable-next-line no-console
+        console.error("Flush error:", e);
+      })
+      .finally(() => {
+        // console.log("<<<Msg:", this._toFlush.length)
+        this._flush(this._toFlush);
+      });
   }
 }

package/src/logger-impl.ts

@@ -13,7 +13,6 @@ import {
   Sized,
   Lengthed,
   LogValue,
-  asyncLogValue,
   LevelHandler,
   LogFormatter,
   LogValueArg,
@@ -176,7 +175,7 @@ export class LoggerImpl implements Logger {
   }
 
   Attributes(): Record<string, unknown> {
-    return JSON.parse(JSON.stringify(this._attributes, null));
+    return JSON.parse(JSON.stringify(this._attributes, null)) as Record<string, unknown>;
     // return Array.from(Object.entries(this._attributes)).reduce(
     //   (acc, [key, value]) => {
     //     if (value instanceof LogValue) {
@@ -246,7 +245,7 @@ export class LoggerImpl implements Logger {
     this._attributes["level"] = logValue(Level.INFO, toLogValueCtx(this.levelHandler));
     return this;
   }
-  Err(err: unknown | Result<unknown> | Error): Logger {
+  Err<T>(err: T | Result<T> | Error): Logger {
     let key = "error";
     if (Result.Is(err)) {
       if (err.isOk()) {
@@ -356,11 +355,13 @@ export class LoggerImpl implements Logger {
     return this;
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   Hash(value: unknown, key = "hash"): Logger {
-    this._attributes[key] = asyncLogValue(
-      async () => `${getLen(value, toLogValueCtx(this.levelHandler)).value()}:${await hash(value)}`,
-    );
-    return this;
+    throw new Error("Not implemented");
+    // this._attributes[key] = asyncLogValue(
+    //   async () => `${getLen(value, toLogValueCtx(this.levelHandler)).value()}:${await hash(value)}`,
+    // );
+    // return this;
   }
 
   Url(url: CoerceURI, key = "url"): Logger {
@@ -592,7 +593,7 @@ class WithLoggerBuilder implements WithLogger {
     this._li.Timestamp();
     return this;
   }
-  Any(key: string | Record<string, unknown>, value?: unknown | LogSerializable): WithLogger {
+  Any<T>(key: string | Record<string, unknown>, value?: T | LogSerializable): WithLogger {
     this._li.Any(key, value);
     return this;
   }

package/src/logger.ts

@@ -75,7 +75,7 @@ function logValueInternal(val: LogValueArg, ctx: LogValueStateInternal): LogValu
       return new LogValue(val);
     case "string": {
       try {
-        const ret = JSON.parse(val);
+        const ret = JSON.parse(val) as LogValueArg;
         if (typeof ret === "object" && ret !== null) {
           return logValueInternal(ret, ctx);
         }
@@ -108,7 +108,7 @@ function logValueInternal(val: LogValueArg, ctx: LogValueStateInternal): LogValu
           // should be injected
           const decoder = new TextDecoder();
           const asStr = decoder.decode(val);
-          const obj = JSON.parse(asStr);
+          const obj = JSON.parse(asStr) as LogValueArg;
           return logValueInternal(obj, ctx);
           // eslint-disable-next-line @typescript-eslint/no-unused-vars
         } catch (e) {
@@ -239,7 +239,7 @@ export interface LoggerInterface<R> {
   Log(): R;
   WithLevel(level: Level): R;
 
-  Err(err: unknown | Result<unknown> | Error): R; // could be Error, or something which coerces to string
+  Err<T>(err: T | Result<T> | Error): R; // could be Error, or something which coerces to string
   Info(): R;
   Timestamp(): R;
   Dur(key: string, nsec: number): R;
@@ -266,8 +266,7 @@ export function IsLogger(obj: unknown): obj is Logger {
       "Dur",
       "Uint64",
     ]
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      .map((fn) => typeof (obj as any)[fn] === "function")
+      .map((fn) => typeof (obj as Record<string, unknown>)[fn] === "function")
       .reduce((a, b) => a && b, true)
   );
 }

package/src/node/mock-file-service.ts

@@ -13,10 +13,10 @@ export class MockFileService extends NodeFileService {
   //   return this.join("/mock/", fname);
   // }
 
-  override async create(fname: string): Promise<NamedWritableStream> {
+  override create(fname: string): Promise<NamedWritableStream> {
     let oName = fname;
     if (!this.isAbsolute(fname)) {
-      oName = await this.abs(fname);
+      oName = this.abs(fname);
     }
 
     const fc = {
@@ -27,7 +27,7 @@ export class MockFileService extends NodeFileService {
     this.files[fname] = fc;
     const decoder = new TextDecoder();
 
-    return {
+    return Promise.resolve({
       name: oName,
       stream: new WritableStream<Uint8Array>({
         write(chunk): void {
@@ -40,6 +40,6 @@ export class MockFileService extends NodeFileService {
           throw new Error("not implemented");
         },
       }),
-    };
+    });
   }
 }

package/src/node/node-env-actions.ts

@@ -0,0 +1,45 @@
+import { ResolveOnce } from "../resolve-once.js";
+import { runtimeFn } from "../runtime.js";
+import { Env, EnvActions, EnvFactoryOpts } from "../sys-env.js";
+
+const once = new ResolveOnce<NodeEnvActions>();
+export class NodeEnvActions implements EnvActions {
+  readonly #node = globalThis as unknown as { process: { env: Record<string, string> } };
+
+  static new(opts: Partial<EnvFactoryOpts>): EnvActions {
+    return once.once(() => new NodeEnvActions(opts));
+  }
+
+  readonly opts: Partial<EnvFactoryOpts>;
+  private constructor(opts: Partial<EnvFactoryOpts>) {
+    this.opts = opts;
+  }
+
+  register(env: Env): Env {
+    for (const key of env.keys()) {
+      this._env[key] = env.get(key) || "";
+    }
+    return env;
+  }
+
+  active(): boolean {
+    return runtimeFn().isNodeIsh;
+    // typeof this.#node === "object" && typeof this.#node.process === "object" && typeof this.#node.process.env === "object";
+  }
+  readonly _env: Record<string, string> = this.active() ? this.#node.process.env : {};
+  keys(): string[] {
+    return Object.keys(this._env);
+  }
+  get(key: string): string | undefined {
+    return this._env[key];
+  }
+  set(key: string, value?: string): void {
+    if (value) {
+      this._env[key] = value;
+    }
+  }
+  delete(key: string): void {
+    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+    delete this._env[key];
+  }
+}

package/src/node/node-sys-abstraction.ts

@@ -7,53 +7,9 @@ import {
   WrapperSysAbstractionParams,
 } from "../base-sys-abstraction.js";
 import { NodeFileService } from "./node-file-service.js";
-import { Env, EnvActions, envFactory, EnvFactoryOpts } from "../sys-env.js";
+import { Env, envFactory } from "../sys-env.js";
 import { Utf8EnDecoderSingleton } from "../txt-en-decoder.js";
 import process from "node:process";
-import { runtimeFn } from "../runtime.js";
-import { ResolveOnce } from "../resolve-once.js";
-
-const once = new ResolveOnce<NodeEnvActions>();
-export class NodeEnvActions implements EnvActions {
-  readonly #node = globalThis as unknown as { process: { env: Record<string, string> } };
-
-  static new(opts: Partial<EnvFactoryOpts>): EnvActions {
-    return once.once(() => new NodeEnvActions(opts));
-  }
-
-  readonly opts: Partial<EnvFactoryOpts>;
-  private constructor(opts: Partial<EnvFactoryOpts>) {
-    this.opts = opts;
-  }
-
-  register(env: Env): Env {
-    for (const key of env.keys()) {
-      this._env[key] = env.get(key) || "";
-    }
-    return env;
-  }
-
-  active(): boolean {
-    return runtimeFn().isNodeIsh;
-    // typeof this.#node === "object" && typeof this.#node.process === "object" && typeof this.#node.process.env === "object";
-  }
-  readonly _env: Record<string, string> = this.active() ? this.#node.process.env : {};
-  keys(): string[] {
-    return Object.keys(this._env);
-  }
-  get(key: string): string | undefined {
-    return this._env[key];
-  }
-  set(key: string, value?: string): void {
-    if (value) {
-      this._env[key] = value;
-    }
-  }
-  delete(key: string): void {
-    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-    delete this._env[key];
-  }
-}
 
 export class NodeExitServiceImpl implements ExitService {
   constructor() {

package/src/resolve-once.ts

@@ -14,10 +14,10 @@ export class ResolveSeq<T, C = void> {
   reset(): void {
     /* noop */
   }
-  async _step(item?: ResolveSeqItem<T, C> | undefined): Promise<void> {
+  _step(item?: ResolveSeqItem<T, C>): Promise<void> {
     if (!item) {
       // done
-      return;
+      return Promise.resolve();
     }
     item
       .fn(this.ctx)
@@ -25,15 +25,16 @@ export class ResolveSeq<T, C = void> {
       .catch((e) => item.future.reject(e as Error))
       .finally(() => {
         this._seqFutures.shift();
-        this._step(this._seqFutures[0]);
+        void this._step(this._seqFutures[0]);
       });
+    return Promise.resolve();
   }
   readonly _seqFutures: ResolveSeqItem<T, C>[] = [];
   async add(fn: (c: C) => Promise<T>, id?: number): Promise<T> {
     const future = new Future<T>();
     this._seqFutures.push({ future, fn, id });
     if (this._seqFutures.length === 1) {
-      this._step(this._seqFutures[0]);
+      void this._step(this._seqFutures[0]);
     }
     return future.asPromise();
   }
@@ -99,7 +100,7 @@ export class ResolveOnce<T, CTX = void> {
         this._onceFutures.length = 0;
       };
       const catchFn = (e: Error): void => {
-        this._onceError = e as Error;
+        this._onceError = e;
         this._onceOk = false;
         this._onceValue = undefined;
         this._onceDone = true;