@difizen/libro-jupyter 0.1.17 → 0.1.19

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

@@ -1,21 +1,14 @@
 /// <reference types="react" resolution-mode="require"/>
 import { LibroCodeCellView } from '@difizen/libro-code-cell';
-import { CodeEditorManager } from '@difizen/libro-code-editor';
 import type { CodeEditorViewOptions, CompletionProvider, TooltipProvider } from '@difizen/libro-code-editor';
-import type { CellViewOptions } from '@difizen/libro-core';
-import { CellService } from '@difizen/libro-core';
-import type { LSPProvider } from '@difizen/libro-lsp';
-import { ILSPDocumentConnectionManager } from '@difizen/libro-lsp';
-import { ViewManager } from '@difizen/mana-app';
+import type { LibroJupyterView } from '../libro-jupyter-view.js';
 import type { JupyterCodeCellModel } from './jupyter-code-cell-model.js';
 export declare class JupyterCodeCellView extends LibroCodeCellView {
+    parent: LibroJupyterView;
     view: import("react").ForwardRefExoticComponent<import("react").RefAttributes<HTMLDivElement>>;
     model: JupyterCodeCellModel;
-    protected readonly lspDocumentConnectionManager: ILSPDocumentConnectionManager;
-    constructor(options: CellViewOptions, cellService: CellService, viewManager: ViewManager, lspDocumentConnectionManager: ILSPDocumentConnectionManager, codeEditorManager: CodeEditorManager);
     clearExecution: () => void;
     protected getEditorOption(): CodeEditorViewOptions;
-    lspProvider: LSPProvider;
     tooltipProvider: TooltipProvider;
     completionProvider: CompletionProvider;
     run(): Promise<boolean>;

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,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,EAElB,eAAe,EAEhB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAiB,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAEnE,OAAO,EAAsB,WAAW,EAAc,MAAM,mBAAmB,CAAC;AAQhF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAkBzE,qBAEa,mBAAoB,SAAQ,iBAAiB;IAC/C,IAAI,2FAA4B;IACjC,KAAK,EAAE,oBAAoB,CAAC;IAEpC,SAAS,CAAC,QAAQ,CAAC,4BAA4B,EAAE,6BAA6B,CAAC;gBAGzD,OAAO,EAAE,eAAe,EACvB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EAE7C,4BAA4B,EAAE,6BAA6B,EAChC,iBAAiB,EAAE,iBAAiB;IAMxD,cAAc,aAQrB;cAEiB,eAAe,IAAI,qBAAqB;IAY3D,WAAW,EAAE,WAAW,CAkCtB;IAEF,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;IAChD,MAAM,EAAE,gBAAgB,CAAC;IACxB,IAAI,2FAA4B;IACjC,KAAK,EAAE,oBAAoB,CAAC;IAE3B,cAAc,aAQrB;cAEiB,eAAe,IAAI,qBAAqB;IAgB3D,eAAe,EAAE,eAAe,CAqB9B;IAEF,kBAAkB,EAAE,kBAAkB,CA8BpC;IAEa,GAAG;CA8EnB"}

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

@@ -21,12 +21,10 @@ 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 { CodeEditorManager } from '@difizen/libro-code-editor';
-import { CellService } from '@difizen/libro-core';
 import { KernelError } from '@difizen/libro-kernel';
-import { ILSPDocumentConnectionManager } from '@difizen/libro-lsp';
-import { inject, transient } from '@difizen/mana-app';
-import { view, ViewInstance, ViewManager, ViewOption } from '@difizen/mana-app';
+import { LibroCellURIScheme } from '@difizen/libro-language-client';
+import { transient, URI } from '@difizen/mana-app';
+import { view, ViewInstance } from '@difizen/mana-app';
 import { getOrigin, useInject } from '@difizen/mana-app';
 import { l10n } from '@difizen/mana-l10n';
 import { forwardRef } from 'react';
@@ -45,12 +43,14 @@ var JupyterCodeCellComponent = /*#__PURE__*/forwardRef(function JupyterCodeCellC
 export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code-cell-view'), _dec(_class = _dec2(_class = /*#__PURE__*/function (_LibroCodeCellView) {
   _inherits(JupyterCodeCellView, _LibroCodeCellView);
   var _super = _createSuper(JupyterCodeCellView);
-  function JupyterCodeCellView(options, cellService, viewManager, lspDocumentConnectionManager, codeEditorManager) {
+  function JupyterCodeCellView() {
     var _this;
     _classCallCheck(this, JupyterCodeCellView);
-    _this = _super.call(this, options, cellService, viewManager, codeEditorManager);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _super.call.apply(_super, [this].concat(args));
     _this.view = JupyterCodeCellComponent;
-    _this.lspDocumentConnectionManager = void 0;
     _this.clearExecution = function () {
       _this.model.clearExecution();
       Promise.resolve().then(function () {
@@ -58,129 +58,83 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
         return;
       }).catch(console.error);
     };
-    _this.lspProvider = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var adapter, virtualEditor, virtualDocument, lspConnection;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return _this.lspDocumentConnectionManager.ready;
-          case 2:
-            adapter = _this.lspDocumentConnectionManager.adapters.get(_this.parent.model.id);
-            if (adapter) {
-              _context.next = 5;
-              break;
-            }
-            throw new Error('no adapter');
-          case 5:
-            _context.next = 7;
-            return adapter.ready;
-          case 7:
-            virtualEditor = adapter.getCellEditor(_assertThisInitialized(_this));
-            if (virtualEditor) {
-              _context.next = 10;
-              break;
-            }
-            throw new Error('no virtual editor');
-          case 10:
-            // Get the associated virtual document of the opened document
-            virtualDocument = adapter.virtualDocument;
-            if (virtualDocument) {
-              _context.next = 13;
-              break;
-            }
-            throw new Error('no virtualDocument');
-          case 13:
-            // Get the LSP connection of the virtual document.
-            lspConnection = _this.lspDocumentConnectionManager.connections.get(virtualDocument.uri);
-            return _context.abrupt("return", {
-              virtualDocument: virtualDocument,
-              lspConnection: lspConnection,
-              editor: virtualEditor
-            });
-          case 15:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
     _this.tooltipProvider = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(option) {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(option) {
         var cellContent, kernelConnection, reply, value;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
             case 0:
               cellContent = _this.model.value;
               kernelConnection = getOrigin(_this.parent.model.kernelConnection);
               if (kernelConnection) {
-                _context2.next = 5;
+                _context.next = 5;
                 break;
               }
               alert(l10n.t('Kernel Connection 还没有建立'));
-              return _context2.abrupt("return", null);
+              return _context.abrupt("return", null);
             case 5:
-              _context2.next = 7;
+              _context.next = 7;
               return kernelConnection.requestInspect({
                 code: cellContent,
                 cursor_pos: option.cursorPosition,
                 detail_level: 1
               });
             case 7:
-              reply = _context2.sent;
+              reply = _context.sent;
               value = reply.content;
               if (!(value.status !== 'ok' || !value.found)) {
-                _context2.next = 11;
+                _context.next = 11;
                 break;
               }
-              return _context2.abrupt("return", null);
+              return _context.abrupt("return", null);
             case 11:
-              return _context2.abrupt("return", value.data['text/plain']);
+              return _context.abrupt("return", value.data['text/plain']);
             case 12:
             case "end":
-              return _context2.stop();
+              return _context.stop();
           }
-        }, _callee2);
+        }, _callee);
       }));
       return function (_x) {
-        return _ref2.apply(this, arguments);
+        return _ref.apply(this, arguments);
       };
     }();
     _this.completionProvider = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(option) {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(option) {
         var cellContent, kernelConnection, reply, value;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               cellContent = _this.model.source;
               kernelConnection = getOrigin(_this.parent.model.kernelConnection);
               if (kernelConnection) {
-                _context3.next = 5;
+                _context2.next = 5;
                 break;
               }
               alert(l10n.t('Kernel Connection 还没有建立'));
               throw new Error(l10n.t('Kernel Connection 还没有建立'));
             case 5:
-              _context3.next = 7;
+              _context2.next = 7;
               return kernelConnection.requestComplete({
                 code: cellContent,
                 cursor_pos: option.cursorPosition
               });
             case 7:
-              reply = _context3.sent;
+              reply = _context2.sent;
               value = reply.content;
               if (!(value.status === 'abort')) {
-                _context3.next = 11;
+                _context2.next = 11;
                 break;
               }
               throw new Error('abort');
             case 11:
               if (!(value.status === 'error')) {
-                _context3.next = 13;
+                _context2.next = 13;
                 break;
               }
               throw new Error(value.ename);
             case 13:
-              return _context3.abrupt("return", {
+              return _context2.abrupt("return", {
                 matches: value.matches,
                 cursor_start: value.cursor_start,
                 cursor_end: value.cursor_end,
@@ -188,51 +142,51 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
               });
             case 14:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3);
+        }, _callee2);
       }));
       return function (_x2) {
-        return _ref3.apply(this, arguments);
+        return _ref2.apply(this, arguments);
       };
     }();
