@yumerijs/loader 3.0.1 → 3.1.0

package/dist/index.d.ts

@@ -7,6 +7,14 @@ interface Plugin {
     render?: string;
     config?: Schema<any>;
 }
+export interface PluginConfigEntry {
+    id: string;
+    moduleName: string;
+    config: any;
+    configKey: string;
+    enabled: boolean;
+    legacy: boolean;
+}
 export declare class PluginLoader {
     private pluginsDir;
     core: Core;
@@ -25,6 +33,13 @@ export declare class PluginLoader {
     private pluginContexts;
     private isDev;
     constructor(core?: Core, pluginsDir?: string);
+    /**
+     * Normalize both the legacy `{ "package-name": { ...config } }` form and
+     * the named instance form `{ "instance-id": { module, config } }`.
+     */
+    getPluginEntry(pluginId: string): PluginConfigEntry | undefined;
+    setPluginConfig(pluginId: string, config: any): boolean;
+    private getEnabledPluginEntries;
     /**
      * Reloads the config file from disk into memory and emits a 'config-reloaded' event.
      * This does NOT reload any plugins.

package/dist/index.js

@@ -25,6 +25,55 @@ export class PluginLoader {
         this.isDev = process.env.NODE_ENV === 'development';
         Logger.setCore(this.core);
     }
+    /**
+     * Normalize both the legacy `{ "package-name": { ...config } }` form and
+     * the named instance form `{ "instance-id": { module, config } }`.
+     */
+    getPluginEntry(pluginId) {
+        const plugins = this.config?.plugins;
+        if (!plugins || typeof plugins !== 'object')
+            return undefined;
+        const configKey = Object.prototype.hasOwnProperty.call(plugins, pluginId)
+            ? pluginId
+            : Object.prototype.hasOwnProperty.call(plugins, `~${pluginId}`)
+                ? `~${pluginId}`
+                : undefined;
+        if (!configKey)
+            return undefined;
+        const enabled = !configKey.startsWith('~');
+        const id = enabled ? configKey : configKey.substring(1);
+        const value = plugins[configKey];
+        const isInstance = value && typeof value === 'object' && !Array.isArray(value)
+            && typeof value.module === 'string';
+        return {
+            id,
+            moduleName: isInstance ? value.module : id,
+            config: isInstance ? (value.config ?? {}) : (value ?? {}),
+            configKey,
+            enabled,
+            legacy: !isInstance,
+        };
+    }
+    setPluginConfig(pluginId, config) {
+        const entry = this.getPluginEntry(pluginId);
+        if (!entry)
+            return false;
+        if (entry.legacy) {
+            this.config.plugins[entry.configKey] = config;
+        }
+        else {
+            this.config.plugins[entry.configKey].config = config;
+        }
+        return true;
+    }
+    getEnabledPluginEntries() {
+        if (!this.config || typeof this.config.plugins !== 'object' || this.config.plugins === null) {
+            return [];
+        }
+        return Object.keys(this.config.plugins)
+            .map(key => this.getPluginEntry(key.startsWith('~') ? key.substring(1) : key))
+            .filter(entry => entry && entry.enabled);
+    }
     /**
      * Reloads the config file from disk into memory and emits a 'config-reloaded' event.
      * This does NOT reload any plugins.
@@ -84,18 +133,14 @@ export class PluginLoader {
             this.logger.info('No plugins configuration found. No plugins to load.');
             return;
         }
-        const allPluginNames = Object.keys(this.config.plugins);
+        const allEntries = Object.keys(this.config.plugins)
+            .map(key => this.getPluginEntry(key.startsWith('~') ? key.substring(1) : key))
+            .filter(Boolean);
         this.pluginStatus = {}; // Reset status
-        for (const name of allPluginNames) {
-            if (name.startsWith('~')) {
-                const actualName = name.substring(1);
-                this.pluginStatus[actualName] = "disabled" /* PluginStatus.DISABLED */;
-            }
-            else {
-                this.pluginStatus[name] = "pending" /* PluginStatus.PENDING */;
-            }
+        for (const entry of allEntries) {
+            this.pluginStatus[entry.id] = entry.enabled ? "pending" /* PluginStatus.PENDING */ : "disabled" /* PluginStatus.DISABLED */;
         }
-        const enabledPlugins = allPluginNames.filter(name => !name.startsWith('~'));
+        const enabledPlugins = allEntries.filter(entry => entry.enabled).map(entry => entry.id);
         const currentlyLoaded = Object.keys(this.plugins);
         for (const loadedName of currentlyLoaded) {
             if (!enabledPlugins.includes(loadedName)) {
@@ -170,13 +215,13 @@ export class PluginLoader {
                 return false;
             }
             this.plugins[pluginName] = pluginInstance;
-            // ### NEW CONFIG LOGIC ###
-            const rawConfig = (this.config.plugins && this.config.plugins[pluginName]) || {};
-            const schema = pluginInstance.config || Schema.object({}); // The schema is exported as 'config'
-            const finalConfig = fallback(schema, rawConfig);
-            // Update the in-memory config with the fully resolved one
-            this.config.plugins[pluginName] = finalConfig;
-            // ### END NEW CONFIG LOGIC ###
+            const entry = this.getPluginEntry(pluginName);
+            if (!entry) {
+                throw new Error(`Plugin configuration not found for instance "${pluginName}".`);
+            }
+            const schema = pluginInstance.config || Schema.object({});
+            const finalConfig = fallback(schema, entry.config);
+            this.setPluginConfig(pluginName, finalConfig);
             const context = this.getContext(pluginName, {});
             if (pluginInstance.render) {
                 context.renderer = this.core.renderers.get(pluginInstance.render || '');
@@ -188,14 +233,15 @@ export class PluginLoader {
             }
             if (this.isDev) {
                 let pluginPathToWatch = null;
+                const moduleName = entry.moduleName;
                 try {
-                    const packageJsonUrl = import.meta.resolve(`${pluginName}/package.json`);
+                    const packageJsonUrl = import.meta.resolve(`${moduleName}/package.json`);
                     const pkgJsonPath = fileURLToPath(packageJsonUrl);
                     pluginPathToWatch = path.dirname(pkgJsonPath);
                 }
                 catch (e) {
-                    const localPluginPath = path.resolve(process.cwd(), pluginName);
-                    const localPluginPathInPlugins = path.resolve(process.cwd(), 'plugins', pluginName);
+                    const localPluginPath = path.resolve(process.cwd(), moduleName);
+                    const localPluginPathInPlugins = path.resolve(process.cwd(), 'plugins', moduleName);
                     if (fs.existsSync(localPluginPath)) {
                         pluginPathToWatch = localPluginPath;
                     }
@@ -315,10 +361,12 @@ export class PluginLoader {
         this.pluginWatchers[pluginName] = watcher;
     }
     async loadModule(pluginName) {
-        const pluginModule = await import(pluginName);
+        const entry = this.getPluginEntry(pluginName);
+        if (!entry)
+            throw new Error(`Plugin configuration not found for instance "${pluginName}".`);
+        const pluginModule = await import(entry.moduleName);
         const context = this.getContext(pluginName, {});
-        const rawConfig = (this.config.plugins && this.config.plugins[pluginName]) || {};
-        return resolvePluginModule(pluginModule, context, rawConfig);
+        return resolvePluginModule(pluginModule, context, entry.config);
     }
     async checkPluginDependencies(pluginPath) {
         return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yumerijs/loader",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "Module loader for yumeri",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.13.10",
-    "@yumerijs/core": "^3.0.0",
+    "@yumerijs/core": "^3.0.5",
     "esbuild-register": "^3.6.0",
     "typescript": "^6.0.3"
   },
@@ -41,6 +41,6 @@
     "js-yaml": "^4.1.0"
   },
   "peerDependencies": {
-    "@yumerijs/core": "^3.0.0"
+    "@yumerijs/core": "^3.0.5"
   }
 }