valgen 5.0.1 → 5.2.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# v5.2.0
+[2024-01-04]
+
+### Changes
+
+* Now validator options persist in context ([`418901f`](https://github.com/panates/valgen/commit/418901f74ee266d84e50ee82ba5a7221bd2be627))
+
+# v5.1.0
+[2023-12-23]
+
+### Changes
+
+* Moved from "dayjs" to "date-fns" ([`fd240af`](https://github.com/panates/valgen/commit/fd240afe3cdbb7485695d204aa25b9bf62ad315a))
+
 # v5.0.1
 [2023-12-23]
 

package/cjs/core/context.js

@@ -9,14 +9,7 @@ const OPTIONAL_VAR_PATTERN = /^([^?]+)(?:\||(.*))?$/;
 class Context {
     constructor(options) {
         this.errors = [];
-        if (options?.maxErrors != null)
-            this.maxErrors = options.maxErrors;
-        if (typeof options?.onFail === 'function')
-            this.onFail = options.onFail;
-        if (options?.coerce != null)
-            this.coerce = options?.coerce;
-        if (options?.label != null)
-            this.label = options?.label;
+        Object.assign(this, options);
     }
     fail(rule, message, value, details) {
         const issue = (0, omit_undefined_js_1.omitUndefined)({

package/cjs/rules/is-date.js

@@ -1,13 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isDateString = exports.isDate = void 0;
-const dayjs_1 = __importDefault(require("dayjs"));
-const customParseFormat_1 = __importDefault(require("dayjs/plugin/customParseFormat"));
+const date_fns_1 = require("date-fns");
 const index_js_1 = require("../core/index.js");
-dayjs_1.default.extend(customParseFormat_1.default);
 /* eslint-disable-next-line max-len */ // noinspection RegExpUnnecessaryNonCapturingGroup
 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,3}))?)?((?:[+-](0[0-9]|1[0-2])(?::(\d{2}))?)|Z)?)?$/;
 /**
@@ -18,27 +13,28 @@ const DATE_PATTERN = /^(\d{4})(?:-(0[0-9]|1[0-2]))?(?:-([0-2][0-9]|3[0-1]))?(?:[
 function isDate(options) {
     const precision = options?.precision;
     return (0, index_js_1.validator)('isDate', function (input, context, _this) {
-        if (input != null && !(input instanceof Date) && context.coerce) {
+        let d;
+        if (input instanceof Date)
+            d = input;
+        else if (input != null && context.coerce) {
             if (typeof input === 'string' && context.coerce) {
-                const d = (0, dayjs_1.default)(input);
-                if (d.isValid())
-                    input = d.toDate();
+                d = (0, date_fns_1.parseISO)(input);
             }
             else if (typeof input === 'number')
-                input = new Date(input);
+                d = new Date(input);
         }
-        if (input && input instanceof Date && !isNaN(input.getTime())) {
+        if (d && !isNaN(d.getTime())) {
             if (precision === 'year') {
-                input.setHours(0, 0, 0, 0);
-                input.setMonth(0, 1);
+                d.setHours(0, 0, 0, 0);
+                d.setMonth(0, 1);
             }
             if (precision === 'month') {
-                input.setHours(0, 0, 0, 0);
-                input.setDate(1);
+                d.setHours(0, 0, 0, 0);
+                d.setDate(1);
             }
             if (precision === 'date')
-                input.setHours(0, 0, 0, 0);
-            return input;
+                d.setHours(0, 0, 0, 0);
+            return d;
         }
         context.fail(_this, `{{label}} must be a Date instance or a date string`, input);
     }, options);
@@ -54,10 +50,10 @@ function isDateString(options) {
     const trim = options?.trim;
     return (0, index_js_1.validator)('isDateString', function (input, context, _this) {
         if (typeof input === 'string') {
-            const d = (0, dayjs_1.default)(input);
-            if (d.isValid()) {
-                const m = DATE_PATTERN.exec(input);
-                if (m) {
+            const m = DATE_PATTERN.exec(input);
+            if (m) {
+                const d = (0, date_fns_1.parseISO)(input);
+                if (d && !isNaN(d.getTime())) {
                     if (!precision ||
                         precision === 'year' ||
                         (precision === 'month' && m[2]) ||
@@ -76,7 +72,7 @@ function isDateString(options) {
                             return s;
                         if (trim === 'date' || !m[4])
                             return s;
-                        s += 'T' + m[4];
+                        s += 'T' + m[4].substring(0, 8);
                         if (trim === 'time')
                             return s;
                         if (m[9])
@@ -86,13 +82,10 @@ function isDateString(options) {
                 }
             }
         }
-        else if (input != null) {
-            const d = (0, dayjs_1.default)(input);
-            if (d.isValid()) {
-                if (trim === 'date')
-                    return d.format('YYYY-MM-DD');
-                return d.millisecond() ? d.format('YYYY-MM-DDTHH:mm:ss.SSS') : d.format('YYYY-MM-DDTHH:mm:ss');
-            }
+        else if (input instanceof Date) {
+            return trim === 'date'
+                ? (0, date_fns_1.formatISO)(input, { representation: 'date' })
+                : (0, date_fns_1.formatISO)(input).substring(0, 19);
         }
         context.fail(_this, `{{label}} is not a valid date string`, input, { ...options });
     }, options);

package/esm/core/context.js

@@ -6,14 +6,7 @@ const OPTIONAL_VAR_PATTERN = /^([^?]+)(?:\||(.*))?$/;
 export class Context {
     constructor(options) {
         this.errors = [];
-        if (options?.maxErrors != null)
-            this.maxErrors = options.maxErrors;
-        if (typeof options?.onFail === 'function')
-            this.onFail = options.onFail;
-        if (options?.coerce != null)
-            this.coerce = options?.coerce;
-        if (options?.label != null)
-            this.label = options?.label;
+        Object.assign(this, options);
     }
     fail(rule, message, value, details) {
         const issue = omitUndefined({

package/esm/rules/is-date.js

@@ -1,7 +1,5 @@
-import dayjs from 'dayjs';
-import customParseFormat from 'dayjs/plugin/customParseFormat';
+import { formatISO, parseISO } from 'date-fns';
 import { validator } from '../core/index.js';
-dayjs.extend(customParseFormat);
 /* eslint-disable-next-line max-len */ // noinspection RegExpUnnecessaryNonCapturingGroup
 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,3}))?)?((?:[+-](0[0-9]|1[0-2])(?::(\d{2}))?)|Z)?)?$/;
 /**
@@ -12,27 +10,28 @@ const DATE_PATTERN = /^(\d{4})(?:-(0[0-9]|1[0-2]))?(?:-([0-2][0-9]|3[0-1]))?(?:[
 export function isDate(options) {
     const precision = options?.precision;
     return validator('isDate', function (input, context, _this) {
-        if (input != null && !(input instanceof Date) && context.coerce) {
+        let d;
+        if (input instanceof Date)
+            d = input;
+        else if (input != null && context.coerce) {
             if (typeof input === 'string' && context.coerce) {
-                const d = dayjs(input);
-                if (d.isValid())
-                    input = d.toDate();
+                d = parseISO(input);
             }
             else if (typeof input === 'number')
-                input = new Date(input);
+                d = new Date(input);
         }
-        if (input && input instanceof Date && !isNaN(input.getTime())) {
+        if (d && !isNaN(d.getTime())) {
             if (precision === 'year') {
-                input.setHours(0, 0, 0, 0);
-                input.setMonth(0, 1);
+                d.setHours(0, 0, 0, 0);
+                d.setMonth(0, 1);
             }
             if (precision === 'month') {
-                input.setHours(0, 0, 0, 0);
-                input.setDate(1);
+                d.setHours(0, 0, 0, 0);
+                d.setDate(1);
             }
             if (precision === 'date')
-                input.setHours(0, 0, 0, 0);
-            return input;
+                d.setHours(0, 0, 0, 0);
+            return d;
         }
         context.fail(_this, `{{label}} must be a Date instance or a date string`, input);
     }, options);
@@ -47,10 +46,10 @@ export function isDateString(options) {
     const trim = options?.trim;
     return validator('isDateString', function (input, context, _this) {
         if (typeof input === 'string') {
-            const d = dayjs(input);
-            if (d.isValid()) {
-                const m = DATE_PATTERN.exec(input);
-                if (m) {
+            const m = DATE_PATTERN.exec(input);
+            if (m) {
+                const d = parseISO(input);
+                if (d && !isNaN(d.getTime())) {
                     if (!precision ||
                         precision === 'year' ||
                         (precision === 'month' && m[2]) ||
@@ -69,7 +68,7 @@ export function isDateString(options) {
                             return s;
                         if (trim === 'date' || !m[4])
                             return s;
-                        s += 'T' + m[4];
+                        s += 'T' + m[4].substring(0, 8);
                         if (trim === 'time')
                             return s;
                         if (m[9])
@@ -79,13 +78,10 @@ export function isDateString(options) {
                 }
             }
         }
-        else if (input != null) {
-            const d = dayjs(input);
-            if (d.isValid()) {
-                if (trim === 'date')
-                    return d.format('YYYY-MM-DD');
-                return d.millisecond() ? d.format('YYYY-MM-DDTHH:mm:ss.SSS') : d.format('YYYY-MM-DDTHH:mm:ss');
-            }
+        else if (input instanceof Date) {
+            return trim === 'date'
+                ? formatISO(input, { representation: 'date' })
+                : formatISO(input).substring(0, 19);
         }
         context.fail(_this, `{{label}} is not a valid date string`, input, { ...options });
     }, options);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valgen",
   "description": "Fast runtime type validator, converter and io (encoding/decoding) library",
-  "version": "5.0.1",
+  "version": "5.2.0",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>"
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@types/validator": "^13.11.7",
-    "dayjs": "^2.0.0-alpha.4",
+    "date-fns": "^3.0.6",
     "ts-gems": "^3.1.0",
     "validator": "^13.11.0"
   },

package/typings/core/context.d.ts

@@ -12,6 +12,7 @@ export declare class Context implements ExecutionOptions {
     property?: string;
     index?: number;
     label?: string;
+    [key: string]: any;
     constructor(options?: ExecutionOptions);
     fail(rule: Validator, message: string | Error, value: any, details?: Record<string, any>): void;
     extend(options?: ExecutionOptions): Context;

package/typings/core/types.d.ts

@@ -19,4 +19,5 @@ export interface ExecutionOptions extends ValidationOptions {
     coerce?: boolean;
     maxErrors?: number;
     label?: string;
+    [key: string]: any;
 }

package/typings/core/validator.d.ts

@@ -15,4 +15,4 @@ export interface Validator<T = any, I = any, O extends ExecutionOptions = Execut
 }
 export declare function validator<T, I = T, O extends ExecutionOptions = ExecutionOptions>(fn: ValidateFunction<T, I>, validatorOptions?: ValidationOptions): Validator<T, I, O>;
 export declare function validator<T, I = T, O extends ExecutionOptions = ExecutionOptions>(id: string, fn: ValidateFunction<T, I>, validatorOptions?: ValidationOptions): Validator<T, I, O>;
-export declare function isValidator(x: any): x is Validator<any, any>;
+export declare function isValidator(x: any): x is Validator;

package/typings/rules/is-tuple.d.ts

@@ -23,5 +23,5 @@ export declare function isTuple<T1, I1, T2, I2, T3, I3, T4, I4, T5, I5, T6, I6>(
     Validator<T4, I4>,
     Validator<T5, I5>,
     Validator<T6, I6>,
-    ...Validator<any, any>[]
+    ...Validator[]
 ], options?: ValidationOptions): Validator<[T1, T2, T3, T4, T5, T6, ...any[]], [I1, I2, I3, I4, I5, I5, ...any[]]>;

package/typings/rules/pipe.d.ts

@@ -3,9 +3,9 @@ import { Validator } from '../core/index.js';
  *
  * @validator pipe
  */
-export declare function pipe<T>(...rules: [...Validator<any, any>[], Validator<T, any>]): Validator<T, any, import("../core/types.js").ExecutionOptions>;
+export declare function pipe<T>(...rules: [...Validator[], Validator<T, any>]): Validator<T, any, import("../core/types.js").ExecutionOptions>;
 /**
  * Test given value against to all codecs and returns original input
  * @validator allOf
  */
-export declare function allOf(...rules: Validator<any, any>[]): Validator<any, any, import("../core/types.js").ExecutionOptions>;
+export declare function allOf(...rules: Validator[]): Validator<any, any, import("../core/types.js").ExecutionOptions>;