@adviser/cement 0.2.2 → 0.2.4

package/node/index.js.map

@@ -1 +1 @@
-{"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 { FileService, NamedWritableStream } from \"../file_service\";\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): Promise<void> {\n    const o = await this.create(fname);\n    const wr = o.stream.getWriter();\n    await wr.write(new TextEncoder().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) {\n          out.write(chunk);\n        },\n        close() {\n          out.close();\n        },\n        abort() {\n          throw new Error(\"not implemented\");\n        },\n      }),\n    };\n  }\n}\n","import { SysAbstraction, SystemService, VoidFunc } from \"../sys_abstraction\";\nimport {\n  BaseSysAbstraction,\n  ExitHandler,\n  ExitService,\n  WrapperSysAbstraction,\n  WrapperSysAbstractionParams,\n} from \"../base_sys_abstraction\";\nimport { NodeFileService } from \"./node_file_service\";\nimport { envImpl } from \"../sys_env\";\n\nexport class ExitServiceImpl 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        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 ExitServiceImpl();\n  constructor() {\n    this._exitService.injectExitHandlers(NodeSystemService._exitHandlers);\n  }\n\n  Env() {\n    return envImpl;\n  }\n\n  Args() {\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      FileSystem: new NodeFileService(),\n      SystemService: new NodeSystemService(),\n    });\n  }\n  return new WrapperSysAbstraction(my, param);\n}\n","import { NamedWritableStream } from \"../file_service\";\nimport { NodeFileService } from \"./node_file_service\";\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) {\n          fc.content = fc.content + decoder.decode(chunk);\n        },\n        close() {\n          // do nothing\n        },\n        abort() {\n          throw new Error(\"not implemented\");\n        },\n      }),\n    };\n  }\n}\n"],"mappings":"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","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 { FileService, NamedWritableStream } from \"../file_service\";\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): Promise<void> {\n    const o = await this.create(fname);\n    const wr = o.stream.getWriter();\n    await wr.write(new TextEncoder().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) {\n          out.write(chunk);\n        },\n        close() {\n          out.close();\n        },\n        abort() {\n          throw new Error(\"not implemented\");\n        },\n      }),\n    };\n  }\n}\n","import { SysAbstraction, SystemService, VoidFunc } from \"../sys_abstraction\";\nimport {\n  BaseSysAbstraction,\n  ExitHandler,\n  ExitService,\n  WrapperSysAbstraction,\n  WrapperSysAbstractionParams,\n} from \"../base_sys_abstraction\";\nimport { NodeFileService } from \"./node_file_service\";\nimport { envFactory } from \"../sys_env\";\n\nexport class ExitServiceImpl 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 ExitServiceImpl();\n  constructor() {\n    this._exitService.injectExitHandlers(NodeSystemService._exitHandlers);\n  }\n\n  Env() {\n    return envFactory();\n  }\n\n  Args() {\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      FileSystem: new NodeFileService(),\n      SystemService: new NodeSystemService(),\n    });\n  }\n  return new WrapperSysAbstraction(my, param);\n}\n","import { NamedWritableStream } from \"../file_service\";\nimport { NodeFileService } from \"./node_file_service\";\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) {\n          fc.content = fc.content + decoder.decode(chunk);\n        },\n        close() {\n          // do nothing\n        },\n        abort() {\n          throw new Error(\"not implemented\");\n        },\n      }),\n    };\n  }\n}\n"],"mappings":"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","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adviser/cement",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "better try/catch/finally handling",
   "main": "index.js",
   "type": "module",
