@adviser/cement 0.2.31 → 0.2.33

package/index.d.cts

@@ -37,6 +37,8 @@ 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 StripCommand = string | RegExp;
+
 type NullOrUndef = null | undefined;
 interface URIObject {
     readonly style: "host" | "path";
@@ -73,6 +75,7 @@ declare class MutableURL extends URL {
     get searchParams(): URLSearchParams;
     toString(): string;
 }
+type keysParam = (string | ((...keys: string[]) => string))[];
 declare class BuildURI {
     _url: MutableURL;
     private constructor();
@@ -82,13 +85,17 @@ declare class BuildURI {
     hostname(h: string): BuildURI;
     protocol(p: string): BuildURI;
     pathname(p: string): BuildURI;
+    appendRelative(p: CoerceURI): BuildURI;
     delParam(key: string): BuildURI;
     defParam(key: string, str: string): BuildURI;
     setParam(key: string, str: string): BuildURI;
     hasParam(key: string): boolean;
     getParam(key: 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;
     URI(): URI;
 }
 type CoerceURI = string | URI | MutableURL | URL | BuildURI | NullOrUndef;
@@ -110,11 +117,13 @@ declare class URI {
     get getParams(): Iterable<[string, string]>;
     hasParam(key: string): boolean;
     getParam(key: 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(): HostURIObject | PathURIObject;
+    asObj(...strips: StripCommand[]): HostURIObject | PathURIObject;
 }
 
 declare enum Level {
@@ -191,6 +200,7 @@ interface WithLogger extends LoggerInterface<WithLogger> {
 }
 interface AsError {
     AsError(): Error;
+    ResultError<T>(): Result<T>;
 }
 interface Logger extends LoggerInterface<Logger> {
     With(): WithLogger;
@@ -544,6 +554,4 @@ declare function bin2string(hex: ArrayBufferView, size?: number): string;
 
 declare const VERSION: string;
 
-declare function wrapRefcounted<T, M extends string>(t: T, method: M): T;
-
-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, wrapRefcounted };
+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 };

package/index.d.ts

@@ -37,6 +37,8 @@ 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 StripCommand = string | RegExp;
+
 type NullOrUndef = null | undefined;
 interface URIObject {
     readonly style: "host" | "path";
@@ -73,6 +75,7 @@ declare class MutableURL extends URL {
     get searchParams(): URLSearchParams;
     toString(): string;
 }
+type keysParam = (string | ((...keys: string[]) => string))[];
 declare class BuildURI {
     _url: MutableURL;
     private constructor();
@@ -82,13 +85,17 @@ declare class BuildURI {
     hostname(h: string): BuildURI;
     protocol(p: string): BuildURI;
     pathname(p: string): BuildURI;
+    appendRelative(p: CoerceURI): BuildURI;
     delParam(key: string): BuildURI;
     defParam(key: string, str: string): BuildURI;
     setParam(key: string, str: string): BuildURI;
     hasParam(key: string): boolean;
     getParam(key: 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;
     URI(): URI;
 }
 type CoerceURI = string | URI | MutableURL | URL | BuildURI | NullOrUndef;
@@ -110,11 +117,13 @@ declare class URI {
     get getParams(): Iterable<[string, string]>;
     hasParam(key: string): boolean;
     getParam(key: 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(): HostURIObject | PathURIObject;
+    asObj(...strips: StripCommand[]): HostURIObject | PathURIObject;
 }
 
 declare enum Level {
@@ -191,6 +200,7 @@ interface WithLogger extends LoggerInterface<WithLogger> {
 }
 interface AsError {
     AsError(): Error;
+    ResultError<T>(): Result<T>;
 }
 interface Logger extends LoggerInterface<Logger> {
     With(): WithLogger;
@@ -544,6 +554,4 @@ declare function bin2string(hex: ArrayBufferView, size?: number): string;
 
 declare const VERSION: string;
 
-declare function wrapRefcounted<T, M extends string>(t: T, method: M): T;
-
-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, wrapRefcounted };
+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 };

package/index.js

@@ -281,6 +281,61 @@ function exception2Result(fn) {
   }
 }
 
+// src/utils/stripper.ts
+function stripper(strip, obj) {
+  const strips = Array.isArray(strip) ? strip : [strip];
+  const restrips = strips.map((s) => {
+    if (typeof s === "string") {
+      const escaped = s.replace(/[-\\[\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\^\\$\\|]/g, "\\$&");
+      return new RegExp(`^${escaped}$`);
+    }
+    return s;
+  });
+  return localStripper(void 0, restrips, obj);
+}
+function localStripper(path, restrips, obj) {
+  if (typeof obj !== "object" || obj === null) {
+    return obj;
+  }
+  const ret = __spreadValues({}, obj);
+  const matcher = (key, nextPath) => {
+    for (const re of restrips) {
+      if (re.test(key) || re.test(nextPath)) {
+        return true;
+      }
+    }
+    return false;
+  };
+  for (const key in ret) {
+    if (Object.prototype.hasOwnProperty.call(ret, key)) {
+      let nextPath;
+      if (path) {
+        nextPath = [path, key].join(".");
+      } else {
+        nextPath = key;
+      }
+      if (matcher(key, nextPath)) {
+        delete ret[key];
+        continue;
+      }
+      if (typeof ret[key] === "object") {
+        if (Array.isArray(ret[key])) {
+          ret[key] = ret[key].reduce((acc, v, i) => {
+            const toDelete = matcher(key, `${nextPath}[${i}]`);
+            if (!toDelete) {
+              acc.push(localStripper(`${nextPath}[${i}]`, restrips, v));
+            }
+            return acc;
+          }, []);
+        } else {
+          ret[key] = localStripper(nextPath, restrips, ret[key]);
+        }
+      }
+    }
+  }
+  return ret;
+}
+
 // src/uri.ts
 function falsy2undef(value) {
   return value === void 0 || value === null ? void 0 : value;
@@ -419,6 +474,35 @@ function from(fac, strURLUri, defaultProtocol) {
       throw new Error(`Invalid argument: ${typeof strURLUri}`);
   }
 }
+function getParamResult(key, val, msgFn = (key2) => {
+  return `missing parameter: ${key2}`;
+}) {
+  if (val === void 0) {
+    return Result.Err(msgFn(key));
+  }
+  return Result.Ok(val);
+}
+function getParamsResult(keys, getParam) {
+  const keyStrs = keys.flat().filter((k) => typeof k === "string");
+  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);
+    if (val === void 0) {
+      errors.push(key);
+    } else {
+      result[key] = val;
+    }
+  }
+  if (errors.length) {
+    return Result.Err(msgFn(...errors));
+  }
+  return Result.Ok(result);
+}
 var BuildURI = class _BuildURI {
   // pathname needs this
   constructor(url) {
@@ -470,6 +554,20 @@ var BuildURI = class _BuildURI {
   //   this._url.host = h;
   //   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) {
+      this.setParam(key, value);
+    }
+    return this;
+  }
   delParam(key) {
     this._url.searchParams.delete(key);
     return this;
@@ -490,6 +588,12 @@ var BuildURI = class _BuildURI {
   getParam(key) {
     return falsy2undef(this._url.searchParams.get(key));
   }
+  getParamResult(key, msgFn) {
+    return getParamResult(key, this.getParam(key), msgFn);
+  }
+  getParamsResult(...keys) {
+    return getParamsResult(keys, this);
+  }
   toString() {
     this._url.searchParams.sort();
     return this._url.toString();
@@ -497,6 +601,9 @@ var BuildURI = class _BuildURI {
   toJSON() {
     return this.toString();
   }
+  asObj(...strips) {
+    return this.URI().asObj(...strips);
+  }
   URI() {
     return URI.from(this._url);
   }
@@ -579,6 +686,12 @@ var URI = class _URI {
   getParam(key) {
     return falsy2undef(this._url.searchParams.get(key));
   }
+  getParamResult(key, msgFn) {
+    return getParamResult(key, this.getParam(key), msgFn);
+  }
+  getParamsResult(...keys) {
+    return getParamsResult(keys, this);
+  }
   clone() {
     return new _URI(this._url);
   }
@@ -591,7 +704,7 @@ var URI = class _URI {
   toJSON() {
     return this.toString();
   }
-  asObj() {
+  asObj(...strips) {
     const pathURI = {
       style: "path",
       protocol: this.protocol,
@@ -599,13 +712,13 @@ var URI = class _URI {
       searchParams: Object.fromEntries(this.getParams)
     };
     if (hasHostPartProtocols.has(this.protocol.replace(/:$/, ""))) {
-      return __spreadProps(__spreadValues({}, pathURI), {
+      return stripper(strips, __spreadProps(__spreadValues({}, pathURI), {
         style: "host",
         hostname: this.hostname,
         port: this.port
-      });
+      }));
     }
-    return pathURI;
+    return stripper(strips, pathURI);
   }
 };
 
@@ -1034,8 +1147,10 @@ var LoggerImpl = class _LoggerImpl {
       }
       return fnRet;
     });
+    const asError = () => new Error(this._txtEnDe.decode(fnError()));
     return {
-      AsError: () => new Error(this._txtEnDe.decode(fnError()))
+      ResultError: () => Result.Err(asError()),
+      AsError: asError
     };
   }
 };
@@ -1484,26 +1599,6 @@ function toCryptoRuntime(cryptoOpts = {}) {
 var VERSION = Object.keys({
   __packageVersion__: "xxxx"
 })[0];
-
-// src/refcounted.ts
-function wrapRefcounted(t, method) {
-  const my = t;
-  my.__refcounted = (my.__refcounted || 0) + 1;
-  if (my.__refcounted === 1) {
-    my.__unrefcounted = my[method];
-    const mRec = my;
-    mRec[method] = function() {
-      this.__refcounted--;
-      if (this.__refcounted === 0) {
-        this.__unrefcounted();
-      }
-      if (this.__refcounted < 0) {
-        throw new Error("already closed");
-      }
-    };
-  }
-  return t;
-}
 export {
   BaseSysAbstraction,
   BrowserEnvActions,
@@ -1564,7 +1659,6 @@ export {
   removeSelfRef,
   runtimeFn,
   toCryptoRuntime,
-  utils_exports as utils,
-  wrapRefcounted
+  utils_exports as utils
 };
 //# sourceMappingURL=index.js.map