document-drive 1.0.0-experimental.7 → 1.0.0-experimental.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "1.0.0-experimental.7",
+    "version": "1.0.0-experimental.9",
     "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.1",
-        "document-model-libs": "^1.37.0",
+        "document-model-libs": "1.50.0-arbitrum.1",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",
         "fake-indexeddb": "^5.0.2",

package/src/server/index.ts

@@ -20,6 +20,7 @@ import {
     DocumentModel,
     Operation,
     OperationScope,
+    State
 } from 'document-model/document';
 import { createNanoEvents, Unsubscribe } from 'nanoevents';
 import { ICache } from '../cache';
@@ -575,11 +576,13 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         input: CreateDocumentInput
     ) {
         // if a document was provided then checks if it's valid
+        let state = undefined;
         if (input.document) {
             if (input.documentType !== input.document.documentType) {
                 throw new Error(`Provided document is not ${input.documentType}`);
             }
-            this._buildDocument(input.document);
+            const doc = this._buildDocument(input.document);
+            state = doc.state;
         }
 
         // if no document was provided then create a new one
@@ -596,6 +599,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
             operations: { global: [], local: [] },
             initialState: document.initialState,
             clipboard: [],
+            state: state ?? document.state
         };
         await this.storage.createDocument(driveId, input.id, documentStorage);
 
@@ -663,7 +667,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
                     : merge(trunk, invertedTrunk, reshuffleByTimestamp);
 
             const newOperations = newHistory.filter(
-                op => trunk.length < 1 || precedes(trunk[trunk.length - 1]!, op)
+                (op: any) => trunk.length < 1 || precedes(trunk[trunk.length - 1]!, op)
             );
 
             for (const nextOperation of newOperations) {
@@ -726,6 +730,10 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         ) : documentStorage.operations;
         const operations = baseUtils.documentHelpers.grabageCollectDocumentOperations(revisionOperations);
 
+        if (documentStorage.state && (!options || options.checkHashes === false)) {
+            return documentStorage as T;
+        }
+
         return baseUtils.replayDocument(
             documentStorage.initialState,
             operations,
@@ -829,6 +837,7 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
         callback: (document: DocumentStorage) => Promise<{
             operations: Operation[];
             header: DocumentHeader;
+            newState: State<any, any> | undefined;
         }>
     ) {
         if (!this.storage.addDocumentOperationsWithTransaction) {
@@ -920,7 +929,8 @@ export class DocumentDriveServer extends BaseDocumentDriveServer {
 
                 return {
                     operations: result.operationsApplied,
-                    header: result.document
+                    header: result.document,
+                    newState: document.state
                 };
             });
 

package/src/server/listener/transmitter/pull-responder.ts

@@ -374,9 +374,6 @@ export class PullResponderTransmitter implements IPullResponderTransmitter {
     static isPullResponderTrigger(
         trigger: Trigger
     ): trigger is PullResponderTrigger {
-        return (
-            trigger.type === 'PullResponder' &&
-            z.PullResponderTriggerDataSchema().safeParse(trigger.data).success
-        );
+        return trigger.type === 'PullResponder';
     }
 }

package/src/storage/memory.ts

@@ -59,7 +59,8 @@ export class MemoryStorage implements IDriveStorage {
             documentType,
             created,
             lastModified,
-            clipboard
+            clipboard,
+            state
         } = document;
         this.documents[drive]![id] = {
             operations,
@@ -69,7 +70,8 @@ export class MemoryStorage implements IDriveStorage {
             documentType,
             created,
             lastModified,
-            clipboard
+            clipboard,
+            state
         };
     }
 

package/src/storage/prisma.ts

@@ -11,7 +11,8 @@ import type {
     DocumentHeader,
     ExtendedState,
     Operation,
-    OperationScope
+    OperationScope,
+    State
 } from 'document-model/document';
 import { ConflictOperationError } from '../server/error';
 import { logger } from '../utils/logger';
@@ -132,10 +133,11 @@ export class PrismaStorage implements IDriveStorage {
                 name: document.name,
                 documentType: document.documentType,
                 driveId: drive,
-                initialState: document.initialState as Prisma.InputJsonObject,
+                initialState: JSON.stringify(document.initialState),
                 lastModified: document.lastModified,
-                revision: document.revision,
-                id
+                revision: JSON.stringify(document.revision),
+                id,
+                state: JSON.stringify(document.initialState)
             }
         });
     }
