koatty 3.3.7 → 3.4.6

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 (58) hide show
  1. package/.eslintrc.js +2 -1
  2. package/.vscode/settings.json +3 -0
  3. package/CHANGELOG.md +6 -0
  4. package/LICENSE +1 -1
  5. package/README.md +5 -0
  6. package/babel.config.js +0 -5
  7. package/demo/static/test.css +3 -0
  8. package/demo/tsconfig.json +66 -0
  9. package/dist/config/config.d.ts +1 -1
  10. package/dist/config/config.js +1 -1
  11. package/dist/config/config.js.map +1 -1
  12. package/dist/config/middleware.d.ts +4 -6
  13. package/dist/config/middleware.js +7 -16
  14. package/dist/config/middleware.js.map +1 -1
  15. package/dist/config/router.js +20 -16
  16. package/dist/config/router.js.map +1 -1
  17. package/dist/controller/BaseController.d.ts +0 -97
  18. package/dist/controller/BaseController.js +2 -146
  19. package/dist/controller/BaseController.js.map +1 -1
  20. package/dist/controller/HttpController.d.ts +131 -0
  21. package/dist/controller/HttpController.js +215 -0
  22. package/dist/controller/HttpController.js.map +1 -0
  23. package/dist/core/Bootstrap.d.ts +19 -0
  24. package/dist/core/Bootstrap.js +66 -17
  25. package/dist/core/Bootstrap.js.map +1 -1
  26. package/dist/core/Component.d.ts +2 -11
  27. package/dist/core/Component.js.map +1 -1
  28. package/dist/core/Loader.d.ts +13 -36
  29. package/dist/core/Loader.js +50 -80
  30. package/dist/core/Loader.js.map +1 -1
  31. package/dist/index.d.ts +3 -2
  32. package/dist/index.js +12 -12
  33. package/dist/index.js.map +1 -1
  34. package/dist/middleware/PayloadMiddleware.js +3 -3
  35. package/dist/middleware/PayloadMiddleware.js.map +1 -1
  36. package/dist/middleware/TraceMiddleware.d.ts +11 -0
  37. package/dist/middleware/TraceMiddleware.js +22 -0
  38. package/dist/middleware/TraceMiddleware.js.map +1 -0
  39. package/dist/service/BaseService.js +1 -2
  40. package/dist/service/BaseService.js.map +1 -1
  41. package/dist/util/Helper.js +2 -2
  42. package/dist/util/Helper.js.map +1 -1
  43. package/dist/util/Logger.d.ts +21 -1
  44. package/dist/util/Logger.js +32 -3
  45. package/dist/util/Logger.js.map +1 -1
  46. package/jest.config.js +19 -1
  47. package/jest_html_reporters.html +1 -1
  48. package/package.json +30 -25
  49. package/tsconfig.json +1 -1
  50. package/dist/controller/RestController.d.ts +0 -56
  51. package/dist/controller/RestController.js +0 -202
  52. package/dist/controller/RestController.js.map +0 -1
  53. package/dist/core/Router.d.ts +0 -15
  54. package/dist/core/Router.js +0 -19
  55. package/dist/core/Router.js.map +0 -1
  56. package/dist/core/Serve.d.ts +0 -8
  57. package/dist/core/Serve.js +0 -62
  58. package/dist/core/Serve.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"Helper.js","sourceRoot":"","sources":["../../src/util/Helper.ts"],"names":[],"mappings":";;;;AAAA;;;;;GAKG;AACH,2DAAqC;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,6DAAqC;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":";;;;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"}
@@ -4,4 +4,24 @@
4
4
  * @ license: BSD (3-Clause)
5
5
  * @ version: 2020-05-10 11:49:15
6
6
  */
7
- export { DefaultLogger as Logger } from "koatty_logger";
7
+ import { LogLevelType } from "koatty_logger";
8
+ export declare const Logger: import("koatty_logger").Logger;
9
+ /**
10
+ * SetLogger
11
+ *
12
+ * @export
13
+ * @param {{
14
+ * logLevel?: LogLevelType;
15
+ * logConsole?: boolean;
16
+ * logFile?: boolean;
17
+ * logFileLevel?: LogLevelType;
18
+ * logFilePath?: string;
19
+ * }} config
20
+ */
21
+ export declare function SetLogger(config: {
22
+ logLevel?: LogLevelType;
23
+ logConsole?: boolean;
24
+ logFile?: boolean;
25
+ logFileLevel?: LogLevelType;
26
+ logFilePath?: string;
27
+ }): void;
@@ -6,7 +6,36 @@
6
6
  * @ version: 2020-05-10 11:49:15
