@fluidframework/merge-tree 2.0.0-rc.2.0.1 → 2.0.0-rc.3.0.0

package/src/partialLengths.ts

@@ -3,22 +3,23 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
+
 import { Property, RedBlackTree } from "./collections/index.js";
 import { UnassignedSequenceNumber } from "./constants.js";
 import { MergeTree } from "./mergeTree.js";
 import {
 	// eslint-disable-next-line import/no-deprecated
 	CollaborationWindow,
-	compareNumbers,
-	IMergeBlock,
 	IMergeNode,
 	IMoveInfo,
 	IRemovalInfo,
 	ISegment,
-	toMoveInfo,
+	compareNumbers,
 	seqLTE,
+	toMoveInfo,
 	toRemovalInfo,
+	type MergeBlock,
 } from "./mergeTreeNodes.js";
 // eslint-disable-next-line import/no-deprecated
 import { SortedSet } from "./sortedSet.js";
@@ -214,7 +215,7 @@ export interface PartialSequenceLengthsOptions {
 	verifier?: (partialLengths: PartialSequenceLengths) => void;
 	verifyExpected?: (
 		mergeTree: MergeTree,
-		node: IMergeBlock,
+		node: MergeBlock,
 		refSeq: number,
 		clientId: number,
 		localSeq?: number,
@@ -285,7 +286,7 @@ export class PartialSequenceLengths {
 	 * Local partial information doesn't support `update`.
 	 */
 	public static combine(
-		block: IMergeBlock,
+		block: MergeBlock,
 		// eslint-disable-next-line import/no-deprecated
 		collabWindow: CollaborationWindow,
 		recur = false,
@@ -371,10 +372,10 @@ export class PartialSequenceLengths {
 
 	/**
 	 * @returns a PartialSequenceLengths structure which tracks only lengths of leaf children of the provided
-	 * IMergeBlock.
+	 * MergeBlock.
 	 */
 	private static fromLeaves(
-		block: IMergeBlock,
+		block: MergeBlock,
 		// eslint-disable-next-line import/no-deprecated
 		collabWindow: CollaborationWindow,
 		computeLocalPartials: boolean,
@@ -902,7 +903,7 @@ export class PartialSequenceLengths {
 	// on all descendant PartialSequenceLengths)
 	// TODO: assert client id matches
 	public update(
-		node: IMergeBlock,
+		node: MergeBlock,
 		seq: number,
 		clientId: number,
 		// eslint-disable-next-line import/no-deprecated
@@ -1268,7 +1269,7 @@ function verifyPartialLengthsInner(
 
 export function verifyExpectedPartialLengths(
 	mergeTree: MergeTree,
-	node: IMergeBlock,
+	node: MergeBlock,
 	refSeq: number,
 	clientId: number,
 	localSeq?: number,

package/src/revertibles.ts

@@ -3,19 +3,20 @@
  * Licensed under the MIT License.
  */
 
-import { assert, unreachableCase } from "@fluidframework/core-utils";
-import { UsageError } from "@fluidframework/telemetry-utils";
+import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
+import { UsageError } from "@fluidframework/telemetry-utils/internal";
+
 import { DoublyLinkedList } from "./collections/index.js";
 import { EndOfTreeSegment } from "./endOfTreeSegment.js";
 import { LocalReferenceCollection, LocalReferencePosition } from "./localReference.js";
+import { MergeTree, findRootMergeBlock } from "./mergeTree.js";
 import { IMergeTreeDeltaCallbackArgs } from "./mergeTreeDeltaCallback.js";
-import { ISegmentLeaf, ISegment, toRemovalInfo } from "./mergeTreeNodes.js";
 import { depthFirstNodeWalk } from "./mergeTreeNodeWalk.js";
+import { ISegment, ISegmentLeaf, toRemovalInfo } from "./mergeTreeNodes.js";
 import { ITrackingGroup, Trackable, UnorderedTrackingGroup } from "./mergeTreeTracking.js";
 import { IJSONSegment, MergeTreeDeltaType, ReferenceType } from "./ops.js";
-import { matchProperties, PropertySet } from "./properties.js";
+import { PropertySet, matchProperties } from "./properties.js";
 import { DetachedReferencePosition } from "./referencePositions.js";
-import { MergeTree, findRootMergeBlock } from "./mergeTree.js";
 
 /**
  * @alpha

package/src/segmentPropertiesManager.ts

@@ -5,11 +5,12 @@
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
+
 import { UnassignedSequenceNumber, UniversalSequenceNumber } from "./constants.js";
 import { IMergeTreeAnnotateMsg } from "./ops.js";
 // eslint-disable-next-line import/no-deprecated
-import { createMap, MapLike, PropertySet } from "./properties.js";
+import { MapLike, PropertySet, createMap } from "./properties.js";
 
 /**
  * @alpha

package/src/snapshotChunks.ts

@@ -8,10 +8,11 @@
 import { IFluidHandle } from "@fluidframework/core-interfaces";
 import { IFluidSerializer } from "@fluidframework/shared-object-base";
 import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+
+import { SerializedAttributionCollection } from "./attributionCollection.js";
+import { IJSONSegment } from "./ops.js";
 import { PropertySet } from "./properties.js";
 import { SnapshotLegacy } from "./snapshotlegacy.js";
-import { IJSONSegment } from "./ops.js";
-import { SerializedAttributionCollection } from "./attributionCollection.js";
 
 export interface VersionedMergeTreeChunk {
 	version: undefined | "1";

package/src/snapshotLoader.ts

@@ -6,28 +6,26 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
 import { bufferToString } from "@fluid-internal/client-utils";
-import { assert } from "@fluidframework/core-utils";
-import { IFluidSerializer } from "@fluidframework/shared-object-base";
-import {
-	createChildLogger,
-	ITelemetryLoggerExt,
-	UsageError,
-} from "@fluidframework/telemetry-utils";
-import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
+import { AttachState } from "@fluidframework/container-definitions";
+import { assert } from "@fluidframework/core-utils/internal";
 import {
-	IFluidDataStoreRuntime,
 	IChannelStorageService,
+	IFluidDataStoreRuntime,
 } from "@fluidframework/datastore-definitions";
-import { AttachState } from "@fluidframework/container-definitions";
+import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
+import { IFluidSerializer } from "@fluidframework/shared-object-base";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { UsageError, createChildLogger } from "@fluidframework/telemetry-utils/internal";
+
 // eslint-disable-next-line import/no-deprecated
 import { Client } from "./client.js";
 import { NonCollabClient, UniversalSequenceNumber } from "./constants.js";
+import { MergeTree } from "./mergeTree.js";
 import { ISegment } from "./mergeTreeNodes.js";
 import { IJSONSegment } from "./ops.js";
-import { IJSONSegmentWithMergeInfo, hasMergeInfo, MergeTreeChunkV1 } from "./snapshotChunks.js";
+import { IJSONSegmentWithMergeInfo, MergeTreeChunkV1, hasMergeInfo } from "./snapshotChunks.js";
 import { SnapshotV1 } from "./snapshotV1.js";
 import { SnapshotLegacy } from "./snapshotlegacy.js";
-import { MergeTree } from "./mergeTree.js";
 
 export class SnapshotLoader {
 	private readonly logger: ITelemetryLoggerExt;

package/src/snapshotV1.ts

@@ -3,29 +3,32 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLoggerExt, createChildLogger } from "@fluidframework/telemetry-utils";
-import { IFluidHandle } from "@fluidframework/core-interfaces";
-import { IFluidSerializer } from "@fluidframework/shared-object-base";
-import { assert } from "@fluidframework/core-utils";
 import { bufferToString } from "@fluid-internal/client-utils";
+import { IFluidHandle } from "@fluidframework/core-interfaces";
+import { assert } from "@fluidframework/core-utils/internal";
 import { IChannelStorageService } from "@fluidframework/datastore-definitions";
-import { AttributionKey, ISummaryTreeWithStats } from "@fluidframework/runtime-definitions";
-import { SummaryTreeBuilder } from "@fluidframework/runtime-utils";
+import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions";
+import { AttributionKey } from "@fluidframework/runtime-definitions/internal";
+import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
+import { IFluidSerializer } from "@fluidframework/shared-object-base";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { createChildLogger } from "@fluidframework/telemetry-utils/internal";
+
+import { IAttributionCollection } from "./attributionCollection.js";
 import { UnassignedSequenceNumber } from "./constants.js";
+import { MergeTree } from "./mergeTree.js";
+import { walkAllChildSegments } from "./mergeTreeNodeWalk.js";
 import { ISegment } from "./mergeTreeNodes.js";
-import { matchProperties, PropertySet } from "./properties.js";
+import { PropertySet, matchProperties } from "./properties.js";
 import {
 	IJSONSegmentWithMergeInfo,
 	JsonSegmentSpecs,
-	MergeTreeHeaderMetadata,
 	MergeTreeChunkV1,
-	toLatestVersion,
+	MergeTreeHeaderMetadata,
 	serializeAsMaxSupportedVersion,
+	toLatestVersion,
 } from "./snapshotChunks.js";
 import { SnapshotLegacy } from "./snapshotlegacy.js";
-import { MergeTree } from "./mergeTree.js";
-import { walkAllChildSegments } from "./mergeTreeNodeWalk.js";
-import { IAttributionCollection } from "./attributionCollection.js";
 
 export class SnapshotV1 {
 	// Split snapshot into two entries - headers (small) and body (overflow) for faster loading initial content

package/src/snapshotlegacy.ts

@@ -5,14 +5,17 @@
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
-import { ITelemetryLoggerExt, createChildLogger } from "@fluidframework/telemetry-utils";
-import { assert } from "@fluidframework/core-utils";
 import { IFluidHandle } from "@fluidframework/core-interfaces";
-import { IFluidSerializer } from "@fluidframework/shared-object-base";
-import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions";
+import { assert } from "@fluidframework/core-utils/internal";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
-import { SummaryTreeBuilder } from "@fluidframework/runtime-utils";
+import { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions";
+import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
+import { IFluidSerializer } from "@fluidframework/shared-object-base";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { createChildLogger } from "@fluidframework/telemetry-utils/internal";
+
 import { NonCollabClient, UnassignedSequenceNumber } from "./constants.js";
+import { MergeTree } from "./mergeTree.js";
 import { ISegment } from "./mergeTreeNodes.js";
 import { matchProperties } from "./properties.js";
 import {
@@ -20,7 +23,6 @@ import {
 	MergeTreeChunkLegacy,
 	serializeAsMinSupportedVersion,
 } from "./snapshotChunks.js";
-import { MergeTree } from "./mergeTree.js";
 
 interface SnapshotHeader {
 	chunkCount?: number;

package/src/textSegment.ts

@@ -3,7 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
+
 import { BaseSegment, ISegment } from "./mergeTreeNodes.js";
 import { IJSONSegment } from "./ops.js";
 import { PropertySet } from "./properties.js";

package/src/zamboni.ts

@@ -9,7 +9,7 @@ import { UnassignedSequenceNumber } from "./constants.js";
 import { MergeTree } from "./mergeTree.js";
 import { MergeTreeMaintenanceType } from "./mergeTreeDeltaCallback.js";
 import {
-	IMergeBlock,
+	type MergeBlock,
 	IMergeNode,
 	ISegment,
 	Marker,
@@ -21,7 +21,7 @@ import {
 import { matchProperties } from "./properties.js";
 
 export const zamboniSegmentsMax = 2;
-function underflow(node: IMergeBlock) {
+function underflow(node: MergeBlock) {
 	return node.childCount < MaxNodesInBlock / 2;
 }
 
@@ -69,14 +69,14 @@ export function zamboniSegments(
 }
 
 // Interior node with all node children
-export function packParent(parent: IMergeBlock, mergeTree: MergeTree) {
+export function packParent(parent: MergeBlock, mergeTree: MergeTree) {
 	const children = parent.children;
 	let childIndex: number;
-	let childBlock: IMergeBlock;
+	let childBlock: MergeBlock;
 	const holdNodes: IMergeNode[] = [];
 	for (childIndex = 0; childIndex < parent.childCount; childIndex++) {
 		// Debug assert not isLeaf()
-		childBlock = children[childIndex] as IMergeBlock;
+		childBlock = children[childIndex] as MergeBlock;
 		scourNode(childBlock, holdNodes, mergeTree);
 		// Will replace this block with a packed block
 		childBlock.parent = undefined;
@@ -93,7 +93,7 @@ export function packParent(parent: IMergeBlock, mergeTree: MergeTree) {
 		}
 		const baseNodesInBlockCount = Math.floor(totalNodeCount / childCount);
 		let remainderCount = totalNodeCount % childCount;
-		const packedBlocks = new Array<IMergeBlock>(MaxNodesInBlock);
+		const packedBlocks = new Array<MergeBlock>(MaxNodesInBlock);
 		let childrenPackedCount = 0;
 		for (let nodeIndex = 0; nodeIndex < childCount; nodeIndex++) {
 			let nodeCount = baseNodesInBlockCount;
@@ -127,7 +127,7 @@ export function packParent(parent: IMergeBlock, mergeTree: MergeTree) {
 	}
 }
 
-function scourNode(node: IMergeBlock, holdNodes: IMergeNode[], mergeTree: MergeTree) {
+function scourNode(node: MergeBlock, holdNodes: IMergeNode[], mergeTree: MergeTree) {
 	// The previous segment is tracked while scouring for the purposes of merging adjacent segments
 	// when possible.
 	let prevSegment: ISegment | undefined;

package/api-extractor-cjs.json

@@ -1,8 +0,0 @@
-{
-	"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-	"extends": "../../../common/build/build-common/api-extractor-base.cjs.primary.json",
-	// CJS is actually secondary; so, no report.
-	"apiReport": {
-		"enabled": false
-	}
-}