@fluidframework/datastore 2.0.0-dev-rc.1.0.0.228517 → 2.0.0-dev-rc.2.0.0.245554

package/lib/test/types/validateDatastorePrevious.generated.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateDatastorePrevious.generated.js","sourceRoot":"","sources":["../../../src/test/types/validateDatastorePrevious.generated.ts"],"names":[],"mappings":"AAgCA,gDAAgD,CAC5C,4CAA4C,EAAE,CAAC,CAAC;AAWpD,4CAA4C,CACxC,gDAAgD,EAAE,CAAC,CAAC;AAWxD,kDAAkD;AAC9C,uDAAuD;AACvD,8CAA8C,EAAE,CAAC,CAAC;AAWtD,8CAA8C,CAC1C,kDAAkD,EAAE,CAAC,CAAC;AAW1D,8CAA8C,CAC1C,0CAA0C,EAAE,CAAC,CAAC;AAWlD,0CAA0C,CACtC,8CAA8C,EAAE,CAAC,CAAC;AAWtD,sDAAsD,CAClD,kDAAkD,EAAE,CAAC,CAAC;AAW1D,kDAAkD,CAC9C,sDAAsD,EAAE,CAAC,CAAC;AAW9D,mDAAmD,CAC/C,+CAA+C,EAAE,CAAC,CAAC;AAWvD,+CAA+C,CAC3C,mDAAmD,EAAE,CAAC,CAAC;AAW3D,mDAAmD,CAC/C,+CAA+C,EAAE,CAAC,CAAC;AAWvD,+CAA+C,CAC3C,mDAAmD,EAAE,CAAC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n/*\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.\n * Generated by fluid-type-test-generator in @fluidframework/build-tools.\n */\nimport type * as old from \"@fluidframework/datastore-previous\";\nimport type * as current from \"../../index.js\";\n\n\n// See 'build-tools/src/type-test-generator/compatibility.ts' for more information.\ntype TypeOnly<T> = T extends number\n\t? number\n\t: T extends string\n\t? string\n\t: T extends boolean | bigint | symbol\n\t? T\n\t: {\n\t\t\t[P in keyof T]: TypeOnly<T[P]>;\n\t  };\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"EnumDeclaration_DataStoreMessageType\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_EnumDeclaration_DataStoreMessageType():\n    TypeOnly<old.DataStoreMessageType>;\ndeclare function use_current_EnumDeclaration_DataStoreMessageType(\n    use: TypeOnly<current.DataStoreMessageType>): void;\nuse_current_EnumDeclaration_DataStoreMessageType(\n    get_old_EnumDeclaration_DataStoreMessageType());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"EnumDeclaration_DataStoreMessageType\": {\"backCompat\": false}\n*/\ndeclare function get_current_EnumDeclaration_DataStoreMessageType():\n    TypeOnly<current.DataStoreMessageType>;\ndeclare function use_old_EnumDeclaration_DataStoreMessageType(\n    use: TypeOnly<old.DataStoreMessageType>): void;\nuse_old_EnumDeclaration_DataStoreMessageType(\n    get_current_EnumDeclaration_DataStoreMessageType());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"ClassDeclaration_FluidDataStoreRuntime\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_ClassDeclaration_FluidDataStoreRuntime():\n    TypeOnly<old.FluidDataStoreRuntime>;\ndeclare function use_current_ClassDeclaration_FluidDataStoreRuntime(\n    use: TypeOnly<current.FluidDataStoreRuntime>): void;\nuse_current_ClassDeclaration_FluidDataStoreRuntime(\n    // @ts-expect-error compatibility expected to be broken\n    get_old_ClassDeclaration_FluidDataStoreRuntime());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"ClassDeclaration_FluidDataStoreRuntime\": {\"backCompat\": false}\n*/\ndeclare function get_current_ClassDeclaration_FluidDataStoreRuntime():\n    TypeOnly<current.FluidDataStoreRuntime>;\ndeclare function use_old_ClassDeclaration_FluidDataStoreRuntime(\n    use: TypeOnly<old.FluidDataStoreRuntime>): void;\nuse_old_ClassDeclaration_FluidDataStoreRuntime(\n    get_current_ClassDeclaration_FluidDataStoreRuntime());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"ClassDeclaration_FluidObjectHandle\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_ClassDeclaration_FluidObjectHandle():\n    TypeOnly<old.FluidObjectHandle>;\ndeclare function use_current_ClassDeclaration_FluidObjectHandle(\n    use: TypeOnly<current.FluidObjectHandle>): void;\nuse_current_ClassDeclaration_FluidObjectHandle(\n    get_old_ClassDeclaration_FluidObjectHandle());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"ClassDeclaration_FluidObjectHandle\": {\"backCompat\": false}\n*/\ndeclare function get_current_ClassDeclaration_FluidObjectHandle():\n    TypeOnly<current.FluidObjectHandle>;\ndeclare function use_old_ClassDeclaration_FluidObjectHandle(\n    use: TypeOnly<old.FluidObjectHandle>): void;\nuse_old_ClassDeclaration_FluidObjectHandle(\n    get_current_ClassDeclaration_FluidObjectHandle());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_ISharedObjectRegistry\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_InterfaceDeclaration_ISharedObjectRegistry():\n    TypeOnly<old.ISharedObjectRegistry>;\ndeclare function use_current_InterfaceDeclaration_ISharedObjectRegistry(\n    use: TypeOnly<current.ISharedObjectRegistry>): void;\nuse_current_InterfaceDeclaration_ISharedObjectRegistry(\n    get_old_InterfaceDeclaration_ISharedObjectRegistry());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"InterfaceDeclaration_ISharedObjectRegistry\": {\"backCompat\": false}\n*/\ndeclare function get_current_InterfaceDeclaration_ISharedObjectRegistry():\n    TypeOnly<current.ISharedObjectRegistry>;\ndeclare function use_old_InterfaceDeclaration_ISharedObjectRegistry(\n    use: TypeOnly<old.ISharedObjectRegistry>): void;\nuse_old_InterfaceDeclaration_ISharedObjectRegistry(\n    get_current_InterfaceDeclaration_ISharedObjectRegistry());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"VariableDeclaration_mixinRequestHandler\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_VariableDeclaration_mixinRequestHandler():\n    TypeOnly<typeof old.mixinRequestHandler>;\ndeclare function use_current_VariableDeclaration_mixinRequestHandler(\n    use: TypeOnly<typeof current.mixinRequestHandler>): void;\nuse_current_VariableDeclaration_mixinRequestHandler(\n    get_old_VariableDeclaration_mixinRequestHandler());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"VariableDeclaration_mixinRequestHandler\": {\"backCompat\": false}\n*/\ndeclare function get_current_VariableDeclaration_mixinRequestHandler():\n    TypeOnly<typeof current.mixinRequestHandler>;\ndeclare function use_old_VariableDeclaration_mixinRequestHandler(\n    use: TypeOnly<typeof old.mixinRequestHandler>): void;\nuse_old_VariableDeclaration_mixinRequestHandler(\n    get_current_VariableDeclaration_mixinRequestHandler());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"VariableDeclaration_mixinSummaryHandler\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_VariableDeclaration_mixinSummaryHandler():\n    TypeOnly<typeof old.mixinSummaryHandler>;\ndeclare function use_current_VariableDeclaration_mixinSummaryHandler(\n    use: TypeOnly<typeof current.mixinSummaryHandler>): void;\nuse_current_VariableDeclaration_mixinSummaryHandler(\n    get_old_VariableDeclaration_mixinSummaryHandler());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"VariableDeclaration_mixinSummaryHandler\": {\"backCompat\": false}\n*/\ndeclare function get_current_VariableDeclaration_mixinSummaryHandler():\n    TypeOnly<typeof current.mixinSummaryHandler>;\ndeclare function use_old_VariableDeclaration_mixinSummaryHandler(\n    use: TypeOnly<typeof old.mixinSummaryHandler>): void;\nuse_old_VariableDeclaration_mixinSummaryHandler(\n    get_current_VariableDeclaration_mixinSummaryHandler());\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/datastore",
-  "version": "2.0.0-dev-rc.1.0.0.228517",
+  "version": "2.0.0-dev-rc.2.0.0.245554",
   "description": "Fluid data store implementation",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -11,60 +11,50 @@
   "license": "MIT",
   "author": "Microsoft and contributors",
   "sideEffects": false,
+  "type": "module",
   "exports": {
     ".": {
       "import": {
-        "types": "./lib/index.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
       }
     },
-    "./alpha": {
+    "./public": {
       "import": {
-        "types": "./lib/datastore-alpha.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/datastore-public.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/datastore-alpha.d.ts",
+        "types": "./dist/datastore-public.d.ts",
         "default": "./dist/index.js"
       }
     },
-    "./beta": {
+    "./alpha": {
       "import": {
-        "types": "./lib/datastore-beta.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/datastore-alpha.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/datastore-beta.d.ts",
+        "types": "./dist/datastore-alpha.d.ts",
         "default": "./dist/index.js"
       }
     },
     "./internal": {
       "import": {
-        "types": "./lib/index.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
       }
-    },
-    "./public": {
-      "import": {
-        "types": "./lib/datastore-public.d.mts",
-        "default": "./lib/index.mjs"
-      },
-      "require": {
-        "types": "./dist/datastore-public.d.ts",
-        "default": "./dist/index.js"
-      }
     }
   },
   "main": "dist/index.js",
-  "module": "lib/index.mjs",
   "types": "dist/index.d.ts",
   "c8": {
     "all": true,
@@ -87,30 +77,31 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/container-definitions": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/core-interfaces": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/core-utils": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/datastore-definitions": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/driver-definitions": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/driver-utils": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/protocol-definitions": "^3.1.0",
-    "@fluidframework/runtime-definitions": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/runtime-utils": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.1.0.0.228517",
+    "@fluid-internal/client-utils": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/container-definitions": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/core-interfaces": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/core-utils": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/datastore-definitions": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/driver-definitions": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/driver-utils": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/id-compressor": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/protocol-definitions": "^3.2.0",
+    "@fluidframework/runtime-definitions": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/runtime-utils": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.2.0.0.245554",
     "lodash": "^4.17.21",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.13.3",
-    "@fluid-tools/build-cli": "^0.29.0",
+    "@fluid-internal/mocha-test-setup": "2.0.0-dev-rc.2.0.0.245554",
+    "@fluid-tools/build-cli": "^0.34.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.29.0",
+    "@fluidframework/build-tools": "^0.34.0",
     "@fluidframework/datastore-previous": "npm:@fluidframework/datastore@2.0.0-internal.8.0.0",
-    "@fluidframework/eslint-config-fluid": "^3.2.0",
-    "@fluidframework/mocha-test-setup": "2.0.0-dev-rc.1.0.0.228517",
-    "@fluidframework/test-runtime-utils": "2.0.0-dev-rc.1.0.0.228517",
-    "@microsoft/api-extractor": "^7.38.3",
+    "@fluidframework/eslint-config-fluid": "^5.1.0",
+    "@fluidframework/test-runtime-utils": "2.0.0-dev-rc.2.0.0.245554",
+    "@microsoft/api-extractor": "^7.42.3",
     "@types/lodash": "^4.14.118",
     "@types/mocha": "^9.1.1",
     "@types/node": "^18.19.0",
@@ -118,14 +109,13 @@
     "c8": "^8.0.1",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
-    "eslint": "~8.50.0",
+    "eslint": "~8.55.0",
     "mocha": "^10.2.0",
     "mocha-json-output-reporter": "^2.0.1",
     "mocha-multi-reporters": "^1.5.1",
     "moment": "^2.21.0",
     "prettier": "~3.0.3",
     "rimraf": "^4.4.0",
-    "tsc-multi": "^1.1.0",
     "typescript": "~5.1.6"
   },
   "fluidBuild": {
@@ -141,18 +131,24 @@
     }
   },
   "typeValidation": {
-    "broken": {}
+    "broken": {
+      "ClassDeclaration_FluidDataStoreRuntime": {
+        "forwardCompat": false
+      }
+    }
   },
   "scripts": {
     "api": "fluid-build . --task api",
-    "api-extractor:commonjs": "api-extractor run --local",
-    "api-extractor:esnext": "api-extractor run --config ./api-extractor-esm.json",
+    "api-extractor:commonjs": "api-extractor run --config ./api-extractor-cjs.json",
+    "api-extractor:esnext": "api-extractor run --local",
     "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-multi --config ../../../common/build/build-common/tsc-multi.esm.json",
-    "build:test": "tsc --project ./src/test/tsconfig.json",
+    "build:esnext": "tsc --project ./tsconfig.json",
+    "build:test": "npm run build:test:esm && npm run build:test:cjs",
+    "build:test:cjs": "fluid-tsc commonjs --project ./src/test/tsconfig.cjs.json",
+    "build:test:esm": "tsc --project ./src/test/tsconfig.json",
     "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",
@@ -166,9 +162,11 @@
     "prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
     "test": "npm run test:mocha",
     "test:coverage": "c8 npm test",
-    "test:mocha": "mocha --ignore \"dist/test/types/*\" --recursive dist/test --exit -r node_modules/@fluidframework/mocha-test-setup",
+    "test:mocha": "npm run test:mocha:esm && echo skipping cjs to avoid overhead - npm run test:mocha:cjs",
+    "test:mocha:cjs": "mocha --recursive \"dist/test/**/*.spec.*js\" --exit",
+    "test:mocha:esm": "mocha --recursive \"lib/test/**/*.spec.*js\" --exit",
     "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
-    "tsc": "tsc",
+    "tsc": "fluid-tsc commonjs --project ./tsconfig.cjs.json && copyfiles -f ../../../common/build/build-common/src/cjs/package.json ./dist",
     "tsc:watch": "tsc --watch",
     "typetests:gen": "fluid-type-test-generator",
     "typetests:prepare": "flub typetests --dir . --reset --previous --normalize"

package/src/channelContext.ts

@@ -27,9 +27,9 @@ import {
 } from "@fluidframework/runtime-definitions";
 import { addBlobToSummary } from "@fluidframework/runtime-utils";
 import { readAndParse } from "@fluidframework/driver-utils";
-import { ChannelStorageService } from "./channelStorageService";
-import { ChannelDeltaConnection } from "./channelDeltaConnection";
-import { ISharedObjectRegistry } from "./dataStoreRuntime";
+import { ChannelStorageService } from "./channelStorageService.js";
+import { ChannelDeltaConnection } from "./channelDeltaConnection.js";
+import { ISharedObjectRegistry } from "./dataStoreRuntime.js";
 
 export const attributesBlobKey = ".attributes";
 
@@ -78,6 +78,7 @@ export function createChannelServiceEndpoints(
 	submitFn: (content: any, localOpMetadata: unknown) => void,
 	dirtyFn: () => void,
 	addedGCOutboundReferenceFn: (srcHandle: IFluidHandle, outboundHandle: IFluidHandle) => void,
+	isAttachedAndVisible: () => boolean,
 	storageService: IDocumentStorageService,
 	logger: ITelemetryLoggerExt,
 	tree?: ISnapshotTree,
@@ -88,6 +89,7 @@ export function createChannelServiceEndpoints(
 		(message, localOpMetadata) => submitFn(message, localOpMetadata),
 		dirtyFn,
 		addedGCOutboundReferenceFn,
+		isAttachedAndVisible,
 	);
 	const objectStorage = new ChannelStorageService(tree, storageService, logger, extraBlobs);
 
@@ -97,6 +99,7 @@ export function createChannelServiceEndpoints(
 	};
 }
 
+/** Used to get the channel's summary for the DDS or DataStore attach op */
 export function summarizeChannel(
 	channel: IChannel,
 	fullTree: boolean = false,

package/src/channelDeltaConnection.ts

@@ -9,8 +9,44 @@ import { IDeltaConnection, IDeltaHandler } from "@fluidframework/datastore-defin
 import { DataProcessingError } from "@fluidframework/telemetry-utils";
 import { IFluidHandle } from "@fluidframework/core-interfaces";
 
+const stashedOpMetadataMark = Symbol();
+
+type StashedOpMetadata = { contents: any; metadata: unknown }[] &
+	Record<typeof stashedOpMetadataMark, typeof stashedOpMetadataMark>;
+
+function createStashedOpMetadata(): StashedOpMetadata {
+	const arr = [];
+	Object.defineProperty(arr, stashedOpMetadataMark, {
+		value: stashedOpMetadataMark,
+		writable: false,
+		enumerable: true,
+	});
+	return arr as any as StashedOpMetadata;
+}
+
+function isStashedOpMetadata(md: unknown): md is StashedOpMetadata {
+	return (
+		Array.isArray(md) &&
+		stashedOpMetadataMark in md &&
+		md[stashedOpMetadataMark] === stashedOpMetadataMark
+	);
+}
+
+function processWithStashedOpMetadataHandling(
+	content: any,
+	localOpMetaData: unknown,
+	func: (contents: any, metadata: unknown) => void,
+) {
+	if (isStashedOpMetadata(localOpMetaData)) {
+		localOpMetaData.forEach(({ contents, metadata }) => func(contents, metadata));
+	} else {
+		func(content, localOpMetaData);
+	}
+}
+
 export class ChannelDeltaConnection implements IDeltaConnection {
 	private _handler: IDeltaHandler | undefined;
+	private stashedOpMd: StashedOpMetadata | undefined;
 
 	private get handler(): IDeltaHandler {
 		assert(!!this._handler, 0x177 /* "Missing delta handler" */);
@@ -22,13 +58,14 @@ export class ChannelDeltaConnection implements IDeltaConnection {
 
 	constructor(
 		private _connected: boolean,
-		public readonly submit: (content: any, localOpMetadata: unknown) => void,
+		private readonly submitFn: (content: any, localOpMetadata: unknown) => void,
 		public readonly dirty: () => void,
 		/** @deprecated There is no replacement for this, its functionality is no longer needed at this layer. */
 		public readonly addedGCOutboundReference: (
 			srcHandle: IFluidHandle,
 			outboundHandle: IFluidHandle,
 		) => void,
+		private readonly isAttachedAndVisible: () => boolean,
 	) {}
 
 	public attach(handler: IDeltaHandler) {
@@ -44,7 +81,12 @@ export class ChannelDeltaConnection implements IDeltaConnection {
 	public process(message: ISequencedDocumentMessage, local: boolean, localOpMetadata: unknown) {
 		try {
 			// catches as data processing error whether or not they come from async pending queues
-			this.handler.process(message, local, localOpMetadata);
+			processWithStashedOpMetadataHandling(
+				message.contents,
+				localOpMetadata,
+				(contents, metadata) =>
+					this.handler.process({ ...message, contents }, local, metadata),
+			);
 		} catch (error) {
 			throw DataProcessingError.wrapIfUnrecognized(
 				error,
@@ -55,17 +97,39 @@ export class ChannelDeltaConnection implements IDeltaConnection {
 	}
 
 	public reSubmit(content: any, localOpMetadata: unknown) {
-		this.handler.reSubmit(content, localOpMetadata);
+		processWithStashedOpMetadataHandling(
+			content,
+			localOpMetadata,
+			this.handler.reSubmit.bind(this.handler),
+		);
 	}
 
 	public rollback(content: any, localOpMetadata: unknown) {
 		if (this.handler.rollback === undefined) {
 			throw new Error("Handler doesn't support rollback");
 		}
-		this.handler.rollback(content, localOpMetadata);
+		processWithStashedOpMetadataHandling(
+			content,
+			localOpMetadata,
+			this.handler.rollback.bind(this.handler),
+		);
 	}
 
 	public applyStashedOp(content: any): unknown {
-		return this.handler.applyStashedOp(content);
+		try {
+			this.stashedOpMd = this.isAttachedAndVisible() ? createStashedOpMetadata() : undefined;
+			this.handler.applyStashedOp(content);
+			return this.stashedOpMd;
+		} finally {
+			this.stashedOpMd = undefined;
+		}
+	}
+
+	public submit(contents: any, metadata: unknown): void {
+		if (this.stashedOpMd !== undefined) {
+			this.stashedOpMd.push({ contents, metadata });
+		} else {
+			this.submitFn(contents, metadata);
+		}
 	}
 }