valgen 5.19.0 → 5.19.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/constants.js +1 -1
  2. package/index.d.ts +64 -59
  3. package/index.js +10 -1
  4. package/package.json +1 -1
  5. package/rules/type-rules/is-date.d.ts +5 -6
  6. package/rules/type-rules/is-date.js +20 -19
package/constants.js CHANGED
@@ -1,4 +1,4 @@
1
- export const version = '5.19.0';
1
+ export const version = '5.19.2';
2
2
  export const postValidation = Symbol('postValidation');
3
3
  export const preValidation = Symbol('preValidation');
4
4
  export const VALIDATE_METADATA = Symbol('VALIDATE_METADATA');
package/index.d.ts CHANGED
@@ -1,65 +1,70 @@
1
+ import { Context, ExecutionOptions } from './core/index.js';
2
+ import { DatePrecision } from './rules/index.js';
1
3
  import * as vg from './rules/index.js';
2
4
  export * from './constants.js';
3
5
  export * from './core/index.js';
6
+ export type { DatePrecision } from './rules/type-rules/is-date.js';
4
7
  export type { IsObject } from './rules/type-rules/is-object.js';
5
- declare const isAlpha: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
6
- declare const isAlphanumeric: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
7
- declare const isAny: import("./core/validator.js").Validator<any, any, import("./core/types.js").ExecutionOptions>;
8
- declare const isArray: import("./core/validator.js").Validator<unknown[], unknown, import("./core/types.js").ExecutionOptions>;
9
- declare const isAscii: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
10
- declare const isBase64: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
11
- declare const isBigint: import("./core/validator.js").Validator<bigint, unknown, import("./core/types.js").ExecutionOptions>;
12
- declare const isBoolean: import("./core/validator.js").Validator<boolean | undefined, unknown, import("./core/types.js").ExecutionOptions>;
13
- declare const isBtcAddress: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
14
- declare const isCreditCard: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
15
- declare const isDate: import("./core/validator.js").Validator<Date, string | number | Date, import("./core/types.js").ExecutionOptions>;
16
- declare const isDateString: import("./core/validator.js").Validator<string, string | number | Date, import("./core/types.js").ExecutionOptions>;
17
- declare const isDecimal: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
18
- declare const isDefined: import("./core/validator.js").Validator<any, unknown, import("./core/types.js").ExecutionOptions>;
19
- declare const isEAN: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
20
- declare const isEmail: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
21
- declare const isEmpty: import("./core/validator.js").Validator<any, any, import("./core/types.js").ExecutionOptions>;
22
- declare const isETHAddress: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
23
- declare const isFQDN: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
24
- declare const isHex: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
25
- declare const isHexColor: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
26
- declare const isIBAN: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
27
- declare const isInteger: import("./core/validator.js").Validator<number, unknown, import("./core/types.js").ExecutionOptions>;
28
- declare const isIP: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
29
- declare const isIPRange: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
30
- declare const isISSN: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
31
- declare const isJWT: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
32
- declare const isLowercase: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
33
- declare const isMACAddress: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
34
- declare const isMobilePhone: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
35
- declare const isNotEmpty: import("./core/validator.js").Validator<any, any, import("./core/types.js").ExecutionOptions>;
36
- declare const isNotNull: import("./core/validator.js").Validator<unknown, unknown, import("./core/types.js").ExecutionOptions>;
37
- declare const isNotNullish: import("./core/validator.js").Validator<unknown, unknown, import("./core/types.js").ExecutionOptions>;
38
- declare const isNull: import("./core/validator.js").Validator<null, unknown, import("./core/types.js").ExecutionOptions>;
39
- declare const isNullish: import("./core/validator.js").Validator<null, unknown, import("./core/types.js").ExecutionOptions>;
40
- declare const isNumber: import("./core/validator.js").Validator<number, unknown, import("./core/types.js").ExecutionOptions>;
8
+ declare const isAlpha: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
9
+ declare const isAlphanumeric: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
10
+ declare const isAny: import("./core/validator.js").Validator<any, any, ExecutionOptions>;
11
+ declare const isArray: import("./core/validator.js").Validator<unknown[], unknown, ExecutionOptions>;
12
+ declare const isAscii: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
13
+ declare const isBase64: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
14
+ declare const isBigint: import("./core/validator.js").Validator<bigint, unknown, ExecutionOptions>;
15
+ declare const isBoolean: import("./core/validator.js").Validator<boolean | undefined, unknown, ExecutionOptions>;
16
+ declare const isBtcAddress: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
17
+ declare const isCreditCard: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
18
+ declare const isDate: import("./core/validator.js").Validator<Date, string | number | Date, ExecutionOptions>;
19
+ declare const isDateString: import("./core/validator.js").Validator<string, string | number | Date, ExecutionOptions>;
20
+ declare const isDecimal: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
21
+ declare const isDefined: import("./core/validator.js").Validator<any, unknown, ExecutionOptions>;
22
+ declare const isEAN: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
23
+ declare const isEmail: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
24
+ declare const isEmpty: import("./core/validator.js").Validator<any, any, ExecutionOptions>;
25
+ declare const isETHAddress: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
26
+ declare const isFQDN: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
27
+ declare const isHex: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
28
+ declare const isHexColor: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
29
+ declare const isIBAN: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
30
+ declare const isInteger: import("./core/validator.js").Validator<number, unknown, ExecutionOptions>;
31
+ declare const isIP: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
32
+ declare const isIPRange: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
33
+ declare const isISSN: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
34
+ declare const isJWT: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
35
+ declare const isLowercase: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
36
+ declare const isMACAddress: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
37
+ declare const isMobilePhone: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
38
+ declare const isNotEmpty: import("./core/validator.js").Validator<any, any, ExecutionOptions>;
39
+ declare const isNotNull: import("./core/validator.js").Validator<unknown, unknown, ExecutionOptions>;
40
+ declare const isNotNullish: import("./core/validator.js").Validator<unknown, unknown, ExecutionOptions>;
41
+ declare const isNull: import("./core/validator.js").Validator<null, unknown, ExecutionOptions>;
42
+ declare const isNullish: import("./core/validator.js").Validator<null, unknown, ExecutionOptions>;
43
+ declare const isNumber: import("./core/validator.js").Validator<number, unknown, ExecutionOptions>;
41
44
  declare const isObject: vg.IsObject.Validator<object, string | object>;
