@yumerijs/core 2.2.0 → 2.2.2

package/dist/context.d.ts

@@ -2,6 +2,7 @@ import { Core } from './core.js';
 import { Route } from './route.js';
 import { HookHandler } from './hook.js';
 import { Middleware } from './middleware.js';
+import { IRenderer } from '@yumerijs/types';
 interface Plugin {
     apply: (ctx: Context, config: any) => any;
     disable: (ctx: Context) => Promise<void>;
@@ -25,7 +26,9 @@ export declare class Context {
     private childPlugins;
     private i18ns;
     component: Components;
+    renderer?: IRenderer;
     instance: any;
+    childpath: string;
     /** 插件名称 */
     pluginname: string;
     /**
@@ -45,7 +48,7 @@ export declare class Context {
      * @param path 路由路径
      * @returns Route 实例
      */
-    route(path: string): Route;
+    route(routepath: string): Route;
     /**
      * 注册事件
      * @param name 事件名称
@@ -95,7 +98,7 @@ export declare class Context {
      * 注册子 Context
      * @param name 子 Context 名称
      */
-    fork(name?: string): Context;
+    fork(name?: string, path?: string): Context;
     /**
      * 注册子插件
      * @param plugin 插件实例

package/dist/context.js

@@ -1,4 +1,5 @@
 import { Route } from './route.js';
+import path from 'path';
 /**
  * 插件上下文对象
  * 每个插件一个 Context，用于管理插件注册的命令、路由、事件、组件和中间件
@@ -14,7 +15,9 @@ export class Context {
     childPlugins = new Map();
     i18ns = [];
     component;
+    renderer;
     instance;
+    childpath = '/';
     /** 插件名称 */
     pluginname;
     /**
@@ -42,13 +45,14 @@ export class Context {
      * @param path 路由路径
      * @returns Route 实例
      */
-    route(path) {
-        if (this.core.routes[path]) {
+    route(routepath) {
+        const realpath = path.join(this.childpath, routepath);
+        if (this.core.routes[realpath]) {
             this.core.logger.warn(`Plugin "${this.pluginname}" attempt to register route "${path}", but it has already been registered.`);
-            return new Route(path, this);
+            return new Route(realpath, this);
         }
-        this.routes.push(path);
-        return this.core.route(path, this);
+        this.routes.push(realpath);
+        return this.core.route(realpath, this);
     }
     /**
      * 注册事件
@@ -133,8 +137,9 @@ export class Context {
      * 注册子 Context
      * @param name 子 Context 名称
      */
-    fork(name = this.pluginname) {
+    fork(name = this.pluginname, path) {
         const ctx = new Context(this.core, name);
+        ctx.childpath = path;
         this.childContexts.push(ctx);
         return ctx;
     }

package/dist/core.d.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'events';
-import { Config } from './config.js';
+import { Config, Schema } from './config.js';
 import { Logger } from './logger.js';
 import { Session } from './session.js';
 import { Middleware } from './middleware.js';
@@ -15,7 +15,7 @@ interface Plugin {
     depend: Array<string>;
     provide: Array<string>;
 }
-interface CoreOptions {
+export interface CoreOptions {
     port: number;
     host: string;
     staticDir: string;
@@ -23,6 +23,7 @@ interface CoreOptions {
     enableWs: boolean;
     lang: string[];
 }
+export declare const coreConfigSchema: Schema<CoreOptions>;
 export declare const enum PluginStatus {
     ENABLED = "enabled",
     DISABLED = "disabled",

package/dist/core.js

@@ -1,8 +1,17 @@
 import { EventEmitter } from 'events';
+import { Schema } from './config.js';
 import { Logger } from './logger.js';
 import { Route } from './route.js';
 import { Hook } from './hook.js';
 import { Server as CoreServer } from './server.js';
+export const coreConfigSchema = Schema.object({
+    port: Schema.number('监听端口').default(14510),
+    host: Schema.string('监听地址').default('0.0.0.0'),
+    staticDir: Schema.string('静态目录').default('public'),
+    enableCors: Schema.boolean('启用跨域').default(false),
+    enableWs: Schema.boolean('启用 WebSocket').default(false),
+    lang: Schema.array(Schema.string(), '语言列表').default(['zh', 'en']),
+});
 export class Core {
     emitter = new EventEmitter();
     components = {};

package/dist/logger.d.ts

@@ -4,6 +4,7 @@
  * WindyPear-Team All right reserved
  **/
 import { Core } from './core.js';
+type LogLevel = 'info' | 'warn' | 'error' | 'debug';
 export declare class Logger {
     private title;
     private titleColor;
@@ -13,12 +14,16 @@ export declare class Logger {
         message: string;
         timestamp: string;
     }[];
+    static level: LogLevel;
     static setCore(core: Core): void;
+    static setLevel(level: LogLevel): void;
     constructor(title: string);
     private getColorByName;
     private getTimestamp;
     private log;
+    debug(...args: any[]): void;
     info(...args: any[]): void;
     warn(...args: any[]): void;
     error(...args: any[]): void;
 }
+export {};

package/dist/logger.js

@@ -11,12 +11,16 @@ export class Logger {
     titleColor;
     static coreInstance = null;
     static logs = [];
+    static level = 'info';
     static setCore(core) {
         if (Logger.coreInstance !== null) {
             return;
         }
         Logger.coreInstance = core;
     }
+    static setLevel(level) {
+        Logger.level = level;
+    }
     constructor(title) {
         this.title = title;
         this.titleColor = this.getColorByName(this.title);
@@ -48,7 +52,22 @@ export class Logger {
         Logger.coreInstance?.emit('log', { level, message: args.join(' '), timestamp });
         Logger.logs.push({ level, message: args.join(' '), timestamp });
     }
-    info(...args) { this.log('I', ...args); }
-    warn(...args) { this.log('W', ...args); }
-    error(...args) { this.log('E', ...args); }
+    debug(...args) {
+        if (Logger.level === 'debug') {
+            this.log('D', ...args);
+        }
+    }
+    info(...args) {
+        if (Logger.level === 'info' || Logger.level === 'debug') {
+            this.log('I', ...args);
+        }
+    }
+    warn(...args) {
+        if (Logger.level !== 'error') {
+            this.log('W', ...args);
+        }
+    }
+    error(...args) {
+        this.log('E', ...args);
+    }
 }

package/dist/session.d.ts

@@ -153,5 +153,6 @@ export declare class Session {
      * @param data The data/props to pass to the component.
      */
     renderView(component: any, data?: Record<string, any>): Promise<void>;
+    renderFile(filePath: string, data?: any): Promise<void>;
 }
 export {};

package/dist/session.js

@@ -393,15 +393,10 @@ export class Session {
         if (!this.pluginContext) {
             throw new Error(`Cannot call 'renderView' because the session is not associated with a plugin context.`);
         }
-        const rendererName = this.pluginContext.instance.render;
+        const renderer = this.pluginContext.renderer || null;
         const pluginName = this.pluginContext.pluginname;
-        if (!rendererName) {
-            this.server.core.logger.error(`Plugin "${pluginName}" uses 'renderView' but did not declare a renderer. Please add 'export const render = "your-renderer-name";' to your plugin's entry file.`);
-            // throw new Error(`Plugin "${pluginName}" did not declare a renderer.`);
-        }
-        const renderer = this.server.core.renderers.get(rendererName);
         if (!renderer) {
-            this.server.core.logger.error(`Renderer "${rendererName}" declared by plugin "${pluginName}" is not registered. Have you installed the renderer package (e.g., '@yumerijs/vue-renderer')?`);
+            this.server.core.logger.error(`Renderer declared by plugin "${pluginName}" is not registered. Have you installed the renderer package (e.g., '@yumerijs/vue-renderer')?`);
             // throw new Error(`Renderer "${rendererName}" is not registered.`);
         }
         const renderOptions = {
@@ -417,4 +412,21 @@ export class Session {
             throw error;
         }
     }
+    async renderFile(filePath, data) {
+        const renderer = this.pluginContext.renderer;
+        const pluginName = this.pluginContext.pluginname;
+        if (!renderer) {
+            this.server.core.logger.error(`Renderer declared by plugin "${pluginName}" is not registered. Have you installed the renderer package (e.g., '@yumerijs/vue-renderer')?`);
+            // throw new Error(`Renderer "${rendererName}" is not registered.`);
+        }
+        try {
+            const html = await renderer.renderFile(filePath, data);
+            this.setMime('text/html');
+            this.response(html, 'plain');
+        }
+        catch (error) {
+            this.server.core.logger.error(`Error while rendering file "${filePath}":`, error);
+            throw error;
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yumerijs/core",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Core module for yumeri",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",