@fluid-experimental/tree 2.0.0-rc.2.0.1 → 2.0.0-rc.3.0.0

package/src/ReconciliationPath.ts

@@ -3,9 +3,9 @@
  * Licensed under the MIT License.
  */
 
-import { ChangeInternal } from './persisted-types/index.js';
 import { TransactionView } from './RevisionView.js';
 import { TreeView } from './TreeView.js';
+import { ChangeInternal } from './persisted-types/index.js';
 
 /**
  * The path of edits from the revision view where a change was meant to have been applied to the view where the edit that contains the

package/src/RevisionValueCache.ts

@@ -3,10 +3,11 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from '@fluidframework/core-utils';
+import { assert } from '@fluidframework/core-utils/internal';
 import { BTree } from '@tylerbu/sorted-btree-es6';
 import LRU from 'lru-cache';
-import { fail, compareFiniteNumbers } from './Common.js';
+
+import { compareFiniteNumbers, fail } from './Common.js';
 
 /**
  * A revision corresponds to an index in an `EditLog`.

package/src/RevisionView.ts

@@ -3,13 +3,13 @@
  * Licensed under the MIT License.
  */
 
-import { copyPropertyIfDefined, fail, Mutable, MutableMap } from './Common.js';
+import { HasVariadicTraits } from './ChangeTypes.js';
+import { Mutable, MutableMap, copyPropertyIfDefined, fail } from './Common.js';
 import { Forest } from './Forest.js';
 import { NodeId, StableNodeId, TraitLabel } from './Identifiers.js';
 import { NodeIdConverter } from './NodeIdUtilities.js';
-import { Payload, TreeNode, TreeNodeSequence } from './persisted-types/index.js';
 import { TreeView, TreeViewNode, TreeViewPlace, TreeViewRange } from './TreeView.js';
