@fluidframework/tree 2.4.0 → 2.5.0-302463

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/tree",
-  "version": "2.4.0",
+  "version": "2.5.0-302463",
   "description": "Distributed tree",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -89,17 +89,17 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "~2.4.0",
-    "@fluidframework/container-runtime": "~2.4.0",
-    "@fluidframework/core-interfaces": "~2.4.0",
-    "@fluidframework/core-utils": "~2.4.0",
-    "@fluidframework/datastore-definitions": "~2.4.0",
-    "@fluidframework/driver-definitions": "~2.4.0",
-    "@fluidframework/id-compressor": "~2.4.0",
-    "@fluidframework/runtime-definitions": "~2.4.0",
-    "@fluidframework/runtime-utils": "~2.4.0",
-    "@fluidframework/shared-object-base": "~2.4.0",
-    "@fluidframework/telemetry-utils": "~2.4.0",
+    "@fluid-internal/client-utils": "2.5.0-302463",
+    "@fluidframework/container-runtime": "2.5.0-302463",
+    "@fluidframework/core-interfaces": "2.5.0-302463",
+    "@fluidframework/core-utils": "2.5.0-302463",
+    "@fluidframework/datastore-definitions": "2.5.0-302463",
+    "@fluidframework/driver-definitions": "2.5.0-302463",
+    "@fluidframework/id-compressor": "2.5.0-302463",
+    "@fluidframework/runtime-definitions": "2.5.0-302463",
+    "@fluidframework/runtime-utils": "2.5.0-302463",
+    "@fluidframework/shared-object-base": "2.5.0-302463",
+    "@fluidframework/telemetry-utils": "2.5.0-302463",
     "@sinclair/typebox": "^0.32.29",
     "@tylerbu/sorted-btree-es6": "^1.8.0",
     "@ungap/structured-clone": "^1.2.0",
@@ -107,21 +107,21 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.16.4",
-    "@biomejs/biome": "~1.8.3",
-    "@fluid-internal/mocha-test-setup": "~2.4.0",
-    "@fluid-private/stochastic-test-utils": "~2.4.0",
-    "@fluid-private/test-dds-utils": "~2.4.0",
-    "@fluid-private/test-drivers": "~2.4.0",
+    "@biomejs/biome": "~1.9.3",
+    "@fluid-internal/mocha-test-setup": "2.5.0-302463",
+    "@fluid-private/stochastic-test-utils": "2.5.0-302463",
+    "@fluid-private/test-dds-utils": "2.5.0-302463",
+    "@fluid-private/test-drivers": "2.5.0-302463",
     "@fluid-tools/benchmark": "^0.50.0",
-    "@fluid-tools/build-cli": "^0.48.0",
+    "@fluid-tools/build-cli": "^0.49.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.48.0",
-    "@fluidframework/container-definitions": "~2.4.0",
-    "@fluidframework/container-loader": "~2.4.0",
+    "@fluidframework/build-tools": "^0.49.0",
+    "@fluidframework/container-definitions": "2.5.0-302463",
+    "@fluidframework/container-loader": "2.5.0-302463",
     "@fluidframework/eslint-config-fluid": "^5.4.0",
-    "@fluidframework/test-runtime-utils": "~2.4.0",
-    "@fluidframework/test-utils": "~2.4.0",
-    "@fluidframework/tree-previous": "npm:@fluidframework/tree@~2.3.0",
+    "@fluidframework/test-runtime-utils": "2.5.0-302463",
+    "@fluidframework/test-utils": "2.5.0-302463",
+    "@fluidframework/tree-previous": "npm:@fluidframework/tree@~2.4.0",
     "@microsoft/api-extractor": "7.47.8",
     "@types/diff": "^3.5.1",
     "@types/easy-table": "^0.0.32",
