@difizen/libro-jupyter 0.2.28 → 0.2.30

package/es/cell/jupyter-code-cell-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jupyter-code-cell-view.d.ts","sourceRoot":"","sources":["../../src/cell/jupyter-code-cell-view.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAkB,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,EAElB,eAAe,EAEhB,MAAM,4BAA4B,CAAC;AAYpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAkBzE,qBAEa,mBAAoB,SAAQ,iBAAiB;IACxD,UAAkB,OAAO,EAAE,gBAAgB,CAAC;IAE5C,IAAa,MAAM,IAGQ,gBAAgB,CAD1C;IACD,IAAa,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAG1C;IAEQ,IAAI,2FAA4B;IACjC,KAAK,EAAE,oBAAoB,CAAC;IAE3B,cAAc,aAQrB;cAEiB,eAAe,IAAI,qBAAqB;IAe5C,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB3C,eAAe,EAAE,eAAe,CAqB9B;IAEF,kBAAkB,EAAE,kBAAkB,CA8BpC;IAEa,GAAG;CA8EnB"}
+{"version":3,"file":"jupyter-code-cell-view.d.ts","sourceRoot":"","sources":["../../src/cell/jupyter-code-cell-view.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAkB,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,EAElB,eAAe,EAEhB,MAAM,4BAA4B,CAAC;AAWpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAkBzE,qBAEa,mBAAoB,SAAQ,iBAAiB;IACxD,UAAkB,OAAO,EAAE,gBAAgB,CAAC;IAE5C,IAAa,MAAM,IAGQ,gBAAgB,CAD1C;IACD,IAAa,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAG1C;IAEQ,IAAI,2FAA4B;IACjC,KAAK,EAAE,oBAAoB,CAAC;IAE3B,cAAc,aAQrB;cAEiB,eAAe,IAAI,qBAAqB;IAU5C,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB3C,eAAe,EAAE,eAAe,CAqB9B;IAEF,kBAAkB,EAAE,kBAAkB,CA8BpC;IAEa,GAAG;CA8EnB"}

package/es/cell/jupyter-code-cell-view.js

@@ -21,7 +21,6 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import { CellEditorMemo, LibroCodeCellView } from '@difizen/libro-code-cell';
-import { getCellURI } from '@difizen/libro-common';
 import { KernelError } from '@difizen/libro-kernel';
 import { transient } from '@difizen/mana-app';
 import { view, ViewInstance } from '@difizen/mana-app';
@@ -165,14 +164,9 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
     key: "getEditorOption",
     value: function getEditorOption() {
       var options = _get(_getPrototypeOf(JupyterCodeCellView.prototype), "getEditorOption", this).call(this);
-      var uri = getCellURI(this.parent.model.filePath, this.model.id);
       return _objectSpread(_objectSpread({}, options), {}, {
-        uuid: uri.toString(),
         tooltipProvider: this.tooltipProvider,
         completionProvider: this.completionProvider
-        // lspProvider: (this.parent.model as LibroJupyterModel).lspEnabled
-        //   ? this.lspProvider
-        //   : undefined,
       });
     }
   }, {

package/es/contents/content-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"content-contribution.d.ts","sourceRoot":"","sources":["../../src/contents/content-contribution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAM1D,qBACa,+BAAgC,YAAW,mBAAmB;IACzE,SAAS,eAEP;IACI,WAAW,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,aAAa;CAmBhE"}
+{"version":3,"file":"content-contribution.d.ts","sourceRoot":"","sources":["../../src/contents/content-contribution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAM1D,qBACa,+BAAgC,YAAW,mBAAmB;IACzE,SAAS,eAEP;IACI,WAAW,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,aAAa;CAoBhE"}

package/es/contents/content-contribution.js

@@ -36,18 +36,19 @@ export var LibroJupyterContentContribution = (_dec = singleton({
             case 5:
               currentFileContents = _context.sent;
               if (!currentFileContents) {
-                _context.next = 13;
+                _context.next = 14;
                 break;
               }
               currentFileContents.content.nbformat_minor = 5;
               jupyterModel.currentFileContents = currentFileContents;
               jupyterModel.filePath = currentFileContents.path;
+              jupyterModel.id = currentFileContents.path; // use file path as id, will be passed to editor and lsp
               jupyterModel.lastModified = jupyterModel.currentFileContents.last_modified;
               if (jupyterModel.executable) {
                 jupyterModel.startKernelConnection();
               }
               return _context.abrupt("return", jupyterModel.currentFileContents.content);
-            case 13:
+            case 14:
             case "end":
               return _context.stop();
           }

package/es/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAiC/C;;GAEG;AACH,eAAO,MAAM,0BAA0B,YAwDpC,CAAC;AAEJ,eAAO,MAAM,kBAAkB,YAK9B,CAAC"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAiC/C;;GAEG;AACH,eAAO,MAAM,0BAA0B,YAuDpC,CAAC;AAEJ,eAAO,MAAM,kBAAkB,YAO5B,CAAC"}

package/es/module.js

@@ -34,7 +34,7 @@ import { WidgetModule } from "./widget/index.js";
 /**
  *  去除editor和lsp依赖的jupyter module，在opensumi场景使用
  */
-export var LibroJupyterNoEditorModule = ManaModule.create().register(JupyterWorkspaceService, LibroJupyterFileService, LibroJupyterCommandContribution, LibroJupyterKeybindingContribution, LibroJupyterToolbarContribution, ConfigAppContribution, SaveFileErrorContribution, LibroKeybindRegistry, LibroJupyterContentContribution, LibroJupyterContentSaveContribution, LibroJupyterOutputArea, LibroJupyterColorContribution, LibroJupyterSettingContribution, JupyterServerLaunchManager, LibroJupyterView, {
+export var LibroJupyterNoEditorModule = ManaModule.create().register(LibroJupyterFileService, LibroJupyterCommandContribution, LibroJupyterKeybindingContribution, LibroJupyterToolbarContribution, ConfigAppContribution, SaveFileErrorContribution, LibroKeybindRegistry, LibroJupyterContentContribution, LibroJupyterContentSaveContribution, LibroJupyterOutputArea, LibroJupyterColorContribution, LibroJupyterSettingContribution, JupyterServerLaunchManager, LibroJupyterView, {
   token: CellExecutionTimeProvider,
   useValue: CellExecutionTip
 }, {
@@ -55,4 +55,4 @@ export var LibroJupyterNoEditorModule = ManaModule.create().register(JupyterWork
 }).dependOn(LibroModule, CodeCellModule, MarkdownCellModule, RawCellModule, StreamOutputModule, ErrorOutputModule, DisplayDataOutputModule, LibroToolbarModule, LibroKernelManageModule, LibroSearchModule, SearchCodeCellModule, LibroAddCellModule,
 // custom module
 LibroBetweenCellModule, KeybindInstructionsModule, PlotlyModule, LibroJupyterFileModule, WidgetModule);
-export var LibroJupyterModule = ManaModule.create().dependOn(LibroE2EditorModule, CodeMirrorEditorModule, LibroJupyterNoEditorModule, LibroLanguageClientModule);
+export var LibroJupyterModule = ManaModule.create().register(JupyterWorkspaceService).dependOn(LibroE2EditorModule, CodeMirrorEditorModule, LibroJupyterNoEditorModule, LibroLanguageClientModule);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-jupyter",
-  "version": "0.2.28",
+  "version": "0.2.30",
   "description": "",
   "keywords": [
     "libro"
@@ -31,22 +31,22 @@
     "src"
   ],
   "dependencies": {
-    "@difizen/libro-cofine-editor": "^0.2.28",
-    "@difizen/libro-code-editor": "^0.2.28",
-    "@difizen/libro-code-cell": "^0.2.28",
-    "@difizen/libro-codemirror": "^0.2.28",
-    "@difizen/libro-rendermime": "^0.2.28",
-    "@difizen/libro-common": "^0.2.28",
-    "@difizen/libro-core": "^0.2.28",
-    "@difizen/libro-kernel": "^0.2.28",
-    "@difizen/libro-l10n": "^0.2.28",
-    "@difizen/libro-output": "^0.2.28",
-    "@difizen/libro-search": "^0.2.28",
-    "@difizen/libro-search-code-cell": "^0.2.28",
-    "@difizen/libro-lsp": "^0.2.28",
-    "@difizen/libro-markdown-cell": "^0.2.28",
-    "@difizen/libro-raw-cell": "^0.2.28",
-    "@difizen/libro-language-client": "^0.2.28",
+    "@difizen/libro-cofine-editor": "^0.2.30",
+    "@difizen/libro-code-editor": "^0.2.30",
+    "@difizen/libro-code-cell": "^0.2.30",
+    "@difizen/libro-codemirror": "^0.2.30",
+    "@difizen/libro-rendermime": "^0.2.30",
+    "@difizen/libro-common": "^0.2.30",
+    "@difizen/libro-core": "^0.2.30",
+    "@difizen/libro-kernel": "^0.2.30",
+    "@difizen/libro-l10n": "^0.2.30",
+    "@difizen/libro-output": "^0.2.30",
+    "@difizen/libro-search": "^0.2.30",
+    "@difizen/libro-search-code-cell": "^0.2.30",
+    "@difizen/libro-lsp": "^0.2.30",
+    "@difizen/libro-markdown-cell": "^0.2.30",
+    "@difizen/libro-raw-cell": "^0.2.30",
+    "@difizen/libro-language-client": "^0.2.30",
     "@difizen/mana-app": "latest",
     "@difizen/mana-l10n": "latest",
     "@ant-design/colors": "^7.0.0",

package/src/cell/jupyter-code-cell-view.tsx

@@ -6,7 +6,6 @@ import type {
   TooltipProvider,
   TooltipProviderOption,
 } from '@difizen/libro-code-editor';
-import { getCellURI } from '@difizen/libro-common';
 import type { KernelMessage } from '@difizen/libro-kernel';
 import { KernelError } from '@difizen/libro-kernel';
 import { transient } from '@difizen/mana-app';
@@ -65,16 +64,11 @@ export class JupyterCodeCellView extends LibroCodeCellView {
 
   protected override getEditorOption(): CodeEditorViewOptions {
     const options = super.getEditorOption();
-    const uri = getCellURI(this.parent.model.filePath, this.model.id);
 
     return {
       ...options,
-      uuid: uri.toString(),
       tooltipProvider: this.tooltipProvider,
       completionProvider: this.completionProvider,
-      // lspProvider: (this.parent.model as LibroJupyterModel).lspEnabled
-      //   ? this.lspProvider
-      //   : undefined,
     };
   }
 

package/src/contents/content-contribution.ts

@@ -20,6 +20,7 @@ export class LibroJupyterContentContribution implements ContentContribution {
       currentFileContents.content.nbformat_minor = 5;
       jupyterModel.currentFileContents = currentFileContents;
       jupyterModel.filePath = currentFileContents.path;
+      jupyterModel.id = currentFileContents.path; // use file path as id, will be passed to editor and lsp
       jupyterModel.lastModified = jupyterModel.currentFileContents.last_modified;
 
       if (jupyterModel.executable) {

package/src/module.ts

@@ -63,7 +63,6 @@ import { WidgetModule } from './widget/index.js';
  */
 export const LibroJupyterNoEditorModule = ManaModule.create()
   .register(
-    JupyterWorkspaceService,
     LibroJupyterFileService,
     LibroJupyterCommandContribution,
     LibroJupyterKeybindingContribution,
@@ -119,9 +118,11 @@ export const LibroJupyterNoEditorModule = ManaModule.create()
     WidgetModule,
   );
 
-export const LibroJupyterModule = ManaModule.create().dependOn(
-  LibroE2EditorModule,
-  CodeMirrorEditorModule,
-  LibroJupyterNoEditorModule,
-  LibroLanguageClientModule,
-);
+export const LibroJupyterModule = ManaModule.create()
+  .register(JupyterWorkspaceService)
+  .dependOn(
+    LibroE2EditorModule,
+    CodeMirrorEditorModule,
+    LibroJupyterNoEditorModule,
+    LibroLanguageClientModule,
+  );