chyz 2.0.1-rc.1 → 2.0.1-rc.3
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/base/ActionFilter.d.ts.map +1 -1
- package/base/ActionFilter.js +9 -1
- package/base/Logs.d.ts.map +1 -1
- package/base/Logs.js +20 -1
- package/index.d.ts +1 -4
- package/index.d.ts.map +1 -1
- package/index.js +2 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActionFilter.d.ts","sourceRoot":"","sources":["../../src/base/ActionFilter.ts"],"names":[],"mappings":";AAMA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,UAAU,CAAC;AAE3C,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"ActionFilter.d.ts","sourceRoot":"","sources":["../../src/base/ActionFilter.ts"],"names":[],"mappings":";AAMA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,UAAU,CAAC;AAE3C,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAA;AAGzC,qBAAa,YAAa,SAAQ,WAAW;IAElC,IAAI,EAAE,GAAG,CAAC;IAEjB;;;OAGG;IACI,MAAM,UAAM;IAGZ,IAAI;IAIX;;;;;OAKG;IACU,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ;IAUjE;;;;;OAKG;IACU,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ;IAIjE;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG;CA8BjC"}
|
package/base/ActionFilter.js
CHANGED
|
@@ -8,10 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.ActionFilter = void 0;
|
|
13
16
|
const Utils_1 = require("../requiments/Utils");
|
|
14
17
|
const CBaseObject_1 = require("./CBaseObject");
|
|
18
|
+
const BaseChyz_1 = __importDefault(require("../BaseChyz"));
|
|
15
19
|
class ActionFilter extends CBaseObject_1.CBaseObject {
|
|
16
20
|
constructor() {
|
|
17
21
|
super(...arguments);
|
|
@@ -31,6 +35,7 @@ class ActionFilter extends CBaseObject_1.CBaseObject {
|
|
|
31
35
|
*/
|
|
32
36
|
beforeFilter(route, req, res) {
|
|
33
37
|
return __awaiter(this, void 0, void 0, function* () {
|
|
38
|
+
BaseChyz_1.default.debug("Controller->beforeFilter ", route);
|
|
34
39
|
if (!this.isActive(route)) {
|
|
35
40
|
return;
|
|
36
41
|
}
|
|
@@ -71,7 +76,10 @@ class ActionFilter extends CBaseObject_1.CBaseObject {
|
|
|
71
76
|
}
|
|
72
77
|
for (const exceptKey in this.except) {
|
|
73
78
|
let pattern = this.except[exceptKey];
|
|
74
|
-
let
|
|
79
|
+
let reg = new RegExp(`${pattern}$`, "g");
|
|
80
|
+
let match = id.match(reg);
|
|
81
|
+
// let match = id.startsWith(pattern);
|
|
82
|
+
console.log(id, pattern, match, this.except);
|
|
75
83
|
if (match && match.length > 0) {
|
|
76
84
|
exceptMatch = true;
|
|
77
85
|
}
|
package/base/Logs.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logs.d.ts","sourceRoot":"","sources":["../../src/base/Logs.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"Logs.d.ts","sourceRoot":"","sources":["../../src/base/Logs.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAK5C,qBAAa,IAAK,YAAW,YAAY;IAE9B,IAAI,SAAyB;IAC7B,OAAO,EAAE,GAAG,CAA6C;gBAGpD,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG;IA6BxC,IAAI;IAIJ;;;OAGG;IACI,QAAQ;IAIR,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAInB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAIpB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAInB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAInB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAIpB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAKpB,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;CAIhC;;AAED,wBAA0B"}
|
package/base/Logs.js
CHANGED
|
@@ -17,8 +17,27 @@ class Logs {
|
|
|
17
17
|
this.configs = (_a = require('../log/config/log4js.json')) !== null && _a !== void 0 ? _a : {};
|
|
18
18
|
if (name)
|
|
19
19
|
this.name = name;
|
|
20
|
-
if (configs)
|
|
20
|
+
if (configs) {
|
|
21
21
|
this.configs = configs;
|
|
22
|
+
}
|
|
23
|
+
// let _conf = Utils.clone(this.configs);
|
|
24
|
+
// Object.keys(_conf.appenders).forEach(function (appender: string) {
|
|
25
|
+
// let _base;
|
|
26
|
+
// if (_conf.appenders[appender].layout) {
|
|
27
|
+
// if ((_base = _conf.appenders[appender].layout).tokens == null) {
|
|
28
|
+
// _base.tokens = {};
|
|
29
|
+
// }
|
|
30
|
+
// //
|
|
31
|
+
// _conf.appenders[appender].layout.tokens = Utils.extend(_conf.appenders[appender].layout.tokens, {
|
|
32
|
+
// singleLine: function (logEvent: any) {
|
|
33
|
+
// console.log("singglleeee")
|
|
34
|
+
// // logEvent.data is an array that contains the arguments to the log.info() call
|
|
35
|
+
// return logEvent.data[0] + ', ' + logEvent.data[1].toString();
|
|
36
|
+
// }
|
|
37
|
+
// });
|
|
38
|
+
//
|
|
39
|
+
// }
|
|
40
|
+
// });
|
|
22
41
|
this.Provider().configure(this.configs);
|
|
23
42
|
}
|
|
24
43
|
init() {
|
package/index.d.ts
CHANGED
|
@@ -10,10 +10,7 @@ declare module "express-serve-static-core" {
|
|
|
10
10
|
identity: any;
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
|
-
|
|
14
|
-
*
|
|
15
|
-
*/
|
|
16
|
-
export declare const Chyz_Version = "2.0.1-rc.1";
|
|
13
|
+
export declare const Chyz_Version: any;
|
|
17
14
|
declare const Chyz: BaseChyz;
|
|
18
15
|
export { Request, Response, NextFunction } from "./base/CRequest";
|
|
19
16
|
export { RouteDefinition } from "./model/RouteDefinition";
|
package/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC;KAClC;CACJ;AAQD,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,EAAC,UAAU,EAAC,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC;KAClC;CACJ;AAQD,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,EAAC,UAAU,EAAC,MAAM,QAAQ,CAAC;AAGlC,OAAO,QAAQ,2BAA2B,CAAC;IACvC,UAAU,OAAO;QACb,QAAQ,EAAE,GAAG,CAAC;KACjB;CACJ;AAgBD,eAAO,MAAM,YAAY,KAAgB,CAAC;AAC1C,QAAA,MAAM,IAAI,UAAiB,CAAC;AAC5B,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAC,eAAe,EAAC,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,CAAA;AAC7B,OAAO,EACH,IAAI,EACJ,YAAY,EACZ,SAAS,EACT,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,sBAAsB,EACtB,sBAAsB,EACtB,wBAAwB,EACxB,qBAAqB,EACrB,yBAAyB,EACzB,oBAAoB,EACpB,uBAAuB,EACvB,KAAK,EACL,YAAY,EACZ,OAAO,EACV,MAAM,QAAQ,CAAC;AAChB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AAExB,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AAEnC,eAAe,IAAI,CAAC"}
|
package/index.js
CHANGED
|
@@ -41,7 +41,8 @@ String.prototype.tokenReplace = function (obj) {
|
|
|
41
41
|
/**
|
|
42
42
|
*
|
|
43
43
|
*/
|
|
44
|
-
|
|
44
|
+
const pjson = require('./package.json');
|
|
45
|
+
exports.Chyz_Version = pjson.version;
|
|
45
46
|
const Chyz = new BaseChyz_1.default();
|
|
46
47
|
var WebUser_1 = require("./web/WebUser");
|
|
47
48
|
Object.defineProperty(exports, "WebUser", { enumerable: true, get: function () { return WebUser_1.WebUser; } });
|