cafe-utility 6.1.0 → 6.2.1

package/index.d.ts

@@ -139,6 +139,7 @@ interface BlockExtractionOptions {
     exclusive?: boolean;
 }
 declare function extractBlock(string: string, options: BlockExtractionOptions): string | null;
+declare function extractAllBlocks(string: string, options: BlockExtractionOptions): string[];
 declare function parseCsv(string: string, delimiter?: string, quote?: string): string[];
 declare function humanizeProgress(state: Progress): string;
 declare function waitFor(predicate: () => Promise<boolean>, waitLength: number, maxWaits: number): Promise<boolean>;
@@ -210,7 +211,7 @@ declare function increment(value: number, change: number, maximum: number): numb
 declare function decrement(value: number, change: number, minimum: number): number;
 declare function runOn<T>(object: T, callable: (object: T) => void): T;
 declare function ifPresent<T>(object: T, callable: (object: T) => void): void;
-declare function mergeArrays(target: CafeObject<unknown[]>, source: CafeObject<unknown[]>): void;
+declare function mergeArrays(target: CafeObject<unknown | unknown[]>, source: CafeObject<unknown | unknown[]>): void;
 declare function empty<T>(array: T[]): T[];
 declare function removeEmptyArrays(object: CafeObject): CafeObject;
 declare function removeEmptyValues(object: CafeObject): CafeObject;
@@ -486,6 +487,7 @@ export declare const Strings: {
     joinHumanly: typeof joinHumanly;
     findWeightedPair: typeof findWeightedPair;
     extractBlock: typeof extractBlock;
+    extractAllBlocks: typeof extractAllBlocks;
     isLetter: typeof isLetter;
     isDigit: typeof isDigit;
     isLetterOrDigit: typeof isLetterOrDigit;

package/index.js

@@ -885,11 +885,11 @@ function csvEscape(string) {
 function findWeightedPair(string, start = 0, opening = '{', closing = '}') {
     let weight = 1
     for (let i = start; i < string.length; i++) {
-        if (string[i] === closing) {
+        if (string.slice(i, i + closing.length) === closing) {
             if (--weight === 0) {
                 return i
             }
-        } else if (string[i] === opening) {
+        } else if (string.slice(i, i + opening.length) === opening) {
             weight++
         }
     }
@@ -901,12 +901,28 @@ function extractBlock(string, options) {
     if (opensAt === -1) {
         return null
     }
-    const closesAt = findWeightedPair(string, opensAt + 1, options.opening, options.closing)
+    const closesAt = findWeightedPair(string, opensAt + options.opening.length, options.opening, options.closing)
     return closesAt === -1
         ? null
         : options.exclusive
-        ? string.slice(opensAt + 1, closesAt)
-        : string.slice(opensAt, closesAt + 1)
+        ? string.slice(opensAt + options.opening.length, closesAt)
+        : string.slice(opensAt, closesAt + options.closing.length)
+}
+
+function extractAllBlocks(string, options) {
+    const blocks = []
+    let start = string.indexOf(options.opening)
+    while (true) {
+        if (start === -1) {
+            return blocks
+        }
+        const block = extractBlock(string, { ...options, start })
+        if (!block) {
+            return blocks
+        }
+        blocks.push(block)
+        start = string.indexOf(options.opening, start + block.length)
+    }
 }
 
 function parseCsv(string, delimiter = ',', quote = '"') {
@@ -2123,6 +2139,7 @@ exports.Strings = {
     joinHumanly,
     findWeightedPair,
     extractBlock,
+    extractAllBlocks,
     isLetter,
     isDigit,
     isLetterOrDigit,

package/package.json

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