Browse Source

Update findGlobalPluginId

new-plugin-system
Artur Arseniev 2 months ago
parent
commit
7085dd01ed
  1. 4
      packages/core/src/abstract/Module.ts
  2. 2
      packages/core/src/plugin_manager/index.ts
  3. 8
      packages/core/src/plugin_manager/utils.ts

4
packages/core/src/abstract/Module.ts

@ -307,9 +307,9 @@ export abstract class ItemManagerModule<
__onAllEvent() {} __onAllEvent() {}
_createId(len = 16) { _createId(len = 16, increase?: number) {
const all = this.getAll(); const all = this.getAll();
const ln = all.length + len; const ln = (increase ?? all.length) + len;
const allMap = this.getAllMap(); const allMap = this.getAllMap();
let id; let id;

2
packages/core/src/plugin_manager/index.ts

@ -31,7 +31,7 @@ export default class PluginManager extends ItemManagerModule<ModuleConfig, Plugi
} }
private generatePluginId() { private generatePluginId() {
return `gjs-plugin:${this._createId(8)}`; return `gjs-plugin:${this._createId(16, 0)}`;
} }
private resolvePluginId(input: string | Plugin<any>, plugin: Plugin<any>, explicitId?: string) { private resolvePluginId(input: string | Plugin<any>, plugin: Plugin<any>, explicitId?: string) {

8
packages/core/src/plugin_manager/utils.ts

@ -63,8 +63,12 @@ export const findGlobalPluginId = (plugin: Plugin<any>) => {
const globalPlugins = getGlobal() as Record<string, any>; const globalPlugins = getGlobal() as Record<string, any>;
return Object.keys(globalPlugins).find((id) => { return Object.keys(globalPlugins).find((id) => {
const globalPlugin = globalPlugins[id]; try {
return globalPlugin === plugin || globalPlugin?.default === plugin; const globalPlugin = globalPlugins[id];
return globalPlugin === plugin || globalPlugin?.default === plugin;
} catch (error) {
return false;
}
}); });
}; };

Loading…
Cancel
Save