@adviser/cement 0.4.3 → 0.4.5

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;
 }
@@ -744,6 +753,7 @@ function isURL(value) {
 }
 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(":");
@@ -766,7 +776,6 @@ 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();
@@ -821,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;
@@ -841,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) {
@@ -904,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) {
@@ -932,10 +955,49 @@ 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) {
@@ -972,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();
@@ -1055,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;
   // }
@@ -1076,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;
   // }
@@ -1102,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);
   }
@@ -3508,7 +3579,11 @@ var pathOpsImpl = class {
     __privateAdd(this, _pathOpsImpl_instances);
   }
   join(...paths) {
-    return paths.map((i) => i.replace(/\/+$/, "")).join("/");
+    const parts = __privateMethod(this, _pathOpsImpl_instances, parts_fn).call(this, paths.filter((i) => i).join("/"));
+    if (parts.dirname === "" || parts.dirname === ".") {
+      return parts.basename ? parts.basename : ".";
+    }
+    return parts.dirname + "/" + parts.basename;
   }
   dirname(path) {
     return __privateMethod(this, _pathOpsImpl_instances, parts_fn).call(this, path).dirname;
@@ -3519,14 +3594,18 @@ var pathOpsImpl = class {
 };
 _pathOpsImpl_instances = new WeakSet();
 parts_fn = function(path) {
+  path = path.replace(/\/+/g, "/").replace(/(\/\.\/)+/g, "/").replace(/\/+$/, "");
   const splitted = path.split("/");
-  const last = splitted.pop();
-  if (splitted.length && last === "") {
-    return __privateMethod(this, _pathOpsImpl_instances, parts_fn).call(this, this.join(...splitted));
+  if (splitted.length === 1) {
+    return {
+      dirname: ".",
+      basename: splitted[0] === "." ? "" : splitted[0]
+    };
   }
+  const basename = splitted.pop();
   return {
-    dirname: this.join(...splitted),
-    basename: last != null ? last : ""
+    dirname: splitted.join("/").replace(/^\.\//, ""),
+    basename
   };
 };
 var pathOps = new pathOpsImpl();