42
- declare const isObjectId: import("./core/validator.js").Validator<string | vg.ObjectIdLike | Uint8Array<ArrayBufferLike>, unknown, import("./core/types.js").ExecutionOptions>;
43
- declare const isPort: import("./core/validator.js").Validator<number, string | number, import("./core/types.js").ExecutionOptions>;
44
- declare const isString: import("./core/validator.js").Validator<string, unknown, import("./core/types.js").ExecutionOptions>;
45
- declare const isSWIFT: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
46
- declare const isTime: import("./core/validator.js").Validator<string, string | Date, import("./core/types.js").ExecutionOptions>;
47
- declare const isUndefined: import("./core/validator.js").Validator<any, unknown, import("./core/types.js").ExecutionOptions>;
48
- declare const isUppercase: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
49
- declare const isURL: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
50
- declare const isUUID: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
51
- declare const isUUID1: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
52
- declare const isUUID2: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
53
- declare const isUUID3: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
54
- declare const isUUID4: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
55
- declare const isUUID5: import("./core/validator.js").Validator<string, string, import("./core/types.js").ExecutionOptions>;
56
- declare const toArray: import("./core/validator.js").Validator<any[], any, import("./core/types.js").ExecutionOptions>;
57
- declare const toBigint: import("./core/validator.js").Validator<bigint, unknown, import("./core/types.js").ExecutionOptions>;
58
- declare const toBoolean: import("./core/validator.js").Validator<boolean | undefined, unknown, import("./core/types.js").ExecutionOptions>;
59
- declare const toDate: import("./core/validator.js").Validator<Date, string | number | Date, import("./core/types.js").ExecutionOptions>;
60
- declare const toDateString: import("./core/validator.js").Validator<string, string | number | Date, import("./core/types.js").ExecutionOptions>;
61
- declare const toInteger: import("./core/validator.js").Validator<number, unknown, import("./core/types.js").ExecutionOptions>;
62
- declare const toNumber: import("./core/validator.js").Validator<number, unknown, import("./core/types.js").ExecutionOptions>;
63
- declare const toString: import("./core/validator.js").Validator<string, unknown, import("./core/types.js").ExecutionOptions>;
64
- declare const toTime: import("./core/validator.js").Validator<string, string | Date, import("./core/types.js").ExecutionOptions>;
45
+ declare const isObjectId: import("./core/validator.js").Validator<string | vg.ObjectIdLike | Uint8Array<ArrayBufferLike>, unknown, ExecutionOptions>;
46
+ declare const isPort: import("./core/validator.js").Validator<number, string | number, ExecutionOptions>;
47
+ declare const isString: import("./core/validator.js").Validator<string, unknown, ExecutionOptions>;
48
+ declare const isSWIFT: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
49
+ declare const isTime: import("./core/validator.js").Validator<string, string | Date, ExecutionOptions>;
50
+ declare const isUndefined: import("./core/validator.js").Validator<any, unknown, ExecutionOptions>;
51
+ declare const isUppercase: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
52
+ declare const isURL: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
53
+ declare const isUUID: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
54
+ declare const isUUID1: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
55
+ declare const isUUID2: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
56
+ declare const isUUID3: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
57
+ declare const isUUID4: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
58
+ declare const isUUID5: import("./core/validator.js").Validator<string, string, ExecutionOptions>;
59
+ declare const toArray: import("./core/validator.js").Validator<any[], any, ExecutionOptions>;
60
+ declare const toBigint: import("./core/validator.js").Validator<bigint, unknown, ExecutionOptions>;
61
+ declare const toBoolean: import("./core/validator.js").Validator<boolean | undefined, unknown, ExecutionOptions>;
62
+ declare const toDate: import("./core/validator.js").Validator<Date, string | number | Date, ExecutionOptions>;
63
+ declare const toDateString: (input: Date | string | number, options?: ExecutionOptions & {
64
+ trim?: DatePrecision;
65
+ }, ctx?: Context) => any;
66
+ declare const toInteger: import("./core/validator.js").Validator<number, unknown, ExecutionOptions>;
67
+ declare const toNumber: import("./core/validator.js").Validator<number, unknown, ExecutionOptions>;
68
+ declare const toString: import("./core/validator.js").Validator<string, unknown, ExecutionOptions>;
69
+ declare const toTime: import("./core/validator.js").Validator<string, string | Date, ExecutionOptions>;
65
70
  export { isAlpha, isAlphanumeric, isAny, isArray, isAscii, isBase64, isBigint, isBoolean, isBtcAddress, isCreditCard, isDate, isDateString, isDecimal, isDefined, isEAN, isEmail, isEmpty, isETHAddress, isFQDN, isHex, isHexColor, isIBAN, isInteger, isIP, isIPRange, isISSN, isJWT, isLowercase, isMACAddress, isMobilePhone, isNotEmpty, isNotNull, isNotNullish, isNull, isNullish, isNumber, isObject, isObjectId, isPort, isString, isSWIFT, isTime, isUndefined, isUppercase, isURL, isUUID, isUUID1, isUUID2, isUUID3, isUUID4, isUUID5, toArray, toBigint, toBoolean, toDate, toDateString, toInteger, toNumber, toString, toTime, vg, };
