koatty 3.4.10 → 3.5.5

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 (15) hide show
  1. package/.vscode/launch.json +3 -0
  2. package/CHANGELOG.md +3 -1
  3. package/README.md +3 -1
  4. package/dist/core/Bootstrap.js +4 -15
  5. package/dist/core/Bootstrap.js.map +1 -1
  6. package/dist/core/Loader.d.ts +19 -21
  7. package/dist/core/Loader.js +53 -109
  8. package/dist/core/Loader.js.map +1 -1
  9. package/dist/util/Helper.d.ts +1 -0
  10. package/dist/util/Helper.js +40 -2
  11. package/dist/util/Helper.js.map +1 -1
  12. package/jest_html_reporters.html +1 -1
  13. package/package.json +8 -6
  14. package/demo/static/test.css +0 -3
  15. package/demo/tsconfig.json +0 -66
package/.vscode/launch.json CHANGED
@@ -13,6 +13,9 @@
13
13
  "-r",
14
14
  "ts-node/register"
15
15
  ],
16
+ "env": {
17
+ "NODE_ENV": "development",
18
+ },
16
19
  "sourceMaps": true,
17
20
  "cwd": "${workspaceRoot}",
18
21
  "protocol": "inspector",
package/CHANGELOG.md CHANGED
@@ -2,7 +2,9 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
4
4
 
5
- ### [3.4.10](https://github.com/thinkkoa/koatty/compare/v3.4.8...v3.4.10) (2021-11-26)
5
+ ### [3.5.2](https://github.com/thinkkoa/koatty/compare/v3.4.12...v3.5.2) (2021-12-01)
6
+
7
+ ### [3.4.12](https://github.com/thinkkoa/koatty/compare/v3.4.8...v3.4.12) (2021-11-26)
6
8
 
7
9
  ### [3.4.8](https://github.com/thinkkoa/koatty/compare/v3.4.4...v3.4.8) (2021-11-25)
8
10
 
package/README.md CHANGED
@@ -6,11 +6,13 @@ Use Typescript's decorator implement IOC and AOP.
6
6
 
