@wener/utils 1.1.54 → 1.1.58

package/lib/objects/merge/merge.test.js

@@ -70,9 +70,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function () {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function (v) {

package/lib/objects/set.js

@@ -16,11 +16,19 @@ import { parseObjectPath } from "./parseObjectPath.js";
     var x, k;
     while (i < len) {
         k = path[i++];
+        // Security: Prevent prototype pollution
         if (k === "__proto__" || k === "constructor" || k === "prototype")
             break;
         // noinspection PointlessArithmeticExpressionJS
-        current = current[k] = i === len ? merging ? merge(current[k], val) : val : _type_of(x = current[k]) === (typeof path === "undefined" ? "undefined" : _type_of(path)) ? x : path[i] * 0 !== 0 || !!~("" + path[i]).indexOf(".") // eslint-disable-line
-            ? {} : [];
+        current = current[k] = i === len ? merging ? merge(current[k], val) : val : _type_of(x = current[k]) === (typeof path === "undefined" ? "undefined" : _type_of(path)) ? x : // If the next key is NOT an integer-like index, or contains a dot, create an Object.
+            // Otherwise, create an Array.
+            //
+            // path[i] * 0 !== 0 checks if it is NOT a number (NaN * 0 is NaN).
+            // !!~('' + path[i]).indexOf('.') checks if it contains a dot.
+            //
+            // @ts-expect-error hacky type check from dset
+            path[i] * 0 !== 0 || !!~("" + path[i]).indexOf(".") // eslint-disable-line
+                ? {} : [];
     }
 }
 export function merge(a, b) {

package/lib/objects/set.test.js

@@ -1,4 +1,4 @@
-/* eslint no-proto:0 no-prototype-builtins:0 */ function _instanceof(left, right) {
+function _instanceof(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
         return !!right[Symbol.hasInstance](left);
     }
@@ -6,7 +6,7 @@
         return left instanceof right;
     }
 }
-import { describe, expect, it, test } from "vitest";
+/* eslint no-proto:0 no-prototype-builtins:0 */ import { describe, expect, it, test } from "vitest";
 import { set } from "./set.js";
 test("set basics", function () {
     expect(set({}, "c", 3), "should not give return value").toBe(undefined);

package/lib/scripts/getGenerateContext.js

@@ -93,9 +93,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function () {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function (v) {
@@ -347,7 +355,7 @@ export function getGenerateContext(prefix) {
 }
 function write(dir, file, content) {
     return _async_to_generator(function () {
-        var size, dst, last, e;
+        var size, dst, last, unused;
         return _ts_generator(this, function (_state) {
             switch (_state.label) {
                 case 0:
@@ -374,7 +382,7 @@ function write(dir, file, content) {
                         4
                     ];
                 case 3:
-                    e = _state.sent();
+                    unused = _state.sent();
                     return [
                         3,
                         4

package/lib/server/fetch/createFetchWithProxyByNodeFetch.js

@@ -101,9 +101,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function () {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function (v) {

package/lib/server/fetch/createFetchWithProxyByUndici.js

@@ -139,9 +139,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function () {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function (v) {

package/lib/server/polyfill/polyfillBrowser.js

@@ -39,9 +39,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function () {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function (v) {

package/lib/server/polyfill/polyfillBrowser.test.js

@@ -39,9 +39,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function () {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function (v) {

package/lib/server/polyfill/polyfillCrypto.js

@@ -39,9 +39,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function () {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function (v) {

package/lib/server/polyfill/polyfillJsDom.js

@@ -37,12 +37,24 @@ function _class_call_check(instance, Constructor) {
 function _object_without_properties(source, excluded) {
     if (source == null)
         return {};
-    var target = _object_without_properties_loose(source, excluded);
-    var key, i;
+    var target = {}, sourceKeys, key, i;
+    if (typeof Reflect !== "undefined" && Reflect.ownKeys) {
+        sourceKeys = Reflect.ownKeys(source);
+        for (i = 0; i < sourceKeys.length; i++) {
+            key = sourceKeys[i];
+            if (excluded.indexOf(key) >= 0)
+                continue;
+            if (!Object.prototype.propertyIsEnumerable.call(source, key))
+                continue;
+            target[key] = source[key];
+        }
+        return target;
+    }
+    target = _object_without_properties_loose(source, excluded);
     if (Object.getOwnPropertySymbols) {
-        var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-        for (i = 0; i < sourceSymbolKeys.length; i++) {
-            key = sourceSymbolKeys[i];
+        sourceKeys = Object.getOwnPropertySymbols(source);
+        for (i = 0; i < sourceKeys.length; i++) {
+            key = sourceKeys[i];
             if (excluded.indexOf(key) >= 0)
                 continue;
             if (!Object.prototype.propertyIsEnumerable.call(source, key))
@@ -55,13 +67,13 @@ function _object_without_properties(source, excluded) {
 function _object_without_properties_loose(source, excluded) {
     if (source == null)
         return {};
-    var target = {};
-    var sourceKeys = Object.keys(source);
-    var key, i;
+    var target = {}, sourceKeys = Object.getOwnPropertyNames(source), key, i;
     for (i = 0; i < sourceKeys.length; i++) {
         key = sourceKeys[i];
         if (excluded.indexOf(key) >= 0)
             continue;
+        if (!Object.prototype.propertyIsEnumerable.call(source, key))
+            continue;
         target[key] = source[key];
     }
     return target;
@@ -76,9 +88,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function () {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function (v) {

package/lib/strings/renderTemplate.test.js

@@ -1,4 +1,4 @@
-/* eslint no-template-curly-in-string:0 */ function _array_like_to_array(arr, len) {
+function _array_like_to_array(arr, len) {
     if (len == null || len > arr.length)
         len = arr.length;
     for (var i = 0, arr2 = new Array(len); i < len; i++)
@@ -59,7 +59,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))
         return _array_like_to_array(o, minLen);
 }
-import { expect, test } from "vitest";
+/* eslint no-template-curly-in-string:0 */ import { expect, test } from "vitest";
 import { renderTemplate } from "./renderTemplate.js";
 test("renderTemplate", function () {
     var obj = {

package/lib/web/getGlobalThis.js

@@ -1,4 +1,3 @@
-var _this = this;
 /**
  * isomorphic globalThis
  *
@@ -13,6 +12,5 @@ var _this = this;
     if (typeof self !== 'undefined') return self;
     if (typeof window !== 'undefined') return window;
     if (typeof global !== 'undefined') return global;
-    if (typeof _this !== 'undefined') return _this;
     throw new Error('Unable to locate global `this`');
 };

package/lib/web/getRandomValues.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
 function _instanceof(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
         return !!right[Symbol.hasInstance](left);
@@ -10,29 +9,24 @@ function _instanceof(left, right) {
 var _globalThis_crypto_getRandomValues, _globalThis_crypto, _globalThis_msCrypto_getRandomValues, _globalThis_msCrypto;
 import { getNodeCrypto } from "../crypto/getNodeCrypto.js";
 import { getGlobalThis } from "./getGlobalThis.js";
-var globalThis = getGlobalThis();
+var _globalThis = getGlobalThis();
 // chrome 11+, safari 5+, nodejs 17.4+
 // https://developer.mozilla.org/en-US/docs/Web/API/Crypto/getRandomValues
-export var getRandomValues = ((_globalThis_crypto = globalThis.crypto) === null || _globalThis_crypto === void 0 ? void 0 : (_globalThis_crypto_getRandomValues = _globalThis_crypto.getRandomValues) === null || _globalThis_crypto_getRandomValues === void 0 ? void 0 : _globalThis_crypto_getRandomValues.bind(globalThis.crypto)) || ((_globalThis_msCrypto = globalThis.msCrypto) === null || _globalThis_msCrypto === void 0 ? void 0 : (_globalThis_msCrypto_getRandomValues = _globalThis_msCrypto.getRandomValues) === null || _globalThis_msCrypto_getRandomValues === void 0 ? void 0 : _globalThis_msCrypto_getRandomValues.bind(globalThis.msCrypto)) || function () {
-    throw new Error("[getRandomValues]: No secure random number generator available.");
-};
+export var getRandomValues = ((_globalThis_crypto = _globalThis.crypto) === null || _globalThis_crypto === void 0 ? void 0 : (_globalThis_crypto_getRandomValues = _globalThis_crypto.getRandomValues) === null || _globalThis_crypto_getRandomValues === void 0 ? void 0 : _globalThis_crypto_getRandomValues.bind(_globalThis.crypto)) || ((_globalThis_msCrypto = _globalThis.msCrypto) === null || _globalThis_msCrypto === void 0 ? void 0 : (_globalThis_msCrypto_getRandomValues = _globalThis_msCrypto.getRandomValues) === null || _globalThis_msCrypto_getRandomValues === void 0 ? void 0 : _globalThis_msCrypto_getRandomValues.bind(_globalThis.msCrypto)) || _getRandomValues;
 function _getRandomValues(buf) {
     var nodeCrypto = getNodeCrypto();
-    // avoid type error
     var wc = nodeCrypto === null || nodeCrypto === void 0 ? void 0 : nodeCrypto.webcrypto;
     if (wc === null || wc === void 0 ? void 0 : wc.getRandomValues) {
-        var _wc_getRandomValues;
-        getRandomValues = (_wc_getRandomValues = wc.getRandomValues) === null || _wc_getRandomValues === void 0 ? void 0 : _wc_getRandomValues.bind(nodeCrypto === null || nodeCrypto === void 0 ? void 0 : nodeCrypto.webcrypto);
-        return wc.getRandomValues(buf);
+        getRandomValues = wc.getRandomValues.bind(wc);
+        return getRandomValues(buf);
     }
     if (nodeCrypto === null || nodeCrypto === void 0 ? void 0 : nodeCrypto.randomBytes) {
         if (!_instanceof(buf, Uint8Array)) {
             throw new TypeError("expected Uint8Array");
         }
         if (buf.length > 65536) {
-            var e = new Error();
+            var e = new Error("Failed to execute 'getRandomValues' on 'Crypto': The ArrayBufferView's byte length (".concat(buf.length, ") exceeds the number of bytes of entropy available via this API (65536)."));
             e.code = 22;
-            e.message = "Failed to execute 'getRandomValues' on 'Crypto': The ArrayBufferView's byte length (".concat(buf.length, ") exceeds the number of bytes of entropy available via this API (65536).");
             e.name = "QuotaExceededError";
             throw e;
         }

package/lib/web/structuredClone.js

@@ -1,8 +1,8 @@
-/* eslint no-proto:0 */ function _type_of(obj) {
+function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
-import { classOf } from "../langs/classOf.js";
+/* eslint no-proto:0 */ import { classOf } from "../langs/classOf.js";
 /**
  * Clone an object using structured cloning algorithm
  *

package/package.json

@@ -1,15 +1,19 @@
 {
   "name": "@wener/utils",
-  "version": "1.1.54",
+  "version": "1.1.58",
   "type": "module",
   "description": "Utils for daily use",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/wener/wode.git"
+    "url": "https://github.com/wenerme/wener.git",
+    "directory": "packages/wener-utils"
   },
-  "homepage": "https://github.com/wenerme/wode#readme",
+  "homepage": "https://github.com/wenerme/wener/tree/main/packages/wener-utils",
   "author": "wener",
   "license": "MIT",
+  "imports": {
+    "#/*": "./src/*"
+  },
   "exports": {
     ".": {
       "types": "./src/index.ts",
@@ -65,12 +69,12 @@
     "lodash"
   ],
   "devDependencies": {
-    "@sinclair/typebox": "^0.34.41",
+    "@sinclair/typebox": "^0.34.47",
     "@types/ws": "^8.18.1",
     "https-proxy-agent": "^7.0.6",
     "node-fetch": "^3.3.2",
-    "undici": "^7.16.0",
-    "zod": "^4.1.12"
+    "undici": "^7.18.2",
+    "zod": "^4.3.5"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",

package/src/asyncs/Promises.ts

@@ -20,7 +20,8 @@ export class Promises {
 		}
 		let resolve: (value: T | PromiseLike<T>) => void;
 		let reject: (reason?: any) => void;
-		// @ts-ignore
+		// @ts-ignore -- Polyfill/Fallback for environment without Promise.withResolvers
+		// eslint-disable-next-line
 		const promise = new Promise<T>((res, rej) => {
 			resolve = res;
 			reject = rej;

package/src/asyncs/timeout.ts

@@ -3,7 +3,7 @@ export function timeout<T = any>(
 	ms: number,
 ): Promise<T> {
 	const error = new TimeoutError();
-	let timeout: any;
+	let timeout: ReturnType<typeof setTimeout>;
 	let ac: AbortController | undefined;
 	if (typeof pending === 'function') {
 		ac = new AbortController();

package/src/crypto/hashing.ts

@@ -1,10 +1,11 @@
 import { ArrayBuffers } from '../io/ArrayBuffers';
+import type { Bytes } from '../io/types';
 
 type HashEncoding = 'hex' | 'base64' | 'buffer';
 
 type HashFunction = {
 	(s: BinaryLike, o?: 'hex' | 'base64' | undefined): Promise<string>;
-	(s: BinaryLike, o: 'buffer'): Promise<ArrayBuffer>;
+	(s: BinaryLike, o: 'buffer'): Promise<Bytes>;
 };
 
 function createDigestFunction(a: string): HashFunction {
@@ -17,27 +18,27 @@ function createDigestFunction(a: string): HashFunction {
 	}) as HashFunction;
 }
 
-export function sha1(s: BinaryLike, o?: undefined | 'buffer'): Promise<Buffer>;
+export function sha1(s: BinaryLike, o?: undefined | 'buffer'): Promise<Bytes>;
 export function sha1(s: BinaryLike, o: 'hex' | 'base64'): Promise<string>;
 export function sha1(s: BinaryLike, o?: DigestOptions) {
 	return digestOf('SHA-1', s, o);
 }
 
-export function sha256(s: BinaryLike, o?: undefined | 'buffer'): Promise<Buffer>;
+export function sha256(s: BinaryLike, o?: undefined | 'buffer'): Promise<Bytes>;
 export function sha256(s: BinaryLike, o: 'hex' | 'base64'): Promise<string>;
 
 export function sha256(s: BinaryLike, o?: DigestOptions) {
 	return digestOf('SHA-256', s, o);
 }
 
-export function sha384(s: BinaryLike, o?: undefined | 'buffer'): Promise<Buffer>;
+export function sha384(s: BinaryLike, o?: undefined | 'buffer'): Promise<Bytes>;
 export function sha384(s: BinaryLike, o: 'hex' | 'base64'): Promise<string>;
 
 export function sha384(s: BinaryLike, o?: DigestOptions) {
 	return digestOf('SHA-384', s, o);
 }
 
-export function sha512(s: BinaryLike, o?: undefined | 'buffer'): Promise<Buffer>;
+export function sha512(s: BinaryLike, o?: undefined | 'buffer'): Promise<Bytes>;
 export function sha512(s: BinaryLike, o: 'hex' | 'base64'): Promise<string>;
 
 export function sha512(s: BinaryLike, o?: DigestOptions) {
@@ -84,7 +85,7 @@ export function hmac<O extends DigestOptions>(
 	key: BinaryLike | CryptoKey,
 	data: BinaryLike,
 	o?: O,
-): Promise<IsStringCoding<O> extends true ? string : Buffer>;
+): Promise<IsStringCoding<O> extends true ? string : Bytes>;
 
 export async function hmac(
 	hash: 'SHA-1' | 'SHA-256' | 'SHA-384' | 'SHA-512' | 'sha1' | 'sha256' | 'sha384' | 'sha512',

package/src/crypto/pem/pem.ts

@@ -1,4 +1,5 @@
 import { ArrayBuffers } from '../../io/ArrayBuffers';
+import type { Bytes } from '../../io/types';
 
 export interface Block {
 	/**
@@ -30,7 +31,7 @@ export interface Block {
 		| 'SM2 PARAMETERS';
 
 	header: Record<string, string>;
-	bytes: BufferSource;
+	bytes: Bytes;
 }
 
 export class PEM {
@@ -53,7 +54,7 @@ export class PEM {
 				type,
 				header,
 				//  avoid replaceAll
-				bytes: ArrayBuffers.from(b64.replace(/[\r\n]/g, ''), 'base64'),
+				bytes: ArrayBuffers.from(b64.replace(/[\r\n]/g, ''), 'base64', Uint8Array),
 			},
 			head: data.slice(0, match.index || 0),
 			tail: data.slice((match.index || 0) + match[0].length),

package/src/crypto/randomUUIDv7.test.ts

@@ -0,0 +1,82 @@
+import { describe, expect, test } from 'vitest';
+import { createRandomUUIDv7, isUUIDv7, parseUUIDv7Timestamp, randomUUIDv7 } from './randomUUIDv7';
+
+describe('randomUUIDv7', () => {
+	test('generates valid UUIDv7', () => {
+		const uuid = randomUUIDv7();
+		expect(uuid).toMatch(/^[0-9a-f]{8}-[0-9a-f]{4}-7[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i);
+	});
+
+	test('generates unique UUIDs', () => {
+		const uuids = new Set<string>();
+		for (let i = 0; i < 1000; i++) {
+			uuids.add(randomUUIDv7());
+		}
+		expect(uuids.size).toBe(1000);
+	});
+
+	test('respects provided timestamp', () => {
+		const ts = 1704067200000; // 2024-01-01 00:00:00 UTC
+		const uuid = randomUUIDv7(ts);
+		const extractedTs = parseUUIDv7Timestamp(uuid);
+		expect(extractedTs).toBe(ts);
+	});
+
+	test('UUIDs are sortable by time', () => {
+		const ts1 = 1704067200000;
+		const ts2 = 1704067201000;
+		const uuid1 = randomUUIDv7(ts1);
+		const uuid2 = randomUUIDv7(ts2);
+		expect(uuid1 < uuid2).toBe(true);
+	});
+});
+
+describe('isUUIDv7', () => {
+	test('returns true for valid UUIDv7', () => {
+		const uuid = randomUUIDv7();
+		expect(isUUIDv7(uuid)).toBe(true);
+	});
+
+	test('returns false for UUIDv4', () => {
+		expect(isUUIDv7('550e8400-e29b-41d4-a716-446655440000')).toBe(false);
+	});
+
+	test('returns false for invalid strings', () => {
+		expect(isUUIDv7('')).toBe(false);
+		expect(isUUIDv7(null)).toBe(false);
+		expect(isUUIDv7(undefined)).toBe(false);
+		expect(isUUIDv7('not-a-uuid')).toBe(false);
+	});
+});
+
+describe('parseUUIDv7Timestamp', () => {
+	test('extracts correct timestamp', () => {
+		const ts = Date.now();
+		const uuid = randomUUIDv7(ts);
+		expect(parseUUIDv7Timestamp(uuid)).toBe(ts);
+	});
+
+	test('throws for invalid UUID format', () => {
+		expect(() => parseUUIDv7Timestamp('invalid')).toThrow('Invalid UUID format');
+	});
+});
+
+describe('createRandomUUIDv7', () => {
+	test('creates generator with custom now function', () => {
+		let currentTime = 1704067200000;
+		const generator = createRandomUUIDv7({ now: () => currentTime });
+
+		const uuid1 = generator();
+		expect(parseUUIDv7Timestamp(uuid1)).toBe(currentTime);
+
+		currentTime = 1704067201000;
+		const uuid2 = generator();
+		expect(parseUUIDv7Timestamp(uuid2)).toBe(currentTime);
+	});
+
+	test('generator accepts explicit timestamp override', () => {
+		const generator = createRandomUUIDv7({ now: () => 1000 });
+		const uuid = generator(2000);
+		expect(parseUUIDv7Timestamp(uuid)).toBe(2000);
+	});
+});