@atlaskit/collab-provider 10.5.2 → 10.6.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/collab-provider
 
+## 10.6.1
+
+### Patch Changes
+
+- [#112186](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/112186)
+  [`9462d8ca2405a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9462d8ca2405a) -
+  Bump adf-schema to 47.2.1
+
+## 10.6.0
+
+### Minor Changes
+
+- [#105322](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/105322)
+  [`8876083532adc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8876083532adc) -
+  Bumped editor-prosemirror version to 7.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 10.5.2
 
 ### Patch Changes

package/dist/cjs/document/document-service.js

@@ -129,7 +129,8 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
               _this.catchUpOutofSync = _context.sent;
               latency = new Date().getTime() - start;
               (_this$analyticsHelper2 = _this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 || _this$analyticsHelper2.sendActionEvent(_const.EVENT_ACTION.CATCHUP, _const.EVENT_STATUS.SUCCESS, {
-                latency: latency
+                latency: latency,
+                version: _this.getCurrentPmVersion()
               });
               _context.next = 20;
               break;
@@ -307,10 +308,32 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
         });
       }
     });
+    (0, _defineProperty2.default)(this, "obfuscateStepsAndState", function (unconfirmedSteps, currentState) {
+      var obfuscatedSteps;
+      try {
+        obfuscatedSteps = unconfirmedSteps ? (0, _utils.getObfuscatedSteps)(unconfirmedSteps.map(function (pmStep) {
+          return pmStep.toJSON();
+        })) : 'None';
+      } catch (error) {
+        // Note that we do not log this error immediately - this string will be logged later.
+        // This avoids double logging and keeps this function pure.
+        obfuscatedSteps = 'Failed to obfuscate steps';
+      }
+      var obfuscatedDoc;
+      try {
+        obfuscatedDoc = (0, _utils.getDocAdfWithObfuscation)(currentState.content);
+      } catch (error) {
+        obfuscatedDoc = 'Failed to obfuscate doc';
+      }
+      return {
+        obfuscatedSteps: obfuscatedSteps,
+        obfuscatedDoc: obfuscatedDoc
+      };
+    });
     // Triggered when page recovery has emitted an 'init' event on a page client is currently connected to.
     (0, _defineProperty2.default)(this, "onRestore", /*#__PURE__*/function () {
       var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(_ref6) {
-        var doc, version, metadata, targetClientId, unconfirmedSteps, currentState, useReconcile, _this$analyticsHelper15, _this$analyticsHelper13, _this$analyticsHelper14, _this$analyticsHelper16, _this$analyticsHelper17;
+        var doc, version, metadata, targetClientId, unconfirmedSteps, currentState, useReconcile, _this$obfuscateStepsA, obfuscatedSteps, obfuscatedDoc, _this$analyticsHelper15, _this$analyticsHelper13, _this$analyticsHelper14, _this$analyticsHelper16, _this$analyticsHelper17;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -332,7 +355,8 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
             case 7:
               currentState = _context3.sent;
               useReconcile = Boolean((unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) && currentState && !targetClientId);
-              _context3.prev = 9;
+              _this$obfuscateStepsA = _this.obfuscateStepsAndState(unconfirmedSteps, currentState), obfuscatedSteps = _this$obfuscateStepsA.obfuscatedSteps, obfuscatedDoc = _this$obfuscateStepsA.obfuscatedDoc;
+              _context3.prev = 10;
               // Reset the editor,
               //  - Replace the document, keep in sync with the server
               //  - Replace the version number, so editor is in sync with NCS server and can commit new changes.
@@ -347,12 +371,14 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
               });
               _this.metadataService.updateMetadata(metadata);
               if (!(0, _platformFeatureFlags.fg)('restore_localstep_fallback_reconcile')) {
-                _context3.next = 26;
+                _context3.next = 27;
                 break;
               }
-              _context3.prev = 13;
+              _context3.prev = 14;
               (_this$analyticsHelper13 = _this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.INFO, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
+                obfuscatedSteps: obfuscatedSteps,
+                obfuscatedDoc: obfuscatedDoc,
                 hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title),
                 clientId: _this.clientId,
                 targetClientId: targetClientId,
@@ -361,35 +387,35 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
               if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
                 _this.applyLocalSteps(unconfirmedSteps);
               }
-              _context3.next = 24;
+              _context3.next = 25;
               break;
