toastflow-core 1.1.4 → 1.1.5

package/package.json

@@ -8,7 +8,7 @@
     "url": "https://github.com/adrianjanocko/toastflow.git",
     "directory": "packages/core"
   },
-  "version": "1.1.4",
+  "version": "1.1.5",
   "main": "src/index.ts",
   "module": "src/index.ts",
   "types": "src/index.ts",

package/src/util.ts

@@ -2,22 +2,33 @@
  * Generate a UUID v4 using `crypto.randomUUID` when available; otherwise fall back
  * to the classic template with random nibbles (uses `crypto.getRandomValues` when possible).
  */
+type CryptoLike = {
+  randomUUID?: () => string;
+  getRandomValues?: (arr: Uint8Array) => Uint8Array;
+};
+
 export function generateUuid(): string {
-  const cryptoSource: Crypto | undefined =
-    typeof crypto !== "undefined" ? (crypto as Crypto) : undefined;
+  const cryptoApi: CryptoLike | undefined = (globalThis as any)?.crypto;
 
-  if (typeof cryptoSource?.randomUUID === "function") {
+  if (typeof cryptoApi?.randomUUID === "function") {
     try {
-      return cryptoSource.randomUUID();
+      return cryptoApi.randomUUID();
     } catch {
       // ignore and use fallback
     }
   }
 
+  function randomNibble(): number {
+    if (typeof cryptoApi?.getRandomValues === "function") {
+      const bytes = new Uint8Array(1);
+      cryptoApi.getRandomValues(bytes);
+      return (bytes[0] ?? 0) & 0xf;
+    }
+    return Math.floor(Math.random() * 16);
+  }
+
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
-    const rand = cryptoSource?.getRandomValues
-      ? cryptoSource.getRandomValues(new Uint8Array(1))[0] & 0xf
-      : Math.floor(Math.random() * 16);
+    const rand = randomNibble();
     const value = c === "x" ? rand : (rand & 0x3) | 0x8;
     return value.toString(16);
   });