@adviser/cement 0.2.17 → 0.2.19

package/index.js

@@ -1,27 +1,40 @@
+import {
+  ConsoleWriterStream,
+  FanoutWriteStream,
+  utils_exports
+} from "./chunk-AO7BGISE.js";
 import {
   WebSysAbstraction
-} from "./chunk-XJF7FQUN.js";
+} from "./chunk-2L33RPFJ.js";
 import {
+  BaseSysAbstraction,
   BrowserEnvActions,
+  ConstTime,
   EnvImpl,
   Future,
   IDMode,
+  IdService,
   Keyed,
   KeyedResolvOnce,
   KeyedResolvSeq,
   RandomMode,
+  RandomService,
   ResolveOnce,
   ResolveSeq,
+  StepTime,
   String2TimeMode,
+  SysTime,
   Time,
+  TimeFactory,
   TimeMode,
   TimeUnits,
+  WrapperSysAbstraction,
   envFactory
-} from "./chunk-O4F5AURC.js";
+} from "./chunk-JYUQZNDZ.js";
 import {
   __spreadValues,
   __yieldStar
-} from "./chunk-J2IM7FHM.js";
+} from "./chunk-I4NUGWZ6.js";
 
 // src/logger.ts
 var Level = /* @__PURE__ */ ((Level2) => {
@@ -110,34 +123,100 @@ function falsy2undef(value) {
 }
 function ensureURLWithDefaultProto(url, defaultProtocol) {
   if (!url) {
-    return new URL(`${defaultProtocol}//`);
+    return new MutableURL(`${defaultProtocol}//`);
   }
   if (typeof url === "string") {
     try {
-      return new URL(url);
+      return new MutableURL(url);
     } catch (e) {
-      return new URL(`${defaultProtocol}//${url}`);
+      return new MutableURL(`${defaultProtocol}//${url}`);
     }
   } else {
-    return url;
+    return new MutableURL(url.toString());
   }
 }
 function isURL(value) {
   return value instanceof URL || !!value && typeof value.searchParams === "object" && typeof value.searchParams.sort === "function" && typeof value.hash === "string";
 }
+var MutableURL = class _MutableURL extends URL {
+  constructor(urlStr) {
+    super("defect://does.not.exist");
+    this._sysURL = new URL(urlStr);
+    this._protocol = this._sysURL.protocol;
+    this._hasHostpart = ["http:", "https:"].includes(this._protocol);
+    if (this._hasHostpart) {
+      this._pathname = this._sysURL.pathname;
+    } else {
+      this._pathname = urlStr.replace(new RegExp(`^${this._protocol}//`), "").replace(/[#?].*$/, "");
+    }
+    this.hash = this._sysURL.hash;
+  }
+  clone() {
+    return new _MutableURL(this.toString());
+  }
+  get hostname() {
+    if (!this._hasHostpart) {
+      throw new Error("you can use hostname only if protocol is http or https");
+    }
+    return this._sysURL.hostname;
+  }
+  set hostname(h) {
+    if (!this._hasHostpart) {
+      throw new Error("you can use hostname only if protocol is http or https");
+    }
+    this._sysURL.hostname = h;
+  }
+  set pathname(p) {
+    this._pathname = p;
+  }
+  get pathname() {
+    return this._pathname;
+  }
+  get protocol() {
+    return this._protocol;
+  }
+  set protocol(p) {
+    if (!p.endsWith(":")) {
+      p = `${p}:`;
+    }
+    this._protocol = p;
+  }
+  get searchParams() {
+    return this._sysURL.searchParams;
+  }
+  toString() {
+    let search = "";
+    if (this._sysURL.searchParams.size) {
+      for (const [key, value] of Array.from(this._sysURL.searchParams.entries()).sort((a, b) => a[0].localeCompare(b[0]))) {
+        search += `${!search.length ? "?" : "&"}${key}=${encodeURIComponent(value)}`;
+      }
+    }
+    let hostpart = "";
+    if (this._hasHostpart) {
+      hostpart = this._sysURL.hostname;
+      if (this._sysURL.port) {
+        hostpart += `:${this._sysURL.port}`;
+      }
+      if (!this._pathname.startsWith("/")) {
+        hostpart += "/";
+      }
+    }
+    return `${this._protocol}//${hostpart}${this._pathname}${search}`;
+  }
+};
 function from(fac, strURLUri, defaultProtocol) {
   switch (typeof falsy2undef(strURLUri)) {
     case "undefined":
-      return fac(new URL(`${defaultProtocol}//`));
+      return fac(new MutableURL(`${defaultProtocol}///`));
     case "string":
       return fac(ensureURLWithDefaultProto(strURLUri, defaultProtocol));
     case "object":
       if (BuildURI.is(strURLUri)) {
-        return fac(new URL(strURLUri._url.toString()));
+        return fac(new MutableURL(strURLUri._url.toString()));
       } else if (URI.is(strURLUri)) {
-        return fac(new URL(strURLUri._url.toString()));
+        return fac(new MutableURL(strURLUri._url.toString()));
       } else if (isURL(strURLUri)) {
-        return fac(new URL(strURLUri.toString()));
+        return fac(new MutableURL(strURLUri.toString()));
       }
       throw new Error(`unknown object type: ${strURLUri}`);
     default:
@@ -159,46 +238,38 @@ var BuildURI = class _BuildURI {
     this._url.hostname = h;
     return this;
   }
-  password(p) {
-    this._url.password = p;
-    return this;
-  }
-  port(p) {
-    this._url.port = p;
-    return this;
-  }
-  username(u) {
-    this._url.username = u;
-    return this;
-  }
-  search(s) {
-    this._url.search = s;
-    return this;
-  }
+  // password(p: string) {
+  //   this._url.password = p;
+  //   return this;
+  // }
+  // port(p: string) {
+  //   this._url.port = p;
+  //   return this;
+  // }
+  // username(u: string) {
+  //   this._url.username = u;
+  //   return this;
+  // }
+  // search(s: string) {
+  //   this._url.search = s;
+  //   return this;
+  // }
   protocol(p) {
-    if (!p.endsWith(":")) {
-      p = `${p}:`;
-    }
-    const mySrc = this._url.toString();
-    const myDst = mySrc.replace(new RegExp(`^${this._url.protocol}`), `${p}`);
-    this._url = new URL(myDst);
+    this._url.protocol = p;
     return this;
   }
   pathname(p) {
-    const myp = this.URI().pathname;
-    const mySrc = this._url.toString();
-    const myDst = mySrc.replace(new RegExp(`^${this._url.protocol}//${myp}`), `${this._url.protocol}//${p}`);
-    this._url = new URL(myDst);
-    return this;
-  }
-  hash(h) {
-    this._url.hash = h;
-    return this;
-  }
-  host(h) {
-    this._url.host = h;
+    this._url.pathname = p;
     return this;
   }
+  // hash(h: string) {
+  //   this._url.hash = h;
+  //   return this;
+  // }
+  // host(h: string) {
+  //   this._url.host = h;
+  //   return this;
+  // }
   delParam(key) {
     this._url.searchParams.delete(key);
     return this;
@@ -217,6 +288,9 @@ var BuildURI = class _BuildURI {
     this._url.searchParams.sort();
     return this._url.toString();
   }
+  toJSON() {
+    return this.toString();
+  }
   URI() {
     return URI.from(this._url);
   }
@@ -244,38 +318,38 @@ var URI = class _URI {
     return from((url) => new _URI(url), strURLUri, defaultProtocol);
   }
   constructor(url) {
-    this._url = url;
+    this._url = url.clone();
   }
   build() {
-    return BuildURI.from(this.asURL());
+    return BuildURI.from(this._url);
   }
   get hostname() {
     return this._url.hostname;
   }
-  get password() {
-    return this._url.password;
-  }
-  get port() {
-    return this._url.port;
-  }
-  get username() {
-    return this._url.username;
-  }
-  get search() {
-    return this._url.search;
-  }
+  // get password(): string {
+  //   return this._url.password;
+  // }
+  // get port(): string {
+  //   return this._url.port;
+  // }
+  // get username(): string {
+  //   return this._url.username;
+  // }
+  // get search(): string {
+  //   return this._url.search;
+  // }
   get protocol() {
     return this._url.protocol;
   }
   get pathname() {
     return this._url.toString().replace(/^.*:\/\//, "").replace(/\?.*$/, "");
   }
-  get hash() {
-    return this._url.hash;
-  }
-  get host() {
-    return this._url.host;
-  }
+  // get hash(): string {
+  //   return this._url.hash;
+  // }
+  // get host(): string {
+  //   return this._url.host;
+  // }
   get getParams() {
     return this._url.searchParams.entries();
   }
@@ -286,17 +360,17 @@ var URI = class _URI {
     return falsy2undef(this._url.searchParams.get(key));
   }
   clone() {
-    return new _URI(this.asURL());
+    return new _URI(this._url);
   }
   asURL() {
-    const url = new URL(this._url.toString());
-    url.searchParams.sort();
-    return url;
+    return this._url.clone();
   }
   toString() {
-    this._url.searchParams.sort();
     return this._url.toString();
   }
+  toJSON() {
+    return this.toString();
+  }
 };
 
 // src/runtime.ts
@@ -322,7 +396,7 @@ function runtimeFn() {
   };
 }
 
-// src/logger_impl.ts
+// src/logger-impl.ts
 var encoder = new TextEncoder();
 var LevelHandlerImpl = class {
   constructor() {
@@ -466,68 +540,6 @@ function toLogValue(lop) {
   }
   return lop;
 }
-var ConsoleWriterStreamDefaultWriter = class {
-  constructor(stream) {
-    this.stream = stream;
-    this.desiredSize = null;
-    this.decoder = new TextDecoder();
-    this._stream = stream;
-    this.ready = Promise.resolve(void 0);
-    this.closed = Promise.resolve(void 0);
-  }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any
-  abort(reason) {
-    throw new Error("Method not implemented.");
-  }
-  async close() {
-  }
-  releaseLock() {
-    this._stream.locked = false;
-    this.ready = Promise.resolve(void 0);
-    this.closed = Promise.resolve(void 0);
-  }
-  async write(chunk) {
-    const str = this.decoder.decode(chunk).trimEnd();
-    let output = "log";
-    try {
-      const decode = JSON.parse(str);
-      output = decode.level;
-    } catch (e) {
-    }
-    switch (output) {
-      case "error":
-        console.error(str);
-        break;
-      case "warn":
-        console.warn(str);
-        break;
-      default:
-        console.log(str);
-    }
-  }
-};
-var ConsoleWriterStream = class {
-  constructor() {
-    this.locked = false;
-  }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars
-  abort(reason) {
-    throw new Error("Method not implemented.");
-  }
-  async close() {
-    return;
-  }
-  getWriter() {
-    if (this.locked) {
-      throw new Error("Stream is locked");
-    }
-    this.locked = true;
-    if (!this._writer) {
-      this._writer = new ConsoleWriterStreamDefaultWriter(this);
-    }
-    return this._writer;
-  }
-};
 var LoggerImpl = class _LoggerImpl {
   // readonly _id: string = "logger-" + Math.random().toString(36)
   constructor(params) {
@@ -572,6 +584,17 @@ var LoggerImpl = class _LoggerImpl {
       this._levelHandler = levelSingleton;
     }
   }
+  Attributes() {
+    return Array.from(Object.entries(this._attributes)).reduce(
+      (acc, [key, value]) => {
+        if (value instanceof LogValue) {
+          acc[key] = value.value();
+        }
+        return acc;
+      },
+      {}
+    );
+  }
   SetExposeStack(enable) {
     this._levelHandler.setExposeStack(enable);
     return this;
@@ -595,7 +618,7 @@ var LoggerImpl = class _LoggerImpl {
     return this;
   }
   Timestamp() {
-    this._attributes["ts"] = logValue(this._sys.Time().Now().toISOString());
+    this._attributes["ts"] = logValue(() => this._sys.Time().Now().toISOString());
     return this;
   }
   Warn() {
@@ -712,18 +735,11 @@ var LoggerImpl = class _LoggerImpl {
     return ret;
   }
   _produceError(attr, ...args) {
-    var _a;
     attr["msg"] = logValue(args.join(" "));
     const msg = attr["msg"].value();
     if (typeof msg === "string" && !msg.trim().length) {
       delete attr["msg"];
     }
-    if (((_a = toLogValue(attr["ts"])) == null ? void 0 : _a.value()) === "ETERNITY") {
-      this.Timestamp.call({
-        _sys: this._sys,
-        _attributes: attr
-      });
-    }
     return JSON.stringify(attr, removeSelfRef());
   }
   Msg(...args) {
@@ -755,6 +771,9 @@ var WithLoggerBuilder = class {
     Object.assign(this._li._withAttributes, this._li._attributes);
     return this._li;
   }
+  Attributes() {
+    return __spreadValues({}, this._li._attributes);
+  }
   SetExposeStack(enable) {
     this._li._levelHandler.setExposeStack(enable);
     return this;
@@ -836,7 +855,7 @@ var WithLoggerBuilder = class {
     return this;
   }
   Timestamp() {
-    this._li._attributes["ts"] = logValue("ETERNITY");
+    this._li.Timestamp();
     return this;
   }
   Any(key, value) {
@@ -853,8 +872,8 @@ var WithLoggerBuilder = class {
   }
 };
 
-// src/test/log_collector.ts
-var LogWriterCollector = class {
+// src/test/log-write-stream.ts
+var LogWriteStream = class {
   constructor(bufferArr) {
     this._resolveClosed = new Future();
     this.closed = this._resolveClosed.asPromise();
@@ -879,30 +898,6 @@ var LogWriterCollector = class {
     return Promise.resolve(void 0);
   }
 };
-var FanoutWriter = class {
-  constructor(writers) {
-    this.desiredSize = null;
-    this._writers = writers;
-    this.ready = Promise.all(this._writers.map((w) => w.ready)).then(() => void 0);
-    this.closed = Promise.all(this._writers.map((w) => w.closed)).then(() => void 0);
-  }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  abort(reason) {
-    return Promise.all(this._writers.map((w) => w.abort(reason))).then(() => {
-    });
-  }
-  close() {
-    return Promise.all(this._writers.map((w) => w.close())).then(() => {
-    });
-  }
-  releaseLock() {
-    this._writers.map((w) => w.releaseLock());
-  }
-  write(chunk) {
-    return Promise.all(this._writers.map((w) => w.write(chunk))).then(() => {
-    });
-  }
-};
 var LogCollector = class {
   constructor(pass) {
     this.locked = false;
@@ -923,11 +918,11 @@ var LogCollector = class {
   }
   getWriter() {
     if (!this._writer) {
-      const dests = [new LogWriterCollector(this._bufferArr)];
+      const dests = [new LogWriteStream(this._bufferArr)];
       if (this._pass) {
         dests.push(this._pass);
       }
-      this._writer = new FanoutWriter(dests);
+      this._writer = new FanoutWriteStream(dests);
     }
     return this._writer;
   }
@@ -952,7 +947,7 @@ var LogCollector = class {
   }
 };
 
-// src/test/mock_logger.ts
+// src/test/mock-logger.ts
 function MockLogger(params) {
   const lc = new LogCollector(params == null ? void 0 : params.pass);
   let modNames = ["MockLogger"];
@@ -1119,12 +1114,14 @@ function toCryptoRuntime(cryptoOpts = {}) {
   return runtime;
 }
 export {
+  BaseSysAbstraction,
   BrowserEnvActions,
   BuildURI,
+  ConstTime,
   EnvImpl,
-  FanoutWriter,
   Future,
   IDMode,
+  IdService,
   IsLogger,
   Keyed,
   KeyedResolvOnce,
@@ -1133,30 +1130,37 @@ export {
   LevelHandlerImpl,
   LogCollector,
   LogValue,
-  LogWriterCollector,
+  LogWriteStream,
   LogWriterStream,
   LoggerImpl,
   MockLogger,
+  MutableURL,
   None,
   Option,
   RandomMode,
+  RandomService,
   ResolveOnce,
   ResolveSeq,
   Result,
   ResultError,
   ResultOK,
   Some,
+  StepTime,
   String2TimeMode,
+  SysTime,
   Time,
+  TimeFactory,
   TimeMode,
   TimeUnits,
   URI,
+  WrapperSysAbstraction,
   asyncLogValue,
   envFactory,
   isURL,
   logValue,
   removeSelfRef,
   runtimeFn,
-  toCryptoRuntime
+  toCryptoRuntime,
+  utils_exports as utils
 };
 //# sourceMappingURL=index.js.map