@adviser/cement 0.2.22 → 0.2.23

package/index.d.cts

@@ -4,8 +4,8 @@ export { i as utils } from './index-_GuS2IT4.cjs';
 import 'vitest';
 
 declare abstract class Result<T, E = Error> {
-    static Ok<T>(t: T): Result<T, Error>;
-    static Err<T extends Error = Error>(t: T | string): Result<never, T>;
+    static Ok<T = void>(t: T): Result<T, Error>;
+    static Err<T extends Error = Error>(t: T | string): Result<void, T>;
     static Is<T>(t: unknown): t is Result<T>;
     isOk(): boolean;
     isErr(): boolean;
@@ -33,6 +33,8 @@ declare class ResultError<T extends Error> extends Result<never, T> {
     unwrap_err(): T;
 }
 type WithoutResult<T> = T extends Result<infer U> ? U : T;
+type WithResult<T> = T extends Promise<infer U> ? Promise<Result<U>> : Result<T>;
+declare function exception2Result<FN extends () => Promise<T> | T, T>(fn: FN): WithResult<ReturnType<FN>>;
 
 type NullOrUndef = null | undefined;
 declare function isURL(value: unknown): value is URL;
@@ -44,6 +46,9 @@ declare class MutableURL extends URL {
     readonly hash: string;
     constructor(urlStr: string);
     clone(): MutableURL;
+    get host(): string;
+    get port(): string;
+    set port(p: string);
     get hostname(): string;
     set hostname(h: string);
     set pathname(p: string);
@@ -58,6 +63,7 @@ declare class BuildURI {
     private constructor();
     static is(value: unknown): value is BuildURI;
     static from(strURLUri?: CoerceURI, defaultProtocol?: string): BuildURI;
+    port(p: string): this;
     hostname(h: string): this;
     protocol(p: string): this;
     pathname(p: string): this;
@@ -69,14 +75,19 @@ declare class BuildURI {
     URI(): URI;
 }
 type CoerceURI = string | URI | MutableURL | URL | BuildURI | NullOrUndef;
+declare const protocols: Map<string, boolean>;
 declare class URI {
+    static protocolHasHostpart(protocol: string): () => void;
     static merge(into: CoerceURI, from: CoerceURI, defaultProtocol?: string): URI;
     static is(value: unknown): value is URI;
     static from(strURLUri?: CoerceURI, defaultProtocol?: string): URI;
+    static fromResult(strURLUri?: CoerceURI, defaultProtocol?: string): Result<URI>;
     readonly _url: MutableURL;
     private constructor();
     build(): BuildURI;
     get hostname(): string;
+    get port(): string;
+    get host(): string;
     get protocol(): string;
     get pathname(): string;
     get getParams(): Iterable<[string, string]>;
@@ -133,7 +144,7 @@ interface LoggerInterface<R> {
     Debug(): R;
     Log(): R;
     WithLevel(level: Level): R;
-    Err(err: unknown): R;
+    Err(err: unknown | Result<unknown> | Error): R;
     Info(): R;
     Timestamp(): R;
     Any(key: string, value: unknown): R;
@@ -209,7 +220,7 @@ declare class LoggerImpl implements Logger {
     Debug(): Logger;
     Error(): Logger;
     Info(): Logger;
-    Err(err: unknown): Logger;
+    Err(err: unknown | Result<unknown> | Error): Logger;
     WithLevel(l: Level): Logger;
     Ref(key: string, action: {
         toString: () => string;
@@ -424,4 +435,4 @@ interface CryptoRuntime {
 }
 declare function toCryptoRuntime(cryptoOpts?: Partial<CryptoRuntime>): CryptoRuntime;
 
-export { type AsError, BuildURI, type CTAesKeyAlgorithm, type CTAlgorithm, type CTAlgorithmIdentifier, type CTArrayBufferView, type CTBufferSource, type CTCryptoKey, type CTEcKeyImportParams, type CTHmacImportParams, type CTJsonWebKey, type CTKeyFormat, type CTKeyType, type CTKeyUsage, type CTNamedCurve, type CTRsaHashedImportParams, type CoerceURI, type CryptoRuntime, type FnSerialized, Future, IsLogger, Keyed, KeyedResolvOnce, KeyedResolvSeq, type Lengthed, Level, type LevelHandler, LevelHandlerImpl, LogCollector, type LogSerializable, LogValue, LogWriteStream, LogWriterStream, type Logger, LoggerImpl, type LoggerImplParams, type LoggerInterface, MockLogger, type MockLoggerReturn, MutableURL, None, Option, ResolveOnce, ResolveSeq, Result, ResultError, ResultOK, type Runtime, type Serialized, type SizeOrLength, type Sized, Some, SysAbstraction, URI, type WithLogger, type WithoutOption, type WithoutResult, asyncLogValue, isURL, logValue, removeSelfRef, runtimeFn, toCryptoRuntime };
+export { type AsError, BuildURI, type CTAesKeyAlgorithm, type CTAlgorithm, type CTAlgorithmIdentifier, type CTArrayBufferView, type CTBufferSource, type CTCryptoKey, type CTEcKeyImportParams, type CTHmacImportParams, type CTJsonWebKey, type CTKeyFormat, type CTKeyType, type CTKeyUsage, type CTNamedCurve, type CTRsaHashedImportParams, type CoerceURI, type CryptoRuntime, type FnSerialized, Future, IsLogger, Keyed, KeyedResolvOnce, KeyedResolvSeq, type Lengthed, Level, type LevelHandler, LevelHandlerImpl, LogCollector, type LogSerializable, LogValue, LogWriteStream, LogWriterStream, type Logger, LoggerImpl, type LoggerImplParams, type LoggerInterface, MockLogger, type MockLoggerReturn, MutableURL, None, Option, ResolveOnce, ResolveSeq, Result, ResultError, ResultOK, type Runtime, type Serialized, type SizeOrLength, type Sized, Some, SysAbstraction, URI, type WithLogger, type WithoutOption, type WithoutResult, asyncLogValue, exception2Result, isURL, logValue, protocols, removeSelfRef, runtimeFn, toCryptoRuntime };

package/index.d.ts

@@ -4,8 +4,8 @@ export { i as utils } from './index-_GuS2IT4.js';
 import 'vitest';
 
 declare abstract class Result<T, E = Error> {
-    static Ok<T>(t: T): Result<T, Error>;
-    static Err<T extends Error = Error>(t: T | string): Result<never, T>;
+    static Ok<T = void>(t: T): Result<T, Error>;
+    static Err<T extends Error = Error>(t: T | string): Result<void, T>;
     static Is<T>(t: unknown): t is Result<T>;
     isOk(): boolean;
     isErr(): boolean;
@@ -33,6 +33,8 @@ declare class ResultError<T extends Error> extends Result<never, T> {
     unwrap_err(): T;
 }
 type WithoutResult<T> = T extends Result<infer U> ? U : T;
+type WithResult<T> = T extends Promise<infer U> ? Promise<Result<U>> : Result<T>;
+declare function exception2Result<FN extends () => Promise<T> | T, T>(fn: FN): WithResult<ReturnType<FN>>;
 
 type NullOrUndef = null | undefined;
 declare function isURL(value: unknown): value is URL;
@@ -44,6 +46,9 @@ declare class MutableURL extends URL {
     readonly hash: string;
     constructor(urlStr: string);
     clone(): MutableURL;
+    get host(): string;
+    get port(): string;
+    set port(p: string);
     get hostname(): string;
     set hostname(h: string);
     set pathname(p: string);
@@ -58,6 +63,7 @@ declare class BuildURI {
     private constructor();
     static is(value: unknown): value is BuildURI;
     static from(strURLUri?: CoerceURI, defaultProtocol?: string): BuildURI;
+    port(p: string): this;
     hostname(h: string): this;
     protocol(p: string): this;
     pathname(p: string): this;
@@ -69,14 +75,19 @@ declare class BuildURI {
     URI(): URI;
 }
 type CoerceURI = string | URI | MutableURL | URL | BuildURI | NullOrUndef;
+declare const protocols: Map<string, boolean>;
 declare class URI {
+    static protocolHasHostpart(protocol: string): () => void;
     static merge(into: CoerceURI, from: CoerceURI, defaultProtocol?: string): URI;
     static is(value: unknown): value is URI;
     static from(strURLUri?: CoerceURI, defaultProtocol?: string): URI;
+    static fromResult(strURLUri?: CoerceURI, defaultProtocol?: string): Result<URI>;
     readonly _url: MutableURL;
     private constructor();
     build(): BuildURI;
     get hostname(): string;
+    get port(): string;
+    get host(): string;
     get protocol(): string;
     get pathname(): string;
     get getParams(): Iterable<[string, string]>;
@@ -133,7 +144,7 @@ interface LoggerInterface<R> {
     Debug(): R;
     Log(): R;
     WithLevel(level: Level): R;
-    Err(err: unknown): R;
+    Err(err: unknown | Result<unknown> | Error): R;
     Info(): R;
     Timestamp(): R;
     Any(key: string, value: unknown): R;
@@ -209,7 +220,7 @@ declare class LoggerImpl implements Logger {
     Debug(): Logger;
     Error(): Logger;
     Info(): Logger;
-    Err(err: unknown): Logger;
+    Err(err: unknown | Result<unknown> | Error): Logger;
     WithLevel(l: Level): Logger;
     Ref(key: string, action: {
         toString: () => string;
@@ -424,4 +435,4 @@ interface CryptoRuntime {
 }
 declare function toCryptoRuntime(cryptoOpts?: Partial<CryptoRuntime>): CryptoRuntime;
 
-export { type AsError, BuildURI, type CTAesKeyAlgorithm, type CTAlgorithm, type CTAlgorithmIdentifier, type CTArrayBufferView, type CTBufferSource, type CTCryptoKey, type CTEcKeyImportParams, type CTHmacImportParams, type CTJsonWebKey, type CTKeyFormat, type CTKeyType, type CTKeyUsage, type CTNamedCurve, type CTRsaHashedImportParams, type CoerceURI, type CryptoRuntime, type FnSerialized, Future, IsLogger, Keyed, KeyedResolvOnce, KeyedResolvSeq, type Lengthed, Level, type LevelHandler, LevelHandlerImpl, LogCollector, type LogSerializable, LogValue, LogWriteStream, LogWriterStream, type Logger, LoggerImpl, type LoggerImplParams, type LoggerInterface, MockLogger, type MockLoggerReturn, MutableURL, None, Option, ResolveOnce, ResolveSeq, Result, ResultError, ResultOK, type Runtime, type Serialized, type SizeOrLength, type Sized, Some, SysAbstraction, URI, type WithLogger, type WithoutOption, type WithoutResult, asyncLogValue, isURL, logValue, removeSelfRef, runtimeFn, toCryptoRuntime };
+export { type AsError, BuildURI, type CTAesKeyAlgorithm, type CTAlgorithm, type CTAlgorithmIdentifier, type CTArrayBufferView, type CTBufferSource, type CTCryptoKey, type CTEcKeyImportParams, type CTHmacImportParams, type CTJsonWebKey, type CTKeyFormat, type CTKeyType, type CTKeyUsage, type CTNamedCurve, type CTRsaHashedImportParams, type CoerceURI, type CryptoRuntime, type FnSerialized, Future, IsLogger, Keyed, KeyedResolvOnce, KeyedResolvSeq, type Lengthed, Level, type LevelHandler, LevelHandlerImpl, LogCollector, type LogSerializable, LogValue, LogWriteStream, LogWriterStream, type Logger, LoggerImpl, type LoggerImplParams, type LoggerInterface, MockLogger, type MockLoggerReturn, MutableURL, None, Option, ResolveOnce, ResolveSeq, Result, ResultError, ResultOK, type Runtime, type Serialized, type SizeOrLength, type Sized, Some, SysAbstraction, URI, type WithLogger, type WithoutOption, type WithoutResult, asyncLogValue, exception2Result, isURL, logValue, protocols, removeSelfRef, runtimeFn, toCryptoRuntime };

package/index.js

@@ -117,6 +117,91 @@ function IsLogger(obj) {
   ].map((fn) => typeof obj[fn] === "function").reduce((a, b) => a && b, true);
 }
 
+// src/result.ts
+var Result = class _Result {
+  static Ok(t) {
+    return new ResultOK(t);
+  }
+  static Err(t) {
+    if (typeof t === "string") {
+      return new ResultError(new Error(t));
+    }
+    return new ResultError(t);
+  }
+  static Is(t) {
+    if (!t) {
+      return false;
+    }
+    if (t instanceof _Result) {
+      return true;
+    }
+    const rt = t;
+    if ([typeof rt.is_ok, typeof rt.is_err, typeof rt.unwrap, typeof rt.unwrap_err].every((x) => x === "function")) {
+      return true;
+    }
+    return false;
+  }
+  isOk() {
+    return this.is_ok();
+  }
+  isErr() {
+    return this.is_err();
+  }
+  Ok() {
+    return this.unwrap();
+  }
+  Err() {
+    return this.unwrap_err();
+  }
+};
+var ResultOK = class extends Result {
+  constructor(t) {
+    super();
+    this._t = t;
+  }
+  is_ok() {
+    return true;
+  }
+  is_err() {
+    return false;
+  }
+  unwrap_err() {
+    throw new Error("Result is Ok");
+  }
+  unwrap() {
+    return this._t;
+  }
+};
+var ResultError = class extends Result {
+  constructor(t) {
+    super();
+    this._error = t;
+  }
+  is_ok() {
+    return false;
+  }
+  is_err() {
+    return true;
+  }
+  unwrap() {
+    throw new Error(`Result is Err: ${this._error}`);
+  }
+  unwrap_err() {
+    return this._error;
+  }
+};
+function exception2Result(fn) {
+  try {
+    const res = fn();
+    if (res instanceof Promise) {
+      return res.then((value) => Result.Ok(value)).catch((e) => Result.Err(e));
+    }
+    return Result.Ok(res);
+  } catch (e) {
+    return Result.Err(e);
+  }
+}
+
 // src/uri.ts
 function falsy2undef(value) {
   return value === void 0 || value === null ? void 0 : value;
@@ -141,16 +226,21 @@ function isURL(value) {
 var MutableURL = class _MutableURL extends URL {
   constructor(urlStr) {
     super("defect://does.not.exist");
-    this._hasHostpart = ["http", "https"].includes(urlStr.split(":")[0]);
-    const prefix = this._hasHostpart ? "" : "cement-";
+    const partedURL = urlStr.split(":");
+    this._hasHostpart = protocols.has(partedURL[0]);
+    let hostPartUrl = ["http", ...partedURL.slice(1)].join(":");
+    if (!this._hasHostpart) {
+      const pathname = hostPartUrl.replace(/http:\/\/[/]*/, "").replace(/[#?].*$/, "");
+      hostPartUrl = hostPartUrl.replace(/http:\/\//, `http://localhost/${pathname}`);
+    }
     try {
-      this._sysURL = new URL(prefix + urlStr);
+      this._sysURL = new URL(hostPartUrl);
     } catch (ie) {
       const e = ie;
       e.message = `${e.message} for URL: ${urlStr}`;
       throw e;
     }
-    this._protocol = this._sysURL.protocol.replace(new RegExp("^cement-"), "");
+    this._protocol = `${partedURL[0]}:`;
     if (this._hasHostpart) {
       this._pathname = this._sysURL.pathname;
     } else {
@@ -161,15 +251,35 @@ var MutableURL = class _MutableURL extends URL {
   clone() {
     return new _MutableURL(this.toString());
   }
+  get host() {
+    if (!this._hasHostpart) {
+      throw new Error(
+        `you can use hostname only if protocol is ${this.toString()} ${JSON.stringify(Array.from(protocols.keys()))}`
+      );
+    }
+    return this._sysURL.host;
+  }
+  get port() {
+    if (!this._hasHostpart) {
+      throw new Error(`you can use hostname only if protocol is ${JSON.stringify(Array.from(protocols.keys()))}`);
+    }
+    return this._sysURL.port;
+  }
+  set port(p) {
+    if (!this._hasHostpart) {
+      throw new Error(`you can use port only if protocol is ${JSON.stringify(Array.from(protocols.keys()))}`);
+    }
+    this._sysURL.port = p;
+  }
   get hostname() {
     if (!this._hasHostpart) {
-      throw new Error("you can use hostname only if protocol is http or https");
+      throw new Error(`you can use hostname only if protocol is ${JSON.stringify(Array.from(protocols.keys()))}`);
     }
     return this._sysURL.hostname;
   }
   set hostname(h) {
     if (!this._hasHostpart) {
-      throw new Error("you can use hostname only if protocol is http or https");
+      throw new Error(`you can use hostname only if protocol is ${JSON.stringify(Array.from(protocols.keys()))}`);
     }
     this._sysURL.hostname = h;
   }
@@ -241,6 +351,10 @@ var BuildURI = class _BuildURI {
   static from(strURLUri, defaultProtocol = "file:") {
     return from((url) => new _BuildURI(url), strURLUri, defaultProtocol);
   }
+  port(p) {
+    this._url.port = p;
+    return this;
+  }
   hostname(h) {
     this._url.hostname = h;
     return this;
@@ -302,7 +416,20 @@ var BuildURI = class _BuildURI {
     return URI.from(this._url);
   }
 };
+var protocols = /* @__PURE__ */ new Map([
+  ["http", true],
+  ["https", true],
+  ["ws", true],
+  ["wss", true]
+]);
 var URI = class _URI {
+  static protocolHasHostpart(protocol) {
+    protocol = protocol.replace(/:$/, "");
+    protocols.set(protocol, true);
+    return () => {
+      protocols.delete(protocol);
+    };
+  }
   // if no protocol is provided, default to file:
   static merge(into, from2, defaultProtocol = "file:") {
     const intoUrl = BuildURI.from(into, defaultProtocol);
@@ -324,6 +451,9 @@ var URI = class _URI {
   static from(strURLUri, defaultProtocol = "file:") {
     return from((url) => new _URI(url), strURLUri, defaultProtocol);
   }
+  static fromResult(strURLUri, defaultProtocol = "file:") {
+    return exception2Result(() => from((url) => new _URI(url), strURLUri, defaultProtocol));
+  }
   constructor(url) {
     this._url = url.clone();
   }
@@ -336,9 +466,12 @@ var URI = class _URI {
   // get password(): string {
   //   return this._url.password;
   // }
-  // get port(): string {
-  //   return this._url.port;
-  // }
+  get port() {
+    return this._url.port;
+  }
+  get host() {
+    return this._url.host;
+  }
   // get username(): string {
   //   return this._url.username;
   // }
@@ -349,7 +482,7 @@ var URI = class _URI {
     return this._url.protocol;
   }
   get pathname() {
-    return this._url.toString().replace(/^.*:\/\//, "").replace(/\?.*$/, "");
+    return this._url.pathname;
   }
   // get hash(): string {
   //   return this._url.hash;
@@ -649,7 +782,13 @@ var LoggerImpl = class _LoggerImpl {
   }
   Err(err) {
     var _a;
-    if (err instanceof Error) {
+    if (Result.Is(err)) {
+      if (err.isOk()) {
+        this.Result("noerror", err);
+      } else {
+        this.Result("error", err);
+      }
+    } else if (err instanceof Error) {
       this._attributes["error"] = logValue(err.message);
       if (this._levelHandler.isStackExposed) {
         this._attributes["stack"] = logValue((_a = err.stack) == null ? void 0 : _a.split("\n").map((s) => s.trim()));
@@ -977,80 +1116,6 @@ function MockLogger(params) {
   };
 }
 
-// src/result.ts
-var Result = class _Result {
-  static Ok(t) {
-    return new ResultOK(t);
-  }
-  static Err(t) {
-    if (typeof t === "string") {
-      return new ResultError(new Error(t));
-    }
-    return new ResultError(t);
-  }
-  static Is(t) {
-    if (!t) {
-      return false;
-    }
-    if (t instanceof _Result) {
-      return true;
-    }
-    const rt = t;
-    if ([typeof rt.is_ok, typeof rt.is_err, typeof rt.unwrap, typeof rt.unwrap_err].every((x) => x === "function")) {
-      return true;
-    }
-    return false;
-  }
-  isOk() {
-    return this.is_ok();
-  }
-  isErr() {
-    return this.is_err();
-  }
-  Ok() {
-    return this.unwrap();
-  }
-  Err() {
-    return this.unwrap_err();
-  }
-};
-var ResultOK = class extends Result {
-  constructor(t) {
-    super();
-    this._t = t;
-  }
-  is_ok() {
-    return true;
-  }
-  is_err() {
-    return false;
-  }
-  unwrap_err() {
-    throw new Error("Result is Ok");
-  }
-  unwrap() {
-    return this._t;
-  }
-};
-var ResultError = class extends Result {
-  constructor(t) {
-    super();
-    this._error = t;
-  }
-  is_ok() {
-    return false;
-  }
-  is_err() {
-    return true;
-  }
-  unwrap() {
-    throw new Error(`Result is Err: ${this._error}`);
-  }
-  unwrap_err() {
-    return this._error;
-  }
-};
-
 // src/option.ts
 var Option = class _Option {
   static Some(t) {
@@ -1163,8 +1228,10 @@ export {
   WrapperSysAbstraction,
   asyncLogValue,
   envFactory,
+  exception2Result,
   isURL,
   logValue,
+  protocols,
   removeSelfRef,
   runtimeFn,
   toCryptoRuntime,