Merge branch 'release/v0.24.21'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zeed",
   "type": "module",
-  "version": "0.24.20",
+  "version": "0.24.21",
   "description": "🌱 Simple foundation library",
   "author": {
     "name": "Dirk Holtwick",

src/common/uuid.spec.ts

@@ -2,24 +2,27 @@
 
 import { useBase } from './data/basex'
 import { sleep } from './exec/promise'
-import { suid, suidBytesDate, suidDate, uname, uuid, uuid32bit, uuidB32, uuidBytes, uuidDecode, uuidDecodeB32, uuidDecodeV4, uuidEncode, uuidEncodeB32, uuidEncodeV4, uuidv4 } from './uuid'
+import { setUuidDefaultEncoding, suid, suidBytesDate, suidDate, uname, uuid, uuid32bit, uuidB32, uuidBytes, uuidDecode, uuidDecodeB32, uuidDecodeV4, uuidEncode, uuidEncodeB32, uuidEncodeV4, uuidv4 } from './uuid'
 
 describe('uuid', () => {
   // beforeAll(() => setUuidDefaultEncoding('base32'))
 
   it('should not certain length', () => {
+    setUuidDefaultEncoding()
     expect(uuid().length).toBe(22)
     expect(uuidB32().length).toBe(26)
   })
 
   it('should encode/decode', () => {
+    setUuidDefaultEncoding()
     const us = uuid()
     const ub = uuidDecode(us)
     expect(ub.length).toBe(16)
     expect(uuidEncode(ub)).toEqual(us)
   })
 
   it('should not have collisions', () => {
+    setUuidDefaultEncoding()
     const list = Array.apply(null, Array.from({ length: 100 })).map(uuid)
     while (list.length) {
       const id = list.pop()
@@ -29,6 +32,7 @@ describe('uuid', () => {
   })
 
   it('should not have collisions v4', () => {
+    setUuidDefaultEncoding()
     const list = Array.apply(null, Array.from({ length: 100 })).map(uuidv4)
     while (list.length) {
       const id = list.pop()
@@ -172,13 +176,15 @@ describe('uuid', () => {
   })
 
   it('should encode / decode 62', () => {
+    setUuidDefaultEncoding()
     const bytes = uuidBytes()
     const b62 = uuidEncode(bytes)
     expect(b62).toHaveLength(22)
     expect(uuidDecode(b62)).toEqual(bytes)
   })
 
   it('should encode / decode 62 from string', () => {
+    setUuidDefaultEncoding()
     const id = uuid()
     expect(id).toHaveLength(22)
     const b62 = uuidDecode(id)
@@ -187,6 +193,7 @@ describe('uuid', () => {
   })
 
   it('should encode / decode 62 by example', () => {
+    setUuidDefaultEncoding()
     const id = '78MQbFaILcblSYA7WS2OGE'
     expect(id).toHaveLength(22)
     const b62 = uuidDecode(id)
@@ -235,4 +242,14 @@ describe('uuid', () => {
     const decoded = uuidDecodeV4(uuid)
     expect(decoded).toEqual(new Uint8Array([234, 109, 230, 115, 91, 247, 195, 211, 119, 255, 157, 220, 65, 184, 26, 190]))
   })
+
+  it('should use test uuid', () => {
+    setUuidDefaultEncoding('test')
+    expect(uuid()).toEqual('test-0')
+    expect(uuid()).toEqual('test-1')
+
+    setUuidDefaultEncoding('test')
+    expect(uuid()).toEqual('test-0')
+    expect(uuid()).toEqual('test-1')
+  })
 })

src/common/uuid.ts

@@ -1,6 +1,6 @@
 import { randomUint8Array } from './crypto'
 import { decodeBase32, decodeBase62, encodeBase32, encodeBase62 } from './data/basex'
-import { fromHex, toHex } from './data/bin'
+import { fromHex, toHex, toUint8Array, Uint8ArrayToString } from './data/bin'
 import { getTimestamp } from './time'
 
 // 128 bit UUID
@@ -139,13 +139,21 @@ const mapModes = {
     uuidDecode: uuidDecodeV4,
     uuidEncode: uuidEncodeV4,
   },
+  test: {
+    uuid: () => uname('test'),
+    uuidDecode: (id: string) => toUint8Array(id),
+    uuidEncode: (bin: Uint8Array) => Uint8ArrayToString(bin),
+  },
 }
 
 let _mode: keyof typeof mapModes = 'base62'
 let _sorted = false
 
-export function setUuidDefaultEncoding(mode: keyof typeof mapModes, sorted = false) {
-  _mode = mode
+export function setUuidDefaultEncoding(mode?: keyof typeof mapModes, sorted = false) {
+  if (mode === 'test')
+    unameReset('test')
+
+  _mode = mode ?? 'base62'
   _sorted = sorted
 }
 
@@ -183,6 +191,10 @@ export function uname(name = 'id'): string {
   return `${name}-${_unameCounters[name]++}`
 }
 
+export function unameReset(name = 'id') {
+  _unameCounters[name] = 0
+}
+
 let _qid = 0
 
 export function qid(): string {