document-model 5.1.0-dev.35 → 5.1.0-dev.37
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/src/core/actions.d.ts.map +1 -1
- package/dist/src/core/actions.js +6 -13
- package/dist/src/core/actions.js.map +1 -1
- package/dist/src/core/documents.d.ts +2 -2
- package/dist/src/core/ph-types.d.ts +18 -6
- package/dist/src/core/ph-types.d.ts.map +1 -1
- package/dist/src/core/utils.d.ts +1 -3
- package/dist/src/core/utils.d.ts.map +1 -1
- package/dist/src/core/utils.js +2 -4
- package/dist/src/core/utils.js.map +1 -1
- package/dist/src/index.d.ts +1 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +1 -1
- package/dist/src/index.js.map +1 -1
- package/dist/test/document/event-vs-command.test.js +4 -1
- package/dist/test/document/event-vs-command.test.js.map +1 -1
- package/dist/test/document/operation-id.test.js +4 -41
- package/dist/test/document/operation-id.test.js.map +1 -1
- package/dist/test/document/reducer.test.js +4 -1
- package/dist/test/document/reducer.test.js.map +1 -1
- package/dist/test/document/undo-redo.test.js +22 -7
- package/dist/test/document/undo-redo.test.js.map +1 -1
- package/dist/test/document/utils.test.js +36 -21
- package/dist/test/document/utils.test.js.map +1 -1
- package/dist/test/document-helpers/groupOperationsByScope.test.js +9 -5
- package/dist/test/document-helpers/groupOperationsByScope.test.js.map +1 -1
- package/dist/test/document-helpers/removeExistingOperations.test.js +46 -31
- package/dist/test/document-helpers/removeExistingOperations.test.js.map +1 -1
- package/dist/test/document-helpers/skipHeaderOperations.test.js +7 -2
- package/dist/test/document-helpers/skipHeaderOperations.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { baseCreateDocument, createReducer, generateId, hashBrowser, replayDocument, validateOperations, } from "document-model/core";
|
|
1
|
+
import { baseCreateDocument, createReducer, deriveOperationId, generateId, hashBrowser, replayDocument, validateOperations, } from "document-model/core";
|
|
2
2
|
import { getLocalFile, hashNode } from "document-model/node";
|
|
3
3
|
import { countReducer, createCountDocumentState, fakeAction, increment, mutableCountReducer, setLocalName, testCreateBaseState, } from "document-model/test";
|
|
4
4
|
import fs from "fs";
|
|
@@ -36,6 +36,8 @@ describe("Base utils", () => {
|
|
|
36
36
|
expect(hashNode("test")).toEqual(hashBrowser("test"));
|
|
37
37
|
});
|
|
38
38
|
it("should find invalid index oprations", () => {
|
|
39
|
+
const TEST_DOC_ID = "test-doc-id";
|
|
40
|
+
const TEST_BRANCH = "main";
|
|
39
41
|
const a1 = fakeAction({
|
|
40
42
|
type: "TEST_ACTION",
|
|
41
43
|
input: { id: "test" },
|
|
@@ -54,6 +56,7 @@ describe("Base utils", () => {
|
|
|
54
56
|
const errors = validateOperations({
|
|
55
57
|
global: [
|
|
56
58
|
{
|
|
59
|
+
id: deriveOperationId(TEST_DOC_ID, "global", TEST_BRANCH, a1.id),
|
|
57
60
|
hash: "",
|
|
58
61
|
index: 0,
|
|
59
62
|
skip: 0,
|
|
@@ -61,6 +64,7 @@ describe("Base utils", () => {
|
|
|
61
64
|
action: a1,
|
|
62
65
|
},
|
|
63
66
|
{
|
|
67
|
+
id: deriveOperationId(TEST_DOC_ID, "global", TEST_BRANCH, a2.id),
|
|
64
68
|
hash: "",
|
|
65
69
|
index: 0,
|
|
66
70
|
skip: 0,
|
|
@@ -70,6 +74,7 @@ describe("Base utils", () => {
|
|
|
70
74
|
],
|
|
71
75
|
local: [
|
|
72
76
|
{
|
|
77
|
+
id: deriveOperationId(TEST_DOC_ID, "local", TEST_BRANCH, a3.id),
|
|
73
78
|
hash: "",
|
|
74
79
|
index: 0,
|
|
75
80
|
skip: 0,
|
|
@@ -82,53 +87,63 @@ describe("Base utils", () => {
|
|
|
82
87
|
expect(errors[0].message).toStrictEqual("Invalid operation index 0 at position 1");
|
|
83
88
|
});
|
|
84
89
|
it("should work with garbage collected operations", () => {
|
|
90
|
+
const TEST_DOC_ID = "test-doc-id";
|
|
91
|
+
const TEST_BRANCH = "main";
|
|
92
|
+
const g1 = fakeAction({
|
|
93
|
+
type: "TEST_ACTION",
|
|
94
|
+
input: { id: "test" },
|
|
95
|
+
scope: "global",
|
|
96
|
+
});
|
|
97
|
+
const g2 = fakeAction({
|
|
98
|
+
type: "TEST_ACTION",
|
|
99
|
+
input: { id: "test" },
|
|
100
|
+
scope: "global",
|
|
101
|
+
});
|
|
102
|
+
const g3 = fakeAction({
|
|
103
|
+
type: "TEST_ACTION",
|
|
104
|
+
input: { id: "test" },
|
|
105
|
+
scope: "global",
|
|
106
|
+
});
|
|
107
|
+
const l1 = fakeAction({
|
|
108
|
+
type: "TEST_ACTION",
|
|
109
|
+
input: { id: "test" },
|
|
110
|
+
scope: "local",
|
|
111
|
+
});
|
|
85
112
|
const errors = validateOperations({
|
|
86
113
|
global: [
|
|
87
114
|
{
|
|
115
|
+
id: deriveOperationId(TEST_DOC_ID, "global", TEST_BRANCH, g1.id),
|
|
88
116
|
hash: "",
|
|
89
117
|
index: 0,
|
|
90
118
|
skip: 0,
|
|
91
119
|
timestampUtcMs: "",
|
|
92
|
-
action:
|
|
93
|
-
type: "TEST_ACTION",
|
|
94
|
-
input: { id: "test" },
|
|
95
|
-
scope: "global",
|
|
96
|
-
}),
|
|
120
|
+
action: g1,
|
|
97
121
|
},
|
|
98
122
|
{
|
|
123
|
+
id: deriveOperationId(TEST_DOC_ID, "global", TEST_BRANCH, g2.id),
|
|
99
124
|
hash: "",
|
|
100
125
|
index: 1,
|
|
101
126
|
skip: 0,
|
|
102
127
|
timestampUtcMs: "",
|
|
103
|
-
action:
|
|
104
|
-
type: "TEST_ACTION",
|
|
105
|
-
input: { id: "test" },
|
|
106
|
-
scope: "global",
|
|
107
|
-
}),
|
|
128
|
+
action: g2,
|
|
108
129
|
},
|
|
109
130
|
{
|
|
131
|
+
id: deriveOperationId(TEST_DOC_ID, "global", TEST_BRANCH, g3.id),
|
|
110
132
|
hash: "",
|
|
111
133
|
index: 3,
|
|
112
134
|
skip: 1,
|
|
113
135
|
timestampUtcMs: "",
|
|
114
|
-
action:
|
|
115
|
-
type: "TEST_ACTION",
|
|
116
|
-
input: { id: "test" },
|
|
117
|
-
scope: "global",
|
|
118
|
-
}),
|
|
136
|
+
action: g3,
|
|
119
137
|
},
|
|
120
138
|
],
|
|
121
139
|
local: [
|
|
122
140
|
{
|
|
141
|
+
id: deriveOperationId(TEST_DOC_ID, "local", TEST_BRANCH, l1.id),
|
|
123
142
|
hash: "",
|
|
124
143
|
index: 0,
|
|
125
144
|
skip: 0,
|
|
126
145
|
timestampUtcMs: "",
|
|
127
|
-
action:
|
|
128
|
-
type: "TEST_ACTION",
|
|
129
|
-
input: { id: "test" },
|
|
130
|
-
scope: "local",
|
|
131
|
-
}),
|
|
146
|
+
action: l1,
|
|
132
147
|
},
|
|
133
148
|
],
|
|
134
149
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../test/document/utils.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../test/document/utils.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,20 @@
|
|
|
1
|
-
import { groupOperationsByScope } from "document-model/core";
|
|
1
|
+
import { deriveOperationId, groupOperationsByScope } from "document-model/core";
|
|
2
2
|
import { fakeAction } from "document-model/test";
|
|
3
3
|
import { describe, expect, it } from "vitest";
|
|
4
|
+
const TEST_DOC_ID = "test-doc-id";
|
|
5
|
+
const TEST_BRANCH = "main";
|
|
4
6
|
const fakeOperation = (index, skip, scope, hash) => {
|
|
7
|
+
const action = fakeAction({
|
|
8
|
+
scope,
|
|
9
|
+
type: "TEST",
|
|
10
|
+
});
|
|
5
11
|
return {
|
|
12
|
+
id: deriveOperationId(TEST_DOC_ID, scope, TEST_BRANCH, action.id),
|
|
6
13
|
index,
|
|
7
14
|
skip,
|
|
8
15
|
hash,
|
|
9
16
|
timestampUtcMs: new Date().toISOString(),
|
|
10
|
-
action
|
|
11
|
-
scope,
|
|
12
|
-
type: "TEST",
|
|
13
|
-
}),
|
|
17
|
+
action,
|
|
14
18
|
};
|
|
15
19
|
};
|
|
16
20
|
describe("groupOperationsByScope", () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"groupOperationsByScope.test.js","sourceRoot":"","sources":["../../../test/document-helpers/groupOperationsByScope.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"groupOperationsByScope.test.js","sourceRoot":"","sources":["../../../test/document-helpers/groupOperationsByScope.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { describe, expect, it } from "vitest";
|
|
2
|
-
import { removeExistingOperations } from "document-model/core";
|
|
2
|
+
import { deriveOperationId, removeExistingOperations } from "document-model/core";
|
|
3
3
|
import { buildOperations, fakeAction } from "document-model/test";
|
|
4
|
+
const TEST_DOC_ID = "test-doc-id";
|
|
5
|
+
const TEST_BRANCH = "main";
|
|
6
|
+
const TEST_SCOPE = "global";
|
|
4
7
|
describe("removeExistingOperations", () => {
|
|
5
8
|
const scenarios = [
|
|
6
9
|
{
|
|
@@ -85,35 +88,56 @@ describe("removeExistingOperations", () => {
|
|
|
85
88
|
expect(result).toMatchObject(testInput.expected);
|
|
86
89
|
});
|
|
87
90
|
it("should not consider operations skipped", () => {
|
|
91
|
+
const action1 = fakeAction({
|
|
92
|
+
type: "NOOP",
|
|
93
|
+
input: {},
|
|
94
|
+
scope: "global",
|
|
95
|
+
});
|
|
96
|
+
const action2 = fakeAction({
|
|
97
|
+
type: "ADD_FOLDER",
|
|
98
|
+
input: { id: "1", name: "test1" },
|
|
99
|
+
scope: "global",
|
|
100
|
+
});
|
|
101
|
+
const action3 = fakeAction({
|
|
102
|
+
type: "ADD_FOLDER",
|
|
103
|
+
input: { id: "2", name: "test2" },
|
|
104
|
+
scope: "global",
|
|
105
|
+
});
|
|
106
|
+
const action4 = fakeAction({
|
|
107
|
+
type: "ADD_FOLDER",
|
|
108
|
+
input: { id: "1", name: "test1" },
|
|
109
|
+
scope: "global",
|
|
110
|
+
});
|
|
111
|
+
const action5 = fakeAction({
|
|
112
|
+
type: "ADD_FOLDER",
|
|
113
|
+
input: { id: "1", name: "test1" },
|
|
114
|
+
scope: "global",
|
|
115
|
+
});
|
|
116
|
+
const action6 = fakeAction({
|
|
117
|
+
type: "ADD_FOLDER",
|
|
118
|
+
input: { id: "2", name: "test2" },
|
|
119
|
+
scope: "global",
|
|
120
|
+
});
|
|
88
121
|
const existingOperations = [
|
|
89
122
|
{
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
input: {},
|
|
93
|
-
scope: "global",
|
|
94
|
-
}),
|
|
123
|
+
id: deriveOperationId(TEST_DOC_ID, TEST_SCOPE, TEST_BRANCH, action1.id),
|
|
124
|
+
action: action1,
|
|
95
125
|
index: 0,
|
|
96
126
|
timestampUtcMs: "2024-04-22T18:33:20.624Z",
|
|
97
127
|
hash: "pLimr2HqW//d6upWCv4tGfI0W4c=",
|
|
98
128
|
skip: 0,
|
|
99
129
|
},
|
|
100
130
|
{
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
input: { id: "1", name: "test1" },
|
|
104
|
-
scope: "global",
|
|
105
|
-
}),
|
|
131
|
+
id: deriveOperationId(TEST_DOC_ID, TEST_SCOPE, TEST_BRANCH, action2.id),
|
|
132
|
+
action: action2,
|
|
106
133
|
index: 1,
|
|
107
134
|
timestampUtcMs: "2024-04-22T18:33:20.631Z",
|
|
108
135
|
hash: "P6p5OmHl7FpHRN9ftOS0k+eaU4E=",
|
|
109
136
|
skip: 1,
|
|
110
137
|
},
|
|
111
138
|
{
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
input: { id: "2", name: "test2" },
|
|
115
|
-
scope: "global",
|
|
116
|
-
}),
|
|
139
|
+
id: deriveOperationId(TEST_DOC_ID, TEST_SCOPE, TEST_BRANCH, action3.id),
|
|
140
|
+
action: action3,
|
|
117
141
|
index: 2,
|
|
118
142
|
timestampUtcMs: "2024-04-22T18:33:20.631Z",
|
|
119
143
|
hash: "5XOFEY2NKrHVyOA3c3oXDibrjwM=",
|
|
@@ -122,33 +146,24 @@ describe("removeExistingOperations", () => {
|
|
|
122
146
|
];
|
|
123
147
|
const operationsHistory = [
|
|
124
148
|
{
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
input: { id: "1", name: "test1" },
|
|
128
|
-
scope: "global",
|
|
129
|
-
}),
|
|
149
|
+
id: deriveOperationId(TEST_DOC_ID, TEST_SCOPE, TEST_BRANCH, action4.id),
|
|
150
|
+
action: action4,
|
|
130
151
|
index: 0,
|
|
131
152
|
timestampUtcMs: "2024-04-22T18:33:20.628Z",
|
|
132
153
|
hash: "P6p5OmHl7FpHRN9ftOS0k+eaU4E=",
|
|
133
154
|
skip: 0,
|
|
134
155
|
},
|
|
135
156
|
{
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
input: { id: "1", name: "test1" },
|
|
139
|
-
scope: "global",
|
|
140
|
-
}),
|
|
157
|
+
id: deriveOperationId(TEST_DOC_ID, TEST_SCOPE, TEST_BRANCH, action5.id),
|
|
158
|
+
action: action5,
|
|
141
159
|
index: 1,
|
|
142
160
|
timestampUtcMs: "2024-04-22T18:33:20.630Z",
|
|
143
161
|
hash: "P6p5OmHl7FpHRN9ftOS0k+eaU4E=",
|
|
144
162
|
skip: 1,
|
|
145
163
|
},
|
|
146
164
|
{
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
input: { id: "2", name: "test2" },
|
|
150
|
-
scope: "global",
|
|
151
|
-
}),
|
|
165
|
+
id: deriveOperationId(TEST_DOC_ID, TEST_SCOPE, TEST_BRANCH, action6.id),
|
|
166
|
+
action: action6,
|
|
152
167
|
index: 2,
|
|
153
168
|
timestampUtcMs: "2024-04-22T18:33:20.630Z",
|
|
154
169
|
hash: "5XOFEY2NKrHVyOA3c3oXDibrjwM=",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeExistingOperations.test.js","sourceRoot":"","sources":["../../../test/document-helpers/removeExistingOperations.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAG9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"removeExistingOperations.test.js","sourceRoot":"","sources":["../../../test/document-helpers/removeExistingOperations.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,19 @@
|
|
|
1
|
-
import { skipHeaderOperations } from "document-model/core";
|
|
1
|
+
import { deriveOperationId, generateId, skipHeaderOperations } from "document-model/core";
|
|
2
2
|
import { describe, expect, it } from "vitest";
|
|
3
|
+
const TEST_DOC_ID = "test-doc-id";
|
|
4
|
+
const TEST_BRANCH = "main";
|
|
5
|
+
const TEST_SCOPE = "global";
|
|
3
6
|
const fakeOperation = (index, skip, type) => {
|
|
4
7
|
const timestamp = new Date().toISOString();
|
|
8
|
+
const actionId = generateId();
|
|
5
9
|
return {
|
|
10
|
+
id: deriveOperationId(TEST_DOC_ID, TEST_SCOPE, TEST_BRANCH, actionId),
|
|
6
11
|
index,
|
|
7
12
|
skip,
|
|
8
13
|
timestampUtcMs: timestamp,
|
|
9
14
|
hash: "123",
|
|
10
15
|
action: {
|
|
11
|
-
id:
|
|
16
|
+
id: actionId,
|
|
12
17
|
timestampUtcMs: timestamp,
|
|
13
18
|
type,
|
|
14
19
|
input: {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skipHeaderOperations.test.js","sourceRoot":"","sources":["../../../test/document-helpers/skipHeaderOperations.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"skipHeaderOperations.test.js","sourceRoot":"","sources":["../../../test/document-helpers/skipHeaderOperations.test.ts"],"names":[],"mappings":"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"}
|