@@ -35,14 +35,14 @@
   "homepage": "https://github.com/mabels/cement#readme",
   "devDependencies": {
     "@types/node": "^20.14.9",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
-    "@typescript-eslint/parser": "^7.16.0",
+    "@typescript-eslint/eslint-plugin": "^7.16.1",
+    "@typescript-eslint/parser": "^7.16.1",
     "eslint": "^9.6.0",
     "prettier": "^3.2.5",
     "tsup": "^8.1.0",
     "tsx": "^4.16.0",
     "typescript": "^5.5.0",
-    "typescript-eslint": "^7.16.0",
+    "typescript-eslint": "^7.16.1",
     "vitest": "^2.0.2"
   },
   "engines": {
@@ -59,6 +59,7 @@
     "presmoke": "pnpm run pubdir ; cd pubdir ; pnpm pack",
     "smoke": "cd smoke; rm -f package.json; pnpm init ; pnpm install -f ../pubdir/adviser-cement-*.tgz; npx tsx ./smoke.ts; deno run --allow-read ./smoke.ts",
     "lint": "eslint .",
-    "prettier": "prettier ."
+    "prettier": "prettier .",
+    "format": "prettier ."
   }
 }

package/{sys_abstraction-BzkoCY1p.d.cts → sys_abstraction-C1-BRiiP.d.cts}

@@ -16,12 +16,26 @@ interface FileService {
     isAbsolute(fname: string): boolean;
 }
 
