@adviser/cement 0.5.3 → 0.5.4

package/esm/wait-for-value.js

@@ -0,0 +1,45 @@
+import { Future } from "./future.js";
+import { Option } from "./option.js";
+import { ResolveOnce } from "./resolve-once.js";
+export class WaitingForValue {
+    #value;
+    #waitFuture;
+    #waitValue;
+    constructor(opts = {}) {
+        this.init(opts.presetValue);
+    }
+    init(presetValue = Option.None()) {
+        this.#value = presetValue;
+        if (this.#value.IsSome()) {
+            return this.setValue(this.#value);
+        }
+        const myFuture = (this.#waitFuture = new Future());
+        const resolveOnce = new ResolveOnce();
+        this.#waitValue = () => resolveOnce.once(async () => myFuture.asPromise());
+    }
+    setValue(value) {
+        if (value.IsNone()) {
+            return;
+        }
+        switch (true) {
+            case this.#value.IsNone():
+                this.#value = value;
+                this.#waitFuture?.resolve(value.unwrap());
+                break;
+            case this.#value.IsSome(): {
+                this.#value = value;
+                this.#waitFuture = undefined;
+                const resolveOnce = new ResolveOnce();
+                this.#waitValue = () => resolveOnce.once(() => Promise.resolve(value.unwrap()));
+                break;
+            }
+        }
+    }
+    waitValue() {
+        return this.#waitValue();
+    }
+    value() {
+        return this.#value;
+    }
+}
+//# sourceMappingURL=wait-for-value.js.map

package/esm/wait-for-value.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wait-for-value.js","sourceRoot":"","sources":["../../../src/wait-for-value.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAkChD,MAAM,OAAO,eAAe;IAC1B,MAAM,CAAa;IACnB,WAAW,CAAa;IACxB,UAAU,CAAoB;IAO9B,YAAY,IAAI,GAA4B,EAAE,EAAE;QAC9C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAAA,CAC7B;IASD,IAAI,CAAC,WAAW,GAAc,MAAM,CAAC,IAAI,EAAE,EAAQ;QACjD,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC;QAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,MAAM,EAAK,CAAC,CAAC;QACtD,MAAM,WAAW,GAAG,IAAI,WAAW,EAAK,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,GAAe,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;IAAA,CACxF;IAUD,QAAQ,CAAC,KAAgB,EAAQ;QAC/B,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QACD,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBAEvB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;gBACpB,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC1C,MAAM;YACR,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;gBAC1B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;gBACpB,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;gBAC7B,MAAM,WAAW,GAAG,IAAI,WAAW,EAAK,CAAC;gBACzC,IAAI,CAAC,UAAU,GAAG,GAAe,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC5F,MAAM;YACR,CAAC;QACH,CAAC;IAAA,CACF;IAUD,SAAS,GAAe;QACtB,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;IAAA,CAC1B;IAED,KAAK,GAAc;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC;IAAA,CACpB;CACF"}

package/esm/wait-for-value.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=wait-for-value.test.d.ts.map

package/esm/wait-for-value.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wait-for-value.test.d.ts","sourceRoot":"","sources":["../../../src/wait-for-value.test.ts"],"names":[],"mappings":""}

package/esm/wait-for-value.test.js

@@ -0,0 +1,84 @@
+import { WaitingForValue, sleep, Option } from "@adviser/cement";
+import { it, vi, expect } from "vitest";
+it("waitFor void", async () => {
+    const wfv = new WaitingForValue();
+    const size = 10;
+    for (let i = 0; i < size; i++) {
+        const promiseWaits = Promise.all(Array(size)
+            .fill(0)
+            .map(() => wfv.waitValue()));
+        const results = vi.fn();
+        void promiseWaits.then(results);
+        await sleep(10);
+        expect(results).not.toHaveBeenCalled();
+        wfv.setValue(Option.None());
+        await sleep(10);
+        expect(results).not.toHaveBeenCalled();
+        wfv.setValue(Option.Some(undefined));
+        await sleep(10);
+        await promiseWaits;
+        expect(results).toHaveBeenCalledTimes(1);
+        expect(results).toHaveBeenCalledWith(Array(size).fill(undefined));
+        wfv.setValue(Option.Some(42));
+        const promiseWaits2 = Promise.all(Array(size)
+            .fill(0)
+            .map(() => wfv.waitValue())).then(results);
+        await sleep(10);
+        await promiseWaits2;
+        expect(results).toHaveBeenCalledTimes(2);
+        expect(results.mock.calls).toEqual([[Array(size).fill(undefined)], [Array(size).fill(42)]]);
+        wfv.init();
+    }
+});
+it("waitFor object", async () => {
+    const wfv = new WaitingForValue();
+    const size = 10;
+    for (let i = 0; i < size; i++) {
+        const promiseWaits = Promise.all(Array(size)
+            .fill(0)
+            .map(() => wfv.waitValue()));
+        const results = vi.fn();
+        void promiseWaits.then(results);
+        await sleep(10);
+        expect(results).not.toHaveBeenCalled();
+        wfv.setValue(Option.None());
+        await sleep(10);
+        expect(results).not.toHaveBeenCalled();
+        wfv.setValue(Option.Some({ value: 0 }));
+        await sleep(10);
+        await promiseWaits;
+        expect(results).toHaveBeenCalledTimes(1);
+        expect(results).toHaveBeenCalledWith(Array(size).fill({ value: 0 }));
+        wfv.setValue(Option.Some({ value: 42 }));
+        const promiseWaits2 = Promise.all(Array(size)
+            .fill(0)
+            .map(() => wfv.waitValue())).then(results);
+        await sleep(10);
+        await promiseWaits2;
+        expect(results).toHaveBeenCalledTimes(2);
+        expect(results.mock.calls).toEqual([[Array(size).fill({ value: 0 })], [Array(size).fill({ value: 42 })]]);
+        wfv.init();
+    }
+});
+it("waitFor preset value", async () => {
+    const wfv = new WaitingForValue({ presetValue: Option.Some(7) });
+    const size = 10;
+    const promiseWaits = Promise.all(Array(size)
+        .fill(0)
+        .map(() => wfv.waitValue()));
+    const results = vi.fn();
+    void promiseWaits.then(results);
+    await sleep(10);
+    await promiseWaits;
+    expect(results).toHaveBeenCalledTimes(1);
+    expect(results).toHaveBeenCalledWith(Array(size).fill(7));
+    wfv.setValue(Option.Some(42));
+    const promiseWaits2 = Promise.all(Array(size)
+        .fill(0)
+        .map(() => wfv.waitValue())).then(results);
+    await sleep(10);
+    await promiseWaits2;
+    expect(results).toHaveBeenCalledTimes(2);
+    expect(results.mock.calls).toEqual([[Array(size).fill(7)], [Array(size).fill(42)]]);
+});
+//# sourceMappingURL=wait-for-value.test.js.map

package/esm/wait-for-value.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wait-for-value.test.js","sourceRoot":"","sources":["../../../src/wait-for-value.test.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/index.ts

@@ -50,5 +50,8 @@ export * from "./utils/uint8array-equal.js";
 export * from "./utils/coerce-uint8.js";
 export * from "./utils/consume.js";
 export * from "./utils/to-sorted.js";
+export * from "./utils/relative-path.js";
 
 export * from "./node-env/index.js";
+export * from "./wait-for-value.js";
+export * from "./is-json.js";

package/src/option.ts

@@ -26,8 +26,8 @@
  * ```
  */
 export abstract class Option<T> {
-  static Some<T>(t: T): Option<T> {
-    return new Some(t);
+  static Some<T = void>(...args: T[]): Option<T> {
+    return args.length >= 1 ? new Some<T>(args[0]) : new Some<T>(undefined as unknown as T);
   }
 
   static None<T>(): Option<T> {

package/src/resolve-once.ts

@@ -269,22 +269,6 @@ export class SyncResolveOnce<T, CTX> implements SyncOrAsyncIf<T> {
     }
     return this.#value as ResultOnce<RET>;
   }
-
-  // /**
-  //  * Resets the cached state, allowing the function to be executed again.
-  //  *
-  //  * @param fn - Optional function to execute immediately after reset
-  //  * @returns The result if fn provided, undefined otherwise
-  //  */
-  // reset(fn?: () => RET): T | undefined {
-  //   this.#value = undefined;
-  //   this.#error = undefined;
-  //   if (fn) {
-  //     this.#state.setProcessing();
-  //     return this.resolve(fn);
-  //   }
-  //   return undefined as T;
-  // }
 }
 
 /**
@@ -488,20 +472,6 @@ export class AsyncResolveOnce<T, CTX> implements SyncOrAsyncIf<T> {
 
     return this.#active().resolve(fn);
   }
-
-  // /**
-  //  * Resets the cached state, allowing the function to be executed again.
-  //  *
-  //  * @param fn - Optional function to execute immediately after reset
-  //  * @returns The result if fn provided, undefined otherwise
-  //  */
-  // reset(fn?: () => ResultOnce<T>): T {
-  //   this.#state.setProcessing();
-  //   if (fn) {
-  //     return this.resolve(fn);
-  //   }
-  //   return undefined as T;
-  // }
 }
 
 /**
@@ -687,36 +657,12 @@ export class ResolveOnce<T, CTX = void> implements ResolveOnceIf<T, CTX> {
     return this.#syncOrAsync.Unwrap().error;
   }
 
-  // get state(): ResolveState {
-  //   return this.#state;
-  // }
-  // set state(value: ResolveState) {
-  //   console.log(`ResolveOnce.state ${this.#state} -> ${value}`);
-  //   if (value === "processed") {
-  //     if (this.resetAfterTimer) {
-  //       clearTimeout(this.resetAfterTimer);
-  //     }
-  //     if (typeof this.#opts.resetAfter === "number" && this.#opts.resetAfter > 0) {
-  //       console.log("setting reset timer for", this.#opts.resetAfter);
-  //       this.resetAfterTimer = setTimeout(() => {
-  //         console.log("resetting after", this.#opts.resetAfter);
-  //         this.reset();
-  //       }, this.#opts.resetAfter);
-  //     }
-  //   }
-  //   this.#state = value;
-  // }
-
   once<RET extends T | Promise<T>>(fn: (arg: OnceActionArg<T, CTX>) => RET): ResultOnce<RET> {
     let resultFn: () => RET;
     if (this.#state.isInitial()) {
       const state = this.#state;
       try {
         state.setProcessing();
-        // let prev: T | undefined = undefined;
-        // if (this.#syncOrAsync.IsSome()) {
-        //   prev = this.#syncOrAsync.Unwrap().value as T;
-        // }
         const isSyncOrAsync = fn(this._onceArg);
         if (isPromise(isSyncOrAsync)) {
           this.#syncOrAsync = Option.Some(new AsyncResolveOnce<T, CTX>(this, state, this.#syncOrAsync));
@@ -806,11 +752,14 @@ export type AddKeyedParam<K, V, CTX extends NonNullable<object>> = Omit<KeyedNgO
  */
 export type WithKey<X extends NonNullable<object>, K> = X & { readonly key: K };
 
+// interface ResetFunc {
+//   reset(): void;
+// }
 /**
  * Type helper that adds an optional reset method to a value type.
  * @template V - The value type
  */
-export type WithOptionalReset<V> = V & { readonly reset?: () => void };
+// export type WithOptionalReset<V> = V extends ResetFunc ? V & ResetFunc : V;
 
 /**
  * Represents an item in a KeyedResolvOnce collection with its resolved result.
@@ -824,7 +773,7 @@ export interface KeyedResolveOnceItem<K, T, CTX extends NonNullable<object>> {
   /** The resolved value wrapped in a Result (Ok or Err) */
   readonly value: Result<T>;
   /** The complete KeyedNgItem containing metadata */
-  readonly item: KeyedNgItem<K, ResolveOnce<WithOptionalReset<T>, KeyedNgItemWithoutValue<K, CTX>>, CTX>;
+  readonly item: KeyedNgItem<K, ResolveOnce<T, KeyedNgItemWithoutValue<K, CTX>>, CTX>;
 }
 
 /**
@@ -873,10 +822,12 @@ export interface KeyedResolveOnceItem<K, T, CTX extends NonNullable<object>> {
  * ```
  */
 export class KeyedResolvOnce<
-  T extends WithOptionalReset<PT>,
+  T,
+  //export type WithOptionalReset<V> = V extends ResetFunc ? V & ResetFunc : V;
+  // WithOptionalReset<PT>,
   K = string,
   CTX extends NonNullable<object> = object,
-  PT = T,
+  // PT = unknown,
 > implements Omit<
   // KeyedIf<ResolveOnce<T, KeyedNgItemWithoutValue<K, CTX>>, WithOptionalReset<T>, K>
   KeyedIf<
@@ -888,7 +839,7 @@ export class KeyedResolvOnce<
   "entries" | "forEach" | "onSet" | "onDelete" | "values" | "setParam"
 > {
   /** @internal */
-  readonly _keyed: KeyedNg<K, ResolveOnce<WithOptionalReset<T>, KeyedNgItemWithoutValue<K, CTX>>, CTX>;
+  readonly _keyed: KeyedNg<K, ResolveOnce<T, KeyedNgItemWithoutValue<K, CTX>>, CTX>;
 
   /**
    * Creates a new KeyedResolvOnce instance.
@@ -896,7 +847,7 @@ export class KeyedResolvOnce<
    * @param kp - Configuration options (key2string, ctx, lru)
    */
   constructor(kp: Partial<AddKeyedParam<K, T, CTX>> = {}) {
-    this._keyed = new KeyedNg({
+    this._keyed = new KeyedNg<K, ResolveOnce<T, KeyedNgItemWithoutValue<K, CTX>>, CTX>({
       createValue: (
         item: KeyedNgItem<K, ResolveOnce<T, KeyedNgItemWithoutValue<K, CTX>>, CTX>,
       ): ResolveOnce<T, KeyedNgItemWithoutValue<K, CTX>> => {

package/src/wait-for-value.ts

@@ -0,0 +1,111 @@
+import { Future } from "./future.js";
+import { Option } from "./option.js";
+import { ResolveOnce } from "./resolve-once.js";
+
+/**
+ * Configuration options for WaitingForValue.
+ */
+export interface WaitingForValueProps<T> {
+  /**
+   * Optional preset value to initialize the WaitingForValue with.
+   * If provided and Some, the value is immediately available.
+   */
+  readonly presetValue?: Option<T>;
+}
+
+/**
+ * A utility for managing a value that may not be immediately available.
+ * Allows multiple callers to await the same value efficiently, with all
+ * waiters resolved when the value becomes available.
+ *
+ * @template T - The type of value being waited for
+ *
+ * @example
+ * ```ts
+ * const waiting = new WaitingForValue<string>();
+ *
+ * // Multiple callers can await the value
+ * const promise1 = waiting.waitValue();
+ * const promise2 = waiting.waitValue();
+ *
+ * // Set the value - all waiters are resolved
+ * waiting.setValue(Option.Some("hello"));
+ *
+ * // Both promises resolve to "hello"
+ * ```
+ */
+export class WaitingForValue<T = void> {
+  #value!: Option<T>;
+  #waitFuture?: Future<T>;
+  #waitValue!: () => Promise<T>;
+
+  /**
+   * Creates a new WaitingForValue instance.
+   *
+   * @param opts - Configuration options
+   */
+  constructor(opts: WaitingForValueProps<T> = {}) {
+    this.init(opts.presetValue);
+  }
+
+  /**
+   * Initializes or reinitializes the WaitingForValue with an optional preset value.
+   * If a preset value is provided and is Some, the value is immediately available.
+   * Otherwise, sets up the waiting mechanism for future value resolution.
+   *
+   * @param presetValue - Optional initial value
+   */
+  init(presetValue: Option<T> = Option.None()): void {
+    this.#value = presetValue;
+    if (this.#value.IsSome()) {
+      return this.setValue(this.#value);
+    }
+    const myFuture = (this.#waitFuture = new Future<T>());
+    const resolveOnce = new ResolveOnce<T>();
+    this.#waitValue = (): Promise<T> => resolveOnce.once(async () => myFuture.asPromise());
+  }
+
+  /**
+   * Sets the value and resolves all pending waiters.
+   * If called when no value exists, resolves the waiting Future.
+   * If called when a value already exists, updates the value and resets the waiting mechanism.
+   * Does nothing if the provided value is None.
+   *
+   * @param value - The value to set (wrapped in Option)
+   */
+  setValue(value: Option<T>): void {
+    if (value.IsNone()) {
+      return;
+    }
+    switch (true) {
+      case this.#value.IsNone():
+        // need to resolve waiters
+        this.#value = value;
+        this.#waitFuture?.resolve(value.unwrap());
+        break;
+      case this.#value.IsSome(): {
+        this.#value = value;
+        this.#waitFuture = undefined;
+        const resolveOnce = new ResolveOnce<T>();
+        this.#waitValue = (): Promise<T> => resolveOnce.once(() => Promise.resolve(value.unwrap()));
+        break;
+      }
+    }
+  }
+
+  /**
+   * Returns a promise that resolves when the value becomes available.
+   * If the value is already set, returns a promise that resolves immediately.
+   * Multiple calls to this method are safe and efficient - all callers share
+   * the same resolution logic thanks to ResolveOnce.
+   *
+   * @returns A promise that resolves to the value
+   */
+  waitValue(): Promise<T> {
+    return this.#waitValue();
+  }
+
+  value(): Option<T> {
+    return this.#value;
+  }
+}

package/ts/cjs/base-basic-sys-abstraction.test.js

@@ -2,32 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = require("./web-env/index.js");
 const index_js_2 = require("./cf-env/index.js");
-const runtime_js_1 = require("./runtime.js");
-const sys_abstraction_js_1 = require("./sys-abstraction.js");
 const index_js_3 = require("./node-env/index.js");
 const index_js_4 = require("./deno-env/index.js");
 const vitest_1 = require("vitest");
+const cement_1 = require("@adviser/cement");
 const add_cement_do_not_export_js_1 = require("./add-cement-do-not-export.js");
 const abstractions = [];
-if ((0, runtime_js_1.runtimeFn)().isCFWorker) {
+if ((0, cement_1.runtimeFn)().isCFWorker) {
     abstractions.push({
         name: "CFSysAbstraction",
         fn: (a) => (0, index_js_2.CFBasicSysAbstraction)((0, add_cement_do_not_export_js_1.addCement)(a)),
     });
 }
-if ((0, runtime_js_1.runtimeFn)().isNodeIsh) {
+if ((0, cement_1.runtimeFn)().isNodeIsh) {
     abstractions.push({
         name: "NodeSysAbstraction",
         fn: (a) => (0, index_js_3.NodeBasicSysAbstraction)((0, add_cement_do_not_export_js_1.addCement)(a)),
     });
 }
-if ((0, runtime_js_1.runtimeFn)().isDeno) {
+if ((0, cement_1.runtimeFn)().isDeno) {
     abstractions.push({
         name: "DenoSysAbstraction",
         fn: (a) => (0, index_js_4.DenoBasicSysAbstraction)((0, add_cement_do_not_export_js_1.addCement)(a)),
     });
 }
-if ((0, runtime_js_1.runtimeFn)().isBrowser) {
+if ((0, cement_1.runtimeFn)().isBrowser) {
     abstractions.push({
         name: "WebSysAbstraction",
         fn: (a) => (0, index_js_1.WebBasicSysAbstraction)((0, add_cement_do_not_export_js_1.addCement)(a)),
@@ -42,20 +41,20 @@ for (const abstraction of abstractions) {
             (0, vitest_1.expect)(id1).not.toEqual(id2);
         });
         (0, vitest_1.it)("IdService explict UUID", () => {
-            const sys = abstraction.fn({ IdMode: sys_abstraction_js_1.IDMode.UUID });
+            const sys = abstraction.fn({ IdMode: cement_1.IDMode.UUID });
             const id1 = sys.NextId();
             const id2 = sys.NextId();
             (0, vitest_1.expect)(id1).not.toEqual(id2);
         });
         (0, vitest_1.it)("IdService const", () => {
-            const sys = abstraction.fn({ IdMode: sys_abstraction_js_1.IDMode.CONST });
+            const sys = abstraction.fn({ IdMode: cement_1.IDMode.CONST });
             const id1 = sys.NextId();
             const id2 = sys.NextId();
             (0, vitest_1.expect)(id1).toEqual(id2);
         });
         (0, vitest_1.it)("IdService set", () => {
             for (let i = 0; i < 10; i++) {
-                const sys = abstraction.fn({ IdMode: sys_abstraction_js_1.IDMode.STEP });
+                const sys = abstraction.fn({ IdMode: cement_1.IDMode.STEP });
                 const id1 = sys.NextId();
                 const id2 = sys.NextId();
                 (0, vitest_1.expect)(id1).toEqual("STEPId-0");
@@ -69,25 +68,25 @@ for (const abstraction of abstractions) {
             (0, vitest_1.expect)(sys.Time().TimeSince(start)).toBeGreaterThan(90);
         });
         (0, vitest_1.it)("time sleep const", async () => {
-            const sys = abstraction.fn({ TimeMode: sys_abstraction_js_1.TimeMode.REAL });
+            const sys = abstraction.fn({ TimeMode: cement_1.TimeMode.REAL });
             const start = new Date();
             await sys.Time().Sleep(100);
             const end = new Date();
             (0, vitest_1.expect)(end.getTime() - start.getTime()).toBeGreaterThan(90);
         });
         (0, vitest_1.it)("time sleep step", async () => {
-            const sys = abstraction.fn({ TimeMode: sys_abstraction_js_1.TimeMode.STEP });
+            const sys = abstraction.fn({ TimeMode: cement_1.TimeMode.STEP });
             const start = sys.Time().Now();
             await sys.Time().Sleep(86400500);
             (0, vitest_1.expect)(sys.Time().Now().getTime() - start.getTime()).toEqual(86401500);
         });
         (0, vitest_1.it)("const random", () => {
-            const sys = abstraction.fn({ RandomMode: sys_abstraction_js_1.RandomMode.CONST });
+            const sys = abstraction.fn({ RandomMode: cement_1.RandomMode.CONST });
             (0, vitest_1.expect)(sys.Random0ToValue(10)).toEqual(5);
             (0, vitest_1.expect)(sys.Random0ToValue(10)).toEqual(5);
         });
         (0, vitest_1.it)("step random", () => {
-            const sys = abstraction.fn({ RandomMode: sys_abstraction_js_1.RandomMode.STEP });
+            const sys = abstraction.fn({ RandomMode: cement_1.RandomMode.STEP });
             (0, vitest_1.expect)(sys.Random0ToValue(10000)).toEqual(1);
             (0, vitest_1.expect)(sys.Random0ToValue(10000)).toEqual(2);
         });

package/ts/cjs/base-basic-sys-abstraction.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-basic-sys-abstraction.test.js","sourceRoot":"","sources":["../../../src/base-basic-sys-abstraction.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-basic-sys-abstraction.test.js","sourceRoot":"","sources":["../../../src/base-basic-sys-abstraction.test.ts"],"names":[],"mappings":"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"}

package/ts/cjs/bin2text.test.js

@@ -1,37 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const bin2text_js_1 = require("./bin2text.js");
-it("bin2hex empty", () => {
-    expect((0, bin2text_js_1.bin2string)(new Uint8Array())).toEqual("");
+const vitest_1 = require("vitest");
+const cement_1 = require("@adviser/cement");
+(0, vitest_1.it)("bin2hex empty", () => {
+    (0, vitest_1.expect)((0, cement_1.bin2string)(new Uint8Array())).toEqual("");
 });
-it("bin2hex one", () => {
-    expect((0, bin2text_js_1.bin2string)(new Uint8Array([64]))).toBe("0000  40                                              @");
+(0, vitest_1.it)("bin2hex one", () => {
+    (0, vitest_1.expect)((0, cement_1.bin2string)(new Uint8Array([64]))).toBe("0000  40                                              @");
 });
-it("bin2hex 12", () => {
+(0, vitest_1.it)("bin2hex 12", () => {
     const collector = [];
-    (0, bin2text_js_1.bin2text)(new Uint8Array([1, 2, 3, 4, 4, 5, 6, 7, 8, 9, 0xa, 0xb, 0xc]), (line) => {
+    (0, cement_1.bin2text)(new Uint8Array([1, 2, 3, 4, 4, 5, 6, 7, 8, 9, 0xa, 0xb, 0xc]), (line) => {
         collector.push(line);
     });
-    expect(collector).toEqual(["0000  01 02 03 04 04 05 06 07 08 09 0a 0b 0c          ............."]);
+    (0, vitest_1.expect)(collector).toEqual(["0000  01 02 03 04 04 05 06 07 08 09 0a 0b 0c          ............."]);
 });
-it("bin2hex cut", () => {
+(0, vitest_1.it)("bin2hex cut", () => {
     const collector = [];
-    (0, bin2text_js_1.bin2text)(new Uint8Array(new Array(255).fill(1).map((_, i) => i)), (line) => {
+    (0, cement_1.bin2text)(new Uint8Array(new Array(255).fill(1).map((_, i) => i)), (line) => {
         collector.push(line);
     }, 52);
-    expect(collector).toEqual([
+    (0, vitest_1.expect)(collector).toEqual([
         "0000  00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f ................",
         "0010  10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f ................",
         "0020  20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f  !\"#$%&'()*+,-./",
         "00f0>>f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe    ...............",
     ]);
 });
-it("bin2hex long", () => {
+(0, vitest_1.it)("bin2hex long", () => {
     const collector = [];
-    (0, bin2text_js_1.bin2text)(new Uint8Array(new Array(256).fill(1).map((_, i) => i % 0xff)), (line) => {
+    (0, cement_1.bin2text)(new Uint8Array(new Array(256).fill(1).map((_, i) => i % 0xff)), (line) => {
         collector.push(line);
     });
-    expect(collector).toEqual([
+    (0, vitest_1.expect)(collector).toEqual([
         "0000  00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f ................",
         "0010  10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f ................",
         "0020  20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f  !\"#$%&'()*+,-./",

package/ts/cjs/bin2text.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"bin2text.test.js","sourceRoot":"","sources":["../../../src/bin2text.test.ts"],"names":[],"mappings":";;AAAA,+CAAqD;AAErD,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC;IACxB,MAAM,CAAC,IAAA,wBAAU,EAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAAA,CAClD,CAAC,CAAC;AAEH,EAAE,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC;IACtB,MAAM,CAAC,IAAA,wBAAU,EAAC,IAAI,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;AAAA,CAC1G,CAAC,CAAC;AAEH,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC;IACrB,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,IAAA,sBAAQ,EAAC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QAChF,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAAA,CACtB,CAAC,CAAC;IACH,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,qEAAqE,CAAC,CAAC,CAAC;AAAA,CACpG,CAAC,CAAC;AAEH,EAAE,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC;IACtB,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,IAAA,sBAAQ,EACN,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EACvD,CAAC,IAAI,EAAE,EAAE,CAAC;QACR,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAAA,CACtB,EACD,EAAE,CACH,CAAC;IACF,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC;QACxB,wEAAwE;QACxE,wEAAwE;QACxE,yEAAyE;QACzE,uEAAuE;KACxE,CAAC,CAAC;AAAA,CACJ,CAAC,CAAC;AAEH,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC;IACvB,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,IAAA,sBAAQ,EAAC,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACjF,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAAA,CACtB,CAAC,CAAC;IACH,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC;QACxB,wEAAwE;QACxE,wEAAwE;QACxE,yEAAyE;QACzE,wEAAwE;QACxE,wEAAwE;QACxE,yEAAyE;QACzE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;KACzE,CAAC,CAAC;AAAA,CACJ,CAAC,CAAC"}
+{"version":3,"file":"bin2text.test.js","sourceRoot":"","sources":["../../../src/bin2text.test.ts"],"names":[],"mappings":";;AAAA,mCAAoC;AACpC,4CAAuD;AAEvD,IAAA,WAAE,EAAC,eAAe,EAAE,GAAG,EAAE,CAAC;IACxB,IAAA,eAAM,EAAC,IAAA,mBAAU,EAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAAA,CAClD,CAAC,CAAC;AAEH,IAAA,WAAE,EAAC,aAAa,EAAE,GAAG,EAAE,CAAC;IACtB,IAAA,eAAM,EAAC,IAAA,mBAAU,EAAC,IAAI,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;AAAA,CAC1G,CAAC,CAAC;AAEH,IAAA,WAAE,EAAC,YAAY,EAAE,GAAG,EAAE,CAAC;IACrB,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,IAAA,iBAAQ,EAAC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QAChF,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAAA,CACtB,CAAC,CAAC;IACH,IAAA,eAAM,EAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,qEAAqE,CAAC,CAAC,CAAC;AAAA,CACpG,CAAC,CAAC;AAEH,IAAA,WAAE,EAAC,aAAa,EAAE,GAAG,EAAE,CAAC;IACtB,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,IAAA,iBAAQ,EACN,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EACvD,CAAC,IAAI,EAAE,EAAE,CAAC;QACR,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAAA,CACtB,EACD,EAAE,CACH,CAAC;IACF,IAAA,eAAM,EAAC,SAAS,CAAC,CAAC,OAAO,CAAC;QACxB,wEAAwE;QACxE,wEAAwE;QACxE,yEAAyE;QACzE,uEAAuE;KACxE,CAAC,CAAC;AAAA,CACJ,CAAC,CAAC;AAEH,IAAA,WAAE,EAAC,cAAc,EAAE,GAAG,EAAE,CAAC;IACvB,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,IAAA,iBAAQ,EAAC,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;QACjF,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAAA,CACtB,CAAC,CAAC;IACH,IAAA,eAAM,EAAC,SAAS,CAAC,CAAC,OAAO,CAAC;QACxB,wEAAwE;QACxE,wEAAwE;QACxE,yEAAyE;QACzE,wEAAwE;QACxE,wEAAwE;QACxE,yEAAyE;QACzE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;QACxE,wEAAwE;KACzE,CAAC,CAAC;AAAA,CACJ,CAAC,CAAC"}