cafe-utility 6.2.0 → 6.2.1

package/index.d.ts

@@ -211,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;

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,12 @@ 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) {

package/package.json

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