feat: Use DateInterval to represent date intervals

aholstenson · Oct 4, 2019 · 5b74e30 · 5b74e30
1 parent f869d6b
commit 5b74e30
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "date-fns": "^2.4.1",
-    "datetime-types": "^0.2.0",
+    "datetime-types": "^0.3.0",
     "fast-clone": "^1.5.13",
     "fast-deep-equal": "^3.0.0-beta.2",
     "numeric-types": "^0.3.1",

diff --git a/src/time/date-intervals.ts b/src/time/date-intervals.ts
@@ -6,7 +6,7 @@ import { IntervalData } from './IntervalData';
 import { DateTimeData } from './DateTimeData';
 import { IntervalEdge } from './IntervalEdge';
 import { TimeRelationship } from './TimeRelationship';
-import { Interval, LocalDate } from 'datetime-types';
+import { DateInterval } from 'datetime-types';
 
 /**
  * Create an interval that matches dates in the past.
@@ -48,7 +48,7 @@ function applyRelationAndEdge(r: DateTimeData, edge: IntervalEdge) {
 	return r;
 }
 
-export function mapDateInterval(r: IntervalData, e: DateTimeEncounter): Interval<LocalDate> {
+export function mapDateInterval(r: IntervalData, e: DateTimeEncounter): DateInterval {
 	let start = null;
 	let end = null;
 
@@ -78,5 +78,5 @@ export function mapDateInterval(r: IntervalData, e: DateTimeEncounter): Interval
 		}
 	}
 
-	return Interval.between(start, end);
+	return DateInterval.between(start, end);
 }