@ibodr/utils 0.2.6 → 0.2.7

package/dist/index.mjs

@@ -3,7 +3,6 @@ import isEqualWith from 'lodash.isequalwith';
 export { default as isEqualWith } from 'lodash.isequalwith';
 export { default as throttle } from 'lodash.throttle';
 export { default as uniq } from 'lodash.uniq';
-import { generateKeyBetween, generateNKeysBetween } from 'jittered-fractional-indexing';
 
 // src/lib/version.ts
 function registerDrawLibraryVersion(name, version, modules) {
@@ -111,8 +110,8 @@ function omitFromStackTrace(fn) {
   };
   return wrappedFn;
 }
-var noop = () => {
-};
+function noop() {
+}
 
 // src/lib/control.ts
 var Result = {
@@ -283,7 +282,10 @@ function debounce(callback, wait) {
   fn.cancel = () => {
     if (!state) return;
     clearTimeout(state.timeout);
+    const s = state;
     state = void 0;
+    s.promise.catch(noop);
+    s.reject(new Error("Debounced function was cancelled"));
   };
   return fn;
 }
@@ -438,11 +440,11 @@ async function fetch(input, init) {
     ...init
   });
 }
-var Image = (width, height) => {
+function Image(width, height) {
   const img = new window.Image(width, height);
   img.referrerPolicy = "strict-origin-when-cross-origin";
   return img;
-};
+}
 
 // src/lib/file.ts
 var FileHelpers = class _FileHelpers {
@@ -675,6 +677,9 @@ var LruCache = class {
   has(key) {
     return this.map.has(key);
   }
+  delete(key) {
+    return this.map.delete(key);
+  }
   // eslint-disable-next-line tldraw/no-setter-getter
   get size() {
     return this.map.size;
@@ -741,10 +746,10 @@ function isApngAnimated(buffer) {
 }
 
 // src/lib/media/avif.ts
-var isAvifAnimated = (buffer) => {
+function isAvifAnimated(buffer) {
   const view = new Uint8Array(buffer);
   return view[3] === 44;
-};
+}
 
 // src/lib/media/gif.ts
 function getDataBlocksLength(buffer, offset) {
@@ -1938,11 +1943,210 @@ var PerformanceTracker = class {
     return this.started;
   }
 };
-var generateKeysFn = generateNKeysBetween;
+
+// src/lib/fractionalIndexing.ts
+var DIGITS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+var ZERO = DIGITS[0];
+var LARGEST_DIGIT = DIGITS[DIGITS.length - 1];
+var SMALLEST_INTEGER = "A" + ZERO.repeat(26);
+var JITTER_BITS = 16;
+function getIntegerLength(head) {
+  if (head >= "a" && head <= "z") {
+    return head.charCodeAt(0) - "a".charCodeAt(0) + 2;
+  } else if (head >= "A" && head <= "Z") {
+    return "Z".charCodeAt(0) - head.charCodeAt(0) + 2;
+  }
+  throw new Error("invalid order key head: " + head);
+}
+function getIntegerPart(key) {
+  const integerPartLength = getIntegerLength(key[0]);
+  if (integerPartLength > key.length) {
+    throw new Error("invalid order key: " + key);
+  }
+  return key.slice(0, integerPartLength);
+}
+function digitIndex(char) {
+  const code = char.charCodeAt(0);
+  if (code <= 57) return code - 48;
+  if (code <= 90) return code - 55;
+  return code - 61;
+}
+function validateOrderKey(key) {
+  if (key === SMALLEST_INTEGER) {
+    throw new Error("invalid order key: " + key);
+  }
+  const i = getIntegerPart(key);
+  if (key.length > i.length && key[key.length - 1] === ZERO) {
+    throw new Error("invalid order key: " + key);
+  }
+}
+function midpoint(a, b) {
+  if (b != null && a >= b) {
+    throw new Error(a + " >= " + b);
+  }
+  if (a.slice(-1) === ZERO || b && b.slice(-1) === ZERO) {
+    throw new Error("trailing zero");
+  }
+  if (b) {
+    let n = 0;
+    while ((a[n] || ZERO) === b[n]) {
+      n++;
+    }
+    if (n > 0) {
+      return b.slice(0, n) + midpoint(a.slice(n), b.slice(n));
+    }
+  }
+  const digitA = a ? digitIndex(a[0]) : 0;
+  const digitB = b != null ? digitIndex(b[0]) : DIGITS.length;
+  if (digitB - digitA > 1) {
+    const midDigit = Math.round(0.5 * (digitA + digitB));
+    return DIGITS[midDigit];
+  }
+  if (b && b.length > 1) {
+    return b.slice(0, 1);
+  }
+  return DIGITS[digitA] + midpoint(a.slice(1), null);
+}
+function incrementInteger(x) {
+  const [head, ...digs] = x.split("");
+  let carry = true;
+  for (let i = digs.length - 1; carry && i >= 0; i--) {
+    const d = digitIndex(digs[i]) + 1;
+    if (d === DIGITS.length) {
+      digs[i] = ZERO;
+    } else {
+      digs[i] = DIGITS[d];
+      carry = false;
+    }
+  }
+  if (carry) {
+    if (head === "Z") return "a" + ZERO;
+    if (head === "z") return null;
+    const h = String.fromCharCode(head.charCodeAt(0) + 1);
+    if (h > "a") {
+      digs.push(ZERO);
+    } else {
+      digs.pop();
+    }
+    return h + digs.join("");
+  }
+  return head + digs.join("");
+}
+function decrementInteger(x) {
+  const [head, ...digs] = x.split("");
+  let borrow = true;
+  for (let i = digs.length - 1; borrow && i >= 0; i--) {
+    const d = digitIndex(digs[i]) - 1;
+    if (d === -1) {
+      digs[i] = LARGEST_DIGIT;
+    } else {
+      digs[i] = DIGITS[d];
+      borrow = false;
+    }
+  }
+  if (borrow) {
+    if (head === "a") return "Z" + LARGEST_DIGIT;
+    if (head === "A") return null;
+    const h = String.fromCharCode(head.charCodeAt(0) - 1);
+    if (h < "Z") {
+      digs.push(LARGEST_DIGIT);
+    } else {
+      digs.pop();
+    }
+    return h + digs.join("");
+  }
+  return head + digs.join("");
+}
+function keyBetweenUnchecked(a, b) {
+  if (a != null && b != null && a >= b) {
+    throw new Error(a + " >= " + b);
+  }
+  if (a == null) {
+    if (b == null) return "a" + ZERO;
+    const ib2 = getIntegerPart(b);
+    const fb2 = b.slice(ib2.length);
+    if (ib2 === SMALLEST_INTEGER) {
+      return ib2 + midpoint("", fb2);
+    }
+    if (ib2 < b) return ib2;
+    const res = decrementInteger(ib2);
+    if (res == null) throw new Error("cannot decrement any more");
+    return res;
+  }
+  if (b == null) {
+    const ia2 = getIntegerPart(a);
+    const fa2 = a.slice(ia2.length);
+    const i2 = incrementInteger(ia2);
+    return i2 == null ? ia2 + midpoint(fa2, null) : i2;
+  }
+  const ia = getIntegerPart(a);
+  const fa = a.slice(ia.length);
+  const ib = getIntegerPart(b);
+  const fb = b.slice(ib.length);
+  if (ia === ib) {
+    return ia + midpoint(fa, fb);
+  }
+  const i = incrementInteger(ia);
+  if (i == null) throw new Error("cannot increment any more");
+  if (i < b) return i;
+  return ia + midpoint(fa, null);
+}
+function nKeysBetweenUnchecked(a, b, n) {
+  if (n === 0) return [];
+  if (n === 1) return [keyBetweenUnchecked(a, b)];
+  if (b == null) {
+    let c2 = keyBetweenUnchecked(a, b);
+    const result = [c2];
+    for (let i = 0; i < n - 1; i++) {
+      c2 = keyBetweenUnchecked(c2, b);
+      result.push(c2);
+    }
+    return result;
+  }
+  if (a == null) {
+    let c2 = keyBetweenUnchecked(a, b);
+    const result = [c2];
+    for (let i = 0; i < n - 1; i++) {
+      c2 = keyBetweenUnchecked(a, c2);
+      result.push(c2);
+    }
+    result.reverse();
+    return result;
+  }
+  const mid = Math.floor(n / 2);
+  const c = keyBetweenUnchecked(a, b);
+  return [...nKeysBetweenUnchecked(a, c, mid), c, ...nKeysBetweenUnchecked(c, b, n - mid - 1)];
+}
+function jitterBetween(low, high) {
+  let mid = keyBetweenUnchecked(low, high);
+  for (let i = 0; i < JITTER_BITS; i++) {
+    if (Math.random() < 0.5) {
+      low = mid;
+    } else {
+      high = mid;
+    }
+    mid = keyBetweenUnchecked(low, high);
+  }
+  return mid;
+}
+function generateNJitteredKeysBetween(a, b, n) {
+  if (n === 0) return [];
+  if (a != null) validateOrderKey(a);
+  if (b != null) validateOrderKey(b);
+  const keys = nKeysBetweenUnchecked(a, b, n + 1);
+  const result = new Array(n);
+  for (let i = 0; i < n; i++) {
+    result[i] = jitterBetween(keys[i], keys[i + 1]);
+  }
+  return result;
+}
+
+// src/lib/reordering.ts
+var generateKeysFn = generateNJitteredKeysBetween;
 var ZERO_INDEX_KEY = "a0";
 function validateIndexKey(index) {
   try {
-    generateKeyBetween(index, null);
+    validateOrderKey(index);
   } catch {
     throw new Error("invalid index: " + index);
   }
@@ -2067,6 +2271,34 @@ function clearSessionStorage() {
   }
 }
 
+// src/lib/string.ts
+var graphemeSegmenter;
+var checkedForSegmenter = false;
+function getGraphemeSegmenter() {
+  if (!checkedForSegmenter) {
+    checkedForSegmenter = true;
+    if (typeof Intl !== "undefined" && "Segmenter" in Intl) {
+      graphemeSegmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
+    }
+  }
+  return graphemeSegmenter;
+}
+function* iterateGraphemes(str) {
+  const segmenter = getGraphemeSegmenter();
+  if (segmenter) {
+    for (const { segment } of segmenter.segment(str)) yield segment;
+  } else {
+    yield* str;
+  }
+}
+function getFirstCharacter(str) {
+  if (!str) return "";
+  for (const segment of iterateGraphemes(str)) {
+    return segment;
+  }
+  return "";
+}
+
 // src/lib/stringEnum.ts
 function stringEnum(...values) {
   const obj = {};
@@ -2185,6 +2417,9 @@ function throttleToNextFrame(fn) {
 
 // src/lib/timers.ts
 var Timers = class {
+  // Ids are dropped as soon as a timer fires or is cleared through this class, so a
+  // long-lived context (the editor creates two timeouts per pointer down) does not
+  // accumulate stale ids that `dispose` would otherwise have to clear one by one.
   timeouts = /* @__PURE__ */ new Map();
   intervals = /* @__PURE__ */ new Map();
   rafs = /* @__PURE__ */ new Map();
@@ -2201,6 +2436,9 @@ var Timers = class {
     this.setTimeout = this.setTimeout.bind(this);
     this.setInterval = this.setInterval.bind(this);
     this.requestAnimationFrame = this.requestAnimationFrame.bind(this);
+    this.clearTimeout = this.clearTimeout.bind(this);
+    this.clearInterval = this.clearInterval.bind(this);
+    this.cancelAnimationFrame = this.cancelAnimationFrame.bind(this);
     this.dispose = this.dispose.bind(this);
   }
   /**
@@ -2219,9 +2457,16 @@ var Timers = class {
    * @public
    */
   setTimeout(contextId, handler, timeout, ...args) {
-    const id = window.setTimeout(handler, timeout, args);
-    const current = this.timeouts.get(contextId) ?? [];
-    this.timeouts.set(contextId, [...current, id]);
+    const ids = getOrCreateSet(this.timeouts, contextId);
+    let fired = false;
+    let id = -1;
+    const wrapped = typeof handler === "function" ? (...handlerArgs) => {
+      fired = true;
+      ids.delete(id);
+      handler(...handlerArgs);
+    } : handler;
+    id = window.setTimeout(wrapped, timeout, args);
+    if (!fired) ids.add(id);
     return id;
   }
   /**
@@ -2241,8 +2486,7 @@ var Timers = class {
    */
   setInterval(contextId, handler, timeout, ...args) {
     const id = window.setInterval(handler, timeout, args);
-    const current = this.intervals.get(contextId) ?? [];
-    this.intervals.set(contextId, [...current, id]);
+    getOrCreateSet(this.intervals, contextId).add(id);
     return id;
   }
   /**
@@ -2259,11 +2503,70 @@ var Timers = class {
    * @public
    */
   requestAnimationFrame(contextId, callback) {
-    const id = window.requestAnimationFrame(callback);
-    const current = this.rafs.get(contextId) ?? [];
-    this.rafs.set(contextId, [...current, id]);
+    const ids = getOrCreateSet(this.rafs, contextId);
+    let fired = false;
+    let id = -1;
+    id = window.requestAnimationFrame((time) => {
+      fired = true;
+      ids.delete(id);
+      callback(time);
+    });
+    if (!fired) ids.add(id);
     return id;
   }
+  /**
+   * Clears a timeout created with {@link Timers.setTimeout} and stops tracking it.
+   * Prefer this over the global `clearTimeout` for ids that came from this instance,
+   * otherwise the id stays tracked until its context is disposed.
+   * @param contextId - The context identifier the timeout was created under.
+   * @param id - The timer ID returned by `setTimeout`. Ignored when undefined.
+   * @example
+   * ```ts
+   * const timers = new Timers()
+   * const id = timers.setTimeout('autosave', () => save(), 5000)
+   * timers.clearTimeout('autosave', id)
+   * ```
+   * @public
+   */
+  clearTimeout(contextId, id) {
+    if (id === void 0) return;
+    clearTimeout(id);
+    this.timeouts.get(contextId)?.delete(id);
+  }
+  /**
+   * Clears an interval created with {@link Timers.setInterval} and stops tracking it.
+   * @param contextId - The context identifier the interval was created under.
+   * @param id - The interval ID returned by `setInterval`. Ignored when undefined.
+   * @example
+   * ```ts
+   * const timers = new Timers()
+   * const id = timers.setInterval('refresh', () => updateData(), 1000)
+   * timers.clearInterval('refresh', id)
+   * ```
+   * @public
+   */
+  clearInterval(contextId, id) {
+    if (id === void 0) return;
+    clearInterval(id);
+    this.intervals.get(contextId)?.delete(id);
+  }
+  /**
+   * Cancels an animation frame requested with {@link Timers.requestAnimationFrame} and stops tracking it.
+   * @param contextId - The context identifier the animation frame was requested under.
+   * @param id - The request ID returned by `requestAnimationFrame`. Ignored when undefined.
+   * @example
+   * ```ts
+   * const timers = new Timers()
+   * const id = timers.requestAnimationFrame('render', () => draw())
+   * timers.cancelAnimationFrame('render', id)
+   * ```
+   * @public
+   */
+  cancelAnimationFrame(contextId, id) {
+    if (id === void 0) return;
+    cancelAnimationFrame(id);
+    this.rafs.get(contextId)?.delete(id);
+  }
   /**
    * Disposes of all timers associated with the specified context.
    * Clears all timeouts, intervals, and animation frames for the given context ID.
@@ -2304,7 +2607,12 @@ var Timers = class {
    * @public
    */
   disposeAll() {
-    for (const contextId of this.timeouts.keys()) {
+    const contextIds = /* @__PURE__ */ new Set([
+      ...this.timeouts.keys(),
+      ...this.intervals.keys(),
+      ...this.rafs.keys()
+    ]);
+    for (const contextId of contextIds) {
       this.dispose(contextId);
     }
   }
@@ -2312,17 +2620,20 @@ var Timers = class {
    * Returns an object with timer methods bound to a specific context.
    * Convenient for getting context-specific timer functions without repeatedly passing the contextId.
    * @param contextId - The context identifier to bind the returned methods to.
-   * @returns An object with setTimeout, setInterval, requestAnimationFrame, and dispose methods bound to the context.
+   * @returns An object with setTimeout, setInterval, requestAnimationFrame, the matching clear methods, and dispose bound to the context.
    * @example
    * ```ts
    * const timers = new Timers()
    * const uiTimers = timers.forContext('ui')
    *
    * // These are equivalent to calling timers.setTimeout('ui', ...)
-   * uiTimers.setTimeout(() => console.log('timeout'), 1000)
+   * const id = uiTimers.setTimeout(() => console.log('timeout'), 1000)
    * uiTimers.setInterval(() => console.log('interval'), 500)
    * uiTimers.requestAnimationFrame(() => console.log('frame'))
    *
+   * // Clear a single timer
+   * uiTimers.clearTimeout(id)
+   *
    * // Dispose only this context
    * uiTimers.dispose()
    * ```
@@ -2333,19 +2644,30 @@ var Timers = class {
       setTimeout: (handler, timeout, ...args) => this.setTimeout(contextId, handler, timeout, args),
       setInterval: (handler, timeout, ...args) => this.setInterval(contextId, handler, timeout, args),
       requestAnimationFrame: (callback) => this.requestAnimationFrame(contextId, callback),
+      clearTimeout: (id) => this.clearTimeout(contextId, id),
+      clearInterval: (id) => this.clearInterval(contextId, id),
+      cancelAnimationFrame: (id) => this.cancelAnimationFrame(contextId, id),
       dispose: () => this.dispose(contextId)
     };
   }
 };
+function getOrCreateSet(map, contextId) {
+  let set = map.get(contextId);
+  if (!set) {
+    set = /* @__PURE__ */ new Set();
+    map.set(contextId, set);
+  }
+  return set;
+}
 
 // src/lib/url.ts
-var safeParseUrl = (url, baseUrl) => {
+function safeParseUrl(url, baseUrl) {
   try {
     return new URL(url, baseUrl);
   } catch {
     return;
   }
-};
+}
 
 // src/lib/value.ts
 function isDefined(value) {
@@ -2392,7 +2714,7 @@ function warnOnce(message) {
 // src/index.ts
 registerDrawLibraryVersion(
   "@ibodr/utils",
-  "0.2.6",
+  "0.2.7",
   "esm"
 );
 /*!
@@ -2428,6 +2750,6 @@ registerDrawLibraryVersion(
  * Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
  */
 
-export { DEFAULT_SUPPORTED_IMAGE_TYPES, DEFAULT_SUPPORTED_MEDIA_TYPES, DEFAULT_SUPPORTED_MEDIA_TYPE_LIST, DEFAULT_SUPPORT_VIDEO_TYPES, ExecutionQueue, FileHelpers, FpsScheduler, Image, LruCache, MediaHelpers, PerformanceTracker, PngHelpers, Result, STRUCTURED_CLONE_OBJECT_PROTOTYPE, Timers, WeakCache, ZERO_INDEX_KEY, annotateError, areArraysShallowEqual, areObjectsShallowEqual, assert, assertExists, bind, clearLocalStorage, clearSessionStorage, compact, debounce, dedupe, deleteFromLocalStorage, deleteFromSessionStorage, exhaustiveSwitchError, fetch, filterEntries, fpsThrottle, getChangedKeys, getErrorAnnotations, getFirstFromIterable, getFromLocalStorage, getFromSessionStorage, getHashForBuffer, getHashForObject, getHashForString, getIndexAbove, getIndexBelow, getIndexBetween, getIndices, getIndicesAbove, getIndicesBelow, getIndicesBetween, getOwnProperty, groupBy, hasOwnProperty, invLerp, isDefined, isEqualAllowingForFloatingPointErrors, isNativeStructuredClone, isNonNull, isNonNullish, last, lerp, lns, mapObjectMapValues, maxBy, measureAverageDuration, measureCbDuration, measureDuration, mergeArraysAndReplaceDefaults, minBy, mockUniqueId, modulate, noop, objectMapEntries, objectMapEntriesIterable, objectMapFromEntries, objectMapKeys, objectMapValues, omit, omitFromStackTrace, partition, promiseWithResolve, registerDrawLibraryVersion, restoreUniqueId, retry, rng, rotateArray, safeParseUrl, setInLocalStorage, setInSessionStorage, sleep, sortById, sortByIndex, sortByMaybeIndex, stringEnum, structuredClone, throttleToNextFrame, uniqueId, validateIndexKey, warnDeprecatedGetter, warnOnce };
+export { DEFAULT_SUPPORTED_IMAGE_TYPES, DEFAULT_SUPPORTED_MEDIA_TYPES, DEFAULT_SUPPORTED_MEDIA_TYPE_LIST, DEFAULT_SUPPORT_VIDEO_TYPES, ExecutionQueue, FileHelpers, FpsScheduler, Image, LruCache, MediaHelpers, PerformanceTracker, PngHelpers, Result, STRUCTURED_CLONE_OBJECT_PROTOTYPE, Timers, WeakCache, ZERO_INDEX_KEY, annotateError, areArraysShallowEqual, areObjectsShallowEqual, assert, assertExists, bind, clearLocalStorage, clearSessionStorage, compact, debounce, dedupe, deleteFromLocalStorage, deleteFromSessionStorage, exhaustiveSwitchError, fetch, filterEntries, fpsThrottle, getChangedKeys, getErrorAnnotations, getFirstCharacter, getFirstFromIterable, getFromLocalStorage, getFromSessionStorage, getHashForBuffer, getHashForObject, getHashForString, getIndexAbove, getIndexBelow, getIndexBetween, getIndices, getIndicesAbove, getIndicesBelow, getIndicesBetween, getOwnProperty, groupBy, hasOwnProperty, invLerp, isDefined, isEqualAllowingForFloatingPointErrors, isNativeStructuredClone, isNonNull, isNonNullish, iterateGraphemes, last, lerp, lns, mapObjectMapValues, maxBy, measureAverageDuration, measureCbDuration, measureDuration, mergeArraysAndReplaceDefaults, minBy, mockUniqueId, modulate, noop, objectMapEntries, objectMapEntriesIterable, objectMapFromEntries, objectMapKeys, objectMapValues, omit, omitFromStackTrace, partition, promiseWithResolve, registerDrawLibraryVersion, restoreUniqueId, retry, rng, rotateArray, safeParseUrl, setInLocalStorage, setInSessionStorage, sleep, sortById, sortByIndex, sortByMaybeIndex, stringEnum, structuredClone, throttleToNextFrame, uniqueId, validateIndexKey, warnDeprecatedGetter, warnOnce };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map