@@ -146,6 +148,7 @@ export class PrismaStorage implements IDriveStorage {
         id: string,
         operations: Operation[],
         header: DocumentHeader,
+        newState: State<any, any> | undefined = undefined
     ): Promise<void> {
         const document = await this.getDocument(drive, id, tx);
         if (!document) {
@@ -176,7 +179,8 @@ export class PrismaStorage implements IDriveStorage {
                 },
                 data: {
                     lastModified: header.lastModified,
-                    revision: header.revision
+                    revision: JSON.stringify(header.revision),
+                    state: JSON.stringify(newState)
                 }
             });
         } catch (e) {
@@ -224,11 +228,13 @@ export class PrismaStorage implements IDriveStorage {
         callback: (document: DocumentStorage) => Promise<{
             operations: Operation[];
             header: DocumentHeader;
+            newState?: State<any, any> | undefined
         }>
     ) {
         let result: {
             operations: Operation[];
             header: DocumentHeader;
+            newState?: State<any, any> | undefined;
         } | null = null;
 
         await this.db.$transaction(async tx => {
@@ -238,13 +244,14 @@ export class PrismaStorage implements IDriveStorage {
             }
             result = await callback(document);
 
-            const { operations, header } = result;
+            const { operations, header, newState } = result;
             return this._addDocumentOperations(
                 tx,
                 drive,
                 id,
                 operations,
                 header,
+                newState
             );
         }, { isolationLevel: "Serializable" });
 
@@ -324,10 +331,11 @@ export class PrismaStorage implements IDriveStorage {
             created: dbDoc.created.toISOString(),
             name: dbDoc.name ? dbDoc.name : '',
             documentType: dbDoc.documentType,
-            initialState: dbDoc.initialState as ExtendedState<
+            initialState: JSON.parse(dbDoc.initialState) as ExtendedState<
                 DocumentDriveState,
                 DocumentDriveLocalState
             >,
+            state: JSON.parse(dbDoc.state) as State<unknown, unknown>,
             lastModified: new Date(dbDoc.lastModified).toISOString(),
             operations: {
                 global: dbDoc.operations
@@ -340,7 +348,7 @@ export class PrismaStorage implements IDriveStorage {
             clipboard: dbDoc.operations
                 .filter(op => op.clipboard)
                 .map(storageToOperation),
-            revision: dbDoc.revision as Record<OperationScope, number>
+            revision: JSON.parse(dbDoc.revision) as Record<OperationScope, number>
         };
 
         return doc;

package/src/storage/types.ts

@@ -6,12 +6,14 @@ import type {
     BaseAction,
     Document,
     DocumentHeader,
-    Operation
+    ExtendedState,
+    Operation,
+    State
 } from 'document-model/document';
 
 export type DocumentStorage<D extends Document = Document> = Omit<
     D,
-    'state' | 'attachments'
+    'attachments'
 >;
 
 export type DocumentDriveStorage = DocumentStorage<DocumentDriveDocument>;
@@ -37,6 +39,7 @@ export interface IStorage {
         callback: (document: DocumentStorage) => Promise<{
             operations: Operation[];
             header: DocumentHeader;
+            newState: State<any, any> | undefined
         }>
     ): Promise<void>;
     deleteDocument(drive: string, id: string): Promise<void>;

package/src/utils/index.ts

@@ -27,8 +27,7 @@ export function isDocumentDrive(
     document: Document
 ): document is DocumentDriveDocument {
     return (
-        document.documentType === DocumentDriveModel.id &&
-        z.DocumentDriveStateSchema().safeParse(document.state.global).success
+        document.documentType === DocumentDriveModel.id
     );
 }