cleaning up database types

1 files changed, 11 insertions, 4 deletions

diff --git a/src/fields/ObjectField.ts b/src/fields/ObjectField.ts
index 21c4af608..5f31208eb 100644
--- a/src/fields/ObjectField.ts
+++ b/src/fields/ObjectField.ts
@@ -2,11 +2,18 @@ import { ScriptingGlobals } from '../client/util/ScriptingGlobals';
 import { Copy, FieldChanged, Parent, ToJavascriptString, ToScriptString, ToString } from './FieldSymbols';
 import { RefField } from './RefField';
 
+export type serializedFieldType = { fieldId: string; heading?: string; __type: string };
+export type serializedFieldsType = { [key: string]: { fields: serializedFieldType[] } };
+export interface serializedDoctype {
+    readonly id: string;
+    readonly fields?: serializedFieldsType;
+}
+
 export type serverOpType = {
-    $set?: { [key: string]: unknown }; //
+    $set?: serializedFieldsType; //
     $unset?: { [key: string]: unknown };
-    $remFromSet?: { [key: string]: unknown };
-    $addToSet?: { [key: string]: unknown };
+    $remFromSet?: { [key: string]: { fields: serializedFieldType[] } | { deleteCount: number; start: number } | undefined; hint?: { deleteCount: number; start: number } };
+    $addToSet?: serializedFieldsType;
     length?: number;
 };
 export abstract class ObjectField {
@@ -15,7 +22,7 @@ export abstract class ObjectField {
                              // eslint-disable-next-line no-use-before-define
                              items: FieldType[] | undefined; 
                              length: number | undefined; 
-                             hint?: unknown }, 
+                             hint?: { deleteCount: number, start: number} }, 
                              serverOp?: serverOpType) => void;
     // eslint-disable-next-line no-use-before-define
     public [Parent]?: RefField | ObjectField;