duration ISO should support fractional seconds

moment · Mar 12, 2018 · 5a62569 · 5a62569
1 parent 84273ac
commit 5a62569
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/impl/regexParser.js b/src/impl/regexParser.js
@@ -108,10 +108,10 @@ function extractIANAZone(match, cursor) {
 
 // ISO duration parsing
 
-const isoDuration = /^P(?:(?:(\d{1,9})Y)?(?:(\d{1,9})M)?(?:(\d{1,9})D)?(?:T(?:(\d{1,9})H)?(?:(\d{1,9})M)?(?:(\d{1,9})S)?)?|(\d{1,9})W)$/;
+const isoDuration = /^P(?:(?:(\d{1,9})Y)?(?:(\d{1,9})M)?(?:(\d{1,9})D)?(?:T(?:(\d{1,9})H)?(?:(\d{1,9})M)?(?:(\d{1,9})(?:[.,](\d{1,9}))?S)?)?|(\d{1,9})W)$/;
 
 function extractISODuration(match) {
-  const [, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr, weekStr] = match;
+  const [, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr, millisecondsStr, weekStr] = match;
 
   return [ {
     years: parseInt(yearStr),
@@ -120,7 +120,8 @@ function extractISODuration(match) {
     days: parseInt(dayStr),
     hours: parseInt(hourStr),
     minutes: parseInt(minuteStr),
-    seconds: parseInt(secondStr)
+    seconds: parseInt(secondStr),
+    milliseconds: Util.parseMillis(millisecondsStr)
   } ];
 }
 

diff --git a/src/impl/util.js b/src/impl/util.js
@@ -82,11 +82,11 @@ export class Util {
   }
 
   static parseMillis(fraction) {
-    if (fraction) {
+    if (Util.isUndefined(fraction)) {
+      return NaN;
+    } else {
       const f = parseFloat('0.' + fraction) * 1000;
       return Math.floor(f);
-    } else {
-      return 0;
     }
   }
 

diff --git a/test/duration/parse.test.js b/test/duration/parse.test.js
@@ -18,6 +18,15 @@ test('Duration.fromISO can parse a variety of ISO formats', () => {
   check('P2W', { weeks: 2 });
 });
 
+test('Duration.fromISO can parse fractions of seconds', () => {
+
+  expect(Duration.fromISO('PT54M32.5S').toObject()).toEqual({ minutes: 54, seconds: 32, milliseconds: 500 });
+  expect(Duration.fromISO('PT54M32.53S').toObject()).toEqual({ minutes: 54, seconds: 32, milliseconds: 530 });
+  expect(Duration.fromISO('PT54M32.534S').toObject()).toEqual({ minutes: 54, seconds: 32, milliseconds: 534 });
+  expect(Duration.fromISO('PT54M32.5348S').toObject()).toEqual({ minutes: 54, seconds: 32, milliseconds: 534 });
+  expect(Duration.fromISO('PT54M32.034S').toObject()).toEqual({ minutes: 54, seconds: 32, milliseconds: 34 });
+});
+
 test('Duration.fromISO rejects junk', () => {
   const rejects = s => {
     expect(Duration.fromISO(s).isValid).toBe(false);