@fluidframework/tree 2.41.0-338401 → 2.41.0

package/src/simple-tree/api/treeNodeApi.ts

@@ -38,8 +38,8 @@ import {
 	typeSchemaSymbol,
 	getOrCreateInnerNode,
 } from "../core/index.js";
-import { isObjectNodeSchema } from "../objectNodeTypes.js";
 import type { TreeChangeEvents } from "./treeChangeEvents.js";
+import { lazilyAllocateIdentifier, isObjectNodeSchema } from "../node-kinds/index.js";
 
 /**
  * Provides various functions for analyzing {@link TreeNode}s.
@@ -108,9 +108,9 @@ export interface TreeNodeApi {
 	/**
 	 * Returns the {@link SchemaFactory.identifier | identifier} of the given node in the most compressed form possible.
 	 * @remarks
-	 * If the node's identifier is a valid UUID that was automatically generated by the SharedTree, then this will return a process-unique integer corresponding to that identifier.
-	 * Note that the node must already have been inserted into the tree in order to retrieve a generated UUID (or shortId will error).
+	 * If the node is {@link Unhydrated | hydrated}  and its identifier is a valid UUID that was automatically generated by the SharedTree it is part of (or something else using the same {@link @fluidframework/id-compressor#IIdCompressor}), then this will return a process-unique integer corresponding to that identifier.
 	 * This is useful for performance-sensitive scenarios involving many nodes with identifiers that need to be compactly retained in memory or used for efficient lookup.
+	 * Note that automatically generated identifiers that were accessed before the node was hydrated will return the generated UUID, not the process-unique integer.
 	 *
 	 * If the node's identifier is any other user-provided string, then this will return that string.
 	 *
@@ -118,7 +118,7 @@ export interface TreeNodeApi {
 	 *
 	 * If the node has more than one identifier, then this will throw an error.
 	 *
-	 * The returned integer must not be serialized or preserved outside of the current process.
+	 * The returned integer should not be serialized or preserved outside of the current process.
 	 * Its lifetime is that of the current in-memory instance of the FF container for this client, and it is not guaranteed to be unique or stable outside of that context.
 	 * The same node's identifier may, for example, be different across multiple sessions for the same client and document, or different across two clients in the same session.
 	 */
@@ -217,42 +217,7 @@ export const treeNodeApi: TreeNodeApi = {
 		return tryGetSchema(node) ?? fail(0xb37 /* Not a tree node */);
 	},
 	shortId(node: TreeNode): number | string | undefined {
-		const schema = node[typeSchemaSymbol];
-		if (!isObjectNodeSchema(schema)) {
-			return undefined;
-		}
-
-		const flexNode = getOrCreateInnerNode(node);
-		const identifierFieldKeys = schema.identifierFieldKeys;
-
-		switch (identifierFieldKeys.length) {
-			case 0:
-				return undefined;
-			case 1: {
-				const identifier = flexNode.tryGetField(identifierFieldKeys[0] ?? oob())?.boxedAt(0);
-				if (flexNode instanceof UnhydratedFlexTreeNode) {
-					if (identifier === undefined) {
-						throw new UsageError(
-							"Tree.shortId cannot access default identifiers on unhydrated nodes",
-						);
-					}
-					return identifier.value as string;
-				}
-				assert(
-					identifier?.context.isHydrated() === true,
-					0xa27 /* Expected hydrated identifier */,
-				);
-				const identifierValue = identifier.value as string;
-
-				const localNodeKey =
-					identifier.context.nodeKeyManager.tryLocalizeNodeIdentifier(identifierValue);
-				return localNodeKey !== undefined ? extractFromOpaque(localNodeKey) : identifierValue;
-			}
-			default:
-				throw new UsageError(
-					"shortId() may not be called on a node with more than one identifier. Consider converting extraneous identifier fields to string fields.",
-				);
-		}
+		return getIdentifierFromNode(node, "preferCompressed");
 	},
 };
 
@@ -285,6 +250,90 @@ export function tryGetSchema(value: unknown): undefined | TreeNodeSchema {
 	}
 }
 
