@adviser/cement 0.3.7 → 0.3.9

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

@@ -2,7 +2,7 @@ import path from "node:path";
 import fs from "node:fs";
 import process from "node:process";
 import { FileService, NamedWritableStream } from "../file-service.js";
-import { TxtEnDecoder, Utf8EnDecoderSingleton } from "../txt-en-decoder.js";
+import { TxtEnDecoder, TxtEnDecoderSingleton } from "../txt-en-decoder.js";
 
 export class NodeFileService implements FileService {
   readonly baseDir: string;
@@ -57,7 +57,7 @@ export class NodeFileService implements FileService {
     return path.isAbsolute(fname);
   }
 
-  async writeFileString(fname: string, content: string, ende: TxtEnDecoder = Utf8EnDecoderSingleton()): Promise<void> {
+  async writeFileString(fname: string, content: string, ende: TxtEnDecoder = TxtEnDecoderSingleton()): Promise<void> {
     const o = await this.create(fname);
     const wr = o.stream.getWriter();
     await wr.write(ende.encode(content));

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

@@ -8,7 +8,7 @@ import {
 } from "../base-sys-abstraction.js";
 import { NodeFileService } from "./node-file-service.js";
 import { Env, envFactory } from "../sys-env.js";
-import { Utf8EnDecoderSingleton } from "../txt-en-decoder.js";
+import { TxtEnDecoderSingleton } from "../txt-en-decoder.js";
 import process from "node:process";
 
 export class NodeExitServiceImpl implements ExitService {
@@ -112,7 +112,7 @@ let my: BaseSysAbstraction | undefined = undefined;
 export function NodeSysAbstraction(param?: WrapperSysAbstractionParams): SysAbstraction {
   if (!my) {
     my = new BaseSysAbstraction({
-      TxtEnDecoder: param?.TxtEnDecoder || Utf8EnDecoderSingleton(),
+      TxtEnDecoder: param?.TxtEnDecoder || TxtEnDecoderSingleton(),
       FileSystem: new NodeFileService(),
       SystemService: new NodeSystemService(),
     });

package/src/resolve-once.ts

@@ -47,6 +47,7 @@ export class ResolveOnce<T, CTX = void> {
   _onceValue?: T;
   _onceError?: Error;
   _isPromise = false;
+  _inProgress?: Future<T>;
 
   readonly ctx: CTX;
 
@@ -63,7 +64,15 @@ export class ResolveOnce<T, CTX = void> {
     this._onceOk = false;
     this._onceValue = undefined;
     this._onceError = undefined;
-    this._onceFutures.length = 0;
+    if (this._inProgress) {
+      const idx = this._onceFutures.findIndex((f) => f === this._inProgress);
+      if (idx >= 0) {
+        // leave the current in progress future
+        this._onceFutures.push(...this._onceFutures.splice(2).slice(1));
+      }
+    } else {
+      this._onceFutures.length = 0;
+    }
   }
 
   // T extends Option<infer U> ? U : T
@@ -110,6 +119,7 @@ export class ResolveOnce<T, CTX = void> {
         }
         this._onceFutures.length = 0;
       };
+      this._inProgress = future;
       try {
         const ret = fn(this.ctx);
         if (typeof (ret as Promise<T>).then === "function") {
@@ -121,6 +131,7 @@ export class ResolveOnce<T, CTX = void> {
       } catch (e) {
         catchFn(e as Error);
       }
+      this._inProgress = undefined;
     }
     if (this._isPromise) {
       return future.asPromise() as unknown as R;

package/src/test/log-write-stream.ts

@@ -1,6 +1,6 @@
 import { FanoutWriteStream } from "../utils/fanout-write-stream.js";
 import { Future } from "../future.js";
-import { TxtEnDecoder, Utf8EnDecoderSingleton } from "../txt-en-decoder.js";
+import { TxtEnDecoder, TxtEnDecoderSingleton } from "../txt-en-decoder.js";
 
 export class LogWriteStream implements WritableStreamDefaultWriter<Uint8Array> {
   private readonly _bufferArr: Uint8Array[];
@@ -42,7 +42,7 @@ export class LogCollector implements WritableStream<Uint8Array> {
 
   constructor(pass?: WritableStreamDefaultWriter<Uint8Array>, txtEnDe?: TxtEnDecoder) {
     this._pass = pass;
-    this._txtEnDe = txtEnDe || Utf8EnDecoderSingleton();
+    this._txtEnDe = txtEnDe || TxtEnDecoderSingleton();
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars

package/src/txt-en-decoder.ts

@@ -10,7 +10,7 @@ export interface TxtEnDecoder {
   asyncDecode(input: AsyncToEnDecoder): Promise<string>;
 }
 
-class Utf8EnDecoder implements TxtEnDecoder {
+class TxtOps implements TxtEnDecoder {
   readonly encoder = new TextEncoder();
   readonly decoder = new TextDecoder();
 
@@ -43,8 +43,8 @@ class Utf8EnDecoder implements TxtEnDecoder {
   }
 }
 
-let utf8EnDecoder: TxtEnDecoder;
-export function Utf8EnDecoderSingleton(): TxtEnDecoder {
-  utf8EnDecoder = utf8EnDecoder ?? new Utf8EnDecoder();
-  return utf8EnDecoder;
+let txtEnDecoder: TxtEnDecoder;
+export function TxtEnDecoderSingleton(): TxtEnDecoder {
+  txtEnDecoder = txtEnDecoder ?? new TxtOps();
+  return txtEnDecoder;
 }

package/src/utils/string2stream.ts

@@ -1,6 +1,6 @@
-import { TxtEnDecoder, Utf8EnDecoderSingleton } from "../txt-en-decoder.js";
+import { TxtEnDecoder, TxtEnDecoderSingleton } from "../txt-en-decoder.js";
 
-export function string2stream(str: string, ende: TxtEnDecoder = Utf8EnDecoderSingleton()): ReadableStream<Uint8Array> {
+export function string2stream(str: string, ende: TxtEnDecoder = TxtEnDecoderSingleton()): ReadableStream<Uint8Array> {
   return uint8array2stream(ende.encode(str));
 }
 

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

@@ -2,7 +2,7 @@ import { BaseSysAbstraction, WrapperSysAbstraction, WrapperSysAbstractionParams
 import { FileService, NamedWritableStream } from "../file-service.js";
 import { SysAbstraction, SystemService, VoidFunc } from "../sys-abstraction.js";
 import { Env, envFactory } from "../sys-env.js";
-import { Utf8EnDecoderSingleton } from "../txt-en-decoder.js";
+import { TxtEnDecoderSingleton } from "../txt-en-decoder.js";
 
 export class WebFileService implements FileService {
   get baseDir(): string {
@@ -71,7 +71,7 @@ let my: BaseSysAbstraction | undefined = undefined;
 export function WebSysAbstraction(param?: WrapperSysAbstractionParams): SysAbstraction {
   if (!my) {
     my = new BaseSysAbstraction({
-      TxtEnDecoder: param?.TxtEnDecoder || Utf8EnDecoderSingleton(),
+      TxtEnDecoder: param?.TxtEnDecoder || TxtEnDecoderSingleton(),
       FileSystem: new WebFileService(),
       SystemService: new WebSystemService(),
     });

package/{sys-abstraction-B-0XMe9V.d.cts → sys-abstraction-3OXhCVsu.d.cts}

@@ -1,4 +1,4 @@
-import { K as KeysParam, R as Result } from './get-params-result-CXYbMEcV.cjs';
+import { K as KeysParam, R as Result } from './get-params-result-C2cbgB78.cjs';
 
 interface NamedWritableStream {
     readonly name: string;

package/{sys-abstraction-CZa-VyNs.d.ts → sys-abstraction-DXeSUn9x.d.ts}

@@ -1,4 +1,4 @@
-import { K as KeysParam, R as Result } from './get-params-result-CXYbMEcV.js';
+import { K as KeysParam, R as Result } from './get-params-result-C2cbgB78.js';
 
 interface NamedWritableStream {
     readonly name: string;

package/test/index.cjs

@@ -218,7 +218,7 @@ function coerceIntoUint8(raw) {
 }
 
 // src/txt-en-decoder.ts
-var Utf8EnDecoder = class {
+var TxtOps = class {
   constructor() {
     this.encoder = new TextEncoder();
     this.decoder = new TextDecoder();
@@ -249,10 +249,10 @@ var Utf8EnDecoder = class {
     return this.decode(resolved);
   }
 };
-var utf8EnDecoder;
-function Utf8EnDecoderSingleton() {
-  utf8EnDecoder = utf8EnDecoder != null ? utf8EnDecoder : new Utf8EnDecoder();
-  return utf8EnDecoder;
+var txtEnDecoder;
+function TxtEnDecoderSingleton() {
+  txtEnDecoder = txtEnDecoder != null ? txtEnDecoder : new TxtOps();
+  return txtEnDecoder;
 }
 
 // src/test/log-write-stream.ts
@@ -286,7 +286,7 @@ var LogCollector = class {
     this.locked = false;
     this._bufferArr = [];
     this._pass = pass;
-    this._txtEnDe = txtEnDe || Utf8EnDecoderSingleton();
+    this._txtEnDe = txtEnDe || TxtEnDecoderSingleton();
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   abort(reason) {
@@ -850,7 +850,14 @@ var ResolveOnce = class {
     this._onceOk = false;
     this._onceValue = void 0;
     this._onceError = void 0;
-    this._onceFutures.length = 0;
+    if (this._inProgress) {
+      const idx = this._onceFutures.findIndex((f) => f === this._inProgress);
+      if (idx >= 0) {
+        this._onceFutures.push(...this._onceFutures.splice(2).slice(1));
+      }
+    } else {
+      this._onceFutures.length = 0;
+    }
   }
   // T extends Option<infer U> ? U : T
   once(fn) {
@@ -893,6 +900,7 @@ var ResolveOnce = class {
         }
         this._onceFutures.length = 0;
       };
+      this._inProgress = future;
       try {
         const ret = fn(this.ctx);
         if (typeof ret.then === "function") {
@@ -904,6 +912,7 @@ var ResolveOnce = class {
       } catch (e) {
         catchFn(e);
       }
+      this._inProgress = void 0;
     }
     if (this._isPromise) {
       return future.asPromise();
@@ -1411,7 +1420,7 @@ var my = void 0;
 function WebSysAbstraction(param2) {
   if (!my) {
     my = new BaseSysAbstraction({
-      TxtEnDecoder: (param2 == null ? void 0 : param2.TxtEnDecoder) || Utf8EnDecoderSingleton(),
+      TxtEnDecoder: (param2 == null ? void 0 : param2.TxtEnDecoder) || TxtEnDecoderSingleton(),
       FileSystem: new WebFileService(),
       SystemService: new WebSystemService()
     });
@@ -2170,7 +2179,7 @@ var LoggerImpl = class _LoggerImpl {
       this._sys = params.sys;
     }
     if (!params.txtEnDe) {
-      this._txtEnDe = Utf8EnDecoderSingleton();
+      this._txtEnDe = TxtEnDecoderSingleton();
     } else {
       this._txtEnDe = params.txtEnDe;
     }