cafe-utility 14.1.0 → 15.0.1

package/index.d.ts

@@ -54,7 +54,6 @@ declare function isBoolean(value: any): value is boolean;
 declare function isDate(value: any): value is Date;
 declare function isBlank(value: any): boolean;
 declare function isId(value: any): value is number;
-declare function isNumbool(value: any): value is 0 | 1;
 declare function randomLetterString(length: number, generator?: () => number): string;
 declare function randomAlphanumericString(length: number, generator?: () => number): string;
 declare function randomRichAsciiString(length: number, generator?: () => number): string;
@@ -70,7 +69,6 @@ declare function asDate(date: any): Date;
 declare function asNullableString(string: any): string | null;
 declare function asEmptiableString(string: any): string;
 declare function asId(value: any): number;
-declare function asNumbool(value: any): 0 | 1;
 declare function asTime(value: any): string;
 declare function asArray(value: any): unknown[];
 declare function asObject(value: any): Record<string, unknown>;
@@ -112,6 +110,7 @@ declare function interpolate(a: number, b: number, t: number): number;
 declare function sum(array: number[]): number;
 declare function average(array: number[]): number;
 declare function median(array: number[]): number;
+declare function getDistanceFromMidpoint(position: number, length: number): number;
 declare function range(start: number, end: number): number[];
 declare function includesAny(string: string, substrings: string[]): boolean;
 declare function isChinese(string: string): boolean;
@@ -178,7 +177,9 @@ type StringSegment = {
     symbol: string | null;
     string: string;
 };
-declare function segmentizeString(string: string, symbol: string, orphan?: boolean): StringSegment[];
+declare function splitFormatting(string: string, symbol: string): StringSegment[];
+declare function splitHashtags(string: string): StringSegment[];
+declare function splitUrls(string: string): StringSegment[];
 declare function base64ToUint8Array(base64: string): Uint8Array;
 declare function uint8ArrayToBase64(array: Uint8Array): string;
 declare function hexToUint8Array(hex: string): Uint8Array;
@@ -354,12 +355,16 @@ declare function makeAsyncQueue(concurrency?: number): {
     enqueue(fn: () => Promise<void>): void;
     drain: () => Promise<void>;
 };
