@atlaskit/collab-provider 35.0.5 → 35.0.8

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/collab-provider
 
+## 35.0.8
+
+### Patch Changes
+
+- [`4a03a1ebd7662`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4a03a1ebd7662) -
+  Remove the platform_editor_agentic_step_attribution feature gate and preserve agent attribution.
+- [`f2be4b48189f2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f2be4b48189f2) -
+  Clean up experiment `platform_editor_enable_single_player_step_merging`
+- Updated dependencies
+
+## 35.0.7
+
+### Patch Changes
+
+- Updated dependencies
+
+## 35.0.6
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 35.0.5
 
 ### Patch Changes

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

@@ -1094,16 +1094,14 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       var _this$getState1,
         _this$getState10,
         _this4 = this;
-      var onlineStepMergingEnabled = (0, _expValEquals.expValEquals)('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
       // We don't trust `_newState` not to be stale
       // ED-29051 - the `onEditorViewStateUpdated` can have a stale state in edge cases. We need
       // to always ensure we're sending the latest state and unconfirmed steps so we use the state
       // from editorView directly (via getState).
-      var newState = onlineStepMergingEnabled ? (_this$getState1 = (_this$getState10 = this.getState) === null || _this$getState10 === void 0 ? void 0 : _this$getState10.call(this)) !== null && _this$getState1 !== void 0 ? _this$getState1 : _newState : _newState;
+      var newState = (_this$getState1 = (_this$getState10 = this.getState) === null || _this$getState10 === void 0 ? void 0 : _this$getState10.call(this)) !== null && _this$getState1 !== void 0 ? _this$getState1 : _newState;
 
       // Don't send any steps before we're ready.
-      var enableOnlineStepMerging = onlineStepMergingEnabled && !this.commitStepService.getReadyToCommitStatus();
-      if (!this.getConnected() || enableOnlineStepMerging) {
+      if (!this.getConnected() || !this.commitStepService.getReadyToCommitStatus()) {
         return;
       }
       var unconfirmedStepsData = (0, _prosemirrorCollab.sendableSteps)(newState);

package/dist/cjs/helpers/utils.js

@@ -13,7 +13,7 @@ exports.toObfuscatedSteps = toObfuscatedSteps;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _scrub = require("@atlaskit/adf-utils/scrub");
+var _scrubAdf = _interopRequireDefault(require("@atlaskit/adf-utils/scrub-adf"));
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _customErrors = require("../errors/custom-errors");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -166,7 +166,7 @@ var getStepsAdfWithObfuscation = exports.getStepsAdfWithObfuscation = function g
     return null;
   }
   var scrubbedSteps = stepContentAsAdf.map(function (adf) {
-    return (0, _scrub.scrubAdf)(adf);
+    return (0, _scrubAdf.default)(adf);
   }).filter(function (adf) {
     return !!adf;
   });
@@ -174,14 +174,14 @@ var getStepsAdfWithObfuscation = exports.getStepsAdfWithObfuscation = function g
 };
 var getDocAdfWithObfuscation = exports.getDocAdfWithObfuscation = function getDocAdfWithObfuscation(doc) {
   var docJson = doc.toJSON();
-  var scrubbedDoc = (0, _scrub.scrubAdf)(docJson);
+  var scrubbedDoc = (0, _scrubAdf.default)(docJson);
   if (!scrubbedDoc) {
     return null;
   }
   return scrubbedDoc;
 };
 var getDocAdfWithObfuscationFromJSON = exports.getDocAdfWithObfuscationFromJSON = function getDocAdfWithObfuscationFromJSON(docJson) {
-  var scrubbedDoc = (0, _scrub.scrubAdf)(docJson);
+  var scrubbedDoc = (0, _scrubAdf.default)(docJson);
   if (!scrubbedDoc) {
     return null;
   }

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

@@ -10,7 +10,6 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _countBy = _interopRequireDefault(require("lodash/countBy"));
 var _transactionAgentAttribution = require("@atlaskit/editor-common/transaction-agent-attribution");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _ncsErrors = require("../errors/ncs-errors");
 var _const = require("../helpers/const");
 var _utils = require("../helpers/utils");
@@ -37,7 +36,6 @@ var CommitStepService = exports.CommitStepService = /*#__PURE__*/function () {
     this.onErrorHandled = onErrorHandled;
     this.readyToCommit = true;
     this.lastBroadcastRequestAcked = true;
-    this.shouldSerializeAgentAttribution = (0, _fg.fg)('platform_editor_agentic_step_attribution');
   }
   return (0, _createClass2.default)(CommitStepService, [{
     key: "commitStepQueue",
@@ -79,7 +77,7 @@ var CommitStepService = exports.CommitStepService = /*#__PURE__*/function () {
       }, RESET_READYTOCOMMIT_INTERVAL_MS);
       var stepsWithClientAndUserId = steps.map(function (step, index) {
         var _stepOrigins$index;
-        var agentAttribution = _this.shouldSerializeAgentAttribution ? stepOrigins === null || stepOrigins === void 0 || (_stepOrigins$index = stepOrigins[index]) === null || _stepOrigins$index === void 0 ? void 0 : _stepOrigins$index.getMeta(_transactionAgentAttribution.AGENT_ATTRIBUTION_META) : undefined;
+        var agentAttribution = stepOrigins === null || stepOrigins === void 0 || (_stepOrigins$index = stepOrigins[index]) === null || _stepOrigins$index === void 0 ? void 0 : _stepOrigins$index.getMeta(_transactionAgentAttribution.AGENT_ATTRIBUTION_META);
         return _objectSpread(_objectSpread({}, step.toJSON()), {}, {
           clientId: clientId,
           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 = "35.0.4";
+var version = exports.version = "35.0.7";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

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

@@ -948,16 +948,14 @@ export class DocumentService {
   send(tr, _oldState, _newState, sendAnalyticsEvent, reason // only used for publish and draft-sync events - when called through getFinalAcknowledgedState
   ) {
     var _this$getState1, _this$getState10;
-    const onlineStepMergingEnabled = expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
     // We don't trust `_newState` not to be stale
     // ED-29051 - the `onEditorViewStateUpdated` can have a stale state in edge cases. We need
     // to always ensure we're sending the latest state and unconfirmed steps so we use the state
     // from editorView directly (via getState).
-    const newState = onlineStepMergingEnabled ? (_this$getState1 = (_this$getState10 = this.getState) === null || _this$getState10 === void 0 ? void 0 : _this$getState10.call(this)) !== null && _this$getState1 !== void 0 ? _this$getState1 : _newState : _newState;
+    const newState = (_this$getState1 = (_this$getState10 = this.getState) === null || _this$getState10 === void 0 ? void 0 : _this$getState10.call(this)) !== null && _this$getState1 !== void 0 ? _this$getState1 : _newState;
 
     // Don't send any steps before we're ready.
-    const enableOnlineStepMerging = onlineStepMergingEnabled && !this.commitStepService.getReadyToCommitStatus();
-    if (!this.getConnected() || enableOnlineStepMerging) {
+    if (!this.getConnected() || !this.commitStepService.getReadyToCommitStatus()) {
       return;
     }
     const unconfirmedStepsData = sendableSteps(newState);

package/dist/es2019/helpers/utils.js

@@ -1,4 +1,4 @@
-import { scrubAdf } from '@atlaskit/adf-utils/scrub';
+import scrubAdf from '@atlaskit/adf-utils/scrub-adf';
 import { sendableSteps } from '@atlaskit/prosemirror-collab';
 import { CustomError } from '../errors/custom-errors';
 // eslint-disable-next-line require-unicode-regexp

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

@@ -1,6 +1,5 @@
 import countBy from 'lodash/countBy';
 import { AGENT_ATTRIBUTION_META } from '@atlaskit/editor-common/transaction-agent-attribution';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { NCS_ERROR_CODE } from '../errors/ncs-errors';
 import { ADD_STEPS_TYPE, EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
 import { createLogger } from '../helpers/utils';
@@ -24,7 +23,6 @@ export class CommitStepService {
     this.onErrorHandled = onErrorHandled;
     this.readyToCommit = true;
     this.lastBroadcastRequestAcked = true;
-    this.shouldSerializeAgentAttribution = fg('platform_editor_agentic_step_attribution');
   }
   commitStepQueue({
     steps,
@@ -64,7 +62,7 @@ export class CommitStepService {
     }, RESET_READYTOCOMMIT_INTERVAL_MS);
     let stepsWithClientAndUserId = steps.map((step, index) => {
       var _stepOrigins$index;
-      const agentAttribution = this.shouldSerializeAgentAttribution ? stepOrigins === null || stepOrigins === void 0 ? void 0 : (_stepOrigins$index = stepOrigins[index]) === null || _stepOrigins$index === void 0 ? void 0 : _stepOrigins$index.getMeta(AGENT_ATTRIBUTION_META) : undefined;
+      const agentAttribution = stepOrigins === null || stepOrigins === void 0 ? void 0 : (_stepOrigins$index = stepOrigins[index]) === null || _stepOrigins$index === void 0 ? void 0 : _stepOrigins$index.getMeta(AGENT_ATTRIBUTION_META);
       return {
         ...step.toJSON(),
         clientId,

package/dist/es2019/version-wrapper.js

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

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

@@ -1089,16 +1089,14 @@ export var DocumentService = /*#__PURE__*/function () {
       var _this$getState1,
         _this$getState10,
         _this4 = this;
-      var onlineStepMergingEnabled = expValEquals('platform_editor_enable_single_player_step_merging', 'isEnabled', true);
       // We don't trust `_newState` not to be stale
       // ED-29051 - the `onEditorViewStateUpdated` can have a stale state in edge cases. We need
       // to always ensure we're sending the latest state and unconfirmed steps so we use the state
       // from editorView directly (via getState).
-      var newState = onlineStepMergingEnabled ? (_this$getState1 = (_this$getState10 = this.getState) === null || _this$getState10 === void 0 ? void 0 : _this$getState10.call(this)) !== null && _this$getState1 !== void 0 ? _this$getState1 : _newState : _newState;
+      var newState = (_this$getState1 = (_this$getState10 = this.getState) === null || _this$getState10 === void 0 ? void 0 : _this$getState10.call(this)) !== null && _this$getState1 !== void 0 ? _this$getState1 : _newState;
 
       // Don't send any steps before we're ready.
-      var enableOnlineStepMerging = onlineStepMergingEnabled && !this.commitStepService.getReadyToCommitStatus();
-      if (!this.getConnected() || enableOnlineStepMerging) {
+      if (!this.getConnected() || !this.commitStepService.getReadyToCommitStatus()) {
         return;
       }
       var unconfirmedStepsData = sendableSteps(newState);

package/dist/esm/helpers/utils.js

@@ -3,7 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 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 { scrubAdf } from '@atlaskit/adf-utils/scrub';
+import scrubAdf from '@atlaskit/adf-utils/scrub-adf';
 import { sendableSteps } from '@atlaskit/prosemirror-collab';
 import { CustomError } from '../errors/custom-errors';
 // eslint-disable-next-line require-unicode-regexp

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

@@ -5,7 +5,6 @@ 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 countBy from 'lodash/countBy';
 import { AGENT_ATTRIBUTION_META } from '@atlaskit/editor-common/transaction-agent-attribution';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { NCS_ERROR_CODE } from '../errors/ncs-errors';
 import { ADD_STEPS_TYPE, EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
 import { createLogger } from '../helpers/utils';
@@ -30,7 +29,6 @@ export var CommitStepService = /*#__PURE__*/function () {
     this.onErrorHandled = onErrorHandled;
     this.readyToCommit = true;
     this.lastBroadcastRequestAcked = true;
-    this.shouldSerializeAgentAttribution = fg('platform_editor_agentic_step_attribution');
   }
   return _createClass(CommitStepService, [{
     key: "commitStepQueue",
@@ -72,7 +70,7 @@ export var CommitStepService = /*#__PURE__*/function () {
       }, RESET_READYTOCOMMIT_INTERVAL_MS);
       var stepsWithClientAndUserId = steps.map(function (step, index) {
         var _stepOrigins$index;
-        var agentAttribution = _this.shouldSerializeAgentAttribution ? stepOrigins === null || stepOrigins === void 0 || (_stepOrigins$index = stepOrigins[index]) === null || _stepOrigins$index === void 0 ? void 0 : _stepOrigins$index.getMeta(AGENT_ATTRIBUTION_META) : undefined;
+        var agentAttribution = stepOrigins === null || stepOrigins === void 0 || (_stepOrigins$index = stepOrigins[index]) === null || _stepOrigins$index === void 0 ? void 0 : _stepOrigins$index.getMeta(AGENT_ATTRIBUTION_META);
         return _objectSpread(_objectSpread({}, step.toJSON()), {}, {
           clientId: clientId,
           userId: userId

package/dist/esm/version-wrapper.js

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

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

@@ -1,7 +1,7 @@
 import type { DebouncedFunc } from 'lodash';
 import type { ADFEntity } from '@atlaskit/adf-utils/types';
 import type { ResolvedEditorState, SyncUpErrorFunction, CollabEvents, CollabInitPayload } from '@atlaskit/editor-common/collab';
-import type { GetResolvedEditorStateReason } from '@atlaskit/editor-common/types';
+import type { GetResolvedEditorStateReason } from '@atlaskit/editor-common/types/editor-actions';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import { Transaction } from '@atlaskit/editor-prosemirror/state';

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

@@ -1,5 +1,5 @@
 import type { ResolvedEditorState, SyncUpErrorFunction } from '@atlaskit/editor-common/collab';
-import type { GetResolvedEditorStateReason } from '@atlaskit/editor-common/types';
+import type { GetResolvedEditorStateReason } from '@atlaskit/editor-common/types/editor-actions';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform-override';
 import type { InternalError } from '../errors/internal-errors';

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

@@ -1,5 +1,5 @@
 import type { ResolvedEditorState } from '@atlaskit/editor-common/collab';
-import type { GetResolvedEditorStateReason } from '@atlaskit/editor-common/types';
+import type { GetResolvedEditorStateReason } from '@atlaskit/editor-common/types/editor-actions';
 import type { DocumentServiceInterface } from './interface-document-service';
 export declare class NullDocumentService implements DocumentServiceInterface {
     setup: () => this;

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

@@ -1,5 +1,5 @@
 import type { CollabEvents } from '@atlaskit/editor-common/collab';
-import type { GetResolvedEditorStateReason } from '@atlaskit/editor-common/types';
+import type { GetResolvedEditorStateReason } from '@atlaskit/editor-common/types/editor-actions';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform-override';
 import type AnalyticsHelper from '../analytics/analytics-helper';
@@ -13,7 +13,6 @@ export declare class CommitStepService {
     private onErrorHandled;
     private readyToCommit;
     private lastBroadcastRequestAcked;
-    private readonly shouldSerializeAgentAttribution;
     /**
      * @param broadcast - Callback for broadcasting events to other clients
      * @param analyticsHelper - Helper for analytics events

package/dist/types/provider/index.d.ts

@@ -1,5 +1,5 @@
 import type { CollabEditProvider, CollabEvents, CollabTelepointerPayload, ResolvedEditorState, Metadata, CollabInitPayload, SyncUpErrorFunction, CollabPresenceActivityChangePayload, CollabActivityAIProviderChangedPayload, ProviderParticipant } from '@atlaskit/editor-common/collab';
-import type { GetResolvedEditorStateReason } from '@atlaskit/editor-common/types';
+import type { GetResolvedEditorStateReason } from '@atlaskit/editor-common/types/editor-actions';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform-override';
 import { Api } from '../api/api';

package/docs/document-service-send-function-analysis.md

@@ -650,8 +650,7 @@ The send function and commit queue behavior is controlled by several feature fla
 
 1. **`platform_editor_offline_editing_web`**: Enables offline editing support with step timeout
    handling
-2. **`platform_editor_enable_single_player_step_merging`**: Enables step merging for single users
-3. **`platform_editor_step_validation_on_connect`**: Controls step validation for first N steps
+2. **`platform_editor_step_validation_on_connect`**: Controls step validation for first N steps
    after connection
 
 ### Publish Operation Optimization

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "35.0.5",
+	"version": "35.0.8",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -30,7 +30,7 @@
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/prosemirror-collab": "^1.1.0",
 		"@atlaskit/react-ufo": "^8.1.0",
-		"@atlaskit/tmp-editor-statsig": "^231.0.0",
+		"@atlaskit/tmp-editor-statsig": "^234.0.0",
 		"@atlaskit/ufo": "^2.0.0",
 		"@atlaskit/util-service-support": "^7.4.0",
 		"@babel/runtime": "^7.0.0",
@@ -61,9 +61,6 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
-		"platform_editor_agentic_step_attribution": {
-			"type": "boolean"
-		},
 		"platform-editor-presence-websocket-only": {
 			"type": "boolean"
 		},
@@ -75,6 +72,6 @@
 		}
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^130.3.0"
+		"@atlaskit/editor-common": "^130.5.0"
 	}
 }