@fluidframework/merge-tree 2.4.0-297027 → 2.4.0-299374

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 (130) hide show
  1. package/api-report/merge-tree.legacy.alpha.api.md +0 -1
  2. package/dist/client.d.ts.map +1 -1
  3. package/dist/client.js +3 -3
  4. package/dist/client.js.map +1 -1
  5. package/dist/collections/list.d.ts +1 -0
  6. package/dist/collections/list.d.ts.map +1 -1
  7. package/dist/collections/list.js +4 -1
  8. package/dist/collections/list.js.map +1 -1
  9. package/dist/index.d.ts +1 -1
  10. package/dist/index.d.ts.map +1 -1
  11. package/dist/index.js.map +1 -1
  12. package/dist/localReference.d.ts +1 -1
  13. package/dist/localReference.d.ts.map +1 -1
  14. package/dist/localReference.js.map +1 -1
  15. package/dist/mergeTree.d.ts +9 -9
  16. package/dist/mergeTree.d.ts.map +1 -1
  17. package/dist/mergeTree.js +41 -13
  18. package/dist/mergeTree.js.map +1 -1
  19. package/dist/mergeTreeNodes.d.ts +27 -8
  20. package/dist/mergeTreeNodes.d.ts.map +1 -1
  21. package/dist/mergeTreeNodes.js +0 -17
  22. package/dist/mergeTreeNodes.js.map +1 -1
  23. package/dist/revertibles.d.ts.map +1 -1
  24. package/dist/revertibles.js +4 -2
  25. package/dist/revertibles.js.map +1 -1
  26. package/dist/snapshotV1.d.ts.map +1 -1
  27. package/dist/snapshotV1.js +0 -2
  28. package/dist/snapshotV1.js.map +1 -1
  29. package/dist/snapshotlegacy.d.ts.map +1 -1
  30. package/dist/snapshotlegacy.js +0 -1
  31. package/dist/snapshotlegacy.js.map +1 -1
  32. package/dist/test/beastTest.spec.d.ts.map +1 -1
  33. package/dist/test/beastTest.spec.js +3 -3
  34. package/dist/test/beastTest.spec.js.map +1 -1
  35. package/dist/test/client.annotateMarker.spec.js.map +1 -1
  36. package/dist/test/client.applyMsg.spec.js +79 -3
  37. package/dist/test/client.applyMsg.spec.js.map +1 -1
  38. package/dist/test/client.conflictFarm.spec.js +17 -4
  39. package/dist/test/client.conflictFarm.spec.js.map +1 -1
  40. package/dist/test/client.localReference.spec.js.map +1 -1
  41. package/dist/test/client.rollback.spec.js.map +1 -1
  42. package/dist/test/mergeTree.annotate.spec.js +29 -19
  43. package/dist/test/mergeTree.annotate.spec.js.map +1 -1
  44. package/dist/test/mergeTree.insertingWalk.spec.js +2 -2
  45. package/dist/test/mergeTree.insertingWalk.spec.js.map +1 -1
  46. package/dist/test/mergeTreeOperationRunner.d.ts +1 -0
  47. package/dist/test/mergeTreeOperationRunner.d.ts.map +1 -1
  48. package/dist/test/mergeTreeOperationRunner.js +22 -1
  49. package/dist/test/mergeTreeOperationRunner.js.map +1 -1
  50. package/dist/test/obliterate.partialLength.spec.js +0 -4
  51. package/dist/test/obliterate.partialLength.spec.js.map +1 -1
  52. package/dist/test/obliterate.spec.js +0 -6
  53. package/dist/test/obliterate.spec.js.map +1 -1
  54. package/dist/test/revertibleFarm.spec.js.map +1 -1
  55. package/dist/test/testUtils.d.ts +2 -3
  56. package/dist/test/testUtils.d.ts.map +1 -1
  57. package/dist/test/testUtils.js +4 -4
  58. package/dist/test/testUtils.js.map +1 -1
  59. package/dist/zamboni.js +2 -1
  60. package/dist/zamboni.js.map +1 -1
  61. package/lib/client.d.ts.map +1 -1
  62. package/lib/client.js +3 -3
  63. package/lib/client.js.map +1 -1
  64. package/lib/collections/list.d.ts +1 -0
  65. package/lib/collections/list.d.ts.map +1 -1
  66. package/lib/collections/list.js +4 -1
  67. package/lib/collections/list.js.map +1 -1
  68. package/lib/index.d.ts +1 -1
  69. package/lib/index.d.ts.map +1 -1
  70. package/lib/index.js.map +1 -1
  71. package/lib/localReference.d.ts +1 -1
  72. package/lib/localReference.d.ts.map +1 -1
  73. package/lib/localReference.js.map +1 -1
  74. package/lib/mergeTree.d.ts +9 -9
  75. package/lib/mergeTree.d.ts.map +1 -1
  76. package/lib/mergeTree.js +43 -15
  77. package/lib/mergeTree.js.map +1 -1
  78. package/lib/mergeTreeNodes.d.ts +27 -8
  79. package/lib/mergeTreeNodes.d.ts.map +1 -1
  80. package/lib/mergeTreeNodes.js +0 -17
  81. package/lib/mergeTreeNodes.js.map +1 -1
  82. package/lib/revertibles.d.ts.map +1 -1
  83. package/lib/revertibles.js +5 -3
  84. package/lib/revertibles.js.map +1 -1
  85. package/lib/snapshotV1.d.ts.map +1 -1
  86. package/lib/snapshotV1.js +0 -2
  87. package/lib/snapshotV1.js.map +1 -1
  88. package/lib/snapshotlegacy.d.ts.map +1 -1
  89. package/lib/snapshotlegacy.js +0 -1
  90. package/lib/snapshotlegacy.js.map +1 -1
  91. package/lib/test/beastTest.spec.d.ts.map +1 -1
  92. package/lib/test/beastTest.spec.js +3 -3
  93. package/lib/test/beastTest.spec.js.map +1 -1
  94. package/lib/test/client.annotateMarker.spec.js.map +1 -1
  95. package/lib/test/client.applyMsg.spec.js +79 -3
  96. package/lib/test/client.applyMsg.spec.js.map +1 -1
  97. package/lib/test/client.conflictFarm.spec.js +18 -5
  98. package/lib/test/client.conflictFarm.spec.js.map +1 -1
  99. package/lib/test/client.localReference.spec.js.map +1 -1
  100. package/lib/test/client.rollback.spec.js.map +1 -1
  101. package/lib/test/mergeTree.annotate.spec.js +29 -19
  102. package/lib/test/mergeTree.annotate.spec.js.map +1 -1
  103. package/lib/test/mergeTree.insertingWalk.spec.js +2 -2
  104. package/lib/test/mergeTree.insertingWalk.spec.js.map +1 -1
  105. package/lib/test/mergeTreeOperationRunner.d.ts +1 -0
  106. package/lib/test/mergeTreeOperationRunner.d.ts.map +1 -1
  107. package/lib/test/mergeTreeOperationRunner.js +20 -0
  108. package/lib/test/mergeTreeOperationRunner.js.map +1 -1
  109. package/lib/test/obliterate.partialLength.spec.js +0 -4
  110. package/lib/test/obliterate.partialLength.spec.js.map +1 -1
  111. package/lib/test/obliterate.spec.js +0 -6
  112. package/lib/test/obliterate.spec.js.map +1 -1
  113. package/lib/test/revertibleFarm.spec.js.map +1 -1
  114. package/lib/test/testUtils.d.ts +2 -3
  115. package/lib/test/testUtils.d.ts.map +1 -1
  116. package/lib/test/testUtils.js +4 -4
  117. package/lib/test/testUtils.js.map +1 -1
  118. package/lib/zamboni.js +2 -1
  119. package/lib/zamboni.js.map +1 -1
  120. package/package.json +20 -21
  121. package/src/client.ts +0 -3
  122. package/src/collections/list.ts +6 -0
  123. package/src/index.ts +1 -0
  124. package/src/localReference.ts +5 -5
  125. package/src/mergeTree.ts +95 -62
  126. package/src/mergeTreeNodes.ts +35 -29
  127. package/src/revertibles.ts +12 -5
  128. package/src/snapshotV1.ts +0 -2
  129. package/src/snapshotlegacy.ts +0 -1
  130. package/src/zamboni.ts +3 -2
package/src/zamboni.ts CHANGED
@@ -135,8 +135,9 @@ function scourNode(node: MergeBlock, holdNodes: IMergeNode[], mergeTree: MergeTr
135
135
  // when possible.
136
136
  let prevSegment: ISegment | undefined;
137
137
  for (let k = 0; k < node.childCount; k++) {
138
- const childNode = node.children[k];
139
- if (!childNode.isLeaf() || !childNode.segmentGroups.empty) {
138
+ // TODO Non null asserting, why is this not null?
139
+ const childNode = node.children[k]!;
140
+ if (!childNode.isLeaf() || childNode.segmentGroups?.empty === false) {
140
141
  holdNodes.push(childNode);
141
142
  prevSegment = undefined;
142
143
  continue;