feat: add singleton decorator

Author: wewoor

src/services/activityBarService.ts

@@ -1,20 +1,32 @@
-import { ActivityBarEvent, IActivityBar, IActivityBarItem } from 'mo/core/activityBar';
-import { emit } from 'mo/common/eventEmitter';
-
-export class ActivityBarService implements IActivityBar {
-    data: IActivityBarItem[];
+import { ActivityBarEvent, IActivityBar, IActivityBarItem } from 'mo/core/workbench/activityBar';
+import { emit, EventService } from 'mo/services/eventService';
+import { injectable, inject } from 'tsyringe';
+import { BaseService } from './baseService';
+
+@injectable()
+export class ActivityBarService extends BaseService implements IActivityBar {
+    public data: IActivityBarItem[];
     public selected: string;
 
-    constructor(data: IActivityBarItem[] = [], selected: string = '') {
+    constructor(
+        @inject('IActivityBarItem') data: IActivityBarItem[] = [],
+        selected: string = '',
+    ) {
+        super();
         this.data = data;
         this.selected = selected;
     }
 
+    public subscribe(name: ActivityBarEvent, callback: Function) {
+        EventService.subscribe(name, callback);
+    }
+
     @emit(ActivityBarEvent.Selected)
-    public onSelect(key: string, item?: IActivityBarItem) {
+    public onSelect(key: string, item?: IActivityBarItem | undefined) {
         this.selected = key;
     }
 
+    @emit(ActivityBarEvent.OnClick)
     public onClick(event: React.MouseEvent, item: IActivityBarItem) {
 
     }
@@ -39,4 +51,8 @@ export class ActivityBarService implements IActivityBar {
     public get(id: string) {
 
     }
+
+    // public subscribe(name: ActivityBarEvent | ActivityBarEvent[], callback: CallbackEvent) {
+    //     EventService.subscribe(name, callback);
+    // }
 }

src/services/editor/editorService.ts

@@ -1,12 +1,13 @@
 import { ITab } from 'mo/components/tabs';
-import { EditorEvent, IEditor, IEditorGroup } from 'mo/core/editor';
-import { emit } from 'mo/common/eventEmitter';
+import { EditorEvent, IEditor, IEditorGroup } from 'mo/core/workbench/editor';
+import { emit } from 'mo/services/eventService';
+import { EditorGroupService } from './groupService';
 
 export class EditorService<T = any> implements IEditor<T> {
-    public current: IEditorGroup;
-    public groups: IEditorGroup[];
+    public current: IEditorGroup | undefined;
+    public groups!: IEditorGroup[];
 
-    constructor(current: IEditorGroup, groups: IEditorGroup[] = []) {
+    constructor(current?: IEditorGroup, groups: IEditorGroup[] = []) {
         this.current = current;
         this.groups = groups;
     }
@@ -20,6 +21,14 @@ export class EditorService<T = any> implements IEditor<T> {
         if (group) {
             group.tabs.push(tab);
             group.activeTab = tab;
+        } else {
+            group = new EditorGroupService(
+                this.groups.length + 1,
+                tab,
+                [tab],
+            );
+            this.current = group;
+            this.groups.push(group);
         }
     }
 

src/services/editor/groupService.ts

@@ -1,23 +1,23 @@
-import { IEditorGroup } from 'mo/core/editor';
+import { IEditorGroup } from 'mo/core/workbench/editor';
 import { ITab } from 'mo/components/tabs';
 
-export class EditorGroupService<E = any> implements IEditorGroup {
+export class EditorGroupService implements IEditorGroup {
     id: number;
     activeTab: ITab;
     tabs: ITab[];
     breadcrumb: any[];
     actions: any[];
     menu: any[];
-    editorInstance: E;
+    editorInstance: any;
 
     constructor(
         id: number,
         activeTab: ITab,
         tabs: ITab[],
-        breadcrumb: any[],
-        actions: any[],
-        menu: any[],
-        editorInstance: E,
+        breadcrumb: any[] = [],
+        actions: any[] = [],
+        menu: any[] = [],
+        editorInstance?: any,
     ) {
         this.id = id;
         this.tabs = tabs;

src/services/extensionService.ts

@@ -1,32 +1,30 @@
 import { ErrorMsg } from 'mo/common/error';
 import { IContribute, IContributeType, IExtension, IExtensionEntry } from 'mo/core/extension';
 import { IMolecule } from 'mo/core/molecule';
-import { defaultExtensions } from 'mo/extensions';
 
 export class ExtensionService {
     public extensions: IExtension[] = [];
     public moleculeCtx: IMolecule;
 
     constructor(extensionEntry: IExtensionEntry = {}, moleculeCtx: IMolecule) {
         this.moleculeCtx = moleculeCtx;
-        this.load(defaultExtensions, moleculeCtx);
-        this.load(extensionEntry, moleculeCtx);
+        this.load(extensionEntry);
     }
 
     /**
      * TODO: Current extension service can't parses VSCode theme, so needs to refactor
      * @param param0 extensionEntry object
      * @param moleculeCtx the context object of molecule
      */
-    public load({ location, extensions = [] }: IExtensionEntry, moleculeCtx: IMolecule) {
+    public load({ location, extensions = [] }: IExtensionEntry) {
         try {
             if (extensions?.length === 0) return;
             this.extensions = this.extensions.concat(extensions || []);
 
             extensions?.forEach((extension: IExtension, index: number) => {
                 if (extension.main) {
                     if (extension.activate) {
-                        extension.activate(moleculeCtx);
+                        extension.activate(this.moleculeCtx);
                     } else {
                         throw new Error(ErrorMsg.NotFoundActivate);
                     }
@@ -51,7 +49,7 @@ export class ExtensionService {
         });
     }
 
-    unload(id: string) {
-        console.log('unload extension:', id);
+    unload(extension: IExtension) {
+        console.log('unload extension:', extension.name);
     }
 }

src/services/moleculeService.ts

@@ -1,11 +1,13 @@
-import { IEditor } from 'mo/core/editor';
-import { IActivityBar } from 'mo/core/activityBar';
+import { IEditor } from 'mo/core/workbench/editor';
+import { IActivityBar } from 'mo/core/workbench/activityBar';
 import { ITheme } from 'mo/core/theme';
-import { ISidebar } from 'mo/core/sidebar';
-
-
-export class MoleculeService {
-    // public menuBar: MenuBar;
+import { ISidebar } from 'mo/core/workbench/sidebar';
+import { IMenuBar } from 'mo/core/workbench/menuBar';
+import { IMolecule } from 'mo/core/molecule';
+import { singleton } from 'tsyringe';
+@singleton()
+export class MoleculeService implements IMolecule {
+    public menuBar: IMenuBar;
     // public statusBar: StatusBar;
     public activityBar: IActivityBar;
     // public panel: Panel;
@@ -19,20 +21,20 @@ export class MoleculeService {
     // public shortcutKeys: ShortcutKeys;
 
     constructor(
-        // menuBar: MenuBar,
+        menuBar: IMenuBar,
         // statusBar: StatusBar,
         activityBar: IActivityBar,
         editor: IEditor,
+        sidebar: ISidebar,
         // panel: Panel,
         // layout: Layout,
         theme: ITheme,
-        sidebar: ISidebar,
         // iconTheme: IconTheme,
         // settings: Settings,
         // local: Local,
         // shortcutKeys: ShortcutKeys,
     ) {
-        // this.menuBar = menuBar;
+        this.menuBar = menuBar;
         // this.statusBar = statusBar;
         this.activityBar = activityBar;
         // this.panel = panel;
@@ -46,5 +48,3 @@ export class MoleculeService {
         // this.shortcutKeys = shortcutKeys;
     }
 };
-
-// // TODO

src/services/sidebarService.ts

@@ -1,6 +1,8 @@
-import { ISidebar, ISidebarPane } from 'mo/core/sidebar';
+import { ISidebar, ISidebarPane } from 'mo/core/workbench/sidebar';
+import { singleton } from 'tsyringe';
 
-export class SidebarBarService implements ISidebar {
+@singleton()
+export class SidebarService implements ISidebar {
     selected: string;
     panes: ISidebarPane[];
 
@@ -12,12 +14,4 @@ export class SidebarBarService implements ISidebar {
     onSelect(key: string) {
         this.selected = key;
     }
-
-    // getSelected() {
-    //     return this.selected;
-    // }
-
-    // getPanes() {
-    //     return this.panes;
-    // }
 }

src/services/themeServices.ts

@@ -5,6 +5,7 @@
 
 import { IExtension } from 'mo/core/extension';
 import { ITheme, ThemeColor, TokenColor } from 'mo/core/theme';
+import { singleton } from 'tsyringe';
 
 /**
  * Apply css content to workbench
@@ -24,6 +25,7 @@ function _applyRules(styleSheetContent: string, rulesClassName: string) {
     }
 }
 
+@singleton()
 export class ThemeService implements ITheme {
     id: string;
     name: string;