-
Notifications
You must be signed in to change notification settings - Fork 27
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Proposal – Add support for presences #25
Open
Calyhre
wants to merge
3
commits into
ottypes:master
Choose a base branch
from
Calyhre:feat/json1-presence
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| const assert = require("assert"); | ||
| const Delta = require("quill-delta"); | ||
| const { type } = require("../dist/json1.release"); | ||
|
|
||
| type.registerSubtype(require("rich-text")); | ||
|
|
||
| describe("presences", () => { | ||
| it("transforms json1 only presences", () => { | ||
| const op = ["z", 0, { i: "hello" }]; | ||
| const presenceBefore = { start: ["z", 0], end: ["z", 1] }; | ||
| const presenceAfter = { start: ["z", 1], end: ["z", 2] }; | ||
|
|
||
| assert.deepStrictEqual( | ||
| type.transformPresence(presenceBefore, op), | ||
| presenceAfter | ||
| ); | ||
| }); | ||
|
|
||
| it("transforms json1 + text-unicode presences", () => { | ||
| const op = ["z", [0, { i: "hello" }], [2, { es: ["hi"] }]]; | ||
| const presenceBefore = { start: ["z", 1, 1], end: ["z", 2, 0] }; | ||
| const presenceAfter = { start: ["z", 2, 3], end: ["z", 3, 0] }; | ||
|
|
||
| assert.deepStrictEqual( | ||
| type.transformPresence(presenceBefore, op), | ||
| presenceAfter | ||
| ); | ||
| }); | ||
|
|
||
| it("transforms json1 + rich-text presences", () => { | ||
| const op = [ | ||
| "z", | ||
| [0, { i: "hello" }], | ||
| [4, { et: "rich-text", e: new Delta([{ insert: "bye" }]) }], | ||
| ]; | ||
| const presenceBefore = { start: ["z", 3, 1], end: ["z", 4, 0] }; | ||
| const presenceAfter = { start: ["z", 4, 4], end: ["z", 5, 0] }; | ||
|
|
||
| assert.deepStrictEqual( | ||
| type.transformPresence(presenceBefore, op), | ||
| presenceAfter | ||
| ); | ||
| }); | ||
|
|
||
| it("does nothing on null presences", () => { | ||
| const op = ["z", 0, { i: "hello" }]; | ||
|
|
||
| assert.deepStrictEqual(type.transformPresence(null, op), null); | ||
| }); | ||
|
|
||
| it("returns null on missing start or end", () => { | ||
| const op = ["z", 0, { i: "hello" }]; | ||
|
|
||
| assert.deepStrictEqual( | ||
| type.transformPresence({ start: null, end: [] }, op), | ||
| null | ||
| ); | ||
|
|
||
| assert.deepStrictEqual( | ||
| type.transformPresence({ start: [], end: null }, op), | ||
| null | ||
| ); | ||
| }); | ||
|
|
||
| it("returns collapsed presence when start container is removed", () => { | ||
| const op = ["z", 0, { r: true }]; | ||
| const presenceBefore = { start: ["z", 0], end: ["z", 1] }; | ||
| const presenceAfter = { start: ["z", 0], end: ["z", 0] }; | ||
|
|
||
| assert.deepStrictEqual( | ||
| type.transformPresence(presenceBefore, op), | ||
| presenceAfter | ||
| ); | ||
| }); | ||
|
|
||
| it("returns collapsed presence when end container is removed", () => { | ||
| const op = ["z", 1, { r: true }]; | ||
| const presenceBefore = { start: ["z", 0], end: ["z", 1] }; | ||
| const presenceAfter = { start: ["z", 0], end: ["z", 0] }; | ||
|
|
||
| assert.deepStrictEqual( | ||
| type.transformPresence(presenceBefore, op), | ||
| presenceAfter | ||
| ); | ||
| }); | ||
|
|
||
| it("allows arbitrary data in presences", () => { | ||
| const op = ["z", 0, { i: "hello" }]; | ||
| const data = { user: "John Doe", color: "blue" }; | ||
| const presenceBefore = { start: ["z", 0], end: ["z", 1], data }; | ||
| const presenceAfter = type.transformPresence(presenceBefore, op); | ||
|
|
||
| assert.ok(presenceBefore.data === presenceAfter.data); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where would
transformCursorcome from? Is this for rich text?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Exactly, not ideal but they renamed it there: https://github.com/ottypes/rich-text/blob/master/lib/type.js#L39-L41
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah I see.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, I got it backward. As per the main OTType documentation it's
transformCursorthat the type should implement. And it'stext-unicode(the default subtype in JSON1), that is missing it but implementstransformPosition.