@jupyter/docprovider 4.1.2 → 4.2.0-alpha.0

package/lib/ydrive.d.ts

@@ -1,5 +1,5 @@
 import { TranslationBundle } from '@jupyterlab/translation';
-import { Contents, IContentProvider, RestContentProvider, User } from '@jupyterlab/services';
+import { Contents, IContentProvider, ServerConnection, User } from '@jupyterlab/services';
 import { ISignal } from '@lumino/signaling';
 import { IDocumentProvider, ISharedModelFactory } from '@jupyter/collaborative-drive';
 import { Awareness } from 'y-protocols/awareness';
@@ -11,15 +11,17 @@ export interface IForkProvider {
     format: string;
 }
 declare namespace RtcContentProvider {
-    interface IOptions extends RestContentProvider.IOptions {
+    interface IOptions {
         user: User.IManager;
         trans: TranslationBundle;
         globalAwareness: Awareness | null;
+        serverSettings: ServerConnection.ISettings;
         docmanagerSettings: ISettingRegistry.ISettings | null;
+        currentDrive: Contents.IDrive;
         fileChanged?: ISignal<Contents.IDrive, Contents.IChangedArgs>;
     }
 }
-export declare class RtcContentProvider extends RestContentProvider implements IContentProvider {
+export declare class RtcContentProvider implements IContentProvider {
     constructor(options: RtcContentProvider.IOptions);
     /**
      * SharedModel factory for the content provider.
@@ -46,7 +48,7 @@ export declare class RtcContentProvider extends RestContentProvider implements I
      * @returns A promise which resolves with the file content model when the
      *   file is saved.
      */
-    save(localPath: string, options?: Partial<Contents.IModel>): Promise<Contents.IModel>;
+    save(localPath: string, options?: Partial<Contents.IModel> & Contents.IContentProvisionOptions): Promise<Contents.IModel>;
     /**
      * A signal emitted when a file operation takes place.
      */
@@ -54,6 +56,7 @@ export declare class RtcContentProvider extends RestContentProvider implements I
     private _onCreate;
     private _user;
     private _saveCounter;
+    private _currentDrive;
     private _trans;
     private _globalAwareness;
     private _providers;

package/lib/ydrive.js

@@ -1,7 +1,6 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 import { PageConfig, URLExt } from '@jupyterlab/coreutils';
-import { RestContentProvider } from '@jupyterlab/services';
 import { PromiseDelegate } from '@lumino/coreutils';
 import { Signal } from '@lumino/signaling';
 import { WebSocketProvider } from './yprovider';
@@ -13,9 +12,8 @@ const RAW_MESSAGE_TYPE = 2;
  * The url for the default drive service.
  */
 const DOCUMENT_PROVIDER_URL = 'api/collaboration/room';
-export class RtcContentProvider extends RestContentProvider {
+export class RtcContentProvider {
     constructor(options) {
-        super(options);
         this._onCreate = (options, sharedModel) => {
             var _a, _b, _c, _d, _e, _f, _g;
             if (typeof options.format !== 'string') {
@@ -174,6 +172,7 @@ export class RtcContentProvider extends RestContentProvider {
         this._trans = options.trans;
         this._globalAwareness = options.globalAwareness;
         this._serverSettings = options.serverSettings;
+        this._currentDrive = options.currentDrive;
         this.sharedModelFactory = new SharedModelFactory(this._onCreate);
         this._providers = new Map();
         this._docmanagerSettings = options.docmanagerSettings;
@@ -201,7 +200,12 @@ export class RtcContentProvider extends RestContentProvider {
                 // Use `Promise.all` to reject as soon as possible. The Context will
                 // show a dialog to the user.
                 const [model] = await Promise.all([
-                    super.get(localPath, { ...options, content: false }),
+                    // Not calling get() with options.contentProviderId otherwise it's an infinite loop
+                    this._currentDrive.get(localPath, {
+                        ...options,
+                        content: false,
+                        contentProviderId: undefined
+                    }),
                     provider.ready
                 ]);
                 // The server doesn't return a model with a format when content is false,
@@ -209,7 +213,11 @@ export class RtcContentProvider extends RestContentProvider {
                 return { ...model, format: options.format };
             }
         }
-        return super.get(localPath, options);
+        // Not calling get() with options.contentProviderId otherwise it's an infinite loop
+        return this._currentDrive.get(localPath, {
+            ...options,
+            contentProviderId: undefined
+        });
     }
     /**
      * Save a file.
@@ -290,7 +298,10 @@ export class RtcContentProvider extends RestContentProvider {
                 console.warn(`Could not find a provider for ${localPath}, falling back to REST API save`);
             }
         }
-        return super.save(localPath, options);
+        return this._currentDrive.save(localPath, {
+            ...options,
+            contentProviderId: undefined
+        });
     }
     /**
      * A signal emitted when a file operation takes place.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter/docprovider",
-  "version": "4.1.2",
+  "version": "4.2.0-alpha.0",
   "description": "JupyterLab - Document Provider",
   "homepage": "https://github.com/jupyterlab/jupyter-collaboration",
   "bugs": {
@@ -41,14 +41,14 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter/collaborative-drive": "^4.1.2",
+    "@jupyter/collaborative-drive": "^4.2.0-alpha.0",
     "@jupyter/ydoc": "^2.1.3 || ^3.0.0",
-    "@jupyterlab/apputils": "^4.4.0",
-    "@jupyterlab/cells": "^4.4.0",
-    "@jupyterlab/coreutils": "^6.4.0",
-    "@jupyterlab/notebook": "^4.4.0",
-    "@jupyterlab/services": "^7.4.0",
-    "@jupyterlab/translation": "^4.4.0",
+    "@jupyterlab/apputils": "^4.5.0",
+    "@jupyterlab/cells": "^4.5.0",
+    "@jupyterlab/coreutils": "^6.5.0",
+    "@jupyterlab/notebook": "^4.5.0",
+    "@jupyterlab/services": "^7.5.0",
+    "@jupyterlab/translation": "^4.5.0",
     "@lumino/coreutils": "^2.2.1",
     "@lumino/disposable": "^2.1.4",
     "@lumino/signaling": "^2.1.4",
@@ -58,7 +58,7 @@
     "yjs": "^13.5.40"
   },
   "devDependencies": {
-    "@jupyterlab/testing": "^4.4.0",
+    "@jupyterlab/testing": "^4.5.0",
     "@types/jest": "^29.2.0",
     "jest": "^29.5.0",
     "rimraf": "^4.1.2",