@adviser/cement 0.2.36 → 0.2.37

package/index.d.cts

@@ -89,7 +89,7 @@ declare class MutableURL extends URL {
     toString(): string;
 }
 type msgFn = (...keys: string[]) => string;
-type keysParam = (string | msgFn | Record<string, string>)[];
+type keysParam = (string | msgFn | Record<string, unknown>)[];
 declare class BuildURI implements URIInterface<BuildURI> {
     _url: MutableURL;
     private constructor();
@@ -179,6 +179,7 @@ interface LevelHandler {
     setDebug(...modules: (string | string[])[]): void;
     isEnabled(ilevel: unknown, module: unknown): boolean;
 }
+type HttpType = Response | Result<Response> | Request | Result<Request>;
 interface LoggerInterface<R> {
     TxtEnDe(): TxtEnDecoder;
     Module(key: string): R;
@@ -200,7 +201,7 @@ interface LoggerInterface<R> {
     Int<T extends string | Record<string, number>>(key: T, value?: T extends string ? number : undefined): R;
     Bool<T extends string | Record<string, unknown>>(key: T, value?: T extends string ? unknown : undefined): R;
     Any<T extends string | Record<string, unknown>>(key: T, value?: T extends string ? unknown : undefined): R;
-    Http(res: Response | Result<Response>, req?: Request, key?: string): R;
+    Http(...mix: (HttpType | string)[]): R;
     Pair(x: Record<string, unknown>): R;
     Error(): R;
     Warn(): R;
@@ -286,7 +287,7 @@ declare class LoggerImpl implements Logger {
         toString: () => string;
     } | FnSerialized): Logger;
     Bool(key: string | Record<string, unknown>, value: unknown): Logger;
-    Http(res: Response | Result<Response>, req?: Request, key?: string): Logger;
+    Http(...mix: (HttpType | string)[]): Logger;
     Pair(x: Record<string, unknown>): Logger;
     Result<T>(key: string, res: Result<T, Error>): Logger;
     Len(value: unknown, key?: string): Logger;
@@ -575,4 +576,4 @@ declare function bin2string(hex: ArrayBufferView, size?: number): string;
 
 declare const VERSION: string;
 
-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 CleanCtx, type CoerceURI, type CryptoRuntime, type FnSerialized, Future, type HostURIObject, type Invokaction, IsLogger, JSONFormatter, Keyed, KeyedResolvOnce, KeyedResolvSeq, type Lengthed, Level, type LevelHandler, LevelHandlerImpl, LevelHandlerSingleton, LogCollector, type LogFormatter, type LogSerializable, LogValue, type LogValueArg, LogWriteStream, type Logger, LoggerImpl, type LoggerImplParams, type LoggerInterface, Metric, type MetricMap, Metrics, MockLogger, type MockLoggerReturn, MutableURL, None, Option, type PathURIObject, ResolveOnce, ResolveSeq, Result, ResultError, ResultOK, type Runtime, type Serialized, type SizeOrLength, type Sized, Some, SysAbstraction, Time, type TraceCtx, type TraceCtxParam, TraceNode, type TraceNodeMap, TxtEnDecoder, URI, type URIInterface, type URIObject, VERSION, type WithLogger, type WithoutOption, type WithoutResult, YAMLFormatter, asyncLogValue, bin2string, bin2text, exception2Result, hasHostPartProtocols, isURL, logValue, 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 CleanCtx, type CoerceURI, type CryptoRuntime, type FnSerialized, Future, type HostURIObject, type HttpType, type Invokaction, IsLogger, JSONFormatter, Keyed, KeyedResolvOnce, KeyedResolvSeq, type Lengthed, Level, type LevelHandler, LevelHandlerImpl, LevelHandlerSingleton, LogCollector, type LogFormatter, type LogSerializable, LogValue, type LogValueArg, LogWriteStream, type Logger, LoggerImpl, type LoggerImplParams, type LoggerInterface, Metric, type MetricMap, Metrics, MockLogger, type MockLoggerReturn, MutableURL, None, Option, type PathURIObject, ResolveOnce, ResolveSeq, Result, ResultError, ResultOK, type Runtime, type Serialized, type SizeOrLength, type Sized, Some, SysAbstraction, Time, type TraceCtx, type TraceCtxParam, TraceNode, type TraceNodeMap, TxtEnDecoder, URI, type URIInterface, type URIObject, VERSION, type WithLogger, type WithoutOption, type WithoutResult, YAMLFormatter, asyncLogValue, bin2string, bin2text, exception2Result, hasHostPartProtocols, isURL, logValue, runtimeFn, toCryptoRuntime };

package/index.d.ts

@@ -89,7 +89,7 @@ declare class MutableURL extends URL {
     toString(): string;
 }
 type msgFn = (...keys: string[]) => string;
-type keysParam = (string | msgFn | Record<string, string>)[];
+type keysParam = (string | msgFn | Record<string, unknown>)[];
 declare class BuildURI implements URIInterface<BuildURI> {
     _url: MutableURL;
     private constructor();
@@ -179,6 +179,7 @@ interface LevelHandler {
     setDebug(...modules: (string | string[])[]): void;
     isEnabled(ilevel: unknown, module: unknown): boolean;
 }
+type HttpType = Response | Result<Response> | Request | Result<Request>;
 interface LoggerInterface<R> {
     TxtEnDe(): TxtEnDecoder;
     Module(key: string): R;
@@ -200,7 +201,7 @@ interface LoggerInterface<R> {
     Int<T extends string | Record<string, number>>(key: T, value?: T extends string ? number : undefined): R;
     Bool<T extends string | Record<string, unknown>>(key: T, value?: T extends string ? unknown : undefined): R;
     Any<T extends string | Record<string, unknown>>(key: T, value?: T extends string ? unknown : undefined): R;
-    Http(res: Response | Result<Response>, req?: Request, key?: string): R;
+    Http(...mix: (HttpType | string)[]): R;
     Pair(x: Record<string, unknown>): R;
     Error(): R;
     Warn(): R;
@@ -286,7 +287,7 @@ declare class LoggerImpl implements Logger {
         toString: () => string;
     } | FnSerialized): Logger;
     Bool(key: string | Record<string, unknown>, value: unknown): Logger;
-    Http(res: Response | Result<Response>, req?: Request, key?: string): Logger;
+    Http(...mix: (HttpType | string)[]): Logger;
     Pair(x: Record<string, unknown>): Logger;
     Result<T>(key: string, res: Result<T, Error>): Logger;
     Len(value: unknown, key?: string): Logger;
@@ -575,4 +576,4 @@ declare function bin2string(hex: ArrayBufferView, size?: number): string;
 
 declare const VERSION: string;
 
-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 CleanCtx, type CoerceURI, type CryptoRuntime, type FnSerialized, Future, type HostURIObject, type Invokaction, IsLogger, JSONFormatter, Keyed, KeyedResolvOnce, KeyedResolvSeq, type Lengthed, Level, type LevelHandler, LevelHandlerImpl, LevelHandlerSingleton, LogCollector, type LogFormatter, type LogSerializable, LogValue, type LogValueArg, LogWriteStream, type Logger, LoggerImpl, type LoggerImplParams, type LoggerInterface, Metric, type MetricMap, Metrics, MockLogger, type MockLoggerReturn, MutableURL, None, Option, type PathURIObject, ResolveOnce, ResolveSeq, Result, ResultError, ResultOK, type Runtime, type Serialized, type SizeOrLength, type Sized, Some, SysAbstraction, Time, type TraceCtx, type TraceCtxParam, TraceNode, type TraceNodeMap, TxtEnDecoder, URI, type URIInterface, type URIObject, VERSION, type WithLogger, type WithoutOption, type WithoutResult, YAMLFormatter, asyncLogValue, bin2string, bin2text, exception2Result, hasHostPartProtocols, isURL, logValue, 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 CleanCtx, type CoerceURI, type CryptoRuntime, type FnSerialized, Future, type HostURIObject, type HttpType, type Invokaction, IsLogger, JSONFormatter, Keyed, KeyedResolvOnce, KeyedResolvSeq, type Lengthed, Level, type LevelHandler, LevelHandlerImpl, LevelHandlerSingleton, LogCollector, type LogFormatter, type LogSerializable, LogValue, type LogValueArg, LogWriteStream, type Logger, LoggerImpl, type LoggerImplParams, type LoggerInterface, Metric, type MetricMap, Metrics, MockLogger, type MockLoggerReturn, MutableURL, None, Option, type PathURIObject, ResolveOnce, ResolveSeq, Result, ResultError, ResultOK, type Runtime, type Serialized, type SizeOrLength, type Sized, Some, SysAbstraction, Time, type TraceCtx, type TraceCtxParam, TraceNode, type TraceNodeMap, TxtEnDecoder, URI, type URIInterface, type URIObject, VERSION, type WithLogger, type WithoutOption, type WithoutResult, YAMLFormatter, asyncLogValue, bin2string, bin2text, exception2Result, hasHostPartProtocols, isURL, logValue, runtimeFn, toCryptoRuntime };

package/index.js

@@ -509,7 +509,7 @@ function getParamsResult(keys, getParam) {
       if (typeof i === "string") {
         acc.push({ key: i });
       } else if (typeof i === "object") {
-        acc.push(...Object.keys(i).map((k) => ({ key: k, def: i[k] })));
+        acc.push(...Object.keys(i).map((k) => ({ key: k, def: typeof i[k] === "string" ? i[k] : void 0 })));
       }
       return acc;
     },
@@ -524,7 +524,7 @@ function getParamsResult(keys, getParam) {
   for (const kd of keyDef) {
     const val = getParam.getParam(kd.key);
     if (val === void 0) {
-      if (kd.def) {
+      if (typeof kd.def === "string") {
         result[kd.key] = kd.def;
       } else {
         errors.push(kd.key);
@@ -1124,19 +1124,29 @@ var LoggerImpl = class _LoggerImpl {
     this.coerceKey(key, !!value);
     return this;
   }
-  Http(res, req, key) {
-    if (Result.Is(res)) {
-      if (res.isErr()) {
-        this.Err(res.Err());
-        return this;
-      }
-      res = res.Ok();
-    }
-    let reqRes = res;
-    if (req) {
-      reqRes = { res, req };
+  Http(...mix) {
+    const key = mix.find((x) => typeof x === "string");
+    mix = mix.filter((x) => typeof x !== "string");
+    const resErrors = mix.filter((x) => Result.Is(x) && x.isErr());
+    if (resErrors.length) {
+      this.Err(resErrors.map((x) => x.Err().message).join("\n"));
+      return this;
+    }
+    const req = mix.map((reqOrResult) => Result.Is(reqOrResult) ? reqOrResult.Ok() : reqOrResult).find((req2) => typeof req2.status !== "number");
+    const res = mix.map((resOrResult) => Result.Is(resOrResult) ? resOrResult.Ok() : resOrResult).find((res2) => typeof res2.status === "number");
+    let reqAndOrres;
+    if (res && req) {
+      reqAndOrres = { res, req };
+    } else if (!res && !req) {
+      reqAndOrres = void 0;
+    } else if (res) {
+      reqAndOrres = res;
+    } else if (req) {
+      reqAndOrres = req;
+    }
+    if (reqAndOrres) {
+      this.Any(key || "Http", reqAndOrres);
     }
-    this.Any(key || "Http", reqRes);
     return this;
   }
   Pair(x) {
@@ -1291,8 +1301,8 @@ var WithLoggerBuilder = class {
     this._li.SetDebug(...modules);
     return this;
   }
-  Http(res, req, key) {
-    this._li.Http(res, req, key);
+  Http(...mix) {
+    this._li.Http(...mix);
     return this;
   }
   Pair(x) {