@difizen/libro-jupyter 0.1.27 → 0.1.29

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

@@ -0,0 +1,10 @@
+import type { NotebookOption } from '@difizen/libro-core';
+import { ContentSaveContribution } from '@difizen/libro-core';
+import { ModalService } from '@difizen/mana-app';
+import type { LibroJupyterModel } from '../libro-jupyter-model.js';
+export declare class LibroJupyterContentSaveContribution implements ContentSaveContribution {
+    protected readonly modalService: ModalService;
+    canHandle: () => number;
+    saveContent: (options: NotebookOption, model: LibroJupyterModel) => Promise<void>;
+}
+//# sourceMappingURL=save-content-contribution.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"save-content-contribution.d.ts","sourceRoot":"","sources":["../../src/contents/save-content-contribution.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAqB,MAAM,mBAAmB,CAAC;AAEpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAGnE,qBACa,mCAAoC,YAAW,uBAAuB;IAC3D,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAEpE,SAAS,eAEP;IACF,WAAW,YAAmB,cAAc,SAAS,iBAAiB,mBAkDpE;CACH"}

package/es/contents/save-content-contribution.js

@@ -0,0 +1,110 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _dec, _dec2, _class, _class2, _descriptor;
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
+function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'transform-class-properties is enabled and runs after the decorators transform.'); }
+import { ContentSaveContribution } from '@difizen/libro-core';
+import { ModalService, inject, singleton } from '@difizen/mana-app';
+import { SaveFileErrorModal } from "../toolbar/save-file-error.js";
+export var LibroJupyterContentSaveContribution = (_dec = singleton({
+  contrib: ContentSaveContribution
+}), _dec2 = inject(ModalService), _dec(_class = (_class2 = /*#__PURE__*/_createClass(function LibroJupyterContentSaveContribution() {
+  var _this = this;
+  _classCallCheck(this, LibroJupyterContentSaveContribution);
+  _initializerDefineProperty(this, "modalService", _descriptor, this);
+  this.canHandle = function () {
+    return 2;
+  };
+  this.saveContent = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options, model) {
+      var notebookContent, res, _res, errorMsg;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            notebookContent = model.toJSON();
+            if (model.currentFileContents) {
+              _context.next = 3;
+              break;
+            }
+            throw new Error('currentFileContents is undefined');
+          case 3:
+            res = {};
+            _context.prev = 4;
+            _context.next = 7;
+            return model.fileService.write(notebookContent, model.currentFileContents);
+          case 7:
+            res = _context.sent;
+            if (res) {
+              _context.next = 10;
+              break;
+            }
+            return _context.abrupt("return");
+          case 10:
+            if (!(res.last_modified === model.lastModified || res.size === 0)) {
+              _context.next = 15;
+              break;
+            }
+            errorMsg = "File Save Error: ".concat((_res = res) === null || _res === void 0 ? void 0 : _res.message, " ");
+            model.fileService.fileSaveErrorEmitter.fire({
+              cause: res.message,
+              msg: errorMsg,
+              name: res.name,
+              path: res.path,
+              created: res.created,
+              last_modified: res.last_modified,
+              size: res.size,
+              type: res.type
+            });
+            _this.modalService.openModal(SaveFileErrorModal);
+            throw new Error(errorMsg);
+          case 15:
+            _context.next = 24;
+            break;
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](4);
+            if (res) {
+              _context.next = 21;
+              break;
+            }
+            return _context.abrupt("return");
+          case 21:
+            model.fileService.fileSaveErrorEmitter.fire({
+              cause: _context.t0.errorCause,
+              msg: _context.t0.message,
+              name: res.name || model.currentFileContents.name,
+              path: res.path || model.currentFileContents.path,
+              created: res.created || model.currentFileContents.created,
+              last_modified: res.last_modified || model.currentFileContents.last_modified,
+              size: res.size || model.currentFileContents.size,
+              type: res.type || model.currentFileContents.type
+            });
+            _this.modalService.openModal(SaveFileErrorModal);
+            throw new Error('File Save Error');
+          case 24:
+            _context.next = 26;
+            return model.createCheckpoint();
+          case 26:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[4, 17]]);
+    }));
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+}), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "modalService", [_dec2], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class2)) || _class);

