document-drive 0.0.8 → 0.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "0.0.8",
+    "version": "0.0.10",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",
@@ -36,8 +36,8 @@
         "@typescript-eslint/eslint-plugin": "^6.12.0",
         "@typescript-eslint/parser": "^6.12.0",
         "@vitest/coverage-v8": "^0.34.6",
-        "document-model": "^1.0.15",
-        "document-model-libs": "^1.1.23",
+        "document-model": "^1.0.16",
+        "document-model-libs": "^1.1.24",
         "eslint": "^8.54.0",
         "eslint-config-prettier": "^9.0.0",
         "fake-indexeddb": "^5.0.1",

package/src/server/index.ts

@@ -40,7 +40,9 @@ export class DocumentDriveServer implements IDocumentDriveServer {
     }
 
     addDrive(drive: DriveInput) {
-        const document = utils.createDocument({ state: drive });
+        const document = utils.createDocument({
+            state: { global: drive, local: {} }
+        });
         return this.storage.saveDrive(document);
     }
 

package/src/server/types.ts

@@ -10,10 +10,7 @@ import type {
     Signal
 } from 'document-model/document';
 
-export type DriveInput = Omit<
-    DocumentDriveState,
-    '__typename' | 'remoteUrl' | 'nodes'
->;
+export type DriveInput = Omit<DocumentDriveState, '__typename' | 'nodes'>;
 
 export type CreateDocumentInput = {
     id: string;

package/src/storage/browser.ts

@@ -53,7 +53,7 @@ export class BrowserStorage implements IDriveStorage {
                 await this.db
             ).getItem<DocumentDriveDocument[]>(BrowserStorage.DRIVES_KEY)) ??
             [];
-        return drives.map(drive => drive.state.id);
+        return drives.map(drive => drive.state.global.id);
     }
 
     async getDrive(id: string) {
@@ -62,7 +62,7 @@ export class BrowserStorage implements IDriveStorage {
                 await this.db
             ).getItem<DocumentDriveDocument[]>(BrowserStorage.DRIVES_KEY)) ??
             [];
-        const drive = drives.find(drive => drive.state.id === id);
+        const drive = drives.find(drive => drive.state.global.id === id);
         if (!drive) {
             throw new Error(`Drive with id ${id} not found`);
         }
@@ -75,7 +75,9 @@ export class BrowserStorage implements IDriveStorage {
             (await db.getItem<DocumentDriveDocument[]>(
                 BrowserStorage.DRIVES_KEY
             )) ?? [];
-        const index = drives.findIndex(d => d.state.id === drive.state.id);
+        const index = drives.findIndex(
+            d => d.state.global.id === drive.state.global.id
+        );
         if (index > -1) {
             drives[index] = drive;
         } else {
@@ -94,7 +96,7 @@ export class BrowserStorage implements IDriveStorage {
             )) ?? [];
         await db.setItem(
             BrowserStorage.DRIVES_KEY,
-            drives.filter(drive => drive.state.id !== id)
+            drives.filter(drive => drive.state.global.id !== id)
         );
     }
 }

package/src/storage/filesystem.ts

@@ -120,8 +120,8 @@ export class FilesystemStorage implements IDriveStorage {
         let document: Document;
         try {
             document = await this.getDocument(FilesystemStorage.DRIVES_DIR, id);
-        } catch {
-            throw new Error(`Drive with id ${id} not found`);
+        } catch (error) {
+            throw new Error(`Drive with id ${id} not found: ${error}`);
         }
         if (isDocumentDrive(document)) {
             return document;
@@ -133,7 +133,7 @@ export class FilesystemStorage implements IDriveStorage {
     saveDrive(drive: DocumentDriveDocument) {
         return this.saveDocument(
             FilesystemStorage.DRIVES_DIR,
-            drive.state.id,
+            drive.state.global.id,
             drive
         );
     }

package/src/storage/memory.ts

@@ -52,7 +52,7 @@ export class MemoryStorage implements IDriveStorage {
     }
 
     async saveDrive(drive: DocumentDriveDocument) {
-        this.drives[drive.state.id] = drive;
+        this.drives[drive.state.global.id] = drive;
     }
 
     async deleteDrive(id: string) {

package/src/utils.ts

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