document-drive 0.0.18 → 0.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "document-drive",
-    "version": "0.0.18",
+    "version": "0.0.20",
     "license": "AGPL-3.0-only",
     "type": "module",
     "module": "./src/index.ts",
@@ -33,7 +33,6 @@
         "sanitize-filename": "^1.6.3"
     },
     "devDependencies": {
-        "@types/proper-lockfile": "^4.1.4",
         "@typescript-eslint/eslint-plugin": "^6.12.0",
         "@typescript-eslint/parser": "^6.12.0",
         "@vitest/coverage-v8": "^0.34.6",
@@ -45,7 +44,6 @@
         "localforage": "^1.10.0",
         "prettier": "^3.1.0",
         "prettier-plugin-organize-imports": "^3.2.4",
-        "tsx": "^4.6.2",
         "typescript": "^5.3.2",
         "vitest": "^0.34.6"
     }

package/src/server/index.ts

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

package/src/server/types.ts

@@ -1,16 +1,21 @@
 import type {
     DocumentDriveAction,
     DocumentDriveDocument,
+    DocumentDriveLocalState,
     DocumentDriveState
 } from 'document-model-libs/document-drive';
 import type {
     BaseAction,
     Document,
     Operation,
-    Signal
+    Signal,
+    State
 } from 'document-model/document';
 
-export type DriveInput = Omit<DocumentDriveState, '__typename' | 'nodes'>;
+export type DriveInput = State<
+    Omit<DocumentDriveState, '__typename' | 'nodes'>,
+    DocumentDriveLocalState
+>;
 
 export type CreateDocumentInput = {
     id: string;

package/src/storage/filesystem.ts

@@ -1,7 +1,13 @@
 import { DocumentDriveDocument } from 'document-model-libs/document-drive';
 import { Document } from 'document-model/document';
 import type { Dirent } from 'fs';
-import { existsSync, mkdirSync, writeFileSync } from 'fs';
+import {
+    existsSync,
+    mkdirSync,
+    readFileSync,
+    readdirSync,
+    writeFileSync
+} from 'fs';
 import fs from 'fs/promises';
 import path from 'path';
 import sanitize from 'sanitize-filename';
@@ -46,7 +52,7 @@ export class FilesystemStorage implements IDriveStorage {
     async getDocuments(drive: string) {
         let files: Dirent[] = [];
         try {
-            files = await fs.readdir(path.join(this.basePath, drive), {
+            files = readdirSync(path.join(this.basePath, drive), {
                 withFileTypes: true
             });
         } catch (error) {
@@ -72,10 +78,9 @@ export class FilesystemStorage implements IDriveStorage {
 
     async getDocument(drive: string, id: string) {
         try {
-            const content = await fs.readFile(
-                this._buildDocumentPath(drive, id),
-                { encoding: 'utf-8' }
-            );
+            const content = readFileSync(this._buildDocumentPath(drive, id), {
+                encoding: 'utf-8'
+            });
             return JSON.parse(content);
         } catch (error) {
             console.error(error);
@@ -96,7 +101,7 @@ export class FilesystemStorage implements IDriveStorage {
     }
 
     async getDrives() {
-        const files = await fs.readdir(this.drivesPath, {
+        const files = await readdirSync(this.drivesPath, {
             withFileTypes: true
         });
         const drives: string[] = [];