-import { HasVariadicTraits } from './ChangeTypes.js';
+import { Payload, TreeNode, TreeNodeSequence } from './persisted-types/index.js';
 
 /**
  * An immutable view of a distributed tree.

package/src/SerializationUtilities.ts

@@ -6,8 +6,8 @@
 import { copyPropertyIfDefined, memoizeGetter } from './Common.js';
 import { NodeId, TraitLabel } from './Identifiers.js';
 import { NodeIdConverter } from './NodeIdUtilities.js';
-import { ChangeNode, ChangeNode_0_0_2, TraitMap } from './persisted-types/index.js';
 import { TreeView } from './TreeView.js';
+import { ChangeNode, ChangeNode_0_0_2, TraitMap } from './persisted-types/index.js';
 
 /**
  * Converts this tree view to an equivalent `ChangeNode`.

package/src/SharedTree.ts

@@ -3,44 +3,54 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from '@fluidframework/core-utils';
 import { bufferToString } from '@fluid-internal/client-utils';
-import { ISequencedDocumentMessage } from '@fluidframework/protocol-definitions';
+import { AttachState } from '@fluidframework/container-definitions';
+import { ITelemetryBaseProperties } from '@fluidframework/core-interfaces';
+import { assert } from '@fluidframework/core-utils/internal';
 import {
-	IFluidDataStoreRuntime,
-	IChannelStorageService,
-	IChannelFactory,
 	IChannelAttributes,
+	IChannelFactory,
 	IChannelServices,
+	IChannelStorageService,
+	IFluidDataStoreRuntime,
 } from '@fluidframework/datastore-definitions';
-import { AttachState } from '@fluidframework/container-definitions';
-import {
-	createSingleBlobSummary,
-	IFluidSerializer,
-	ISharedObjectEvents,
-	SharedObject,
-} from '@fluidframework/shared-object-base';
-import { ITelemetryBaseProperties } from '@fluidframework/core-interfaces';
+import { ISequencedDocumentMessage } from '@fluidframework/protocol-definitions';
+import { ISummaryTreeWithStats, ITelemetryContext } from '@fluidframework/runtime-definitions';
+import { IFluidSerializer, ISharedObjectEvents } from '@fluidframework/shared-object-base';
+import { SharedObject, createSingleBlobSummary } from '@fluidframework/shared-object-base/internal';
+import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils';
 import {
-	ITelemetryLoggerExt,
-	createChildLogger,
+	IEventSampler,
 	ITelemetryLoggerPropertyBags,
 	PerformanceEvent,
+	createChildLogger,
 	createSampledLogger,
-	IEventSampler,
-} from '@fluidframework/telemetry-utils';
-import { ISummaryTreeWithStats, ITelemetryContext } from '@fluidframework/runtime-definitions';
-import { fail, copyPropertyIfDefined, RestOrArray, unwrapRestOrArray } from './Common.js';
+} from '@fluidframework/telemetry-utils/internal';
+
+import { BuildNode, BuildTreeNode, Change, ChangeType } from './ChangeTypes.js';
+import { RestOrArray, copyPropertyIfDefined, fail, unwrapRestOrArray } from './Common.js';
 import { EditHandle, EditLog, OrderedEditSet } from './EditLog.js';
 import {
+	areRevisionViewsSemanticallyEqual,
+	convertTreeNodes,
+	deepCloneStablePlace,
+	deepCloneStableRange,
+	internalizeBuildNode,
+	newEditId,
+	walkTree,
+} from './EditUtilities.js';
+import { SharedTreeDiagnosticEvent, SharedTreeEvent } from './EventTypes.js';
+import { revert } from './HistoryEditFactory.js';
+import { convertEditIds } from './IdConversion.js';
+import {
+	AttributionId,
+	DetachedSequenceId,
 	EditId,
 	NodeId,
-	StableNodeId,
-	DetachedSequenceId,
 	OpSpaceNodeId,
-	isDetachedSequenceId,
-	AttributionId,
 	SessionId,
+	StableNodeId,
+	isDetachedSequenceId,
 } from './Identifiers.js';
 import { initialTree } from './InitialTree.js';
 import {
@@ -51,8 +61,16 @@ import {
 	SequencedEditResult,
 	SequencedEditResultCallback,
 } from './LogViewer.js';
-import { deserialize, getSummaryStatistics } from './SummaryBackCompatibility.js';
+import { NodeIdContext, NodeIdNormalizer, getNodeIdContext } from './NodeIdUtilities.js';
 import { ReconciliationPath } from './ReconciliationPath.js';
+import { RevisionView } from './RevisionView.js';
+import { SharedTreeEncoder_0_0_2, SharedTreeEncoder_0_1_1 } from './SharedTreeEncoder.js';
+import { MutableStringInterner } from './StringInterner.js';
+import { SummaryContents, serialize } from './Summary.js';
+import { deserialize, getSummaryStatistics } from './SummaryBackCompatibility.js';
+import { TransactionInternal } from './TransactionInternal.js';
+import { nilUuid } from './UuidUtilities.js';
+import { IdCompressor, createSessionId } from './id-compressor/index.js';
 import {
 	BuildNodeInternal,
 	ChangeInternal,
@@ -63,7 +81,7 @@ import {
 	Edit,
 	EditLogSummary,
 	EditStatus,
-	reservedIdCount,
+	InternalizedChange,
 	SharedTreeEditOp,
 	SharedTreeEditOp_0_0_2,
 	SharedTreeOp,
@@ -73,32 +91,11 @@ import {
 	SharedTreeSummaryBase,
 	SharedTreeSummary_0_0_2,
 	TreeNode,
-	ghostSessionId,
-	WriteFormat,
 	TreeNodeSequence,
-	InternalizedChange,
+	WriteFormat,
+	ghostSessionId,
+	reservedIdCount,
 } from './persisted-types/index.js';
-import { serialize, SummaryContents } from './Summary.js';
-import {
-	areRevisionViewsSemanticallyEqual,
-	convertTreeNodes,
-	deepCloneStablePlace,
-	deepCloneStableRange,
-	internalizeBuildNode,
-	newEditId,
-	walkTree,
-} from './EditUtilities.js';
-import { getNodeIdContext, NodeIdContext, NodeIdNormalizer } from './NodeIdUtilities.js';
-import { SharedTreeDiagnosticEvent, SharedTreeEvent } from './EventTypes.js';
-import { RevisionView } from './RevisionView.js';
-import { SharedTreeEncoder_0_0_2, SharedTreeEncoder_0_1_1 } from './SharedTreeEncoder.js';
-import { revert } from './HistoryEditFactory.js';
-import { BuildNode, BuildTreeNode, Change, ChangeType } from './ChangeTypes.js';
-import { TransactionInternal } from './TransactionInternal.js';
-import { IdCompressor, createSessionId } from './id-compressor/index.js';
-import { convertEditIds } from './IdConversion.js';
-import { MutableStringInterner } from './StringInterner.js';
-import { nilUuid } from './UuidUtilities.js';
 
 /**
  * The write format and associated options used to construct a `SharedTree`

package/src/SharedTreeEncoder.ts

@@ -3,60 +3,61 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from '@fluidframework/core-utils';
 import { IsoBuffer } from '@fluid-internal/client-utils';
+import { assert } from '@fluidframework/core-utils/internal';
+
+import { ChangeCompressor, compressEdit, decompressEdit } from './ChangeCompression.js';
 import { assertWithMessage, fail } from './Common.js';
 import { EditLog } from './EditLog.js';
 import { convertTreeNodes, newEdit } from './EditUtilities.js';
+import { convertEditIds, convertNodeDataIds } from './IdConversion.js';
 import { AttributionId, DetachedSequenceId, FinalNodeId, OpSpaceNodeId, TraitLabel } from './Identifiers.js';
 import { initialTree } from './InitialTree.js';
 import {
 	ContextualizedNodeIdNormalizer,
-	getNodeIdContext,
 	NodeIdContext,
 	NodeIdConverter,
 	NodeIdGenerator,
 	NodeIdNormalizer,
+	getNodeIdContext,
 	scopeIdNormalizer,
 	sequencedIdNormalizer,
 } from './NodeIdUtilities.js';
+import { RevisionView } from './RevisionView.js';
 import { getChangeNodeFromView, getChangeNode_0_0_2FromView } from './SerializationUtilities.js';
+import { MutableStringInterner, StringInterner } from './StringInterner.js';
+import { SummaryContents } from './Summary.js';
+import { InterningTreeCompressor } from './TreeCompressor.js';
+import {
+	IdCompressor,
+	IdCreationRange,
+	SerializedIdCompressorWithNoSession,
+	createSessionId,
+	hasOngoingSession,
+} from './id-compressor/index.js';
 import {
-	CompressedChangeInternal,
 	ChangeInternal,
-	SharedTreeSummary_0_0_2,
-	WriteFormat,
-	ChangeNode,
-	Edit,
-	SharedTreeEditOp,
-	SharedTreeOpType,
-	SharedTreeSummary,
-	EditWithoutId,
-	ChangeTypeInternal,
 	ChangeInternal_0_0_2,
-	SharedTreeEditOp_0_0_2,
-	reservedIdCount,
+	ChangeNode,
 	ChangeNode_0_0_2,
+	ChangeTypeInternal,
+	CompressedChangeInternal,
+	Edit,
 	EditChunkContents,
-	EditLogSummary,
 	EditChunkContents_0_1_1,
+	EditLogSummary,
+	EditWithoutId,
 	FluidEditHandle,
-	StablePlaceInternal,
+	SharedTreeEditOp,
+	SharedTreeEditOp_0_0_2,
+	SharedTreeOpType,
+	SharedTreeSummary,
+	SharedTreeSummary_0_0_2,
 	Side,
+	StablePlaceInternal,
+	WriteFormat,
+	reservedIdCount,
 } from './persisted-types/index.js';
-import { RevisionView } from './RevisionView.js';
-import { MutableStringInterner, StringInterner } from './StringInterner.js';
-import { SummaryContents } from './Summary.js';
-import { InterningTreeCompressor } from './TreeCompressor.js';
-import {
-	createSessionId,
-	hasOngoingSession,
-	IdCompressor,
-	IdCreationRange,
-	SerializedIdCompressorWithNoSession,
-} from './id-compressor/index.js';
-import { ChangeCompressor, compressEdit, decompressEdit } from './ChangeCompression.js';
-import { convertEditIds, convertNodeDataIds } from './IdConversion.js';
 
 /**
  * Object capable of converting between the current internal representation for 0.1.1 edits and their wire format.

package/src/Summary.ts

@@ -4,12 +4,14 @@
  */
 
 import type { IFluidHandle } from '@fluidframework/core-interfaces';