@@ -164,22 +164,38 @@
   },
   "typeValidation": {
     "broken": {
-      "TypeAlias_MapNodeInsertableData": {
-        "backCompat": false
+      "TypeAlias_InsertableTreeFieldFromImplicitField": {
+        "backCompat": false,
+        "forwardCompat": false
       },
-      "Interface_InternalTypes_TreeNodeSchemaNonClass": {
+      "Interface_TreeArrayNode": {
         "backCompat": false
       },
-      "Interface_FieldSchemaUnsafe": {
+      "TypeAlias_InsertableTreeNodeFromImplicitAllowedTypes": {
+        "backCompat": false,
         "forwardCompat": false
       },
-      "Interface_ITreeViewConfiguration": {
-        "forwardCompat": false
+      "TypeAlias_NodeFromSchema": {
+        "backCompat": false
+      },
+      "TypeAlias_TreeFieldFromImplicitField": {
+        "backCompat": false
+      },
+      "TypeAlias_TreeNodeFromImplicitAllowedTypes": {
+        "backCompat": false
+      },
+      "TypeAlias_InternalTypes_ApplyKind": {
+        "forwardCompat": false,
+        "backCompat": false
+      },
+      "TypeAlias_InternalTypes_InsertableObjectFromSchemaRecord": {
+        "forwardCompat": false,
+        "backCompat": false
       },
-      "TypeAlias_ImplicitFieldSchema": {
+      "TypeAlias_InsertableTreeFieldFromImplicitFieldUnsafe": {
         "forwardCompat": false
       },
-      "TypeAlias_ImplicitAllowedTypes": {
+      "TypeAlias_InternalTypes_InsertableTreeFieldFromImplicitFieldUnsafe": {
         "forwardCompat": false
       }
     },

package/src/events/interop.ts

@@ -5,21 +5,10 @@
 
 import type { IEvent } from "@fluidframework/core-interfaces";
 import type { Listeners } from "./listeners.js";
+import type { UnionToIntersection } from "../util/index.js";
 
 // TODO: this file is currently unused. Use it or remove it.
 
-/**
- * Convert a union of types to an intersection of those types. Useful for `TransformEvents`.
- * @privateRemarks
- * First an always true extends clause is used (T extends T) to distribute T into to a union of types contravariant over each member of the T union.
- * Then the constraint on the type parameter in this new context is inferred, giving the intersection.
- */
-export type UnionToIntersection<T> = (T extends T ? (k: T) => unknown : never) extends (
-	k: infer U,
-) => unknown
-	? U
-	: never;
-
 /**
  * Converts a {@link Listeners} type (i.e. the event registry for a {@link Listenable}) into a type consumable
  * by an IEventProvider from `@fluidframework/core-interfaces`.

package/src/feature-libraries/chunked-forest/basicChunk.ts

@@ -253,7 +253,7 @@ export class BasicChunkCursor extends SynchronousCursor implements ChunkedCursor
 		return {
 			field:
 				this.indexStack.length === 1
-					? prefix?.rootFieldOverride ?? this.getFieldKey()
+					? (prefix?.rootFieldOverride ?? this.getFieldKey())
 					: this.getFieldKey(),
 			parent: this.getOffsetPath(1, prefix),
 		};

package/src/feature-libraries/chunked-forest/uniformChunk.ts

@@ -533,7 +533,7 @@ class Cursor extends SynchronousCursor implements ChunkedCursor {
 		this.indexOfField =
 			fieldInfo === undefined
 				? fieldMap.size
-				: fieldInfo.indexOfParentField ?? fail("children should have parents");
+				: (fieldInfo.indexOfParentField ?? fail("children should have parents"));
 		this.fieldKey = key;
 		this.mode = CursorLocationType.Fields;
 	}

package/src/feature-libraries/object-forest/objectForest.ts

@@ -140,7 +140,7 @@ export class ObjectForest implements IEditableForest {
 			);
 			if (this.currentCursors.size > 1) {
 				const unexpectedSources = [...this.currentCursors].flatMap((c) =>
-					c === cursor ? [] : c.source ?? null,
+					c === cursor ? [] : (c.source ?? null),
 				);
 
 				throw new Error(

package/src/feature-libraries/treeCursorUtils.ts

@@ -194,7 +194,7 @@ class StackCursor<TNode> extends SynchronousCursor implements CursorWithNode<TNo
 		return {
 			field:
 				this.indexStack.length === 1
-					? prefix?.rootFieldOverride ?? this.getFieldKey()
+					? (prefix?.rootFieldOverride ?? this.getFieldKey())
 					: this.getFieldKey(),
 			parent: this.getOffsetPath(1, prefix),
 		};
@@ -427,7 +427,7 @@ export function prefixFieldPath(
 		return path;
 	}
 	return {
-		field: path.parent === undefined ? prefix.rootFieldOverride ?? path.field : path.field,
+		field: path.parent === undefined ? (prefix.rootFieldOverride ?? path.field) : path.field,
 		parent: prefixPath(prefix, path.parent),
 	};
 }

package/src/index.ts

@@ -114,6 +114,8 @@ export {
 	type InsertableObjectFromSchemaRecordUnsafe,
 	type InsertableTreeFieldFromImplicitFieldUnsafe,
 	type FieldSchemaUnsafe,
+	type TreeNodeSchemaClassUnsafe,
+	type InsertableTreeNodeFromAllowedTypesUnsafe,
 	// System types (not in Internal types for various reasons, like doc links or cannot be named errors).
 	type typeSchemaSymbol,
 	type TreeNodeSchemaNonClass,
@@ -124,7 +126,13 @@ export {
 	adaptEnum,
 	enumFromStrings,
 	singletonSchema,
-	typedObjectValues,
+	type UnsafeUnknownSchema,
+	type TreeViewAlpha,
+	type InsertableField,
+	type Insertable,
+	type InsertableContent,
+	type FactoryContent,
+	type FactoryContentObject,
 	// test recursive schema for checking that d.ts files handles schema correctly
 	test_RecursiveObject,
 	test_RecursiveObject_base,
@@ -151,6 +159,9 @@ export {
 	getJsonSchema,
 	type LazyItem,
 	type Unenforced,
+	type ReadonlyArrayNode,
+	type InsertableTreeNodeFromAllowedTypes,
+	type Input,
 } from "./simple-tree/index.js";
 export {
 	SharedTree,
@@ -171,6 +182,10 @@ export {
 	type RestrictiveReadonlyRecord,
 	type RestrictiveStringRecord,
 	type MakeNominal,
+	type IsUnion,
+	type UnionToIntersection,
+	type UnionToTuple,
+	type PopUnion,
 } from "./util/index.js";
 
 import * as InternalTypes from "./internalTypes.js";

package/src/internalTypes.ts

@@ -10,6 +10,7 @@
 export type { _InlineTrick, FlattenKeys } from "./util/index.js";
 export type {
 	ApplyKind,
+	ApplyKindInput,
 	NodeBuilderData,
 	FieldHasDefault,
 	TreeArrayNodeBase,
@@ -33,6 +34,9 @@ export type {
 	NodeBuilderDataUnsafe,
 	NodeFromSchemaUnsafe,
 	ReadonlyMapInlined,
+	TreeNodeSchemaUnsafe,
+	AllowedTypesUnsafe,
+	TreeNodeSchemaNonClassUnsafe,
 } from "./simple-tree/index.js";
 export type { FlexList, FlexListToUnion, ExtractItemType } from "./simple-tree/index.js";
 

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/tree";
-export const pkgVersion = "2.4.0";
+export const pkgVersion = "2.5.0-302463";

package/src/shared-tree/schematizingTreeView.ts

@@ -144,7 +144,7 @@ export class SchematizingSimpleTreeView<in out TRootSchema extends ImplicitField
 
 		this.runSchemaEdit(() => {
 			const mapTree = mapTreeFromNodeData(
-				content as InsertableContent,
+				content as InsertableContent | undefined,
 				this.rootFieldSchema,
 				this.nodeKeyManager,
 				{
@@ -359,7 +359,11 @@ export class SchematizingSimpleTreeView<in out TRootSchema extends ImplicitField
 			);
 		}
 		const view = this.getView();
-		setField(view.context.root, this.rootFieldSchema, newRoot as InsertableContent);
+		setField(
+			view.context.root,
+			this.rootFieldSchema,
+			newRoot as InsertableContent | undefined,
+		);
 	}
 }
 

package/src/shared-tree/sharedTree.ts

@@ -353,8 +353,10 @@ export function getBranch(tree: ITree): TreeBranch;
  * but it (or something like it) is necessary in the meantime to prevent the alpha types from being exposed as public.
  * @alpha
  */
-export function getBranch(view: TreeView<ImplicitFieldSchema>): TreeBranch;
-export function getBranch(treeOrView: ITree | TreeView<ImplicitFieldSchema>): TreeBranch {
+export function getBranch<T extends ImplicitFieldSchema>(view: TreeView<T>): TreeBranch;
+export function getBranch<T extends ImplicitFieldSchema>(
+	treeOrView: ITree | TreeView<T>,
+): TreeBranch {
 	assert(
 		treeOrView instanceof SharedTree || treeOrView instanceof SchematizingSimpleTreeView,
 		0xa48 /* Unsupported implementation */,

package/src/shared-tree/treeApi.ts

@@ -78,7 +78,10 @@ export interface RunTransaction {
 	 * If the transaction function throws an error then the transaction will be automatically rolled back (discarding any changes made to the tree so far) before the error is propagated up from this function.
 	 * If the transaction is rolled back, a corresponding change event will also be emitted for the rollback.
 	 */
-	<TView extends TreeView<ImplicitFieldSchema>, TResult>(
+	// TODO: TreeView is invariant over the schema, so to accept any view, `any` is the only real option unless a non generic (or covariant) base type for view is introduced (which is planned).
+	// This use of any is actually type safe as it is only used as a constraint, and the actual strongly typed view (TView) is passed to the callback.
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	<TView extends TreeView<any>, TResult>(
 		tree: TView,
 		transaction: (root: TView["root"]) => TResult,
 	): TResult;
@@ -123,7 +126,9 @@ export interface RunTransaction {
 	 * If the transaction function throws an error then the transaction will be automatically rolled back (discarding any changes made to the tree so far) before the error is propagated up from this function.
 	 * If the transaction is rolled back (whether by an error or by returning the {@link RunTransaction.rollback} | rollback value), a corresponding change event will also be emitted for the rollback.
 	 */
-	<TView extends TreeView<ImplicitFieldSchema>, TResult>(
+	// See comment on previous overload about use of any here.
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	<TView extends TreeView<any>, TResult>(
 		tree: TView,
 		transaction: (root: TView["root"]) => TResult | typeof rollback,
 	): TResult | typeof rollback;
@@ -161,10 +166,9 @@ export interface RunTransaction {
 	 * If the transaction function throws an error then the transaction will be automatically rolled back (discarding any changes made to the tree so far) before the error is propagated up from this function.
 	 * If the transaction is rolled back, a corresponding change event will also be emitted for the rollback.
 	 */
-	<TView extends TreeView<ImplicitFieldSchema>>(
-		tree: TView,
-		transaction: (root: TView["root"]) => void,
-	): void;
+	// See comment on previous overload about use of any here.
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	<TView extends TreeView<any>>(tree: TView, transaction: (root: TView["root"]) => void): void;
 	/**
 	 * Apply one or more edits to the tree as a single atomic unit.
 	 * @param node - The node that will be passed to `transaction`.
@@ -211,7 +215,9 @@ export interface RunTransaction {
 	 * If the transaction function throws an error then the transaction will be automatically rolled back (discarding any changes made to the tree so far) before the error is propagated up from this function.
 	 * If the transaction is rolled back, a corresponding change event will also be emitted for the rollback.
 	 */
-	<TView extends TreeView<ImplicitFieldSchema>, TResult>(
+	// See comment on previous overload about use of any here.
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	<TView extends TreeView<any>, TResult>(
 		tree: TView,
 		transaction: (root: TView["root"]) => TResult,
 		preconditions?: readonly TransactionConstraint[],
@@ -264,7 +270,9 @@ export interface RunTransaction {
 	 * If the transaction function throws an error then the transaction will be automatically rolled back (discarding any changes made to the tree so far) before the error is propagated up from this function.
 	 * If the transaction is rolled back (whether by an error or by returning the {@link RunTransaction.rollback} | rollback value), a corresponding change event will also be emitted for the rollback.
 	 */
-	<TView extends TreeView<ImplicitFieldSchema>, TResult>(
+	// See comment on previous overload about use of any here.
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	<TView extends TreeView<any>, TResult>(
 		tree: TView,
 		transaction: (root: TView["root"]) => TResult | typeof rollback,
 		preconditions?: readonly TransactionConstraint[],
@@ -313,7 +321,9 @@ export interface RunTransaction {
 	 * If the transaction function throws an error then the transaction will be automatically rolled back (discarding any changes made to the tree so far) before the error is propagated up from this function.
 	 * If the transaction is rolled back, a corresponding change event will also be emitted for the rollback.
 	 */
-	<TView extends TreeView<ImplicitFieldSchema>>(
+	// See comment on previous overload about use of any here.
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	<TView extends TreeView<any>>(
 		tree: TView,
 		transaction: (root: TView["root"]) => void,
 		preconditions?: readonly TransactionConstraint[],

package/src/shared-tree/treeCheckout.ts

@@ -516,6 +516,8 @@ export class TreeCheckout implements ITreeCheckoutFork {
 					event.type === "append" ||
 					(event.type === "replace" && getChangeReplaceType(event) === "transactionCommit")
 				) {
+					// TODO:#20949: When the SharedTree is detached, these commits will already have been garbage collected.
+					//       Figure out a way to generate revertibles before the commits are garbage collected.
 					for (const commit of event.newCommits) {
 						const kind = event.type === "append" ? event.kind : CommitKind.Default;
 						const { change, revision } = commit;

package/src/shared-tree-core/editManager.ts

@@ -53,6 +53,14 @@ const minimumPossibleSequenceId: SequenceId = {
 	sequenceNumber: minimumPossibleSequenceNumber,
 };
 
+/**
+ * A special revision tag for the initial {@link EditManager.trunkBase} commit.
+ * @remarks This tag is used to supply the _initial_ trunk base with a known revision.
+ * The trunk base may advance over time, after which point the trunk base will have a different revision.
+ * When {@link EditManager.getSummaryData | serializing} and deserializing, peer branches that include the trunk base commit in their history will always use this tag.
+ */
+const rootRevision = "root" as const satisfies RevisionTag;
+
 /**
  * Max number of telemetry log call that may be aggregated before being sent.
  */
@@ -152,7 +160,7 @@ export class EditManager<
 		logger?: ITelemetryLoggerExt,
 	) {
 		this.trunkBase = {
-			revision: "root",
+			revision: rootRevision,
 			change: changeFamily.rebaser.compose([]),
 		};
 		this.sequenceMap.set(minimumPossibleSequenceId, this.trunkBase);
@@ -363,11 +371,6 @@ export class EditManager<
 				newTrunkBase,
 				this.trunkBase,
 			).map((c) => c.revision);
-			// Copying the revision of the old trunk base into the new trunk base means we don't need to write out the original
-			// revision to summaries. All clients agree that the trunk base always has the same hardcoded revision.
-			newTrunkBase.revision = this.trunkBase.revision;
-			// Overwriting the change is not strictly necessary, but done here for consistency (so all trunk bases are deeply equal).
-			newTrunkBase.change = this.trunkBase.change;
 			// Dropping the parent field removes (transitively) all references to the evicted commits so they can be garbage collected.
 			delete newTrunkBase.parent;
 			this.trunkBase = newTrunkBase;
@@ -442,6 +445,7 @@ export class EditManager<
 
 		const trunk = getPathFromBase(this.trunk.getHead(), oldestCommitInCollabWindow).map(
 			(c) => {
+				assert(c !== this.trunkBase, "Serialized trunk should not include the trunk base");
 				const metadata =
 					this.trunkMetadata.get(c.revision) ?? fail("Expected metadata for trunk commit");
 				const commit: SequencedCommit<TChangeset> = {
@@ -464,11 +468,16 @@ export class EditManager<
 					findCommonAncestor([branch.getHead(), branchPath], this.trunk.getHead()) ??
 					fail("Expected branch to be based on trunk");
 
+				const base = ancestor === this.trunkBase ? rootRevision : ancestor.revision;
 				return [
 					sessionId,
 					{
-						base: ancestor.revision,
+						base,
 						commits: branchPath.map((c) => {
+							assert(
+								c !== this.trunkBase,
+								"Serialized branch should not include the trunk base",
+							);
 							const commit: Commit<TChangeset> = {
 								change: c.change,
 								revision: c.revision,

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

@@ -10,10 +10,11 @@ import type { ITreeCursorSynchronous, SchemaAndPolicy } from "../../core/index.j
 import type {
 	TreeLeafValue,
 	ImplicitFieldSchema,
-	InsertableTreeFieldFromImplicitField,
 	TreeFieldFromImplicitField,
 	FieldSchema,
 	FieldKind,
+	UnsafeUnknownSchema,
+	InsertableField,
 } from "../schemaTypes.js";
 import {
 	getOrCreateNodeFromInnerNode,
@@ -29,7 +30,7 @@ import {
 } from "../../feature-libraries/index.js";
 import { isFieldInSchema } from "../../feature-libraries/index.js";
 import { toStoredSchema } from "../toFlexSchema.js";
-import { inSchemaOrThrow, mapTreeFromNodeData, type InsertableContent } from "../toMapTree.js";
+import { inSchemaOrThrow, mapTreeFromNodeData } from "../toMapTree.js";
 import {
 	applySchemaToParserOptions,
 	cursorFromVerbose,
@@ -55,7 +56,7 @@ import { getUnhydratedContext } from "../createContext.js";
  */
 export function createFromInsertable<TSchema extends ImplicitFieldSchema>(
 	schema: TSchema,
-	data: InsertableTreeFieldFromImplicitField<TSchema>,
+	data: InsertableField<TSchema>,
 	context?: NodeKeyManager | undefined,
 ): Unhydrated<TreeFieldFromImplicitField<TSchema>> {
 	const cursor = cursorFromInsertable(schema, data, context);
@@ -72,9 +73,13 @@ export function createFromInsertable<TSchema extends ImplicitFieldSchema>(
  * this is the same as invoking its constructor except that an unhydrated node can also be provided and the returned value is a cursor.
  * When `undefined` is provided (for an optional field), `undefined` is returned.
  */
-export function cursorFromInsertable<TSchema extends ImplicitFieldSchema>(
-	schema: TSchema,
-	data: InsertableTreeFieldFromImplicitField<TSchema>,
+export function cursorFromInsertable<
+	TSchema extends ImplicitFieldSchema | UnsafeUnknownSchema,
+>(
+	schema: UnsafeUnknownSchema extends TSchema
+		? ImplicitFieldSchema
+		: TSchema & ImplicitFieldSchema,
+	data: InsertableField<TSchema>,
 	context?: NodeKeyManager | undefined,
 ):
 	| ITreeCursorSynchronous
@@ -87,7 +92,7 @@ export function cursorFromInsertable<TSchema extends ImplicitFieldSchema>(
 	};
 
 	const mapTree = mapTreeFromNodeData(
-		data as InsertableContent | undefined,
+		data as InsertableField<UnsafeUnknownSchema>,
 		schema,
 		context,
 		schemaValidationPolicy,

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

@@ -102,8 +102,8 @@ export function customFromCursorInner<TChild, THandle>(
 						const storedKey = reader.getFieldKey();
 						const key =
 							isObjectNodeSchema(nodeSchema) && !options.useStoredKeys
-								? nodeSchema.storedKeyToPropertyKey.get(storedKey) ??
-									fail("missing property key")
+								? (nodeSchema.storedKeyToPropertyKey.get(storedKey) ??
+									fail("missing property key"))
 								: storedKey;
 						// Length is checked above.
 						// eslint-disable-next-line @typescript-eslint/no-non-null-assertion

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

@@ -12,6 +12,7 @@ export {
 	type ITreeViewConfiguration,
 	type SchemaCompatibilityStatus,
 	type ITreeConfigurationOptions,
+	type TreeViewAlpha,
 } from "./tree.js";
 export { SchemaFactory, type ScopedSchemaName } from "./schemaFactory.js";
 export type {
@@ -22,7 +23,6 @@ export {
 	adaptEnum,
 	enumFromStrings,
 	singletonSchema,
-	typedObjectValues,
 } from "./schemaCreationUtilities.js";
 export { treeNodeApi, type TreeNodeApi } from "./treeNodeApi.js";
 export { createFromInsertable, cursorFromInsertable } from "./create.js";
@@ -62,6 +62,11 @@ export type {
 	NodeBuilderDataUnsafe,
 	NodeFromSchemaUnsafe,
 	ReadonlyMapInlined,
+	TreeNodeSchemaClassUnsafe,
+	TreeNodeSchemaUnsafe,
+	AllowedTypesUnsafe,
+	TreeNodeSchemaNonClassUnsafe,
+	InsertableTreeNodeFromAllowedTypesUnsafe,
 } from "./typesUnsafe.js";
 
 export type {