fix(frontend): UpdateService synchronization

Also bumps frontend dependencies

11 files changed, 417 insertions, 375 deletions

diff --git a/subprojects/frontend/package.json b/subprojects/frontend/package.json
index 448b9710..7cef17fe 100644
--- a/subprojects/frontend/package.json
+++ b/subprojects/frontend/package.json
@@ -31,17 +31,16 @@
     "@codemirror/view": "^6.2.0",
     "@emotion/react": "^11.10.0",
     "@emotion/styled": "^11.10.0",
-    "@fontsource/inter": "^4.5.12",
     "@fontsource/jetbrains-mono": "^4.5.10",
     "@fontsource/roboto": "^4.5.8",
     "@lezer/common": "^1.0.0",
     "@lezer/highlight": "^1.0.0",
     "@lezer/lr": "^1.2.3",
     "@material-icons/svg": "^1.0.32",
-    "@mui/icons-material": "5.8.4",
-    "@mui/material": "5.10.1",
-    "@types/lodash-es": "^4.17.6",
+    "@mui/icons-material": "5.10.2",
+    "@mui/material": "5.10.2",
     "ansi-styles": "^6.1.0",
+    "async-mutex": "^0.3.2",
     "escape-string-regexp": "^5.0.0",
     "lodash-es": "^4.17.21",
     "loglevel": "^1.8.0",
@@ -58,19 +57,20 @@
     "@lezer/generator": "^1.1.1",
     "@types/eslint": "^8.4.6",
     "@types/html-minifier-terser": "^7.0.0",
-    "@types/node": "^18.7.8",
+    "@types/lodash-es": "^4.17.6",
+    "@types/node": "^18.7.13",
     "@types/prettier": "^2.7.0",
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
-    "@typescript-eslint/eslint-plugin": "^5.33.1",
-    "@typescript-eslint/parser": "^5.33.1",
+    "@typescript-eslint/eslint-plugin": "^5.35.1",
+    "@typescript-eslint/parser": "^5.35.1",
     "@vitejs/plugin-react": "^2.0.1",
     "cross-env": "^7.0.3",
     "eslint": "^8.22.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-import-resolver-typescript": "^3.4.2",
+    "eslint-import-resolver-typescript": "^3.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsx-a11y": "^6.6.1",
     "eslint-plugin-prettier": "^4.2.1",
@@ -80,7 +80,7 @@
     "prettier": "^2.7.1",
     "typescript": "~4.7.4",
     "vite": "^3.0.9",
-    "vite-plugin-inject-preload": "^1.0.1",
+    "vite-plugin-inject-preload": "^1.1.0",
     "vite-plugin-pwa": "^0.12.3",
     "workbox-window": "^6.5.4"
   }
