@opensumi/ide-notebook 3.4.5-next-1730693264.0 → 3.5.1-next-1731636910.0

package/src/browser/notebook-document-content-provider.ts

@@ -6,14 +6,12 @@ import {
   Emitter,
   Event,
   IApplicationService,
-  IEditorDocumentChange,
   IEditorDocumentModelSaveResult,
   MaybePromise,
   SaveTaskResponseState,
   URI,
 } from '@opensumi/ide-core-common';
 import { IEditorDocumentModelContentProvider } from '@opensumi/ide-editor/lib/browser/doc-model/types';
-import { EOL } from '@opensumi/ide-monaco';
 
 import { ILibroOpensumiService } from './libro.service';
 
@@ -35,26 +33,15 @@ export class NotebookDocumentContentProvider implements IEditorDocumentModelCont
   handlesScheme?(scheme: string): MaybePromise<boolean> {
     return scheme === LibroCellURIScheme;
   }
-  // handlesUri?(uri: URI): MaybePromise<number> {
-  //   throw new Error("Method not implemented.");
-  // }
 
   async provideEditorDocumentModelContent(uri: URI, encoding?: string | undefined): Promise<string> {
     const cell = await this.libroOpensumiService.getCellViewByUri(uri);
     return cell?.model.value ?? '';
   }
