@atlaskit/collab-provider 10.3.0 → 10.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (53) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/cjs/analytics/analytics-helper.js +10 -0
  3. package/dist/cjs/analytics/performance.js +4 -1
  4. package/dist/cjs/api/null-api.js +3 -1
  5. package/dist/cjs/channel.js +22 -1
  6. package/dist/cjs/connectivity/network.js +8 -0
  7. package/dist/cjs/connectivity/reconnect-helper.js +4 -0
  8. package/dist/cjs/document/catchupv2.js +8 -1
  9. package/dist/cjs/document/document-service.js +65 -4
  10. package/dist/cjs/emitter.js +10 -0
  11. package/dist/cjs/helpers/utils.js +16 -7
  12. package/dist/cjs/metadata/metadata-service.js +4 -1
  13. package/dist/cjs/namespace/namespace-service.js +2 -0
  14. package/dist/cjs/participants/participants-service.js +6 -0
  15. package/dist/cjs/provider/commit-step.js +7 -2
  16. package/dist/cjs/provider/index.js +19 -1
  17. package/dist/cjs/version-wrapper.js +1 -1
  18. package/dist/es2019/analytics/analytics-helper.js +10 -0
  19. package/dist/es2019/analytics/performance.js +4 -1
  20. package/dist/es2019/api/null-api.js +2 -0
  21. package/dist/es2019/channel.js +26 -0
  22. package/dist/es2019/connectivity/network.js +8 -0
  23. package/dist/es2019/connectivity/reconnect-helper.js +4 -0
  24. package/dist/es2019/document/catchupv2.js +8 -1
  25. package/dist/es2019/document/document-service.js +67 -4
  26. package/dist/es2019/emitter.js +11 -0
  27. package/dist/es2019/helpers/utils.js +10 -2
  28. package/dist/es2019/metadata/metadata-service.js +4 -1
  29. package/dist/es2019/namespace/namespace-service.js +2 -0
  30. package/dist/es2019/participants/participants-service.js +6 -0
  31. package/dist/es2019/provider/commit-step.js +8 -3
  32. package/dist/es2019/provider/index.js +19 -1
  33. package/dist/es2019/version-wrapper.js +1 -1
  34. package/dist/esm/analytics/analytics-helper.js +10 -0
  35. package/dist/esm/analytics/performance.js +4 -1
  36. package/dist/esm/api/null-api.js +3 -1
  37. package/dist/esm/channel.js +22 -1
  38. package/dist/esm/connectivity/network.js +8 -0
  39. package/dist/esm/connectivity/reconnect-helper.js +4 -0
  40. package/dist/esm/document/catchupv2.js +8 -1
  41. package/dist/esm/document/document-service.js +68 -4
  42. package/dist/esm/emitter.js +11 -0
  43. package/dist/esm/helpers/utils.js +16 -7
  44. package/dist/esm/metadata/metadata-service.js +4 -1
  45. package/dist/esm/namespace/namespace-service.js +2 -0
  46. package/dist/esm/participants/participants-service.js +6 -0
  47. package/dist/esm/provider/commit-step.js +8 -3
  48. package/dist/esm/provider/index.js +19 -1
  49. package/dist/esm/version-wrapper.js +1 -1
  50. package/dist/types/document/document-service.d.ts +4 -2
  51. package/dist/types-ts4.5/document/document-service.d.ts +4 -2
  52. package/package.json +6 -3
  53. package/tsconfig.json +0 -1
