document-drive 1.0.0-experimental.21 → 1.0.0-experimental.22

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "1.0.0-experimental.21",
+    "version": "1.0.0-experimental.22",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",
@@ -66,7 +66,7 @@
         "@typescript-eslint/parser": "^6.21.0",
         "@vitest/coverage-v8": "^1.4.0",
         "document-model": "1.1.0-experimental.4",
-        "document-model-libs": "1.53.0",
+        "document-model-libs": "1.52.0",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",
         "fake-indexeddb": "^5.0.2",

package/src/queue/base.ts

@@ -237,7 +237,7 @@ export class BaseQueueManager implements IQueueManager {
 
         try {
             const result = await this.delegate.processOperationJob(nextJob);
-            await queue.setResult(nextJob.jobId, result);
+            // await queue.setResult(nextJob.jobId, result);
 
             // unblock the document queues of each add_file operation
             const addFileOperations = nextJob.operations.filter((op) => op.type === "ADD_FILE");

package/src/server/index.ts

@@ -667,7 +667,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                     : merge(trunk, invertedTrunk, reshuffleByTimestamp);
 
             const newOperations = newHistory.filter(
-                (op: any) => trunk.length < 1 || precedes(trunk[trunk.length - 1]!, op)
+                (op) => trunk.length < 1 || precedes(trunk[trunk.length - 1]!, op)
             );
 
             for (const nextOperation of newOperations) {
@@ -741,7 +741,11 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
             undefined,
             documentStorage,
             undefined,
-            { checkHashes: options?.checkHashes ?? true, reuseOperationResultingState: true }
+            {
+                ...options,
+                checkHashes: options?.checkHashes ?? true,
+                reuseOperationResultingState: options?.checkHashes ?? true
+            }
         ) as T;
     }
 
@@ -792,7 +796,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                     );
                 }
             },
-            { skip: operation.skip, reuseOperationResultingState: true, storeOperationResultingState: true }
+            { skip: operation.skip, reuseOperationResultingState: true }
         ) as T;
 
         const appliedOperation = newDocument.operations[operation.scope].filter(
@@ -884,7 +888,6 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                     }
                 });
                 const unsubscribeError = this.queueManager.on('jobFailed', (job, error) => {
-                    console.log("test")
                     if (job.jobId === jobId) {
                         unsubscribe();
                         unsubscribeError();
@@ -1259,7 +1262,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         const document = await this.getDrive(drive);
         const operations = this._buildOperations(document, actions);
         const result = await this.queueDriveOperations(drive, operations);
-        return result as IOperationResult<DocumentDriveDocument>;
+        return result;
     }
 
     async addInternalListener(

package/src/server/types.ts

@@ -14,6 +14,7 @@ import type {
     Document,
     Operation,
     OperationScope,
+    ReducerOptions,
     Signal,
     State
 } from 'document-model/document';
@@ -140,7 +141,7 @@ export type PartialRecord<K extends keyof any, T> = {
 
 export type RevisionsFilter = PartialRecord<OperationScope, number>;
 
-export type GetDocumentOptions = {
+export type GetDocumentOptions = ReducerOptions & {
     revisions?: RevisionsFilter;
     checkHashes?: boolean;
 };