feat: add colorRegistery

Author: wewoor

src/extensions/index.ts

@@ -2,8 +2,9 @@ import { ExtendActivityBar } from './activityBar';
 import { ExtendExplore } from './explore';
 import { ExtendSearch } from './search';
 import { ExtendStatusBar } from './statusBar';
-
-const Themes = require('./theme-defaults/package.json');
+import { defaultColorThemeExtension } from './theme-defaults';
+import { monokaiColorThemeExtension } from './theme-monokai';
+import { paleNightColorThemeExtension } from './vscode-palenight-theme';
 
 /**
  * Default extensions
@@ -13,5 +14,7 @@ export const defaultExtensions = [
     ExtendExplore,
     ExtendSearch,
     ExtendStatusBar,
-    Themes,
+    defaultColorThemeExtension,
+    monokaiColorThemeExtension,
+    paleNightColorThemeExtension,
 ];

src/extensions/theme-defaults/index.ts

@@ -0,0 +1,36 @@
+import { IColorTheme } from "mo/model/colorTheme";
+import { IExtension, IExtensionType } from "mo/model/extension";
+
+const colorThemesExtension: IExtension = require('./package.json');
+
+function initColorTheme() {
+
+    try {
+    
+        if (!colorThemesExtension || !colorThemesExtension.categories?.includes(IExtensionType.Theme)) {
+            console.error('This is invalid colorTheme extension package!', colorThemesExtension);
+        }
+        
+        const themes = colorThemesExtension.contributes?.themes?.map((theme: IColorTheme) => {
+            if (theme.path) {
+                const themeDetail = {}; // require(theme.path);
+                return Object.assign({}, theme, themeDetail)
+            }
+            return theme;
+        });
+        
+        if (!colorThemesExtension.contributes) {
+            colorThemesExtension.contributes = { themes: [] };
+        }
+        
+        colorThemesExtension.contributes.themes = themes;
+    } catch (e) {
+        throw new Error('Load color theme exception:' + e);
+    }
+}
+
+initColorTheme();
+
+export { 
+    colorThemesExtension
+}

src/model/theme.ts src/model/colorTheme.ts

@@ -8,12 +8,15 @@ export interface TokenColor extends Object {
     settings?: object;
 }
 
-export interface ITheme {
+export interface IColorTheme {
     /**
      * The id of component, theme will be applied by this ID
      */
     id: string;
+    label: string;
     name: string;
+    uiTheme: string;
+    path?: string;
     colors?: ThemeColor;
     tokenColors?: TokenColor[];
     /**

src/model/extension.ts

@@ -1,10 +1,12 @@
 import { IExtensionService } from 'mo/services';
+import { IColorTheme } from './colorTheme';
+import { IIconTheme } from './iconTheme';
 
 /**
  * Defines extension types
  */
 export enum IExtensionType {
-    Theme = 'themes',
+    Theme = 'Themes',
     Normal = 'normal',
     Settings = 'settings',
     Locals = 'locals',
@@ -17,13 +19,17 @@ export enum IContributeType {
     Commands = 'commands',
     Configuration = 'configuration',
     Grammar = 'grammars',
+    Theme = 'themes',
+    IconTheme = 'iconThemes',
 }
 
 export interface IContribute {
-    [IContributeType.Languages]: any;
-    [IContributeType.Commands]: any;
-    [IContributeType.Configuration]: any;
-    [IContributeType.Grammar]: any;
+    [IContributeType.Languages]?: any;
+    [IContributeType.Commands]?: any;
+    [IContributeType.Configuration]?: any;
+    [IContributeType.Grammar]?: any;
+    [IContributeType.Theme]?: IColorTheme[];
+    [IContributeType.IconTheme]?: IIconTheme[];
 }
 
 /**

src/model/ui.ts

@@ -1,6 +1,7 @@
-import { ITheme } from './theme';
+import { IColorTheme } from './colorTheme';
+import { IIconTheme } from './iconTheme';
 
 export interface IUI {
-    colorTheme?: ITheme;
-    iconTheme?: ITheme;
+    colorTheme?: IColorTheme;
+    iconTheme?: IIconTheme;
 }

src/provider/molecule.tsx

@@ -2,7 +2,7 @@ import 'mo/style/main.scss';
 import 'vscode-codicons/dist/codicon.css';
 import * as React from 'react';
 import { container } from 'tsyringe';
-import { ITheme } from 'mo/model/theme';
+import { IColorTheme } from 'mo/model/colorTheme';
 import { defaultExtensions } from 'mo/extensions';
 import { IExtension } from 'mo/model/extension';
 import { ILocalization } from 'mo/model/localization';
@@ -14,7 +14,7 @@ import {
 interface Props {
     extensions?: IExtension[];
     locales?: ILocalization[];
-    colorTheme?: ITheme[];
+    colorTheme?: IColorTheme[];
 }
 
 export const MoleculeCtx = React.createContext({});

src/services/helper.ts

@@ -2,10 +2,10 @@ import 'reflect-metadata';
 import { container } from 'tsyringe';
 
 export * from './extensionService';
-export * from './themeService';
+export * from './theme/colorThemeService';
 export * from './workbench';
 
-import { ThemeService } from './themeService';
+import { ColorThemeService, IColorThemeService } from './theme/colorThemeService';
 import { ExtensionService, IExtensionService } from './extensionService';
 import {
     ActivityBarService,
@@ -39,7 +39,7 @@ const statusBarService = container.resolve<IStatusBarService>(StatusBarService);
  * The theme service,
  * TODO: think about break themeService into ColorTheme and IconTheme
  */
-const themeService = container.resolve(ThemeService);
+const colorThemeService = container.resolve<IColorThemeService>(ColorThemeService);
 
 /**
  * Note: The extension service depends on other workbench services,
@@ -55,5 +55,5 @@ export {
     statusBarService,
     editorService,
     extensionService,
-    themeService,
+    colorThemeService,
 };

src/services/index.ts

@@ -0,0 +1,5 @@
+const ColorMap = new Map<Symbol, string>();
+
+export {
+    ColorMap
+}