@adviser/cement 0.2.33 → 0.2.35

package/index.d.cts

@@ -90,12 +90,13 @@ declare class BuildURI {
     defParam(key: string, str: string): BuildURI;
     setParam(key: string, str: string): BuildURI;
     hasParam(key: string): boolean;
-    getParam(key: string): string | undefined;
+    getParam<T extends string | undefined>(key: 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;
-    asObj(...strips: StripCommand[]): HostURIObject | PathURIObject;
+    asURL(): URL;
+    asObj(...strips: StripCommand[]): Partial<HostURIObject | PathURIObject>;
     URI(): URI;
 }
 type CoerceURI = string | URI | MutableURL | URL | BuildURI | NullOrUndef;
@@ -116,14 +117,14 @@ declare class URI {
     get pathname(): string;
     get getParams(): Iterable<[string, string]>;
     hasParam(key: string): boolean;
-    getParam(key: string): string | undefined;
+    getParam<T extends string | undefined>(key: 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;
     asURL(): URL;
     toString(): string;
     toJSON(): string;
-    asObj(...strips: StripCommand[]): HostURIObject | PathURIObject;
+    asObj(...strips: StripCommand[]): Partial<HostURIObject | PathURIObject>;
 }
 
 declare enum Level {
@@ -141,7 +142,6 @@ declare class LogValue {
     toJSON(): Serialized | Serialized[];
 }
 type LogSerializable = Record<string, LogValue | Promise<LogValue>>;
-declare function removeSelfRef(lineEnd?: string): (key: unknown, val: unknown) => unknown;
 declare function asyncLogValue(val: () => Promise<Serialized>): Promise<LogValue>;
 type LogValueArg = LogValue | Serialized | Serialized[] | FnSerialized | undefined | null;
 declare function logValue(val: LogValueArg, state?: Set<unknown>): LogValue;
@@ -180,6 +180,8 @@ interface LoggerInterface<R> {
     Len(value: unknown, key?: string): R;
     Hash(value: unknown, key?: string): R;
     Str(key: string, value?: string): R;
+    Http(res: Response | Result<Response>, req?: Request, key?: string): R;
+    Pair(x: Record<string, unknown>): R;
     Error(): R;
     Warn(): R;
     Debug(): R;
@@ -268,6 +270,8 @@ declare class LoggerImpl implements Logger {
         toString: () => string;
     } | FnSerialized): Logger;
     Bool(key: string, 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;
@@ -554,4 +558,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, 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 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 };

package/index.d.ts

@@ -90,12 +90,13 @@ declare class BuildURI {
     defParam(key: string, str: string): BuildURI;
     setParam(key: string, str: string): BuildURI;
     hasParam(key: string): boolean;
-    getParam(key: string): string | undefined;
+    getParam<T extends string | undefined>(key: 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;
-    asObj(...strips: StripCommand[]): HostURIObject | PathURIObject;
+    asURL(): URL;
+    asObj(...strips: StripCommand[]): Partial<HostURIObject | PathURIObject>;
     URI(): URI;
 }
 type CoerceURI = string | URI | MutableURL | URL | BuildURI | NullOrUndef;
@@ -116,14 +117,14 @@ declare class URI {
     get pathname(): string;
     get getParams(): Iterable<[string, string]>;
     hasParam(key: string): boolean;
-    getParam(key: string): string | undefined;
+    getParam<T extends string | undefined>(key: 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;
     asURL(): URL;
     toString(): string;
     toJSON(): string;
-    asObj(...strips: StripCommand[]): HostURIObject | PathURIObject;
+    asObj(...strips: StripCommand[]): Partial<HostURIObject | PathURIObject>;
 }
 
 declare enum Level {
@@ -141,7 +142,6 @@ declare class LogValue {
     toJSON(): Serialized | Serialized[];
 }
 type LogSerializable = Record<string, LogValue | Promise<LogValue>>;
-declare function removeSelfRef(lineEnd?: string): (key: unknown, val: unknown) => unknown;
 declare function asyncLogValue(val: () => Promise<Serialized>): Promise<LogValue>;
 type LogValueArg = LogValue | Serialized | Serialized[] | FnSerialized | undefined | null;
 declare function logValue(val: LogValueArg, state?: Set<unknown>): LogValue;
@@ -180,6 +180,8 @@ interface LoggerInterface<R> {
     Len(value: unknown, key?: string): R;
     Hash(value: unknown, key?: string): R;
     Str(key: string, value?: string): R;
+    Http(res: Response | Result<Response>, req?: Request, key?: string): R;
+    Pair(x: Record<string, unknown>): R;
     Error(): R;
     Warn(): R;
     Debug(): R;
@@ -268,6 +270,8 @@ declare class LoggerImpl implements Logger {
         toString: () => string;
     } | FnSerialized): Logger;
     Bool(key: string, 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;
@@ -554,4 +558,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, 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 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 };

package/index.js

@@ -101,22 +101,16 @@ var LogValue = class {
     this.fn = fn;
   }
   value() {
-    return this.fn();
+    try {
+      return this.fn();
+    } catch (e) {
+      return `LogValue:${e.message}`;
+    }
   }
   toJSON() {
     return this.value();
   }
 };
-function removeSelfRef(lineEnd) {
-  const cache = /* @__PURE__ */ new Set();
-  return function(key, value) {
-    if (typeof value === "object" && value !== null) {
-      if (cache.has(value)) return "...";
-      cache.add(value);
-    }
-    return lineEnd ? value + lineEnd : value;
-  };
-}
 function asyncLogValue(val) {
   throw new Error("Not implemented");
 }
@@ -143,19 +137,31 @@ function logValue(val, state = /* @__PURE__ */ new Set([Math.random()])) {
     case "boolean":
       return new LogValue(() => val);
     case "object": {
+      if (val === null) {
+        return new LogValue(() => "null");
+      }
       if (ArrayBuffer.isView(val)) {
         return logValue(bin2string(val, 512));
       }
       if (Array.isArray(val)) {
         return new LogValue(() => val.map((v) => logValue(v).value()));
       }
-      if (val === null) {
-        return new LogValue(() => "null");
+      if (val instanceof Headers) {
+        return new LogValue(() => Object.fromEntries(val.entries()));
+      }
+      if (val instanceof ReadableStream) {
+        return new LogValue(() => ">Stream<");
+      }
+      if (val instanceof Promise) {
+        return new LogValue(() => ">Promise<");
       }
       if (state.has(val)) {
         return new LogValue(() => "...");
       }
       state.add(val);
+      if (typeof val.toJSON === "function") {
+        return new LogValue(() => val.toJSON());
+      }
       const res = {};
       const typedVal = val;
       for (const key in typedVal) {
@@ -163,7 +169,9 @@ function logValue(val, state = /* @__PURE__ */ new Set([Math.random()])) {
         if (element instanceof LogValue) {
           res[key] = element;
         } else {
-          res[key] = logValue(element, state);
+          if (typeof element !== "function") {
+            res[key] = logValue(element, state);
+          }
         }
       }
       return new LogValue(() => res);
@@ -297,6 +305,9 @@ function localStripper(path, restrips, obj) {
   if (typeof obj !== "object" || obj === null) {
     return obj;
   }
+  if (Array.isArray(obj)) {
+    return obj.map((i) => localStripper(path, restrips, i));
+  }
   const ret = __spreadValues({}, obj);
   const matcher = (key, nextPath) => {
     for (const re of restrips) {
@@ -555,15 +566,17 @@ var BuildURI = class _BuildURI {
   //   return this;
   // }
   appendRelative(p) {
-    const url = URI.from(p);
-    let pathname = url.pathname;
-    if (url.pathname === "/") {
-      pathname = "";
-    } else if (!pathname.startsWith("/")) {
-      pathname = `/${pathname}`;
-    }
-    this.pathname(this._url.pathname + pathname);
-    for (const [key, value] of url.getParams) {
+    const appendUrl = URI.from(p);
+    let pathname = appendUrl.pathname;
+    let basePath = this._url.pathname;
+    if (pathname.startsWith("/")) {
+      pathname = pathname.replace(/^\//, "");
+    }
+    if (basePath.length > 0) {
+      basePath = basePath.replace(/\/$/, "");
+    }
+    this.pathname(basePath + "/" + pathname);
+    for (const [key, value] of appendUrl.getParams) {
       this.setParam(key, value);
     }
     return this;
@@ -585,8 +598,12 @@ var BuildURI = class _BuildURI {
   hasParam(key) {
     return this._url.searchParams.has(key);
   }
-  getParam(key) {
-    return falsy2undef(this._url.searchParams.get(key));
+  getParam(key, def) {
+    let val = this._url.searchParams.get(key);
+    if (!falsy2undef(val) && def) {
+      val = def;
+    }
+    return falsy2undef(val);
   }
   getParamResult(key, msgFn) {
     return getParamResult(key, this.getParam(key), msgFn);
@@ -601,6 +618,9 @@ var BuildURI = class _BuildURI {
   toJSON() {
     return this.toString();
   }
+  asURL() {
+    return this.URI().asURL();
+  }
   asObj(...strips) {
     return this.URI().asObj(...strips);
   }
@@ -683,8 +703,12 @@ var URI = class _URI {
   hasParam(key) {
     return this._url.searchParams.has(key);
   }
-  getParam(key) {
-    return falsy2undef(this._url.searchParams.get(key));
+  getParam(key, def) {
+    let val = this._url.searchParams.get(key);
+    if (!falsy2undef(val) && def) {
+      val = def;
+    }
+    return falsy2undef(val);
   }
   getParamResult(key, msgFn) {
     return getParamResult(key, this.getParam(key), msgFn);
@@ -905,7 +929,13 @@ var JSONFormatter = class {
     this._space = space;
   }
   format(attr) {
-    return this._txtEnDe.encode(JSON.stringify(attr, removeSelfRef(), this._space) + "\n");
+    let ret;
+    try {
+      ret = JSON.stringify(attr, null, this._space);
+    } catch (e) {
+      ret = JSON.stringify({ internal: { message: e.message, stack: e.stack } });
+    }
+    return this._txtEnDe.encode(ret + "\n");
   }
 };
 var YAMLFormatter = class {
@@ -914,7 +944,7 @@ var YAMLFormatter = class {
     this._space = space;
   }
   format(attr) {
-    return this._txtEnDe.encode("---\n" + YAML.stringify(attr, removeSelfRef(), this._space) + "\n");
+    return this._txtEnDe.encode("---\n" + YAML.stringify(attr, null, this._space) + "\n");
   }
 };
 var LoggerImpl = class _LoggerImpl {
@@ -975,7 +1005,7 @@ var LoggerImpl = class _LoggerImpl {
     return this._txtEnDe;
   }
   Attributes() {
-    return JSON.parse(JSON.stringify(this._attributes, removeSelfRef()));
+    return JSON.parse(JSON.stringify(this._attributes, null));
   }
   SetExposeStack(enable) {
     this._levelHandler.setExposeStack(enable);
@@ -1062,6 +1092,36 @@ var LoggerImpl = class _LoggerImpl {
     this._attributes[key] = logValue(!!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 };
+    }
+    this.Any(key || "Http", reqRes);
+    return this;
+  }
+  Pair(x) {
+    for (const key of Object.keys(x)) {
+      const value = x[key];
+      if (value instanceof LogValue) {
+        this._attributes[key] = value;
+        continue;
+      }
+      if (Result.Is(value)) {
+        this.Result(key, value);
+        continue;
+      }
+      this.Any(key, value);
+    }
+    return this;
+  }
   Result(key, res) {
     if (res.isOk()) {
       this._attributes[key] = logValue(res.Ok());
@@ -1192,6 +1252,14 @@ var WithLoggerBuilder = class {
     this._li.SetDebug(...modules);
     return this;
   }
+  Http(res, req, key) {
+    this._li.Http(res, req, key);
+    return this;
+  }
+  Pair(x) {
+    this._li.Pair(x);
+    return this;
+  }
   Str(key, value) {
     this._li.Str(key, value);
     return this;
@@ -1656,7 +1724,6 @@ export {
   hasHostPartProtocols,
   isURL,
   logValue,
-  removeSelfRef,
   runtimeFn,
   toCryptoRuntime,
   utils_exports as utils