@adviser/cement 0.2.35 → 0.2.36

package/index.d.cts

@@ -40,6 +40,19 @@ declare function exception2Result<FN extends () => Promise<T> | T, T>(fn: FN): W
 type StripCommand = string | RegExp;
 
 type NullOrUndef = null | undefined;
+type OneKey<K extends string, V = string> = Record<K, V>;
+interface URIInterface<R extends URIInterface<R>> {
+    readonly getParams: Iterable<[string, string]>;
+    hasParam(key: string): boolean;
+    getParam<T extends string | undefined>(key: string | OneKey<string>, def?: T): T extends string ? string : string | undefined;
+    getParamResult(key: string, msgFn?: (key: string) => string): Result<string>;
+    getParamsResult(...keys: keysParam): Result<Record<string, string>>;
+    clone(): R;
+    asURL(): URL;
+    toString(): string;
+    toJSON(): string;
+    asObj(...strips: StripCommand[]): Partial<HostURIObject | PathURIObject>;
+}
 interface URIObject {
     readonly style: "host" | "path";
     readonly protocol: string;
@@ -75,8 +88,9 @@ declare class MutableURL extends URL {
     get searchParams(): URLSearchParams;
     toString(): string;
 }
-type keysParam = (string | ((...keys: string[]) => string))[];
-declare class BuildURI {
+type msgFn = (...keys: string[]) => string;
+type keysParam = (string | msgFn | Record<string, string>)[];
+declare class BuildURI implements URIInterface<BuildURI> {
     _url: MutableURL;
     private constructor();
     static is(value: unknown): value is BuildURI;
@@ -90,18 +104,20 @@ declare class BuildURI {
     defParam(key: string, str: string): BuildURI;
     setParam(key: string, str: string): BuildURI;
     hasParam(key: string): boolean;
-    getParam<T extends string | undefined>(key: string, def?: T): T extends string ? string : string | undefined;
+    get getParams(): Iterable<[string, string]>;
+    getParam<T extends string | undefined>(key: string | OneKey<string>, def?: T): T extends string ? string : string | undefined;
     getParamResult(key: string, msgFn?: (key: string) => string): Result<string>;
     getParamsResult(...keys: keysParam): Result<Record<string, string>>;
     toString(): string;
     toJSON(): string;
     asURL(): URL;
     asObj(...strips: StripCommand[]): Partial<HostURIObject | PathURIObject>;
+    clone(): BuildURI;
     URI(): URI;
 }
 type CoerceURI = string | URI | MutableURL | URL | BuildURI | NullOrUndef;
 declare const hasHostPartProtocols: Set<string>;
-declare class URI {
+declare class URI implements URIInterface<URI> {
     static protocolHasHostpart(protocol: string): () => void;
     static merge(into: CoerceURI, from: CoerceURI, defaultProtocol?: string): URI;
     static is(value: unknown): value is URI;
@@ -117,7 +133,7 @@ declare class URI {
     get pathname(): string;
     get getParams(): Iterable<[string, string]>;
     hasParam(key: string): boolean;
-    getParam<T extends string | undefined>(key: string, def?: T): T extends string ? string : string | undefined;
+    getParam<T extends string | undefined>(key: string | OneKey<string>, def?: T): T extends string ? string : string | undefined;
     getParamResult(key: string, msgFn?: (key: string) => string): Result<string>;
     getParamsResult(...keys: keysParam): Result<Record<string, string>>;
     clone(): URI;
@@ -179,7 +195,11 @@ interface LoggerInterface<R> {
     Url(url: CoerceURI, key?: string): R;
     Len(value: unknown, key?: string): R;
     Hash(value: unknown, key?: string): R;
-    Str(key: string, value?: string): R;
+    Str<T extends string | Record<string, string>>(key: T, value?: T extends string ? string : undefined): R;
+    Uint64<T extends string | Record<string, number>>(key: T, value?: T extends string ? number : undefined): 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;
     Pair(x: Record<string, unknown>): R;
     Error(): R;
@@ -190,11 +210,7 @@ interface LoggerInterface<R> {
     Err(err: unknown | Result<unknown> | Error): R;
     Info(): R;
     Timestamp(): R;
-    Any(key: string, value: unknown): R;
     Dur(key: string, nsec: number): R;
-    Uint64(key: string, value: number): R;
-    Int(key: string, value: number): R;
-    Bool(key: string, value: unknown): R;
 }
 declare function IsLogger(obj: unknown): obj is Logger;
 interface WithLogger extends LoggerInterface<WithLogger> {
@@ -269,18 +285,19 @@ declare class LoggerImpl implements Logger {
     Ref(key: string, action: {
         toString: () => string;
     } | FnSerialized): Logger;
-    Bool(key: string, value: unknown): Logger;
+    Bool(key: string | Record<string, unknown>, value: unknown): Logger;
     Http(res: Response | Result<Response>, req?: Request, key?: string): Logger;
     Pair(x: Record<string, unknown>): Logger;
     Result<T>(key: string, res: Result<T, Error>): Logger;
     Len(value: unknown, key?: string): Logger;
     Hash(value: unknown, key?: string): Logger;
     Url(url: CoerceURI, key?: string): Logger;
-    Str(key: string, value?: string): Logger;
-    Any(key: string, value?: string | number | boolean | LogSerializable): Logger;
+    private coerceKey;
+    Str(key: string | Record<string, string>, value?: string): Logger;
+    Any(key: string | Record<string, unknown>, value?: unknown): Logger;
     Dur(key: string, nsec: number): Logger;
-    Uint64(key: string, value: number): Logger;
-    Int(key: string, value: number): Logger;
+    Uint64(key: string | Record<string, number>, value?: number): Logger;
+    Int(key: string | Record<string, number>, value?: number): Logger;
     Flush(): Promise<void>;
     With(): WithLogger;
     _resetAttributes(fn: () => () => Uint8Array): () => Uint8Array;
@@ -558,4 +575,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 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 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

@@ -40,6 +40,19 @@ declare function exception2Result<FN extends () => Promise<T> | T, T>(fn: FN): W
 type StripCommand = string | RegExp;
 
 type NullOrUndef = null | undefined;
+type OneKey<K extends string, V = string> = Record<K, V>;
+interface URIInterface<R extends URIInterface<R>> {
+    readonly getParams: Iterable<[string, string]>;
+    hasParam(key: string): boolean;
+    getParam<T extends string | undefined>(key: string | OneKey<string>, def?: T): T extends string ? string : string | undefined;
+    getParamResult(key: string, msgFn?: (key: string) => string): Result<string>;
+    getParamsResult(...keys: keysParam): Result<Record<string, string>>;
+    clone(): R;
+    asURL(): URL;
+    toString(): string;
+    toJSON(): string;
+    asObj(...strips: StripCommand[]): Partial<HostURIObject | PathURIObject>;
+}
 interface URIObject {
     readonly style: "host" | "path";
     readonly protocol: string;
@@ -75,8 +88,9 @@ declare class MutableURL extends URL {
     get searchParams(): URLSearchParams;
     toString(): string;
 }
-type keysParam = (string | ((...keys: string[]) => string))[];
-declare class BuildURI {
+type msgFn = (...keys: string[]) => string;
+type keysParam = (string | msgFn | Record<string, string>)[];
+declare class BuildURI implements URIInterface<BuildURI> {
     _url: MutableURL;
     private constructor();
     static is(value: unknown): value is BuildURI;
@@ -90,18 +104,20 @@ declare class BuildURI {
     defParam(key: string, str: string): BuildURI;
     setParam(key: string, str: string): BuildURI;
     hasParam(key: string): boolean;
-    getParam<T extends string | undefined>(key: string, def?: T): T extends string ? string : string | undefined;
+    get getParams(): Iterable<[string, string]>;
+    getParam<T extends string | undefined>(key: string | OneKey<string>, def?: T): T extends string ? string : string | undefined;
     getParamResult(key: string, msgFn?: (key: string) => string): Result<string>;
     getParamsResult(...keys: keysParam): Result<Record<string, string>>;
     toString(): string;
     toJSON(): string;
     asURL(): URL;
     asObj(...strips: StripCommand[]): Partial<HostURIObject | PathURIObject>;
+    clone(): BuildURI;
     URI(): URI;
 }
 type CoerceURI = string | URI | MutableURL | URL | BuildURI | NullOrUndef;
 declare const hasHostPartProtocols: Set<string>;
-declare class URI {
+declare class URI implements URIInterface<URI> {
     static protocolHasHostpart(protocol: string): () => void;
     static merge(into: CoerceURI, from: CoerceURI, defaultProtocol?: string): URI;
     static is(value: unknown): value is URI;
@@ -117,7 +133,7 @@ declare class URI {
     get pathname(): string;
     get getParams(): Iterable<[string, string]>;
     hasParam(key: string): boolean;
-    getParam<T extends string | undefined>(key: string, def?: T): T extends string ? string : string | undefined;
+    getParam<T extends string | undefined>(key: string | OneKey<string>, def?: T): T extends string ? string : string | undefined;
     getParamResult(key: string, msgFn?: (key: string) => string): Result<string>;
     getParamsResult(...keys: keysParam): Result<Record<string, string>>;
     clone(): URI;
@@ -179,7 +195,11 @@ interface LoggerInterface<R> {
     Url(url: CoerceURI, key?: string): R;
     Len(value: unknown, key?: string): R;
     Hash(value: unknown, key?: string): R;
-    Str(key: string, value?: string): R;
+    Str<T extends string | Record<string, string>>(key: T, value?: T extends string ? string : undefined): R;
+    Uint64<T extends string | Record<string, number>>(key: T, value?: T extends string ? number : undefined): 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;
     Pair(x: Record<string, unknown>): R;
     Error(): R;
@@ -190,11 +210,7 @@ interface LoggerInterface<R> {
     Err(err: unknown | Result<unknown> | Error): R;
     Info(): R;
     Timestamp(): R;
-    Any(key: string, value: unknown): R;
     Dur(key: string, nsec: number): R;
-    Uint64(key: string, value: number): R;
-    Int(key: string, value: number): R;
-    Bool(key: string, value: unknown): R;
 }
 declare function IsLogger(obj: unknown): obj is Logger;
 interface WithLogger extends LoggerInterface<WithLogger> {
@@ -269,18 +285,19 @@ declare class LoggerImpl implements Logger {
     Ref(key: string, action: {
         toString: () => string;
     } | FnSerialized): Logger;
-    Bool(key: string, value: unknown): Logger;
+    Bool(key: string | Record<string, unknown>, value: unknown): Logger;
     Http(res: Response | Result<Response>, req?: Request, key?: string): Logger;
     Pair(x: Record<string, unknown>): Logger;
     Result<T>(key: string, res: Result<T, Error>): Logger;
     Len(value: unknown, key?: string): Logger;
     Hash(value: unknown, key?: string): Logger;
     Url(url: CoerceURI, key?: string): Logger;
-    Str(key: string, value?: string): Logger;
-    Any(key: string, value?: string | number | boolean | LogSerializable): Logger;
+    private coerceKey;
+    Str(key: string | Record<string, string>, value?: string): Logger;
+    Any(key: string | Record<string, unknown>, value?: unknown): Logger;
     Dur(key: string, nsec: number): Logger;
-    Uint64(key: string, value: number): Logger;
-    Int(key: string, value: number): Logger;
+    Uint64(key: string | Record<string, number>, value?: number): Logger;
+    Int(key: string | Record<string, number>, value?: number): Logger;
     Flush(): Promise<void>;
     With(): WithLogger;
     _resetAttributes(fn: () => () => Uint8Array): () => Uint8Array;
@@ -558,4 +575,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 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 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

@@ -2,7 +2,7 @@ import {
   ConsoleWriterStream,
   FanoutWriteStream,
   utils_exports
-} from "./chunk-7KFVMTOS.js";
+} from "./chunk-USQXEZHL.js";
 import {
   WebSysAbstraction
 } from "./chunk-WMMUXBDX.js";
@@ -348,6 +348,16 @@ function localStripper(path, restrips, obj) {
 }
 
 // src/uri.ts
+function coerceKey(key, def) {
+  if (typeof key === "object") {
+    const keys = Object.keys(key);
+    if (keys.length !== 1) {
+      throw new Error(`Invalid key: ${JSON.stringify(key)}`);
+    }
+    return { key: keys[0], def: key[keys[0]] };
+  }
+  return { key, def };
+}
 function falsy2undef(value) {
   return value === void 0 || value === null ? void 0 : value;
 }
@@ -494,19 +504,33 @@ function getParamResult(key, val, msgFn = (key2) => {
   return Result.Ok(val);
 }
 function getParamsResult(keys, getParam) {
-  const keyStrs = keys.flat().filter((k) => typeof k === "string");
+  const keyDef = keys.flat().reduce(
+    (acc, i) => {
+      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] })));
+      }
+      return acc;
+    },
+    []
+  );
   const msgFn = keys.find((k) => typeof k === "function") || ((...keys2) => {
     const msg = keys2.join(",");
     return `missing parameters: ${msg}`;
   });
   const errors = [];
   const result = {};
-  for (const key of keyStrs) {
-    const val = getParam.getParam(key);
+  for (const kd of keyDef) {
+    const val = getParam.getParam(kd.key);
     if (val === void 0) {
-      errors.push(key);
+      if (kd.def) {
+        result[kd.key] = kd.def;
+      } else {
+        errors.push(kd.key);
+      }
     } else {
-      result[key] = val;
+      result[kd.key] = val;
     }
   }
   if (errors.length) {
@@ -598,10 +622,14 @@ var BuildURI = class _BuildURI {
   hasParam(key) {
     return this._url.searchParams.has(key);
   }
+  get getParams() {
+    return this._url.searchParams.entries();
+  }
   getParam(key, def) {
-    let val = this._url.searchParams.get(key);
-    if (!falsy2undef(val) && def) {
-      val = def;
+    const { key: k, def: d } = coerceKey(key, def);
+    let val = this._url.searchParams.get(k);
+    if (!falsy2undef(val) && d) {
+      val = d;
     }
     return falsy2undef(val);
   }
@@ -624,6 +652,9 @@ var BuildURI = class _BuildURI {
   asObj(...strips) {
     return this.URI().asObj(...strips);
   }
+  clone() {
+    return _BuildURI.from(this.toString());
+  }
   URI() {
     return URI.from(this._url);
   }
@@ -704,9 +735,10 @@ var URI = class _URI {
     return this._url.searchParams.has(key);
   }
   getParam(key, def) {
-    let val = this._url.searchParams.get(key);
-    if (!falsy2undef(val) && def) {
-      val = def;
+    const { key: k, def: d } = coerceKey(key, def);
+    let val = this._url.searchParams.get(k);
+    if (!falsy2undef(val) && d) {
+      val = d;
     }
     return falsy2undef(val);
   }
@@ -1089,7 +1121,7 @@ var LoggerImpl = class _LoggerImpl {
     return this;
   }
   Bool(key, value) {
-    this._attributes[key] = logValue(!!value);
+    this.coerceKey(key, !!value);
     return this;
   }
   Http(res, req, key) {
@@ -1142,12 +1174,19 @@ var LoggerImpl = class _LoggerImpl {
     this.Ref(key, () => URI.from(url).toString());
     return this;
   }
+  coerceKey(key, value) {
+    if (typeof key === "string") {
+      this._attributes[key] = logValue(value);
+    } else {
+      this.Pair(key);
+    }
+  }
   Str(key, value) {
-    this._attributes[key] = logValue(value);
+    this.coerceKey(key, value);
     return this;
   }
   Any(key, value) {
-    this._attributes[key] = logValue(value);
+    this.coerceKey(key, value);
     return this;
   }
   Dur(key, nsec) {
@@ -1155,7 +1194,7 @@ var LoggerImpl = class _LoggerImpl {
     return this;
   }
   Uint64(key, value) {
-    this._attributes[key] = logValue(value);
+    this.coerceKey(key, value);
     return this;
   }
   Int(key, value) {