@fluidframework/sequence 2.0.0-dev.5.3.2.178189 → 2.0.0-dev.6.4.0.191457
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/CHANGELOG.md +114 -0
- package/README.md +4 -3
- package/dist/defaultMap.d.ts +1 -1
- package/dist/defaultMap.d.ts.map +1 -1
- package/dist/defaultMap.js +9 -10
- package/dist/defaultMap.js.map +1 -1
- package/dist/defaultMapInterfaces.d.ts +1 -1
- package/dist/defaultMapInterfaces.d.ts.map +1 -1
- package/dist/defaultMapInterfaces.js.map +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +12 -9
- package/dist/index.js.map +1 -1
- package/dist/intervalCollection.d.ts +11 -424
- package/dist/intervalCollection.d.ts.map +1 -1
- package/dist/intervalCollection.js +74 -815
- package/dist/intervalCollection.js.map +1 -1
- package/dist/intervalIndex/endpointInRangeIndex.d.ts +20 -0
- package/dist/intervalIndex/endpointInRangeIndex.d.ts.map +1 -0
- package/dist/intervalIndex/endpointInRangeIndex.js +60 -0
- package/dist/intervalIndex/endpointInRangeIndex.js.map +1 -0
- package/dist/intervalIndex/endpointIndex.d.ts +21 -0
- package/dist/intervalIndex/endpointIndex.d.ts.map +1 -0
- package/dist/intervalIndex/endpointIndex.js +42 -0
- package/dist/intervalIndex/endpointIndex.js.map +1 -0
- package/dist/intervalIndex/idIntervalIndex.d.ts +12 -0
- package/dist/intervalIndex/idIntervalIndex.d.ts.map +1 -0
- package/dist/intervalIndex/idIntervalIndex.js +41 -0
- package/dist/intervalIndex/idIntervalIndex.js.map +1 -0
- package/dist/intervalIndex/index.d.ts +5 -0
- package/dist/intervalIndex/index.d.ts.map +1 -1
- package/dist/intervalIndex/index.js +9 -1
- package/dist/intervalIndex/index.js.map +1 -1
- package/dist/intervalIndex/intervalIndex.d.ts +29 -0
- package/dist/intervalIndex/intervalIndex.d.ts.map +1 -0
- package/dist/intervalIndex/intervalIndex.js +7 -0
- package/dist/intervalIndex/intervalIndex.js.map +1 -0
- package/dist/intervalIndex/intervalIndexUtils.d.ts +17 -0
- package/dist/intervalIndex/intervalIndexUtils.d.ts.map +1 -0
- package/dist/intervalIndex/intervalIndexUtils.js +22 -0
- package/dist/intervalIndex/intervalIndexUtils.js.map +1 -0
- package/dist/intervalIndex/overlappingIntervalsIndex.d.ts +2 -1
- package/dist/intervalIndex/overlappingIntervalsIndex.d.ts.map +1 -1
- package/dist/intervalIndex/overlappingIntervalsIndex.js +3 -3
- package/dist/intervalIndex/overlappingIntervalsIndex.js.map +1 -1
- package/dist/intervalIndex/overlappingSequenceIntervalsIndex.js +5 -5
- package/dist/intervalIndex/overlappingSequenceIntervalsIndex.js.map +1 -1
- package/dist/intervalIndex/sequenceIntervalIndexes.d.ts +1 -1
- package/dist/intervalIndex/sequenceIntervalIndexes.d.ts.map +1 -1
- package/dist/intervalIndex/sequenceIntervalIndexes.js.map +1 -1
- package/dist/intervalIndex/startpointInRangeIndex.d.ts +20 -0
- package/dist/intervalIndex/startpointInRangeIndex.d.ts.map +1 -0
- package/dist/intervalIndex/startpointInRangeIndex.js +62 -0
- package/dist/intervalIndex/startpointInRangeIndex.js.map +1 -0
- package/dist/intervalTree.d.ts +2 -56
- package/dist/intervalTree.d.ts.map +1 -1
- package/dist/intervalTree.js +2 -11
- package/dist/intervalTree.js.map +1 -1
- package/dist/intervals/index.d.ts +8 -0
- package/dist/intervals/index.d.ts.map +1 -0
- package/dist/intervals/index.js +23 -0
- package/dist/intervals/index.js.map +1 -0
- package/dist/intervals/interval.d.ts +88 -0
- package/dist/intervals/interval.d.ts.map +1 -0
- package/dist/intervals/interval.js +180 -0
- package/dist/intervals/interval.js.map +1 -0
- package/dist/intervals/intervalUtils.d.ts +200 -0
- package/dist/intervals/intervalUtils.d.ts.map +1 -0
- package/dist/intervals/intervalUtils.js +79 -0
- package/dist/intervals/intervalUtils.js.map +1 -0
- package/dist/intervals/sequenceInterval.d.ts +132 -0
- package/dist/intervals/sequenceInterval.d.ts.map +1 -0
- package/dist/intervals/sequenceInterval.js +313 -0
- package/dist/intervals/sequenceInterval.js.map +1 -0
- package/dist/packageVersion.d.ts +1 -1
- package/dist/packageVersion.js +1 -1
- package/dist/packageVersion.js.map +1 -1
- package/dist/revertibles.d.ts +1 -1
- package/dist/revertibles.d.ts.map +1 -1
- package/dist/revertibles.js +45 -52
- package/dist/revertibles.js.map +1 -1
- package/dist/sequence.d.ts +33 -4
- package/dist/sequence.d.ts.map +1 -1
- package/dist/sequence.js +91 -47
- package/dist/sequence.js.map +1 -1
- package/dist/sequenceDeltaEvent.d.ts +8 -3
- package/dist/sequenceDeltaEvent.d.ts.map +1 -1
- package/dist/sequenceDeltaEvent.js +3 -4
- package/dist/sequenceDeltaEvent.js.map +1 -1
- package/dist/sharedIntervalCollection.d.ts +2 -1
- package/dist/sharedIntervalCollection.d.ts.map +1 -1
- package/dist/sharedIntervalCollection.js +2 -2
- package/dist/sharedIntervalCollection.js.map +1 -1
- package/dist/sharedSequence.d.ts +9 -0
- package/dist/sharedSequence.d.ts.map +1 -1
- package/dist/sharedSequence.js +9 -6
- package/dist/sharedSequence.js.map +1 -1
- package/dist/sharedString.d.ts.map +1 -1
- package/dist/sharedString.js +9 -29
- package/dist/sharedString.js.map +1 -1
- package/lib/defaultMap.d.ts +1 -1
- package/lib/defaultMap.d.ts.map +1 -1
- package/lib/defaultMap.js +5 -6
- package/lib/defaultMap.js.map +1 -1
- package/lib/defaultMapInterfaces.d.ts +1 -1
- package/lib/defaultMapInterfaces.d.ts.map +1 -1
- package/lib/defaultMapInterfaces.js.map +1 -1
- package/lib/index.d.ts +3 -3
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +3 -2
- package/lib/index.js.map +1 -1
- package/lib/intervalCollection.d.ts +11 -424
- package/lib/intervalCollection.d.ts.map +1 -1
- package/lib/intervalCollection.js +43 -776
- package/lib/intervalCollection.js.map +1 -1
- package/lib/intervalIndex/endpointInRangeIndex.d.ts +20 -0
- package/lib/intervalIndex/endpointInRangeIndex.d.ts.map +1 -0
- package/lib/intervalIndex/endpointInRangeIndex.js +56 -0
- package/lib/intervalIndex/endpointInRangeIndex.js.map +1 -0
- package/lib/intervalIndex/endpointIndex.d.ts +21 -0
- package/lib/intervalIndex/endpointIndex.d.ts.map +1 -0
- package/lib/intervalIndex/endpointIndex.js +38 -0
- package/lib/intervalIndex/endpointIndex.js.map +1 -0
- package/lib/intervalIndex/idIntervalIndex.d.ts +12 -0
- package/lib/intervalIndex/idIntervalIndex.d.ts.map +1 -0
- package/lib/intervalIndex/idIntervalIndex.js +37 -0
- package/lib/intervalIndex/idIntervalIndex.js.map +1 -0
- package/lib/intervalIndex/index.d.ts +5 -0
- package/lib/intervalIndex/index.d.ts.map +1 -1
- package/lib/intervalIndex/index.js +4 -0
- package/lib/intervalIndex/index.js.map +1 -1
- package/lib/intervalIndex/intervalIndex.d.ts +29 -0
- package/lib/intervalIndex/intervalIndex.d.ts.map +1 -0
- package/lib/intervalIndex/intervalIndex.js +6 -0
- package/lib/intervalIndex/intervalIndex.js.map +1 -0
- package/lib/intervalIndex/intervalIndexUtils.d.ts +17 -0
- package/lib/intervalIndex/intervalIndexUtils.d.ts.map +1 -0
- package/lib/intervalIndex/intervalIndexUtils.js +18 -0
- package/lib/intervalIndex/intervalIndexUtils.js.map +1 -0
- package/lib/intervalIndex/overlappingIntervalsIndex.d.ts +2 -1
- package/lib/intervalIndex/overlappingIntervalsIndex.d.ts.map +1 -1
- package/lib/intervalIndex/overlappingIntervalsIndex.js +1 -1
- package/lib/intervalIndex/overlappingIntervalsIndex.js.map +1 -1
- package/lib/intervalIndex/overlappingSequenceIntervalsIndex.js +1 -1
- package/lib/intervalIndex/overlappingSequenceIntervalsIndex.js.map +1 -1
- package/lib/intervalIndex/sequenceIntervalIndexes.d.ts +1 -1
- package/lib/intervalIndex/sequenceIntervalIndexes.d.ts.map +1 -1
- package/lib/intervalIndex/sequenceIntervalIndexes.js.map +1 -1
- package/lib/intervalIndex/startpointInRangeIndex.d.ts +20 -0
- package/lib/intervalIndex/startpointInRangeIndex.d.ts.map +1 -0
- package/lib/intervalIndex/startpointInRangeIndex.js +58 -0
- package/lib/intervalIndex/startpointInRangeIndex.js.map +1 -0
- package/lib/intervalTree.d.ts +2 -56
- package/lib/intervalTree.d.ts.map +1 -1
- package/lib/intervalTree.js +2 -11
- package/lib/intervalTree.js.map +1 -1
- package/lib/intervals/index.d.ts +8 -0
- package/lib/intervals/index.d.ts.map +1 -0
- package/lib/intervals/index.js +8 -0
- package/lib/intervals/index.js.map +1 -0
- package/lib/intervals/interval.d.ts +88 -0
- package/lib/intervals/interval.d.ts.map +1 -0
- package/lib/intervals/interval.js +175 -0
- package/lib/intervals/interval.js.map +1 -0
- package/lib/intervals/intervalUtils.d.ts +200 -0
- package/lib/intervals/intervalUtils.d.ts.map +1 -0
- package/lib/intervals/intervalUtils.js +74 -0
- package/lib/intervals/intervalUtils.js.map +1 -0
- package/lib/intervals/sequenceInterval.d.ts +132 -0
- package/lib/intervals/sequenceInterval.d.ts.map +1 -0
- package/lib/intervals/sequenceInterval.js +305 -0
- package/lib/intervals/sequenceInterval.js.map +1 -0
- package/lib/packageVersion.d.ts +1 -1
- package/lib/packageVersion.js +1 -1
- package/lib/packageVersion.js.map +1 -1
- package/lib/revertibles.d.ts +1 -1
- package/lib/revertibles.d.ts.map +1 -1
- package/lib/revertibles.js +28 -35
- package/lib/revertibles.js.map +1 -1
- package/lib/sequence.d.ts +33 -4
- package/lib/sequence.d.ts.map +1 -1
- package/lib/sequence.js +86 -41
- package/lib/sequence.js.map +1 -1
- package/lib/sequenceDeltaEvent.d.ts +8 -3
- package/lib/sequenceDeltaEvent.d.ts.map +1 -1
- package/lib/sequenceDeltaEvent.js +2 -3
- package/lib/sequenceDeltaEvent.js.map +1 -1
- package/lib/sharedIntervalCollection.d.ts +2 -1
- package/lib/sharedIntervalCollection.d.ts.map +1 -1
- package/lib/sharedIntervalCollection.js +1 -1
- package/lib/sharedIntervalCollection.js.map +1 -1
- package/lib/sharedSequence.d.ts +9 -0
- package/lib/sharedSequence.d.ts.map +1 -1
- package/lib/sharedSequence.js +8 -5
- package/lib/sharedSequence.js.map +1 -1
- package/lib/sharedString.d.ts.map +1 -1
- package/lib/sharedString.js +9 -29
- package/lib/sharedString.js.map +1 -1
- package/package.json +29 -32
- package/src/defaultMap.ts +2 -1
- package/src/defaultMapInterfaces.ts +1 -1
- package/src/index.ts +18 -12
- package/src/intervalCollection.ts +42 -1225
- package/src/intervalIndex/endpointInRangeIndex.ts +104 -0
- package/src/intervalIndex/endpointIndex.ts +78 -0
- package/src/intervalIndex/idIntervalIndex.ts +58 -0
- package/src/intervalIndex/index.ts +5 -0
- package/src/intervalIndex/intervalIndex.ts +31 -0
- package/src/intervalIndex/intervalIndexUtils.ts +27 -0
- package/src/intervalIndex/overlappingIntervalsIndex.ts +2 -6
- package/src/intervalIndex/overlappingSequenceIntervalsIndex.ts +1 -1
- package/src/intervalIndex/sequenceIntervalIndexes.ts +1 -1
- package/src/intervalIndex/startpointInRangeIndex.ts +109 -0
- package/src/intervalTree.ts +3 -75
- package/src/intervals/index.ts +25 -0
- package/src/intervals/interval.ts +230 -0
- package/src/intervals/intervalUtils.ts +256 -0
- package/src/intervals/sequenceInterval.ts +494 -0
- package/src/packageVersion.ts +1 -1
- package/src/revertibles.ts +24 -13
- package/src/sequence.ts +100 -35
- package/src/sequenceDeltaEvent.ts +12 -4
- package/src/sharedIntervalCollection.ts +2 -3
- package/src/sharedSequence.ts +11 -5
- package/src/sharedString.ts +8 -25
|
@@ -0,0 +1,230 @@
|
|
|
1
|
+
/*!
|
|
2
|
+
* Copyright (c) Microsoft Corporation and contributors. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License.
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
import {
|
|
7
|
+
ICombiningOp,
|
|
8
|
+
PropertiesManager,
|
|
9
|
+
PropertySet,
|
|
10
|
+
createMap,
|
|
11
|
+
reservedRangeLabelsKey,
|
|
12
|
+
} from "@fluidframework/merge-tree";
|
|
13
|
+
import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
|
|
14
|
+
import { assert } from "@fluidframework/core-utils";
|
|
15
|
+
import { IIntervalHelpers, ISerializableInterval, ISerializedInterval } from "./intervalUtils";
|
|
16
|
+
|
|
17
|
+
const reservedIntervalIdKey = "intervalId";
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* Serializable interval whose endpoints are plain-old numbers.
|
|
21
|
+
*/
|
|
22
|
+
export class Interval implements ISerializableInterval {
|
|
23
|
+
/**
|
|
24
|
+
* {@inheritDoc ISerializableInterval.properties}
|
|
25
|
+
*/
|
|
26
|
+
public properties: PropertySet;
|
|
27
|
+
/** @internal */
|
|
28
|
+
public auxProps: PropertySet[] | undefined;
|
|
29
|
+
/**
|
|
30
|
+
* {@inheritDoc ISerializableInterval.propertyManager}
|
|
31
|
+
* @internal
|
|
32
|
+
*/
|
|
33
|
+
public propertyManager: PropertiesManager;
|
|
34
|
+
constructor(public start: number, public end: number, props?: PropertySet) {
|
|
35
|
+
this.propertyManager = new PropertiesManager();
|
|
36
|
+
this.properties = {};
|
|
37
|
+
|
|
38
|
+
if (props) {
|
|
39
|
+
this.addProperties(props);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/**
|
|
44
|
+
* {@inheritDoc ISerializableInterval.getIntervalId}
|
|
45
|
+
*/
|
|
46
|
+
public getIntervalId(): string {
|
|
47
|
+
const id = this.properties?.[reservedIntervalIdKey];
|
|
48
|
+
assert(id !== undefined, 0x5e1 /* interval ID should not be undefined */);
|
|
49
|
+
return `${id}`;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/**
|
|
53
|
+
* @returns an array containing any auxiliary property sets added with `addPropertySet`.
|
|
54
|
+
*/
|
|
55
|
+
public getAdditionalPropertySets(): PropertySet[] {
|
|
56
|
+
return this.auxProps ?? [];
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Adds an auxiliary set of properties to this interval.
|
|
61
|
+
* These properties can be recovered using `getAdditionalPropertySets`
|
|
62
|
+
* @param props - set of properties to add
|
|
63
|
+
* @remarks This gets called as part of the default conflict resolver for `IIntervalCollection<Interval>`
|
|
64
|
+
* (i.e. non-sequence-based interval collections). However, the additional properties don't get serialized.
|
|
65
|
+
* This functionality seems half-baked.
|
|
66
|
+
*/
|
|
67
|
+
public addPropertySet(props: PropertySet) {
|
|
68
|
+
if (this.auxProps === undefined) {
|
|
69
|
+
this.auxProps = [];
|
|
70
|
+
}
|
|
71
|
+
this.auxProps.push(props);
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
/**
|
|
75
|
+
* {@inheritDoc ISerializableInterval.serialize}
|
|
76
|
+
* @internal
|
|
77
|
+
*/
|
|
78
|
+
public serialize(): ISerializedInterval {
|
|
79
|
+
const serializedInterval: ISerializedInterval = {
|
|
80
|
+
end: this.end,
|
|
81
|
+
intervalType: 0,
|
|
82
|
+
sequenceNumber: 0,
|
|
83
|
+
start: this.start,
|
|
84
|
+
};
|
|
85
|
+
if (this.properties) {
|
|
86
|
+
serializedInterval.properties = this.properties;
|
|
87
|
+
}
|
|
88
|
+
return serializedInterval;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
/**
|
|
92
|
+
* {@inheritDoc IInterval.clone}
|
|
93
|
+
*/
|
|
94
|
+
public clone() {
|
|
95
|
+
return new Interval(this.start, this.end, this.properties);
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
/**
|
|
99
|
+
* {@inheritDoc IInterval.compare}
|
|
100
|
+
*/
|
|
101
|
+
public compare(b: Interval) {
|
|
102
|
+
const startResult = this.compareStart(b);
|
|
103
|
+
if (startResult === 0) {
|
|
104
|
+
const endResult = this.compareEnd(b);
|
|
105
|
+
if (endResult === 0) {
|
|
106
|
+
const thisId = this.getIntervalId();
|
|
107
|
+
if (thisId) {
|
|
108
|
+
const bId = b.getIntervalId();
|
|
109
|
+
if (bId) {
|
|
110
|
+
return thisId > bId ? 1 : thisId < bId ? -1 : 0;
|
|
111
|
+
}
|
|
112
|
+
return 0;
|
|
113
|
+
}
|
|
114
|
+
return 0;
|
|
115
|
+
} else {
|
|
116
|
+
return endResult;
|
|
117
|
+
}
|
|
118
|
+
} else {
|
|
119
|
+
return startResult;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
/**
|
|
124
|
+
* {@inheritDoc IInterval.compareStart}
|
|
125
|
+
*/
|
|
126
|
+
public compareStart(b: Interval) {
|
|
127
|
+
return this.start - b.start;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
/**
|
|
131
|
+
* {@inheritDoc IInterval.compareEnd}
|
|
132
|
+
*/
|
|
133
|
+
public compareEnd(b: Interval) {
|
|
134
|
+
return this.end - b.end;
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
/**
|
|
138
|
+
* {@inheritDoc IInterval.overlaps}
|
|
139
|
+
*/
|
|
140
|
+
public overlaps(b: Interval) {
|
|
141
|
+
const result = this.start <= b.end && this.end >= b.start;
|
|
142
|
+
return result;
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
/**
|
|
146
|
+
* {@inheritDoc IInterval.union}
|
|
147
|
+
* @internal
|
|
148
|
+
*/
|
|
149
|
+
public union(b: Interval) {
|
|
150
|
+
return new Interval(
|
|
151
|
+
Math.min(this.start, b.start),
|
|
152
|
+
Math.max(this.end, b.end),
|
|
153
|
+
this.properties,
|
|
154
|
+
);
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
public getProperties() {
|
|
158
|
+
return this.properties;
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
/**
|
|
162
|
+
* {@inheritDoc ISerializableInterval.addProperties}
|
|
163
|
+
* @internal
|
|
164
|
+
*/
|
|
165
|
+
public addProperties(
|
|
166
|
+
newProps: PropertySet,
|
|
167
|
+
collaborating: boolean = false,
|
|
168
|
+
seq?: number,
|
|
169
|
+
op?: ICombiningOp,
|
|
170
|
+
): PropertySet | undefined {
|
|
171
|
+
if (newProps) {
|
|
172
|
+
this.initializeProperties();
|
|
173
|
+
return this.propertyManager.addProperties(
|
|
174
|
+
this.properties,
|
|
175
|
+
newProps,
|
|
176
|
+
op,
|
|
177
|
+
seq,
|
|
178
|
+
collaborating,
|
|
179
|
+
);
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
/**
|
|
184
|
+
* {@inheritDoc IInterval.modify}
|
|
185
|
+
* @internal
|
|
186
|
+
*/
|
|
187
|
+
public modify(label: string, start: number, end: number, op?: ISequencedDocumentMessage) {
|
|
188
|
+
const startPos = start ?? this.start;
|
|
189
|
+
const endPos = end ?? this.end;
|
|
190
|
+
if (this.start === startPos && this.end === endPos) {
|
|
191
|
+
// Return undefined to indicate that no change is necessary.
|
|
192
|
+
return;
|
|
193
|
+
}
|
|
194
|
+
const newInterval = new Interval(startPos, endPos);
|
|
195
|
+
if (this.properties) {
|
|
196
|
+
newInterval.initializeProperties();
|
|
197
|
+
this.propertyManager.copyTo(
|
|
198
|
+
this.properties,
|
|
199
|
+
newInterval.properties,
|
|
200
|
+
newInterval.propertyManager,
|
|
201
|
+
);
|
|
202
|
+
}
|
|
203
|
+
return newInterval;
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
private initializeProperties(): void {
|
|
207
|
+
if (!this.propertyManager) {
|
|
208
|
+
this.propertyManager = new PropertiesManager();
|
|
209
|
+
}
|
|
210
|
+
if (!this.properties) {
|
|
211
|
+
this.properties = createMap<any>();
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
export function createInterval(label: string, start: number, end: number): Interval {
|
|
217
|
+
const rangeProp: PropertySet = {};
|
|
218
|
+
|
|
219
|
+
if (label && label.length > 0) {
|
|
220
|
+
rangeProp[reservedRangeLabelsKey] = [label];
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
return new Interval(start, end, rangeProp);
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
export const intervalHelpers: IIntervalHelpers<Interval> = {
|
|
227
|
+
compareEnds: (a: Interval, b: Interval) => a.end - b.end,
|
|
228
|
+
compareStarts: (a: Interval, b: Interval) => a.start - b.start,
|
|
229
|
+
create: createInterval,
|
|
230
|
+
};
|
|
@@ -0,0 +1,256 @@
|
|
|
1
|
+
/*!
|
|
2
|
+
* Copyright (c) Microsoft Corporation and contributors. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License.
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/* eslint-disable no-bitwise */
|
|
7
|
+
|
|
8
|
+
import {
|
|
9
|
+
Client,
|
|
10
|
+
PropertiesManager,
|
|
11
|
+
PropertySet,
|
|
12
|
+
SlidingPreference,
|
|
13
|
+
} from "@fluidframework/merge-tree";
|
|
14
|
+
import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
|
|
15
|
+
/**
|
|
16
|
+
* Basic interval abstraction
|
|
17
|
+
*/
|
|
18
|
+
export interface IInterval {
|
|
19
|
+
/**
|
|
20
|
+
* @returns a new interval object with identical semantics.
|
|
21
|
+
*/
|
|
22
|
+
clone(): IInterval;
|
|
23
|
+
/**
|
|
24
|
+
* Compares this interval to `b` with standard comparator semantics:
|
|
25
|
+
* - returns -1 if this is less than `b`
|
|
26
|
+
* - returns 1 if this is greater than `b`
|
|
27
|
+
* - returns 0 if this is equivalent to `b`
|
|
28
|
+
* @param b - Interval to compare against
|
|
29
|
+
*/
|
|
30
|
+
compare(b: IInterval): number;
|
|
31
|
+
/**
|
|
32
|
+
* Compares the start endpoint of this interval to `b`'s start endpoint.
|
|
33
|
+
* Standard comparator semantics apply.
|
|
34
|
+
* @param b - Interval to compare against
|
|
35
|
+
*/
|
|
36
|
+
compareStart(b: IInterval): number;
|
|
37
|
+
/**
|
|
38
|
+
* Compares the end endpoint of this interval to `b`'s end endpoint.
|
|
39
|
+
* Standard comparator semantics apply.
|
|
40
|
+
* @param b - Interval to compare against
|
|
41
|
+
*/
|
|
42
|
+
compareEnd(b: IInterval): number;
|
|
43
|
+
/**
|
|
44
|
+
* Modifies one or more of the endpoints of this interval, returning a new interval representing the result.
|
|
45
|
+
* @internal
|
|
46
|
+
*/
|
|
47
|
+
modify(
|
|
48
|
+
label: string,
|
|
49
|
+
start: number | undefined,
|
|
50
|
+
end: number | undefined,
|
|
51
|
+
op?: ISequencedDocumentMessage,
|
|
52
|
+
localSeq?: number,
|
|
53
|
+
): IInterval | undefined;
|
|
54
|
+
/**
|
|
55
|
+
* @returns whether this interval overlaps with `b`.
|
|
56
|
+
* Intervals are considered to overlap if their intersection is non-empty.
|
|
57
|
+
*/
|
|
58
|
+
overlaps(b: IInterval): boolean;
|
|
59
|
+
/**
|
|
60
|
+
* Unions this interval with `b`, returning a new interval.
|
|
61
|
+
* The union operates as a convex hull, i.e. if the two intervals are disjoint, the return value includes
|
|
62
|
+
* intermediate values between the two intervals.
|
|
63
|
+
* @internal
|
|
64
|
+
*/
|
|
65
|
+
union(b: IInterval): IInterval;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* Values are used in persisted formats (ops) and revertibles.
|
|
70
|
+
* @alpha
|
|
71
|
+
*/
|
|
72
|
+
export const IntervalOpType = {
|
|
73
|
+
ADD: "add",
|
|
74
|
+
DELETE: "delete",
|
|
75
|
+
CHANGE: "change",
|
|
76
|
+
PROPERTY_CHANGED: "propertyChanged",
|
|
77
|
+
POSITION_REMOVE: "positionRemove",
|
|
78
|
+
} as const;
|
|
79
|
+
|
|
80
|
+
export enum IntervalType {
|
|
81
|
+
Simple = 0x0,
|
|
82
|
+
Nest = 0x1,
|
|
83
|
+
|
|
84
|
+
/**
|
|
85
|
+
* SlideOnRemove indicates that the ends of the interval will slide if the segment
|
|
86
|
+
* they reference is removed and acked.
|
|
87
|
+
* See `packages\dds\merge-tree\docs\REFERENCEPOSITIONS.md` for details
|
|
88
|
+
* SlideOnRemove is the default interval behavior and does not need to be specified.
|
|
89
|
+
*/
|
|
90
|
+
SlideOnRemove = 0x2, // SlideOnRemove is default behavior - all intervals are SlideOnRemove
|
|
91
|
+
|
|
92
|
+
/**
|
|
93
|
+
* A temporary interval, used internally
|
|
94
|
+
* @internal
|
|
95
|
+
*/
|
|
96
|
+
Transient = 0x4,
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
/**
|
|
100
|
+
* Serialized object representation of an interval.
|
|
101
|
+
* This representation is used for ops that create or change intervals.
|
|
102
|
+
* @internal
|
|
103
|
+
*/
|
|
104
|
+
export interface ISerializedInterval {
|
|
105
|
+
/**
|
|
106
|
+
* Sequence number at which `start` and `end` should be interpreted
|
|
107
|
+
*
|
|
108
|
+
* @remarks It's unclear that this is necessary to store here.
|
|
109
|
+
* This should just be the refSeq on the op that modified the interval, which should be available via other means.
|
|
110
|
+
* At the time of writing, it's not plumbed through to the reconnect/rebase code, however, which does need it.
|
|
111
|
+
*/
|
|
112
|
+
sequenceNumber: number;
|
|
113
|
+
/** Start position of the interval */
|
|
114
|
+
start: number;
|
|
115
|
+
/** End position of the interval */
|
|
116
|
+
end: number;
|
|
117
|
+
/** Interval type to create */
|
|
118
|
+
intervalType: IntervalType;
|
|
119
|
+
stickiness?: IntervalStickiness;
|
|
120
|
+
/** Any properties the interval has */
|
|
121
|
+
properties?: PropertySet;
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
export interface ISerializableInterval extends IInterval {
|
|
125
|
+
/** Serializable bag of properties associated with the interval. */
|
|
126
|
+
properties: PropertySet;
|
|
127
|
+
/** @internal */
|
|
128
|
+
propertyManager: PropertiesManager;
|
|
129
|
+
/** @internal */
|
|
130
|
+
serialize(): ISerializedInterval;
|
|
131
|
+
/** @internal */
|
|
132
|
+
addProperties(
|
|
133
|
+
props: PropertySet,
|
|
134
|
+
collaborating?: boolean,
|
|
135
|
+
seq?: number,
|
|
136
|
+
): PropertySet | undefined;
|
|
137
|
+
/**
|
|
138
|
+
* Gets the id associated with this interval.
|
|
139
|
+
* When the interval is used as part of an interval collection, this id can be used to modify or remove the
|
|
140
|
+
* interval.
|
|
141
|
+
* @remarks This signature includes `undefined` strictly for backwards-compatibility reasons, as older versions
|
|
142
|
+
* of Fluid didn't always write interval ids.
|
|
143
|
+
*/
|
|
144
|
+
getIntervalId(): string | undefined;
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
/**
|
|
148
|
+
* Represents a change that should be applied to an existing interval.
|
|
149
|
+
* Changes can modify any of start/end/properties, with `undefined` signifying no change should be made.
|
|
150
|
+
* @internal
|
|
151
|
+
*/
|
|
152
|
+
export type SerializedIntervalDelta = Omit<ISerializedInterval, "start" | "end" | "properties"> &
|
|
153
|
+
Partial<Pick<ISerializedInterval, "start" | "end" | "properties">>;
|
|
154
|
+
|
|
155
|
+
/**
|
|
156
|
+
* A size optimization to avoid redundantly storing keys when serializing intervals
|
|
157
|
+
* as JSON for summaries.
|
|
158
|
+
*
|
|
159
|
+
* Intervals are of the format:
|
|
160
|
+
*
|
|
161
|
+
* [start, end, sequenceNumber, intervalType, properties, stickiness?]
|
|
162
|
+
*/
|
|
163
|
+
export type CompressedSerializedInterval =
|
|
164
|
+
| [number, number, number, IntervalType, PropertySet, IntervalStickiness]
|
|
165
|
+
| [number, number, number, IntervalType, PropertySet];
|
|
166
|
+
|
|
167
|
+
/**
|
|
168
|
+
* @sealed
|
|
169
|
+
*/
|
|
170
|
+
export interface IIntervalHelpers<TInterval extends ISerializableInterval> {
|
|
171
|
+
/**
|
|
172
|
+
* @deprecated Use the method `IInterval.compareEnd` instead
|
|
173
|
+
*/
|
|
174
|
+
compareEnds(a: TInterval, b: TInterval): number;
|
|
175
|
+
|
|
176
|
+
/**
|
|
177
|
+
* @deprecated Use the method `IInterval.compareStart` instead
|
|
178
|
+
*/
|
|
179
|
+
compareStarts?(a: TInterval, b: TInterval): number;
|
|
180
|
+
/**
|
|
181
|
+
*
|
|
182
|
+
* @param label - label of the interval collection this interval is being added to. This parameter is
|
|
183
|
+
* irrelevant for transient intervals.
|
|
184
|
+
* @param start - numerical start position of the interval
|
|
185
|
+
* @param end - numerical end position of the interval
|
|
186
|
+
* @param client - client creating the interval
|
|
187
|
+
* @param intervalType - Type of interval to create. Default is SlideOnRemove
|
|
188
|
+
* @param op - If this create came from a remote client, op that created it. Default is undefined (i.e. local)
|
|
189
|
+
* @param fromSnapshot - If this create came from loading a snapshot. Default is false.
|
|
190
|
+
* @param stickiness - {@link (IntervalStickiness:type)} to apply to the added interval.
|
|
191
|
+
*/
|
|
192
|
+
create(
|
|
193
|
+
label: string,
|
|
194
|
+
start: number | undefined,
|
|
195
|
+
end: number | undefined,
|
|
196
|
+
client: Client | undefined,
|
|
197
|
+
intervalType: IntervalType,
|
|
198
|
+
op?: ISequencedDocumentMessage,
|
|
199
|
+
fromSnapshot?: boolean,
|
|
200
|
+
stickiness?: IntervalStickiness,
|
|
201
|
+
): TInterval;
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
/**
|
|
205
|
+
* Determines how an interval should expand when segments are inserted adjacent
|
|
206
|
+
* to the range it spans
|
|
207
|
+
*
|
|
208
|
+
* Note that interval stickiness is currently an experimental feature and must
|
|
209
|
+
* be explicitly enabled with the `intervalStickinessEnabled` flag
|
|
210
|
+
*/
|
|
211
|
+
export const IntervalStickiness = {
|
|
212
|
+
/**
|
|
213
|
+
* Interval does not expand to include adjacent segments
|
|
214
|
+
*/
|
|
215
|
+
NONE: 0b00,
|
|
216
|
+
|
|
217
|
+
/**
|
|
218
|
+
* Interval expands to include segments inserted adjacent to the start
|
|
219
|
+
*/
|
|
220
|
+
START: 0b01,
|
|
221
|
+
|
|
222
|
+
/**
|
|
223
|
+
* Interval expands to include segments inserted adjacent to the end
|
|
224
|
+
*
|
|
225
|
+
* This is the default stickiness
|
|
226
|
+
*/
|
|
227
|
+
END: 0b10,
|
|
228
|
+
|
|
229
|
+
/**
|
|
230
|
+
* Interval expands to include all segments inserted adjacent to it
|
|
231
|
+
*/
|
|
232
|
+
FULL: 0b11,
|
|
233
|
+
} as const;
|
|
234
|
+
|
|
235
|
+
/**
|
|
236
|
+
* Determines how an interval should expand when segments are inserted adjacent
|
|
237
|
+
* to the range it spans
|
|
238
|
+
*
|
|
239
|
+
* Note that interval stickiness is currently an experimental feature and must
|
|
240
|
+
* be explicitly enabled with the `intervalStickinessEnabled` flag
|
|
241
|
+
*/
|
|
242
|
+
export type IntervalStickiness = typeof IntervalStickiness[keyof typeof IntervalStickiness];
|
|
243
|
+
|
|
244
|
+
export function endReferenceSlidingPreference(stickiness: IntervalStickiness): SlidingPreference {
|
|
245
|
+
// if any end stickiness, prefer sliding forwards
|
|
246
|
+
return (stickiness & IntervalStickiness.END) !== 0
|
|
247
|
+
? SlidingPreference.FORWARD
|
|
248
|
+
: SlidingPreference.BACKWARD;
|
|
249
|
+
}
|
|
250
|
+
|
|
251
|
+
export function startReferenceSlidingPreference(stickiness: IntervalStickiness): SlidingPreference {
|
|
252
|
+
// if any start stickiness, prefer sliding backwards
|
|
253
|
+
return (stickiness & IntervalStickiness.START) !== 0
|
|
254
|
+
? SlidingPreference.BACKWARD
|
|
255
|
+
: SlidingPreference.FORWARD;
|
|
256
|
+
}
|