From e4615d12bfe74523b00185cf616a226cf94e303c Mon Sep 17 00:00:00 2001 From: bobzel Date: Fri, 26 Feb 2021 16:50:45 -0500 Subject: reverting back some parts of the fix to serialization --- src/client/util/SerializationHelper.ts | 6 +++--- src/server/database.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/client/util/SerializationHelper.ts b/src/client/util/SerializationHelper.ts index 4c3b3f096..d109cb497 100644 --- a/src/client/util/SerializationHelper.ts +++ b/src/client/util/SerializationHelper.ts @@ -22,12 +22,12 @@ export namespace SerializationHelper { return obj; } + serializing++; if (!(obj.constructor.name in reverseMap)) { - // throw Error( console.log("Error: " + `type '${obj.constructor.name}' not registered. Make sure you register it using a @Deserializable decorator`, obj); + throw Error("Error: " + `type '${obj.constructor.name}' not registered. Make sure you register it using a @Deserializable decorator`); return undefined; } - serializing++; const json = serialize(obj); json.__type = reverseMap[obj.constructor.name]; @@ -54,8 +54,8 @@ export namespace SerializationHelper { } if (!(obj.__type in serializationTypes)) { - // throw Error( console.log(`type '${obj.__type}' not registered. Make sure you register it using a @Deserializable decorator`); + throw Error(`type '${obj.__type}' not registered. Make sure you register it using a @Deserializable decorator`); return undefined; } diff --git a/src/server/database.ts b/src/server/database.ts index 8e0f99a1f..2a55c14de 100644 --- a/src/server/database.ts +++ b/src/server/database.ts @@ -163,7 +163,7 @@ export namespace Database { } public async insert(value: any, collectionName = DocumentsCollection) { - if (this.db && value) { + if (this.db && value !== null) { if ("id" in value) { value._id = value.id; delete value.id; @@ -185,7 +185,7 @@ export namespace Database { newProm = prom ? prom.then(run) : run(); this.currentWrites[id] = newProm; return newProm; - } else if (value) { + } else if (value !== null) { this.onConnect.push(() => this.insert(value, collectionName)); } } -- cgit v1.2.3-70-g09d2