document-drive 1.0.0-alpha.100 → 1.0.0-alpha.102

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "document-drive",
-  "version": "1.0.0-alpha.100",
+  "version": "1.0.0-alpha.102",
   "license": "AGPL-3.0-only",
   "type": "module",
   "module": "./src/index.ts",
@@ -26,8 +26,8 @@
     "./src"
   ],
   "peerDependencies": {
-    "document-model": "^1.8.0",
-    "document-model-libs": "^1.90.1"
+    "document-model": "^2.1.0",
+    "document-model-libs": "^1.92.0"
   },
   "optionalDependencies": {
     "@prisma/client": "^5.18.0",
@@ -53,7 +53,6 @@
     "@types/uuid": "^9.0.8",
     "@vitest/browser": "^2.0.5",
     "@vitest/coverage-v8": "^2.0.5",
-    "document-model-libs": "^1.90.1",
     "fake-indexeddb": "^5.0.2",
     "localforage": "^1.10.0",
     "msw": "^2.3.1",
@@ -64,18 +63,20 @@
     "vitest": "^2.0.5",
     "webdriverio": "^9.0.9",
     "vitest-fetch-mock": "^0.3.0",
+    "document-model-libs": "1.92.0",
     "document-model": "2.1.0"
   },
   "packageManager": "pnpm@9.1.4+sha256.30a1801ac4e723779efed13a21f4c39f9eb6c9fbb4ced101bce06b422593d7c9",
   "scripts": {
     "check-types": "tsc --noemit --emitDeclarationOnly false --project tsconfig.json",
-    "lint": "eslint src --ext .js,.jsx,.ts,.tsx && yarn check-types",
+    "lint": "eslint src --ext .js,.jsx,.ts,.tsx && pnpm run check-types",
     "lint:fix": "eslint src --ext .js,.jsx,.ts,.tsx --fix",
     "format": "prettier . --write",
     "release": "semantic-release",
     "test": "vitest run --coverage --exclude \"test/flaky/**\"",
     "test:watch": "vitest watch",
     "clean": "rimraf dist",
-    "clean:node_modules": "rimraf node_modules"
+    "clean:node_modules": "rimraf node_modules",
+    "build": " "
   }
 }

package/src/index.ts

@@ -2,3 +2,5 @@ export * from './server';
 export * from './server/error';
 export * from './storage';
 export * from './utils';
+
+export const test = 'test';

package/src/server/index.ts

@@ -184,6 +184,15 @@ export class BaseDocumentDriveServer
         this.initializePromise = this._initialize();
     }
 
+    setDocumentModels(models: DocumentModel[]): void {
+        this.documentModels = [...models];
+        this.emit('documentModels', [...models]);
+    }
+
+    initializeDefaultRemoteDrives() {
+        return this.defaultDrivesManager.initializeDefaultRemoteDrives();
+    }
+
     getDefaultRemoteDrives() {
         return this.defaultDrivesManager.getDefaultRemoteDrives();
     }
@@ -191,6 +200,7 @@ export class BaseDocumentDriveServer
     setDefaultDriveAccessLevel(url: string, level: RemoteDriveAccessLevel) {
         return this.defaultDrivesManager.setDefaultDriveAccessLevel(url, level);
     }
+
     setAllDefaultDrivesAccessLevel(level: RemoteDriveAccessLevel) {
         return this.defaultDrivesManager.setAllDefaultDrivesAccessLevel(level);
     }
@@ -626,7 +636,9 @@ export class BaseDocumentDriveServer
             });
         }
 
-        await this.defaultDrivesManager.initializeDefaultRemoteDrives();
+        if (this.options.defaultDrives.loadOnInit !== false) {
+            await this.defaultDrivesManager.initializeDefaultRemoteDrives();
+        }
 
         // if network connect comes back online
         // then triggers the listeners update

package/src/server/types.ts

@@ -202,6 +202,7 @@ export interface DriveEvents {
         status: number,
         errorMessage: string
     ) => void;
+    documentModels: (documentModels: DocumentModel[]) => void;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -294,6 +295,7 @@ export type RemoveOldRemoteDrivesOption =
 
 export type DocumentDriveServerOptions = {
     defaultDrives: {
+        loadOnInit?: boolean; // defaults to true
         remoteDrives?: Array<DefaultRemoteDriveInput>;
         removeOldRemoteDrives?: RemoveOldRemoteDrivesOption;
     };
@@ -313,6 +315,8 @@ export type GetStrandsOptions = {
 
 export abstract class AbstractDocumentDriveServer {
     /** Public methods **/
+    abstract initialize(): Promise<Error[] | null>;
+    abstract setDocumentModels(models: DocumentModel[]): void;
     abstract getDrives(): Promise<string[]>;
     abstract addDrive(drive: DriveInput): Promise<DocumentDriveDocument>;
     abstract addRemoteDrive(

package/src/storage/prisma.ts

@@ -485,6 +485,7 @@ export class PrismaStorage implements IDriveStorage {
                 DocumentDriveState,
                 DocumentDriveLocalState
             >,
+            // @ts-expect-error TODO: fix as this should not be undefined
             state: undefined,
             lastModified: new Date(dbDoc.lastModified).toISOString(),
             operations: operationsByScope,

package/src/storage/sequelize.ts

@@ -73,6 +73,10 @@ export class SequelizeStorage implements IDriveStorage {
                 type: DataTypes.STRING,
                 primaryKey: true,
                 unique: 'unique_operation'
+            },
+            skip: {
+                type: DataTypes.INTEGER,
+                defaultValue: 0
             }
         });
 
@@ -292,6 +296,7 @@ export class SequelizeStorage implements IDriveStorage {
         return count > 0;
     }
 
+    // @ts-expect-error TODO: fix as this should not be undefined
     async getDocument(driveId: string, id: string) {
         const Document = this.db.models.document;
         if (!Document) {
@@ -326,6 +331,7 @@ export class SequelizeStorage implements IDriveStorage {
                     type: string;
                     scope: string;
                     opId?: string;
+                    skip: number;
                 }
             ];
             revision: Required<Record<OperationScope, number>>;
@@ -343,26 +349,17 @@ export class SequelizeStorage implements IDriveStorage {
             throw new Error('Operation model not found');
         }
 
-        const operations = document.operations.map(
-            (op: {
-                hash: string;
-                index: number;
-                timestamp: Date;
-                input: JSON;
-                type: string;
-                scope: string;
-                opId?: string;
-            }) => ({
-                hash: op.hash,
-                index: op.index,
-                timestamp: new Date(op.timestamp).toISOString(),
-                input: op.input,
-                type: op.type,
-                scope: op.scope as OperationScope,
-                id: op.opId
-                // attachments: fileRegistry
-            })
-        );
+        const operations: Operation[] = document.operations.map(op => ({
+            hash: op.hash,
+            index: op.index,
+            timestamp: new Date(op.timestamp).toISOString(),
+            input: op.input,
+            type: op.type,
+            scope: op.scope as OperationScope,
+            id: op.opId,
+            skip: op.skip
+            // attachments: fileRegistry
+        }));
 
         const doc = {
             created: document.createdAt.toISOString(),

package/src/utils/default-drives-manager.ts

@@ -22,6 +22,7 @@ function isReadModeDriveServer(obj: unknown): obj is IReadModeDriveServer {
 }
 
 export interface IDefaultDrivesManager {
+    initializeDefaultRemoteDrives(): Promise<void>;
     getDefaultRemoteDrives(): Map<string, DefaultRemoteDriveInfo>;
     setDefaultDriveAccessLevel(
         url: string,