@eggjs/core 6.3.0-beta.0 → 6.3.0

package/dist/commonjs/base_context_class.d.ts

@@ -1,16 +1,16 @@
-import type { EggCore, ContextDelegation } from './egg.js';
+import type { EggCore, Context } from './egg.js';
 /**
  * BaseContextClass is a base class that can be extended,
  * it's instantiated in context level,
  * {@link Helper}, {@link Service} is extending it.
  */
 export declare class BaseContextClass {
-    ctx: ContextDelegation;
+    ctx: Context;
     app: EggCore;
     config: Record<string, any>;
     service: BaseContextClass;
     /**
      * @since 1.0.0
      */
-    constructor(ctx: ContextDelegation);
+    constructor(ctx: Context);
 }

package/dist/commonjs/base_context_class.js

@@ -38,4 +38,4 @@ class BaseContextClass {
     }
 }
 exports.BaseContextClass = BaseContextClass;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV9jb250ZXh0X2NsYXNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jhc2VfY29udGV4dF9jbGFzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQTs7OztHQUlHO0FBQ0gsTUFBYSxnQkFBZ0I7SUFDM0IsR0FBRyxDQUFvQjtJQUN2QixHQUFHLENBQVU7SUFDYixNQUFNLENBQXNCO0lBQzVCLE9BQU8sQ0FBbUI7SUFFMUI7O09BRUc7SUFDSCxZQUFZLEdBQXNCO1FBQ2hDOzs7V0FHRztRQUNILElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2Y7OztXQUdHO1FBQ0gsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDO1FBQ25COzs7V0FHRztRQUNILElBQUksQ0FBQyxNQUFNLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUM7UUFDN0I7OztXQUdHO1FBQ0gsSUFBSSxDQUFDLE9BQU8sR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDO0lBQzdCLENBQUM7Q0FDRjtBQS9CRCw0Q0ErQkMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV9jb250ZXh0X2NsYXNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jhc2VfY29udGV4dF9jbGFzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQTs7OztHQUlHO0FBQ0gsTUFBYSxnQkFBZ0I7SUFDM0IsR0FBRyxDQUFVO0lBQ2IsR0FBRyxDQUFVO0lBQ2IsTUFBTSxDQUFzQjtJQUM1QixPQUFPLENBQW1CO0lBRTFCOztPQUVHO0lBQ0gsWUFBWSxHQUFZO1FBQ3RCOzs7V0FHRztRQUNILElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2Y7OztXQUdHO1FBQ0gsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDO1FBQ25COzs7V0FHRztRQUNILElBQUksQ0FBQyxNQUFNLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUM7UUFDN0I7OztXQUdHO1FBQ0gsSUFBSSxDQUFDLE9BQU8sR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDO0lBQzdCLENBQUM7Q0FDRjtBQS9CRCw0Q0ErQkMifQ==

package/dist/commonjs/egg.d.ts

@@ -1,6 +1,6 @@
 import { Application as KoaApplication, Context as KoaContext, Request as KoaRequest, Response as KoaResponse } from '@eggjs/koa';
-import type { ContextDelegation as KoaContextDelegation, MiddlewareFunc as KoaMiddlewareFunc, Next } from '@eggjs/koa';
-import { EggConsoleLogger } from 'egg-logger';
+import type { MiddlewareFunc as KoaMiddlewareFunc, Next } from '@eggjs/koa';
+import { EggConsoleLogger, Logger } from 'egg-logger';
 import { RegisterOptions, ResourcesController, EggRouter as Router } from '@eggjs/router';
 import type { ReadyFunctionArg } from 'get-ready';
 import { BaseContextClass } from './base_context_class.js';
@@ -8,6 +8,8 @@ import { Timing } from './utils/timing.js';
 import type { Fun } from './utils/index.js';
 import { Lifecycle } from './lifecycle.js';
 import { EggLoader } from './loader/egg_loader.js';
