@adviser/cement 0.2.33 → 0.2.35

package/index.cjs

@@ -143,7 +143,6 @@ __export(src_exports, {
   hasHostPartProtocols: () => hasHostPartProtocols,
   isURL: () => isURL,
   logValue: () => logValue,
-  removeSelfRef: () => removeSelfRef,
   runtimeFn: () => runtimeFn,
   toCryptoRuntime: () => toCryptoRuntime,
   utils: () => utils_exports
@@ -212,22 +211,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");
 }
@@ -254,19 +247,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) {
@@ -274,7 +279,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);
@@ -1067,6 +1074,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) {
@@ -1325,15 +1335,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;
@@ -1355,8 +1367,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);
@@ -1371,6 +1387,9 @@ var BuildURI = class _BuildURI {
   toJSON() {
     return this.toString();
   }
+  asURL() {
+    return this.URI().asURL();
+  }
   asObj(...strips) {
     return this.URI().asObj(...strips);
   }
@@ -1453,8 +1472,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);
@@ -1739,7 +1762,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 {
@@ -1748,7 +1777,7 @@ var YAMLFormatter = class {
     this._space = space;
   }
   format(attr) {
-    return this._txtEnDe.encode("---\n" + import_yaml.default.stringify(attr, removeSelfRef(), this._space) + "\n");
+    return this._txtEnDe.encode("---\n" + import_yaml.default.stringify(attr, null, this._space) + "\n");
   }
 };
 var LoggerImpl = class _LoggerImpl {
@@ -1809,7 +1838,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);
@@ -1896,6 +1925,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());
@@ -2026,6 +2085,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;
@@ -2716,7 +2783,6 @@ function uint8array2stream(str) {
   hasHostPartProtocols,
   isURL,
   logValue,
-  removeSelfRef,
   runtimeFn,
   toCryptoRuntime,
   utils