diff --git a/subprojects/frontend/src/utils/ConditionVariable.ts b/subprojects/frontend/src/utils/ConditionVariable.ts
deleted file mode 100644
index 1d3431f7..00000000
--- a/subprojects/frontend/src/utils/ConditionVariable.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import PendingTask from './PendingTask';
-import getLogger from './getLogger';
-
-const log = getLogger('utils.ConditionVariable');
-
-export type Condition = () => boolean;
-
-export default class ConditionVariable {
-  private readonly condition: Condition;
-
-  private readonly defaultTimeout: number;
-
-  private listeners: PendingTask<void>[] = [];
-
-  constructor(condition: Condition, defaultTimeout = 0) {
-    this.condition = condition;
-    this.defaultTimeout = defaultTimeout;
-  }
-
-  async waitFor(timeoutMs?: number | undefined): Promise<void> {
-    if (this.condition()) {
-      return;
-    }
-    const timeoutOrDefault = timeoutMs ?? this.defaultTimeout;
-    let nowMs = Date.now();
-    const endMs = nowMs + timeoutOrDefault;
-    while (!this.condition() && nowMs < endMs) {
-      const remainingMs = endMs - nowMs;
-      const promise = new Promise<void>((resolve, reject) => {
-        if (this.condition()) {
-          resolve();
-          return;
-        }
-        const task = new PendingTask(resolve, reject, remainingMs);
-        this.listeners.push(task);
-      });
-      // We must keep waiting until the update has completed,
-      // so the tasks can't be started in parallel.
-      // eslint-disable-next-line no-await-in-loop
-      await promise;
-      nowMs = Date.now();
-    }
-    if (!this.condition()) {
-      log.error('Condition still does not hold after', timeoutOrDefault, 'ms');
-      throw new Error('Failed to wait for condition');
-    }
-  }
-
-  notifyAll(): void {
-    this.clearListenersWith((listener) => listener.resolve());
-  }
-
-  rejectAll(error: unknown): void {
-    this.clearListenersWith((listener) => listener.reject(error));
-  }
-
-  private clearListenersWith(callback: (listener: PendingTask<void>) => void) {
-    // Copy `listeners` so that we don't get into a race condition
-    // if one of the listeners adds another listener.
-    const { listeners } = this;
-    this.listeners = [];
-    listeners.forEach(callback);
-  }
-}
diff --git a/subprojects/frontend/src/utils/PendingTask.ts b/subprojects/frontend/src/utils/PendingTask.ts
index 3976bdf9..205c8452 100644
--- a/subprojects/frontend/src/utils/PendingTask.ts
+++ b/subprojects/frontend/src/utils/PendingTask.ts
@@ -14,21 +14,19 @@ export default class PendingTask<T> {
   constructor(
     resolveCallback: (value: T) => void,
     rejectCallback: (reason?: unknown) => void,
-    timeoutMs?: number | undefined,
-    timeoutCallback?: () => void | undefined,
+    timeoutMs: number | undefined,
+    timeoutCallback: () => void | undefined,
   ) {
     this.resolveCallback = resolveCallback;
     this.rejectCallback = rejectCallback;
-    if (timeoutMs) {
-      this.timeout = setTimeout(() => {
-        if (!this.resolved) {
-          this.reject(new Error('Request timed out'));
-          if (timeoutCallback) {
-            timeoutCallback();
-          }
+    this.timeout = setTimeout(() => {
+      if (!this.resolved) {
+        this.reject(new Error('Request timed out'));
+        if (timeoutCallback) {
+          timeoutCallback();
         }
-      }, timeoutMs);
-    }
+      }
+    }, timeoutMs);
   }
 
   resolve(value: T): void {
diff --git a/subprojects/frontend/src/xtext/ContentAssistService.ts b/subprojects/frontend/src/xtext/ContentAssistService.ts
index 39042812..9e41f57b 100644
--- a/subprojects/frontend/src/xtext/ContentAssistService.ts
+++ b/subprojects/frontend/src/xtext/ContentAssistService.ts
@@ -104,13 +104,9 @@ function createCompletion(entry: ContentAssistEntry): Completion {
 }
 
 export default class ContentAssistService {
-  private readonly updateService: UpdateService;
-
   private lastCompletion: CompletionResult | undefined;
 
-  constructor(updateService: UpdateService) {
-    this.updateService = updateService;
-  }
+  constructor(private readonly updateService: UpdateService) {}
 
   onTransaction(transaction: Transaction): void {
     if (this.shouldInvalidateCachedCompletion(transaction)) {
@@ -159,8 +155,6 @@ export default class ContentAssistService {
     this.lastCompletion = undefined;
     const entries = await this.updateService.fetchContentAssist(
       {
-        resource: this.updateService.resourceName,
-        serviceType: 'assist',
         caretOffset: context.pos,
         proposalsLimit: PROPOSALS_LIMIT,
       },
diff --git a/subprojects/frontend/src/xtext/HighlightingService.ts b/subprojects/frontend/src/xtext/HighlightingService.ts
index cf618b96..f9ab7b7e 100644
--- a/subprojects/frontend/src/xtext/HighlightingService.ts
+++ b/subprojects/frontend/src/xtext/HighlightingService.ts
@@ -5,14 +5,10 @@ import type UpdateService from './UpdateService';
 import { highlightingResult } from './xtextServiceResults';
 
 export default class HighlightingService {
-  private readonly store: EditorStore;
-
-  private readonly updateService: UpdateService;
-
-  constructor(store: EditorStore, updateService: UpdateService) {
-    this.store = store;
-    this.updateService = updateService;
-  }
+  constructor(
+    private readonly store: EditorStore,
+    private readonly updateService: UpdateService,
+  ) {}
 
   onPush(push: unknown): void {
     const { regions } = highlightingResult.parse(push);
diff --git a/subprojects/frontend/src/xtext/OccurrencesService.ts b/subprojects/frontend/src/xtext/OccurrencesService.ts
index 35913f43..c8d6fd7b 100644
--- a/subprojects/frontend/src/xtext/OccurrencesService.ts
+++ b/subprojects/frontend/src/xtext/OccurrencesService.ts
@@ -1,20 +1,15 @@
 import { Transaction } from '@codemirror/state';
+import { debounce } from 'lodash-es';
 
 import type EditorStore from '../editor/EditorStore';
 import {
   type IOccurrence,
   isCursorWithinOccurence,
 } from '../editor/findOccurrences';
-import Timer from '../utils/Timer';
 import getLogger from '../utils/getLogger';
 
 import type UpdateService from './UpdateService';
-import type XtextWebSocketClient from './XtextWebSocketClient';
-import {
-  isConflictResult,
-  OccurrencesResult,
-  type TextRegion,
-} from './xtextServiceResults';
+import type { TextRegion } from './xtextServiceResults';
 
 const FIND_OCCURRENCES_TIMEOUT_MS = 1000;
 
@@ -34,38 +29,23 @@ function transformOccurrences(regions: TextRegion[]): IOccurrence[] {
 }
 
 export default class OccurrencesService {
-  private readonly store: EditorStore;
-
-  private readonly webSocketClient: XtextWebSocketClient;
-
-  private readonly updateService: UpdateService;
-
   private hasOccurrences = false;
 
-  private readonly findOccurrencesTimer = new Timer(() => {
-    this.handleFindOccurrences();
-  }, FIND_OCCURRENCES_TIMEOUT_MS);
-
-  private readonly clearOccurrencesTimer = new Timer(() => {
-    this.clearOccurrences();
-  });
+  private readonly findOccurrencesLater = debounce(
+    () => this.findOccurrences(),
+    FIND_OCCURRENCES_TIMEOUT_MS,
+  );
 
   constructor(
-    store: EditorStore,
-    webSocketClient: XtextWebSocketClient,
-    updateService: UpdateService,
-  ) {
-    this.store = store;
-    this.webSocketClient = webSocketClient;
-    this.updateService = updateService;
-  }
+    private readonly store: EditorStore,
+    private readonly updateService: UpdateService,
+  ) {}
 
   onTransaction(transaction: Transaction): void {
     if (transaction.docChanged) {
       // Must clear occurrences asynchronously from `onTransaction`,
       // because we must not emit a conflicting transaction when handling the pending transaction.
-      this.clearOccurrencesTimer.schedule();
-      this.findOccurrencesTimer.reschedule();
+      this.clearAndFindOccurrencesLater();
       return;
     }
     if (!transaction.isUserEvent('select')) {
@@ -73,11 +53,10 @@ export default class OccurrencesService {
     }
     if (this.needsOccurrences) {
       if (!isCursorWithinOccurence(this.store.state)) {
-        this.clearOccurrencesTimer.schedule();
-        this.findOccurrencesTimer.reschedule();
+        this.clearAndFindOccurrencesLater();
       }
     } else {
-      this.clearOccurrencesTimer.schedule();
+      this.clearOccurrencesLater();
     }
   }
 
@@ -85,8 +64,26 @@ export default class OccurrencesService {
     return this.store.state.selection.main.empty;
   }
 
-  private handleFindOccurrences() {
-    this.clearOccurrencesTimer.cancel();
+  private clearAndFindOccurrencesLater(): void {
+    this.clearOccurrencesLater();
+    this.findOccurrencesLater();
+  }
+
+  /**
+   * Clears the occurences from a new immediate task to let the current editor transaction finish.
+   */
+  private clearOccurrencesLater() {
+    setTimeout(() => this.clearOccurrences(), 0);
+  }
+
+  private clearOccurrences() {
+    if (this.hasOccurrences) {
+      this.store.updateOccurrences([], []);
+      this.hasOccurrences = false;
+    }
+  }
+
+  private findOccurrences() {
     this.updateOccurrences().catch((error) => {
       log.error('Unexpected error while updating occurrences', error);
       this.clearOccurrences();
@@ -98,43 +95,26 @@ export default class OccurrencesService {
       this.clearOccurrences();
       return;
     }
-    await this.updateService.update();
-    const result = await this.webSocketClient.send({
-      resource: this.updateService.resourceName,
-      serviceType: 'occurrences',
-      expectedStateId: this.updateService.xtextStateId,
-      caretOffset: this.store.state.selection.main.head,
+    const fetchResult = await this.updateService.fetchOccurrences(() => {
+      return this.needsOccurrences
+        ? {
+            cancelled: false,
+            data: this.store.state.selection.main.head,
+          }
+        : { cancelled: true };
     });
-    const allChanges = this.updateService.computeChangesSinceLastUpdate();
-    if (!allChanges.empty || isConflictResult(result, 'canceled')) {
+    if (fetchResult.cancelled) {
       // Stale occurrences result, the user already made some changes.
       // We can safely ignore the occurrences and schedule a new find occurrences call.
       this.clearOccurrences();
-      this.findOccurrencesTimer.schedule();
-      return;
-    }
-    const parsedOccurrencesResult = OccurrencesResult.safeParse(result);
-    if (!parsedOccurrencesResult.success) {
-      log.error(
-        'Unexpected occurences result',
-        result,
-        'not an OccurrencesResult: ',
-        parsedOccurrencesResult.error,
-      );
-      this.clearOccurrences();
-      return;
-    }
-    const { stateId, writeRegions, readRegions } = parsedOccurrencesResult.data;
-    if (stateId !== this.updateService.xtextStateId) {
-      log.error(
-        'Unexpected state id, expected:',
-        this.updateService.xtextStateId,
-        'got:',
-        stateId,
-      );
-      this.clearOccurrences();
+      if (this.needsOccurrences) {
+        this.findOccurrencesLater();
+      }
       return;
     }
+    const {
+      data: { writeRegions, readRegions },
+    } = fetchResult;
     const write = transformOccurrences(writeRegions);
     const read = transformOccurrences(readRegions);
     this.hasOccurrences = write.length > 0 || read.length > 0;
@@ -147,11 +127,4 @@ export default class OccurrencesService {
     );
     this.store.updateOccurrences(write, read);
   }
-
-  private clearOccurrences() {
-    if (this.hasOccurrences) {
-      this.store.updateOccurrences([], []);
-      this.hasOccurrences = false;
-    }
-  }
 }
diff --git a/subprojects/frontend/src/xtext/UpdateService.ts b/subprojects/frontend/src/xtext/UpdateService.ts
index f8b71160..3b4ae259 100644
--- a/subprojects/frontend/src/xtext/UpdateService.ts
+++ b/subprojects/frontend/src/xtext/UpdateService.ts
@@ -5,11 +5,11 @@ import {
   StateEffect,
   type Transaction,
 } from '@codemirror/state';
+import { E_CANCELED, E_TIMEOUT, Mutex, withTimeout } from 'async-mutex';
+import { debounce } from 'lodash-es';
 import { nanoid } from 'nanoid';
 
 import type EditorStore from '../editor/EditorStore';
-import ConditionVariable from '../utils/ConditionVariable';
-import Timer from '../utils/Timer';
 import getLogger from '../utils/getLogger';
 
 import type XtextWebSocketClient from './XtextWebSocketClient';
@@ -19,12 +19,15 @@ import {
   DocumentStateResult,
   FormattingResult,
   isConflictResult,
+  OccurrencesResult,
 } from './xtextServiceResults';
 
 const UPDATE_TIMEOUT_MS = 500;
 
 const WAIT_FOR_UPDATE_TIMEOUT_MS = 1000;
 
+const FORMAT_TEXT_RETRIES = 5;
+
 const log = getLogger('xtext.UpdateService');
 
 /**
@@ -38,10 +41,20 @@ const log = getLogger('xtext.UpdateService');
  */
 const setDirtyChanges = StateEffect.define<ChangeSet>();
 
-export interface IAbortSignal {
+export interface AbortSignal {
   aborted: boolean;
 }
 
+export interface ContentAssistParams {
+  caretOffset: number;
+
+  proposalsLimit: number;
+}
+
+export type CancellableResult<T> =
+  | { cancelled: false; data: T }
+  | { cancelled: true };
+
 interface StateUpdateResult<T> {
   newStateId: string;
 
@@ -57,15 +70,27 @@ interface Delta {
 }
 
 export default class UpdateService {
-  resourceName: string;
+  readonly resourceName: string;
 
   xtextStateId: string | undefined;
 
   private readonly store: EditorStore;
 
+  private readonly mutex = withTimeout(new Mutex(), WAIT_FOR_UPDATE_TIMEOUT_MS);
+
   /**
-   * The changes being synchronized to the server if a full or delta text update is running,
-   * `undefined` otherwise.
+   * The changes being synchronized to the server if a full or delta text update is running
+   * withing a `withUpdateExclusive` block, `undefined` otherwise.
+   *
+   * Must be `undefined` before and after entering the critical section of `mutex`
+   * and may only be changes in the critical section of `mutex`.
+   *
+   * Methods named with an `Exclusive` suffix in this class assume that the mutex is held
+   * and may call `withUpdateExclusive` or `doFallbackUpdateFullTextExclusive`
+   * to mutate this field.
+   *
+   * Methods named with a `do` suffix assume that they are called in a `withUpdateExclusive`
+   * block and require this field to be non-`undefined`.
    */
   private pendingUpdate: ChangeSet | undefined;
 
@@ -76,15 +101,11 @@ export default class UpdateService {
 
   private readonly webSocketClient: XtextWebSocketClient;
 
-  private readonly updatedCondition = new ConditionVariable(
-    () => this.pendingUpdate === undefined && this.xtextStateId !== undefined,
-    WAIT_FOR_UPDATE_TIMEOUT_MS,
+  private readonly idleUpdateLater = debounce(
+    () => this.idleUpdate(),
+    UPDATE_TIMEOUT_MS,
   );
 
-  private readonly idleUpdateTimer = new Timer(() => {
-    this.handleIdleUpdate();
-  }, UPDATE_TIMEOUT_MS);
-
   constructor(store: EditorStore, webSocketClient: XtextWebSocketClient) {
     this.resourceName = `${nanoid(7)}.problem`;
     this.store = store;
@@ -95,6 +116,13 @@ export default class UpdateService {
   onReconnect(): void {
     this.xtextStateId = undefined;
     this.updateFullText().catch((error) => {
+      // Let E_TIMEOUT errors propagate, since if the first update times out,
+      // we can't use the connection.
+      if (error === E_CANCELED) {
+        // Content assist will perform a full-text update anyways.
+        log.debug('Full text update cancelled');
+        return;
+      }
       log.error('Unexpected error during initial update', error);
     });
   }
@@ -106,6 +134,8 @@ export default class UpdateService {
     if (setDirtyChangesEffect) {
       const { value } = setDirtyChangesEffect;
       if (this.pendingUpdate !== undefined) {
+        // Do not clear `pendingUpdate`, because that would indicate an update failure
+        // to `withUpdateExclusive`.
         this.pendingUpdate = ChangeSet.empty(value.length);
       }
       this.dirtyChanges = value;
@@ -113,7 +143,7 @@ export default class UpdateService {
     }
     if (transaction.docChanged) {
       this.dirtyChanges = this.dirtyChanges.compose(transaction.changes);
-      this.idleUpdateTimer.reschedule();
+      this.idleUpdateLater();
     }
   }
 
@@ -132,34 +162,42 @@ export default class UpdateService {
     );
   }
 
-  private handleIdleUpdate(): void {
+  private idleUpdate(): void {
     if (!this.webSocketClient.isOpen || this.dirtyChanges.empty) {
       return;
     }
-    if (this.pendingUpdate === undefined) {
+    if (!this.mutex.isLocked()) {
       this.update().catch((error) => {
+        if (error === E_CANCELED || error === E_TIMEOUT) {
+          log.debug('Idle update cancelled');
+          return;
+        }
         log.error('Unexpected error during scheduled update', error);
       });
     }
-    this.idleUpdateTimer.reschedule();
+    this.idleUpdateLater();
   }
 
   private newEmptyChangeSet(): ChangeSet {
     return ChangeSet.of([], this.store.state.doc.length);
   }
 
-  async updateFullText(): Promise<void> {
-    await this.withUpdate(() => this.doUpdateFullText());
+  private updateFullText(): Promise<void> {
+    return this.runExclusive(() => this.updateFullTextExclusive());
   }
 
-  private async doUpdateFullText(): Promise<StateUpdateResult<void>> {
+  private async updateFullTextExclusive(): Promise<void> {
+    await this.withVoidUpdateExclusive(() => this.doUpdateFullTextExclusive());
+  }
+
+  private async doUpdateFullTextExclusive(): Promise<string> {
     const result = await this.webSocketClient.send({
       resource: this.resourceName,
       serviceType: 'update',
       fullText: this.store.state.doc.sliceString(0),
     });
     const { stateId } = DocumentStateResult.parse(result);
-    return { newStateId: stateId, data: undefined };
+    return stateId;
   }
 
   /**
@@ -171,14 +209,26 @@ export default class UpdateService {
    *
    * @returns a promise resolving when the update is completed
    */
-  async update(): Promise<void> {
-    await this.prepareForDeltaUpdate();
+  private async update(): Promise<void> {
+    // We may check here for the delta to avoid locking,
+    // but we'll need to recompute the delta in the critical section,
+    // because it may have changed by the time we can acquire the lock.
+    if (this.dirtyChanges.empty) {
+      return;
+    }
+    await this.runExclusive(() => this.updateExclusive());
+  }
+
+  private async updateExclusive(): Promise<void> {
+    if (this.xtextStateId === undefined) {
+      await this.updateFullTextExclusive();
+    }
     const delta = this.computeDelta();
     if (delta === undefined) {
       return;
     }
     log.trace('Editor delta', delta);
-    await this.withUpdate(async () => {
+    await this.withVoidUpdateExclusive(async () => {
       const result = await this.webSocketClient.send({
         resource: this.resourceName,
         serviceType: 'update',
@@ -187,34 +237,98 @@ export default class UpdateService {
       });
       const parsedDocumentStateResult = DocumentStateResult.safeParse(result);
       if (parsedDocumentStateResult.success) {
-        return {
-          newStateId: parsedDocumentStateResult.data.stateId,
-          data: undefined,
-        };
+        return parsedDocumentStateResult.data.stateId;
       }
       if (isConflictResult(result, 'invalidStateId')) {
-        return this.doFallbackToUpdateFullText();
+        return this.doFallbackUpdateFullTextExclusive();
       }
       throw parsedDocumentStateResult.error;
     });
   }
 
-  private doFallbackToUpdateFullText(): Promise<StateUpdateResult<void>> {
-    if (this.pendingUpdate === undefined) {
-      throw new Error('Only a pending update can be extended');
+  async fetchOccurrences(
+    getCaretOffset: () => CancellableResult<number>,
+  ): Promise<CancellableResult<OccurrencesResult>> {
+    try {
+      await this.update();
+    } catch (error) {
+      if (error === E_CANCELED || error === E_TIMEOUT) {
+        return { cancelled: true };
+      }
+      throw error;
     }
-    log.warn('Delta update failed, performing full text update');
-    this.xtextStateId = undefined;
-    this.pendingUpdate = this.pendingUpdate.compose(this.dirtyChanges);
-    this.dirtyChanges = this.newEmptyChangeSet();
-    return this.doUpdateFullText();
+    if (!this.dirtyChanges.empty || this.mutex.isLocked()) {
+      // Just give up if another update is in progress.
+      return { cancelled: true };
+    }
+    const caretOffsetResult = getCaretOffset();
+    if (caretOffsetResult.cancelled) {
+      return { cancelled: true };
+    }
+    const expectedStateId = this.xtextStateId;
+    const data = await this.webSocketClient.send({
+      resource: this.resourceName,
+      serviceType: 'occurrences',
+      caretOffset: caretOffsetResult.data,
+      expectedStateId,
+    });
+    if (
+      // The query must have reached the server without being conflicted with an update
+      // or cancelled server-side.
+      isConflictResult(data) ||
+      // And no state update should have occurred since then.
+      this.xtextStateId !== expectedStateId ||
+      // And there should be no change to the editor text since then.
+      !this.dirtyChanges.empty ||
+      // And there should be no state update in progress.
+      this.mutex.isLocked()
+    ) {
+      return { cancelled: true };
+    }
+    const parsedOccurrencesResult = OccurrencesResult.safeParse(data);
+    if (!parsedOccurrencesResult.success) {
+      log.error(
+        'Unexpected occurences result',
+        data,
+        'not an OccurrencesResult:',
+        parsedOccurrencesResult.error,
+      );
+      throw parsedOccurrencesResult.error;
+    }
+    if (parsedOccurrencesResult.data.stateId !== expectedStateId) {
+      return { cancelled: true };
+    }
+    return { cancelled: false, data: parsedOccurrencesResult.data };
   }
 
   async fetchContentAssist(
-    params: Record<string, unknown>,
-    signal: IAbortSignal,
+    params: ContentAssistParams,
+    signal: AbortSignal,
+  ): Promise<ContentAssistEntry[]> {
+    if (!this.mutex.isLocked && this.xtextStateId !== undefined) {
+      return this.fetchContentAssistFetchOnly(params, this.xtextStateId);
+    }
+    // Content assist updates should have priority over other updates.
+    this.mutex.cancel();
+    try {
+      return await this.runExclusive(() =>
+        this.fetchContentAssistExclusive(params, signal),
+      );
+    } catch (error) {
+      if ((error === E_CANCELED || error === E_TIMEOUT) && signal.aborted) {
+        return [];
+      }
+      throw error;
+    }
+  }
+
+  private async fetchContentAssistExclusive(
+    params: ContentAssistParams,
+    signal: AbortSignal,
   ): Promise<ContentAssistEntry[]> {
-    await this.prepareForDeltaUpdate();
+    if (this.xtextStateId === undefined) {
+      await this.updateFullTextExclusive();
+    }
     if (signal.aborted) {
       return [];
     }
@@ -222,8 +336,8 @@ export default class UpdateService {
     if (delta !== undefined) {
       log.trace('Editor delta', delta);
       // Try to fetch while also performing a delta update.
-      const fetchUpdateEntries = await this.withUpdate(() =>
-        this.doFetchContentAssistWithDelta(params, delta),
+      const fetchUpdateEntries = await this.withUpdateExclusive(() =>
+        this.doFetchContentAssistWithDeltaExclusive(params, delta),
       );
       if (fetchUpdateEntries !== undefined) {
         return fetchUpdateEntries;
@@ -235,15 +349,17 @@ export default class UpdateService {
     if (this.xtextStateId === undefined) {
       throw new Error('failed to obtain Xtext state id');
     }
-    return this.doFetchContentAssistFetchOnly(params, this.xtextStateId);
+    return this.fetchContentAssistFetchOnly(params, this.xtextStateId);
   }
 
-  private async doFetchContentAssistWithDelta(
-    params: Record<string, unknown>,
+  private async doFetchContentAssistWithDeltaExclusive(
+    params: ContentAssistParams,
     delta: Delta,
   ): Promise<StateUpdateResult<ContentAssistEntry[] | undefined>> {
     const fetchUpdateResult = await this.webSocketClient.send({
       ...params,
+      resource: this.resourceName,
+      serviceType: 'assist',
       requiredStateId: this.xtextStateId,
       ...delta,
     });
@@ -256,7 +372,7 @@ export default class UpdateService {
     }
     if (isConflictResult(fetchUpdateResult, 'invalidStateId')) {
       log.warn('Server state invalid during content assist');
-      const { newStateId } = await this.doFallbackToUpdateFullText();
+      const newStateId = await this.doFallbackUpdateFullTextExclusive();
       // We must finish this state update transaction to prepare for any push events
       // before querying for content assist, so we just return `undefined` and will query
       // the content assist service later.
@@ -265,14 +381,16 @@ export default class UpdateService {
     throw parsedContentAssistResult.error;
   }
 
-  private async doFetchContentAssistFetchOnly(
-    params: Record<string, unknown>,
+  private async fetchContentAssistFetchOnly(
+    params: ContentAssistParams,
     requiredStateId: string,
   ): Promise<ContentAssistEntry[]> {
     // Fallback to fetching without a delta update.
     const fetchOnlyResult = await this.webSocketClient.send({
       ...params,
-      requiredStateId: this.xtextStateId,
+      resource: this.resourceName,
+      serviceType: 'assist',
+      requiredStateId,
     });
     const { stateId, entries: fetchOnlyEntries } =
       ContentAssistResult.parse(fetchOnlyResult);
@@ -285,14 +403,32 @@ export default class UpdateService {
   }
 
   async formatText(): Promise<void> {
-    await this.update();
+    let retries = 0;
+    while (retries < FORMAT_TEXT_RETRIES) {
+      try {
+        // eslint-disable-next-line no-await-in-loop -- Use a loop for sequential retries.
+        await this.runExclusive(() => this.formatTextExclusive());
+        return;
+      } catch (error) {
+        // Let timeout errors propagate to give up formatting on a flaky connection.
+        if (error === E_CANCELED && retries < FORMAT_TEXT_RETRIES) {
+          retries += 1;
+        } else {
+          throw error;
+        }
+      }
+    }
+  }
+
+  private async formatTextExclusive(): Promise<void> {
+    await this.updateExclusive();
     let { from, to } = this.store.state.selection.main;
     if (to <= from) {
       from = 0;
       to = this.store.state.doc.length;
     }
     log.debug('Formatting from', from, 'to', to);
-    await this.withUpdate<void>(async () => {
+    await this.withVoidUpdateExclusive(async () => {
       const result = await this.webSocketClient.send({
         resource: this.resourceName,
         serviceType: 'format',
@@ -305,7 +441,7 @@ export default class UpdateService {
         to,
         insert: formattedText,
       });
-      return { newStateId: stateId, data: undefined };
+      return stateId;
     });
   }
 
@@ -345,6 +481,28 @@ export default class UpdateService {
     });
   }
 
+  private runExclusive<T>(callback: () => Promise<T>): Promise<T> {
+    return this.mutex.runExclusive(async () => {
+      if (this.pendingUpdate !== undefined) {
+        throw new Error('Update is pending before entering critical section');
+      }
+      const result = await callback();
+      if (this.pendingUpdate !== undefined) {
+        throw new Error('Update is pending after entering critical section');
+      }
+      return result;
+    });
+  }
+
+  private withVoidUpdateExclusive(
+    callback: () => Promise<string>,
+  ): Promise<void> {
+    return this.withUpdateExclusive<void>(async () => {
+      const newStateId = await callback();
+      return { newStateId, data: undefined };
+    });
+  }
+
   /**
    * Executes an asynchronous callback that updates the state on the server.
    *
@@ -366,20 +524,18 @@ export default class UpdateService {
    * @param callback the asynchronous callback that updates the server state
    * @returns a promise resolving to the second value returned by `callback`
    */
-  private async withUpdate<T>(
+  private async withUpdateExclusive<T>(
     callback: () => Promise<StateUpdateResult<T>>,
   ): Promise<T> {
     if (this.pendingUpdate !== undefined) {
-      throw new Error('Another update is pending, will not perform update');
+      throw new Error('Delta updates are not reentrant');
     }
     this.pendingUpdate = this.dirtyChanges;
     this.dirtyChanges = this.newEmptyChangeSet();
+    let data: T;
     try {
-      const { newStateId, data } = await callback();
-      this.xtextStateId = newStateId;
+      ({ newStateId: this.xtextStateId, data } = await callback());
       this.pendingUpdate = undefined;
-      this.updatedCondition.notifyAll();
-      return data;
     } catch (e) {
       log.error('Error while update', e);
       if (this.pendingUpdate === undefined) {
@@ -389,25 +545,19 @@ export default class UpdateService {
       }
       this.pendingUpdate = undefined;
       this.webSocketClient.forceReconnectOnError();
-      this.updatedCondition.rejectAll(e);
       throw e;
     }
+    return data;
   }
 
-  /**
-   * Ensures that there is some state available on the server (`xtextStateId`)
-   * and that there is no pending update.
-   *
-   * After this function resolves, a delta text update is possible.
-   *
-   * @returns a promise resolving when there is a valid state id but no pending update
-   */
-  private async prepareForDeltaUpdate(): Promise<void> {
-    // If no update is pending, but the full text hasn't been uploaded to the server yet,
-    // we must start a full text upload.
-    if (this.pendingUpdate === undefined && this.xtextStateId === undefined) {
-      await this.updateFullText();
+  private doFallbackUpdateFullTextExclusive(): Promise<string> {
+    if (this.pendingUpdate === undefined) {
+      throw new Error('Only a pending update can be extended');
     }
-    await this.updatedCondition.waitFor();
+    log.warn('Delta update failed, performing full text update');
+    this.xtextStateId = undefined;
+    this.pendingUpdate = this.pendingUpdate.compose(this.dirtyChanges);
+    this.dirtyChanges = this.newEmptyChangeSet();
+    return this.doUpdateFullTextExclusive();
   }
 }
diff --git a/subprojects/frontend/src/xtext/ValidationService.ts b/subprojects/frontend/src/xtext/ValidationService.ts
index a0b27251..e78318f7 100644
--- a/subprojects/frontend/src/xtext/ValidationService.ts
+++ b/subprojects/frontend/src/xtext/ValidationService.ts
@@ -6,14 +6,10 @@ import type UpdateService from './UpdateService';
 import { ValidationResult } from './xtextServiceResults';
 
 export default class ValidationService {
-  private readonly store: EditorStore;
-
-  private readonly updateService: UpdateService;
-
-  constructor(store: EditorStore, updateService: UpdateService) {
-    this.store = store;
-    this.updateService = updateService;
-  }
+  constructor(
+    private readonly store: EditorStore,
+    private readonly updateService: UpdateService,
+  ) {}
 
   onPush(push: unknown): void {
     const { issues } = ValidationResult.parse(push);
diff --git a/subprojects/frontend/src/xtext/XtextClient.ts b/subprojects/frontend/src/xtext/XtextClient.ts
index 7297c674..6351c9fd 100644
--- a/subprojects/frontend/src/xtext/XtextClient.ts
+++ b/subprojects/frontend/src/xtext/XtextClient.ts
@@ -43,11 +43,7 @@ export default class XtextClient {
       this.updateService,
     );
     this.validationService = new ValidationService(store, this.updateService);
-    this.occurrencesService = new OccurrencesService(
-      store,
-      this.webSocketClient,
-      this.updateService,
-    );
+    this.occurrencesService = new OccurrencesService(store, this.updateService);
   }
 
   onTransaction(transaction: Transaction): void {
diff --git a/subprojects/frontend/src/xtext/xtextServiceResults.ts b/subprojects/frontend/src/xtext/xtextServiceResults.ts
index 4cfb9c33..e93c6714 100644
--- a/subprojects/frontend/src/xtext/xtextServiceResults.ts
+++ b/subprojects/frontend/src/xtext/xtextServiceResults.ts
@@ -26,12 +26,13 @@ export type ServiceConflictResult = z.infer<typeof ServiceConflictResult>;
 
 export function isConflictResult(
   result: unknown,
-  conflictType: Conflict,
+  conflictType?: Conflict | undefined,
 ): boolean {
   const parsedConflictResult = ServiceConflictResult.safeParse(result);
   return (
     parsedConflictResult.success &&
-    parsedConflictResult.data.conflict === conflictType
+    (conflictType === undefined ||
+      parsedConflictResult.data.conflict === conflictType)
   );
 }
 
diff --git a/yarn.lock b/yarn.lock
index ca217f1a..a8dc0ca4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1440,16 +1440,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/cache@npm:^11.10.0, @emotion/cache@npm:^11.9.3":
-  version: 11.10.0
-  resolution: "@emotion/cache@npm:11.10.0"
+"@emotion/cache@npm:^11.10.0, @emotion/cache@npm:^11.10.1":
+  version: 11.10.3
+  resolution: "@emotion/cache@npm:11.10.3"
   dependencies:
     "@emotion/memoize": ^0.8.0
     "@emotion/sheet": ^1.2.0
     "@emotion/utils": ^1.2.0
     "@emotion/weak-memoize": ^0.3.0
     stylis: 4.0.13
-  checksum: 60786e3108c35d3f79bd434119f1b6e34120fccc92f4a129bb67596944b703c3396efa51ed373f0ee3d71de780d78f4d767c264f7d76b073d06d435a2d3c1edf
+  checksum: d31291eff1b270d8db6f471b2b9b3bc5d786c296838631f101837747ff5afa8e8890655279457c68ce2cee23256ab02a25c177f5487b5061da82c7354c1bdce5
   languageName: node
   linkType: hard
 
@@ -1460,7 +1460,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/is-prop-valid@npm:^1.1.3, @emotion/is-prop-valid@npm:^1.2.0":
+"@emotion/is-prop-valid@npm:^1.2.0":
   version: 1.2.0
   resolution: "@emotion/is-prop-valid@npm:1.2.0"
   dependencies:
@@ -1586,13 +1586,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@fontsource/inter@npm:^4.5.12":
-  version: 4.5.12
-  resolution: "@fontsource/inter@npm:4.5.12"
-  checksum: 7637978d4355f52cf348bbe40a2e1bfa535c290057bef27c022343234b00c07b138c86a2b52260825c1ecc5cc9f59c68fd6ff08311111c70c04f82ace592920b
-  languageName: node
-  linkType: hard
-
 "@fontsource/jetbrains-mono@npm:^4.5.10":
   version: 4.5.10
   resolution: "@fontsource/jetbrains-mono@npm:4.5.10"
@@ -1745,12 +1738,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mui/base@npm:5.0.0-alpha.93":
-  version: 5.0.0-alpha.93
-  resolution: "@mui/base@npm:5.0.0-alpha.93"
+"@mui/base@npm:5.0.0-alpha.94":
+  version: 5.0.0-alpha.94
+  resolution: "@mui/base@npm:5.0.0-alpha.94"
   dependencies:
     "@babel/runtime": ^7.17.2
-    "@emotion/is-prop-valid": ^1.1.3
+    "@emotion/is-prop-valid": ^1.2.0
     "@mui/types": ^7.1.5
     "@mui/utils": ^5.9.3
     "@popperjs/core": ^2.11.6
@@ -1764,20 +1757,20 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 8e04ac3d7e453d8acea73884fea899db4561218ba48644b04a11dfb905dbf630a84847a28ca62bc03d678c8db749e76e150d9cf99d1fbb5ff892e6b734527c29
+  checksum: 877c7c1b53a555265332e1e677945de0415db187a7c5a7f088eaacb4f85aa20086a668915ad1885e77fa7ef4df5d35250e55f4aef2b4c5aa82f014406bbdaef3
   languageName: node
   linkType: hard
 
-"@mui/core-downloads-tracker@npm:^5.10.1":
-  version: 5.10.1
-  resolution: "@mui/core-downloads-tracker@npm:5.10.1"
-  checksum: 275fbabd9beb6d4cbbe5d6cf2a7621fb827bb7ad8be2fdd218ac3b1cc7c2ee9f69cbb71022b8a6f9ecaadbc21225015b33232fc3827dabe8db5c12fbf642cfc9
+"@mui/core-downloads-tracker@npm:^5.10.2":
+  version: 5.10.2
+  resolution: "@mui/core-downloads-tracker@npm:5.10.2"
+  checksum: 237d25f2cc8f63e4ee5f1cbe7944cb9818784535ed861ab3b8564ec4c7cbfdeb3c044596a2447c49feff987f268da30538fcb2ad194e3f7a0095d2e6edcdfdbd
   languageName: node
   linkType: hard
 
-"@mui/icons-material@npm:5.8.4":
-  version: 5.8.4
-  resolution: "@mui/icons-material@npm:5.8.4"
+"@mui/icons-material@npm:5.10.2":
+  version: 5.10.2
+  resolution: "@mui/icons-material@npm:5.10.2"
   dependencies:
     "@babel/runtime": ^7.17.2
   peerDependencies:
@@ -1787,18 +1780,18 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 1df0ffb08670628968b803c7048fc645df5e2870860759626d80a355fdef62498e60e4ebed2d47ca8b3600e6ecb6db1829bec5acf3a766ff41e518007c7e2f5b
+  checksum: 9e694babaa69c52139b7cdd12f449a3464707ae12c3cdfd8af43bcbb1f9040dce08c6cde95ea7812e7b946f49fddbf4df05bc6cf44a30eaeb1c8701786fd309d
   languageName: node
   linkType: hard
 
-"@mui/material@npm:5.10.1":
-  version: 5.10.1
-  resolution: "@mui/material@npm:5.10.1"
+"@mui/material@npm:5.10.2":
+  version: 5.10.2
+  resolution: "@mui/material@npm:5.10.2"
   dependencies:
     "@babel/runtime": ^7.17.2
-    "@mui/base": 5.0.0-alpha.93
-    "@mui/core-downloads-tracker": ^5.10.1
-    "@mui/system": ^5.10.1
+    "@mui/base": 5.0.0-alpha.94
+    "@mui/core-downloads-tracker": ^5.10.2
+    "@mui/system": ^5.10.2
     "@mui/types": ^7.1.5
     "@mui/utils": ^5.9.3
     "@types/react-transition-group": ^4.4.5
@@ -1820,7 +1813,7 @@ __metadata:
       optional: true
     "@types/react":
       optional: true
-  checksum: 47c8157757df28863f4788f551ddb55e8268a246b2691fe5f0351d83040d874314a3b483d33359824f918abb861e3c6dca91562a5999ebda456c743890e6978a
+  checksum: 2d44933c28e25b112a18cdcee4ea4c71d6eeba6b91ee33e3b66ec636c05daf3a9b03715d0a86c34a5670a3e25e39d13b10fc57aac524d52631134db0daca88de
   languageName: node
   linkType: hard
 
@@ -1841,12 +1834,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mui/styled-engine@npm:^5.10.1":
-  version: 5.10.1
-  resolution: "@mui/styled-engine@npm:5.10.1"
+"@mui/styled-engine@npm:^5.10.2":
+  version: 5.10.2
+  resolution: "@mui/styled-engine@npm:5.10.2"
   dependencies:
     "@babel/runtime": ^7.17.2
-    "@emotion/cache": ^11.9.3
+    "@emotion/cache": ^11.10.1
     csstype: ^3.1.0
     prop-types: ^15.8.1
   peerDependencies:
@@ -1858,17 +1851,17 @@ __metadata:
       optional: true
     "@emotion/styled":
       optional: true
-  checksum: 27c4003bdb1f8a76f30ed6c458789631a93efee832631edeb63940ca3ede70f8aee8e39987b1da1b8717fcbd907d00554d2b5fecc83266eee70c3637c9b66712
+  checksum: 337455da69990ef83b10f7e0ee14720b991ae2dca9c616664931edbc17f209f3f9fc0abcad97c01d70cd72afbb0760f44c9aefe27c458fb6104d4a3f0078b812
   languageName: node
   linkType: hard
 
-"@mui/system@npm:^5.10.1":
-  version: 5.10.1
-  resolution: "@mui/system@npm:5.10.1"
+"@mui/system@npm:^5.10.2":
+  version: 5.10.2
+  resolution: "@mui/system@npm:5.10.2"
   dependencies:
     "@babel/runtime": ^7.17.2
     "@mui/private-theming": ^5.9.3
-    "@mui/styled-engine": ^5.10.1
+    "@mui/styled-engine": ^5.10.2
     "@mui/types": ^7.1.5
     "@mui/utils": ^5.9.3
     clsx: ^1.2.1
@@ -1886,7 +1879,7 @@ __metadata:
       optional: true
     "@types/react":
       optional: true
-  checksum: 0acb163dec856af3813ff043b4d8441d44431add7cb234cf16d386b2b70e30cba6261b51ac936f886d746f4b3ab3475b58e33e09f76cd92a6f6aadd61dca3927
+  checksum: 07bdac55e8a29d5397579025a47258b885bd54b60cd9f7bc7214526960ba076ab975ba0a217b2420fd48960aaaec4bceea37ae404f7452cc2048c677fc91790a
   languageName: node
   linkType: hard
 
@@ -1998,7 +1991,6 @@ __metadata:
     "@codemirror/view": ^6.2.0
     "@emotion/react": ^11.10.0
     "@emotion/styled": ^11.10.0
-    "@fontsource/inter": ^4.5.12
     "@fontsource/jetbrains-mono": ^4.5.10
     "@fontsource/roboto": ^4.5.8
     "@lezer/common": ^1.0.0
@@ -2006,26 +1998,27 @@ __metadata:
     "@lezer/highlight": ^1.0.0
     "@lezer/lr": ^1.2.3
     "@material-icons/svg": ^1.0.32
-    "@mui/icons-material": 5.8.4
-    "@mui/material": 5.10.1
+    "@mui/icons-material": 5.10.2
+    "@mui/material": 5.10.2
     "@types/eslint": ^8.4.6
     "@types/html-minifier-terser": ^7.0.0
     "@types/lodash-es": ^4.17.6
-    "@types/node": ^18.7.8
+    "@types/node": ^18.7.13
     "@types/prettier": ^2.7.0
     "@types/react": ^18.0.17
     "@types/react-dom": ^18.0.6
-    "@typescript-eslint/eslint-plugin": ^5.33.1
-    "@typescript-eslint/parser": ^5.33.1
+    "@typescript-eslint/eslint-plugin": ^5.35.1
+    "@typescript-eslint/parser": ^5.35.1
     "@vitejs/plugin-react": ^2.0.1
     ansi-styles: ^6.1.0
+    async-mutex: ^0.3.2
     cross-env: ^7.0.3
     escape-string-regexp: ^5.0.0
     eslint: ^8.22.0
     eslint-config-airbnb: ^19.0.4
     eslint-config-airbnb-typescript: ^17.0.0
     eslint-config-prettier: ^8.5.0
-    eslint-import-resolver-typescript: ^3.4.2
+    eslint-import-resolver-typescript: ^3.5.0
     eslint-plugin-import: ^2.26.0
     eslint-plugin-jsx-a11y: ^6.6.1
     eslint-plugin-prettier: ^4.2.1
@@ -2044,7 +2037,7 @@ __metadata:
     react-dom: ^18.2.0
     typescript: ~4.7.4
     vite: ^3.0.9
-    vite-plugin-inject-preload: ^1.0.1
+    vite-plugin-inject-preload: ^1.1.0
     vite-plugin-pwa: ^0.12.3
     workbox-window: ^6.5.4
     zod: ^3.18.0
@@ -2198,10 +2191,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:^18.7.8":
-  version: 18.7.8
-  resolution: "@types/node@npm:18.7.8"
-  checksum: e0125efefa896083c05f549d93166109959ffdd68cb626aad0d660c0ce9de888fe405b4763b4a3c3e0968560409c272413e0ad07204522543c688e162a617ecb
+"@types/node@npm:*, @types/node@npm:^18.7.13":
+  version: 18.7.13
+  resolution: "@types/node@npm:18.7.13"
+  checksum: 45431e7e89ecaf85c7d2c180d801c132a7c59e2f8ad578726b6d71cc74e3267c18f9ccdcad738bc0479790c078f0c79efb0e58da2c6be535c15995dbb19050c9
   languageName: node
   linkType: hard
 
@@ -2287,13 +2280,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^5.33.1":
-  version: 5.33.1
-  resolution: "@typescript-eslint/eslint-plugin@npm:5.33.1"
+"@typescript-eslint/eslint-plugin@npm:^5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/eslint-plugin@npm:5.35.1"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.33.1
-    "@typescript-eslint/type-utils": 5.33.1
-    "@typescript-eslint/utils": 5.33.1
+    "@typescript-eslint/scope-manager": 5.35.1
+    "@typescript-eslint/type-utils": 5.35.1
+    "@typescript-eslint/utils": 5.35.1
     debug: ^4.3.4
     functional-red-black-tree: ^1.0.1
     ignore: ^5.2.0
@@ -2306,42 +2299,42 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: d9b6b038f70e4959ad211c84f50a38de2d00b54f0636ad76eea414fb070fa616933690da80de6668e62c8fbbeb227086322001b7d7ad1924421a232547c97936
+  checksum: 073f4dffd863881f1c87e1c217ac13bda44aaa2db12ef260032b5e8eb6ffd6b9cf6f62c85132dbf84152f353c435c66dd4f75c3bcb86eb23e926737aa4fb66fa
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^5.33.1":
-  version: 5.33.1
-  resolution: "@typescript-eslint/parser@npm:5.33.1"
+"@typescript-eslint/parser@npm:^5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/parser@npm:5.35.1"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.33.1
-    "@typescript-eslint/types": 5.33.1
-    "@typescript-eslint/typescript-estree": 5.33.1
+    "@typescript-eslint/scope-manager": 5.35.1
+    "@typescript-eslint/types": 5.35.1
+    "@typescript-eslint/typescript-estree": 5.35.1
     debug: ^4.3.4
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: fb3a4e000ce6d9583656fc3b3fb80f127a0ec1b7c3872ea469164516d993a588859ded4ec1338e6bbf2151168380d8aa29ec31027af23b50f5107949f8e7b438
+  checksum: 57ea1a1da60b370f8d5c11c86155f7339359a90f2c59e34c89f626f1a79cb440248f07bd307a27ebbbcc997d2731cb9754cdbc37639770940521a938dd89870c
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.33.1":
-  version: 5.33.1
-  resolution: "@typescript-eslint/scope-manager@npm:5.33.1"
+"@typescript-eslint/scope-manager@npm:5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/scope-manager@npm:5.35.1"
   dependencies:
-    "@typescript-eslint/types": 5.33.1
-    "@typescript-eslint/visitor-keys": 5.33.1
-  checksum: b9918d8320ea59081d19070ce952b56984e72fb2c113215e5e6a0f97deac9aae5aa67ec7a07cddb010c0f75cdf8df096ab45e9241e4b7b611acfa6d4cdfb6516
+    "@typescript-eslint/types": 5.35.1
+    "@typescript-eslint/visitor-keys": 5.35.1
+  checksum: 5a969a081309bac5962f99ee6dfdfd9c68ea677bc79d9796592dce82a36217f67aa55c7bf421b2c97b46c5149d6a9401bb4c57829595e8c19f47cfa9e8c2dd86
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:5.33.1":
-  version: 5.33.1
-  resolution: "@typescript-eslint/type-utils@npm:5.33.1"
+"@typescript-eslint/type-utils@npm:5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/type-utils@npm:5.35.1"
   dependencies:
-    "@typescript-eslint/utils": 5.33.1
+    "@typescript-eslint/utils": 5.35.1
     debug: ^4.3.4
     tsutils: ^3.21.0
   peerDependencies:
@@ -2349,23 +2342,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: ddf88835bc87b3ad946aaeb29b770a49a8e1c3c5e294ee9cb93b1936f432a1016efb97803f197eea1be61545cbc79b5526cc05e9339ca9beada22fc83801ddea
+  checksum: af317ba156f2767f76a7f97193873a00468370e157fdcc6ac19f664bc6c4c0a6836bd25028d17fdd54d339b6842fda68b82f1ce4142a222de6953625ea6c0a9c
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:5.33.1":
-  version: 5.33.1
-  resolution: "@typescript-eslint/types@npm:5.33.1"
-  checksum: 122891bd4ab4b930b1d33f3ce43a010825c1e61b9879520a0f3dc34cf92df71e2a873410845ab8d746333511c455c115eaafdec149298a161cef713829dfdb77
+"@typescript-eslint/types@npm:5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/types@npm:5.35.1"
+  checksum: a4e1001867f43f3364b109fc5a07b91ae7a34b78ab191c6c5c4695dac9bb2b80b0a602651c0b807c1c7c1fc3656d2bbd47c637afa08a09e7b1c39eae3c489e00
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.33.1":
-  version: 5.33.1
-  resolution: "@typescript-eslint/typescript-estree@npm:5.33.1"
+"@typescript-eslint/typescript-estree@npm:5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/typescript-estree@npm:5.35.1"
   dependencies:
-    "@typescript-eslint/types": 5.33.1
-    "@typescript-eslint/visitor-keys": 5.33.1
+    "@typescript-eslint/types": 5.35.1
+    "@typescript-eslint/visitor-keys": 5.35.1
     debug: ^4.3.4
     globby: ^11.1.0
     is-glob: ^4.0.3
@@ -2374,33 +2367,33 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 1418e409b141c2f012bc2dd5c40d95dfd8aa572dd3e9523ed23e4371e4459d10ecd074fda75dc770ce980686b25ffc44725eebf165c494818ed4131d1ac0239f
+  checksum: a917ca4753a3f92c8d8555c96f5414383a9742761625476fa36a019401543aa74996159afa0f7fc7fae05fe0f904e3c6f4153a55412070c8a94e8171e81084c7
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:5.33.1":
-  version: 5.33.1
-  resolution: "@typescript-eslint/utils@npm:5.33.1"
+"@typescript-eslint/utils@npm:5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/utils@npm:5.35.1"
   dependencies:
     "@types/json-schema": ^7.0.9
-    "@typescript-eslint/scope-manager": 5.33.1
-    "@typescript-eslint/types": 5.33.1
-    "@typescript-eslint/typescript-estree": 5.33.1
+    "@typescript-eslint/scope-manager": 5.35.1
+    "@typescript-eslint/types": 5.35.1
+    "@typescript-eslint/typescript-estree": 5.35.1
     eslint-scope: ^5.1.1
     eslint-utils: ^3.0.0
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: c550504d62fc72f29bf3d7a651bd3a81f49fb1fccaf47583721c2ab1abd2ef78a1e4bc392cb4be4a61a45a4f24fc14a59d67b98aac8a16a207a7cace86538cab
+  checksum: 2b04092583c3139dd090727c24fb9d7fdb1fb9f20f2e3f0141cab5b98b6a1934b0fc8cab948f7faae55588385b0f1fb7bbf91f52c705ce4528036a527c3119c6
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.33.1":
-  version: 5.33.1
-  resolution: "@typescript-eslint/visitor-keys@npm:5.33.1"
+"@typescript-eslint/visitor-keys@npm:5.35.1":
+  version: 5.35.1
+  resolution: "@typescript-eslint/visitor-keys@npm:5.35.1"
   dependencies:
-    "@typescript-eslint/types": 5.33.1
+    "@typescript-eslint/types": 5.35.1
     eslint-visitor-keys: ^3.3.0
-  checksum: 0d32a433450f61e97b5fa6b1e167f06ed395c200b16b4dbd4490a1c4941de420689b622f8a2486f5398806fb24f57b9fab901b4cbc8fdb8853f568264b3a182a
+  checksum: ef3c8377aac89935b5cc2fcf37bb3e42aa5f98848e7c22bdcbe5bb06c0fe8a1373a6897fd21109be8929b4708ad06c8874d2ef7bba17ff64911964203457330d
   languageName: node
   linkType: hard
 
@@ -2616,6 +2609,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"async-mutex@npm:^0.3.2":
+  version: 0.3.2
+  resolution: "async-mutex@npm:0.3.2"
+  dependencies:
+    tslib: ^2.3.1
+  checksum: 620b771dfdea1cad0a6b712915c31a1e3ca880a8cf1eae92b4590f435995e0260929c6ebaae0b9126b1456790ea498064b5bb9a506948cda760f48d3d0dcc4c8
+  languageName: node
+  linkType: hard
+
 "async@npm:^3.2.3":
   version: 3.2.4
   resolution: "async@npm:3.2.4"
@@ -3610,21 +3612,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-import-resolver-typescript@npm:^3.4.2":
-  version: 3.4.2
-  resolution: "eslint-import-resolver-typescript@npm:3.4.2"
+"eslint-import-resolver-typescript@npm:^3.5.0":
+  version: 3.5.0
+  resolution: "eslint-import-resolver-typescript@npm:3.5.0"
   dependencies:
     debug: ^4.3.4
     enhanced-resolve: ^5.10.0
     get-tsconfig: ^4.2.0
     globby: ^13.1.2
-    is-core-module: ^2.9.0
+    is-core-module: ^2.10.0
     is-glob: ^4.0.3
     synckit: ^0.8.3
   peerDependencies:
     eslint: "*"
     eslint-plugin-import: "*"
-  checksum: e54d8c02542cc85fc9703a064111a25585a7189b61445a209792ae50b718d273e5522be44c61f149f59292570eef6a08036d988c8477da9f6d8f3c6177801319
+  checksum: 9719d1f68b7bb0eaf8939cff2d3b02b526949f73db744877de781640650dd4d0a17d934222b9ac69e27d9f363ee4569c1aa1a2a2aab6500257517f9bf7d25976
   languageName: node
   linkType: hard
 
@@ -4492,12 +4494,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.2.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0":
-  version: 2.9.0
-  resolution: "is-core-module@npm:2.9.0"
+"is-core-module@npm:^2.10.0, is-core-module@npm:^2.2.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0":
+  version: 2.10.0
+  resolution: "is-core-module@npm:2.10.0"
   dependencies:
     has: ^1.0.3
-  checksum: b27034318b4b462f1c8f1dfb1b32baecd651d891a4e2d1922135daeff4141dfced2b82b07aef83ef54275c4a3526aa38da859223664d0868ca24182badb784ce
+  checksum: 0f3f77811f430af3256fa7bbc806f9639534b140f8ee69476f632c3e1eb4e28a38be0b9d1b8ecf596179c841b53576129279df95e7051d694dac4ceb6f967593
   languageName: node
   linkType: hard
 
@@ -6410,7 +6412,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.0.3, tslib@npm:^2.4.0":
+"tslib@npm:^2.0.3, tslib@npm:^2.3.1, tslib@npm:^2.4.0":
   version: 2.4.0
   resolution: "tslib@npm:2.4.0"
   checksum: 8c4aa6a3c5a754bf76aefc38026134180c053b7bd2f81338cb5e5ebf96fefa0f417bff221592bf801077f5bf990562f6264fecbc42cd3309b33872cb6fc3b113
@@ -6592,14 +6594,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite-plugin-inject-preload@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "vite-plugin-inject-preload@npm:1.0.1"
+"vite-plugin-inject-preload@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "vite-plugin-inject-preload@npm:1.1.0"
   dependencies:
     mime-types: ^2.1.35
   peerDependencies:
     vite: ^2.9.0 || ^3.0.0-0
-  checksum: 0504be885942752933240f99192b677c27f0f56297546e9db289312784f71f60fa30dff896f89677af7a2c84eed10bc8af33c41bd284c63a3b59379030f383fd
+  checksum: 51123f1e5bb5cf1d7830e964e0b81b4d64e92a1176b86fea6ec33ea28601673a2315a63a66fc8aa79f6dc3e8c18a847f5dfabbefee19db507aa548318f12913e
   languageName: node
   linkType: hard