merge-timerange
Advanced tools
Comparing version 0.1.5 to 0.1.6
@@ -101,3 +101,3 @@ 'use strict'; | ||
while (from) { | ||
while (to && from.start - max >= to.end) to = tos[++toIdx]; | ||
while (to && from.start - max > to.end) to = tos[++toIdx]; | ||
@@ -104,0 +104,0 @@ if (!to || from.end < to.start - max) { |
{ | ||
"name": "merge-timerange", | ||
"version": "0.1.5", | ||
"version": "0.1.6", | ||
"description": "Merge time ranges", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -40,3 +40,3 @@ 'use strict'; | ||
head: 1, | ||
start: new Date('2015-01-01T10:30:00Z'), | ||
start: new Date('2015-01-01T11:00:00Z'), | ||
end: new Date('2015-01-01T12:30:00Z'), | ||
@@ -43,0 +43,0 @@ prop: 'a', |
@@ -26,7 +26,7 @@ 'use strict'; | ||
T.removed [test]('should merge into free ranges (default)', [ | ||
T.removed [test]('should remove ranges', [ | ||
{ | ||
start: new Date('2015-01-01T10:00:00.000Z'), | ||
end: new Date('2015-01-01T10:30:00.000Z'), | ||
time: 1800, | ||
end: new Date('2015-01-01T11:00:00.000Z'), | ||
time: 3600, | ||
head: 1, | ||
@@ -33,0 +33,0 @@ prop: 'a', |
@@ -16,3 +16,3 @@ 'use strict'; | ||
end: { | ||
$gte: new Date('2015-01-01T10:30:00.000Z') | ||
$gte: new Date('2015-01-01T11:00:00.000Z') | ||
}, | ||
@@ -19,0 +19,0 @@ head: 1 |
@@ -21,13 +21,13 @@ 'use strict'; | ||
merge2.insertsShouldBe = T.removed.concat(undefined); | ||
merge2.inserts [test]('merged rangeItems should match', merge2.insertsShouldBe); | ||
merge2.insertsShouldBe = T.removed.slice(1).concat(undefined); | ||
merge2.inserts [test]('merged inserts should match', merge2.insertsShouldBe); | ||
merge2.removesShouldBe = T.from1.concat(undefined); | ||
merge2.removes [test]('should merge into free ranges (default)', merge2.removesShouldBe); | ||
merge2.removesShouldBe = T.from1.slice(1).concat(undefined); | ||
merge2.removes [test]('merged removes should match', merge2.removesShouldBe); | ||
merge2.removeCmdsShouldBe = ( | ||
T.from1.map(item => item [pick]('head', 'start', 'end')) | ||
).concat(undefined); | ||
merge2.removesShouldBe.map(item => item && item [pick]('head', 'start', 'end')) | ||
); | ||
merge2.removeCmds [test]('should merge into free ranges (default)', merge2.removeCmdsShouldBe); | ||
merge2.removeCmds [test]('merged remove cmds should match', merge2.removeCmdsShouldBe); | ||
@@ -42,3 +42,3 @@ T.Model.collection = {}; | ||
T.Model.remove = (items) => new Promise((resolve) => { | ||
items [test]('should merge into free ranges (default)', merge2.removeCmdsShouldBe); | ||
items [test]('should merge into free ranges (default)', {$or: merge2.removeCmdsShouldBe}); | ||
resolve({}); | ||
@@ -45,0 +45,0 @@ }); |
21094