fix: Null value throwing type error

Unnoen · Oct 15, 2023 · 2554348 · 2554348
1 parent b22842c
commit 2554348
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "packageManager": "yarn@3.6.4",
   "name": "@unnoen/untypedjson",
   "description": "A simple JSON deserializer and serializer for Node.js and the browser using TypeScript decorators.",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "type": "module",
   "license": "MIT",
   "author": "Unnoen",

diff --git a/src/features.ts b/src/features.ts
@@ -54,7 +54,7 @@ const verifyType = (propertyKey: string, properties: IJsonPropertyMetadata, json
         type,
     } = properties;
 
-    if (typeof json[jsonProperty] === 'undefined' && nullabilityMode === (PropertyNullability.IGNORE || PropertyNullability.PASS)) {
+    if ((typeof json[jsonProperty] === 'undefined' || json[jsonProperty] === null) && nullabilityMode === (PropertyNullability.IGNORE || PropertyNullability.PASS)) {
         return;
     }
 
@@ -109,7 +109,7 @@ const verifyType = (propertyKey: string, properties: IJsonPropertyMetadata, json
  * @param {boolean} serialize Whether to serialize or deserialize.
  * @returns {void}
  */
-const mapObjectProperty = (propertyKey: string, properties: IJsonPropertyMetadata, fromObject: any, toObject: any, serialize = false): void => {
+const mapObjectProperty = (propertyKey: string, properties: IJsonPropertyMetadata, fromObject: any, toObject: any, serialize: boolean = false): void => {
     const {
         jsonProperty,
         array,
@@ -216,7 +216,7 @@ export const DeserializeObject = <T>(json: object | string, classReference: new(
  * @returns {object} The serialized JSON object.
  */
 export const SerializeObject = <T>(instance: T): object => {
-    const json: any = {};
+    const json: object = {};
 
     let classConstructor = instance.constructor;
 

diff --git a/test/main.test.ts b/test/main.test.ts
@@ -382,7 +382,7 @@ describe('JsonProperty Nullability Tests', () => {
         expect(() => {
             return DeserializeObject({
                 int: 1,
-                test: 'test',
+                test: null,
             }, TestClass);
         }).not.toThrow();
     });