@adviser/cement 0.2.35 → 0.2.37

package/{chunk-7KFVMTOS.js → chunk-USQXEZHL.js}

@@ -224,22 +224,22 @@ var ConsoleWriterStreamDefaultWriter = class {
     this.closed = Promise.resolve(void 0);
   }
   async write(chunk) {
-    const str = this.decoder.decode(chunk).trimEnd();
+    let strObj = this.decoder.decode(chunk).trimEnd();
     let output = "log";
     try {
-      const decode = JSON.parse(str);
-      output = decode.level;
+      strObj = JSON.parse(strObj);
+      output = strObj.level;
     } catch (e) {
     }
     switch (output) {
       case "error":
-        console.error(str);
+        console.error(strObj);
         break;
       case "warn":
-        console.warn(str);
+        console.warn(strObj);
         break;
       default:
-        console.log(str);
+        console.log(strObj);
     }
   }
 };
@@ -308,4 +308,4 @@ export {
   uint8array2stream,
   utils_exports
 };
-//# sourceMappingURL=chunk-7KFVMTOS.js.map
+//# sourceMappingURL=chunk-USQXEZHL.js.map

package/chunk-USQXEZHL.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utils/index.ts","../../src/utils/stream-map.ts","../../src/utils/rebuffer.ts","../../src/utils/stream2string.ts","../../src/utils/string2stream.ts","../../src/utils/console-write-stream.ts","../../src/utils/fanout-write-stream.ts"],"sourcesContent":["export * from \"./rebuffer.js\";\nexport * from \"./stream-map.js\";\nexport * from \"./stream2string.js\";\nexport * from \"./string2stream.js\";\nexport * from \"./console-write-stream.js\";\nexport * from \"./fanout-write-stream.js\";\n","export interface StreamMap<T, U> {\n  Map(s: T, idx: number): U | Promise<U>;\n  readonly Close?: () => void;\n}\nexport function streamMap<T, U>(s: ReadableStream<T>, sm: StreamMap<T, U>): ReadableStream<U> {\n  const state = { reader: s.getReader(), streamMap: sm, idx: 0 };\n  return new ReadableStream<U>({\n    async pull(controller): Promise<void> {\n      const { done, value } = await state.reader.read();\n      if (done) {\n        if (state.streamMap.Close) {\n          state.streamMap.Close();\n        }\n        controller.close();\n        return;\n      }\n      const promiseOrU = state.streamMap.Map(value, state.idx++);\n      let mapped: U;\n      if (promiseOrU instanceof Promise || typeof (promiseOrU as { then: () => void }).then === \"function\") {\n        mapped = await promiseOrU;\n      } else {\n        mapped = promiseOrU;\n      }\n      controller.enqueue(mapped);\n    },\n  });\n}\n\nexport async function devnull<T>(a: ReadableStream<T>): Promise<number> {\n  const reader = a.getReader();\n  let cnt = 0;\n  while (true) {\n    const { done } = await reader.read();\n    if (done) {\n      break;\n    }\n    cnt++;\n  }\n  return cnt;\n}\n\nexport function array2stream<T>(a: T[]): ReadableStream<T> {\n  let i = 0;\n  return new ReadableStream<T>({\n    pull(controller): void {\n      if (i >= a.length) {\n        controller.close();\n        return;\n      }\n      controller.enqueue(a[i]);\n      i++;\n    },\n  });\n}\n\nexport async function stream2array<T>(a: ReadableStream<T>): Promise<T[]> {\n  const ret: T[] = [];\n  const reader = a.getReader();\n  while (true) {\n    const { done, value } = await reader.read();\n    if (done) {\n      break;\n    }\n    ret.push(value);\n  }\n  return ret;\n}\n","import { array2stream, stream2array } from \"./stream-map.js\";\n\ninterface ReChunkResult {\n  readonly rest: Uint8Array;\n  readonly chunk: Uint8Array;\n}\n\nexport async function rebufferArray(a: Uint8Array[], chunkSize: number): Promise<Uint8Array[]> {\n  return stream2array(rebuffer(array2stream(a), chunkSize));\n}\n\nfunction reChunk(cs: Uint8Array[], chunkSize: number): ReChunkResult {\n  const len = cs.reduce((acc, v) => acc + v.length, 0);\n  const last = cs[cs.length - 1];\n  const lastOfs = len - last.length;\n  // console.log(\"reChunk\", len, lastOfs, last.length, chunkSize, chunkSize - lastOfs)\n  const rest = last.subarray(chunkSize - lastOfs);\n  cs[cs.length - 1] = last.subarray(0, chunkSize - lastOfs);\n  const chunk = new Uint8Array(chunkSize);\n  let ofs = 0;\n  for (const c of cs) {\n    chunk.set(c, ofs);\n    ofs += c.length;\n  }\n  return { rest, chunk };\n}\n\ninterface pumpState {\n  readonly reader: ReadableStreamDefaultReader<Uint8Array>;\n  tmp: Uint8Array[];\n  tmpLen: number;\n  readonly chunkSize: number;\n}\n\nfunction pump(ps: pumpState, controller: ReadableStreamDefaultController<Uint8Array>, next: () => void): void {\n  ps.reader.read().then(({ done, value }) => {\n    if (done) {\n      if (ps.tmpLen > 0) {\n        controller.enqueue(reChunk(ps.tmp, ps.tmpLen).chunk);\n      }\n      controller.close();\n      next();\n      return;\n    }\n    if (ps.tmpLen + value.length > ps.chunkSize) {\n      ps.tmp.push(value);\n      const res = reChunk(ps.tmp, ps.chunkSize);\n      controller.enqueue(res.chunk);\n      ps.tmp = [res.rest];\n      ps.tmpLen = res.rest.length;\n      next();\n      return;\n    } else if (value.length) {\n      ps.tmp.push(value);\n      ps.tmpLen += value.length;\n    }\n    pump(ps, controller, next);\n  });\n}\n\nexport function rebuffer(a: ReadableStream<Uint8Array>, chunkSize: number): ReadableStream<Uint8Array> {\n  const state: pumpState = {\n    reader: a.getReader(),\n    tmp: [],\n    tmpLen: 0,\n    chunkSize,\n  };\n  return new ReadableStream<Uint8Array>({\n    async pull(controller): Promise<void> {\n      return new Promise<void>((resolve) => {\n        pump(state, controller, resolve);\n      });\n    },\n  });\n}\n","export async function stream2string(stream?: ReadableStream<Uint8Array> | null, maxSize?: number): Promise<string> {\n  if (!stream) {\n    return Promise.resolve(\"\");\n  }\n  const reader = stream.getReader();\n  let res = \"\";\n  const decoder = new TextDecoder();\n  let rSize = 0;\n  while (typeof maxSize === \"undefined\" || rSize < maxSize) {\n    try {\n      const read = await reader.read();\n      if (read.done) {\n        break;\n      }\n      if (maxSize && rSize + read.value.length > maxSize) {\n        read.value = read.value.slice(0, maxSize - rSize);\n      }\n      const block = decoder.decode(read.value, { stream: true });\n      rSize += read.value.length;\n      res += block;\n    } catch (err) {\n      return Promise.reject(err);\n    }\n  }\n  return Promise.resolve(res);\n}\n\nexport async function stream2uint8array(stream?: ReadableStream<Uint8Array> | null): Promise<Uint8Array> {\n  if (!stream) {\n    return Promise.resolve(new Uint8Array());\n  }\n  const reader = stream.getReader();\n  let res = new Uint8Array();\n  // eslint-disable-next-line no-constant-condition\n  while (1) {\n    try {\n      const { done, value } = await reader.read();\n      if (done) {\n        break;\n      }\n      res = new Uint8Array([...res, ...value]);\n    } catch (err) {\n      return Promise.reject(err);\n    }\n  }\n  return Promise.resolve(res);\n}\n","import { TxtEnDecoder, Utf8EnDecoderSingleton } from \"../txt-en-decoder.js\";\n\nexport function string2stream(str: string, ende: TxtEnDecoder = Utf8EnDecoderSingleton()): ReadableStream<Uint8Array> {\n  return uint8array2stream(ende.encode(str));\n}\n\nexport function uint8array2stream(str: Uint8Array): ReadableStream<Uint8Array> {\n  return new ReadableStream<Uint8Array>({\n    start(controller): void {\n      controller.enqueue(str);\n      controller.close();\n    },\n  });\n}\n","export class ConsoleWriterStreamDefaultWriter implements WritableStreamDefaultWriter<Uint8Array> {\n  readonly desiredSize: number | null = null;\n  readonly decoder: TextDecoder = new TextDecoder();\n\n  closed: Promise<undefined>;\n  ready: Promise<undefined>;\n  readonly _stream: ConsoleWriterStream;\n\n  constructor(private stream: ConsoleWriterStream) {\n    this._stream = stream;\n    this.ready = Promise.resolve(undefined);\n    this.closed = Promise.resolve(undefined);\n  }\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any\n  abort(reason?: any): Promise<void> {\n    throw new Error(\"Method not implemented.\");\n  }\n  async close(): Promise<void> {\n    // noop\n  }\n  releaseLock(): void {\n    this._stream.locked = false;\n    this.ready = Promise.resolve(undefined);\n    this.closed = Promise.resolve(undefined);\n  }\n  async write(chunk?: Uint8Array | undefined): Promise<void> {\n    let strObj: string | { level: string } = this.decoder.decode(chunk).trimEnd();\n    let output = \"log\";\n    try {\n      strObj = JSON.parse(strObj) as { level: string };\n      output = strObj.level;\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    } catch (e) {\n      /* noop */\n    }\n    switch (output) {\n      case \"error\":\n        // eslint-disable-next-line no-console\n        console.error(strObj);\n        break;\n      case \"warn\":\n        // eslint-disable-next-line no-console\n        console.warn(strObj);\n        break;\n      default:\n        // eslint-disable-next-line no-console\n        console.log(strObj);\n    }\n  }\n}\n\nexport class ConsoleWriterStream implements WritableStream<Uint8Array> {\n  locked = false;\n  _writer?: WritableStreamDefaultWriter<Uint8Array>;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unused-vars\n  abort(reason?: any): Promise<void> {\n    throw new Error(\"Method not implemented.\");\n  }\n  async close(): Promise<void> {\n    return;\n  }\n  getWriter(): WritableStreamDefaultWriter<Uint8Array> {\n    if (this.locked) {\n      throw new Error(\"Stream is locked\");\n    }\n    this.locked = true;\n    if (!this._writer) {\n      this._writer = new ConsoleWriterStreamDefaultWriter(this);\n    }\n    return this._writer;\n  }\n}\n","export class FanoutWriteStream implements WritableStreamDefaultWriter<Uint8Array> {\n  readonly _writers: WritableStreamDefaultWriter<Uint8Array>[];\n  readonly ready: Promise<undefined>;\n  readonly closed: Promise<undefined>;\n  readonly desiredSize: number | null = null;\n  constructor(writers: WritableStreamDefaultWriter<Uint8Array>[]) {\n    this._writers = writers;\n    this.ready = Promise.all(this._writers.map((w) => w.ready)).then(() => undefined);\n    this.closed = Promise.all(this._writers.map((w) => w.closed)).then(() => undefined);\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  abort(reason?: any): Promise<void> {\n    return Promise.all(this._writers.map((w) => w.abort(reason))).then(() => {\n      /* do nothing */\n    });\n  }\n  close(): Promise<void> {\n    return Promise.all(this._writers.map((w) => w.close())).then(() => {\n      /* do nothing */\n    });\n  }\n  releaseLock(): void {\n    this._writers.map((w) => w.releaseLock());\n  }\n\n  write(chunk?: Uint8Array | undefined): Promise<void> {\n    return Promise.all(this._writers.map((w) => w.write(chunk))).then(() => {\n      /* do nothing */\n    });\n  }\n}\n"],"mappings":"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","names":[]}

