@difizen/libro-jupyter 0.0.2-alpha.0 → 0.1.0

package/src/file/file-service.ts

@@ -1,3 +1,5 @@
+import pathUtil from 'path';
+
 import type { IContentsModel } from '@difizen/libro-kernel';
 import { ContentsManager } from '@difizen/libro-kernel';
 import type {
@@ -7,6 +9,7 @@ import type {
   ResolveFileOptions,
 } from '@difizen/mana-app';
 import { FileService, URI, inject, singleton } from '@difizen/mana-app';
+import { message } from 'antd';
 
 import { FileNameAlias } from './file-name-alias.js';
 import type { DirItem } from './file-protocol.js';
@@ -50,41 +53,29 @@ export class JupyterFileService extends FileService {
   }
 
   async write(filePath: string, content: string): Promise<string | undefined> {
-    try {
-      await this.contentsManager.save(filePath, {
-        content,
-      });
-      return filePath;
-    } catch (_e) {
-      //
-    }
-    return undefined;
+    await this.contentsManager.save(filePath, {
+      content,
+    });
+    return filePath;
   }
 
   async readDir(dirPath: string): Promise<DirItem[]> {
     let children: DirItem[] = [];
-    try {
-      const res = await this.contentsManager.get(dirPath, { type: 'directory' });
-      if (res && this.isDirectory(res)) {
-        const content = res.content;
-        children = content.map((item) => {
-          return [item.path, this.isDirectory(item) ? 2 : 1];
-        });
-      }
-    } catch (_e) {
-      //
+    const res = await this.contentsManager.get(dirPath, { type: 'directory' });
+    if (res && this.isDirectory(res)) {
+      const content = res.content;
+      children = content.map((item) => {
+        return [item.path, this.isDirectory(item) ? 2 : 1];
+      });
     }
     return children;
   }
+
   async read(filePath: string): Promise<string | undefined> {
     let content: string | undefined = undefined;
-    try {
-      const res = await this.contentsManager.get(filePath);
-      if (res && !this.isDirectory(res)) {
-        content = res.content as string;
-      }
-    } catch (_e) {
-      //
+    const res = await this.contentsManager.get(filePath);
+    if (res && !this.isDirectory(res)) {
+      content = res.content as string;
     }
     return content;
   }
@@ -94,7 +85,7 @@ export class JupyterFileService extends FileService {
     try {
       const res = await this.contentsManager.get(filePath);
       stat = this.toFileMeta(res);
-    } catch (_e) {
+    } catch {
       //
     }
     return stat;
@@ -132,22 +123,22 @@ export class JupyterFileService extends FileService {
 
   override async copy(
     source: URI,
-    target: URI,
-    options?: CopyFileOptions,
+    _target: URI,
+    _options?: CopyFileOptions,
   ): Promise<FileStatWithMetadata> {
+    await this.contentsManager.copy(source.path.toString(), _target.path.toString());
     return this.resolve(source);
   }
   override async move(
     source: URI,
-    target: URI,
-    options?: MoveFileOptions,
+    _target: URI,
+    _options?: MoveFileOptions,
   ): Promise<FileStatWithMetadata> {
     return this.resolve(source);
   }
 
   toFileStatMeta(meta: FileMeta): FileStatWithMetadata {
     const uri = URI.withScheme(new URI(meta.resource), 'file');
-
     return {
       ...meta,
       resource: uri,
@@ -158,7 +149,7 @@ export class JupyterFileService extends FileService {
 
   override async resolve(
     resource: URI,
-    options?: ResolveFileOptions | undefined,
+    _options?: ResolveFileOptions | undefined,
   ): Promise<FileStatWithMetadata> {
     const resolved = await this.doResolve(resource.path.toString());
     if (resolved) {
@@ -176,4 +167,49 @@ export class JupyterFileService extends FileService {
       isSymbolicLink: false,
     };
   }
+
+  async delete(
+    resource: URI,
+    _options?: ResolveFileOptions | undefined,
+  ): Promise<FileStatWithMetadata> {
+    await this.contentsManager.delete(resource.path.toString());
+    return this.resolve(resource);
+  }
+
+  async rename(resource: URI, newName: string): Promise<FileStatWithMetadata> {
+    const newPath = pathUtil.join(resource.path.dir.toString(), newName);
+    await this.contentsManager.rename(resource.path.toString(), newPath);
+
+    return this.resolve(resource);
+  }
+
+  async newFile(fileName: string, target: URI): Promise<FileStatWithMetadata> {
+    const targetFileUri = new URI(pathUtil.join(target.path.toString(), fileName));
+    if ((await this.resolve(targetFileUri)).isFile) {
+      message.error('文件名重复');
+      return this.resolve(target);
+    }
+    const fileNameArr = fileName.split('.');
+    const ext = fileNameArr[fileNameArr.length - 1];
+    const res = await this.contentsManager.newUntitled({
+      path: target.path.toString(),
+      ext,
+    });
+    await this.rename(new URI(res.path.toString()), fileName);
+    return this.resolve(target);
+  }
+
+  async newFileDir(dirName: string, target: URI): Promise<FileStatWithMetadata> {
+    const targetFileUri = new URI(pathUtil.join(target.path.toString(), dirName));
+    if ((await this.resolve(targetFileUri)).isDirectory) {
+      message.error('文件夹重复');
+      return this.resolve(target);
+    }
+    const res = await this.contentsManager.newUntitled({
+      path: target.path.toString(),
+      type: 'directory',
+    });
+    await this.rename(new URI(res.path.toString()), dirName);
+    return this.resolve(target);
+  }
 }

package/src/file/file-view/index.tsx

@@ -1,3 +1,4 @@
+import { FolderFilled } from '@ant-design/icons';
 import type { TreeNode, ViewOpenHandler } from '@difizen/mana-app';
 import { FileTreeViewFactory } from '@difizen/mana-app';
 import {
@@ -19,7 +20,7 @@ import {
   inject,
   singleton,
 } from '@difizen/mana-app';
-import type React from 'react';
+import React from 'react';
 
 import type { LibroNavigatableView } from '../navigatable-view.js';
 
@@ -53,6 +54,8 @@ export class FileView extends FileTreeView {
       labelProvider,
       decoratorService,
     );
+    this.title.label = '文件导航';
+    this.title.icon = <FolderFilled />;
     this.toDispose.push(this.model.onOpenNode(this.openNode));
   }
 

package/src/file/module.ts

@@ -1,6 +1,10 @@
 import { FileTreeModule, ManaModule } from '@difizen/mana-app';
 
+import { FileCommandContribution } from './file-command.js';
+import { FileCreateModalContribution } from './file-create-modal-contribution.js';
+import { FileCreateDirModalContribution } from './file-createdir-modal-contribution.js';
 import { FileNameAlias } from './file-name-alias.js';
+import { FileRenameModalContribution } from './file-rename-modal-contribution.js';
 import { JupyterFileService } from './file-service.js';
 import { FileTreeLabelProvider } from './file-tree-label-provider.js';
 import { FileView } from './file-view/index.js';
@@ -15,5 +19,9 @@ export const LibroJupyterFileModule = ManaModule.create()
     FileTreeLabelProvider,
     LibroNavigatableView,
     LibroJupyterOpenHandler,
+    FileCommandContribution,
+    FileCreateModalContribution,
+    FileCreateDirModalContribution,
+    FileRenameModalContribution,
   )
   .dependOn(FileTreeModule);

package/src/file/navigatable-view.tsx

@@ -1,6 +1,7 @@
 import type { LibroView } from '@difizen/libro-core';
 import { LibroService } from '@difizen/libro-core';
 import type { NavigatableView } from '@difizen/mana-app';
+import { CommandRegistry } from '@difizen/mana-app';
 import {
   BaseView,
   inject,
@@ -19,6 +20,8 @@ import {
 } from '@difizen/mana-app';
 import { createRef, forwardRef } from 'react';
 
+import type { EditorView } from './file-protocol.js';
+
 export const LibroEditorComponent = forwardRef(function LibroEditorComponent() {
   const instance = useInject<LibroNavigatableView>(ViewInstance);
 
@@ -32,15 +35,23 @@ export const LibroEditorComponent = forwardRef(function LibroEditorComponent() {
 export const LibroNavigatableViewFactoryId = 'libro-navigatable-view-factory';
 @transient()
 @view(LibroNavigatableViewFactoryId)
-export class LibroNavigatableView extends BaseView implements NavigatableView {
+export class LibroNavigatableView
+  extends BaseView
+  implements NavigatableView, EditorView
+{
   @inject(LibroService) protected libroService: LibroService;
 
+  @inject(CommandRegistry) commandRegistry: CommandRegistry;
+
   override view = LibroEditorComponent;
 
   codeRef = createRef<HTMLDivElement>();
 
   @prop() filePath?: string;
 
+  @prop()
+  dirty: boolean;
+
   @prop()
   libroView?: LibroView;
 
@@ -56,6 +67,7 @@ export class LibroNavigatableView extends BaseView implements NavigatableView {
   ) {
     super();
     this.filePath = options.path;
+    this.dirty = false;
     this.title.caption = options.path;
     const uri = new URI(options.path);
     const uriRef = URIIconReference.create('file', new VScodeURI(options.path));
@@ -77,7 +89,14 @@ export class LibroNavigatableView extends BaseView implements NavigatableView {
       return;
     }
     this.libroView = libroView;
+    this.libroView.model.onContentChanged(() => {
+      this.dirty = true;
+    });
+    this.libroView.onSave(() => {
+      this.dirty = false;
+    });
     await this.libroView.initialized;
+    this.libroView.focus();
     this.defer.resolve();
   }
 

package/src/file/utils.ts

@@ -0,0 +1,51 @@
+import { message } from 'antd';
+
+function copyFallback(string: string) {
+  function handler(event: ClipboardEvent) {
+    const clipboardData = event.clipboardData || (window as any).clipboardData;
+    clipboardData.setData('text/plain', string);
+    event.preventDefault();
+    document.removeEventListener('copy', handler, true);
+  }
+
+  document.addEventListener('copy', handler, true);
+  const successful = document.execCommand('copy');
+  if (successful) {
+    message.success('复制成功');
+  } else {
+    message.warning('复制失败');
+  }
+}
+
+// 复制到剪贴板
+export const copy2clipboard = (string: string) => {
+  navigator.permissions
+    .query({
+      name: 'clipboard-write' as any,
+    })
+    .then((result) => {
+      if (result.state === 'granted' || result.state === 'prompt') {
+        if (window.navigator && window.navigator.clipboard) {
+          window.navigator.clipboard
+            .writeText(string)
+            .then(() => {
+              message.success('复制成功');
+              return;
+            })
+            .catch((err) => {
+              message.warning('复制失败');
+              console.error('Could not copy text: ', err);
+            });
+        } else {
+          console.warn('navigator is not  exist');
+        }
+      } else {
+        console.warn('浏览器权限不允许复制');
+        copyFallback(string);
+      }
+      return;
+    })
+    .catch(() => {
+      //
+    });
+};

package/src/index.spec.ts

@@ -0,0 +1,11 @@
+import assert from 'assert';
+
+import { JupyterFileService, LibroJupyterModel } from './index.js';
+import 'reflect-metadata';
+
+describe('libro-jupyter', () => {
+  it('#import', () => {
+    assert(JupyterFileService);
+    assert(LibroJupyterModel);
+  });
+});

package/src/index.ts

@@ -26,6 +26,7 @@ export * from './theme/index.js';
 export * from './toolbar/index.js';
 export * from './libro-jupyter-protocol.js';
 export * from './libro-jupyter-model.js';
+export * from './libro-jupyter-view.js';
 export * from './libro-jupyter-file-service.js';
 export * from './libro-jupyter-server-launch-manager.js';
 export * from './file/index.js';

package/src/libro-jupyter-protocol.ts

@@ -52,8 +52,3 @@ export interface LibroFileService {
     currentFileContents: IContentsModel,
   ) => Promise<IContentsModel | undefined>;
 }
-
-export const ServerLaunchManager = Symbol('ServerLaunchManager');
-export interface ServerLaunchManager {
-  launch: () => Promise<any>;
-}

package/src/libro-jupyter-server-launch-manager.ts

@@ -2,12 +2,8 @@ import { ServerManager, ServerConnection } from '@difizen/libro-kernel';
 import { inject, singleton } from '@difizen/mana-app';
 import { ApplicationContribution } from '@difizen/mana-app';
 
-import { ServerLaunchManager } from './libro-jupyter-protocol.js';
-
-@singleton({ contrib: [ServerLaunchManager, ApplicationContribution] })
-export class JupyterServerLaunchManager
-  implements ServerLaunchManager, ApplicationContribution
-{
+@singleton({ contrib: [ApplicationContribution] })
+export class JupyterServerLaunchManager implements ApplicationContribution {
   protected serverManager: ServerManager;
   protected serverConnection: ServerConnection;
 
@@ -27,10 +23,5 @@ export class JupyterServerLaunchManager
       baseUrl: `http://${host}`,
       wsUrl: `ws://${host}`,
     });
-    this.launch();
-  }
-
-  launch() {
-    return this.serverManager.launch();
   }
 }

package/es/components/icons.d.ts

@@ -1,5 +0,0 @@
-import React from 'react';
-export declare const InfoCircle: React.FC;
-export declare const WarningIcon: React.FC;
-export declare const Location: React.FC;
-//# sourceMappingURL=icons.d.ts.map

package/es/components/icons.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"icons.d.ts","sourceRoot":"","sources":["../../src/components/icons.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EA4C9B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAuC/B,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EA2B5B,CAAC"}

package/es/config/config.d.ts

@@ -1,3 +0,0 @@
-import type { ConfigurationNode } from '@difizen/mana-app';
-export declare const LibroAutosaveSetting: ConfigurationNode<boolean>;
-//# sourceMappingURL=config.d.ts.map

package/es/config/config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAG3D,eAAO,MAAM,oBAAoB,EAAE,iBAAiB,CAAC,OAAO,CAU3D,CAAC"}

package/es/configuration/index.d.ts

@@ -1,3 +0,0 @@
-export * from './libro-configuration.js';
-export * from './libro-configuration-contribution.js';
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/configuration/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,uCAAuC,CAAC"}

package/es/configuration/libro-configuration-contribution.d.ts

@@ -1,5 +0,0 @@
-import { ConfigurationContribution } from '@difizen/mana-app';
-export declare class LibroConfigurationContribution implements ConfigurationContribution {
-    registerConfigurations(): import("@difizen/mana-app").ConfigurationNode<string>[];
-}
-//# sourceMappingURL=libro-configuration-contribution.d.ts.map

package/es/configuration/libro-configuration-contribution.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"libro-configuration-contribution.d.ts","sourceRoot":"","sources":["../../src/configuration/libro-configuration-contribution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAK9D,qBACa,8BAA+B,YAAW,yBAAyB;IAC9E,sBAAsB;CAGvB"}

package/es/configuration/libro-configuration.d.ts

@@ -1,3 +0,0 @@
-import type { ConfigurationNode } from '@difizen/mana-app';
-export declare const LibroJupyterConfiguration: Record<string, ConfigurationNode<string>>;
-//# sourceMappingURL=libro-configuration.d.ts.map

package/es/configuration/libro-configuration.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"libro-configuration.d.ts","sourceRoot":"","sources":["../../src/configuration/libro-configuration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,eAAO,MAAM,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,CAW/E,CAAC"}

package/es/file/file-name-alias.d.ts

@@ -1,7 +0,0 @@
-import type { URI } from '@difizen/mana-app';
-export declare class FileNameAlias {
-    protected aliases: Map<string, string>;
-    set(uri: URI, name: string): void;
-    get(uri: URI): string | undefined;
-}
-//# sourceMappingURL=file-name-alias.d.ts.map

package/es/file/file-name-alias.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"file-name-alias.d.ts","sourceRoot":"","sources":["../../src/file/file-name-alias.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAG7C,qBACa,aAAa;IACxB,SAAS,CAAC,OAAO,sBAA6B;IAE9C,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM;IAI1B,GAAG,CAAC,GAAG,EAAE,GAAG;CAGb"}

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

@@ -1,8 +0,0 @@
-export declare enum FileType {
-    Unknown = 0,
-    File = 1,
-    Directory = 2,
-    SymbolicLink = 64
-}
-export type DirItem = [string, FileType];
-//# sourceMappingURL=file-protocol.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"file-protocol.d.ts","sourceRoot":"","sources":["../../src/file/file-protocol.ts"],"names":[],"mappings":"AAAA,oBAAY,QAAQ;IAClB,OAAO,IAAI;IACX,IAAI,IAAI;IACR,SAAS,IAAI;IACb,YAAY,KAAK;CAClB;AACD,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC"}

package/es/file/file-tree-label-provider.d.ts

@@ -1,13 +0,0 @@
-import type { DidChangeLabelEvent, FileStat, URI } from '@difizen/mana-app';
-import { FileStatNode, LabelProvider, LabelProviderContribution, TreeLabelProvider, URIIconReference } from '@difizen/mana-app';
-export declare class FileTreeLabelProvider implements LabelProviderContribution {
-    protected readonly labelProvider: LabelProvider;
-    protected readonly treeLabelProvider: TreeLabelProvider;
-    protected asURIIconReference(element: FileStat): URI | URIIconReference;
-    canHandle(element: object): number;
-    getIcon(node: FileStatNode): string;
-    getName(node: FileStatNode): string;
-    getDescription(node: FileStatNode): string;
-    affects(node: FileStatNode, event: DidChangeLabelEvent): boolean;
-}
-//# sourceMappingURL=file-tree-label-provider.d.ts.map

package/es/file/file-tree-label-provider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"file-tree-label-provider.d.ts","sourceRoot":"","sources":["../../src/file/file-tree-label-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EACL,YAAY,EACZ,aAAa,EACb,yBAAyB,EACzB,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,mBAAmB,CAAC;AAE3B,qBACa,qBAAsB,YAAW,yBAAyB;IAC9C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAC5C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAEnF,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,QAAQ,GAAG,GAAG,GAAG,gBAAgB;IAMvE,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAIlC,OAAO,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM;IAInC,OAAO,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM;IAInC,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM;IAI1C,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,mBAAmB,GAAG,OAAO;CAGjE"}

package/es/keybind-instructions/keybind-instructions-items.d.ts

@@ -1,14 +0,0 @@
-/// <reference types="react" resolution-mode="require"/>
-import type { ColumnsType } from 'antd/es/table';
-export interface DataType {
-    key: React.Key;
-    actionDescription: React.ReactNode;
-    keybind: React.ReactNode;
-}
-export declare class LibroKeybindItems {
-    commandModeActionColumns: ColumnsType<DataType>;
-    editModeActionColumns: ColumnsType<DataType>;
-    editModeData: DataType[];
-    commandModeData: DataType[];
-}
-//# sourceMappingURL=keybind-instructions-items.d.ts.map

package/es/keybind-instructions/keybind-instructions-items.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"keybind-instructions-items.d.ts","sourceRoot":"","sources":["../../src/keybind-instructions/keybind-instructions-items.tsx"],"names":[],"mappings":";AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,WAAW,QAAQ;IACvB,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;IACf,iBAAiB,EAAE,KAAK,CAAC,SAAS,CAAC;IACnC,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;CAC1B;AAED,qBACa,iBAAiB;IAC5B,wBAAwB,EAAE,WAAW,CAAC,QAAQ,CAAC,CAW7C;IAEF,qBAAqB,EAAE,WAAW,CAAC,QAAQ,CAAC,CAU1C;IAEF,YAAY,EAAE,QAAQ,EAAE,CA4OtB;IAEF,eAAe,EAAE,QAAQ,EAAE,CA+TzB;CACH"}

package/es/theme/color-registry.d.ts

@@ -1,6 +0,0 @@
-import type { ColorRegistry } from '@difizen/mana-app';
-import { ColorContribution } from '@difizen/mana-app';
-export declare class LibroJupyterColorContribution implements ColorContribution {
-    registerColors(colors: ColorRegistry): void;
-}
-//# sourceMappingURL=color-registry.d.ts.map

package/es/theme/color-registry.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"color-registry.d.ts","sourceRoot":"","sources":["../../src/theme/color-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAS,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAG7D,qBACa,6BAA8B,YAAW,iBAAiB;IACrE,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;CAsS5C"}

package/es/theme/index.d.ts

@@ -1,2 +0,0 @@
-export * from './color-registry.js';
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/theme/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC"}