-    _this.lspDocumentConnectionManager = lspDocumentConnectionManager;
     return _this;
   }
-  JupyterCodeCellView = inject(CodeEditorManager)(JupyterCodeCellView, undefined, 4) || JupyterCodeCellView;
-  JupyterCodeCellView = inject(ILSPDocumentConnectionManager)(JupyterCodeCellView, undefined, 3) || JupyterCodeCellView;
-  JupyterCodeCellView = inject(ViewManager)(JupyterCodeCellView, undefined, 2) || JupyterCodeCellView;
-  JupyterCodeCellView = inject(CellService)(JupyterCodeCellView, undefined, 1) || JupyterCodeCellView;
-  JupyterCodeCellView = inject(ViewOption)(JupyterCodeCellView, undefined, 0) || JupyterCodeCellView;
   _createClass(JupyterCodeCellView, [{
     key: "getEditorOption",
     value: function getEditorOption() {
       var options = _get(_getPrototypeOf(JupyterCodeCellView.prototype), "getEditorOption", this).call(this);
+      var uri = new URI(this.parent.model.filePath);
+      uri = URI.withScheme(uri, LibroCellURIScheme);
+      uri = URI.withQuery(uri, "cellid=".concat(this.model.id));
       return _objectSpread(_objectSpread({}, options), {}, {
+        uuid: uri.toString(),
         tooltipProvider: this.tooltipProvider,
-        completionProvider: this.completionProvider,
-        lspProvider: this.parent.model.lspEnabled ? this.lspProvider : undefined
+        completionProvider: this.completionProvider
+        // lspProvider: (this.parent.model as LibroJupyterModel).lspEnabled
+        //   ? this.lspProvider
+        //   : undefined,
       });
     }
   }, {
     key: "run",
     value: function () {
-      var _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var libroModel, kernelConnection, cellContent, cellModel, future, startTimeStr, msgPromise, endTimeStr;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               libroModel = this.parent.model;
               if (!(!libroModel || !(libroModel instanceof LibroJupyterModel) || !libroModel.kernelConnection || libroModel.kernelConnection.isDisposed)) {
-                _context4.next = 3;
+                _context3.next = 3;
                 break;
               }
-              return _context4.abrupt("return", false);
+              return _context3.abrupt("return", false);
             case 3:
               kernelConnection = getOrigin(libroModel.kernelConnection);
               cellContent = this.model.source;
               cellModel = this.model;
-              _context4.prev = 6;
+              _context3.prev = 6;
               // if (this.outputArea instanceof LibroOutputArea)
               //   this.outputArea.lastOutputContainerHeight =
               //     this.outputArea.container?.current?.clientHeight;
@@ -264,10 +218,10 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
               future.onReply = function (msg) {
                 cellModel.msgChangeEmitter.fire(msg);
               };
-              _context4.next = 15;
+              _context3.next = 15;
               return future.done;
             case 15:
-              msgPromise = _context4.sent;
+              msgPromise = _context3.sent;
               cellModel.executing = false;
               cellModel.kernelExecuting = false;
               startTimeStr = msgPromise.metadata['started'];
@@ -275,36 +229,36 @@ export var JupyterCodeCellView = (_dec = transient(), _dec2 = view('jupyter-code
               cellModel.metadata.execution['shell.execute_reply.started'] = startTimeStr;
               cellModel.metadata.execution['shell.execute_reply.end'] = endTimeStr;
               if (msgPromise) {
-                _context4.next = 24;
+                _context3.next = 24;
                 break;
               }
-              return _context4.abrupt("return", true);
+              return _context3.abrupt("return", true);
             case 24:
               if (!(msgPromise.content.status === 'ok')) {
-                _context4.next = 28;
+                _context3.next = 28;
                 break;
               }
-              return _context4.abrupt("return", true);
+              return _context3.abrupt("return", true);
             case 28:
               throw new KernelError(msgPromise.content);
             case 29:
-              _context4.next = 36;
+              _context3.next = 36;
               break;
             case 31:
-              _context4.prev = 31;
-              _context4.t0 = _context4["catch"](6);
-              if (!_context4.t0.message.startsWith('Canceled')) {
-                _context4.next = 35;
+              _context3.prev = 31;
+              _context3.t0 = _context3["catch"](6);
+              if (!_context3.t0.message.startsWith('Canceled')) {
+                _context3.next = 35;
                 break;
               }
-              return _context4.abrupt("return", false);
+              return _context3.abrupt("return", false);
             case 35:
-              throw _context4.t0;
+              throw _context3.t0;
             case 36:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4, this, [[6, 31]]);
+        }, _callee3, this, [[6, 31]]);
       }));
       function run() {
         return _run.apply(this, arguments);

package/es/components/cell-execution-tip.js

@@ -21,7 +21,7 @@ export function CellExecutionTip(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     setCurrentTime = _useState2[1];
   var observableCell = useObserve(cell);
-  if (!ExecutableCellView.is(cell)) {
+  if (!ExecutableCellView.is(observableCell)) {
     return null;
   }
   if (!ExecutableCellModel.is(observableCell.model)) {
@@ -30,7 +30,7 @@ export function CellExecutionTip(_ref) {
   var isHidden = observableCell.model.hasOutputHidden;
   var kernelExecuting = cell.model.kernelExecuting;
   var executionInfo = parseExecutionInfoFromModel(cell.model);
-  var output = cell.outputArea.outputs;
+  var output = observableCell.outputArea.outputs;
   var existOutput = output && output.length !== 0;
   var waitingExecute = isWaitingExecute(observableCell.model);
   if (!executionInfo) {

package/es/file/file-command.d.ts

@@ -54,6 +54,10 @@ export declare const FileCommands: {
         id: string;
         label: string;
     };
+    UPLOAD: {
+        id: string;
+        label: string;
+    };
 };
 export declare const FileTreeContextMenuPath: MenuPath;
 export declare const FileTreeContextMenuGroups: Record<string, MenuPath>;
@@ -67,6 +71,8 @@ export declare class FileCommandContribution implements CommandContribution, Men
     fileView: FileView;
     lastAction: 'COPY' | 'CUT';
     lastActionNode: FileStatNode;
+    allowDownload: boolean;
+    allowUpload: boolean;
     constructor(viewManager: ViewManager);
     registerMenus(menu: MenuRegistry): void;
     registerCommands(command: CommandRegistry): void;

package/es/file/file-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-command.d.ts","sourceRoot":"","sources":["../../src/file/file-command.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EACV,eAAe,EACf,QAAQ,EACR,YAAY,EACZ,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EACL,mBAAmB,EACnB,YAAY,EAEZ,gBAAgB,EAChB,YAAY,EACZ,aAAa,EAEb,mBAAmB,EAEpB,MAAM,mBAAmB,CAAC;AAQ3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,cAAc,CAAC;AAEtB,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiDxB,CAAC;AACF,eAAO,MAAM,uBAAuB,EAAE,QAAqC,CAAC;AAC5E,eAAO,MAAM,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAK9D,CAAC;AAEF,qBAGa,uBACX,YAAW,mBAAmB,EAAE,gBAAgB,EAAE,mBAAmB;IAErE,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACP,WAAW,EAAE,kBAAkB,CAAC;IACtC,YAAY,EAAE,YAAY,CAAC;IAC1B,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC;IAC9B,oBAAoB,EAAE,oBAAoB,CAAC;IAChD,eAAe,EAAE,eAAe,CAAC;IAE1D,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,KAAK,CAAC;IAC3B,cAAc,EAAE,YAAY,CAAC;gBAEI,WAAW,EAAE,WAAW;IAazD,aAAa,CAAC,IAAI,EAAE,YAAY;IA8DhC,gBAAgB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAmMhD,oBAAoB,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI;CAQ7D"}
+{"version":3,"file":"file-command.d.ts","sourceRoot":"","sources":["../../src/file/file-command.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EACV,eAAe,EACf,QAAQ,EACR,YAAY,EACZ,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EACL,mBAAmB,EACnB,YAAY,EAEZ,gBAAgB,EAChB,YAAY,EACZ,aAAa,EAEb,mBAAmB,EAEpB,MAAM,mBAAmB,CAAC;AAM3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,cAAc,CAAC;AAEtB,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqDxB,CAAC;AACF,eAAO,MAAM,uBAAuB,EAAE,QAAqC,CAAC;AAC5E,eAAO,MAAM,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAK9D,CAAC;AAEF,qBAGa,uBACX,YAAW,mBAAmB,EAAE,gBAAgB,EAAE,mBAAmB;IAErE,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACP,WAAW,EAAE,kBAAkB,CAAC;IACtC,YAAY,EAAE,YAAY,CAAC;IAC1B,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC;IAC9B,oBAAoB,EAAE,oBAAoB,CAAC;IAChD,eAAe,EAAE,eAAe,CAAC;IAE1D,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,KAAK,CAAC;IAC3B,cAAc,EAAE,YAAY,CAAC;IAC7B,aAAa,UAAS;IACtB,WAAW,UAAS;gBAEa,WAAW,EAAE,WAAW;IAazD,aAAa,CAAC,IAAI,EAAE,YAAY;IAmEhC,gBAAgB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAkOhD,oBAAoB,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI;CAQ7D"}

package/es/file/file-command.js

@@ -20,7 +20,6 @@ import { ContentsManager } from '@difizen/libro-kernel';
 import { ViewManager, ConfigurationService } from '@difizen/mana-app';
 import { CommandContribution, FileStatNode, inject, MenuContribution, ModalService, OpenerService, singleton, ToolbarContribution, URI } from '@difizen/mana-app';
 import { message, Modal } from 'antd';
-import { LibroConfigAllowDownload } from "../config/index.js";
 import { FileCreateModal } from "./file-create-modal.js";
 import { FileDirCreateModal } from "./file-createdir-modal.js";
 import { FileRenameModal } from "./file-rename-modal.js";
@@ -77,6 +76,10 @@ export var FileCommands = {
   DOWNLOAD: {
     id: 'fileTree.command.download',
     label: '下载'
+  },
+  UPLOAD: {
+    id: 'fileTree.command.upload',
+    label: '上传'
   }
 };
 export var FileTreeContextMenuPath = ['file-tree-context-menu'];
@@ -101,6 +104,8 @@ export var FileCommandContribution = (_dec = singleton({
     this.fileView = void 0;
     this.lastAction = void 0;
     this.lastActionNode = void 0;
+    this.allowDownload = false;
+    this.allowUpload = false;
     this.viewManager = viewManager;
     this.viewManager.getOrCreateView(FileView).then(function (view) {
       _this.fileView = view;
@@ -171,6 +176,11 @@ export var FileCommandContribution = (_dec = singleton({
         command: FileCommands.DOWNLOAD.id,
         order: 'h'
       });
+      menu.registerMenuAction(FileTreeContextMenuGroups['extra'], {
+        id: FileCommands.UPLOAD.id,
+        command: FileCommands.UPLOAD.id,
+        order: 'i'
+      });
     }
   }, {
     key: "registerCommands",
@@ -480,6 +490,11 @@ export var FileCommandContribution = (_dec = singleton({
           }
           var path = data.uri.path.toString();
           _this2.contentsManager.getDownloadUrl(path).then(function (url) {
+            var urlObj = new URL(url);
+            if (urlObj.origin !== location.origin) {
+              // not same origin
+              return;
+            }
             var element = document.createElement('a');
             element.href = url;
             element.download = '';
@@ -491,7 +506,35 @@ export var FileCommandContribution = (_dec = singleton({
           }).catch(console.error);
         },
         isVisible: function isVisible(data) {
-          return !!_this2.configurationService.get(LibroConfigAllowDownload) && FileStatNode.is(data);
+          return _this2.allowDownload && FileStatNode.is(data) && data.fileStat.isFile;
+        }
+      });
+      command.registerCommand(FileCommands.UPLOAD, {
+        execute: function execute(data, view) {
+          if (!_this2.allowUpload) {
+            return;
+          }
+          if (!view || !(view instanceof FileView)) {
+            return;
+          }
+          if (!data || data instanceof FileView) {
+            return view.uploadSubmit();
+          }
+          if (FileStatNode.is(data) && data.fileStat.isDirectory) {
+            return view.uploadSubmit(data.uri.path.toString());
+          }
+        },
+        isVisible: function isVisible(data, view) {
+          if (!_this2.allowUpload) {
+            return false;
+          }
+          if (!view || !(view instanceof FileView)) {
+            return false;
+          }
+          if (!data || data instanceof FileView) {
+            return true;
+          }
+          return FileStatNode.is(data) && data.fileStat.isDirectory;
         }
       });
     }

package/es/file/file-view/index.d.ts

@@ -1,13 +1,25 @@
+import { ContentsManager } from '@difizen/libro-kernel';
+import type { IContentsModel } from '@difizen/libro-kernel';
 import type { TreeNode } from '@difizen/mana-app';
 import { FileTreeModel, FileTreeView, LabelProvider, TreeDecoratorService, TreeProps, TreeViewDecorator, CommandRegistry, OpenerService, SelectionService } from '@difizen/mana-app';
 import React from 'react';
 import './index.less';
 export declare class FileView extends FileTreeView {
     protected openService: OpenerService;
+    protected contentsManager: ContentsManager;
     protected command: CommandRegistry;
+    uploadInput?: HTMLInputElement;
     id: string;
     className: string;
     constructor(props: TreeProps, model: FileTreeModel, treeViewDecorator: TreeViewDecorator, selectionService: SelectionService, labelProvider: LabelProvider, decoratorService: TreeDecoratorService);
+    onViewMount(): void;
+    uploadSubmit: (basePath?: string) => void;
+    /**
+     * Perform the actual upload.
+     */
+    protected doUpload(file: File, basePath: string): Promise<IContentsModel>;
+    onInputChanged: () => void;
+    onInputClicked: () => void;
     openNode: (treeNode: TreeNode) => Promise<void>;
     handleClickEvent(node: TreeNode | undefined, event: React.MouseEvent<HTMLElement>): void;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/file/file-view/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,mBAAmB,CAAC;AAEnE,OAAO,EAGL,aAAa,EACb,YAAY,EAEZ,aAAa,EACb,oBAAoB,EACpB,SAAS,EACT,iBAAiB,EAEjB,eAAe,EAEf,aAAa,EACb,gBAAgB,EAIjB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,cAAc,CAAC;AAUtB,qBAEa,QAAS,SAAQ,YAAY;IACjB,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC;IACnC,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC;IACnD,EAAE,SAAuB;IACzB,SAAS,SAA6B;gBAG1B,KAAK,EAAE,SAAS,EACZ,KAAK,EAAE,aAAa,EAChB,iBAAiB,EAAE,iBAAiB,EACrC,gBAAgB,EAAE,gBAAgB,EACrC,aAAa,EAAE,aAAa,EACrB,gBAAgB,EAAE,oBAAoB;IAetE,QAAQ,aAAoB,QAAQ,mBAmClC;IAEO,gBAAgB,CACvB,IAAI,EAAE,QAAQ,GAAG,SAAS,EAC1B,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,GACnC,IAAI;CAeR"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/file/file-view/index.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAmB,MAAM,mBAAmB,CAAC;AAEnE,OAAO,EAGL,aAAa,EACb,YAAY,EAEZ,aAAa,EACb,oBAAoB,EACpB,SAAS,EACT,iBAAiB,EAEjB,eAAe,EAEf,aAAa,EACb,gBAAgB,EAIjB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,cAAc,CAAC;AAUtB,qBAEa,QAAS,SAAQ,YAAY;IACjB,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC;IACnC,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAC3C,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC;IAC5D,WAAW,CAAC,EAAE,gBAAgB,CAAC;IACtB,EAAE,SAAuB;IACzB,SAAS,SAA6B;gBAG1B,KAAK,EAAE,SAAS,EACZ,KAAK,EAAE,aAAa,EAChB,iBAAiB,EAAE,iBAAiB,EACrC,gBAAgB,EAAE,gBAAgB,EACrC,aAAa,EAAE,aAAa,EACrB,gBAAgB,EAAE,oBAAoB;IAe7D,WAAW,IAAI,IAAI;IAgB5B,YAAY,cAAe,MAAM,UAK/B;IACF;;OAEG;cACa,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAgC/E,cAAc,aAqBZ;IAEF,cAAc,aAIZ;IAEF,QAAQ,aAAoB,QAAQ,mBAmClC;IAEO,gBAAgB,CACvB,IAAI,EAAE,QAAQ,GAAG,SAAS,EAC1B,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,GACnC,IAAI;CAeR"}