quasar 2.16.7 → 2.16.9

package/src/utils/date/date.js

@@ -10,8 +10,8 @@ const
   MILLISECONDS_IN_HOUR = 3600000,
   MILLISECONDS_IN_MINUTE = 60000,
   defaultMask = 'YYYY-MM-DDTHH:mm:ss.SSSZ',
-  token = /\[((?:[^\]\\]|\\]|\\)*)\]|d{1,4}|M{1,4}|m{1,2}|w{1,2}|Qo|Do|D{1,4}|YY(?:YY)?|H{1,2}|h{1,2}|s{1,2}|S{1,3}|Z{1,2}|a{1,2}|[AQExX]/g,
-  reverseToken = /(\[[^\]]*\])|d{1,4}|M{1,4}|m{1,2}|w{1,2}|Qo|Do|D{1,4}|YY(?:YY)?|H{1,2}|h{1,2}|s{1,2}|S{1,3}|Z{1,2}|a{1,2}|[AQExX]|([.*+:?^,\s${}()|\\]+)/g,
+  token = /\[((?:[^\]\\]|\\]|\\)*)\]|do|d{1,4}|Mo|M{1,4}|m{1,2}|wo|w{1,2}|Qo|Do|DDDo|D{1,4}|YY(?:YY)?|H{1,2}|h{1,2}|s{1,2}|S{1,3}|Z{1,2}|a{1,2}|[AQExX]/g,
+  reverseToken = /(\[[^\]]*\])|do|d{1,4}|Mo|M{1,4}|m{1,2}|wo|w{1,2}|Qo|Do|DDDo|D{1,4}|YY(?:YY)?|H{1,2}|h{1,2}|s{1,2}|S{1,3}|Z{1,2}|a{1,2}|[AQExX]|([.*+:?^,\s${}()|\\]+)/g,
   regexStore = {}
 
 function getRegexData (mask, dateLocale) {
@@ -43,6 +43,9 @@ function getRegexData (mask, dateLocale) {
       case 'M':
         map.M = index
         return '(\\d{1,2})'
+      case 'Mo':
+        map.M = index++ // bumping to M
+        return '(\\d{1,2}(st|nd|rd|th))'
       case 'MM':
         map.M = index // bumping to M
         return '(\\d{2})'
@@ -112,13 +115,22 @@ function getRegexData (mask, dateLocale) {
       case 'd':
       case 'E':
         return '(\\d{1})'
+      case 'do':
+        index++
+        return '(\\d{1}(st|nd|rd|th))'
       case 'Qo':
         return '(1st|2nd|3rd|4th)'
       case 'DDD':
       case 'DDDD':
         return '(\\d{1,3})'
+      case 'DDDo':
+        index++
+        return '(\\d{1,3}(st|nd|rd|th))'
       case 'w':
         return '(\\d{1,2})'
+      case 'wo':
+        index++
+        return '(\\d{1,2}(st|nd|rd|th))'
       case 'ww':
         return '(\\d{2})'
 
@@ -755,6 +767,11 @@ const formatter = {
     return date.getMonth() + 1
   },
 
+  // Month: 1st, 2nd, ..., 12th
+  Mo (date) {
+    return getOrdinal(date.getMonth() + 1)
+  },
+
   // Month: 01, 02, ..., 12
   MM (date) {
     return pad(date.getMonth() + 1)
@@ -800,6 +817,11 @@ const formatter = {
     return getDayOfYear(date)
   },
 
+  // Day of year: 1st, 2nd, ..., 366th
+  DDDo (date) {
+    return getOrdinal(getDayOfYear(date))
+  },
+
   // Day of year: 001, 002, ..., 366
   DDDD (date) {
     return pad(getDayOfYear(date), 3)
@@ -810,9 +832,14 @@ const formatter = {
     return date.getDay()
   },
 
+  // Day of week: 0th, 1st, ..., 6th
+  do (date) {
+    return getOrdinal(date.getDay())
+  },
+
   // Day of week: Su, Mo, ...
   dd (date, dateLocale) {
-    return this.dddd(date, dateLocale).slice(0, 2)
+    return (dateLocale.days[ date.getDay() ]).slice(0, 2)
   },
 
   // Day of week: Sun, Mon, ...
@@ -835,6 +862,11 @@ const formatter = {
     return getWeekOfYear(date)
   },
 
+  // Week of Year: 1st 2nd ... 52nd 53rd
+  wo (date) {
+    return getOrdinal(getWeekOfYear(date))
+  },
+
   // Week of Year: 01 02 ... 52 53
   ww (date) {
     return pad(getWeekOfYear(date))
@@ -900,17 +932,17 @@ const formatter = {
 
   // Meridiem: AM, PM
   A (date) {
-    return this.H(date) < 12 ? 'AM' : 'PM'
+    return date.getHours() < 12 ? 'AM' : 'PM'
   },
 
   // Meridiem: am, pm
   a (date) {
-    return this.H(date) < 12 ? 'am' : 'pm'
+    return date.getHours() < 12 ? 'am' : 'pm'
   },
 
   // Meridiem: a.m., p.m.
   aa (date) {
-    return this.H(date) < 12 ? 'a.m.' : 'p.m.'
+    return date.getHours() < 12 ? 'a.m.' : 'p.m.'
   },
 
   // Timezone: -01:00, +00:00, ... +12:00