@fluidframework/tree 2.41.0-337492 → 2.41.0-338401

package/src/core/change-family/editBuilder.ts

@@ -4,6 +4,7 @@
  */
 
 import type { TaggedChange } from "../rebase/index.js";
+
 import type { ChangeFamily, ChangeFamilyEditor } from "./changeFamily.js";
 
 export abstract class EditBuilder<TChange> implements ChangeFamilyEditor {

package/src/core/forest/forest.ts

@@ -3,9 +3,9 @@
  * Licensed under the MIT License.
  */
 
+import type { Listenable } from "@fluidframework/core-interfaces/internal";
 import { assert } from "@fluidframework/core-utils/internal";
 
-import type { Listenable } from "@fluidframework/core-interfaces/internal";
 import type { FieldKey, TreeStoredSchemaSubscription } from "../schema-stored/index.js";
 import {
 	type Anchor,

package/src/core/schema-stored/schema.ts

@@ -4,8 +4,10 @@
  */
 
 import { fail } from "@fluidframework/core-utils/internal";
+
 import { DiscriminatedUnionDispatcher } from "../../codec/index.js";
 import { type MakeNominal, brand, invertMap } from "../../util/index.js";
+
 import {
 	type FieldKey,
 	type FieldKindIdentifier,

package/src/core/schema-stored/storedSchemaRepository.ts

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 
+import { createEmitter } from "@fluid-internal/client-utils";
+import type { Listenable } from "@fluidframework/core-interfaces/internal";
 import { BTree } from "@tylerbu/sorted-btree-es6";
 
-import type { Listenable } from "@fluidframework/core-interfaces/internal";
-import { createEmitter } from "@fluid-internal/client-utils";
 import { compareStrings } from "../../util/index.js";
 
 import type { TreeNodeSchemaIdentifier } from "./formatV1.js";

package/src/core/tree/anchorSet.ts

@@ -5,10 +5,10 @@
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
+import { createEmitter } from "@fluid-internal/client-utils";
+import type { Listenable } from "@fluidframework/core-interfaces/internal";
 import { assert, fail } from "@fluidframework/core-utils/internal";
 
-import type { Listenable } from "@fluidframework/core-interfaces/internal";
-import { createEmitter } from "@fluid-internal/client-utils";
 import {
 	type Brand,
 	type BrandedKey,
@@ -22,7 +22,9 @@ import {
 } from "../../util/index.js";
 import type { FieldKey } from "../schema-stored/index.js";
 
+import type { ITreeCursorSynchronous } from "./cursor.js";
 import type * as Delta from "./delta.js";
+import { offsetDetachId } from "./deltaUtil.js";
 import {
 	isDetachedUpPathRoot,
 	type INormalizedUpPath,
@@ -33,8 +35,6 @@ import {
 } from "./pathTree.js";
 import { EmptyKey } from "./types.js";
 import type { DeltaVisitor } from "./visitDelta.js";
-import { offsetDetachId } from "./deltaUtil.js";
-import type { ITreeCursorSynchronous } from "./cursor.js";
 
 /**
  * A way to refer to a particular tree location within an {@link AnchorSet}.

package/src/core/tree/chunk.ts

@@ -7,12 +7,13 @@ import { assert } from "@fluidframework/core-utils/internal";
 
 import type { ReferenceCounted } from "../../util/index.js";
 import type { FieldKey } from "../schema-stored/index.js";
-import { rootFieldKey } from "./types.js";
+
 import {
 	CursorLocationType,
 	type ITreeCursor,
 	type ITreeCursorSynchronous,
 } from "./cursor.js";
+import { rootFieldKey } from "./types.js";
 
 /**
  * Contiguous part of the tree which get stored together in some data format.

package/src/core/tree/delta.ts

@@ -5,6 +5,7 @@
 
 import type { RevisionTag } from "../rebase/index.js";
 import type { FieldKey } from "../schema-stored/index.js";
+
 import type { TreeChunk } from "./chunk.js";
 
 /**

package/src/core/tree/deltaUtil.ts

@@ -5,8 +5,8 @@
 
 import type { Mutable } from "../../util/index.js";
 import type { FieldKey } from "../schema-stored/index.js";
-import type { TreeChunk } from "./chunk.js";
 
+import type { TreeChunk } from "./chunk.js";
 import type { DetachedNodeId, FieldChanges, Root } from "./delta.js";
 import { rootFieldKey } from "./types.js";
 

package/src/core/tree/detachedFieldIndex.ts

@@ -4,6 +4,7 @@
  */
 
 import { assert } from "@fluidframework/core-utils/internal";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 import { type ICodecOptions, type IJsonCodec, noopValidator } from "../../codec/index.js";
 import {
@@ -31,7 +32,6 @@ import type {
 	Major,
 	Minor,
 } from "./detachedFieldIndexTypes.js";
-import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 /**
  * The tree index records detached field IDs and associates them with a change atom ID.

package/src/core/tree/detachedFieldIndexCodec.ts

@@ -4,12 +4,14 @@
  */
 
 import { assert } from "@fluidframework/core-utils/internal";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 import {
 	type ICodecOptions,
 	type IJsonCodec,
 	makeVersionedValidatedCodec,
 } from "../../codec/index.js";
+import { hasSingle } from "../../util/index.js";
 import type { EncodedRevisionTag, RevisionTagCodec, RevisionTag } from "../rebase/index.js";
 
 import {
@@ -23,8 +25,6 @@ import type {
 	DetachedFieldSummaryData,
 	Major,
 } from "./detachedFieldIndexTypes.js";
-import type { IIdCompressor } from "@fluidframework/id-compressor";
-import { hasSingle } from "../../util/index.js";
 
 class MajorCodec implements IJsonCodec<Major> {
 	public constructor(

package/src/core/tree/pathTree.ts

@@ -4,8 +4,8 @@
  */
 
 import type { FieldKey } from "../schema-stored/index.js";
-import type { DetachedNodeId } from "./delta.js";
 
+import type { DetachedNodeId } from "./delta.js";
 import { type DetachedField, keyAsDetachedField } from "./types.js";
 
 /**

package/src/core/tree/treeTextFormat.ts

@@ -4,6 +4,7 @@
  */
 
 import { fail } from "@fluidframework/core-utils/internal";
+
 import type { FieldKey } from "../schema-stored/index.js";
 
 import type { NodeData } from "./types.js";

package/src/core/tree/visitDelta.ts

@@ -6,6 +6,7 @@
 import { assert } from "@fluidframework/core-utils/internal";
 
 import { type NestedMap, setInNestedMap, tryGetFromNestedMap } from "../../util/index.js";
+import type { RevisionTag, TreeChunk } from "../index.js";
 import type { FieldKey } from "../schema-stored/index.js";
 
 import { mapCursorField, type ITreeCursorSynchronous } from "./cursor.js";
@@ -14,7 +15,6 @@ import { areDetachedNodeIdsEqual, offsetDetachId } from "./deltaUtil.js";
 import type { DetachedFieldIndex } from "./detachedFieldIndex.js";
 import type { ForestRootId, Major, Minor } from "./detachedFieldIndexTypes.js";
 import type { NodeIndex, PlaceIndex, Range } from "./pathTree.js";
-import type { RevisionTag, TreeChunk } from "../index.js";
 
 /**
  * Implementation notes:

package/src/core/tree/visitorUtils.ts

@@ -3,18 +3,19 @@
  * Licensed under the MIT License.
  */
 
+import type { IIdCompressor } from "@fluidframework/id-compressor";
+
 import type { ICodecOptions } from "../../codec/index.js";
 import { type IdAllocator, idAllocatorFromMaxId } from "../../util/index.js";
 import type { RevisionTag, RevisionTagCodec } from "../rebase/index.js";
 import type { FieldKey } from "../schema-stored/index.js";
 
+import type { ITreeCursorSynchronous } from "./cursor.js";
 import type { DetachedNodeId, Root } from "./delta.js";
 import { DetachedFieldIndex } from "./detachedFieldIndex.js";
 import type { ForestRootId } from "./detachedFieldIndexTypes.js";
 import type { PlaceIndex, Range } from "./pathTree.js";
 import { type DeltaVisitor, visitDelta } from "./visitDelta.js";
-import type { IIdCompressor } from "@fluidframework/id-compressor";
-import type { ITreeCursorSynchronous } from "./cursor.js";
 
 export function makeDetachedFieldIndex(
 	prefix: string = "Temp",

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

@@ -4,6 +4,7 @@
  */
 
 import { assert, debugAssert, oob, fail } from "@fluidframework/core-utils/internal";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 import {
 	CursorLocationType,
@@ -26,12 +27,11 @@ import {
 } from "../../core/index.js";
 import { getOrCreate } from "../../util/index.js";
 import type { FullSchemaPolicy } from "../modular-schema/index.js";
+import { isStableNodeIdentifier } from "../node-identifier/index.js";
 
 import { BasicChunk } from "./basicChunk.js";
 import { SequenceChunk } from "./sequenceChunk.js";
 import { type FieldShape, TreeShape, UniformChunk } from "./uniformChunk.js";
-import { isStableNodeIdentifier } from "../node-identifier/index.js";
-import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 export interface Disposable {
 	/**

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

@@ -3,9 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { assert, oob, fail } from "@fluidframework/core-utils/internal";
-import type { Listenable } from "@fluidframework/core-interfaces";
 import { createEmitter } from "@fluid-internal/client-utils";
+import type { Listenable } from "@fluidframework/core-interfaces";
+import { assert, oob, fail } from "@fluidframework/core-utils/internal";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 import {
 	type Anchor,
@@ -44,7 +45,6 @@ import {
 
 import { BasicChunk, BasicChunkCursor, type SiblingsOrKey } from "./basicChunk.js";
 import { type IChunker, basicChunkTree, chunkFieldSingle, chunkTree } from "./chunkTree.js";
-import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 function makeRoot(): BasicChunk {
 	return new BasicChunk(aboveRootPlaceholder, new Map());

package/src/feature-libraries/chunked-forest/codec/chunkDecoding.ts

@@ -4,6 +4,11 @@
  */
 
 import { assert, unreachableCase, oob } from "@fluidframework/core-utils/internal";
+import type {
+	IIdCompressor,
+	OpSpaceCompressedId,
+	SessionId,
+} from "@fluidframework/id-compressor";
 
 import { DiscriminatedUnionDispatcher } from "../../../codec/index.js";
 import type {
@@ -42,11 +47,6 @@ import {
 	type EncodedValueShape,
 	SpecialField,
 } from "./format.js";
-import type {
-	IIdCompressor,
-	OpSpaceCompressedId,
-	SessionId,
-} from "@fluidframework/id-compressor";
 
 export interface IdDecodingContext {
 	idCompressor: IIdCompressor;

package/src/feature-libraries/chunked-forest/codec/chunkDecodingGeneric.ts

@@ -6,8 +6,8 @@
 import { assert } from "@fluidframework/core-utils/internal";
 
 import type { DiscriminatedUnionDispatcher } from "../../../codec/index.js";
-import type { BrandedType } from "../../../util/index.js";
 import type { TreeChunk } from "../../../core/index.js";
+import type { BrandedType } from "../../../util/index.js";
 
 import {
 	type ChunkDecoder,
@@ -15,8 +15,8 @@ import {
 	getChecked,
 	readStream,
 } from "./chunkCodecUtilities.js";
-import type { EncodedFieldBatchGeneric, IdentifierOrIndex } from "./formatGeneric.js";
 import type { IdDecodingContext } from "./chunkDecoding.js";
+import type { EncodedFieldBatchGeneric, IdentifierOrIndex } from "./formatGeneric.js";
 
 /**
  * General purpose shape based tree decoder which gets its support for specific shapes from the caller.

package/src/feature-libraries/chunked-forest/codec/chunkEncodingGeneric.ts

@@ -4,6 +4,7 @@
  */
 
 import { fail } from "@fluidframework/core-utils/internal";
+
 import type { TreeValue } from "../../../core/index.js";
 import type { FluidSerializableReadOnly } from "../../valueUtilities.js";
 

package/src/feature-libraries/chunked-forest/codec/codecs.ts

@@ -4,8 +4,10 @@
  */
 
 import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
+import type { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
 
 import {
+	type FluidClientVersion,
 	type ICodecOptions,
 	type IJsonCodec,
 	makeVersionedValidatedCodec,
@@ -19,7 +21,6 @@ import type { FieldBatch } from "./fieldBatch.js";
 import { EncodedFieldBatch, validVersions } from "./format.js";
 import { schemaCompressedEncode } from "./schemaBasedEncode.js";
 import { uncompressedEncode } from "./uncompressedEncode.js";
-import type { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
 
 export interface FieldBatchEncodingContext {
 	readonly encodeType: TreeCompressionStrategy;
@@ -38,6 +39,18 @@ export type FieldBatchCodec = IJsonCodec<
 	FieldBatchEncodingContext
 >;
 
+/**
+ * Get the write version for {@link makeFieldBatchCodec} based on the `oldestCompatibleClient` version.
+ * @privateRemarks
+ * TODO: makeFieldBatchCodec (and makeVersionDispatchingCodec transitively) should bake in this versionToFormat logic and the resulting codec can then support use with FluidClientVersion directly.
+ */
+export function fluidVersionToFieldBatchCodecWriteVersion(
+	oldestCompatibleClient: FluidClientVersion,
+): number {
+	// There is currently on only 1 version.
+	return 1;
+}
+
 export function makeFieldBatchCodec(
 	options: ICodecOptions,
 	writeVersion: number,
@@ -51,6 +64,7 @@ export function makeFieldBatchCodec(
 		0x935 /* Invalid write version for FieldBatch codec */,
 	);
 
+	// TODO: use makeVersionDispatchingCodec to support adding more versions in the future.
 	return makeVersionedValidatedCodec(options, validVersions, EncodedFieldBatch, {
 		encode: (data: FieldBatch, context: FieldBatchEncodingContext): EncodedFieldBatch => {
 			for (const cursor of data) {

package/src/feature-libraries/chunked-forest/codec/compressedEncode.ts

@@ -4,6 +4,7 @@
  */
 
 import { assert, unreachableCase, fail } from "@fluidframework/core-utils/internal";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 import {
 	CursorLocationType,
@@ -34,7 +35,6 @@ import {
 	SpecialField,
 	version,
 } from "./format.js";
-import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 /**
  * Encode data from `FieldBatch` into an `EncodedChunk`.

package/src/feature-libraries/chunked-forest/codec/index.ts

@@ -9,4 +9,5 @@ export {
 	type FieldBatchCodec,
 	makeFieldBatchCodec,
 	type FieldBatchEncodingContext,
+	fluidVersionToFieldBatchCodecWriteVersion,
 } from "./codecs.js";

package/src/feature-libraries/chunked-forest/codec/nodeShape.ts

@@ -4,6 +4,7 @@
  */
 
 import { assert, fail } from "@fluidframework/core-utils/internal";
+import { isStableId } from "@fluidframework/id-compressor/internal";
 
 import {
 	type FieldKey,
@@ -24,7 +25,6 @@ import {
 	encodeValue,
 } from "./compressedEncode.js";
 import type { EncodedChunkShape, EncodedFieldShape, EncodedValueShape } from "./format.js";
-import { isStableId } from "@fluidframework/id-compressor/internal";
 
 export class NodeShape extends Shape<EncodedChunkShape> implements NodeEncoder {
 	/**

package/src/feature-libraries/chunked-forest/codec/schemaBasedEncode.ts

@@ -4,6 +4,7 @@
  */
 
 import { assert, unreachableCase, fail } from "@fluidframework/core-utils/internal";
+import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 import {
 	LeafNodeStoredSchema,
@@ -31,7 +32,6 @@ import {
 import type { FieldBatch } from "./fieldBatch.js";
 import { type EncodedFieldBatch, type EncodedValueShape, SpecialField } from "./format.js";
 import { NodeShape } from "./nodeShape.js";
-import type { IIdCompressor } from "@fluidframework/id-compressor";
 
 /**
  * Encode data from `fieldBatch` in into an `EncodedChunk`.

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

@@ -4,6 +4,7 @@
  */
 
 import { fail } from "@fluidframework/core-utils/internal";
+
 import {
 	CursorLocationType,
 	CursorMarker,

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

@@ -20,4 +20,5 @@ export {
 	type FieldBatchCodec,
 	makeFieldBatchCodec,
 	type FieldBatchEncodingContext,
+	fluidVersionToFieldBatchCodecWriteVersion,
 } from "./codec/index.js";

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

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 
+import { type ChunkedCursor, type TreeChunk, dummyRoot } from "../../core/index.js";
 import { ReferenceCountedBase } from "../../util/index.js";
 
 import { BasicChunkCursor } from "./basicChunk.js";
-import { type ChunkedCursor, type TreeChunk, dummyRoot } from "../../core/index.js";
 
 /**
  * General purpose multi-node sequence chunk.

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

@@ -4,6 +4,8 @@
  */
 
 import { assert, compareArrays, oob, fail } from "@fluidframework/core-utils/internal";
+import type { SessionSpaceCompressedId, IIdCompressor } from "@fluidframework/id-compressor";
+import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
 import {
 	CursorLocationType,
@@ -22,9 +24,6 @@ import {
 import { ReferenceCountedBase, hasSome } from "../../util/index.js";
 import { SynchronousCursor, prefixFieldPath, prefixPath } from "../treeCursorUtils.js";
 
-import type { SessionSpaceCompressedId, IIdCompressor } from "@fluidframework/id-compressor";
-import { UsageError } from "@fluidframework/telemetry-utils/internal";
-
 /**
  * Create a tree chunk with ref count 1.
  *

package/src/feature-libraries/default-schema/defaultEditBuilder.ts

@@ -37,6 +37,7 @@ import {
 	relevantRemovedRoots as relevantModularRemovedRoots,
 } from "../modular-schema/index.js";
 import type { OptionalChangeset } from "../optional-field/index.js";
+import type { CellId } from "../sequence-field/index.js";
 
 import {
 	fieldKinds,
@@ -44,7 +45,6 @@ import {
 	sequence,
 	required as valueFieldKind,
 } from "./defaultFieldKinds.js";
-import type { CellId } from "../sequence-field/index.js";
 
 export type DefaultChangeset = ModularChangeset;
 

package/src/feature-libraries/default-schema/defaultFieldKinds.ts

@@ -4,6 +4,7 @@
  */
 
 import { fail } from "@fluidframework/core-utils/internal";
+
 import {
 	type ChangeAtomId,
 	type DeltaDetachedNodeId,

package/src/feature-libraries/default-schema/index.ts

@@ -26,7 +26,12 @@ export {
 	relevantRemovedRoots,
 } from "./defaultEditBuilder.js";
 
-export { SchemaValidationErrors, isNodeInSchema, isFieldInSchema } from "./schemaChecker.js";
+export {
+	SchemaValidationErrors,
+	isNodeInSchema,
+	isFieldInSchema,
+	inSchemaOrThrow,
+} from "./schemaChecker.js";
 
 export { defaultSchemaPolicy } from "./defaultSchema.js";
 

package/src/feature-libraries/default-schema/mappedEditBuilder.ts

@@ -4,6 +4,7 @@
  */
 
 import type { NormalizedFieldUpPath, NormalizedUpPath } from "../../core/index.js";
+
 import type {
 	IDefaultEditBuilder,
 	OptionalFieldEditBuilder,

package/src/feature-libraries/default-schema/schemaChecker.ts

@@ -4,6 +4,7 @@
  */
 
 import { unreachableCase, fail } from "@fluidframework/core-utils/internal";
+
 import {
 	type MapTree,
 	type TreeFieldStoredSchema,
@@ -14,6 +15,7 @@ import {
 	type SchemaAndPolicy,
 } from "../../core/index.js";
 import { allowsValue } from "../valueUtilities.js";
+import { UsageError } from "@fluidframework/telemetry-utils/internal";
 
 export const enum SchemaValidationErrors {
 	NoError,
@@ -28,6 +30,15 @@ export const enum SchemaValidationErrors {
 	UnknownError,
 }
 
+/**
+ * Throws a UsageError if maybeError indicates a tree is out of schema.
+ */
+export function inSchemaOrThrow(maybeError: SchemaValidationErrors): void {
+	if (maybeError !== SchemaValidationErrors.NoError) {
+		throw new UsageError("Tree does not conform to schema.");
+	}
+}
+
 /**
  * Deeply checks that the provided node complies with the schema based on its identifier.
  */
@@ -50,38 +61,38 @@ export function isNodeInSchema(
 		if (!allowsValue(schema.leafValue, node.value)) {
 			return SchemaValidationErrors.LeafNode_InvalidValue;
 		}
-	} else if (schema instanceof ObjectNodeStoredSchema) {
+	} else {
 		if (node.value !== undefined) {
 			return SchemaValidationErrors.NonLeafNode_ValueNotAllowed;
 		}
-		const uncheckedFieldsFromNode = new Set(node.fields.keys());
-		for (const [fieldKey, fieldSchema] of schema.objectNodeFields) {
-			const nodeField = node.fields.get(fieldKey) ?? [];
-			const fieldInSchemaResult = isFieldInSchema(nodeField, fieldSchema, schemaAndPolicy);
-			if (fieldInSchemaResult !== SchemaValidationErrors.NoError) {
-				return fieldInSchemaResult;
+
+		if (schema instanceof ObjectNodeStoredSchema) {
+			const uncheckedFieldsFromNode = new Set(node.fields.keys());
+			for (const [fieldKey, fieldSchema] of schema.objectNodeFields) {
+				const nodeField = node.fields.get(fieldKey) ?? [];
+				const fieldInSchemaResult = isFieldInSchema(nodeField, fieldSchema, schemaAndPolicy);
+				if (fieldInSchemaResult !== SchemaValidationErrors.NoError) {
+					return fieldInSchemaResult;
+				}
+				uncheckedFieldsFromNode.delete(fieldKey);
 			}
-			uncheckedFieldsFromNode.delete(fieldKey);
-		}
-		// The node has fields that we did not check as part of looking at every field defined in the node's schema
-		if (
-			uncheckedFieldsFromNode.size !== 0 &&
-			!schemaAndPolicy.policy.allowUnknownOptionalFields(node.type)
-		) {
-			return SchemaValidationErrors.ObjectNode_FieldNotInSchema;
-		}
-	} else if (schema instanceof MapNodeStoredSchema) {
-		if (node.value !== undefined) {
-			return SchemaValidationErrors.NonLeafNode_ValueNotAllowed;
-		}
-		for (const field of node.fields.values()) {
-			const fieldInSchemaResult = isFieldInSchema(field, schema.mapFields, schemaAndPolicy);
-			if (fieldInSchemaResult !== SchemaValidationErrors.NoError) {
-				return fieldInSchemaResult;
+			// The node has fields that we did not check as part of looking at every field defined in the node's schema
+			if (
+				uncheckedFieldsFromNode.size !== 0 &&
+				!schemaAndPolicy.policy.allowUnknownOptionalFields(node.type)
+			) {
+				return SchemaValidationErrors.ObjectNode_FieldNotInSchema;
+			}
+		} else if (schema instanceof MapNodeStoredSchema) {
+			for (const field of node.fields.values()) {
+				const fieldInSchemaResult = isFieldInSchema(field, schema.mapFields, schemaAndPolicy);
+				if (fieldInSchemaResult !== SchemaValidationErrors.NoError) {
+					return fieldInSchemaResult;
+				}
 			}
+		} else {
+			fail(0xb0e /* Unknown TreeNodeStoredSchema type */);
 		}
-	} else {
-		fail(0xb0e /* Unknown TreeNodeStoredSchema type */);
 	}
 
 	return SchemaValidationErrors.NoError;