@adviser/cement 0.3.12 → 0.3.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adviser/cement",
-  "version": "0.3.12",
+  "version": "0.3.14",
   "description": "better try/catch/finally handling",
   "main": "index.js",
   "type": "module",
@@ -55,7 +55,7 @@
     "@vitest/browser": "^2.1.8",
     "esbuild-plugin-replace": "^1.4.0",
     "esbuild-plugin-resolve": "^2.0.0",
-    "eslint": "9.19.0",
+    "eslint": "9.20.0",
     "prettier": "^3.3.3",
     "tsup": "^8.3.0",
     "tsx": "^4.19.1",

package/src/jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@adviser/cement",
-  "version": "0.3.12",
+  "version": "0.3.14",
   "exports": {
     ".": "./index.ts",
     "./web": "./web/index.ts",

package/src/resolve-once.ts

@@ -1,4 +1,5 @@
 import { Future } from "./future.js";
+import { Result } from "./result.js";
 
 interface ResolveSeqItem<T, C> {
   readonly future: Future<T>;
@@ -164,7 +165,7 @@ export class ResolveOnce<T, CTX = void> {
 }
 
 export class Keyed<T extends { reset: () => void }, K = string> {
-  private readonly _map = new Map<K, T>();
+  protected readonly _map: Map<K, T> = new Map<K, T>();
 
   readonly factory: (key: K) => T;
   constructor(factory: (key: K) => T) {
@@ -175,10 +176,6 @@ export class Keyed<T extends { reset: () => void }, K = string> {
     return this.get(await key());
   }
 
-  entries(): IterableIterator<[K, T]> {
-    return this._map.entries();
-  }
-
   get(key: K | (() => K)): T {
     if (typeof key === "function") {
       key = (key as () => K)();
@@ -207,6 +204,33 @@ export class KeyedResolvOnce<T, K = string> extends Keyed<ResolveOnce<T, K>, K>
   constructor() {
     super((key) => new ResolveOnce<T, K>(key));
   }
+
+  /**
+   *
+   * @returns The values of the resolved keys
+   */
+  values(): { key: K; value: Result<T> }[] {
+    return (
+      Array.from(this._map.entries())
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        .filter(([_, v]) => v._onceDone)
+        .map(([k, v]) => {
+          if (v._onceDone) {
+            if (v._onceError) {
+              return {
+                key: k,
+                value: Result.Err(v._onceError),
+              };
+            }
+            return {
+              key: k,
+              value: Result.Ok(v._onceValue as T),
+            };
+          }
+          throw new Error("KeyedResolvOnce.values impossible");
+        })
+    );
+  }
 }
 
 export class KeyedResolvSeq<T, K = string> extends Keyed<ResolveSeq<T, K>, K> {

package/src/uri.ts

@@ -421,6 +421,26 @@ export class BuildURI implements URIInterface<BuildURI> {
 
 export type CoerceURI = string | URI | MutableURL | URL | BuildURI | NullOrUndef;
 
+export function isCoerceURI(value: unknown): value is CoerceURI {
+  if (!value) {
+    return false;
+  }
+  if (isURL(value)) {
+    // includes MutableURL
+    return true;
+  }
+  if (URI.is(value)) {
+    return true;
+  }
+  if (BuildURI.is(value)) {
+    return true;
+  }
+  if (typeof value === "string") {
+    return true;
+  }
+  return false;
+}
+
 export const hasHostPartProtocols: Set<string> = new Set<string>(["http", "https", "ws", "wss"]);
 
 // non mutable URL Implementation

package/test/index.cjs

@@ -933,9 +933,6 @@ var Keyed = class {
   async asyncGet(key) {
     return this.get(await key());
   }
-  entries() {
-    return this._map.entries();
-  }
   get(key) {
     if (typeof key === "function") {
       key = key();
@@ -961,6 +958,27 @@ var KeyedResolvOnce = class extends Keyed {
   constructor() {
     super((key) => new ResolveOnce(key));
   }
+  /**
+   *
+   * @returns The values of the resolved keys
+   */
+  values() {
+    return Array.from(this._map.entries()).filter(([_, v]) => v._onceDone).map(([k, v]) => {
+      if (v._onceDone) {
+        if (v._onceError) {
+          return {
+            key: k,
+            value: Result.Err(v._onceError)
+          };
+        }
+        return {
+          key: k,
+          value: Result.Ok(v._onceValue)
+        };
+      }
+      throw new Error("KeyedResolvOnce.values impossible");
+    });
+  }
 };
 
 // src/runtime.ts