@eggjs/core 6.3.0-beta.0 → 6.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (56) hide show
  1. package/dist/commonjs/base_context_class.d.ts +3 -3
  2. package/dist/commonjs/base_context_class.js +1 -1
  3. package/dist/commonjs/egg.d.ts +17 -10
  4. package/dist/commonjs/egg.js +30 -4
  5. package/dist/commonjs/index.d.ts +2 -0
  6. package/dist/commonjs/index.js +2 -1
  7. package/dist/commonjs/lifecycle.d.ts +5 -2
  8. package/dist/commonjs/lifecycle.js +35 -15
  9. package/dist/commonjs/loader/context_loader.d.ts +3 -3
  10. package/dist/commonjs/loader/context_loader.js +1 -1
  11. package/dist/commonjs/loader/egg_loader.d.ts +4 -40
  12. package/dist/commonjs/loader/egg_loader.js +56 -39
  13. package/dist/commonjs/loader/file_loader.d.ts +5 -1
  14. package/dist/commonjs/loader/file_loader.js +18 -5
  15. package/dist/commonjs/singleton.d.ts +29 -0
  16. package/dist/commonjs/singleton.js +125 -0
  17. package/dist/commonjs/types.d.ts +53 -0
  18. package/dist/commonjs/types.js +3 -0
  19. package/dist/commonjs/utils/index.js +10 -5
  20. package/dist/commonjs/utils/sequencify.js +1 -1
  21. package/dist/commonjs/utils/timing.js +1 -1
  22. package/dist/esm/base_context_class.d.ts +3 -3
  23. package/dist/esm/base_context_class.js +1 -1
  24. package/dist/esm/egg.d.ts +17 -10
  25. package/dist/esm/egg.js +30 -4
  26. package/dist/esm/index.d.ts +2 -0
  27. package/dist/esm/index.js +2 -1
  28. package/dist/esm/lifecycle.d.ts +5 -2
  29. package/dist/esm/lifecycle.js +35 -15
  30. package/dist/esm/loader/context_loader.d.ts +3 -3
  31. package/dist/esm/loader/context_loader.js +1 -1
  32. package/dist/esm/loader/egg_loader.d.ts +4 -40
  33. package/dist/esm/loader/egg_loader.js +60 -43
  34. package/dist/esm/loader/file_loader.d.ts +5 -1
  35. package/dist/esm/loader/file_loader.js +17 -4
  36. package/dist/esm/singleton.d.ts +29 -0
  37. package/dist/esm/singleton.js +118 -0
  38. package/dist/esm/types.d.ts +53 -0
  39. package/dist/esm/types.js +2 -0
  40. package/dist/esm/utils/index.js +10 -5
  41. package/dist/esm/utils/sequencify.js +1 -1
  42. package/dist/esm/utils/timing.js +1 -1
  43. package/dist/package.json +1 -1
  44. package/package.json +16 -15
  45. package/src/base_context_class.ts +3 -3
  46. package/src/egg.ts +40 -12
  47. package/src/index.ts +2 -0
  48. package/src/lifecycle.ts +40 -15
  49. package/src/loader/context_loader.ts +4 -4
  50. package/src/loader/egg_loader.ts +76 -90
  51. package/src/loader/file_loader.ts +16 -4
  52. package/src/singleton.ts +149 -0
  53. package/src/types.ts +56 -0
  54. package/src/utils/index.ts +9 -4
  55. package/src/utils/sequencify.ts +1 -1
  56. package/src/utils/timing.ts +1 -1
