@yumerijs/loader 2.1.1 → 2.2.0

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,24 +30,19 @@ 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;
     unloadPlugin(pluginNameToUnload: string, ispending?: boolean): Promise<void>;
     private _unloadSinglePlugin;
-    /**
-     * Reloads a single plugin's code by clearing the require cache and then reloading it.
-     * @param pluginName The name of the plugin to reload.
-     */
     reloadPlugin(pluginName: string): Promise<void>;
     private watchPlugin;
     loadModule(pluginName: string): Promise<Plugin>;
-    private clearRequireCache;
     checkPluginDependencies(pluginPath: string): Promise<boolean>;
     installPluginDependencies(pluginName: string): Promise<void>;
 }

package/dist/index.js

@@ -1,53 +1,17 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PluginLoader = void 0;
-const path = __importStar(require("path"));
-const core_1 = require("@yumerijs/core");
-const fs = __importStar(require("fs"));
-const util_1 = require("util");
-const child_process_1 = require("child_process");
-const yaml = __importStar(require("js-yaml"));
-const chokidar = __importStar(require("chokidar"));
-const vueLoader_1 = require("./runtime/vueLoader");
-const execAsync = (0, util_1.promisify)(child_process_1.exec);
-class PluginLoader {
+import * as path from 'path';
+import { Core, Logger, Context, fallback, I18n } from '@yumerijs/core';
+import * as fs from 'fs';
+import { promisify } from 'util';
+import { exec } from 'child_process';
+import { fileURLToPath } from 'url';
+import * as yaml from 'js-yaml';
+import * as chokidar from 'chokidar';
+const execAsync = promisify(exec);
+export class PluginLoader {
     pluginsDir;
     core;
     config = null;
-    logger = new core_1.Logger('loader');
+    logger = new Logger('loader');
     plugins = {};
     pluginStatus = {};
     pluginWatchers = {};
@@ -57,37 +21,25 @@ class PluginLoader {
     isDev = false;
     constructor(core, pluginsDir = 'plugins') {
         this.pluginsDir = pluginsDir;
-        this.core = core || new core_1.Core(this, undefined, false);
+        this.core = core || new Core(this, undefined, false);
         this.isDev = process.env.NODE_ENV === 'development';
-        core_1.Logger.setCore(this.core);
-        (0, vueLoader_1.registerVueRuntimeLoader)();
+        Logger.setCore(this.core);
     }
     /**
      * Reloads the config file from disk into memory and emits a 'config-reloaded' event.
      * 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 ext = path.extname(this.configPath).toLowerCase();
-            const fileContent = fs.readFileSync(this.configPath, 'utf8');
-            let doc;
-            if (ext === '.yaml' || ext === '.yml') {
-                doc = yaml.load(fileContent);
-            }
-            else if (ext === '.json') {
-                doc = JSON.parse(fileContent);
-            }
-            else {
-                throw new Error(`Unsupported config file extension: ${ext}`);
-            }
-            this.config = doc;
-            this.core.coreConfig = this.config.core || {};
-            this.core.emit('config-reloaded', this.config);
-            this.logger.info('Config file reloaded successfully.');
+            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() {
@@ -95,7 +47,7 @@ class PluginLoader {
     }
     getContext(pluginName, injections = {}) {
         if (!this.pluginContexts[pluginName]) {
-            this.pluginContexts[pluginName] = new core_1.Context(this.core, pluginName, null, injections);
+            this.pluginContexts[pluginName] = new Context(this.core, pluginName, null, injections);
         }
         return this.pluginContexts[pluginName];
     }
@@ -120,20 +72,13 @@ class PluginLoader {
             this.config = doc;
             this.logger.info('Config loaded.');
             this.core.coreConfig = this.config.core || {};
-            this.core.i18n = new (require('@yumerijs/core').I18n)(this.core.coreConfig.lang || ['zh', 'en']);
+            this.core.i18n = new I18n(this.core.coreConfig.lang || ['zh', 'en']);
         }
         catch (e) {
             this.logger.error('Failed to load config:', e);
             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.');
@@ -206,7 +151,7 @@ class PluginLoader {
                         };
                         const rendererPackageName = rendererPackageMap[rendererName] || rendererName;
                         this.logger.info(`Loading renderer package: "${rendererPackageName}"...`);
-                        const RendererClass = require(rendererPackageName);
+                        const RendererClass = await import(rendererPackageName);
                         // Handle both ES modules (default export) and CommonJS modules
                         const ActualRendererClass = RendererClass.default || RendererClass;
                         const rendererInstance = new ActualRendererClass();
@@ -230,9 +175,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 = 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();
@@ -240,7 +191,8 @@ class PluginLoader {
             if (this.isDev) {
                 let pluginPathToWatch = null;
                 try {
-                    const pkgJsonPath = require.resolve(`${pluginName}/package.json`);
+                    const packageJsonUrl = import.meta.resolve(`${pluginName}/package.json`);
+                    const pkgJsonPath = fileURLToPath(packageJsonUrl);
                     pluginPathToWatch = path.dirname(pkgJsonPath);
                 }
                 catch (e) {
@@ -323,27 +275,11 @@ class PluginLoader {
             this.logger.error(`Failed to unload plugin "${pluginName}":`, error);
         }
     }
-    /**
-     * Reloads a single plugin's code by clearing the require cache and then reloading it.
-     * @param pluginName The name of the plugin to reload.
-     */
     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);
+        const success = await this.loadSinglePlugin(pluginName, true, false);
         if (success) {
             this.logger.info(`Plugin "${pluginName}" reloaded successfully.`);
             this.core.emit('plugin-reloaded', pluginName);
@@ -356,7 +292,7 @@ class PluginLoader {
         if (this.pluginWatchers[pluginName]) {
             return;
         }
-        const logger = new core_1.Logger('hmr');
+        const logger = new Logger('hmr');
         const watcher = chokidar.watch(pluginPath, {
             ignored: /(^|[\/])\../,
             persistent: true,
@@ -381,24 +317,9 @@ class PluginLoader {
         this.pluginWatchers[pluginName] = watcher;
     }
     async loadModule(pluginName) {
-        const plugin = await require(pluginName);
+        const plugin = await import(pluginName);
         return plugin.default || plugin;
     }
-    clearRequireCache(moduleId, visited) {
-        if (visited.has(moduleId)) {
-            return;
-        }
-        visited.add(moduleId);
-        const module = require.cache[moduleId];
-        if (!module)
-            return;
-        if (module.children) {
-            for (const child of module.children) {
-                this.clearRequireCache(child.id, visited);
-            }
-        }
-        delete require.cache[moduleId];
-    }
     async checkPluginDependencies(pluginPath) {
         return true;
     }
@@ -418,5 +339,4 @@ class PluginLoader {
         }
     }
 }
-exports.PluginLoader = PluginLoader;
-exports.default = PluginLoader;
+export default PluginLoader;

package/dist/runtime/vueLoader.js

@@ -1,24 +1,18 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerVueRuntimeLoader = registerVueRuntimeLoader;
-const fs_1 = __importDefault(require("fs"));
-const crypto_1 = __importDefault(require("crypto"));
-const compiler_sfc_1 = require("@vue/compiler-sfc");
-const esbuild_1 = require("esbuild");
+import fs from 'fs';
+import crypto from 'crypto';
+import { parse, compileScript, compileTemplate } from '@vue/compiler-sfc';
+import { transformSync } from 'esbuild';
 let vueLoaderRegistered = false;
 const SUPPORTED_ESBUILD_LOADERS = new Set(['js', 'ts', 'tsx', 'jsx']);
 function getScopeId(filename) {
-    return crypto_1.default.createHash('md5').update(filename).digest('hex').slice(0, 8);
+    return crypto.createHash('md5').update(filename).digest('hex').slice(0, 8);
 }
 function inferLoader(lang) {
     if (!lang)
         return 'js';
     return SUPPORTED_ESBUILD_LOADERS.has(lang) ? lang : 'js';
 }
-function registerVueRuntimeLoader() {
+export function registerVueRuntimeLoader() {
     if (vueLoaderRegistered) {
         return;
     }
@@ -26,8 +20,8 @@ function registerVueRuntimeLoader() {
     require.extensions['.vue'] = function registerVueSFC(module, filename) {
         const nodeModule = module;
         try {
-            const source = fs_1.default.readFileSync(filename, 'utf8');
-            const { descriptor } = (0, compiler_sfc_1.parse)(source, { filename });
+            const source = fs.readFileSync(filename, 'utf8');
+            const { descriptor } = parse(source, { filename });
             if (!descriptor.script && !descriptor.scriptSetup && !descriptor.template) {
                 nodeModule._compile('module.exports = {};\n', filename);
                 return;
@@ -36,7 +30,7 @@ function registerVueRuntimeLoader() {
             let code = '';
             const lang = descriptor.scriptSetup?.lang || descriptor.script?.lang;
             if (!descriptor.script && !descriptor.scriptSetup && descriptor.template) {
-                const templateResult = (0, compiler_sfc_1.compileTemplate)({
+                const templateResult = compileTemplate({
                     id,
                     filename,
                     source: descriptor.template.content,
@@ -53,7 +47,7 @@ export default __component__;
 `;
             }
             else {
-                const compiled = (0, compiler_sfc_1.compileScript)(descriptor, {
+                const compiled = compileScript(descriptor, {
                     id,
                     inlineTemplate: Boolean(descriptor.template),
                     templateOptions: {
@@ -62,7 +56,7 @@ export default __component__;
                 });
                 code = compiled.content;
             }
-            const transformed = (0, esbuild_1.transformSync)(code, {
+            const transformed = transformSync(code, {
                 loader: inferLoader(lang),
                 format: 'cjs',
                 target: 'node18',

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@yumerijs/loader",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Module loader for yumeri",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "type": "module",
   "files": [
     "dist"
   ],
@@ -40,6 +41,6 @@
     "js-yaml": "^4.1.0"
   },
   "peerDependencies": {
-    "@yumerijs/core": "^2.0.2"
+    "@yumerijs/core": "^2.2.0"
   }
 }