@atlaskit/collab-provider 10.4.1 → 10.5.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/collab-provider
 
+## 10.5.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 10.5.0
+
+### Minor Changes
+
+- [#107250](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/107250)
+  [`9a71e848fdc06`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9a71e848fdc06) -
+  Send collabMode flag to NCS via step commits
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 10.4.1
 
 ### Patch Changes

package/dist/cjs/connectivity/reconnect-helper.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _readOnlyError2 = _interopRequireDefault(require("@babel/runtime/helpers/readOnlyError"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));

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

@@ -28,7 +28,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var CATCHUP_THROTTLE = 1 * 1000; // 1 second
 
 var noop = function noop() {};
-var logger = (0, _utils.createLogger)('documentService', 'black');
+var logger = (0, _utils.createLogger)('documentService', 'red');
 var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
   // ClientID is the unique ID for a prosemirror client. Used for step-rebasing.
 
@@ -891,7 +891,8 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
         analyticsHelper: this.analyticsHelper,
         emit: this.providerEmitCallback,
         __livePage: this.options.__livePage,
-        hasRecovered: this.hasRecovered
+        hasRecovered: this.hasRecovered,
+        collabMode: this.participantsService.getCollabMode()
       });
     }
   }]);

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

@@ -395,6 +395,9 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
     (0, _defineProperty2.default)(this, "getAIProviderParticipants", function () {
       return _this.participantsState.getAIProviderParticipants();
     });
+    (0, _defineProperty2.default)(this, "getCollabMode", function () {
+      return _this.participantsState.size() > 1 ? 'collab' : 'single';
+    });
     this.analyticsHelper = analyticsHelper;
     this.participantsState = participantsState;
     this.emit = emit;

package/dist/cjs/provider/commit-step.js