package/dist/types/document/document-service.d.ts CHANGED
@@ -20,6 +20,7 @@ export declare class DocumentService implements DocumentServiceInterface {
20
20
  private isNameSpaceLocked;
21
21
  private enableErrorOnFailedDocumentApply;
22
22
  private options;
23
+ private getConnected;
23
24
  private getState;
24
25
  private onSyncUpError?;
25
26
  private stepQueue;
@@ -41,10 +42,11 @@ export declare class DocumentService implements DocumentServiceInterface {
41
42
  * @param onErrorHandled - Callback to handle
42
43
  * @param metadataService
43
44
  * @param enableErrorOnFailedDocumentApply - Enable failed document update exceptions.
45
+ * @param getConnected - if the channel is currently connected
44
46
  */
45
- constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchupv2: (fromVersion: number, clientId: number | string | undefined, catchUpOutofSync: boolean) => Promise<Catchupv2Response>, fetchReconcile: (currentStateDoc: string, reason: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, isNameSpaceLocked: () => boolean, enableErrorOnFailedDocumentApply?: boolean, options?: {
47
+ constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchupv2: (fromVersion: number, clientId: number | string | undefined, catchUpOutofSync: boolean) => Promise<Catchupv2Response>, fetchReconcile: (currentStateDoc: string, reason: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, isNameSpaceLocked: () => boolean, enableErrorOnFailedDocumentApply: boolean, options: {
46
48
  __livePage: boolean;
47
- });
49
+ }, getConnected: () => boolean);
48
50
  /**
49
51
  * To prevent calling catchup to often, use lodash throttle to reduce the frequency
50
52
  * @param reason - optional reason to attach.
package/dist/types-ts4.5/document/document-service.d.ts CHANGED
@@ -20,6 +20,7 @@ export declare class DocumentService implements DocumentServiceInterface {
20
20
  private isNameSpaceLocked;
21
21
  private enableErrorOnFailedDocumentApply;
22
22
  private options;
23
+ private getConnected;
23
24
  private getState;
24
25
  private onSyncUpError?;
25
26
  private stepQueue;
@@ -41,10 +42,11 @@ export declare class DocumentService implements DocumentServiceInterface {
41
42
  * @param onErrorHandled - Callback to handle
42
43
  * @param metadataService
43
44
  * @param enableErrorOnFailedDocumentApply - Enable failed document update exceptions.
45
+ * @param getConnected - if the channel is currently connected
44
46
  */
45
- constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchupv2: (fromVersion: number, clientId: number | string | undefined, catchUpOutofSync: boolean) => Promise<Catchupv2Response>, fetchReconcile: (currentStateDoc: string, reason: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, isNameSpaceLocked: () => boolean, enableErrorOnFailedDocumentApply?: boolean, options?: {
47
+ constructor(participantsService: ParticipantsService, analyticsHelper: AnalyticsHelper | undefined, fetchCatchupv2: (fromVersion: number, clientId: number | string | undefined, catchUpOutofSync: boolean) => Promise<Catchupv2Response>, fetchReconcile: (currentStateDoc: string, reason: string) => Promise<ReconcileResponse>, providerEmitCallback: (evt: keyof CollabEvents, data: any) => void, broadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, getUserId: () => string | undefined, onErrorHandled: (error: InternalError) => void, metadataService: MetadataService, isNameSpaceLocked: () => boolean, enableErrorOnFailedDocumentApply: boolean, options: {
46
48
  __livePage: boolean;
47
- });
49
+ }, getConnected: () => boolean);
48
50
  /**
49
51
  * To prevent calling catchup to often, use lodash throttle to reduce the frequency
50
52
  * @param reason - optional reason to attach.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/collab-provider",
3
- "version": "10.3.0",
3
+ "version": "10.3.2",
4
4
  "description": "A provider for collaborative editing.",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -34,12 +34,12 @@
34
34
  "dependencies": {
35
35
  "@atlaskit/analytics-gas-types": "^5.1.0",
36
36
  "@atlaskit/analytics-listeners": "^8.13.0",
37
- "@atlaskit/editor-common": "^96.7.0",
37
+ "@atlaskit/editor-common": "^97.2.0",
38
38
  "@atlaskit/editor-json-transformer": "^8.21.0",
39
39
  "@atlaskit/editor-prosemirror": "6.2.1",
40
40
  "@atlaskit/feature-gate-js-client": "^4.22.0",
41
41
  "@atlaskit/platform-feature-flags": "^0.3.0",
42
- "@atlaskit/prosemirror-collab": "^0.10.0",
42
+ "@atlaskit/prosemirror-collab": "^0.11.0",
43
43
  "@atlaskit/ufo": "^0.3.0",
44
44
  "@atlaskit/util-service-support": "^6.2.0",
45
45
  "@babel/runtime": "^7.0.0",
@@ -71,6 +71,9 @@
71
71
  "platform.editor.live-pages-expand-divergence": {
72
72
  "type": "boolean"
73
73
  },
74
+ "platform_editor_merge_unconfirmed_steps": {
75
+ "type": "boolean"
76
+ },
74
77
  "restore_localstep_fallback_reconcile": {
75
78
  "type": "boolean"
76
79
  }
package/tsconfig.json CHANGED
@@ -1,7 +1,6 @@
1
1
  {
2
2
  "extends": "../../../tsconfig.json",
3
3
  "compilerOptions": {
4
- "baseUrl": "./"
5
4
  },
6
5
  "include": [
7
6
  "./src/**/*.ts",