document-model 6.0.0-dev.104 → 6.0.0-dev.106

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 (289) hide show
  1. package/dist/index.d.ts +81 -0
  2. package/dist/index.d.ts.map +1 -0
  3. package/dist/index.js +216 -0
  4. package/dist/index.js.map +1 -0
  5. package/dist/{src/core/node.d.ts → node.d.mts} +25 -23
  6. package/dist/node.d.mts.map +1 -0
  7. package/dist/node.mjs +151 -0
  8. package/dist/node.mjs.map +1 -0
  9. package/package.json +11 -15
  10. package/dist/src/core/actions.d.ts +0 -87
  11. package/dist/src/core/actions.d.ts.map +0 -1
  12. package/dist/src/core/actions.js +0 -187
  13. package/dist/src/core/actions.js.map +0 -1
  14. package/dist/src/core/controller.d.ts +0 -30
  15. package/dist/src/core/controller.d.ts.map +0 -1
  16. package/dist/src/core/controller.js +0 -60
  17. package/dist/src/core/controller.js.map +0 -1
  18. package/dist/src/core/crypto.d.ts +0 -8
  19. package/dist/src/core/crypto.d.ts.map +0 -1
  20. package/dist/src/core/crypto.js +0 -68
  21. package/dist/src/core/crypto.js.map +0 -1
  22. package/dist/src/core/documents.d.ts +0 -147
  23. package/dist/src/core/documents.d.ts.map +0 -1
  24. package/dist/src/core/documents.js +0 -845
  25. package/dist/src/core/documents.js.map +0 -1
  26. package/dist/src/core/errors.d.ts +0 -21
  27. package/dist/src/core/errors.d.ts.map +0 -1
  28. package/dist/src/core/errors.js +0 -46
  29. package/dist/src/core/errors.js.map +0 -1
  30. package/dist/src/core/files.d.ts +0 -27
  31. package/dist/src/core/files.d.ts.map +0 -1
  32. package/dist/src/core/files.js +0 -90
  33. package/dist/src/core/files.js.map +0 -1
  34. package/dist/src/core/header.d.ts +0 -63
  35. package/dist/src/core/header.d.ts.map +0 -1
  36. package/dist/src/core/header.js +0 -173
  37. package/dist/src/core/header.js.map +0 -1
  38. package/dist/src/core/index.d.ts +0 -16
  39. package/dist/src/core/index.d.ts.map +0 -1
  40. package/dist/src/core/index.js +0 -16
  41. package/dist/src/core/index.js.map +0 -1
  42. package/dist/src/core/logger-types.d.ts +0 -12
  43. package/dist/src/core/logger-types.d.ts.map +0 -1
  44. package/dist/src/core/logger-types.js +0 -2
  45. package/dist/src/core/logger-types.js.map +0 -1
  46. package/dist/src/core/logger.d.ts +0 -27
  47. package/dist/src/core/logger.d.ts.map +0 -1
  48. package/dist/src/core/logger.js +0 -127
  49. package/dist/src/core/logger.js.map +0 -1
  50. package/dist/src/core/node.d.ts.map +0 -1
  51. package/dist/src/core/node.js +0 -155
  52. package/dist/src/core/node.js.map +0 -1
  53. package/dist/src/core/operations.d.ts +0 -50
  54. package/dist/src/core/operations.d.ts.map +0 -1
  55. package/dist/src/core/operations.js +0 -126
  56. package/dist/src/core/operations.js.map +0 -1
  57. package/dist/src/core/ph-types.d.ts +0 -2
  58. package/dist/src/core/ph-types.d.ts.map +0 -1
  59. package/dist/src/core/ph-types.js +0 -2
  60. package/dist/src/core/ph-types.js.map +0 -1
  61. package/dist/src/core/reducer.d.ts +0 -63
  62. package/dist/src/core/reducer.d.ts.map +0 -1
  63. package/dist/src/core/reducer.js +0 -446
  64. package/dist/src/core/reducer.js.map +0 -1
  65. package/dist/src/core/schemas.d.ts +0 -75
  66. package/dist/src/core/schemas.d.ts.map +0 -1
  67. package/dist/src/core/schemas.js +0 -116
  68. package/dist/src/core/schemas.js.map +0 -1
  69. package/dist/src/core/state.d.ts +0 -26
  70. package/dist/src/core/state.d.ts.map +0 -1
  71. package/dist/src/core/state.js +0 -56
  72. package/dist/src/core/state.js.map +0 -1
  73. package/dist/src/core/types.d.ts +0 -2
  74. package/dist/src/core/types.d.ts.map +0 -1
  75. package/dist/src/core/types.js +0 -2
  76. package/dist/src/core/types.js.map +0 -1
  77. package/dist/src/core/utils.d.ts +0 -6
  78. package/dist/src/core/utils.d.ts.map +0 -1
  79. package/dist/src/core/utils.js +0 -15
  80. package/dist/src/core/utils.js.map +0 -1
  81. package/dist/src/core/validation.d.ts +0 -4
  82. package/dist/src/core/validation.d.ts.map +0 -1
  83. package/dist/src/core/validation.js +0 -27
  84. package/dist/src/core/validation.js.map +0 -1
  85. package/dist/src/document-model/actions.d.ts +0 -164
  86. package/dist/src/document-model/actions.d.ts.map +0 -1
  87. package/dist/src/document-model/actions.js +0 -111
  88. package/dist/src/document-model/actions.js.map +0 -1
  89. package/dist/src/document-model/constants.d.ts +0 -6
  90. package/dist/src/document-model/constants.d.ts.map +0 -1
  91. package/dist/src/document-model/constants.js +0 -584
  92. package/dist/src/document-model/constants.js.map +0 -1
  93. package/dist/src/document-model/controller.d.ts +0 -5
  94. package/dist/src/document-model/controller.d.ts.map +0 -1
  95. package/dist/src/document-model/controller.js +0 -5
  96. package/dist/src/document-model/controller.js.map +0 -1
  97. package/dist/src/document-model/document-schema.d.ts +0 -69
  98. package/dist/src/document-model/document-schema.d.ts.map +0 -1
  99. package/dist/src/document-model/document-schema.js +0 -43
  100. package/dist/src/document-model/document-schema.js.map +0 -1
  101. package/dist/src/document-model/document-type.d.ts +0 -2
  102. package/dist/src/document-model/document-type.d.ts.map +0 -1
  103. package/dist/src/document-model/document-type.js +0 -2
  104. package/dist/src/document-model/document-type.js.map +0 -1
  105. package/dist/src/document-model/files.d.ts +0 -5
  106. package/dist/src/document-model/files.d.ts.map +0 -1
  107. package/dist/src/document-model/files.js +0 -9
  108. package/dist/src/document-model/files.js.map +0 -1
  109. package/dist/src/document-model/index.d.ts +0 -12
  110. package/dist/src/document-model/index.d.ts.map +0 -1
  111. package/dist/src/document-model/index.js +0 -12
  112. package/dist/src/document-model/index.js.map +0 -1
  113. package/dist/src/document-model/module.d.ts +0 -3
  114. package/dist/src/document-model/module.d.ts.map +0 -1
  115. package/dist/src/document-model/module.js +0 -24
  116. package/dist/src/document-model/module.js.map +0 -1
  117. package/dist/src/document-model/reducers.d.ts +0 -11
  118. package/dist/src/document-model/reducers.d.ts.map +0 -1
  119. package/dist/src/document-model/reducers.js +0 -618
  120. package/dist/src/document-model/reducers.js.map +0 -1
  121. package/dist/src/document-model/schemas.d.ts +0 -189
  122. package/dist/src/document-model/schemas.d.ts.map +0 -1
  123. package/dist/src/document-model/schemas.js +0 -388
  124. package/dist/src/document-model/schemas.js.map +0 -1
  125. package/dist/src/document-model/state.d.ts +0 -15
  126. package/dist/src/document-model/state.d.ts.map +0 -1
  127. package/dist/src/document-model/state.js +0 -75
  128. package/dist/src/document-model/state.js.map +0 -1
  129. package/dist/src/document-model/types.d.ts +0 -584
  130. package/dist/src/document-model/types.d.ts.map +0 -1
  131. package/dist/src/document-model/types.js +0 -2
  132. package/dist/src/document-model/types.js.map +0 -1
  133. package/dist/src/document-model/validation.d.ts +0 -32
  134. package/dist/src/document-model/validation.d.ts.map +0 -1
  135. package/dist/src/document-model/validation.js +0 -166
  136. package/dist/src/document-model/validation.js.map +0 -1
  137. package/dist/src/index.d.ts +0 -6
  138. package/dist/src/index.d.ts.map +0 -1
  139. package/dist/src/index.js +0 -3
  140. package/dist/src/index.js.map +0 -1
  141. package/dist/test/document/crypto.test.d.ts +0 -2
  142. package/dist/test/document/crypto.test.d.ts.map +0 -1
  143. package/dist/test/document/crypto.test.js +0 -192
  144. package/dist/test/document/crypto.test.js.map +0 -1
  145. package/dist/test/document/event-vs-command.test.d.ts +0 -2
  146. package/dist/test/document/event-vs-command.test.d.ts.map +0 -1
  147. package/dist/test/document/event-vs-command.test.js +0 -202
  148. package/dist/test/document/event-vs-command.test.js.map +0 -1
  149. package/dist/test/document/local.test.d.ts +0 -2
  150. package/dist/test/document/local.test.d.ts.map +0 -1
  151. package/dist/test/document/local.test.js +0 -226
  152. package/dist/test/document/local.test.js.map +0 -1
  153. package/dist/test/document/operation-id.test.d.ts +0 -2
  154. package/dist/test/document/operation-id.test.d.ts.map +0 -1
  155. package/dist/test/document/operation-id.test.js +0 -118
  156. package/dist/test/document/operation-id.test.js.map +0 -1
  157. package/dist/test/document/prune.test.d.ts +0 -2
  158. package/dist/test/document/prune.test.d.ts.map +0 -1
  159. package/dist/test/document/prune.test.js +0 -159
  160. package/dist/test/document/prune.test.js.map +0 -1
  161. package/dist/test/document/reducer.test.d.ts +0 -2
  162. package/dist/test/document/reducer.test.d.ts.map +0 -1
  163. package/dist/test/document/reducer.test.js +0 -284
  164. package/dist/test/document/reducer.test.js.map +0 -1
  165. package/dist/test/document/skip-operations.test.d.ts +0 -2
  166. package/dist/test/document/skip-operations.test.d.ts.map +0 -1
  167. package/dist/test/document/skip-operations.test.js +0 -495
  168. package/dist/test/document/skip-operations.test.js.map +0 -1
  169. package/dist/test/document/undo-redo-v2.test.d.ts +0 -2
  170. package/dist/test/document/undo-redo-v2.test.d.ts.map +0 -1
  171. package/dist/test/document/undo-redo-v2.test.js +0 -207
  172. package/dist/test/document/undo-redo-v2.test.js.map +0 -1
  173. package/dist/test/document/undo-redo.test.d.ts +0 -2
  174. package/dist/test/document/undo-redo.test.d.ts.map +0 -1
  175. package/dist/test/document/undo-redo.test.js +0 -413
  176. package/dist/test/document/undo-redo.test.js.map +0 -1
  177. package/dist/test/document/utils.test.d.ts +0 -2
  178. package/dist/test/document/utils.test.d.ts.map +0 -1
  179. package/dist/test/document/utils.test.js +0 -172
  180. package/dist/test/document/utils.test.js.map +0 -1
  181. package/dist/test/document-helpers/addUndo.test.d.ts +0 -2
  182. package/dist/test/document-helpers/addUndo.test.d.ts.map +0 -1
  183. package/dist/test/document-helpers/addUndo.test.js +0 -120
  184. package/dist/test/document-helpers/addUndo.test.js.map +0 -1
  185. package/dist/test/document-helpers/attachBranch.test.d.ts +0 -2
  186. package/dist/test/document-helpers/attachBranch.test.d.ts.map +0 -1
  187. package/dist/test/document-helpers/attachBranch.test.js +0 -364
  188. package/dist/test/document-helpers/attachBranch.test.js.map +0 -1
  189. package/dist/test/document-helpers/checkCleanedOperationsIntegrity.test.d.ts +0 -2
  190. package/dist/test/document-helpers/checkCleanedOperationsIntegrity.test.d.ts.map +0 -1
  191. package/dist/test/document-helpers/checkCleanedOperationsIntegrity.test.js +0 -252
  192. package/dist/test/document-helpers/checkCleanedOperationsIntegrity.test.js.map +0 -1
  193. package/dist/test/document-helpers/conflictResolution.test.d.ts +0 -2
  194. package/dist/test/document-helpers/conflictResolution.test.d.ts.map +0 -1
  195. package/dist/test/document-helpers/conflictResolution.test.js +0 -109
  196. package/dist/test/document-helpers/conflictResolution.test.js.map +0 -1
  197. package/dist/test/document-helpers/filterDuplicatedOperations.test.d.ts +0 -2
  198. package/dist/test/document-helpers/filterDuplicatedOperations.test.d.ts.map +0 -1
  199. package/dist/test/document-helpers/filterDuplicatedOperations.test.js +0 -126
  200. package/dist/test/document-helpers/filterDuplicatedOperations.test.js.map +0 -1
  201. package/dist/test/document-helpers/garbageCollect.test.d.ts +0 -2
  202. package/dist/test/document-helpers/garbageCollect.test.d.ts.map +0 -1
  203. package/dist/test/document-helpers/garbageCollect.test.js +0 -136
  204. package/dist/test/document-helpers/garbageCollect.test.js.map +0 -1
  205. package/dist/test/document-helpers/groupOperationsByScope.test.d.ts +0 -2
  206. package/dist/test/document-helpers/groupOperationsByScope.test.d.ts.map +0 -1
  207. package/dist/test/document-helpers/groupOperationsByScope.test.js +0 -102
  208. package/dist/test/document-helpers/groupOperationsByScope.test.js.map +0 -1
  209. package/dist/test/document-helpers/headerRevision.test.d.ts +0 -2
  210. package/dist/test/document-helpers/headerRevision.test.d.ts.map +0 -1
  211. package/dist/test/document-helpers/headerRevision.test.js +0 -203
  212. package/dist/test/document-helpers/headerRevision.test.js.map +0 -1
  213. package/dist/test/document-helpers/merge.test.d.ts +0 -2
  214. package/dist/test/document-helpers/merge.test.d.ts.map +0 -1
  215. package/dist/test/document-helpers/merge.test.js +0 -906
  216. package/dist/test/document-helpers/merge.test.js.map +0 -1
  217. package/dist/test/document-helpers/nextSkipNumber.test.d.ts +0 -2
  218. package/dist/test/document-helpers/nextSkipNumber.test.d.ts.map +0 -1
  219. package/dist/test/document-helpers/nextSkipNumber.test.js +0 -135
  220. package/dist/test/document-helpers/nextSkipNumber.test.js.map +0 -1
  221. package/dist/test/document-helpers/prepareOperations.test.d.ts +0 -2
  222. package/dist/test/document-helpers/prepareOperations.test.d.ts.map +0 -1
  223. package/dist/test/document-helpers/prepareOperations.test.js +0 -304
  224. package/dist/test/document-helpers/prepareOperations.test.js.map +0 -1
  225. package/dist/test/document-helpers/removeExistingOperations.test.d.ts +0 -2
  226. package/dist/test/document-helpers/removeExistingOperations.test.d.ts.map +0 -1
  227. package/dist/test/document-helpers/removeExistingOperations.test.js +0 -177
  228. package/dist/test/document-helpers/removeExistingOperations.test.js.map +0 -1
  229. package/dist/test/document-helpers/reshuffleByTimestamp.test.d.ts +0 -2
  230. package/dist/test/document-helpers/reshuffleByTimestamp.test.d.ts.map +0 -1
  231. package/dist/test/document-helpers/reshuffleByTimestamp.test.js +0 -148
  232. package/dist/test/document-helpers/reshuffleByTimestamp.test.js.map +0 -1
  233. package/dist/test/document-helpers/reshuffleByTimestampAndIndex.test.d.ts +0 -2
  234. package/dist/test/document-helpers/reshuffleByTimestampAndIndex.test.d.ts.map +0 -1
  235. package/dist/test/document-helpers/reshuffleByTimestampAndIndex.test.js +0 -200
  236. package/dist/test/document-helpers/reshuffleByTimestampAndIndex.test.js.map +0 -1
  237. package/dist/test/document-helpers/skipHeaderOperations.test.d.ts +0 -2
  238. package/dist/test/document-helpers/skipHeaderOperations.test.d.ts.map +0 -1
  239. package/dist/test/document-helpers/skipHeaderOperations.test.js +0 -72
  240. package/dist/test/document-helpers/skipHeaderOperations.test.js.map +0 -1
  241. package/dist/test/document-helpers/sortOperations.test.d.ts +0 -2
  242. package/dist/test/document-helpers/sortOperations.test.d.ts.map +0 -1
  243. package/dist/test/document-helpers/sortOperations.test.js +0 -101
  244. package/dist/test/document-helpers/sortOperations.test.js.map +0 -1
  245. package/dist/test/document-helpers/split.test.d.ts +0 -2
  246. package/dist/test/document-helpers/split.test.d.ts.map +0 -1
  247. package/dist/test/document-helpers/split.test.js +0 -121
  248. package/dist/test/document-helpers/split.test.js.map +0 -1
  249. package/dist/test/document-helpers/utils.d.ts +0 -15
  250. package/dist/test/document-helpers/utils.d.ts.map +0 -1
  251. package/dist/test/document-helpers/utils.js +0 -61
  252. package/dist/test/document-helpers/utils.js.map +0 -1
  253. package/dist/test/document-model/replay.test.d.ts +0 -2
  254. package/dist/test/document-model/replay.test.d.ts.map +0 -1
  255. package/dist/test/document-model/replay.test.js +0 -139
  256. package/dist/test/document-model/replay.test.js.map +0 -1
  257. package/dist/test/document-model/skip-operations.test.d.ts +0 -2
  258. package/dist/test/document-model/skip-operations.test.d.ts.map +0 -1
  259. package/dist/test/document-model/skip-operations.test.js +0 -214
  260. package/dist/test/document-model/skip-operations.test.js.map +0 -1
  261. package/dist/test/document-model/validation.test.d.ts +0 -2
  262. package/dist/test/document-model/validation.test.d.ts.map +0 -1
  263. package/dist/test/document-model/validation.test.js +0 -451
  264. package/dist/test/document-model/validation.test.js.map +0 -1
  265. package/dist/test/document-model/versioning.test.d.ts +0 -2
  266. package/dist/test/document-model/versioning.test.d.ts.map +0 -1
  267. package/dist/test/document-model/versioning.test.js +0 -93
  268. package/dist/test/document-model/versioning.test.js.map +0 -1
  269. package/dist/test/document-model/zip.test.d.ts +0 -2
  270. package/dist/test/document-model/zip.test.d.ts.map +0 -1
  271. package/dist/test/document-model/zip.test.js +0 -79
  272. package/dist/test/document-model/zip.test.js.map +0 -1
  273. package/dist/test/helpers.d.ts +0 -79
  274. package/dist/test/helpers.d.ts.map +0 -1
  275. package/dist/test/helpers.js +0 -121
  276. package/dist/test/helpers.js.map +0 -1
  277. package/dist/test/index.d.ts +0 -4
  278. package/dist/test/index.d.ts.map +0 -1
  279. package/dist/test/index.js +0 -3
  280. package/dist/test/index.js.map +0 -1
  281. package/dist/test/types.d.ts +0 -6
  282. package/dist/test/types.d.ts.map +0 -1
  283. package/dist/test/types.js +0 -2
  284. package/dist/test/types.js.map +0 -1
  285. package/dist/tsconfig.tsbuildinfo +0 -1
  286. package/dist/vitest.config.d.ts +0 -3
  287. package/dist/vitest.config.d.ts.map +0 -1
  288. package/dist/vitest.config.js +0 -7
  289. package/dist/vitest.config.js.map +0 -1
