@atlaskit/collab-provider 10.7.0 → 10.7.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/collab-provider
 
+## 10.7.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 10.7.1
+
+### Patch Changes
+
+- [#116044](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116044)
+  [`927dd6876fbca`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/927dd6876fbca) -
+  Fix obfuscated doc logging for onRestore
+
 ## 10.7.0
 
 ### Minor Changes

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

@@ -322,7 +322,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       var obfuscatedDoc;
       if (currentState) {
         try {
-          obfuscatedDoc = (0, _utils.getDocAdfWithObfuscation)(currentState.content);
+          obfuscatedDoc = (0, _utils.getDocAdfWithObfuscationFromJSON)(currentState.content);
         } catch (error) {
           obfuscatedDoc = 'Failed to obfuscate doc';
         }

package/dist/cjs/helpers/utils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isAIProviderID = exports.getSubProduct = exports.getStepsAdfWithObfuscation = exports.getStepUGCFreeDetails = exports.getStepTypes = exports.getStepPositions = exports.getProduct = exports.getObfuscatedSteps = exports.getDocAdfWithObfuscation = exports.createLogger = void 0;
+exports.isAIProviderID = exports.getSubProduct = exports.getStepsAdfWithObfuscation = exports.getStepUGCFreeDetails = exports.getStepTypes = exports.getStepPositions = exports.getProduct = exports.getObfuscatedSteps = exports.getDocAdfWithObfuscationFromJSON = exports.getDocAdfWithObfuscation = exports.createLogger = void 0;
 exports.logObfuscatedSteps = logObfuscatedSteps;
 exports.sleep = sleep;
 exports.toObfuscatedSteps = toObfuscatedSteps;
@@ -138,6 +138,13 @@ var getDocAdfWithObfuscation = exports.getDocAdfWithObfuscation = function getDo
   }
   return scrubbedDoc;
 };
