@adviser/cement 0.2.36 → 0.2.37

package/index.cjs

@@ -1278,7 +1278,7 @@ function getParamsResult(keys, getParam) {
       if (typeof i === "string") {
         acc.push({ key: i });
       } else if (typeof i === "object") {
-        acc.push(...Object.keys(i).map((k) => ({ key: k, def: i[k] })));
+        acc.push(...Object.keys(i).map((k) => ({ key: k, def: typeof i[k] === "string" ? i[k] : void 0 })));
       }
       return acc;
     },
@@ -1293,7 +1293,7 @@ function getParamsResult(keys, getParam) {
   for (const kd of keyDef) {
     const val = getParam.getParam(kd.key);
     if (val === void 0) {
-      if (kd.def) {
+      if (typeof kd.def === "string") {
         result[kd.key] = kd.def;
       } else {
         errors.push(kd.key);
@@ -1957,19 +1957,29 @@ var LoggerImpl = class _LoggerImpl {
     this.coerceKey(key, !!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 };
+  Http(...mix) {
+    const key = mix.find((x) => typeof x === "string");
+    mix = mix.filter((x) => typeof x !== "string");
+    const resErrors = mix.filter((x) => Result.Is(x) && x.isErr());
+    if (resErrors.length) {
+      this.Err(resErrors.map((x) => x.Err().message).join("\n"));
+      return this;
+    }
+    const req = mix.map((reqOrResult) => Result.Is(reqOrResult) ? reqOrResult.Ok() : reqOrResult).find((req2) => typeof req2.status !== "number");
+    const res = mix.map((resOrResult) => Result.Is(resOrResult) ? resOrResult.Ok() : resOrResult).find((res2) => typeof res2.status === "number");
+    let reqAndOrres;
+    if (res && req) {
+      reqAndOrres = { res, req };
+    } else if (!res && !req) {
+      reqAndOrres = void 0;
+    } else if (res) {
+      reqAndOrres = res;
+    } else if (req) {
+      reqAndOrres = req;
+    }
+    if (reqAndOrres) {
+      this.Any(key || "Http", reqAndOrres);
     }
-    this.Any(key || "Http", reqRes);
     return this;
   }
   Pair(x) {
@@ -2124,8 +2134,8 @@ var WithLoggerBuilder = class {
     this._li.SetDebug(...modules);
     return this;
   }
-  Http(res, req, key) {
-    this._li.Http(res, req, key);
+  Http(...mix) {
+    this._li.Http(...mix);
     return this;
   }
   Pair(x) {