@adviser/cement 0.3.4 → 0.3.6

package/index.cjs

@@ -35,8 +35,8 @@ var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   BaseSysAbstraction: () => BaseSysAbstraction,
   BuildURI: () => BuildURI,
   ConstTime: () => ConstTime,
@@ -95,12 +95,13 @@ __export(src_exports, {
   isURL: () => isURL,
   key: () => key,
   logValue: () => logValue,
+  param: () => param2,
   registerEnvAction: () => registerEnvAction,
   runtimeFn: () => runtimeFn,
   toCryptoRuntime: () => toCryptoRuntime,
   utils: () => utils_exports
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/logger-impl.ts
 var import_yaml = __toESM(require("yaml"), 1);
@@ -463,13 +464,15 @@ var BaseSysAbstraction = class {
     this._systemService = params.SystemService;
     this._txtEnDe = params.TxtEnDecoder;
     const decoder2 = this._txtEnDe;
-    this._stdout = CFWriteableStream(async (chunk) => {
+    this._stdout = CFWriteableStream((chunk) => {
       const decoded = decoder2.decode(chunk);
       console.log(decoded.trimEnd());
+      return Promise.resolve();
     });
-    this._stderr = CFWriteableStream(async (chunk) => {
+    this._stderr = CFWriteableStream((chunk) => {
       const decoded = decoder2.decode(chunk);
       console.error(decoded.trimEnd());
+      return Promise.resolve();
     });
   }
 };
@@ -567,20 +570,21 @@ var ResolveSeq = class {
   }
   reset() {
   }
-  async _step(item) {
+  _step(item) {
     if (!item) {
-      return;
+      return Promise.resolve();
     }
     item.fn(this.ctx).then((value) => item.future.resolve(value)).catch((e) => item.future.reject(e)).finally(() => {
       this._seqFutures.shift();
-      this._step(this._seqFutures[0]);
+      void this._step(this._seqFutures[0]);
     });
+    return Promise.resolve();
   }
   async add(fn, id) {
     const future = new Future();
     this._seqFutures.push({ future, fn, id });
     if (this._seqFutures.length === 1) {
-      this._step(this._seqFutures[0]);
+      void this._step(this._seqFutures[0]);
     }
     return future.asPromise();
   }
@@ -716,7 +720,10 @@ function isSet(value, ref = globalThis) {
 }
 function runtimeFn() {
   const gt = globalThis;
-  let isReactNative = isSet("navigator.product") && typeof gt["navigator"] === "object" && gt["navigator"]["product"] === "ReactNative";
+  let isReactNative = (
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    isSet("navigator.product") && typeof gt["navigator"] === "object" && gt["navigator"]["product"] === "ReactNative"
+  );
   let isNodeIsh = false;
   if (!isSet("Deno")) {
     isNodeIsh = isSet("process.versions.node") && !isReactNative;
@@ -901,6 +908,156 @@ var CFEnvActions = class _CFEnvActions {
   }
 };
 
+// src/result.ts
+var Result = class _Result {
+  static Ok(t) {
+    return new ResultOK(t);
+  }
+  static Err(t) {
+    if (typeof t === "string") {
+      return new ResultError(new Error(t));
+    }
+    if (_Result.Is(t)) {
+      if (t.is_ok()) {
+        return new ResultError(new Error("Result Error is Ok"));
+      }
+      return t;
+    }
+    return new ResultError(t);
+  }
+  static Is(t) {
+    if (!t) {
+      return false;
+    }
+    if (t instanceof _Result) {
+      return true;
+    }
+    const rt = t;
+    if ([typeof rt.is_ok, typeof rt.is_err, typeof rt.unwrap, typeof rt.unwrap_err].every((x) => x === "function")) {
+      return true;
+    }
+    return false;
+  }
+  isOk() {
+    return this.is_ok();
+  }
+  isErr() {
+    return this.is_err();
+  }
+  Ok() {
+    return this.unwrap();
+  }
+  Err() {
+    return this.unwrap_err();
+  }
+};
+var ResultOK = class extends Result {
+  constructor(t) {
+    super();
+    this._t = t;
+  }
+  is_ok() {
+    return true;
+  }
+  is_err() {
+    return false;
+  }
+  unwrap_err() {
+    throw new Error("Result is Ok");
+  }
+  unwrap() {
+    return this._t;
+  }
+};
+var ResultError = class extends Result {
+  constructor(t) {
+    super();
+    this._error = t;
+  }
+  is_ok() {
+    return false;
+  }
+  is_err() {
+    return true;
+  }
+  unwrap() {
+    throw new Error(`Result is Err: ${this._error}`);
+  }
+  unwrap_err() {
+    return this._error;
+  }
+};
+function exception2Result(fn) {
+  try {
+    const res = fn();
+    if (res instanceof Promise) {
+      return res.then((value) => Result.Ok(value)).catch((e) => Result.Err(e));
+    }
+    return Result.Ok(res);
+  } catch (e) {
+    return Result.Err(e);
+  }
+}
+
+// src/utils/get-params-result.ts
+var _REQUIRED = class {
+  constructor() {
+    this.val = "REQUIRED";
+  }
+};
+var _OPTIONAL = class {
+  constructor() {
+    this.val = "OPTIONAL";
+  }
+};
+var param = {
+  REQUIRED: new _REQUIRED(),
+  OPTIONAL: new _OPTIONAL()
+};
+function getParamsResult(keys, getParam) {
+  const keyDef = keys.flat().reduce(
+    (acc, i) => {
+      if (typeof i === "string") {
+        acc.push({ key: i, def: void 0, isOptional: false });
+      } else if (typeof i === "object") {
+        acc.push(
+          ...Object.keys(i).map((k) => ({
+            key: k,
+            def: typeof i[k] === "string" ? i[k] : void 0,
+            isOptional: i[k] === param.OPTIONAL
+          }))
+        );
+      }
+      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 kd of keyDef) {
+    const val = getParam.getParam(kd.key);
+    if (val === void 0) {
+      if (typeof kd.def === "string") {
+        result[kd.key] = kd.def;
+      } else {
+        if (!kd.isOptional) {
+          errors.push(kd.key);
+        }
+      }
+    } else {
+      result[kd.key] = val;
+    }
+  }
+  if (errors.length) {
+    return Result.Err(msgFn(...errors));
+  }
+  return Result.Ok(result);
+}
+
 // src/sys-env.ts
 var envActions = [
   { id: "cf", fn: (opts) => CFEnvActions.new(opts) },
@@ -932,12 +1089,62 @@ function envFactory(opts = {}) {
     return ret;
   });
 }
+function isIterable(obj) {
+  if (obj == null) {
+    return false;
+  }
+  return typeof obj[Symbol.iterator] === "function";
+}
 var EnvImpl = class {
   constructor(map, opts = {}) {
     this._onSet = [];
     this._map = map;
     this._updatePresets(opts.presetEnv);
   }
+  gets(...kparams) {
+    return getParamsResult(kparams, {
+      getParam: (k) => this.get(k)
+    });
+  }
+  sets(...keys) {
+    keys.forEach((key2) => {
+      if (Array.isArray(key2)) {
+        if (key2.length === 2) {
+          const [k, v] = key2;
+          if (typeof k === "string" && typeof v === "string") {
+            this.set(k, v);
+            return;
+          }
+        }
+        for (const item of key2) {
+          if (Array.isArray(item)) {
+            if (item.length === 2) {
+              const [k, v] = item;
+              if (typeof k === "string" && typeof v === "string") {
+                this.set(k, v);
+              }
+            }
+          }
+        }
+      } else {
+        if (isIterable(key2)) {
+          for (const [k, v] of key2) {
+            if (typeof k === "string" && typeof v === "string") {
+              this.set(k, v);
+            }
+          }
+        } else {
+          const rKey = key2;
+          for (const k in rKey) {
+            const v = rKey[k];
+            if (typeof k === "string" && typeof v === "string") {
+              this.set(k, v);
+            }
+          }
+        }
+      }
+    });
+  }
   _updatePresets(presetEnv) {
     if (!presetEnv) {
       return;
@@ -1079,106 +1286,15 @@ var WebSystemService = class {
   }
 };
 var my = void 0;
-function WebSysAbstraction(param) {
+function WebSysAbstraction(param3) {
   if (!my) {
     my = new BaseSysAbstraction({
-      TxtEnDecoder: (param == null ? void 0 : param.TxtEnDecoder) || Utf8EnDecoderSingleton(),
+      TxtEnDecoder: (param3 == null ? void 0 : param3.TxtEnDecoder) || Utf8EnDecoderSingleton(),
       FileSystem: new WebFileService(),
       SystemService: new WebSystemService()
     });
   }
-  return new WrapperSysAbstraction(my, param);
-}
-
-// src/result.ts
-var Result = class _Result {
-  static Ok(t) {
-    return new ResultOK(t);
-  }
-  static Err(t) {
-    if (typeof t === "string") {
-      return new ResultError(new Error(t));
-    }
-    if (_Result.Is(t)) {
-      if (t.is_ok()) {
-        return new ResultError(new Error("Result Error is Ok"));
-      }
-      return t;
-    }
-    return new ResultError(t);
-  }
-  static Is(t) {
-    if (!t) {
-      return false;
-    }
-    if (t instanceof _Result) {
-      return true;
-    }
-    const rt = t;
-    if ([typeof rt.is_ok, typeof rt.is_err, typeof rt.unwrap, typeof rt.unwrap_err].every((x) => x === "function")) {
-      return true;
-    }
-    return false;
-  }
-  isOk() {
-    return this.is_ok();
-  }
-  isErr() {
-    return this.is_err();
-  }
-  Ok() {
-    return this.unwrap();
-  }
-  Err() {
-    return this.unwrap_err();
-  }
-};
-var ResultOK = class extends Result {
-  constructor(t) {
-    super();
-    this._t = t;
-  }
-  is_ok() {
-    return true;
-  }
-  is_err() {
-    return false;
-  }
-  unwrap_err() {
-    throw new Error("Result is Ok");
-  }
-  unwrap() {
-    return this._t;
-  }
-};
-var ResultError = class extends Result {
-  constructor(t) {
-    super();
-    this._error = t;
-  }
-  is_ok() {
-    return false;
-  }
-  is_err() {
-    return true;
-  }
-  unwrap() {
-    throw new Error(`Result is Err: ${this._error}`);
-  }
-  unwrap_err() {
-    return this._error;
-  }
-};
-function exception2Result(fn) {
-  try {
-    const res = fn();
-    if (res instanceof Promise) {
-      return res.then((value) => Result.Ok(value)).catch((e) => Result.Err(e));
-    }
-    return Result.Ok(res);
-  } catch (e) {
-    return Result.Err(e);
-  }
+  return new WrapperSysAbstraction(my, param3);
 }
 
 // src/utils/relative-path.ts
@@ -1373,20 +1489,7 @@ function localStripper(path, restrips, obj) {
 }
 
 // src/uri.ts
-var _REQUIRED = class {
-  constructor() {
-    this.val = "REQUIRED";
-  }
-};
-var _OPTIONAL = class {
-  constructor() {
-    this.val = "OPTIONAL";
-  }
-};
-var key = {
-  REQUIRED: new _REQUIRED(),
-  OPTIONAL: new _OPTIONAL()
-};
+var key = param;
 function coerceKey(key2, def) {
   if (typeof key2 === "object") {
     const keys = Object.keys(key2);
@@ -1542,49 +1645,6 @@ function getParamResult(key2, val, msgFn = (key3) => {
   }
   return Result.Ok(val);
 }
-function getParamsResult(keys, getParam) {
-  const keyDef = keys.flat().reduce(
-    (acc, i) => {
-      if (typeof i === "string") {
-        acc.push({ key: i, def: void 0, isOptional: false });
-      } else if (typeof i === "object") {
-        acc.push(
-          ...Object.keys(i).map((k) => ({
-            key: k,
-            def: typeof i[k] === "string" ? i[k] : void 0,
-            isOptional: i[k] instanceof _OPTIONAL
-          }))
-        );
-      }
-      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 kd of keyDef) {
-    const val = getParam.getParam(kd.key);
-    if (val === void 0) {
-      if (typeof kd.def === "string") {
-        result[kd.key] = kd.def;
-      } else {
-        if (!kd.isOptional) {
-          errors.push(kd.key);
-        }
-      }
-    } else {
-      result[kd.key] = val;
-    }
-  }
-  if (errors.length) {
-    return Result.Err(msgFn(...errors));
-  }
-  return Result.Ok(result);
-}
 var BuildURI = class _BuildURI {
   // pathname needs this
   constructor(url) {
@@ -1844,7 +1904,7 @@ var ConsoleWriterStreamDefaultWriter = class {
     this.ready = Promise.resolve(void 0);
     this.closed = Promise.resolve(void 0);
   }
-  async write(chunk) {
+  write(chunk) {
     let strObj = this.decoder.decode(chunk).trimEnd();
     let output = "log";
     try {
@@ -1862,6 +1922,7 @@ var ConsoleWriterStreamDefaultWriter = class {
       default:
         console.log(strObj);
     }
+    return Promise.resolve();
   }
 };
 var ConsoleWriterStream = class {
@@ -1872,8 +1933,8 @@ var ConsoleWriterStream = class {
   abort(reason) {
     throw new Error("Method not implemented.");
   }
-  async close() {
-    return;
+  close() {
+    return Promise.resolve();
   }
   getWriter() {
     if (this.locked) {
@@ -1901,7 +1962,7 @@ var LogWriterStream = class {
         const writer = this._out.getWriter();
         await writer.ready;
         await writer.write(encoded);
-        await writer.releaseLock();
+        writer.releaseLock();
       } catch (err) {
         console.error("Chunk error:", err);
       }
@@ -1925,7 +1986,9 @@ var LogWriterStream = class {
       return;
     }
     const my2 = this._toFlush.shift();
-    my2 == null ? void 0 : my2().finally(() => {
+    my2 == null ? void 0 : my2().catch((e) => {
+      console.error("Flush error:", e);
+    }).finally(() => {
       this._flush(this._toFlush);
     });
   }
@@ -2086,9 +2149,6 @@ function getLen(value, lvs) {
   }
   return logValue(() => -1, lvs);
 }
-function hash(value) {
-  return "not implemented";
-}
 function toLogValue(lop) {
   if (lop && typeof lop.then === "function") {
     throw new Error("async logValue Not implemented");
@@ -2338,11 +2398,9 @@ var LoggerImpl = class _LoggerImpl {
     this._attributes[key2] = getLen(value, toLogValueCtx(this.levelHandler));
     return this;
   }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   Hash(value, key2 = "hash") {
-    this._attributes[key2] = asyncLogValue(
-      async () => `${getLen(value, toLogValueCtx(this.levelHandler)).value()}:${await hash(value)}`
-    );
-    return this;
+    throw new Error("Not implemented");
   }
   Url(url, key2 = "url") {
     this.Ref(key2, () => URI.from(url).toString());
@@ -3039,6 +3097,8 @@ __export(utils_exports, {
   FanoutWriteStream: () => FanoutWriteStream,
   array2stream: () => array2stream,
   devnull: () => devnull,
+  getParamsResult: () => getParamsResult,
+  param: () => param,
   rebuffer: () => rebuffer,
   rebufferArray: () => rebufferArray,
   stream2array: () => stream2array,
@@ -3046,6 +3106,7 @@ __export(utils_exports, {
   stream2uint8array: () => stream2uint8array,
   streamMap: () => streamMap,
   string2stream: () => string2stream,
+  stripper: () => stripper,
   uint8array2stream: () => uint8array2stream
 });
 
@@ -3152,6 +3213,9 @@ function pump(ps, controller, next) {
       ps.tmpLen += value.length;
     }
     pump(ps, controller, next);
+  }).catch((err) => {
+    controller.error(err);
+    next();
   });
 }
 function rebuffer(a, chunkSize) {
@@ -3229,6 +3293,9 @@ function uint8array2stream(str) {
     }
   });
 }
+
+// src/index.ts
+var param2 = param;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseSysAbstraction,
@@ -3289,6 +3356,7 @@ function uint8array2stream(str) {
   isURL,
   key,
   logValue,
+  param,
   registerEnvAction,
   runtimeFn,
   toCryptoRuntime,