-import { IFluidSerializer, serializeHandles } from '@fluidframework/shared-object-base';
+import { IFluidSerializer } from '@fluidframework/shared-object-base';
+import { serializeHandles } from '@fluidframework/shared-object-base/internal';
+
 import { fail } from './Common.js';
-import type { IdCompressor } from './id-compressor/index.js';
-import type { EditLogSummary, SharedTreeSummaryBase, ChangeNode, ChangeInternal } from './persisted-types/index.js';
 import type { EditHandle } from './EditLog.js';
 import type { MutableStringInterner } from './StringInterner.js';
+import type { IdCompressor } from './id-compressor/index.js';
+import type { ChangeInternal, ChangeNode, EditLogSummary, SharedTreeSummaryBase } from './persisted-types/index.js';
 
 /**
  * The contents of a SharedTree summary, converted to a common internal format that can be

package/src/SummaryBackCompatibility.ts

@@ -5,6 +5,7 @@
 
 import type { ITelemetryBaseProperties } from '@fluidframework/core-interfaces';
 import type { IFluidSerializer } from '@fluidframework/shared-object-base';
+
 import { fail } from './Common.js';
 import { getNumberOfHandlesFromEditLogSummary } from './EditLog.js';
 import {

package/src/SummaryTestUtilities.ts

@@ -4,9 +4,10 @@
  */
 
 import { IsoBuffer } from '@fluid-internal/client-utils';
