document-drive 1.0.0-alpha.63 → 1.0.0-alpha.65

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "1.0.0-alpha.63",
+    "version": "1.0.0-alpha.65",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",
@@ -34,7 +34,7 @@
         "test:watch": "vitest watch"
     },
     "peerDependencies": {
-        "document-model": "1.2.0",
+        "document-model": "1.3.0",
         "document-model-libs": "^1.53.1"
     },
     "optionalDependencies": {
@@ -65,7 +65,7 @@
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "@vitest/coverage-v8": "^1.4.0",
-        "document-model": "^1.2.0",
+        "document-model": "^1.3.0",
         "document-model-libs": "^1.53.1",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",

package/src/server/index.ts

@@ -20,7 +20,7 @@ import {
     DocumentModel,
     Operation,
     OperationScope,
-    State
+    utils as DocumentUtils
 } from 'document-model/document';
 import { createNanoEvents, Unsubscribe } from 'nanoevents';
 import { ICache } from '../cache';
@@ -631,6 +631,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
 
     async _processOperations<T extends Document, A extends Action>(
         drive: string,
+        documentId: string | undefined,
         storageDocument: DocumentStorage<T>,
         operations: Operation<A | BaseAction>[]
     ) {
@@ -690,6 +691,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                 try {
                     const appliedResult = await this._performOperation(
                         drive,
+                        documentId,
                         document,
                         nextOperation,
                         skipHashValidation
@@ -739,10 +741,6 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         ) : documentStorage.operations;
         const operations = baseUtils.documentHelpers.garbageCollectDocumentOperations(revisionOperations);
 
-        if (documentStorage.state && (!options || options.checkHashes === false)) {
-            return documentStorage as T;
-        }
-
         return baseUtils.replayDocument(
             documentStorage.initialState,
             operations,
@@ -760,6 +758,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
 
     private async _performOperation<T extends Document>(
         drive: string,
+        id: string | undefined,
         document: T,
         operation: Operation,
         skipHashValidation = false
@@ -769,6 +768,25 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         const signalResults: SignalResult[] = [];
         let newDocument = document;
 
+        const scope = operation.scope;
+        const documentOperations = DocumentUtils.documentHelpers.garbageCollectDocumentOperations(
+            {
+                ...document.operations,
+                [scope]: DocumentUtils.documentHelpers.skipHeaderOperations(
+                    document.operations[scope],
+                    operation,
+                ),
+            },
+        );
+
+        const lastRemainingOperation = documentOperations[scope].at(-1);
+        // if the latest operation doesn't have a resulting state then tries
+        // to retrieve it from the db to avoid rerunning all the operations
+        if (lastRemainingOperation && !lastRemainingOperation.resultingState) {
+            lastRemainingOperation.resultingState = await (id ? this.storage.getOperationResultingState?.(drive, id, lastRemainingOperation.index, lastRemainingOperation.scope, "main") :
+                this.storage.getDriveOperationResultingState?.(drive, lastRemainingOperation.index, lastRemainingOperation.scope, "main"))
+        }
+
         const operationSignals: (() => Promise<SignalResult>)[] = [];
         newDocument = documentModel.reducer(
             newDocument,
@@ -924,6 +942,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
             await this._addOperations(drive, id, async documentStorage => {
                 const result = await this._processOperations(
                     drive,
+                    id,
                     documentStorage,
                     operations
                 );
@@ -1109,7 +1128,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                 const result = await this._processOperations<
                     DocumentDriveDocument,
                     DocumentDriveAction
-                >(drive, documentStorage, operations.slice());
+                >(drive, undefined, documentStorage, operations.slice());
 
                 document = result.document;
                 operationsApplied.push(...result.operationsApplied);

package/src/storage/prisma.ts

@@ -505,4 +505,23 @@ export class PrismaStorage implements IDriveStorage {
         });
         await this.deleteDocument('drives', id);
     }
+
+    async getOperationResultingState(driveId: string, documentId: string, index: number, scope: string, branch: string): Promise<unknown> {
+        const operation = await this.db.operation.findUnique({
+            where: {
+                unique_operation: {
+                    driveId,
+                    documentId,
+                    index,
+                    scope,
+                    branch
+                }
+            }
+        });
+        return operation?.resultingState?.toString();
+    }
+
+    getDriveOperationResultingState(drive: string, index: number, scope: string, branch: string): Promise<unknown> {
+        return this.getOperationResultingState("drives", drive, index, scope, branch);
+    }
 }

package/src/storage/types.ts

@@ -42,6 +42,7 @@ export interface IStorage {
         }>
     ): Promise<void>;
     deleteDocument(drive: string, id: string): Promise<void>;
+    getOperationResultingState?(drive: string, id: string, index: number, scope: string, branch: string): Promise<unknown>;
 }
 
 export interface IDriveStorage extends IStorage {
@@ -63,4 +64,5 @@ export interface IDriveStorage extends IStorage {
             header: DocumentHeader;
         }>
     ): Promise<void>;
+    getDriveOperationResultingState?(drive: string, index: number, scope: string, branch: string): Promise<unknown>;
 }