@valkyriestudios/utils 12.44.0 → 12.45.0

package/README.md

@@ -994,6 +994,27 @@ import guid from '@valkyriestudios/utils/hash/guid';
 guid(); // 245caf1a-86af-11e7-bb31-be2e44b06b34
 ```
 
+### hash/hexId(size:number)
+Generate a cryptographically secure random hex string.
+
+⚠️ The size parameter is in bytes, the resulting string will be size * 2 characters long
+```typescript
+import hexId from '@valkyriestudios/utils/hash/hexId';
+
+hexId(8); // "7a3c1b9f8e2d4c71"
+hexId(16); // "3f6e1b2c4a7d9f0e2b6c8d1a3e4f7b9c"
+```
+
+### hash/uuidv7()
+Generate a unique uuidv7 identifier according to [RFC 9562](https://www.rfc-editor.org/rfc/rfc9562)
+
+These IDs are **time-ordered** while still being 128-bit random identifiers.
+```typescript
+import uuidv7 from '@valkyriestudios/utils/hash/uuidv7';
+
+uuidv7(); // "018f4d5b-9c61-7d2f-8e3b-3a90b5f78c2d"
+```
+
 ### hash/djb2(val:unknown)
 Generate a djb2 hash from an object/array/primitive/...
 ```typescript

package/array/dedupe.d.ts