7
7
  [![Version npm](https://img.shields.io/npm/v/koatty.svg?style=flat-square)](https://www.npmjs.com/package/koatty)[![npm Downloads](https://img.shields.io/npm/dm/koatty.svg?style=flat-square)](https://npmcharts.com/compare/koatty?minimal=true)
8
8
 
9
- ## New
9
+ ## New features
10
10
 
11
11
  * HTTP、HTTPS、HTTP2 .
12
12
  * gRPC server.
13
13
  * WebSocket server. (unstable)
14
+
15
+
14
16
  ## Documentation
15
17
 
16
18
  [koatty_doc_CN](https://koatty.github.io/koatty_doc/) （In progress💪）
package/dist/core/Bootstrap.js CHANGED
@@ -49,23 +49,12 @@ const ExecBootstrap = async function (target, bootFunc) {
49
49
  koatty_container_1.IOCContainer.setApp(app);
50
50
  Helper_1.Helper.define(app, "container", koatty_container_1.IOCContainer);
51
51
  Logger_1.Logger.Custom('think', '', 'ComponentScan ...');
52
- // component metadata
53
- const componentMetas = Loader_1.Loader.GetComponentMetas(app, target);
54
- // configuration metadata
55
- const configurationMetas = Loader_1.Loader.GetConfigurationMetas(app, target);
56
- // load all bean
57
- const exSet = new Set();
58
- Loader_1.Loader.LoadDirectory(componentMetas, '', (fileName, target, xpath) => {
59
- if (target[fileName] && Helper_1.Helper.isClass(target[fileName])) {
60
- if (exSet.has(fileName)) {
61
- throw new Error(`A same name class already exists. Please modify the \`${xpath}\`'s class name and file name.`);
62
- }
63
- exSet.add(fileName);
64
- }
65
- }, [...configurationMetas, `!${target.name || '.no'}.ts`]);
66
- exSet.clear();
52
+ // Check all bean
53
+ Loader_1.Loader.CheckAllComponents(app, target);
67
54
  // Load configuration
68
55
  Logger_1.Logger.Custom('think', '', 'Load Configurations ...');
56
+ // configuration metadata
57
+ const configurationMetas = Loader_1.Loader.GetConfigurationMetas(app, target);
69
58
  Loader_1.Loader.LoadConfigs(app, configurationMetas);
70
59
  // Load Plugin
71
60
  Logger_1.Logger.Custom('think', '', 'Load Plugins ...');
package/dist/core/Bootstrap.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Bootstrap.js","sourceRoot":"","sources":["../../src/core/Bootstrap.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Bootstrap.js","sourceRoot":"","sources":["../../src/core/Bootstrap.ts"],"names":[],"mappings":"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"}
package/dist/core/Loader.d.ts CHANGED
@@ -21,6 +21,15 @@ export declare class Loader {
21
21
  * @memberof Loader
22
22
  */
23
23
  static GetComponentMetas(app: Koatty, target: any): any[];
24
+ /**
25
+ * Load all bean, excepted config/*、App.ts
26
+ *
27
+ * @static
28
+ * @param {Koatty} app
29
+ * @param {*} target
30
+ * @memberof Loader
31
+ */
32
+ static CheckAllComponents(app: Koatty, target: any): void;
24
33
  /**
25
34
  * Get configuration metadata
26
35
  *
@@ -32,30 +41,31 @@ export declare class Loader {
32
41
  */
33
42
  static GetConfigurationMetas(app: Koatty, target: any): any[];
34
43
  /**
35
- * Load app ready hook funcs
44
+ * Set Logger level
36
45
  *
37
46
  * @static
38
47
  * @param {Koatty} app
39
- * @param {*} target
40
48
  * @memberof Loader
41
49
  */
42
- static LoadAppReadyHooks(app: Koatty, target: any): void;
50
+ static SetLogger(app: Koatty): void;
43
51
  /**
44
- * Load configuration
52
+ * Load app ready hook funcs
45
53
  *
46
54
  * @static
47
- * @param {*} app
55
+ * @param {Koatty} app
56
+ * @param {*} target
48
57
  * @memberof Loader
49
58
  */
50
- static LoadConfigs(app: Koatty, loadPath?: string | string[]): void;
59
+ static LoadAppReadyHooks(app: Koatty, target: any): void;
51
60
  /**
52
- * Set Logger level
61
+ * Load configuration
53
62
  *
54
63
  * @static
55
64
  * @param {Koatty} app
65
+ * @param {string[]} [loadPath]
56
66
  * @memberof Loader
57
67
  */
58
- static SetLogger(app: Koatty): void;
68
+ static LoadConfigs(app: Koatty, loadPath?: string[]): void;
59
69
  /**
60
70
  * Load middlewares
61
71
  * [async]
@@ -64,7 +74,7 @@ export declare class Loader {
64
74
  * @param {(string | string[])} [loadPath]
65
75
  * @memberof Loader
66
76
  */
67
- static LoadMiddlewares(app: Koatty, loadPath?: string | string[]): Promise<void>;
77
+ static LoadMiddlewares(app: Koatty, loadPath?: string[]): Promise<void>;
68
78
  /**
69
79
  * Load controllers
70
80
  *
@@ -97,16 +107,4 @@ export declare class Loader {
97
107
  * @memberof Loader
98
108
  */
99
109
  static LoadPlugins(app: Koatty): Promise<void>;
100
- /**
101
- *
102
- *
103
- * @static
104
- * @param {(string | string[])} loadDir
105
- * @param {string} [baseDir]
106
- * @param {Function} [fn]
107
- * @param {(string | string[])} [pattern]
108
- * @param {(string | string[])} [ignore]
109
- * @memberof Loader
110
- */
111
- static LoadDirectory(loadDir: string | string[], baseDir?: string, fn?: Function, pattern?: string | string[], ignore?: string | string[]): void;
112
110
  }
package/dist/core/Loader.js CHANGED
@@ -8,8 +8,9 @@ const tslib_1 = require("tslib");
8
8
  * @ license: BSD (3-Clause)
9
9
  * @ version: 2020-07-06 11:18:01
10
10
  */
11
- const globby = (0, tslib_1.__importStar)(require("globby"));
12
11
  const path = (0, tslib_1.__importStar)(require("path"));
12
+ const koatty_loader_1 = require("koatty_loader");
13
+ const koatty_config_1 = require("koatty_config");
13
14
  const Logger_1 = require("../util/Logger");
14
15
  const koatty_exception_1 = require("koatty_exception");
15
16
  const BaseService_1 = require("../service/BaseService");
@@ -48,7 +49,7 @@ class Loader {
48
49
  // app.env
49
50
  app.env = process.env.KOATTY_ENV || process.env.NODE_ENV;
50
51
  if ((env.indexOf('--production') > -1) || (((_b = app.env) !== null && _b !== void 0 ? _b : '').indexOf('pro') > -1)) {
51
- app.appDebug = true;
52
+ app.appDebug = false;
52
53
  }
53
54
  if (app.appDebug) {
54
55
  app.env = 'development';
@@ -104,6 +105,25 @@ class Loader {
104
105
  }
105
106
  return componentMetas;
106
107
  }
108
+ /**
109
+ * Load all bean, excepted config/*、App.ts
110
+ *
111
+ * @static
112
+ * @param {Koatty} app
113
+ * @param {*} target
114
+ * @memberof Loader
115
+ */
116
+ static CheckAllComponents(app, target) {
117
+ // component metadata
118
+ const componentMetas = Loader.GetComponentMetas(app, target);
119
+ // configuration metadata
120
+ const configurationMetas = Loader.GetConfigurationMetas(app, target);
121
+ const exSet = new Set();
122
+ (0, koatty_loader_1.Load)(componentMetas, '', (fileName, xpath, xTarget) => {
123
+ (0, Helper_1.checkClass)(fileName, xpath, xTarget, exSet);
124
+ }, ['**/**.js', '**/**.ts', '!**/**.d.ts'], [...configurationMetas, `${target.name || '.no'}.ts`]);
125
+ exSet.clear();
126
+ }
107
127
  /**
108
128
  * Get configuration metadata
109
129
  *
@@ -126,6 +146,27 @@ class Loader {
126
146
  }
127
147
  return configurationMetas;
128
148
  }
149
+ /**
150
+ * Set Logger level
151
+ *
152
+ * @static
153
+ * @param {Koatty} app
154
+ * @memberof Loader
155
+ */
156
+ static SetLogger(app) {
157
+ var _a;
158
+ const configs = (_a = app.getMetaData("_configs")) !== null && _a !== void 0 ? _a : {};
159
+ //Logger
160
+ if (configs.config) {
161
+ (0, Logger_1.SetLogger)({
162
+ logLevel: configs.config.logs_level,
163
+ logConsole: configs.config.logs_console,
164
+ logFile: configs.config.logs_write,
165
+ logFileLevel: configs.config.logs_write_level,
166
+ logFilePath: configs.config.logs_path || app.rootPath + "/logs"
167
+ });
168
+ }
169
+ }
129
170
  /**
130
171
  * Load app ready hook funcs
131
172
  *
@@ -147,68 +188,22 @@ class Loader {
147
188
  * Load configuration
148
189
  *
149
190
  * @static
150
- * @param {*} app
191
+ * @param {Koatty} app
192
+ * @param {string[]} [loadPath]
151
193
  * @memberof Loader
152
194
  */
153
195
  static LoadConfigs(app, loadPath) {
154
- const config = {};
196
+ const frameConfig = {};
155
197
  // Logger.Debug(`Load configuration path: ${app.thinkPath}/config`);
156
- Loader.LoadDirectory("./config", app.thinkPath, function (name, exp) {
157
- config[name] = exp;
198
+ (0, koatty_loader_1.Load)(["./config"], app.thinkPath, function (name, path, exp) {
199
+ frameConfig[name] = exp;
158
200
  });
159
- const appConfig = {};
160
201
  if (Helper_1.Helper.isArray(loadPath)) {
161
- loadPath = loadPath.length > 0 ? loadPath : "";
162
- }
163
- const tempConfig = {};
164
- // Logger.Debug(`Load configuration path: ${app.appPath}${loadPath || "/config"}`);
165
- Loader.LoadDirectory(loadPath || "./config", app.appPath, function (name, exp) {
166
- var _a;
167
- // tslint:disable-next-line: one-variable-per-declaration
168
- let type = "", t = "";
169
- if (name.indexOf("_") > -1) {
170
- t = name.slice(name.lastIndexOf("_") + 1);
171
- if (t && ((_a = app.env) !== null && _a !== void 0 ? _a : "").indexOf(t) === 0) {
172
- type = t;
173
- }
174
- }
175
- if (type) {
176
- tempConfig[`${name.replace(`_${t}`, "")}^${type}`] = exp;
177
- }
178
- else {
179
- appConfig[name] = exp;
180
- }
181
- });
182
- // load env configuration
183
- // tslint:disable-next-line: forin
184
- for (const n in tempConfig) {
185
- const na = n.split("^")[0];
186
- if (appConfig[na]) {
187
- appConfig[na] = Helper_1.Helper.extend(appConfig[na], tempConfig[n], true);
188
- }
189
- }
190
- app.setMetaData("_configs", Helper_1.Helper.extend(config, appConfig, true));
191
- }
192
- /**
193
- * Set Logger level
194
- *
195
- * @static
196
- * @param {Koatty} app
197
- * @memberof Loader
198
- */
199
- static SetLogger(app) {
200
- var _a;
201
- const configs = (_a = app.getMetaData("_configs")) !== null && _a !== void 0 ? _a : {};
202
- //Logger
203
- if (configs.config) {
204
- (0, Logger_1.SetLogger)({
205
- logLevel: configs.config.logs_level,
206
- logConsole: configs.config.logs_console,
207
- logFile: configs.config.logs_write,
208
- logFileLevel: configs.config.logs_write_level,
209
- logFilePath: configs.config.logs_path || app.rootPath + "/logs"
210
- });
202
+ loadPath = loadPath.length > 0 ? loadPath : ["./config"];
211
203
  }
204
+ let appConfig = (0, koatty_config_1.LoadConfigs)(loadPath, app.appPath);
205
+ appConfig = Helper_1.Helper.extend(frameConfig, appConfig, true);
206
+ app.setMetaData("_configs", appConfig);
212
207
  }
213
208
  /**
214
209
  * Load middlewares
@@ -225,7 +220,7 @@ class Loader {
225
220
  middlewareConf = { config: {}, list: [] };
226
221
  }
227
222
  //Mount default middleware
228
- Loader.LoadDirectory(loadPath || "./middleware", app.thinkPath);
223
+ (0, koatty_loader_1.Load)(loadPath || ["./middleware"], app.thinkPath);
229
224
  //Mount application middleware
230
225
  // const middleware: any = {};
231
226
  const appMiddleware = (_a = app.container.listClass("MIDDLEWARE")) !== null && _a !== void 0 ? _a : [];
@@ -390,57 +385,6 @@ class Loader {
390
385
  await handle.run((_a = pluginsConf.config[key]) !== null && _a !== void 0 ? _a : {}, app);
391
386
  }
392
387
  }
393
- /**
394
- *
395
- *
396
- * @static
397
- * @param {(string | string[])} loadDir
398
- * @param {string} [baseDir]
399
- * @param {Function} [fn]
400
- * @param {(string | string[])} [pattern]
401
- * @param {(string | string[])} [ignore]
402
- * @memberof Loader
403
- */
404
- static LoadDirectory(loadDir, baseDir, fn, pattern, ignore) {
405
- baseDir = baseDir || process.cwd();
406
- const loadDirs = [].concat(loadDir !== null && loadDir !== void 0 ? loadDir : []);
407
- for (let dir of loadDirs) {
408
- dir = buildLoadDir(baseDir, dir);
409
- const fileResults = globby.sync(['**/**.js', '**/**.ts', '!**/**.d.ts'].concat(pattern !== null && pattern !== void 0 ? pattern : []), {
410
- cwd: dir,
411
- ignore: [
412
- '**/node_modules/**',
413
- '**/logs/**',
414
- '**/static/**'
415
- ].concat(ignore !== null && ignore !== void 0 ? ignore : [])
416
- });
417
- for (let name of fileResults) {
418
- const file = path.join(dir, name);
419
- if (name.indexOf('/') > -1) {
420
- name = name.slice(name.lastIndexOf('/') + 1);
421
- }
422
- // let namePattern = '.ts';
423
- // if (name.slice(-3) === '.js') {
424
- // namePattern = '.js';
425
- // }
426
- // const fileName = name.slice(0, name.lastIndexOf(namePattern));
427
- const fileName = name.slice(0, -3);
428
- //
429
- const exports = (0, Helper_1.requireDefault)(file);
430
- const tkeys = Object.keys(exports);
431
- if (!exports[fileName] && (tkeys[0] && Helper_1.Helper.isClass(exports[tkeys[0]]) && tkeys[0] !== fileName)) {
432
- throw new Error(`The class name is not consistent with the file('${file}') name. Or you used 'export default'?`);
433
- // continue;
434
- }
435
- // callback
436
- if (fn) {
437
- // console.log(fileName);
438
- // console.log(exports);
439
- fn(fileName, exports, file);
440
- }
441
- }
442
- }
443
- }
444
388
  }
445
389
  exports.Loader = Loader;
446
390
  //# sourceMappingURL=Loader.js.map
package/dist/core/Loader.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Loader.js","sourceRoot":"","sources":["../../src/core/Loader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Loader.js","sourceRoot":"","sources":["../../src/core/Loader.ts"],"names":[],"mappings":"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"}
package/dist/util/Helper.d.ts CHANGED
@@ -22,3 +22,4 @@ export declare function getParamNames(func: {
22
22
  * @return {void} []
23
23
  */
24
24
  export declare function checkRuntime(): void;
25
+ export declare function checkClass(fileName: string, xpath: string, target: any, exSet?: Set<unknown>): void;
package/dist/util/Helper.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.checkRuntime = exports.getParamNames = exports.ControllerMatch = exports.requireDefault = exports.Helper = void 0;
3
+ exports.checkClass = exports.checkRuntime = exports.getParamNames = exports.ControllerMatch = exports.requireDefault = exports.Helper = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  /**
6
6
  * @ author: richen
@@ -63,7 +63,7 @@ exports.getParamNames = getParamNames;
63
63
  * @return {void} []
64
64
  */
65
65
  function checkRuntime() {
66
- let nodeEngines = pkg.engines.node.slice(1) || '10.0.0';
66
+ let nodeEngines = pkg.engines.node.slice(1) || '12.0.0';
67
67
  nodeEngines = nodeEngines.slice(0, nodeEngines.lastIndexOf('.'));
68
68
  let nodeVersion = process.version;
69
69
  if (nodeVersion[0] === 'v') {
@@ -76,4 +76,42 @@ function checkRuntime() {
76
76
  }
77
77
  }
78
78
  exports.checkRuntime = checkRuntime;
79
+ /**
80
+ * Check class file
81
+ * name should be always the same as class name
82
+ * class must be unique
83
+ *
84
+ * @export
85
+ * @param {string} fileName
86
+ * @param {string} xpath
87
+ * @param {*} target
88
+ * @param {Set<unknown>} [exSet]
89
+ * @returns {*}
90
+ */
91
+ const exSet = new Set();
92
+ function checkClass(fileName, xpath, target, exSet) {
93
+ if (Helper.isClass(target) && target.name != fileName) { // export default class name{}
94
+ throw Error(`The file(${xpath}) name should be always the same as class name.`);
95
+ }
96
+ if (target["__esModule"]) {
97
+ if (target.name === undefined) { // export class name{}
98
+ const keys = Object.keys(target);
99
+ if (keys[0] != fileName && Helper.isClass(target[keys[0]])) {
100
+ throw Error(`The file(${xpath}) name should be always the same as class name.`);
101
+ }
102
+ }
103
+ else if (target.name != fileName) { // export default class {}
104
+ throw Error(`The file(${xpath}) name should be always the same as class name.`);
105
+ }
106
+ }
107
+ if (!exSet) {
108
+ return;
109
+ }
110
+ if (exSet.has(fileName)) {
111
+ throw new Error(`A same class already exists. at \`${xpath}\`.`);
112
+ }
113
+ exSet.add(fileName);
114
+ return;
115
+ }
116
+ exports.checkClass = checkClass;
79
117
  //# sourceMappingURL=Helper.js.map
package/dist/util/Helper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Helper.js","sourceRoot":"","sources":["../../src/util/Helper.ts"],"names":[],"mappings":";;;;AAAA;;;;;GAKG;AACH,gEAAqC;AACrC,qCAAkC;AAClC,MAAM,cAAc,GAAG,kCAAkC,CAAC;AAC1D,MAAM,cAAc,GAAG,YAAY,CAAC;AACpC,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAC1C,gBAAgB;AAChB,kEAAqC;AAErC;;;;;;GAMG;AACH,SAAgB,cAAc,CAAC,CAAS;IACpC,mCAAmC;IACnC,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACtB,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,QAAQ,CAAC,IAAI,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;AACjF,CAAC;AAJD,wCAIC;AAED;;;;;;;GAOG;AACH,IAAI,aAAa,GAAQ,IAAI,CAAC;AAC9B,SAAgB,eAAe,CAAC,IAAY,EAAE,gBAAgB,GAAG,EAAE;IAC/D,IAAI,CAAC,aAAa,EAAE;QAChB,aAAa,GAAG,IAAI,MAAM,CAAC,kBAAkB,gBAAgB,EAAE,CAAC,CAAC;KACpE;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACvD,OAAO,MAAM,CAAC;AAClB,CAAC;AAPD,0CAOC;AAGD;;;GAGG;AACH,SAAgB,aAAa,CAAC,IAA0E;IACpG,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IAC1D,IAAI,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC3F,IAAI,MAAM,KAAK,IAAI,EAAE;QACjB,MAAM,GAAG,EAAE,CAAC;KACf;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAPD,sCAOC;AAED;;;GAGG;AACH,SAAgB,YAAY;IACxB,IAAI,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;IACxD,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IACjE,IAAI,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAClC,IAAI,WAAW,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;QACxB,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACtC;IACD,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IAEjE,IAAI,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QAC7D,eAAM,CAAC,KAAK,CAAC,8BAA8B,WAAW,wBAAwB,WAAW,sBAAsB,CAAC,CAAC;QACjH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;KACpB;AACL,CAAC;AAbD,oCAaC"}
1
+ {"version":3,"file":"Helper.js","sourceRoot":"","sources":["../../src/util/Helper.ts"],"names":[],"mappings":"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"}
package/jest_html_reporters.html CHANGED
@@ -1,5 +1,5 @@
1
1
  <!doctype html><html><head><meta charset="utf-8"><meta http-equiv="Content-Type" content="text/html;charset=utf-8"><meta name="keywords" contect="jest, reporters"><meta name="author" contect="hazyzh"><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0,minimum-scale=1,maximum-scale=1"><link rel="shortcut icon" href="data:image/png;base64,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"></head><title>Report</title><body><div id="app"></div><textarea style="display: none;" id="resData">
2
- "{\"numFailedTestSuites\":0,\"numFailedTests\":0,\"numPassedTestSuites\":0,\"numPassedTests\":0,\"numPendingTestSuites\":0,\"numPendingTests\":0,\"numRuntimeErrorTestSuites\":0,\"numTodoTests\":0,\"numTotalTestSuites\":0,\"numTotalTests\":0,\"openHandles\":[],\"snapshot\":{\"added\":0,\"didUpdate\":false,\"failure\":false,\"filesAdded\":0,\"filesRemoved\":0,\"filesRemovedList\":[],\"filesUnmatched\":0,\"filesUpdated\":0,\"matched\":0,\"total\":0,\"unchecked\":0,\"uncheckedKeysByFile\":[],\"unmatched\":0,\"updated\":0},\"startTime\":1637914226111,\"success\":false,\"testResults\":[],\"wasInterrupted\":false,\"coverageMap\":{},\"config\":{\"bail\":0,\"changedFilesWithAncestor\":false,\"collectCoverage\":true,\"collectCoverageFrom\":[],\"coverageDirectory\":\"/Users/richen/Workspace/nodejs/koatty/coverage\",\"coverageProvider\":\"babel\",\"coverageReporters\":[\"html\",\"lcov\",\"json\",\"text\",\"clover\",\"text-summary\"],\"detectLeaks\":false,\"detectOpenHandles\":false,\"errorOnDeprecated\":false,\"expand\":false,\"findRelatedTests\":false,\"forceExit\":false,\"json\":false,\"lastCommit\":false,\"listTests\":false,\"logHeapUsage\":false,\"maxConcurrency\":5,\"maxWorkers\":7,\"noStackTrace\":false,\"nonFlagArgs\":[],\"notify\":false,\"notifyMode\":\"failure-change\",\"onlyChanged\":false,\"onlyFailures\":false,\"passWithNoTests\":true,\"projects\":[],\"reporters\":[[\"default\",{}],[\"/Users/richen/Workspace/nodejs/koatty/node_modules/jest-html-reporters/index.js\",{}]],\"rootDir\":\"/Users/richen/Workspace/nodejs/koatty\",\"runTestsByPath\":false,\"skipFilter\":false,\"testFailureExitCode\":1,\"testPathPattern\":\"\",\"testSequencer\":\"/Users/richen/Workspace/nodejs/koatty/node_modules/@jest/test-sequencer/build/index.js\",\"updateSnapshot\":\"new\",\"useStderr\":false,\"watch\":false,\"watchAll\":false,\"watchman\":true},\"endTime\":1637914226150,\"_reporterOptions\":{\"publicPath\":\"/Users/richen/Workspace/nodejs/koatty\",\"filename\":\"jest_html_reporters.html\",\"expand\":false,\"pageTitle\":\"\",\"hideIcon\":false,\"testCommand\":\"npx jest\",\"openReport\":false,\"multipleReportsUnitePath\":\"\",\"failureMessageOnly\":false,\"enableMergeData\":false,\"dataMergeLevel\":1},\"attachInfos\":{}}"
2
+ "{\"numFailedTestSuites\":0,\"numFailedTests\":0,\"numPassedTestSuites\":0,\"numPassedTests\":0,\"numPendingTestSuites\":0,\"numPendingTests\":0,\"numRuntimeErrorTestSuites\":0,\"numTodoTests\":0,\"numTotalTestSuites\":0,\"numTotalTests\":0,\"openHandles\":[],\"snapshot\":{\"added\":0,\"didUpdate\":false,\"failure\":false,\"filesAdded\":0,\"filesRemoved\":0,\"filesRemovedList\":[],\"filesUnmatched\":0,\"filesUpdated\":0,\"matched\":0,\"total\":0,\"unchecked\":0,\"uncheckedKeysByFile\":[],\"unmatched\":0,\"updated\":0},\"startTime\":1638367300191,\"success\":false,\"testResults\":[],\"wasInterrupted\":false,\"coverageMap\":{},\"config\":{\"bail\":0,\"changedFilesWithAncestor\":false,\"collectCoverage\":true,\"collectCoverageFrom\":[],\"coverageDirectory\":\"/Users/richen/Workspace/nodejs/koatty/coverage\",\"coverageProvider\":\"babel\",\"coverageReporters\":[\"html\",\"lcov\",\"json\",\"text\",\"clover\",\"text-summary\"],\"detectLeaks\":false,\"detectOpenHandles\":false,\"errorOnDeprecated\":false,\"expand\":false,\"findRelatedTests\":false,\"forceExit\":false,\"json\":false,\"lastCommit\":false,\"listTests\":false,\"logHeapUsage\":false,\"maxConcurrency\":5,\"maxWorkers\":7,\"noStackTrace\":false,\"nonFlagArgs\":[],\"notify\":false,\"notifyMode\":\"failure-change\",\"onlyChanged\":false,\"onlyFailures\":false,\"passWithNoTests\":true,\"projects\":[],\"reporters\":[[\"default\",{}],[\"/Users/richen/Workspace/nodejs/koatty/node_modules/jest-html-reporters/index.js\",{}]],\"rootDir\":\"/Users/richen/Workspace/nodejs/koatty\",\"runTestsByPath\":false,\"skipFilter\":false,\"testFailureExitCode\":1,\"testPathPattern\":\"\",\"testSequencer\":\"/Users/richen/Workspace/nodejs/koatty/node_modules/@jest/test-sequencer/build/index.js\",\"updateSnapshot\":\"new\",\"useStderr\":false,\"watch\":false,\"watchAll\":false,\"watchman\":true},\"endTime\":1638367300252,\"_reporterOptions\":{\"publicPath\":\"/Users/richen/Workspace/nodejs/koatty\",\"filename\":\"jest_html_reporters.html\",\"expand\":false,\"pageTitle\":\"\",\"hideIcon\":false,\"testCommand\":\"npx jest\",\"openReport\":false,\"multipleReportsUnitePath\":\"\",\"failureMessageOnly\":false,\"enableMergeData\":false,\"dataMergeLevel\":1},\"attachInfos\":{}}"
3
3
  </textarea><script>/*! Copyright Harry All rights reserved. */!function(n){var r={};function o(t){if(r[t])return r[t].exports;var e=r[t]={i:t,l:!1,exports:{}};return n[t].call(e.exports,e,e.exports,o),e.l=!0,e.exports}o.m=n,o.c=r,o.d=function(t,e,n){o.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},o.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},o.t=function(e,t){if(1&t&&(e=o(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(o.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)o.d(n,r,function(t){return e[t]}.bind(null,r));return n},o.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return o.d(e,"a",e),e},o.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},o.p="",o(o.s=1103)}([function(t,e,n){"use strict";t.exports=n(447)},function(t,e,n){t.exports=n(905)()},function(t,e,n){var r;
4
4
  /*!
5
5
  Copyright (c) 2017 Jed Watson.
package/package.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "name": "koatty",
3
- "version": "3.4.10",
3
+ "version": "3.5.5",
4
4
  "description": "Koa2 + Typescript = koatty. Use Typescript's decorator implement auto injection.",
5
5
  "scripts": {
6
6
  "build": "del-cli --force dist && tsc",
7
7
  "eslint": "eslint --ext .ts,.js ./",
8
8
  "prepublishOnly": "npm test && npm run build",
9
9
  "release": "npm run prepublishOnly && standard-version",
10
- "pub": "git push --follow-tags origin && npm publish",
10
+ "pub": "git push --follow-tags origin && npm publish",
11
11
  "test": "npm run eslint && jest --passWithNoTests",
12
12
  "test:cov": "jest --collectCoverage --detectOpenHandles",
13
13
  "version": "conventional-changelog -p angular -i CHANGELOG.md -s"
@@ -29,7 +29,7 @@
29
29
  "thinkkoa"
30
30
  ],
31
31
  "engines": {
32
- "node": ">10.0.0"
32
+ "node": ">12.0.0"
33
33
  },
34
34
  "author": {
35
35
  "name": "richenlin",
@@ -76,15 +76,17 @@
76
76
  "dependencies": {
77
77
  "globby": "^11.0.4",
78
78
  "koa": "^2.13.4",
79
+ "koatty_config": "^1.0.4",
79
80
  "koatty_container": "^1.6.8",
80
81
  "koatty_core": "^1.3.38",
81
82
  "koatty_exception": "^1.0.6",
82
83
  "koatty_lib": "^1.2.6",
83
- "koatty_logger": "^1.2.6",
84
+ "koatty_loader": "^1.0.2",
85
+ "koatty_logger": "^1.2.8",
84
86
  "koatty_payload": "^1.3.10",
85
87
  "koatty_router": "^1.5.12",
86
88
  "koatty_serve": "^1.3.10",
87
- "koatty_trace": "^1.4.24",
89
+ "koatty_trace": "^1.4.26",
88
90
  "reflect-metadata": "^0.1.13",
89
91
  "tslib": "^2.3.1",
90
92
  "uuid": "^8.3.2"
@@ -94,4 +96,4 @@
94
96
  "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
95
97
  }
96
98
  }
97
- }
99
+ }
package/demo/static/test.css DELETED
@@ -1,3 +0,0 @@
1
- .css {
2
- color: #000;
3
- }
package/demo/tsconfig.json DELETED
@@ -1,66 +0,0 @@
1
- {
2
- "compilerOptions": {
3
- /* Basic Options */
4
- "target": "es2018" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'. */,
5
- "module": "commonjs" /* Specify module code generation: 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
6
- "lib": [
7
- "es2019"
8
- ]
9
- /* Specify library files to be included in the compilation: */ ,
10
- // "allowJs": true /* Allow javascript files to be compiled. */,
11
- // "checkJs": true, /* Report errors in .js files. */
12
- // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
13
- "declaration": true /* Generates corresponding '.d.ts' file. */,
14
- "sourceMap": true /* Generates corresponding '.map' file. */,
15
- // "outFile": "./", /* Concatenate and emit output to single file. */
16
- "outDir": "./dist/" /* Redirect output structure to the directory. */,
17
- // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
18
- "removeComments": true /* Do not emit comments to output. */,
19
- // "noEmit": true /* Do not emit outputs. */,
20
- "importHelpers": true /* Import emit helpers from 'tslib'. */,
21
- "downlevelIteration": true /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */,
22
- // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
23
- /* Strict Type-Checking Options */
24
- "stripInternal": true /* Enable all strict type-checking options. */,
25
- "noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */,
26
- // "strictNullChecks": true, /* Enable strict null checks. */
27
- "noImplicitThis": false /* Raise error on 'this' expressions with an implied 'any' type. */,
28
- // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
29
- "pretty": true, /* pretty source file. */
30
- /* Additional Checks */
31
- // "noUnusedLocals": true, /* Report errors on unused locals. */
32
- // "noUnusedParameters": true, /* Report errors on unused parameters. */
33
- // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
34
- // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
35
- /* Module Resolution Options */
36
- "moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
37
- // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
38
- // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
39
- // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
40
- "typeRoots": [
41
- "node_modules/@types"
42
- // "./typings/*"
43
- ] /* List of folders to include type definitions from. */,
44
- "types": [
45
- "node"
46
- ] /* Type declaration files to be included in compilation. */,
47
- "allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */,
48
- "resolveJsonModule": true,
49
- "esModuleInterop": true,
50
- /* Source Map Options */
51
- // "sourceRoot": "./", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
52
- // "mapRoot": "./", /* Specify the location where debugger should locate map files instead of generated locations. */
53
- // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
54
- // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
55
- /* Experimental Options */
56
- "experimentalDecorators": true /* Enables experimental support for ES7 decorators. */,
57
- "emitDecoratorMetadata": true /* Enables experimental support for emitting type metadata for decorators. */
58
- },
59
- "exclude": [
60
- "node_modules"
61
- ],
62
- "include": [
63
- "src",
64
- "src/**/*.json"
65
- ]
66
- }