+/**
+ * Gets the identifier from a node.
+ *
+ * @param node - {@link TreeNode} where you want to extract the identifier from.
+ * @param compression - string value to determine what type of identifier you want to retrieve.
+ *
+ * @remarks
+ * If the node does not contain an identifier field, it returns undefined.
+ *
+ * If `compression` is set to `compressed`:
+ *
+ * - If the node contains a compressible identifier known by the id compressor, the compressed identifier is returned.
+ *
+ * - If the node contains an identifier, but is not compressible or unknown by the id compressor, `undefined` is returned.
+ *
+ * If `compression` is set to `preferCompressed`:
+ *
+ * - If the node contains a compressible identifier known by the id compressor, the compressed identifier is returned.
+ *
+ * - If the node contains an identifier, but is not compressible or unknown by the id compressor, the uncompressed identifier is returned.
+ *
+ * If `compression` is set to `uncompressed`:
+ * - If the node contains an identifier field, the uncompressed identifier is returned.
+ */
+export function getIdentifierFromNode(
+	node: TreeNode,
+	compression: "preferCompressed",
+): number | string | undefined;
+export function getIdentifierFromNode(
+	node: TreeNode,
+	compression: "compressed",
+): number | undefined;
+export function getIdentifierFromNode(
+	node: TreeNode,
+	compression: "uncompressed",
+): string | undefined;
+export function getIdentifierFromNode(
+	node: TreeNode,
+	compression: "preferCompressed" | "compressed" | "uncompressed",
+): number | string | undefined {
+	const schema = node[typeSchemaSymbol];
+	if (!isObjectNodeSchema(schema)) {
+		return undefined;
+	}
+
+	const flexNode = getOrCreateInnerNode(node);
+	const identifierFieldKeys = schema.identifierFieldKeys;
+
+	switch (identifierFieldKeys.length) {
+		case 0:
+			return undefined;
+		case 1: {
+			const key = identifierFieldKeys[0] ?? oob();
+			const identifier = flexNode.tryGetField(key)?.boxedAt(0);
+			if (flexNode instanceof UnhydratedFlexTreeNode) {
+				if (identifier === undefined) {
+					return lazilyAllocateIdentifier(flexNode, key);
+				}
+				return identifier.value as string;
+			}
+			assert(
+				identifier?.context.isHydrated() === true,
+				0xa27 /* Expected hydrated identifier */,
+			);
+			const identifierValue = identifier.value as string;
+
+			if (compression === "preferCompressed") {
+				const localNodeKey =
+					identifier.context.nodeKeyManager.tryLocalizeNodeIdentifier(identifierValue);
+				return localNodeKey !== undefined ? extractFromOpaque(localNodeKey) : identifierValue;
+			} else if (compression === "compressed") {
+				const localNodeKey =
+					identifier.context.nodeKeyManager.tryLocalizeNodeIdentifier(identifierValue);
+				return localNodeKey !== undefined ? extractFromOpaque(localNodeKey) : undefined;
+			}
+			return identifierValue;
+		}
+		default:
+			throw new UsageError(
+				"shortId() may not be called on a node with more than one identifier. Consider converting extraneous identifier fields to string fields.",
+			);
+	}
+}
+
 /**
  * Gets the stored key with which the provided node is associated in the parent.
  */

package/src/simple-tree/api/typesUnsafe.ts

@@ -28,7 +28,7 @@ import type {
 	TreeNodeSchemaCore,
 	TreeNodeSchemaClass,
 } from "../core/index.js";
-import type { TreeArrayNode } from "../arrayNode.js";
+import type { TreeArrayNode } from "../node-kinds/index.js";
 import type { FlexListToUnion, LazyItem } from "../flexList.js";
 import type { SimpleArrayNodeSchema, SimpleMapNodeSchema } from "../simpleSchema.js";
 

package/src/simple-tree/api/verboseTree.ts

@@ -36,7 +36,7 @@ import {
 	numberSchema,
 	stringSchema,
 } from "../leafNodeSchema.js";