-export declare class Maybe<T> {
-    private value;
-    constructor(value: T | null);
-    bind<K>(fn: (value: T) => K): Maybe<Awaited<K>>;
-    valueOf(): Promise<T | null>;
+export declare class Optional<T> {
+    value: T | null | undefined;
+    constructor(value: T | null | undefined);
+    ifPresent(fn: (value: T) => void): this;
+    orElse(fn: () => void): void;
 }
+interface Newable<T> extends Function {
+    new (...args: any[]): T;
+}
+declare function findInstance<T, K extends T>(array: T[], type: Newable<K>): Optional<K>;
 type Playbook<T> = {
     ttl: number;
     ttlMax?: number;
@@ -447,6 +452,7 @@ export declare const Arrays: {
     requireNumberArgument: typeof requireNumberArgument;
     bringToFront: typeof bringToFront;
     bringToFrontInPlace: typeof bringToFrontInPlace;
+    findInstance: typeof findInstance;
 };
 export declare const System: {
     sleepMillis: typeof sleepMillis;
@@ -460,6 +466,7 @@ export declare const Numbers: {
     sum: typeof sum;
     average: typeof average;
     median: typeof median;
+    getDistanceFromMidpoint: typeof getDistanceFromMidpoint;
     clamp: typeof clamp;
     range: typeof range;
     interpolate: typeof interpolate;
@@ -575,7 +582,6 @@ export declare const Types: {
     isDate: typeof isDate;
     isBlank: typeof isBlank;
     isId: typeof isId;
-    isNumbool: typeof isNumbool;
     isNullable: typeof isNullable;
     asString: typeof asString;
     asNumber: typeof asNumber;
@@ -585,7 +591,6 @@ export declare const Types: {
     asNullableString: typeof asNullableString;
     asEmptiableString: typeof asEmptiableString;
     asId: typeof asId;
-    asNumbool: typeof asNumbool;
     asTime: typeof asTime;
     asArray: typeof asArray;
     asObject: typeof asObject;
@@ -665,7 +670,9 @@ export declare const Strings: {
     describeMarkdown: typeof describeMarkdown;
     isBalanced: typeof isBalanced;
     textToFormat: typeof textToFormat;
-    segmentize: typeof segmentizeString;
+    splitFormatting: typeof splitFormatting;
+    splitHashtags: typeof splitHashtags;
+    splitUrls: typeof splitUrls;
     hexToUint8Array: typeof hexToUint8Array;
     uint8ArrayToHex: typeof uint8ArrayToHex;
     base64ToUint8Array: typeof base64ToUint8Array;

package/index.js

@@ -13,7 +13,7 @@ Object.defineProperty(exports, '__esModule', { value: !0 }),
         exports.System =
         exports.Arrays =
         exports.Random =
-        exports.Maybe =
+        exports.Optional =
             void 0)
 async function invertPromise(n) {
     return new Promise((e, t) => n.then(t, e))
@@ -126,13 +126,13 @@ function pickManyUnique(n, e, t, r = Math.random) {
     return o
 }
 function pickGuaranteed(n, e, t, r, o, i = Math.random) {
-    const u = n.filter(c => c !== e && c !== t),
-        s = []
-    for (e !== null && s.push(e); u.length && s.length < r; ) {
-        const c = exports.Random.intBetween(0, u.length - 1, i)
-        o(u[c], s) && s.push(u[c]), u.splice(c, 1)
+    const u = n.filter(s => s !== e && s !== t),
+        c = []
+    for (e !== null && c.push(e); u.length && c.length < r; ) {
+        const s = exports.Random.intBetween(0, u.length - 1, i)
+        o(u[s], c) && c.push(u[s]), u.splice(s, 1)
     }
-    return shuffle(s, i), { values: s, indexOfGuaranteed: e !== null ? s.indexOf(e) : -1 }
+    return shuffle(c, i), { values: c, indexOfGuaranteed: e !== null ? c.indexOf(e) : -1 }
 }
 function last(n) {
     return n[n.length - 1]
@@ -167,10 +167,10 @@ function setDeep(n, e, t) {
     let o = n
     for (let i = 0; i < r.length; i++) {
         const u = r[i],
-            s = i < r.length - 1 && r[i + 1].includes(']'),
-            f = u.includes(']') ? u.replace(/\[|\]/g, '') : u
-        if (i === r.length - 1) return (o[f] = t), t
-        isObject(o[f]) || (s ? (o[f] = []) : (o[f] = {})), (o = o[f])
+            c = i < r.length - 1 && r[i + 1].includes(']'),
+            l = u.includes(']') ? u.replace(/\[|\]/g, '') : u
+        if (i === r.length - 1) return (o[l] = t), t
+        isObject(o[l]) || (c ? (o[l] = []) : (o[l] = {})), (o = o[l])
     }
     return t
 }
@@ -277,9 +277,6 @@ function isBlank(n) {
 function isId(n) {
     return isNumber(n) && Number.isInteger(n) && n >= 1
 }
-function isNumbool(n) {
-    return n === 0 || n === 1
-}
 const symbols = '!@#$%^&*()_+-=[]{}|;:<>?,./',
     symbolsArray = '!@#$%^&*()_+-=[]{}|;:<>?,./'.split(''),
     lowercaseAlphabet = 'abcdefghijklmnopqrstuvwxyz',
@@ -370,11 +367,6 @@ function asId(n) {
     if (!isId(e)) throw new TypeError('Expected id, got: ' + n)
     return e
 }
-function asNumbool(n) {
-    if (n === 1 || n === '1') return 1
-    if (n === 0 || n === '0') return 0
-    throw new TypeError('Expected numbool, got: ' + n)
-}
 function asTime(n) {
     if (!isString(n)) throw new TypeError('Expected time, got: ' + n)
     const e = n.split(':')
@@ -547,6 +539,9 @@ function median(n) {
         t = Math.floor(e.length / 2)
     return e.length % 2 === 0 ? (e[t] + e[t - 1]) / 2 : e[t]
 }
+function getDistanceFromMidpoint(n, e) {
+    return n - (e - 1) / 2
+}
 function range(n, e) {
     const t = []
     for (let r = n; r <= e; r++) t.push(r)
@@ -686,9 +681,9 @@ function expand(n) {
         o = n.slice(0, t.index),
         i = n.slice(t.index + t[0].length)
     let u = []
-    for (const s of r) {
-        const c = expand(o + s + i)
-        u = u.concat(c)
+    for (const c of r) {
+        const s = expand(o + c + i)
+        u = u.concat(s)
     }
     return u
 }
@@ -759,6 +754,14 @@ function indexOfEarliest(n, e, t = 0) {
     }
     return r
 }
+function indexOfWordBreak(n, e = 0) {
+    for (let t = e; t < n.length; t++) if (!isLetterOrDigit(n[t])) return t
+    return -1
+}
+function indexOfHashtag(n, e = 0) {
+    for (let t = e; t < n.length; t++) if (n[t] === '#' && isLetterOrDigit(n[t + 1])) return t
+    return -1
+}
 function lastIndexOfBefore(n, e, t = 0) {
     return n.slice(0, t).lastIndexOf(e)
 }
@@ -826,37 +829,71 @@ function replaceBlocks(n, e, t) {
         ;(r = n.indexOf(o, r) + i.length), (n = n.replace(o, i))
     }
 }
-function segmentizeString(n, e, t = !1) {
-    const r = []
-    let o = 0
-    for (; o < n.length; ) {
-        const i = n.indexOf(e, o)
-        if (i === -1) {
-            r.push({ string: n.slice(o), symbol: null })
+function splitFormatting(n, e) {
+    const t = []
+    let r = 0
+    for (; r < n.length; ) {
+        const o = n.indexOf(e, r)
+        if (o === -1) {
+            t.push({ string: n.slice(r), symbol: null })
             break
         }
-        const u = t
-            ? indexOfEarliest(
-                  n,
-                  [
-                      ' ',
-                      `
-`
-                  ],
-                  i + e.length
-              )
-            : n.indexOf(e, i + e.length)
-        if (t && u === -1) {
-            r.push({ string: n.slice(o, i), symbol: null }), r.push({ string: n.slice(i + e.length), symbol: e })
+        const i = n.indexOf(e, o + e.length)
+        if ((o > r && i !== -1 && t.push({ string: n.slice(r, o), symbol: null }), i === -1)) {
+            t.push({ string: n.slice(r), symbol: null })
+            break
+        }
+        t.push({ string: n.slice(o + e.length, i), symbol: e }), (r = i + e.length)
+    }
+    return t
+}
+function splitHashtags(n) {
+    const e = []
+    let t = 0
+    for (; t < n.length; ) {
+        const r = indexOfHashtag(n, t)
+        if (r === -1) {
+            e.push({ string: n.slice(t), symbol: null })
             break
         }
-        if ((i > o && u !== -1 && r.push({ string: n.slice(o, i), symbol: null }), u === -1)) {
-            r.push({ string: n.slice(o), symbol: null })
+        const o = indexOfWordBreak(n, r + 1)
+        if (o === -1) {
+            e.push({ string: n.slice(t, r), symbol: null }), e.push({ string: n.slice(r + 1), symbol: '#' })
             break
         }
-        r.push({ string: n.slice(i + e.length, u), symbol: e }), (o = t ? u : u + e.length)
+        r > t && e.push({ string: n.slice(t, r), symbol: null }),
+            e.push({ string: n.slice(r + 1, o), symbol: '#' }),
+            (t = o)
     }
-    return r
+    return e
+}
+function splitUrls(n) {
+    const e = []
+    let t = 0
+    for (; t < n.length; ) {
+        const r = indexOfEarliest(n, ['http://', 'https://'], t)
+        if (r === -1) {
+            e.push({ string: n.slice(t), symbol: null })
+            break
+        }
+        const o = indexOfEarliest(
+            n,
+            [
+                ' ',
+                `
+`
+            ],
+            r
+        )
+        if (o === -1) {
+            r > t && e.push({ string: n.slice(t, r), symbol: null }), e.push({ string: n.slice(r), symbol: 'http' })
+            break
+        }
+        r > t && e.push({ string: n.slice(t, r), symbol: null }),
+            e.push({ string: n.slice(r, o), symbol: 'http' }),
+            (t = o)
+    }
+    return e
 }
 const BASE64_CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
 function base64ToUint8Array(n) {
@@ -868,13 +905,13 @@ function base64ToUint8Array(n) {
         i = 0
     for (; o < n.length; ) {
         const u = BASE64_CHARS.indexOf(n.charAt(o++)),
-            s = BASE64_CHARS.indexOf(n.charAt(o++)),
             c = BASE64_CHARS.indexOf(n.charAt(o++)),
-            f = BASE64_CHARS.indexOf(n.charAt(o++)),
-            l = (u << 2) | (s >> 4),
-            a = ((s & 15) << 4) | (c >> 2),
-            h = ((c & 3) << 6) | f
-        ;(r[i++] = l), i < t && (r[i++] = a), i < t && (r[i++] = h)
+            s = BASE64_CHARS.indexOf(n.charAt(o++)),
+            l = BASE64_CHARS.indexOf(n.charAt(o++)),
+            f = (u << 2) | (c >> 4),
+            a = ((c & 15) << 4) | (s >> 2),
+            h = ((s & 3) << 6) | l
+        ;(r[i++] = f), i < t && (r[i++] = a), i < t && (r[i++] = h)
     }
     return r
 }
@@ -885,13 +922,13 @@ function uint8ArrayToBase64(n) {
         const o = n[r],
             i = n[r + 1],
             u = n[r + 2],
-            s = o >> 2,
-            c = ((o & 3) << 4) | (i >> 4),
-            f = ((i & 15) << 2) | (u >> 6),
-            l = u & 63
-        ;(e += BASE64_CHARS[s] + BASE64_CHARS[c]),
-            r + 1 < n.length ? (e += BASE64_CHARS[f]) : t++,
-            r + 2 < n.length ? (e += BASE64_CHARS[l]) : t++
+            c = o >> 2,
+            s = ((o & 3) << 4) | (i >> 4),
+            l = ((i & 15) << 2) | (u >> 6),
+            f = u & 63
+        ;(e += BASE64_CHARS[c] + BASE64_CHARS[s]),
+            r + 1 < n.length ? (e += BASE64_CHARS[l]) : t++,
+            r + 2 < n.length ? (e += BASE64_CHARS[f]) : t++
     }
     return t && (e += t === 1 ? '=' : '=='), e
 }
@@ -931,7 +968,7 @@ function generateVariants(n, e, t, r = Math.random) {
     const o = exports.Arrays.shuffle(
             e.map(u => ({
                 variants: exports.Arrays.shuffle(
-                    u.variants.map(s => s),
+                    u.variants.map(c => c),
                     r
                 ),
                 avoid: u.avoid
@@ -940,14 +977,14 @@ function generateVariants(n, e, t, r = Math.random) {
         ),
         i = []
     for (const u of o) {
-        const s = u.variants.filter(f => f !== u.avoid),
-            c = s.find(f => n.includes(f))
-        if (c && (pushAll(i, explodeReplace(n, c, s)), i.length >= t)) break
+        const c = u.variants.filter(l => l !== u.avoid),
+            s = c.find(l => n.includes(l))
+        if (s && (pushAll(i, explodeReplace(n, s, c)), i.length >= t)) break
     }
     if (i.length < t)
         for (const u of o) {
-            const s = u.variants.find(c => n.includes(c))
-            if (s && (pushAll(i, explodeReplace(n, s, u.variants)), i.length >= t)) break
+            const c = u.variants.find(s => n.includes(s))
+            if (c && (pushAll(i, explodeReplace(n, c, u.variants)), i.length >= t)) break
         }
     return i.slice(0, t)
 }
@@ -999,8 +1036,8 @@ function resolveVariableWithDefaultSyntax(n, e, t, r = '$', o = ':') {
         if (n[i + e.length + 1] === o)
             if (n[i + e.length + 2] === o) n = n.replace(`${r}${e}${o}${o}`, t)
             else {
-                const s = readNextWord(n, i + e.length + 2, ['_'])
-                n = n.replace(`${r}${e}${o}${s}`, t)
+                const c = readNextWord(n, i + e.length + 2, ['_'])
+                n = n.replace(`${r}${e}${o}${c}`, t)
             }
         else n = n.replace(`${r}${e}`, t)
         i = n.indexOf(`${r}${e}`, i + t.length)
@@ -1028,8 +1065,8 @@ function resolveMarkdownLinks(n, e) {
             o = n.indexOf(')', t)
         if (r !== -1 && o !== -1) {
             const [i, u] = n.slice(r + 1, o).split(']('),
-                s = e(i, u)
-            n = n.slice(0, r) + s + n.slice(o + 1)
+                c = e(i, u)
+            n = n.slice(0, r) + c + n.slice(o + 1)
         }
         t = n.indexOf('](', t + 1)
     }
@@ -1062,7 +1099,7 @@ function parseCsv(n, e = ',', t = '"') {
     let o = '',
         i = !1
     const u = n.split('')
-    for (const s of u) s === e && !i ? (r.push(o), (o = '')) : s === t && ((!o && !i) || i) ? (i = !i) : (o += s)
+    for (const c of u) c === e && !i ? (r.push(o), (o = '')) : c === t && ((!o && !i) || i) ? (i = !i) : (o += c)
     return r.push(o), r
 }
 function humanizeProgress(n) {
@@ -1143,12 +1180,12 @@ function getAgoStructured(n, e) {
 }
 function countCycles(n, e, t) {
     var r, o, i
-    const s = ((r = t?.now) !== null && r !== void 0 ? r : Date.now()) - n,
-        c = Math.floor(s / e),
-        f =
+    const c = ((r = t?.now) !== null && r !== void 0 ? r : Date.now()) - n,
+        s = Math.floor(c / e),
+        l =
             e / ((o = t?.precision) !== null && o !== void 0 ? o : 1) -
-            Math.ceil((s % e) / ((i = t?.precision) !== null && i !== void 0 ? i : 1))
-    return { cycles: c, remaining: f }
+            Math.ceil((c % e) / ((i = t?.precision) !== null && i !== void 0 ? i : 1))
+    return { cycles: s, remaining: l }
 }
 const throttleTimers = {}
 function throttle(n, e) {
@@ -1165,9 +1202,9 @@ function getProgress(n, e, t, r) {
     const o = e / t,
         i = r - n,
         u = i / e,
-        s = u * t,
-        c = s - i
-    return { deltaMs: i, progress: o, baseTimeMs: u, totalTimeMs: s, remainingTimeMs: c }
+        c = u * t,
+        s = c - i
+    return { deltaMs: i, progress: o, baseTimeMs: u, totalTimeMs: c, remainingTimeMs: s }
 }
 const dayNumberIndex = {
     0: 'sunday',
@@ -1332,9 +1369,9 @@ function organiseWithLimits(n, e, t, r, o) {
     for (const u of Object.keys(e)) i[u] = []
     ;(i[r] = []), o && (n = n.sort(o))
     for (const u of n) {
-        const s = u[t],
-            c = e[s] ? s : r
-        i[c].length >= e[c] ? i[r].push(u) : i[c].push(u)
+        const c = u[t],
+            s = e[c] ? c : r
+        i[s].length >= e[s] ? i[r].push(u) : i[s].push(u)
     }
     return i
 }
@@ -1398,11 +1435,11 @@ function formatNumber(n, e) {
     const o = (t = e?.longForm) !== null && t !== void 0 ? t : !1,
         i = e?.unit ? ` ${e.unit}` : '',
         u = o ? longNumberUnits : shortNumberUnits,
-        s = (r = e?.precision) !== null && r !== void 0 ? r : 1
+        c = (r = e?.precision) !== null && r !== void 0 ? r : 1
     if (n < thresholds[0]) return `${n}${i}`
-    for (let c = 0; c < thresholds.length - 1; c++)
-        if (n < thresholds[c + 1]) return `${(n / thresholds[c]).toFixed(s)}${o ? ' ' : ''}${u[c]}${i}`
-    return `${(n / thresholds[thresholds.length - 1]).toFixed(s)}${o ? ' ' : ''}${u[thresholds.length - 1]}${i}`
+    for (let s = 0; s < thresholds.length - 1; s++)
+        if (n < thresholds[s + 1]) return `${(n / thresholds[s]).toFixed(c)}${o ? ' ' : ''}${u[s]}${i}`
+    return `${(n / thresholds[thresholds.length - 1]).toFixed(c)}${o ? ' ' : ''}${u[thresholds.length - 1]}${i}`
 }
 function makeNumber(n) {
     const e = parseFloat(n)
@@ -1481,20 +1518,20 @@ function flip(n) {
 }
 function getAllPermutations(n) {
     const e = Object.keys(n),
-        t = e.map(s => n[s].length),
-        r = t.reduce((s, c) => (s *= c))
+        t = e.map(c => n[c].length),
+        r = t.reduce((c, s) => (c *= s))
     let o = 1
     const i = [1]
-    for (let s = 0; s < t.length - 1; s++) (o *= t[s]), i.push(o)
+    for (let c = 0; c < t.length - 1; c++) (o *= t[c]), i.push(o)
     const u = []
-    for (let s = 0; s < r; s++) {
-        const c = {}
-        for (let f = 0; f < e.length; f++) {
-            const l = n[e[f]],
-                a = Math.floor(s / i[f]) % l.length
-            c[e[f]] = l[a]
+    for (let c = 0; c < r; c++) {
+        const s = {}
+        for (let l = 0; l < e.length; l++) {
+            const f = n[e[l]],
+                a = Math.floor(c / i[l]) % f.length
+            s[e[l]] = f[a]
         }
-        u.push(c)
+        u.push(s)
     }
     return u
 }
@@ -1507,14 +1544,14 @@ function getFlatNotation(n, e, t) {
 function flattenInner(n, e, t, r, o) {
     if (!isObject(e)) return e
     for (const [i, u] of Object.entries(e)) {
-        const s = getFlatNotation(t, i, r)
+        const c = getFlatNotation(t, i, r)
         Array.isArray(u)
             ? o
-                ? flattenInner(n, u, s, !0, o)
-                : (n[s] = u.map(c => flattenInner(Array.isArray(c) ? [] : {}, c, '', !1, o)))
+                ? flattenInner(n, u, c, !0, o)
+                : (n[c] = u.map(s => flattenInner(Array.isArray(s) ? [] : {}, s, '', !1, o)))
             : isObject(u)
-            ? flattenInner(n, u, s, !1, o)
-            : (n[s] = u)
+            ? flattenInner(n, u, c, !1, o)
+            : (n[c] = u)
     }
     return n
 }
@@ -1580,9 +1617,9 @@ function makeUnique(n, e) {
 function countUnique(n, e, t, r, o) {
     const i = e ? n.map(e) : n,
         u = {}
-    for (const c of i) u[c] = (u[c] || 0) + 1
-    const s = r ? sortObjectValues(u, o ? (c, f) => c[1] - f[1] : (c, f) => f[1] - c[1]) : u
-    return t ? Object.keys(s) : s
+    for (const s of i) u[s] = (u[s] || 0) + 1
+    const c = r ? sortObjectValues(u, o ? (s, l) => s[1] - l[1] : (s, l) => l[1] - s[1]) : u
+    return t ? Object.keys(c) : c
 }
 function sortObjectValues(n, e) {
     return Object.fromEntries(Object.entries(n).sort(e))
@@ -1674,29 +1711,23 @@ function makeAsyncQueue(n = 1) {
         drain: i
     }
 }
-class Maybe {
+class Optional {
     constructor(e) {
         this.value = e
     }
-    bind(e) {
-        if (this.value === null || this.value === void 0) return new Maybe(null)
-        if (isPromise(this.value)) return new Maybe(this.value.then(t => (t != null ? e(t) : null)).catch(() => null))
-        try {
-            const t = e(this.value)
-            return new Maybe(t)
-        } catch {
-            return new Maybe(null)
-        }
+    ifPresent(e) {
+        return this.value && e(this.value), this
     }
-    async valueOf() {
-        try {
-            return await this.value
-        } catch {
-            return null
-        }
+    orElse(e) {
+        var t
+        ;((t = this.value) !== null && t !== void 0) || e()
     }
 }
-exports.Maybe = Maybe
+exports.Optional = Optional
+function findInstance(n, e) {
+    const t = n.find(r => r instanceof e)
+    return new Optional(t)
+}
 function tickPlaybook(n) {
     if (n.length === 0) return null
     const e = n[0]
@@ -1706,7 +1737,7 @@ function tickPlaybook(n) {
     )
 }
 function getArgument(n, e, t, r) {
-    const o = n.findIndex(s => s.endsWith('-' + e) || s.includes('-' + e + '=')),
+    const o = n.findIndex(c => c.endsWith('-' + e) || c.includes('-' + e + '=')),
         i = n[o]
     if (!i) return (t || {})[r || e || ''] || null
     if (i.includes('=')) return i.split('=')[1]
@@ -1723,14 +1754,14 @@ function getNumberArgument(n, e, t, r) {
     }
 }
 function getBooleanArgument(n, e, t, r) {
-    const o = n.some(c => c.endsWith('-' + e)),
+    const o = n.some(s => s.endsWith('-' + e)),
         i = getArgument(n, e, t, r)
     if (!i && o) return !0
     if (!i && !o) return null
     const u = ['true', '1', 'yes', 'y', 'on'],
-        s = ['false', '0', 'no', 'n', 'off']
+        c = ['false', '0', 'no', 'n', 'off']
     if (u.includes(i.toLowerCase())) return !0
-    if (s.includes(i.toLowerCase())) return !1
+    if (c.includes(i.toLowerCase())) return !1
     throw Error(`Invalid boolean argument ${e}: ${i}`)
 }
 function requireStringArgument(n, e, t, r) {
@@ -1813,24 +1844,24 @@ function isBottommost(n, e, t) {
     return !n[e][t + 1]
 }
 function getCorners(n, e, t) {
-    var r, o, i, u, s, c, f, l
+    var r, o, i, u, c, s, l, f
     const a = []
     return n[e][t]
         ? isHorizontalLine(n, e, t) || isVerticalLine(n, e, t)
             ? []
-            : (!(!((s = n[e - 1]) === null || s === void 0) && s[t - 1]) &&
+            : (!(!((c = n[e - 1]) === null || c === void 0) && c[t - 1]) &&
                   isLeftmost(n, e, t) &&
                   isTopmost(n, e, t) &&
                   a.push({ x: e, y: t }),
-              !(!((c = n[e + 1]) === null || c === void 0) && c[t - 1]) &&
+              !(!((s = n[e + 1]) === null || s === void 0) && s[t - 1]) &&
                   isRightmost(n, e, t) &&
                   isTopmost(n, e, t) &&
                   a.push({ x: e + 1, y: t }),
-              !(!((f = n[e - 1]) === null || f === void 0) && f[t + 1]) &&
+              !(!((l = n[e - 1]) === null || l === void 0) && l[t + 1]) &&
                   isLeftmost(n, e, t) &&
                   isBottommost(n, e, t) &&
                   a.push({ x: e, y: t + 1 }),
-              !(!((l = n[e + 1]) === null || l === void 0) && l[t + 1]) &&
+              !(!((f = n[e + 1]) === null || f === void 0) && f[t + 1]) &&
                   isRightmost(n, e, t) &&
                   isBottommost(n, e, t) &&
                   a.push({ x: e + 1, y: t + 1 }),
@@ -1850,42 +1881,42 @@ function findCorners(n, e, t, r) {
     ]
     for (let i = 0; i < n.length; i++)
         for (let u = 0; u < n[0].length; u++) {
-            const s = getCorners(n, i, u)
-            for (const c of s) o.some(f => f.x === c.x && f.y === c.y) || o.push(c)
+            const c = getCorners(n, i, u)
+            for (const s of c) o.some(l => l.x === s.x && l.y === s.y) || o.push(s)
         }
     return o.map(i => ({ x: i.x * e, y: i.y * e }))
 }
 function findLines(n, e) {
-    const t = filterCoordinates(n, (c, f) => n[c][f] === 0 && n[c][f + 1] !== 0, 'row-first').map(c =>
-            Object.assign(Object.assign({}, c), { dx: 1, dy: 0 })
+    const t = filterCoordinates(n, (s, l) => n[s][l] === 0 && n[s][l + 1] !== 0, 'row-first').map(s =>
+            Object.assign(Object.assign({}, s), { dx: 1, dy: 0 })
         ),
-        r = filterCoordinates(n, (c, f) => n[c][f] === 0 && n[c][f - 1] !== 0, 'row-first').map(c =>
-            Object.assign(Object.assign({}, c), { dx: 1, dy: 0 })
+        r = filterCoordinates(n, (s, l) => n[s][l] === 0 && n[s][l - 1] !== 0, 'row-first').map(s =>
+            Object.assign(Object.assign({}, s), { dx: 1, dy: 0 })
         ),
         o = filterCoordinates(
             n,
-            (c, f) => {
-                var l
-                return n[c][f] === 0 && ((l = n[c - 1]) === null || l === void 0 ? void 0 : l[f]) !== 0
+            (s, l) => {
+                var f
+                return n[s][l] === 0 && ((f = n[s - 1]) === null || f === void 0 ? void 0 : f[l]) !== 0
             },
             'column-first'
-        ).map(c => Object.assign(Object.assign({}, c), { dx: 0, dy: 1 })),
+        ).map(s => Object.assign(Object.assign({}, s), { dx: 0, dy: 1 })),
         i = filterCoordinates(
             n,
-            (c, f) => {
-                var l
-                return n[c][f] === 0 && ((l = n[c + 1]) === null || l === void 0 ? void 0 : l[f]) !== 0
+            (s, l) => {
+                var f
+                return n[s][l] === 0 && ((f = n[s + 1]) === null || f === void 0 ? void 0 : f[l]) !== 0
             },
             'column-first'
-        ).map(c => Object.assign(Object.assign({}, c), { dx: 0, dy: 1 }))
-    t.forEach(c => c.y++), i.forEach(c => c.x++)
-    const u = group([...o, ...i], (c, f) => c.x === f.x && c.y - 1 === f.y),
-        s = group([...r, ...t], (c, f) => c.y === f.y && c.x - 1 === f.x)
-    return [...u, ...s]
-        .map(c => ({ start: c[0], end: last(c) }))
-        .map(c => ({
-            start: multiplyPoint(c.start, e),
-            end: multiplyPoint(addPoint(c.end, { x: c.start.dx, y: c.start.dy }), e)
+        ).map(s => Object.assign(Object.assign({}, s), { dx: 0, dy: 1 }))
+    t.forEach(s => s.y++), i.forEach(s => s.x++)
+    const u = group([...o, ...i], (s, l) => s.x === l.x && s.y - 1 === l.y),
+        c = group([...r, ...t], (s, l) => s.y === l.y && s.x - 1 === l.x)
+    return [...u, ...c]
+        .map(s => ({ start: s[0], end: last(s) }))
+        .map(s => ({
+            start: multiplyPoint(s.start, e),
+            end: multiplyPoint(addPoint(s.end, { x: s.start.dx, y: s.start.dy }), e)
         }))
 }
 function getAngleInRadians(n, e) {
@@ -1899,11 +1930,11 @@ function getLineIntersectionPoint(n, e, t, r) {
     if (o === 0) return null
     let i = n.y - t.y,
         u = n.x - t.x
-    const s = (r.x - t.x) * i - (r.y - t.y) * u,
-        c = (e.x - n.x) * i - (e.y - n.y) * u
+    const c = (r.x - t.x) * i - (r.y - t.y) * u,
+        s = (e.x - n.x) * i - (e.y - n.y) * u
     return (
-        (i = s / o),
-        (u = c / o),
+        (i = c / o),
+        (u = s / o),
         i > 0 && i < 1 && u > 0 && u < 1 ? { x: n.x + i * (e.x - n.x), y: n.y + i * (e.y - n.y) } : null
     )
 }
@@ -1916,9 +1947,9 @@ function raycast(n, e, t) {
     }
     return r.length
         ? r.reduce((i, u) => {
-              const s = getDistanceBetweenPoints(n, u),
-                  c = getDistanceBetweenPoints(n, i)
-              return s < c ? u : i
+              const c = getDistanceBetweenPoints(n, u),
+                  s = getDistanceBetweenPoints(n, i)
+              return c < s ? u : i
           })
         : null
 }
@@ -1926,9 +1957,9 @@ function raycastCircle(n, e, t) {
     const o = getSortedRayAngles(n, t),
         i = []
     for (const u of o) {
-        const s = raycast(n, e, u - 0.001),
-            c = raycast(n, e, u + 0.001)
-        s && i.push(s), c && i.push(c)
+        const c = raycast(n, e, u - 0.001),
+            s = raycast(n, e, u + 0.001)
+        c && i.push(c), s && i.push(s)
     }
     return i
 }
@@ -1976,7 +2007,8 @@ function raycastCircle(n, e, t) {
         requireStringArgument,
         requireNumberArgument,
         bringToFront,
-        bringToFrontInPlace
+        bringToFrontInPlace,
+        findInstance
     }),
     (exports.System = { sleepMillis, forever, scheduleMany, waitFor, expandError }),
     (exports.Numbers = {
@@ -1984,6 +2016,7 @@ function raycastCircle(n, e, t) {
         sum,
         average,
         median,
+        getDistanceFromMidpoint,
         clamp,
         range,
         interpolate,
@@ -2091,7 +2124,6 @@ function raycastCircle(n, e, t) {
         isDate,
         isBlank,
         isId,
-        isNumbool,
         isNullable,
         asString,
         asNumber,
@@ -2101,7 +2133,6 @@ function raycastCircle(n, e, t) {
         asNullableString,
         asEmptiableString,
         asId,
-        asNumbool,
         asTime,
         asArray,
         asObject,
@@ -2181,7 +2212,9 @@ function raycastCircle(n, e, t) {
         describeMarkdown,
         isBalanced,
         textToFormat,
-        segmentize: segmentizeString,
+        splitFormatting,
+        splitHashtags,
+        splitUrls,
         hexToUint8Array,
         uint8ArrayToHex,
         base64ToUint8Array,

package/module.mjs

@@ -12,5 +12,5 @@ export const Random = utility.Random
 export const Strings = utility.Strings
 export const System = utility.System
 export const Types = utility.Types
-export const Maybe = utility.Maybe
+export const Optional = utility.Optional
 export const Vector = utility.Vector

package/package.json

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