-            case 18:
-              _context3.prev = 18;
-              _context3.t0 = _context3["catch"](13);
+            case 19:
+              _context3.prev = 19;
+              _context3.t0 = _context3["catch"](14);
               (_this$analyticsHelper14 = _this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 || _this$analyticsHelper14.sendErrorEvent(_context3.t0, "Error while onRestore with applyLocalSteps. Will fallback to fetchReconcile");
               useReconcile = true;
-              _context3.next = 24;
+              _context3.next = 25;
               return _this.fetchReconcile(JSON.stringify(currentState.content), 'fe-restore');
-            case 24:
-              _context3.next = 32;
+            case 25:
+              _context3.next = 33;
               break;
-            case 26:
+            case 27:
               if (!(useReconcile && currentState)) {
-                _context3.next = 31;
+                _context3.next = 32;
                 break;
               }
-              _context3.next = 29;
+              _context3.next = 30;
               return _this.fetchReconcile(JSON.stringify(currentState.content), 'fe-restore');
-            case 29:
-              _context3.next = 32;
+            case 30:
+              _context3.next = 33;
               break;
-            case 31:
+            case 32:
               if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
                 // we don't want to use reconcile for restore triggered by catchup client out of sync (when targetClientId is provided)
                 // as this results in all changes made while the client was out of sync being lost
                 _this.applyLocalSteps(unconfirmedSteps);
               }
-            case 32:
+            case 33:
               (_this$analyticsHelper15 = _this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 || _this$analyticsHelper15.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.SUCCESS, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
                 hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title),
@@ -398,11 +424,11 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
                 targetClientId: targetClientId,
                 triggeredByCatchup: targetClientId ? true : false
               });
-              _context3.next = 40;
+              _context3.next = 41;
               break;
-            case 35:
-              _context3.prev = 35;
-              _context3.t1 = _context3["catch"](9);
+            case 36:
+              _context3.prev = 36;
+              _context3.t1 = _context3["catch"](10);
               (_this$analyticsHelper16 = _this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 || _this$analyticsHelper16.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.FAILURE, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
                 useReconcile: useReconcile,
@@ -419,11 +445,11 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
                   code: _internalErrors.INTERNAL_ERROR_CODE.DOCUMENT_RESTORE_ERROR
                 }
               });
-            case 40:
+            case 41:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, null, [[9, 35], [13, 18]]);
+        }, _callee3, null, [[10, 36], [14, 19]]);
       }));
       return function (_x3) {
         return _ref7.apply(this, arguments);

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/collab-provider";
-var version = exports.version = "10.5.2";
+var version = exports.version = "10.6.1";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/document/document-service.js

@@ -6,7 +6,7 @@ import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import throttle from 'lodash/throttle';
 import { MEASURE_NAME, startMeasure, stopMeasure } from '../analytics/performance';
 import { INTERNAL_ERROR_CODE } from '../errors/internal-errors';
-import { createLogger, getStepUGCFreeDetails, sleep } from '../helpers/utils';
+import { createLogger, getDocAdfWithObfuscation, getObfuscatedSteps, getStepUGCFreeDetails, sleep } from '../helpers/utils';
 import { MAX_STEP_REJECTED_ERROR, MAX_STEP_REJECTED_ERROR_AGGRESSIVE } from '../provider';
 import { commitStepQueue } from '../provider/commit-step';
 import { catchupv2 } from './catchupv2';
@@ -121,7 +121,8 @@ export class DocumentService {
         });
         const latency = new Date().getTime() - start;
         (_this$analyticsHelper2 = this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 ? void 0 : _this$analyticsHelper2.sendActionEvent(EVENT_ACTION.CATCHUP, EVENT_STATUS.SUCCESS, {
-          latency
+          latency,
+          version: this.getCurrentPmVersion()
         });
       } catch (error) {
         var _this$analyticsHelper3;
@@ -276,6 +277,26 @@ export class DocumentService {
         });
       }
     });
