createMarker/createMarkerMeta

src/datelib/env.ts

@@ -175,8 +175,12 @@ export class DateEnv {
     )
   }
 
-  // returns an object that wraps the marker!
   createMarker(input) {
+    return this.createMarkerMeta(input).marker
+  }
+
+  // returns an object that wraps the marker!
+  createMarkerMeta(input) {
     if (typeof input === 'string') {
       return this.parse(input)
     } else if (typeof input === 'number') {

tests/automated/datelib/main.js

@@ -13,8 +13,8 @@ describe('datelib', function() {
         calendarSystem: 'gregorian',
         locale: 'en'
       })
-      var m1 = env.createMarker('2018-04-07').marker
-      var m2 = env.createMarker('2018-04-08').marker
+      var m1 = env.createMarker('2018-04-07')
+      var m2 = env.createMarker('2018-04-08')
       expect(env.computeWeekNumber(m1)).toBe(14)
       expect(env.computeWeekNumber(m2)).toBe(15)
     })
@@ -26,8 +26,8 @@ describe('datelib', function() {
         locale: 'en',
         weekNumberCalculation: 'ISO'
       })
-      var m1 = env.createMarker('2018-04-01').marker
-      var m2 = env.createMarker('2018-04-02').marker
+      var m1 = env.createMarker('2018-04-01')
+      var m2 = env.createMarker('2018-04-02')
       expect(env.computeWeekNumber(m1)).toBe(13)
       expect(env.computeWeekNumber(m2)).toBe(14)
     })
@@ -43,7 +43,7 @@ describe('datelib', function() {
           return 99
         }
       })
-      var m1 = env.createMarker('2018-04-01').marker
+      var m1 = env.createMarker('2018-04-01')
       expect(env.computeWeekNumber(m1)).toBe(99)
     })
 
@@ -56,7 +56,7 @@ describe('datelib', function() {
       locale: 'en',
       firstDay: 2 // tues
     })
