@fluidframework/tree 2.74.0 → 2.81.0-374083

package/src/simple-tree/toStoredSchema.ts

@@ -186,27 +186,31 @@ export function transformSimpleSchema(
 ): SimpleTreeSchema {
 	const simpleNodeSchema = new Map<string, SimpleNodeSchema>();
 	const root = filterFieldAllowedTypes(schema.root, options);
-	const queue = Array.from(root.simpleAllowedTypes.keys());
+	const queue = [...root.simpleAllowedTypes.keys()];
 	for (const identifier of queue) {
 		getOrCreate(simpleNodeSchema, identifier, (id) => {
 			const nodeSchema = schema.definitions.get(id) ?? fail(0xca8 /* missing schema */);
 			const transformed = transformSimpleNodeSchema(nodeSchema, options);
 			const kind = transformed.kind;
 			switch (kind) {
-				case NodeKind.Leaf:
+				case NodeKind.Leaf: {
 					break;
+				}
 				case NodeKind.Array:
 				case NodeKind.Map:
-				case NodeKind.Record:
+				case NodeKind.Record: {
 					queue.push(...transformed.simpleAllowedTypes.keys());
 					break;
-				case NodeKind.Object:
+				}
+				case NodeKind.Object: {
 					for (const fieldSchema of transformed.fields.values()) {
 						queue.push(...fieldSchema.simpleAllowedTypes.keys());
 					}
 					break;
-				default:
+				}
+				default: {
 					unreachableCase(kind);
+				}
 			}
 			return transformed;
 		});

package/src/simple-tree/unhydratedFlexTreeFromInsertable.ts

@@ -9,7 +9,10 @@ import { assert, fail } from "@fluidframework/core-utils/internal";
 
 import { filterIterable, hasSingle, oneFromIterable } from "../util/index.js";
 
-import { normalizeFieldSchema, FieldKind, type ImplicitFieldSchema } from "./fieldSchema.js";
+import type { FlexTreeNode } from "../feature-libraries/index.js";
+
+import type { ImplicitFieldSchema } from "./fieldSchema.js";
+import { normalizeFieldSchema, FieldKind } from "./fieldSchema.js";
 import {
 	CompatibilityLevel,
 	getKernel,
@@ -24,7 +27,7 @@ import {
 import { getUnhydratedContext } from "./createContext.js";
 
 /**
- * Transforms an input {@link TypedNode} tree to an {@link UnhydratedFlexTreeNode}.
+ * Transforms an input {@link TypedNode} tree to a {@link FlexTreeNode}.
  * @param data - The input tree to be converted.
  * If the data is an unsupported value (e.g. NaN), a fallback value will be used when supported,
  * otherwise an error will be thrown.
@@ -49,10 +52,10 @@ import { getUnhydratedContext } from "./createContext.js";
  * Output should comply with the provided view schema, but this is not explicitly validated:
  * validation against stored schema (to guard against document corruption) is done elsewhere.
  */
-export function unhydratedFlexTreeFromInsertable<TIn extends InsertableContent | undefined>(
+export function flexTreeFromInsertable<TIn extends InsertableContent | undefined>(
 	data: TIn,
 	allowedTypes: ImplicitFieldSchema,
-): TIn extends undefined ? undefined : UnhydratedFlexTreeNode {
+): TIn extends undefined ? undefined : FlexTreeNode {
 	const normalizedFieldSchema = normalizeFieldSchema(allowedTypes);
 
 	if (data === undefined) {
@@ -60,35 +63,60 @@ export function unhydratedFlexTreeFromInsertable<TIn extends InsertableContent |
 		if (normalizedFieldSchema.kind !== FieldKind.Optional) {
 			throw new UsageError("Got undefined for non-optional field.");
 		}
-		return undefined as TIn extends undefined ? undefined : UnhydratedFlexTreeNode;
+		return undefined as TIn extends undefined ? undefined : FlexTreeNode;
 	}
 
-	const flexTree: UnhydratedFlexTreeNode = unhydratedFlexTreeFromInsertableNode(
+	const flexTree: FlexTreeNode = flexTreeFromInsertableNode(
 		data,
 		normalizedFieldSchema.allowedTypeSet,
 	);
 
-	return flexTree as TIn extends undefined ? undefined : UnhydratedFlexTreeNode;
+	return flexTree as TIn extends undefined ? undefined : FlexTreeNode;
 }
 
 /**
- * Copy content from `data` into a UnhydratedFlexTreeNode.
+ * Wrapper around {@link flexTreeFromInsertable} which always returns an unhydrated nodes (or undefined).
+ * @remarks
+ * This does not deeply check content is unhydrated.
+ *
+ * Once hybrid content is better supported, this should likely be removed as a simplification.
  */
-export function unhydratedFlexTreeFromInsertableNode(
+export function unhydratedFlexTreeFromInsertable<TIn extends InsertableContent | undefined>(
+	data: TIn,
+	allowedTypes: ImplicitFieldSchema,
+): TIn extends undefined ? undefined : UnhydratedFlexTreeNode {
+	const result = flexTreeFromInsertable(data, allowedTypes);
+	if (result === undefined) {
+		return undefined as TIn extends undefined ? undefined : UnhydratedFlexTreeNode;
+	}
+	assert(result instanceof UnhydratedFlexTreeNode, "expected unhydrated node");
+	return result as TIn extends undefined ? undefined : UnhydratedFlexTreeNode;
+}
+
+/**
+ * Copy content from `data` into a UnhydratedFlexTreeNode or return an existing node if `data` is a TreeNode.
+ */
+export function flexTreeFromInsertableNode(
 	data: InsertableContent,
 	allowedTypes: ReadonlySet<TreeNodeSchema>,
-): UnhydratedFlexTreeNode {
+): FlexTreeNode {
 	if (isTreeNode(data)) {
 		const kernel = getKernel(data);
-		const inner = kernel.getInnerNodeIfUnhydrated();
-		if (inner === undefined) {
-			// The node is already hydrated, meaning that it already got inserted into the tree previously
-			throw new UsageError("A node may not be inserted into the tree more than once");
-		} else {
+		const inner = kernel.getInnerNode();
+		if (inner.parentField.parent.parent === undefined) {
 			if (!allowedTypes.has(kernel.schema)) {
 				throw new UsageError("Invalid schema for this context.");
 			}
+
+			if (inner.isHydrated()) {
+				// TODO: hook up event bubbling from hydrated to unhydrated tree.
+			}
+
 			return inner;
+		} else {
+			throw new UsageError(
+				"A node which already has a parent may not be used as part of a new tree.",
+			);
 		}
 	}
 

package/src/text/README.md

@@ -0,0 +1,8 @@
+# Text
+
+A collection of text related types, schema and utilities for working with text beyond the basic `SchemaStatics.string`.
+
+## Status
+
+Very early work in progress.
+See doc comment on `TextAsTree` for more details.

package/src/text/index.ts

@@ -0,0 +1,6 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+export { TextAsTree } from "./textDomain.js";

package/src/text/textDomain.ts

@@ -0,0 +1,199 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { EmptyKey } from "../core/index.js";
+import {
+	eraseSchemaDetails,
+	SchemaFactory,
+	SchemaFactoryAlpha,
+	TreeArrayNode,
+} from "../simple-tree/index.js";
+import type { TreeNode, WithType } from "../simple-tree/index.js";
+
+const sf = new SchemaFactoryAlpha("com.fluidframework.text");
+
+class TextNode
+	extends sf.object("Text", {
+		content: SchemaFactory.required([() => StringArray], { key: EmptyKey }),
+	})
+	implements TextAsTree.Members
+{
+	public insertAt(index: number, additionalCharacters: string): void {
+		this.content.insertAt(
+			index,
+			TreeArrayNode.spread(charactersFromString(additionalCharacters)),
+		);
+	}
+	public removeRange(index: number, length: number): void {
+		this.content.removeRange(index, length);
+	}
+	public characters(): Iterable<string> {
+		return this.content[Symbol.iterator]();
+	}
+	public fullString(): string {
+		return this.content.join("");
+	}
+
+	public static fromString(value: string): TextNode {
+		// Constructing an ArrayNode from an iterator is supported, so creating an array from the iterable of characters seems like its not necessary here,
+		// but to reduce the risk of incorrect data interpretation, we actually ban this in the special case where the iterable is a string directly, which is the case here.
+		// Thus the array construction here is necessary to avoid a runtime error.
+		return new TextNode({ content: [...charactersFromString(value)] });
+	}
+}
+
+/**
+ * Interpret a string as an iterable of characters.
+ * @remarks
+ * This mostly exists to clearly document where the code is interpreting a string as characters,
+ * and provide a centralized place where validation could be added in the future if desired.
+ * Additionally using this function consistently will make any refactors to support alternative character boundaries easier.
+ */
+function charactersFromString(value: string): Iterable<string> {
+	// Uses the string as an iterable of characters, so utf-16 surrogate pairs get grouped together correctly.
+	// Might be nice to call isWellFormed or toWellFormed here (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toWellFormed)
+	// But those are not widely supported yet.
+	return value;
+}
+
+class StringArray extends sf.array("StringArray", SchemaFactory.string) {}
+
+/**
+ * A collection of text related types, schema and utilities for working with text beyond the basic {@link SchemaStatics.string}.
+ * @privateRemarks
+ * Currently this API only supports a really minimal feature set, and has no support for more advanced features like:
+ * - Alternative character boundaries (e.g. grapheme clusters, paragraphs, tokens, etc.).
+ * We may want to provide either ways to create strings with application controlled character boundaries since there is not a clear single answer on how to break a string into atomic units.
+ * - Character attributes (e.g. bold, italic, etc):
+ * Properties that can be set on any character independently with optimizations for runs of characters with the same attributes.
+ * - Inline objects (e.g. images, embedded components, etc):
+ * These would be logically part of the text, generalizing characters to allow inline objects in character ranges.
+ * How character attributes apply to inline objects is an open question
+ * (there could be a kind of object which gets them, and one that doesn't for example).
+ * - Annotations (e.g. comments, suggestions, etc).
+ * Objects which can be associated with a range of characters but are not logically part of the text.
+ * These would need to have the logical range they apply to updated by edits.
+ * How edits which overlap annotation boundaries are handled may require hints from the application for optimal behavior (mainly inserts at the boundaries).
+ * These get a lifetime tied to the text node, not any of the characters the annotation covers,
+ * however it might be desirable to have a way for a range edit to (optionally) also remove any annotations which are fully covered by the edit.
+ * Annotations over an empty range should also be supported and behave well (for example not end up with characters inside the range after edits unless specifically structured so that makes sense).
+ * - Anchors (e.g. positions in the text which survive edits).
+ * These would be useful for ephemeral state like cursor positions, but should match the behaviors with respect to edits exhibited by the ends of Annotations.
+ *
+ * How these features will be represented in the schema and API should be determined before any of this is stabilized so the simple more limited version can neatly fit into the larger design.
+ *
+ * There are various optimizations that should be implemented to make this performant for large texts and common usage patterns.
+ * These include:
+ * - Optimized persisted format.
+ * - Optimized in memory representation (via chunked forest).
+ * - Optimized edit persisted format (e.g. combining adjacent inserts/removes into single operations as well as support for efficient attribute editing of ranges).
+ * - Optimized edit application (e.g. applying the above noted optimizable edit cases efficiently).
+ * This applies to the revision manager, the forest, and any flex or simple-tree nodes and user events.
+ *
+ * There are also additional features required for ensuring the invariants of collaborative text editing are maintained through concurrent edits.
+ * The main challenges here are related to annotations, but some policies for what to do in the case of corrupt/invalid text should also be included.
+ * There are quite a few ways invariants could break, including:
+ * - concurrent edits without proper constraints.
+ * - collaboration with clients using compatible schema with different constraints.
+ * - opening documents which contain invalid content (e.g. from older versions of the software, manual edits to the persisted format, or simply an existing corrupt case which was saved).
+ * - a user inserting/constructing/importing invalid content.
+ *
+ * These cases could break constraints causing issues like invalided characters (empty, a utf-16 surrogate pair alone, etc) or
+ * annotations which reference out of bounds character ranges.
+ * Addressing these issues mainly falls into these categories:
+ * - Handling of invalid content on import/construction of unhydrated nodes and/or insertion into the document (hydration).
+ * - Handling of invalid content which is already part of the document (live). This should ideally include both detection and repair.
+ * - Constraints on edits to prevent invalid content from being created by merges.
+ * - Optimization of the constraints to reduce cases in which edits are rejected due to conflicts.
+ *
+ * Note that these cases of invariant violations are the same cases any component should handle, so ideally there would be a general framework or pattern for documenting and enforcing such constraints.
+ *
+ * Another area for future work is improved APIs for import, export and non-schema-aware use. This includes a variety of cases, including but not limited to:
+ * - Insertable content format (taken by the constructor and import APIs).
+ * - Customizable export formats (like a way to make exportVerbose and exportConcise flatten the text nodes to strings automatically).
+ * - Customizable toJson behavior (e.g. flattening to strings, possibly via tools or patterns for custom tree stringifier).
+ * - Ensure JS object APIs (like iteration, own vs inherited properties, etc) provide a good and consistent experience with respect to other nodes.
+ * - Support in generateSchemaFromSimpleSchema for recognizing text nodes and generating the appropriate schema.
+ * - Ensure above features work well enough to support important scenarios like AI assisted editing and document indexing for search.
+ *
+ * Part of that work will be establishing and documenting those patterns so other components with complex encodings can follow them,
+ * in addition to implementing them for text.
+ * @internal
+ */
+export namespace TextAsTree {
+	/**
+	 * Statics for text nodes.
+	 * @internal
+	 */
+	export interface Statics {
+		/**
+		 * Construct a {@link TextAsTree.(Tree:type)} from a string, where each character (as defined by iterating over the string) becomes a single character in the text node.
+		 * This combines pairs of utf-16 surrogate code units into single characters as appropriate.
+		 */
+		fromString(value: string): Tree;
+	}
+
+	/**
+	 * Interface for a text node.
+	 * @remarks
+	 * The string is broken up into substrings which are referred to as 'characters'.
+	 * Unlike with JavaScript strings, all indexes are by character, not UTF-16 code unit.
+	 * This avoids the problem JavaScript where it can split UTF-16 surrogate pairs producing invalid strings,
+	 * and avoids the issue where indexing a string and iterating it segment the string differently.
+	 * This does NOT mean the characters correspond to user perceived characters (like grapheme clusters try to do):
+	 * applications will likely want to include higher level segmentation logic
+	 * which might differ between operations like delete
+	 * (which often operates on something in between unicode code points and grapheme clusters)
+	 * and navigation/selection (which typically uses grapheme clusters).
+	 *
+	 * @see {@link TextAsTree.Statics.fromString} for construction.
+	 * @see {@link TextAsTree.(Tree:type)} for schema.
+	 * @internal
+	 */
+	export interface Members {
+		/**
+		 * Gets an iterable over the characters currently in the text.
+		 * @remarks
+		 * This iterator matches the behavior of {@link (TreeArrayNode:interface)} with respect to edits during iteration.
+		 */
+		characters(): Iterable<string>;
+
+		/**
+		 * Copy the content of this node into a string.
+		 */
+		fullString(): string;
+
+		/**
+		 * Insert a range of characters into the string based on character index.
+		 * @remarks
+		 * See {@link (TreeArrayNode:interface).insertAt} for more details on the behavior.
+		 * See {@link TextAsTree.Statics.fromString} for how the `additionalCharacters` string is broken into characters.
+		 * @privateRemarks
+		 * If we provide ways to customize character boundaries, that could be handled here by taking in an Iterable<string> instead of a string.
+		 * Doing this currently would enable insertion of text with different character boundaries than the existing text,
+		 * which would violate the currently documented character boundary invariants.
+		 *
+		 * Another option would be to take an approach like Table,
+		 * where the user of the API uses a factory function to generate the schema, and can inject custom logic, like a string character iterator.
+		 */
+		insertAt(index: number, additionalCharacters: string): void;
+
+		/**
+		 * Remove a range from a string based on character index.
+		 * See {@link (TreeArrayNode:interface).removeRange} for more details on the behavior.
+		 */
+		removeRange(index: number, length: number): void;
+	}
+
+	/**
+	 * Schema for a text node.
+	 * @remarks
+	 * See {@link TextAsTree.Members} for the API.
+	 * See {@link TextAsTree.Statics} for static APIs on this Schema, including construction.
+	 * @internal
+	 */
+	export const Tree = eraseSchemaDetails<Members, Statics>()(TextNode);
+	export type Tree = Members & TreeNode & WithType<"com.fluidframework.text.Text">;
+}

package/src/treeFactory.ts

@@ -29,7 +29,9 @@ import type { ITree } from "./simple-tree/index.js";
 import { Breakable, copyProperty } from "./util/index.js";
 import { FluidClientVersion } from "./codec/index.js";
 import {
+	editManagerFormatVersionSelectorForDetachedRootEditing,
 	editManagerFormatVersionSelectorForSharedBranches,
+	messageFormatVersionSelectorForDetachedRootEditing,
 	messageFormatVersionSelectorForSharedBranches,
 } from "./shared-tree-core/index.js";
 
@@ -203,7 +205,7 @@ export function configuredSharedTreeInternal(
 
 export function resolveOptions(options: SharedTreeOptions): SharedTreeOptionsInternal {
 	const internal: SharedTreeOptionsInternal = {
-		...resolveSharedBranchesOptions(options.enableSharedBranches),
+		...resolveFormatOptions(options),
 	};
 	for (const optionName of Object.keys(options)) {
 		copyProperty(options, optionName, internal);
@@ -211,12 +213,25 @@ export function resolveOptions(options: SharedTreeOptions): SharedTreeOptionsInt
 	return internal;
 }
 
-function resolveSharedBranchesOptions(
-	enableSharedBranches: boolean | undefined,
-): SharedTreeOptionsInternal {
-	return enableSharedBranches === true ? sharedBranchesOptions : {};
+function resolveFormatOptions(options: SharedTreeOptions): SharedTreeOptionsInternal {
+	if (options.enableSharedBranches === true && options.enableDetachedRootEditing === true) {
+		throw new UsageError("enableDetachRootEditing cannot be used with enableSharedBranches.");
+	}
+	if (options.enableSharedBranches === true) {
+		return sharedBranchesOptions;
+	}
+	if (options.enableDetachedRootEditing === true) {
+		return detachRootEditingOptions;
+	}
+	return {};
 }
+
 const sharedBranchesOptions: SharedTreeOptionsInternal = {
 	messageFormatSelector: messageFormatVersionSelectorForSharedBranches,
 	editManagerFormatSelector: editManagerFormatVersionSelectorForSharedBranches,
 };
+const detachRootEditingOptions: SharedTreeOptionsInternal = {
+	messageFormatSelector: messageFormatVersionSelectorForDetachedRootEditing,
+	editManagerFormatSelector: editManagerFormatVersionSelectorForDetachedRootEditing,
+	canMakeDetachedRootEdits: true,
+};

package/src/util/bTreeUtils.ts

@@ -3,49 +3,60 @@
  * Licensed under the MIT License.
  */
 
-import { BTree } from "@tylerbu/sorted-btree-es6";
+import { BTree, defaultComparator, type DefaultComparable } from "@tylerbu/sorted-btree-es6";
 
 import { brand, type Brand } from "./brand.js";
+import { debugAssert } from "@fluidframework/core-utils/internal";
 
-export type TupleBTree<K, V> = Brand<BTree<K, V>, "TupleBTree">;
+/**
+ * A BTree which uses tuples (arrays) as the key.
+ * @remarks
+ * All keys must be the same length.
+ */
+export type TupleBTree<K extends readonly DefaultComparable[], V> = Brand<
+	BTree<K, V>,
+	"TupleBTree"
+>;
 
-export function newTupleBTree<K extends readonly unknown[], V>(
+/**
+ * Create a new {@link TupleBTree}.
+ */
+export function newTupleBTree<const K extends readonly DefaultComparable[], V>(
 	entries?: [K, V][],
 ): TupleBTree<K, V> {
 	return brand(new BTree<K, V>(entries, compareTuples));
 }
 
-// This assumes that the arrays are the same length.
-function compareTuples(arrayA: readonly unknown[], arrayB: readonly unknown[]): number {
+/**
+ * Compares two tuples (arrays) element by element.
+ * @param arrayA - The first tuple to compare.
+ * @param arrayB - The second tuple to compare.
+ * @returns A negative number if arrayA \< arrayB, a positive number if arrayA \> arrayB, or 0 if they are equal.
+ */
+function compareTuples(
+	arrayA: readonly DefaultComparable[],
+	arrayB: readonly DefaultComparable[],
+): number {
+	debugAssert(
+		() =>
+			arrayA.length === arrayB.length || "compareTuples requires arrays of the same length",
+	);
 	for (let i = 0; i < arrayA.length; i++) {
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		const a = arrayA[i] as any;
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		const b = arrayB[i] as any;
-
-		// Less-than and greater-than always return false if either value is undefined,
-		// so we handle undefined separately, treating it as less than all other values.
-		if (a === undefined && b !== undefined) {
-			return -1;
-		} else if (b === undefined && a !== undefined) {
-			return 1;
-		} else if (a < b) {
-			return -1;
-		} else if (a > b) {
-			return 1;
+		const result = defaultComparator(arrayA[i], arrayB[i]);
+		if (result !== 0) {
+			return result;
 		}
 	}
-
 	return 0;
 }
 
-export function mergeTupleBTrees<K extends readonly unknown[], V>(
+export function mergeTupleBTrees<K extends readonly DefaultComparable[], V>(
 	tree1: TupleBTree<K, V> | undefined,
 	tree2: TupleBTree<K, V> | undefined,
 	preferLeft = true,
 ): TupleBTree<K, V> {
 	if (tree1 === undefined) {
-		return tree2 !== undefined ? brand(tree2.clone()) : newTupleBTree<K, V>();
+		return tree2 === undefined ? newTupleBTree<K, V>() : brand(tree2.clone());
 	}
 
 	const result: TupleBTree<K, V> = brand(tree1.clone());

package/src/util/breakable.ts

@@ -221,15 +221,15 @@ export function breakingClass<Target extends abstract new (...args: any[]) => Wi
 			if (!doNotWrap.has(key)) {
 				doNotWrap.add(key);
 				const descriptor = Reflect.getOwnPropertyDescriptor(prototype, key);
-				if (descriptor !== undefined) {
-					// Method
-					if (typeof descriptor.value === "function") {
-						if (!isBreaker(descriptor.value)) {
-							// This does not affect the original class, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/getOwnPropertyDescriptor
-							descriptor.value = breakingMethod(descriptor.value);
-							Object.defineProperty(DecoratedBreakable.prototype, key, descriptor);
-						}
-					}
+				// Method
+				if (
+					descriptor !== undefined &&
+					typeof descriptor.value === "function" &&
+					!isBreaker(descriptor.value)
+				) {
+					// This does not affect the original class, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/getOwnPropertyDescriptor
+					descriptor.value = breakingMethod(descriptor.value);
+					Object.defineProperty(DecoratedBreakable.prototype, key, descriptor);
 				}
 			}
 		}

package/src/util/idAllocator.ts

@@ -30,8 +30,7 @@ export function idAllocatorFromMaxId(maxId: number | undefined = undefined): IdA
 
 export function idAllocatorFromState(state: IdAllocationState): IdAllocator {
 	return {
-		allocate: (c?: number): number => {
-			const count = c ?? 1;
+		allocate: (count: number = 1): number => {
 			assert(count > 0, 0x5cf /* Must allocate at least one ID */);
 			const id: number = state.maxId + 1;
 			state.maxId += count;

package/src/util/index.ts

@@ -134,7 +134,10 @@ export {
 export {
 	RangeMap,
 	type RangeQueryResult,
+	type RangeQueryResultFragment,
+	type RangeQueryEntry,
 	newIntegerRangeMap,
+	areAdjacentIntegerRanges,
 } from "./rangeMap.js";
 
 export {

package/src/util/nestedMap.ts

@@ -177,11 +177,11 @@ export function nestedMapToFlatList<Key1, Key2, Value>(
 	map: ReadonlyNestedMap<Key1, Key2, Value>,
 ): [Key1, Key2, Value][] {
 	const list: [Key1, Key2, Value][] = [];
-	map.forEach((innerMap, key1) => {
-		innerMap.forEach((val, key2) => {
+	for (const [key1, innerMap] of map) {
+		for (const [key2, val] of innerMap) {
 			list.push([key1, key2, val]);
-		});
-	});
+		}
+	}
 	return list;
 }
 
@@ -202,11 +202,11 @@ export function forEachInNestedMap<Key1, Key2, Value>(
 	map: ReadonlyNestedMap<Key1, Key2, Value>,
 	delegate: (value: Value, key1: Key1, key2: Key2) => void,
 ): void {
-	map.forEach((innerMap, keyFirst) => {
-		innerMap.forEach((val, keySecond) => {
+	for (const [keyFirst, innerMap] of map) {
+		for (const [keySecond, val] of innerMap) {
 			delegate(val, keyFirst, keySecond);
-		});
-	});
+		}
+	}
 }
 
 /**
@@ -221,14 +221,14 @@ export function mapNestedMap<Key1, Key2, ValueIn, ValueOut = ValueIn>(
 	delegate: (value: ValueIn, key1: Key1, key2: Key2) => ValueOut,
 ): NestedMap<Key1, Key2, ValueOut> {
 	const output = new Map<Key1, Map<Key2, ValueOut>>();
-	input.forEach((inputInnerMap, keyFirst) => {
+	for (const [keyFirst, inputInnerMap] of input) {
 		const outputInnerMap = new Map<Key2, ValueOut>();
-		inputInnerMap.forEach((val, keySecond) => {
+		for (const [keySecond, val] of inputInnerMap) {
 			const mappedValue = delegate(val, keyFirst, keySecond);
 			outputInnerMap.set(keySecond, mappedValue);
-		});
+		}
 		output.set(keyFirst, outputInnerMap);
-	});
+	}
 	return output;
 }
 
@@ -314,9 +314,7 @@ export class SizedNestedMap<Key1, Key2, Value> {
 	}
 
 	public values(): IterableIterator<Value> {
-		return (
-			Array.from(this.nestedMap.values()).flatMap((innerMap) => innerMap.values())[0] ?? oob()
-		);
+		return [...this.nestedMap.values()].flatMap((innerMap) => innerMap.values())[0] ?? oob();
 	}
 
 	public [Symbol.iterator](): IterableIterator<[Key1, Map<Key2, Value>]> {