+import { EggAppConfig } from './types.js';
+import { type SingletonCreateMethod } from './singleton.js';
 export declare const EGG_LOADER: unique symbol;
 export interface EggCoreOptions {
     baseDir: string;
@@ -18,16 +20,14 @@ export interface EggCoreOptions {
 }
 export type EggCoreInitOptions = Partial<EggCoreOptions>;
 export { KoaRequest, KoaResponse, KoaContext, KoaApplication, Router, };
-export type { Next, KoaMiddlewareFunc, KoaContextDelegation, };
+export type { Next, KoaMiddlewareFunc, };
 export declare class Request extends KoaRequest {
     app: EggCore;
     response: Response;
-    ctx: ContextDelegation;
 }
 export declare class Response extends KoaResponse {
     app: EggCore;
     request: Request;
-    ctx: ContextDelegation;
 }
 export declare class Context extends KoaContext {
     app: EggCore;
@@ -35,8 +35,7 @@ export declare class Context extends KoaContext {
     response: Response;
     service: BaseContextClass;
 }
-export type ContextDelegation = KoaContextDelegation & Context;
-export type MiddlewareFunc<T extends ContextDelegation = ContextDelegation> = KoaMiddlewareFunc<T>;
+export type MiddlewareFunc<T = Context> = KoaMiddlewareFunc<T>;
 export declare class EggCore extends KoaApplication {
     #private;
     options: EggCoreOptions;
@@ -63,6 +62,14 @@ export declare class EggCore extends KoaApplication {
      * @since 1.0.0
      */
     constructor(options?: EggCoreInitOptions);
+    get logger(): Logger;
+    get coreLogger(): Logger;
+    /**
+     * create a singleton instance
+     * @param {String} name - unique name for singleton
+     * @param {Function|AsyncFunction} create - method will be invoked when singleton instance create
+     */
+    addSingleton(name: string, create: SingletonCreateMethod): void;
     /**
      * override koa's app.use, support generator function
      * @since 1.0.0
@@ -99,13 +106,13 @@ export declare class EggCore extends KoaApplication {
      * @member {Object}
      * @since 1.0.0
      */
-    get plugins(): Record<string, import("./loader/egg_loader.js").EggPluginInfo>;
+    get plugins(): Record<string, import("./types.js").EggPluginInfo>;
     /**
      * The configuration of application
      * @member {Config}
      * @since 1.0.0
      */
-    get config(): Record<string, any>;
+    get config(): EggAppConfig;
     /**
      * Execute scope after loaded and before app start.
      *
@@ -164,7 +171,7 @@ export declare class EggCore extends KoaApplication {
      *
      * @param {Function} fn - the function that can be generator function or async function.
      */
-    beforeClose(fn: Fun): void;
+    beforeClose(fn: Fun, name?: string): void;
     /**
      * Close all, it will close
      * - callbacks registered by beforeClose

package/dist/commonjs/egg.js

@@ -20,7 +20,8 @@ const timing_js_1 = require("./utils/timing.js");
 const lifecycle_js_1 = require("./lifecycle.js");
 const egg_loader_js_1 = require("./loader/egg_loader.js");
 const index_js_1 = __importDefault(require("./utils/index.js"));
-const debug = (0, node_util_1.debuglog)('@eggjs/core:egg');
+const singleton_js_1 = require("./singleton.js");
+const debug = (0, node_util_1.debuglog)('@eggjs/core/egg');
 exports.EGG_LOADER = Symbol.for('egg#loader');
 // export @eggjs/core classes
 class Request extends koa_1.Request {
@@ -139,6 +140,31 @@ class EggCore extends koa_1.Application {
             EggCoreClass: EggCore,
         });
     }
+    get logger() {
+        return this.console;
+    }
+    get coreLogger() {
+        return this.console;
+    }
+    /**
+     * create a singleton instance
+     * @param {String} name - unique name for singleton
+     * @param {Function|AsyncFunction} create - method will be invoked when singleton instance create
+     */
+    addSingleton(name, create) {
+        const options = {
+            name,
+            create,
+            app: this,
+        };
+        const singleton = new singleton_js_1.Singleton(options);
+        const initPromise = singleton.init();
+        if (initPromise) {
+            this.beforeStart(async () => {
+                await initPromise;
+            });
+        }
+    }
     /**
      * override koa's app.use, support generator function
      * @since 1.0.0
@@ -256,9 +282,9 @@ class EggCore extends koa_1.Application {
      *
      * @param {Function} fn - the function that can be generator function or async function.
      */
-    beforeClose(fn) {
+    beforeClose(fn, name) {
         this.deprecate('`beforeClose` was deprecated, please use "Life Cycles" instead, see https://www.eggjs.org/advanced/loader#life-cycles');
-        this.lifecycle.registerBeforeClose(fn);
+        this.lifecycle.registerBeforeClose(fn, name);
     }
     /**
      * Close all, it will close
@@ -347,4 +373,4 @@ class EggCore extends koa_1.Application {
     }
 }
 exports.EggCore = EggCore;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"egg.js","sourceRoot":"","sources":["../../src/egg.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"egg.js","sourceRoot":"","sources":["../../src/egg.ts"],"names":[],"mappings":"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"}

package/dist/commonjs/index.d.ts

@@ -3,8 +3,10 @@ export { utils };
 export * from './egg.js';
 export * from './base_context_class.js';
 export * from './lifecycle.js';
+export * from './singleton.js';
 export * from './loader/egg_loader.js';
 export * from './loader/file_loader.js';
 export * from './loader/context_loader.js';
 export * from './utils/sequencify.js';
 export * from './utils/timing.js';
+export type * from './types.js';

package/dist/commonjs/index.js

@@ -23,9 +23,10 @@ exports.utils = index_js_1.default;
 __exportStar(require("./egg.js"), exports);
 __exportStar(require("./base_context_class.js"), exports);
 __exportStar(require("./lifecycle.js"), exports);
+__exportStar(require("./singleton.js"), exports);
 __exportStar(require("./loader/egg_loader.js"), exports);
 __exportStar(require("./loader/file_loader.js"), exports);
 __exportStar(require("./loader/context_loader.js"), exports);
 __exportStar(require("./utils/sequencify.js"), exports);
 __exportStar(require("./utils/timing.js"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxnRUFBcUM7QUFFNUIsZ0JBRkYsa0JBQUssQ0FFRTtBQUVkLDJDQUF5QjtBQUN6QiwwREFBd0M7QUFDeEMsaURBQStCO0FBQy9CLHlEQUF1QztBQUN2QywwREFBd0M7QUFDeEMsNkRBQTJDO0FBQzNDLHdEQUFzQztBQUN0QyxvREFBa0MifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxnRUFBcUM7QUFFNUIsZ0JBRkYsa0JBQUssQ0FFRTtBQUVkLDJDQUF5QjtBQUN6QiwwREFBd0M7QUFDeEMsaURBQStCO0FBQy9CLGlEQUErQjtBQUMvQix5REFBdUM7QUFDdkMsMERBQXdDO0FBQ3hDLDZEQUEyQztBQUMzQyx3REFBc0M7QUFDdEMsb0RBQWtDIn0=

package/dist/commonjs/lifecycle.d.ts

@@ -44,6 +44,9 @@ export interface LifecycleOptions {
     app: EggCore;
     logger: EggConsoleLogger;
 }
+export type FunWithFullPath = Fun & {
+    fullPath?: string;
+};
 export declare class Lifecycle extends EventEmitter {
     #private;
     loadReady: Ready;
@@ -58,13 +61,13 @@ export declare class Lifecycle extends EventEmitter {
     get timing(): import("./index.js").Timing;
     legacyReadyCallback(name: string, opt?: object): (...args: any[]) => void;
     addBootHook(bootHootOrBootClass: BootImplClass | ILifecycleBoot): void;
-    addFunctionAsBootHook<T = EggCore>(hook: (app: T) => void): void;
+    addFunctionAsBootHook<T = EggCore>(hook: (app: T) => void, fullPath?: string): void;
     /**
      * init boots and trigger config did config
      */
     init(): void;
     registerBeforeStart(scope: Fun, name: string): void;
-    registerBeforeClose(fn: Fun): void;
+    registerBeforeClose(fn: FunWithFullPath, fullPath?: string): void;
     close(): Promise<void>;
     triggerConfigWillLoad(): void;
     triggerConfigDidLoad(): void;

package/dist/commonjs/lifecycle.js

@@ -42,10 +42,10 @@ class Lifecycle extends node_events_1.EventEmitter {
         this.#initReady();
         this
             .on('ready_stat', data => {
-            this.logger.info('[egg:core:ready_stat] end ready task %s, remain %j', data.id, data.remain);
+            this.logger.info('[@eggjs/core/lifecycle:ready_stat] end ready task %s, remain %j', data.id, data.remain);
         })
             .on('ready_timeout', id => {
-            this.logger.warn('[egg:core:ready_timeout] %s seconds later %s was still unable to finish.', this.readyTimeout / 1000, id);
+            this.logger.warn('[@eggjs/core/lifecycle:ready_timeout] %s seconds later %s was still unable to finish.', this.readyTimeout / 1000, id);
         });
         this.ready(err => {
             this.triggerDidReady(err);
@@ -85,11 +85,12 @@ class Lifecycle extends node_events_1.EventEmitter {
         (0, node_assert_1.default)(this.#init === false, 'do not add hook when lifecycle has been initialized');
         this.#bootHooks.push(bootHootOrBootClass);
     }
-    addFunctionAsBootHook(hook) {
+    addFunctionAsBootHook(hook, fullPath) {
         (0, node_assert_1.default)(this.#init === false, 'do not add hook when lifecycle has been initialized');
         // app.js is exported as a function
         // call this function in configDidLoad
-        this.#bootHooks.push(class Boot {
+        class Boot {
+            static fullPath;
             app;
             constructor(app) {
                 this.app = app;
@@ -97,23 +98,31 @@ class Lifecycle extends node_events_1.EventEmitter {
             configDidLoad() {
                 hook(this.app);
             }
-        });
+        }
+        Boot.fullPath = fullPath;
+        this.#bootHooks.push(Boot);
     }
     /**
      * init boots and trigger config did config
      */
     init() {
+        debug('%s init lifecycle', this.app.type);
         (0, node_assert_1.default)(this.#init === false, 'lifecycle have been init');
         this.#init = true;
         this.#boots = this.#bootHooks.map(BootHootOrBootClass => {
+            let instance = BootHootOrBootClass;
             if ((0, is_type_of_1.isClass)(BootHootOrBootClass)) {
-                return new BootHootOrBootClass(this.app);
+                instance = new BootHootOrBootClass(this.app);
+                if (!instance.fullPath && 'fullPath' in BootHootOrBootClass) {
+                    instance.fullPath = BootHootOrBootClass.fullPath;
+                }
             }
-            return BootHootOrBootClass;
+            debug('[init] add boot instance: %o', instance.fullPath);
+            return instance;
         });
     }
     registerBeforeStart(scope, name) {
-        debug('add registerBeforeStart, name: %o', name);
+        debug('%s add registerBeforeStart, name: %o', this.options.app.type, name);
         this.#registerReadyCallback({
             scope,
             ready: this.loadReady,
@@ -121,16 +130,21 @@ class Lifecycle extends node_events_1.EventEmitter {
             scopeFullName: name,
         });
     }
-    registerBeforeClose(fn) {
+    registerBeforeClose(fn, fullPath) {
         (0, node_assert_1.default)(typeof fn === 'function', 'argument should be function');
         (0, node_assert_1.default)(this.#isClosed === false, 'app has been closed');
+        if (fullPath) {
+            fn.fullPath = fullPath;
+        }
         this.#closeFunctionSet.add(fn);
+        debug('%s register beforeClose at %o, count: %d', this.app.type, fullPath, this.#closeFunctionSet.size);
     }
     async close() {
         // close in reverse order: first created, last closed
         const closeFns = Array.from(this.#closeFunctionSet);
-        debug('close %d beforeClose functions', closeFns.length);
+        debug('%s start trigger %d beforeClose functions', this.app.type, closeFns.length);
         for (const fn of closeFns.reverse()) {
+            debug('%s trigger beforeClose at %o', this.app.type, fn.fullPath);
             await index_js_1.default.callFn(fn);
             this.#closeFunctionSet.delete(fn);
         }
@@ -139,12 +153,13 @@ class Lifecycle extends node_events_1.EventEmitter {
         this.removeAllListeners();
         this.app.removeAllListeners();
         this.#isClosed = true;
-        debug('%s closed', this.options.app.type);
+        debug('%s closed', this.app.type);
     }
     triggerConfigWillLoad() {
         debug('trigger configWillLoad start');
         for (const boot of this.#boots) {
             if (typeof boot.configWillLoad === 'function') {
+                debug('trigger configWillLoad at %o', boot.fullPath);
                 boot.configWillLoad();
             }
         }
@@ -155,12 +170,13 @@ class Lifecycle extends node_events_1.EventEmitter {
         debug('trigger configDidLoad start');
         for (const boot of this.#boots) {
             if (typeof boot.configDidLoad === 'function') {
+                debug('trigger configDidLoad at %o', boot.fullPath);
                 boot.configDidLoad();
             }
             // function boot hook register after configDidLoad trigger
             if (typeof boot.beforeClose === 'function') {
                 const beforeClose = boot.beforeClose.bind(boot);
-                this.registerBeforeClose(beforeClose);
+                this.registerBeforeClose(beforeClose, boot.fullPath);
             }
         }
         debug('trigger configDidLoad end');
@@ -203,11 +219,13 @@ class Lifecycle extends node_events_1.EventEmitter {
         return (async () => {
             for (const boot of this.#boots) {
                 if (typeof boot.didReady === 'function') {
+                    debug('trigger didReady at %o', boot.fullPath);
                     try {
                         await boot.didReady(err);
                     }
-                    catch (e) {
-                        this.emit('error', e);
+                    catch (err) {
+                        debug('trigger didReady error at %o, error: %s', boot.fullPath, err);
+                        this.emit('error', err);
                     }
                 }
             }
@@ -221,10 +239,12 @@ class Lifecycle extends node_events_1.EventEmitter {
                 if (typeof boot.serverDidReady !== 'function') {
                     continue;
                 }
+                debug('trigger serverDidReady at %o', boot.fullPath);
                 try {
                     await boot.serverDidReady();
                 }
                 catch (err) {
+                    debug('trigger serverDidReady error at %o, error: %s', boot.fullPath, err);
                     this.emit('error', err);
                 }
             }
@@ -285,4 +305,4 @@ class Lifecycle extends node_events_1.EventEmitter {
     }
 }
 exports.Lifecycle = Lifecycle;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/lifecycle.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/lifecycle.ts"],"names":[],"mappings":"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"}

package/dist/commonjs/loader/context_loader.d.ts

@@ -1,13 +1,13 @@
 import { FileLoader, type FileLoaderOptions } from './file_loader.js';
-import type { ContextDelegation } from '../egg.js';
+import type { Context } from '../egg.js';
 export interface ClassLoaderOptions {
-    ctx: ContextDelegation;
+    ctx: Context;
     properties: any;
 }
 export declare class ClassLoader {
     #private;
     readonly _cache: Map<any, any>;
-    _ctx: ContextDelegation;
+    _ctx: Context;
     constructor(options: ClassLoaderOptions);
 }
 export interface ContextLoaderOptions extends Omit<FileLoaderOptions, 'target'> {

package/dist/commonjs/loader/context_loader.js

@@ -107,4 +107,4 @@ function getInstance(values, ctx) {
     }
     return instance;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dF9sb2FkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbG9hZGVyL2NvbnRleHRfbG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDhEQUFpQztBQUNqQywyQ0FBa0Q7QUFDbEQscURBQStFO0FBRy9FLE1BQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQztBQU8zQyxNQUFhLFdBQVc7SUFDYixNQUFNLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUM1QixJQUFJLENBQW9CO0lBRXhCLFlBQVksT0FBMkI7UUFDckMsSUFBQSxxQkFBTSxFQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUseUJBQXlCLENBQUMsQ0FBQztRQUMvQyxNQUFNLFVBQVUsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDO1FBQ3RDLElBQUksQ0FBQyxJQUFJLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQztRQUV4QixLQUFLLE1BQU0sUUFBUSxJQUFJLFVBQVUsRUFBRSxDQUFDO1lBQ2xDLElBQUksQ0FBQyxlQUFlLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ3ZELENBQUM7SUFDSCxDQUFDO0lBRUQsZUFBZSxDQUFDLFFBQWdCLEVBQUUsTUFBVztRQUMzQyxNQUFNLENBQUMsY0FBYyxDQUFDLElBQUksRUFBRSxRQUFRLEVBQUU7WUFDcEMsR0FBRztnQkFDRCxJQUFJLFFBQVEsR0FBUSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztnQkFDOUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO29CQUNkLFFBQVEsR0FBRyxXQUFXLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztvQkFDMUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxDQUFDO2dCQUN0QyxDQUFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dF9sb2FkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbG9hZGVyL2NvbnRleHRfbG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDhEQUFpQztBQUNqQywyQ0FBa0Q7QUFDbEQscURBQStFO0FBRy9FLE1BQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQztBQU8zQyxNQUFhLFdBQVc7SUFDYixNQUFNLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUM1QixJQUFJLENBQVU7SUFFZCxZQUFZLE9BQTJCO1FBQ3JDLElBQUEscUJBQU0sRUFBQyxPQUFPLENBQUMsR0FBRyxFQUFFLHlCQUF5QixDQUFDLENBQUM7UUFDL0MsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQztRQUN0QyxJQUFJLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7UUFFeEIsS0FBSyxNQUFNLFFBQVEsSUFBSSxVQUFVLEVBQUUsQ0FBQztZQUNsQyxJQUFJLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUN2RCxDQUFDO0lBQ0gsQ0FBQztJQUVELGVBQWUsQ0FBQyxRQUFnQixFQUFFLE1BQVc7UUFDM0MsTUFBTSxDQUFDLGNBQWMsQ0FBQyxJQUFJLEVBQUUsUUFBUSxFQUFFO1lBQ3BDLEdBQUc7Z0JBQ0QsSUFBSSxRQUFRLEdBQVEsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7Z0JBQzlDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztvQkFDZCxRQUFRLEdBQUcsV0FBVyxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7b0JBQzFDLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxRQUFRLENBQUMsQ0FBQztnQkFDdEMsQ0FBQztn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

package/dist/commonjs/loader/egg_loader.d.ts

@@ -3,43 +3,7 @@ import { FileLoader, FileLoaderOptions } from './file_loader.js';
 import { ContextLoader, ContextLoaderOptions } from './context_loader.js';
 import { Timing } from '../utils/timing.js';
 import type { EggCore } from '../egg.js';
-export interface EggAppInfo {
-    /** package.json */
-    pkg: Record<string, any>;
-    /** the application name from package.json */
-    name: string;
-    /** current directory of application */
-    baseDir: string;
-    /** equals to serverEnv */
-    env: string;
-    /** equals to serverScope */
-    scope: string;
-    /** home directory of the OS */
-    HOME: string;
-    /** baseDir when local and unittest, HOME when other environment */
-    root: string;
-}
-export interface EggPluginInfo {
-    /** the plugin name, it can be used in `dep` */
-    name: string;
-    /** the package name of plugin */
-    package?: string;
-    version?: string;
-    /** whether enabled */
-    enable: boolean;
-    implicitEnable?: boolean;
-    /** the directory of the plugin package */
-    path?: string;
-    /** the dependent plugins, you can use the plugin name */
-    dependencies: string[];
-    /** the optional dependent plugins. */
-    optionalDependencies: string[];
-    dependents?: string[];
-    /** specify the serverEnv that only enable the plugin in it */
-    env: string[];
-    /** the file plugin config in. */
-    from: string;
-}
+import type { EggAppConfig, EggAppInfo, EggPluginInfo } from '../types.js';
 export interface EggLoaderOptions {
     /** server env */
     env: string;
@@ -190,7 +154,7 @@ export declare class EggLoader {
     /** end Plugin loader */
     /** start Config loader */
     configMeta: Record<string, any>;
-    config: Record<string, any>;
+    config: EggAppConfig;
     /**
      * Load config/config.js
      *
@@ -381,7 +345,7 @@ export declare class EggLoader {
      * @param {Object} options - see {@link FileLoader}
      * @since 1.0.0
      */
-    loadToApp(directory: string | string[], property: string | symbol, options?: FileLoaderOptions): Promise<void>;
+    loadToApp(directory: string | string[], property: string | symbol, options?: Omit<FileLoaderOptions, 'inject' | 'target'>): Promise<void>;
     /**
      * Load files using {@link ContextLoader}
      * @param {String|Array} directory - see {@link ContextLoader}
@@ -389,7 +353,7 @@ export declare class EggLoader {
      * @param {Object} options - see {@link ContextLoader}
      * @since 1.0.0
      */
-    loadToContext(directory: string | string[], property: string | symbol, options?: ContextLoaderOptions): Promise<void>;
+    loadToContext(directory: string | string[], property: string | symbol, options?: Omit<ContextLoaderOptions, 'inject' | 'property'>): Promise<void>;
     /**
      * @member {FileLoader} EggLoader#FileLoader
      * @since 1.0.0