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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "1.0.0-experimental.10",
+    "version": "1.0.0-experimental.15",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",
@@ -34,11 +34,11 @@
         "test:watch": "vitest watch"
     },
     "peerDependencies": {
-        "document-model": "1.1.0-experimental.1",
-        "document-model-libs": "^1.37.0"
+        "document-model": "1.1.0-experimental.4",
+        "document-model-libs": "^1.52.0"
     },
     "optionalDependencies": {
-        "@prisma/client": "5.11.0",
+        "@prisma/client": "5.14.0",
         "localforage": "^1.10.0",
         "redis": "^4.6.13",
         "sequelize": "^6.35.2",
@@ -65,8 +65,8 @@
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
         "@vitest/coverage-v8": "^1.4.0",
-        "document-model": "1.1.0-experimental.1",
-        "document-model-libs": "1.50.0-arbitrum.1",
+        "document-model": "1.1.0-experimental.4",
+        "document-model-libs": "1.53.0",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",
         "fake-indexeddb": "^5.0.2",
@@ -74,7 +74,7 @@
         "msw": "^2.2.13",
         "prettier": "^3.2.5",
         "prettier-plugin-organize-imports": "^3.2.4",
-        "prisma": "^5.12.1",
+        "prisma": "^5.14.0",
         "semantic-release": "^23.0.8",
         "sequelize": "^6.37.2",
         "sqlite3": "^5.1.7",

package/src/server/index.ts

@@ -728,7 +728,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
             documentStorage.operations,
             options.revisions
         ) : documentStorage.operations;
-        const operations = baseUtils.documentHelpers.grabageCollectDocumentOperations(revisionOperations);
+        const operations = baseUtils.documentHelpers.garbageCollectDocumentOperations(revisionOperations);
 
         if (documentStorage.state && (!options || options.checkHashes === false)) {
             return documentStorage as T;
@@ -792,7 +792,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                     );
                 }
             },
-            { skip: operation.skip }
+            { skip: operation.skip, reuseOperationResultingState: true, storeOperationResultingState: true }
         ) as T;
 
         const appliedOperation = newDocument.operations[operation.scope].filter(

package/src/storage/prisma.ts

@@ -34,6 +34,7 @@ function storageToOperation(
         input: JSON.parse(op.input),
         type: op.type,
         scope: op.scope as OperationScope,
+        resultingState: op.resultingState ? JSON.parse(op.resultingState) : undefined
         // attachments: fileRegistry
     };
     if (op.context) {
@@ -137,7 +138,6 @@ export class PrismaStorage implements IDriveStorage {
                 lastModified: document.lastModified,
                 revision: JSON.stringify(document.revision),
                 id,
-                state: JSON.stringify(document.state)
             }
         });
     }
@@ -168,7 +168,8 @@ export class PrismaStorage implements IDriveStorage {
                     scope: op.scope,
                     branch: 'main',
                     skip: op.skip,
-                    context: op.context
+                    context: op.context,
+                    resultingState: op.resultingState ? JSON.stringify(op.resultingState) : undefined
                 }))
             });
 
@@ -335,7 +336,7 @@ export class PrismaStorage implements IDriveStorage {
                 DocumentDriveState,
                 DocumentDriveLocalState
             >,
-            state: JSON.parse(dbDoc.state) as State<unknown, unknown>,
+            state: JSON.parse(dbDoc.state!) as State<unknown, unknown>,
             lastModified: new Date(dbDoc.lastModified).toISOString(),
             operations: {
                 global: dbDoc.operations

package/src/queue/manager.ts

@@ -1,22 +0,0 @@
-import { Unsubscribe } from "nanoevents";
-import { IOperationResult } from "../server";
-import { IQueueManager, QueueEvents } from "./types";
-
-export class BaseQueueManager implements IQueueManager {
-
-    constructor() {
-    }
-    addJob(job: OperationJob): Promise<string> {
-        throw new Error("Method not implemented.");
-    }
-    getResult(driveId: string, documentId: string, jobId: JobId): Promise<IOperationResult | undefined> {
-        throw new Error("Method not implemented.");
-    }
-    init(processor: OperationJobProcessor, onError: (error: Error) => void): Promise<void> {
-        throw new Error("Method not implemented.");
-    }
-    on<K extends keyof QueueEvents>(this: this, event: K, cb: QueueEvents[K]): Unsubscribe {
-        throw new Error("Method not implemented.");
-    }
-
-}