@adviser/cement 0.4.72 → 0.4.80

package/esm/web/web-env-actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web-env-actions.d.ts","sourceRoot":"","sources":["../../../../src/web/web-env-actions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGhE,qBAAa,iBAAkB,YAAW,UAAU;IAClD,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAA6B;IAC9D,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAEvC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,UAAU,CAEpD;IAED,OAAO,eAEN;IAED,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEnC;IACD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAIrC;IACD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAExB;IACD,IAAI,IAAI,MAAM,EAAE,CAEf;IACD,MAAM,IAAI,OAAO,CAEhB;IAED,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAKtB;CACF"}
+{"version":3,"file":"web-env-actions.d.ts","sourceRoot":"","sources":["../../../../src/web/web-env-actions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAGvE,qBAAa,iBAAkB,YAAW,UAAU;IAClD,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAA6B;IAC9D,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAEvC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,UAAU,CAGpD;IAED,OAAO,eAEN;IAED,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEnC;IACD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAIrC;IACD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAExB;IACD,IAAI,IAAI,MAAM,EAAE,CAEf;IACD,MAAM,IAAI,OAAO,CAEhB;IAED,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAKtB;CACF"}

package/esm/web/web-env-actions.js

@@ -1,10 +1,10 @@
-import { ResolveOnce } from "../resolve-once.js";
-const once = new ResolveOnce();
+let once = undefined;
 export class BrowserEnvActions {
     env = new Map();
     opts;
     static new(opts) {
-        return once.once(() => new BrowserEnvActions(opts));
+        once = once ?? new BrowserEnvActions(opts);
+        return once;
     }
     constructor(opts) {
         this.opts = opts;

package/esm/web/web-env-actions.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-env-actions.js","sourceRoot":"","sources":["../../../../src/web/web-env-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,MAAM,IAAI,GAAG,IAAI,WAAW,EAAqB,CAAC;AAClD,MAAM,OAAO,iBAAiB;IACnB,GAAG,GAAwB,IAAI,GAAG,EAAkB,CAAC;IACrD,IAAI,CAA0B;IAEvC,MAAM,CAAC,GAAG,CAAC,IAA6B,EAAc;QACpD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;IAAA,CACrD;IAED,YAAoB,IAA6B,EAAE;QACjD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAAA,CAClB;IAED,GAAG,CAAC,GAAW,EAAsB;QACnC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAAA,CAC1B;IACD,GAAG,CAAC,GAAW,EAAE,KAAc,EAAQ;QACrC,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC3B,CAAC;IAAA,CACF;IACD,MAAM,CAAC,GAAW,EAAQ;QACxB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAAA,CACtB;IACD,IAAI,GAAa;QACf,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IAAA,CACpC;IACD,MAAM,GAAY;QAChB,OAAO,IAAI,CAAC;IAAA,CACb;IAED,QAAQ,CAAC,GAAQ,EAAO;QACtB,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,UAA4C,CAAC;QAC7D,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QACnB,OAAO,GAAG,CAAC;IAAA,CACZ;CACF"}
+{"version":3,"file":"web-env-actions.js","sourceRoot":"","sources":["../../../../src/web/web-env-actions.ts"],"names":[],"mappings":"AAEA,IAAI,IAAI,GAAkC,SAAS,CAAC;AACpD,MAAM,OAAO,iBAAiB;IACnB,GAAG,GAAwB,IAAI,GAAG,EAAkB,CAAC;IACrD,IAAI,CAA0B;IAEvC,MAAM,CAAC,GAAG,CAAC,IAA6B,EAAc;QACpD,IAAI,GAAG,IAAI,IAAI,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC;IAAA,CACb;IAED,YAAoB,IAA6B,EAAE;QACjD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAAA,CAClB;IAED,GAAG,CAAC,GAAW,EAAsB;QACnC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAAA,CAC1B;IACD,GAAG,CAAC,GAAW,EAAE,KAAc,EAAQ;QACrC,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC3B,CAAC;IAAA,CACF;IACD,MAAM,CAAC,GAAW,EAAQ;QACxB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAAA,CACtB;IACD,IAAI,GAAa;QACf,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IAAA,CACpC;IACD,MAAM,GAAY;QAChB,OAAO,IAAI,CAAC;IAAA,CACb;IAED,QAAQ,CAAC,GAAQ,EAAO;QACtB,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,UAA4C,CAAC;QAC7D,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QACnB,OAAO,GAAG,CAAC;IAAA,CACZ;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adviser/cement",
-  "version": "0.4.72",
+  "version": "0.4.80",
   "description": "better try/catch/finally handling",
   "main": "./cjs/index.js",
   "type": "module",
@@ -21,11 +21,6 @@
       "require": "./cjs/web/index.cjs",
       "import": "./esm/web/index.js"
     },
-    "./utils": {
-      "types": "./esm/utils/index.d.ts",
-      "require": "./cjs/utils/index.cjs",
-      "import": "./esm/utils/index.js"
-    },
     "./cf": {
       "types": "./esm/cf/index.d.ts",
       "require": "./cjs/cf/index.cjs",
@@ -94,7 +89,7 @@
     "@types/semver": "^7.7.1",
     "@typescript-eslint/eslint-plugin": "^8.46.3",
     "@typescript-eslint/parser": "^8.46.3",
-    "@typescript/native-preview": "7.0.0-dev.20251117.1",
+    "@typescript/native-preview": "7.0.0-dev.20251124.1",
     "@vitest/browser": "^3.2.4",
     "@vitest/runner": "^3.2.4",
     "cmd-ts": "^0.14.1",

package/src/add-cement-do-not-export.ts

@@ -0,0 +1,27 @@
+import { WithCement } from "./types.js";
+import { runtimeFn } from "./runtime.js";
+import {
+  WrapperBasicSysAbstraction,
+  WrapperRuntimeSysAbstraction,
+  BaseBasicSysAbstraction,
+  BaseSysAbstraction,
+} from "./base-sys-abstraction.js";
+import { TxtEnDecoderSingleton } from "./txt-en-decoder.js";
+import { ConsoleWriterStream } from "./utils/console-write-stream.js";
+import { envFactory } from "./sys-env.js";
+
+export function addCement<T>(params: T): WithCement<T> {
+  return {
+    cement: {
+      runtimeFn,
+      WrapperBasicSysAbstraction,
+      WrapperRuntimeSysAbstraction,
+      TxtEnDecoderSingleton,
+      ConsoleWriterStream,
+      envFactory,
+      BaseBasicSysAbstraction,
+      BaseSysAbstraction,
+    },
+    ...params,
+  };
+}

package/src/base-sys-abstraction.ts

@@ -13,9 +13,11 @@ import { Time } from "./time.js";
 import { TxtEnDecoder } from "./txt-en-decoder.js";
 import { WebBasicSysAbstraction } from "./web/web-basic-sys-abstraction.js";
 import { Env } from "./sys-env.js";
-import { CFBasicSysAbstraction } from "./cf/cf-basic-sys-abstraction.js";
+import { CFBasicSysAbstraction } from "@adviser/cement/cf";
 import { DenoBasicSysAbstraction } from "./deno/deno-basic-sys-abstraction.js";
 import { NodeBasicSysAbstraction } from "./node/node-basic-sys-abstraction.js";
+import { WithCement } from "@adviser/cement";
+import { addCement } from "./add-cement-do-not-export.js";
 
 /**
  * Real-time implementation using system clock.
@@ -325,6 +327,11 @@ export interface BasicSysAbstractionParams {
 
 export type WrapperBasicSysAbstractionParams = Partial<BasicRuntimeService & BasicSysAbstractionParams>;
 
+export type BaseBasicRuntimeSysAbstractionParams =
+  | (BasicRuntimeService & BasicSysAbstractionParams)
+  | (BasicRuntimeService & BaseSysAbstractionParams);
+
+export type WithCementWrapperSysAbstractionParams = WithCement<Partial<BaseBasicRuntimeSysAbstractionParams>>;
 /**
  * Creates a BasicSysAbstraction instance for the current runtime environment.
  *
@@ -355,17 +362,18 @@ export type WrapperBasicSysAbstractionParams = Partial<BasicRuntimeService & Bas
  * const id2 = testSys.NextId(); // "STEPId-1"
  * ```
  */
+
 export function BasicSysAbstractionFactory(params?: WrapperBasicSysAbstractionParams): BasicSysAbstraction {
   const fn = runtimeFn();
   switch (true) {
     case fn.isBrowser:
-      return WebBasicSysAbstraction(params);
+      return WebBasicSysAbstraction(addCement(params));
     case fn.isDeno:
-      return DenoBasicSysAbstraction(params);
+      return DenoBasicSysAbstraction(addCement(params));
     case fn.isCFWorker:
-      return CFBasicSysAbstraction(params);
+      return CFBasicSysAbstraction(addCement(params));
     case fn.isNodeIsh:
-      return NodeBasicSysAbstraction(params);
+      return NodeBasicSysAbstraction(addCement(params));
     default:
       throw new Error("Unknown runtime");
   }

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

@@ -1,16 +1,22 @@
-import { BaseBasicSysAbstraction, WrapperBasicSysAbstraction, WrapperBasicSysAbstractionParams } from "../base-sys-abstraction.js";
-import { ResolveOnce } from "../resolve-once.js";
-import { BasicRuntimeService, BasicSysAbstraction } from "../sys-abstraction.js";
-import { Env, envFactory } from "../sys-env.js";
-import { TxtEnDecoder, TxtEnDecoderSingleton } from "../txt-en-decoder.js";
+import type {
+  BaseBasicSysAbstraction,
+  BasicRuntimeService,
+  BasicSysAbstraction,
+  Env,
+  EnvFactory,
+  TxtEnDecoder,
+  WithCementWrapperSysAbstractionParams,
+} from "@adviser/cement";
 
 export class CFRuntimeService implements BasicRuntimeService {
   readonly _txtEnDe: TxtEnDecoder;
-  constructor(ende: TxtEnDecoder) {
+  readonly _envFactory: EnvFactory;
+  constructor(ende: TxtEnDecoder, envFactory: EnvFactory) {
     this._txtEnDe = ende;
+    this._envFactory = envFactory;
   }
   Env(): Env {
-    return envFactory();
+    return this._envFactory();
   }
   Args(): string[] {
     throw new Error("Args-Method not implemented.");
@@ -65,15 +71,16 @@ function CFWriteableStream(writeFn: (chunk: Uint8Array) => Promise<void>): Writa
   return ts.writable;
 }
 
-const baseSysAbstraction = new ResolveOnce<BaseBasicSysAbstraction>();
-export function CFBasicSysAbstraction(param?: WrapperBasicSysAbstractionParams): BasicSysAbstraction {
-  const my = baseSysAbstraction.once(() => {
-    return new BaseBasicSysAbstraction({
-      TxtEnDecoder: param?.TxtEnDecoder || TxtEnDecoderSingleton(),
+let baseSysAbstraction: BaseBasicSysAbstraction | undefined = undefined;
+export function CFBasicSysAbstraction(param: WithCementWrapperSysAbstractionParams): BasicSysAbstraction {
+  const ende = param?.TxtEnDecoder || param.cement.TxtEnDecoderSingleton();
+  baseSysAbstraction =
+    baseSysAbstraction ??
+    new param.cement.BaseBasicSysAbstraction({
+      TxtEnDecoder: ende,
     });
-  });
-  return new WrapperBasicSysAbstraction(my, {
-    basicRuntimeService: new CFRuntimeService(param?.TxtEnDecoder ?? my._txtEnDe),
+  return new param.cement.WrapperBasicSysAbstraction(baseSysAbstraction, {
+    basicRuntimeService: new CFRuntimeService(ende, param.cement.envFactory),
     ...param,
   });
 }

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

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

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

@@ -1,18 +1,21 @@
 /// <reference types="deno" />
 
-import { BaseBasicSysAbstraction, WrapperBasicSysAbstraction, WrapperBasicSysAbstractionParams } from "../base-sys-abstraction.js";
-import { ResolveOnce } from "../resolve-once.js";
-import { BasicRuntimeService, BasicSysAbstraction } from "../sys-abstraction.js";
-import { Env, envFactory } from "../sys-env.js";
-import { TxtEnDecoder, TxtEnDecoderSingleton } from "../txt-en-decoder.js";
+import type {
+  BasicRuntimeService,
+  Env,
+  BasicSysAbstraction,
+  EnvFactory,
+  BaseBasicSysAbstraction,
+  WithCementWrapperSysAbstractionParams,
+} from "@adviser/cement";
 
 export class DenoRuntimeService implements BasicRuntimeService {
-  readonly _txtEnDe: TxtEnDecoder;
-  constructor(ende: TxtEnDecoder) {
-    this._txtEnDe = ende;
+  readonly _envFactory: EnvFactory;
+  constructor(envFactory: EnvFactory) {
+    this._envFactory = envFactory;
   }
   Env(): Env {
-    return envFactory();
+    return this._envFactory();
   }
 
   Args(): string[] {
@@ -27,15 +30,16 @@ export class DenoRuntimeService implements BasicRuntimeService {
   }
 }
 
-const baseSysAbstraction = new ResolveOnce<BaseBasicSysAbstraction>();
-export function DenoBasicSysAbstraction(param?: WrapperBasicSysAbstractionParams): BasicSysAbstraction {
-  const my = baseSysAbstraction.once(() => {
-    return new BaseBasicSysAbstraction({
-      TxtEnDecoder: param?.TxtEnDecoder || TxtEnDecoderSingleton(),
+let baseBasicSysAbstraction: BaseBasicSysAbstraction | undefined = undefined;
+export function DenoBasicSysAbstraction(param: WithCementWrapperSysAbstractionParams): BasicSysAbstraction {
+  const ende = param.TxtEnDecoder ?? param.cement.TxtEnDecoderSingleton();
+  baseBasicSysAbstraction =
+    baseBasicSysAbstraction ??
+    new param.cement.BaseBasicSysAbstraction({
+      TxtEnDecoder: ende,
     });
-  });
-  return new WrapperBasicSysAbstraction(my, {
-    basicRuntimeService: new DenoRuntimeService(param?.TxtEnDecoder ?? my._txtEnDe),
+  return new param.cement.WrapperBasicSysAbstraction(baseBasicSysAbstraction, {
+    basicRuntimeService: new DenoRuntimeService(param?.cement.envFactory),
     ...param,
   });
 }

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

@@ -1,6 +1,4 @@
-import { ResolveOnce } from "../resolve-once.js";
-import { runtimeFn } from "../runtime.js";
-import { Env, EnvActions, EnvFactoryOpts } from "../sys-env.js";
+import type { Env, EnvActions, EnvFactoryOpts, WithCement } from "@adviser/cement";
 
 interface DenoEnv {
   get: (key: string) => string | undefined;
@@ -10,7 +8,7 @@ interface DenoEnv {
   delete: (key: string) => void;
 }
 
-const once = new ResolveOnce<DenoEnvActions>();
+let once: DenoEnvActions | undefined = undefined;
 export class DenoEnvActions implements EnvActions {
   readonly #deno = globalThis as unknown as {
     Deno: {
@@ -18,16 +16,17 @@ export class DenoEnvActions implements EnvActions {
     };
   };
 
-  static new(opts: Partial<EnvFactoryOpts>): EnvActions {
-    return once.once(() => new DenoEnvActions(opts));
+  static new(opts: WithCement<Partial<EnvFactoryOpts>>): EnvActions {
+    once = once ?? new DenoEnvActions(opts);
+    return once;
   }
 
   get _env(): DenoEnv {
     return this.#deno.Deno.env;
   }
 
-  readonly opts: Partial<EnvFactoryOpts>;
-  private constructor(opts: Partial<EnvFactoryOpts>) {
+  readonly opts: WithCement<Partial<EnvFactoryOpts>>;
+  private constructor(opts: WithCement<Partial<EnvFactoryOpts>>) {
     this.opts = opts;
   }
 
@@ -38,7 +37,7 @@ export class DenoEnvActions implements EnvActions {
     return env;
   }
   active(): boolean {
-    return runtimeFn().isDeno;
+    return this.opts.cement.runtimeFn().isDeno;
   }
   keys(): string[] {
     return Object.keys(this._env.toObject());

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

@@ -1,6 +1,5 @@
 import * as path from "node:path";
-import type { FileService, NamedWritableStream } from "../file-service.js";
-import { TxtEnDecoder, TxtEnDecoderSingleton } from "../txt-en-decoder.js";
+import type { FileService, NamedWritableStream, TxtEnDecoder } from "@adviser/cement";
 
 const Deno = (globalThis as unknown as { Deno: unknown }).Deno as {
   cwd(): string;
@@ -12,7 +11,7 @@ const Deno = (globalThis as unknown as { Deno: unknown }).Deno as {
 export class DenoFileService implements FileService {
   readonly baseDir: string;
   readonly txtEnde: TxtEnDecoder;
-  constructor(baseDir: string = Deno.cwd(), txtEnde: TxtEnDecoder = TxtEnDecoderSingleton()) {
+  constructor(txtEnde: TxtEnDecoder, baseDir: string = Deno.cwd()) {
     this.baseDir = this.abs(baseDir);
     this.txtEnde = txtEnde;
   }
@@ -64,7 +63,7 @@ export class DenoFileService implements FileService {
     return path.isAbsolute(fname);
   }
 
-  async writeFileString(fname: string, content: string, ende: TxtEnDecoder = TxtEnDecoderSingleton()): Promise<void> {
+  async writeFileString(fname: string, content: string, ende: TxtEnDecoder = this.txtEnde): Promise<void> {
     const o = await this.create(fname);
     const wr = o.stream.getWriter();
     await wr.write(ende.encode(content));

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

@@ -1,13 +1,12 @@
-import {
+import type {
   ExitService,
   ExitHandler,
   BaseSysAbstraction,
-  WrapperBasicSysAbstractionParams,
-  WrapperRuntimeSysAbstraction,
-} from "../base-sys-abstraction.js";
-import { ResolveOnce } from "../resolve-once.js";
-import { RuntimeSysAbstraction, SystemService, VoidFunc } from "../sys-abstraction.js";
-import { TxtEnDecoderSingleton } from "../txt-en-decoder.js";
+  RuntimeSysAbstraction,
+  SystemService,
+  VoidFunc,
+  WithCementWrapperSysAbstractionParams,
+} from "@adviser/cement";
 import { DenoBasicSysAbstraction } from "./deno-basic-sys-abstraction.js";
 // import * as process from "node:process";
 import { DenoFileService } from "./deno-file-service.js";
@@ -114,17 +113,17 @@ export class DenoSystemService implements SystemService {
   }
 }
 
-const baseSysAbstraction = new ResolveOnce<BaseSysAbstraction>();
-export function DenoSysAbstraction(param?: WrapperBasicSysAbstractionParams): RuntimeSysAbstraction {
-  const my = baseSysAbstraction.once(
-    () =>
-      new BaseSysAbstraction({
-        TxtEnDecoder: param?.TxtEnDecoder || TxtEnDecoderSingleton(),
-        FileSystem: new DenoFileService(),
-        SystemService: new DenoSystemService(),
-      }),
-  );
-  return new WrapperRuntimeSysAbstraction(my, {
+let baseSysAbstraction: BaseSysAbstraction | undefined = undefined;
+export function DenoSysAbstraction(param: WithCementWrapperSysAbstractionParams): RuntimeSysAbstraction {
+  const ende = param?.TxtEnDecoder ?? param.cement.TxtEnDecoderSingleton();
+  baseSysAbstraction =
+    baseSysAbstraction ??
+    new param.cement.BaseSysAbstraction({
+      TxtEnDecoder: ende,
+      FileSystem: new DenoFileService(ende),
+      SystemService: new DenoSystemService(),
+    });
+  return new param.cement.WrapperRuntimeSysAbstraction(baseSysAbstraction, {
     basicRuntimeService: DenoBasicSysAbstraction(param),
     ...param,
   });

package/src/deno/index.ts

@@ -1,2 +1,4 @@
 export * from "./deno-sys-abstraction.js";
 export * from "./deno-file-service.js";
+export * from "./deno-env-actions.js";
+export * from "./deno-basic-sys-abstraction.js";

package/src/index.cjs.ts

@@ -28,7 +28,7 @@ export * from "./is-promise.js";
 export * from "./app-context.js";
 
 // ugly
-export * as utils from "./utils/index.js";
+// export * as utils from "@adviser/cement/utils"
 // import * as utils from "./utils/index.js";
 
 // export const param = utils.param;

package/src/index.ts

@@ -35,4 +35,18 @@ export * from "./promise-sleep.js";
 export * from "./keyed-ng.js";
 
 // ugly not really esm but how could that work otherwise?
-export * as utils from "./utils/index.js";
+// export * as utils from "@adviser/cement/utils"
+
+export * from "./utils/rebuffer.js";
+export * from "./utils/stream-map.js";
+export * from "./utils/stream2string.js";
+export * from "./utils/string2stream.js";
+export * from "./utils/console-write-stream.js";
+export * from "./utils/fanout-write-stream.js";
+export * from "./utils/get-params-result.js";
+export * from "./utils/stripper.js";
+export * from "./utils/sorted-object.js";
+export * from "./utils/uint8array-equal.js";
+export * from "./utils/coerce-uint8.js";
+export * from "./utils/consume.js";
+export * from "./utils/to-sorted.js";

package/src/log-level-impl.ts

@@ -1,5 +1,6 @@
-import { LevelHandler, Level } from "./logger.js";
+import { LevelHandler } from "./logger.js";
 import { Option } from "./option.js";
+import { Level } from "./types.js";
 
 export class LevelHandlerImpl implements LevelHandler {
   readonly _globalLevels: Set<Level> = new Set<Level>([Level.INFO, Level.ERROR, Level.WARN]);

package/src/logger-impl.ts

@@ -2,17 +2,12 @@
 import YAML from "yaml";
 import {
   AsError,
-  FnSerialized,
-  LogSerializable,
-  Level,
   Logger,
   logValue,
-  Serialized,
   WithLogger,
   // sanitizeSerialize,
   Sized,
   Lengthed,
-  LogValue,
   LevelHandler,
   LogFormatter,
   LogValueArg,
@@ -26,6 +21,7 @@ import { TxtEnDecoder, TxtEnDecoderSingleton } from "./txt-en-decoder.js";
 import { LevelHandlerSingleton } from "./log-level-impl.js";
 import { BasicSysAbstractionFactory } from "./base-sys-abstraction.js";
 import { LogWriterStream } from "./log-writer-impl.js";
+import { LogValue, LogSerializable, Level, FnSerialized, Serialized } from "./types.js";
 
 function getLen(value: unknown, lvs: LogValueState): LogValue {
   if (Array.isArray(value)) {

package/src/logger.ts

@@ -7,35 +7,7 @@ import { TxtEnDecoder, TxtEnDecoderSingleton } from "./txt-en-decoder.js";
 import { CoerceURI } from "./uri.js";
 import { isJSON } from "./is-json.js";
 import { ReadonlyURL } from "./mutable-url.js";
-
-export const Level = {
-  WARN: "warn",
-  DEBUG: "debug",
-  INFO: "info",
-  ERROR: "error",
-};
-
-export type Level = (typeof Level)[keyof typeof Level];
-
-export type Serialized = string | number | boolean;
-export type FnSerialized = () => Serialized | Serialized[];
-
-export class LogValue {
-  constructor(readonly fn: FnSerialized) {}
-  value(): Serialized | Serialized[] {
-    try {
-      // console.log("LogValue.value", this.fn.toString());
-      return this.fn();
-    } catch (e) {
-      return `LogValue:${(e as Error).message}`;
-    }
-  }
-  toJSON(): Serialized | Serialized[] {
-    return this.value();
-  }
-}
-
-export type LogSerializable = Record<string, LogValue | Promise<LogValue>>;
+import { FnSerialized, Level, LogSerializable, LogValue, Serialized } from "./types.js";
 
 // export function sanitizeSerialize(lineEnd?: string): (key: unknown, val: unknown) => unknown {
 //   const cache = new Set();

package/src/mutable-url.ts

@@ -1,5 +1,5 @@
 import { exception2Result, Result } from "./result.js";
-import { hasHostPartProtocols } from "./uri.js";
+import { hasHostPartProtocols } from "./types.js";
 
 // due to that the System URL class is has a strange behavior
 // on different platforms, we need to implement our own URL class

package/src/node/index.ts

@@ -1,3 +1,5 @@
 export * from "./node-file-service.js";
 export * from "./node-sys-abstraction.js";
 export * from "./mock-file-service.js";
+export * from "./node-env-actions.js";
+export * from "./node-basic-sys-abstraction.js";

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

@@ -1,5 +1,4 @@
-import { NamedWritableStream } from "../file-service.js";
-import { TxtEnDecoderSingleton } from "../txt-en-decoder.js";
+import type { NamedWritableStream } from "@adviser/cement";
 import { NodeFileService } from "./node-file-service.js";
 
 export interface FileCollector {
@@ -26,7 +25,7 @@ export class MockFileService extends NodeFileService {
     };
     this.files[oName] = fc;
     this.files[fname] = fc;
-    const decoder = TxtEnDecoderSingleton();
+    const decoder = this.defTxtEnde;
 
     return Promise.resolve({
       name: oName,

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

@@ -1,11 +1,16 @@
-import { BaseBasicSysAbstraction, WrapperBasicSysAbstraction, WrapperBasicSysAbstractionParams } from "../base-sys-abstraction.js";
-import { ResolveOnce } from "../resolve-once.js";
-import { BasicRuntimeService, BasicSysAbstraction } from "../sys-abstraction.js";
-import { Env, envFactory } from "../sys-env.js";
-import { TxtEnDecoder, TxtEnDecoderSingleton } from "../txt-en-decoder.js";
+import type {
+  BaseBasicSysAbstraction,
+  BasicRuntimeService,
+  BasicSysAbstraction,
+  Env,
+  EnvFactory,
+  TxtEnDecoder,
+  WithCementWrapperSysAbstractionParams,
+} from "@adviser/cement";
 
 export class NodeRuntimeService implements BasicRuntimeService {
   readonly _txtEnDe: TxtEnDecoder;
+  readonly _envFactory: EnvFactory;
   readonly _gthis: {
     process: {
       argv: string[];
@@ -17,12 +22,13 @@ export class NodeRuntimeService implements BasicRuntimeService {
       };
     };
   };
-  constructor(ende: TxtEnDecoder) {
+  constructor(ende: TxtEnDecoder, envFactory: EnvFactory) {
     this._txtEnDe = ende;
+    this._envFactory = envFactory;
     this._gthis = globalThis as unknown as NodeRuntimeService["_gthis"];
   }
   Env(): Env {
-    return envFactory();
+    return this._envFactory();
   }
 
   Args(): string[] {
@@ -45,15 +51,17 @@ export class NodeRuntimeService implements BasicRuntimeService {
   }
 }
 
-const baseSysAbstraction = new ResolveOnce<BaseBasicSysAbstraction>();
-export function NodeBasicSysAbstraction(param?: WrapperBasicSysAbstractionParams): BasicSysAbstraction {
-  const my = baseSysAbstraction.once(() => {
-    return new BaseBasicSysAbstraction({
-      TxtEnDecoder: param?.TxtEnDecoder || TxtEnDecoderSingleton(),
+let baseSysAbstraction: BaseBasicSysAbstraction | undefined = undefined;
+
+export function NodeBasicSysAbstraction(param: WithCementWrapperSysAbstractionParams): BasicSysAbstraction {
+  const ende = param.TxtEnDecoder ?? param.cement.TxtEnDecoderSingleton();
+  baseSysAbstraction =
+    baseSysAbstraction ??
+    new param.cement.BaseBasicSysAbstraction({
+      TxtEnDecoder: ende,
     });
-  });
-  return new WrapperBasicSysAbstraction(my, {
-    basicRuntimeService: new NodeRuntimeService(param?.TxtEnDecoder ?? my._txtEnDe),
+  return new param.cement.WrapperBasicSysAbstraction(baseSysAbstraction, {
+    basicRuntimeService: new NodeRuntimeService(ende, param.cement.envFactory),
     ...param,
   });
 }