Merge pull request #530 from lblod/feature/datastore-on-demand

feat(datastore): make datastore lazy
lblod · Jan 12, 2023 · 3f85c0b · 3f85c0b
2 parents fa467d8 + b9d2484
commit 3f85c0b
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 40 deletions.
diff --git a/addon/core/prosemirror.ts b/addon/core/prosemirror.ts
@@ -212,7 +212,7 @@ export class ProseController {
   }
 
   get datastore(): ProseStore {
-    return unwrap(datastoreKey.getState(this.pm.state));
+    return unwrap(datastoreKey.getState(this.pm.state))();
   }
 
   get widgets() {

diff --git a/addon/plugins/datastore/index.ts b/addon/plugins/datastore/index.ts
@@ -11,13 +11,16 @@ import {
 import { Mark, PNode, ProsePlugin, Schema } from '@lblod/ember-rdfa-editor';
 import { map, objectFrom } from 'iter-tools';
 import { ProseReferenceManager } from '@lblod/ember-rdfa-editor/core/prosemirror';
-import { createLogger } from '@lblod/ember-rdfa-editor/utils/logging-utils';
+import {
+  createLogger,
+  Logger,
+} from '@lblod/ember-rdfa-editor/utils/logging-utils';
 import { DOMSerializer, MarkType } from 'prosemirror-model';
 import { isElement, tagName } from '@lblod/ember-rdfa-editor/utils/dom-helpers';
 import { Option, unwrap } from '@lblod/ember-rdfa-editor/utils/option';
 import ArrayUtils from '@lblod/ember-rdfa-editor/utils/array-utils';
 
-export const datastoreKey = new PluginKey<ProseStore>('datastore');
+export const datastoreKey = new PluginKey<() => ProseStore>('datastore');
 
 export { ProseStore } from '@lblod/ember-rdfa-editor/utils/datastore/prose-store';
 
@@ -62,57 +65,57 @@ export interface DatastorePluginArgs {
 export function datastore({
   pathFromRoot,
   baseIRI,
-}: DatastorePluginArgs): ProsePlugin<ProseStore> {
+}: DatastorePluginArgs): ProsePlugin<() => ProseStore> {
   const logger = createLogger('datastore');
-  return new ProsePlugin({
+  return new ProsePlugin<() => ProseStore>({
     key: datastoreKey,
     state: {
-      init(config: EditorStateConfig, state: EditorState) {
-        const refman = new ProseReferenceManager();
-        const store = proseStoreFromParse({
-          root: { node: state.doc, from: -1, to: state.doc.nodeSize },
-          textContent,
-          tag,
-          children: children(state.schema, refman),
-          attributes,
-          isText,
-
-          pathFromDomRoot: pathFromRoot,
-          baseIRI,
-        });
-
-        logger(`parsed ${store.size} triples`);
-        return store;
+      init(config: EditorStateConfig, state: EditorState): () => ProseStore {
+        return createDataStoreGetter(state, pathFromRoot, baseIRI, logger);
       },
       apply(
         tr: Transaction,
-        oldStore: ProseStore,
+        oldStore: () => ProseStore,
         oldState: EditorState,
         newState: EditorState
       ) {
-        const refman = new ProseReferenceManager();
-        if (tr.docChanged) {
-          const newStore = proseStoreFromParse({
-            root: { node: newState.doc, from: -1, to: newState.doc.nodeSize },
-            textContent,
-            tag,
-            children: children(newState.schema, refman),
-            attributes,
-            isText: isText,
-
-            pathFromDomRoot: pathFromRoot,
-            baseIRI,
-          });
-          logger(`parsed ${newStore.size} triples`);
-          return newStore;
-        } else {
-          return oldStore;
-        }
+        return createDataStoreGetter(newState, pathFromRoot, baseIRI, logger);
       },
     },
   });
 }
 
+let stateCache: { state: EditorState; store: ProseStore };
+
+function createDataStoreGetter(
+  state: EditorState,
+  pathFromRoot: Node[],
+  baseIRI: string,
+  logger: Logger
+) {
+  const refman = new ProseReferenceManager();
+  return function () {
+    if (stateCache && stateCache.state === state) {
+      return stateCache.store;
+    } else {
+      const store = proseStoreFromParse({
+        root: { node: state.doc, from: -1, to: state.doc.nodeSize },
+        textContent,
+        tag,
+        children: children(state.schema, refman),
+        attributes,
+        isText,
+
+        pathFromDomRoot: pathFromRoot,
+        baseIRI,
+      });
+      logger(`parsed ${store.size} triples`);
+      stateCache = { state, store };
+      return store;
+    }
+  };
+}
+
 function textContent(resolvedNode: ResolvedPNode): string {
   if (isElementPNode(resolvedNode)) {
     return resolvedNode.node.textContent;