refactor: diService、eventManager

Author: 1ncounter

packages/engine-core/src/command/commandRegistry.ts

@@ -9,7 +9,7 @@ import {
   Iterable,
 } from '@alilc/lowcode-shared';
 import { ICommand, ICommandHandler } from './command';
-import { Extensions, Registry } from '../common/registry';
+import { Extensions, Registry } from '../extension/registry';
 import { ICommandService } from './commandService';
 
 export type ICommandsMap = Map<string, ICommand>;
@@ -26,7 +26,7 @@ export interface ICommandRegistry {
   getCommands(): ICommandsMap;
 }
 
-class CommandsRegistry implements ICommandRegistry {
+class CommandsRegistryImpl implements ICommandRegistry {
   private readonly _commands = new Map<string, LinkedList<ICommand>>();
 
   private readonly _didRegisterCommandEmitter = new Emitter<string>();
@@ -111,6 +111,6 @@ class CommandsRegistry implements ICommandRegistry {
   }
 }
 
-const commandsRegistry = new CommandsRegistry();
+export const CommandsRegistry = new CommandsRegistryImpl();
 
-Registry.add(Extensions.Command, commandsRegistry);
+Registry.add(Extensions.Command, CommandsRegistry);

packages/engine-core/src/command/commandService.ts

@@ -1,14 +1,12 @@
-import { createDecorator, Provide, IInstantiationService } from '@alilc/lowcode-shared';
-import { Registry, Extensions } from '../common/registry';
-import { ICommandRegistry } from './commandRegistry';
+import { createDecorator, IInstantiationService } from '@alilc/lowcode-shared';
+import { CommandsRegistry } from './commandRegistry';
 
 export interface ICommandService {
   executeCommand<T = any>(commandId: string, ...args: any[]): Promise<T | undefined>;
 }
 
 export const ICommandService = createDecorator<ICommandService>('commandService');
 
-@Provide(ICommandService)
 export class CommandService implements ICommandService {
   constructor(@IInstantiationService private instantiationService: IInstantiationService) {}
 
@@ -17,7 +15,7 @@ export class CommandService implements ICommandService {
   }
 
   private tryExecuteCommand(id: string, args: any[]): Promise<any> {
-    const command = Registry.as<ICommandRegistry>(Extensions.Command).getCommand(id);
+    const command = CommandsRegistry.getCommand(id);
     if (!command) {
       return Promise.reject(new Error(`command '${id}' not found`));
     }

packages/engine-core/src/configuration/configurationRegistry.ts

@@ -8,7 +8,7 @@ import {
   types,
 } from '@alilc/lowcode-shared';
 import { isUndefined, isObject } from 'lodash-es';
-import { Extensions, Registry } from '../common/registry';
+import { Extensions, Registry } from '../extension/registry';
 import { OVERRIDE_PROPERTY_REGEX, overrideIdentifiersFromKey } from './configuration';
 
 export interface IConfigurationRegistry {
@@ -133,18 +133,18 @@ export const allSettings: {
   patternProperties: StringDictionary<IConfigurationPropertySchema>;
 } = { properties: {}, patternProperties: {} };
 
-export class ConfigurationRegistry implements IConfigurationRegistry {
+export class ConfigurationRegistryImpl implements IConfigurationRegistry {
   private registeredConfigurationDefaults: IConfigurationDefaults[] = [];
-  private configurationDefaultsOverrides: Map<
+  private readonly configurationDefaultsOverrides: Map<
     string,
     {
       configurationDefaultOverrides: IConfigurationDefaultOverride[];
       configurationDefaultOverrideValue?: IConfigurationDefaultOverrideValue;
     }
   >;
 
-  private configurationProperties: StringDictionary<IRegisteredConfigurationPropertySchema>;
-  private excludedConfigurationProperties: StringDictionary<IRegisteredConfigurationPropertySchema>;
+  private readonly configurationProperties: StringDictionary<IRegisteredConfigurationPropertySchema>;
+  private readonly excludedConfigurationProperties: StringDictionary<IRegisteredConfigurationPropertySchema>;
   private overrideIdentifiers = new Set<string>();
 
   private propertiesChangeEmitter = new Emitter<{
@@ -645,4 +645,6 @@ function isSameExtension(a?: IExtensionInfo, b?: IExtensionInfo): boolean {
   return a.id === b.id && a.version === b.version;
 }
 
-Registry.add(Extensions.Configuration, new ConfigurationRegistry());
+export const ConfigurationRegistry = new ConfigurationRegistryImpl();
+
+Registry.add(Extensions.Configuration, ConfigurationRegistry);

packages/engine-core/src/configuration/configurationService.ts

@@ -1,10 +1,4 @@
-import {
-  createDecorator,
-  Emitter,
-  Provide,
-  type Event,
-  type EventListener,
-} from '@alilc/lowcode-shared';
+import { createDecorator, Emitter, type Event, type EventListener } from '@alilc/lowcode-shared';
 import {
   Configuration,
   DefaultConfiguration,
@@ -69,7 +63,6 @@ export interface IConfigurationService {
 
 export const IConfigurationService = createDecorator<IConfigurationService>('configurationService');
 
-@Provide(IConfigurationService)
 export class ConfigurationService implements IConfigurationService {
   private configuration: Configuration;
   private readonly defaultConfiguration: DefaultConfiguration;

packages/engine-core/src/configuration/configurations.ts

@@ -6,11 +6,11 @@ import {
   type IOverrides,
 } from './configurationModel';
 import {
+  ConfigurationRegistry,
   type IConfigurationPropertySchema,
   type IConfigurationRegistry,
   type IRegisteredConfigurationPropertySchema,
 } from './configurationRegistry';
-import { Registry, Extensions } from '../common/registry';
 import { isEqual, isNil, isPlainObject, get as lodasgGet } from 'lodash-es';
 import {
   IInspectValue,
@@ -37,8 +37,8 @@ export class DefaultConfiguration {
 
   initialize(): ConfigurationModel {
     this.resetConfigurationModel();
-    Registry.as<IConfigurationRegistry>(Extensions.Configuration).onDidUpdateConfiguration(
-      ({ properties }) => this.onDidUpdateConfiguration([...properties]),
+    ConfigurationRegistry.onDidUpdateConfiguration(({ properties }) =>
+      this.onDidUpdateConfiguration([...properties]),
     );
 
     return this.configurationModel;
@@ -56,19 +56,14 @@ export class DefaultConfiguration {
   }
 
   private onDidUpdateConfiguration(properties: string[]): void {
-    this.updateConfigurationModel(
-      properties,
-      Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationProperties(),
-    );
+    this.updateConfigurationModel(properties, ConfigurationRegistry.getConfigurationProperties());
     this.emitter.emit({ defaults: this.configurationModel, properties });
   }
 
   private resetConfigurationModel(): void {
     this._configurationModel = ConfigurationModel.createEmptyModel();
 
-    const properties = Registry.as<IConfigurationRegistry>(
-      Extensions.Configuration,
-    ).getConfigurationProperties();
+    const properties = ConfigurationRegistry.getConfigurationProperties();
 
     this.updateConfigurationModel(Object.keys(properties), properties);
   }
@@ -156,9 +151,7 @@ class ConfigurationModelParser {
     raw: any,
     options?: ConfigurationParseOptions,
   ): IConfigurationModel & { hasExcludedProperties?: boolean } {
-    const configurationProperties = Registry.as<IConfigurationRegistry>(
-      Extensions.Configuration,
-    ).getConfigurationProperties();
+    const configurationProperties = ConfigurationRegistry.getConfigurationProperties();
     const filtered = this.filter(raw, configurationProperties, true, options);
 
     raw = filtered.raw;

packages/engine-core/src/extension/extensionHost.ts

@@ -1,5 +1,4 @@
-import { type IConfigurationRegistry, type IConfigurationNode } from '../configuration';
-import { Registry, Extensions } from '../common/registry';
+import { ConfigurationRegistry, type IConfigurationNode } from '../configuration';
 import { type ExtensionInitializer, type IExtensionInstance } from './extension';
 import { invariant } from '@alilc/lowcode-shared';
 
@@ -19,9 +18,8 @@ export class ExtensionHost {
     initializer: ExtensionInitializer,
     preferenceConfigurations: IConfigurationNode[],
   ) {
-    const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
     this.configurationProperties =
-      configurationRegistry.registerConfigurations(preferenceConfigurations);
+      ConfigurationRegistry.registerConfigurations(preferenceConfigurations);
 
     this.instance = initializer({});
   }

packages/engine-core/src/extension/extensionManagement.ts

@@ -37,7 +37,7 @@ export class ExtensionManagement {
   ): Promise<void> {
     if (!this.validateExtension(extension, override)) return;
 
-    const metadata = extension.meta ?? {};
+    const metadata = extension.metadata ?? {};
     const host = new ExtensionHost(
       extension.name,
       extension,

packages/engine-core/src/extension/extensionService.ts

@@ -1,4 +1,4 @@
-import { createDecorator, Provide } from '@alilc/lowcode-shared';
+import { createDecorator } from '@alilc/lowcode-shared';
 import { ExtensionManagement, type IExtensionRegisterOptions } from './extensionManagement';
 import { type IFunctionExtension } from './extension';
 import { ExtensionHost } from './extensionHost';
@@ -15,7 +15,6 @@ export interface IExtensionService {
 
 export const IExtensionService = createDecorator<IExtensionService>('extensionService');
 
-@Provide(IExtensionService)
 export class ExtensionService implements IExtensionService {
   private extensionManagement = new ExtensionManagement();
 

packages/engine-core/src/common/registry.ts renamed to packages/engine-core/src/extension/registry.ts

@@ -41,5 +41,6 @@ export const Registry: IRegistry = new RegistryImpl();
 export const Extensions = {
   Configuration: 'base.contributions.configuration',
   Command: 'base.contributions.command',
+  Keybinding: 'base.contributions.keybinding',
   Widget: 'base.contributions.widget',
 };

packages/engine-core/src/index.ts

@@ -4,5 +4,9 @@ export * from './resource';
 export * from './command';
 
 // test
-export * from './common/registry';
+export * from './extension/registry';
 export * from './main';
+export * from './keybinding/keybindingRegistry';
+export * from './keybinding/keybindingParser';
+export * from './keybinding/keybindingResolver';
+export * from './keybinding/keybindings';