7
7
  */
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.Logger = void 0;
10
- var koatty_logger_1 = require("koatty_logger");
11
- Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return koatty_logger_1.DefaultLogger; } });
9
+ exports.SetLogger = exports.Logger = void 0;
10
+ const koatty_logger_1 = require("koatty_logger");
11
+ // Logger
12
+ exports.Logger = koatty_logger_1.DefaultLogger;
13
+ /**
14
+ * SetLogger
15
+ *
16
+ * @export
17
+ * @param {{
18
+ * logLevel?: LogLevelType;
19
+ * logConsole?: boolean;
20
+ * logFile?: boolean;
21
+ * logFileLevel?: LogLevelType;
22
+ * logFilePath?: string;
23
+ * }} config
24
+ */
25
+ function SetLogger(config) {
26
+ if (config.logLevel !== undefined) {
27
+ exports.Logger.setLevel(config.logLevel);
28
+ }
29
+ if (config.logConsole !== undefined) {
30
+ exports.Logger.setLogConsole(config.logConsole);
31
+ }
32
+ if (config.logFile !== undefined) {
33
+ koatty_logger_1.DefaultLogger.setLogFile(config.logFile);
34
+ exports.Logger.setLogFilePath(config.logFilePath);
35
+ }
36
+ if (config.logFileLevel !== undefined) {
37
+ exports.Logger.setLogFileLevel(config.logFileLevel);
38
+ }
39
+ }
40
+ exports.SetLogger = SetLogger;
12
41
  //# sourceMappingURL=Logger.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/util/Logger.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+CAAwD;AAA/C,uGAAA,aAAa,OAAU"}
1
+ {"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/util/Logger.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iDAA4D;AAE5D,SAAS;AACI,QAAA,MAAM,GAAG,6BAAa,CAAC;AACpC;;;;;;;;;;;GAWG;AACH,SAAgB,SAAS,CAAC,MAMzB;IACG,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE;QAC/B,cAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;KACpC;IACD,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,EAAE;QACjC,cAAM,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;KAC3C;IACD,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE;QAC9B,6BAAa,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACzC,cAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;KAC7C;IACD,IAAI,MAAM,CAAC,YAAY,KAAK,SAAS,EAAE;QACnC,cAAM,CAAC,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;KAC/C;AACL,CAAC;AApBD,8BAoBC"}
package/jest.config.js CHANGED
@@ -14,5 +14,23 @@ module.exports = {
14
14
  'jest-html-reporters'
15
15
  ], // 测试用例报告
16
16
  collectCoverage: true, // 是否收集测试时的覆盖率信息
17
- coverageReporters: ['html', 'lcov', 'json', 'text', 'clover', 'text-summary'], // 收集测试时的覆盖率信息
17
+ coverageReporters: [
18
+ 'html',
19
+ 'lcov',
20
+ 'json',
21
+ 'text',
22
+ 'clover',
23
+ 'text-summary',
24
+ ], // 收集测试时的覆盖率信息
25
+ // 将 `ts-jest` 的配置注入到运行时的全局变量中
26
+ globals: {
27
+ 'ts-jest': {
28
+ // 是否使用 babel 配置来转译
29
+ babelConfig: true,
30
+ // 编译 Typescript 所依赖的配置
31
+ tsconfig: '<rootDir>/tsconfig.json',
32
+ // 是否启用报告诊断,这里是不启用
33
+ diagnostics: false,
34
+ },
35
+ }
18
36
  };
