@dxos/react-ui-editor 0.3.8-main.c66298b → 0.3.8-main.d9818d5
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.
- package/dist/types/src/automerge/automerge-plugin/PatchSemaphore.d.ts +1 -1
- package/dist/types/src/automerge/automerge-plugin/PatchSemaphore.d.ts.map +1 -1
- package/dist/types/src/automerge/automerge-plugin/amToCodemirror.d.ts +1 -1
- package/dist/types/src/automerge/automerge-plugin/amToCodemirror.d.ts.map +1 -1
- package/dist/types/src/automerge/automerge-plugin/codeMirrorToAm.d.ts +1 -1
- package/dist/types/src/automerge/automerge-plugin/codeMirrorToAm.d.ts.map +1 -1
- package/dist/types/src/automerge/automerge-plugin/plugin.d.ts +2 -2
- package/dist/types/src/automerge/automerge-plugin/plugin.d.ts.map +1 -1
- package/dist/types/src/automerge/automerge.stories.d.ts.map +1 -1
- package/dist/types/src/automerge/demo.d.ts +1 -1
- package/dist/types/src/automerge/demo.d.ts.map +1 -1
- package/package.json +16 -18
- package/src/automerge/automerge-plugin/PatchSemaphore.ts +2 -1
- package/src/automerge/automerge-plugin/amToCodemirror.ts +4 -3
- package/src/automerge/automerge-plugin/codeMirrorToAm.ts +2 -1
- package/src/automerge/automerge-plugin/plugin.ts +3 -2
- package/src/automerge/automerge.stories.tsx +2 -1
- package/src/automerge/demo.ts +2 -3
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { next as automerge } from '@automerge/automerge';
|
|
2
1
|
import { type EditorView } from '@codemirror/view';
|
|
2
|
+
import { next as automerge } from '@dxos/automerge/automerge';
|
|
3
3
|
import { type Field } from './plugin';
|
|
4
4
|
import { type Peer } from '../demo';
|
|
5
5
|
type Doc<T> = automerge.Doc<T>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PatchSemaphore.d.ts","sourceRoot":"","sources":["../../../../../src/automerge/automerge-plugin/PatchSemaphore.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"PatchSemaphore.d.ts","sourceRoot":"","sources":["../../../../../src/automerge/automerge-plugin/PatchSemaphore.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAI9D,OAAO,EAAE,KAAK,KAAK,EAA8E,MAAM,UAAU,CAAC;AAClH,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,SAAS,CAAC;AAEpC,KAAK,GAAG,CAAC,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAC/B,KAAK,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC;AAE7B,KAAK,QAAQ,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,KAAK,KAAK,GAAG,SAAS,CAAC;AAE3F,qBAAa,cAAc;IACzB,MAAM,EAAG,KAAK,CAAC;IACf,YAAY,UAAS;IACrB,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAM;gBAEjB,KAAK,CAAC,EAAE,KAAK;IAMzB,SAAS,WAAY,IAAI,QAAQ,UAAU,UA2CzC;CACH"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { type Patch, type Prop } from '@automerge/automerge';
|
|
2
1
|
import { type EditorSelection } from '@codemirror/state';
|
|
3
2
|
import { type EditorView } from '@codemirror/view';
|
|
3
|
+
import { type Patch, type Prop } from '@dxos/automerge/automerge';
|
|
4
4
|
declare const _default: (view: EditorView, selection: EditorSelection, target: Prop[], patches: Patch[]) => void;
|
|
5
5
|
export default _default;
|
|
6
6
|
//# sourceMappingURL=amToCodemirror.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amToCodemirror.d.ts","sourceRoot":"","sources":["../../../../../src/automerge/automerge-plugin/amToCodemirror.ts"],"names":[],"mappings":"AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"amToCodemirror.d.ts","sourceRoot":"","sources":["../../../../../src/automerge/automerge-plugin/amToCodemirror.ts"],"names":[],"mappings":"AAIA,OAAO,EAA8B,KAAK,eAAe,EAAoB,MAAM,mBAAmB,CAAC;AACvG,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAGL,KAAK,KAAK,EACV,KAAK,IAAI,EAGV,MAAM,2BAA2B,CAAC;+BAIb,UAAU,aAAa,eAAe,UAAU,IAAI,EAAE,WAAW,KAAK,EAAE;AAA9F,wBAgBE"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type Heads } from '@automerge/automerge';
|
|
2
1
|
import { type EditorState, type Transaction } from '@codemirror/state';
|
|
2
|
+
import { type Heads } from '@dxos/automerge/automerge';
|
|
3
3
|
import { type Field } from './plugin';
|
|
4
4
|
import { type Peer } from '../demo';
|
|
5
5
|
declare const _default: (field: Field, handle: Peer, transactions: Transaction[], state: EditorState) => Heads | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeMirrorToAm.d.ts","sourceRoot":"","sources":["../../../../../src/automerge/automerge-plugin/codeMirrorToAm.ts"],"names":[],"mappings":"AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"codeMirrorToAm.d.ts","sourceRoot":"","sources":["../../../../../src/automerge/automerge-plugin/codeMirrorToAm.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,WAAW,EAAa,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAElF,OAAO,EAAc,KAAK,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,SAAS,CAAC;+CAEE,IAAI,gBAAgB,WAAW,EAAE,SAAS,WAAW,KAAG,KAAK,GAAG,SAAS;AAA/G,wBA0BE"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import * as automerge from '@automerge/automerge';
|
|
2
|
-
import { type Doc, type Heads, type Prop } from '@automerge/automerge';
|
|
3
1
|
import { type EditorState, type Extension, StateEffect, StateField, type Transaction, type TransactionSpec } from '@codemirror/state';
|
|
4
2
|
import { type EditorView } from '@codemirror/view';
|
|
3
|
+
import * as automerge from '@dxos/automerge/automerge';
|
|
4
|
+
import { type Doc, type Heads, type Prop } from '@dxos/automerge/automerge';
|
|
5
5
|
import { type Peer } from '../demo';
|
|
6
6
|
export type Value = {
|
|
7
7
|
lastHeads: Heads;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../src/automerge/automerge-plugin/plugin.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../src/automerge/automerge-plugin/plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,SAAS,EAEd,WAAW,EACX,UAAU,EACV,KAAK,WAAW,EAChB,KAAK,eAAe,EACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,SAAS,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,KAAK,EAAE,KAAK,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAG5E,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,SAAS,CAAC;AAEpC,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,EAAE,KAAK,CAAC;IACjB,IAAI,EAAE,IAAI,EAAE,CAAC;IACb,wBAAwB,EAAE,WAAW,EAAE,CAAC;CACzC,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,KAAK,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,UAAU,0DAAsC,CAAC;AAE9D,eAAO,MAAM,WAAW,sCAAsB,YAAY,WAAW,CAAgC,CAAC;AAEtG,eAAO,MAAM,YAAY,UAAW,WAAW,uCAAsD,CAAC;AAEtG,eAAO,MAAM,OAAO,UAAW,WAAW,mBAAiB,IAAI,EAA6B,CAAC;AAE7F,MAAM,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;AAMtC,eAAO,MAAM,MAAM,wCAA0B,IAAI,EAAE,KAAG,SAiCrD,CAAC;AAEF,eAAO,MAAM,uBAAuB,qDAA+B,CAAC;AAEpE,eAAO,MAAM,aAAa,OAAQ,WAAW,KAAG,OAAmD,CAAC;AAEpG,eAAO,MAAM,aAAa,OAAQ,eAAe,SAchD,CAAC;AAEF,eAAO,MAAM,SAAS,WAAY,IAAI,QAAQ,UAAU,SAEvD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automerge.stories.d.ts","sourceRoot":"","sources":["../../../../src/automerge/automerge.stories.tsx"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"automerge.stories.d.ts","sourceRoot":"","sources":["../../../../src/automerge/automerge.stories.tsx"],"names":[],"mappings":";;;AAkGA,wBAEE;AAEF,eAAO,MAAM,WAAW;;CAEvB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type Doc, next as automerge, type ChangeOptions, type ChangeFn, type Heads } from '@automerge/automerge';
|
|
2
1
|
import { Event } from '@dxos/async';
|
|
2
|
+
import { type Doc, next as automerge, type ChangeOptions, type ChangeFn, type Heads } from '@dxos/automerge/automerge';
|
|
3
3
|
export declare class Peer {
|
|
4
4
|
changeEvent: Event<void>;
|
|
5
5
|
storage: Map<string, Uint8Array>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"demo.d.ts","sourceRoot":"","sources":["../../../../src/automerge/demo.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,GAAG,EACR,IAAI,IAAI,SAAS,EACjB,KAAK,aAAa,EAClB,KAAK,QAAQ,EACb,KAAK,KAAK,EAEX,MAAM,
|
|
1
|
+
{"version":3,"file":"demo.d.ts","sourceRoot":"","sources":["../../../../src/automerge/demo.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EACL,KAAK,GAAG,EACR,IAAI,IAAI,SAAS,EACjB,KAAK,aAAa,EAClB,KAAK,QAAQ,EACb,KAAK,KAAK,EAEX,MAAM,2BAA2B,CAAC;AAEnC,qBAAa,IAAI;IACf,WAAW,cAAe;IAE1B,OAAO,0BAAiC;IACxC,KAAK;;;;;;;MAOH;IAEF,GAAG,EAAG,GAAG,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAE5B,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC;IAKrF,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC;IAOrG,SAAS,IAAI;QAAE,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;QAAC,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,CAAA;KAAE;IAgD3F,OAAO,CAAC,aAAa;CAgBtB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/react-ui-editor",
|
|
3
|
-
"version": "0.3.8-main.
|
|
3
|
+
"version": "0.3.8-main.d9818d5",
|
|
4
4
|
"description": "Document editing experience within a DXOS shell.",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -47,20 +47,17 @@
|
|
|
47
47
|
"y-prosemirror": "~1.0.20",
|
|
48
48
|
"y-protocols": "^1.0.5",
|
|
49
49
|
"yjs": "^13.6.8",
|
|
50
|
-
"@dxos/debug": "0.3.8-main.
|
|
51
|
-
"@dxos/
|
|
52
|
-
"@dxos/
|
|
53
|
-
"@dxos/
|
|
54
|
-
"@dxos/react-
|
|
55
|
-
"@dxos/react-
|
|
56
|
-
"@dxos/
|
|
57
|
-
"@dxos/
|
|
58
|
-
"@dxos/
|
|
50
|
+
"@dxos/debug": "0.3.8-main.d9818d5",
|
|
51
|
+
"@dxos/display-name": "0.3.8-main.d9818d5",
|
|
52
|
+
"@dxos/log": "0.3.8-main.d9818d5",
|
|
53
|
+
"@dxos/protocols": "0.3.8-main.d9818d5",
|
|
54
|
+
"@dxos/react-async": "0.3.8-main.d9818d5",
|
|
55
|
+
"@dxos/react-ui": "0.3.8-main.d9818d5",
|
|
56
|
+
"@dxos/util": "0.3.8-main.d9818d5",
|
|
57
|
+
"@dxos/text-model": "0.3.8-main.d9818d5",
|
|
58
|
+
"@dxos/react-ui-theme": "0.3.8-main.d9818d5"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
|
-
"@automerge/automerge": "^2.1.7",
|
|
62
|
-
"@automerge/automerge-codemirror": "^0.0.7",
|
|
63
|
-
"@automerge/automerge-repo": "^1.0.17",
|
|
64
61
|
"@codemirror/basic-setup": "^0.20.0",
|
|
65
62
|
"@types/codemirror": "^5.60.14",
|
|
66
63
|
"@types/lodash.get": "^4.4.7",
|
|
@@ -68,15 +65,16 @@
|
|
|
68
65
|
"@types/react-dom": "^18.0.6",
|
|
69
66
|
"react": "^18.2.0",
|
|
70
67
|
"react-dom": "^18.2.0",
|
|
71
|
-
"@dxos/
|
|
72
|
-
"@dxos/
|
|
73
|
-
"@dxos/echo-
|
|
74
|
-
"@dxos/
|
|
68
|
+
"@dxos/automerge": "0.3.8-main.d9818d5",
|
|
69
|
+
"@dxos/config": "0.3.8-main.d9818d5",
|
|
70
|
+
"@dxos/echo-schema": "0.3.8-main.d9818d5",
|
|
71
|
+
"@dxos/echo-typegen": "0.3.8-main.d9818d5",
|
|
72
|
+
"@dxos/react-client": "0.3.8-main.d9818d5"
|
|
75
73
|
},
|
|
76
74
|
"peerDependencies": {
|
|
77
75
|
"react": "^18.2.0",
|
|
78
76
|
"react-dom": "^18.2.0",
|
|
79
|
-
"@dxos/react-client": "0.3.8-main.
|
|
77
|
+
"@dxos/react-client": "0.3.8-main.d9818d5"
|
|
80
78
|
},
|
|
81
79
|
"publishConfig": {
|
|
82
80
|
"access": "public"
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { next as automerge } from '@automerge/automerge';
|
|
6
5
|
import { type EditorView } from '@codemirror/view';
|
|
7
6
|
|
|
7
|
+
import { next as automerge } from '@dxos/automerge/automerge';
|
|
8
|
+
|
|
8
9
|
import amToCodemirror from './amToCodemirror';
|
|
9
10
|
import codeMirrorToAm from './codeMirrorToAm';
|
|
10
11
|
import { type Field, isReconcileTx, getPath, reconcileAnnotationType, updateHeads, getLastHeads } from './plugin';
|
|
@@ -2,6 +2,9 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
+
import { ChangeSet, type ChangeSpec, type EditorSelection, type EditorState } from '@codemirror/state';
|
|
6
|
+
import { type EditorView } from '@codemirror/view';
|
|
7
|
+
|
|
5
8
|
import {
|
|
6
9
|
type DelPatch,
|
|
7
10
|
type InsertPatch,
|
|
@@ -9,9 +12,7 @@ import {
|
|
|
9
12
|
type Prop,
|
|
10
13
|
type PutPatch,
|
|
11
14
|
type SpliceTextPatch,
|
|
12
|
-
} from '@automerge/automerge';
|
|
13
|
-
import { ChangeSet, type ChangeSpec, type EditorSelection, type EditorState } from '@codemirror/state';
|
|
14
|
-
import { type EditorView } from '@codemirror/view';
|
|
15
|
+
} from '@dxos/automerge/automerge';
|
|
15
16
|
|
|
16
17
|
import { reconcileAnnotationType } from './plugin';
|
|
17
18
|
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { next as am, type Heads } from '@automerge/automerge';
|
|
6
5
|
import { type EditorState, type Text, type Transaction } from '@codemirror/state';
|
|
7
6
|
|
|
7
|
+
import { next as am, type Heads } from '@dxos/automerge/automerge';
|
|
8
|
+
|
|
8
9
|
import { type Field } from './plugin';
|
|
9
10
|
import { type Peer } from '../demo';
|
|
10
11
|
|
|
@@ -2,8 +2,6 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import * as automerge from '@automerge/automerge';
|
|
6
|
-
import { type Doc, type Heads, type Prop } from '@automerge/automerge';
|
|
7
5
|
import {
|
|
8
6
|
Annotation,
|
|
9
7
|
type EditorState,
|
|
@@ -16,6 +14,9 @@ import {
|
|
|
16
14
|
} from '@codemirror/state';
|
|
17
15
|
import { type EditorView } from '@codemirror/view';
|
|
18
16
|
|
|
17
|
+
import * as automerge from '@dxos/automerge/automerge';
|
|
18
|
+
import { type Doc, type Heads, type Prop } from '@dxos/automerge/automerge';
|
|
19
|
+
|
|
19
20
|
import { PatchSemaphore } from './PatchSemaphore';
|
|
20
21
|
import { type Peer } from '../demo';
|
|
21
22
|
|
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { type Prop, next as automerge } from '@automerge/automerge';
|
|
6
5
|
import { basicSetup } from '@codemirror/basic-setup';
|
|
7
6
|
import { EditorView } from '@codemirror/view';
|
|
8
7
|
import React, { useEffect, useRef, useState } from 'react';
|
|
9
8
|
|
|
9
|
+
import { type Prop, next as automerge } from '@dxos/automerge/automerge';
|
|
10
|
+
|
|
10
11
|
import { plugin as amgPlugin } from './automerge-plugin';
|
|
11
12
|
import { reconcile } from './automerge-plugin/plugin';
|
|
12
13
|
import { Peer } from './demo';
|
package/src/automerge/demo.ts
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
+
import { Event } from '@dxos/async';
|
|
5
6
|
import {
|
|
6
7
|
type Doc,
|
|
7
8
|
next as automerge,
|
|
@@ -9,9 +10,7 @@ import {
|
|
|
9
10
|
type ChangeFn,
|
|
10
11
|
type Heads,
|
|
11
12
|
type SyncState,
|
|
12
|
-
} from '@automerge/automerge';
|
|
13
|
-
|
|
14
|
-
import { Event } from '@dxos/async';
|
|
13
|
+
} from '@dxos/automerge/automerge';
|
|
15
14
|
|
|
16
15
|
export class Peer {
|
|
17
16
|
changeEvent = new Event();
|