@atlaskit/collab-provider 9.40.4 → 9.40.6

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/collab-provider
 
+## 9.40.6
+
+### Patch Changes
+
+- Updated dependencies
+
+## 9.40.5
+
+### Patch Changes
+
+- [#143146](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/143146)
+  [`5df86b2c5407e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5df86b2c5407e) -
+  Retire getVersion using getCollabState from prosemirror-collab, and adding error events on
+  checking undefined collab state in all collab-provider usages
+- Updated dependencies
+
 ## 9.40.4
 
 ### Patch Changes

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

@@ -218,10 +218,10 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
         (_this$analyticsHelper5 = _this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 || _this$analyticsHelper5.sendErrorEvent(new Error('No editor state when calling ProseMirror function'), 'getCurrentPmVersion called without state');
         return 0;
       }
-      return (0, _prosemirrorCollab.getVersion)(state);
+      return _this.getVersionFromCollabState(state, 'collab-provider: getCurrentPmVersion');
     });
     (0, _defineProperty2.default)(this, "getCurrentState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-      var _this$getState2, _this$analyticsHelper7, _this$analyticsHelper6, state, adfDocument, currentState, measure, _this$analyticsHelper8, _this$analyticsHelper9, _measure;
+      var _this$getState2, _this$analyticsHelper7, _this$analyticsHelper6, state, adfDocument, version, currentState, measure, _this$analyticsHelper8, _this$analyticsHelper9, _measure;
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -234,18 +234,19 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
             }
             state = _this.getState();
             adfDocument = new _editorJsonTransformer.JSONTransformer().encode(state.doc);
+            version = _this.getVersionFromCollabState(state, 'collab-provider: getCurrentState');
             currentState = {
               content: adfDocument,
               title: _this.metadataService.getTitle(),
-              stepVersion: (0, _prosemirrorCollab.getVersion)(state)
+              stepVersion: version
             };
             measure = (0, _performance.stopMeasure)(_performance.MEASURE_NAME.GET_CURRENT_STATE, _this.analyticsHelper);
             (_this$analyticsHelper7 = _this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendActionEvent(_const.EVENT_ACTION.GET_CURRENT_STATE, _const.EVENT_STATUS.SUCCESS, {
               latency: measure === null || measure === void 0 ? void 0 : measure.duration
             });
             return _context3.abrupt("return", currentState);
-          case 11:
-            _context3.prev = 11;
+          case 12:
+            _context3.prev = 12;
             _context3.t0 = _context3["catch"](0);
             _measure = (0, _performance.stopMeasure)(_performance.MEASURE_NAME.GET_CURRENT_STATE, _this.analyticsHelper);
             (_this$analyticsHelper8 = _this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendActionEvent(_const.EVENT_ACTION.GET_CURRENT_STATE, _const.EVENT_STATUS.FAILURE, {
@@ -253,11 +254,11 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
             });
             (_this$analyticsHelper9 = _this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(_context3.t0, 'Error while returning ADF version of current draft document');
             throw _context3.t0;
-          case 17:
+          case 18:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[0, 11]]);
+      }, _callee3, null, [[0, 12]]);
     })));
     (0, _defineProperty2.default)(this, "getUnconfirmedStepsOrigins", function () {
       var _this$getState3, _sendableSteps;
@@ -557,7 +558,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
      * @throws {Error} Couldn't sync the steps after retrying 30 times
      */
     (0, _defineProperty2.default)(this, "commitUnconfirmedSteps", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
-      var unconfirmedSteps, _this$getState6, _this$analyticsHelper23, count, unconfirmedTrs, lastTr, isLastTrConfirmed, _this$analyticsHelper22, nextUnconfirmedSteps, nextUnconfirmedTrs, _this$getUnconfirmedS, state, unconfirmedStepsInfoUGCRemoved, error, measure, _this$analyticsHelper24, _this$analyticsHelper25, _measure3;
+      var unconfirmedSteps, _this$getState6, _this$analyticsHelper23, count, unconfirmedTrs, lastTr, isLastTrConfirmed, _this$analyticsHelper22, nextUnconfirmedSteps, nextUnconfirmedTrs, _this$getUnconfirmedS, state, version, unconfirmedStepsInfoUGCRemoved, error, measure, _this$analyticsHelper24, _this$analyticsHelper25, _measure3;
       return _regenerator.default.wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -602,12 +603,13 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
             }
             if (_this.onSyncUpError) {
               state = _this.getState();
+              version = _this.getVersionFromCollabState(state, 'collab-provider: commitUnconfirmedSteps');
               _this.onSyncUpError({
                 lengthOfUnconfirmedSteps: nextUnconfirmedSteps === null || nextUnconfirmedSteps === void 0 ? void 0 : nextUnconfirmedSteps.length,
                 tries: count,
                 maxRetries: _const.ACK_MAX_TRY,
                 clientId: _this.clientId,
-                version: (0, _prosemirrorCollab.getVersion)(state)
+                version: version
               });
             }
             unconfirmedStepsInfoUGCRemoved = (_this$getUnconfirmedS = _this.getUnconfirmedSteps()) === null || _this$getUnconfirmedS === void 0 ? void 0 : _this$getUnconfirmedS.map(function (step) {
@@ -685,6 +687,24 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
     this.onErrorHandled = onErrorHandled;
   }
   (0, _createClass2.default)(DocumentService, [{
+    key: "getVersionFromCollabState",
+    value: function getVersionFromCollabState(state, resource) {
+      var collabState = (0, _prosemirrorCollab.getCollabState)(state);
+      if (!collabState) {
+        var _this$analyticsHelper28;
+        (_this$analyticsHelper28 = this.analyticsHelper) === null || _this$analyticsHelper28 === void 0 || _this$analyticsHelper28.sendErrorEvent(new Error('No collab state when calling ProseMirror function'), "".concat(resource, " called without collab state"));
+        return 0;
+      }
+
+      // This should not happen in usual, just add error event in case it happens
+      if (collabState.version === undefined) {
+        var _this$analyticsHelper29;
+        (_this$analyticsHelper29 = this.analyticsHelper) === null || _this$analyticsHelper29 === void 0 || _this$analyticsHelper29.sendErrorEvent(new Error('Collab state missing version info when calling ProseMirror function'), "".concat(resource, " called with collab state missing version info"));
+        return 0;
+      }
+      return collabState.version;
+    }
+  }, {
     key: "processQueue",
     value: function processQueue() {
       if (this.stepQueue.isPaused()) {
@@ -733,9 +753,9 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
             }, 100);
           }
         } catch (error) {
-          var _this$analyticsHelper28;
+          var _this$analyticsHelper30;
           logger("Processing steps failed with error: ".concat(error, ". Triggering catch up call."));
-          (_this$analyticsHelper28 = this.analyticsHelper) === null || _this$analyticsHelper28 === void 0 || _this$analyticsHelper28.sendErrorEvent(error, 'Error while processing steps');
+          (_this$analyticsHelper30 = this.analyticsHelper) === null || _this$analyticsHelper30 === void 0 || _this$analyticsHelper30.sendErrorEvent(error, 'Error while processing steps');
           this.throttledCatchupv2(_const.CatchupEventReason.PROCESS_STEPS);
         }
       }
@@ -765,8 +785,8 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       var _this$getState7;
       var state = (_this$getState7 = this.getState) === null || _this$getState7 === void 0 ? void 0 : _this$getState7.call(this);
       if (!state) {
-        var _this$analyticsHelper29;
-        (_this$analyticsHelper29 = this.analyticsHelper) === null || _this$analyticsHelper29 === void 0 || _this$analyticsHelper29.sendErrorEvent(new Error('Editor state is undefined'), 'sendStepsFromCurrentState called without state');
+        var _this$analyticsHelper31;
+        (_this$analyticsHelper31 = this.analyticsHelper) === null || _this$analyticsHelper31 === void 0 || _this$analyticsHelper31.sendErrorEvent(new Error('Editor state is undefined'), 'sendStepsFromCurrentState called without state');
         return;
       }
       this.send(null, null, state, sendAnalyticsEvent);
@@ -780,7 +800,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
      */
     function send(_tr, _oldState, newState, sendAnalyticsEvent) {
       var unconfirmedStepsData = (0, _prosemirrorCollab.sendableSteps)(newState);
-      var version = (0, _prosemirrorCollab.getVersion)(newState) || 0; // To mimic the default value customisation introduced in the prosemirror-collab fork
+      var version = this.getVersionFromCollabState(newState, 'collab-provider: send');
 
       // Don't send any steps before we're ready.
       if (!unconfirmedStepsData) {
@@ -791,8 +811,8 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       // to ensure that analytics events with the number of unconfirmed steps is only
       // sent once on connection (as opposed to on every step)
       if (sendAnalyticsEvent) {
-        var _this$analyticsHelper30;
-        (_this$analyticsHelper30 = this.analyticsHelper) === null || _this$analyticsHelper30 === void 0 || _this$analyticsHelper30.sendActionEvent(_const.EVENT_ACTION.HAS_UNCONFIRMED_STEPS, _const.EVENT_STATUS.INFO, {
+        var _this$analyticsHelper32;
+        (_this$analyticsHelper32 = this.analyticsHelper) === null || _this$analyticsHelper32 === void 0 || _this$analyticsHelper32.sendActionEvent(_const.EVENT_ACTION.HAS_UNCONFIRMED_STEPS, _const.EVENT_STATUS.INFO, {
           numUnconfirmedSteps: (unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) || 0
         });
       }

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 = "9.40.4";
+var version = exports.version = "9.40.6";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

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

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS, CatchupEventReason } from '../helpers/const';
-import { getVersion, sendableSteps } from '@atlaskit/prosemirror-collab';
+import { getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import throttle from 'lodash/throttle';
 import { MEASURE_NAME, startMeasure, stopMeasure } from '../analytics/performance';
@@ -179,7 +179,7 @@ export class DocumentService {
         (_this$analyticsHelper5 = this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 ? void 0 : _this$analyticsHelper5.sendErrorEvent(new Error('No editor state when calling ProseMirror function'), 'getCurrentPmVersion called without state');
         return 0;
       }
-      return getVersion(state);
+      return this.getVersionFromCollabState(state, 'collab-provider: getCurrentPmVersion');
     });
     _defineProperty(this, "getCurrentState", async () => {
       try {
@@ -193,10 +193,11 @@ export class DocumentService {
         }
         const state = this.getState();
         const adfDocument = new JSONTransformer().encode(state.doc);
+        const version = this.getVersionFromCollabState(state, 'collab-provider: getCurrentState');
         const currentState = {
           content: adfDocument,
           title: this.metadataService.getTitle(),
-          stepVersion: getVersion(state)
+          stepVersion: version
         };
         const measure = stopMeasure(MEASURE_NAME.GET_CURRENT_STATE, this.analyticsHelper);
         (_this$analyticsHelper7 = this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 ? void 0 : _this$analyticsHelper7.sendActionEvent(EVENT_ACTION.GET_CURRENT_STATE, EVENT_STATUS.SUCCESS, {
@@ -494,12 +495,13 @@ export class DocumentService {
               var _this$getUnconfirmedS;
               if (this.onSyncUpError) {
                 const state = this.getState();
+                const version = this.getVersionFromCollabState(state, 'collab-provider: commitUnconfirmedSteps');
                 this.onSyncUpError({
                   lengthOfUnconfirmedSteps: nextUnconfirmedSteps === null || nextUnconfirmedSteps === void 0 ? void 0 : nextUnconfirmedSteps.length,
                   tries: count,
                   maxRetries: ACK_MAX_TRY,
                   clientId: this.clientId,
-                  version: getVersion(state)
+                  version
                 });
               }
               const unconfirmedStepsInfoUGCRemoved = (_this$getUnconfirmedS = this.getUnconfirmedSteps()) === null || _this$getUnconfirmedS === void 0 ? void 0 : _this$getUnconfirmedS.map(step => getStepUGCFreeDetails(step));
@@ -563,6 +565,22 @@ export class DocumentService {
     this.stepQueue = new StepQueueState();
     this.onErrorHandled = onErrorHandled;
   }
+  getVersionFromCollabState(state, resource) {
+    const collabState = getCollabState(state);
+    if (!collabState) {
+      var _this$analyticsHelper28;
+      (_this$analyticsHelper28 = this.analyticsHelper) === null || _this$analyticsHelper28 === void 0 ? void 0 : _this$analyticsHelper28.sendErrorEvent(new Error('No collab state when calling ProseMirror function'), `${resource} called without collab state`);
+      return 0;
+    }
+
+    // This should not happen in usual, just add error event in case it happens
+    if (collabState.version === undefined) {
+      var _this$analyticsHelper29;
+      (_this$analyticsHelper29 = this.analyticsHelper) === null || _this$analyticsHelper29 === void 0 ? void 0 : _this$analyticsHelper29.sendErrorEvent(new Error('Collab state missing version info when calling ProseMirror function'), `${resource} called with collab state missing version info`);
+      return 0;
+    }
+    return collabState.version;
+  }
   processQueue() {
     if (this.stepQueue.isPaused()) {
       logger(`Queue is paused. Aborting.`);
@@ -606,9 +624,9 @@ export class DocumentService {
           setTimeout(() => this.sendStepsFromCurrentState(), 100);
         }
       } catch (error) {
-        var _this$analyticsHelper28;
+        var _this$analyticsHelper30;
         logger(`Processing steps failed with error: ${error}. Triggering catch up call.`);
-        (_this$analyticsHelper28 = this.analyticsHelper) === null || _this$analyticsHelper28 === void 0 ? void 0 : _this$analyticsHelper28.sendErrorEvent(error, 'Error while processing steps');
+        (_this$analyticsHelper30 = this.analyticsHelper) === null || _this$analyticsHelper30 === void 0 ? void 0 : _this$analyticsHelper30.sendErrorEvent(error, 'Error while processing steps');
         this.throttledCatchupv2(CatchupEventReason.PROCESS_STEPS);
       }
     }
@@ -635,8 +653,8 @@ export class DocumentService {
     var _this$getState7;
     const state = (_this$getState7 = this.getState) === null || _this$getState7 === void 0 ? void 0 : _this$getState7.call(this);
     if (!state) {
-      var _this$analyticsHelper29;
-      (_this$analyticsHelper29 = this.analyticsHelper) === null || _this$analyticsHelper29 === void 0 ? void 0 : _this$analyticsHelper29.sendErrorEvent(new Error('Editor state is undefined'), 'sendStepsFromCurrentState called without state');
+      var _this$analyticsHelper31;
+      (_this$analyticsHelper31 = this.analyticsHelper) === null || _this$analyticsHelper31 === void 0 ? void 0 : _this$analyticsHelper31.sendErrorEvent(new Error('Editor state is undefined'), 'sendStepsFromCurrentState called without state');
       return;
     }
     this.send(null, null, state, sendAnalyticsEvent);
@@ -647,7 +665,7 @@ export class DocumentService {
    */
   send(_tr, _oldState, newState, sendAnalyticsEvent) {
     const unconfirmedStepsData = sendableSteps(newState);
-    const version = getVersion(newState) || 0; // To mimic the default value customisation introduced in the prosemirror-collab fork
+    const version = this.getVersionFromCollabState(newState, 'collab-provider: send');
 
     // Don't send any steps before we're ready.
     if (!unconfirmedStepsData) {
@@ -658,8 +676,8 @@ export class DocumentService {
     // to ensure that analytics events with the number of unconfirmed steps is only
     // sent once on connection (as opposed to on every step)
     if (sendAnalyticsEvent) {
-      var _this$analyticsHelper30;
-      (_this$analyticsHelper30 = this.analyticsHelper) === null || _this$analyticsHelper30 === void 0 ? void 0 : _this$analyticsHelper30.sendActionEvent(EVENT_ACTION.HAS_UNCONFIRMED_STEPS, EVENT_STATUS.INFO, {
+      var _this$analyticsHelper32;
+      (_this$analyticsHelper32 = this.analyticsHelper) === null || _this$analyticsHelper32 === void 0 ? void 0 : _this$analyticsHelper32.sendActionEvent(EVENT_ACTION.HAS_UNCONFIRMED_STEPS, EVENT_STATUS.INFO, {
         numUnconfirmedSteps: (unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) || 0
       });
     }

package/dist/es2019/version-wrapper.js

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

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

@@ -6,7 +6,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { ACK_MAX_TRY, EVENT_ACTION, EVENT_STATUS, CatchupEventReason } from '../helpers/const';
-import { getVersion, sendableSteps } from '@atlaskit/prosemirror-collab';
+import { getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import throttle from 'lodash/throttle';
 import { MEASURE_NAME, startMeasure, stopMeasure } from '../analytics/performance';
@@ -211,10 +211,10 @@ export var DocumentService = /*#__PURE__*/function () {
         (_this$analyticsHelper5 = _this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 || _this$analyticsHelper5.sendErrorEvent(new Error('No editor state when calling ProseMirror function'), 'getCurrentPmVersion called without state');
         return 0;
       }
-      return getVersion(state);
+      return _this.getVersionFromCollabState(state, 'collab-provider: getCurrentPmVersion');
     });
     _defineProperty(this, "getCurrentState", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      var _this$getState2, _this$analyticsHelper7, _this$analyticsHelper6, state, adfDocument, currentState, measure, _this$analyticsHelper8, _this$analyticsHelper9, _measure;
+      var _this$getState2, _this$analyticsHelper7, _this$analyticsHelper6, state, adfDocument, version, currentState, measure, _this$analyticsHelper8, _this$analyticsHelper9, _measure;
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -227,18 +227,19 @@ export var DocumentService = /*#__PURE__*/function () {
             }
             state = _this.getState();
             adfDocument = new JSONTransformer().encode(state.doc);
+            version = _this.getVersionFromCollabState(state, 'collab-provider: getCurrentState');
             currentState = {
               content: adfDocument,
               title: _this.metadataService.getTitle(),
-              stepVersion: getVersion(state)
+              stepVersion: version
             };
             measure = stopMeasure(MEASURE_NAME.GET_CURRENT_STATE, _this.analyticsHelper);
             (_this$analyticsHelper7 = _this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendActionEvent(EVENT_ACTION.GET_CURRENT_STATE, EVENT_STATUS.SUCCESS, {
               latency: measure === null || measure === void 0 ? void 0 : measure.duration
             });
             return _context3.abrupt("return", currentState);
-          case 11:
-            _context3.prev = 11;
+          case 12:
+            _context3.prev = 12;
             _context3.t0 = _context3["catch"](0);
             _measure = stopMeasure(MEASURE_NAME.GET_CURRENT_STATE, _this.analyticsHelper);
             (_this$analyticsHelper8 = _this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendActionEvent(EVENT_ACTION.GET_CURRENT_STATE, EVENT_STATUS.FAILURE, {
@@ -246,11 +247,11 @@ export var DocumentService = /*#__PURE__*/function () {
             });
             (_this$analyticsHelper9 = _this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(_context3.t0, 'Error while returning ADF version of current draft document');
             throw _context3.t0;
-          case 17:
+          case 18:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[0, 11]]);
+      }, _callee3, null, [[0, 12]]);
     })));
     _defineProperty(this, "getUnconfirmedStepsOrigins", function () {
       var _this$getState3, _sendableSteps;
@@ -550,7 +551,7 @@ export var DocumentService = /*#__PURE__*/function () {
      * @throws {Error} Couldn't sync the steps after retrying 30 times
      */
     _defineProperty(this, "commitUnconfirmedSteps", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
-      var unconfirmedSteps, _this$getState6, _this$analyticsHelper23, count, unconfirmedTrs, lastTr, isLastTrConfirmed, _this$analyticsHelper22, nextUnconfirmedSteps, nextUnconfirmedTrs, _this$getUnconfirmedS, state, unconfirmedStepsInfoUGCRemoved, error, measure, _this$analyticsHelper24, _this$analyticsHelper25, _measure3;
+      var unconfirmedSteps, _this$getState6, _this$analyticsHelper23, count, unconfirmedTrs, lastTr, isLastTrConfirmed, _this$analyticsHelper22, nextUnconfirmedSteps, nextUnconfirmedTrs, _this$getUnconfirmedS, state, version, unconfirmedStepsInfoUGCRemoved, error, measure, _this$analyticsHelper24, _this$analyticsHelper25, _measure3;
       return _regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -595,12 +596,13 @@ export var DocumentService = /*#__PURE__*/function () {
             }
             if (_this.onSyncUpError) {
               state = _this.getState();
+              version = _this.getVersionFromCollabState(state, 'collab-provider: commitUnconfirmedSteps');
               _this.onSyncUpError({
                 lengthOfUnconfirmedSteps: nextUnconfirmedSteps === null || nextUnconfirmedSteps === void 0 ? void 0 : nextUnconfirmedSteps.length,
                 tries: count,
                 maxRetries: ACK_MAX_TRY,
                 clientId: _this.clientId,
-                version: getVersion(state)
+                version: version
               });
             }
             unconfirmedStepsInfoUGCRemoved = (_this$getUnconfirmedS = _this.getUnconfirmedSteps()) === null || _this$getUnconfirmedS === void 0 ? void 0 : _this$getUnconfirmedS.map(function (step) {
@@ -678,6 +680,24 @@ export var DocumentService = /*#__PURE__*/function () {
     this.onErrorHandled = onErrorHandled;
   }
   _createClass(DocumentService, [{
+    key: "getVersionFromCollabState",
+    value: function getVersionFromCollabState(state, resource) {
+      var collabState = getCollabState(state);
+      if (!collabState) {
+        var _this$analyticsHelper28;
+        (_this$analyticsHelper28 = this.analyticsHelper) === null || _this$analyticsHelper28 === void 0 || _this$analyticsHelper28.sendErrorEvent(new Error('No collab state when calling ProseMirror function'), "".concat(resource, " called without collab state"));
+        return 0;
+      }
+
+      // This should not happen in usual, just add error event in case it happens
+      if (collabState.version === undefined) {
+        var _this$analyticsHelper29;
+        (_this$analyticsHelper29 = this.analyticsHelper) === null || _this$analyticsHelper29 === void 0 || _this$analyticsHelper29.sendErrorEvent(new Error('Collab state missing version info when calling ProseMirror function'), "".concat(resource, " called with collab state missing version info"));
+        return 0;
+      }
+      return collabState.version;
+    }
+  }, {
     key: "processQueue",
     value: function processQueue() {
       if (this.stepQueue.isPaused()) {
@@ -726,9 +746,9 @@ export var DocumentService = /*#__PURE__*/function () {
             }, 100);
           }
         } catch (error) {
-          var _this$analyticsHelper28;
+          var _this$analyticsHelper30;
           logger("Processing steps failed with error: ".concat(error, ". Triggering catch up call."));
-          (_this$analyticsHelper28 = this.analyticsHelper) === null || _this$analyticsHelper28 === void 0 || _this$analyticsHelper28.sendErrorEvent(error, 'Error while processing steps');
+          (_this$analyticsHelper30 = this.analyticsHelper) === null || _this$analyticsHelper30 === void 0 || _this$analyticsHelper30.sendErrorEvent(error, 'Error while processing steps');
           this.throttledCatchupv2(CatchupEventReason.PROCESS_STEPS);
         }
       }
@@ -758,8 +778,8 @@ export var DocumentService = /*#__PURE__*/function () {
       var _this$getState7;
       var state = (_this$getState7 = this.getState) === null || _this$getState7 === void 0 ? void 0 : _this$getState7.call(this);
       if (!state) {
-        var _this$analyticsHelper29;
-        (_this$analyticsHelper29 = this.analyticsHelper) === null || _this$analyticsHelper29 === void 0 || _this$analyticsHelper29.sendErrorEvent(new Error('Editor state is undefined'), 'sendStepsFromCurrentState called without state');
+        var _this$analyticsHelper31;
+        (_this$analyticsHelper31 = this.analyticsHelper) === null || _this$analyticsHelper31 === void 0 || _this$analyticsHelper31.sendErrorEvent(new Error('Editor state is undefined'), 'sendStepsFromCurrentState called without state');
         return;
       }
       this.send(null, null, state, sendAnalyticsEvent);
@@ -773,7 +793,7 @@ export var DocumentService = /*#__PURE__*/function () {
      */
     function send(_tr, _oldState, newState, sendAnalyticsEvent) {
       var unconfirmedStepsData = sendableSteps(newState);
-      var version = getVersion(newState) || 0; // To mimic the default value customisation introduced in the prosemirror-collab fork
+      var version = this.getVersionFromCollabState(newState, 'collab-provider: send');
 
       // Don't send any steps before we're ready.
       if (!unconfirmedStepsData) {
@@ -784,8 +804,8 @@ export var DocumentService = /*#__PURE__*/function () {
       // to ensure that analytics events with the number of unconfirmed steps is only
       // sent once on connection (as opposed to on every step)
       if (sendAnalyticsEvent) {
-        var _this$analyticsHelper30;
-        (_this$analyticsHelper30 = this.analyticsHelper) === null || _this$analyticsHelper30 === void 0 || _this$analyticsHelper30.sendActionEvent(EVENT_ACTION.HAS_UNCONFIRMED_STEPS, EVENT_STATUS.INFO, {
+        var _this$analyticsHelper32;
+        (_this$analyticsHelper32 = this.analyticsHelper) === null || _this$analyticsHelper32 === void 0 || _this$analyticsHelper32.sendActionEvent(EVENT_ACTION.HAS_UNCONFIRMED_STEPS, EVENT_STATUS.INFO, {
           numUnconfirmedSteps: (unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) || 0
         });
       }

package/dist/esm/version-wrapper.js

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

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

@@ -70,6 +70,7 @@ export declare class DocumentService implements DocumentServiceInterface {
      * @param reason - optional reason to attach.
      */
     private catchupv2;
+    private getVersionFromCollabState;
     getCurrentPmVersion: () => number;
     private processQueue;
     getCurrentState: () => Promise<ResolvedEditorState>;

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

@@ -70,6 +70,7 @@ export declare class DocumentService implements DocumentServiceInterface {
      * @param reason - optional reason to attach.
      */
     private catchupv2;
+    private getVersionFromCollabState;
     getCurrentPmVersion: () => number;
     private processQueue;
     getCurrentState: () => Promise<ResolvedEditorState>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "9.40.4",
+	"version": "9.40.6",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -34,7 +34,7 @@
 	"dependencies": {
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/analytics-listeners": "^8.11.0",
-		"@atlaskit/editor-common": "^90.0.0",
+		"@atlaskit/editor-common": "^91.0.0",
 		"@atlaskit/editor-json-transformer": "^8.18.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",