document-drive 1.28.2 → 1.28.4

package/dist/src/storage/memory.js

@@ -3,58 +3,59 @@ import { mergeOperations } from "#utils/misc";
 export class MemoryStorage {
     documents;
     drives;
+    driveManifests;
     slugToDriveId = {};
     constructor() {
         this.documents = {};
         this.drives = {};
+        this.driveManifests = {};
     }
-    exists(id) {
-        for (const drive of Object.values(this.documents)) {
-            if (drive[id]) {
-                return Promise.resolve(true);
-            }
-        }
-        return Promise.resolve(false);
+    ////////////////////////////////
+    // IDocumentStorage
+    ////////////////////////////////
+    exists(documentId) {
+        return Promise.resolve(!!this.documents[documentId]);
+    }
+    create(documentId, document) {
+        this.documents[documentId] = document;
+        return Promise.resolve();
     }
+    ////////////////////////////////
+    // IDriveStorage
+    ////////////////////////////////
     checkDocumentExists(drive, id) {
         return this.exists(id);
     }
-    async getDocuments(drive) {
-        return Object.keys(this.documents[drive] ?? {});
+    getDocuments(drive) {
+        const manifest = this.getDriveManifest(drive);
+        return Promise.resolve([...manifest.documentIds]);
     }
     async getDocument(driveId, id) {
-        const drive = this.documents[driveId];
-        if (!drive) {
-            throw new DriveNotFoundError(driveId);
-        }
-        const document = drive[id];
+        const document = this.documents[id];
         if (!document) {
             throw new Error(`Document with id ${id} not found`);
         }
         return document;
     }
     async saveDocument(drive, id, document) {
-        this.documents[drive] = this.documents[drive] ?? {};
-        this.documents[drive][id] = document;
+        this.documents[id] = document;
+        // Update the drive manifest
+        const manifest = this.getDriveManifest(drive);
+        manifest.documentIds.add(id);
+        this.updateDriveManifest(drive, manifest);
     }
     async clearStorage() {
         this.documents = {};
         this.drives = {};
+        this.driveManifests = {};
+        this.slugToDriveId = {};
     }
     async createDocument(drive, id, document) {
-        this.documents[drive] = this.documents[drive] ?? {};
-        const { operations, initialState, name, revision, documentType, created, lastModified, clipboard, state, } = document;
-        this.documents[drive][id] = {
-            operations,
-            initialState,
-            name,
-            revision,
-            documentType,
-            created,
-            lastModified,
-            clipboard,
-            state,
-        };
+        await this.create(id, document);
+        // Update the drive manifest
+        const manifest = this.getDriveManifest(drive);
+        manifest.documentIds.add(id);
+        this.updateDriveManifest(drive, manifest);
     }
     async addDocumentOperations(drive, id, operations, header) {
         const document = await this.getDocument(drive, id);
@@ -62,17 +63,23 @@ export class MemoryStorage {
             throw new Error(`Document with id ${id} not found`);
         }
         const mergedOperations = mergeOperations(document.operations, operations);
-        this.documents[drive][id] = {
+        this.documents[id] = {
             ...document,
             ...header,
             operations: mergedOperations,
         };
     }
     async deleteDocument(drive, id) {
-        if (!this.documents[drive]) {
-            throw new DriveNotFoundError(drive);
+        // delete the document from all drive manifests
+        const drives = await this.getDrives();
+        for (const driveId of drives) {
+            const manifest = this.getDriveManifest(driveId);
+            if (manifest.documentIds.has(id)) {
+                manifest.documentIds.delete(id);
+                this.updateDriveManifest(driveId, manifest);
+            }
         }
-        delete this.documents[drive][id];
+        delete this.documents[id];
     }
     async getDrives() {
         return Object.keys(this.drives);
@@ -93,7 +100,8 @@ export class MemoryStorage {
     }
     async createDrive(id, drive) {
         this.drives[id] = drive;
-        this.documents[id] = {};
+        // Initialize an empty manifest for the new drive
+        this.updateDriveManifest(id, { documentIds: new Set() });
         const { slug } = drive.initialState.state.global;
         if (slug) {
             this.slugToDriveId[slug] = id;
@@ -109,8 +117,31 @@ export class MemoryStorage {
         };
     }
     async deleteDrive(id) {
-        delete this.documents[id];
+        // Get all documents in this drive
+        const manifest = this.getDriveManifest(id);
+        // delete each document that belongs only to this drive
+        const drives = await this.getDrives();
+        await Promise.all([...manifest.documentIds].map((docId) => {
+            for (const driveId of drives) {
+                if (driveId === id) {
+                    continue;
+                }
+                const manifest = this.getDriveManifest(driveId);
+                if (manifest.documentIds.has(docId)) {
+                    return;
+                }
+            }
+            delete this.documents[docId];
+        }));
+        // Delete the drive manifest and the drive itself
+        delete this.driveManifests[id];
         delete this.drives[id];
+        // Clean up slug mapping if needed
+        for (const [slug, driveId] of Object.entries(this.slugToDriveId)) {
+            if (driveId === id) {
+                delete this.slugToDriveId[slug];
+            }
+        }
     }
     async getSynchronizationUnitsRevision(units) {
         const results = await Promise.allSettled(units.map(async (unit) => {
@@ -144,4 +175,16 @@ export class MemoryStorage {
             return acc;
         }, []);
     }
+    ////////////////////////////////
+    // Private
+    ////////////////////////////////
+    getDriveManifest(driveId) {
+        if (!this.driveManifests[driveId]) {
+            this.driveManifests[driveId] = { documentIds: new Set() };
+        }
+        return this.driveManifests[driveId];
+    }
+    updateDriveManifest(driveId, manifest) {
+        this.driveManifests[driveId] = manifest;
+    }
 }

package/dist/src/storage/prisma/index.d.ts

@@ -3,7 +3,7 @@ import type { BaseStateFromDocument, DocumentHeader, Operation, OperationFromDoc
 import { type IBackOffOptions } from "exponential-backoff";
 import { type DocumentDriveAction, type DocumentDriveDocument } from "../../drive-document-model/gen/types.js";
 import { type SynchronizationUnitQuery } from "../../server/types.js";
-import { type IDriveStorage, type IStorageDelegate } from "../types.js";
+import type { IDocumentStorage, IDriveStorage, IStorageDelegate } from "../types.js";
 export * from "./factory.js";
 type Transaction = Omit<PrismaClient<Prisma.PrismaClientOptions, never>, "$connect" | "$disconnect" | "$on" | "$transaction" | "$use" | "$extends"> | ExtendedPrismaClient;
 export type PrismaStorageOptions = {
@@ -25,10 +25,12 @@ declare function getRetryTransactionsClient<T extends PrismaClient>(prisma: T, b
     };
 }, {}>;
 type ExtendedPrismaClient = ReturnType<typeof getRetryTransactionsClient<PrismaClient>>;
-export declare class PrismaStorage implements IDriveStorage {
+export declare class PrismaStorage implements IDriveStorage, IDocumentStorage {
     private db;
     private delegate;
     constructor(db: PrismaClient, options?: PrismaStorageOptions);
+    exists(documentId: string): Promise<boolean>;
+    create(documentId: string, document: PHDocument): Promise<void>;
     setStorageDelegate(delegate: IStorageDelegate): void;
     createDrive(id: string, drive: DocumentDriveDocument): Promise<void>;
     addDriveOperations(id: string, operations: Operation<DocumentDriveAction>[], header: DocumentHeader): Promise<void>;

package/dist/src/storage/prisma/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/storage/prisma/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/storage/prisma/index.ts"],"names":[],"mappings":"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"}

package/dist/src/storage/prisma/index.js

@@ -1,6 +1,6 @@
 import { PrismaClientKnownRequestError } from "@prisma/client/runtime/library";
 import { backOff } from "exponential-backoff";
-import { ConflictOperationError, DriveNotFoundError, } from "../../server/error.js";
+import { ConflictOperationError } from "../../server/error.js";
 import { logger } from "../../utils/logger.js";
 export * from "./factory.js";
 function storageToOperation(op) {
@@ -54,22 +54,88 @@ export class PrismaStorage {
             jitter: backOffOptions?.jitter ?? "full",
         });
     }
+    ////////////////////////////////
+    // IDocumentStorage
+    ////////////////////////////////
+    async exists(documentId) {
+        const count = await this.db.document.count({
+            where: {
+                id: documentId,
+            },
+        });
+        return count > 0;
+    }
+    async create(documentId, document) {
+        await this.db.document.upsert({
+            where: {
+                id: documentId,
+            },
+            update: {},
+            create: {
+                name: document.name,
+                documentType: document.documentType,
+                isDrive: false,
+                initialState: JSON.stringify(document.initialState),
+                lastModified: document.lastModified,
+                revision: JSON.stringify(document.revision),
+                meta: document.meta ? JSON.stringify(document.meta) : undefined,
+                id: documentId,
+            },
+        });
+    }
+    ////////////////////////////////
+    // IDriveStorage
+    ////////////////////////////////
     setStorageDelegate(delegate) {
         this.delegate = delegate;
     }
     async createDrive(id, drive) {
-        // drive for all drive documents
-        await this.createDocument("drives", id, drive);
+        const doc = {
+            name: drive.name,
+            documentType: drive.documentType,
+            isDrive: true,
+            initialState: JSON.stringify(drive.initialState),
+            lastModified: drive.lastModified,
+            revision: JSON.stringify(drive.revision),
+            meta: drive.meta ? JSON.stringify(drive.meta) : undefined,
+            id,
+        };
+        await this.db.document.upsert({
+            where: {
+                id,
+            },
+            update: doc,
+            create: doc,
+        });
+        // backwards compatibility -- if the drive has a slug, check if it already exists
+        if (drive.initialState.state.global.slug) {
+            const existingDrive = await this.db.drive.findFirst({
+                where: {
+                    slug: drive.initialState.state.global.slug,
+                },
+            });
+            if (existingDrive) {
+                await this.db.drive.update({
+                    where: { id: existingDrive.id },
+                    data: {
+                        id,
+                        slug: drive.initialState.state.global.slug,
+                    },
+                });
+                return;
+            }
+        }
         await this.db.drive.upsert({
             where: {
-                slug: drive.initialState.state.global.slug ?? id,
+                id,
             },
             create: {
-                id: id,
+                id,
                 slug: drive.initialState.state.global.slug ?? id,
             },
             update: {
                 id,
+                slug: drive.initialState.state.global.slug ?? id,
             },
         });
     }
@@ -80,24 +146,15 @@ export class PrismaStorage {
         return this.addDocumentOperationsWithTransaction("drives", drive, (document) => callback(document));
     }
     async createDocument(drive, id, document) {
-        await this.db.document.upsert({
+        await this.create(id, document);
+        // create the many-to-many relation
+        await this.db.document.update({
             where: {
-                id_driveId: {
-                    id,
-                    driveId: drive,
-                },
-            },
-            update: {},
-            create: {
-                name: document.name,
-                documentType: document.documentType,
-                driveId: drive,
-                initialState: JSON.stringify(document.initialState),
-                lastModified: document.lastModified,
-                revision: JSON.stringify(document.revision),
-                meta: document.meta ? JSON.stringify(document.meta) : undefined,
                 id,
             },
+            data: {
+                driveDocuments: { create: { driveId: drive } },
+            },
         });
     }
     async _addDocumentOperations(tx, drive, id, operations, header) {
@@ -124,7 +181,6 @@ export class PrismaStorage {
             await tx.document.updateMany({
                 where: {
                     id,
-                    driveId: drive,
                 },
                 data: {
                     lastModified: header.lastModified,
@@ -210,10 +266,9 @@ export class PrismaStorage {
                 id: true,
             },
             where: {
-                AND: {
-                    driveId: drive,
-                    NOT: {
-                        id: "drives",
+                driveDocuments: {
+                    some: {
+                        driveId: drive,
                     },
                 },
             },
@@ -224,21 +279,31 @@ export class PrismaStorage {
         const count = await this.db.document.count({
             where: {
                 id: id,
-                driveId: driveId,
+                driveDocuments: {
+                    some: {
+                        driveId: driveId,
+                    },
+                },
             },
         });
         return count > 0;
     }
     async getDocument(driveId, id, tx) {
         const prisma = tx ?? this.db;
-        const result = await prisma.document.findUnique({
+        const query = {
             where: {
-                id_driveId: {
+                id,
+            },
+        };
+        if (driveId !== "drives") {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            query.where.driveDocuments = {
+                some: {
                     driveId,
-                    id,
                 },
-            },
-        });
+            };
+        }
+        const result = await prisma.document.findUnique(query);
         if (result === null) {
             throw new Error(`Document with id ${id} not found`);
         }
@@ -327,10 +392,25 @@ export class PrismaStorage {
     }
     async deleteDocument(drive, id) {
         try {
+            // delete out of drives
+            await this.db.drive.deleteMany({
+                where: {
+                    driveDocuments: {
+                        none: {
+                            documentId: id,
+                        },
+                    },
+                },
+            });
+            // delete document
             await this.db.document.deleteMany({
                 where: {
-                    driveId: drive,
-                    id: id,
+                    driveDocuments: {
+                        some: {
+                            driveId: drive,
+                        },
+                    },
+                    id,
                 },
             });
         }
@@ -345,17 +425,15 @@ export class PrismaStorage {
         }
     }
     async getDrives() {
-        return this.getDocuments("drives");
+        const drives = await this.db.drive.findMany({
+            select: {
+                id: true,
+            },
+        });
+        return drives.map((d) => d.id);
     }
     async getDrive(id) {
-        try {
-            const doc = await this.getDocument("drives", id);
-            return doc;
-        }
-        catch (e) {
-            logger.error(e);
-            throw new DriveNotFoundError(id);
-        }
+        return this.getDocument("drives", id);
     }
     async getDriveBySlug(slug) {
         const driveEntity = await this.db.drive.findFirst({
@@ -369,18 +447,26 @@ export class PrismaStorage {
         return this.getDrive(driveEntity.id);
     }
     async deleteDrive(id) {
-        // delete drive and associated slug
-        await this.db.drive.deleteMany({
+        // delete drive
+        await this.db.drive.delete({
             where: {
                 id,
             },
         });
-        // delete drive document and its operations
-        await this.deleteDocument("drives", id);
-        // deletes all documents of the drive
+        // delete drive document (will cascade)
+        await this.db.document.delete({
+            where: {
+                id,
+            },
+        });
+        // deletes all documents that only belong to this drive
         await this.db.document.deleteMany({
             where: {
-                driveId: id,
+                driveDocuments: {
+                    none: {
+                        driveId: id,
+                    },
+                },
             },
         });
     }

package/dist/src/storage/sequelize.d.ts

@@ -1,33 +1,2 @@
-import { type DocumentDriveAction, type DocumentDriveDocument } from "#drive-document-model/gen/types";
-import { type SynchronizationUnitQuery } from "#server/types";
-import { type AttachmentInput, type DocumentHeader, type Operation, type PHDocument } from "document-model";
-import { type Options, Sequelize } from "sequelize";
-import { type IDocumentStorage, type IDriveStorage } from "./types.js";
-export declare class SequelizeStorage implements IDriveStorage, IDocumentStorage {
-    private db;
-    constructor(options: Options);
-    syncModels(): Promise<Sequelize>;
-    createDrive(id: string, drive: DocumentDriveDocument): Promise<void>;
-    addDriveOperations(id: string, operations: Operation<DocumentDriveAction>[], header: DocumentHeader): Promise<void>;
-    createDocument(drive: string, id: string, document: PHDocument): Promise<void>;
-    addDocumentOperations(drive: string, id: string, operations: Operation[], header: DocumentHeader): Promise<void>;
-    _addDocumentOperationAttachments(driveId: string, documentId: string, operation: Operation, attachments: AttachmentInput[]): Promise<import("sequelize").Model<any, any>[]>;
-    getDocuments(drive: string): Promise<string[]>;
-    exists(id: string): Promise<boolean>;
-    checkDocumentExists(drive: string, id: string): Promise<boolean>;
-    getDocument<TDocument extends PHDocument>(driveId: string, id: string): Promise<TDocument>;
-    deleteDocument(drive: string, id: string): Promise<void>;
-    getDrives(): Promise<string[]>;
-    getDrive(id: string): Promise<DocumentDriveDocument>;
-    getDriveBySlug(slug: string): Promise<DocumentDriveDocument>;
-    deleteDrive(id: string): Promise<void>;
-    getSynchronizationUnitsRevision(units: SynchronizationUnitQuery[]): Promise<{
-        driveId: string;
-        documentId: string;
-        scope: string;
-        branch: string;
-        lastUpdated: string;
-        revision: number;
-    }[]>;
-}
+export {};
 //# sourceMappingURL=sequelize.d.ts.map

package/dist/src/storage/sequelize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sequelize.d.ts","sourceRoot":"","sources":["../../../src/storage/sequelize.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAG3B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAEnB,KAAK,SAAS,EAEd,KAAK,UAAU,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAa,KAAK,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC/D,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAEvE,qBAAa,gBAAiB,YAAW,aAAa,EAAE,gBAAgB;IACtE,OAAO,CAAC,EAAE,CAAY;gBAEV,OAAO,EAAE,OAAO;IAIrB,UAAU;IAuGX,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAKpE,kBAAkB,CACtB,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,SAAS,CAAC,mBAAmB,CAAC,EAAE,EAC5C,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAGV,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,UAAU,GACnB,OAAO,CAAC,IAAI,CAAC;IAiBV,qBAAqB,CACzB,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAyEV,gCAAgC,CACpC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,eAAe,EAAE;IAuB1B,YAAY,CAAC,KAAK,EAAE,MAAM;IAoB1B,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAcpC,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIhE,WAAW,CAAC,SAAS,SAAS,UAAU,EAC5C,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,SAAS,CAAC;IA6Ef,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IAcxC,SAAS;IAIT,QAAQ,CAAC,EAAE,EAAE,MAAM;IAKnB,cAAc,CAAC,IAAI,EAAE,MAAM;IAoB3B,WAAW,CAAC,EAAE,EAAE,MAAM;IAwBtB,+BAA+B,CACnC,KAAK,EAAE,wBAAwB,EAAE,GAChC,OAAO,CACR;QACE,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;KAClB,EAAE,CACJ;CA2CF"}
+{"version":3,"file":"sequelize.d.ts","sourceRoot":"","sources":["../../../src/storage/sequelize.ts"],"names":[],"mappings":""}