cafe-utility 10.17.0 → 10.19.0

package/index.d.ts

@@ -22,7 +22,7 @@ declare function chance(threshold: number, generator?: () => number): boolean;
 declare function pick<T>(array: T[], generator?: () => number): T;
 declare function pickMany<T>(array: T[], count: number, generator?: () => number): T[];
 declare function pickManyUnique<T>(array: T[], count: number, equalityFunction: (a: T, b: T) => boolean, generator?: () => number): T[];
-declare function pickGuaranteed<T>(array: T[], include: T | null, exclude: T | null, count: number, generator?: () => number): {
+declare function pickGuaranteed<T>(array: T[], include: T | null, exclude: T | null, count: number, predicate: (value: T, values: T[]) => boolean, generator?: () => number): {
     values: T[];
     indexOfGuaranteed: number;
 };
@@ -132,7 +132,7 @@ interface ParsedFilename {
     filename: string;
 }
 declare function parseFilename(string: string): ParsedFilename;
-declare function randomize(string: string): string;
+declare function randomize(string: string, generator?: () => number): string;
 declare function expand(input: string): string[];
 declare function shrinkTrim(string: string): string;
 declare function capitalize(string: string): string;
@@ -167,6 +167,8 @@ declare type StringSegment = {
     string: string;
 };
 declare function segmentizeString(string: string, symbol: string): StringSegment[];
+declare function base64ToUint8Array(base64: string): Uint8Array;
+declare function hexToUint8Array(hex: string): Uint8Array;
 declare function parseHtmlAttributes(string: string): Record<string, string>;
 declare function readNextWord(string: string, index: number, allowedCharacters?: string[]): string;
 declare function resolveVariables(string: string, variables: Record<string, string>, prefix?: string, separator?: string): string;
@@ -617,6 +619,8 @@ export declare const Strings: {
     isBalanced: typeof isBalanced;
     textToFormat: typeof textToFormat;
     segmentize: typeof segmentizeString;
+    hexToUint8Array: typeof hexToUint8Array;
+    base64ToUint8Array: typeof base64ToUint8Array;
 };
 export declare const Assertions: {
     asEqual: typeof asEqual;

package/index.js

@@ -169,15 +169,19 @@ function pickManyUnique(array, count, equalityFunction, generator = Math.random)
     return results
 }
 
-function pickGuaranteed(array, include, exclude, count, generator = Math.random) {
-    const picks = pickMany(
-        array.filter(x => x !== include && x !== exclude),
-        include === null ? count : count - 1,
-        generator
-    )
+function pickGuaranteed(array, include, exclude, count, predicate, generator = Math.random) {
+    const choices = array.filter(x => x !== include && x !== exclude)
+    const picks = []
     if (include !== null) {
         picks.push(include)
     }
+    while (choices.length && picks.length < count) {
+        const index = exports.Random.intBetween(0, choices.length - 1, generator)
+        if (predicate(choices[index], picks)) {
+            picks.push(choices[index])
+        }
+        choices.splice(index, 1)
+    }
     shuffle(picks, generator)
     return { values: picks, indexOfGuaranteed: include !== null ? picks.indexOf(include) : -1 }
 }
@@ -940,8 +944,8 @@ function parseFilename(string) {
     }
 }
 
-function randomize(string) {
-    return string.replace(/\{(.+?)\}/g, (_, group) => pick(group.split('|')))
+function randomize(string, generator = Math.random) {
+    return string.replace(/\{(.+?)\}/g, (_, group) => pick(group.split('|'), generator))
 }
 
 function expand(input) {
@@ -1148,6 +1152,47 @@ function segmentizeString(string, symbol) {
     return segments
 }
 
+function base64ToUint8Array(base64) {
+    const BASE64_CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
+    let padding = 0
+    if (base64.charAt(base64.length - 1) === '=') {
+        padding++
+        if (base64.charAt(base64.length - 2) === '=') {
+            padding++
+        }
+    }
+    const length = (base64.length * 6) / 8 - padding
+    const output = new Uint8Array(length)
+    let p = 0
+    let q = 0
+    while (p < base64.length) {
+        const w = BASE64_CHARS.indexOf(base64.charAt(p++))
+        const x = BASE64_CHARS.indexOf(base64.charAt(p++))
+        const y = BASE64_CHARS.indexOf(base64.charAt(p++))
+        const z = BASE64_CHARS.indexOf(base64.charAt(p++))
+        const first = (w << 2) | (x >> 4)
+        const second = ((x & 15) << 4) | (y >> 2)
+        const third = ((y & 3) << 6) | z
+        output[q++] = first
+        if (q < length) output[q++] = second
+        if (q < length) output[q++] = third
+    }
+    return output
+}
+
+function hexToUint8Array(hex) {
+    if (hex.startsWith('0x')) {
+        hex = hex.slice(2)
+    }
+    const arrayLength = hex.length / 2
+    const result = new Uint8Array(arrayLength)
+    for (let i = 0; i < arrayLength; i++) {
+        const byteValue = parseInt(hex.slice(i * 2, i * 2 + 2), 16)
+        result[i] = byteValue
+    }
+    return result
+}
+
 function parseHtmlAttributes(string) {
     const attributes = {}
     const matches = string.match(/([a-z\-]+)="([^"]+)"/g)
@@ -2877,7 +2922,9 @@ exports.Strings = {
     describeMarkdown,
     isBalanced,
     textToFormat,
-    segmentize: segmentizeString
+    segmentize: segmentizeString,
+    hexToUint8Array,
+    base64ToUint8Array
 }
 
 exports.Assertions = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cafe-utility",
-    "version": "10.17.0",
+    "version": "10.19.0",
     "description": "",
     "main": "index.js",
     "exports": {