valgen 4.0.0-alpha.2 → 4.0.0-alpha.4

package/cjs/rules/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./is-any.js"), exports);
 __exportStar(require("./is-array.js"), exports);
+__exportStar(require("./is-bigint.js"), exports);
 __exportStar(require("./is-boolean.js"), exports);
 __exportStar(require("./is-date.js"), exports);
 __exportStar(require("./is-empty.js"), exports);

package/cjs/rules/is-bigint.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isBigint = void 0;
+const index_js_1 = require("../core/index.js");
+/**
+ * Validates if value is "BigInt".
+ * Converts input value to number if coerce option is set to 'true'.
+ * @validator isNumber
+ */
+function isBigint(options) {
+    return (0, index_js_1.validator)('isBigint', function (input, context) {
+        if (input != null && typeof input !== 'bigint' && context.coerce) {
+            if (typeof input === 'string' || typeof input === 'number')
+                input = BigInt(input);
+        }
+        if (typeof input === 'bigint')
+            return input;
+        context.failure(`{{label}} is not a valid BigInt`);
+    }, options);
+}
+exports.isBigint = isBigint;

package/cjs/rules/is-date.js

@@ -43,16 +43,21 @@ exports.isDate = isDate;
  * @validator isDateString
  */
 function isDateString(options) {
+    const inputFormat = options?.format;
+    const coerceFormat = Array.isArray(options?.format) ? options?.format[0] : options?.format;
     return (0, index_js_1.validator)('isDateString', function (input, context) {
-        if (input && typeof input !== 'string' && context.coerce) {
+        if (input instanceof Date) {
             const d = (0, dayjs_1.default)(input);
             if (d.isValid())
-                return options?.format ? d.format(options?.format) : d.toISOString();
+                return coerceFormat ? d.format(coerceFormat) : d.toISOString();
         }
-        if (typeof input === 'string') {
-            const d = (0, dayjs_1.default)(input, options?.format);
-            if (d.isValid())
+        else if (typeof input === 'string') {
+            const d = (0, dayjs_1.default)(input, inputFormat);
+            if (d.isValid()) {
+                if (context.coerce && options?.format)
+                    return coerceFormat ? d.format(coerceFormat) : d.toISOString();
                 return input;
+            }
         }
         context.failure({
             message: `{{label}} is not a valid date formatted${options?.format ? " (" + options.format + ")" : ''} string`,

package/cjs/rules/is-number.js

@@ -20,7 +20,7 @@ function isNumber(options) {
         }
         if (typeof input === 'number' && !isNaN(input))
             return input;
-        context.failure(`{{label}} not a valid number`);
+        context.failure(`{{label}} is not a valid number`);
     }, options);
 }
 exports.isNumber = isNumber;

package/cjs/rules/is-object.js

@@ -13,13 +13,6 @@ function isObject(schema, options) {
     const additionalFields = options?.additionalFields ?? false;
     const caseInSensitive = !!options?.caseInSensitive;
     const detectCircular = !!options?.detectCircular;
-    if (options) {
-        delete options.name;
-        delete options.ctor;
-        delete options.additionalFields;
-        delete options.caseInSensitive;
-        delete options.detectCircular;
-    }
     const propertyRules = {};
     const propertyOptions = {};
     Object.keys(schema).forEach(k => {
@@ -38,21 +31,12 @@ function isObject(schema, options) {
         else
             throw new TypeError(`Invalid definition in validation schema (${k})`);
     });
-    const schemaKeys = Object.keys(propertyRules);
     const _rule = (0, index_js_1.validator)('isObject', function (input, context) {
         if (!(input && typeof input === 'object')) {
             context.failure(`{{label}} must be an object`);
             return;
         }
-        const keyMap = [...Object.keys(input), ...schemaKeys]
-            .reduce((a, k) => {
-            if (caseInSensitive)
-                a[k.toLowerCase()] = k;
-            else
-                a[k] = k;
-            return a;
-        }, {});
-        const keys = Object.keys(keyMap);
+        const keys = [...Object.keys(input), ...Object.keys(schema)];
         const l = keys.length;
         let i = 0;
         let inputKey;
@@ -70,14 +54,18 @@ function isObject(schema, options) {
         }
         const rootName = context.root?.input.context;
         const location = context.input.location || '';
+        const processedSchemaKeys = {};
         // Iterate object keys and perform rules
         for (i = 0; i < l; i++) {
             inputKey = keys[i];
-            schemaKey = keyMap[inputKey];
+            schemaKey = caseInSensitive ? inputKey.toLowerCase() : inputKey;
             v = input[inputKey];
             _propRule = propertyRules[schemaKey] ||
                 ((0, index_js_1.isValidator)(additionalFields) ? additionalFields : undefined);
             if (_propRule) {
+                if (processedSchemaKeys[schemaKey])
+                    continue;
+                processedSchemaKeys[schemaKey] = true;
                 const subCtx = context.extend(_propRule);
                 if (ctorName) {
                     if (rootName && rootName !== ctorName)
@@ -90,8 +78,12 @@ function isObject(schema, options) {
                 subCtx.input.property = schemaKey;
                 v = _propRule[index_js_1.kValidatorFn](v, subCtx, _propRule);
             }
-            else if (v !== undefined && !additionalFields)
-                context.failure(`${ctorName || 'Object'} does not accept additional fields`);
+            else if (v !== undefined) {
+                if (additionalFields === 'ignore')
+                    continue;
+                if (!additionalFields)
+                    context.failure(`${ctorName || 'Object'} has no field '${inputKey}' and does not accept additional fields`);
+            }
             if (v !== undefined)
                 out[propertyOptions[schemaKey]?.as || schemaKey] = v;
         }

package/esm/rules/index.js

@@ -1,5 +1,6 @@
 export * from './is-any.js';
 export * from './is-array.js';
+export * from './is-bigint.js';
 export * from './is-boolean.js';
 export * from './is-date.js';
 export * from './is-empty.js';

package/esm/rules/is-bigint.js

@@ -0,0 +1,17 @@
+import { validator } from '../core/index.js';
+/**
+ * Validates if value is "BigInt".
+ * Converts input value to number if coerce option is set to 'true'.
+ * @validator isNumber
+ */
+export function isBigint(options) {
+    return validator('isBigint', function (input, context) {
+        if (input != null && typeof input !== 'bigint' && context.coerce) {
+            if (typeof input === 'string' || typeof input === 'number')
+                input = BigInt(input);
+        }
+        if (typeof input === 'bigint')
+            return input;
+        context.failure(`{{label}} is not a valid BigInt`);
+    }, options);
+}

package/esm/rules/is-date.js

@@ -36,16 +36,21 @@ export function isDate(options) {
  * @validator isDateString
  */
 export function isDateString(options) {
+    const inputFormat = options?.format;
+    const coerceFormat = Array.isArray(options?.format) ? options?.format[0] : options?.format;
     return validator('isDateString', function (input, context) {
-        if (input && typeof input !== 'string' && context.coerce) {
+        if (input instanceof Date) {
             const d = dayjs(input);
             if (d.isValid())
-                return options?.format ? d.format(options?.format) : d.toISOString();
+                return coerceFormat ? d.format(coerceFormat) : d.toISOString();
         }
-        if (typeof input === 'string') {
-            const d = dayjs(input, options?.format);
-            if (d.isValid())
+        else if (typeof input === 'string') {
+            const d = dayjs(input, inputFormat);
+            if (d.isValid()) {
+                if (context.coerce && options?.format)
+                    return coerceFormat ? d.format(coerceFormat) : d.toISOString();
                 return input;
+            }
         }
         context.failure({
             message: `{{label}} is not a valid date formatted${options?.format ? " (" + options.format + ")" : ''} string`,

package/esm/rules/is-number.js

@@ -17,6 +17,6 @@ export function isNumber(options) {
         }
         if (typeof input === 'number' && !isNaN(input))
             return input;
-        context.failure(`{{label}} not a valid number`);
+        context.failure(`{{label}} is not a valid number`);
     }, options);
 }

package/esm/rules/is-object.js

@@ -10,13 +10,6 @@ export function isObject(schema, options) {
     const additionalFields = options?.additionalFields ?? false;
     const caseInSensitive = !!options?.caseInSensitive;
     const detectCircular = !!options?.detectCircular;
-    if (options) {
-        delete options.name;
-        delete options.ctor;
-        delete options.additionalFields;
-        delete options.caseInSensitive;
-        delete options.detectCircular;
-    }
     const propertyRules = {};
     const propertyOptions = {};
     Object.keys(schema).forEach(k => {
@@ -35,21 +28,12 @@ export function isObject(schema, options) {
         else
             throw new TypeError(`Invalid definition in validation schema (${k})`);
     });
-    const schemaKeys = Object.keys(propertyRules);
     const _rule = validator('isObject', function (input, context) {
         if (!(input && typeof input === 'object')) {
             context.failure(`{{label}} must be an object`);
             return;
         }
-        const keyMap = [...Object.keys(input), ...schemaKeys]
-            .reduce((a, k) => {
-            if (caseInSensitive)
-                a[k.toLowerCase()] = k;
-            else
-                a[k] = k;
-            return a;
-        }, {});
-        const keys = Object.keys(keyMap);
+        const keys = [...Object.keys(input), ...Object.keys(schema)];
         const l = keys.length;
         let i = 0;
         let inputKey;
@@ -67,14 +51,18 @@ export function isObject(schema, options) {
         }
         const rootName = context.root?.input.context;
         const location = context.input.location || '';
+        const processedSchemaKeys = {};
         // Iterate object keys and perform rules
         for (i = 0; i < l; i++) {
             inputKey = keys[i];
-            schemaKey = keyMap[inputKey];
+            schemaKey = caseInSensitive ? inputKey.toLowerCase() : inputKey;
             v = input[inputKey];
             _propRule = propertyRules[schemaKey] ||
                 (isValidator(additionalFields) ? additionalFields : undefined);
             if (_propRule) {
+                if (processedSchemaKeys[schemaKey])
+                    continue;
+                processedSchemaKeys[schemaKey] = true;
                 const subCtx = context.extend(_propRule);
                 if (ctorName) {
                     if (rootName && rootName !== ctorName)
@@ -87,8 +75,12 @@ export function isObject(schema, options) {
                 subCtx.input.property = schemaKey;
                 v = _propRule[kValidatorFn](v, subCtx, _propRule);
             }
-            else if (v !== undefined && !additionalFields)
-                context.failure(`${ctorName || 'Object'} does not accept additional fields`);
+            else if (v !== undefined) {
+                if (additionalFields === 'ignore')
+                    continue;
+                if (!additionalFields)
+                    context.failure(`${ctorName || 'Object'} has no field '${inputKey}' and does not accept additional fields`);
+            }
             if (v !== undefined)
                 out[propertyOptions[schemaKey]?.as || schemaKey] = v;
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valgen",
   "description": "Fast runtime type validator, converter and io (encoding/decoding) library",
-  "version": "4.0.0-alpha.2",
+  "version": "4.0.0-alpha.4",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>"

package/typings/rules/index.d.ts

@@ -1,5 +1,6 @@
 export * from './is-any.js';
 export * from './is-array.js';
+export * from './is-bigint.js';
 export * from './is-boolean.js';
 export * from './is-date.js';
 export * from './is-empty.js';

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

@@ -0,0 +1,7 @@
+import { ValidationOptions } from '../core/index.js';
+/**
+ * Validates if value is "BigInt".
+ * Converts input value to number if coerce option is set to 'true'.
+ * @validator isNumber
+ */
+export declare function isBigint(options?: ValidationOptions): import("../core/validator.js").Validator<bigint, unknown, import("../core/types.js").ExecutionOptions>;

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

@@ -9,7 +9,7 @@ export interface IsDateOptions extends ValidationOptions {
  */
 export declare function isDate(options?: IsDateOptions): import("../core/validator.js").Validator<Date, string | number | Date, import("../core/types.js").ExecutionOptions>;
 export interface IsDateStringOptions extends ValidationOptions {
-    format?: string;
+    format?: string | string[];
 }
 /**
  * Validates if value is DFS (date formatted string).

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

@@ -7,7 +7,7 @@ export type ObjectSchema = Record<string | number, Validator<any, any> | [Valida
 export interface IsObjectOptions<T> extends ValidationOptions {
     name?: string;
     ctor?: Type<T>;
-    additionalFields?: boolean | Validator<any, any>;
+    additionalFields?: boolean | Validator<any, any> | 'ignore';
     caseInSensitive?: boolean;
     detectCircular?: boolean;
 }