+
 import type { EditLog } from './EditLog.js';
-import type { ChangeInternal, EditChunkContents, FluidEditHandle } from './persisted-types/index.js';
 import type { SharedTree } from './SharedTree.js';
+import type { ChangeInternal, EditChunkContents, FluidEditHandle } from './persisted-types/index.js';
 
 /**
  * Format used for exporting an uploaded edit chunk and its associated handle path. Primarily used for testing SharedTree summaries.

package/src/Transaction.ts

@@ -3,16 +3,17 @@
  * Licensed under the MIT License.
  */
 
-import { IErrorEvent } from '@fluidframework/core-interfaces';
 import { TypedEventEmitter } from '@fluid-internal/client-utils';
-import { ChangeInternal, Edit, EditStatus } from './persisted-types/index.js';
-import { newEditId } from './EditUtilities.js';
-import { TreeView } from './TreeView.js';
+import { IErrorEvent } from '@fluidframework/core-interfaces';
+
 import { Change } from './ChangeTypes.js';
+import { RestOrArray, unwrapRestOrArray } from './Common.js';
+import { newEditId } from './EditUtilities.js';
+import { CachingLogViewer } from './LogViewer.js';
 import { SharedTree } from './SharedTree.js';
 import { GenericTransaction, TransactionInternal } from './TransactionInternal.js';