@@ -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\":1626925021982,\"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\":1626925022026,\"_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\":1637811026799,\"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\":1637811026845,\"_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,12 +1,13 @@
1
1
  {
2
2
  "name": "koatty",
3
- "version": "3.3.7",
3
+ "version": "3.4.6",
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
- "release": "npm run build && standard-version",
9
+ "release": "npm run prepublishOnly && standard-version",
10
+ "pub": "git push --follow-tags origin && npm publish",
10
11
  "test": "npm run eslint && jest --passWithNoTests",
11
12
  "test:cov": "jest --collectCoverage --detectOpenHandles",
12
13
  "version": "conventional-changelog -p angular -i CHANGELOG.md -s"
@@ -34,7 +35,7 @@
34
35
  "name": "richenlin",
35
36
  "email": "richenlin@gmail.com"
36
37
  },
37
- "license": "BSD (3-Clause)",
38
+ "license": "BSD-3-Clause",
38
39
  "bugs": {
39
40
  "url": "https://github.com/thinkkoa/koatty/issues"
40
41
  },
@@ -51,42 +52,46 @@
51
52
  "@babel/preset-env": "^7.x.x",
52
53
  "@babel/preset-typescript": "^7.x.x",
53
54
  "@commitlint/cli": "^12.x.x",
54
- "@commitlint/config-conventional": "^12.x.x",
55
- "@types/cls-hooked": "^4.x.x",
55
+ "@commitlint/config-conventional": "^15.x.x",
56
+ "@types/jest": "^27.x.x",
56
57
  "@types/koa": "^2.x.x",
57
- "@types/koa__router": "^8.x.x",
58
- "@types/node": "^12.x.x",
59
- "@typescript-eslint/eslint-plugin": "^4.x.x",
60
- "@typescript-eslint/parser": "^4.x.x",
58
+ "@types/koa__router": "^8.0.9",
59
+ "@types/node": "^16.x.x",
60
+ "@types/uuid": "^8.3.3",
61
+ "@types/ws": "^8.2.0",
62
+ "@typescript-eslint/eslint-plugin": "^5.x.x",
63
+ "@typescript-eslint/parser": "^5.x.x",
61
64
  "conventional-changelog-cli": "^2.x.x",
62
- "del-cli": "^3.x.x",
63
- "eslint": "^7.x.x",
64
- "eslint-plugin-jest": "^24.x.x",
65
- "husky": "^6.x.x",
65
+ "del-cli": "^4.x.x",
66
+ "eslint": "^8.x.x",
67
+ "eslint-plugin-jest": "^25.x.x",
68
+ "husky": "^7.x.x",
66
69
  "jest": "^27.x.x",
67
70
  "jest-html-reporters": "^2.x.x",
68
71
  "standard-version": "^9.x.x",
69
72
  "ts-jest": "^27.x.x",
70
- "ts-node": "^10.0.0",
71
- "typescript": "^4.3.4"
73
+ "ts-node": "^10.x.x",
74
+ "typescript": "^4.x.x"
72
75
  },
73
76
  "dependencies": {
74
77
  "globby": "^11.0.4",
75
- "koa": "^2.13.1",
76
- "koatty_container": "^1.6.0",
77
- "koatty_core": "^1.1.2",
78
+ "koa": "^2.13.4",
79
+ "koatty_container": "^1.6.8",
80
+ "koatty_core": "^1.3.38",
81
+ "koatty_exception": "^1.0.6",
78
82
  "koatty_lib": "^1.2.6",
79
- "koatty_logger": "^1.1.2",
80
- "koatty_payload": "^1.3.0",
81
- "koatty_router": "^1.3.0",
82
- "koatty_serve": "^1.0.6",
83
- "koatty_trace": "^1.3.2",
83
+ "koatty_logger": "^1.2.6",
84
+ "koatty_payload": "^1.3.8",
85
+ "koatty_router": "^1.5.12",
86
+ "koatty_serve": "^1.3.10",
87
+ "koatty_trace": "^1.4.22",
84
88
  "reflect-metadata": "^0.1.13",
85
- "tslib": "^2.3.0"
89
+ "tslib": "^2.3.1",
90
+ "uuid": "^8.3.2"
86
91
  },
87
92
  "husky": {
88
93
  "hooks": {
89
94
  "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
90
95
  }
91
96
  }