package/index.cjs

@@ -1117,6 +1117,16 @@ function localStripper(path, restrips, obj) {
 }
 
 // src/uri.ts
+function coerceKey(key, def) {
+  if (typeof key === "object") {
+    const keys = Object.keys(key);
+    if (keys.length !== 1) {
+      throw new Error(`Invalid key: ${JSON.stringify(key)}`);
+    }
+    return { key: keys[0], def: key[keys[0]] };
+  }
+  return { key, def };
+}
 function falsy2undef(value) {
   return value === void 0 || value === null ? void 0 : value;
 }
@@ -1263,19 +1273,33 @@ function getParamResult(key, val, msgFn = (key2) => {
   return Result.Ok(val);
 }
 function getParamsResult(keys, getParam) {
-  const keyStrs = keys.flat().filter((k) => typeof k === "string");
+  const keyDef = keys.flat().reduce(
+    (acc, i) => {
+      if (typeof i === "string") {
+        acc.push({ key: i });
+      } else if (typeof i === "object") {
+        acc.push(...Object.keys(i).map((k) => ({ key: k, def: typeof i[k] === "string" ? i[k] : void 0 })));
+      }
+      return acc;
+    },
+    []
+  );
   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);
+  for (const kd of keyDef) {
+    const val = getParam.getParam(kd.key);
     if (val === void 0) {
-      errors.push(key);
+      if (typeof kd.def === "string") {
+        result[kd.key] = kd.def;
+      } else {
+        errors.push(kd.key);
+      }
     } else {
-      result[key] = val;
+      result[kd.key] = val;
     }
   }
   if (errors.length) {
@@ -1367,10 +1391,14 @@ var BuildURI = class _BuildURI {
   hasParam(key) {
     return this._url.searchParams.has(key);
   }
+  get getParams() {
+    return this._url.searchParams.entries();
+  }
   getParam(key, def) {
-    let val = this._url.searchParams.get(key);
-    if (!falsy2undef(val) && def) {
-      val = def;
+    const { key: k, def: d } = coerceKey(key, def);
+    let val = this._url.searchParams.get(k);
+    if (!falsy2undef(val) && d) {
+      val = d;
     }
     return falsy2undef(val);
   }
@@ -1393,6 +1421,9 @@ var BuildURI = class _BuildURI {
   asObj(...strips) {
     return this.URI().asObj(...strips);
   }
+  clone() {
+    return _BuildURI.from(this.toString());
+  }
   URI() {
     return URI.from(this._url);
   }
@@ -1473,9 +1504,10 @@ var URI = class _URI {
     return this._url.searchParams.has(key);
   }
   getParam(key, def) {
-    let val = this._url.searchParams.get(key);
-    if (!falsy2undef(val) && def) {
-      val = def;
+    const { key: k, def: d } = coerceKey(key, def);
+    let val = this._url.searchParams.get(k);
+    if (!falsy2undef(val) && d) {
+      val = d;
     }
     return falsy2undef(val);
   }
@@ -1564,22 +1596,22 @@ var ConsoleWriterStreamDefaultWriter = class {
     this.closed = Promise.resolve(void 0);
   }
   async write(chunk) {
-    const str = this.decoder.decode(chunk).trimEnd();
+    let strObj = this.decoder.decode(chunk).trimEnd();
     let output = "log";
     try {
-      const decode = JSON.parse(str);
-      output = decode.level;
+      strObj = JSON.parse(strObj);
+      output = strObj.level;
     } catch (e) {
     }
     switch (output) {
       case "error":
-        console.error(str);
+        console.error(strObj);
         break;
       case "warn":
-        console.warn(str);
+        console.warn(strObj);
         break;
       default:
-        console.log(str);
+        console.log(strObj);
     }
   }
 };
@@ -1922,22 +1954,32 @@ var LoggerImpl = class _LoggerImpl {
     return this;
   }
   Bool(key, value) {
-    this._attributes[key] = logValue(!!value);
+    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();
+  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);
     }
-    let reqRes = res;
-    if (req) {
-      reqRes = { res, req };
-    }
-    this.Any(key || "Http", reqRes);
     return this;
   }
   Pair(x) {
@@ -1975,12 +2017,19 @@ var LoggerImpl = class _LoggerImpl {
     this.Ref(key, () => URI.from(url).toString());
     return this;
   }
+  coerceKey(key, value) {
+    if (typeof key === "string") {
+      this._attributes[key] = logValue(value);
+    } else {
+      this.Pair(key);
+    }
+  }
   Str(key, value) {
-    this._attributes[key] = logValue(value);
+    this.coerceKey(key, value);
     return this;
   }
   Any(key, value) {
-    this._attributes[key] = logValue(value);
+    this.coerceKey(key, value);
     return this;
   }
   Dur(key, nsec) {
@@ -1988,7 +2037,7 @@ var LoggerImpl = class _LoggerImpl {
     return this;
   }
   Uint64(key, value) {
-    this._attributes[key] = logValue(value);
+    this.coerceKey(key, value);
     return this;
   }
   Int(key, value) {
@@ -2085,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) {