-import { CachingLogViewer } from './LogViewer.js';
-import { RestOrArray, unwrapRestOrArray } from './Common.js';
+import { TreeView } from './TreeView.js';
+import { ChangeInternal, Edit, EditStatus } from './persisted-types/index.js';
 
 /**
  * An event emitted by a `Transaction` to indicate a state change. See {@link TransactionEvents} for event argument information.

package/src/TransactionInternal.ts

@@ -3,9 +3,23 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from '@fluidframework/core-utils';
-import { assertWithMessage, copyPropertyIfDefined, fail, Result } from './Common.js';
-import { NodeId, DetachedSequenceId, TraitLabel, isDetachedSequenceId } from './Identifiers.js';
+import { assert } from '@fluidframework/core-utils/internal';
+
+import { Result, assertWithMessage, copyPropertyIfDefined, fail } from './Common.js';
+import {
+	BadPlaceValidationResult,
+	BadRangeValidationResult,
+	PlaceValidationResult,
+	RangeValidationResultKind,
+	detachRange,
+	insertIntoTrait,
+	validateStablePlace,
+	validateStableRange,
+} from './EditUtilities.js';
+import { DetachedSequenceId, NodeId, TraitLabel, isDetachedSequenceId } from './Identifiers.js';
+import { ReconciliationChange, ReconciliationPath } from './ReconciliationPath.js';
+import { RevisionView, TransactionView } from './RevisionView.js';
+import { TreeViewNode } from './TreeView.js';
 import { rangeFromStableRange } from './TreeViewUtilities.js';
 import {
 	BuildInternal,
@@ -21,19 +35,6 @@ import {
 	StablePlaceInternal,
 	StableRangeInternal,
 } from './persisted-types/index.js';
-import {
-	detachRange,
-	insertIntoTrait,
-	validateStablePlace,
-	validateStableRange,
-	BadPlaceValidationResult,
-	BadRangeValidationResult,
-	PlaceValidationResult,
-	RangeValidationResultKind,
-} from './EditUtilities.js';
-import { RevisionView, TransactionView } from './RevisionView.js';
-import { ReconciliationChange, ReconciliationPath } from './ReconciliationPath.js';
-import { TreeViewNode } from './TreeView.js';
 
 /**
  * Result of applying a transaction.

package/src/TreeCompressor.ts

@@ -2,13 +2,15 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { assert } from '@fluidframework/core-utils';
+
+import { assert } from '@fluidframework/core-utils/internal';
+
+import { Mutable, fail } from './Common.js';
 import { isDetachedSequenceId } from './Identifiers.js';
 import type { Definition, DetachedSequenceId, InternedStringId, OpSpaceNodeId, TraitLabel } from './Identifiers.js';
-import type { StringInterner } from './StringInterner.js';
-import type { CompressedTraits, CompressedPlaceholderTree, PlaceholderTree, Payload } from './persisted-types/index.js';
 import type { ContextualizedNodeIdNormalizer } from './NodeIdUtilities.js';
-import { fail, Mutable } from './Common.js';
+import type { StringInterner } from './StringInterner.js';
+import type { CompressedPlaceholderTree, CompressedTraits, Payload, PlaceholderTree } from './persisted-types/index.js';
 
 /**
  * Compresses a given {@link PlaceholderTree} into a more compact serializable format.

package/src/TreeNodeHandle.ts

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { Definition, NodeId } from './Identifiers.js';
 import { fail, memoizeGetter } from './Common.js';
-import { Payload, TraitMap, TreeNode } from './persisted-types/index.js';
+import { Definition, NodeId } from './Identifiers.js';
 import { TreeView, TreeViewNode } from './TreeView.js';
+import { Payload, TraitMap, TreeNode } from './persisted-types/index.js';
 
 /**
  * A handle to a `TreeNode` that exists within a specific `TreeView`. This type provides a convenient

package/src/TreeView.ts

@@ -3,10 +3,11 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from '@fluidframework/core-utils';
+import { assert } from '@fluidframework/core-utils/internal';
+
 import { copyPropertyIfDefined, fail } from './Common.js';
-import { NodeId, TraitLabel } from './Identifiers.js';
 import { Delta, Forest, isParentedForestNode } from './Forest.js';
+import { NodeId, TraitLabel } from './Identifiers.js';
 import { NodeData, Side } from './persisted-types/index.js';
 
 /**
@@ -318,6 +319,5 @@ export abstract class TreeView {
 }
 
 function getIndex(side: Side, index: TraitNodeIndex): PlaceIndex {
-	// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
 	return (side + index) as PlaceIndex;
 }

package/src/UuidUtilities.ts

@@ -3,7 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { v4, NIL } from 'uuid';
+import { NIL, v4 } from 'uuid';
+
 import { assertWithMessage } from './Common.js';
 import { StableId, UuidString } from './Identifiers.js';
 

package/src/id-compressor/AppendOnlySortedMap.ts

@@ -5,7 +5,8 @@
 
 /* eslint-disable no-bitwise */
 