+var getDocAdfWithObfuscationFromJSON = exports.getDocAdfWithObfuscationFromJSON = function getDocAdfWithObfuscationFromJSON(docJson) {
+  var scrubbedDoc = (0, _scrub.scrubAdf)(docJson);
+  if (!scrubbedDoc) {
+    return null;
+  }
+  return scrubbedDoc;
+};
 var getStepPositions = exports.getStepPositions = function getStepPositions(stepJson) {
   return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, stepWithFromTo(stepJson) && {
     from: stepJson.from,

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.7.0";
+var version = exports.version = "10.7.2";
 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, getDocAdfWithObfuscation, getObfuscatedSteps, getStepUGCFreeDetails, sleep } from '../helpers/utils';
+import { createLogger, getDocAdfWithObfuscationFromJSON, 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';
@@ -289,7 +289,7 @@ export class DocumentService {
       let obfuscatedDoc;
       if (currentState) {
         try {
-          obfuscatedDoc = getDocAdfWithObfuscation(currentState.content);
+          obfuscatedDoc = getDocAdfWithObfuscationFromJSON(currentState.content);
         } catch (error) {
           obfuscatedDoc = 'Failed to obfuscate doc';
         }

package/dist/es2019/helpers/utils.js

@@ -112,6 +112,13 @@ export const getDocAdfWithObfuscation = doc => {
   }
   return scrubbedDoc;
 };
+export const getDocAdfWithObfuscationFromJSON = docJson => {
+  const scrubbedDoc = scrubAdf(docJson);
+  if (!scrubbedDoc) {
+    return null;
+  }
+  return scrubbedDoc;
+};
 export const getStepPositions = stepJson => {
   return {
     ...(stepWithFromTo(stepJson) && {

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/collab-provider";
-export const version = "10.7.0";
+export const version = "10.7.2";
 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, getDocAdfWithObfuscation, getObfuscatedSteps, getStepUGCFreeDetails, sleep } from '../helpers/utils';
+import { createLogger, getDocAdfWithObfuscationFromJSON, 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';
@@ -315,7 +315,7 @@ export var DocumentService = /*#__PURE__*/function () {
       var obfuscatedDoc;
       if (currentState) {
         try {
-          obfuscatedDoc = getDocAdfWithObfuscation(currentState.content);
+          obfuscatedDoc = getDocAdfWithObfuscationFromJSON(currentState.content);
         } catch (error) {
           obfuscatedDoc = 'Failed to obfuscate doc';
         }

package/dist/esm/helpers/utils.js

@@ -128,6 +128,13 @@ export var getDocAdfWithObfuscation = function getDocAdfWithObfuscation(doc) {
   }
   return scrubbedDoc;
 };
+export var getDocAdfWithObfuscationFromJSON = function getDocAdfWithObfuscationFromJSON(docJson) {
+  var scrubbedDoc = scrubAdf(docJson);
+  if (!scrubbedDoc) {
+    return null;
+  }
+  return scrubbedDoc;
+};
 export var getStepPositions = function getStepPositions(stepJson) {
   return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, stepWithFromTo(stepJson) && {
     from: stepJson.from,

package/dist/esm/version-wrapper.js

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

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

@@ -5,6 +5,7 @@ import { CatchupEventReason } from '../helpers/const';
 import type { MetadataService } from '../metadata/metadata-service';
 import type { Catchupv2Response, ChannelEvent, ReconcileResponse, ReconnectionMetadata, StepsPayload } from '../types';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { InternalError } from '../errors/internal-errors';
 import type { ParticipantsService } from '../participants/participants-service';
 import { type DocumentServiceInterface } from './interface-document-service';
@@ -80,7 +81,7 @@ 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) => {
+    obfuscateStepsAndState: (unconfirmedSteps: readonly ProseMirrorStep[] | undefined, currentState?: ResolvedEditorState<JSONDocNode>) => {
         obfuscatedSteps: string | {
             stepType: {
                 type: string;

package/dist/types/helpers/utils.d.ts

@@ -3,6 +3,7 @@ import type { ProductInformation } from '../types';
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { StepJson } from '@atlaskit/editor-common/collab';
+import { type JSONDocNode } from '@atlaskit/editor-json-transformer';
 import { Node as ProseMirrorNode } from '@atlaskit/editor-prosemirror/model';
 import { CustomError } from '../errors/custom-errors';
 export declare const createLogger: (prefix: string, color?: string) => (msg: string, data?: any) => void;
@@ -22,6 +23,7 @@ export declare const getStepTypes: (stepJson: StepJson) => {
 };
 export declare const getStepsAdfWithObfuscation: (stepJson: StepJson) => ADFEntity[] | null;
 export declare const getDocAdfWithObfuscation: (doc: ProseMirrorNode) => ADFEntity | null;
+export declare const getDocAdfWithObfuscationFromJSON: (docJson: JSONDocNode) => ADFEntity | null;
 export declare const getStepPositions: (stepJson: StepJson) => {
     pos?: number | undefined;
     insert?: number | undefined;

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

@@ -5,6 +5,7 @@ import { CatchupEventReason } from '../helpers/const';
 import type { MetadataService } from '../metadata/metadata-service';
 import type { Catchupv2Response, ChannelEvent, ReconcileResponse, ReconnectionMetadata, StepsPayload } from '../types';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { InternalError } from '../errors/internal-errors';
 import type { ParticipantsService } from '../participants/participants-service';
 import { type DocumentServiceInterface } from './interface-document-service';
@@ -80,7 +81,7 @@ 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) => {
+    obfuscateStepsAndState: (unconfirmedSteps: readonly ProseMirrorStep[] | undefined, currentState?: ResolvedEditorState<JSONDocNode>) => {
         obfuscatedSteps: string | {
             stepType: {
                 type: string;

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

@@ -3,6 +3,7 @@ import type { ProductInformation } from '../types';
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { StepJson } from '@atlaskit/editor-common/collab';
+import { type JSONDocNode } from '@atlaskit/editor-json-transformer';
 import { Node as ProseMirrorNode } from '@atlaskit/editor-prosemirror/model';
 import { CustomError } from '../errors/custom-errors';
 export declare const createLogger: (prefix: string, color?: string) => (msg: string, data?: any) => void;
@@ -22,6 +23,7 @@ export declare const getStepTypes: (stepJson: StepJson) => {
 };
 export declare const getStepsAdfWithObfuscation: (stepJson: StepJson) => ADFEntity[] | null;
 export declare const getDocAdfWithObfuscation: (doc: ProseMirrorNode) => ADFEntity | null;
+export declare const getDocAdfWithObfuscationFromJSON: (docJson: JSONDocNode) => ADFEntity | null;
 export declare const getStepPositions: (stepJson: StepJson) => {
     pos?: number | undefined;
     insert?: number | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "10.7.0",
+	"version": "10.7.2",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -34,15 +34,15 @@
 	"dependencies": {
 		"@atlaskit/adf-utils": "^19.18.0",
 		"@atlaskit/analytics-gas-types": "^5.1.0",
-		"@atlaskit/analytics-listeners": "^8.15.0",
-		"@atlaskit/editor-common": "^99.17.0",
+		"@atlaskit/analytics-listeners": "^9.0.0",
+		"@atlaskit/editor-common": "^100.0.0",
 		"@atlaskit/editor-json-transformer": "^8.23.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/feature-gate-js-client": "^4.25.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-collab": "^0.14.0",
-		"@atlaskit/react-ufo": "^2.16.0",
-		"@atlaskit/ufo": "^0.3.0",
+		"@atlaskit/react-ufo": "^3.0.0",
+		"@atlaskit/ufo": "^0.4.0",
 		"@atlaskit/util-service-support": "^6.2.0",
 		"@babel/runtime": "^7.0.0",
 		"eventemitter2": "^4.1.0",