@atlaskit/prosemirror-collab 0.2.4 → 0.2.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## 1.3.0 (2022-05-30)
 
+## 0.2.6
+
+### Patch Changes
+
+- [`4e6f1bf8511`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4e6f1bf8511) - [ED-19233] Import prosemirror libraries from internal facade package
+
+## 0.2.5
+
+### Patch Changes
+
+- [`5f5ba16de66`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5f5ba16de66) - [ED-13910] Fix prosemirror types
+
 ## 0.2.4
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -11,7 +11,7 @@ exports.receiveTransaction = receiveTransaction;
 exports.sendableSteps = sendableSteps;
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var Rebaseable = /*#__PURE__*/(0, _createClass2.default)(function Rebaseable(step, inverted, origin) {
   (0, _classCallCheck2.default)(this, Rebaseable);
   this.step = step;
@@ -72,7 +72,7 @@ function unconfirmedFrom(transform) {
   }
   return result;
 }
-var collabKey = new _prosemirrorState.PluginKey('collab');
+var collabKey = new _state.PluginKey('collab');
 /// Creates a plugin that enables the collaborative editing framework
 /// for the editor.
 function collab() {
@@ -83,7 +83,7 @@ function collab() {
     // eslint-disable-next-line eqeqeq
     config.clientID == null ? Math.floor(Math.random() * 0xffffffff) : config.clientID
   };
-  return new _prosemirrorState.Plugin({
+  return new _state.Plugin({
     key: collabKey,
     state: {
       init: function init() {
@@ -95,14 +95,11 @@ function collab() {
           return newState;
         }
         if (tr.docChanged) {
-          return new CollabState(collab.version,
-          // @ts-expect-error
-          collab.unconfirmed.concat(unconfirmedFrom(tr)));
+          return new CollabState(collab.version, collab.unconfirmed.concat(unconfirmedFrom(tr)));
         }
         return collab;
       }
     },
-    // @ts-expect-error
     config: conf,
     // This is used to notify the history plugin to not merge steps,
     // so that the history can be rebased.
@@ -121,7 +118,7 @@ function receiveTransaction(state, steps, clientIDs) {
   // appropriate. Remaining unconfirmed steps will be rebased over
   // remote steps.
   var collabState = collabKey.getState(state);
-  var version = collabState.version + steps.length;
+  var version = ((collabState === null || collabState === void 0 ? void 0 : collabState.version) || 0) + steps.length;
   var ourID = collabKey.get(state).spec.config.clientID;
 
   // Find out which prefix of the steps originated with us
@@ -130,7 +127,7 @@ function receiveTransaction(state, steps, clientIDs) {
   while (ours < clientIDs.length && clientIDs[ours] == ourID) {
     ++ours;
   }
-  var unconfirmed = collabState.unconfirmed.slice(ours);
+  var unconfirmed = (collabState === null || collabState === void 0 ? void 0 : collabState.unconfirmed.slice(ours)) || [];
   steps = ours ? steps.slice(ours) : steps;
 
   // If all steps originated with us, we're done.
@@ -148,8 +145,8 @@ function receiveTransaction(state, steps, clientIDs) {
     unconfirmed = [];
   }
   var newCollabState = new CollabState(version, unconfirmed);
-  if (options && options.mapSelectionBackward && state.selection instanceof _prosemirrorState.TextSelection) {
-    tr.setSelection(_prosemirrorState.TextSelection.between(tr.doc.resolve(tr.mapping.map(state.selection.anchor, -1)), tr.doc.resolve(tr.mapping.map(state.selection.head, -1)), -1));
+  if (options && options.mapSelectionBackward && state.selection instanceof _state.TextSelection) {
+    tr.setSelection(_state.TextSelection.between(tr.doc.resolve(tr.mapping.map(state.selection.anchor, -1)), tr.doc.resolve(tr.mapping.map(state.selection.head, -1)), -1));
     tr.updated &= ~1;
   }
   return tr.setMeta('rebased', nUnconfirmed).setMeta('addToHistory', false).setMeta(collabKey, newCollabState);
@@ -166,6 +163,10 @@ function receiveTransaction(state, steps, clientIDs) {
 /// unchanged objects.
 function sendableSteps(state) {
   var collabState = collabKey.getState(state);
+  if (!collabState) {
+    return null;
+  }
+
   // eslint-disable-next-line eqeqeq
   if (collabState.unconfirmed.length == 0) {
     return null;
@@ -177,7 +178,7 @@ function sendableSteps(state) {
     }),
     clientID: collabKey.get(state).spec.config.clientID,
     get origins() {
-      return this._origins || (this._origins = collabState.unconfirmed.map(function (s) {
+      return this._origins || (this._origins = collabState === null || collabState === void 0 ? void 0 : collabState.unconfirmed.map(function (s) {
         return s.origin;
       }));
     }
@@ -187,5 +188,6 @@ function sendableSteps(state) {
 /// Get the version up to which the collab plugin has synced with the
 /// central authority.
 function getVersion(state) {
-  return collabKey.getState(state).version;
+  var _collabKey$getState;
+  return ((_collabKey$getState = collabKey.getState(state)) === null || _collabKey$getState === void 0 ? void 0 : _collabKey$getState.version) || 0;
 }

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/prosemirror-collab",
-	"version": "0.2.4",
+	"version": "0.2.6",
 	"sideEffects": false
 }

package/dist/es2019/index.js

@@ -1,4 +1,4 @@
-import { Plugin, PluginKey, TextSelection } from 'prosemirror-state';
+import { Plugin, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 class Rebaseable {
   constructor(step, inverted, origin) {
     this.step = step;
@@ -83,14 +83,11 @@ export function collab(config = {}) {
           return newState;
         }
         if (tr.docChanged) {
-          return new CollabState(collab.version,
-          // @ts-expect-error
-          collab.unconfirmed.concat(unconfirmedFrom(tr)));
+          return new CollabState(collab.version, collab.unconfirmed.concat(unconfirmedFrom(tr)));
         }
         return collab;
       }
     },
-    // @ts-expect-error
     config: conf,
     // This is used to notify the history plugin to not merge steps,
     // so that the history can be rebased.
@@ -108,7 +105,7 @@ export function receiveTransaction(state, steps, clientIDs, options = {}) {
   // appropriate. Remaining unconfirmed steps will be rebased over
   // remote steps.
   let collabState = collabKey.getState(state);
-  let version = collabState.version + steps.length;
+  let version = ((collabState === null || collabState === void 0 ? void 0 : collabState.version) || 0) + steps.length;
   let ourID = collabKey.get(state).spec.config.clientID;
 
   // Find out which prefix of the steps originated with us
@@ -117,7 +114,7 @@ export function receiveTransaction(state, steps, clientIDs, options = {}) {
   while (ours < clientIDs.length && clientIDs[ours] == ourID) {
     ++ours;
   }
-  let unconfirmed = collabState.unconfirmed.slice(ours);
+  let unconfirmed = (collabState === null || collabState === void 0 ? void 0 : collabState.unconfirmed.slice(ours)) || [];
   steps = ours ? steps.slice(ours) : steps;
 
   // If all steps originated with us, we're done.
@@ -153,6 +150,10 @@ export function receiveTransaction(state, steps, clientIDs, options = {}) {
 /// unchanged objects.
 export function sendableSteps(state) {
   let collabState = collabKey.getState(state);
+  if (!collabState) {
+    return null;
+  }
+
   // eslint-disable-next-line eqeqeq
   if (collabState.unconfirmed.length == 0) {
     return null;
@@ -162,7 +163,7 @@ export function sendableSteps(state) {
     steps: collabState.unconfirmed.map(s => s.step),
     clientID: collabKey.get(state).spec.config.clientID,
     get origins() {
-      return this._origins || (this._origins = collabState.unconfirmed.map(s => s.origin));
+      return this._origins || (this._origins = collabState === null || collabState === void 0 ? void 0 : collabState.unconfirmed.map(s => s.origin));
     }
   };
 }
@@ -170,5 +171,6 @@ export function sendableSteps(state) {
 /// Get the version up to which the collab plugin has synced with the
 /// central authority.
 export function getVersion(state) {
-  return collabKey.getState(state).version;
+  var _collabKey$getState;
+  return ((_collabKey$getState = collabKey.getState(state)) === null || _collabKey$getState === void 0 ? void 0 : _collabKey$getState.version) || 0;
 }

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/prosemirror-collab",
-	"version": "0.2.4",
+	"version": "0.2.6",
 	"sideEffects": false
 }

package/dist/esm/index.js

@@ -1,6 +1,6 @@
 import _createClass from "@babel/runtime/helpers/createClass";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import { Plugin, PluginKey, TextSelection } from 'prosemirror-state';
+import { Plugin, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 var Rebaseable = /*#__PURE__*/_createClass(function Rebaseable(step, inverted, origin) {
   _classCallCheck(this, Rebaseable);
   this.step = step;
@@ -84,14 +84,11 @@ export function collab() {
           return newState;
         }
         if (tr.docChanged) {
-          return new CollabState(collab.version,
-          // @ts-expect-error
-          collab.unconfirmed.concat(unconfirmedFrom(tr)));
+          return new CollabState(collab.version, collab.unconfirmed.concat(unconfirmedFrom(tr)));
         }
         return collab;
       }
     },
-    // @ts-expect-error
     config: conf,
     // This is used to notify the history plugin to not merge steps,
     // so that the history can be rebased.
@@ -110,7 +107,7 @@ export function receiveTransaction(state, steps, clientIDs) {
   // appropriate. Remaining unconfirmed steps will be rebased over
   // remote steps.
   var collabState = collabKey.getState(state);
-  var version = collabState.version + steps.length;
+  var version = ((collabState === null || collabState === void 0 ? void 0 : collabState.version) || 0) + steps.length;
   var ourID = collabKey.get(state).spec.config.clientID;
 
   // Find out which prefix of the steps originated with us
@@ -119,7 +116,7 @@ export function receiveTransaction(state, steps, clientIDs) {
   while (ours < clientIDs.length && clientIDs[ours] == ourID) {
     ++ours;
   }
-  var unconfirmed = collabState.unconfirmed.slice(ours);
+  var unconfirmed = (collabState === null || collabState === void 0 ? void 0 : collabState.unconfirmed.slice(ours)) || [];
   steps = ours ? steps.slice(ours) : steps;
 
   // If all steps originated with us, we're done.
@@ -155,6 +152,10 @@ export function receiveTransaction(state, steps, clientIDs) {
 /// unchanged objects.
 export function sendableSteps(state) {
   var collabState = collabKey.getState(state);
+  if (!collabState) {
+    return null;
+  }
+
   // eslint-disable-next-line eqeqeq
   if (collabState.unconfirmed.length == 0) {
     return null;
@@ -166,7 +167,7 @@ export function sendableSteps(state) {
     }),
     clientID: collabKey.get(state).spec.config.clientID,
     get origins() {
-      return this._origins || (this._origins = collabState.unconfirmed.map(function (s) {
+      return this._origins || (this._origins = collabState === null || collabState === void 0 ? void 0 : collabState.unconfirmed.map(function (s) {
         return s.origin;
       }));
     }
@@ -176,5 +177,6 @@ export function sendableSteps(state) {
 /// Get the version up to which the collab plugin has synced with the
 /// central authority.
 export function getVersion(state) {
-  return collabKey.getState(state).version;
+  var _collabKey$getState;
+  return ((_collabKey$getState = collabKey.getState(state)) === null || _collabKey$getState === void 0 ? void 0 : _collabKey$getState.version) || 0;
 }

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/prosemirror-collab",
-	"version": "0.2.4",
+	"version": "0.2.6",
 	"sideEffects": false
 }

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
-import { type EditorState, Plugin, type Transaction } from 'prosemirror-state';
-import type { Step as ProseMirrorStep, Transform as ProseMirrorTransform } from 'prosemirror-transform';
+import { type EditorState, Plugin, type Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { Step as ProseMirrorStep, Transform as ProseMirrorTransform } from '@atlaskit/editor-prosemirror/transform';
 declare class Rebaseable {
     readonly step: ProseMirrorStep;
     readonly inverted: ProseMirrorStep;
@@ -14,7 +14,7 @@ type CollabConfig = {
 export declare function collab(config?: CollabConfig): Plugin;
 export declare function receiveTransaction(state: EditorState, steps: readonly ProseMirrorStep[], clientIDs: readonly (string | number)[], options?: {
     mapSelectionBackward?: boolean;
-}): Transaction<any>;
+}): Transaction;
 export declare function sendableSteps(state: EditorState): {
     version: number;
     steps: readonly ProseMirrorStep[];

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

@@ -1,5 +1,5 @@
-import { type EditorState, Plugin, type Transaction } from 'prosemirror-state';
-import type { Step as ProseMirrorStep, Transform as ProseMirrorTransform } from 'prosemirror-transform';
+import { type EditorState, Plugin, type Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { Step as ProseMirrorStep, Transform as ProseMirrorTransform } from '@atlaskit/editor-prosemirror/transform';
 declare class Rebaseable {
     readonly step: ProseMirrorStep;
     readonly inverted: ProseMirrorStep;
@@ -14,7 +14,7 @@ type CollabConfig = {
 export declare function collab(config?: CollabConfig): Plugin;
 export declare function receiveTransaction(state: EditorState, steps: readonly ProseMirrorStep[], clientIDs: readonly (string | number)[], options?: {
     mapSelectionBackward?: boolean;
-}): Transaction<any>;
+}): Transaction;
 export declare function sendableSteps(state: EditorState): {
     version: number;
     steps: readonly ProseMirrorStep[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/prosemirror-collab",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Collaborative editing for ProseMirror - Atlassian Fork",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -32,19 +32,13 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@babel/runtime": "^7.0.0",
-    "prosemirror-state": "1.3.4"
+    "@atlaskit/editor-prosemirror": "1.0.2",
+    "@babel/runtime": "^7.0.0"
   },
   "devDependencies": {
-    "@atlaskit/adf-schema": "^25.9.0",
-    "@atlaskit/editor-test-helpers": "^18.7.0",
-    "@atlassian/atlassian-frontend-prettier-config-1.0.0": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.0",
-    "@types/prosemirror-history": "^1.0.1",
-    "@types/prosemirror-model": "^1.11.0",
-    "@types/prosemirror-transform": "^1.1.0",
-    "prosemirror-history": "^1.1.3",
-    "prosemirror-model": "1.16.0",
-    "prosemirror-transform": "1.3.2"
+    "@atlaskit/adf-schema": "^26.4.0",
+    "@atlaskit/editor-test-helpers": "^18.10.0",
+    "@atlassian/atlassian-frontend-prettier-config-1.0.0": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.0"
   },
   "techstack": {
     "@atlassian/frontend": {

package/report.api.md

@@ -15,11 +15,11 @@
 <!--SECTION START: Main Entry Types-->
 
 ```ts
-import { EditorState } from 'prosemirror-state';
-import { Plugin as Plugin_2 } from 'prosemirror-state';
-import type { Step } from 'prosemirror-transform';
-import { Transaction } from 'prosemirror-state';
-import type { Transform } from 'prosemirror-transform';
+import { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { Plugin as Plugin_2 } from '@atlaskit/editor-prosemirror/state';
+import type { Step } from '@atlaskit/editor-prosemirror/transform';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { Transform } from '@atlaskit/editor-prosemirror/transform';
 
 // @public (undocumented)
 export function collab(config?: CollabConfig): Plugin_2;
@@ -59,7 +59,7 @@ export function receiveTransaction(
   options?: {
     mapSelectionBackward?: boolean;
   },
-): Transaction<any>;
+): Transaction;
 
 // @public (undocumented)
 export function sendableSteps(state: EditorState): null | {

package/tmp/api-report-tmp.d.ts

@@ -4,11 +4,11 @@
 
 ```ts
 
-import { EditorState } from 'prosemirror-state';
-import { Plugin as Plugin_2 } from 'prosemirror-state';
-import type { Step } from 'prosemirror-transform';
-import { Transaction } from 'prosemirror-state';
-import type { Transform } from 'prosemirror-transform';
+import { EditorState } from '@atlaskit/editor-prosemirror/state';
+import { Plugin as Plugin_2 } from '@atlaskit/editor-prosemirror/state';
+import type { Step } from '@atlaskit/editor-prosemirror/transform';
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { Transform } from '@atlaskit/editor-prosemirror/transform';
 
 // @public (undocumented)
 export function collab(config?: CollabConfig): Plugin_2;
@@ -39,7 +39,7 @@ export function rebaseSteps(steps: readonly Rebaseable[], over: readonly Step[],
 // @public (undocumented)
 export function receiveTransaction(state: EditorState, steps: readonly Step[], clientIDs: readonly (number | string)[], options?: {
     mapSelectionBackward?: boolean;
-}): Transaction<any>;
+}): Transaction;
 
 // @public (undocumented)
 export function sendableSteps(state: EditorState): null | {