-import { assert } from '@fluidframework/core-utils';
+import { assert } from '@fluidframework/core-utils/internal';
+
 import { fail } from '../Common.js';
 
 /**

package/src/id-compressor/IdCompressor.ts

@@ -3,48 +3,50 @@
  * Licensed under the MIT License.
  */
 
-/* eslint-disable @typescript-eslint/restrict-plus-operands */
-
-import { assert } from '@fluidframework/core-utils';
-import { ITelemetryLoggerExt, createChildLogger } from '@fluidframework/telemetry-utils';
-import { BTree } from '@tylerbu/sorted-btree-es6';
 import { ITelemetryBaseLogger } from '@fluidframework/core-interfaces';
+import { assert } from '@fluidframework/core-utils/internal';
+import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils';
+import { createChildLogger } from '@fluidframework/telemetry-utils/internal';
+import { BTree } from '@tylerbu/sorted-btree-es6';
+
 import {
-	hasLength,
+	Mutable,
 	assertNotUndefined,
+	assertWithMessage,
 	compareFiniteNumbers,
 	compareFiniteNumbersReversed,
 	compareMaps,
 	compareStrings,
 	fail,
 	getOrCreate,
-	Mutable,
+	hasLength,
 	setPropertyIfDefined,
-	assertWithMessage,
 } from '../Common.js';
 import {
-	LocalCompressedId,
+	AttributionId,
+	CompressedId,
 	FinalCompressedId,
-	SessionSpaceCompressedId,
-	StableId,
+	LocalCompressedId,
 	OpSpaceCompressedId,
 	SessionId,
-	CompressedId,
+	SessionSpaceCompressedId,
+	StableId,
 	UuidString,
-	AttributionId,
 } from '../Identifiers.js';
 import { assertIsStableId, assertIsUuidString, isStableId } from '../UuidUtilities.js';
+
 import { AppendOnlySortedMap } from './AppendOnlySortedMap.js';
 import { getIds } from './IdRange.js';
 import {
-	numericUuidEquals,
+	NumericUuid,
+	ensureSessionUuid,
 	getPositiveDelta,
 	incrementUuid,
+	numericUuidEquals,
 	numericUuidFromStableId,
-	NumericUuid,
 	stableIdFromNumericUuid,
-	ensureSessionUuid,
 } from './NumericUuid.js';