-  isReadonly(uri: URI): MaybePromise<boolean> {
+  isReadonly(): MaybePromise<boolean> {
     return false;
   }
-  saveDocumentModel?(
-    uri: URI,
-    content: string,
-    baseContent: string,
-    changes: IEditorDocumentChange[],
-    encoding?: string | undefined,
-    ignoreDiff?: boolean | undefined,
-    eol?: EOL | undefined,
-  ): MaybePromise<IEditorDocumentModelSaveResult> {
+  saveDocumentModel?(): MaybePromise<IEditorDocumentModelSaveResult> {
     return {
       state: SaveTaskResponseState.SUCCESS,
     };
@@ -64,11 +51,8 @@ export class NotebookDocumentContentProvider implements IEditorDocumentModelCont
     if (!cell) {
       return;
     }
-    return this.libroOpensumiService.getCellLangauge(cell);
+    return this.libroOpensumiService.getCellLanguage(cell);
   }
-  // async provideEOL?(uri: URI): Promise<EOL> {
-  //   return '\n'
-  // }
   provideEncoding?(uri: URI): MaybePromise<string> {
     const encoding = this.preferenceService.get<string>(
       'files.encoding',
@@ -78,22 +62,12 @@ export class NotebookDocumentContentProvider implements IEditorDocumentModelCont
     );
     return encoding || 'utf8';
   }
-
-  // provideEditorDocumentModelContentMd5?(uri: URI, encoding?: string | undefined): MaybePromise<string | undefined> {
-  //   throw new Error("Method not implemented.");
-  // }
-  // onDidDisposeModel?(uri: URI): void {
-  //   throw new Error("Method not implemented.");
-  // }
   isAlwaysDirty?(uri: URI): MaybePromise<boolean> {
     return false;
   }
   closeAutoSave?(uri: URI): MaybePromise<boolean> {
     return true;
   }
-  // guessEncoding?(uri: URI): Promise<string | undefined> {
-  //   throw new Error("Method not implemented.");
-  // }
   disposeEvenDirty?(uri: URI): MaybePromise<boolean> {
     return false;
   }

package/src/browser/notebook.service.ts

@@ -2,8 +2,8 @@ import { CellUri, CellView, LibroJupyterView, LibroService, LibroView, MIME } fr
 import { Container, getOrigin } from '@difizen/mana-app';
 
 import { Autowired, Injectable } from '@opensumi/di';
-import { ClientAppContribution, URI } from '@opensumi/ide-core-browser';
-import { Domain, MaybePromise, Uri } from '@opensumi/ide-core-common';
+import { URI } from '@opensumi/ide-core-browser';
+import { DisposableCollection, Uri } from '@opensumi/ide-core-common';
 import {
   CellKind,
   INotebookModelAddedData,
@@ -20,8 +20,7 @@ import { ILibroOpensumiService } from './libro.service';
 import { ManaContainer } from './mana';
 
 @Injectable()
-@Domain(ClientAppContribution)
-export class NotebookServiceOverride extends NotebookService implements ClientAppContribution {
+export class NotebookServiceOverride extends NotebookService {
   @Autowired(ManaContainer)
   private readonly manaContainer: Container;
   @Autowired(IEditorDocumentModelService)
@@ -31,15 +30,10 @@ export class NotebookServiceOverride extends NotebookService implements ClientAp
   @Autowired(ILibroOpensumiService)
   private readonly libroOpensumiService: ILibroOpensumiService;
 
-  onDidStart(): MaybePromise<void> {
-    this.listenLibro();
-    this.listenEditor();
-  }
-
   listenEditor() {
-    this.workbenchEditorService.onActiveResourceChange((e) => {
+    return this.workbenchEditorService.onActiveResourceChange((e) => {
       if (e?.uri?.path.ext === `.${LIBRO_COMPONENTS_SCHEME_ID}`) {
-        this.libroOpensumiService.getOrCreatLibroView(e.uri).then((libroView) => {
+        this.libroOpensumiService.getOrCreateLibroView(e.uri).then((libroView) => {
           this.handleOpenNotebook(libroView);
         });
       }
@@ -88,7 +82,7 @@ export class NotebookServiceOverride extends NotebookService implements ClientAp
       cellKind: this.isCodeCell(cell.model.mimeType) ? CellKind.Code : CellKind.Markup,
       eol: '\n',
       handle: 1,
-      language: this.libroOpensumiService.getCellLangauge(cell) ?? 'plaintext',
+      language: this.libroOpensumiService.getCellLanguage(cell) ?? 'plaintext',
       mime: cell.model.mimeType,
       outputs: [],
       source: cell.model.value.split('\n'),
@@ -110,78 +104,88 @@ export class NotebookServiceOverride extends NotebookService implements ClientAp
   }
 
   listenLibro() {
+    const disposables = new DisposableCollection();
     const libroService = this.manaContainer.get(LibroService);
-    libroService.onNotebookViewCreated(this.handleOpenNotebook);
-    libroService.onNotebookViewClosed((libroView) => {
-      if (!this.isValidNotebook(libroView)) {
-        return;
-      }
-      this.deleteNotebookVersion(libroView);
-      this._onDidCloseNotebookDocument.fire(this.getNotebookUri(libroView as LibroJupyterView));
-    });
-    libroService.onNotebookViewSaved((libroView) => {
-      if (!this.isValidNotebook(libroView)) {
-        return;
-      }
-      this.updateNotebookVersion(libroView);
-      this._onDidSaveNotebookDocument.fire(this.getNotebookUri(libroView as LibroJupyterView));
-    });
-    libroService.onNotebookViewChanged((event) => {
-      if (!this.isValidNotebook(event.libroView)) {
-        return;
-      }
-
-      if (!event.libroView.model.isInitialized) {
-        return;
-      }
-
-      const events: NotebookRawContentEventDto[] = [];
-
-      if (event.contentChanges) {
-        event.contentChanges.forEach((item) => {
-          if (item.addedCells.length > 0) {
-            events.push({
-              kind: NotebookCellsChangeType.ModelChange,
-              changes: [[item.range.start, 0, item.addedCells.map((cell) => this.asNotebookCell(cell))]],
-            });
-          }
-          if (item.removedCells.length > 0) {
-            events.push({
-              kind: NotebookCellsChangeType.ModelChange,
-              changes: [[item.range.start, item.range.end - item.range.start, []]],
-            });
-          }
+    disposables.push(libroService.onNotebookViewCreated(this.handleOpenNotebook));
+    disposables.push(
+      libroService.onNotebookViewClosed((libroView) => {
+        if (!this.isValidNotebook(libroView)) {
+          return;
+        }
+        this.deleteNotebookVersion(libroView);
+        this._onDidCloseNotebookDocument.fire(this.getNotebookUri(libroView as LibroJupyterView));
+      }),
+    );
+    disposables.push(
+      libroService.onNotebookViewSaved((libroView) => {
+        if (!this.isValidNotebook(libroView)) {
+          return;
+        }
+        this.updateNotebookVersion(libroView);
+        this._onDidSaveNotebookDocument.fire(this.getNotebookUri(libroView as LibroJupyterView));
+      }),
+    );
+    disposables.push(
+      libroService.onNotebookViewChanged((event) => {
+        if (!this.isValidNotebook(event.libroView)) {
+          return;
+        }
+
+        if (!event.libroView.model.isInitialized) {
+          return;
+        }
+
+        const events: NotebookRawContentEventDto[] = [];
+
+        if (event.contentChanges) {
+          event.contentChanges.forEach((item) => {
+            if (item.addedCells.length > 0) {
+              events.push({
+                kind: NotebookCellsChangeType.ModelChange,
+                changes: [[item.range.start, 0, item.addedCells.map((cell) => this.asNotebookCell(cell))]],
+              });
+            }
+            if (item.removedCells.length > 0) {
+              events.push({
+                kind: NotebookCellsChangeType.ModelChange,
+                changes: [[item.range.start, item.range.end - item.range.start, []]],
+              });
+            }
+          });
+        }
+
+        this.updateNotebookVersion(event.libroView);
+        this._onDidChangeNotebookDocument.fire({
+          uri: this.getNotebookUri(event.libroView as LibroJupyterView),
+          event: {
+            rawEvents: events,
+            versionId: this.getNotebookVersion(event.libroView),
+          },
+          isDirty: getOrigin(event.libroView.model.dirty),
         });
-      }
-
-      this.updateNotebookVersion(event.libroView);
-      this._onDidChangeNotebookDocument.fire({
-        uri: this.getNotebookUri(event.libroView as LibroJupyterView),
-        event: {
-          rawEvents: events,
-          versionId: 1,
-        },
-        isDirty: getOrigin(event.libroView.model.dirty),
-      });
-    });
-
-    libroService.onNotebookCellChanged((event) => {
-      const events: NotebookRawContentEventDto[] = [];
-      const index = event.cell.parent.findCellIndex(event.cell);
-      const modelRef = this.getCellModelRef(event.cell);
-      events.push({
-        kind: NotebookCellsChangeType.ChangeCellContent,
-        index,
-      });
-      this._onDidChangeNotebookDocument.fire({
-        uri: this.getNotebookUri(event.cell.parent as LibroJupyterView),
-        event: {
-          rawEvents: events,
-          versionId: modelRef?.instance.getMonacoModel().getVersionId() ?? 1,
-        },
-        isDirty: getOrigin(event.cell.parent.model.dirty),
-      });
-    });
+      }),
+    );
+
+    disposables.push(
+      libroService.onNotebookCellChanged((event) => {
+        const events: NotebookRawContentEventDto[] = [];
+        const index = event.cell.parent.findCellIndex(event.cell);
+        const modelRef = this.getCellModelRef(event.cell);
+        events.push({
+          kind: NotebookCellsChangeType.ChangeCellContent,
+          index,
+        });
+        this._onDidChangeNotebookDocument.fire({
+          uri: this.getNotebookUri(event.cell.parent as LibroJupyterView),
+          event: {
+            rawEvents: events,
+            versionId: modelRef?.instance.getMonacoModel().getVersionId() ?? 1,
+          },
+          isDirty: getOrigin(event.cell.parent.model.dirty),
+        });
+      }),
+    );
+    return disposables;
   }
 
   protected handleOpenNotebook = async (libroView: LibroView) => {

package/src/browser/toc/toc.panel.tsx

@@ -22,7 +22,7 @@ export const TocPanel = ({ viewState }: PropsWithChildren<{ viewState: ViewState
 
   useEffect(() => {
     if (editorService.currentResource?.uri.path.ext === `.${LIBRO_COMPONENTS_SCHEME_ID}`) {
-      libroOpensumiService.getOrCreatLibroView(editorService.currentResource.uri).then((libro) => {
+      libroOpensumiService.getOrCreateLibroView(editorService.currentResource.uri).then((libro) => {
         const viewManager = manaContainer.get(ViewManager);
         viewManager
           .getOrCreateView<TOCView>(TOCView, {
@@ -37,7 +37,7 @@ export const TocPanel = ({ viewState }: PropsWithChildren<{ viewState: ViewState
     }
     editorService.onActiveResourceChange((e) => {
       if (e?.uri.path.ext === `.${LIBRO_COMPONENTS_SCHEME_ID}`) {
-        libroOpensumiService.getOrCreatLibroView(e.uri).then((libro) => {
+        libroOpensumiService.getOrCreateLibroView(e.uri).then((libro) => {
           const viewManager = manaContainer.get(ViewManager);
           viewManager
             .getOrCreateView<TOCView>(TOCView, {

package/lib/browser/libro.view.tracker.d.ts

@@ -1,6 +0,0 @@
-export declare class LibroTracker {
-    constructor();
-    refreshTimer: number | undefined;
-    refresh(refreshTimer: number | undefined): void;
-}
-//# sourceMappingURL=libro.view.tracker.d.ts.map

package/lib/browser/libro.view.tracker.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"libro.view.tracker.d.ts","sourceRoot":"","sources":["../../src/browser/libro.view.tracker.ts"],"names":[],"mappings":"AAIA,qBACa,YAAY;;IAMvB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAa;IAG7C,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS;CAGzC"}

package/lib/browser/libro.view.tracker.js

@@ -1,28 +0,0 @@
-import { __decorate, __metadata } from "tslib";
-import { action, makeObservable, observable } from 'mobx';
-import { Injectable } from '@opensumi/di';
-let LibroTracker = class LibroTracker {
-    constructor() {
-        this.refreshTimer = undefined;
-        makeObservable(this);
-    }
-    refresh(refreshTimer) {
-        this.refreshTimer = refreshTimer;
-    }
-};
-__decorate([
-    observable,
-    __metadata("design:type", Object)
-], LibroTracker.prototype, "refreshTimer", void 0);
-__decorate([
-    action,
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", void 0)
-], LibroTracker.prototype, "refresh", null);
-LibroTracker = __decorate([
-    Injectable({ multiple: true }),
-    __metadata("design:paramtypes", [])
-], LibroTracker);
-export { LibroTracker };
-//# sourceMappingURL=libro.view.tracker.js.map

package/lib/browser/libro.view.tracker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"libro.view.tracker.js","sourceRoot":"","sources":["../../src/browser/libro.view.tracker.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAGnC,IAAM,YAAY,GAAlB,MAAM,YAAY;IACvB;QAKA,iBAAY,GAAuB,SAAS,CAAC;QAJ3C,cAAc,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAMD,OAAO,CAAC,YAAgC;QACtC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;CACF,CAAA;AANC;IADC,UAAU;;kDACkC;AAG7C;IADC,MAAM;;;;2CAGN;AAXU,YAAY;IADxB,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;GAClB,YAAY,CAYxB"}

package/src/browser/libro.view.tracker.ts

@@ -1,18 +0,0 @@
-import { action, makeObservable, observable } from 'mobx';
-
-import { Injectable } from '@opensumi/di';
-
-@Injectable({ multiple: true })
-export class LibroTracker {
-  constructor() {
-    makeObservable(this);
-  }
-
-  @observable
-  refreshTimer: number | undefined = undefined;
-
-  @action
-  refresh(refreshTimer: number | undefined) {
-    this.refreshTimer = refreshTimer;
-  }
-}