@fluidframework/sequence 2.0.0-rc.1.0.4 → 2.0.0-rc.2.0.0

package/{.eslintrc.js → .eslintrc.cjs}

@@ -4,7 +4,10 @@
  */
 
 module.exports = {
-	extends: [require.resolve("@fluidframework/eslint-config-fluid/minimal"), "prettier"],
+	extends: [
+		require.resolve("@fluidframework/eslint-config-fluid/minimal-deprecated"),
+		"prettier",
+	],
 	parserOptions: {
 		project: ["./tsconfig.json", "./src/test/tsconfig.json"],
 	},

package/{.mocharc.js → .mocharc.cjs}

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const getFluidTestMochaConfig = require("@fluidframework/mocha-test-setup/mocharc-common");
+const getFluidTestMochaConfig = require("@fluid-internal/mocha-test-setup/mocharc-common");
 
 const packageDir = __dirname;
 const config = getFluidTestMochaConfig(packageDir);

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @fluidframework/sequence
 
+## 2.0.0-rc.2.0.0
+
+### Minor Changes
+
+-   container-definitions: ILoaderOptions no longer accepts arbitrary key/value pairs ([#19306](https://github.com/microsoft/FluidFramework/issues/19306)) [741926e225](https://github.com/microsoft/FluidFramework/commits/741926e2253a161504ecc6a6451d8f15d7ac4ed6)
+
+    ILoaderOptions has been narrowed to the specific set of supported loader options, and may no longer be used to pass arbitrary key/value pairs through to the runtime.
+
 ## 2.0.0-rc.1.0.0
 
 ### Minor Changes

package/README.md

@@ -595,8 +595,8 @@ There are plans to make attribution policies more flexible, for example tracking
     -   [smde](https://github.com/microsoft/FluidFramework/tree/main/examples/data-objects/smde)
 
 -   Plain Text Editor Implementations
-    -   [collaborativeTextArea](https://github.com/microsoft/FluidFramework/blob/main/experimental/framework/react-inputs/src/CollaborativeTextArea.tsx)
-    -   [collaborativeInput](https://github.com/microsoft/FluidFramework/blob/main/experimental/framework/react-inputs/src/CollaborativeInput.tsx)
+    -   [collaborativeTextArea](https://github.com/microsoft/FluidFramework/blob/main/examples/utils/example-utils/src/reactInputs/CollaborativeTextArea.tsx)
+    -   [collaborativeInput](https://github.com/microsoft/FluidFramework/blob/main/examples/utils/example-utils/src/reactInputs/CollaborativeInput.tsx)
 
 <!-- This line ends the content that is copied to the string.md README -->
 

package/{api-extractor-esm.json → api-extractor-cjs.json}

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

package/api-extractor.json

@@ -1,4 +1,4 @@
 {
 	"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-	"extends": "../../../common/build/build-common/api-extractor-base.json"
+	"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
 }

package/api-report/sequence.api.md

@@ -50,19 +50,19 @@ import { TextSegment } from '@fluidframework/merge-tree';
 import { TrackingGroup } from '@fluidframework/merge-tree';
 import { TypedEventEmitter } from '@fluid-internal/client-utils';
 
-// @internal
+// @alpha
 export function appendAddIntervalToRevertibles(interval: SequenceInterval, revertibles: SharedStringRevertible[]): SharedStringRevertible[];
 
-// @internal
+// @alpha
 export function appendChangeIntervalToRevertibles(string: SharedString, newInterval: SequenceInterval, previousInterval: SequenceInterval, revertibles: SharedStringRevertible[]): SharedStringRevertible[];
 
-// @internal
+// @alpha
 export function appendDeleteIntervalToRevertibles(string: SharedString, interval: SequenceInterval, revertibles: SharedStringRevertible[]): SharedStringRevertible[];
 
-// @internal
+// @alpha
 export function appendIntervalPropertyChangedToRevertibles(interval: SequenceInterval, deltas: PropertySet, revertibles: SharedStringRevertible[]): SharedStringRevertible[];
 
-// @internal
+// @alpha
 export function appendSharedStringDeltaToRevertibles(string: SharedString, delta: SequenceDeltaEvent, revertibles: SharedStringRevertible[]): void;
 
 export { BaseSegment }
@@ -76,7 +76,7 @@ export function createEndpointInRangeIndex(sharedString: SharedString): IEndpoin
 // @internal (undocumented)
 export function createIdIntervalIndex<TInterval extends ISerializableInterval>(): IIdIntervalIndex<TInterval>;
 
-// @internal (undocumented)
+// @alpha (undocumented)
 export function createOverlappingIntervalsIndex(sharedString: SharedString): IOverlappingIntervalsIndex<SequenceInterval>;
 
 // @internal (undocumented)
@@ -88,7 +88,7 @@ export function createStartpointInRangeIndex(sharedString: SharedString): IStart
 // @alpha (undocumented)
 export type DeserializeCallback = (properties: PropertySet) => void;
 
-// @internal
+// @alpha
 export function discardSharedStringRevertibles(sharedString: SharedString, revertibles: SharedStringRevertible[]): void;
 
 // @internal
@@ -178,6 +178,7 @@ export interface IIntervalCollectionEvent<TInterval extends ISerializableInterva
     (event: "changeInterval", listener: (interval: TInterval, previousInterval: TInterval, local: boolean, op: ISequencedDocumentMessage | undefined, slide: boolean) => void): void;
     (event: "addInterval" | "deleteInterval", listener: (interval: TInterval, local: boolean, op: ISequencedDocumentMessage | undefined) => void): void;
     (event: "propertyChanged", listener: (interval: TInterval, propertyDeltas: PropertySet, local: boolean, op: ISequencedDocumentMessage | undefined) => void): void;
+    (event: "changed", listener: (interval: TInterval, propertyDeltas: PropertySet, previousInterval: TInterval | undefined, local: boolean, slide: boolean) => void): void;
 }
 
 // @internal @sealed @deprecated (undocumented)
@@ -254,7 +255,7 @@ export interface IntervalLocator {
 // @internal
 export function intervalLocatorFromEndpoint(potentialEndpoint: LocalReferencePosition): IntervalLocator | undefined;
 
-// @internal
+// @alpha
 export const IntervalOpType: {
     readonly PROPERTY_CHANGED: "propertyChanged";
     readonly POSITION_REMOVE: "positionRemove";
@@ -263,10 +264,10 @@ export const IntervalOpType: {
     readonly CHANGE: "change";
 };
 
-// @internal (undocumented)
+// @alpha (undocumented)
 export type IntervalOpType = (typeof IntervalOpType)[keyof typeof IntervalOpType];
 
-// @internal
+// @alpha
 export type IntervalRevertible = {
     event: typeof IntervalOpType.CHANGE;
     interval: SequenceInterval;
@@ -320,7 +321,7 @@ export enum IntervalType {
     Transient = 4
 }
 
-// @internal (undocumented)
+// @alpha (undocumented)
 export interface IOverlappingIntervalsIndex<TInterval extends ISerializableInterval> extends IntervalIndex<TInterval> {
     // (undocumented)
     findOverlappingIntervals(start: SequencePlace, end: SequencePlace): TInterval[];
@@ -418,7 +419,7 @@ export { reservedRangeLabelsKey }
 
 export { reservedTileLabelsKey }
 
-// @internal
+// @alpha
 export function revertSharedStringRevertibles(sharedString: SharedString, revertibles: SharedStringRevertible[]): void;
 
 // @alpha
@@ -529,7 +530,6 @@ export class SharedIntervalCollection extends SharedObject implements ISharedInt
     // (undocumented)
     getIntervalCollection(label: string): IIntervalCollection<Interval>;
     protected getIntervalCollectionPath(label: string): string;
-    // (undocumented)
     protected loadCore(storage: IChannelStorageService): Promise<void>;
     // (undocumented)
     protected onDisconnect(): void;
@@ -549,7 +549,6 @@ export class SharedIntervalCollectionFactory implements IChannelFactory {
     get attributes(): IChannelAttributes;
     // (undocumented)
     create(runtime: IFluidDataStoreRuntime, id: string): SharedIntervalCollection;
-    // (undocumented)
     load(runtime: IFluidDataStoreRuntime, id: string, services: IChannelServices, attributes: IChannelAttributes): Promise<SharedIntervalCollection>;
     // (undocumented)
     static readonly Type = "https://graph.microsoft.com/types/sharedIntervalCollection";
@@ -561,12 +560,10 @@ export class SharedIntervalCollectionFactory implements IChannelFactory {
 export abstract class SharedSegmentSequence<T extends ISegment> extends SharedObject<ISharedSegmentSequenceEvents> implements ISharedIntervalCollection<SequenceInterval>, MergeTreeRevertibleDriver {
     constructor(dataStoreRuntime: IFluidDataStoreRuntime, id: string, attributes: IChannelAttributes, segmentFromSpec: (spec: IJSONSegment) => ISegment);
     annotateRange(start: number, end: number, props: PropertySet): void;
-    // (undocumented)
-    protected applyStashedOp(content: any): unknown;
+    protected applyStashedOp(content: any): void;
     // (undocumented)
     protected client: Client;
     createLocalReferencePosition(segment: T, offset: number, refType: ReferenceType, properties: PropertySet | undefined, slidingPreference?: SlidingPreference, canSlideToEndpoint?: boolean): LocalReferencePosition;
-    // (undocumented)
     protected didAttach(): void;
     getContainingSegment(pos: number): {
         segment: T | undefined;
@@ -591,23 +588,18 @@ export abstract class SharedSegmentSequence<T extends ISegment> extends SharedOb
     protected guardReentrancy: <TRet>(callback: () => TRet) => TRet;
     // (undocumented)
     id: string;
-    // (undocumented)
     protected initializeLocalCore(): void;
     insertAtReferencePosition(pos: ReferencePosition, segment: T): void;
     insertFromSpec(pos: number, spec: IJSONSegment): void;
-    // (undocumented)
     protected loadCore(storage: IChannelStorageService): Promise<void>;
     // (undocumented)
     get loaded(): Promise<void>;
     protected loadedDeferred: Deferred<void>;
     localReferencePositionToPosition(lref: ReferencePosition): number;
     obliterateRange(start: number, end: number): void;
-    // (undocumented)
     protected onConnect(): void;
-    // (undocumented)
     protected onDisconnect(): void;
     posFromRelativePos(relativePos: IRelativePosition): number;
-    // (undocumented)
     protected processCore(message: ISequencedDocumentMessage, local: boolean, localOpMetadata: unknown): void;
     protected processGCDataCore(serializer: IFluidSerializer): void;
     removeLocalReferencePosition(lref: LocalReferencePosition): LocalReferencePosition | undefined;
@@ -615,11 +607,9 @@ export abstract class SharedSegmentSequence<T extends ISegment> extends SharedOb
     removeRange(start: number, end: number): void;
     protected replaceRange(start: number, end: number, segment: ISegment): void;
     resolveRemoteClientPosition(remoteClientPosition: number, remoteClientRefSeq: number, remoteClientId: string): number | undefined;
-    // (undocumented)
     protected reSubmitCore(content: any, localOpMetadata: unknown): void;
     // (undocumented)
     readonly segmentFromSpec: (spec: IJSONSegment) => ISegment;
-    // (undocumented)
     protected summarizeCore(serializer: IFluidSerializer, telemetryContext?: ITelemetryContext): ISummaryTreeWithStats;
     walkSegments<TClientData>(handler: ISegmentAction<TClientData>, start?: number, end?: number, accum?: TClientData, splitRange?: boolean): void;
 }
@@ -668,9 +658,7 @@ export class SharedStringFactory implements IChannelFactory {
     static readonly Attributes: IChannelAttributes;
     // (undocumented)
     get attributes(): IChannelAttributes;
-    // (undocumented)
     create(document: IFluidDataStoreRuntime, id: string): SharedString;
-    // (undocumented)
     load(runtime: IFluidDataStoreRuntime, id: string, services: IChannelServices, attributes: IChannelAttributes): Promise<SharedString>;
     // (undocumented)
     static segmentFromSpec(spec: any): SharedStringSegment;
@@ -680,7 +668,7 @@ export class SharedStringFactory implements IChannelFactory {
     get type(): string;
 }
 
-// @internal
+// @alpha
 export type SharedStringRevertible = MergeTreeDeltaRevertible | IntervalRevertible;
 
 // @alpha (undocumented)

package/dist/defaultMap.d.ts

@@ -6,7 +6,8 @@ import { IFluidHandle } from "@fluidframework/core-interfaces";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import { IFluidSerializer } from "@fluidframework/shared-object-base";
 import { TypedEventEmitter } from "@fluid-internal/client-utils";
-import { ISerializableValue, ISerializedValue, IValueType, ISharedDefaultMapEvents, IMapMessageLocalMetadata, SequenceOptions, IValueTypeOperationValue } from "./defaultMapInterfaces";
+import { ISerializableValue, ISerializedValue, IValueType, ISharedDefaultMapEvents, IMapMessageLocalMetadata, SequenceOptions, IValueTypeOperationValue } from "./defaultMapInterfaces.js";
+import { type IntervalCollection } from "./intervalCollection.js";
 /**
  * Describes an operation specific to a value type.
  */
@@ -21,7 +22,6 @@ export interface IMapValueTypeOperation {
     key: string;
     /**
      * Value of the operation, specific to the value type.
-     * @alpha
      */
     value: IValueTypeOperationValue;
 }
@@ -46,7 +46,7 @@ export interface IMapDataObjectSerialized {
  * Creation of values is implicit on access (either via `get` or a remote op application referring to
  * a collection that wasn't previously known)
  */
-export declare class DefaultMap<T> {
+export declare class DefaultMap<T extends IntervalCollection<any> = IntervalCollection<any>> {
     private readonly serializer;
     private readonly handle;
     private readonly submitMessage;
@@ -60,7 +60,7 @@ export declare class DefaultMap<T> {
     /**
      * Mapping of op types to message handlers.
      */
-    private readonly messageHandlers;
+    private readonly messageHandler;
     /**
      * The in-memory data the map is storing.
      */
@@ -119,10 +119,10 @@ export declare class DefaultMap<T> {
     serialize(serializer: IFluidSerializer): string;
     /**
      * Populate the kernel with the given map data.
-     * @param data - A JSON string containing serialized map data
+     *
+     * @param serialized - A JSON string containing serialized map data
      */
-    populateFromSerializable(json: IMapDataObjectSerializable): void;
-    populate(json: string): void;
+    populate(serialized: string): void;
     /**
      * Submit the given op if a handler is registered.
      * @param op - The operation to attempt to submit
@@ -131,8 +131,8 @@ export declare class DefaultMap<T> {
      * also sent if we are asked to resubmit the message.
      * @returns True if the operation was submitted, false otherwise.
      */
-    tryResubmitMessage(op: IMapOperation, localOpMetadata: IMapMessageLocalMetadata): boolean;
-    tryGetStashedOpLocalMetadata(op: unknown): IMapMessageLocalMetadata | undefined;
+    tryResubmitMessage(op: unknown, localOpMetadata: IMapMessageLocalMetadata): boolean;
+    tryApplyStashedOp(op: unknown): boolean;
     /**
      * Process the given op if a handler is registered.
      * @param message - The message to process
@@ -141,7 +141,7 @@ export declare class DefaultMap<T> {
      * For messages from a remote client, this will be undefined.
      * @returns True if the operation was processed, false otherwise.
      */
-    tryProcessMessage(op: IMapOperation, local: boolean, message: ISequencedDocumentMessage | undefined, localOpMetadata: unknown): boolean;
+    tryProcessMessage(op: unknown, local: boolean, message: ISequencedDocumentMessage, localOpMetadata: unknown): boolean;
     /**
      * Initializes a default ValueType at the provided key.
      * Should be used when a map operation incurs creation.
@@ -160,14 +160,8 @@ export declare class DefaultMap<T> {
      * @returns The local value that was produced
      */
     private makeLocal;
-    /**
-     * Get the message handlers for the map.
-     * @returns A map of string op names to IMapMessageHandlers for those ops
-     */
-    private getMessageHandlers;
     /**
      * Create an emitter for a value type to emit ops from the given key.
-     * @alpha
      * @param key - The key of the map that the value type will be stored on
      * @returns A value op emitter for the given key
      */

package/dist/defaultMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaultMap.d.ts","sourceRoot":"","sources":["../src/defaultMap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"defaultMap.d.ts","sourceRoot":"","sources":["../src/defaultMap.ts"],"names":[],"mappings":"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"}

package/dist/defaultMap.js

@@ -8,7 +8,8 @@ exports.DefaultMap = void 0;
 const shared_object_base_1 = require("@fluidframework/shared-object-base");
 const client_utils_1 = require("@fluid-internal/client-utils");
 const core_utils_1 = require("@fluidframework/core-utils");
-const localValues_1 = require("./localValues");
+const localValues_js_1 = require("./localValues.js");
+const intervalCollection_js_1 = require("./intervalCollection.js");
 function isMapOperation(op) {
     return typeof op === "object" && op !== null && "type" in op && op.type === "act";
 }
@@ -44,12 +45,34 @@ class DefaultMap {
         /**
          * Mapping of op types to message handlers.
          */
-        this.messageHandlers = new Map();
+        this.messageHandler = {
+            process: (op, local, message, localOpMetadata) => {
+                const localValue = this.data.get(op.key) ?? this.createCore(op.key, local);
+                const handler = localValue.getOpHandler(op.value.opName);
+                const previousValue = localValue.value;
+                const translatedValue = op.value.value;
+                handler.process(previousValue, translatedValue, local, message, localOpMetadata);
+                const event = { key: op.key, previousValue };
+                this.eventEmitter.emit("valueChanged", event, local, message, this.eventEmitter);
+            },
+            submit: (op, localOpMetadata) => {
+                this.submitMessage(op, localOpMetadata);
+            },
+            resubmit: (op, localOpMetadata) => {
+                const localValue = this.data.get(op.key);
+                (0, core_utils_1.assert)(localValue !== undefined, 0x3f8 /* Local value expected on resubmission */);
+                const handler = localValue.getOpHandler(op.value.opName);
+                const rebased = handler.rebase(localValue.value, op.value, localOpMetadata);
+                if (rebased !== undefined) {
+                    const { rebasedOp, rebasedLocalOpMetadata } = rebased;
+                    this.submitMessage({ ...op, value: rebasedOp }, rebasedLocalOpMetadata);
+                }
+            },
+        };
         /**
          * The in-memory data the map is storing.
          */
         this.data = new Map();
-        this.messageHandlers = this.getMessageHandlers();
     }
     /**
      * Get an iterator over the keys in this map.
@@ -142,7 +165,7 @@ class DefaultMap {
     getSerializableStorage(serializer) {
         const serializableMapData = {};
         this.data.forEach((localValue, key) => {
-            serializableMapData[key] = (0, localValues_1.makeSerializable)(localValue, serializer, this.handle);
+            serializableMapData[key] = (0, localValues_js_1.makeSerializable)(localValue, serializer, this.handle);
         });
         return serializableMapData;
     }
@@ -151,10 +174,12 @@ class DefaultMap {
     }
     /**
      * Populate the kernel with the given map data.
-     * @param data - A JSON string containing serialized map data
+     *
+     * @param serialized - A JSON string containing serialized map data
      */
-    populateFromSerializable(json) {
-        for (const [key, serializable] of Object.entries(json)) {
+    populate(serialized) {
+        const parsed = this.serializer.parse(serialized);
+        for (const [key, serializable] of Object.entries(parsed)) {
             // Back-compat: legacy documents may have handles to an intervalCollection map kernel.
             // These collections should be empty, and ValueTypes are no longer supported.
             if (serializable.type === shared_object_base_1.ValueType[shared_object_base_1.ValueType.Plain] ||
@@ -173,9 +198,6 @@ class DefaultMap {
             this.data.set(localValue.key, localValue.value);
         }
     }
-    populate(json) {
-        this.populateFromSerializable(JSON.parse(json));
-    }
     /**
      * Submit the given op if a handler is registered.
      * @param op - The operation to attempt to submit
@@ -185,20 +207,47 @@ class DefaultMap {
      * @returns True if the operation was submitted, false otherwise.
      */
     tryResubmitMessage(op, localOpMetadata) {
-        const type = op.type;
-        const handler = this.messageHandlers.get(type);
-        if (handler !== undefined) {
-            handler.resubmit(op, localOpMetadata);
+        if (isMapOperation(op)) {
+            this.messageHandler.resubmit(op, localOpMetadata);
             return true;
         }
         return false;
     }
-    tryGetStashedOpLocalMetadata(op) {
-        if (isMapOperation(op) && this.messageHandlers.has(op.type)) {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            return this.messageHandlers.get(op.type).getStashedOpLocalMetadata(op);
+    tryApplyStashedOp(op) {
+        if (isMapOperation(op)) {
+            const { value, key } = op;
+            const map = this.get(key);
+            switch (value.opName) {
+                case "add": {
+                    map.add({
+                        // Todo: we should improve typing so we know add ops always have start and end
+                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                        start: (0, intervalCollection_js_1.toSequencePlace)(value.value.start, value.value.startSide),
+                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                        end: (0, intervalCollection_js_1.toSequencePlace)(value.value.end, value.value.endSide),
+                        props: value.value.properties,
+                    });
+                    return true;
+                }
+                case "change": {
+                    const { [intervalCollection_js_1.reservedIntervalIdKey]: id, ...props } = value.value.properties ?? {};
+                    map.change(id, {
+                        start: (0, intervalCollection_js_1.toOptionalSequencePlace)(value.value.start, value.value.startSide),
+                        end: (0, intervalCollection_js_1.toOptionalSequencePlace)(value.value.end, value.value.endSide),
+                        props,
+                    });
+                    return true;
+                }
+                case "delete": {
+                    const { [intervalCollection_js_1.reservedIntervalIdKey]: id } = value.value.properties ?? {};
+                    map.removeIntervalById(id);
+                    return true;
+                }
+                default:
+                    throw new Error("unknown ops should not be stashed");
+            }
         }
-        return undefined;
+        return false;
     }
     /**
      * Process the given op if a handler is registered.
@@ -209,9 +258,8 @@ class DefaultMap {
      * @returns True if the operation was processed, false otherwise.
      */
     tryProcessMessage(op, local, message, localOpMetadata) {
-        const handler = this.messageHandlers.get(op.type);
-        if (handler !== undefined) {
-            handler.process(op, local, message, localOpMetadata);
+        if (isMapOperation(op)) {
+            this.messageHandler.process(op, local, message, localOpMetadata);
             return true;
         }
         return false;
@@ -223,7 +271,7 @@ class DefaultMap {
      * @param local - Whether the message originated from the local client
      */
     createCore(key, local) {
-        const localValue = new localValues_1.ValueTypeLocalValue(this.type.factory.load(this.makeMapValueOpEmitter(key), undefined, this.options), this.type);
+        const localValue = new localValues_js_1.ValueTypeLocalValue(this.type.factory.load(this.makeMapValueOpEmitter(key), undefined, this.options), this.type);
         const previousValue = this.data.get(key);
         this.data.set(key, localValue);
         const event = { key, previousValue };
@@ -243,55 +291,11 @@ class DefaultMap {
     makeLocal(key, serializable) {
         (0, core_utils_1.assert)(serializable.type !== shared_object_base_1.ValueType[shared_object_base_1.ValueType.Plain] &&
             serializable.type !== shared_object_base_1.ValueType[shared_object_base_1.ValueType.Shared], 0x2e1 /* "Support for plain value types removed." */);
-        serializable.value = (0, shared_object_base_1.parseHandles)(serializable.value, this.serializer);
         const localValue = this.type.factory.load(this.makeMapValueOpEmitter(key), serializable.value, this.options);
-        return new localValues_1.ValueTypeLocalValue(localValue, this.type);
-    }
-    /**
-     * Get the message handlers for the map.
-     * @returns A map of string op names to IMapMessageHandlers for those ops
-     */
-    getMessageHandlers() {
-        const messageHandlers = new Map();
-        // Ops with type "act" describe actions taken by custom value type handlers of whatever item is
-        // being addressed.  These custom handlers can be retrieved from the ValueTypeLocalValue which has
-        // stashed its valueType (and therefore its handlers).  We also emit a valueChanged for anyone
-        // watching for manipulations of that item.
-        messageHandlers.set("act", {
-            process: (op, local, message, localOpMetadata) => {
-                const localValue = this.data.get(op.key) ?? this.createCore(op.key, local);
-                const handler = localValue.getOpHandler(op.value.opName);
-                const previousValue = localValue.value;
-                const translatedValue = (0, shared_object_base_1.parseHandles)(op.value.value, this.serializer);
-                handler.process(previousValue, translatedValue, local, message, localOpMetadata);
-                const event = { key: op.key, previousValue };
-                this.eventEmitter.emit("valueChanged", event, local, message, this.eventEmitter);
-            },
-            submit: (op, localOpMetadata) => {
-                this.submitMessage(op, localOpMetadata);
-            },
-            resubmit: (op, localOpMetadata) => {
-                const localValue = this.data.get(op.key);
-                (0, core_utils_1.assert)(localValue !== undefined, 0x3f8 /* Local value expected on resubmission */);
-                const handler = localValue.getOpHandler(op.value.opName);
-                const rebased = handler.rebase(localValue.value, op.value, localOpMetadata);
-                if (rebased !== undefined) {
-                    const { rebasedOp, rebasedLocalOpMetadata } = rebased;
-                    this.submitMessage({ ...op, value: rebasedOp }, rebasedLocalOpMetadata);
-                }
-            },
-            getStashedOpLocalMetadata: (op) => {
-                const localValue = this.data.get(op.key) ?? this.createCore(op.key, true);
-                (0, core_utils_1.assert)(localValue !== undefined, 0x879 /* Local value expected on applying stashed op */);
-                const handler = localValue.getOpHandler(op.value.opName);
-                return handler.applyStashedOp(localValue.value, op.value);
-            },
-        });
-        return messageHandlers;
+        return new localValues_js_1.ValueTypeLocalValue(localValue, this.type);
     }
     /**
      * Create an emitter for a value type to emit ops from the given key.
-     * @alpha
      * @param key - The key of the map that the value type will be stored on
      * @returns A value op emitter for the given key
      */
@@ -299,13 +303,12 @@ class DefaultMap {
     makeMapValueOpEmitter(key) {
         // eslint-disable-next-line import/no-deprecated
         const emit = (opName, previousValue, params, localOpMetadata) => {
-            const translatedParams = (0, shared_object_base_1.makeHandlesSerializable)(params, this.serializer, this.handle);
             const op = {
                 key,
                 type: "act",
                 value: {
                     opName,
-                    value: translatedParams,
+                    value: params,
                 },
             };
             this.submitMessage(op, localOpMetadata);