@@ -28,7 +28,8 @@ var commitStepQueue = exports.commitStepQueue = function commitStepQueue(_ref) {
     analyticsHelper = _ref.analyticsHelper,
     emit = _ref.emit,
     __livePage = _ref.__livePage,
-    hasRecovered = _ref.hasRecovered;
+    hasRecovered = _ref.hasRecovered,
+    collabMode = _ref.collabMode;
   if (!readyToCommit) {
     logger('Not ready to commit, skip');
     return;
@@ -87,6 +88,7 @@ var commitStepQueue = exports.commitStepQueue = function commitStepQueue(_ref) {
   });
   try {
     broadcast('steps:commit', {
+      collabMode: collabMode,
       steps: stepsWithClientAndUserId,
       version: version,
       userId: userId

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

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

@@ -15,7 +15,7 @@ import { CantSyncUpError, UpdateDocumentError } from '../errors/custom-errors';
 const CATCHUP_THROTTLE = 1 * 1000; // 1 second
 
 const noop = () => {};
-const logger = createLogger('documentService', 'black');
+const logger = createLogger('documentService', 'red');
 export class DocumentService {
   // ClientID is the unique ID for a prosemirror client. Used for step-rebasing.
 
@@ -764,7 +764,8 @@ export class DocumentService {
       analyticsHelper: this.analyticsHelper,
       emit: this.providerEmitCallback,
       __livePage: this.options.__livePage,
-      hasRecovered: this.hasRecovered
+      hasRecovered: this.hasRecovered,
+      collabMode: this.participantsService.getCollabMode()
     });
   }
 }

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

@@ -340,6 +340,9 @@ export class ParticipantsService {
     _defineProperty(this, "getAIProviderParticipants", () => {
       return this.participantsState.getAIProviderParticipants();
     });
+    _defineProperty(this, "getCollabMode", () => {
+      return this.participantsState.size() > 1 ? 'collab' : 'single';
+    });
     this.analyticsHelper = analyticsHelper;
     this.participantsState = participantsState;
     this.emit = emit;

package/dist/es2019/provider/commit-step.js

@@ -18,7 +18,8 @@ export const commitStepQueue = ({
   analyticsHelper,
   emit,
   __livePage,
-  hasRecovered
+  hasRecovered,
+  collabMode
 }) => {
   if (!readyToCommit) {
     logger('Not ready to commit, skip');
@@ -79,6 +80,7 @@ export const commitStepQueue = ({
   });
   try {
     broadcast('steps:commit', {
+      collabMode,
       steps: stepsWithClientAndUserId,
       version,
       userId

package/dist/es2019/version-wrapper.js

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

package/dist/esm/connectivity/reconnect-helper.js

@@ -1,3 +1,4 @@
+import _readOnlyError from "@babel/runtime/helpers/readOnlyError";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";

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

@@ -21,7 +21,7 @@ import { CantSyncUpError, UpdateDocumentError } from '../errors/custom-errors';
 var CATCHUP_THROTTLE = 1 * 1000; // 1 second
 
 var noop = function noop() {};
-var logger = createLogger('documentService', 'black');
+var logger = createLogger('documentService', 'red');
 export var DocumentService = /*#__PURE__*/function () {
   // ClientID is the unique ID for a prosemirror client. Used for step-rebasing.
 
@@ -884,7 +884,8 @@ export var DocumentService = /*#__PURE__*/function () {
         analyticsHelper: this.analyticsHelper,
         emit: this.providerEmitCallback,
         __livePage: this.options.__livePage,
-        hasRecovered: this.hasRecovered
+        hasRecovered: this.hasRecovered,
+        collabMode: this.participantsService.getCollabMode()
       });
     }
   }]);

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

@@ -388,6 +388,9 @@ export var ParticipantsService = /*#__PURE__*/function () {
     _defineProperty(this, "getAIProviderParticipants", function () {
       return _this.participantsState.getAIProviderParticipants();
     });
+    _defineProperty(this, "getCollabMode", function () {
+      return _this.participantsState.size() > 1 ? 'collab' : 'single';
+    });
     this.analyticsHelper = analyticsHelper;
     this.participantsState = participantsState;
     this.emit = emit;

package/dist/esm/provider/commit-step.js

@@ -21,7 +21,8 @@ export var commitStepQueue = function commitStepQueue(_ref) {
     analyticsHelper = _ref.analyticsHelper,
     emit = _ref.emit,
     __livePage = _ref.__livePage,
-    hasRecovered = _ref.hasRecovered;
+    hasRecovered = _ref.hasRecovered,
+    collabMode = _ref.collabMode;
   if (!readyToCommit) {
     logger('Not ready to commit, skip');
     return;
@@ -80,6 +81,7 @@ export var commitStepQueue = function commitStepQueue(_ref) {
   });
   try {
     broadcast('steps:commit', {
+      collabMode: collabMode,
       steps: stepsWithClientAndUserId,
       version: version,
       userId: userId

package/dist/esm/version-wrapper.js

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

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

@@ -119,4 +119,5 @@ export declare class ParticipantsService {
      */
     getParticipants: () => ProviderParticipant[];
     getAIProviderParticipants: () => ProviderParticipant[];
+    getCollabMode: () => "collab" | "single";
 }

package/dist/types/provider/commit-step.d.ts

@@ -5,7 +5,7 @@ import type AnalyticsHelper from '../analytics/analytics-helper';
 import type { InternalError } from '../errors/internal-errors';
 export declare let readyToCommit: boolean;
 export declare const RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
-export declare const commitStepQueue: ({ broadcast, steps, version, userId, clientId, onStepsAdded, onErrorHandled, analyticsHelper, emit, __livePage, hasRecovered, }: {
+export declare const commitStepQueue: ({ broadcast, steps, version, userId, clientId, onStepsAdded, onErrorHandled, analyticsHelper, emit, __livePage, hasRecovered, collabMode, }: {
     broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void;
     steps: readonly ProseMirrorStep[];
     version: number;
@@ -17,4 +17,5 @@ export declare const commitStepQueue: ({ broadcast, steps, version, userId, clie
     emit: (evt: keyof CollabEvents, data: CollabCommitStatusEventPayload) => void;
     __livePage: boolean;
     hasRecovered: boolean;
+    collabMode: string;
 }) => void;

package/dist/types/types.d.ts

@@ -188,6 +188,7 @@ export type ChannelEvent = {
     'participant:updated': PresencePayload;
     'steps:commit': StepsPayload & {
         userId: string;
+        collabMode: string;
     };
     'steps:added': StepsPayload;
     'metadata:changed': Metadata;

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

@@ -119,4 +119,5 @@ export declare class ParticipantsService {
      */
     getParticipants: () => ProviderParticipant[];
     getAIProviderParticipants: () => ProviderParticipant[];
+    getCollabMode: () => "collab" | "single";
 }

package/dist/types-ts4.5/provider/commit-step.d.ts

@@ -5,7 +5,7 @@ import type AnalyticsHelper from '../analytics/analytics-helper';
 import type { InternalError } from '../errors/internal-errors';
 export declare let readyToCommit: boolean;
 export declare const RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
-export declare const commitStepQueue: ({ broadcast, steps, version, userId, clientId, onStepsAdded, onErrorHandled, analyticsHelper, emit, __livePage, hasRecovered, }: {
+export declare const commitStepQueue: ({ broadcast, steps, version, userId, clientId, onStepsAdded, onErrorHandled, analyticsHelper, emit, __livePage, hasRecovered, collabMode, }: {
     broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void;
     steps: readonly ProseMirrorStep[];
     version: number;
@@ -17,4 +17,5 @@ export declare const commitStepQueue: ({ broadcast, steps, version, userId, clie
     emit: (evt: keyof CollabEvents, data: CollabCommitStatusEventPayload) => void;
     __livePage: boolean;
     hasRecovered: boolean;
+    collabMode: string;
 }) => void;

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

@@ -188,6 +188,7 @@ export type ChannelEvent = {
     'participant:updated': PresencePayload;
     'steps:commit': StepsPayload & {
         userId: string;
+        collabMode: string;
     };
     'steps:added': StepsPayload;
     'metadata:changed': Metadata;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "10.4.1",
+	"version": "10.5.1",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -32,16 +32,16 @@
 		"./version-wrapper": "./src/version-wrapper.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-utils": "^19.17.0",
+		"@atlaskit/adf-utils": "^19.18.0",
 		"@atlaskit/analytics-gas-types": "^5.1.0",
-		"@atlaskit/analytics-listeners": "^8.13.0",
-		"@atlaskit/editor-common": "^99.5.0",
-		"@atlaskit/editor-json-transformer": "^8.21.0",
+		"@atlaskit/analytics-listeners": "^8.14.0",
+		"@atlaskit/editor-common": "^99.7.0",
+		"@atlaskit/editor-json-transformer": "^8.22.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/feature-gate-js-client": "^4.22.0",
-		"@atlaskit/platform-feature-flags": "^0.3.0",
+		"@atlaskit/platform-feature-flags": "^1.0.0",
 		"@atlaskit/prosemirror-collab": "^0.11.0",
-		"@atlaskit/react-ufo": "^2.12.0",
+		"@atlaskit/react-ufo": "^2.14.0",
 		"@atlaskit/ufo": "^0.3.0",
 		"@atlaskit/util-service-support": "^6.2.0",
 		"@babel/runtime": "^7.0.0",
@@ -66,7 +66,7 @@
 	},
 	"devDependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlassian/feature-flags-test-utils": "^0.2.0",
+		"@atlassian/feature-flags-test-utils": "^0.3.0",
 		"typescript": "~5.4.2"
 	},
 	"platform-feature-flags": {