Skip to content

Commit 330ad51

Browse files
committed
fix: sync src/lib with lib
Some PRs (e.g. #1010 and #1017) haven't been compiled properly.
1 parent 63e4c78 commit 330ad51

File tree

4 files changed

+16
-196
lines changed

4 files changed

+16
-196
lines changed

lib/isMobilePhone.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
1414
var phones = {
1515
'ar-AE': /^((\+?971)|0)?5[024568]\d{7}$/,
1616
'ar-DZ': /^(\+?213|0)(5|6|7)\d{8}$/,
17-
'ar-EG': /^((\+?20)|0)?1[012]\d{8}$/,
17+
'ar-EG': /^((\+?20)|0)?1[0125]\d{8}$/,
1818
'ar-IQ': /^(\+?964|0)?7[0-9]\d{8}$/,
1919
'ar-JO': /^(\+?962|0)?7[789]\d{7}$/,
2020
'ar-KW': /^(\+?965)[569]\d{7}$/,
@@ -48,6 +48,7 @@ var phones = {
4848
'en-ZM': /^(\+?26)?09[567]\d{7}$/,
4949
'es-ES': /^(\+?34)?(6\d{1}|7[1234])\d{7}$/,
5050
'es-MX': /^(\+?52)?(1|01)?\d{10,11}$/,
51+
'es-PY': /^(\+?595|0)9[9876]\d{7}$/,
5152
'es-UY': /^(\+598|0)9[1-9][\d]{6}$/,
5253
'et-EE': /^(\+?372)?\s?(5|8[1-4])\s?([0-9]\s?){6,7}$/,
5354
'fa-IR': /^(\+?98[\-\s]?|0)9[0-39]\d[\-\s]?\d{3}[\-\s]?\d{4}$/,

lib/isPostalCode.js

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ var patterns = {
3535
GR: /^\d{3}\s?\d{2}$/,
3636
HR: /^([1-5]\d{4}$)/,
3737
HU: fourDigit,
38+
ID: fiveDigit,
3839
IL: fiveDigit,
3940
IN: sixDigit,
4041
IS: threeDigit,

validator.js

+12-194
Original file line numberDiff line numberDiff line change
@@ -40,191 +40,6 @@ function _typeof(obj) {
4040
return _typeof(obj);
4141
}
4242

43-
function _toArray(arr) {
44-
return _arrayWithHoles(arr) || _iterableToArray(arr) || _nonIterableRest();
45-
}
46-
47-
function _arrayWithHoles(arr) {
48-
if (Array.isArray(arr)) return arr;
49-
}
50-
51-
function _iterableToArray(iter) {
52-
if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter);
53-
}
54-
55-
function _nonIterableRest() {
56-
throw new TypeError("Invalid attempt to destructure non-iterable instance");
57-
}
58-
59-
function _toPrimitive(input, hint) {
60-
if (typeof input !== "object" || input === null) return input;
61-
var prim = input[Symbol.toPrimitive];
62-
63-
if (prim !== undefined) {
64-
var res = prim.call(input, hint || "default");
65-
if (typeof res !== "object") return res;
66-
throw new TypeError("@@toPrimitive must return a primitive value.");
67-
}
68-
69-
return (hint === "string" ? String : Number)(input);
70-
}
71-
72-
function _toPropertyKey(arg) {
73-
var key = _toPrimitive(arg, "string");
74-
75-
return typeof key === "symbol" ? key : String(key);
76-
}
77-
78-
function _addElementPlacement(element, placements, silent) {
79-
var keys = placements[element.placement];
80-
81-
if (!silent && keys.indexOf(element.key) !== -1) {
82-
throw new TypeError("Duplicated element (" + element.key + ")");
83-
}
84-
85-
keys.push(element.key);
86-
}
87-
88-
function _fromElementDescriptor(element) {
89-
var obj = {
90-
kind: element.kind,
91-
key: element.key,
92-
placement: element.placement,
93-
descriptor: element.descriptor
94-
};
95-
var desc = {
96-
value: "Descriptor",
97-
configurable: true
98-
};
99-
Object.defineProperty(obj, Symbol.toStringTag, desc);
100-
if (element.kind === "field") obj.initializer = element.initializer;
101-
return obj;
102-
}
103-
104-
function _toElementDescriptors(elementObjects) {
105-
if (elementObjects === undefined) return;
106-
return _toArray(elementObjects).map(function (elementObject) {
107-
var element = _toElementDescriptor(elementObject);
108-
109-
_disallowProperty(elementObject, "finisher", "An element descriptor");
110-
111-
_disallowProperty(elementObject, "extras", "An element descriptor");
112-
113-
return element;
114-
});
115-
}
116-
117-
function _toElementDescriptor(elementObject) {
118-
var kind = String(elementObject.kind);
119-
120-
if (kind !== "method" && kind !== "field") {
121-
throw new TypeError('An element descriptor\'s .kind property must be either "method" or' + ' "field", but a decorator created an element descriptor with' + ' .kind "' + kind + '"');
122-
}
123-
124-
var key = _toPropertyKey(elementObject.key);
125-
126-
var placement = String(elementObject.placement);
127-
128-
if (placement !== "static" && placement !== "prototype" && placement !== "own") {
129-
throw new TypeError('An element descriptor\'s .placement property must be one of "static",' + ' "prototype" or "own", but a decorator created an element descriptor' + ' with .placement "' + placement + '"');
130-
}
131-
132-
var descriptor = elementObject.descriptor;
133-
134-
_disallowProperty(elementObject, "elements", "An element descriptor");
135-
136-
var element = {
137-
kind: kind,
138-
key: key,
139-
placement: placement,
140-
descriptor: Object.assign({}, descriptor)
141-
};
142-
143-
if (kind !== "field") {
144-
_disallowProperty(elementObject, "initializer", "A method descriptor");
145-
} else {
146-
_disallowProperty(descriptor, "get", "The property descriptor of a field descriptor");
147-
148-
_disallowProperty(descriptor, "set", "The property descriptor of a field descriptor");
149-
150-
_disallowProperty(descriptor, "value", "The property descriptor of a field descriptor");
151-
152-
element.initializer = elementObject.initializer;
153-
}
154-
155-
return element;
156-
}
157-
158-
function _toElementFinisherExtras(elementObject) {
159-
var element = _toElementDescriptor(elementObject);
160-
161-
var finisher = _optionalCallableProperty(elementObject, "finisher");
162-
163-
var extras = _toElementDescriptors(elementObject.extras);
164-
165-
return {
166-
element: element,
167-
finisher: finisher,
168-
extras: extras
169-
};
170-
}
171-
172-
function _fromClassDescriptor(elements) {
173-
var obj = {
174-
kind: "class",
175-
elements: elements.map(_fromElementDescriptor)
176-
};
177-
var desc = {
178-
value: "Descriptor",
179-
configurable: true
180-
};
181-
Object.defineProperty(obj, Symbol.toStringTag, desc);
182-
return obj;
183-
}
184-
185-
function _toClassDescriptor(obj) {
186-
var kind = String(obj.kind);
187-
188-
if (kind !== "class") {
189-
throw new TypeError('A class descriptor\'s .kind property must be "class", but a decorator' + ' created a class descriptor with .kind "' + kind + '"');
190-
}
191-
192-
_disallowProperty(obj, "key", "A class descriptor");
193-
194-
_disallowProperty(obj, "placement", "A class descriptor");
195-
196-
_disallowProperty(obj, "descriptor", "A class descriptor");
197-
198-
_disallowProperty(obj, "initializer", "A class descriptor");
199-
200-
_disallowProperty(obj, "extras", "A class descriptor");
201-
202-
var finisher = _optionalCallableProperty(obj, "finisher");
203-
204-
var elements = _toElementDescriptors(obj.elements);
205-
206-
return {
207-
elements: elements,
208-
finisher: finisher
209-
};
210-
}
211-
212-
function _disallowProperty(obj, name, objectType) {
213-
if (obj[name] !== undefined) {
214-
throw new TypeError(objectType + " can't have a ." + name + " property.");
215-
}
216-
}
217-
218-
function _optionalCallableProperty(obj, name) {
219-
var value = obj[name];
220-
221-
if (value !== undefined && typeof value !== "function") {
222-
throw new TypeError("Expected '" + name + "' to be a function");
223-
}
224-
225-
return value;
226-
}
227-
22843
function assertString(input) {
22944
var isString = typeof input === 'string' || input instanceof String;
23045

@@ -887,14 +702,14 @@ function isNumeric(str, options) {
887702
return numeric.test(str);
888703
}
889704

890-
var int = /^(?:[-+]?(?:0|[1-9][0-9]*))$/;
705+
var _int = /^(?:[-+]?(?:0|[1-9][0-9]*))$/;
891706
var intLeadingZeroes = /^[-+]?[0-9]+$/;
892707
function isInt(str, options) {
893708
assertString(str);
894709
options = options || {}; // Get the regex to use for testing, based on whether
895710
// leading zeroes are allowed or not.
896711

897-
var regex = options.hasOwnProperty('allow_leading_zeroes') && !options.allow_leading_zeroes ? int : intLeadingZeroes; // Check min/max/lt/gt
712+
var regex = options.hasOwnProperty('allow_leading_zeroes') && !options.allow_leading_zeroes ? _int : intLeadingZeroes; // Check min/max/lt/gt
898713

899714
var minCheckPassed = !options.hasOwnProperty('min') || str >= options.min;
900715
var maxCheckPassed = !options.hasOwnProperty('max') || str <= options.max;
@@ -966,14 +781,15 @@ function isSurrogatePair(str) {
966781
function isFloat(str, options) {
967782
assertString(str);
968783
options = options || {};
969-
var float = new RegExp("^(?:[-+])?(?:[0-9]+)?(?:\\".concat(options.locale ? decimal[options.locale] : '.', "[0-9]*)?(?:[eE][\\+\\-]?(?:[0-9]+))?$"));
784+
785+
var _float = new RegExp("^(?:[-+])?(?:[0-9]+)?(?:\\".concat(options.locale ? decimal[options.locale] : '.', "[0-9]*)?(?:[eE][\\+\\-]?(?:[0-9]+))?$"));
970786

971787
if (str === '' || str === '.' || str === '-' || str === '+') {
972788
return false;
973789
}
974790

975791
var value = parseFloat(str.replace(',', '.'));
976-
return float.test(str) && (!options.hasOwnProperty('min') || value >= options.min) && (!options.hasOwnProperty('max') || value <= options.max) && (!options.hasOwnProperty('lt') || value < options.lt) && (!options.hasOwnProperty('gt') || value > options.gt);
792+
return _float.test(str) && (!options.hasOwnProperty('min') || value >= options.min) && (!options.hasOwnProperty('max') || value <= options.max) && (!options.hasOwnProperty('lt') || value < options.lt) && (!options.hasOwnProperty('gt') || value > options.gt);
977793
}
978794
var locales$2 = Object.keys(decimal);
979795

@@ -1219,8 +1035,8 @@ var validators = {
12191035
} // validate the control digit
12201036

12211037

1222-
var number = sanitized.slice(0, -1).replace(/[X,Y,Z]/g, function (char) {
1223-
return charsValue[char];
1038+
var number = sanitized.slice(0, -1).replace(/[X,Y,Z]/g, function (_char) {
1039+
return charsValue[_char];
12241040
});
12251041
return sanitized.endsWith(controlDigits[number % 23]);
12261042
}
@@ -1365,7 +1181,7 @@ function isISSN(str) {
13651181
var phones = {
13661182
'ar-AE': /^((\+?971)|0)?5[024568]\d{7}$/,
13671183
'ar-DZ': /^(\+?213|0)(5|6|7)\d{8}$/,
1368-
'ar-EG': /^((\+?20)|0)?1[012]\d{8}$/,
1184+
'ar-EG': /^((\+?20)|0)?1[0125]\d{8}$/,
13691185
'ar-IQ': /^(\+?964|0)?7[0-9]\d{8}$/,
13701186
'ar-JO': /^(\+?962|0)?7[789]\d{7}$/,
13711187
'ar-KW': /^(\+?965)[569]\d{7}$/,
@@ -1399,6 +1215,7 @@ var phones = {
13991215
'en-ZM': /^(\+?26)?09[567]\d{7}$/,
14001216
'es-ES': /^(\+?34)?(6\d{1}|7[1234])\d{7}$/,
14011217
'es-MX': /^(\+?52)?(1|01)?\d{10,11}$/,
1218+
'es-PY': /^(\+?595|0)9[9876]\d{7}$/,
14021219
'es-UY': /^(\+598|0)9[1-9][\d]{6}$/,
14031220
'et-EE': /^(\+?372)?\s?(5|8[1-4])\s?([0-9]\s?){6,7}$/,
14041221
'fa-IR': /^(\+?98[\-\s]?|0)9[0-39]\d[\-\s]?\d{3}[\-\s]?\d{4}$/,
@@ -1729,12 +1546,12 @@ function isMimeType(str) {
17291546
}
17301547

17311548
var lat = /^\(?[+-]?(90(\.0+)?|[1-8]?\d(\.\d+)?)$/;
1732-
var long = /^\s?[+-]?(180(\.0+)?|1[0-7]\d(\.\d+)?|\d{1,2}(\.\d+)?)\)?$/;
1549+
var _long = /^\s?[+-]?(180(\.0+)?|1[0-7]\d(\.\d+)?|\d{1,2}(\.\d+)?)\)?$/;
17331550
var isLatLong = function (str) {
17341551
assertString(str);
17351552
if (!str.includes(',')) return false;
17361553
var pair = str.split(',');
1737-
return lat.test(pair[0]) && long.test(pair[1]);
1554+
return lat.test(pair[0]) && _long.test(pair[1]);
17381555
};
17391556

17401557
var threeDigit = /^\d{3}$/;
@@ -1761,6 +1578,7 @@ var patterns = {
17611578
GR: /^\d{3}\s?\d{2}$/,
17621579
HR: /^([1-5]\d{4}$)/,
17631580
HU: fourDigit,
1581+
ID: fiveDigit,
17641582
IL: fiveDigit,
17651583
IN: sixDigit,
17661584
IS: threeDigit,

validator.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)