92
- }
97
+ }
package/tsconfig.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "compilerOptions": {
3
3
  /* Basic Options */
4
- "target": "es2019" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'. */,
4
+ "target": "ES2019" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'. */,
5
5
  "module": "commonjs" /* Specify module code generation: 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
6
6
  "lib": [
7
7
  "es2019"
@@ -1,56 +0,0 @@
1
- import { BaseController } from "./BaseController";
2
- /**
3
- * RESTful controller
4
- *
5
- * @export
6
- * @class RestController
7
- * @extends {BaseController}
8
- */
9
- export declare class RestController extends BaseController {
10
- private model;
11
- /**
12
- * init
13
- *
14
- * @protected
15
- * @memberof BaseController
16
- */
17
- protected init(): void;
18
- /**
19
- *
20
- *
21
- * @param {(number | string)} id
22
- * @param {string} resource
23
- * @returns
24
- * @memberof RestController
25
- */
26
- getResource(id: number | string, resource: string): Promise<import("..").ApiOutput>;
27
- /**
28
- *
29
- *
30
- * @param {(number | string)} id
31
- * @param {string} resource
32
- * @param {*} data
33
- * @returns
34
- * @memberof RestController
35
- */
36
- postResource(id: number | string, resource: string, data: any): Promise<import("..").ApiOutput>;
37
- /**
38
- *
39
- *
40
- * @param {(number | string)} id
41
- * @param {string} resource
42
- * @returns
43
- * @memberof RestController
44
- */
45
- deleteResource(id: number | string, resource: string): Promise<import("..").ApiOutput>;
46
- /**
47
- *
48
- *
49
- * @param {(number | string)} id
50
- * @param {string} resource
51
- * @param {*} data
52
- * @returns
53
- * @memberof RestController
54
- */
55
- putResource(id: number | string, resource: string, data: any): Promise<import("..").ApiOutput>;
56
- }
@@ -1,202 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.RestController = void 0;
4
- const tslib_1 = require("tslib");
5
- /**
6
- * @ author: richen
7
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
8
- * @ license: BSD (3-Clause)
9
- * @ version: 2020-07-06 11:19:16
10
- */
11
- const Helper_1 = require("../util/Helper");
12
- const koatty_container_1 = require("koatty_container");
13
- const BaseController_1 = require("./BaseController");
14
- const koatty_router_1 = require("koatty_router");
15
- /**
16
- * RESTful controller
17
- *
18
- * @export
19
- * @class RestController
20
- * @extends {BaseController}
21
- */
22
- class RestController extends BaseController_1.BaseController {
23
- /**
24
- * init
25
- *
26
- * @protected
27
- * @memberof BaseController
28
- */
29
- init() {
30
- }
31
- /**
32
- *
33
- *
34
- * @param {(number | string)} id
35
- * @param {string} resource
36
- * @returns
37
- * @memberof RestController
38
- */
39
- async getResource(id, resource) {
40
- if (Helper_1.Helper.isEmpty(id)) {
41
- return this.fail('id is empty');
42
- }
43
- if (Helper_1.Helper.isEmpty(resource)) {
44
- return this.fail('resource is empty');
45
- }
46
- if (!this.model) {
47
- const resourceName = Helper_1.Helper.camelCase(resource, true);
48
- this.model = koatty_container_1.IOCContainer.get(`${resourceName}Model`, 'COMPONENT');
49
- if (!this.model || !this.model.pk) {
50
- return this.fail(`the model: ${resourceName} not found.`);
51
- }
52
- }
53
- try {
54
- if (id) {
55
- const pk = await this.model.getPk();
56
- const data = await this.model.where({ [pk]: id }).find();
57
- return this.ok('success', data);
58
- }
59
- const data = await this.model.limit(10000).select();
60
- return this.ok('success', data);
61
- }
62
- catch (err) {
63
- return this.fail(err.message || 'get resource error');
64
- }
65
- }
66
- /**
67
- *
68
- *
69
- * @param {(number | string)} id
70
- * @param {string} resource
71
- * @param {*} data
72
- * @returns
73
- * @memberof RestController
74
- */
75
- async postResource(id, resource, data) {
76
- if (Helper_1.Helper.isEmpty(id)) {
77
- return this.fail('id is empty');
78
- }
79
- if (Helper_1.Helper.isEmpty(resource)) {
80
- return this.fail('resource is empty');
81
- }
82
- if (Helper_1.Helper.isEmpty(data) || Helper_1.Helper.isEmpty(data.post)) {
83
- return this.fail('body is empty');
84
- }
85
- if (!this.model) {
86
- const resourceName = Helper_1.Helper.camelCase(resource, true);
87
- this.model = koatty_container_1.IOCContainer.get(`${resourceName}Model`, 'COMPONENT');
88
- if (!this.model || !this.model.pk) {
89
- return this.fail(`the model: ${resourceName} not found.`);
90
- }
91
- }
92
- try {
93
- const res = await this.model.add(data.post);
94
- return this.ok('success', res);
95
- }
96
- catch (err) {
97
- return this.fail(err.message || 'post resource error');
98
- }
99
- }
100
- /**
101
- *
102
- *
103
- * @param {(number | string)} id
104
- * @param {string} resource
105
- * @returns
106
- * @memberof RestController
107
- */
108
- async deleteResource(id, resource) {
109
- if (Helper_1.Helper.isEmpty(id)) {
110
- return this.fail('id is empty');
111
- }
112
- if (Helper_1.Helper.isEmpty(resource)) {
113
- return this.fail('resource is empty');
114
- }
115
- if (!this.model) {
116
- const resourceName = Helper_1.Helper.camelCase(resource, true);
117
- this.model = koatty_container_1.IOCContainer.get(`${resourceName}Model`, 'COMPONENT');
118
- if (!this.model || !this.model.pk) {
119
- return this.fail(`the model: ${resourceName} not found.`);
120
- }
121
- }
122
- try {
123
- const pk = await this.model.getPk();
124
- const rows = await this.model.where({ [pk]: id }).delete();
125
- return this.ok('success', rows);
126
- }
127
- catch (err) {
128
- return this.fail(err.message || 'delete resource error');
129
- }
130
- }
131
- /**
132
- *
133
- *
134
- * @param {(number | string)} id
135
- * @param {string} resource
136
- * @param {*} data
137
- * @returns
138
- * @memberof RestController
139
- */
140
- async putResource(id, resource, data) {
141
- if (Helper_1.Helper.isEmpty(id)) {
142
- return this.fail('id is empty');
143
- }
144
- if (Helper_1.Helper.isEmpty(resource)) {
145
- return this.fail('resource is empty');
146
- }
147
- if (Helper_1.Helper.isEmpty(data) || Helper_1.Helper.isEmpty(data.post)) {
148
- return this.fail('body is empty');
149
- }
150
- if (!this.model) {
151
- const resourceName = Helper_1.Helper.camelCase(resource, true);
152
- this.model = koatty_container_1.IOCContainer.get(`${resourceName}Model`, 'COMPONENT');
153
- if (!this.model || !this.model.pk) {
154
- return this.fail(`the model: ${resourceName} not found.`);
155
- }
156
- }
157
- try {
158
- const pk = await this.model.getPk();
159
- const rows = await this.model.where({ [pk]: id }).update(data.post);
160
- return this.ok('success', rows);
161
- }
162
- catch (err) {
163
- return this.fail(err.message || 'put resource error');
164
- }
165
- }
166
- }
167
- tslib_1.__decorate([
168
- koatty_router_1.GetMapping('/:resource/:id'),
169
- tslib_1.__param(0, koatty_router_1.PathVariable('id')),
170
- tslib_1.__param(1, koatty_router_1.PathVariable('resource')),
171
- tslib_1.__metadata("design:type", Function),
172
- tslib_1.__metadata("design:paramtypes", [Object, String]),
173
- tslib_1.__metadata("design:returntype", Promise)
174
- ], RestController.prototype, "getResource", null);
175
- tslib_1.__decorate([
176
- koatty_router_1.PostMapping('/:resource/:id'),
177
- tslib_1.__param(0, koatty_router_1.PathVariable('id')),
178
- tslib_1.__param(1, koatty_router_1.PathVariable('resource')),
179
- tslib_1.__param(2, koatty_router_1.RequestBody()),
180
- tslib_1.__metadata("design:type", Function),
181
- tslib_1.__metadata("design:paramtypes", [Object, String, Object]),
182
- tslib_1.__metadata("design:returntype", Promise)
183
- ], RestController.prototype, "postResource", null);
184
- tslib_1.__decorate([
185
- koatty_router_1.DeleteMapping('/:resource/:id'),
186
- tslib_1.__param(0, koatty_router_1.PathVariable('id')),
187
- tslib_1.__param(1, koatty_router_1.PathVariable('resource')),
188
- tslib_1.__metadata("design:type", Function),
189
- tslib_1.__metadata("design:paramtypes", [Object, String]),
190
- tslib_1.__metadata("design:returntype", Promise)
191
- ], RestController.prototype, "deleteResource", null);
192
- tslib_1.__decorate([
193
- koatty_router_1.PutMapping('/:resource/:id'),
194
- tslib_1.__param(0, koatty_router_1.PathVariable('id')),
195
- tslib_1.__param(1, koatty_router_1.PathVariable('resource')),
196
- tslib_1.__param(2, koatty_router_1.RequestBody()),
197
- tslib_1.__metadata("design:type", Function),
198
- tslib_1.__metadata("design:paramtypes", [Object, String, Object]),
199
- tslib_1.__metadata("design:returntype", Promise)
200
- ], RestController.prototype, "putResource", null);
201
- exports.RestController = RestController;
202
- //# sourceMappingURL=RestController.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"RestController.js","sourceRoot":"","sources":["../../src/controller/RestController.ts"],"names":[],"mappings":"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"}
@@ -1,15 +0,0 @@
1
- /**
2
- * @ author: richen
3
- * @ copyright: Copyright (c) - <richenlin(at)gmail.com>
4
- * @ license: BSD (3-Clause)
5
- * @ version: 2020-07-06 14:23:43
6
- */
7
- import { Koatty } from 'koatty_core';
8
- /**
9
- * get instance of router
10
- *
11
- * @export
12
- * @param {Koatty} app
13
- * @returns {*}
14
- */
15
- export declare function newRouter(app: Koatty): import("koatty_router/dist/grpc").GrpcRouter | import("koatty_router/dist/router").HttpRouter | import("koatty_router/dist/websocket").WebsocketRouter;
@@ -1,19 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.newRouter = void 0;
4
- const koatty_router_1 = require("koatty_router");
5
- /**
6
- * get instance of router
7
- *
8
- * @export
9
- * @param {Koatty} app
10
- * @returns {*}
11
- */
12
- function newRouter(app) {
13
- var _a;
14
- const serveMode = app.config("serve_mod") || "http";
15
- const options = (_a = app.config(undefined, 'router')) !== null && _a !== void 0 ? _a : {};
16
- return koatty_router_1.NewRouter(serveMode, app, options);
17
- }
18
- exports.newRouter = newRouter;
19
- //# sourceMappingURL=Router.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"Router.js","sourceRoot":"","sources":["../../src/core/Router.ts"],"names":[],"mappings":";;;AAOA,iDAA0C;AAE1C;;;;;;GAMG;AACH,SAAgB,SAAS,CAAC,GAAW;;IACjC,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC;IACpD,MAAM,OAAO,GAAG,MAAA,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,mCAAI,EAAE,CAAC;IACtD,OAAO,yBAAS,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAJD,8BAIC"}
@@ -1,8 +0,0 @@
1
- import { Koatty } from "..";
2
- /**
3
- *
4
- *
5
- * @export
6
- * @param {Koatty} app
7
- */
8
- export declare function startSever(app: Koatty): void;
@@ -1,62 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.startSever = void 0;
4
- const tslib_1 = require("tslib");
5
- /*
6
- * @Author: richen
7
- * @Date: 2020-07-06 15:53:37
8
- * @LastEditTime: 2021-07-22 11:32:33
9
- * @Description:
10
- * @Copyright (c) - <richenlin(at)gmail.com>
11
- */
12
- const fs_1 = tslib_1.__importDefault(require("fs"));
13
- const __1 = require("..");
14
- const koatty_serve_1 = require("koatty_serve");
15
- const pkg = require("../../package.json");
16
- /**
17
- * Listening callback function
18
- *
19
- * @param {Koatty} app
20
- * @param {ListeningOptions} options
21
- * @returns {*}
22
- */
23
- const callback = (app, options) => {
24
- return function () {
25
- __1.Logger.Custom("think", "", `Nodejs Version: ${process.version}`);
26
- __1.Logger.Custom("think", "", `${pkg.name} Version: v${pkg.version}`);
27
- __1.Logger.Custom("think", "", `App Environment: ${app.env}`);
28
- __1.Logger.Custom("think", "", `Server running at ${options.listenUrl}`);
29
- __1.Logger.Custom("think", "", "====================================");
30
- // tslint:disable-next-line: no-unused-expression
31
- app.appDebug && __1.Logger.Warn(`Running in debug mode.`);
32
- };
33
- };
34
- /**
35
- *
36
- *
37
- * @export
38
- * @param {Koatty} app
39
- */
40
- function startSever(app) {
41
- var _a, _b, _c;
42
- const serveMode = app.config("serve_mod") || "http";
43
- const port = process.env.PORT || process.env.APPPORT || app.config('app_port') || 3000;
44
- const hostname = process.env.IP || ((_a = process.env.HOSTNAME) === null || _a === void 0 ? void 0 : _a.replace(/-/g, '.')) || app.config('app_host') || 'localhost';
45
- const options = {
46
- hostname: hostname,
47
- port: port,
48
- listenUrl: `${serveMode}://${hostname || '127.0.0.1'}:${port}/`,
49
- key: "",
50
- cert: "",
51
- };
52
- if (serveMode == koatty_serve_1.SERVE_MODE.HTTP2) {
53
- const keyFile = (_b = app.config("key_file")) !== null && _b !== void 0 ? _b : "";
54
- const crtFile = (_c = app.config("crt_file")) !== null && _c !== void 0 ? _c : "";
55
- options.key = fs_1.default.readFileSync(keyFile).toString();
56
- options.cert = fs_1.default.readFileSync(crtFile).toString();
57
- options.port = options.port == 80 ? 443 : options.port;
58
- }
59
- koatty_serve_1.Serve(serveMode, app, options, callback(app, options));
60
- }
61
- exports.startSever = startSever;
62
- //# sourceMappingURL=Serve.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"Serve.js","sourceRoot":"","sources":["../../src/core/Serve.ts"],"names":[],"mappings":";;;;AAAA;;;;;;GAMG;AACH,oDAAoB;AACpB,0BAAoC;AACpC,+CAAmE;AACnE,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAG1C;;;;;;GAMG;AACH,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,OAAyB,EAAE,EAAE;IACxD,OAAO;QACH,UAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,mBAAmB,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QACjE,UAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,IAAI,cAAc,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACnE,UAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,oBAAoB,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;QAC1D,UAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,qBAAqB,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;QACrE,UAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,sCAAsC,CAAC,CAAC;QACnE,iDAAiD;QACjD,GAAG,CAAC,QAAQ,IAAI,UAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAC1D,CAAC,CAAC;AACN,CAAC,CAAC;AAEF;;;;;GAKG;AACH,SAAgB,UAAU,CAAC,GAAW;;IAClC,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC;IACpD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC;IACvF,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,KAAI,MAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,0CAAE,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,WAAW,CAAC;IACrH,MAAM,OAAO,GAAG;QACZ,QAAQ,EAAE,QAAQ;QAClB,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,GAAG,SAAS,MAAM,QAAQ,IAAI,WAAW,IAAI,IAAI,GAAG;QAC/D,GAAG,EAAE,EAAE;QACP,IAAI,EAAE,EAAE;KACX,CAAA;IACD,IAAI,SAAS,IAAI,yBAAU,CAAC,KAAK,EAAE;QAC/B,MAAM,OAAO,GAAG,MAAA,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,mCAAI,EAAE,CAAC;QAC7C,MAAM,OAAO,GAAG,MAAA,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,mCAAI,EAAE,CAAC;QAC7C,OAAO,CAAC,GAAG,GAAG,YAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;QAClD,OAAO,CAAC,IAAI,GAAG,YAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;QACnD,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;KAC1D;IACD,oBAAK,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;AAE1D,CAAC;AApBD,gCAoBC"}