package/index.js CHANGED
@@ -56,7 +56,16 @@ const toArray = vg.isArray(isAny, { coerce: true });
56
56
  const toBigint = vg.isBigint({ coerce: true });
57
57
  const toBoolean = vg.isBoolean({ coerce: true });
58
58
  const toDate = vg.isDate({ coerce: true });
59
- const toDateString = vg.isDateString({ coerce: true, precisionMin: 'day' });
59
+ const toDateStringValidators = new Map();
60
+ const toDateString = (input, options, ctx) => {
61
+ const trim = options?.trim ?? 'seconds';
62
+ let validator = toDateStringValidators.get(trim);
63
+ if (!validator) {
64
+ validator = vg.isDateString({ coerce: true, precisionMax: trim });
65
+ toDateStringValidators.set(trim, validator);
66
+ }
67
+ return validator(input, options, ctx);
68
+ };
60
69
  const toInteger = vg.isInteger({ coerce: true });
61
70
  const toNumber = vg.isNumber({ coerce: true });
62
71
  const toString = vg.isString({ coerce: true });
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "valgen",
3
3
  "description": "Fast runtime type validator, converter and io (encoding/decoding) library",
4
- "version": "5.19.0",
4
+ "version": "5.19.2",
5
5
  "author": "Panates",
