cafe-utility 30.0.1 → 31.1.0

package/index.d.ts

@@ -210,6 +210,7 @@ declare function asUrl(
 ): string
 declare function isNullable(typeFn: (value: any) => boolean, value: any): boolean
 declare function asNullable<T>(typeFn: (value: any) => T, value: any): T | null
+declare function asEmptiable<T>(typeFn: (value: any) => T, value: any): T | ''
 declare function asOptional<T>(typeFn: (value: any) => T, value: any): T | undefined
 declare function enforceObjectShape(value: Record<string, any>, shape: Record<string, (value: any) => boolean>): boolean
 declare function enforceArrayShape(value: any[], shape: Record<string, (value: any) => boolean>): boolean
@@ -357,7 +358,12 @@ declare function parseKeyValues(lines: string[], separator?: string): Record<str
 declare function buildUrl(baseUrl?: string | null, path?: string | null, query?: Record<string, any> | null): 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<void>
+interface WaitOptions {
+	waitMillis: number
+	attempts: number
+	requiredConsecutivePasses?: number
+}
+declare function waitFor(predicate: () => Promise<boolean>, options: WaitOptions): Promise<void>
 declare function filterAndRemove<T>(array: T[], predicate: (item: T) => boolean): T[]
 declare function cloneWithJson<T>(a: T): T
 declare function unixTimestamp(optionalTimestamp?: number): number
