iso8601 fix

Author: ht2

dist/regexValues/duration.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var rulr_1 = require("rulr");
 var TypeWarning_1 = require("../warnings/TypeWarning");
-exports.default = rulr_1.checkRegex(/^P((\d+([\.,]\d+)?Y)?(\d+([\.,]\d+)?M)?(\d+([\.,]\d+)?W)?(\d+([\.,]\d+)?D)?)?(T(\d+([\.,]\d+)?H)?(\d+([\.,]\d+)?M)?(\d+([\.,]\d+)?S)?)?$/i, TypeWarning_1.createTypeWarning('ISO Duration'));
+exports.default = rulr_1.checkRegex(/^(-?)P(?=\d|T\d)(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)([DW]))?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+(?:\.\d+)?)S)?)?$/, TypeWarning_1.createTypeWarning('ISO Duration'));

dist/tests/regexValues/duration.js

@@ -3,8 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var itsInvalid_1 = require("../itsInvalid");
 var itsValid_1 = require("../itsValid");
 var validData = 'P3Y6M4DT12H30M5S';
+var validData2 = 'P4W';
 exports.default = function (test) {
     itsInvalid_1.default('3Y6M4DT12H30M5S', 'not a Duration', test);
+    itsInvalid_1.default('P4W1D', 'not a Duration', test);
     itsInvalid_1.default(10, 'not a String', test);
     itsValid_1.default(validData, test);
+    itsValid_1.default(validData2, test);
 };

src/regexValues/duration.ts

@@ -3,5 +3,5 @@ import { checkRegex, Rule } from 'rulr';
 import { createTypeWarning } from '../warnings/TypeWarning';
 
 export default checkRegex(
-  /^P((\d+([\.,]\d+)?Y)?(\d+([\.,]\d+)?M)?(\d+([\.,]\d+)?W)?(\d+([\.,]\d+)?D)?)?(T(\d+([\.,]\d+)?H)?(\d+([\.,]\d+)?M)?(\d+([\.,]\d+)?S)?)?$/i
+  /^(-?)P(?=\d|T\d)(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)([DW]))?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+(?:\.\d+)?)S)?)?$/
 , createTypeWarning('ISO Duration')) as Rule;

src/tests/regexValues/duration.ts

@@ -3,9 +3,12 @@ import itsInvalid from '../itsInvalid';
 import itsValid from '../itsValid';
 
 const validData = 'P3Y6M4DT12H30M5S';
+const validData2 = 'P4W';
 
 export default (test: Test) => {
   itsInvalid('3Y6M4DT12H30M5S', 'not a Duration', test);
+  itsInvalid('P4W1D', 'not a Duration', test);
   itsInvalid(10, 'not a String', test);
   itsValid(validData, test);
+  itsValid(validData2, test);
 };