cafe-utility 27.14.1 → 27.15.0

package/index.d.ts

@@ -229,6 +229,7 @@ declare function indexOfRegex(string: string, regex: RegExp, start?: number): Re
 declare function lineMatches(haystack: string, needles: (string | RegExp)[], orderMatters?: boolean): boolean;
 declare function linesMatchInOrder(lines: string[], expectations: (string | RegExp)[][], orderMatters?: boolean): boolean;
 declare function csvEscape(string: string): string;
+declare function allIndexOf(string: string, searchString: string, start?: number): number[];
 declare function indexOfEarliest(string: string, searchStrings: string[], start?: number): number;
 declare function lastIndexOfBefore(string: string, searchString: string, start?: number): number;
 declare function findWeightedPair(string: string, start?: number, opening?: string, closing?: string): number;
@@ -276,6 +277,7 @@ declare function containsWord(string: string, word: string): boolean;
 declare function containsWords(string: string, words: string[], mode: 'any' | 'all'): boolean;
 declare function parseHtmlAttributes(string: string): Record<string, string>;
 declare function readNextWord(string: string, index: number, allowedCharacters?: string[]): string;
+declare function readWordsAfterAll(string: string, after: string, allowedCharacters?: string[]): string[];
 declare function resolveVariables(string: string, variables: Record<string, string>, prefix?: string, separator?: string): string;
 declare function resolveVariableWithDefaultSyntax(string: string, key: string, value: string, prefix?: string, separator?: string): string;
 declare function resolveRemainingVariablesWithDefaults(string: string, prefix?: string, separator?: string): string;