@@ -1011,6 +1017,7 @@ export declare const Types: {
 	asStringMap: typeof asStringMap
 	asNumericDictionary: typeof asNumericDictionary
 	asUrl: typeof asUrl
+	asEmptiable: typeof asEmptiable
 	asNullable: typeof asNullable
 	asOptional: typeof asOptional
 	enforceObjectShape: typeof enforceObjectShape

package/index.js

@@ -464,6 +464,9 @@ function isNullable(n, e) {
 function asNullable(n, e) {
 	return e == null ? null : n(e)
 }
+function asEmptiable(n, e) {
+	return e === '' ? '' : n(e)
+}
 function asOptional(n, e) {
 	return e == null ? void 0 : n(e)
 }
@@ -1272,12 +1275,18 @@ function parseCsv(n, e = ',', t = '"') {
 function humanizeProgress(n) {
 	return `[${Math.floor(n.progress * 100)}%] ${humanizeTime(n.deltaMs)} out of ${humanizeTime(n.totalTimeMs)} (${humanizeTime(n.remainingTimeMs)} left) [${Math.round(n.baseTimeMs)} ms each]`
 }
-async function waitFor(n, e, t) {
-	for (let r = 0; r < t; r++) {
+async function waitFor(n, e) {
+	let t = e.requiredConsecutivePasses || 1,
+		r = 0
+	for (let o = 0; o < e.attempts; o++) {
 		try {
-			if (await n()) return
-		} catch {}
-		r < t - 1 && (await sleepMillis(e))
+			if (await n()) {
+				if ((r++, r >= t)) return
+			} else r = 0
+		} catch {
+			r = 0
+		}
+		o < e.attempts - 1 && (await sleepMillis(e.waitMillis))
 	}
 	throw Error('Timed out waiting for predicate')
 }
@@ -2058,8 +2067,8 @@ function keccakPermutate(n) {
 			S = (n[4] << 30) | (n[5] >>> 2),
 			R = (n[6] << 28) | (n[7] >>> 4),
 			I = (n[7] << 28) | (n[6] >>> 4),
-			D = (n[8] << 27) | (n[9] >>> 5),
-			C = (n[9] << 27) | (n[8] >>> 5),
+			C = (n[8] << 27) | (n[9] >>> 5),
+			D = (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),
@@ -2100,7 +2109,7 @@ function keccakPermutate(n) {
 			wn = (n[46] << 24) | (n[47] >>> 8),
 			xn = (n[48] << 14) | (n[49] >>> 18),
 			yn = (n[49] << 14) | (n[48] >>> 18)
-		;(n[0] = E ^ (~v & K)), (n[1] = M ^ (~U & Z)), (n[2] = v ^ (~K & un)), (n[3] = U ^ (~Z & cn)), (n[4] = K ^ (~un & xn)), (n[5] = Z ^ (~cn & yn)), (n[6] = un ^ (~xn & E)), (n[7] = cn ^ (~yn & M)), (n[8] = xn ^ (~E & v)), (n[9] = yn ^ (~M & U)), (n[10] = R ^ (~z & q)), (n[11] = I ^ (~W & H)), (n[12] = z ^ (~q & en)), (n[13] = W ^ (~H & tn)), (n[14] = q ^ (~en & pn)), (n[15] = H ^ (~tn & mn)), (n[16] = en ^ (~pn & R)), (n[17] = tn ^ (~mn & I)), (n[18] = pn ^ (~R & z)), (n[19] = mn ^ (~I & W)), (n[20] = O ^ (~L & Q)), (n[21] = k ^ (~N & G)), (n[22] = L ^ (~Q & sn)), (n[23] = N ^ (~G & fn)), (n[24] = Q ^ (~sn & ln)), (n[25] = G ^ (~fn & an)), (n[26] = sn ^ (~ln & O)), (n[27] = fn ^ (~an & k)), (n[28] = ln ^ (~O & L)), (n[29] = an ^ (~k & N)), (n[30] = D ^ (~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 & D)), (n[37] = on ^ (~wn & C)), (n[38] = gn ^ (~D & B)), (n[39] = wn ^ (~C & P)), (n[40] = T ^ (~j & Y)), (n[41] = S ^ (~F & _)), (n[42] = j ^ (~Y & X)), (n[43] = F ^ (~_ & nn)), (n[44] = Y ^ (~X & hn)), (n[45] = _ ^ (~nn & dn)), (n[46] = X ^ (~hn & T)), (n[47] = nn ^ (~dn & S)), (n[48] = hn ^ (~T & j)), (n[49] = dn ^ (~S & F)), (n[0] ^= IOTA_CONSTANTS[e * 2]), (n[1] ^= IOTA_CONSTANTS[e * 2 + 1])
+		;(n[0] = E ^ (~v & K)), (n[1] = M ^ (~U & Z)), (n[2] = v ^ (~K & un)), (n[3] = U ^ (~Z & cn)), (n[4] = K ^ (~un & xn)), (n[5] = Z ^ (~cn & yn)), (n[6] = un ^ (~xn & E)), (n[7] = cn ^ (~yn & M)), (n[8] = xn ^ (~E & v)), (n[9] = yn ^ (~M & U)), (n[10] = R ^ (~z & q)), (n[11] = I ^ (~W & H)), (n[12] = z ^ (~q & en)), (n[13] = W ^ (~H & tn)), (n[14] = q ^ (~en & pn)), (n[15] = H ^ (~tn & mn)), (n[16] = en ^ (~pn & R)), (n[17] = tn ^ (~mn & I)), (n[18] = pn ^ (~R & z)), (n[19] = mn ^ (~I & W)), (n[20] = O ^ (~L & Q)), (n[21] = k ^ (~N & G)), (n[22] = L ^ (~Q & sn)), (n[23] = N ^ (~G & fn)), (n[24] = Q ^ (~sn & ln)), (n[25] = G ^ (~fn & an)), (n[26] = sn ^ (~ln & O)), (n[27] = fn ^ (~an & k)), (n[28] = ln ^ (~O & L)), (n[29] = an ^ (~k & N)), (n[30] = C ^ (~B & V)), (n[31] = D ^ (~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 & D)), (n[38] = gn ^ (~C & B)), (n[39] = wn ^ (~D & P)), (n[40] = T ^ (~j & Y)), (n[41] = S ^ (~F & _)), (n[42] = j ^ (~Y & X)), (n[43] = F ^ (~_ & nn)), (n[44] = Y ^ (~X & hn)), (n[45] = _ ^ (~nn & dn)), (n[46] = X ^ (~hn & T)), (n[47] = nn ^ (~dn & S)), (n[48] = hn ^ (~T & j)), (n[49] = dn ^ (~S & F)), (n[0] ^= IOTA_CONSTANTS[e * 2]), (n[1] ^= IOTA_CONSTANTS[e * 2 + 1])
 	}
 }
 function bytesToNumbers(n) {
@@ -2704,7 +2713,7 @@ class TrieRouter {
 	(exports.Promises = { raceFulfilled, invert: invertPromise, runInParallelBatches }),
 	(exports.Dates = { getTimestamp, getTimeDelta, secondsToHumanTime, countCycles, isoDate, throttle, timeSince, dateTimeSlug, unixTimestamp, fromUtcString, fromMillis, getProgress, humanizeTime, humanizeProgress, createTimeDigits, mapDayNumber, getDayInfoFromDate, getDayInfoFromDateTimeString, seconds, minutes, hours, days, make: makeDate, normalizeTime, absoluteDays }),
 	(exports.Objects = { safeParse, deleteDeep, getDeep, setDeep, incrementDeep, ensureDeep, replaceDeep, getFirstDeep, deepMergeInPlace, deepMerge2, deepMerge3, mapAllAsync, cloneWithJson, sortObject, sortArray, sortAny, deepEquals, deepEqualsEvery, runOn, ifPresent, zip, zipSum, removeEmptyArrays, removeEmptyValues, flatten, unflatten, match, sort: sortObjectValues, map: mapObject, mapIterable, filterKeys: filterObjectKeys, filterValues: filterObjectValues, rethrow, setSomeOnObject, setSomeDeep, flip, getAllPermutations, countTruthyValues, transformToArray, setMulti, incrementMulti, createBidirectionalMap, createTemporalBidirectionalMap, pushToBidirectionalMap, unshiftToBidirectionalMap, addToTemporalBidirectionalMap, getFromTemporalBidirectionalMap, createStatefulToggle, diffKeys, pickRandomKey, mapRandomKey, fromObjectString, toQueryString, parseQueryString, hasKey, selectMax, reposition, unwrapSingleKey, parseKeyValues }),
-	(exports.Types = { isFunction, isObject, isStrictlyObject, isEmptyArray, isEmptyObject, isUndefined, isString, isNumber, isBoolean, isDate, isBlank, isId, isIntegerString, isHexString, isUrl, isNullable, asString, asHexString, asSafeString, asIntegerString, asNumber, asFunction, asInteger, asBoolean, asDate, asNullableString, asEmptiableString, asId, asTime, asArray, asObject, asNullableObject, asStringMap, asNumericDictionary, asUrl, asNullable, asOptional, enforceObjectShape, enforceArrayShape, isPng, isJpg, isWebp, isImage }),
+	(exports.Types = { isFunction, isObject, isStrictlyObject, isEmptyArray, isEmptyObject, isUndefined, isString, isNumber, isBoolean, isDate, isBlank, isId, isIntegerString, isHexString, isUrl, isNullable, asString, asHexString, asSafeString, asIntegerString, asNumber, asFunction, asInteger, asBoolean, asDate, asNullableString, asEmptiableString, asId, asTime, asArray, asObject, asNullableObject, asStringMap, asNumericDictionary, asUrl, asEmptiable, asNullable, asOptional, enforceObjectShape, enforceArrayShape, isPng, isJpg, isWebp, isImage }),
 	(exports.Strings = { tokenizeByCount, tokenizeByLength, searchHex, searchSubstring, randomHex: randomHexString, randomLetter: randomLetterString, randomAlphanumeric: randomAlphanumericString, randomRichAscii: randomRichAsciiString, randomUnicode: randomUnicodeString, includesAny, slugify, normalForm, enumify, escapeHtml, decodeHtmlEntities, after, afterLast, before, beforeLast, betweenWide, betweenNarrow, getPreLine, containsWord, containsWords, joinUrl, getFuzzyMatchScore, sortByFuzzyScore, splitOnce, splitAll, randomize, expand, shrinkTrim, capitalize, decapitalize, csvEscape, parseCsv, surroundInOut, getExtension, getBasename, normalizeEmail, normalizeFilename, parseFilename, camelToTitle, slugToTitle, slugToCamel, joinHumanly, findWeightedPair, extractBlock, extractAllBlocks, replaceBlocks, indexOfEarliest, lastIndexOfBefore, parseHtmlAttributes, readNextWord, readWordsAfterAll, resolveVariables, resolveVariableWithDefaultSyntax, resolveRemainingVariablesWithDefaults, isLetter, isDigit, isLetterOrDigit, isValidObjectPathCharacter, insert: insertString, indexOfRegex, allIndexOf, lineMatches, linesMatchInOrder, represent, resolveMarkdownLinks, buildUrl, isChinese, replaceBetweenStrings, describeMarkdown, isBalanced, textToFormat, splitFormatting, splitHashtags, splitUrls, route, explodeReplace, generateVariants, replaceWord, replacePascalCaseWords, stripHtml, breakLine, measureTextWidth, toLines, levenshteinDistance, findCommonPrefix, findCommonDirectory }),
 	(exports.Assertions = { asEqual, asTrue, asTruthy, asFalse, asFalsy, asEither }),
 	(exports.Cache = { get: getCached, invalidate: invalidateCache }),

package/package.json

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