@eggjs/core 6.2.5 → 6.2.7
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.js +1 -1
- package/dist/commonjs/loader/egg_loader.js +8 -8
- package/dist/commonjs/loader/file_loader.js +9 -2
- package/dist/commonjs/utils/index.js +5 -5
- package/dist/commonjs/utils/sequencify.js +1 -1
- package/dist/commonjs/utils/timing.js +1 -1
- package/dist/esm/egg.js +1 -1
- package/dist/esm/loader/egg_loader.js +8 -8
- package/dist/esm/loader/file_loader.js +9 -2
- package/dist/esm/utils/index.js +5 -5
- package/dist/esm/utils/sequencify.js +1 -1
- package/dist/esm/utils/timing.js +1 -1
- package/dist/package.json +1 -1
- package/package.json +4 -2
- package/src/egg.ts +1 -1
- package/src/loader/egg_loader.ts +8 -8
- package/src/loader/file_loader.ts +8 -1
- package/src/utils/index.ts +4 -4
- package/src/utils/sequencify.ts +1 -1
- package/src/utils/timing.ts +1 -1
package/dist/commonjs/egg.js
CHANGED
|
@@ -20,7 +20,7 @@ const timing_js_1 = require("./utils/timing.js");
|
|
|
20
20
|
const lifecycle_js_1 = require("./lifecycle.js");
|
|
21
21
|
const egg_loader_js_1 = require("./loader/egg_loader.js");
|
|
22
22
|
const index_js_1 = __importDefault(require("./utils/index.js"));
|
|
23
|
-
const debug = (0, node_util_1.debuglog)('@eggjs/core
|
|
23
|
+
const debug = (0, node_util_1.debuglog)('@eggjs/core/egg');
|
|
24
24
|
exports.EGG_LOADER = Symbol.for('egg#loader');
|
|
25
25
|
// export @eggjs/core classes
|
|
26
26
|
class Request extends koa_1.Request {
|
|
@@ -69,7 +69,7 @@ class EggLoader {
|
|
|
69
69
|
require('tsconfig-paths').register({ cwd: this.options.baseDir });
|
|
70
70
|
}
|
|
71
71
|
else {
|
|
72
|
-
this.logger.info('[@eggjs/core
|
|
72
|
+
this.logger.info('[@eggjs/core/egg_loader] skip register "tsconfig-paths" because tsconfig.json not exists at %s', tsConfigFile);
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
/**
|
|
@@ -520,13 +520,13 @@ class EggLoader {
|
|
|
520
520
|
}
|
|
521
521
|
const logger = this.options.logger;
|
|
522
522
|
if (!config) {
|
|
523
|
-
logger.warn(`[@eggjs/core
|
|
523
|
+
logger.warn(`[@eggjs/core/egg_loader] pkg.eggPlugin is missing in ${pluginPackage}`);
|
|
524
524
|
return;
|
|
525
525
|
}
|
|
526
526
|
if (config.name && config.strict !== false && config.name !== plugin.name) {
|
|
527
527
|
// pluginName is configured in config/plugin.js
|
|
528
528
|
// pluginConfigName is pkg.eggPlugin.name
|
|
529
|
-
logger.warn(`[@eggjs/core
|
|
529
|
+
logger.warn(`[@eggjs/core/egg_loader] pluginName(${plugin.name}) is different from pluginConfigName(${config.name})`);
|
|
530
530
|
}
|
|
531
531
|
// dep compatible
|
|
532
532
|
depCompatible(config);
|
|
@@ -1006,7 +1006,7 @@ class EggLoader {
|
|
|
1006
1006
|
debug('[loadBootHook] add bootHookFunction from %o', bootFilePath);
|
|
1007
1007
|
}
|
|
1008
1008
|
else {
|
|
1009
|
-
this.options.logger.warn('[@eggjs/core
|
|
1009
|
+
this.options.logger.warn('[@eggjs/core/egg_loader] %s must exports a boot class', bootFilePath);
|
|
1010
1010
|
}
|
|
1011
1011
|
}
|
|
1012
1012
|
// init boots
|
|
@@ -1111,13 +1111,13 @@ class EggLoader {
|
|
|
1111
1111
|
}
|
|
1112
1112
|
app.use(mw);
|
|
1113
1113
|
debug('[loadMiddleware] Use middleware: %s with options: %j', name, options);
|
|
1114
|
-
this.options.logger.info('[@eggjs/core
|
|
1114
|
+
this.options.logger.info('[@eggjs/core/egg_loader] Use middleware: %s', name);
|
|
1115
1115
|
}
|
|
1116
1116
|
else {
|
|
1117
|
-
this.options.logger.info('[@eggjs/core
|
|
1117
|
+
this.options.logger.info('[@eggjs/core/egg_loader] Disable middleware: %s', name);
|
|
1118
1118
|
}
|
|
1119
1119
|
}
|
|
1120
|
-
this.options.logger.info('[@eggjs/core
|
|
1120
|
+
this.options.logger.info('[@eggjs/core/egg_loader] Loaded middleware from %j', middlewarePaths);
|
|
1121
1121
|
this.timing.end('Load Middleware');
|
|
1122
1122
|
// add router middleware, make sure router is the last middleware
|
|
1123
1123
|
const mw = this.app.router.middleware();
|
|
@@ -1173,7 +1173,7 @@ class EggLoader {
|
|
|
1173
1173
|
};
|
|
1174
1174
|
await this.loadToApp(controllerBase, 'controller', opt);
|
|
1175
1175
|
debug('[loadController] app.controller => %o', this.app.controller);
|
|
1176
|
-
this.options.logger.info('[@eggjs/core
|
|
1176
|
+
this.options.logger.info('[@eggjs/core/egg_loader] Controller loaded: %s', controllerBase);
|
|
1177
1177
|
this.timing.end('Load Controller');
|
|
1178
1178
|
}
|
|
1179
1179
|
/** end Controller loader */
|
|
@@ -11,7 +11,7 @@ const node_path_1 = __importDefault(require("node:path"));
|
|
|
11
11
|
const globby_1 = __importDefault(require("globby"));
|
|
12
12
|
const is_type_of_1 = require("is-type-of");
|
|
13
13
|
const index_js_1 = __importDefault(require("../utils/index.js"));
|
|
14
|
-
const debug = (0, node_util_1.debuglog)('@eggjs/core
|
|
14
|
+
const debug = (0, node_util_1.debuglog)('@eggjs/core/file_loader');
|
|
15
15
|
exports.FULLPATH = Symbol('EGG_LOADER_ITEM_FULLPATH');
|
|
16
16
|
exports.EXPORTS = Symbol('EGG_LOADER_ITEM_EXPORTS');
|
|
17
17
|
/**
|
|
@@ -148,6 +148,13 @@ class FileLoader {
|
|
|
148
148
|
const fullpath = node_path_1.default.join(directory, filepath);
|
|
149
149
|
if (!node_fs_1.default.statSync(fullpath).isFile())
|
|
150
150
|
continue;
|
|
151
|
+
if (filepath.endsWith('.js')) {
|
|
152
|
+
const filepathTs = filepath.replace(/\.js$/, '.ts');
|
|
153
|
+
if (filepaths.includes(filepathTs)) {
|
|
154
|
+
debug('[parse] ignore %s, because %s exists', fullpath, filepathTs);
|
|
155
|
+
continue;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
151
158
|
// get properties
|
|
152
159
|
// app/service/foo/bar.js => [ 'foo', 'bar' ]
|
|
153
160
|
const properties = getProperties(filepath, this.options.caseStyle);
|
|
@@ -245,4 +252,4 @@ function defaultCamelize(filepath, caseStyle) {
|
|
|
245
252
|
return first + property.substring(1);
|
|
246
253
|
});
|
|
247
254
|
}
|
|
248
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
255
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"file_loader.js","sourceRoot":"","sources":["../../../src/loader/file_loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const node_fs_1 = __importDefault(require("node:fs"));
|
|
|
9
9
|
const promises_1 = require("node:fs/promises");
|
|
10
10
|
const node_module_1 = __importDefault(require("node:module"));
|
|
11
11
|
const utils_1 = require("@eggjs/utils");
|
|
12
|
-
const debug = (0, node_util_1.debuglog)('@eggjs/core
|
|
12
|
+
const debug = (0, node_util_1.debuglog)('@eggjs/core/utils');
|
|
13
13
|
// Guard against poorly mocked module constructors.
|
|
14
14
|
const Module = typeof module !== 'undefined' && module.constructor.length > 1
|
|
15
15
|
? module.constructor
|
|
@@ -51,11 +51,11 @@ function getCalleeFromStack(withLine, stackIndex) {
|
|
|
51
51
|
exports.default = {
|
|
52
52
|
deprecated(message) {
|
|
53
53
|
if (debug.enabled) {
|
|
54
|
-
console.trace('[@eggjs/core
|
|
54
|
+
console.trace('[@eggjs/core/deprecated] %s', message);
|
|
55
55
|
}
|
|
56
56
|
else {
|
|
57
|
-
console.
|
|
58
|
-
console.
|
|
57
|
+
console.log('[@eggjs/core/deprecated] %s', message);
|
|
58
|
+
console.log('[@eggjs/core/deprecated] set NODE_DEBUG=@eggjs/core/utils can show call stack');
|
|
59
59
|
}
|
|
60
60
|
},
|
|
61
61
|
extensions,
|
|
@@ -109,4 +109,4 @@ exports.default = {
|
|
|
109
109
|
function prepareObjectStackTrace(_obj, stack) {
|
|
110
110
|
return stack;
|
|
111
111
|
}
|
|
112
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSx5Q0FBcUM7QUFDckMsMERBQTZCO0FBQzdCLHNEQUF5QjtBQUN6QiwrQ0FBd0M7QUFDeEMsOERBQXdDO0FBQ3hDLHdDQUEyRDtBQUUzRCxNQUFNLEtBQUssR0FBRyxJQUFBLG9CQUFRLEVBQUMsbUJBQW1CLENBQUMsQ0FBQztBQUk1QyxtREFBbUQ7QUFDbkQsTUFBTSxNQUFNLEdBQUcsT0FBTyxNQUFNLEtBQUssV0FBVyxJQUFJLE1BQU0sQ0FBQyxXQUFXLENBQUMsTUFBTSxHQUFHLENBQUM7SUFDM0UsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxXQUFXO0lBQ3BCLDBCQUEwQjtJQUMxQixDQUFDLENBQUMscUJBQWEsQ0FBQztBQUVsQixNQUFNLFVBQVUsR0FBSSxNQUFjLENBQUMsV0FBVyxDQUFDO0FBQy9DLE1BQU0sY0FBYyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBRSxDQUFDLENBQUM7QUFDMUUsS0FBSyxDQUFDLHVCQUF1QixFQUFFLGNBQWMsQ0FBQyxDQUFDO0FBRS9DLFNBQVMsa0JBQWtCLENBQUMsUUFBa0IsRUFBRSxVQUFtQjtJQUNqRSxVQUFVLEdBQUcsVUFBVSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUM7SUFDdkQsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLGVBQWUsQ0FBQztJQUNwQyxNQUFNLElBQUksR0FBRyxLQUFLLENBQUMsaUJBQWlCLENBQUM7SUFFckMsS0FBSyxDQUFDLGlCQUFpQixHQUFHLHVCQUF1QixDQUFDO0lBQ2xELEtBQUssQ0FBQyxlQUFlLEdBQUcsQ0FBQyxDQUFDO0lBRTFCLG9CQUFvQjtJQUNwQixNQUFNLEdB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
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.default = sequencify;
|
|
4
4
|
const node_util_1 = require("node:util");
|
|
5
|
-
const debug = (0, node_util_1.debuglog)('@eggjs/core
|
|
5
|
+
const debug = (0, node_util_1.debuglog)('@eggjs/core/utils/sequencify');
|
|
6
6
|
function sequence(tasks, names, result, missing, recursive, nest, optional, parent) {
|
|
7
7
|
names.forEach(function (name) {
|
|
8
8
|
if (result.requires[name])
|
|
@@ -7,7 +7,7 @@ exports.Timing = void 0;
|
|
|
7
7
|
const node_os_1 = require("node:os");
|
|
8
8
|
const node_util_1 = require("node:util");
|
|
9
9
|
const node_assert_1 = __importDefault(require("node:assert"));
|
|
10
|
-
const debug = (0, node_util_1.debuglog)('@eggjs/core
|
|
10
|
+
const debug = (0, node_util_1.debuglog)('@eggjs/core/utils/timing');
|
|
11
11
|
class Timing {
|
|
12
12
|
#enable;
|
|
13
13
|
#startTime;
|
package/dist/esm/egg.js
CHANGED
|
@@ -9,7 +9,7 @@ import { Timing } from './utils/timing.js';
|
|
|
9
9
|
import { Lifecycle } from './lifecycle.js';
|
|
10
10
|
import { EggLoader } from './loader/egg_loader.js';
|
|
11
11
|
import utils from './utils/index.js';
|
|
12
|
-
const debug = debuglog('@eggjs/core
|
|
12
|
+
const debug = debuglog('@eggjs/core/egg');
|
|
13
13
|
export const EGG_LOADER = Symbol.for('egg#loader');
|
|
14
14
|
// export @eggjs/koa classes
|
|
15
15
|
export { KoaRequest, KoaResponse, KoaContext, KoaApplication, Router, };
|
|
@@ -63,7 +63,7 @@ export class EggLoader {
|
|
|
63
63
|
require('tsconfig-paths').register({ cwd: this.options.baseDir });
|
|
64
64
|
}
|
|
65
65
|
else {
|
|
66
|
-
this.logger.info('[@eggjs/core
|
|
66
|
+
this.logger.info('[@eggjs/core/egg_loader] skip register "tsconfig-paths" because tsconfig.json not exists at %s', tsConfigFile);
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
69
|
/**
|
|
@@ -514,13 +514,13 @@ export class EggLoader {
|
|
|
514
514
|
}
|
|
515
515
|
const logger = this.options.logger;
|
|
516
516
|
if (!config) {
|
|
517
|
-
logger.warn(`[@eggjs/core
|
|
517
|
+
logger.warn(`[@eggjs/core/egg_loader] pkg.eggPlugin is missing in ${pluginPackage}`);
|
|
518
518
|
return;
|
|
519
519
|
}
|
|
520
520
|
if (config.name && config.strict !== false && config.name !== plugin.name) {
|
|
521
521
|
// pluginName is configured in config/plugin.js
|
|
522
522
|
// pluginConfigName is pkg.eggPlugin.name
|
|
523
|
-
logger.warn(`[@eggjs/core
|
|
523
|
+
logger.warn(`[@eggjs/core/egg_loader] pluginName(${plugin.name}) is different from pluginConfigName(${config.name})`);
|
|
524
524
|
}
|
|
525
525
|
// dep compatible
|
|
526
526
|
depCompatible(config);
|
|
@@ -1000,7 +1000,7 @@ export class EggLoader {
|
|
|
1000
1000
|
debug('[loadBootHook] add bootHookFunction from %o', bootFilePath);
|
|
1001
1001
|
}
|
|
1002
1002
|
else {
|
|
1003
|
-
this.options.logger.warn('[@eggjs/core
|
|
1003
|
+
this.options.logger.warn('[@eggjs/core/egg_loader] %s must exports a boot class', bootFilePath);
|
|
1004
1004
|
}
|
|
1005
1005
|
}
|
|
1006
1006
|
// init boots
|
|
@@ -1105,13 +1105,13 @@ export class EggLoader {
|
|
|
1105
1105
|
}
|
|
1106
1106
|
app.use(mw);
|
|
1107
1107
|
debug('[loadMiddleware] Use middleware: %s with options: %j', name, options);
|
|
1108
|
-
this.options.logger.info('[@eggjs/core
|
|
1108
|
+
this.options.logger.info('[@eggjs/core/egg_loader] Use middleware: %s', name);
|
|
1109
1109
|
}
|
|
1110
1110
|
else {
|
|
1111
|
-
this.options.logger.info('[@eggjs/core
|
|
1111
|
+
this.options.logger.info('[@eggjs/core/egg_loader] Disable middleware: %s', name);
|
|
1112
1112
|
}
|
|
1113
1113
|
}
|
|
1114
|
-
this.options.logger.info('[@eggjs/core
|
|
1114
|
+
this.options.logger.info('[@eggjs/core/egg_loader] Loaded middleware from %j', middlewarePaths);
|
|
1115
1115
|
this.timing.end('Load Middleware');
|
|
1116
1116
|
// add router middleware, make sure router is the last middleware
|
|
1117
1117
|
const mw = this.app.router.middleware();
|
|
@@ -1167,7 +1167,7 @@ export class EggLoader {
|
|
|
1167
1167
|
};
|
|
1168
1168
|
await this.loadToApp(controllerBase, 'controller', opt);
|
|
1169
1169
|
debug('[loadController] app.controller => %o', this.app.controller);
|
|
1170
|
-
this.options.logger.info('[@eggjs/core
|
|
1170
|
+
this.options.logger.info('[@eggjs/core/egg_loader] Controller loaded: %s', controllerBase);
|
|
1171
1171
|
this.timing.end('Load Controller');
|
|
1172
1172
|
}
|
|
1173
1173
|
/** end Controller loader */
|
|
@@ -5,7 +5,7 @@ import path from 'node:path';
|
|
|
5
5
|
import globby from 'globby';
|
|
6
6
|
import { isClass, isGeneratorFunction, isAsyncFunction, isPrimitive } from 'is-type-of';
|
|
7
7
|
import utils from '../utils/index.js';
|
|
8
|
-
const debug = debuglog('@eggjs/core
|
|
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
11
|
/**
|
|
@@ -142,6 +142,13 @@ export class FileLoader {
|
|
|
142
142
|
const fullpath = path.join(directory, filepath);
|
|
143
143
|
if (!fs.statSync(fullpath).isFile())
|
|
144
144
|
continue;
|
|
145
|
+
if (filepath.endsWith('.js')) {
|
|
146
|
+
const filepathTs = filepath.replace(/\.js$/, '.ts');
|
|
147
|
+
if (filepaths.includes(filepathTs)) {
|
|
148
|
+
debug('[parse] ignore %s, because %s exists', fullpath, filepathTs);
|
|
149
|
+
continue;
|
|
150
|
+
}
|
|
151
|
+
}
|
|
145
152
|
// get properties
|
|
146
153
|
// app/service/foo/bar.js => [ 'foo', 'bar' ]
|
|
147
154
|
const properties = getProperties(filepath, this.options.caseStyle);
|
|
@@ -238,4 +245,4 @@ function defaultCamelize(filepath, caseStyle) {
|
|
|
238
245
|
return first + property.substring(1);
|
|
239
246
|
});
|
|
240
247
|
}
|
|
241
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
248
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"file_loader.js","sourceRoot":"","sources":["../../../src/loader/file_loader.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/utils/index.js
CHANGED
|
@@ -4,7 +4,7 @@ import fs from 'node:fs';
|
|
|
4
4
|
import { stat } from 'node:fs/promises';
|
|
5
5
|
import BuiltinModule from 'node:module';
|
|
6
6
|
import { importResolve, importModule } from '@eggjs/utils';
|
|
7
|
-
const debug = debuglog('@eggjs/core
|
|
7
|
+
const debug = debuglog('@eggjs/core/utils');
|
|
8
8
|
// Guard against poorly mocked module constructors.
|
|
9
9
|
const Module = typeof module !== 'undefined' && module.constructor.length > 1
|
|
10
10
|
? module.constructor
|
|
@@ -46,11 +46,11 @@ function getCalleeFromStack(withLine, stackIndex) {
|
|
|
46
46
|
export default {
|
|
47
47
|
deprecated(message) {
|
|
48
48
|
if (debug.enabled) {
|
|
49
|
-
console.trace('[@eggjs/core
|
|
49
|
+
console.trace('[@eggjs/core/deprecated] %s', message);
|
|
50
50
|
}
|
|
51
51
|
else {
|
|
52
|
-
console.
|
|
53
|
-
console.
|
|
52
|
+
console.log('[@eggjs/core/deprecated] %s', message);
|
|
53
|
+
console.log('[@eggjs/core/deprecated] set NODE_DEBUG=@eggjs/core/utils can show call stack');
|
|
54
54
|
}
|
|
55
55
|
},
|
|
56
56
|
extensions,
|
|
@@ -104,4 +104,4 @@ export default {
|
|
|
104
104
|
function prepareObjectStackTrace(_obj, stack) {
|
|
105
105
|
return stack;
|
|
106
106
|
}
|
|
107
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
107
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNyQyxPQUFPLElBQUksTUFBTSxXQUFXLENBQUM7QUFDN0IsT0FBTyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQ3pCLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUN4QyxPQUFPLGFBQWEsTUFBTSxhQUFhLENBQUM7QUFDeEMsT0FBTyxFQUFFLGFBQWEsRUFBRSxZQUFZLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFM0QsTUFBTSxLQUFLLEdBQUcsUUFBUSxDQUFDLG1CQUFtQixDQUFDLENBQUM7QUFJNUMsbURBQW1EO0FBQ25ELE1BQU0sTUFBTSxHQUFHLE9BQU8sTUFBTSxLQUFLLFdBQVcsSUFBSSxNQUFNLENBQUMsV0FBVyxDQUFDLE1BQU0sR0FBRyxDQUFDO0lBQzNFLENBQUMsQ0FBQyxNQUFNLENBQUMsV0FBVztJQUNwQiwwQkFBMEI7SUFDMUIsQ0FBQyxDQUFDLGFBQWEsQ0FBQztBQUVsQixNQUFNLFVBQVUsR0FBSSxNQUFjLENBQUMsV0FBVyxDQUFDO0FBQy9DLE1BQU0sY0FBYyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBRSxDQUFDLENBQUM7QUFDMUUsS0FBSyxDQUFDLHVCQUF1QixFQUFFLGNBQWMsQ0FBQyxDQUFDO0FBRS9DLFNBQVMsa0JBQWtCLENBQUMsUUFBa0IsRUFBRSxVQUFtQjtJQUNqRSxVQUFVLEdBQUcsVUFBVSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUM7SUFDdkQsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLGVBQWUsQ0FBQztJQUNwQyxN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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { debuglog } from 'node:util';
|
|
2
|
-
const debug = debuglog('@eggjs/core
|
|
2
|
+
const debug = debuglog('@eggjs/core/utils/sequencify');
|
|
3
3
|
function sequence(tasks, names, result, missing, recursive, nest, optional, parent) {
|
|
4
4
|
names.forEach(function (name) {
|
|
5
5
|
if (result.requires[name])
|
package/dist/esm/utils/timing.js
CHANGED
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.7",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -15,10 +15,12 @@
|
|
|
15
15
|
"clean": "rimraf dist",
|
|
16
16
|
"lint": "eslint src test --ext ts",
|
|
17
17
|
"pretest": "npm run clean && npm run lint -- --fix && npm run prepublishOnly",
|
|
18
|
-
"test": "
|
|
18
|
+
"test": "egg-bin test",
|
|
19
|
+
"posttest": "npm run clean",
|
|
19
20
|
"test-local": "egg-bin test",
|
|
20
21
|
"preci": "npm run clean && npm run lint && npm run prepublishOnly",
|
|
21
22
|
"ci": "egg-bin cov",
|
|
23
|
+
"postci": "npm run clean",
|
|
22
24
|
"prepublishOnly": "tshy && tshy-after && attw --pack"
|
|
23
25
|
},
|
|
24
26
|
"repository": {
|
package/src/egg.ts
CHANGED
|
@@ -20,7 +20,7 @@ import { Lifecycle } from './lifecycle.js';
|
|
|
20
20
|
import { EggLoader } from './loader/egg_loader.js';
|
|
21
21
|
import utils from './utils/index.js';
|
|
22
22
|
|
|
23
|
-
const debug = debuglog('@eggjs/core
|
|
23
|
+
const debug = debuglog('@eggjs/core/egg');
|
|
24
24
|
|
|
25
25
|
export const EGG_LOADER = Symbol.for('egg#loader');
|
|
26
26
|
|
package/src/loader/egg_loader.ts
CHANGED
|
@@ -135,7 +135,7 @@ export class EggLoader {
|
|
|
135
135
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
136
136
|
require('tsconfig-paths').register({ cwd: this.options.baseDir });
|
|
137
137
|
} else {
|
|
138
|
-
this.logger.info('[@eggjs/core
|
|
138
|
+
this.logger.info('[@eggjs/core/egg_loader] skip register "tsconfig-paths" because tsconfig.json not exists at %s',
|
|
139
139
|
tsConfigFile);
|
|
140
140
|
}
|
|
141
141
|
}
|
|
@@ -639,14 +639,14 @@ export class EggLoader {
|
|
|
639
639
|
|
|
640
640
|
const logger = this.options.logger;
|
|
641
641
|
if (!config) {
|
|
642
|
-
logger.warn(`[@eggjs/core
|
|
642
|
+
logger.warn(`[@eggjs/core/egg_loader] pkg.eggPlugin is missing in ${pluginPackage}`);
|
|
643
643
|
return;
|
|
644
644
|
}
|
|
645
645
|
|
|
646
646
|
if (config.name && config.strict !== false && config.name !== plugin.name) {
|
|
647
647
|
// pluginName is configured in config/plugin.js
|
|
648
648
|
// pluginConfigName is pkg.eggPlugin.name
|
|
649
|
-
logger.warn(`[@eggjs/core
|
|
649
|
+
logger.warn(`[@eggjs/core/egg_loader] pluginName(${plugin.name}) is different from pluginConfigName(${config.name})`);
|
|
650
650
|
}
|
|
651
651
|
|
|
652
652
|
// dep compatible
|
|
@@ -1184,7 +1184,7 @@ export class EggLoader {
|
|
|
1184
1184
|
this.lifecycle.addFunctionAsBootHook(bootHook, bootFilePath);
|
|
1185
1185
|
debug('[loadBootHook] add bootHookFunction from %o', bootFilePath);
|
|
1186
1186
|
} else {
|
|
1187
|
-
this.options.logger.warn('[@eggjs/core
|
|
1187
|
+
this.options.logger.warn('[@eggjs/core/egg_loader] %s must exports a boot class', bootFilePath);
|
|
1188
1188
|
}
|
|
1189
1189
|
}
|
|
1190
1190
|
// init boots
|
|
@@ -1295,13 +1295,13 @@ export class EggLoader {
|
|
|
1295
1295
|
}
|
|
1296
1296
|
app.use(mw);
|
|
1297
1297
|
debug('[loadMiddleware] Use middleware: %s with options: %j', name, options);
|
|
1298
|
-
this.options.logger.info('[@eggjs/core
|
|
1298
|
+
this.options.logger.info('[@eggjs/core/egg_loader] Use middleware: %s', name);
|
|
1299
1299
|
} else {
|
|
1300
|
-
this.options.logger.info('[@eggjs/core
|
|
1300
|
+
this.options.logger.info('[@eggjs/core/egg_loader] Disable middleware: %s', name);
|
|
1301
1301
|
}
|
|
1302
1302
|
}
|
|
1303
1303
|
|
|
1304
|
-
this.options.logger.info('[@eggjs/core
|
|
1304
|
+
this.options.logger.info('[@eggjs/core/egg_loader] Loaded middleware from %j', middlewarePaths);
|
|
1305
1305
|
this.timing.end('Load Middleware');
|
|
1306
1306
|
|
|
1307
1307
|
// add router middleware, make sure router is the last middleware
|
|
@@ -1359,7 +1359,7 @@ export class EggLoader {
|
|
|
1359
1359
|
};
|
|
1360
1360
|
await this.loadToApp(controllerBase, 'controller', opt as FileLoaderOptions);
|
|
1361
1361
|
debug('[loadController] app.controller => %o', this.app.controller);
|
|
1362
|
-
this.options.logger.info('[@eggjs/core
|
|
1362
|
+
this.options.logger.info('[@eggjs/core/egg_loader] Controller loaded: %s', controllerBase);
|
|
1363
1363
|
this.timing.end('Load Controller');
|
|
1364
1364
|
}
|
|
1365
1365
|
/** end Controller loader */
|
|
@@ -6,7 +6,7 @@ import globby from 'globby';
|
|
|
6
6
|
import { isClass, isGeneratorFunction, isAsyncFunction, isPrimitive } from 'is-type-of';
|
|
7
7
|
import utils, { Fun } from '../utils/index.js';
|
|
8
8
|
|
|
9
|
-
const debug = debuglog('@eggjs/core
|
|
9
|
+
const debug = debuglog('@eggjs/core/file_loader');
|
|
10
10
|
|
|
11
11
|
export const FULLPATH = Symbol('EGG_LOADER_ITEM_FULLPATH');
|
|
12
12
|
export const EXPORTS = Symbol('EGG_LOADER_ITEM_EXPORTS');
|
|
@@ -185,6 +185,13 @@ export class FileLoader {
|
|
|
185
185
|
for (const filepath of filepaths) {
|
|
186
186
|
const fullpath = path.join(directory, filepath);
|
|
187
187
|
if (!fs.statSync(fullpath).isFile()) continue;
|
|
188
|
+
if (filepath.endsWith('.js')) {
|
|
189
|
+
const filepathTs = filepath.replace(/\.js$/, '.ts');
|
|
190
|
+
if (filepaths.includes(filepathTs)) {
|
|
191
|
+
debug('[parse] ignore %s, because %s exists', fullpath, filepathTs);
|
|
192
|
+
continue;
|
|
193
|
+
}
|
|
194
|
+
}
|
|
188
195
|
// get properties
|
|
189
196
|
// app/service/foo/bar.js => [ 'foo', 'bar' ]
|
|
190
197
|
const properties = getProperties(filepath, this.options.caseStyle);
|
package/src/utils/index.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { stat } from 'node:fs/promises';
|
|
|
5
5
|
import BuiltinModule from 'node:module';
|
|
6
6
|
import { importResolve, importModule } from '@eggjs/utils';
|
|
7
7
|
|
|
8
|
-
const debug = debuglog('@eggjs/core
|
|
8
|
+
const debug = debuglog('@eggjs/core/utils');
|
|
9
9
|
|
|
10
10
|
export type Fun = (...args: any[]) => any;
|
|
11
11
|
|
|
@@ -55,10 +55,10 @@ function getCalleeFromStack(withLine?: boolean, stackIndex?: number) {
|
|
|
55
55
|
export default {
|
|
56
56
|
deprecated(message: string) {
|
|
57
57
|
if (debug.enabled) {
|
|
58
|
-
console.trace('[@eggjs/core
|
|
58
|
+
console.trace('[@eggjs/core/deprecated] %s', message);
|
|
59
59
|
} else {
|
|
60
|
-
console.
|
|
61
|
-
console.
|
|
60
|
+
console.log('[@eggjs/core/deprecated] %s', message);
|
|
61
|
+
console.log('[@eggjs/core/deprecated] set NODE_DEBUG=@eggjs/core/utils can show call stack');
|
|
62
62
|
}
|
|
63
63
|
},
|
|
64
64
|
|
package/src/utils/sequencify.ts
CHANGED
package/src/utils/timing.ts
CHANGED