Skip to content
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

Introduce basic architecture to support undo and redo #650

Merged
merged 32 commits into from
Sep 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
887d4cf
add TODO requirement comments
hyemmie Aug 24, 2023
15393ab
add test code for initial undo/redo
hyemmie Aug 25, 2023
738ce5f
add history at document
hyemmie Aug 25, 2023
6e69505
feat reverse operation for counter increase
hyemmie Aug 25, 2023
98bc22e
feat undo function
hyemmie Aug 25, 2023
baf514a
temp for test
hyemmie Aug 25, 2023
3063ac6
Fix update() function
hyemmie Aug 28, 2023
f1c47f0
Add TODO comment for undefined executedAt
hyemmie Aug 28, 2023
554f0d2
Feat redo function
hyemmie Aug 28, 2023
9fe1c14
Add redo and no change test cases
hyemmie Aug 28, 2023
69cc857
Add undo/redo error handling and test code
hyemmie Aug 28, 2023
2fbae1e
Add assertUndoRedo and handle undo/redo for Long type
chacha912 Aug 28, 2023
3c81cc4
Add max stack size for undo/redo and test code
hyemmie Aug 28, 2023
a64ed15
Merge branch 'feat/undo-redo-arch' of https://github.com/yorkie-team/…
hyemmie Aug 28, 2023
dc1fd74
Fix long counter multiply function type error
hyemmie Aug 28, 2023
6c36a3c
Add test for reverse operation of increase operation
chacha912 Aug 28, 2023
6790ee1
Add test for changeInfo when undoing increase operation
chacha912 Aug 28, 2023
fe2400c
Add redo stack clear function and test code
hyemmie Aug 28, 2023
eeea054
Merge branch 'feat/undo-redo-arch' of https://github.com/yorkie-team/…
chacha912 Aug 28, 2023
cee8126
Implement undo/redo with presence
chacha912 Aug 31, 2023
ae65179
Merge branch 'main' into undo-redo-basic
hackerwins Sep 20, 2023
b222d50
Move commits related to counter from undo-redo-arch
hackerwins Sep 20, 2023
890ec33
Narrow down the critical section scope of history lock
hackerwins Sep 20, 2023
69f4c5e
Add todos releated to presence history
hackerwins Sep 20, 2023
0dc7977
Organize test code location
chacha912 Sep 20, 2023
f511039
Add test for presence.set undo
chacha912 Sep 20, 2023
c17dec1
Modify to return ExecutionResult type when operation is executed
chacha912 Sep 21, 2023
15d8e7a
Rollback extracting applyContextChange and removing verbose methods
hackerwins Sep 22, 2023
763aa40
Extract history from document
hackerwins Sep 22, 2023
6d0b527
Remove unnecessary comments
chacha912 Sep 22, 2023
76b5c44
Modify to make `addToHistory` option accumulate for a single key
chacha912 Sep 22, 2023
67a407b
Clean up codes
hackerwins Sep 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions src/document/change/change.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ import {
import { CRDTRoot } from '@yorkie-js-sdk/src/document/crdt/root';
import { ChangeID } from '@yorkie-js-sdk/src/document/change/change_id';
import { Indexable } from '@yorkie-js-sdk/src/document/document';
import { HistoryOperation } from '@yorkie-js-sdk/src/document/history';
import {
PresenceChange,
PresenceChangeType,
} from '@yorkie-js-sdk/src/document/presence/presence';
import { deepcopy } from '@yorkie-js-sdk/src/util/object';

/**
* `Change` represents a unit of modification in the document.
Expand Down Expand Up @@ -135,21 +137,31 @@ export class Change<P extends Indexable> {
public execute(
root: CRDTRoot,
presences: Map<ActorID, P>,
): Array<OperationInfo> {
const opInfos: Array<OperationInfo> = [];
): {
opInfos: Array<OperationInfo>;
reverseOps: Array<HistoryOperation<P>>;
} {
const changeOpInfos: Array<OperationInfo> = [];
const reverseOps: Array<HistoryOperation<P>> = [];
for (const operation of this.operations) {
const infos = operation.execute(root);
opInfos.push(...infos);
const { opInfos, reverseOp } = operation.execute(root);
changeOpInfos.push(...opInfos);
if (reverseOp) {
reverseOps.unshift(reverseOp);
}
}

if (this.presenceChange) {
if (this.presenceChange.type === PresenceChangeType.Put) {
presences.set(this.id.getActorID()!, this.presenceChange.presence);
presences.set(
this.id.getActorID()!,
deepcopy(this.presenceChange.presence),
);
} else {
presences.delete(this.id.getActorID()!);
}
}
return opInfos;
return { opInfos: changeOpInfos, reverseOps };
}

/**
Expand Down
57 changes: 52 additions & 5 deletions src/document/change/context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import { ChangeID } from '@yorkie-js-sdk/src/document/change/change_id';
import { Change } from '@yorkie-js-sdk/src/document/change/change';
import { PresenceChange } from '@yorkie-js-sdk/src/document/presence/presence';
import { Indexable } from '@yorkie-js-sdk/src/document/document';
import { deepcopy } from '@yorkie-js-sdk/src/util/object';

/**
* `ChangeContext` is used to record the context of modification when editing
Expand All @@ -37,19 +38,35 @@ import { Indexable } from '@yorkie-js-sdk/src/document/document';
*/
export class ChangeContext<P extends Indexable = Indexable> {
private id: ChangeID;
private delimiter: number;
private message?: string;

private root: CRDTRoot;
private operations: Array<Operation>;
private presenceChange?: PresenceChange<P>;
private message?: string;
private delimiter: number;

constructor(id: ChangeID, root: CRDTRoot, message?: string) {
/**
* `previousPresence` stores the previous presence to be used for undoing
* presence changes.
*/
private previousPresence: P;

/**
* `reversePresenceKeys` stores the keys of the presence to be used for undoing
* presence changes.
*/
private reversePresenceKeys: Set<string>;

constructor(id: ChangeID, root: CRDTRoot, presence: P, message?: string) {
this.id = id;
this.delimiter = InitialDelimiter;

this.root = root;
this.operations = [];
this.previousPresence = deepcopy(presence);
this.presenceChange = undefined;
this.reversePresenceKeys = new Set();
this.message = message;
this.delimiter = InitialDelimiter;
}

/**
Expand All @@ -58,9 +75,10 @@ export class ChangeContext<P extends Indexable = Indexable> {
public static create<P extends Indexable>(
id: ChangeID,
root: CRDTRoot,
presence: P,
message?: string,
): ChangeContext<P> {
return new ChangeContext(id, root, message);
return new ChangeContext(id, root, presence, message);
}

/**
Expand Down Expand Up @@ -118,6 +136,35 @@ export class ChangeContext<P extends Indexable = Indexable> {
this.presenceChange = presenceChange;
}

/**
* `setReversePresence` registers the previous presence to undo presence updates.
*/
public setReversePresence(
presence: Partial<P>,
option?: { addToHistory: boolean },
) {
for (const key of Object.keys(presence)) {
if (option?.addToHistory) {
this.reversePresenceKeys.add(key);
} else {
this.reversePresenceKeys.delete(key);
}
}
}

/**
* `getReversePresence` returns the reverse presence of this context.
*/
public getReversePresence() {
if (this.reversePresenceKeys.size === 0) return undefined;

const reversePresence: Partial<P> = {};
for (const key of this.reversePresenceKeys) {
reversePresence[key as keyof P] = this.previousPresence[key];
}
return reversePresence;
}

/**
* `issueTimeTicket` creates a time ticket to be used to create a new operation.
*/
Expand Down
Loading