document-drive 1.0.0-experimental.15 → 1.0.0-experimental.17

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "1.0.0-experimental.15",
+    "version": "1.0.0-experimental.17",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",

package/src/server/index.ts

@@ -720,6 +720,10 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
     private _buildDocument<T extends Document>(
         documentStorage: DocumentStorage<T>, options?: GetDocumentOptions
     ): T {
+        if (documentStorage.state && (!options || options.checkHashes === false)) {
+            return documentStorage as T;
+        }
+
         const documentModel = this._getDocumentModel(
             documentStorage.documentType
         );
@@ -730,10 +734,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,
@@ -741,7 +741,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
             undefined,
             documentStorage,
             undefined,
-            { checkHashes: options?.checkHashes ?? true }
+            { checkHashes: options?.checkHashes ?? true, reuseOperationResultingState: true }
         ) as T;
     }
 
@@ -841,7 +841,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         }>
     ) {
         if (!this.storage.addDocumentOperationsWithTransaction) {
-            const documentStorage = await this.storage.getDocument(drive, id);
+            const documentStorage = await this.storage.getDocument(drive, id, skip);
             const result = await callback(documentStorage);
             // saves the applied operations to storage
             if (

package/src/storage/prisma.ts

@@ -138,6 +138,7 @@ export class PrismaStorage implements IDriveStorage {
                 lastModified: document.lastModified,
                 revision: JSON.stringify(document.revision),
                 id,
+                state: JSON.stringify(document.state)
             }
         });
     }
@@ -147,8 +148,7 @@ export class PrismaStorage implements IDriveStorage {
         drive: string,
         id: string,
         operations: Operation[],
-        header: DocumentHeader,
-        newState: State<any, any> | undefined = undefined
+        state: ExtendedState<unknown, unknown>
     ): Promise<void> {
         const document = await this.getDocument(drive, id, tx);
         if (!document) {
@@ -181,7 +181,7 @@ export class PrismaStorage implements IDriveStorage {
                 data: {
                     lastModified: header.lastModified,
                     revision: JSON.stringify(header.revision),
-                    state: JSON.stringify(newState)
+                    state: JSON.stringify(header.state)
                 }
             });
         } catch (e) {
@@ -244,15 +244,14 @@ export class PrismaStorage implements IDriveStorage {
                 throw new Error(`Document with id ${id} not found`);
             }
             result = await callback(document);
-
+            console.log(result);
             const { operations, header, newState } = result;
             return this._addDocumentOperations(
                 tx,
                 drive,
                 id,
                 operations,
-                header,
-                newState
+                header as ExtendedState<unknown, unknown>,
             );
         }, { isolationLevel: "Serializable" });
 
@@ -311,18 +310,18 @@ export class PrismaStorage implements IDriveStorage {
                 id: id,
                 driveId: driveId
             },
-            include: {
-                operations: {
-                    orderBy: {
-                        index: 'asc'
-                    },
-                    include: {
-                        attachments: true
-                    }
-                }
-            }
         });
 
+        const operations = (await (tx ?? this.db).operation.findMany({
+            where: {
+                driveId: driveId,
+                documentId: id
+            },
+            orderBy: {
+                index: 'asc'
+            },
+        }))
+
         if (result === null) {
             throw new Error(`Document with id ${id} not found`);
         }
@@ -339,14 +338,14 @@ export class PrismaStorage implements IDriveStorage {
             state: JSON.parse(dbDoc.state!) as State<unknown, unknown>,
             lastModified: new Date(dbDoc.lastModified).toISOString(),
             operations: {
-                global: dbDoc.operations
+                global: operations
                     .filter(op => op.scope === 'global' && !op.clipboard)
                     .map(storageToOperation),
-                local: dbDoc.operations
+                local: operations
                     .filter(op => op.scope === 'local' && !op.clipboard)
                     .map(storageToOperation)
             },
-            clipboard: dbDoc.operations
+            clipboard: operations
                 .filter(op => op.clipboard)
                 .map(storageToOperation),
             revision: JSON.parse(dbDoc.revision) as Record<OperationScope, number>