package/es/file/file-create-modal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-create-modal.d.ts","sourceRoot":"","sources":["../../src/file/file-create-modal.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAKnE,OAAO,cAAc,CAAC;AAWtB,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,KAAK,QAAQ,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;AAEhE,eAAO,MAAM,wBAAwB,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,CA0J5E,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,aAAa,CAGpD,CAAC"}
+{"version":3,"file":"file-create-modal.d.ts","sourceRoot":"","sources":["../../src/file/file-create-modal.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAMnE,OAAO,cAAc,CAAC;AAWtB,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,KAAK,QAAQ,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;AAEhE,eAAO,MAAM,wBAAwB,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,CAkK5E,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,SAAS,CAAC,aAAa,CAGpD,CAAC"}

package/es/file/file-create-modal.js

@@ -8,6 +8,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { CommandRegistry } from '@difizen/mana-app';
 import { URI, useInject, ViewManager } from '@difizen/mana-app';
 import { Col, Form, message, Row, Input, Modal } from 'antd';
 import { useEffect, useRef, useState } from 'react';
@@ -20,6 +21,7 @@ export var FileCreateModalComponent = function FileCreateModalComponent(_ref) {
     close = _ref.close,
     data = _ref.data;
   var fileService = useInject(JupyterFileService);
+  var commands = useInject(CommandRegistry);
   var viewManager = useInject(ViewManager);
   var _useState = useState(data === null || data === void 0 ? void 0 : data.fileType),
     _useState2 = _slicedToArray(_useState, 2),
@@ -35,6 +37,7 @@ export var FileCreateModalComponent = function FileCreateModalComponent(_ref) {
     form = _Form$useForm2[0];
   var onFinish = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
+      var stat;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -46,20 +49,28 @@ export var FileCreateModalComponent = function FileCreateModalComponent(_ref) {
             _context.next = 6;
             return fileService.newFile(values.fileName + (fileType || ''), new URI(data === null || data === void 0 ? void 0 : data.path));
           case 6:
+            stat = _context.sent;
             if (fileView) {
               fileView.model.refresh();
             }
-            _context.next = 12;
+            if (stat.isFile) {
+              commands.executeCommand('fileTree.command.openfile', {
+                fileStat: stat,
+                uri: stat.resource
+              });
+            }
+            // message.success('新建文件成功');
+            _context.next = 14;
             break;
-          case 9:
-            _context.prev = 9;
+          case 11:
+            _context.prev = 11;
             _context.t0 = _context["catch"](3);
             message.error('新建文件失败');
-          case 12:
+          case 14:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[3, 9]]);
+      }, _callee, null, [[3, 11]]);
     }));
     return function onFinish(_x) {
       return _ref2.apply(this, arguments);

package/es/file/file-service.js

@@ -390,7 +390,7 @@ export var JupyterFileService = (_dec = singleton({
               _context10.next = 13;
               return this.rename(new URI(res.path.toString()), fileName);
             case 13:
-              return _context10.abrupt("return", this.resolve(target));
+              return _context10.abrupt("return", this.resolve(targetFileUri));
             case 14:
             case "end":
               return _context10.stop();

package/es/file/index.d.ts

@@ -7,4 +7,5 @@ export * from './file-protocol.js';
 export * from './file-icon.js';
 export * from './file-create-modal.js';
 export * from './file-createdir-modal.js';
+export * from './file-command.js';
 //# sourceMappingURL=index.d.ts.map

package/es/file/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/file/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/file/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAC"}

package/es/file/index.js

@@ -6,4 +6,5 @@ export * from "./file-service.js";
 export * from "./file-protocol.js";
 export * from "./file-icon.js";
 export * from "./file-create-modal.js";
-export * from "./file-createdir-modal.js";
+export * from "./file-createdir-modal.js";
+export * from "./file-command.js";

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

@@ -40,7 +40,6 @@ export declare class LibroJupyterModel extends LibroModel implements ExecutableN
     restoreCheckpoint(checkpointID: string): Promise<void>;
     deleteCheckpoint(checkpointID: string): Promise<void>;
     startKernelConnection(): void;
-    saveNotebookContent(): Promise<void>;
     canRun(): boolean;
     interrupt(): Promise<void>;
     shutdown(): 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;AAIrC,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;IA2BN,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuD1C,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,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"}

package/es/libro-jupyter-model.js

@@ -28,7 +28,6 @@ import { Deferred } from '@difizen/mana-app';
 import { inject, transient } from '@difizen/mana-app';
 import { l10n } from '@difizen/mana-l10n';
 import { ExecutedWithKernelCellModel, libroArgsMimetype, LibroFileService } from "./libro-jupyter-protocol.js";
-import { SaveFileErrorModal } from "./toolbar/save-file-error.js";
 import { getDefaultKernel } from "./utils/index.js";
 export var LibroJupyterModel = (_dec = transient(), _dec2 = prop(), _dec3 = prop(), _dec4 = prop(), _dec5 = prop(), _dec6 = prop(), _dec7 = prop(), _dec8 = prop(), _dec(_class = (_class2 = /*#__PURE__*/function (_LibroModel) {
   _inherits(LibroJupyterModel, _LibroModel);
@@ -250,88 +249,6 @@ export var LibroJupyterModel = (_dec = transient(), _dec2 = prop(), _dec3 = prop
         }, _callee5);
       }))).catch(console.error);
     }
-  }, {
-    key: "saveNotebookContent",
-    value: function () {
-      var _saveNotebookContent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        var notebookContent, res, _res, errorMsg;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
-            case 0:
-              notebookContent = this.toJSON();
-              if (this.currentFileContents) {
-                _context6.next = 3;
-                break;
-              }
-              throw new Error('currentFileContents is undefined');
-            case 3:
-              res = {};
-              _context6.prev = 4;
-              _context6.next = 7;
-              return this.libroFileService.write(notebookContent, this.currentFileContents);
-            case 7:
-              res = _context6.sent;
-              if (res) {
-                _context6.next = 10;
-                break;
-              }
-              return _context6.abrupt("return");
-            case 10:
-              if (!(res.last_modified === this.last_modified || res.size === 0)) {
-                _context6.next = 15;
-                break;
-              }
-              errorMsg = "File Save Error: ".concat((_res = res) === null || _res === void 0 ? void 0 : _res.message, " ");
-              this.libroFileService.fileSaveErrorEmitter.fire({
-                cause: res.message,
-                msg: errorMsg,
-                name: res.name,
-                path: res.path,
-                created: res.created,
-                last_modified: res.last_modified,
-                size: res.size,
-                type: res.type
-              });
-              this.modalService.openModal(SaveFileErrorModal);
-              throw new Error(errorMsg);
-            case 15:
-              _context6.next = 24;
-              break;
-            case 17:
-              _context6.prev = 17;
-              _context6.t0 = _context6["catch"](4);
-              if (res) {
-                _context6.next = 21;
-                break;
-              }
-              return _context6.abrupt("return");
-            case 21:
-              this.libroFileService.fileSaveErrorEmitter.fire({
-                cause: _context6.t0.errorCause,
-                msg: _context6.t0.message,
-                name: res.name || this.currentFileContents.name,
-                path: res.path || this.currentFileContents.path,
-                created: res.created || this.currentFileContents.created,
-                last_modified: res.last_modified || this.currentFileContents.last_modified,
-                size: res.size || this.currentFileContents.size,
-                type: res.type || this.currentFileContents.type
-              });
-              this.modalService.openModal(SaveFileErrorModal);
-              throw new Error('File Save Error');
-            case 24:
-              _context6.next = 26;
-              return this.createCheckpoint();
-            case 26:
-            case "end":
-              return _context6.stop();
-          }
-        }, _callee6, this, [[4, 17]]);
-      }));
-      function saveNotebookContent() {
-        return _saveNotebookContent.apply(this, arguments);
-      }
-      return saveNotebookContent;
-    }()
   }, {
     key: "canRun",
     value: function canRun() {
@@ -348,24 +265,24 @@ export var LibroJupyterModel = (_dec = transient(), _dec2 = prop(), _dec3 = prop
   }, {
     key: "interrupt",
     value: function () {
-      var _interrupt = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _interrupt = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               if (this.kernelConnection) {
-                _context7.next = 3;
+                _context6.next = 3;
                 break;
               }
               alert(l10n.t('Kernel Connection 还没有建立'));
-              return _context7.abrupt("return");
+              return _context6.abrupt("return");
             case 3:
-              _context7.next = 5;
+              _context6.next = 5;
               return this.kernelConnection.interrupt();
             case 5:
             case "end":
-              return _context7.stop();
+              return _context6.stop();
           }
-        }, _callee7, this);
+        }, _callee6, this);
       }));
       function interrupt() {
         return _interrupt.apply(this, arguments);
@@ -375,26 +292,26 @@ export var LibroJupyterModel = (_dec = transient(), _dec2 = prop(), _dec3 = prop
   }, {
     key: "shutdown",
     value: function () {
-      var _shutdown = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      var _shutdown = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               if (this.kernelConnection) {
-                _context8.next = 3;
+                _context7.next = 3;
                 break;
               }
               alert(l10n.t('Kernel Connection 还没有建立'));
-              return _context8.abrupt("return");
+              return _context7.abrupt("return");
             case 3:
-              _context8.next = 5;
+              _context7.next = 5;
               return this.kernelConnectionManager.shutdownKC(this.currentFileContents);
             case 5:
               this.kernelConnection = undefined;
             case 6:
             case "end":
-              return _context8.stop();
+              return _context7.stop();
           }
-        }, _callee8, this);
+        }, _callee7, this);
       }));
       function shutdown() {
         return _shutdown.apply(this, arguments);
@@ -404,13 +321,13 @@ export var LibroJupyterModel = (_dec = transient(), _dec2 = prop(), _dec3 = prop
   }, {
     key: "restart",
     value: function () {
-      var _restart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+      var _restart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         var _this3 = this;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               if (!(!this.kernelConnection || this.kernelConnection.isDisposed)) {
-                _context9.next = 4;
+                _context8.next = 4;
                 break;
               }
               this.startKernelConnection();
@@ -421,14 +338,14 @@ export var LibroJupyterModel = (_dec = transient(), _dec2 = prop(), _dec3 = prop
                 }
                 return;
               }).catch(console.error);
-              return _context9.abrupt("return");
+              return _context8.abrupt("return");
             case 4:
               this.kernelConnection.restart();
             case 5:
             case "end":
-              return _context9.stop();
+              return _context8.stop();
           }
