Merge pull request #7 from LearningLocker/descriptive-regex-warnings

ryasmi · web-flow · commit 7f6a5202bc11 · 2017-01-22T20:34:27.000Z
Makes regex warnings more descriptive.
diff --git a/dist/regexValues/duration.js b/dist/regexValues/duration.js
@@ -1,4 +1,4 @@
 "use strict";
 var rulr_1 = require("rulr");
 Object.defineProperty(exports, "__esModule", { value: true });
-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);
+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, rulr_1.checkTypeWarning('ISO Duration'));
diff --git a/dist/regexValues/imt.js b/dist/regexValues/imt.js
@@ -1,4 +1,4 @@
 "use strict";
 var rulr_1 = require("rulr");
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = rulr_1.checkRegex(/^((application|audio|example|image|message|model|multipart|text|video)(\/[-\w\+\.]+)(;\s*[-\w]+\=[-\w]+)*;?)$/);
+exports.default = rulr_1.checkRegex(/^((application|audio|example|image|message|model|multipart|text|video)(\/[-\w\+\.]+)(;\s*[-\w]+\=[-\w]+)*;?)$/, rulr_1.checkTypeWarning('Internet Media Type (IMT)'));
diff --git a/dist/regexValues/interactionType.js b/dist/regexValues/interactionType.js
@@ -1,4 +1,4 @@
 "use strict";
 var rulr_1 = require("rulr");
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = rulr_1.checkRegex(/^((choice)|(sequencing)|(likert)|(matching)|(performance)|(true-false)|(fill-in)|(long-fill-in)|(numeric)|(other))$/);
+exports.default = rulr_1.checkRegex(/^((choice)|(sequencing)|(likert)|(matching)|(performance)|(true-false)|(fill-in)|(long-fill-in)|(numeric)|(other))$/, rulr_1.checkTypeWarning('Interaction Type'));
diff --git a/dist/regexValues/iri.js b/dist/regexValues/iri.js
diff --git a/dist/regexValues/language.js b/dist/regexValues/language.js
@@ -1,4 +1,4 @@
 "use strict";
 var rulr_1 = require("rulr");
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = rulr_1.checkRegex(/^(([a-zA-Z]{2,8}((-[a-zA-Z]{3}){0,3})(-[a-zA-Z]{4})?((-[a-zA-Z]{2})|(-\d{3}))?(-[a-zA-Z\d]{4,8})*(-[a-zA-Z\d](-[a-zA-Z\d]{1,8})+)*)|x(-[a-zA-Z\d]{1,8})+|en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tsu|i-tay|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)$/i);
+exports.default = rulr_1.checkRegex(/^(([a-zA-Z]{2,8}((-[a-zA-Z]{3}){0,3})(-[a-zA-Z]{4})?((-[a-zA-Z]{2})|(-\d{3}))?(-[a-zA-Z\d]{4,8})*(-[a-zA-Z\d](-[a-zA-Z\d]{1,8})+)*)|x(-[a-zA-Z\d]{1,8})+|en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tsu|i-tay|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)$/i, rulr_1.checkTypeWarning('Language'));
diff --git a/dist/regexValues/mailto.js b/dist/regexValues/mailto.js
@@ -1,4 +1,4 @@
 "use strict";
 var rulr_1 = require("rulr");
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = rulr_1.checkRegex(/^mailto:[A-Z0-9\.\`\'_%+-]+@[A-Z0-9.-]+\.[A-Z]{1,63}$/i);
+exports.default = rulr_1.checkRegex(/^mailto:[A-Z0-9\.\`\'_%+-]+@[A-Z0-9.-]+\.[A-Z]{1,63}$/i, rulr_1.checkTypeWarning('Mailto'));
diff --git a/dist/regexValues/sha1.js b/dist/regexValues/sha1.js
@@ -1,4 +1,4 @@
 "use strict";
 var rulr_1 = require("rulr");
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = rulr_1.checkRegex(/^\b[0-9a-f]{5,40}$/i);
+exports.default = rulr_1.checkRegex(/^\b[0-9a-f]{5,40}$/i, rulr_1.checkTypeWarning('Sha1'));
diff --git a/dist/regexValues/timestamp.js b/dist/regexValues/timestamp.js
@@ -31,4 +31,4 @@ var EXT_ZONE = "(Z|" + EXT_P_ZONE + "|" + EXT_N_ZONE + ")";
 var EXT = "(" + EXT_DATE + "(T" + EXT_TIME + EXT_ZONE + ")?)";
 var TIMESTAMP = new RegExp("^(" + EXT + "|" + BASIC + ")$");
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = rulr_1.checkRegex(TIMESTAMP);
+exports.default = rulr_1.checkRegex(TIMESTAMP, rulr_1.checkTypeWarning('ISO Timestamp'));
diff --git a/dist/regexValues/uuid.js b/dist/regexValues/uuid.js
@@ -1,4 +1,4 @@
 "use strict";
 var rulr_1 = require("rulr");
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = rulr_1.checkRegex(/^\{?[A-Z0-9]{8}-[A-Z0-9]{4}-[A-Z0-9]{4}-[8,9,a,b][A-Z0-9]{3}-[A-Z0-9]{12}\}?$/i);
+exports.default = rulr_1.checkRegex(/^\{?[A-Z0-9]{8}-[A-Z0-9]{4}-[A-Z0-9]{4}-[8,9,a,b][A-Z0-9]{3}-[A-Z0-9]{12}\}?$/i, rulr_1.checkTypeWarning('Universal Unique Identifier (UUID)'));
diff --git a/dist/regexValues/version.js b/dist/regexValues/version.js
@@ -1,4 +1,4 @@
 "use strict";
 var rulr_1 = require("rulr");
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = rulr_1.checkRegex(/^1\.0\.[0-9]+$/);
+exports.default = rulr_1.checkRegex(/^1\.0\.[0-9]+$/, rulr_1.checkTypeWarning('Version'));
diff --git a/dist/tests/describeIfiProp.d.ts b/dist/tests/describeIfiProp.d.ts
@@ -1,3 +1,4 @@
+/// <reference types="mocha" />
 import Test from './helpers/test';
 import 'mocha';
 declare var _default: (prop: string, describer: (test: Test) => void, test: Test) => Mocha.ISuite;
diff --git a/src/regexValues/duration.ts b/src/regexValues/duration.ts
@@ -1,6 +1,6 @@
 /* tslint:disable:max-line-length */
-import { checkRegex } from 'rulr';
+import { checkRegex, checkTypeWarning } from 'rulr';
 
 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
-);
+, checkTypeWarning('ISO Duration'));
diff --git a/src/regexValues/imt.ts b/src/regexValues/imt.ts
@@ -1,5 +1,5 @@
-import { checkRegex } from 'rulr';
+import { checkRegex, checkTypeWarning } from 'rulr';
 
 export default checkRegex(
   /^((application|audio|example|image|message|model|multipart|text|video)(\/[-\w\+\.]+)(;\s*[-\w]+\=[-\w]+)*;?)$/
-);
+, checkTypeWarning('Internet Media Type (IMT)'));
diff --git a/src/regexValues/interactionType.ts b/src/regexValues/interactionType.ts
@@ -1,5 +1,5 @@
-import { checkRegex } from 'rulr';
+import { checkRegex, checkTypeWarning } from 'rulr';
 
 export default checkRegex(
   /^((choice)|(sequencing)|(likert)|(matching)|(performance)|(true-false)|(fill-in)|(long-fill-in)|(numeric)|(other))$/
-);
+, checkTypeWarning('Interaction Type'));
diff --git a/src/regexValues/iri.ts b/src/regexValues/iri.ts
@@ -1,6 +1,6 @@
 /* tslint:disable:max-line-length */
-import { checkRegex } from 'rulr';
+import { checkRegex, checkTypeWarning } from 'rulr';
 
 export default checkRegex(
   /^[a-z](?:[-a-z0-9\+\.])*:(?:\/\/(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\xA0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF\u0000-\uFFFD!\$&\'\(\)\*\+,;=:])*@)?(?:\[(?:(?:(?:[0-9a-f]{1,4}:){6}(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3})|::(?:[0-9a-f]{1,4}:){5}(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3})|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3})|(?:[0-9a-f]{1,4}:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3})|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3})|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3})|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3})|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|v[0-9a-f]+[-a-z0-9\._~!\$&\'\(\)\*\+,;=:]+)\]|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3}|(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\xA0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF\u0000-\uFFFD!\$&\'\(\)\*\+,;=@])*)(?::[0-9]*)?(?:\/(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\xA0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF\u0000-\uFFFD!\$&\'\(\)\*\+,;=:@]))*)*|\/(?:(?:(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\xA0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF\u0000-\uFFFD!\$&\'\(\)\*\+,;=:@]))+)(?:\/(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\xA0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF\u0000-\uFFFD!\$&\'\(\)\*\+,;=:@]))*)*)?|(?:(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\xA0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF\u0000-\uFFFD!\$&\'\(\)\*\+,;=:@]))+)(?:\/(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\xA0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF\u0000-\uFFFD!\$&\'\(\)\*\+,;=:@]))*)*|(?!(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\xA0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF\u0000-\uFFFD!\$&\'\(\)\*\+,;=:@])))(?:\?(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\xA0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF\u0000-\uFFFD!\$&\'\(\)\*\+,;=:@])|[\uE000-\uF8FF\u0000-\uFFFD|\u0000-\uFFFD\/\?])*)?(?:\#(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\xA0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF\u0000-\uFFFD!\$&\'\(\)\*\+,;=:@])|[\/\?])*)?$/i
-);
+, checkTypeWarning('Internationalized Resource Identifier (IRI)'));
diff --git a/src/regexValues/language.ts b/src/regexValues/language.ts
@@ -1,6 +1,6 @@
 /* tslint:disable:max-line-length */
-import { checkRegex } from 'rulr';
+import { checkRegex, checkTypeWarning } from 'rulr';
 
 export default checkRegex(
   /^(([a-zA-Z]{2,8}((-[a-zA-Z]{3}){0,3})(-[a-zA-Z]{4})?((-[a-zA-Z]{2})|(-\d{3}))?(-[a-zA-Z\d]{4,8})*(-[a-zA-Z\d](-[a-zA-Z\d]{1,8})+)*)|x(-[a-zA-Z\d]{1,8})+|en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tsu|i-tay|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)$/i
-);
+, checkTypeWarning('Language'));
diff --git a/src/regexValues/mailto.ts b/src/regexValues/mailto.ts
@@ -1,5 +1,5 @@
-import { checkRegex } from 'rulr';
+import { checkRegex, checkTypeWarning } from 'rulr';
 
 export default checkRegex(
   /^mailto:[A-Z0-9\.\`\'_%+-]+@[A-Z0-9.-]+\.[A-Z]{1,63}$/i
-);
+, checkTypeWarning('Mailto'));
diff --git a/src/regexValues/sha1.ts b/src/regexValues/sha1.ts
@@ -1,5 +1,5 @@
-import { checkRegex } from 'rulr';
+import { checkRegex, checkTypeWarning } from 'rulr';
 
 export default checkRegex(
   /^\b[0-9a-f]{5,40}$/i
-);
+, checkTypeWarning('Sha1'));
diff --git a/src/regexValues/timestamp.ts b/src/regexValues/timestamp.ts
@@ -1,4 +1,4 @@
-import { checkRegex } from 'rulr';
+import { checkRegex, checkTypeWarning } from 'rulr';
 
 const YEAR = '(\\d{4})';
 const MONTH = '((0[1-9])|(1[012]))';
@@ -31,4 +31,4 @@ const EXT_ZONE = `(Z|${EXT_P_ZONE}|${EXT_N_ZONE})`;
 const EXT = `(${EXT_DATE}(T${EXT_TIME}${EXT_ZONE})?)`;
 const TIMESTAMP = new RegExp(`^(${EXT}|${BASIC})$`);
 
-export default checkRegex(TIMESTAMP);
+export default checkRegex(TIMESTAMP, checkTypeWarning('ISO Timestamp'));
diff --git a/src/regexValues/uuid.ts b/src/regexValues/uuid.ts
@@ -1,5 +1,5 @@
-import { checkRegex } from 'rulr';
+import { checkRegex, checkTypeWarning } from 'rulr';
 
 export default checkRegex(
   /^\{?[A-Z0-9]{8}-[A-Z0-9]{4}-[A-Z0-9]{4}-[8,9,a,b][A-Z0-9]{3}-[A-Z0-9]{12}\}?$/i
-);
+, checkTypeWarning('Universal Unique Identifier (UUID)'));
diff --git a/src/regexValues/version.ts b/src/regexValues/version.ts
@@ -1,5 +1,5 @@
-import { checkRegex } from 'rulr';
+import { checkRegex, checkTypeWarning } from 'rulr';
 
 export default checkRegex(
   /^1\.0\.[0-9]+$/
-);
+, checkTypeWarning('Version'));