-import { isObjectNodeSchema } from "../objectNodeTypes.js";
+import { isObjectNodeSchema } from "../node-kinds/index.js";
 import {
 	customFromCursor,
 	replaceHandles,

package/src/simple-tree/api/viewSchemaToSimpleSchema.ts

@@ -15,12 +15,10 @@ import type {
 	SimpleObjectNodeSchema,
 	SimpleTreeSchema,
 } from "../simpleSchema.js";
-import { ObjectNodeSchema } from "../objectNodeTypes.js";
 import { NodeKind } from "../core/index.js";
+import { ArrayNodeSchema, MapNodeSchema, ObjectNodeSchema } from "../node-kinds/index.js";
 import { walkFieldSchema } from "../walkFieldSchema.js";
-import { ArrayNodeSchema } from "../arrayNodeTypes.js";
 import { LeafNodeSchema } from "../leafNodeSchema.js";
-import { MapNodeSchema } from "../mapNodeTypes.js";
 
 /**
  * Converts an {@link ImplicitFieldSchema} to a "simple" schema representation.

package/src/simple-tree/core/context.ts

@@ -9,6 +9,7 @@ import type {
 	FlexTreeHydratedContext,
 } from "../../feature-libraries/index.js";
 import { brand } from "../../util/index.js";
+
 import type { TreeNodeSchema } from "./treeNodeSchema.js";
 import { walkAllowedTypes } from "./walkSchema.js";
 

package/src/simple-tree/core/getOrCreateNode.ts

@@ -4,13 +4,14 @@
  */
 
 import type { TreeValue } from "../../core/index.js";
+
+import type { TreeNode } from "./treeNode.js";
 import {
 	type InnerNode,
 	unhydratedFlexTreeNodeToTreeNode,
 	simpleTreeNodeSlot,
 	createTreeNodeFromInner,
 } from "./treeNodeKernel.js";
-import type { TreeNode } from "./treeNode.js";
 import { UnhydratedFlexTreeNode } from "./unhydratedFlexTree.js";
 
 /**

package/src/simple-tree/core/treeNode.ts

@@ -6,10 +6,10 @@
 import { assert } from "@fluidframework/core-utils/internal";
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
+import { tryGetTreeNodeSchema } from "./treeNodeKernel.js";
 import { NodeKind, type TreeNodeSchemaClass } from "./treeNodeSchema.js";
 // eslint-disable-next-line import/no-deprecated
 import { type WithType, typeNameSymbol, type typeSchemaSymbol } from "./withType.js";
-import { tryGetTreeNodeSchema } from "./treeNodeKernel.js";
 
 /**
  * A non-{@link NodeKind.Leaf|leaf} SharedTree node. Includes objects, arrays, and maps.

package/src/simple-tree/core/treeNodeKernel.ts

@@ -3,11 +3,11 @@
  * Licensed under the MIT License.
  */
 
-import { assert, Lazy, fail, debugAssert } from "@fluidframework/core-utils/internal";
-import { UsageError } from "@fluidframework/telemetry-utils/internal";
 import { createEmitter } from "@fluid-internal/client-utils";
 import type { Listenable, Off } from "@fluidframework/core-interfaces";
-import type { InternalTreeNode, Unhydrated } from "./types.js";
+import { assert, Lazy, fail, debugAssert } from "@fluidframework/core-utils/internal";
+import { UsageError } from "@fluidframework/telemetry-utils/internal";
+
 import {
 	anchorSlot,
 	type AnchorEvents,
@@ -16,6 +16,9 @@ import {
 	type TreeValue,
 	type UpPath,
 } from "../../core/index.js";
+// TODO: decide how to deal with dependencies on flex-tree implementation.
+// eslint-disable-next-line import/no-internal-modules
+import { makeTree } from "../../feature-libraries/flex-tree/lazyNode.js";
 import {
 	assertFlexTreeEntityNotFreed,
 	ContextSlot,
@@ -25,13 +28,12 @@ import {
 	treeStatusFromAnchorCache,
 	type FlexTreeNode,
 } from "../../feature-libraries/index.js";
-import type { TreeNodeSchema } from "./treeNodeSchema.js";
-// TODO: decide how to deal with dependencies on flex-tree implementation.
-// eslint-disable-next-line import/no-internal-modules
-import { makeTree } from "../../feature-libraries/flex-tree/lazyNode.js";
+
 import { SimpleContextSlot, type Context, type HydratedContext } from "./context.js";
-import { UnhydratedFlexTreeNode } from "./unhydratedFlexTree.js";
 import type { TreeNode } from "./treeNode.js";
+import type { TreeNodeSchema } from "./treeNodeSchema.js";
+import type { InternalTreeNode, Unhydrated } from "./types.js";
+import { UnhydratedFlexTreeNode } from "./unhydratedFlexTree.js";
 
 const treeNodeToKernel = new WeakMap<TreeNode, TreeNodeKernel>();
 

package/src/simple-tree/core/treeNodeSchema.ts

@@ -5,6 +5,7 @@
 
 import type { TreeLeafValue } from "../schemaTypes.js";
 import type { SimpleNodeSchemaBase } from "../simpleSchema.js";
+
 import type { TreeNode } from "./treeNode.js";
 import type { InternalTreeNode, Unhydrated } from "./types.js";
 

package/src/simple-tree/core/types.ts

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils/internal";
 import type { ErasedType } from "@fluidframework/core-interfaces";
+import { assert } from "@fluidframework/core-utils/internal";
 
 import { isFlexTreeNode, type FlexTreeNode } from "../../feature-libraries/index.js";
 

package/src/simple-tree/core/unhydratedFlexTree.ts

@@ -3,9 +3,9 @@
  * Licensed under the MIT License.
  */
 
-import { assert, oob, fail } from "@fluidframework/core-utils/internal";
 import { createEmitter } from "@fluid-internal/client-utils";
 import type { Listenable } from "@fluidframework/core-interfaces";
+import { assert, oob, fail } from "@fluidframework/core-utils/internal";
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
 import {
@@ -25,7 +25,6 @@ import {
 	type TreeStoredSchema,
 	type Value,
 } from "../../core/index.js";
-import { brand, getOrCreate, mapIterable } from "../../util/index.js";
 import {
 	type FlexTreeContext,
 	FlexTreeEntityKind,
@@ -44,6 +43,8 @@ import {
 	type SequenceFieldEditBuilder,
 	cursorForMapTreeNode,
 } from "../../feature-libraries/index.js";
+import { brand, getOrCreate, mapIterable } from "../../util/index.js";
+
 import type { Context } from "./context.js";
 
 interface UnhydratedTreeSequenceFieldEditBuilder
@@ -602,7 +603,7 @@ function getOrCreateField(
 		return new UnhydratedFlexTreeField(parent.simpleContext, schema, key, parent, onEdit);
 	}
 
-	return fail("unsupported field kind");
+	return fail(0xb9d /* unsupported field kind */);
 }
 
 // #endregion Caching and unboxing utilities

package/src/simple-tree/core/withType.ts

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import type { NodeKind, TreeNodeSchemaClass } from "./treeNodeSchema.js";
 import type { TreeNode } from "./treeNode.js";
+import type { NodeKind, TreeNodeSchemaClass } from "./treeNodeSchema.js";
 
 /**
  * The type of a {@link TreeNode}.

package/src/simple-tree/createContext.ts

@@ -5,6 +5,7 @@
 
 import { defaultSchemaPolicy } from "../feature-libraries/index.js";
 import { getOrCreate } from "../util/index.js";
+
 import { Context, UnhydratedContext } from "./core/index.js";
 import { normalizeFieldSchema, type ImplicitFieldSchema } from "./schemaTypes.js";
 import { toStoredSchema } from "./toStoredSchema.js";

package/src/simple-tree/getTreeNodeForField.ts

@@ -4,6 +4,7 @@
  */
 
 import { fail } from "@fluidframework/core-utils/internal";
+
 import type { TreeValue } from "../core/index.js";
 import {
 	FieldKinds,
@@ -12,6 +13,7 @@ import {
 	type FlexTreeRequiredField,
 	type FlexTreeOptionalField,
 } from "../feature-libraries/index.js";
+
 import { type TreeNode, getOrCreateNodeFromInnerNode } from "./core/index.js";
 
 /**

package/src/simple-tree/index.ts

@@ -43,13 +43,8 @@ export {
 	adaptEnum,
 	enumFromStrings,
 	singletonSchema,
-	test_RecursiveObject,
-	test_RecursiveObject_base,
-	test_RecursiveObjectPojoMode,
 	treeNodeApi,
 	type TreeNodeApi,
-	cursorFromInsertable,
-	createFromInsertable,
 	type NodeChangedData,
 	TreeBeta,
 	type TreeChangeEventsBeta,
@@ -119,6 +114,7 @@ export {
 	type HandleConverter,
 	allowUnused,
 	type FieldSchemaAlphaUnsafe,
+	getIdentifierFromNode,
 	type TreeSchema,
 	type ValidateRecursiveSchemaTemplate,
 	type FixRecursiveRecursionLimit,
@@ -188,31 +184,28 @@ export {
 } from "./schemaTypes.js";
 export { getTreeNodeForField } from "./getTreeNodeForField.js";
 export {
-	TreeArrayNode,
+	type ArrayNodeCustomizableSchema,
+	type ArrayNodePojoEmulationSchema,
+	ArrayNodeSchema,
+	isArrayNodeSchema,
 	IterableTreeArrayContent,
 	type ReadonlyArrayNode,
-} from "./arrayNode.js";
-export type {
-	ArrayNodeCustomizableSchema,
-	ArrayNodePojoEmulationSchema,
-} from "./arrayNodeTypes.js";
-export { ArrayNodeSchema, isArrayNodeSchema } from "./arrayNodeTypes.js";
-export type {
-	MapNodeCustomizableSchema,
-	MapNodePojoEmulationSchema,
-} from "./mapNodeTypes.js";
-export { MapNodeSchema, isMapNodeSchema } from "./mapNodeTypes.js";
-export {
+	TreeArrayNode,
+	type MapNodeCustomizableSchema,
+	type MapNodePojoEmulationSchema,
+	MapNodeSchema,
+	isMapNodeSchema,
+	type TreeMapNode,
+	type MapNodeInsertableData,
 	type FieldHasDefault,
 	type InsertableObjectFromSchemaRecord,
 	type ObjectFromSchemaRecord,
+	ObjectNodeSchema,
 	type InsertableObjectFromAnnotatedSchemaRecord,
 	type TreeObjectNode,
 	setField,
 	createUnknownOptionalFieldPolicy,
-} from "./objectNode.js";
-export { ObjectNodeSchema } from "./objectNodeTypes.js";
-export type { TreeMapNode, MapNodeInsertableData } from "./mapNode.js";
+} from "./node-kinds/index.js";
 export {
 	mapTreeFromNodeData,
 	type InsertableContent,

package/src/simple-tree/leafNodeSchema.ts

@@ -11,6 +11,7 @@ import {
 	isFlexTreeNode,
 	valueSchemaAllows,
 } from "../feature-libraries/index.js";
+
 import { NodeKind, type TreeNodeSchema, type TreeNodeSchemaNonClass } from "./core/index.js";
 import type { NodeSchemaMetadata, TreeLeafValue } from "./schemaTypes.js";
 import type { SimpleLeafNodeSchema } from "./simpleSchema.js";

package/src/simple-tree/{arrayNode.ts → node-kinds/array/arrayNode.ts}

@@ -6,12 +6,12 @@
 import { Lazy, oob, fail } from "@fluidframework/core-utils/internal";
 import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
-import { EmptyKey, type ExclusiveMapTree } from "../core/index.js";
+import { EmptyKey, type ExclusiveMapTree } from "../../../core/index.js";
 import {
 	type FlexTreeNode,
 	type FlexTreeSequenceField,
 	isFlexTreeNode,
-} from "../feature-libraries/index.js";
+} from "../../../feature-libraries/index.js";
 import {
 	normalizeAllowedTypes,
 	unannotateImplicitAllowedTypes,
@@ -22,7 +22,7 @@ import {
 	type TreeLeafValue,
 	type TreeNodeFromImplicitAllowedTypes,
 	type UnannotateImplicitAllowedTypes,
-} from "./schemaTypes.js";
+} from "../../schemaTypes.js";
 import {
 	type WithType,
 	// eslint-disable-next-line import/no-deprecated
@@ -37,17 +37,17 @@ import {
 	getSimpleNodeSchemaFromInnerNode,
 	getOrCreateInnerNode,
 	type TreeNodeSchemaClass,
-} from "./core/index.js";
-import { type InsertableContent, mapTreeFromNodeData } from "./toMapTree.js";
-import { prepareArrayContentForInsertion } from "./prepareForInsertion.js";
+} from "../../core/index.js";
+import { type InsertableContent, mapTreeFromNodeData } from "../../toMapTree.js";
+import { prepareArrayContentForInsertion } from "../../prepareForInsertion.js";
 import {
 	getKernel,
 	UnhydratedFlexTreeNode,
 	UnhydratedTreeSequenceField,
-} from "./core/index.js";
-import { TreeNodeValid, type MostDerivedData } from "./treeNodeValid.js";
-import { getUnhydratedContext } from "./createContext.js";
-import type { System_Unsafe } from "./api/index.js";
+} from "../../core/index.js";
+import { TreeNodeValid, type MostDerivedData } from "../../treeNodeValid.js";
+import { getUnhydratedContext } from "../../createContext.js";
+import type { System_Unsafe } from "../../api/index.js";
 import type {
 	ArrayNodeCustomizableSchema,
 	ArrayNodePojoEmulationSchema,

package/src/simple-tree/{arrayNodeTypes.ts → node-kinds/array/arrayNodeTypes.ts}

@@ -8,16 +8,16 @@ import type {
 	ImplicitAnnotatedAllowedTypes,
 	InsertableTreeNodeFromImplicitAllowedTypes,
 	UnannotateImplicitAllowedTypes,
-} from "./schemaTypes.js";
+} from "../../schemaTypes.js";
 import {
 	NodeKind,
 	type TreeNodeSchemaClass,
 	type TreeNodeSchema,
 	type TreeNodeSchemaNonClass,
 	type WithType,
-} from "./core/index.js";
+} from "../../core/index.js";
 
-import type { SimpleArrayNodeSchema } from "./simpleSchema.js";
+import type { SimpleArrayNodeSchema } from "../../simpleSchema.js";
 
 /**
  * A schema for customizable {@link (TreeArrayNode:interface)}s.

package/src/simple-tree/node-kinds/array/index.ts

@@ -0,0 +1,18 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+export {
+	arraySchema,
+	asIndex,
+	IterableTreeArrayContent,
+	TreeArrayNode,
+	type ReadonlyArrayNode,
+} from "./arrayNode.js";
+export {
+	type ArrayNodeCustomizableSchema,
+	type ArrayNodePojoEmulationSchema,
+	ArrayNodeSchema,
+	isArrayNodeSchema,
+} from "./arrayNodeTypes.js";

package/src/simple-tree/node-kinds/index.ts

@@ -0,0 +1,40 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+export {
+	type ArrayNodeCustomizableSchema,
+	type ArrayNodePojoEmulationSchema,
+	ArrayNodeSchema,
+	arraySchema,
+	asIndex,
+	isArrayNodeSchema,
+	IterableTreeArrayContent,
+	TreeArrayNode,
+	type ReadonlyArrayNode,
+} from "./array/index.js";
+
+export {
+	isMapNodeSchema,
+	type MapNodeCustomizableSchema,
+	type MapNodeInsertableData,
+	type MapNodePojoEmulationSchema,
+	MapNodeSchema,
+	mapSchema,
+	type TreeMapNode,
+} from "./map/index.js";
+
+export {
+	createUnknownOptionalFieldPolicy,
+	type FieldHasDefault,
+	type InsertableObjectFromAnnotatedSchemaRecord,
+	type InsertableObjectFromSchemaRecord,
+	isObjectNodeSchema,
+	lazilyAllocateIdentifier,
+	type ObjectFromSchemaRecord,
+	ObjectNodeSchema,
+	objectSchema,
+	setField,
+	type TreeObjectNode,
+} from "./object/index.js";

package/src/simple-tree/node-kinds/map/index.ts

@@ -0,0 +1,16 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+export {
+	type MapNodeInsertableData,
+	mapSchema,
+	type TreeMapNode,
+} from "./mapNode.js";
+export {
+	isMapNodeSchema,
+	type MapNodeCustomizableSchema,
+	type MapNodePojoEmulationSchema,
+	MapNodeSchema,
+} from "./mapNodeTypes.js";

package/src/simple-tree/{mapNode.ts → node-kinds/map/mapNode.ts}

@@ -8,8 +8,8 @@ import type {
 	FlexTreeNode,
 	FlexTreeOptionalField,
 	OptionalFieldEditBuilder,
-} from "../feature-libraries/index.js";
-import { getTreeNodeForField } from "./getTreeNodeForField.js";
+} from "../../../feature-libraries/index.js";
+import { getTreeNodeForField } from "../../getTreeNodeForField.js";
 import {
 	createFieldSchema,
 	FieldKind,
@@ -21,7 +21,7 @@ import {
 	type NodeSchemaMetadata,
 	type TreeNodeFromImplicitAllowedTypes,
 	type UnannotateImplicitAllowedTypes,
-} from "./schemaTypes.js";
+} from "../../schemaTypes.js";
 import {
 	getKernel,
 	type InnerNode,
@@ -35,17 +35,17 @@ import {
 	UnhydratedFlexTreeNode,
 	getOrCreateInnerNode,
 	type InternalTreeNode,
-} from "./core/index.js";
+} from "../../core/index.js";
 import {
 	mapTreeFromNodeData,
 	type FactoryContent,
 	type InsertableContent,
-} from "./toMapTree.js";
-import { prepareForInsertion } from "./prepareForInsertion.js";
-import { brand, count, type RestrictiveStringRecord } from "../util/index.js";
-import { TreeNodeValid, type MostDerivedData } from "./treeNodeValid.js";
-import type { ExclusiveMapTree } from "../core/index.js";
-import { getUnhydratedContext } from "./createContext.js";
+} from "../../toMapTree.js";
+import { prepareForInsertion } from "../../prepareForInsertion.js";
+import { brand, count, type RestrictiveStringRecord } from "../../../util/index.js";
+import { TreeNodeValid, type MostDerivedData } from "../../treeNodeValid.js";
+import type { ExclusiveMapTree } from "../../../core/index.js";
+import { getUnhydratedContext } from "../../createContext.js";
 import type { MapNodeCustomizableSchema, MapNodePojoEmulationSchema } from "./mapNodeTypes.js";
 
 /**

package/src/simple-tree/{mapNodeTypes.ts → node-kinds/map/mapNodeTypes.ts}

@@ -7,16 +7,16 @@ import type { MapNodeInsertableData, TreeMapNode } from "./mapNode.js";
 import type {
 	ImplicitAnnotatedAllowedTypes,
 	UnannotateImplicitAllowedTypes,
-} from "./schemaTypes.js";
+} from "../../schemaTypes.js";
 import {
 	NodeKind,
 	type TreeNodeSchemaClass,
 	type TreeNodeSchema,
 	type TreeNodeSchemaNonClass,
 	type WithType,
-} from "./core/index.js";
+} from "../../core/index.js";
 
-import type { SimpleMapNodeSchema } from "./simpleSchema.js";
+import type { SimpleMapNodeSchema } from "../../simpleSchema.js";
 
 /**
  * A schema for customizable {@link (TreeMapNode:interface)}s.