@yumerijs/loader 2.1.0 → 2.1.2

package/dist/index.d.ts

@@ -1,10 +1,11 @@
-import { Core, Config, Logger, Context, PluginStatus } from '@yumerijs/core';
+import { Core, Config, Logger, Context, PluginStatus, Schema } from '@yumerijs/core';
 interface Plugin {
     apply: (ctx: Context, config: Config) => Promise<void>;
     disable: (ctx: Context) => Promise<void>;
     depend: Array<string>;
     provide: Array<string>;
     render?: string;
+    config?: Schema<any>;
 }
 export declare class PluginLoader {
     private pluginsDir;
@@ -29,11 +30,11 @@ export declare class PluginLoader {
      * This does NOT reload any plugins.
      */
     reloadConfigFile(): Promise<void>;
+    saveConfig(): Promise<void>;
     getCore(): Core;
     getContext(pluginName: string, injections?: Record<string, any>): Context;
     unregall(pluginName: string): void;
     loadConfig(configPath: string): Promise<void>;
-    getPluginConfig(pluginName: string): Promise<Config>;
     loadPlugins(): Promise<void>;
     loadSinglePlugin(pluginName: string, triggerPendingCheck?: boolean, onlypending?: boolean): Promise<boolean>;
     private _loadPendingPlugins;

package/dist/index.js

@@ -67,16 +67,16 @@ class PluginLoader {
      * This does NOT reload any plugins.
      */
     async reloadConfigFile() {
-        this.logger.info('Reloading config file...');
+        this.core.coreConfig = this.config.core || {};
+        this.core.emit('config-reloaded', this.config);
+    }
+    async saveConfig() {
         try {
-            const doc = yaml.load(fs.readFileSync(this.configPath, 'utf8'));
-            this.config = doc;
-            this.core.coreConfig = this.config.core || {};
-            this.core.emit('config-reloaded', this.config);
-            this.logger.info('Config file reloaded.');
+            const jsonConfig = JSON.stringify(this.config, null, 2);
+            fs.writeFileSync(this.configPath, jsonConfig, 'utf8');
         }
         catch (e) {
-            this.logger.error('Failed to reload config file:', e);
+            this.logger.error('Failed to save config file:', e);
         }
     }
     getCore() {
@@ -98,7 +98,14 @@ class PluginLoader {
     async loadConfig(configPath) {
         try {
             this.configPath = configPath;
-            const doc = yaml.load(fs.readFileSync(configPath, 'utf8'));
+            const fileContents = fs.readFileSync(configPath, 'utf8');
+            let doc;
+            if (path.extname(configPath) === '.json') {
+                doc = JSON.parse(fileContents);
+            }
+            else {
+                doc = yaml.load(fileContents);
+            }
             this.config = doc;
             this.logger.info('Config loaded.');
             this.core.coreConfig = this.config.core || {};
@@ -109,13 +116,6 @@ class PluginLoader {
             throw e;
         }
     }
-    async getPluginConfig(pluginName) {
-        const actualPluginName = pluginName.startsWith('~') ? pluginName.substring(1) : pluginName;
-        if (!this.config.plugins[actualPluginName]) {
-            return new core_1.Config(actualPluginName);
-        }
-        return new core_1.Config(actualPluginName, this.config.plugins[actualPluginName]);
-    }
     async loadPlugins() {
         if (!this.config || typeof this.config.plugins !== 'object' || this.config.plugins === null) {
             this.logger.info('No plugins configuration found. No plugins to load.');
@@ -212,9 +212,15 @@ class PluginLoader {
             for (const injection of depend) {
                 injections[injection] = this.core.getComponent(injection);
             }
-            const pluginConfig = await this.getPluginConfig(pluginName);
+            // ### NEW CONFIG LOGIC ###
+            const rawConfig = (this.config.plugins && this.config.plugins[pluginName]) || {};
+            const schema = pluginInstance.config; // The schema is exported as 'config'
+            const finalConfig = (0, core_1.fallback)(schema, rawConfig);
+            // Update the in-memory config with the fully resolved one
+            this.config.plugins[pluginName] = finalConfig;
+            // ### END NEW CONFIG LOGIC ###
             const context = this.getContext(pluginName, injections);
-            await this.core.plugin(pluginInstance, context, pluginConfig);
+            await this.core.plugin(pluginInstance, context, finalConfig);
             this.pluginStatus[pluginName] = "enabled" /* PluginStatus.ENABLED */;
             if (triggerPendingCheck) {
                 await this._loadPendingPlugins();
@@ -311,20 +317,15 @@ class PluginLoader {
      */
     async reloadPlugin(pluginName) {
         this.logger.info(`Reloading plugin: "${pluginName}"...`);
-        // Clear the module cache for the plugin. This is critical for hot-reloading.
         try {
             const resolvedPath = require.resolve(pluginName);
             this.clearRequireCache(resolvedPath, new Set());
-            this.logger.info(`Cache cleared for plugin "${pluginName}".`);
         }
         catch (e) {
             this.logger.error(`Could not resolve path for plugin ${pluginName} to clear cache.`, e);
         }
-        // Reload the configuration from disk to catch any changes.
         await this.reloadConfigFile();
-        // Unload the plugin and its dependents.
         await this.unloadPlugin(pluginName, true);
-        // Load the plugin again. This will also trigger a check for other pending plugins.
         const success = await this.loadSinglePlugin(pluginName);
         if (success) {
             this.logger.info(`Plugin "${pluginName}" reloaded successfully.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yumerijs/loader",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Module loader for yumeri",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -40,6 +40,6 @@
     "js-yaml": "^4.1.0"
   },
   "peerDependencies": {
-    "@yumerijs/core": "^2.0.2"
+    "@yumerijs/core": "^2.1.1"
   }
 }