@fluidframework/tree 2.12.0 → 2.13.0

package/src/util/rangeMap.ts

@@ -6,229 +6,239 @@
 import { oob } from "@fluidframework/core-utils/internal";
 
 /**
- * A map keyed on integers allowing reading and writing contiguous ranges of integer keys.
- *
- * TODO: We should avoid the direct exposure of RangeEntry. AB#7414
+ * RangeMap represents a mapping from integers to values of type T or undefined.
+ * The values for a range of consecutive keys can be changed or queried in a single operation.
  */
-export type RangeMap<T> = RangeEntry<T>[];
+export class RangeMap<T> {
+	private readonly entries: RangeEntry<T>[];
 
-export interface RangeEntry<T> {
-	start: number;
-	length: number;
-	value: T;
-}
+	public constructor(initialEntries?: RangeEntry<T>[]) {
+		this.entries = initialEntries ? [...initialEntries] : [];
+	}
 
-/**
- * The result of a query about a range of keys.
- */
-export interface RangeQueryResult<T> {
 	/**
-	 * The value of the first key in the query range.
+	 * Retrieves all entries from the rangeMap.
+	 * @returns An array of RangeEntryResult objects, each containing the start index, length, and value of a contiguous range.
 	 */
-	value: T | undefined;
+	public getAllEntries(): readonly RangeQueryResult<T>[] {
+		return this.entries;
+	}
 
 	/**
-	 * The length of the prefix of the query range which have the same value.
-	 * For example, if a RangeMap has the same value for keys 5, 6, and 7,
-	 * a query about the range [5, 10] would give a result with length 3.
+	 * Retrieves the value for some prefix of the query range.
+	 *
+	 * @param start - The first key in the query range.
+	 * @param length - The length of the query range.
+	 * @returns A RangeQueryResult containing the value associated with `start`,
+	 * and the number of consecutive keys with that same value.
 	 */
-	length: number;
-}
+	public get(start: number, length: number): RangeQueryResult<T> {
+		for (const entry of this.entries) {
+			if (entry.start > start) {
+				return { value: undefined, length: Math.min(entry.start - start, length) };
+			}
 
-/**
- * See comments on `RangeQueryResult`.
- */
-export function getFromRangeMap<T>(
-	map: RangeMap<T>,
-	start: number,
-	length: number,
-): RangeQueryResult<T> {
-	for (const range of map) {
-		if (range.start > start) {
-			return { value: undefined, length: Math.min(range.start - start, length) };
+			const lastRangeKey = entry.start + entry.length - 1;
+			if (lastRangeKey >= start) {
+				const overlapLength = lastRangeKey - start + 1;
+				return { value: entry.value, length: Math.min(overlapLength, length) };
+			}
 		}
 
-		const lastRangeKey = range.start + range.length - 1;
-		if (lastRangeKey >= start) {
-			// This range contains `start`.
-			const overlapLength = lastRangeKey - start + 1;
-			return { value: range.value, length: Math.min(overlapLength, length) };
-		}
+		// There were no entries intersecting the query range, so the entire query range has undefined value.
+		return { value: undefined, length };
 	}
 
-	// There were no entries intersecting the query range, so the entire query range has undefined value.
-	return { value: undefined, length };
-}
+	/**
+	 * Sets the value for a specified range.
+	 *
+	 * @param start - The first key in the range being set.
+	 * @param length - The length of the range.
+	 * @param value - The value to associate with the range.
+	 */
+	public set(start: number, length: number, value: T | undefined): void {
+		if (value === undefined) {
+			this.delete(start, length);
+			return;
+		}
 
-export function getFirstEntryFromRangeMap<T>(
-	map: RangeMap<T>,
-	start: number,
-	length: number,
-): RangeEntry<T> | undefined {
-	const lastQueryKey = start + length - 1;
-	for (const range of map) {
-		if (range.start > lastQueryKey) {
-			// We've passed the end of the query range.
-			break;
+		const end = start + length - 1;
+		const newEntry: RangeEntry<T> = { start, length, value };
+
+		let iBefore = -1;
+		let iAfter = this.entries.length;
+		for (const [i, entry] of this.entries.entries()) {
+			const entryLastKey = entry.start + entry.length - 1;
+			if (entryLastKey < start) {
+				iBefore = i;
+			} else if (entry.start > end) {
+				iAfter = i;
+				break;
+			}
 		}
 
-		const lastRangeKey = range.start + range.length - 1;
-		if (lastRangeKey >= start) {
-			return range;
+		const numOverlappingEntries = iAfter - iBefore - 1;
+		if (numOverlappingEntries === 0) {
+			this.entries.splice(iAfter, 0, newEntry);
+			return;
 		}
-	}
 
-	return undefined;
-}
+		const iFirst = iBefore + 1;
+		const firstEntry = this.entries[iFirst] ?? oob();
+		const iLast = iAfter - 1;
+		const lastEntry = this.entries[iLast] ?? oob();
+		const lengthBeforeFirst = start - firstEntry.start;
+		const lastEntryKey = lastEntry.start + lastEntry.length - 1;
+		const lengthAfterLast = lastEntryKey - end;
+
+		if (lengthBeforeFirst > 0 && lengthAfterLast > 0 && iFirst === iLast) {
+			// The new entry fits in the middle of an existing entry.
+			// We replace the existing entry with:
+			// 1) the portion which comes before `newEntry`
+			// 2) `newEntry`
+			// 3) the portion which comes after `newEntry`
+			this.entries.splice(iFirst, 1, { ...firstEntry, length: lengthBeforeFirst }, newEntry, {
+				...lastEntry,
+				start: end + 1,
+				length: lengthAfterLast,
+			});
+			return;
+		}
 
-/**
- * Sets the keys from `start` to `start + length - 1` to `value`.
- */
-export function setInRangeMap<T>(
-	map: RangeMap<T>,
-	start: number,
-	length: number,
-	value: T,
-): void {
-	const end = start + length - 1;
-	const newEntry: RangeEntry<T> = { start, length, value };
-
-	let iBefore = -1;
-	let iAfter = map.length;
-	for (const [i, entry] of map.entries()) {
-		const entryLastKey = entry.start + entry.length - 1;
-		if (entryLastKey < start) {
-			iBefore = i;
-		} else if (entry.start > end) {
-			iAfter = i;
-			break;
+		if (lengthBeforeFirst > 0) {
+			this.entries[iFirst] = { ...firstEntry, length: lengthBeforeFirst };
+			// The entry at `iFirst` is no longer overlapping with `newEntry`.
+			iBefore = iFirst;
 		}
-	}
 
-	const numOverlappingEntries = iAfter - iBefore - 1;
-	if (numOverlappingEntries === 0) {
-		map.splice(iAfter, 0, newEntry);
-		return;
-	}
+		if (lengthAfterLast > 0) {
+			this.entries[iLast] = {
+				...lastEntry,
+				start: end + 1,
+				length: lengthAfterLast,
+			};
 
-	const iFirst = iBefore + 1;
-	const firstEntry = map[iFirst] ?? oob();
-	const iLast = iAfter - 1;
-	const lastEntry = map[iLast] ?? oob();
-	const lengthBeforeFirst = start - firstEntry.start;
-	const lastEntryKey = lastEntry.start + lastEntry.length - 1;
-	const lengthAfterLast = lastEntryKey - end;
-
-	if (lengthBeforeFirst > 0 && lengthAfterLast > 0 && iFirst === iLast) {
-		// The new entry fits in the middle of an existing entry.
-		// We replace the existing entry with:
-		// 1) the portion which comes before `newEntry`
-		// 2) `newEntry`
-		// 3) the portion which comes after `newEntry`
-		map.splice(iFirst, 1, { ...firstEntry, length: lengthBeforeFirst }, newEntry, {
-			...lastEntry,
-			start: end + 1,
-			length: lengthAfterLast,
-		});
-		return;
+			// The entry at `iLast` is no longer overlapping with `newEntry`.
+			iAfter = iLast;
+		}
+
+		const numContainedEntries = iAfter - iBefore - 1;
+		this.entries.splice(iBefore + 1, numContainedEntries, newEntry);
 	}
 
-	if (lengthBeforeFirst > 0) {
-		map[iFirst] = { ...firstEntry, length: lengthBeforeFirst };
+	/**
+	 * Deletes values within a specified range, updating or removing existing entries.
+	 *
+	 * 1. If an entry is completely included in the deletion range, the whole entry will be deleted
+	 * e.g.: map = [[1, 2], [4, 6]], delete range: [3, 6]
+	 * map becomes [[1, 2]] after deletion
+	 * (Note: the notation [a, b] represents start = a, end = b for simpler visualization, instead of `b`
+	 * representing the length)
+	 *
+	 * 2. If an entry is partially overlapped with the deletion range, the start or end point will be shifted
+	 * e.g.: map = [[1, 2], [4, 6]], delete range: [2, 4]
+	 * map becomes [[1, 1], [5, 6]] after deletion
+	 *
+	 * 3. If an entry completely includes the deletion range, the original entry may be split into two.
+	 * e.g.: map = [[1, 6]], delete range: [2, 4]
+	 * map becomes [[1, 1], [5, 6]]
+	 *
+	 * @param start - The start of the range to delete (inclusive).
+	 * @param length - The length of the range to delete.
+	 */
+	public delete(start: number, length: number): void {
+		const end = start + length - 1;
+
+		let iBefore = -1;
+		let iAfter = this.entries.length;
+
+		for (const [i, entry] of this.entries.entries()) {
+			const entryLastKey = entry.start + entry.length - 1;
+			if (entryLastKey < start) {
+				iBefore = i;
+			} else if (entry.start > end) {
+				iAfter = i;
+				break;
+			}
+		}
 
-		// The entry at `iFirst` is no longer overlapping with `newEntry`.
-		iBefore = iFirst;
-	}
+		const numOverlappingEntries = iAfter - iBefore - 1;
 
-	if (lengthAfterLast > 0) {
-		map[iLast] = {
-			...lastEntry,
-			start: end + 1,
-			length: lengthAfterLast,
-		};
+		if (numOverlappingEntries === 0) {
+			// No entry will be removed
+			return;
+		}
 
-		// The entry at `iLast` is no longer overlapping with `newEntry`.
-		iAfter = iLast;
+		const iFirst = iBefore + 1;
+		const iLast = iAfter - 1;
+
+		for (let i = iFirst; i <= iLast; ++i) {
+			const entry = this.entries[i] ?? oob();
+			const entryLastKey = entry.start + entry.length - 1;
+			let isDirty = false;
+
+			if (entry.start >= start && entryLastKey <= end) {
+				// If the entry lies within the range to be deleted, remove it
+				this.entries.splice(i, 1);
+			} else {
+				// If the entry partially or completely overlaps with the range to be deleted
+				if (entry.start < start) {
+					// Update the endpoint and length of the portion before the range to be deleted
+					const lengthBefore = start - entry.start;
+					this.entries[i] = { ...entry, length: lengthBefore };
+					isDirty = true;
+				}
+
+				if (entryLastKey > end) {
+					// Update the startpoint and length of the portion after the range to be deleted
+					const newStart = end + 1;
+					const newLength = entryLastKey - end;
+					this.entries.splice(isDirty ? i + 1 : i, isDirty ? 0 : 1, {
+						start: newStart,
+						length: newLength,
+						value: entry.value,
+					});
+				}
+			}
+		}
 	}
-
-	const numContainedEntries = iAfter - iBefore - 1;
-	map.splice(iBefore + 1, numContainedEntries, newEntry);
 }
 
 /**
- * Delete the keys from `start` to `start + length - 1`
- *
- * 1. If an entry is completely included in the deletion range, the whole entry will be deleted
- * e.g.: map = [[1, 2], [4, 6]], delete range: [3, 6]
- * map becomes [[1, 2]] after deletion
- * (Note: the notation [a, b] represents start = a, end = b for simpler visiualization, instead of `b`
- * representing the length)
- *
- * 2. If an entry is partially overlapped with the deletion range, the start or end point will be shifted
- * e.g.: map = [[1, 2], [4, 6]], delete range: [2, 4]
- * map becomes [[1, 1], [5, 6]] after deletion
- *
- * 3. If an entry completely includes the deletion range, the original entry may be split into two.
- * e.g.: map = [[1, 6]], delete range: [2, 4]
- * map becomes [[1, 1], [5, 6]]
- *
- * TODO: We may find ways to mitigate the code duplication between set and delete, and we need to better
- * document the API.  AB#7413
+ * Represents a contiguous range of values in the RangeMap.
+ * This interface is used internally and should not be exposed to consumers.
  */
-export function deleteFromRangeMap<T>(map: RangeMap<T>, start: number, length: number): void {
-	const end = start + length - 1;
-
-	let iBefore = -1;
-	let iAfter = map.length;
-
-	for (const [i, entry] of map.entries()) {
-		const entryLastKey = entry.start + entry.length - 1;
-		if (entryLastKey < start) {
-			iBefore = i;
-		} else if (entry.start > end) {
-			iAfter = i;
-			break;
-		}
-	}
+interface RangeEntry<T> {
+	/**
+	 * The starting index of the range (inclusive).
+	 */
+	readonly start: number;
 
-	const numOverlappingEntries = iAfter - iBefore - 1;
+	/**
+	 * The length of the range.
+	 */
+	readonly length: number;
 
-	if (numOverlappingEntries === 0) {
-		// No entry will be removed
-		return;
-	}
+	/**
+	 * The value associated with this range.
+	 */
+	readonly value: T;
+}
 
-	const iFirst = iBefore + 1;
-	const iLast = iAfter - 1;
-
-	// Update or remove the overlapping entries
-	for (let i = iFirst; i <= iLast; ++i) {
-		const entry = map[i] ?? oob();
-		const entryLastKey = entry.start + entry.length - 1;
-		let isDirty = false;
-
-		// If the entry lies within the range to be deleted, remove it
-		if (entry.start >= start && entryLastKey <= end) {
-			map.splice(i, 1);
-		} else {
-			// If the entry partially or completely overlaps with the range to be deleted
-			if (entry.start < start) {
-				// Update the endpoint and length of the portion before the range to be deleted
-				const lengthBefore = start - entry.start;
-				map[i] = { ...entry, length: lengthBefore };
-				isDirty = true;
-			}
+/**
+ * Describes the result of a range query, including the value and length of the matching prefix.
+ */
+export interface RangeQueryResult<T> {
+	/**
+	 * The value of the first key in the query range.
+	 * If no matching range is found, this will be undefined.
+	 */
+	readonly value: T | undefined;
 
-			if (entryLastKey > end) {
-				// Update the startpoint and length of the portion after the range to be deleted
-				const newStart = end + 1;
-				const newLength = entryLastKey - end;
-				map.splice(isDirty ? i + 1 : i, isDirty ? 0 : 1, {
-					start: newStart,
-					length: newLength,
-					value: entry.value,
-				});
-			}
-		}
-	}
+	/**
+	 * The length of the prefix of the query range which has the same value.
+	 * For example, if a RangeMap has the same value for keys 5, 6, and 7,
+	 * a query about the range [5, 10] would give a result with length 3.
+	 */
+	readonly length: number;
 }

package/src/util/utils.ts

@@ -16,7 +16,7 @@ export interface MapGetSet<K, V> {
 }
 
 /**
- * Make all transitive properties in T readonly
+ * Make all transitive properties in `T` readonly
  */
 export type RecursiveReadonly<T> = {
 	readonly [P in keyof T]: RecursiveReadonly<T[P]>;
@@ -563,3 +563,49 @@ export function defineLazyCachedProperty<
 	});
 	return obj as typeof obj & { [P in K]: V };
 }
+
+/**
+ * Copies a given property from one object to another if and only if the property is defined.
+ * @param source - The object to copy the property from.
+ * If `source` is undefined or does not have the property defined, then this function will do nothing.
+ * @param property - The property to copy.
+ * @param destination - The object to copy the property to.
+ * @remarks This function is useful for copying properties from one object to another while minimizing the presence of `undefined` values.
+ * If `property` is not present on `source` - or if `property` is present, but has a value of `undefined` - then this function will not modify `destination`.
+ * This is different from doing `destination.foo = source.foo`, which would define a `"foo"` property on `destination` with the value `undefined`.
+ *
+ * If the type of `source` is known to have `property`, then this function asserts that the type of `destination` has `property` as well after the call.
+ *
+ * This function first reads the property value (if present) from `source` and then sets it on `destination`, as opposed to e.g. directly copying the property descriptor.
+ * @privateRemarks The first overload of this function allows auto-complete to suggest property names from `source`, but by having the second overload we still allow for arbitrary property names.
+ */
+export function copyPropertyIfDefined<S extends object, K extends keyof S, D extends object>(
+	source: S | undefined,
+	property: K,
+	destination: D,
+): asserts destination is K extends keyof S ? D & { [P in K]: S[K] } : D;
+export function copyPropertyIfDefined<
+	S extends object,
+	K extends string | number | symbol,
+	D extends object,
+>(
+	source: S | undefined,
+	property: K,
+	destination: D,
+): asserts destination is K extends keyof S ? D & { [P in K]: S[K] } : D;
+export function copyPropertyIfDefined<
+	S extends object,
+	K extends string | number | symbol,
+	D extends object,
+>(
+	source: S | undefined,
+	property: K,
+	destination: D,
+): asserts destination is K extends keyof S ? D & { [P in K]: S[K] } : D {
+	if (source !== undefined) {
+		const value = (source as { [P in K]?: unknown })[property];
+		if (value !== undefined) {
+			(destination as { [P in K]: unknown })[property] = value;
+		}
+	}
+}

package/dist/feature-libraries/memoizedIdRangeAllocator.d.ts

@@ -1,38 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import type { ChangesetLocalId, RevisionTag } from "../core/index.js";
-/**
- * A unique ID allocator that returns the output ID for the same input ID.
- */
-export interface MemoizedIdRangeAllocator {
-    /**
-     * A unique ID allocator that returns the output ID for the same input ID.
-     *
-     * "The same" here includes cases where a prior call allocated a range of IDs that partially or fully overlap with the
-     * current call.
-     * @param revision - The revision associated with the range of IDs to allocate.
-     * @param startId - The first ID to allocate.
-     * @param count - The number of IDs to allocate. Interpreted as 1 if undefined.
-     */
-    allocate(revision: RevisionTag | undefined, startId: ChangesetLocalId, count?: number): IdRange[];
-    /**
-     * Allocates a new range of IDs.
-     *
-     * @param count - The number of IDs to allocate. Interpreted as 1 if undefined.
-     */
-    mint(count?: number): ChangesetLocalId;
-}
-/**
- */
-export interface IdRange {
-    readonly first: ChangesetLocalId;
-    readonly count: number;
-}
-/**
- */
-export declare const MemoizedIdRangeAllocator: {
-    fromNextId(nextId?: number): MemoizedIdRangeAllocator;
-};
-//# sourceMappingURL=memoizedIdRangeAllocator.d.ts.map

package/dist/feature-libraries/memoizedIdRangeAllocator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"memoizedIdRangeAllocator.d.ts","sourceRoot":"","sources":["../../src/feature-libraries/memoizedIdRangeAllocator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAUtE;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACxC;;;;;;;;OAQG;IACH,QAAQ,CACP,QAAQ,EAAE,WAAW,GAAG,SAAS,EACjC,OAAO,EAAE,gBAAgB,EACzB,KAAK,CAAC,EAAE,MAAM,GACZ,OAAO,EAAE,CAAC;IACb;;;;OAIG;IACH,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;CACvC;AAED;GACG;AACH,MAAM,WAAW,OAAO;IACvB,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB;AAED;GACG;AACH,eAAO,MAAM,wBAAwB;wBACjB,MAAM,GAAO,wBAAwB;CA4DxD,CAAC"}

package/dist/feature-libraries/memoizedIdRangeAllocator.js

@@ -1,74 +0,0 @@
-"use strict";
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MemoizedIdRangeAllocator = void 0;
-const index_js_1 = require("../util/index.js");
-/**
- */
-exports.MemoizedIdRangeAllocator = {
-    fromNextId(nextId = 0) {
-        const rangeMap = new Map();
-        let _nextId = nextId;
-        return {
-            allocate(key, startId, length) {
-                let count = length ?? 1;
-                const out = [];
-                const ranges = (0, index_js_1.getOrAddEmptyToMap)(rangeMap, key);
-                let currId = startId;
-                while (count > 0) {
-                    const firstRange = (0, index_js_1.getFirstEntryFromRangeMap)(ranges, currId, count);
-                    if (firstRange === undefined) {
-                        const newId = _nextId;
-                        _nextId += count;
-                        (0, index_js_1.setInRangeMap)(ranges, currId, count, newId);
-                        out.push({ first: (0, index_js_1.brand)(newId), count });
-                        count = 0;
-                    }
-                    else {
-                        const idRange = {
-                            first: (0, index_js_1.brand)(firstRange.value),
-                            count: firstRange.length,
-                        };
-                        if (currId < firstRange.start) {
-                            const countToAdd = firstRange.start - currId;
-                            (0, index_js_1.setInRangeMap)(ranges, currId, countToAdd, _nextId);
-                            out.push({ first: (0, index_js_1.brand)(_nextId), count: countToAdd });
-                            _nextId += countToAdd;
-                            currId += countToAdd;
-                            count -= countToAdd;
-                        }
-                        else if (firstRange.start < currId) {
-                            const countToTrim = currId - firstRange.start;
-                            idRange.first = (0, index_js_1.brand)(idRange.first + countToTrim);
-                            idRange.count -= countToTrim;
-                        }
-                        if (idRange.count > count) {
-                            idRange.count = count;
-                        }
-                        else if (idRange.count < count &&
-                            firstRange.value + firstRange.length === _nextId) {
-                            // The existing range can be extended
-                            _nextId += count - idRange.count;
-                            firstRange.length = count;
-                            idRange.count = count;
-                        }
-                        out.push(idRange);
-                        count -= idRange.count;
-                        currId += idRange.count;
-                    }
-                }
-                return out;
-            },
-            mint(length) {
-                const count = length ?? 1;
-                const out = _nextId;
-                _nextId += count;
-                return (0, index_js_1.brand)(out);
-            },
-        };
-    },
-};
-//# sourceMappingURL=memoizedIdRangeAllocator.js.map

package/dist/feature-libraries/memoizedIdRangeAllocator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"memoizedIdRangeAllocator.js","sourceRoot":"","sources":["../../src/feature-libraries/memoizedIdRangeAllocator.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type { ChangesetLocalId, RevisionTag } from \"../core/index.js\";\nimport {\n\ttype Mutable,\n\ttype RangeMap,\n\tbrand,\n\tgetFirstEntryFromRangeMap,\n\tgetOrAddEmptyToMap,\n\tsetInRangeMap,\n} from \"../util/index.js\";\n\n/**\n * A unique ID allocator that returns the output ID for the same input ID.\n */\nexport interface MemoizedIdRangeAllocator {\n\t/**\n\t * A unique ID allocator that returns the output ID for the same input ID.\n\t *\n\t * \"The same\" here includes cases where a prior call allocated a range of IDs that partially or fully overlap with the\n\t * current call.\n\t * @param revision - The revision associated with the range of IDs to allocate.\n\t * @param startId - The first ID to allocate.\n\t * @param count - The number of IDs to allocate. Interpreted as 1 if undefined.\n\t */\n\tallocate(\n\t\trevision: RevisionTag | undefined,\n\t\tstartId: ChangesetLocalId,\n\t\tcount?: number,\n\t): IdRange[];\n\t/**\n\t * Allocates a new range of IDs.\n\t *\n\t * @param count - The number of IDs to allocate. Interpreted as 1 if undefined.\n\t */\n\tmint(count?: number): ChangesetLocalId;\n}\n\n/**\n */\nexport interface IdRange {\n\treadonly first: ChangesetLocalId;\n\treadonly count: number;\n}\n\n/**\n */\nexport const MemoizedIdRangeAllocator = {\n\tfromNextId(nextId: number = 0): MemoizedIdRangeAllocator {\n\t\tconst rangeMap: Map<RevisionTag | undefined, RangeMap<number>> = new Map();\n\t\tlet _nextId = nextId;\n\t\treturn {\n\t\t\tallocate(key: string | number | undefined, startId: number, length?: number): IdRange[] {\n\t\t\t\tlet count = length ?? 1;\n\t\t\t\tconst out: IdRange[] = [];\n\t\t\t\tconst ranges = getOrAddEmptyToMap(rangeMap, key);\n\t\t\t\tlet currId = startId;\n\t\t\t\twhile (count > 0) {\n\t\t\t\t\tconst firstRange = getFirstEntryFromRangeMap(ranges, currId, count);\n\t\t\t\t\tif (firstRange === undefined) {\n\t\t\t\t\t\tconst newId = _nextId;\n\t\t\t\t\t\t_nextId += count;\n\t\t\t\t\t\tsetInRangeMap(ranges, currId, count, newId);\n\t\t\t\t\t\tout.push({ first: brand(newId), count });\n\t\t\t\t\t\tcount = 0;\n\t\t\t\t\t} else {\n\t\t\t\t\t\tconst idRange: Mutable<IdRange> = {\n\t\t\t\t\t\t\tfirst: brand(firstRange.value),\n\t\t\t\t\t\t\tcount: firstRange.length,\n\t\t\t\t\t\t};\n\t\t\t\t\t\tif (currId < firstRange.start) {\n\t\t\t\t\t\t\tconst countToAdd = firstRange.start - currId;\n\t\t\t\t\t\t\tsetInRangeMap(ranges, currId, countToAdd, _nextId);\n\t\t\t\t\t\t\tout.push({ first: brand(_nextId), count: countToAdd });\n\t\t\t\t\t\t\t_nextId += countToAdd;\n\t\t\t\t\t\t\tcurrId += countToAdd;\n\t\t\t\t\t\t\tcount -= countToAdd;\n\t\t\t\t\t\t} else if (firstRange.start < currId) {\n\t\t\t\t\t\t\tconst countToTrim = currId - firstRange.start;\n\t\t\t\t\t\t\tidRange.first = brand((idRange.first as number) + countToTrim);\n\t\t\t\t\t\t\tidRange.count -= countToTrim;\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif (idRange.count > count) {\n\t\t\t\t\t\t\tidRange.count = count;\n\t\t\t\t\t\t} else if (\n\t\t\t\t\t\t\tidRange.count < count &&\n\t\t\t\t\t\t\tfirstRange.value + firstRange.length === _nextId\n\t\t\t\t\t\t) {\n\t\t\t\t\t\t\t// The existing range can be extended\n\t\t\t\t\t\t\t_nextId += count - idRange.count;\n\t\t\t\t\t\t\tfirstRange.length = count;\n\t\t\t\t\t\t\tidRange.count = count;\n\t\t\t\t\t\t}\n\t\t\t\t\t\tout.push(idRange);\n\t\t\t\t\t\tcount -= idRange.count;\n\t\t\t\t\t\tcurrId += idRange.count;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\treturn out;\n\t\t\t},\n\t\t\tmint(length?: number): ChangesetLocalId {\n\t\t\t\tconst count = length ?? 1;\n\t\t\t\tconst out = _nextId;\n\t\t\t\t_nextId += count;\n\t\t\t\treturn brand(out);\n\t\t\t},\n\t\t};\n\t},\n};\n"]}

package/lib/feature-libraries/memoizedIdRangeAllocator.d.ts

@@ -1,38 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import type { ChangesetLocalId, RevisionTag } from "../core/index.js";
-/**
- * A unique ID allocator that returns the output ID for the same input ID.
- */
-export interface MemoizedIdRangeAllocator {
-    /**
-     * A unique ID allocator that returns the output ID for the same input ID.
-     *
-     * "The same" here includes cases where a prior call allocated a range of IDs that partially or fully overlap with the
-     * current call.
-     * @param revision - The revision associated with the range of IDs to allocate.
-     * @param startId - The first ID to allocate.
-     * @param count - The number of IDs to allocate. Interpreted as 1 if undefined.
-     */
-    allocate(revision: RevisionTag | undefined, startId: ChangesetLocalId, count?: number): IdRange[];
-    /**
-     * Allocates a new range of IDs.
-     *
-     * @param count - The number of IDs to allocate. Interpreted as 1 if undefined.
-     */
-    mint(count?: number): ChangesetLocalId;
-}
-/**
- */
-export interface IdRange {
-    readonly first: ChangesetLocalId;
-    readonly count: number;
-}
-/**
- */
-export declare const MemoizedIdRangeAllocator: {
-    fromNextId(nextId?: number): MemoizedIdRangeAllocator;
-};
-//# sourceMappingURL=memoizedIdRangeAllocator.d.ts.map

package/lib/feature-libraries/memoizedIdRangeAllocator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"memoizedIdRangeAllocator.d.ts","sourceRoot":"","sources":["../../src/feature-libraries/memoizedIdRangeAllocator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAUtE;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACxC;;;;;;;;OAQG;IACH,QAAQ,CACP,QAAQ,EAAE,WAAW,GAAG,SAAS,EACjC,OAAO,EAAE,gBAAgB,EACzB,KAAK,CAAC,EAAE,MAAM,GACZ,OAAO,EAAE,CAAC;IACb;;;;OAIG;IACH,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;CACvC;AAED;GACG;AACH,MAAM,WAAW,OAAO;IACvB,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB;AAED;GACG;AACH,eAAO,MAAM,wBAAwB;wBACjB,MAAM,GAAO,wBAAwB;CA4DxD,CAAC"}