-        }, _callee9, this);
+        }, _callee8, this);
       }));
       function restart() {
         return _restart.apply(this, arguments);
@@ -438,24 +355,24 @@ export var LibroJupyterModel = (_dec = transient(), _dec2 = prop(), _dec3 = prop
   }, {
     key: "reconnect",
     value: function () {
-      var _reconnect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _reconnect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               if (this.kernelConnection) {
-                _context10.next = 3;
+                _context9.next = 3;
                 break;
               }
               alert(l10n.t('Kernel Connection 还没有建立'));
-              return _context10.abrupt("return");
+              return _context9.abrupt("return");
             case 3:
-              _context10.next = 5;
+              _context9.next = 5;
               return this.kernelConnection.reconnect();
             case 5:
             case "end":
-              return _context10.stop();
+              return _context9.stop();
           }
-        }, _callee10, this);
+        }, _callee9, this);
       }));
       function reconnect() {
         return _reconnect.apply(this, arguments);

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

@@ -1 +1 @@
-{"version":3,"file":"libro-jupyter-workspace.d.ts","sourceRoot":"","sources":["../src/libro-jupyter-workspace.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,UAAU,oBAAoB;IAC5B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBACa,uBACX,SAAQ,oBACR,YAAW,sBAAsB,EAAE,uBAAuB;IAEhC,gBAAgB,EAAE,gBAAgB,CAAC;IACtC,aAAa,EAAE,aAAa,CAAC;IAEpD,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAE9C,WAAW;IAgBX,IAAa,aAAa,QAEzB;IACD,IAAa,SAAS,YAErB;IACD,IAAa,KAAK,YAEjB;CACF"}
+{"version":3,"file":"libro-jupyter-workspace.d.ts","sourceRoot":"","sources":["../src/libro-jupyter-workspace.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAGxC,UAAU,oBAAoB;IAC5B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBACa,uBACX,SAAQ,oBACR,YAAW,sBAAsB,EAAE,uBAAuB;IAEhC,gBAAgB,EAAE,gBAAgB,CAAC;IACtC,aAAa,EAAE,aAAa,CAAC;IAEpD,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAE9C,WAAW;IAkBX,IAAa,aAAa,QAEzB;IACD,IAAa,SAAS,YAErB;IACD,IAAa,KAAK,YAEjB;CACF"}

package/es/libro-jupyter-workspace.js

@@ -48,9 +48,9 @@ export var JupyterWorkspaceService = (_dec = singleton({
     key: "onViewStart",
     value: function onViewStart() {
       var _this2 = this;
-      var settings = _objectSpread({}, this.serverConnection.settings);
-      var url = URL.join(settings.baseUrl, '/libro/api/workspace');
       this.serverManager.ready.then(function () {
+        var settings = _objectSpread({}, _this2.serverConnection.settings);
+        var url = URL.join(settings.baseUrl, '/libro/api/workspace');
         return _this2.serverConnection.makeRequest(url, {});
       }).then( /*#__PURE__*/function () {
         var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {

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;AA+B/C,eAAO,MAAM,kBAAkB,YAwD5B,CAAC"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAgC/C,eAAO,MAAM,kBAAkB,YAyD5B,CAAC"}

package/es/module.js

@@ -16,6 +16,7 @@ import { LibroJupyterCommandContribution, LibroJupyterKeybindingContribution } f
 import { CellExecutionTip, CellInputBottomBlank } from "./components/index.js";
 import { ConfigAppContribution, LibroJupyterSettingContribution } from "./config/index.js";
 import { LibroJupyterContentContribution } from "./contents/index.js";
+import { LibroJupyterContentSaveContribution } from "./contents/save-content-contribution.js";
 import { LibroJupyterFileModule } from "./file/index.js";
 import { KeybindInstructionsModule } from "./keybind-instructions/index.js";
 import { LibroJupyterFileService } from "./libro-jupyter-file-service.js";
@@ -28,7 +29,7 @@ import { LibroJupyterOutputArea } from "./output/index.js";
 import { PlotlyModule } from "./rendermime/index.js";
 import { LibroJupyterColorContribution } from "./theme/index.js";
 import { KernelStatusSelector, LibroJupyterToolbarContribution, SaveFileErrorContribution } from "./toolbar/index.js";
-export var LibroJupyterModule = ManaModule.create().register(JupyterWorkspaceService, LibroJupyterFileService, LibroJupyterCommandContribution, LibroJupyterKeybindingContribution, LibroJupyterToolbarContribution, ConfigAppContribution, SaveFileErrorContribution, LibroKeybindRegistry, LibroJupyterContentContribution, LibroJupyterOutputArea, LibroJupyterColorContribution, LibroJupyterSettingContribution, JupyterServerLaunchManager, LibroJupyterView, {
+export var LibroJupyterModule = ManaModule.create().register(JupyterWorkspaceService, LibroJupyterFileService, LibroJupyterCommandContribution, LibroJupyterKeybindingContribution, LibroJupyterToolbarContribution, ConfigAppContribution, SaveFileErrorContribution, LibroKeybindRegistry, LibroJupyterContentContribution, LibroJupyterContentSaveContribution, LibroJupyterOutputArea, LibroJupyterColorContribution, LibroJupyterSettingContribution, JupyterServerLaunchManager, LibroJupyterView, {
   token: CellExecutionTimeProvider,
   useValue: CellExecutionTip
 }, {

package/package.json

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

package/src/contents/save-content-contribution.ts

@@ -0,0 +1,67 @@
+import type { NotebookOption } from '@difizen/libro-core';
+import { ContentSaveContribution } from '@difizen/libro-core';
+import type { IContentsModel } from '@difizen/libro-kernel';
+import { ModalService, inject, singleton } from '@difizen/mana-app';
+
+import type { LibroJupyterModel } from '../libro-jupyter-model.js';
+import { SaveFileErrorModal } from '../toolbar/save-file-error.js';
+
+@singleton({ contrib: ContentSaveContribution })
+export class LibroJupyterContentSaveContribution implements ContentSaveContribution {
+  @inject(ModalService) protected readonly modalService: ModalService;
+
+  canHandle = () => {
+    return 2;
+  };
+  saveContent = async (options: NotebookOption, model: LibroJupyterModel) => {
+    const notebookContent = model.toJSON();
+    if (!model.currentFileContents) {
+      throw new Error('currentFileContents is undefined');
+    }
+
+    let res = {} as IContentsModel | undefined;
+
+    try {
+      res = await model.fileService.write(notebookContent, model.currentFileContents);
+      if (!res) {
+        return;
+      }
+      // 文件保存失败
+      if (res.last_modified === model.lastModified || res.size === 0) {
+        const errorMsg = `File Save Error: ${res?.message} `;
+        model.fileService.fileSaveErrorEmitter.fire({
+          cause: res.message,
+          msg: errorMsg,
+          name: res.name,
+          path: res.path,
+          created: res.created,
+          last_modified: res.last_modified,
+          size: res.size,
+          type: res.type,
+        });
+        this.modalService.openModal(SaveFileErrorModal);
+
+        throw new Error(errorMsg);
+      }
+    } catch (e: any) {
+      if (!res) {
+        return;
+      }
+      model.fileService.fileSaveErrorEmitter.fire({
+        cause: e.errorCause,
+        msg: e.message,
+        name: res.name || model.currentFileContents.name,
+        path: res.path || model.currentFileContents.path,
+        created: res.created || model.currentFileContents.created,
+        last_modified: res.last_modified || model.currentFileContents.last_modified,
+        size: res.size || model.currentFileContents.size,
+        type: res.type || model.currentFileContents.type,
+      });
+      this.modalService.openModal(SaveFileErrorModal);
+
+      throw new Error('File Save Error');
+    }
+
+    await model.createCheckpoint();
+  };
+}

package/src/file/file-create-modal.tsx

@@ -1,4 +1,5 @@
 import type { ModalItemProps, ModalItem } from '@difizen/mana-app';
+import { CommandRegistry } from '@difizen/mana-app';
 import { URI, useInject, ViewManager } from '@difizen/mana-app';
 import { Col, Form, message, Row, Input, Modal } from 'antd';
 import type { InputRef } from 'antd';
@@ -27,6 +28,7 @@ export const FileCreateModalComponent: React.FC<ModalItemProps<ModalItemType>> =
   data,
 }: ModalItemProps<ModalItemType>) => {
   const fileService = useInject(JupyterFileService);
+  const commands = useInject(CommandRegistry);
   const viewManager = useInject(ViewManager);
   const [fileType, setFileType] = useState<FileType>(data?.fileType);
   const [fileView, setFileView] = useState<FileView>();
@@ -37,13 +39,20 @@ export const FileCreateModalComponent: React.FC<ModalItemProps<ModalItemType>> =
     await form.validateFields();
     close();
     try {
-      await fileService.newFile(
+      const stat = await fileService.newFile(
         values.fileName + (fileType || ''),
         new URI(data?.path),
       );
       if (fileView) {
         fileView.model.refresh();
       }
+      if (stat.isFile) {
+        commands.executeCommand('fileTree.command.openfile', {
+          fileStat: stat,
+          uri: stat.resource,
+        });
+      }
+      // message.success('新建文件成功');
     } catch {
       message.error('新建文件失败');
     }

package/src/file/file-service.ts

@@ -205,7 +205,7 @@ export class JupyterFileService extends FileService {
       ext,
     });
     await this.rename(new URI(res.path.toString()), fileName);
-    return this.resolve(target);
+    return this.resolve(targetFileUri);
   }
 
   async newFileDir(dirName: string, target: URI): Promise<FileStatWithMetadata> {

package/src/file/index.ts

@@ -7,3 +7,4 @@ export * from './file-protocol.js';
 export * from './file-icon.js';
 export * from './file-create-modal.js';
 export * from './file-createdir-modal.js';
+export * from './file-command.js';

package/src/libro-jupyter-model.ts

@@ -19,7 +19,6 @@ import {
   libroArgsMimetype,
   LibroFileService,
 } from './libro-jupyter-protocol.js';
-import { SaveFileErrorModal } from './toolbar/save-file-error.js';
 import { getDefaultKernel } from './utils/index.js';
 
 type IModel = IContentsModel;
@@ -175,61 +174,6 @@ export class LibroJupyterModel extends LibroModel implements ExecutableNotebookM
       .catch(console.error);
   }
 
-  override async saveNotebookContent(): Promise<void> {
-    const notebookContent = this.toJSON();
-    if (!this.currentFileContents) {
-      throw new Error('currentFileContents is undefined');
-    }
-
-    let res = {} as IModel | undefined;
-
-    try {
-      res = await this.libroFileService.write(
-        notebookContent,
-        this.currentFileContents,
-      );
-      if (!res) {
-        return;
-      }
-      // 文件保存失败
-      if (res.last_modified === this.last_modified || res.size === 0) {
-        const errorMsg = `File Save Error: ${res?.message} `;
-        this.libroFileService.fileSaveErrorEmitter.fire({
-          cause: res.message,
-          msg: errorMsg,
-          name: res.name,
-          path: res.path,
-          created: res.created,
-          last_modified: res.last_modified,
-          size: res.size,
-          type: res.type,
-        });
-        this.modalService.openModal(SaveFileErrorModal);
-
-        throw new Error(errorMsg);
-      }
-    } catch (e: any) {
-      if (!res) {
-        return;
-      }
-      this.libroFileService.fileSaveErrorEmitter.fire({
-        cause: e.errorCause,
-        msg: e.message,
-        name: res.name || this.currentFileContents.name,
-        path: res.path || this.currentFileContents.path,
-        created: res.created || this.currentFileContents.created,
-        last_modified: res.last_modified || this.currentFileContents.last_modified,
-        size: res.size || this.currentFileContents.size,
-        type: res.type || this.currentFileContents.type,
-      });
-      this.modalService.openModal(SaveFileErrorModal);
-
-      throw new Error('File Save Error');
-    }
-
-    await this.createCheckpoint();
-  }
-
   override canRun() {
     if (!this.kernelConnection) {
       alert(l10n.t('Kernel Connection 还没有建立'));

package/src/libro-jupyter-workspace.ts

@@ -20,10 +20,12 @@ export class JupyterWorkspaceService
   protected workspaceData: JupyterWorkspaceData;
 
   onViewStart() {
-    const settings = { ...this.serverConnection.settings };
-    const url = URL.join(settings.baseUrl, '/libro/api/workspace');
     this.serverManager.ready
-      .then(() => this.serverConnection.makeRequest(url, {}))
+      .then(() => {
+        const settings = { ...this.serverConnection.settings };
+        const url = URL.join(settings.baseUrl, '/libro/api/workspace');
+        return this.serverConnection.makeRequest(url, {});
+      })
       .then(async (res) => {
         const data = await res.json();
         this.workspaceData = data;

package/src/module.ts

@@ -39,6 +39,7 @@ import {
   LibroJupyterSettingContribution,
 } from './config/index.js';
 import { LibroJupyterContentContribution } from './contents/index.js';
+import { LibroJupyterContentSaveContribution } from './contents/save-content-contribution.js';
 import { LibroJupyterFileModule } from './file/index.js';
 import { KeybindInstructionsModule } from './keybind-instructions/index.js';
 import { LibroJupyterFileService } from './libro-jupyter-file-service.js';
@@ -67,6 +68,7 @@ export const LibroJupyterModule = ManaModule.create()
     SaveFileErrorContribution,
     LibroKeybindRegistry,
     LibroJupyterContentContribution,
+    LibroJupyterContentSaveContribution,
     LibroJupyterOutputArea,
     LibroJupyterColorContribution,
     LibroJupyterSettingContribution,