@adviser/cement 0.4.2 → 0.4.4

package/{index-TtYD7HhB.d.cts → index-BJwthmNK.d.cts}

@@ -67,13 +67,14 @@ interface HostURIObject extends URIObject {
     readonly port: string;
 }
 declare function isURL(value: unknown): value is URL;
+declare const customInspectSymbol: unique symbol;
 declare class MutableURL extends URL {
     private readonly _sysURL;
     private _protocol;
     private _pathname;
     private _hasHostpart;
-    readonly hash: string;
     constructor(urlStr: string);
+    [customInspectSymbol](): string;
     clone(): MutableURL;
     get host(): string;
     get port(): string;
@@ -84,7 +85,10 @@ declare class MutableURL extends URL {
     get pathname(): string;
     get protocol(): string;
     set protocol(p: string);
+    get hash(): string;
+    set hash(h: string);
     get searchParams(): URLSearchParams;
+    get search(): string;
     toString(): string;
 }
 declare class BuildURI implements URIInterface<BuildURI> {
@@ -97,9 +101,11 @@ declare class BuildURI implements URIInterface<BuildURI> {
     hostname(h: string): BuildURI;
     protocol(p: string): BuildURI;
     pathname(p: string): BuildURI;
+    hash(h: string): BuildURI;
     resolve(p: CoerceURI): BuildURI;
     appendRelative(p: CoerceURI): BuildURI;
-    cleanParams(): BuildURI;
+    cleanParams(...remove: (string | string[])[]): BuildURI;
+    hashParams(val: Record<string, string | number | boolean | Date | null | undefined>, mode?: "reset" | "merge"): BuildURI;
     delParam(key: string): BuildURI;
     defParam(key: string, str: string): BuildURI;
     setParam(key: string, str: string): BuildURI;
@@ -108,6 +114,7 @@ declare class BuildURI implements URIInterface<BuildURI> {
     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>>;
+    getHashParams(...keys: KeysParam): Result<Record<string, string>>;
     toString(): string;
     toJSON(): string;
     asURL(): URL;
@@ -129,15 +136,18 @@ declare class URI implements URIInterface<URI> {
     private constructor();
     build(): BuildURI;
     get hostname(): string;
+    get local(): string;
     get port(): string;
     get host(): string;
     get protocol(): string;
     get pathname(): string;
+    get hash(): string;
     get 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>>;
+    getHashParams(...keys: KeysParam): Result<Record<string, string>>;
     clone(): URI;
     asURL(): URL;
     toString(): string;

package/{index-N0bkrgSt.d.ts → index-Bh_2ZgIk.d.ts}

@@ -67,13 +67,14 @@ interface HostURIObject extends URIObject {
     readonly port: string;
 }
 declare function isURL(value: unknown): value is URL;
+declare const customInspectSymbol: unique symbol;
 declare class MutableURL extends URL {
     private readonly _sysURL;
     private _protocol;
     private _pathname;
     private _hasHostpart;
-    readonly hash: string;
     constructor(urlStr: string);
+    [customInspectSymbol](): string;
     clone(): MutableURL;
     get host(): string;
     get port(): string;
@@ -84,7 +85,10 @@ declare class MutableURL extends URL {
     get pathname(): string;
     get protocol(): string;
     set protocol(p: string);
+    get hash(): string;
+    set hash(h: string);
     get searchParams(): URLSearchParams;
+    get search(): string;
     toString(): string;
 }
 declare class BuildURI implements URIInterface<BuildURI> {
@@ -97,9 +101,11 @@ declare class BuildURI implements URIInterface<BuildURI> {
     hostname(h: string): BuildURI;
     protocol(p: string): BuildURI;
     pathname(p: string): BuildURI;
+    hash(h: string): BuildURI;
     resolve(p: CoerceURI): BuildURI;
     appendRelative(p: CoerceURI): BuildURI;
-    cleanParams(): BuildURI;
+    cleanParams(...remove: (string | string[])[]): BuildURI;
+    hashParams(val: Record<string, string | number | boolean | Date | null | undefined>, mode?: "reset" | "merge"): BuildURI;
     delParam(key: string): BuildURI;
     defParam(key: string, str: string): BuildURI;
     setParam(key: string, str: string): BuildURI;
@@ -108,6 +114,7 @@ declare class BuildURI implements URIInterface<BuildURI> {
     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>>;
+    getHashParams(...keys: KeysParam): Result<Record<string, string>>;
     toString(): string;
     toJSON(): string;
     asURL(): URL;
@@ -129,15 +136,18 @@ declare class URI implements URIInterface<URI> {
     private constructor();
     build(): BuildURI;
     get hostname(): string;
+    get local(): string;
     get port(): string;
     get host(): string;
     get protocol(): string;
     get pathname(): string;
+    get hash(): string;
     get 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>>;
+    getHashParams(...keys: KeysParam): Result<Record<string, string>>;
     clone(): URI;
     asURL(): URL;
     toString(): string;

package/index.cjs

@@ -722,6 +722,15 @@ function coerceKey(key, def) {
   }
   return { key, def };
 }
+function resolveHash(hash) {
+  const searchParams = new URLSearchParams(hash.replace(/^#/, ""));
+  return {
+    getParam: (k) => {
+      const ret = searchParams.get(k);
+      return ret === null ? void 0 : ret;
+    }
+  };
+}
 function falsy2undef(value) {
   return value === void 0 || value === null ? void 0 : value;
 }
@@ -742,7 +751,9 @@ function ensureURLWithDefaultProto(url, defaultProtocol) {
 function isURL(value) {
   return value instanceof URL || !!value && typeof value.searchParams === "object" && typeof value.searchParams.sort === "function" && typeof value.hash === "string";
 }
+var customInspectSymbol = Symbol.for("nodejs.util.inspect.custom");
 var MutableURL = class _MutableURL extends URL {
+  // override readonly hash: string;
   constructor(urlStr) {
     super("defect://does.not.exist");
     const partedURL = urlStr.split(":");
@@ -765,7 +776,9 @@ var MutableURL = class _MutableURL extends URL {
     } else {
       this._pathname = urlStr.replace(new RegExp(`^${this._protocol}//`), "").replace(/[#?].*$/, "");
     }
-    this.hash = this._sysURL.hash;
+  }
+  [customInspectSymbol]() {
+    return this.toString();
   }
   clone() {
     return new _MutableURL(this.toString());
@@ -817,16 +830,26 @@ var MutableURL = class _MutableURL extends URL {
     }
     this._protocol = p;
   }
+  get hash() {
+    return this._sysURL.hash;
+  }
+  set hash(h) {
+    this._sysURL.hash = h;
+  }
   get searchParams() {
     return this._sysURL.searchParams;
   }
-  toString() {
+  get search() {
     let search = "";
     if (this._sysURL.searchParams.size) {
       for (const [key, value] of Array.from(this._sysURL.searchParams.entries()).sort((a, b) => a[0].localeCompare(b[0]))) {
         search += `${!search.length ? "?" : "&"}${key}=${encodeURIComponent(value)}`;
       }
     }
+    return search;
+  }
+  toString() {
+    const search = this.search;
     let hostpart = "";
     if (this._hasHostpart) {
       hostpart = this._sysURL.hostname;
@@ -837,7 +860,7 @@ var MutableURL = class _MutableURL extends URL {
         hostpart += "/";
       }
     }
-    return `${this._protocol}//${hostpart}${this._pathname}${search}`;
+    return `${this._protocol}//${hostpart}${this._pathname}${search}${this.hash}`;
   }
 };
 function from(fac, strURLUri, defaultProtocol) {
@@ -900,6 +923,10 @@ var BuildURI = class _BuildURI {
     this._url.pathname = p;
     return this;
   }
+  hash(h) {
+    this._url.hash = h;
+    return this;
+  }
   // could pass a relative path or a full URL
   // if relative path, it will be appended to the current path
   resolve(p) {
@@ -928,12 +955,51 @@ var BuildURI = class _BuildURI {
     }
     return this;
   }
-  cleanParams() {
+  cleanParams(...remove) {
+    const keys = new Set(remove.flat());
     for (const key of Array.from(this._url.searchParams.keys())) {
-      this._url.searchParams.delete(key);
+      if (keys.size === 0 || keys.has(key)) {
+        this._url.searchParams.delete(key);
+      }
     }
     return this;
   }
+  hashParams(val, mode = "reset") {
+    let preset;
+    switch (mode) {
+      case "reset":
+        this._url.hash = "";
+        preset = {};
+        break;
+      case "merge":
+      default:
+        preset = Object.fromEntries(new URLSearchParams(this._url.hash.replace(/^#/, "")).entries());
+        break;
+    }
+    const out = new URLSearchParams("");
+    for (const [key, value] of Object.entries({ ...preset, ...val }).sort((a, b) => a[0].localeCompare(b[0]))) {
+      switch (typeof value) {
+        case "string":
+          out.set(key, value);
+          break;
+        case "number":
+          out.set(key, value.toString());
+          break;
+        case "boolean":
+          out.set(key, value ? "true" : "false");
+          break;
+        default:
+          if (value instanceof Date) {
+            out.set(key, value.toISOString());
+          } else {
+            console.error(`unsupported type: ${typeof value} ignore key: ${key}`);
+          }
+          break;
+      }
+    }
+    this._url.hash = out.toString();
+    return this;
+  }
   delParam(key) {
     this._url.searchParams.delete(key);
     return this;
@@ -968,6 +1034,9 @@ var BuildURI = class _BuildURI {
   getParamsResult(...keys) {
     return getParamsResult(keys, this);
   }
+  getHashParams(...keys) {
+    return getParamsResult(keys, resolveHash(this._url.hash));
+  }
   toString() {
     this._url.searchParams.sort();
     return this._url.toString();
@@ -1051,6 +1120,9 @@ var URI = class _URI {
   get hostname() {
     return this._url.hostname;
   }
+  get local() {
+    return this._url.pathname + this._url.search;
+  }
   // get password(): string {
   //   return this._url.password;
   // }
@@ -1072,9 +1144,9 @@ var URI = class _URI {
   get pathname() {
     return this._url.pathname;
   }
-  // get hash(): string {
-  //   return this._url.hash;
-  // }
+  get hash() {
+    return this._url.hash;
+  }
   // get host(): string {
   //   return this._url.host;
   // }
@@ -1098,6 +1170,9 @@ var URI = class _URI {
   getParamsResult(...keys) {
     return getParamsResult(keys, this);
   }
+  getHashParams(...keys) {
+    return getParamsResult(keys, resolveHash(this._url.hash));
+  }
   clone() {
     return new _URI(this._url);
   }