-    var m = env.createMarker('2018-04-19').marker
+    var m = env.createMarker('2018-04-19')
     var w = env.startOfWeek(m)
 
     expect(env.toDate(w)).toEqual(
@@ -83,7 +83,7 @@ describe('datelib', function() {
           env.toDate(
             env.createMarker(
               new Date(2017, 5, 8)
-            ).marker
+            )
           )
         ).toEqual(
           new Date(2017, 5, 8)
@@ -95,7 +95,7 @@ describe('datelib', function() {
           env.toDate(
             env.createMarker(
               new Date(2017, 5, 8).valueOf()
-            ).marker
+            )
           )
         ).toEqual(
           new Date(2017, 5, 8)
@@ -107,7 +107,7 @@ describe('datelib', function() {
           env.toDate(
             env.createMarker(
               [ 2017, 5, 8 ]
-            ).marker
+            )
           )
         ).toEqual(
           new Date(Date.UTC(2017, 5, 8))
@@ -119,51 +119,51 @@ describe('datelib', function() {
     describe('ISO8601 parsing', function() {
 
       it('parses non-tz as UTC', function() {
-        var res = env.createMarker('2018-06-08')
+        var res = env.createMarkerMeta('2018-06-08')
         var date = env.toDate(res.marker)
         expect(date).toEqual(new Date(Date.UTC(2018, 5, 8)))
         expect(res.forcedTimeZoneOffset).toBeNull()
       })
 
       it('parses a date already in UTC', function() {
-        var res = env.createMarker('2018-06-08T00:00:00Z')
+        var res = env.createMarkerMeta('2018-06-08T00:00:00Z')
         var date = env.toDate(res.marker)
         expect(date).toEqual(new Date(Date.UTC(2018, 5, 8)))
         expect(res.forcedTimeZoneOffset).toBeNull()
       })
 
       it('parses timezones into UTC', function() {
-        var res = env.createMarker('2018-06-08T00:00:00+12:00')
+        var res = env.createMarkerMeta('2018-06-08T00:00:00+12:00')
         var date = env.toDate(res.marker)
         expect(date).toEqual(new Date(Date.UTC(2018, 5, 7, 12)))
         expect(res.forcedTimeZoneOffset).toBeNull()
       })
 
       it('detects lack of time', function() {
-        var res = env.createMarker('2018-06-08')
+        var res = env.createMarkerMeta('2018-06-08')
         expect(res.hasTime).toBe(false)
       })
 
       it('detects presence of time', function() {
-        var res = env.createMarker('2018-06-08T00:00:00')
+        var res = env.createMarkerMeta('2018-06-08T00:00:00')
         expect(res.hasTime).toBe(true)
       })
 
       it('detects presence of time even if timezone', function() {
-        var res = env.createMarker('2018-06-08T00:00:00+12:00')
+        var res = env.createMarkerMeta('2018-06-08T00:00:00+12:00')
         expect(res.hasTime).toBe(true)
       })
 
     })
 
     it('outputs ISO8601 formatting', function() {
-      var marker = env.createMarker('2018-06-08T00:00:00').marker
+      var marker = env.createMarker('2018-06-08T00:00:00')
       var s = env.toIso(marker)
       expect(s).toBe('2018-06-08T00:00:00Z')
     })
 
     it('outputs pretty format with UTC timezone', function() {
-      var marker = env.createMarker('2018-06-08').marker
+      var marker = env.createMarker('2018-06-08')
       var formatter = createFormatter({
         weekday: 'long',
         day: 'numeric',
@@ -184,22 +184,22 @@ describe('datelib', function() {
       })
 
       it('works with different days of same month', function() {
-        var m0 = env.createMarker('2018-06-08').marker
-        var m1 = env.createMarker('2018-06-09').marker
+        var m0 = env.createMarker('2018-06-08')
+        var m1 = env.createMarker('2018-06-09')
         var s = env.toRangeFormat(m0, m1, formatter)
         expect(s).toBe('June 8 - 9, 2018')
       })
 
       it('works with different day/month of same year', function() {
-        var m0 = env.createMarker('2018-06-08').marker
-        var m1 = env.createMarker('2018-07-09').marker
+        var m0 = env.createMarker('2018-06-08')
+        var m1 = env.createMarker('2018-07-09')
         var s = env.toRangeFormat(m0, m1, formatter)
         expect(s).toBe('June 8 - July 9, 2018')
       })
 
       it('works with completely different dates', function() {
-        var m0 = env.createMarker('2018-06-08').marker
-        var m1 = env.createMarker('2020-07-09').marker
+        var m0 = env.createMarker('2018-06-08')
+        var m1 = env.createMarker('2020-07-09')
         var s = env.toRangeFormat(m0, m1, formatter)
         expect(s).toBe('June 8, 2018 - July 9, 2020')
       })
@@ -465,14 +465,14 @@ describe('datelib', function() {
     describe('ISO8601 parsing', function() {
 
       it('parses non-tz as local', function() {
-        var res = env.createMarker('2018-06-08')
+        var res = env.createMarkerMeta('2018-06-08')
         var date = env.toDate(res.marker)
         expect(date).toEqual(new Date(2018, 5, 8))
         expect(res.forcedTimeZoneOffset).toBeNull()
       })
 
       it('parses timezones into local', function() {
-        var res = env.createMarker('2018-06-08T00:00:00+12:00')
+        var res = env.createMarkerMeta('2018-06-08T00:00:00+12:00')
         var date = env.toDate(res.marker)
         expect(date).toEqual(new Date(Date.UTC(2018, 5, 7, 12)))
         expect(res.forcedTimeZoneOffset).toBeNull()
@@ -481,14 +481,14 @@ describe('datelib', function() {
     })
 
     it('outputs ISO8601 formatting', function() {
-      var marker = env.createMarker('2018-06-08T00:00:00').marker
+      var marker = env.createMarker('2018-06-08T00:00:00')
       var s = env.toIso(marker)
       var realTzo = getFormattedTimzoneOffset(new Date(2018, 5, 8))
       expect(s).toBe('2018-06-08T00:00:00' + realTzo)
     })
 
     it('outputs pretty format with local timezone', function() {
-      var marker = env.createMarker('2018-06-08').marker
+      var marker = env.createMarker('2018-06-08')
       var formatter = createFormatter({
         weekday: 'long',
         day: 'numeric',
@@ -526,14 +526,14 @@ describe('datelib', function() {
     describe('ISO8601 parsing', function() {
 
       it('parses non-tz as UTC with no forcedTimeZoneOffset', function() {
-        var res = env.createMarker('2018-06-08')
+        var res = env.createMarkerMeta('2018-06-08')
         var date = env.toDate(res.marker)
         expect(date).toEqual(new Date(Date.UTC(2018, 5, 8)))
         expect(res.forcedTimeZoneOffset).toBeNull()
       })
 
       it('parses as UTC after stripping and with a forcedTimeZoneOffset', function() {
-        var res = env.createMarker('2018-06-08T00:00:00+12:00')
+        var res = env.createMarkerMeta('2018-06-08T00:00:00+12:00')
         var date = env.toDate(res.marker)
         expect(date).toEqual(new Date(Date.UTC(2018, 5, 8)))
         expect(res.forcedTimeZoneOffset).toBe(12 * 60)
@@ -542,7 +542,7 @@ describe('datelib', function() {
     })
 
     it('outputs pretty format with no timezone even tho specified', function() {
-      var marker = env.createMarker('2018-06-08').marker
+      var marker = env.createMarker('2018-06-08')
       var formatter = createFormatter({
         weekday: 'long',
         day: 'numeric',