+    _defineProperty(this, "obfuscateStepsAndState", (unconfirmedSteps, currentState) => {
+      let obfuscatedSteps;
+      try {
+        obfuscatedSteps = unconfirmedSteps ? getObfuscatedSteps(unconfirmedSteps.map(pmStep => pmStep.toJSON())) : 'None';
+      } catch (error) {
+        // Note that we do not log this error immediately - this string will be logged later.
+        // This avoids double logging and keeps this function pure.
+        obfuscatedSteps = 'Failed to obfuscate steps';
+      }
+      let obfuscatedDoc;
+      try {
+        obfuscatedDoc = getDocAdfWithObfuscation(currentState.content);
+      } catch (error) {
+        obfuscatedDoc = 'Failed to obfuscate doc';
+      }
+      return {
+        obfuscatedSteps,
+        obfuscatedDoc
+      };
+    });
     // Triggered when page recovery has emitted an 'init' event on a page client is currently connected to.
     _defineProperty(this, "onRestore", async ({
       doc,
@@ -294,6 +315,10 @@ export class DocumentService {
       const unconfirmedSteps = this.getUnconfirmedSteps();
       const currentState = await this.getCurrentState();
       let useReconcile = Boolean((unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) && currentState && !targetClientId);
+      const {
+        obfuscatedSteps,
+        obfuscatedDoc
+      } = this.obfuscateStepsAndState(unconfirmedSteps, currentState);
       try {
         var _this$analyticsHelper15;
         // Reset the editor,
@@ -314,6 +339,8 @@ export class DocumentService {
             var _this$analyticsHelper13;
             (_this$analyticsHelper13 = this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 ? void 0 : _this$analyticsHelper13.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.INFO, {
               numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
+              obfuscatedSteps,
+              obfuscatedDoc,
               hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title),
               clientId: this.clientId,
               targetClientId,

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/collab-provider";
-export const version = "10.5.2";
+export const version = "10.6.1";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/document/document-service.js

@@ -12,7 +12,7 @@ import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import throttle from 'lodash/throttle';
 import { MEASURE_NAME, startMeasure, stopMeasure } from '../analytics/performance';
 import { INTERNAL_ERROR_CODE } from '../errors/internal-errors';
-import { createLogger, getStepUGCFreeDetails, sleep } from '../helpers/utils';
+import { createLogger, getDocAdfWithObfuscation, getObfuscatedSteps, getStepUGCFreeDetails, sleep } from '../helpers/utils';
 import { MAX_STEP_REJECTED_ERROR, MAX_STEP_REJECTED_ERROR_AGGRESSIVE } from '../provider';
 import { commitStepQueue } from '../provider/commit-step';
 import { catchupv2 } from './catchupv2';
@@ -122,7 +122,8 @@ export var DocumentService = /*#__PURE__*/function () {
               _this.catchUpOutofSync = _context.sent;
               latency = new Date().getTime() - start;
               (_this$analyticsHelper2 = _this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 || _this$analyticsHelper2.sendActionEvent(EVENT_ACTION.CATCHUP, EVENT_STATUS.SUCCESS, {
-                latency: latency
+                latency: latency,
+                version: _this.getCurrentPmVersion()
               });
               _context.next = 20;
               break;
@@ -300,10 +301,32 @@ export var DocumentService = /*#__PURE__*/function () {
         });
       }
     });
+    _defineProperty(this, "obfuscateStepsAndState", function (unconfirmedSteps, currentState) {
+      var obfuscatedSteps;
+      try {
+        obfuscatedSteps = unconfirmedSteps ? getObfuscatedSteps(unconfirmedSteps.map(function (pmStep) {
+          return pmStep.toJSON();
+        })) : 'None';
+      } catch (error) {
+        // Note that we do not log this error immediately - this string will be logged later.
+        // This avoids double logging and keeps this function pure.
+        obfuscatedSteps = 'Failed to obfuscate steps';
+      }
+      var obfuscatedDoc;
+      try {
+        obfuscatedDoc = getDocAdfWithObfuscation(currentState.content);
+      } catch (error) {
+        obfuscatedDoc = 'Failed to obfuscate doc';
+      }
+      return {
+        obfuscatedSteps: obfuscatedSteps,
+        obfuscatedDoc: obfuscatedDoc
+      };
+    });
     // Triggered when page recovery has emitted an 'init' event on a page client is currently connected to.
     _defineProperty(this, "onRestore", /*#__PURE__*/function () {
       var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref6) {
-        var doc, version, metadata, targetClientId, unconfirmedSteps, currentState, useReconcile, _this$analyticsHelper15, _this$analyticsHelper13, _this$analyticsHelper14, _this$analyticsHelper16, _this$analyticsHelper17;
+        var doc, version, metadata, targetClientId, unconfirmedSteps, currentState, useReconcile, _this$obfuscateStepsA, obfuscatedSteps, obfuscatedDoc, _this$analyticsHelper15, _this$analyticsHelper13, _this$analyticsHelper14, _this$analyticsHelper16, _this$analyticsHelper17;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -325,7 +348,8 @@ export var DocumentService = /*#__PURE__*/function () {
             case 7:
               currentState = _context3.sent;
               useReconcile = Boolean((unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) && currentState && !targetClientId);
-              _context3.prev = 9;
+              _this$obfuscateStepsA = _this.obfuscateStepsAndState(unconfirmedSteps, currentState), obfuscatedSteps = _this$obfuscateStepsA.obfuscatedSteps, obfuscatedDoc = _this$obfuscateStepsA.obfuscatedDoc;
+              _context3.prev = 10;
               // Reset the editor,
               //  - Replace the document, keep in sync with the server
               //  - Replace the version number, so editor is in sync with NCS server and can commit new changes.
@@ -340,12 +364,14 @@ export var DocumentService = /*#__PURE__*/function () {
               });
               _this.metadataService.updateMetadata(metadata);
               if (!fg('restore_localstep_fallback_reconcile')) {
-                _context3.next = 26;
+                _context3.next = 27;
                 break;
               }
-              _context3.prev = 13;
+              _context3.prev = 14;
               (_this$analyticsHelper13 = _this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.INFO, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
+                obfuscatedSteps: obfuscatedSteps,
+                obfuscatedDoc: obfuscatedDoc,
                 hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title),
                 clientId: _this.clientId,
                 targetClientId: targetClientId,
@@ -354,35 +380,35 @@ export var DocumentService = /*#__PURE__*/function () {
               if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
                 _this.applyLocalSteps(unconfirmedSteps);
               }
-              _context3.next = 24;
+              _context3.next = 25;
               break;
-            case 18:
-              _context3.prev = 18;
-              _context3.t0 = _context3["catch"](13);
+            case 19:
+              _context3.prev = 19;
+              _context3.t0 = _context3["catch"](14);
               (_this$analyticsHelper14 = _this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 || _this$analyticsHelper14.sendErrorEvent(_context3.t0, "Error while onRestore with applyLocalSteps. Will fallback to fetchReconcile");
               useReconcile = true;
-              _context3.next = 24;
+              _context3.next = 25;
               return _this.fetchReconcile(JSON.stringify(currentState.content), 'fe-restore');
-            case 24:
-              _context3.next = 32;
+            case 25:
+              _context3.next = 33;
               break;
-            case 26:
+            case 27:
               if (!(useReconcile && currentState)) {
-                _context3.next = 31;
+                _context3.next = 32;
                 break;
               }
-              _context3.next = 29;
+              _context3.next = 30;
               return _this.fetchReconcile(JSON.stringify(currentState.content), 'fe-restore');
-            case 29:
-              _context3.next = 32;
+            case 30:
+              _context3.next = 33;
               break;
-            case 31:
+            case 32:
               if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
                 // we don't want to use reconcile for restore triggered by catchup client out of sync (when targetClientId is provided)
                 // as this results in all changes made while the client was out of sync being lost
                 _this.applyLocalSteps(unconfirmedSteps);
               }
-            case 32:
+            case 33:
               (_this$analyticsHelper15 = _this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 || _this$analyticsHelper15.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.SUCCESS, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
                 hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title),
@@ -391,11 +417,11 @@ export var DocumentService = /*#__PURE__*/function () {
                 targetClientId: targetClientId,
                 triggeredByCatchup: targetClientId ? true : false
               });
-              _context3.next = 40;
+              _context3.next = 41;
               break;
-            case 35:
-              _context3.prev = 35;
-              _context3.t1 = _context3["catch"](9);
+            case 36:
+              _context3.prev = 36;
+              _context3.t1 = _context3["catch"](10);
               (_this$analyticsHelper16 = _this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 || _this$analyticsHelper16.sendActionEvent(EVENT_ACTION.REINITIALISE_DOCUMENT, EVENT_STATUS.FAILURE, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
                 useReconcile: useReconcile,
@@ -412,11 +438,11 @@ export var DocumentService = /*#__PURE__*/function () {
                   code: INTERNAL_ERROR_CODE.DOCUMENT_RESTORE_ERROR
                 }
               });
-            case 40:
+            case 41:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, null, [[9, 35], [13, 18]]);
+        }, _callee3, null, [[10, 36], [14, 19]]);
       }));
       return function (_x3) {
         return _ref7.apply(this, arguments);

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/collab-provider";
-export var version = "10.5.2";
+export var version = "10.6.1";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/document/document-service.d.ts

@@ -80,6 +80,34 @@ export declare class DocumentService implements DocumentServiceInterface {
      * Called when we receive steps from the service
      */
     onStepsAdded: (data: StepsPayload) => void;
+    obfuscateStepsAndState: (unconfirmedSteps: readonly ProseMirrorStep[] | undefined, currentState: ResolvedEditorState) => {
+        obfuscatedSteps: string | {
+            stepType: {
+                type: string;
+                contentTypes: string | null;
+            };
+            stepContent: import("@atlaskit/adf-utils/types").ADFEntity[] | null;
+            stepPositions: {
+                pos?: number | undefined;
+                insert?: number | undefined;
+                gapFrom?: number | undefined;
+                gapTo?: number | undefined;
+                from?: number | undefined;
+                to?: number | undefined;
+            };
+            stepMetadata: {
+                source?: string | undefined;
+                stepId?: string | undefined;
+                prevStepId?: string | undefined;
+                rebased?: boolean | undefined;
+                traceId?: string | undefined;
+                reqId?: string | undefined;
+                schemaVersion?: string | undefined;
+                unconfirmedStepAfterRecovery?: boolean | undefined;
+            } | undefined;
+        }[];
+        obfuscatedDoc: string | import("@atlaskit/adf-utils/types").ADFEntity | null;
+    };
     onRestore: ({ doc, version, metadata, targetClientId }: CollabInitPayload) => Promise<void>;
     getFinalAcknowledgedState: () => Promise<ResolvedEditorState>;
     getIsNamespaceLocked(): boolean;

package/dist/types-ts4.5/document/document-service.d.ts

@@ -80,6 +80,34 @@ export declare class DocumentService implements DocumentServiceInterface {
      * Called when we receive steps from the service
      */
     onStepsAdded: (data: StepsPayload) => void;
+    obfuscateStepsAndState: (unconfirmedSteps: readonly ProseMirrorStep[] | undefined, currentState: ResolvedEditorState) => {
+        obfuscatedSteps: string | {
+            stepType: {
+                type: string;
+                contentTypes: string | null;
+            };
+            stepContent: import("@atlaskit/adf-utils/types").ADFEntity[] | null;
+            stepPositions: {
+                pos?: number | undefined;
+                insert?: number | undefined;
+                gapFrom?: number | undefined;
+                gapTo?: number | undefined;
+                from?: number | undefined;
+                to?: number | undefined;
+            };
+            stepMetadata: {
+                source?: string | undefined;
+                stepId?: string | undefined;
+                prevStepId?: string | undefined;
+                rebased?: boolean | undefined;
+                traceId?: string | undefined;
+                reqId?: string | undefined;
+                schemaVersion?: string | undefined;
+                unconfirmedStepAfterRecovery?: boolean | undefined;
+            } | undefined;
+        }[];
+        obfuscatedDoc: string | import("@atlaskit/adf-utils/types").ADFEntity | null;
+    };
     onRestore: ({ doc, version, metadata, targetClientId }: CollabInitPayload) => Promise<void>;
     getFinalAcknowledgedState: () => Promise<ResolvedEditorState>;
     getIsNamespaceLocked(): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "10.5.2",
+	"version": "10.6.1",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -35,12 +35,12 @@
 		"@atlaskit/adf-utils": "^19.18.0",
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/analytics-listeners": "^8.14.0",
-		"@atlaskit/editor-common": "^99.8.0",
-		"@atlaskit/editor-json-transformer": "^8.22.0",
-		"@atlaskit/editor-prosemirror": "6.2.1",
+		"@atlaskit/editor-common": "^99.14.0",
+		"@atlaskit/editor-json-transformer": "^8.23.0",
+		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/feature-gate-js-client": "^4.22.0",
 		"@atlaskit/platform-feature-flags": "^1.0.0",
-		"@atlaskit/prosemirror-collab": "^0.11.0",
+		"@atlaskit/prosemirror-collab": "^0.12.0",
 		"@atlaskit/react-ufo": "^2.14.0",
 		"@atlaskit/ufo": "^0.3.0",
 		"@atlaskit/util-service-support": "^6.2.0",
@@ -65,7 +65,7 @@
 		}
 	},
 	"devDependencies": {
-		"@atlaskit/adf-schema": "^46.1.0",
+		"@atlaskit/adf-schema": "^47.2.1",
 		"@atlassian/feature-flags-test-utils": "^0.3.0",
 		"typescript": "~5.4.2"
 	},