@@ -1,906 +0,0 @@
1
- import { checkCleanedOperationsIntegrity, merge, reshuffleByTimestamp, reshuffleByTimestampAndIndex, } from "document-model/core";
2
- import { describe, expect, it } from "vitest";
3
- import { buildOperations } from "./utils.js";
4
- describe("merge", () => {
5
- const scenarios = [
6
- {
7
- // [0:0, 1:0, 2:0, A3:0, A4:0, A5:0] + [0:0, 1:0, 2:0, B3:0, B4:2, B5:0]
8
- // GC => [0:0, 1:0, 2:0, A3:0, A4:0, A5:0] + [0:0, 1:0, B4:2, B5:0]
9
- // Split => [0:0, 1:0] + [2:0, A3:0, A4:0, A5:0] + [B4:2, B5:0]
10
- // Reshuffle(6:4) => [6:4, 7:0, 8:0, 9:0, 10:0, 11:0]
11
- // merge => [0:0, 1:0, 6:4, 7:0, 8:0, 9:0, 10:0, 11:0]
12
- title: "case 1",
13
- targetOperations: [
14
- {
15
- index: 0,
16
- skip: 0,
17
- type: "OP_0",
18
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
19
- },
20
- {
21
- index: 1,
22
- skip: 0,
23
- type: "OP_1",
24
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
25
- },
26
- {
27
- index: 2,
28
- skip: 0,
29
- type: "OP_A_2",
30
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
31
- },
32
- {
33
- index: 3,
34
- skip: 0,
35
- type: "OP_A_3",
36
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
37
- },
38
- {
39
- index: 4,
40
- skip: 0,
41
- type: "OP_A_4",
42
- timestampUtcMs: "2021-01-09T00:00:00.000Z",
43
- },
44
- {
45
- index: 5,
46
- skip: 0,
47
- type: "OP_A_5",
48
- timestampUtcMs: "2021-01-10T00:00:00.000Z",
49
- },
50
- ],
51
- mergeOperations: [
52
- {
53
- index: 0,
54
- skip: 0,
55
- type: "OP_0",
56
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
57
- },
58
- {
59
- index: 1,
60
- skip: 0,
61
- type: "OP_1",
62
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
63
- },
64
- {
65
- index: 2,
66
- skip: 0,
67
- type: "OP_B_2",
68
- timestampUtcMs: "2021-01-05T00:00:00.000Z",
69
- },
70
- {
71
- index: 3,
72
- skip: 0,
73
- type: "OP_B_3",
74
- timestampUtcMs: "2021-01-06T00:00:00.000Z",
75
- },
76
- {
77
- index: 4,
78
- skip: 2,
79
- type: "OP_B_4",
80
- timestampUtcMs: "2021-01-07T00:00:00.000Z",
81
- },
82
- {
83
- index: 5,
84
- skip: 0,
85
- type: "OP_B_5",
86
- timestampUtcMs: "2021-01-08T00:00:00.000Z",
87
- },
88
- ],
89
- expected: [
90
- {
91
- index: 0,
92
- skip: 0,
93
- type: "OP_0",
94
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
95
- },
96
- {
97
- index: 1,
98
- skip: 0,
99
- type: "OP_1",
100
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
101
- },
102
- {
103
- index: 6,
104
- skip: 4,
105
- type: "OP_A_2",
106
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
107
- },
108
- {
109
- index: 7,
110
- skip: 0,
111
- type: "OP_A_3",
112
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
113
- },
114
- {
115
- index: 8,
116
- skip: 0,
117
- type: "OP_B_4",
118
- timestampUtcMs: "2021-01-07T00:00:00.000Z",
119
- },
120
- {
121
- index: 9,
122
- skip: 0,
123
- type: "OP_A_4",
124
- timestampUtcMs: "2021-01-09T00:00:00.000Z",
125
- },
126
- {
127
- index: 10,
128
- skip: 0,
129
- type: "OP_B_5",
130
- timestampUtcMs: "2021-01-08T00:00:00.000Z",
131
- },
132
- {
133
- index: 11,
134
- skip: 0,
135
- type: "OP_A_5",
136
- timestampUtcMs: "2021-01-10T00:00:00.000Z",
137
- },
138
- ],
139
- },
140
- {
141
- // [0:0, 1:0, 2:0, A3:0, A4:0, A5:1] + [0:0, 1:0, 2:0, B3:0, B4:2, B5:0]
142
- // GC => [0:0, 1:0, 2:0, A3:0, A5:1] + [0:0, 1:0, B4:2, B5:0]
143
- // Split => [0:0, 1:0] + [2:0, A3:0, A5:1] + [B4:2, B5:0]
144
- // Reshuffle(6:4) => [6:4, 7:0, 8:0, 9:0, 10:0]
145
- // merge => [0:0, 1:0, 6:4, 7:0, 8:0, 9:0, 10:0]
146
- title: "case 2",
147
- targetOperations: [
148
- {
149
- index: 0,
150
- skip: 0,
151
- type: "OP_0",
152
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
153
- },
154
- {
155
- index: 1,
156
- skip: 0,
157
- type: "OP_1",
158
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
159
- },
160
- {
161
- index: 2,
162
- skip: 0,
163
- type: "OP_A_2",
164
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
165
- },
166
- {
167
- index: 3,
168
- skip: 0,
169
- type: "OP_A_3",
170
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
171
- },
172
- {
173
- index: 4,
174
- skip: 0,
175
- type: "OP_A_4",
176
- timestampUtcMs: "2021-01-05T00:00:00.000Z",
177
- },
178
- {
179
- index: 5,
180
- skip: 1,
181
- type: "OP_A_5",
182
- timestampUtcMs: "2021-01-06T00:00:00.000Z",
183
- },
184
- ],
185
- mergeOperations: [
186
- {
187
- index: 0,
188
- skip: 0,
189
- type: "OP_0",
190
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
191
- },
192
- {
193
- index: 1,
194
- skip: 0,
195
- type: "OP_1",
196
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
197
- },
198
- {
199
- index: 2,
200
- skip: 0,
201
- type: "OP_B_2",
202
- timestampUtcMs: "2021-01-07T00:00:00.000Z",
203
- },
204
- {
205
- index: 3,
206
- skip: 0,
207
- type: "OP_B_3",
208
- timestampUtcMs: "2021-01-08T00:00:00.000Z",
209
- },
210
- {
211
- index: 4,
212
- skip: 2,
213
- type: "OP_B_4",
214
- timestampUtcMs: "2021-01-09T00:00:00.000Z",
215
- },
216
- {
217
- index: 5,
218
- skip: 0,
219
- type: "OP_B_5",
220
- timestampUtcMs: "2021-01-10T00:00:00.000Z",
221
- },
222
- ],
223
- expected: [
224
- {
225
- index: 0,
226
- skip: 0,
227
- type: "OP_0",
228
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
229
- },
230
- {
231
- index: 1,
232
- skip: 0,
233
- type: "OP_1",
234
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
235
- },
236
- {
237
- index: 6,
238
- skip: 4,
239
- type: "OP_A_2",
240
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
241
- },
242
- {
243
- index: 7,
244
- skip: 0,
245
- type: "OP_A_3",
246
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
247
- },
248
- {
249
- index: 8,
250
- skip: 0,
251
- type: "OP_B_4",
252
- timestampUtcMs: "2021-01-09T00:00:00.000Z",
253
- },
254
- {
255
- index: 9,
256
- skip: 0,
257
- type: "OP_A_5",
258
- timestampUtcMs: "2021-01-06T00:00:00.000Z",
259
- },
260
- {
261
- index: 10,
262
- skip: 0,
263
- type: "OP_B_5",
264
- timestampUtcMs: "2021-01-10T00:00:00.000Z",
265
- },
266
- ],
267
- },
268
- // [0:0, 1:1, 2:0, A3:0, A4:0, A5:1] + [0:0, 1:1, 2:0, B3:0, B4:2, B5:0]
269
- // GC => [1:1, 2:0, A3:0, A5:1] + [1:1, B4:2, B5:0]
270
- // Split => [1:1] + [2:0, A3:0, A5:1] + [B4:2, B5:0]
271
- // Reshuffle(6:4) => [6:4, 7:0, 8:0, 9:0, 10:0, 11:0]
272
- // merge => [1:1, 6:4, 7:0, 8:0, 9:0, 10:0, 11:0]
273
- {
274
- title: "case 3",
275
- targetOperations: [
276
- {
277
- index: 0,
278
- skip: 0,
279
- type: "OP_0",
280
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
281
- },
282
- {
283
- index: 1,
284
- skip: 1,
285
- type: "OP_1",
286
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
287
- },
288
- {
289
- index: 2,
290
- skip: 0,
291
- type: "OP_A_2",
292
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
293
- },
294
- {
295
- index: 3,
296
- skip: 0,
297
- type: "OP_A_3",
298
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
299
- },
300
- {
301
- index: 4,
302
- skip: 0,
303
- type: "OP_A_4",
304
- timestampUtcMs: "2021-01-05T00:00:00.000Z",
305
- },
306
- {
307
- index: 5,
308
- skip: 1,
309
- type: "OP_A_5",
310
- timestampUtcMs: "2021-01-06T00:00:00.000Z",
311
- },
312
- ],
313
- mergeOperations: [
314
- {
315
- index: 0,
316
- skip: 0,
317
- type: "OP_0",
318
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
319
- },
320
- {
321
- index: 1,
322
- skip: 1,
323
- type: "OP_1",
324
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
325
- },
326
- {
327
- index: 2,
328
- skip: 0,
329
- type: "OP_B_2",
330
- timestampUtcMs: "2021-01-07T00:00:00.000Z",
331
- },
332
- {
333
- index: 3,
334
- skip: 0,
335
- type: "OP_B_3",
336
- timestampUtcMs: "2021-01-08T00:00:00.000Z",
337
- },
338
- {
339
- index: 4,
340
- skip: 2,
341
- type: "OP_B_4",
342
- timestampUtcMs: "2021-01-09T00:00:00.000Z",
343
- },
344
- {
345
- index: 5,
346
- skip: 0,
347
- type: "OP_B_5",
348
- timestampUtcMs: "2021-01-10T00:00:00.000Z",
349
- },
350
- ],
351
- expected: [
352
- {
353
- index: 1,
354
- skip: 1,
355
- type: "OP_1",
356
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
357
- },
358
- {
359
- index: 6,
360
- skip: 4,
361
- type: "OP_A_2",
362
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
363
- },
364
- {
365
- index: 7,
366
- skip: 0,
367
- type: "OP_A_3",
368
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
369
- },
370
- {
371
- index: 8,
372
- skip: 0,
373
- type: "OP_B_4",
374
- timestampUtcMs: "2021-01-09T00:00:00.000Z",
375
- },
376
- {
377
- index: 9,
378
- skip: 0,
379
- type: "OP_A_5",
380
- timestampUtcMs: "2021-01-06T00:00:00.000Z",
381
- },
382
- {
383
- index: 10,
384
- skip: 0,
385
- type: "OP_B_5",
386
- timestampUtcMs: "2021-01-10T00:00:00.000Z",
387
- },
388
- ],
389
- },
390
- // [0:0, 1:1, 2:0, A3:0, A4:0, A5:1] + [0:0, 1:1, 2:0]
391
- // GC => [1:1, 2:0, A3:0, A5:1] + [1:1, 2:0]
392
- // Split => [1:1, 2:0] + [A3:0, A5:1] + []
393
- // Reshuffle(6:3) => [6:3, 7:0]
394
- // merge => [1:1, 2:0, 6:3, 7:0]
395
- {
396
- title: "case 4 (empty merge ops)",
397
- targetOperations: [
398
- {
399
- index: 0,
400
- skip: 0,
401
- type: "OP_0",
402
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
403
- },
404
- {
405
- index: 1,
406
- skip: 1,
407
- type: "OP_1",
408
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
409
- },
410
- {
411
- index: 2,
412
- skip: 0,
413
- type: "OP_2",
414
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
415
- },
416
- {
417
- index: 3,
418
- skip: 0,
419
- type: "OP_A_3",
420
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
421
- },
422
- {
423
- index: 4,
424
- skip: 0,
425
- type: "OP_A_4",
426
- timestampUtcMs: "2021-01-05T00:00:00.000Z",
427
- },
428
- {
429
- index: 5,
430
- skip: 1,
431
- type: "OP_A_5",
432
- timestampUtcMs: "2021-01-06T00:00:00.000Z",
433
- },
434
- ],
435
- mergeOperations: [
436
- {
437
- index: 0,
438
- skip: 0,
439
- type: "OP_0",
440
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
441
- },
442
- {
443
- index: 1,
444
- skip: 1,
445
- type: "OP_1",
446
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
447
- },
448
- {
449
- index: 2,
450
- skip: 0,
451
- type: "OP_2",
452
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
453
- },
454
- ],
455
- expected: [
456
- {
457
- index: 1,
458
- skip: 1,
459
- type: "OP_1",
460
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
461
- },
462
- {
463
- index: 2,
464
- skip: 0,
465
- type: "OP_2",
466
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
467
- },
468
- {
469
- index: 6,
470
- skip: 3,
471
- type: "OP_A_3",
472
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
473
- },
474
- {
475
- index: 7,
476
- skip: 0,
477
- type: "OP_A_5",
478
- timestampUtcMs: "2021-01-06T00:00:00.000Z",
479
- },
480
- ],
481
- },
482
- // [0:0, 1:1, 2:0] + [0:0, 1:1, 2:0, A3:0, A4:0, A5:1]
483
- // GC => [1:1, 2:0] + [1:1, 2:0, A3:0, A5:1]
484
- // Split => [1:1, 2:0] + [] + [A3:0, A5:1]
485
- // Reshuffle(6:3) => [6:3, 7:0, 8:0]
486
- // merge => [1:1, 2:0, 6:3, 7:0, 8:0]
487
- {
488
- title: "case 5 (empty target ops)",
489
- targetOperations: [
490
- {
491
- index: 0,
492
- skip: 0,
493
- type: "OP_0",
494
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
495
- },
496
- {
497
- index: 1,
498
- skip: 1,
499
- type: "OP_1",
500
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
501
- },
502
- {
503
- index: 2,
504
- skip: 0,
505
- type: "OP_2",
506
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
507
- },
508
- ],
509
- mergeOperations: [
510
- {
511
- index: 0,
512
- skip: 0,
513
- type: "OP_0",
514
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
515
- },
516
- {
517
- index: 1,
518
- skip: 1,
519
- type: "OP_1",
520
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
521
- },
522
- {
523
- index: 2,
524
- skip: 0,
525
- type: "OP_2",
526
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
527
- },
528
- {
529
- index: 3,
530
- skip: 0,
531
- type: "OP_B_3",
532
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
533
- },
534
- {
535
- index: 4,
536
- skip: 0,
537
- type: "OP_B_4",
538
- timestampUtcMs: "2021-01-05T00:00:00.000Z",
539
- },
540
- {
541
- index: 5,
542
- skip: 1,
543
- type: "OP_B_5",
544
- timestampUtcMs: "2021-01-06T00:00:00.000Z",
545
- },
546
- ],
547
- expected: [
548
- {
549
- index: 1,
550
- skip: 1,
551
- type: "OP_1",
552
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
553
- },
554
- {
555
- index: 2,
556
- skip: 0,
557
- type: "OP_2",
558
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
559
- },
560
- {
561
- index: 6,
562
- skip: 3,
563
- type: "OP_B_3",
564
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
565
- },
566
- {
567
- index: 7,
568
- skip: 0,
569
- type: "OP_B_5",
570
- timestampUtcMs: "2021-01-06T00:00:00.000Z",
571
- },
572
- ],
573
- },
574
- // [A0:0, A1:0, A2:1, A3:0] + [B0:0, B1:0]
575
- // GC => [A0:0, A2:1, A3:0] + [B0:0, B1:0]
576
- // Split => [] + [A0:0, A2:1, A3:0] + [B0:0, B1:0]
577
- // Reshuffle(4:4) => [4:4, 5:0, 6:0, 7:0, 8:0]
578
- // merge => [4:4, 5:0, 6:0, 7:0, 8:0]
579
- {
580
- title: "case 6 (empty common, longer target)",
581
- targetOperations: [
582
- {
583
- index: 0,
584
- skip: 0,
585
- type: "OP_A0",
586
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
587
- },
588
- {
589
- index: 1,
590
- skip: 0,
591
- type: "OP_A1",
592
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
593
- },
594
- {
595
- index: 2,
596
- skip: 1,
597
- type: "OP_A2",
598
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
599
- },
600
- {
601
- index: 3,
602
- skip: 0,
603
- type: "OP_A3",
604
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
605
- },
606
- ],
607
- mergeOperations: [
608
- {
609
- index: 0,
610
- skip: 0,
611
- type: "OP_B0",
612
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
613
- },
614
- {
615
- index: 1,
616
- skip: 0,
617
- type: "OP_B1",
618
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
619
- },
620
- ],
621
- expected: [
622
- {
623
- index: 4,
624
- skip: 4,
625
- type: "OP_A0",
626
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
627
- },
628
- {
629
- index: 5,
630
- skip: 0,
631
- type: "OP_B0",
632
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
633
- },
634
- {
635
- index: 6,
636
- skip: 0,
637
- type: "OP_B1",
638
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
639
- },
640
- {
641
- index: 7,
642
- skip: 0,
643
- type: "OP_A2",
644
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
645
- },
646
- {
647
- index: 8,
648
- skip: 0,
649
- type: "OP_A3",
650
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
651
- },
652
- ],
653
- },
654
- // [A0:0, A1:0] + [B0:0, B1:0, B2:1, B3:0]
655
- // GC => [A0:0, A1:0] + [B0:0, B2:1, B3:0]
656
- // Split => [] + [A0:0, A1:0] + [B0:0, B2:1, B3:0]
657
- // Reshuffle(4:3) => [4:4, 5:0, 6:0, 7:0, 8:0]
658
- // merge => [4:4, 5:0, 6:0, 7:0, 8:0]
659
- {
660
- title: "case 7 (empty common, longer merge)",
661
- targetOperations: [
662
- {
663
- index: 0,
664
- skip: 0,
665
- type: "OP_A0",
666
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
667
- },
668
- {
669
- index: 1,
670
- skip: 0,
671
- type: "OP_A1",
672
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
673
- },
674
- ],
675
- mergeOperations: [
676
- {
677
- index: 0,
678
- skip: 0,
679
- type: "OP_B0",
680
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
681
- },
682
- {
683
- index: 1,
684
- skip: 0,
685
- type: "OP_B1",
686
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
687
- },
688
- {
689
- index: 2,
690
- skip: 1,
691
- type: "OP_B2",
692
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
693
- },
694
- {
695
- index: 3,
696
- skip: 0,
697
- type: "OP_B3",
698
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
699
- },
700
- ],
701
- expected: [
702
- {
703
- index: 4,
704
- skip: 4,
705
- type: "OP_A0",
706
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
707
- },
708
- {
709
- index: 5,
710
- skip: 0,
711
- type: "OP_B0",
712
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
713
- },
714
- {
715
- index: 6,
716
- skip: 0,
717
- type: "OP_A1",
718
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
719
- },
720
- {
721
- index: 7,
722
- skip: 0,
723
- type: "OP_B2",
724
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
725
- },
726
- {
727
- index: 8,
728
- skip: 0,
729
- type: "OP_B3",
730
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
731
- },
732
- ],
733
- },
734
- // [] + []
735
- // GC => [] + []
736
- // Split => [] + [] + []
737
- // Reshuffle(0:0) => []
738
- // merge => []
739
- {
740
- title: "case 8 (all empty)",
741
- targetOperations: [],
742
- mergeOperations: [],
743
- expected: [],
744
- },
745
- ];
746
- it.each(scenarios)("should merge conlficted operations into a new operations history: $title", (testInput) => {
747
- const targetOperations = buildOperations(testInput.targetOperations);
748
- const mergeOperations = buildOperations(testInput.mergeOperations);
749
- const result = merge(targetOperations, mergeOperations, reshuffleByTimestampAndIndex);
750
- expect(result.length).toBe(testInput.expected.length);
751
- expect(result).toMatchObject(testInput.expected);
752
- const check = checkCleanedOperationsIntegrity(result);
753
- expect(check).toHaveLength(0);
754
- });
755
- it("should not consider duplicated operations when merge operations", () => {
756
- const targetOperations = buildOperations([
757
- {
758
- index: 0,
759
- skip: 0,
760
- type: "T_0",
761
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
762
- id: "1",
763
- }, // add folder
764
- {
765
- index: 1,
766
- skip: 0,
767
- type: "T_1",
768
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
769
- id: "2",
770
- }, // add folder
771
- {
772
- index: 2,
773
- skip: 0,
774
- type: "T_2",
775
- timestampUtcMs: "2021-01-05T00:00:00.000Z",
776
- id: "5",
777
- }, // 5
778
- {
779
- index: 3,
780
- skip: 0,
781
- type: "T_3",
782
- timestampUtcMs: "2021-01-06T00:00:00.000Z",
783
- id: "6",
784
- }, // 6
785
- {
786
- index: 4,
787
- skip: 0,
788
- type: "T_4",
789
- timestampUtcMs: "2021-01-07T00:00:00.000Z",
790
- id: "7",
791
- }, // 7
792
- {
793
- index: 5,
794
- skip: 0,
795
- type: "T_5",
796
- timestampUtcMs: "2021-01-08T00:00:00.000Z",
797
- id: "8",
798
- }, // 8
799
- ]);
800
- const mergeOperations = buildOperations([
801
- {
802
- index: 0,
803
- skip: 0,
804
- type: "T_0",
805
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
806
- id: "1",
807
- }, // add folder
808
- {
809
- index: 1,
810
- skip: 0,
811
- type: "T_1",
812
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
813
- id: "2",
814
- }, // add folder
815
- {
816
- index: 4,
817
- skip: 2,
818
- type: "B_4_2",
819
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
820
- id: "3",
821
- }, // 3
822
- {
823
- index: 5,
824
- skip: 0,
825
- type: "B_5",
826
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
827
- id: "4",
828
- }, // 4
829
- {
830
- index: 6,
831
- skip: 0,
832
- type: "T_2",
833
- timestampUtcMs: "2021-01-05T00:00:00.000Z",
834
- id: "5",
835
- }, // 5
836
- {
837
- index: 7,
838
- skip: 0,
839
- type: "T_3",
840
- timestampUtcMs: "2021-01-06T00:00:00.000Z",
841
- id: "6",
842
- }, // 6
843
- ]);
844
- const result = merge(targetOperations, mergeOperations, reshuffleByTimestamp);
845
- expect(result.length).toBe(8);
846
- expect(result).toMatchObject([
847
- {
848
- index: 0,
849
- skip: 0,
850
- type: "T_0",
851
- timestampUtcMs: "2021-01-01T00:00:00.000Z",
852
- id: "1",
853
- }, // add folder
854
- {
855
- index: 1,
856
- skip: 0,
857
- type: "T_1",
858
- timestampUtcMs: "2021-01-02T00:00:00.000Z",
859
- id: "2",
860
- }, // add folder
861
- {
862
- index: 8,
863
- skip: 6,
864
- type: "B_4_2",
865
- timestampUtcMs: "2021-01-03T00:00:00.000Z",
866
- id: "3",
867
- }, // 3
868
- {
869
- index: 9,
870
- skip: 0,
871
- type: "B_5",
872
- timestampUtcMs: "2021-01-04T00:00:00.000Z",
873
- id: "4",
874
- }, // 4
875
- {
876
- index: 10,
877
- skip: 0,
878
- type: "T_2",
879
- timestampUtcMs: "2021-01-05T00:00:00.000Z",
880
- id: "5",
881
- }, // 5
882
- {
883
- index: 11,
884
- skip: 0,
885
- type: "T_3",
886
- timestampUtcMs: "2021-01-06T00:00:00.000Z",
887
- id: "6",
888
- }, // 6
889
- {
890
- index: 12,
891
- skip: 0,
892
- type: "T_4",
893
- timestampUtcMs: "2021-01-07T00:00:00.000Z",
894
- id: "7",
895
- }, // 7
896
- {
897
- index: 13,
898
- skip: 0,
899
- type: "T_5",
900
- timestampUtcMs: "2021-01-08T00:00:00.000Z",
901
- id: "8",
902
- }, // 8
903
- ]);
904
- });
905
- });
906
- //# sourceMappingURL=merge.test.js.map