@fluidframework/sequence 2.0.0-internal.8.0.1 → 2.0.0-rc.1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/sequence",
-  "version": "2.0.0-internal.8.0.1",
+  "version": "2.0.0-rc.1.0.0",
   "description": "Distributed sequence",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -11,20 +11,82 @@
   "license": "MIT",
   "author": "Microsoft and contributors",
   "sideEffects": false,
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./lib/index.d.mts",
+        "default": "./lib/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    },
+    "./test/intervalCollection": {
+      "import": {
+        "types": "./lib/intervalCollection.d.mts",
+        "default": "./lib/intervalCollection.mjs"
+      },
+      "require": {
+        "types": "./dist/intervalCollection.d.ts",
+        "default": "./dist/intervalCollection.js"
+      }
+    },
+    "./alpha": {
+      "import": {
+        "types": "./lib/sequence-alpha.d.mts",
+        "default": "./lib/index.mjs"
+      },
+      "require": {
+        "types": "./dist/sequence-alpha.d.ts",
+        "default": "./dist/index.js"
+      }
+    },
+    "./beta": {
+      "import": {
+        "types": "./lib/sequence-beta.d.mts",
+        "default": "./lib/index.mjs"
+      },
+      "require": {
+        "types": "./dist/sequence-beta.d.ts",
+        "default": "./dist/index.js"
+      }
+    },
+    "./internal": {
+      "import": {
+        "types": "./lib/index.d.mts",
+        "default": "./lib/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    },
+    "./public": {
+      "import": {
+        "types": "./lib/sequence-public.d.mts",
+        "default": "./lib/index.mjs"
+      },
+      "require": {
+        "types": "./dist/sequence-public.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
   "main": "dist/index.js",
-  "module": "lib/index.js",
+  "module": "lib/index.mjs",
   "types": "dist/index.d.ts",
   "c8": {
     "all": true,
     "cache-dir": "nyc/.cache",
     "exclude": [
-      "src/test/**/*.ts",
-      "dist/test/**/*.js"
+      "src/test/**/*.*ts",
+      "dist/test/**/*.*js"
     ],
     "exclude-after-remap": false,
     "include": [
-      "src/**/*.ts",
-      "dist/**/*.js"
+      "src/**/*.*ts",
+      "dist/**/*.*js"
     ],
     "report-dir": "nyc/report",
     "reporter": [
@@ -35,36 +97,36 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": ">=2.0.0-internal.8.0.1 <2.0.0-internal.8.1.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-internal.8.0.1 <2.0.0-internal.8.1.0",
-    "@fluidframework/core-utils": ">=2.0.0-internal.8.0.1 <2.0.0-internal.8.1.0",
-    "@fluidframework/datastore-definitions": ">=2.0.0-internal.8.0.1 <2.0.0-internal.8.1.0",
-    "@fluidframework/merge-tree": ">=2.0.0-internal.8.0.1 <2.0.0-internal.8.1.0",
-    "@fluidframework/protocol-definitions": "^3.0.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-internal.8.0.1 <2.0.0-internal.8.1.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-internal.8.0.1 <2.0.0-internal.8.1.0",
-    "@fluidframework/shared-object-base": ">=2.0.0-internal.8.0.1 <2.0.0-internal.8.1.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-internal.8.0.1 <2.0.0-internal.8.1.0",
+    "@fluid-internal/client-utils": ">=2.0.0-rc.1.0.0 <2.0.0-rc.1.1.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-rc.1.0.0 <2.0.0-rc.1.1.0",
+    "@fluidframework/core-utils": ">=2.0.0-rc.1.0.0 <2.0.0-rc.1.1.0",
+    "@fluidframework/datastore-definitions": ">=2.0.0-rc.1.0.0 <2.0.0-rc.1.1.0",
+    "@fluidframework/merge-tree": ">=2.0.0-rc.1.0.0 <2.0.0-rc.1.1.0",
+    "@fluidframework/protocol-definitions": "^3.1.0",
+    "@fluidframework/runtime-definitions": ">=2.0.0-rc.1.0.0 <2.0.0-rc.1.1.0",
+    "@fluidframework/runtime-utils": ">=2.0.0-rc.1.0.0 <2.0.0-rc.1.1.0",
+    "@fluidframework/shared-object-base": ">=2.0.0-rc.1.0.0 <2.0.0-rc.1.1.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-rc.1.0.0 <2.0.0-rc.1.1.0",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.13.3",
-    "@fluid-private/stochastic-test-utils": ">=2.0.0-internal.8.0.1 <2.0.0-internal.8.1.0",
-    "@fluid-private/test-dds-utils": ">=2.0.0-internal.8.0.1 <2.0.0-internal.8.1.0",
+    "@fluid-private/stochastic-test-utils": ">=2.0.0-rc.1.0.0 <2.0.0-rc.1.1.0",
+    "@fluid-private/test-dds-utils": ">=2.0.0-rc.1.0.0 <2.0.0-rc.1.1.0",
     "@fluid-tools/benchmark": "^0.48.0",
-    "@fluid-tools/build-cli": "^0.28.0",
+    "@fluid-tools/build-cli": "^0.29.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.28.0",
-    "@fluidframework/eslint-config-fluid": "^3.1.0",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.8.0.1 <2.0.0-internal.8.1.0",
-    "@fluidframework/sequence-previous": "npm:@fluidframework/sequence@2.0.0-internal.7.2.0",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.8.0.1 <2.0.0-internal.8.1.0",
+    "@fluidframework/build-tools": "^0.29.0",
+    "@fluidframework/eslint-config-fluid": "^3.2.0",
+    "@fluidframework/mocha-test-setup": ">=2.0.0-rc.1.0.0 <2.0.0-rc.1.1.0",
+    "@fluidframework/sequence-previous": "npm:@fluidframework/sequence@2.0.0-internal.8.0.0",
+    "@fluidframework/test-runtime-utils": ">=2.0.0-rc.1.0.0 <2.0.0-rc.1.1.0",
     "@microsoft/api-extractor": "^7.38.3",
     "@types/diff": "^3.5.1",
     "@types/mocha": "^9.1.1",
     "@types/node": "^18.19.0",
     "@types/uuid": "^9.0.2",
-    "c8": "^7.7.1",
+    "c8": "^8.0.1",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
     "diff": "^3.5.0",
@@ -75,7 +137,9 @@
     "moment": "^2.21.0",
     "prettier": "~3.0.3",
     "random-js": "^2.1.0",
+    "replace-in-file": "^6.3.5",
     "rimraf": "^4.4.0",
+    "tsc-multi": "^1.1.0",
     "typescript": "~5.1.6"
   },
   "fluidBuild": {
@@ -96,23 +160,10 @@
   },
   "typeValidation": {
     "broken": {
-      "InterfaceDeclaration_ISharedString": {
-        "forwardCompat": false,
-        "backCompat": false
-      },
-      "ClassDeclaration_SharedSegmentSequence": {
-        "forwardCompat": false,
-        "backCompat": false
-      },
-      "ClassDeclaration_SharedSequence": {
-        "forwardCompat": false,
+      "InterfaceDeclaration_IIntervalCollection": {
         "backCompat": false
       },
       "ClassDeclaration_SharedString": {
-        "forwardCompat": false,
-        "backCompat": false
-      },
-      "TypeAliasDeclaration_SharedStringSegment": {
         "backCompat": false
       }
     }
@@ -120,15 +171,15 @@
   "scripts": {
     "api": "fluid-build . --task api",
     "api-extractor:commonjs": "api-extractor run --local",
-    "api-extractor:esnext": "copyfiles -u 1 \"dist/**/*-@(alpha|beta|public|untrimmed).d.ts\" lib",
+    "api-extractor:esnext": "api-extractor run --config ./api-extractor-esm.json",
     "build": "fluid-build . --task build",
     "build:commonjs": "fluid-build . --task commonjs",
     "build:compile": "fluid-build . --task compile",
     "build:docs": "fluid-build . --task api",
-    "build:esnext": "tsc --project ./tsconfig.esnext.json",
+    "build:esnext": "tsc-multi --config ../../../common/build/build-common/tsc-multi.esm.json",
     "build:genver": "gen-version",
     "build:test": "tsc --project ./src/test/tsconfig.json",
-    "check:are-the-types-wrong": "attw --pack",
+    "check:are-the-types-wrong": "attw --pack . --entrypoints .",
     "check:release-tags": "api-extractor run --local --config ./api-extractor-lint.json",
     "ci:build:docs": "api-extractor run",
     "clean": "rimraf --glob dist lib \"**/*.tsbuildinfo\" \"**/*.build.log\" _api-extractor-temp nyc",
@@ -137,19 +188,19 @@
     "format": "npm run prettier:fix",
     "lint": "npm run prettier && npm run check:release-tags && npm run eslint",
     "lint:fix": "npm run prettier:fix && npm run eslint:fix",
-    "perf": "cross-env FLUID_TEST_VERBOSE=1 mocha \"dist/**/*.spec.js\" --node-option unhandled-rejections=strict,expose-gc --exit -r node_modules/@fluidframework/mocha-test-setup --perfMode --fgrep @Benchmark --reporter @fluid-tools/benchmark/dist/MochaReporter.js --timeout 30000",
+    "perf": "cross-env FLUID_TEST_VERBOSE=1 mocha \"dist/**/*.spec.*js\" --node-option unhandled-rejections=strict,expose-gc --exit -r node_modules/@fluidframework/mocha-test-setup --perfMode --fgrep @Benchmark --reporter @fluid-tools/benchmark/dist/MochaReporter.js --timeout 30000",
     "perf:measure": "npm run perf -- --fgrep @Measurement",
     "prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
     "prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
     "test": "npm run test:mocha",
-    "test:benchmark:report": "mocha \"dist/test/*.perf.spec.js\" --node-option unhandled-rejections=strict,expose-gc --exit --perfMode --fgrep @Benchmark -r @fluidframework/mocha-test-setup --reporter @fluid-tools/benchmark/dist/MochaReporter.js --timeout 60000",
+    "test:benchmark:report": "mocha \"dist/test/*.perf.spec.*js\" --node-option unhandled-rejections=strict,expose-gc --exit --perfMode --fgrep @Benchmark -r @fluidframework/mocha-test-setup --reporter @fluid-tools/benchmark/dist/MochaReporter.js --timeout 60000",
     "test:coverage": "c8 npm test",
     "test:memory": "mocha --config src/test/memory/.mocharc.js",
     "test:memory-profiling:report": "mocha --config src/test/memory/.mocharc.js",
-    "test:mocha": "mocha --ignore \"dist/test/memory/**/*\" --recursive \"dist/test/**/*.spec.js\" -r node_modules/@fluidframework/mocha-test-setup",
+    "test:mocha": "mocha --ignore \"dist/test/memory/**/*\" --recursive \"dist/test/**/*.spec.*js\" -r node_modules/@fluidframework/mocha-test-setup",
     "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
     "test:newsnapfiles": "node dist/test/createSnapshotFiles.js",
-    "test:stress": "cross-env FUZZ_TEST_COUNT=100 FUZZ_STRESS_RUN=true mocha --ignore \"dist/test/memory/**/*\" --recursive \"dist/test/**/*.fuzz.spec.js\" -r @fluidframework/mocha-test-setup",
+    "test:stress": "cross-env FUZZ_TEST_COUNT=100 FUZZ_STRESS_RUN=true mocha --ignore \"dist/test/memory/**/*\" --recursive \"dist/test/**/*.fuzz.spec.*js\" -r @fluidframework/mocha-test-setup",
     "tsc": "tsc",
     "typetests:gen": "fluid-type-test-generator",
     "typetests:prepare": "flub typetests --dir . --reset --previous --normalize"

package/src/defaultMap.ts

@@ -21,13 +21,16 @@ import {
 	// eslint-disable-next-line import/no-deprecated
 	IValueOpEmitter,
 	IValueType,
-	IValueTypeOperationValue,
 	ISharedDefaultMapEvents,
 	IMapMessageLocalMetadata,
 	SequenceOptions,
+	IValueTypeOperationValue,
 } from "./defaultMapInterfaces";
-import { IntervalOpType, SerializedIntervalDelta } from "./intervals";
+import { SerializedIntervalDelta, IntervalDeltaOpType } from "./intervals";
 
+function isMapOperation(op: unknown): op is IMapOperation {
+	return typeof op === "object" && op !== null && "type" in op && op.type === "act";
+}
 /**
  * Defines the means to process and submit a given op on a map.
  */
@@ -55,7 +58,7 @@ interface IMapMessageHandler {
 
 	resubmit(op: IMapOperation, localOpMetadata: IMapMessageLocalMetadata): void;
 
-	getStashedOpLocalMetadata(op: IMapOperation): unknown;
+	getStashedOpLocalMetadata(op: IMapOperation): IMapMessageLocalMetadata;
 }
 
 /**
@@ -307,13 +310,12 @@ export class DefaultMap<T> {
 		return false;
 	}
 
-	public tryGetStashedOpLocalMetadata(op: IMapOperation): unknown {
-		const type: string = op.type;
-		if (this.messageHandlers.has(type)) {
+	public tryGetStashedOpLocalMetadata(op: unknown): IMapMessageLocalMetadata | undefined {
+		if (isMapOperation(op) && this.messageHandlers.has(op.type)) {
 			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-			return this.messageHandlers.get(type)!.getStashedOpLocalMetadata(op);
+			return this.messageHandlers.get(op.type)!.getStashedOpLocalMetadata(op);
 		}
-		throw new Error("no apply stashed op handler");
+		return undefined;
 	}
 
 	/**
@@ -417,11 +419,14 @@ export class DefaultMap<T> {
 					this.submitMessage({ ...op, value: rebasedOp }, rebasedLocalOpMetadata);
 				}
 			},
-			getStashedOpLocalMetadata: (op: IMapValueTypeOperation) => {
+			getStashedOpLocalMetadata: (op: IMapValueTypeOperation): IMapMessageLocalMetadata => {
+				const localValue = this.data.get(op.key) ?? this.createCore(op.key, true);
 				assert(
-					false,
-					0x016 /* "apply stashed op not implemented for custom value type ops" */,
+					localValue !== undefined,
+					0x879 /* Local value expected on applying stashed op */,
 				);
+				const handler = localValue.getOpHandler(op.value.opName);
+				return handler.applyStashedOp(localValue.value, op.value);
 			},
 		});
 
@@ -438,7 +443,7 @@ export class DefaultMap<T> {
 	private makeMapValueOpEmitter(key: string): IValueOpEmitter {
 		// eslint-disable-next-line import/no-deprecated
 		const emit: IValueOpEmitter["emit"] = (
-			opName: IntervalOpType,
+			opName: IntervalDeltaOpType,
 			previousValue: unknown,
 			params: SerializedIntervalDelta,
 			localOpMetadata: IMapMessageLocalMetadata,

package/src/defaultMapInterfaces.ts

@@ -6,7 +6,12 @@
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import { ISharedObjectEvents } from "@fluidframework/shared-object-base";
 import { IEventThisPlaceHolder } from "@fluidframework/core-interfaces";
-import { ISerializedInterval, IntervalOpType, SerializedIntervalDelta } from "./intervals";
+import {
+	ISerializedInterval,
+	IntervalOpType,
+	SerializedIntervalDelta,
+	IntervalDeltaOpType,
+} from "./intervals";
 
 /**
  * Type of "valueChanged" event parameter.
@@ -145,6 +150,8 @@ export interface IValueOperation<T> {
 	):
 		| { rebasedOp: IValueTypeOperationValue; rebasedLocalOpMetadata: IMapMessageLocalMetadata }
 		| undefined;
+
+	applyStashedOp(value: T, op: IValueTypeOperationValue): IMapMessageLocalMetadata;
 }
 
 /**
@@ -225,7 +232,7 @@ export interface IValueTypeOperationValue {
 	/**
 	 * The name of the operation.
 	 */
-	opName: IntervalOpType;
+	opName: IntervalDeltaOpType;
 
 	/**
 	 * The payload that is submitted along with the operation.

package/src/intervalCollection.ts

@@ -7,7 +7,7 @@
 /* eslint-disable import/no-deprecated */
 
 import { TypedEventEmitter } from "@fluid-internal/client-utils";
-import { assert } from "@fluidframework/core-utils";
+import { assert, unreachableCase } from "@fluidframework/core-utils";
 import { IEvent } from "@fluidframework/core-interfaces";
 import {
 	addProperties,
@@ -35,6 +35,7 @@ import {
 	IValueOpEmitter,
 	IValueOperation,
 	IValueType,
+	IValueTypeOperationValue,
 	SequenceOptions,
 } from "./defaultMapInterfaces";
 import {
@@ -53,6 +54,7 @@ import {
 	startReferenceSlidingPreference,
 	sequenceIntervalHelpers,
 	createInterval,
+	IntervalDeltaOpType,
 } from "./intervals";
 import {
 	EndpointIndex,
@@ -578,6 +580,13 @@ export function makeOpsMap<T extends ISerializableInterval>(): Map<
 		return { rebasedOp, rebasedLocalOpMetadata: localOpMetadata };
 	};
 
+	const applyStashedOp: IValueOperation<IntervalCollection<T>>["applyStashedOp"] = (
+		collection,
+		op,
+	) => {
+		return collection.applyStashedOp(op);
+	};
+
 	return new Map<IntervalOpType, IValueOperation<IntervalCollection<T>>>([
 		[
 			IntervalOpType.ADD,
@@ -592,6 +601,7 @@ export function makeOpsMap<T extends ISerializableInterval>(): Map<
 					collection.ackAdd(params, local, op, localOpMetadata);
 				},
 				rebase,
+				applyStashedOp,
 			},
 		],
 		[
@@ -605,6 +615,7 @@ export function makeOpsMap<T extends ISerializableInterval>(): Map<
 					// Deletion of intervals is based on id, so requires no rebasing.
 					return { rebasedOp: op, rebasedLocalOpMetadata: localOpMetadata };
 				},
+				applyStashedOp,
 			},
 		],
 		[
@@ -620,6 +631,7 @@ export function makeOpsMap<T extends ISerializableInterval>(): Map<
 					collection.ackChange(params, local, op, localOpMetadata);
 				},
 				rebase,
+				applyStashedOp,
 			},
 		],
 	]);
@@ -724,12 +736,6 @@ export interface IIntervalCollectionEvent<TInterval extends ISerializableInterva
 	): void;
 }
 
-// solely for type checking in the implementation of add - will be removed once
-// deprecated signatures are removed
-const isSequencePlace = (place: any): place is SequencePlace => {
-	return typeof place === "number" || typeof place === "string" || place.pos !== undefined;
-};
-
 /**
  * Collection of intervals that supports addition, modification, removal, and efficient spatial querying.
  * Changes to this collection will be incur updates on collaborating clients (i.e. they are not local-only).
@@ -762,12 +768,10 @@ export interface IIntervalCollection<TInterval extends ISerializableInterval>
 	getIntervalById(id: string): TInterval | undefined;
 	/**
 	 * Creates a new interval and add it to the collection.
-	 * @deprecated call IntervalCollection.add without specifying an intervalType
 	 * @param start - interval start position (inclusive)
 	 * @param end - interval end position (exclusive)
-	 * @param intervalType - type of the interval. All intervals are SlideOnRemove. Intervals may not be Transient.
 	 * @param props - properties of the interval
-	 * @returns The created interval
+	 * @returns - the created interval
 	 * @remarks See documentation on {@link SequenceInterval} for comments on
 	 * interval endpoint semantics: there are subtleties with how the current
 	 * half-open behavior is represented.
@@ -833,21 +837,6 @@ export interface IIntervalCollection<TInterval extends ISerializableInterval>
 	 * the case that the entire interval has been deleted should be resolved at
 	 * the same time as this ticket
 	 */
-	add(
-		start: SequencePlace,
-		end: SequencePlace,
-		intervalType: IntervalType,
-		props?: PropertySet,
-	): TInterval;
-	/**
-	 * Creates a new interval and add it to the collection.
-	 * @param start - interval start position (inclusive)
-	 * @param end - interval end position (exclusive)
-	 * @param props - properties of the interval
-	 * @returns - the created interval
-	 * @remarks - See documentation on {@link SequenceInterval} for comments on interval endpoint semantics: there are subtleties
-	 * with how the current half-open behavior is represented.
-	 */
 	add({
 		start,
 		end,
@@ -863,23 +852,6 @@ export interface IIntervalCollection<TInterval extends ISerializableInterval>
 	 * @returns the removed interval
 	 */
 	removeIntervalById(id: string): TInterval | undefined;
-	/**
-	 * Changes the properties on an existing interval.
-	 * @deprecated - call change with the id and and object containing the new properties
-	 * @param id - Id of the interval whose properties should be changed
-	 * @param props - Property set to apply to the interval. Shallow merging is used between any existing properties
-	 * and `prop`, i.e. the interval will end up with a property object equivalent to `{ ...oldProps, ...props }`.
-	 */
-	changeProperties(id: string, props: PropertySet): void;
-	/**
-	 * Changes the endpoints of an existing interval.
-	 * @deprecated - call change with the start and end parameters encapsulated in an object
-	 * @param id - Id of the interval to change
-	 * @param start - New start value. To leave the endpoint unchanged, pass the current value.
-	 * @param end - New end value. To leave the endpoint unchanged, pass the current value.
-	 * @returns the interval that was changed, if it existed in the collection.
-	 */
-	change(id: string, start: SequencePlace, end: SequencePlace): TInterval | undefined;
 	/**
 	 * Changes the endpoints, properties, or both of an existing interval.
 	 * @param id - Id of the Interval to change
@@ -1257,15 +1229,7 @@ export class IntervalCollection<TInterval extends ISerializableInterval>
 
 	/**
 	 * {@inheritdoc IIntervalCollection.add}
-	 * @deprecated call IntervalCollection.add without specifying an intervalType
 	 */
-	public add(
-		start: SequencePlace,
-		end: SequencePlace,
-		intervalType: IntervalType,
-		props?: PropertySet,
-	): TInterval;
-
 	public add({
 		start,
 		end,
@@ -1274,47 +1238,12 @@ export class IntervalCollection<TInterval extends ISerializableInterval>
 		start: SequencePlace;
 		end: SequencePlace;
 		props?: PropertySet;
-	}): TInterval;
-
-	public add(
-		start:
-			| SequencePlace
-			| {
-					start: SequencePlace;
-					end: SequencePlace;
-					props?: PropertySet;
-			  },
-		end?: SequencePlace,
-		intervalType?: IntervalType,
-		props?: PropertySet,
-	): TInterval {
-		let intStart: SequencePlace;
-		let intEnd: SequencePlace;
-		let type: IntervalType;
-		let properties: PropertySet | undefined;
-
-		if (isSequencePlace(start)) {
-			intStart = start;
-			assert(end !== undefined, 0x7c0 /* end must be defined */);
-			intEnd = end;
-			assert(intervalType !== undefined, 0x7c1 /* intervalType must be defined */);
-			type = intervalType;
-			properties = props;
-		} else {
-			intStart = start.start;
-			intEnd = start.end;
-			type = IntervalType.SlideOnRemove;
-			properties = start.props;
-		}
-
+	}): TInterval {
 		if (!this.localCollection) {
 			throw new LoggingError("attach must be called prior to adding intervals");
 		}
-		if (type & IntervalType.Transient) {
-			throw new LoggingError("Can not add transient intervals");
-		}
 
-		const { startSide, endSide, startPos, endPos } = endpointPosAndSide(intStart, intEnd);
+		const { startSide, endSide, startPos, endPos } = endpointPosAndSide(start, end);
 
 		assert(
 			startPos !== undefined &&
@@ -1326,13 +1255,13 @@ export class IntervalCollection<TInterval extends ISerializableInterval>
 
 		const stickiness = computeStickinessFromSide(startPos, startSide, endPos, endSide);
 
-		this.assertStickinessEnabled(intStart, intEnd);
+		this.assertStickinessEnabled(start, end);
 
 		const interval: TInterval = this.localCollection.addInterval(
 			toSequencePlace(startPos, startSide),
 			toSequencePlace(endPos, endSide),
-			type,
-			properties,
+			IntervalType.SlideOnRemove,
+			props,
 		);
 
 		if (interval) {
@@ -1343,7 +1272,7 @@ export class IntervalCollection<TInterval extends ISerializableInterval>
 			const serializedInterval: ISerializedInterval = {
 				start: startPos,
 				end: endPos,
-				intervalType: type,
+				intervalType: IntervalType.SlideOnRemove,
 				properties: interval.properties,
 				sequenceNumber: this.client?.getCurrentSeq() ?? 0,
 				stickiness,
@@ -1401,45 +1330,13 @@ export class IntervalCollection<TInterval extends ISerializableInterval>
 		}
 		return interval;
 	}
-
-	/**
-	 * {@inheritdoc IIntervalCollection.changeProperties}
-	 * @deprecated - call change with the id and an object containing the new props values
-	 */
-	public changeProperties(id: string, props: PropertySet) {
-		this.change(id, { props });
-	}
-
-	/**
-	 * {@inheritdoc IIntervalCollection.change}
-	 * @deprecated - call change with the id and an object containing the new start, end, and/or props values
-	 */
-	public change(id: string, start: SequencePlace, end: SequencePlace): TInterval | undefined;
 	/**
 	 * {@inheritdoc IIntervalCollection.change}
 	 */
 	public change(
 		id: string,
 		{ start, end, props }: { start?: SequencePlace; end?: SequencePlace; props?: PropertySet },
-	): TInterval | undefined;
-	public change(
-		arg1: string,
-		arg2: SequencePlace | { start?: SequencePlace; end?: SequencePlace; props?: PropertySet },
-		arg3?: SequencePlace,
 	): TInterval | undefined {
-		const id: string = arg1;
-		let start: SequencePlace | undefined;
-		let end: SequencePlace | undefined;
-		let props: PropertySet | undefined;
-		if (isSequencePlace(arg2)) {
-			start = arg2;
-			end = arg3;
-		} else {
-			start = arg2.start;
-			end = arg2.end;
-			props = arg2.props;
-		}
-
 		if (!this.localCollection) {
 			throw new LoggingError("Attach must be called before accessing intervals");
 		}
@@ -1759,6 +1656,53 @@ export class IntervalCollection<TInterval extends ISerializableInterval>
 		return rebased;
 	}
 
+	public applyStashedOp(op: IValueTypeOperationValue): IMapMessageLocalMetadata {
+		let interval: TInterval | undefined;
+		let props: PropertySet | undefined;
+		let intervalId: string;
+		switch (op.opName) {
+			case IntervalDeltaOpType.ADD: {
+				assert(op.value.start !== undefined, 0x87a /* start is undefined */);
+				assert(op.value.end !== undefined, 0x87b /* end is undefined */);
+				interval = this.add({
+					start: op.value.start,
+					end: op.value.end,
+					props: op.value.properties,
+				});
+				const metadata = {
+					localSeq: this.getNextLocalSeq(),
+				};
+				if (interval !== undefined) {
+					this.localSeqToSerializedInterval.set(metadata.localSeq, interval.serialize());
+				}
+				return metadata;
+			}
+			case IntervalDeltaOpType.DELETE:
+				this.removeIntervalById(op.value.properties?.intervalId);
+				return {
+					localSeq: this.getNextLocalSeq(),
+				};
+			case IntervalDeltaOpType.CHANGE: {
+				assert(op.value.properties !== undefined, 0x87c /* properties is undefined */);
+				({ intervalId, ...props } = op.value.properties);
+				interval = this.change(intervalId, {
+					start: op.value.start,
+					end: op.value.end,
+					props,
+				});
+				const metadata = {
+					localSeq: this.getNextLocalSeq(),
+				};
+				if (interval !== undefined) {
+					this.localSeqToSerializedInterval.set(metadata.localSeq, interval.serialize());
+				}
+				return metadata;
+			}
+			default:
+				unreachableCase(op.opName, `Unknown interval op type: ${op.opName}`);
+		}
+	}
+
 	private getSlideToSegment(
 		lref: LocalReferencePosition,
 	): { segment: ISegment | undefined; offset: number | undefined } | undefined {

package/src/intervals/index.ts

@@ -9,6 +9,7 @@ export {
 	ISerializableInterval,
 	IntervalOpType,
 	IntervalType,
+	IntervalDeltaOpType,
 	IIntervalHelpers,
 	IntervalStickiness,
 	SerializedIntervalDelta,