@adviser/cement 0.4.80 → 0.4.81

package/esm/utils/rebuffer.test.js

@@ -1,20 +1,20 @@
-import { rebuffer, rebufferArray } from "./rebuffer.js";
+import { utils } from "@adviser/cement";
 import { receiveFromStream, sendToStream } from "./stream-test-helper.js";
 it("rechunk empty", async () => {
-    const chunks = await rebufferArray([], 10);
+    const chunks = await utils.rebufferArray([], 10);
     expect(chunks.length).toEqual(0);
 });
 it("rechunk 0 size", async () => {
-    const chunks = await rebufferArray([new Uint8Array(0)], 10);
+    const chunks = await utils.rebufferArray([new Uint8Array(0)], 10);
     expect(chunks.length).toEqual(0);
 });
 it("rechunk smaller 10", async () => {
-    const chunks = await rebufferArray([new Uint8Array(3)], 10);
+    const chunks = await utils.rebufferArray([new Uint8Array(3)], 10);
     expect(chunks.length).toEqual(1);
     expect(chunks[0].length).toEqual(3);
 });
 it("rechunk smaller 10 pack smaller chunks", async () => {
-    const chunks = await rebufferArray(Array(7)
+    const chunks = await utils.rebufferArray(Array(7)
         .fill(0)
         .map((_, i) => {
         const o = new Uint8Array(3);
@@ -32,7 +32,7 @@ it("rechunk smaller 10 pack smaller chunks", async () => {
     expect(Array.from(chunks[2]).map((i) => i)).toEqual([20]);
 });
 it("rechunk smaller 10 pack bigger chunks", async () => {
-    const chunks = await rebufferArray(Array(3)
+    const chunks = await utils.rebufferArray(Array(3)
         .fill(0)
         .map((_, i) => {
         const o = new Uint8Array(11);
@@ -61,7 +61,7 @@ describe("test streaming through rebuffer", () => {
     const reBufferSize = 11;
     it("does rebuffer respect backpressure", async () => {
         const ts = new TransformStream(undefined, undefined, { highWaterMark: 2 });
-        const reb = rebuffer(ts.readable, reBufferSize);
+        const reb = utils.rebuffer(ts.readable, reBufferSize);
         await Promise.all([receiveFromStream(reb, state), sendToStream(ts.writable, state)]);
         expect(state.CollectorFn).toBeCalledTimes(~~((state.sendChunkSize * state.sendChunks) / reBufferSize) + 1 + 1);
         expect(state.CollectorFn.mock.calls.slice(-1)[0][0].done).toBeTruthy();

package/esm/utils/rebuffer.test.js.map

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

package/esm/utils/stream-map.test.js

@@ -1,7 +1,7 @@
-import { array2stream, devnull, stream2array, streamMap } from "./stream-map.js";
+import { utils } from "@adviser/cement";
 import { receiveFromStream, sendToStream } from "./stream-test-helper.js";
 it("array2stream", async () => {
-    const as = array2stream([1, 2, 3]);
+    const as = utils.array2stream([1, 2, 3]);
     let i = 0;
     const reader = as.getReader();
     while (true) {
@@ -13,7 +13,7 @@ it("array2stream", async () => {
     }
 });
 it("stream2array", async () => {
-    const as = await stream2array(new ReadableStream({
+    const as = await utils.stream2array(new ReadableStream({
         start(controller) {
             controller.enqueue(1);
             controller.enqueue(2);
@@ -24,14 +24,14 @@ it("stream2array", async () => {
     expect(as).toEqual([1, 2, 3]);
 });
 it("devnull", async () => {
-    const cnt = await devnull(streamMap(array2stream([1, 2, 3]), {
+    const cnt = await utils.devnull(utils.streamMap(utils.array2stream([1, 2, 3]), {
         Map: (i, idx) => (idx + 1) * 10 + i + 1,
     }));
     expect(cnt).toBe(3);
 });
 it("stream_map", async () => {
     const closeFn = vitest.fn();
-    const s = await stream2array(streamMap(array2stream([1, 2, 3]), {
+    const s = await utils.stream2array(utils.streamMap(utils.array2stream([1, 2, 3]), {
         Map: (i, idx) => (idx + 1) * 10 + i + 1,
         Close: closeFn,
     }));
@@ -40,7 +40,7 @@ it("stream_map", async () => {
 });
 it("stream_map async", async () => {
     const closeFn = vitest.fn();
-    const s = await stream2array(streamMap(array2stream([1, 2, 3]), {
+    const s = await utils.stream2array(utils.streamMap(utils.array2stream([1, 2, 3]), {
         Map: (i, idx) => Promise.resolve((idx + 1) * 10 + i + 1),
         Close: closeFn,
     }));
@@ -48,7 +48,7 @@ it("stream_map async", async () => {
     expect(s).toEqual([12, 23, 34]);
 });
 it("map types", async () => {
-    const oo = await stream2array(streamMap(array2stream([1, 2, 3]), {
+    const oo = await utils.stream2array(utils.streamMap(utils.array2stream([1, 2, 3]), {
         Map: (chunk, idx) => {
             return "[" + chunk + "/" + idx + "]";
         },
@@ -64,7 +64,7 @@ describe("test streaming through streamMap", () => {
     };
     it("does streamMap respect backpressure", async () => {
         const ts = new TransformStream(undefined, undefined, { highWaterMark: 2 });
-        const reb = streamMap(ts.readable, {
+        const reb = utils.streamMap(ts.readable, {
             Map: (chunk) => {
                 for (let i = 0; i < chunk.length; i++) {
                     chunk[i] = (chunk[i] + 1) % 256;

package/esm/utils/stream-map.test.js.map

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

package/esm/utils/stream2string.test.js

@@ -1,4 +1,4 @@
-import { TxtEnDecoderSingleton } from "@adviser/cement";
+import { TxtEnDecoderSingleton } from "../txt-en-decoder.js";
 import { stream2string } from "./stream2string.js";
 it("stream2string", async () => {
     expect(await stream2string(new ReadableStream({

package/esm/utils/stream2string.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream2string.test.js","sourceRoot":"","sources":["../../../../src/utils/stream2string.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,EAAE,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC;IAC9B,MAAM,CACJ,MAAM,aAAa,CACjB,IAAI,cAAc,CAAC;QACjB,KAAK,CAAC,UAAU,EAAQ;YACtB,MAAM,OAAO,GAAG,qBAAqB,EAAE,CAAC;YACxC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5C,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACxC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5C,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACxC,UAAU,CAAC,KAAK,EAAE,CAAC;QAAA,CACpB;KACF,CAAC,CACH,CACF,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;AAAA,CACxB,CAAC,CAAC;AAEH,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE,CAAC;IACtC,MAAM,KAAK,GAAG,cAAc,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,CACJ,MAAM,aAAa,CACjB,IAAI,cAAc,CAAC;YACjB,KAAK,CAAC,UAAU,EAAQ;gBACtB,MAAM,OAAO,GAAG,qBAAqB,EAAE,CAAC;gBACxC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC5C,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBACxC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC5C,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBACxC,UAAU,CAAC,KAAK,EAAE,CAAC;YAAA,CACpB;SACF,CAAC,EACF,CAAC,CACF,CACF,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;AAAA,CACF,CAAC,CAAC"}
+{"version":3,"file":"stream2string.test.js","sourceRoot":"","sources":["../../../../src/utils/stream2string.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,EAAE,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC;IAC9B,MAAM,CACJ,MAAM,aAAa,CACjB,IAAI,cAAc,CAAC;QACjB,KAAK,CAAC,UAAU,EAAQ;YACtB,MAAM,OAAO,GAAG,qBAAqB,EAAE,CAAC;YACxC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5C,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACxC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5C,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACxC,UAAU,CAAC,KAAK,EAAE,CAAC;QAAA,CACpB;KACF,CAAC,CACH,CACF,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;AAAA,CACxB,CAAC,CAAC;AAEH,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE,CAAC;IACtC,MAAM,KAAK,GAAG,cAAc,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,CACJ,MAAM,aAAa,CACjB,IAAI,cAAc,CAAC;YACjB,KAAK,CAAC,UAAU,EAAQ;gBACtB,MAAM,OAAO,GAAG,qBAAqB,EAAE,CAAC;gBACxC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC5C,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBACxC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC5C,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBACxC,UAAU,CAAC,KAAK,EAAE,CAAC;YAAA,CACpB;SACF,CAAC,EACF,CAAC,CACF,CACF,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;AAAA,CACF,CAAC,CAAC"}

package/esm/utils/string2stream.test.js

@@ -1,7 +1,6 @@
-import { stream2string } from "./stream2string.js";
-import { string2stream } from "./string2stream.js";
+import { utils } from "@adviser/cement";
 it("string2stream", async () => {
-    const inStr = string2stream("Hello World!");
-    expect(await stream2string(inStr)).toBe("Hello World!");
+    const inStr = utils.string2stream("Hello World!");
+    expect(await utils.stream2string(inStr)).toBe("Hello World!");
 });
 //# sourceMappingURL=string2stream.test.js.map

package/esm/utils/string2stream.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"string2stream.test.js","sourceRoot":"","sources":["../../../../src/utils/string2stream.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,EAAE,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC;IAC9B,MAAM,KAAK,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC;IAC5C,MAAM,CAAC,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;AAAA,CACzD,CAAC,CAAC"}
+{"version":3,"file":"string2stream.test.js","sourceRoot":"","sources":["../../../../src/utils/string2stream.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,EAAE,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC;IAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IAClD,MAAM,CAAC,MAAM,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;AAAA,CAC/D,CAAC,CAAC"}

package/esm/version.js

@@ -1,2 +1,2 @@
-export const VERSION = "0.4.80";
+export const VERSION = "0.4.81";
 //# sourceMappingURL=version.js.map

package/esm/web/index.d.ts

@@ -1,3 +1,2 @@
-export * from "./web-env-actions.js";
 export * from "./web-basic-sys-abstraction.js";
 //# sourceMappingURL=index.d.ts.map

package/esm/web/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/web/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,gCAAgC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/web/index.ts"],"names":[],"mappings":"AAAA,cAAc,gCAAgC,CAAC"}

package/esm/web/index.js

@@ -1,3 +1,2 @@
-export * from "./web-env-actions.js";
 export * from "./web-basic-sys-abstraction.js";
 //# sourceMappingURL=index.js.map

package/esm/web/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/web/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,gCAAgC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/web/index.ts"],"names":[],"mappings":"AAAA,cAAc,gCAAgC,CAAC"}

package/esm/web/web-basic-sys-abstraction.d.ts

@@ -1,3 +1,4 @@
-import type { WithCementWrapperSysAbstractionParams, BasicSysAbstraction } from "@adviser/cement";
-export declare function WebBasicSysAbstraction(param: WithCementWrapperSysAbstractionParams): BasicSysAbstraction;
+import { WrapperBasicSysAbstractionParams } from "../base-sys-abstraction.js";
+import { BasicSysAbstraction } from "../sys-abstraction.js";
+export declare function WebBasicSysAbstraction(param?: WrapperBasicSysAbstractionParams): BasicSysAbstraction;
 //# sourceMappingURL=web-basic-sys-abstraction.d.ts.map

package/esm/web/web-basic-sys-abstraction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web-basic-sys-abstraction.d.ts","sourceRoot":"","sources":["../../../../src/web/web-basic-sys-abstraction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qCAAqC,EAMrC,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AAoCzB,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,qCAAqC,GAAG,mBAAmB,CAWxG"}
+{"version":3,"file":"web-basic-sys-abstraction.d.ts","sourceRoot":"","sources":["../../../../src/web/web-basic-sys-abstraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,gCAAgC,EAAE,MAAM,4BAA4B,CAAC;AAEnI,OAAO,EAAuB,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AA4FjF,wBAAgB,sBAAsB,CAAC,KAAK,CAAC,EAAE,gCAAgC,GAAG,mBAAmB,CAUpG"}

package/esm/web/web-basic-sys-abstraction.js

@@ -1,20 +1,21 @@
+import { BaseBasicSysAbstraction, WrapperBasicSysAbstraction } from "../base-sys-abstraction.js";
+import { ResolveOnce } from "../resolve-once.js";
+import { envFactory } from "../sys-env.js";
+import { TxtEnDecoderSingleton } from "../txt-en-decoder.js";
+import { ConsoleWriterStream } from "../utils/console-write-stream.js";
 class WebSystemService {
     _txtEnDe;
-    _envFactory;
-    _stdoutFactory;
-    constructor(ende, envFactory, stdoutFactory) {
+    constructor(ende) {
         this._txtEnDe = ende;
-        this._envFactory = envFactory;
-        this._stdoutFactory = stdoutFactory;
     }
     Env() {
-        return this._envFactory();
+        return envFactory();
     }
     Args() {
         throw new Error("Args-Method not implemented.");
     }
     Stdout() {
-        return this._stdoutFactory();
+        return new ConsoleWriterStream();
     }
     Stderr() {
         const decoder = this._txtEnDe;
@@ -29,16 +30,15 @@ class WebSystemService {
         });
     }
 }
-let baseBasicSysAbstraction = undefined;
+const baseSysAbstraction = new ResolveOnce();
 export function WebBasicSysAbstraction(param) {
-    const ende = param.TxtEnDecoder ?? param.cement.TxtEnDecoderSingleton();
-    baseBasicSysAbstraction =
-        baseBasicSysAbstraction ??
-            new param.cement.BaseBasicSysAbstraction({
-                TxtEnDecoder: ende,
-            });
-    return new param.cement.WrapperBasicSysAbstraction(baseBasicSysAbstraction, {
-        basicRuntimeService: new WebSystemService(ende, param.cement.envFactory, () => new param.cement.ConsoleWriterStream()),
+    const my = baseSysAbstraction.once(() => {
+        return new BaseBasicSysAbstraction({
+            TxtEnDecoder: param?.TxtEnDecoder || TxtEnDecoderSingleton(),
+        });
+    });
+    return new WrapperBasicSysAbstraction(my, {
+        basicRuntimeService: new WebSystemService(param?.TxtEnDecoder ?? my._txtEnDe),
         ...param,
     });
 }

package/esm/web/web-basic-sys-abstraction.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-basic-sys-abstraction.js","sourceRoot":"","sources":["../../../../src/web/web-basic-sys-abstraction.ts"],"names":[],"mappings":"AAUA,MAAM,gBAAgB;IACX,QAAQ,CAAe;IACvB,WAAW,CAAa;IACxB,cAAc,CAAmC;IAC1D,YAAY,IAAkB,EAAE,UAAsB,EAAE,aAA+C,EAAE;QACvG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;IAAA,CACrC;IACD,GAAG,GAAQ;QACT,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IAAA,CAC3B;IACD,IAAI,GAAa;QACf,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAAA,CACjD;IACD,MAAM,GAA+B;QACnC,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;IAAA,CAC9B;IACD,MAAM,GAA+B;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,OAAO,IAAI,cAAc,CAAC;YACxB,KAAK,CAAC,KAAK,EAAiB;gBAC1B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;oBAC9B,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAEtC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;oBACjC,OAAO,EAAE,CAAC;gBAAA,CACX,CAAC,CAAC;YAAA,CACJ;SACF,CAAC,CAAC;IAAA,CACJ;CACF;AAED,IAAI,uBAAuB,GAAwC,SAAS,CAAC;AAC7E,MAAM,UAAU,sBAAsB,CAAC,KAA4C,EAAuB;IACxG,MAAM,IAAI,GAAG,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC;IACxE,uBAAuB;QACrB,uBAAuB;YACvB,IAAI,KAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC;gBACvC,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;IACL,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,0BAA0B,CAAC,uBAAuB,EAAE;QAC1E,mBAAmB,EAAE,IAAI,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC;QACtH,GAAG,KAAK;KACT,CAAC,CAAC;AAAA,CACJ"}
+{"version":3,"file":"web-basic-sys-abstraction.js","sourceRoot":"","sources":["../../../../src/web/web-basic-sys-abstraction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAAoC,MAAM,4BAA4B,CAAC;AACnI,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAO,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAgB,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAgDvE,MAAM,gBAAgB;IACX,QAAQ,CAAe;IAChC,YAAY,IAAkB,EAAE;QAC9B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IAAA,CACtB;IACD,GAAG,GAAQ;QACT,OAAO,UAAU,EAAE,CAAC;IAAA,CACrB;IACD,IAAI,GAAa;QACf,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAAA,CACjD;IACD,MAAM,GAA+B;QACnC,OAAO,IAAI,mBAAmB,EAAE,CAAC;IAAA,CAYlC;IACD,MAAM,GAA+B;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,OAAO,IAAI,cAAc,CAAC;YACxB,KAAK,CAAC,KAAK,EAAiB;gBAC1B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;oBAC9B,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAEtC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;oBACjC,OAAO,EAAE,CAAC;gBAAA,CACX,CAAC,CAAC;YAAA,CACJ;SACF,CAAC,CAAC;IAAA,CACJ;CACF;AAED,MAAM,kBAAkB,GAAG,IAAI,WAAW,EAA2B,CAAC;AACtE,MAAM,UAAU,sBAAsB,CAAC,KAAwC,EAAuB;IACpG,MAAM,EAAE,GAAG,kBAAkB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACvC,OAAO,IAAI,uBAAuB,CAAC;YACjC,YAAY,EAAE,KAAK,EAAE,YAAY,IAAI,qBAAqB,EAAE;SAC7D,CAAC,CAAC;IAAA,CACJ,CAAC,CAAC;IACH,OAAO,IAAI,0BAA0B,CAAC,EAAE,EAAE;QACxC,mBAAmB,EAAE,IAAI,gBAAgB,CAAC,KAAK,EAAE,YAAY,IAAI,EAAE,CAAC,QAAQ,CAAC;QAC7E,GAAG,KAAK;KACT,CAAC,CAAC;AAAA,CACJ"}

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

@@ -1,4 +1,4 @@
-import type { EnvActions, EnvFactoryOpts, Env } from "@adviser/cement";
+import { EnvActions, EnvFactoryOpts, Env } from "../sys-env.js";
 export declare class BrowserEnvActions implements EnvActions {
     readonly env: Map<string, string>;
     readonly opts: Partial<EnvFactoryOpts>;

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":"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"}
+{"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"}

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

@@ -1,10 +1,10 @@
-let once = undefined;
+import { ResolveOnce } from "../resolve-once.js";
+const once = new ResolveOnce();
 export class BrowserEnvActions {
     env = new Map();
     opts;
     static new(opts) {
-        once = once ?? new BrowserEnvActions(opts);
-        return once;
+        return once.once(() => new BrowserEnvActions(opts));
     }
     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":"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"}
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adviser/cement",
-  "version": "0.4.80",
+  "version": "0.4.81",
   "description": "better try/catch/finally handling",
   "main": "./cjs/index.js",
   "type": "module",
@@ -21,6 +21,11 @@
       "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",

package/src/base-sys-abstraction.ts

@@ -13,11 +13,9 @@ 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 "@adviser/cement/cf";
+import { CFBasicSysAbstraction } from "./cf/cf-basic-sys-abstraction.js";
 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.
@@ -327,11 +325,6 @@ 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.
  *
@@ -362,18 +355,17 @@ export type WithCementWrapperSysAbstractionParams = WithCement<Partial<BaseBasic
  * const id2 = testSys.NextId(); // "STEPId-1"
  * ```
  */
-
 export function BasicSysAbstractionFactory(params?: WrapperBasicSysAbstractionParams): BasicSysAbstraction {
   const fn = runtimeFn();
   switch (true) {
     case fn.isBrowser:
-      return WebBasicSysAbstraction(addCement(params));
+      return WebBasicSysAbstraction(params);
     case fn.isDeno:
-      return DenoBasicSysAbstraction(addCement(params));
+      return DenoBasicSysAbstraction(params);
     case fn.isCFWorker:
-      return CFBasicSysAbstraction(addCement(params));
+      return CFBasicSysAbstraction(params);
     case fn.isNodeIsh:
-      return NodeBasicSysAbstraction(addCement(params));
+      return NodeBasicSysAbstraction(params);
     default:
       throw new Error("Unknown runtime");
   }

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

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

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

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

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

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

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

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