@eggjs/core 6.2.10 → 6.2.12
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.
- package/dist/commonjs/egg.d.ts +5 -4
- package/dist/commonjs/egg.js +1 -1
- package/dist/commonjs/index.d.ts +1 -0
- package/dist/commonjs/loader/egg_loader.d.ts +4 -40
- package/dist/commonjs/loader/egg_loader.js +14 -11
- package/dist/commonjs/loader/file_loader.d.ts +5 -1
- package/dist/commonjs/loader/file_loader.js +10 -4
- package/dist/commonjs/types.d.ts +53 -0
- package/dist/commonjs/types.js +3 -0
- package/dist/esm/egg.d.ts +5 -4
- package/dist/esm/egg.js +1 -1
- package/dist/esm/index.d.ts +1 -0
- package/dist/esm/loader/egg_loader.d.ts +4 -40
- package/dist/esm/loader/egg_loader.js +15 -12
- package/dist/esm/loader/file_loader.d.ts +5 -1
- package/dist/esm/loader/file_loader.js +9 -3
- package/dist/esm/types.d.ts +53 -0
- package/dist/esm/types.js +2 -0
- package/dist/package.json +1 -1
- package/package.json +2 -2
- package/src/egg.ts +5 -4
- package/src/index.ts +1 -0
- package/src/loader/egg_loader.ts +20 -52
- package/src/loader/file_loader.ts +8 -3
- package/src/types.ts +56 -0
|
@@ -8,6 +8,12 @@ import utils from '../utils/index.js';
|
|
|
8
8
|
const debug = debuglog('@eggjs/core/file_loader');
|
|
9
9
|
export const FULLPATH = Symbol('EGG_LOADER_ITEM_FULLPATH');
|
|
10
10
|
export const EXPORTS = Symbol('EGG_LOADER_ITEM_EXPORTS');
|
|
11
|
+
export var CaseStyle;
|
|
12
|
+
(function (CaseStyle) {
|
|
13
|
+
CaseStyle["camel"] = "camel";
|
|
14
|
+
CaseStyle["lower"] = "lower";
|
|
15
|
+
CaseStyle["upper"] = "upper";
|
|
16
|
+
})(CaseStyle || (CaseStyle = {}));
|
|
11
17
|
/**
|
|
12
18
|
* Load files from directory to target object.
|
|
13
19
|
* @since 1.0.0
|
|
@@ -38,7 +44,7 @@ export class FileLoader {
|
|
|
38
44
|
assert(options.directory, 'options.directory is required');
|
|
39
45
|
assert(options.target, 'options.target is required');
|
|
40
46
|
this.options = {
|
|
41
|
-
caseStyle:
|
|
47
|
+
caseStyle: CaseStyle.camel,
|
|
42
48
|
call: true,
|
|
43
49
|
override: false,
|
|
44
50
|
...options,
|
|
@@ -46,7 +52,7 @@ export class FileLoader {
|
|
|
46
52
|
// compatible old options _lowercaseFirst_
|
|
47
53
|
if (this.options.lowercaseFirst === true) {
|
|
48
54
|
utils.deprecated('lowercaseFirst is deprecated, use caseStyle instead');
|
|
49
|
-
this.options.caseStyle =
|
|
55
|
+
this.options.caseStyle = CaseStyle.lower;
|
|
50
56
|
}
|
|
51
57
|
}
|
|
52
58
|
/**
|
|
@@ -245,4 +251,4 @@ function defaultCamelize(filepath, caseStyle) {
|
|
|
245
251
|
return first + property.substring(1);
|
|
246
252
|
});
|
|
247
253
|
}
|
|
248
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
254
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"file_loader.js","sourceRoot":"","sources":["../../../src/loader/file_loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
export interface EggAppInfo {
|
|
2
|
+
/** package.json */
|
|
3
|
+
pkg: Record<string, any>;
|
|
4
|
+
/** the application name from package.json */
|
|
5
|
+
name: string;
|
|
6
|
+
/** current directory of application */
|
|
7
|
+
baseDir: string;
|
|
8
|
+
/** equals to serverEnv */
|
|
9
|
+
env: string;
|
|
10
|
+
/** equals to serverScope */
|
|
11
|
+
scope: string;
|
|
12
|
+
/** home directory of the OS */
|
|
13
|
+
HOME: string;
|
|
14
|
+
/** baseDir when local and unittest, HOME when other environment */
|
|
15
|
+
root: string;
|
|
16
|
+
}
|
|
17
|
+
export interface EggPluginInfo {
|
|
18
|
+
/** the plugin name, it can be used in `dep` */
|
|
19
|
+
name: string;
|
|
20
|
+
/** the package name of plugin */
|
|
21
|
+
package?: string;
|
|
22
|
+
version?: string;
|
|
23
|
+
/** whether enabled */
|
|
24
|
+
enable: boolean;
|
|
25
|
+
implicitEnable?: boolean;
|
|
26
|
+
/** the directory of the plugin package */
|
|
27
|
+
path?: string;
|
|
28
|
+
/** the dependent plugins, you can use the plugin name */
|
|
29
|
+
dependencies: string[];
|
|
30
|
+
/** the optional dependent plugins. */
|
|
31
|
+
optionalDependencies: string[];
|
|
32
|
+
dependents?: string[];
|
|
33
|
+
/** specify the serverEnv that only enable the plugin in it */
|
|
34
|
+
env: string[];
|
|
35
|
+
/** the file plugin config in. */
|
|
36
|
+
from: string;
|
|
37
|
+
}
|
|
38
|
+
export interface CustomLoaderConfigItem {
|
|
39
|
+
/** the directory of the custom loader */
|
|
40
|
+
directory: string;
|
|
41
|
+
/** the inject object, it can be app or ctx */
|
|
42
|
+
inject: string;
|
|
43
|
+
/** whether load unit files */
|
|
44
|
+
loadunit?: boolean;
|
|
45
|
+
}
|
|
46
|
+
export interface EggAppConfig extends Record<string, any> {
|
|
47
|
+
coreMiddleware: string[];
|
|
48
|
+
middleware: string[];
|
|
49
|
+
customLoader?: Record<string, CustomLoaderConfigItem>;
|
|
50
|
+
controller?: {
|
|
51
|
+
supportParams?: boolean;
|
|
52
|
+
};
|
|
53
|
+
}
|
package/dist/package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eggjs/core",
|
|
3
|
-
"version": "6.2.
|
|
3
|
+
"version": "6.2.12",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
},
|
|
39
39
|
"homepage": "https://github.com/eggjs/core#readme",
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@eggjs/koa": "^2.20.
|
|
41
|
+
"@eggjs/koa": "^2.20.6",
|
|
42
42
|
"@eggjs/router": "^3.0.5",
|
|
43
43
|
"@eggjs/utils": "^4.1.5",
|
|
44
44
|
"egg-logger": "^3.5.0",
|
package/src/egg.ts
CHANGED
|
@@ -18,6 +18,7 @@ import type { Fun } from './utils/index.js';
|
|
|
18
18
|
import { Lifecycle } from './lifecycle.js';
|
|
19
19
|
import { EggLoader } from './loader/egg_loader.js';
|
|
20
20
|
import utils from './utils/index.js';
|
|
21
|
+
import { EggAppConfig } from './types.js';
|
|
21
22
|
|
|
22
23
|
const debug = debuglog('@eggjs/core/egg');
|
|
23
24
|
|
|
@@ -50,7 +51,7 @@ export class Request extends KoaRequest {
|
|
|
50
51
|
declare response: Response;
|
|
51
52
|
}
|
|
52
53
|
|
|
53
|
-
export class Response extends KoaResponse
|
|
54
|
+
export class Response extends KoaResponse {
|
|
54
55
|
declare app: EggCore;
|
|
55
56
|
declare request: Request;
|
|
56
57
|
}
|
|
@@ -63,7 +64,7 @@ export class Context extends KoaContext {
|
|
|
63
64
|
}
|
|
64
65
|
|
|
65
66
|
// export @eggjs/core types
|
|
66
|
-
export type MiddlewareFunc<T
|
|
67
|
+
export type MiddlewareFunc<T = Context> = KoaMiddlewareFunc<T>;
|
|
67
68
|
|
|
68
69
|
export class EggCore extends KoaApplication {
|
|
69
70
|
options: EggCoreOptions;
|
|
@@ -247,8 +248,8 @@ export class EggCore extends KoaApplication {
|
|
|
247
248
|
* @member {Config}
|
|
248
249
|
* @since 1.0.0
|
|
249
250
|
*/
|
|
250
|
-
get config() {
|
|
251
|
-
return this.loader ? this.loader.config : {};
|
|
251
|
+
get config(): EggAppConfig {
|
|
252
|
+
return this.loader ? this.loader.config : {} as EggAppConfig;
|
|
252
253
|
}
|
|
253
254
|
|
|
254
255
|
/**
|
package/src/index.ts
CHANGED
package/src/loader/egg_loader.ts
CHANGED
|
@@ -10,7 +10,7 @@ import { extend } from 'extend2';
|
|
|
10
10
|
import { Request, Response, Application, Context as KoaContext } from '@eggjs/koa';
|
|
11
11
|
import { pathMatching, type PathMatchingOptions } from 'egg-path-matching';
|
|
12
12
|
import { now, diff } from 'performance-ms';
|
|
13
|
-
import { FULLPATH, FileLoader, FileLoaderOptions } from './file_loader.js';
|
|
13
|
+
import { CaseStyle, FULLPATH, FileLoader, FileLoaderOptions } from './file_loader.js';
|
|
14
14
|
import { ContextLoader, ContextLoaderOptions } from './context_loader.js';
|
|
15
15
|
import utils, { Fun } from '../utils/index.js';
|
|
16
16
|
import sequencify from '../utils/sequencify.js';
|
|
@@ -19,6 +19,7 @@ import type {
|
|
|
19
19
|
Context, EggCore, MiddlewareFunc,
|
|
20
20
|
} from '../egg.js';
|
|
21
21
|
import type { BaseContextClass } from '../base_context_class.js';
|
|
22
|
+
import type { EggAppConfig, EggAppInfo, EggPluginInfo } from '../types.js';
|
|
22
23
|
|
|
23
24
|
const debug = debuglog('@eggjs/core/loader/egg_loader');
|
|
24
25
|
|
|
@@ -29,44 +30,6 @@ const originalPrototypes: Record<string, any> = {
|
|
|
29
30
|
application: Application.prototype,
|
|
30
31
|
};
|
|
31
32
|
|
|
32
|
-
export interface EggAppInfo {
|
|
33
|
-
/** package.json */
|
|
34
|
-
pkg: Record<string, any>;
|
|
35
|
-
/** the application name from package.json */
|
|
36
|
-
name: string;
|
|
37
|
-
/** current directory of application */
|
|
38
|
-
baseDir: string;
|
|
39
|
-
/** equals to serverEnv */
|
|
40
|
-
env: string;
|
|
41
|
-
/** equals to serverScope */
|
|
42
|
-
scope: string;
|
|
43
|
-
/** home directory of the OS */
|
|
44
|
-
HOME: string;
|
|
45
|
-
/** baseDir when local and unittest, HOME when other environment */
|
|
46
|
-
root: string;
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
export interface EggPluginInfo {
|
|
50
|
-
/** the plugin name, it can be used in `dep` */
|
|
51
|
-
name: string;
|
|
52
|
-
/** the package name of plugin */
|
|
53
|
-
package?: string;
|
|
54
|
-
version?: string;
|
|
55
|
-
/** whether enabled */
|
|
56
|
-
enable: boolean;
|
|
57
|
-
implicitEnable?: boolean;
|
|
58
|
-
/** the directory of the plugin package */
|
|
59
|
-
path?: string;
|
|
60
|
-
/** the dependent plugins, you can use the plugin name */
|
|
61
|
-
dependencies: string[];
|
|
62
|
-
/** the optional dependent plugins. */
|
|
63
|
-
optionalDependencies: string[];
|
|
64
|
-
dependents?: string[];
|
|
65
|
-
/** specify the serverEnv that only enable the plugin in it */
|
|
66
|
-
env: string[];
|
|
67
|
-
/** the file plugin config in. */
|
|
68
|
-
from: string;
|
|
69
|
-
}
|
|
70
33
|
|
|
71
34
|
export interface EggLoaderOptions {
|
|
72
35
|
/** server env */
|
|
@@ -845,7 +808,7 @@ export class EggLoader {
|
|
|
845
808
|
|
|
846
809
|
/** start Config loader */
|
|
847
810
|
configMeta: Record<string, any>;
|
|
848
|
-
config:
|
|
811
|
+
config: EggAppConfig;
|
|
849
812
|
|
|
850
813
|
/**
|
|
851
814
|
* Load config/config.js
|
|
@@ -859,7 +822,10 @@ export class EggLoader {
|
|
|
859
822
|
this.timing.start('Load Config');
|
|
860
823
|
this.configMeta = {};
|
|
861
824
|
|
|
862
|
-
const target:
|
|
825
|
+
const target: EggAppConfig = {
|
|
826
|
+
middleware: [],
|
|
827
|
+
coreMiddleware: [],
|
|
828
|
+
};
|
|
863
829
|
|
|
864
830
|
// Load Application config first
|
|
865
831
|
const appConfig = await this.#preloadAppConfig();
|
|
@@ -1208,7 +1174,7 @@ export class EggLoader {
|
|
|
1208
1174
|
const servicePaths = this.getLoadUnits().map(unit => path.join(unit.path, 'app/service'));
|
|
1209
1175
|
options = {
|
|
1210
1176
|
call: true,
|
|
1211
|
-
caseStyle:
|
|
1177
|
+
caseStyle: CaseStyle.lower,
|
|
1212
1178
|
fieldClass: 'serviceClasses',
|
|
1213
1179
|
directory: servicePaths,
|
|
1214
1180
|
...options,
|
|
@@ -1248,7 +1214,7 @@ export class EggLoader {
|
|
|
1248
1214
|
opt = {
|
|
1249
1215
|
call: false,
|
|
1250
1216
|
override: true,
|
|
1251
|
-
caseStyle:
|
|
1217
|
+
caseStyle: CaseStyle.lower,
|
|
1252
1218
|
directory: middlewarePaths,
|
|
1253
1219
|
...opt,
|
|
1254
1220
|
};
|
|
@@ -1323,7 +1289,7 @@ export class EggLoader {
|
|
|
1323
1289
|
this.timing.start('Load Controller');
|
|
1324
1290
|
const controllerBase = path.join(this.options.baseDir, 'app/controller');
|
|
1325
1291
|
opt = {
|
|
1326
|
-
caseStyle:
|
|
1292
|
+
caseStyle: CaseStyle.lower,
|
|
1327
1293
|
directory: controllerBase,
|
|
1328
1294
|
initializer: (obj, opt) => {
|
|
1329
1295
|
// return class if it exports a function
|
|
@@ -1403,7 +1369,7 @@ export class EggLoader {
|
|
|
1403
1369
|
case 'ctx': {
|
|
1404
1370
|
assert(!(property in this.app.context), `customLoader should not override ctx.${property}`);
|
|
1405
1371
|
const options = {
|
|
1406
|
-
caseStyle:
|
|
1372
|
+
caseStyle: CaseStyle.lower,
|
|
1407
1373
|
fieldClass: `${property}Classes`,
|
|
1408
1374
|
...loaderConfig,
|
|
1409
1375
|
directory,
|
|
@@ -1414,7 +1380,7 @@ export class EggLoader {
|
|
|
1414
1380
|
case 'app': {
|
|
1415
1381
|
assert(!(property in this.app), `customLoader should not override app.${property}`);
|
|
1416
1382
|
const options = {
|
|
1417
|
-
caseStyle:
|
|
1383
|
+
caseStyle: CaseStyle.lower,
|
|
1418
1384
|
initializer: (Clazz: unknown) => {
|
|
1419
1385
|
return isClass(Clazz) ? new Clazz(this.app) : Clazz;
|
|
1420
1386
|
},
|
|
@@ -1533,10 +1499,11 @@ export class EggLoader {
|
|
|
1533
1499
|
* @param {Object} options - see {@link FileLoader}
|
|
1534
1500
|
* @since 1.0.0
|
|
1535
1501
|
*/
|
|
1536
|
-
async loadToApp(directory: string | string[], property: string | symbol,
|
|
1502
|
+
async loadToApp(directory: string | string[], property: string | symbol,
|
|
1503
|
+
options?: Omit<FileLoaderOptions, 'inject' | 'target'>) {
|
|
1537
1504
|
const target = {};
|
|
1538
1505
|
Reflect.set(this.app, property, target);
|
|
1539
|
-
|
|
1506
|
+
const loadOptions: FileLoaderOptions = {
|
|
1540
1507
|
...options,
|
|
1541
1508
|
directory: options?.directory ?? directory,
|
|
1542
1509
|
target,
|
|
@@ -1545,7 +1512,7 @@ export class EggLoader {
|
|
|
1545
1512
|
|
|
1546
1513
|
const timingKey = `Load "${String(property)}" to Application`;
|
|
1547
1514
|
this.timing.start(timingKey);
|
|
1548
|
-
await new FileLoader(
|
|
1515
|
+
await new FileLoader(loadOptions).load();
|
|
1549
1516
|
this.timing.end(timingKey);
|
|
1550
1517
|
}
|
|
1551
1518
|
|
|
@@ -1556,8 +1523,9 @@ export class EggLoader {
|
|
|
1556
1523
|
* @param {Object} options - see {@link ContextLoader}
|
|
1557
1524
|
* @since 1.0.0
|
|
1558
1525
|
*/
|
|
1559
|
-
async loadToContext(directory: string | string[], property: string | symbol,
|
|
1560
|
-
options
|
|
1526
|
+
async loadToContext(directory: string | string[], property: string | symbol,
|
|
1527
|
+
options?: Omit<ContextLoaderOptions, 'inject' | 'property'>) {
|
|
1528
|
+
const loadOptions: ContextLoaderOptions = {
|
|
1561
1529
|
...options,
|
|
1562
1530
|
directory: options?.directory || directory,
|
|
1563
1531
|
property,
|
|
@@ -1566,7 +1534,7 @@ export class EggLoader {
|
|
|
1566
1534
|
|
|
1567
1535
|
const timingKey = `Load "${String(property)}" to Context`;
|
|
1568
1536
|
this.timing.start(timingKey);
|
|
1569
|
-
await new ContextLoader(
|
|
1537
|
+
await new ContextLoader(loadOptions).load();
|
|
1570
1538
|
this.timing.end(timingKey);
|
|
1571
1539
|
}
|
|
1572
1540
|
|
|
@@ -11,7 +11,12 @@ const debug = debuglog('@eggjs/core/file_loader');
|
|
|
11
11
|
export const FULLPATH = Symbol('EGG_LOADER_ITEM_FULLPATH');
|
|
12
12
|
export const EXPORTS = Symbol('EGG_LOADER_ITEM_EXPORTS');
|
|
13
13
|
|
|
14
|
-
export
|
|
14
|
+
export enum CaseStyle {
|
|
15
|
+
camel = 'camel',
|
|
16
|
+
lower = 'lower',
|
|
17
|
+
upper = 'upper',
|
|
18
|
+
}
|
|
19
|
+
|
|
15
20
|
export type CaseStyleFunction = (filepath: string) => string[];
|
|
16
21
|
export type FileLoaderInitializer = (exports: unknown, options: { path: string; pathName: string }) => unknown;
|
|
17
22
|
export type FileLoaderFilter = (exports: unknown) => boolean;
|
|
@@ -79,7 +84,7 @@ export class FileLoader {
|
|
|
79
84
|
assert(options.directory, 'options.directory is required');
|
|
80
85
|
assert(options.target, 'options.target is required');
|
|
81
86
|
this.options = {
|
|
82
|
-
caseStyle:
|
|
87
|
+
caseStyle: CaseStyle.camel,
|
|
83
88
|
call: true,
|
|
84
89
|
override: false,
|
|
85
90
|
...options,
|
|
@@ -88,7 +93,7 @@ export class FileLoader {
|
|
|
88
93
|
// compatible old options _lowercaseFirst_
|
|
89
94
|
if (this.options.lowercaseFirst === true) {
|
|
90
95
|
utils.deprecated('lowercaseFirst is deprecated, use caseStyle instead');
|
|
91
|
-
this.options.caseStyle =
|
|
96
|
+
this.options.caseStyle = CaseStyle.lower;
|
|
92
97
|
}
|
|
93
98
|
}
|
|
94
99
|
|
package/src/types.ts
ADDED
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
export interface EggAppInfo {
|
|
2
|
+
/** package.json */
|
|
3
|
+
pkg: Record<string, any>;
|
|
4
|
+
/** the application name from package.json */
|
|
5
|
+
name: string;
|
|
6
|
+
/** current directory of application */
|
|
7
|
+
baseDir: string;
|
|
8
|
+
/** equals to serverEnv */
|
|
9
|
+
env: string;
|
|
10
|
+
/** equals to serverScope */
|
|
11
|
+
scope: string;
|
|
12
|
+
/** home directory of the OS */
|
|
13
|
+
HOME: string;
|
|
14
|
+
/** baseDir when local and unittest, HOME when other environment */
|
|
15
|
+
root: string;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export interface EggPluginInfo {
|
|
19
|
+
/** the plugin name, it can be used in `dep` */
|
|
20
|
+
name: string;
|
|
21
|
+
/** the package name of plugin */
|
|
22
|
+
package?: string;
|
|
23
|
+
version?: string;
|
|
24
|
+
/** whether enabled */
|
|
25
|
+
enable: boolean;
|
|
26
|
+
implicitEnable?: boolean;
|
|
27
|
+
/** the directory of the plugin package */
|
|
28
|
+
path?: string;
|
|
29
|
+
/** the dependent plugins, you can use the plugin name */
|
|
30
|
+
dependencies: string[];
|
|
31
|
+
/** the optional dependent plugins. */
|
|
32
|
+
optionalDependencies: string[];
|
|
33
|
+
dependents?: string[];
|
|
34
|
+
/** specify the serverEnv that only enable the plugin in it */
|
|
35
|
+
env: string[];
|
|
36
|
+
/** the file plugin config in. */
|
|
37
|
+
from: string;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
export interface CustomLoaderConfigItem {
|
|
41
|
+
/** the directory of the custom loader */
|
|
42
|
+
directory: string;
|
|
43
|
+
/** the inject object, it can be app or ctx */
|
|
44
|
+
inject: string;
|
|
45
|
+
/** whether load unit files */
|
|
46
|
+
loadunit?: boolean;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
export interface EggAppConfig extends Record<string, any> {
|
|
50
|
+
coreMiddleware: string[];
|
|
51
|
+
middleware: string[];
|
|
52
|
+
customLoader?: Record<string, CustomLoaderConfigItem>;
|
|
53
|
+
controller?: {
|
|
54
|
+
supportParams?: boolean;
|
|
55
|
+
};
|
|
56
|
+
}
|