Merge branch 'restoringEslint' into eleanor-starter

1 files changed, 18 insertions, 15 deletions

diff --git a/src/client/util/SerializationHelper.ts b/src/client/util/SerializationHelper.ts
index 8daa69890..d9d22437c 100644
--- a/src/client/util/SerializationHelper.ts
+++ b/src/client/util/SerializationHelper.ts
@@ -1,5 +1,5 @@
 import { PropSchema, serialize, deserialize, custom, setDefaultModelSchema, getDefaultModelSchema } from 'serializr';
-import { Field } from '../../fields/Doc';
+// import { Field } from '../../fields/Doc';
 
 let serializing = 0;
 export function afterDocDeserialize(cb: (err: any, val: any) => void, err: any, newValue: any) {
@@ -7,12 +7,16 @@ export function afterDocDeserialize(cb: (err: any, val: any) => void, err: any,
     cb(err, newValue);
     serializing--;
 }
+
+const serializationTypes: { [name: string]: { ctor: { new (): any }; afterDeserialize?: (obj: any) => void | Promise<any> } } = {};
+const reverseMap: { [ctor: string]: string } = {};
+
 export namespace SerializationHelper {
     export function IsSerializing() {
         return serializing > 0;
     }
 
-    export function Serialize(obj: Field): any {
+    export function Serialize(obj: any /* Field */): any {
         if (obj === undefined || obj === null) {
             return null;
         }
@@ -24,7 +28,7 @@ export namespace SerializationHelper {
         serializing++;
         if (!(obj.constructor.name in reverseMap)) {
             serializing--;
-            throw Error('Error: ' + `type '${obj.constructor.name}' not registered. Make sure you register it using a @Deserializable decorator`);
+            throw Error(`Error: type '${obj.constructor.name}' not registered. Make sure you register it using a @Deserializable decorator`);
         }
 
         const json = serialize(obj);
@@ -52,30 +56,29 @@ export namespace SerializationHelper {
         }
 
         const type = serializationTypes[obj.__type];
-        const value = await new Promise(res => deserialize(type.ctor, obj, (err, result) => res(result)));
+        const value = await new Promise(res => {
+            deserialize(type.ctor, obj, (err, result) => res(result));
+        });
         type.afterDeserialize?.(value);
 
         return value;
     }
 }
 
-const serializationTypes: { [name: string]: { ctor: { new (): any }; afterDeserialize?: (obj: any) => void | Promise<any> } } = {};
-const reverseMap: { [ctor: string]: string } = {};
-
-export function Deserializable(className: string, afterDeserialize?: (obj: any) => void | Promise<any>, constructorArgs?: [string]): (constructor: { new (...args: any[]): any }) => void {
-    function addToMap(className: string, ctor: { new (...args: any[]): any }) {
-        const schema = getDefaultModelSchema(ctor) as any;
-        if (schema.targetClass !== ctor || constructorArgs) {
-            setDefaultModelSchema(ctor, { ...schema, factory: (context: any) => new ctor(...(constructorArgs ?? [])?.map(arg => context.json[arg])) });
+export function Deserializable(classNameForSerializer: string, afterDeserialize?: (obj: any) => void | Promise<any>, constructorArgs?: [string]): (constructor: { new (...args: any[]): any }) => void {
+    function addToMap(className: string, Ctor: { new (...args: any[]): any }) {
+        const schema = getDefaultModelSchema(Ctor) as any;
+        if (schema.targetClass !== Ctor || constructorArgs) {
+            setDefaultModelSchema(Ctor, { ...schema, factory: (context: any) => new Ctor(...(constructorArgs ?? []).map(arg => context.json[arg])) });
         }
         if (!(className in serializationTypes)) {
-            serializationTypes[className] = { ctor, afterDeserialize };
-            reverseMap[ctor.name] = className;
+            serializationTypes[className] = { ctor: Ctor, afterDeserialize };
+            reverseMap[Ctor.name] = className;
         } else {
             throw new Error(`Name ${className} has already been registered as deserializable`);
         }
     }
-    return (ctor: { new (...args: any[]): any }) => addToMap(className, ctor);
+    return (ctor: { new (...args: any[]): any }) => addToMap(classNameForSerializer, ctor);
 }
 
 export function autoObject(): PropSchema {