@@ -988,6 +990,7 @@ export declare const Strings: {
     lastIndexOfBefore: typeof lastIndexOfBefore;
     parseHtmlAttributes: typeof parseHtmlAttributes;
     readNextWord: typeof readNextWord;
+    readWordsAfterAll: typeof readWordsAfterAll;
     resolveVariables: typeof resolveVariables;
     resolveVariableWithDefaultSyntax: typeof resolveVariableWithDefaultSyntax;
     resolveRemainingVariablesWithDefaults: typeof resolveRemainingVariablesWithDefaults;
@@ -997,6 +1000,7 @@ export declare const Strings: {
     isValidObjectPathCharacter: typeof isValidObjectPathCharacter;
     insert: typeof insertString;
     indexOfRegex: typeof indexOfRegex;
+    allIndexOf: typeof allIndexOf;
     lineMatches: typeof lineMatches;
     linesMatchInOrder: typeof linesMatchInOrder;
     represent: typeof represent;

package/index.js

@@ -446,6 +446,8 @@ function asString(n, e) {
 function asHexString(n, e) {
     if (!isHexString(n)) throw new TypeError(`Expected hex string${e?.name ? ` for ${e.name}` : ''}, got: ` + n)
     const t = n.replace(/^0x/, '')
+    if (t.length % 2 !== 0)
+        throw RangeError(`Expected even number of hex digits${e?.name ? ` for ${e.name}` : ''}; got: ` + n)
     if (e && e.byteLength && t.length !== e.byteLength * 2)
         throw RangeError(
             `Expected hex string${e?.name ? ` for ${e.name}` : ''} of byte length ${e.byteLength}; got: ` + t
@@ -925,6 +927,12 @@ function linesMatchInOrder(n, e, t = !0) {
 function csvEscape(n) {
     return n.match(/"|,/) ? `"${n.replace(/"/g, '""')}"` : n
 }
+function allIndexOf(n, e, t = 0) {
+    const r = []
+    let o = n.indexOf(e, t)
+    for (; o !== -1; ) r.push(o), (o = n.indexOf(e, o + e.length))
+    return r
+}
 function indexOfEarliest(n, e, t = 0) {
     let r = -1
     for (const o of e) {
@@ -1244,6 +1252,12 @@ function readNextWord(n, e, t = []) {
     for (; e < n.length && (isLetterOrDigit(n[e]) || t.includes(n[e])); ) r += n[e++]
     return r
 }
+function readWordsAfterAll(n, e, t = []) {
+    const r = allIndexOf(n, e),
+        o = []
+    for (const i of r) o.push(readNextWord(n, i + e.length, t))
+    return o
+}
 function resolveVariables(n, e, t = '$', r = ':') {
     for (const o in e) n = resolveVariableWithDefaultSyntax(n, o, e[o], t, r)
     return (n = resolveRemainingVariablesWithDefaults(n)), n
@@ -2244,26 +2258,26 @@ function keccakPermutate(n) {
             a = n[9] ^ n[19] ^ n[29] ^ n[39] ^ n[49],
             h = (o << 1) | (i >>> 31),
             bn = (i << 1) | (o >>> 31),
-            p = l ^ h,
-            d = a ^ bn,
+            d = l ^ h,
+            p = a ^ bn,
             $n = (u << 1) | (s >>> 31),
             An = (s << 1) | (u >>> 31),
             m = t ^ $n,
             g = r ^ An,
             En = (c << 1) | (f >>> 31),
-            Mn = (f << 1) | (c >>> 31),
+            On = (f << 1) | (c >>> 31),
             w = o ^ En,
-            y = i ^ Mn,
-            On = (l << 1) | (a >>> 31),
+            y = i ^ On,
+            Mn = (l << 1) | (a >>> 31),
             kn = (a << 1) | (l >>> 31),
-            x = u ^ On,
+            x = u ^ Mn,
             b = s ^ kn,
             Tn = (t << 1) | (r >>> 31),
             Sn = (r << 1) | (t >>> 31),
             $ = c ^ Tn,
             A = f ^ Sn
-        ;(n[0] ^= p),
-            (n[1] ^= d),
+        ;(n[0] ^= d),
+            (n[1] ^= p),
             (n[2] ^= m),
             (n[3] ^= g),
             (n[4] ^= w),
@@ -2272,8 +2286,8 @@ function keccakPermutate(n) {
             (n[7] ^= b),
             (n[8] ^= $),
             (n[9] ^= A),
-            (n[10] ^= p),
-            (n[11] ^= d),
+            (n[10] ^= d),
+            (n[11] ^= p),
             (n[12] ^= m),
             (n[13] ^= g),
             (n[14] ^= w),
@@ -2282,8 +2296,8 @@ function keccakPermutate(n) {
             (n[17] ^= b),
             (n[18] ^= $),
             (n[19] ^= A),
-            (n[20] ^= p),
-            (n[21] ^= d),
+            (n[20] ^= d),
+            (n[21] ^= p),
             (n[22] ^= m),
             (n[23] ^= g),
             (n[24] ^= w),
@@ -2292,8 +2306,8 @@ function keccakPermutate(n) {
             (n[27] ^= b),
             (n[28] ^= $),
             (n[29] ^= A),
-            (n[30] ^= p),
-            (n[31] ^= d),
+            (n[30] ^= d),
+            (n[31] ^= p),
             (n[32] ^= m),
             (n[33] ^= g),
             (n[34] ^= w),
@@ -2302,8 +2316,8 @@ function keccakPermutate(n) {
             (n[37] ^= b),
             (n[38] ^= $),
             (n[39] ^= A),
-            (n[40] ^= p),
-            (n[41] ^= d),
+            (n[40] ^= d),
+            (n[41] ^= p),
             (n[42] ^= m),
             (n[43] ^= g),
             (n[44] ^= w),
@@ -2313,15 +2327,15 @@ function keccakPermutate(n) {
             (n[48] ^= $),
             (n[49] ^= A)
         const E = n[0],
-            M = n[1],
-            O = (n[2] << 1) | (n[3] >>> 31),
+            O = n[1],
+            M = (n[2] << 1) | (n[3] >>> 31),
             k = (n[3] << 1) | (n[2] >>> 31),
             T = (n[5] << 30) | (n[4] >>> 2),
             S = (n[4] << 30) | (n[5] >>> 2),
             R = (n[6] << 28) | (n[7] >>> 4),
             D = (n[7] << 28) | (n[6] >>> 4),
-            C = (n[8] << 27) | (n[9] >>> 5),
-            I = (n[9] << 27) | (n[8] >>> 5),
+            I = (n[8] << 27) | (n[9] >>> 5),
+            C = (n[9] << 27) | (n[8] >>> 5),
             B = (n[11] << 4) | (n[10] >>> 28),
             P = (n[10] << 4) | (n[11] >>> 28),
             v = (n[13] << 12) | (n[12] >>> 20),
@@ -2355,63 +2369,63 @@ function keccakPermutate(n) {
             ln = (n[40] << 18) | (n[41] >>> 14),
             an = (n[41] << 18) | (n[40] >>> 14),
             hn = (n[42] << 2) | (n[43] >>> 30),
-            pn = (n[43] << 2) | (n[42] >>> 30),
-            dn = (n[45] << 29) | (n[44] >>> 3),
+            dn = (n[43] << 2) | (n[42] >>> 30),
+            pn = (n[45] << 29) | (n[44] >>> 3),
             mn = (n[44] << 29) | (n[45] >>> 3),
             gn = (n[47] << 24) | (n[46] >>> 8),
             wn = (n[46] << 24) | (n[47] >>> 8),
             yn = (n[48] << 14) | (n[49] >>> 18),
             xn = (n[49] << 14) | (n[48] >>> 18)
         ;(n[0] = E ^ (~v & K)),
-            (n[1] = M ^ (~U & Z)),
+            (n[1] = O ^ (~U & Z)),
             (n[2] = v ^ (~K & un)),
             (n[3] = U ^ (~Z & cn)),
             (n[4] = K ^ (~un & yn)),
             (n[5] = Z ^ (~cn & xn)),
             (n[6] = un ^ (~yn & E)),
-            (n[7] = cn ^ (~xn & M)),
+            (n[7] = cn ^ (~xn & O)),
             (n[8] = yn ^ (~E & v)),
-            (n[9] = xn ^ (~M & U)),
+            (n[9] = xn ^ (~O & U)),
             (n[10] = R ^ (~F & W)),
             (n[11] = D ^ (~q & H)),
             (n[12] = F ^ (~W & en)),
             (n[13] = q ^ (~H & tn)),
-            (n[14] = W ^ (~en & dn)),
+            (n[14] = W ^ (~en & pn)),
             (n[15] = H ^ (~tn & mn)),
-            (n[16] = en ^ (~dn & R)),
+            (n[16] = en ^ (~pn & R)),
             (n[17] = tn ^ (~mn & D)),
-            (n[18] = dn ^ (~R & F)),
+            (n[18] = pn ^ (~R & F)),
             (n[19] = mn ^ (~D & q)),
-            (n[20] = O ^ (~L & Q)),
+            (n[20] = M ^ (~L & Q)),
             (n[21] = k ^ (~j & _)),
             (n[22] = L ^ (~Q & sn)),
             (n[23] = j ^ (~_ & fn)),
             (n[24] = Q ^ (~sn & ln)),
             (n[25] = _ ^ (~fn & an)),
-            (n[26] = sn ^ (~ln & O)),
+            (n[26] = sn ^ (~ln & M)),
             (n[27] = fn ^ (~an & k)),
-            (n[28] = ln ^ (~O & L)),
+            (n[28] = ln ^ (~M & L)),
             (n[29] = an ^ (~k & j)),
-            (n[30] = C ^ (~B & V)),
-            (n[31] = I ^ (~P & J)),
+            (n[30] = I ^ (~B & V)),
+            (n[31] = C ^ (~P & J)),
             (n[32] = B ^ (~V & rn)),
             (n[33] = P ^ (~J & on)),
             (n[34] = V ^ (~rn & gn)),
             (n[35] = J ^ (~on & wn)),
-            (n[36] = rn ^ (~gn & C)),
-            (n[37] = on ^ (~wn & I)),
-            (n[38] = gn ^ (~C & B)),
-            (n[39] = wn ^ (~I & P)),
+            (n[36] = rn ^ (~gn & I)),
+            (n[37] = on ^ (~wn & C)),
+            (n[38] = gn ^ (~I & B)),
+            (n[39] = wn ^ (~C & P)),
             (n[40] = T ^ (~N & G)),
             (n[41] = S ^ (~z & Y)),
             (n[42] = N ^ (~G & X)),
             (n[43] = z ^ (~Y & nn)),
             (n[44] = G ^ (~X & hn)),
-            (n[45] = Y ^ (~nn & pn)),
+            (n[45] = Y ^ (~nn & dn)),
             (n[46] = X ^ (~hn & T)),
-            (n[47] = nn ^ (~pn & S)),
+            (n[47] = nn ^ (~dn & S)),
             (n[48] = hn ^ (~T & N)),
-            (n[49] = pn ^ (~S & z)),
+            (n[49] = dn ^ (~S & z)),
             (n[0] ^= IOTA_CONSTANTS[e * 2]),
             (n[1] ^= IOTA_CONSTANTS[e * 2 + 1])
     }
@@ -3391,6 +3405,7 @@ class AsyncQueue {
         lastIndexOfBefore,
         parseHtmlAttributes,
         readNextWord,
+        readWordsAfterAll,
         resolveVariables,
         resolveVariableWithDefaultSyntax,
         resolveRemainingVariablesWithDefaults,
@@ -3400,6 +3415,7 @@ class AsyncQueue {
         isValidObjectPathCharacter,
         insert: insertString,
         indexOfRegex,
+        allIndexOf,
         lineMatches,
         linesMatchInOrder,
         represent,

package/package.json

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