@@ -36,10 +36,10 @@ export class Lifecycle extends EventEmitter {
36
36
  this.#initReady();
37
37
  this
38
38
  .on('ready_stat', data => {
39
- this.logger.info('[egg:core:ready_stat] end ready task %s, remain %j', data.id, data.remain);
39
+ this.logger.info('[@eggjs/core/lifecycle:ready_stat] end ready task %s, remain %j', data.id, data.remain);
40
40
  })
41
41
  .on('ready_timeout', id => {
42
- this.logger.warn('[egg:core:ready_timeout] %s seconds later %s was still unable to finish.', this.readyTimeout / 1000, id);
42
+ this.logger.warn('[@eggjs/core/lifecycle:ready_timeout] %s seconds later %s was still unable to finish.', this.readyTimeout / 1000, id);
43
43
  });
44
44
  this.ready(err => {
45
45
  this.triggerDidReady(err);
@@ -79,11 +79,12 @@ export class Lifecycle extends EventEmitter {
79
79
  assert(this.#init === false, 'do not add hook when lifecycle has been initialized');
80
80
  this.#bootHooks.push(bootHootOrBootClass);
81
81
  }
82
- addFunctionAsBootHook(hook) {
82
+ addFunctionAsBootHook(hook, fullPath) {
83
83
  assert(this.#init === false, 'do not add hook when lifecycle has been initialized');
84
84
  // app.js is exported as a function
85
85
  // call this function in configDidLoad
86
- this.#bootHooks.push(class Boot {
86
+ class Boot {
87
+ static fullPath;
87
88
  app;
88
89
  constructor(app) {
89
90
  this.app = app;
@@ -91,23 +92,31 @@ export class Lifecycle extends EventEmitter {
91
92
  configDidLoad() {
92
93
  hook(this.app);
93
94
  }
94
- });
95
+ }
96
+ Boot.fullPath = fullPath;
97
+ this.#bootHooks.push(Boot);
95
98
  }
96
99
  /**
97
100
  * init boots and trigger config did config
98
101
  */
99
102
  init() {
103
+ debug('%s init lifecycle', this.app.type);
100
104
  assert(this.#init === false, 'lifecycle have been init');
101
105
  this.#init = true;
102
106
  this.#boots = this.#bootHooks.map(BootHootOrBootClass => {
107
+ let instance = BootHootOrBootClass;
103
108
  if (isClass(BootHootOrBootClass)) {
104
- return new BootHootOrBootClass(this.app);
109
+ instance = new BootHootOrBootClass(this.app);
110
+ if (!instance.fullPath && 'fullPath' in BootHootOrBootClass) {
111
+ instance.fullPath = BootHootOrBootClass.fullPath;
112
+ }
105
113
  }
106
- return BootHootOrBootClass;
114
+ debug('[init] add boot instance: %o', instance.fullPath);
115
+ return instance;
107
116
  });
108
117
  }
109
118
  registerBeforeStart(scope, name) {
110
- debug('add registerBeforeStart, name: %o', name);
119
+ debug('%s add registerBeforeStart, name: %o', this.options.app.type, name);
111
120
  this.#registerReadyCallback({
112
121
  scope,
113
122
  ready: this.loadReady,
@@ -115,16 +124,21 @@ export class Lifecycle extends EventEmitter {
115
124
  scopeFullName: name,
116
125
  });
117
126
  }
118
- registerBeforeClose(fn) {
127
+ registerBeforeClose(fn, fullPath) {
119
128
  assert(typeof fn === 'function', 'argument should be function');
120
129
  assert(this.#isClosed === false, 'app has been closed');
130
+ if (fullPath) {
131
+ fn.fullPath = fullPath;
132
+ }
121
133
  this.#closeFunctionSet.add(fn);
134
+ debug('%s register beforeClose at %o, count: %d', this.app.type, fullPath, this.#closeFunctionSet.size);
122
135
  }
123
136
  async close() {
124
137
  // close in reverse order: first created, last closed
125
138
  const closeFns = Array.from(this.#closeFunctionSet);
126
- debug('close %d beforeClose functions', closeFns.length);
139
+ debug('%s start trigger %d beforeClose functions', this.app.type, closeFns.length);
127
140
  for (const fn of closeFns.reverse()) {
141
+ debug('%s trigger beforeClose at %o', this.app.type, fn.fullPath);
128
142
  await utils.callFn(fn);
129
143
  this.#closeFunctionSet.delete(fn);
130
144
  }
@@ -133,12 +147,13 @@ export class Lifecycle extends EventEmitter {
133
147
  this.removeAllListeners();
134
148
  this.app.removeAllListeners();
135
149
  this.#isClosed = true;
136
- debug('%s closed', this.options.app.type);
150
+ debug('%s closed', this.app.type);
137
151
  }
138
152
  triggerConfigWillLoad() {
139
153
  debug('trigger configWillLoad start');
140
154
  for (const boot of this.#boots) {
141
155
  if (typeof boot.configWillLoad === 'function') {
156
+ debug('trigger configWillLoad at %o', boot.fullPath);
142
157
  boot.configWillLoad();
143
158
  }
144
159
  }
@@ -149,12 +164,13 @@ export class Lifecycle extends EventEmitter {
149
164
  debug('trigger configDidLoad start');
150
165
  for (const boot of this.#boots) {
151
166
  if (typeof boot.configDidLoad === 'function') {
167
+ debug('trigger configDidLoad at %o', boot.fullPath);
152
168
  boot.configDidLoad();
153
169
  }
154
170
  // function boot hook register after configDidLoad trigger
155
171
  if (typeof boot.beforeClose === 'function') {
156
172
  const beforeClose = boot.beforeClose.bind(boot);
157
- this.registerBeforeClose(beforeClose);
173
+ this.registerBeforeClose(beforeClose, boot.fullPath);
158
174
  }
159
175
  }
160
176
  debug('trigger configDidLoad end');
@@ -197,11 +213,13 @@ export class Lifecycle extends EventEmitter {
197
213
  return (async () => {
198
214
  for (const boot of this.#boots) {
199
215
  if (typeof boot.didReady === 'function') {
216
+ debug('trigger didReady at %o', boot.fullPath);
200
217
  try {
201
218
  await boot.didReady(err);
202
219
  }
203
- catch (e) {
204
- this.emit('error', e);
220
+ catch (err) {
221
+ debug('trigger didReady error at %o, error: %s', boot.fullPath, err);
222
+ this.emit('error', err);
205
223
  }
206
224
  }
207
225
  }
@@ -215,10 +233,12 @@ export class Lifecycle extends EventEmitter {
215
233
  if (typeof boot.serverDidReady !== 'function') {
216
234
  continue;
217
235
  }
236
+ debug('trigger serverDidReady at %o', boot.fullPath);
218
237
  try {
219
238
  await boot.serverDidReady();
220
239
  }
221
240
  catch (err) {
241
+ debug('trigger serverDidReady error at %o, error: %s', boot.fullPath, err);
222
242
  this.emit('error', err);
223
243
  }
224
244
  }
@@ -278,4 +298,4 @@ export class Lifecycle extends EventEmitter {
278
298
  });
279
299
  }
280
300
  }
281
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/lifecycle.ts"],"names":[],"mappings":"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"}
301
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/lifecycle.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,13 @@
1
1
  import { FileLoader, type FileLoaderOptions } from './file_loader.js';
2
- import type { ContextDelegation } from '../egg.js';
2
+ import type { Context } from '../egg.js';
3
3
  export interface ClassLoaderOptions {
4
- ctx: ContextDelegation;
4
+ ctx: Context;
5
5
  properties: any;
6
6
  }
7
7
  export declare class ClassLoader {
8
8
  #private;
9
9
  readonly _cache: Map<any, any>;
10
- _ctx: ContextDelegation;
10
+ _ctx: Context;
11
11
  constructor(options: ClassLoaderOptions);
12
12
  }
13
13
  export interface ContextLoaderOptions extends Omit<FileLoaderOptions, 'target'> {
@@ -99,4 +99,4 @@ function getInstance(values, ctx) {
99
99
  }
100
100
  return instance;
101
101
  }
102
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dF9sb2FkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbG9hZGVyL2NvbnRleHRfbG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sTUFBTSxNQUFNLGFBQWEsQ0FBQztBQUNqQyxPQUFPLEVBQUUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUNsRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBMEIsTUFBTSxrQkFBa0IsQ0FBQztBQUcvRSxNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUM7QUFPM0MsTUFBTSxPQUFPLFdBQVc7SUFDYixNQUFNLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUM1QixJQUFJLENBQW9CO0lBRXhCLFlBQVksT0FBMkI7UUFDckMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUseUJBQXlCLENBQUMsQ0FBQztRQUMvQyxNQUFNLFVBQVUsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDO1FBQ3RDLElBQUksQ0FBQyxJQUFJLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQztRQUV4QixLQUFLLE1BQU0sUUFBUSxJQUFJLFVBQVUsRUFBRSxDQUFDO1lBQ2xDLElBQUksQ0FBQyxlQUFlLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ3ZELENBQUM7SUFDSCxDQUFDO0lBRUQsZUFBZSxDQUFDLFFBQWdCLEVBQUUsTUFBVztRQUMzQyxNQUFNLENBQUMsY0FBYyxDQUFDLElBQUksRUFBRSxRQUFRLEVBQUU7WUFDcEMsR0FBRztnQkFDRCxJQUFJLFFBQVEsR0FBUSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztnQkFDOUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO29CQUNkLFFBQVEsR0FBRyxXQUFXLENBQUMsTUFBTSxFQUFFLElBQUksQ0FB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
102
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dF9sb2FkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbG9hZGVyL2NvbnRleHRfbG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sTUFBTSxNQUFNLGFBQWEsQ0FBQztBQUNqQyxPQUFPLEVBQUUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUNsRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBMEIsTUFBTSxrQkFBa0IsQ0FBQztBQUcvRSxNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUM7QUFPM0MsTUFBTSxPQUFPLFdBQVc7SUFDYixNQUFNLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUM1QixJQUFJLENBQVU7SUFFZCxZQUFZLE9BQTJCO1FBQ3JDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLHlCQUF5QixDQUFDLENBQUM7UUFDL0MsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQztRQUN0QyxJQUFJLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7UUFFeEIsS0FBSyxNQUFNLFFBQVEsSUFBSSxVQUFVLEVBQUUsQ0FBQztZQUNsQyxJQUFJLENBQUMsZUFBZSxDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztRQUN2RCxDQUFDO0lBQ0gsQ0FBQztJQUVELGVBQWUsQ0FBQyxRQUFnQixFQUFFLE1BQVc7UUFDM0MsTUFBTSxDQUFDLGNBQWMsQ0FBQyxJQUFJLEVBQUUsUUFBUSxFQUFFO1lBQ3BDLEdBQUc7Z0JBQ0QsSUFBSSxRQUFRLEdBQVEsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7Z0JBQzlDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztvQkFDZCxRQUFRLEdBQUcsV0FBVyxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7b0JBQzFDLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxRQUFRLENBQUMsQ0FBQztnQkFDdEMsQ0FBQztnQkFDRCxPQUFPLFFBQVEsQ0FBQztZQUNsQixDQUFDO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBV0Q7Ozs7O0dBS0c7QUFDSCxNQUFNLE9BQU8sYUFBYyxTQUFRLFVBQVU7SUFDbEMsT0FBTyxDQUFzQjtJQUN0Qzs7OztPQUlHO0lBQ0gsWUFBWSxPQUE2QjtRQUN2QyxNQUFNLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSw4QkFBOEIsQ0FBQyxDQUFDO1FBQ3pELE1BQU0sQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLDRCQUE0QixDQUFDLENBQUM7UUFDckQsTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ2xCLElBQUksT0FBTyxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ3ZCLE9BQU8sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxHQUFHLE1BQU0sQ0FBQztRQUM5QyxDQUFDO1FBQ0QsS0FBSyxDQUFDO1lBQ0osR0FBRyxPQUFPO1lBQ1YsTUFBTTtTQUNQLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFPLENBQUM7UUFFcEMsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUN6QixNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDO1FBQ2xDLHFCQUFxQjtRQUNyQixNQUFNLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsUUFBUSxFQUFFO1lBQzNDLEdBQUc7Z0JBQ0QsNERBQTREO2dCQUM1RCxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUM7Z0JBQ2pCLDhCQUE4QjtnQkFDOUIsMkRBQTJEO2dCQUMzRCwwREFBMEQ7Z0JBQzFELElBQUksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBQztvQkFDdkIsR0FBRyxDQUFDLFlBQVksQ0FBQyxHQUFHLElBQUksR0FBRyxFQUFFLENBQUM7Z0JBQ2hDLENBQUM7Z0JBQ0QsTUFBTSxXQUFXLEdBQXNDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztnQkFDekUsSUFBSSxRQUFRLEdBQUcsV0FBVyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztnQkFDekMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO29CQUNkLFFBQVEsR0FBRyxXQUFXLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxDQUFDO29CQUNwQyxXQUFXLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxRQUFTLENBQUMsQ0FBQztnQkFDdkMsQ0FBQztnQkFDRCxPQUFPLFFBQVEsQ0FBQztZQUNsQixDQUFDO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGO0FBRUQsU0FBUyxXQUFXLENBQUMsTUFBVyxFQUFFLEdBQVk7SUFDNUMsMENBQTBDO0lBQzFDLHVCQUF1QjtJQUN2QixNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO0lBQzlDLElBQUksUUFBUSxDQUFDO0lBQ2IsSUFBSSxLQUFLLEVBQUUsQ0FBQztRQUNWLElBQUksT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDbkIsUUFBUSxHQUFHLElBQUksS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzVCLENBQUM7YUFBTSxDQUFDO1lBQ04sc0JBQXNCO1lBQ3RCLFFBQVEsR0FBRyxLQUFLLENBQUM7UUFDbkIsQ0FBQztRQUNILGtEQUFrRDtRQUNsRCwyQkFBMkI7SUFDM0IsQ0FBQztTQUFNLElBQUksV0FBVyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7UUFDL0IsUUFBUSxHQUFHLE1BQU0sQ0FBQztJQUNwQixDQUFDO1NBQU0sQ0FBQztRQUNOLFFBQVEsR0FBRyxJQUFJLFdBQVcsQ0FBQyxFQUFFLEdBQUcsRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUMxRCxDQUFDO0lBQ0QsT0FBTyxRQUFRLENBQUM7QUFDbEIsQ0FBQyJ9
@@ -3,43 +3,7 @@ import { FileLoader, FileLoaderOptions } from './file_loader.js';
3
3
  import { ContextLoader, ContextLoaderOptions } from './context_loader.js';
4
4
  import { Timing } from '../utils/timing.js';
5
5
  import type { EggCore } from '../egg.js';
6
- export interface EggAppInfo {
7
- /** package.json */
8
- pkg: Record<string, any>;
9
- /** the application name from package.json */
10
- name: string;
11
- /** current directory of application */
12
- baseDir: string;
13
- /** equals to serverEnv */
14
- env: string;
15
- /** equals to serverScope */
16
- scope: string;
17
- /** home directory of the OS */
18
- HOME: string;
19
- /** baseDir when local and unittest, HOME when other environment */
20
- root: string;
21
- }
22
- export interface EggPluginInfo {
23
- /** the plugin name, it can be used in `dep` */
24
- name: string;
25
- /** the package name of plugin */
26
- package?: string;
27
- version?: string;
28
- /** whether enabled */
29
- enable: boolean;
30
- implicitEnable?: boolean;
31
- /** the directory of the plugin package */
32
- path?: string;
33
- /** the dependent plugins, you can use the plugin name */
34
- dependencies: string[];
35
- /** the optional dependent plugins. */
36
- optionalDependencies: string[];
37
- dependents?: string[];
38
- /** specify the serverEnv that only enable the plugin in it */
39
- env: string[];
40
- /** the file plugin config in. */
41
- from: string;
42
- }
6
+ import type { EggAppConfig, EggAppInfo, EggPluginInfo } from '../types.js';
43
7
  export interface EggLoaderOptions {
44
8
  /** server env */
45
9
  env: string;
@@ -190,7 +154,7 @@ export declare class EggLoader {
190
154
  /** end Plugin loader */
191
155
  /** start Config loader */
192
156
  configMeta: Record<string, any>;
193
- config: Record<string, any>;
157
+ config: EggAppConfig;
194
158
  /**
195
159
  * Load config/config.js
196
160
  *
@@ -381,7 +345,7 @@ export declare class EggLoader {
381
345
  * @param {Object} options - see {@link FileLoader}
382
346
  * @since 1.0.0
383
347
  */
384
- loadToApp(directory: string | string[], property: string | symbol, options?: FileLoaderOptions): Promise<void>;
348
+ loadToApp(directory: string | string[], property: string | symbol, options?: Omit<FileLoaderOptions, 'inject' | 'target'>): Promise<void>;
385
349
  /**
386
350
  * Load files using {@link ContextLoader}
387
351
  * @param {String|Array} directory - see {@link ContextLoader}
@@ -389,7 +353,7 @@ export declare class EggLoader {
389
353
  * @param {Object} options - see {@link ContextLoader}
390
354
  * @since 1.0.0
391
355
  */
392
- loadToContext(directory: string | string[], property: string | symbol, options?: ContextLoaderOptions): Promise<void>;
356
+ loadToContext(directory: string | string[], property: string | symbol, options?: Omit<ContextLoaderOptions, 'inject' | 'property'>): Promise<void>;
393
357
  /**
394
358
  * @member {FileLoader} EggLoader#FileLoader
395
359
  * @since 1.0.0