lint fixes.

2 files changed, 39 insertions, 46 deletions

diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts
index 3fb914423..f8351c238 100644
--- a/src/fields/Doc.ts
+++ b/src/fields/Doc.ts
@@ -152,7 +152,7 @@ export const ReverseHierarchyMap: Map<string, { level: aclLevel; acl: symbol; im
 export function updateCachedAcls(doc: Doc) {
     if (doc) {
         const target = (doc as any)?.__fieldTuples ?? doc;
-        const permissions: { [key: string]: symbol } = !target.author || target.author === ClientUtils.CurrentUserEmail ? { 'acl-Me': AclAdmin } : {};
+        const permissions: { [key: string]: symbol } = !target.author || target.author === ClientUtils.CurrentUserEmail() ? { 'acl-Me': AclAdmin } : {};
         Object.keys(target).forEach(key => {
             key.startsWith('acl') && (permissions[key] = ReverseHierarchyMap.get(StrCast(target[key]))!.acl);
         });
@@ -301,15 +301,16 @@ export class Doc extends RefField {
     private set __fieldTuples(value) {
         // called by deserializer to set all fields in one shot
         this[FieldTuples] = value;
-        // eslint-disable-next-line no-restricted-syntax
-        for (const key in value) {
-            const field = value[key];
-            field !== undefined && (this[FieldKeys][key] = true);
-            if (field instanceof ObjectField) {
-                field[Parent] = this[Self];
-                field[FieldChanged] = containedFieldChangedHandler(this[SelfProxy], key, field);
+        Object.keys(value).forEach(key => {
+            if (Object.prototype.hasOwnProperty.call(value, key)) {
+                const field = value[key];
+                field !== undefined && (this[FieldKeys][key] = true);
+                if (field instanceof ObjectField) {
+                    field[Parent] = this[Self];
+                    field[FieldChanged] = containedFieldChangedHandler(this[SelfProxy], key, field);
+                }
             }
-        }
+        });
     }
 
     @observable private [FieldTuples]: any = {};
@@ -365,14 +366,11 @@ export class Doc extends RefField {
 
     public async [HandleUpdate](diff: any) {
         const set = diff.$set;
-        const sameAuthor = this.author === ClientUtils.CurrentUserEmail;
-        if (set) {
-            for (const key in set) {
-                const fprefix = 'fields.';
-                if (!key.startsWith(fprefix)) {
-                    // eslint-disable-next-line no-continue
-                    continue;
-                }
+        const sameAuthor = this.author === ClientUtils.CurrentUserEmail();
+        const fprefix = 'fields.';
+        Object.keys(set ?? {})
+            .filter(key => Object.prototype.hasOwnProperty.call(set, key) && key.startsWith(fprefix))
+            .forEach(async key => {
                 const fKey = key.substring(fprefix.length);
                 const fn = async () => {
                     const value = await SerializationHelper.Deserialize(set[key]);
@@ -395,15 +393,11 @@ export class Doc extends RefField {
                 } else {
                     this[CachedUpdates][fKey] = fn;
                 }
-            }
-        }
+            });
         const unset = diff.$unset;
-        if (unset) {
-            for (const key in unset) {
-                if (!key.startsWith('fields.')) {
-                    // eslint-disable-next-line no-continue
-                    continue;
-                }
+        Object.keys(unset ?? {})
+            .filter(key => Object.prototype.hasOwnProperty.call(unset, key) && key.startsWith(fprefix))
+            .forEach(async key => {
                 const fKey = key.substring(7);
                 const fn = () => {
                     this[UpdatingFromServer] = true;
@@ -412,13 +406,11 @@ export class Doc extends RefField {
                 };
                 if (sameAuthor || DocServer.getFieldWriteMode(fKey) !== DocServer.WriteMode.Playground) {
                     delete this[CachedUpdates][fKey];
-                    // eslint-disable-next-line no-await-in-loop
                     await fn();
                 } else {
                     this[CachedUpdates][fKey] = fn;
                 }
-            }
-        }
+            });
     }
 }
 
@@ -519,15 +511,15 @@ export namespace Doc {
      */
     export function assign<K extends string>(doc: Doc, fields: Partial<Record<K, Opt<FieldType>>>, skipUndefineds: boolean = false, isInitializing = false) {
         isInitializing && (doc[Initializing] = true);
-        for (const key in fields) {
-            if (fields.hasOwnProperty(key)) {
-                const value = fields[key];
+        Object.keys(fields).forEach(key => {
+            if (Object.prototype.hasOwnProperty.call(fields.hasOwnProperty, key)) {
+                const value = (fields as any)[key];
                 if (!skipUndefineds || value !== undefined) {
                     // Do we want to filter out undefineds?
                     doc[key] = value;
                 }
             }
-        }
+        });
         isInitializing && (doc[Initializing] = false);
         return doc;
     }
@@ -640,7 +632,7 @@ export namespace Doc {
         embedding.createdFrom = doc;
         embedding.proto_embeddingId = doc[DocData].proto_embeddingId = Doc.GetEmbeddings(doc).length - 1;
         !Doc.GetT(embedding, 'title', 'string', true) && (embedding.title = ComputedField.MakeFunction(`renameEmbedding(this)`));
-        embedding.author = ClientUtils.CurrentUserEmail;
+        embedding.author = ClientUtils.CurrentUserEmail();
 
         return embedding;
     }
@@ -648,7 +640,7 @@ export namespace Doc {
     export function BestEmbedding(doc: Doc) {
         const dataDoc = doc[DocData];
         const availableEmbeddings = Doc.GetEmbeddings(dataDoc);
-        const bestEmbedding = [...(dataDoc !== doc ? [doc] : []), ...availableEmbeddings].find(doc => !doc.embedContainer && doc.author === ClientUtils.CurrentUserEmail);
+        const bestEmbedding = [...(dataDoc !== doc ? [doc] : []), ...availableEmbeddings].find(doc => !doc.embedContainer && doc.author === ClientUtils.CurrentUserEmail());
         bestEmbedding && Doc.AddEmbedding(doc, doc);
         return bestEmbedding ?? Doc.MakeEmbedding(doc);
     }
@@ -708,7 +700,7 @@ export namespace Doc {
                 };
                 const docAtKey = doc[key];
                 if (key === 'author') {
-                    assignKey(ClientUtils.CurrentUserEmail);
+                    assignKey(ClientUtils.CurrentUserEmail());
                 } else if (docAtKey instanceof Doc) {
                     if (pruneDocs.includes(docAtKey)) {
                         // prune doc and do nothing
@@ -717,7 +709,7 @@ export namespace Doc {
                         (key.includes('layout[') ||
                             key.startsWith('layout') || //
                             ['embedContainer', 'annotationOn', 'proto'].includes(key) ||
-                            (['link_anchor_1', 'link_anchor_2'].includes(key) && doc.author === ClientUtils.CurrentUserEmail))
+                            (['link_anchor_1', 'link_anchor_2'].includes(key) && doc.author === ClientUtils.CurrentUserEmail()))
                     ) {
                         assignKey(await Doc.makeClone(docAtKey, cloneMap, linkMap, rtfs, exclusions, pruneDocs, cloneLinks, cloneTemplates));
                     } else {
@@ -886,7 +878,7 @@ export namespace Doc {
                 }
             } else {
                 const cfield = ComputedField.WithoutComputed(() => FieldValue(doc[key]));
-                const field = key === 'author' ? ClientUtils.CurrentUserEmail : ProxyField.WithoutProxy(() => doc[key]);
+                const field = key === 'author' ? ClientUtils.CurrentUserEmail() : ProxyField.WithoutProxy(() => doc[key]);
                 if (field instanceof RefField) {
                     if (field instanceof Doc) {
                         if (key === 'myLinkDatabase') {
@@ -934,7 +926,7 @@ export namespace Doc {
                     }
                 } else {
                     const cfield = ComputedField.WithoutComputed(() => FieldValue(doc[key]));
-                    const field = key === 'author' ? ClientUtils.CurrentUserEmail : ProxyField.WithoutProxy(() => doc[key]);
+                    const field = key === 'author' ? ClientUtils.CurrentUserEmail() : ProxyField.WithoutProxy(() => doc[key]);
                     if (field instanceof RefField) {
                         copy[key] = field;
                     } else if (cfield instanceof ComputedField) {
@@ -973,7 +965,7 @@ export namespace Doc {
             delegate[Initializing] = true;
             updateCachedAcls(delegate);
             delegate.proto = doc;
-            delegate.author = ClientUtils.CurrentUserEmail;
+            delegate.author = ClientUtils.CurrentUserEmail();
             Object.keys(doc)
                 .filter(key => key.startsWith('acl'))
                 .forEach(key => {
@@ -1004,7 +996,7 @@ export namespace Doc {
     export function ApplyTemplate(templateDoc: Doc) {
         if (templateDoc) {
             const proto = new Doc();
-            proto.author = ClientUtils.CurrentUserEmail;
+            proto.author = ClientUtils.CurrentUserEmail();
             const target = Doc.MakeDelegate(proto);
             const targetKey = StrCast(templateDoc.layout_fieldKey, 'layout');
             const applied = ApplyTemplateTo(templateDoc, target, targetKey, templateDoc.title + '(...' + _applyCount++ + ')');
@@ -1199,7 +1191,8 @@ export namespace Doc {
     }
 
     const UnhighlightWatchers: (() => void)[] = [];
-    export let UnhighlightTimer: any;
+    let UnhighlightTimer: any;
+    export function IsUnhighlightTimerSet() { return UnhighlightTimer; } // prettier-ignore
     export function AddUnHighlightWatcher(watcher: () => void) {
         if (UnhighlightTimer) {
             UnhighlightWatchers.push(watcher);
diff --git a/src/fields/util.ts b/src/fields/util.ts
index 5ed10cf05..d7268f31a 100644
--- a/src/fields/util.ts
+++ b/src/fields/util.ts
@@ -84,7 +84,7 @@ const _setterImpl = action((target: any, prop: string | symbol | number, valueIn
 
     const writeMode = DocServer.getFieldWriteMode(prop as string);
     const fromServer = target[UpdatingFromServer];
-    const sameAuthor = fromServer || receiver.author === ClientUtils.CurrentUserEmail;
+    const sameAuthor = fromServer || receiver.author === ClientUtils.CurrentUserEmail();
     const writeToDoc =
         sameAuthor || effectiveAcl === AclEdit || effectiveAcl === AclAdmin || writeMode === DocServer.WriteMode.Playground || writeMode === DocServer.WriteMode.LivePlayground || (effectiveAcl === AclAugment && value instanceof RichTextField);
     const writeToServer =
@@ -163,7 +163,7 @@ const getEffectiveAclCache = computedFn((target: any, user?: string) => getEffec
  */
 export function GetEffectiveAcl(target: any, user?: string): symbol {
     if (!target) return AclPrivate;
-    if (target[UpdatingFromServer] || ClientUtils.CurrentUserEmail === 'guest') return AclAdmin;
+    if (target[UpdatingFromServer] || ClientUtils.CurrentUserEmail() === 'guest') return AclAdmin;
     return getEffectiveAclCache(target, user); // all changes received from the server must be processed as Admin.  return this directly so that the acls aren't cached (UpdatingFromServer is not observable)
 }
 
@@ -186,7 +186,7 @@ function getEffectiveAcl(target: any, user?: string): symbol {
     const targetAcls = target[DocAcl];
     if (targetAcls?.['acl-Me'] === AclAdmin || GetCachedGroupByName('Admin')) return AclAdmin;
 
-    const userChecked = user || ClientUtils.CurrentUserEmail; // if the current user is the author of the document / the current user is a member of the admin group
+    const userChecked = user || ClientUtils.CurrentUserEmail(); // if the current user is the author of the document / the current user is a member of the admin group
     if (targetAcls && Object.keys(targetAcls).length) {
         let effectiveAcl = AclPrivate;
         Object.entries(targetAcls).forEach(([key, value]) => {
@@ -219,7 +219,7 @@ function getEffectiveAcl(target: any, user?: string): symbol {
  */
 // eslint-disable-next-line default-param-last
 export function distributeAcls(key: string, acl: SharingPermissions, target: Doc, visited: Doc[] = [], allowUpgrade?: boolean, layoutOnly = false) {
-    const selfKey = `acl-${normalizeEmail(ClientUtils.CurrentUserEmail)}`;
+    const selfKey = `acl-${normalizeEmail(ClientUtils.CurrentUserEmail())}`;
     if (!target || visited.includes(target) || key === selfKey) return;
     visited.push(target);
 
@@ -268,7 +268,7 @@ export function distributeAcls(key: string, acl: SharingPermissions, target: Doc
  * Copies parent's acl fields to the child
  */
 export function inheritParentAcls(parent: Doc, child: Doc, layoutOnly: boolean) {
-    [...Object.keys(parent), ...(ClientUtils.CurrentUserEmail !== parent.author ? ['acl-Owner'] : [])]
+    [...Object.keys(parent), ...(ClientUtils.CurrentUserEmail() !== parent.author ? ['acl-Owner'] : [])]
         .filter(key => key.startsWith('acl'))
         .forEach(key => {
             // if the default acl mode is private, then don't inherit the acl-guest permission, but set it to private.