@dereekb/model 12.0.6 → 12.1.0

package/index.cjs.js

@@ -3584,7 +3584,7 @@ $({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign },
 });
 
 function transformAndValidateObject(config) {
-  const transformToResult = transformAndValidateObjectResult(config.classType, config.fn, config.optionsForContext);
+  const transformToResult = transformAndValidateObjectResult(config);
   const {
     handleValidationError
   } = config;
@@ -3611,14 +3611,16 @@ function transformAndValidateObject(config) {
 function transformAndValidateObjectFactory(defaults) {
   const {
     handleValidationError: defaultHandleValidationError,
-    optionsForContext
+    optionsForContext,
+    defaultValidationOptions
   } = defaults;
   return (classType, fn, handleValidationError) => {
     const config = {
       classType,
       fn,
       handleValidationError: handleValidationError != null ? handleValidationError : defaultHandleValidationError,
-      optionsForContext
+      optionsForContext,
+      defaultValidationOptions
     };
     return transformAndValidateObject(config);
   };
@@ -3630,7 +3632,13 @@ function transformAndValidateObjectFactory(defaults) {
  * @param fn
  * @returns
  */
-function transformAndValidateObjectResult(classType, fn, inputOptionsForContext) {
+function transformAndValidateObjectResult(config) {
+  const {
+    defaultValidationOptions,
+    classType,
+    fn,
+    optionsForContext: inputOptionsForContext
+  } = config;
   const optionsForContext = inputOptionsForContext != null ? inputOptionsForContext : () => ({});
   return async (input, context) => {
     const {
@@ -3641,7 +3649,9 @@ function transformAndValidateObjectResult(classType, fn, inputOptionsForContext)
       // Note: Each variable on the target class must be marked with the @Expose() annotation.
       excludeExtraneousValues: true
     }));
-    const validationErrors = await classValidator.validate(object, validateOptions);
+    const validationErrors = await classValidator.validate(object, Object.assign({
+      forbidUnknownValues: false
+    }, defaultValidationOptions, validateOptions));
     if (validationErrors.length) {
       return {
         object,

package/index.esm.js

@@ -3582,7 +3582,7 @@ $({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign },
 });
 
 function transformAndValidateObject(config) {
-  const transformToResult = transformAndValidateObjectResult(config.classType, config.fn, config.optionsForContext);
+  const transformToResult = transformAndValidateObjectResult(config);
   const {
     handleValidationError
   } = config;
@@ -3609,14 +3609,16 @@ function transformAndValidateObject(config) {
 function transformAndValidateObjectFactory(defaults) {
   const {
     handleValidationError: defaultHandleValidationError,
-    optionsForContext
+    optionsForContext,
+    defaultValidationOptions
   } = defaults;
   return (classType, fn, handleValidationError) => {
     const config = {
       classType,
       fn,
       handleValidationError: handleValidationError != null ? handleValidationError : defaultHandleValidationError,
-      optionsForContext
+      optionsForContext,
+      defaultValidationOptions
     };
     return transformAndValidateObject(config);
   };
@@ -3628,7 +3630,13 @@ function transformAndValidateObjectFactory(defaults) {
  * @param fn
  * @returns
  */
-function transformAndValidateObjectResult(classType, fn, inputOptionsForContext) {
+function transformAndValidateObjectResult(config) {
+  const {
+    defaultValidationOptions,
+    classType,
+    fn,
+    optionsForContext: inputOptionsForContext
+  } = config;
   const optionsForContext = inputOptionsForContext != null ? inputOptionsForContext : () => ({});
   return async (input, context) => {
     const {
@@ -3639,7 +3647,9 @@ function transformAndValidateObjectResult(classType, fn, inputOptionsForContext)
       // Note: Each variable on the target class must be marked with the @Expose() annotation.
       excludeExtraneousValues: true
     }));
-    const validationErrors = await validate(object, validateOptions);
+    const validationErrors = await validate(object, Object.assign({
+      forbidUnknownValues: false
+    }, defaultValidationOptions, validateOptions));
     if (validationErrors.length) {
       return {
         object,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/model",
-  "version": "12.0.6",
+  "version": "12.1.0",
   "exports": {
     ".": {
       "types": "./src/index.d.ts",

package/src/lib/transform/transform.d.ts

@@ -1,28 +1,24 @@
-import { type ClassType } from '@dereekb/util';
+import { Maybe, type ClassType } from '@dereekb/util';
 import { type ClassTransformOptions } from 'class-transformer';
-import { type ValidationError, type ValidationOptions } from 'class-validator';
+import { type ValidationError, type ValidatorOptions } from 'class-validator';
 export interface TransformAndValidateObjectOutput<T, O> {
-    object: T;
-    result: O;
+    readonly object: T;
+    readonly result: O;
 }
 export type TransformAndValidateObjectFunction<T, O, I extends object = object, C = unknown> = (input: I, context?: C) => Promise<TransformAndValidateObjectOutput<T, O>>;
 export type TransformAndValidateObjectHandleValidate<O = unknown> = (validationErrors: ValidationError[]) => Promise<O>;
 /**
  * transformAndValidateObject() configuration that also provides error handling.
  */
-export interface TransformAndValidateObject<T extends object, O, C = unknown> {
-    readonly classType: ClassType<T>;
-    readonly fn: (parsed: T) => Promise<O>;
+export interface TransformAndValidateObject<T extends object, O, C = unknown> extends TransformAndValidateObjectResultFunctionConfig<T, O, C> {
     readonly handleValidationError: TransformAndValidateObjectHandleValidate<O>;
-    readonly optionsForContext?: TransformAndValidateObjectResultContextOptionsFunction<C>;
 }
 export declare function transformAndValidateObject<T extends object, O, I extends object = object, C = unknown>(config: TransformAndValidateObject<T, O, C>): TransformAndValidateObjectFunction<T, O, I, C>;
 /**
  * Configuration for the transformAndValidateObject function from transformAndValidateObjectFactory().
  */
-export interface TransformAndValidateObjectFactoryDefaults<C> {
+export interface TransformAndValidateObjectFactoryDefaults<C> extends Pick<TransformAndValidateObjectResultFunctionConfig<any, any, C>, 'defaultValidationOptions' | 'optionsForContext'> {
     readonly handleValidationError: TransformAndValidateObjectHandleValidate<unknown>;
-    readonly optionsForContext?: TransformAndValidateObjectResultContextOptionsFunction<C>;
 }
 /**
  * Factory for generating TransformAndValidateObjectFunction functions.
@@ -37,8 +33,8 @@ export type TransformAndValidateObjectFactory<C = unknown> = <T extends object,
 export declare function transformAndValidateObjectFactory<C = unknown>(defaults: TransformAndValidateObjectFactoryDefaults<C>): TransformAndValidateObjectFactory<C>;
 export type TransformAndValidateObjectResultFunction<T, O, I extends object = object, C = unknown> = (input: I, context?: C) => Promise<TransformAndValidateObjectResultOutput<T, O>>;
 export interface TransformAndValidateObjectResultTransformContextOptions {
-    transform?: ClassTransformOptions;
-    validate?: ValidationOptions;
+    readonly transform?: ClassTransformOptions;
+    readonly validate?: ValidatorOptions;
 }
 export type TransformAndValidateObjectResultContextOptionsFunction<C> = (context?: C) => TransformAndValidateObjectResultTransformContextOptions;
 export type TransformAndValidateObjectResultOutput<T, O> = TransformAndValidateObjectSuccessResultOutput<T, O> | TransformAndValidateObjectErrorResultOutput<T>;
@@ -52,6 +48,12 @@ export interface TransformAndValidateObjectErrorResultOutput<T> {
     readonly object: T;
     readonly validationErrors: ValidationError[];
 }
+export interface TransformAndValidateObjectResultFunctionConfig<T extends object, O, C = unknown, I extends object = object> {
+    readonly defaultValidationOptions?: Maybe<ValidatorOptions>;
+    readonly classType: ClassType<T>;
+    readonly fn: (parsed: T) => Promise<O>;
+    readonly optionsForContext?: TransformAndValidateObjectResultContextOptionsFunction<C>;
+}
 /**
  * Factory function that wraps the input class type and handler function to first transform the input object to a the given class, and then validate it.
  *
@@ -59,4 +61,4 @@ export interface TransformAndValidateObjectErrorResultOutput<T> {
  * @param fn
  * @returns
  */
-export declare function transformAndValidateObjectResult<T extends object, O, I extends object = object, C = unknown>(classType: ClassType<T>, fn: (parsed: T) => Promise<O>, inputOptionsForContext?: TransformAndValidateObjectResultContextOptionsFunction<C>): TransformAndValidateObjectResultFunction<T, O, I, C>;
+export declare function transformAndValidateObjectResult<T extends object, O, I extends object = object, C = unknown>(config: TransformAndValidateObjectResultFunctionConfig<T, O, C, I>): TransformAndValidateObjectResultFunction<T, O, I, C>;