@difizen/libro-jupyter 0.2.31 → 0.2.32

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;CAoBhE"}
+{"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;CAehE"}

package/es/contents/content-contribution.js

@@ -36,19 +36,15 @@ export var LibroJupyterContentContribution = (_dec = singleton({
             case 5:
               currentFileContents = _context.sent;
               if (!currentFileContents) {
-                _context.next = 14;
+                _context.next = 12;
                 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 14:
+            case 12:
             case "end":
               return _context.stop();
           }

package/es/libro-jupyter-model.d.ts

@@ -1,3 +1,4 @@
+import type { INotebookContent } from '@difizen/libro-common';
 import type { VirtualizedManager } from '@difizen/libro-core';
 import { LibroModel, VirtualizedManagerHelper } from '@difizen/libro-core';
 import { ContentsManager, LibroKernelConnectionManager, ServerConnection, ServerManager } from '@difizen/libro-kernel';
@@ -39,6 +40,7 @@ export declare class LibroJupyterModel extends LibroModel implements ExecutableN
     listCheckpoints(): Promise<void>;
     restoreCheckpoint(checkpointID: string): Promise<void>;
     deleteCheckpoint(checkpointID: string): Promise<void>;
+    loadNotebookContent(): Promise<INotebookContent>;
     startKernelConnection(): void;
     canRun(): boolean;
     interrupt(): Promise<void>;

package/es/libro-jupyter-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"libro-jupyter-model.d.ts","sourceRoot":"","sources":["../src/libro-jupyter-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EACL,eAAe,EAEf,4BAA4B,EAC5B,gBAAgB,EAChB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AACxF,OAAO,KAAK,EAAE,wBAAwB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,EAAa,YAAY,EAAQ,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI7C,OAAO,EAGL,gBAAgB,EACjB,MAAM,6BAA6B,CAAC;AAGrC,KAAK,MAAM,GAAG,cAAc,CAAC;AAC7B,qBACa,iBAAkB,SAAQ,UAAW,YAAW,uBAAuB;IAClF,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC7C,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAEjD,IAAI,WAAW,qBAEd;IAGD,mBAAmB,EAAE,MAAM,CAAC;IAE5B,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAE/B,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAE/B,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IAGrC,UAAU,UAAQ;IAElB,SAAS,CAAC,uBAAuB,EAAE,4BAA4B,CAAC;IAChE,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IACvC,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;gBAGlB,gBAAgB,EAAE,gBAAgB,EAE5D,uBAAuB,EAAE,4BAA4B,EAC9B,aAAa,EAAE,aAAa,EACzB,gBAAgB,EAAE,gBAAgB,EACnC,eAAe,EAAE,eAAe,EACnC,YAAY,EAAE,YAAY,EAEhD,wBAAwB,EAAE,wBAAwB;IA6BpD,IAAI,YAAY,wBAEf;IAED,IAAI,eAAe,IAIQ,MAAM,CAFhC;IAED,IAAI,eAAe,CAAC,KAAK,EAAE,MAAM,EAEhC;IAED,IAAI,mBAAmB,IAIQ,MAAM,CAFpC;IAED,IAAI,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAEpC;IACD,SAAS,CAAC,UAAU,8BAAqC;IACzD,IAAI,OAAO,+BAEV;IAGD,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAC;IAGtC,QAAQ,SAAM;IAEd,SAAS,CAAC,aAAa,SAAM;IAE7B,IAAI,YAAY,IAIQ,MAAM,CAF7B;IAED,IAAI,YAAY,CAAC,KAAK,EAAE,MAAM,EAE7B;IAED,qBAAqB,EAAE,wBAAwB,CAAC;IAE1C,gBAAgB;IAMhB,eAAe;IAIf,iBAAiB,CAAC,YAAY,EAAE,MAAM;IAItC,gBAAgB,CAAC,YAAY,EAAE,MAAM;IAI3C,qBAAqB;IA2BZ,MAAM;IAcT,SAAS;IAQT,QAAQ;IAUR,OAAO;IAkBP,SAAS;IAQf,eAAe;CAYhB"}
+{"version":3,"file":"libro-jupyter-model.d.ts","sourceRoot":"","sources":["../src/libro-jupyter-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EACL,eAAe,EAEf,4BAA4B,EAC5B,gBAAgB,EAChB,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AACxF,OAAO,KAAK,EAAE,wBAAwB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,EAAa,YAAY,EAAQ,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI7C,OAAO,EAGL,gBAAgB,EACjB,MAAM,6BAA6B,CAAC;AAGrC,KAAK,MAAM,GAAG,cAAc,CAAC;AAC7B,qBACa,iBAAkB,SAAQ,UAAW,YAAW,uBAAuB;IAClF,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC7C,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAEjD,IAAI,WAAW,qBAEd;IAGD,mBAAmB,EAAE,MAAM,CAAC;IAE5B,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAE/B,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAE/B,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IAGrC,UAAU,UAAQ;IAElB,SAAS,CAAC,uBAAuB,EAAE,4BAA4B,CAAC;IAChE,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IACvC,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;gBAGlB,gBAAgB,EAAE,gBAAgB,EAE5D,uBAAuB,EAAE,4BAA4B,EAC9B,aAAa,EAAE,aAAa,EACzB,gBAAgB,EAAE,gBAAgB,EACnC,eAAe,EAAE,eAAe,EACnC,YAAY,EAAE,YAAY,EAEhD,wBAAwB,EAAE,wBAAwB;IA6BpD,IAAI,YAAY,wBAEf;IAED,IAAI,eAAe,IAIQ,MAAM,CAFhC;IAED,IAAI,eAAe,CAAC,KAAK,EAAE,MAAM,EAEhC;IAED,IAAI,mBAAmB,IAIQ,MAAM,CAFpC;IAED,IAAI,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAEpC;IACD,SAAS,CAAC,UAAU,8BAAqC;IACzD,IAAI,OAAO,+BAEV;IAGD,gBAAgB,EAAE,OAAO,GAAG,SAAS,CAAC;IAGtC,QAAQ,SAAM;IAEd,SAAS,CAAC,aAAa,SAAM;IAE7B,IAAI,YAAY,IAIQ,MAAM,CAF7B;IAED,IAAI,YAAY,CAAC,KAAK,EAAE,MAAM,EAE7B;IAED,qBAAqB,EAAE,wBAAwB,CAAC;IAE1C,gBAAgB;IAMhB,eAAe;IAIf,iBAAiB,CAAC,YAAY,EAAE,MAAM;IAItC,gBAAgB,CAAC,YAAY,EAAE,MAAM;IAIlC,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IASzD,qBAAqB;IA2BZ,MAAM;IAcT,SAAS;IAQT,QAAQ;IAUR,OAAO;IAkBP,SAAS;IAQf,eAAe;CAYhB"}

package/es/libro-jupyter-model.js

@@ -12,6 +12,8 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -205,6 +207,16 @@ export var LibroJupyterModel = (_dec = transient(), _dec2 = prop(), _dec3 = prop
       }
       return deleteCheckpoint;
     }()
+  }, {
+    key: "loadNotebookContent",
+    value: function loadNotebookContent() {
+      var content = _get(_getPrototypeOf(LibroJupyterModel.prototype), "loadNotebookContent", this).call(this);
+      this.id = this.currentFileContents.path; // use file path as id, will be passed to editor and lsp
+      if (this.executable && !this.kernelConnecting) {
+        this.startKernelConnection();
+      }
+      return content;
+    }
   }, {
     key: "startKernelConnection",
     value: function startKernelConnection() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-jupyter",
-  "version": "0.2.31",
+  "version": "0.2.32",
   "description": "",
   "keywords": [
     "libro"
@@ -33,27 +33,27 @@
   "dependencies": {
     "@ant-design/colors": "^7.0.0",
     "@ant-design/icons": "^5.1.0",
-    "@difizen/libro-code-cell": "^0.2.31",
-    "@difizen/libro-code-editor": "^0.2.31",
-    "@difizen/libro-codemirror": "^0.2.31",
-    "@difizen/libro-cofine-editor": "^0.2.31",
-    "@difizen/libro-common": "^0.2.31",
-    "@difizen/libro-core": "^0.2.31",
-    "@difizen/libro-kernel": "^0.2.31",
-    "@difizen/libro-l10n": "^0.2.31",
-    "@difizen/libro-language-client": "^0.2.31",
-    "@difizen/libro-lsp": "^0.2.31",
-    "@difizen/libro-markdown-cell": "^0.2.31",
-    "@difizen/libro-output": "^0.2.31",
-    "@difizen/libro-raw-cell": "^0.2.31",
-    "@difizen/libro-rendermime": "^0.2.31",
-    "@difizen/libro-search": "^0.2.31",
-    "@difizen/libro-search-code-cell": "^0.2.31",
+    "@difizen/libro-code-cell": "^0.2.32",
+    "@difizen/libro-code-editor": "^0.2.32",
+    "@difizen/libro-codemirror": "^0.2.32",
+    "@difizen/libro-cofine-editor": "^0.2.32",
+    "@difizen/libro-common": "^0.2.32",
+    "@difizen/libro-core": "^0.2.32",
+    "@difizen/libro-kernel": "^0.2.32",
+    "@difizen/libro-l10n": "^0.2.32",
+    "@difizen/libro-language-client": "^0.2.32",
+    "@difizen/libro-lsp": "^0.2.32",
+    "@difizen/libro-markdown-cell": "^0.2.32",
+    "@difizen/libro-output": "^0.2.32",
+    "@difizen/libro-raw-cell": "^0.2.32",
+    "@difizen/libro-rendermime": "^0.2.32",
+    "@difizen/libro-search": "^0.2.32",
+    "@difizen/libro-search-code-cell": "^0.2.32",
     "@difizen/mana-app": "latest",
     "@difizen/mana-l10n": "latest",
     "classnames": "^2.3.2",
     "moment": "^2.29.4",
-    "plotly.js": "2.35.0"
+    "plotly.js": "^2.35.0"
   },
   "peerDependencies": {
     "antd": "^5.8.6",

package/src/contents/content-contribution.ts

@@ -20,13 +20,8 @@ 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) {
-        jupyterModel.startKernelConnection();
-      }
-
       return jupyterModel.currentFileContents.content;
     }
   }

package/src/libro-jupyter-model.ts

@@ -1,3 +1,4 @@
+import type { INotebookContent } from '@difizen/libro-common';
 import type { VirtualizedManager } from '@difizen/libro-core';
 import { LibroModel, VirtualizedManagerHelper } from '@difizen/libro-core';
 import {
@@ -147,6 +148,15 @@ export class LibroJupyterModel extends LibroModel implements ExecutableNotebookM
     await this.contentsManager.deleteCheckpoint(this.filePath, checkpointID);
   }
 
+  override loadNotebookContent(): Promise<INotebookContent> {
+    const content = super.loadNotebookContent();
+    this.id = this.currentFileContents.path; // use file path as id, will be passed to editor and lsp
+    if (this.executable && !this.kernelConnecting) {
+      this.startKernelConnection();
+    }
+    return content;
+  }
+
   startKernelConnection() {
     this.kernelConnecting = true;
     const fileInfo = this.currentFileContents;