+import { SessionIdNormalizer } from './SessionIdNormalizer.js';
 import type {
 	IdCreationRange,
 	SerializedCluster,
@@ -57,7 +59,6 @@ import type {
 	UnackedLocalId,
 	VersionedSerializedIdCompressor,
 } from './persisted-types/index.js';
-import { SessionIdNormalizer } from './SessionIdNormalizer.js';
 
 /**
  * A cluster of final (sequenced via consensus), sequentially allocated compressed IDs.

package/src/id-compressor/IdRange.ts

@@ -3,7 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from '@fluidframework/core-utils';
+import { assert } from '@fluidframework/core-utils/internal';
+
 import type { IdCreationRange, UnackedLocalId } from './persisted-types/index.js';
 
 export function getIds(

package/src/id-compressor/NumericUuid.ts

@@ -5,9 +5,9 @@
 
 /* eslint-disable no-bitwise */
 
+import { assertWithMessage, fail } from '../Common.js';
 import { SessionId, StableId } from '../Identifiers.js';
 import { generateStableId } from '../UuidUtilities.js';
-import { assertWithMessage, fail } from '../Common.js';
 
 /**
  * A UUID (128 bit identifier) optimized for use as a 128 bit unsigned integer with fast addition and toString operations.

package/src/id-compressor/SessionIdNormalizer.ts

@@ -3,11 +3,11 @@
  * Licensed under the MIT License.
  */
 
-/* eslint-disable @typescript-eslint/restrict-plus-operands */
+import { assert } from '@fluidframework/core-utils/internal';
 
-import { assert } from '@fluidframework/core-utils';
-import { compareFiniteNumbers, compareFiniteNumbersReversed, fail, Mutable } from '../Common.js';
+import { Mutable, compareFiniteNumbers, compareFiniteNumbersReversed, fail } from '../Common.js';
 import { FinalCompressedId, LocalCompressedId, SessionSpaceCompressedId } from '../Identifiers.js';
+
 import { AppendOnlyDoublySortedMap } from './AppendOnlySortedMap.js';
 import { SerializedSessionIdNormalizer } from './persisted-types/index.js';
 

package/src/migration-shim/migrationDeltaHandler.ts

@@ -3,9 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { MessageType, type ISequencedDocumentMessage } from '@fluidframework/protocol-definitions';
+import { assert } from '@fluidframework/core-utils/internal';
 import { type IChannelAttributes, type IDeltaHandler } from '@fluidframework/datastore-definitions';
-import { assert } from '@fluidframework/core-utils';
+import { type ISequencedDocumentMessage, MessageType } from '@fluidframework/protocol-definitions';
+
 import { type IOpContents, type IShimDeltaHandler } from './types.js';
 import { attributesMatch, isBarrierOp, isStampedOp } from './utils.js';
 

package/src/migration-shim/migrationShim.ts

@@ -2,35 +2,39 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+
+import { type EventEmitterEventType } from '@fluid-internal/client-utils';
 import { AttachState } from '@fluidframework/container-definitions';
 import { type IEvent, type IFluidHandle, type IFluidLoadable } from '@fluidframework/core-interfaces';
+import { assert } from '@fluidframework/core-utils/internal';
 import {
-	IChannelFactory,
 	type IChannelAttributes,
+	IChannelFactory,
 	type IChannelServices,
 	type IFluidDataStoreRuntime,
 } from '@fluidframework/datastore-definitions';
+import type { SessionId } from '@fluidframework/id-compressor';
+import type { IIdCompressorCore } from '@fluidframework/id-compressor/internal';
+import { type ISequencedDocumentMessage, MessageType } from '@fluidframework/protocol-definitions';
 import {
 	type IExperimentalIncrementalSummaryContext,
 	type IGarbageCollectionData,
-	type ITelemetryContext,
 	type ISummaryTreeWithStats,
+	type ITelemetryContext,
 } from '@fluidframework/runtime-definitions';
+import { DataProcessingError, EventEmitterWithErrorHandling } from '@fluidframework/telemetry-utils/internal';
 import { type ITree } from '@fluidframework/tree';
-import { assert } from '@fluidframework/core-utils';
-import { MessageType, type ISequencedDocumentMessage } from '@fluidframework/protocol-definitions';
-import { type EventEmitterEventType } from '@fluid-internal/client-utils';
-import { DataProcessingError, EventEmitterWithErrorHandling } from '@fluidframework/telemetry-utils';
-import type { SessionId, IIdCompressorCore } from '@fluidframework/id-compressor';
+
 import {
-	type SharedTreeFactory as LegacySharedTreeFactory,
 	type SharedTree as LegacySharedTree,
+	type SharedTreeFactory as LegacySharedTreeFactory,
 } from '../SharedTree.js';
-import { type IShimChannelServices, NoDeltasChannelServices } from './shimChannelServices.js';
+
 import { MigrationShimDeltaHandler } from './migrationDeltaHandler.js';
+import { type IShimChannelServices, NoDeltasChannelServices } from './shimChannelServices.js';
 import { PreMigrationDeltaConnection, StampDeltaConnection } from './shimDeltaConnection.js';
 import { ShimHandle } from './shimHandle.js';
-import { type IShim, type IOpContents } from './types.js';
+import { type IOpContents, type IShim } from './types.js';
 
 /**
  * Interface for migration events to indicate the stage of the migration. There really is two stages: before, and after.