-interface EnvActions {
+interface EnvMap {
     get(key: string): string | undefined;
     set(key: string, value?: string): void;
-    del(key: string): void;
+    delete(key: string): void;
     keys(): string[];
-    use(): boolean;
+}
+interface EnvActions extends EnvMap {
+    active(): boolean;
+    register(env: Env): Env;
+}
+declare class BrowserEnvActions implements EnvActions {
+    readonly env: Map<string, string>;
+    readonly opts: Partial<EnvFactoryOpts>;
+    constructor(opts: Partial<EnvFactoryOpts>);
+    get(key: string): string | undefined;
+    set(key: string, value?: string): void;
+    delete(key: string): void;
+    keys(): string[];
+    active(): boolean;
+    register(env: Env): Env;
 }
 interface EnvFactoryOpts {
     readonly symbol: string;
@@ -32,19 +46,22 @@ interface OnSetItem {
     readonly filter: Set<string>;
     readonly fn: OnSetFn;
 }
-interface Env extends Omit<EnvActions, "use"> {
+interface Env extends EnvMap {
     onSet(fn: OnSetFn, ...filter: string[]): void;
 }
+declare function envFactory(opts?: Partial<Omit<EnvFactoryOpts, "action">>): Env;
 declare class EnvImpl implements Env {
-    #private;
-    constructor(opts?: Partial<EnvFactoryOpts>);
+    readonly _map: EnvMap;
+    constructor(map: EnvMap, opts?: Partial<EnvFactoryOpts>);
+    _updatePresets(presetEnv?: Map<string, string>): void;
+    _applyOnSet(onSet: OnSetItem[], key?: string, value?: string): void;
+    readonly _onSet: OnSetItem[];
     keys(): string[];
     onSet(fn: OnSetFn, ...filter: string[]): void;
     get(key: string): string | undefined;
     set(key: string, value?: string): void;
-    del(key: string): void;
+    delete(key: string): void;
 }
-declare const envImpl: EnvImpl;
 
 declare abstract class Time {
     abstract Now(): Date;
@@ -92,4 +109,4 @@ interface SysAbstraction {
     FileSystem(): FileService;
 }
 
-export { type Duration as D, type EnvActions as E, type FileService as F, IDMode as I, type NamedWritableStream as N, type OnSetItem as O, RandomMode as R, type SysAbstraction as S, TimeMode as T, type VoidFunc as V, String2TimeMode as a, type SystemService as b, type Env as c, EnvImpl as d, envImpl as e, Time as f, TimeUnits as g };
+export { BrowserEnvActions as B, type Duration as D, type EnvMap as E, type FileService as F, IDMode as I, type NamedWritableStream as N, type OnSetItem as O, RandomMode as R, type SysAbstraction as S, TimeMode as T, type VoidFunc as V, String2TimeMode as a, type SystemService as b, type EnvActions as c, type Env as d, envFactory as e, EnvImpl as f, Time as g, TimeUnits as h };

package/{sys_abstraction-BzkoCY1p.d.ts → sys_abstraction-C1-BRiiP.d.ts}

@@ -16,12 +16,26 @@ interface FileService {
     isAbsolute(fname: string): boolean;
 }
 
-interface EnvActions {
+interface EnvMap {
     get(key: string): string | undefined;
     set(key: string, value?: string): void;
-    del(key: string): void;
+    delete(key: string): void;
     keys(): string[];
-    use(): boolean;
+}
+interface EnvActions extends EnvMap {
+    active(): boolean;
+    register(env: Env): Env;
+}
+declare class BrowserEnvActions implements EnvActions {
+    readonly env: Map<string, string>;
+    readonly opts: Partial<EnvFactoryOpts>;
+    constructor(opts: Partial<EnvFactoryOpts>);
+    get(key: string): string | undefined;
+    set(key: string, value?: string): void;
+    delete(key: string): void;
+    keys(): string[];
+    active(): boolean;
+    register(env: Env): Env;
 }
 interface EnvFactoryOpts {
     readonly symbol: string;
@@ -32,19 +46,22 @@ interface OnSetItem {
     readonly filter: Set<string>;
     readonly fn: OnSetFn;
 }
-interface Env extends Omit<EnvActions, "use"> {
+interface Env extends EnvMap {
     onSet(fn: OnSetFn, ...filter: string[]): void;
 }
+declare function envFactory(opts?: Partial<Omit<EnvFactoryOpts, "action">>): Env;
 declare class EnvImpl implements Env {
-    #private;
-    constructor(opts?: Partial<EnvFactoryOpts>);
+    readonly _map: EnvMap;
+    constructor(map: EnvMap, opts?: Partial<EnvFactoryOpts>);
+    _updatePresets(presetEnv?: Map<string, string>): void;
+    _applyOnSet(onSet: OnSetItem[], key?: string, value?: string): void;
+    readonly _onSet: OnSetItem[];
     keys(): string[];
     onSet(fn: OnSetFn, ...filter: string[]): void;
     get(key: string): string | undefined;
     set(key: string, value?: string): void;
-    del(key: string): void;
+    delete(key: string): void;
 }
-declare const envImpl: EnvImpl;
 
 declare abstract class Time {
     abstract Now(): Date;
@@ -92,4 +109,4 @@ interface SysAbstraction {
     FileSystem(): FileService;
 }
 
-export { type Duration as D, type EnvActions as E, type FileService as F, IDMode as I, type NamedWritableStream as N, type OnSetItem as O, RandomMode as R, type SysAbstraction as S, TimeMode as T, type VoidFunc as V, String2TimeMode as a, type SystemService as b, type Env as c, EnvImpl as d, envImpl as e, Time as f, TimeUnits as g };
+export { BrowserEnvActions as B, type Duration as D, type EnvMap as E, type FileService as F, IDMode as I, type NamedWritableStream as N, type OnSetItem as O, RandomMode as R, type SysAbstraction as S, TimeMode as T, type VoidFunc as V, String2TimeMode as a, type SystemService as b, type EnvActions as c, type Env as d, envFactory as e, EnvImpl as f, Time as g, TimeUnits as h };

package/utils/index.js

@@ -1,4 +1,4 @@
-import "../chunk-ZYFWDQGV.js";
+import "../chunk-J2IM7FHM.js";
 
 // src/utils/stream_map.ts
 function streamMap(s, sm) {

package/web/index.cjs

@@ -23,7 +23,6 @@ var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
 
 // src/web/index.ts
 var web_exports = {};
@@ -215,170 +214,285 @@ var WrapperSysAbstraction = class {
   }
 };
 
+// src/future.ts
+var _promise, _resolveFn, _rejectFn;
+var Future = class {
+  constructor() {
+    __privateAdd(this, _promise);
+    __privateAdd(this, _resolveFn, () => {
+      throw new Error("This Promise is not working as expected.");
+    });
+    __privateAdd(this, _rejectFn, () => {
+      throw new Error("This Promise is not working as expected.");
+    });
+    __privateSet(this, _promise, new Promise((resolve, reject) => {
+      __privateSet(this, _resolveFn, resolve);
+      __privateSet(this, _rejectFn, reject);
+    }));
+  }
+  async asPromise() {
+    return __privateGet(this, _promise);
+  }
+  resolve(value) {
+    __privateGet(this, _resolveFn).call(this, value);
+  }
+  reject(reason) {
+    __privateGet(this, _rejectFn).call(this, reason);
+  }
+};
+_promise = new WeakMap();
+_resolveFn = new WeakMap();
+_rejectFn = new WeakMap();
+
+// src/resolve-once.ts
+var ResolveOnce = class {
+  constructor(ctx) {
+    this._onceDone = false;
+    this._onceFutures = [];
+    this._onceOk = false;
+    this._isPromise = false;
+    this.ctx = ctx;
+  }
+  get ready() {
+    return this._onceDone;
+  }
+  reset() {
+    this._onceDone = false;
+    this._onceOk = false;
+    this._onceValue = void 0;
+    this._onceError = void 0;
+    this._onceFutures.length = 0;
+  }
+  // T extends Option<infer U> ? U : T
+  once(fn) {
+    if (this._onceDone) {
+      if (this._onceError) {
+        if (this._isPromise) {
+          return Promise.reject(this._onceError);
+        } else {
+          throw this._onceError;
+        }
+      }
+      if (this._onceOk) {
+        if (this._isPromise) {
+          return Promise.resolve(this._onceValue);
+        } else {
+          return this._onceValue;
+        }
+      }
+      throw new Error("ResolveOnce.once impossible");
+    }
+    const future = new Future();
+    this._onceFutures.push(future);
+    if (this._onceFutures.length === 1) {
+      const okFn = (value) => {
+        this._onceValue = value;
+        this._onceOk = true;
+        this._onceDone = true;
+        if (this._isPromise) {
+          this._onceFutures.forEach((f) => f.resolve(this._onceValue));
+        }
+        this._onceFutures.length = 0;
+      };
+      const catchFn = (e) => {
+        this._onceError = e;
+        this._onceOk = false;
+        this._onceValue = void 0;
+        this._onceDone = true;
+        if (this._isPromise) {
+          this._onceFutures.forEach((f) => f.reject(this._onceError));
+        }
+        this._onceFutures.length = 0;
+      };
+      try {
+        const ret = fn(this.ctx);
+        if (typeof ret.then === "function") {
+          this._isPromise = true;
+          ret.then(okFn).catch(catchFn);
+        } else {
+          okFn(ret);
+        }
+      } catch (e) {
+        catchFn(e);
+      }
+    }
+    if (this._isPromise) {
+      return future.asPromise();
+    } else {
+      return this.once(fn);
+    }
+  }
+};
+
 // src/sys_env.ts
-var _node, _env;
+var _node;
 var NodeEnvActions = class {
   // eslint-disable-next-line @typescript-eslint/no-useless-constructor, @typescript-eslint/no-unused-vars
   constructor(opts) {
     __privateAdd(this, _node, globalThis);
-    __privateAdd(this, _env, this.use() ? process.env : {});
+    this._env = this.active() ? __privateGet(this, _node).process.env : {};
+  }
+  register(env) {
+    return env;
   }
-  use() {
+  active() {
     return typeof __privateGet(this, _node) === "object" && typeof __privateGet(this, _node).process === "object" && typeof __privateGet(this, _node).process.env === "object";
   }
   keys() {
-    return Object.keys(__privateGet(this, _env));
+    return Object.keys(this._env);
   }
   get(key) {
-    return __privateGet(this, _env)[key];
+    return this._env[key];
   }
   set(key, value) {
     if (value) {
-      __privateGet(this, _env)[key] = value;
+      this._env[key] = value;
     }
   }
-  del(key) {
-    delete __privateGet(this, _env)[key];
+  delete(key) {
+    delete this._env[key];
   }
 };
 _node = new WeakMap();
-_env = new WeakMap();
-var _deno, _env2;
+var _deno;
 var DenoEnvActions = class {
-  constructor(opts, env) {
+  // eslint-disable-next-line @typescript-eslint/no-useless-constructor, @typescript-eslint/no-unused-vars
+  constructor(opts) {
     __privateAdd(this, _deno, globalThis);
-    __privateAdd(this, _env2);
-    if (env) {
-      __privateSet(this, _env2, env);
-    } else {
-      __privateSet(this, _env2, this.use() ? __privateGet(this, _deno).Deno.env : /* @__PURE__ */ new Map());
-    }
   }
-  use() {
+  get _env() {
+    return __privateGet(this, _deno).Deno.env;
+  }
+  register(env) {
+    return env;
+  }
+  active() {
     return typeof __privateGet(this, _deno) === "object" && typeof __privateGet(this, _deno).Deno === "object" && typeof __privateGet(this, _deno).Deno.env === "object";
   }
   keys() {
-    return Array.from(__privateGet(this, _env2).keys());
+    return Array.from(this._env.keys());
   }
   get(key) {
-    return __privateGet(this, _env2).get(key);
+    return this._env.get(key);
   }
   set(key, value) {
     if (value) {
-      __privateGet(this, _env2).set(key, value);
+      this._env.set(key, value);
     }
   }
-  del(key) {
-    __privateGet(this, _env2).delete(key);
+  delete(key) {
+    this._env.delete(key);
   }
 };
 _deno = new WeakMap();
-_env2 = new WeakMap();
-var BrowserEnvActions = class _BrowserEnvActions extends DenoEnvActions {
-  static globalBEA(sym) {
-    const browser = globalThis;
-    if (typeof browser === "object" && typeof browser[sym] === "object") {
-      return { map: browser[sym]._map, finalize: () => browser[sym]._map };
+var BrowserEnvActions = class {
+  constructor(opts) {
+    this.env = /* @__PURE__ */ new Map();
+    this.opts = opts;
+  }
+  get(key) {
+    return this.env.get(key);
+  }
+  set(key, value) {
+    if (value) {
+      this.env.set(key, value);
     }
-    const map = /* @__PURE__ */ new Map();
-    return {
-      map,
-      finalize: (bea) => {
-        browser[sym] = bea;
-        return map;
-      }
-    };
   }
-  constructor(opts) {
-    const { map, finalize } = _BrowserEnvActions.globalBEA(Symbol.for(opts.symbol || "CP_ENV"));
-    super(opts, map);
-    this._map = finalize(this);
+  delete(key) {
+    this.env.delete(key);
   }
-  use() {
+  keys() {
+    return Array.from(this.env.keys());
+  }
+  active() {
     return true;
   }
+  register(env) {
+    const sym = Symbol.for(this.opts.symbol || "CP_ENV");
+    const browser = globalThis;
+    browser[sym] = env;
+    return env;
+  }
 };
+var _envFactory = new ResolveOnce();
 function envFactory(opts = {}) {
-  const found = [new NodeEnvActions(opts), new DenoEnvActions(opts), new BrowserEnvActions(opts)].find((env) => env.use());
-  if (!found) {
-    throw new Error("SysContainer:envFactory: no env available");
-  }
-  return found;
+  return _envFactory.once(() => {
+    const found = [new NodeEnvActions(opts), new DenoEnvActions(opts), new BrowserEnvActions(opts)].find((env) => env.active());
+    if (!found) {
+      throw new Error("SysContainer:envFactory: no env available");
+    }
+    const ret = new EnvImpl(found, opts);
+    found.register(ret);
+    return ret;
+  });
 }
-var _envImpl, _EnvImpl_instances, updatePresets_fn, applyOnSet_fn, _onSet;
 var EnvImpl = class {
-  constructor(opts = {}) {
-    __privateAdd(this, _EnvImpl_instances);
-    __privateAdd(this, _envImpl);
-    __privateAdd(this, _onSet, []);
-    __privateSet(this, _envImpl, envFactory(opts));
-    __privateMethod(this, _EnvImpl_instances, updatePresets_fn).call(this, opts.presetEnv);
+  constructor(map, opts = {}) {
+    this._onSet = [];
+    this._map = map;
+    this._updatePresets(opts.presetEnv);
+  }
+  _updatePresets(presetEnv) {
+    if (!presetEnv) {
+      return;
+    }
+    for (const [key, value] of presetEnv) {
+      this._map.set(key, value);
+    }
+  }
+  _applyOnSet(onSet, key, value) {
+    onSet.forEach((item) => {
+      let keys = [];
+      if (key) {
+        keys = [key];
+      } else {
+        keys = this._map.keys();
+      }
+      keys.filter((k) => {
+        if (item.filter.size === 0) {
+          return true;
+        }
+        if (item.filter.has(k)) {
+          return true;
+        }
+        return false;
+      }).forEach((k) => {
+        let v;
+        if (!key && !value) {
+          v = this._map.get(k);
+        } else if (key && !value) {
+          v = void 0;
+        } else {
+          v = value;
+        }
+        item.fn(k, v);
+      });
+    });
   }
   keys() {
-    return __privateGet(this, _envImpl).keys();
+    return this._map.keys();
   }
   // filter is not set all sets passed
   onSet(fn, ...filter) {
     const item = { filter: new Set(filter), fn };
-    __privateGet(this, _onSet).push(item);
-    __privateMethod(this, _EnvImpl_instances, applyOnSet_fn).call(this, [item]);
+    this._onSet.push(item);
+    this._applyOnSet([item]);
   }
   get(key) {
-    return __privateGet(this, _envImpl).get(key);
+    return this._map.get(key);
   }
   set(key, value) {
     if (!value) {
       return;
     }
-    __privateGet(this, _envImpl).set(key, value);
-    __privateMethod(this, _EnvImpl_instances, applyOnSet_fn).call(this, __privateGet(this, _onSet), key, value);
-  }
-  del(key) {
-    __privateGet(this, _envImpl).del(key);
-    __privateMethod(this, _EnvImpl_instances, applyOnSet_fn).call(this, __privateGet(this, _onSet), key);
+    this._map.set(key, value);
+    this._applyOnSet(this._onSet, key, value);
   }
-};
-_envImpl = new WeakMap();
-_EnvImpl_instances = new WeakSet();
-updatePresets_fn = function(presetEnv) {
-  if (!presetEnv) {
-    return;
-  }
-  for (const [key, value] of presetEnv) {
-    __privateGet(this, _envImpl).set(key, value);
+  delete(key) {
+    this._map.delete(key);
+    this._applyOnSet(this._onSet, key);
   }
 };
-applyOnSet_fn = function(onSet, key, value) {
-  onSet.forEach((item) => {
-    let keys = [];
-    if (key) {
-      keys = [key];
-    } else {
-      keys = __privateGet(this, _envImpl).keys();
-    }
-    keys.filter((k) => {
-      if (item.filter.size === 0) {
-        return true;
-      }
-      if (item.filter.has(k)) {
-        return true;
-      }
-      return false;
-    }).forEach((k) => {
-      let v;
-      if (!key && !value) {
-        v = __privateGet(this, _envImpl).get(k);
-      } else if (key && !value) {
-        v = void 0;
-      } else {
-        v = value;
-      }
-      item.fn(k, v);
-    });
-  });
-};
-_onSet = new WeakMap();
-var envImpl = new EnvImpl();
 
 // src/web/web_sys_abstraction.ts
 var WebFileService = class {
@@ -428,7 +542,7 @@ var WebFileService = class {
 };
 var WebSystemService = class {
   Env() {
-    return envImpl;
+    return envFactory();
   }
   Args() {
     throw new Error("Args-Method not implemented.");