document-drive 1.29.0-dev.0 → 1.29.0-dev.1

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

@@ -46,9 +46,10 @@ function getRetryTransactionsClient(prisma, backOffOptions) {
 }
 export class PrismaStorage {
     db;
-    delegate;
-    constructor(db, options) {
+    cache;
+    constructor(db, cache, options) {
         const backOffOptions = options?.transactionRetryBackoff;
+        this.cache = cache;
         this.db = getRetryTransactionsClient(db, {
             ...backOffOptions,
             jitter: backOffOptions?.jitter ?? "full",
@@ -83,59 +84,37 @@ export class PrismaStorage {
             },
         });
     }
+    async get(documentId) {
+        throw new Error("Not implemented");
+    }
     ////////////////////////////////
     // IDriveStorage
     ////////////////////////////////
-    setStorageDelegate(delegate) {
-        this.delegate = delegate;
-    }
     async createDrive(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,
+        try {
+            await this.db.drive.create({
+                data: {
+                    id,
+                    slug: drive.initialState.state.global.slug ?? id,
                 },
             });
-            if (existingDrive) {
-                await this.db.drive.update({
-                    where: { id: existingDrive.id },
-                    data: {
-                        id,
-                        slug: drive.initialState.state.global.slug,
-                    },
-                });
-                return;
+        }
+        catch (e) {
+            if (e instanceof PrismaClientKnownRequestError && e.code === "P2002") {
+                throw new Error(`Drive with slug ${drive.initialState.state.global.slug ?? id} already exists`);
             }
+            throw e;
         }
-        await this.db.drive.upsert({
-            where: {
-                id,
-            },
-            create: {
-                id,
-                slug: drive.initialState.state.global.slug ?? id,
-            },
-            update: {
+        await this.db.document.create({
+            data: {
+                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,
-                slug: drive.initialState.state.global.slug ?? id,
             },
         });
     }
@@ -161,7 +140,6 @@ export class PrismaStorage {
         try {
             await tx.operation.createMany({
                 data: operations.map((op) => ({
-                    driveId: drive,
                     documentId: id,
                     hash: op.hash,
                     index: op.index,
@@ -295,19 +273,11 @@ export class PrismaStorage {
                 id,
             },
         };
-        if (driveId !== "drives") {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-            query.where.driveDocuments = {
-                some: {
-                    driveId,
-                },
-            };
-        }
         const result = await prisma.document.findUnique(query);
         if (result === null) {
             throw new Error(`Document with id ${id} not found`);
         }
-        const cachedOperations = (await this.delegate?.getCachedOperations(driveId, id)) ?? {
+        const cachedOperations = (await this.cache.getCachedOperations(driveId, id)) ?? {
             global: [],
             local: [],
         };
@@ -347,10 +317,10 @@ export class PrismaStorage {
                 ELSE NULL
             END AS "resultingState"
             FROM ranked_operations
-            WHERE "driveId" = $1 AND "documentId" = $2
+            WHERE "documentId" = $1
             AND (${conditions.join(" OR ")})
             ORDER BY scope, index;
-        `, driveId, id);
+        `, id);
         const operationIds = queryOperations.map((o) => o.id);
         const attachments = await prisma.attachment.findMany({
             where: {
@@ -474,7 +444,6 @@ export class PrismaStorage {
         const operation = await this.db.operation.findUnique({
             where: {
                 unique_operation: {
-                    driveId,
                     documentId,
                     index,
                     scope,
@@ -491,26 +460,19 @@ export class PrismaStorage {
         // TODO add branch condition
         const whereClauses = units
             .map((_, index) => {
-            return `("driveId" = $${index * 3 + 1} AND "documentId" = $${index * 3 + 2} AND "scope" = $${index * 3 + 3})`;
+            return `("documentId" = $${index * 2 + 1} AND "scope" = $${index * 2 + 2})`;
         })
             .join(" OR ");
         const query = `
-            SELECT "driveId", "documentId", "scope", "branch", MAX("timestamp") as "lastUpdated", MAX("index") as revision FROM "Operation"
+            SELECT "documentId", "scope", "branch", MAX("timestamp") as "lastUpdated", MAX("index") as revision FROM "Operation"
             WHERE ${whereClauses}
-            GROUP BY "driveId", "documentId", "scope", "branch"
+            GROUP BY "documentId", "scope", "branch"
         `;
-        const params = units
-            .map((unit) => [
-            unit.documentId ? unit.driveId : "drives",
-            unit.documentId || unit.driveId,
-            unit.scope,
-        ])
-            .flat();
+        const params = units.map((unit) => [unit.documentId, unit.scope]).flat();
         const results = await this.db.$queryRawUnsafe(query, ...params);
         return results.map((row) => ({
             ...row,
-            driveId: row.driveId === "drives" ? row.documentId : row.driveId,
-            documentId: row.driveId === "drives" ? "" : row.documentId,
+            documentId: row.documentId,
             lastUpdated: new Date(row.lastUpdated).toISOString(),
         }));
     }

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

@@ -1,12 +1,13 @@
 import { type DocumentDriveDocument } from "#drive-document-model/gen/types";
 import { type SynchronizationUnitQuery } from "#server/types";
 import type { DocumentHeader, Operation, OperationFromDocument, OperationsFromDocument, PHDocument } from "document-model";
-export interface IStorageDelegate {
+export interface IOperationsCache {
     getCachedOperations<TDocument extends PHDocument = PHDocument>(drive: string, id: string): Promise<OperationsFromDocument<TDocument> | undefined>;
 }
 export interface IDocumentStorage {
     exists(documentId: string): Promise<boolean>;
     create(documentId: string, document: PHDocument): Promise<void>;
+    get<TDocument extends PHDocument>(documentId: string): Promise<TDocument>;
 }
 export interface IStorage {
     checkDocumentExists(drive: string, id: string): Promise<boolean>;
@@ -20,9 +21,7 @@ export interface IStorage {
     }>): Promise<void>;
     deleteDocument(drive: string, id: string): Promise<void>;
     getOperationResultingState?(drive: string, id: string, index: number, scope: string, branch: string): Promise<string | undefined>;
-    setStorageDelegate?(delegate: IStorageDelegate): void;
     getSynchronizationUnitsRevision(units: SynchronizationUnitQuery[]): Promise<{
-        driveId: string;
         documentId: string;
         scope: string;
         branch: string;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/storage/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,KAAK,EACV,cAAc,EACd,SAAS,EACT,qBAAqB,EACrB,sBAAsB,EACtB,UAAU,EACX,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,gBAAgB;IAC/B,mBAAmB,CAAC,SAAS,SAAS,UAAU,GAAG,UAAU,EAC3D,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,sBAAsB,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC,CAAC;CAC3D;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,QAAQ;IACvB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACjE,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACnD,WAAW,CAAC,SAAS,SAAS,UAAU,EACtC,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,SAAS,CAAC,CAAC;IACtB,cAAc,CACZ,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,UAAU,GACnB,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,qBAAqB,CAAC,SAAS,SAAS,UAAU,EAChD,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAAE,EAC9C,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,oCAAoC,CAAC,CAAC,SAAS,SAAS,UAAU,EAChE,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,CAAC,QAAQ,EAAE,SAAS,KAAK,OAAO,CAAC;QACzC,UAAU,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAAE,CAAC;QAC/C,MAAM,EAAE,cAAc,CAAC;KACxB,CAAC,GACD,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,0BAA0B,CAAC,CACzB,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC/B,kBAAkB,CAAC,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACtD,+BAA+B,CAAC,KAAK,EAAE,wBAAwB,EAAE,GAAG,OAAO,CACzE;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,CAAC;CACH;AACD,MAAM,WAAW,aAAc,SAAQ,QAAQ;IAC7C,SAAS,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACrD,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC7D,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,kBAAkB,CAChB,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,iCAAiC,CAAC,CAChC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,CAAC,QAAQ,EAAE,qBAAqB,KAAK,OAAO,CAAC;QACrD,UAAU,EAAE,SAAS,EAAE,CAAC;QACxB,MAAM,EAAE,cAAc,CAAC;KACxB,CAAC,GACD,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,+BAA+B,CAAC,CAC9B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAChC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/storage/types.ts"],"names":[],"mappings":"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"}