6
6
  "license": "MIT",
7
7
  "dependencies": {
package/rules/type-rules/is-date.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { type ValidationOptions } from '../../core/index.js';
2
- type Precision = 'year' | 'yr' | 'month' | 'mo' | 'day' | 'd' | 'hours' | 'hr' | 'minutes' | 'min' | 'seconds' | 'sec' | 'milliseconds' | 'ms' | 'tz';
2
+ export type DatePrecision = 'year' | 'yr' | 'month' | 'mo' | 'day' | 'd' | 'hours' | 'hr' | 'minutes' | 'min' | 'seconds' | 'sec' | 'milliseconds' | 'ms' | 'tz';
3
3
  export interface IsDateOptions extends ValidationOptions {
4
- trim?: Precision;
4
+ trim?: DatePrecision;
5
5
  }
6
6
  /**
7
7
  * Validates if value is a "Date" instance or ISO 8601 formatted date string.
@@ -10,9 +10,9 @@ export interface IsDateOptions extends ValidationOptions {
10
10
  */
11
11
  export declare function isDate(options?: IsDateOptions): import("../../core/validator.js").Validator<Date, string | number | Date, import("../../core/types.js").ExecutionOptions>;
12
12
  export interface IsDateStringOptions extends ValidationOptions {
13
- precisionMin?: Precision;
14
- precisionMax?: Precision;
15
- trim?: Precision;
13
+ precisionMin?: DatePrecision;
14
+ precisionMax?: DatePrecision;
15
+ trim?: boolean;
16
16
  timeZone?: boolean | number;
17
17
  }
18
18
  /**
@@ -21,4 +21,3 @@ export interface IsDateStringOptions extends ValidationOptions {
21
21
  * @validator isDateString
22
22
  */
23
23
  export declare function isDateString(options?: IsDateStringOptions): import("../../core/validator.js").Validator<string, string | number | Date, import("../../core/types.js").ExecutionOptions>;
24
- export {};
package/rules/type-rules/is-date.js CHANGED
@@ -37,33 +37,32 @@ export function isDate(options) {
37
37
  * @validator isDateString
38
38
  */
39
39
  export function isDateString(options) {
40
- const trimIdx = PRECISION_INDEX[options?.trim || 'tz'] || 9;
41
- const precisionMin = options?.precisionMin || options?.trim || 'minutes';
40
+ const trim = options?.trim;
42
41
  const precisionMax = options?.precisionMax || 'tz';
43
- const precisionMaxIdx = PRECISION_INDEX[precisionMax] || 9;
44
- const precisionMinIdx = Math.min(trimIdx, precisionMaxIdx, PRECISION_INDEX[precisionMin] || 6);
42
+ const precisionMaxIdx = PRECISION_INDEX[precisionMax] || 8;
43
+ let precisionMin = options?.precisionMin || 'minutes';
44
+ const precisionMinIdx = Math.min(precisionMaxIdx, PRECISION_INDEX[precisionMin] || 6);
45
+ precisionMin = (PRECISION_INDEX_KEYS[PRECISION_INDEX_VALUES.indexOf(precisionMinIdx)] || precisionMin);
45
46
  return validator('isDateString', (input, context, _this) => {
46
47
  const coerce = options?.coerce ?? context.coerce;
47
- const parsed = coerceDateString(input, options?.trim);
48
+ const parsed = coerceDateString(input, trim ? precisionMax : undefined);
48
49
  if (parsed) {
49
- if (parsed.precision >= precisionMinIdx &&
50
- parsed.precision <= precisionMaxIdx) {
51
- return coerce ? parsed.value : input;
50
+ if (parsed.precision < precisionMinIdx) {
51
+ context.fail(_this, `Minimum date precision should be ${precisionMin}`, input, options);
52
+ }
53
+ if (parsed.precision > precisionMaxIdx) {
54
+ context.fail(_this, `Maximum date precision should be ${precisionMax}`, input, options);
52
55
  }
56
+ return coerce ? parsed.value : input;
53
57
  }
54
- context.fail(_this, `Value is not valid date string` +
55
- (options?.precisionMin || options?.precisionMax
56
- ? ` with required precision`
57
- : ''), input, {
58
- ...options,
59
- });
58
+ context.fail(_this, `Value "${input}" is not a valid date string`, input, options);
60
59
  }, options);
61
60
  }
62
61
  // noinspection RegExpUnnecessaryNonCapturingGroup
63
62
  const DATE_PATTERN = /^(\d{4})(?:-(0[0-9]|1[0-2]))?(?:-([0-2][0-9]|3[0-1]))?(?:[T ](?:([0-1][0-9]|2[0-4]):([0-5][0-9])(?::([0-5][0-9]))?(?:\.(\d{0,6}))?)?((?:[+-](0[0-9]|1[0-2])(?::(\d{2}))?)|Z)?)?$/;
64
63
  const DATE_PATTERN2 = /^(\d{4,14})(?:\.(\d{1,6}))?(?:(?:([+-])(0[0-9]|1[0-2])(\d{2})?)|Z)?$/;
65
- function coerceDateString(input, precision) {
66
- const precisionIndex = (precision ? PRECISION_INDEX[precision] : 9) || 9;
64
+ function coerceDateString(input, trimPrecision) {
65
+ const precisionIndex = (trimPrecision ? PRECISION_INDEX[trimPrecision] : 9) || 9;
67
66
  let dateParts;
68
67
  let detectedPrecision = 0;
69
68
  if (input instanceof Date || typeof input === 'number') {
@@ -114,8 +113,8 @@ function coerceDateString(input, precision) {
114
113
  }
115
114
  if (!dateParts)
116
115
  return;
117
- detectedPrecision = dateParts.findIndex(v => !v);
118
- if (detectedPrecision === -1)
116
+ detectedPrecision = dateParts[7] ? 8 : dateParts.findIndex(v => !v);
117
+ if (detectedPrecision < 0)
119
118
  detectedPrecision = Math.min(dateParts.length, 8);
120
119
  let value = dateParts[0] || '0000';
121
120
  if (precisionIndex > 1)
@@ -134,7 +133,7 @@ function coerceDateString(input, precision) {
134
133
  value += dateParts[7] || '';
135
134
  return {
136
135
  value,
137
- precision: detectedPrecision || 8,
136
+ precision: Math.min(precisionIndex, detectedPrecision),
138
137
  };
139
138
  }
140
139
  const PRECISION_INDEX = {
@@ -154,6 +153,8 @@ const PRECISION_INDEX = {
154
153
  ms: 7,
155
154
  tz: 8,
156
155
  };
156
+ const PRECISION_INDEX_KEYS = Object.keys(PRECISION_INDEX);
157
+ const PRECISION_INDEX_VALUES = Object.values(PRECISION_INDEX);
157
158
  function setPrecision(d, precision) {
158
159
  switch (precision) {
159
160
  case 'year': {