fork: Make isOptional behaviour more strict

Author: brhx

README.md

@@ -3,7 +3,9 @@
 [![Build Status](https://travis-ci.org/typestack/class-validator.svg?branch=master)](https://travis-ci.org/typestack/class-validator)
 [![npm version](https://badge.fury.io/js/class-validator.svg)](https://badge.fury.io/js/class-validator)
 [![install size](https://packagephobia.now.sh/badge?p=class-validator)](https://packagephobia.now.sh/result?p=class-validator)
-[![Join the chat at https://gitter.im/typestack/class-validator](https://badges.gitter.im/typestack/class-validator.svg)](https://gitter.im/typestack/class-validator?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) 
+[![Join the chat at https://gitter.im/typestack/class-validator](https://badges.gitter.im/typestack/class-validator.svg)](https://gitter.im/typestack/class-validator?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+> ⚠️ This is a fork of the original `class-validator` package. It adds a validation property specifically to the `isOptional()` decorator called `nullable`, defaulting to `true` if not supplied (the original behaviour), and if set to `false` will not allow `null` values to be treated as empty.
 
 Allows use of decorator and non-decorator based validation.
 Internally uses [validator.js][1] to perform validation.

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "class-validator",
+  "name": "@socialenergy/class-validator",
   "private": true,
   "version": "0.12.2",
   "description": "Class-based validation with Typescript / ES6 / ES5 using decorators or validation schemas. Supports both node.js and browser",

package.json

@@ -4,20 +4,38 @@ import { ValidationTypes } from "../../validation/ValidationTypes";
 import { ValidationMetadata } from "../../metadata/ValidationMetadata";
 import { getMetadataStorage } from "../../metadata/MetadataStorage";
 
+interface IsOptionalValidationOptions extends ValidationOptions {
+    /**
+     * If true, both `undefined` and `null` will be allowed inputs. If `false`,
+     * only `undefined` will be an allowed input. Defaults to true.
+     */
+    nullable?: boolean;
+}
+
 /**
  * Checks if value is missing and if so, ignores all validators.
  */
-export function IsOptional(validationOptions?: ValidationOptions): PropertyDecorator {
+export function IsOptional(
+    validationOptions?: IsOptionalValidationOptions
+): PropertyDecorator {
+    validationOptions = { nullable: true, ...validationOptions };
+
     return function (object: Object, propertyName: string) {
         const args: ValidationMetadataArgs = {
             type: ValidationTypes.CONDITIONAL_VALIDATION,
             target: object.constructor,
             propertyName: propertyName,
-            constraints: [(object: any, value: any) => {
-                return object[propertyName] !== null && object[propertyName] !== undefined;
-            }],
-            validationOptions: validationOptions
+            constraints: [
+                (object: any, value: any) =>
+                    validationOptions.nullable
+                        ? value !== undefined && value !== null
+                        : object.hasOwnProperty(propertyName),
+            ],
+            validationOptions: validationOptions,
         };
-        getMetadataStorage().addValidationMetadata(new ValidationMetadata(args));
+
+        getMetadataStorage().addValidationMetadata(
+            new ValidationMetadata(args)
+        );
     };
 }