From 4bb96909feac09538bff44407057752eb94f2fe1 Mon Sep 17 00:00:00 2001 From: David Brochart Date: Mon, 16 Sep 2024 22:24:45 +0200 Subject: [PATCH] Extract out ICollaborativeDrive to @jupyter/collaborativedrive --- .../docprovider-extension/src/filebrowser.ts | 2 +- packages/docprovider/src/index.ts | 1 - packages/docprovider/src/tokens.ts | 55 ------------------- packages/docprovider/src/ydrive.ts | 2 +- 4 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 packages/docprovider/src/tokens.ts diff --git a/packages/docprovider-extension/src/filebrowser.ts b/packages/docprovider-extension/src/filebrowser.ts index 743a337d..c0a5006e 100644 --- a/packages/docprovider-extension/src/filebrowser.ts +++ b/packages/docprovider-extension/src/filebrowser.ts @@ -30,12 +30,12 @@ import { CommandRegistry } from '@lumino/commands'; import { YFile, YNotebook } from '@jupyter/ydoc'; import { - ICollaborativeDrive, IForkProvider, IGlobalAwareness, TimelineWidget, YDrive } from '@jupyter/docprovider'; +import { ICollaborativeDrive } from '@jupyter/collaborativedrive'; import { Awareness } from 'y-protocols/awareness'; import { URLExt } from '@jupyterlab/coreutils'; diff --git a/packages/docprovider/src/index.ts b/packages/docprovider/src/index.ts index 2ab2924c..b3cd6572 100644 --- a/packages/docprovider/src/index.ts +++ b/packages/docprovider/src/index.ts @@ -12,5 +12,4 @@ export * from './notebookCellExecutor'; export * from './requests'; export * from './ydrive'; export * from './yprovider'; -export * from './tokens'; export * from './TimelineSlider'; diff --git a/packages/docprovider/src/tokens.ts b/packages/docprovider/src/tokens.ts deleted file mode 100644 index bf62b890..00000000 --- a/packages/docprovider/src/tokens.ts +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) Jupyter Development Team. -// Distributed under the terms of the Modified BSD License. - -import { DocumentChange, IAwareness, YDocument } from '@jupyter/ydoc'; -import { Contents } from '@jupyterlab/services'; - -import { Token } from '@lumino/coreutils'; - -/** - * The collaborative drive. - */ -export const ICollaborativeDrive = new Token( - '@jupyter/collaboration-extension:ICollaborativeDrive' -); - -/** - * The global awareness token. - */ -export const IGlobalAwareness = new Token( - '@jupyter/collaboration:IGlobalAwareness' -); - -/** - * A document factory for registering shared models - */ -export type SharedDocumentFactory = ( - options: Contents.ISharedFactoryOptions -) => YDocument; - -/** - * A Collaborative implementation for an `IDrive`, talking to the - * server using the Jupyter REST API and a WebSocket connection. - */ -export interface ICollaborativeDrive extends Contents.IDrive { - /** - * SharedModel factory for the YDrive. - */ - readonly sharedModelFactory: ISharedModelFactory; -} - -/** - * Yjs sharedModel factory for real-time collaboration. - */ -export interface ISharedModelFactory extends Contents.ISharedFactory { - /** - * Register a SharedDocumentFactory. - * - * @param type Document type - * @param factory Document factory - */ - registerDocumentFactory( - type: Contents.ContentType, - factory: SharedDocumentFactory - ): void; -} diff --git a/packages/docprovider/src/ydrive.ts b/packages/docprovider/src/ydrive.ts index 28242662..e225e391 100644 --- a/packages/docprovider/src/ydrive.ts +++ b/packages/docprovider/src/ydrive.ts @@ -13,7 +13,7 @@ import { ICollaborativeDrive, ISharedModelFactory, SharedDocumentFactory -} from './tokens'; +} from '@jupyter/collaborativedrive'; import { Awareness } from 'y-protocols/awareness'; const DISABLE_RTC =