@@ -1,8 +1,9 @@
+type DedupeFilterFn<T> = (el: T) => boolean;
 type DedupeOptionsBase<T> = {
     /**
      * Pass a custom filter function which will be run in O(n) while deduping is going on
      */
-    filter_fn?: (el: T) => boolean;
+    filter_fn?: DedupeFilterFn<T>;
 };
 type DedupeOptionsWithKey<T extends Record<string, unknown>> = DedupeOptionsBase<T> & {
     /**

package/cjs/array/dedupe.js

@@ -2,40 +2,37 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dedupe = dedupe;
 exports.default = dedupe;
-const utils_1 = require("../hash/utils");
 function dedupe(val, opts) {
     if (!Array.isArray(val))
         return [];
-    const FILTER_FN = opts?.filter_fn;
-    const KEY = opts?.key;
-    const set = new Set();
+    const filter = opts?.filter_fn;
+    const key = opts?.key;
     const acc = [];
-    let hash;
+    const seenPrimitives = new Set();
     const len = val.length;
-    if (KEY) {
-        const CUSTOM_FILTER_FN = typeof FILTER_FN === 'function'
-            ? (el) => el && Object.prototype.toString.call(el) === '[object Object]' && FILTER_FN(el)
-            : (el) => el && Object.prototype.toString.call(el) === '[object Object]';
+    if (filter) {
         for (let i = 0; i < len; i++) {
             const el = val[i];
-            if (!CUSTOM_FILTER_FN(el))
-                continue;
-            hash = (0, utils_1.toString)(el[KEY]);
-            if (!set.has(hash)) {
-                set.add(hash);
-                acc.push(el);
+            const raw = key ? el?.[key] : el;
+            if (raw != null && filter(el)) {
+                const hash = typeof raw !== 'object' ? raw : JSON.stringify(raw);
+                if (!seenPrimitives.has(hash)) {
+                    seenPrimitives.add(hash);
+                    acc.push(el);
+                }
             }
         }
     }
     else {
         for (let i = 0; i < len; i++) {
             const el = val[i];
-            if (FILTER_FN && !FILTER_FN(el))
-                continue;
-            hash = (0, utils_1.toString)(el);
-            if (!set.has(hash)) {
-                set.add(hash);
-                acc.push(el);
+            const raw = key ? el?.[key] : el;
+            if (raw != null) {
+                const hash = typeof raw !== 'object' ? raw : JSON.stringify(raw);
+                if (!seenPrimitives.has(hash)) {
+                    seenPrimitives.add(hash);
+                    acc.push(el);
+                }
             }
         }
     }

package/cjs/array/mapFn.js

@@ -4,21 +4,20 @@ exports.mapFn = mapFn;
 exports.default = mapFn;
 const merge_1 = require("../object/merge");
 function mapFn(arr, fn, opts) {
-    if ((!Array.isArray(arr) || !arr.length) ||
-        typeof fn !== 'function')
+    if (!Array.isArray(arr) || typeof fn !== 'function')
         return {};
     const MERGE = opts?.merge === true;
     const TRANSFORM_FN = opts?.transform_fn;
     const map = {};
     for (let i = 0; i < arr.length; i++) {
         const el = arr[i];
-        if (Object.prototype.toString.call(el) !== '[object Object]')
-            continue;
-        let hash = fn(el);
-        if (Number.isFinite(hash) || (typeof hash === 'string' && hash.length)) {
-            hash = hash + '';
-            const transformed = TRANSFORM_FN ? TRANSFORM_FN(el) : el;
-            map[hash] = MERGE && hash in map ? (0, merge_1.merge)(map[hash], transformed, { union: true }) : transformed;
+        if (Object.prototype.toString.call(el) === '[object Object]') {
+            let hash = fn(el);
+            if (Number.isFinite(hash) || (typeof hash === 'string' && hash.length)) {
+                hash = String(hash);
+                const transformed = TRANSFORM_FN ? TRANSFORM_FN(el) : el;
+                map[hash] = MERGE && hash in map ? (0, merge_1.merge)(map[hash], transformed, { union: true }) : transformed;
+            }
         }
     }
     return map;

package/cjs/hash/guid.js

@@ -6,29 +6,23 @@ const HEX = [];
 for (let i = 0; i < 256; i++) {
     HEX[i] = (i < 16 ? '0' : '') + i.toString(16);
 }
+let pool = new Uint8Array(0);
+let poolIdx = 0;
+function refill(size = 16 * 1024) {
+    pool = new Uint8Array(size);
+    crypto.getRandomValues(pool);
+    poolIdx = 0;
+}
 function guid() {
-    const d0 = (Math.random() * 0xffffffff) | 0;
-    const d1 = (Math.random() * 0xffffffff) | 0;
-    const d2 = (Math.random() * 0xffffffff) | 0;
-    const d3 = (Math.random() * 0xffffffff) | 0;
-    return HEX[d0 & 0xff] +
-        HEX[(d0 >> 8) & 0xff] +
-        HEX[(d0 >> 16) & 0xff] +
-        HEX[(d0 >> 24) & 0xff] +
-        '-' +
-        HEX[d1 & 0xff] +
-        HEX[(d1 >> 8) & 0xff] +
-        '-' +
-        HEX[((d1 >> 16) & 0x0f) | 0x40] +
-        HEX[(d1 >> 24) & 0xff] +
-        '-' +
-        HEX[(d2 & 0x3f) | 0x80] +
-        HEX[(d2 >> 8) & 0xff] +
-        '-' +
-        HEX[(d2 >> 16) & 0xff] +
-        HEX[(d2 >> 24) & 0xff] +
-        HEX[d3 & 0xff] +
-        HEX[(d3 >> 8) & 0xff] +
-        HEX[(d3 >> 16) & 0xff] +
-        HEX[(d3 >> 24) & 0xff];
+    if (poolIdx + 16 > pool.length)
+        refill();
+    const buf = pool.subarray(poolIdx, poolIdx + 16);
+    poolIdx += 16;
+    buf[6] = (buf[6] & 0x0f) | 0x40;
+    buf[8] = (buf[8] & 0x3f) | 0x80;
+    return (HEX[buf[0]] + HEX[buf[1]] + HEX[buf[2]] + HEX[buf[3]] + '-' +
+        HEX[buf[4]] + HEX[buf[5]] + '-' +
+        HEX[buf[6]] + HEX[buf[7]] + '-' +
+        HEX[buf[8]] + HEX[buf[9]] + '-' +
+        HEX[buf[10]] + HEX[buf[11]] + HEX[buf[12]] + HEX[buf[13]] + HEX[buf[14]] + HEX[buf[15]]);
 }

package/cjs/hash/hexId.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hexId = hexId;
+exports.default = hexId;
+const HEX = [];
+for (let i = 0; i < 256; i++) {
+    HEX[i] = (i < 16 ? '0' : '') + i.toString(16);
+}
+let pool = new Uint8Array(0);
+let poolIdx = 0;
+function refill(size = 16 * 1024) {
+    pool = new Uint8Array(size);
+    crypto.getRandomValues(pool);
+    poolIdx = 0;
+}
+function hexId(size) {
+    if (!Number.isInteger(size) || size <= 0)
+        return '';
+    if (poolIdx + size > pool.length)
+        refill();
+    const buf = pool.subarray(poolIdx, poolIdx + size);
+    poolIdx += size;
+    let out = '';
+    for (let i = 0; i < buf.length; i++) {
+        out += HEX[buf[i]];
+    }
+    return out;
+}

package/cjs/hash/index.js

@@ -1,9 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.guid = exports.fnv1A = exports.djb2 = void 0;
+exports.uuidv7 = exports.hexId = exports.guid = exports.fnv1A = exports.djb2 = void 0;
 var djb2_1 = require("./djb2");
 Object.defineProperty(exports, "djb2", { enumerable: true, get: function () { return djb2_1.djb2; } });
 var fnv1A_1 = require("./fnv1A");
 Object.defineProperty(exports, "fnv1A", { enumerable: true, get: function () { return fnv1A_1.fnv1A; } });
 var guid_1 = require("./guid");
 Object.defineProperty(exports, "guid", { enumerable: true, get: function () { return guid_1.guid; } });
+var hexId_1 = require("./hexId");
+Object.defineProperty(exports, "hexId", { enumerable: true, get: function () { return hexId_1.hexId; } });
+var uuidv7_1 = require("./uuidv7");
+Object.defineProperty(exports, "uuidv7", { enumerable: true, get: function () { return uuidv7_1.uuidv7; } });

package/cjs/hash/uuidv7.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uuidv7 = uuidv7;
+exports.default = uuidv7;
+const HEX = [];
+for (let i = 0; i < 256; i++) {
+    HEX[i] = (i < 16 ? '0' : '') + i.toString(16);
+}
+let pool = new Uint8Array(0);
+let poolIdx = 0;
+function refill(size = 16 * 1024) {
+    pool = new Uint8Array(size);
+    crypto.getRandomValues(pool);
+    poolIdx = 0;
+}
+function uuidv7() {
+    if (poolIdx + 10 > pool.length)
+        refill();
+    const rand = pool.subarray(poolIdx, poolIdx + 10);
+    poolIdx += 10;
+    const time = BigInt(Date.now());
+    return (HEX[Number((time >> 40n) & 0xffn)] +
+        HEX[Number((time >> 32n) & 0xffn)] +
+        HEX[Number((time >> 24n) & 0xffn)] +
+        HEX[Number((time >> 16n) & 0xffn)] +
+        '-' +
+        HEX[Number((time >> 8n) & 0xffn)] +
+        HEX[Number(time & 0xffn)] +
+        '-' +
+        HEX[(rand[0] & 0x0f) | 0x70] +
+        HEX[rand[1]] +
+        '-' +
+        HEX[(rand[2] & 0x3f) | 0x80] +
+        HEX[rand[3]] +
+        '-' +
+        HEX[rand[4]] +
+        HEX[rand[5]] +
+        HEX[rand[6]] +
+        HEX[rand[7]] +
+        HEX[rand[8]] +
+        HEX[rand[9]]);
+}

package/cjs/object/is.js

@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isObject = isObject;
 exports.default = isObject;
 function isObject(val) {
-    return Object.prototype.toString.call(val) === '[object Object]';
+    return typeof val === 'object' && Object.prototype.toString.call(val) === '[object Object]';
 }

package/cjs/object/isNotEmpty.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNotEmptyObject = isNotEmptyObject;
 exports.default = isNotEmptyObject;
 function isNotEmptyObject(val) {
-    if (Object.prototype.toString.call(val) !== '[object Object]')
+    if (typeof val !== 'object' || Object.prototype.toString.call(val) !== '[object Object]')
         return false;
     for (const _ in val) {
         return true;

package/esm/array/dedupe.js

@@ -1,37 +1,34 @@
-import { toString } from '../hash/utils';
 function dedupe(val, opts) {
     if (!Array.isArray(val))
         return [];
-    const FILTER_FN = opts?.filter_fn;
-    const KEY = opts?.key;
-    const set = new Set();
+    const filter = opts?.filter_fn;
+    const key = opts?.key;
     const acc = [];
-    let hash;
+    const seenPrimitives = new Set();
     const len = val.length;
-    if (KEY) {
-        const CUSTOM_FILTER_FN = typeof FILTER_FN === 'function'
-            ? (el) => el && Object.prototype.toString.call(el) === '[object Object]' && FILTER_FN(el)
-            : (el) => el && Object.prototype.toString.call(el) === '[object Object]';
+    if (filter) {
         for (let i = 0; i < len; i++) {
             const el = val[i];
-            if (!CUSTOM_FILTER_FN(el))
-                continue;
-            hash = toString(el[KEY]);
-            if (!set.has(hash)) {
-                set.add(hash);
-                acc.push(el);
+            const raw = key ? el?.[key] : el;
+            if (raw != null && filter(el)) {
+                const hash = typeof raw !== 'object' ? raw : JSON.stringify(raw);
+                if (!seenPrimitives.has(hash)) {
+                    seenPrimitives.add(hash);
+                    acc.push(el);
+                }
             }
         }
     }
     else {
         for (let i = 0; i < len; i++) {
             const el = val[i];
-            if (FILTER_FN && !FILTER_FN(el))
-                continue;
-            hash = toString(el);
-            if (!set.has(hash)) {
-                set.add(hash);
-                acc.push(el);
+            const raw = key ? el?.[key] : el;
+            if (raw != null) {
+                const hash = typeof raw !== 'object' ? raw : JSON.stringify(raw);
+                if (!seenPrimitives.has(hash)) {
+                    seenPrimitives.add(hash);
+                    acc.push(el);
+                }
             }
         }
     }

package/esm/array/mapFn.js

@@ -1,20 +1,19 @@
 import { merge } from '../object/merge';
 function mapFn(arr, fn, opts) {
-    if ((!Array.isArray(arr) || !arr.length) ||
-        typeof fn !== 'function')
+    if (!Array.isArray(arr) || typeof fn !== 'function')
         return {};
     const MERGE = opts?.merge === true;
     const TRANSFORM_FN = opts?.transform_fn;
     const map = {};
     for (let i = 0; i < arr.length; i++) {
         const el = arr[i];
-        if (Object.prototype.toString.call(el) !== '[object Object]')
-            continue;
-        let hash = fn(el);
-        if (Number.isFinite(hash) || (typeof hash === 'string' && hash.length)) {
-            hash = hash + '';
-            const transformed = TRANSFORM_FN ? TRANSFORM_FN(el) : el;
-            map[hash] = MERGE && hash in map ? merge(map[hash], transformed, { union: true }) : transformed;
+        if (Object.prototype.toString.call(el) === '[object Object]') {
+            let hash = fn(el);
+            if (Number.isFinite(hash) || (typeof hash === 'string' && hash.length)) {
+                hash = String(hash);
+                const transformed = TRANSFORM_FN ? TRANSFORM_FN(el) : el;
+                map[hash] = MERGE && hash in map ? merge(map[hash], transformed, { union: true }) : transformed;
+            }
         }
     }
     return map;

package/esm/hash/guid.js

@@ -2,30 +2,24 @@ const HEX = [];
 for (let i = 0; i < 256; i++) {
     HEX[i] = (i < 16 ? '0' : '') + i.toString(16);
 }
+let pool = new Uint8Array(0);
+let poolIdx = 0;
+function refill(size = 16 * 1024) {
+    pool = new Uint8Array(size);
+    crypto.getRandomValues(pool);
+    poolIdx = 0;
+}
 function guid() {
-    const d0 = (Math.random() * 0xffffffff) | 0;
-    const d1 = (Math.random() * 0xffffffff) | 0;
-    const d2 = (Math.random() * 0xffffffff) | 0;
-    const d3 = (Math.random() * 0xffffffff) | 0;
-    return HEX[d0 & 0xff] +
-        HEX[(d0 >> 8) & 0xff] +
-        HEX[(d0 >> 16) & 0xff] +
-        HEX[(d0 >> 24) & 0xff] +
-        '-' +
-        HEX[d1 & 0xff] +
-        HEX[(d1 >> 8) & 0xff] +
-        '-' +
-        HEX[((d1 >> 16) & 0x0f) | 0x40] +
-        HEX[(d1 >> 24) & 0xff] +
-        '-' +
-        HEX[(d2 & 0x3f) | 0x80] +
-        HEX[(d2 >> 8) & 0xff] +
-        '-' +
-        HEX[(d2 >> 16) & 0xff] +
-        HEX[(d2 >> 24) & 0xff] +
-        HEX[d3 & 0xff] +
-        HEX[(d3 >> 8) & 0xff] +
-        HEX[(d3 >> 16) & 0xff] +
-        HEX[(d3 >> 24) & 0xff];
+    if (poolIdx + 16 > pool.length)
+        refill();
+    const buf = pool.subarray(poolIdx, poolIdx + 16);
+    poolIdx += 16;
+    buf[6] = (buf[6] & 0x0f) | 0x40;
+    buf[8] = (buf[8] & 0x3f) | 0x80;
+    return (HEX[buf[0]] + HEX[buf[1]] + HEX[buf[2]] + HEX[buf[3]] + '-' +
+        HEX[buf[4]] + HEX[buf[5]] + '-' +
+        HEX[buf[6]] + HEX[buf[7]] + '-' +
+        HEX[buf[8]] + HEX[buf[9]] + '-' +
+        HEX[buf[10]] + HEX[buf[11]] + HEX[buf[12]] + HEX[buf[13]] + HEX[buf[14]] + HEX[buf[15]]);
 }
 export { guid, guid as default };

package/esm/hash/hexId.js

@@ -0,0 +1,25 @@
+const HEX = [];
+for (let i = 0; i < 256; i++) {
+    HEX[i] = (i < 16 ? '0' : '') + i.toString(16);
+}
+let pool = new Uint8Array(0);
+let poolIdx = 0;
+function refill(size = 16 * 1024) {
+    pool = new Uint8Array(size);
+    crypto.getRandomValues(pool);
+    poolIdx = 0;
+}
+function hexId(size) {
+    if (!Number.isInteger(size) || size <= 0)
+        return '';
+    if (poolIdx + size > pool.length)
+        refill();
+    const buf = pool.subarray(poolIdx, poolIdx + size);
+    poolIdx += size;
+    let out = '';
+    for (let i = 0; i < buf.length; i++) {
+        out += HEX[buf[i]];
+    }
+    return out;
+}
+export { hexId, hexId as default };

package/esm/hash/index.js

@@ -1,3 +1,5 @@
 export { djb2 } from './djb2';
 export { fnv1A } from './fnv1A';
 export { guid } from './guid';
+export { hexId } from './hexId';
+export { uuidv7 } from './uuidv7';

package/esm/hash/uuidv7.js

@@ -0,0 +1,39 @@
+const HEX = [];
+for (let i = 0; i < 256; i++) {
+    HEX[i] = (i < 16 ? '0' : '') + i.toString(16);
+}
+let pool = new Uint8Array(0);
+let poolIdx = 0;
+function refill(size = 16 * 1024) {
+    pool = new Uint8Array(size);
+    crypto.getRandomValues(pool);
+    poolIdx = 0;
+}
+function uuidv7() {
+    if (poolIdx + 10 > pool.length)
+        refill();
+    const rand = pool.subarray(poolIdx, poolIdx + 10);
+    poolIdx += 10;
+    const time = BigInt(Date.now());
+    return (HEX[Number((time >> 40n) & 0xffn)] +
+        HEX[Number((time >> 32n) & 0xffn)] +
+        HEX[Number((time >> 24n) & 0xffn)] +
+        HEX[Number((time >> 16n) & 0xffn)] +
+        '-' +
+        HEX[Number((time >> 8n) & 0xffn)] +
+        HEX[Number(time & 0xffn)] +
+        '-' +
+        HEX[(rand[0] & 0x0f) | 0x70] +
+        HEX[rand[1]] +
+        '-' +
+        HEX[(rand[2] & 0x3f) | 0x80] +
+        HEX[rand[3]] +
+        '-' +
+        HEX[rand[4]] +
+        HEX[rand[5]] +
+        HEX[rand[6]] +
+        HEX[rand[7]] +
+        HEX[rand[8]] +
+        HEX[rand[9]]);
+}
+export { uuidv7, uuidv7 as default };

package/esm/object/is.js

@@ -1,4 +1,4 @@
 function isObject(val) {
-    return Object.prototype.toString.call(val) === '[object Object]';
+    return typeof val === 'object' && Object.prototype.toString.call(val) === '[object Object]';
 }
 export { isObject, isObject as default };

package/esm/object/isNotEmpty.js

@@ -1,5 +1,5 @@
 function isNotEmptyObject(val) {
-    if (Object.prototype.toString.call(val) !== '[object Object]')
+    if (typeof val !== 'object' || Object.prototype.toString.call(val) !== '[object Object]')
         return false;
     for (const _ in val) {
         return true;

package/hash/hexId.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Generate a unique hex id
+ *
+ * @param size number of random bytes (id length = size * 2 chars)
+ */
+declare function hexId(size: number): string;
+export { hexId, hexId as default };

package/hash/index.d.ts

@@ -1,3 +1,5 @@
 export { djb2 } from './djb2';
 export { fnv1A } from './fnv1A';
 export { guid } from './guid';
+export { hexId } from './hexId';
+export { uuidv7 } from './uuidv7';

package/hash/uuidv7.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Generate a UUID v7 (timestamp-based, RFC 9562).
+ */
+declare function uuidv7(): string;
+export { uuidv7, uuidv7 as default };

package/index.d.ts

@@ -2,12 +2,10 @@ declare module "equal" {
     function equal(a: any, b: any): boolean;
     export { equal, equal as default };
 }
-declare module "hash/utils" {
-    export function toString(raw: unknown): string;
-}
 declare module "array/dedupe" {
+    type DedupeFilterFn<T> = (el: T) => boolean;
     type DedupeOptionsBase<T> = {
-        filter_fn?: (el: T) => boolean;
+        filter_fn?: DedupeFilterFn<T>;
     };
     type DedupeOptionsWithKey<T extends Record<string, unknown>> = DedupeOptionsBase<T> & {
         key: keyof T;
@@ -643,6 +641,9 @@ declare module "is" {
     }>;
     export { Is, Is as default };
 }
+declare module "hash/utils" {
+    export function toString(raw: unknown): string;
+}
 declare module "hash/djb2" {
     function djb2(data: unknown): string;
     export { djb2, djb2 as default };
@@ -708,10 +709,20 @@ declare module "hash/guid" {
     function guid(): string;
     export { guid, guid as default };
 }
+declare module "hash/hexId" {
+    function hexId(size: number): string;
+    export { hexId, hexId as default };
+}
+declare module "hash/uuidv7" {
+    function uuidv7(): string;
+    export { uuidv7, uuidv7 as default };
+}
 declare module "hash/index" {
     export { djb2 } from "hash/djb2";
     export { fnv1A } from "hash/fnv1A";
     export { guid } from "hash/guid";
+    export { hexId } from "hash/hexId";
+    export { uuidv7 } from "hash/uuidv7";
 }
 declare module "modules/PubSub" {
     type SyncFn = (data: unknown) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@valkyriestudios/utils",
-    "version": "12.44.0",
+    "version": "12.45.0",
     "description": "A collection of single-function utilities for common tasks",
     "author": {
         "name": "Peter Vermeulen",