chyz 2.0.0-rc.7 → 2.0.0-rc.8

package/BaseChyz.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseChyz.d.ts","sourceRoot":"","sources":["../src/BaseChyz.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,IAAI,EAAC,MAAM,aAAa,CAAC;AAwEjC,MAAM,CAAC,OAAO,OAAO,QAAQ;IACzB,OAAO,CAAC,MAAM,CAAM;IACpB,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC;IACvB,MAAM,CAAC,OAAO,MAAS;IACvB,OAAO,CAAC,KAAK,CAAgB;IAC7B,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC;IACf,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACnB,MAAM,CAAC,IAAI,EAAE,IAAI,CAAc;IAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,CAAiB;IACzC,OAAO,CAAC,eAAe,CAAwB;IAC/C,OAAO,CAAC,MAAM,CAAC,WAAW,CAA4B;IACtD,OAAc,UAAU,EAAE,GAAG,CAAK;IAClC,OAAc,WAAW,EAAE,GAAG,CAAK;IAInC,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,MAAM,EAE/B;IAED,IAAI;IAoCJ;;;OAGG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;OAIG;IACH,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,EAErB;IAGD,MAAM,KAAK,QAAQ,IAAI,GAAG,CAEzB;IAED,MAAM,KAAK,QAAQ,CAAC,KAAK,EAAE,GAAG,EAE7B;IAED,GAAG,CAAC,MAAM,GAAE,GAAQ,GAAG,QAAQ;WAoDjB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAIpB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAIpB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAInB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAInB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAIpB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAKpB,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAItB,CAAC,CAAC,IAAI,EAAE,MAAM;IAKrB,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAKrD,cAAc,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAUxD,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;WAQ7C,YAAY,CAAC,GAAG,EAAE,GAAG;WAKrB,cAAc,CAAC,GAAG,EAAE,GAAG;IAIrC;;OAEG;IACG,UAAU;IAyBhB;;OAEG;IACG,cAAc;IAmEb,UAAU;IAqCV,KAAK;CAwBf"}
+{"version":3,"file":"BaseChyz.d.ts","sourceRoot":"","sources":["../src/BaseChyz.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,IAAI,EAAC,MAAM,aAAa,CAAC;AAwEjC,MAAM,CAAC,OAAO,OAAO,QAAQ;IACzB,OAAO,CAAC,MAAM,CAAM;IACpB,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC;IACvB,MAAM,CAAC,OAAO,MAAS;IACvB,OAAO,CAAC,KAAK,CAAgB;IAC7B,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC;IACf,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACnB,MAAM,CAAC,IAAI,EAAE,IAAI,CAAc;IAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,CAAiB;IACzC,OAAO,CAAC,eAAe,CAAwB;IAC/C,OAAO,CAAC,MAAM,CAAC,WAAW,CAA4B;IACtD,OAAc,UAAU,EAAE,GAAG,CAAK;IAClC,OAAc,WAAW,EAAE,GAAG,CAAK;IAGnC,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,MAAM,EAE/B;IAED,IAAI;IAoCJ;;;OAGG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;OAIG;IACH,IAAI,IAAI,CAAC,KAAK,EAAE,MAAM,EAErB;IAGD,MAAM,KAAK,QAAQ,IAAI,GAAG,CAEzB;IAED,MAAM,KAAK,QAAQ,CAAC,KAAK,EAAE,GAAG,EAE7B;IAED,GAAG,CAAC,MAAM,GAAE,GAAQ,GAAG,QAAQ;WAoDjB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAIpB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAIpB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAInB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAInB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAIpB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAKpB,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAItB,CAAC,CAAC,IAAI,EAAE,MAAM;IAKrB,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAKrD,cAAc,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAUxD,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;WAQ7C,YAAY,CAAC,GAAG,EAAE,GAAG;WAKrB,cAAc,CAAC,GAAG,EAAE,GAAG;IAIrC;;OAEG;IACG,UAAU;IAyBhB;;OAEG;IACG,cAAc;IA4Eb,UAAU;IAqCV,KAAK;CAwBf"}

package/BaseChyz.js

@@ -31,12 +31,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const base_1 = require("./base");
-const Utils_1 = __importDefault(require("./requiments/Utils"));
+const Utils_1 = __importStar(require("./requiments/Utils"));
 const Logs_1 = require("./base/Logs");
 const https = require('https');
 const express = require("express");
@@ -65,7 +62,7 @@ validate.validators.array = (arrayItems, itemConstraints) => {
             errors[index] = { error: error };
         return errors;
     }, {});
-    return Utils_1.default.isEmpty(arrayItemErrors) ? null : { errors: arrayItemErrors };
+    return Utils_1.Utils.isEmpty(arrayItemErrors) ? null : { errors: arrayItemErrors };
 };
 validate.validators.tokenString = (items, itemConstraints) => {
     let arrayItems = items.split(",");
@@ -75,7 +72,7 @@ validate.validators.tokenString = (items, itemConstraints) => {
             errors[index] = { error: error };
         return errors;
     }, {});
-    return Utils_1.default.isEmpty(arrayItemErrors) ? null : { errors: arrayItemErrors };
+    return Utils_1.Utils.isEmpty(arrayItemErrors) ? null : { errors: arrayItemErrors };
 };
 const ip = require('ip');
 const bodyParser = require('body-parser');
@@ -171,13 +168,13 @@ class BaseChyz {
         // logger setting
         // this.logProvider().level = log4js.levels.ALL;
         // this.logProvider().configure(this._logConfig);
-        let components = Utils_1.default.findKeyValue(config, "components");
+        let components = Utils_1.Utils.findKeyValue(config, "components");
         if (components) {
             for (const componentsKey in components) {
                 let comp = components[componentsKey];
                 BaseChyz.debug("Create Component ", componentsKey);
                 try {
-                    BaseChyz.components[componentsKey] = Utils_1.default.createObject(new comp.class, comp);
+                    BaseChyz.components[componentsKey] = Utils_1.Utils.createObject(new comp.class, comp);
                     (_a = BaseChyz.components[componentsKey]) === null || _a === void 0 ? void 0 : _a.init();
                 }
                 catch (e) {
@@ -185,7 +182,7 @@ class BaseChyz {
                 }
             }
         }
-        let middlewares = Utils_1.default.findKeyValue(config, "middlewares");
+        let middlewares = Utils_1.Utils.findKeyValue(config, "middlewares");
         if (middlewares) {
             for (const middlewareKey in middlewares) {
                 let middleware1 = middlewares[middlewareKey];
@@ -282,7 +279,16 @@ class BaseChyz {
             // let articlesEndpoints: string[] = [];
             for (const file of fs.readdirSync(`${this._controllerpath}/`)) {
                 // let controller = require(`${this._controllerpath}/${file}`);
-                let controller = (yield Promise.resolve().then(() => __importStar(require(`${this._controllerpath}/${file}`))))[file.replace(".ts", "")];
+                let controller = (yield Promise.resolve().then(() => __importStar(require(`${this._controllerpath}/${file}`))));
+                if (controller[file.replace(".ts", "")]) {
+                    controller = controller[file.replace(".ts", "")];
+                }
+                else if (controller.default) {
+                    controller = controller.default;
+                }
+                else {
+                    throw new base_1.InvalidConfigException((0, Utils_1.default)("Invalid Controller"));
+                }
                 // This is our instantiated class
                 const instance = new controller();
                 BaseChyz.controllers.push(instance);
@@ -343,7 +349,7 @@ class BaseChyz {
         // CORS
         BaseChyz.express.use(function (req, res, next) {
             // @ts-ignore
-            req.reqId = Utils_1.default.uniqueId("chyzzzz_");
+            req.reqId = Utils_1.Utils.uniqueId("chyzzzz_");
             res.setHeader('Content-Type', 'application/json');
             res.setHeader("Access-Control-Allow-Origin", "*");
             res.setHeader("Access-Control-Allow-Credentials", "true");
@@ -355,7 +361,7 @@ class BaseChyz {
         BaseChyz.express.use(compression());
         //Middlewares
         for (const middleware1 of Object.keys(BaseChyz.middlewares)) {
-            if (!Utils_1.default.isFunction(middleware1)) {
+            if (!Utils_1.Utils.isFunction(middleware1)) {
                 let keycloak = BaseChyz.middlewares[middleware1].keycloak;
                 BaseChyz.express.use(keycloak.middleware(BaseChyz.middlewares[middleware1].config));
             }

package/base/ActionFilter.js

@@ -8,12 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionFilter = void 0;
-const Utils_1 = __importDefault(require("../requiments/Utils"));
+const Utils_1 = require("../requiments/Utils");
 const CBaseObject_1 = require("./CBaseObject");
 class ActionFilter extends CBaseObject_1.CBaseObject {
     constructor() {
@@ -60,13 +57,13 @@ class ActionFilter extends CBaseObject_1.CBaseObject {
         let id = action.id;
         let onlyMatch = false;
         let exceptMatch = false;
-        if (Utils_1.default.isEmpty(this.only)) {
+        if (Utils_1.Utils.isEmpty(this.only)) {
             onlyMatch = true;
         }
         else {
             onlyMatch = false;
             for (const onlyKey of this.only) {
-                if (Utils_1.default.matchWildcard(action.id, onlyKey)) {
+                if (Utils_1.Utils.matchWildcard(action.id, onlyKey)) {
                     onlyMatch = true;
                     break;
                 }

package/base/BaseError.js

@@ -5,16 +5,13 @@
  * E-mail: cihan@chy.com.tr
  * Github:https://github.com/cihan53/
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseError = void 0;
-const Utils_1 = __importDefault(require("../requiments/Utils"));
+const Utils_1 = require("../requiments/Utils");
 class BaseError extends Error {
     constructor(message, statusCode = 500) {
         super(message);
-        this.message = Utils_1.default.isString(message) ? message : JSON.stringify(message);
+        this.message = Utils_1.Utils.isString(message) ? message : JSON.stringify(message);
         this.name = this.constructor.name; // good practice
         this.statusCode = statusCode; // error code for responding to client
         //Error.captureStackTrace(this)

package/base/Component.js

@@ -5,13 +5,10 @@
  * E-mail: cihan@chy.com.tr
  * Github:https://github.com/cihan53/
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Component = void 0;
 const CBaseObject_1 = require("./CBaseObject");
-const Utils_1 = __importDefault(require("../requiments/Utils"));
+const Utils_1 = require("../requiments/Utils");
 class Component extends CBaseObject_1.CBaseObject {
     constructor() {
         /**
@@ -50,7 +47,7 @@ class Component extends CBaseObject_1.CBaseObject {
     }
     attachBehaviorInternal(name, behavior) {
         if (!this._behaviors.hasOwnProperty(name)) {
-            let beh = Utils_1.default.createObject(new behavior[name].class, behavior[name]);
+            let beh = Utils_1.Utils.createObject(new behavior[name].class, behavior[name]);
             beh.init();
             this._behaviors[name] = beh;
         }

package/base/Model.js

@@ -20,7 +20,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Model = exports.NOW = exports.DataTypes = void 0;
 const BaseChyz_1 = __importDefault(require("../BaseChyz"));
-const Utils_1 = __importDefault(require("../requiments/Utils"));
+const Utils_1 = require("../requiments/Utils");
 const Component_1 = require("./Component");
 const InvalidConfigException_1 = require("./InvalidConfigException");
 const sequelize_1 = require("sequelize");
@@ -93,7 +93,7 @@ class Model extends Component_1.Component {
             this._sequelize = sequelize;
         else
             this._sequelize = this.getDb();
-        if (!Utils_1.default.isEmpty(this.attributes())) {
+        if (!Utils_1.Utils.isEmpty(this.attributes())) {
             this._model = this._sequelize.define(this._tableName, this.attributes(), {
                 tableName: this.tableName(),
                 timestamps: false,
@@ -457,7 +457,7 @@ class Model extends Component_1.Component {
      */
     load(data, formName = null) {
         let scope = formName === null ? this.formName() : formName;
-        if (scope === '' && !Utils_1.default.isEmpty(data)) {
+        if (scope === '' && !Utils_1.Utils.isEmpty(data)) {
             this.setAttribute(data);
             return true;
         }
@@ -469,7 +469,7 @@ class Model extends Component_1.Component {
     }
     bulkLoad(data, formName = null) {
         let scope = formName === null ? this.formName() : formName;
-        if (scope === '' && !Utils_1.default.isEmpty(data)) {
+        if (scope === '' && !Utils_1.Utils.isEmpty(data)) {
             this.setAttribute(data);
             return true;
         }

package/filters/AccessControl.js

@@ -8,9 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccessControl = void 0;
 /*
@@ -24,7 +21,7 @@ const ForbiddenHttpException_1 = require("../base/ForbiddenHttpException");
 const ActionFilter_1 = require("../base/ActionFilter");
 const AccessRule_1 = require("./AccessRule");
 const WebUser_1 = require("../web/WebUser");
-const Utils_1 = __importDefault(require("../requiments/Utils"));
+const Utils_1 = require("../requiments/Utils");
 class AccessControl extends ActionFilter_1.ActionFilter {
     constructor() {
         super(...arguments);
@@ -35,11 +32,11 @@ class AccessControl extends ActionFilter_1.ActionFilter {
         var _a;
         super.init();
         if (this.user == undefined) {
-            this.user = (_a = Utils_1.default.cloneDeep(index_1.BaseChyz.getComponent("user"))) !== null && _a !== void 0 ? _a : new WebUser_1.WebUser();
+            this.user = (_a = Utils_1.Utils.cloneDeep(index_1.BaseChyz.getComponent("user"))) !== null && _a !== void 0 ? _a : new WebUser_1.WebUser();
         }
         this.rules.forEach((rule, index) => {
             if (rule === Object(rule)) {
-                this.rules[index] = Utils_1.default.createObject(new AccessRule_1.AccessRule(), rule);
+                this.rules[index] = Utils_1.Utils.createObject(new AccessRule_1.AccessRule(), rule);
             }
         });
     }

package/filters/AccessRule.js

@@ -8,14 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccessRule = void 0;
 const Component_1 = require("../base/Component");
 const InvalidConfigException_1 = require("../base/InvalidConfigException");
-const Utils_1 = __importDefault(require("../requiments/Utils"));
+const Utils_1 = require("../requiments/Utils");
 var _ = require('lodash');
 class AccessRule extends Component_1.Component {
     constructor() {
@@ -99,11 +96,11 @@ class AccessRule extends Component_1.Component {
     }
     matchRole(user) {
         return __awaiter(this, void 0, void 0, function* () {
-            let items = Utils_1.default.isEmpty(this.roles) ? [] : this.roles;
-            if (!Utils_1.default.isEmpty(this.permissions)) {
-                items = Utils_1.default.merge(items, this.permissions);
+            let items = Utils_1.Utils.isEmpty(this.roles) ? [] : this.roles;
+            if (!Utils_1.Utils.isEmpty(this.permissions)) {
+                items = Utils_1.Utils.merge(items, this.permissions);
             }
-            if (Utils_1.default.isEmpty(items)) {
+            if (Utils_1.Utils.isEmpty(items)) {
                 return true;
             }
             if (!user) {
@@ -125,8 +122,8 @@ class AccessRule extends Component_1.Component {
                 }
                 else {
                     //roleparams
-                    if (!Utils_1.default.isEmpty(this.roleParams)) {
-                        roleParams = !Utils_1.default.isArray(this.roleParams) ? this.roleParams.apply(this) : this.roleParams;
+                    if (!Utils_1.Utils.isEmpty(this.roleParams)) {
+                        roleParams = !Utils_1.Utils.isArray(this.roleParams) ? this.roleParams.apply(this) : this.roleParams;
                     }
                     if (yield user.can(item, this.roleParams)) {
                         return true;

package/filters/auth/HttpHeaderAuth.js

@@ -14,13 +14,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpHeaderAuth = void 0;
 const AuthMethod_1 = require("./AuthMethod");
-const Utils_1 = __importDefault(require("../../requiments/Utils"));
+const Utils_1 = require("../../requiments/Utils");
 class HttpHeaderAuth extends AuthMethod_1.AuthMethod {
     constructor() {
         super(...arguments);
@@ -34,7 +31,7 @@ class HttpHeaderAuth extends AuthMethod_1.AuthMethod {
             let key = Object.keys(request.headers).find(key => key.toLowerCase() === this.header.toLowerCase());
             if (key) {
                 let authHeader = request.headers[key];
-                if (!Utils_1.default.isEmpty(authHeader)) {
+                if (!Utils_1.Utils.isEmpty(authHeader)) {
                     if (this.pattern) {
                         //preg_match
                         let matches = authHeader.match(this.pattern);

package/index.d.ts

@@ -17,6 +17,6 @@ export { Logs, ActionFilter, BaseError, Behavior, Component, Configurable, CWebC
 export * from "./filters";
 export * from "./filters/auth";
 export * from "./decorator";
-export * as utils from "./requiments/Utils";
+export * from "./requiments/Utils";
 export default Chyz;
 //# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAgBA,OAAO,QAAQ,2BAA2B,CAAC;IACvC,UAAU,OAAO;QACb,QAAQ,EAAE,GAAG,CAAC;KACjB;CACJ;AAGD,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC7C,OAAO,QAAQ,MAAM,YAAY,CAAC;AAElC;;GAEG;AACH,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,GACf,MAAM,QAAQ,CAAC;AAChB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAE/B,cAAc,aAAa,CAAC;AAC5B,OAAO,KAAK,KAAK,MAAM,oBAAoB,CAAC;AAC5C,eAAe,IAAI,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAgBA,OAAO,QAAQ,2BAA2B,CAAC;IACvC,UAAU,OAAO;QACb,QAAQ,EAAE,GAAG,CAAC;KACjB;CACJ;AAGD,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC7C,OAAO,QAAQ,MAAM,YAAY,CAAC;AAElC;;GAEG;AACH,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,GACf,MAAM,QAAQ,CAAC;AAChB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAE/B,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AACnC,eAAe,IAAI,CAAC"}

package/index.js

@@ -18,26 +18,14 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.utils = exports.ModelManager = exports.Model = exports.ValidationHttpException = exports.DataErrorDbException = exports.UnauthorizedHttpException = exports.NotFoundHttpException = exports.InvalidArgumentException = exports.InvalidConfigException = exports.ForbiddenHttpException = exports.DbConnection = exports.CWebController = exports.Component = exports.Behavior = exports.BaseError = exports.ActionFilter = exports.Logs = exports.RestClient = exports.BaseChyz = exports.WebUser = void 0;
+exports.ModelManager = exports.Model = exports.ValidationHttpException = exports.DataErrorDbException = exports.UnauthorizedHttpException = exports.NotFoundHttpException = exports.InvalidArgumentException = exports.InvalidConfigException = exports.ForbiddenHttpException = exports.DbConnection = exports.CWebController = exports.Component = exports.Behavior = exports.BaseError = exports.ActionFilter = exports.Logs = exports.RestClient = exports.BaseChyz = exports.WebUser = void 0;
 const RestClient_1 = require("./base/RestClient");
 Object.defineProperty(exports, "RestClient", { enumerable: true, get: function () { return RestClient_1.RestClient; } });
 const BaseChyz_1 = __importDefault(require("./BaseChyz"));
@@ -68,5 +56,5 @@ Object.defineProperty(exports, "ModelManager", { enumerable: true, get: function
 __exportStar(require("./filters"), exports);
 __exportStar(require("./filters/auth"), exports);
 __exportStar(require("./decorator"), exports);
-exports.utils = __importStar(require("./requiments/Utils"));
+__exportStar(require("./requiments/Utils"), exports);
 exports.default = Chyz;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chyz",
-  "version": "2.0.0-rc.7",
+  "version": "2.0.0-rc.8",
   "description": "Nodejs Micro service Framework",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/rbac/AuthManager.js

@@ -8,14 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthManager = void 0;
 const base_1 = require("../base");
 const index_1 = require("../index");
-const Utils_1 = __importDefault(require("../requiments/Utils"));
+const Utils_1 = require("../requiments/Utils");
 class AuthManager extends base_1.Component {
     constructor() {
         super(...arguments);
@@ -58,7 +55,7 @@ class AuthManager extends base_1.Component {
              * @todo
              * Rule test edilmeli
              */
-            if (assignments[itemname] || Utils_1.default.find(this.defaultRoles, itemname)) {
+            if (assignments[itemname] || Utils_1.Utils.find(this.defaultRoles, itemname)) {
                 return true;
             }
             /**
@@ -134,11 +131,11 @@ class AuthManager extends base_1.Component {
             roles[roleName] = role;
             let _roles = yield this.getRoles();
             let _r = {};
-            Utils_1.default.forEach(_roles, (item) => {
+            Utils_1.Utils.forEach(_roles, (item) => {
                 if (result.result[item.name])
                     _r[item.name] = item;
             });
-            return Utils_1.default.merge(roles, _r);
+            return Utils_1.Utils.merge(roles, _r);
         });
     }
     /**
@@ -151,7 +148,7 @@ class AuthManager extends base_1.Component {
             const result = { result: {} };
             let permissions = {};
             yield this.getChildrenRecursive(roleName, childrenList, result);
-            if (Utils_1.default.isEmpty(result.result)) {
+            if (Utils_1.Utils.isEmpty(result.result)) {
                 return {};
             }
             let itemResult = yield base_1.ModelManager.AuthItem.findAll({
@@ -177,7 +174,7 @@ class AuthManager extends base_1.Component {
             }
             let directPermission = yield this.getDirectPermissionsByUser(userId);
             let inheritedPermission = yield this.getInheritedPermissionsByUser(userId);
-            return Utils_1.default.merge(directPermission, inheritedPermission);
+            return Utils_1.Utils.merge(directPermission, inheritedPermission);
         });
     }
     /**
@@ -214,7 +211,7 @@ class AuthManager extends base_1.Component {
             for (const userAssignmentElement of userAssignment) {
                 this.getChildrenRecursive(userAssignmentElement.item_name, childrenList, result);
             }
-            if (Utils_1.default.isEmpty(result.result)) {
+            if (Utils_1.Utils.isEmpty(result.result)) {
                 return {};
             }
             let itemResult = yield base_1.ModelManager.AuthItem.findAll({
@@ -328,7 +325,7 @@ class AuthManager extends base_1.Component {
             let items = yield base_1.ModelManager.AuthItemChild.findAll();
             let parents = {};
             for (const item of items) {
-                parents[item["parent"]] = Utils_1.default.concat(parents[item["parent"]] || [], [item["child"]]);
+                parents[item["parent"]] = Utils_1.Utils.concat(parents[item["parent"]] || [], [item["child"]]);
             }
             return parents;
         });
@@ -350,7 +347,7 @@ class AuthManager extends base_1.Component {
      * @since 2.0.11
      */
     hasNoAssignments(assignments) {
-        return Utils_1.default.isEmpty(assignments) && Utils_1.default.isEmpty(this.defaultRoles);
+        return Utils_1.Utils.isEmpty(assignments) && Utils_1.Utils.isEmpty(this.defaultRoles);
     }
 }
 exports.AuthManager = AuthManager;

package/requiments/Utils.d.ts

@@ -1,3 +1,9 @@
-declare const _default: any;
-export default _default;
+/**
+ *
+ * @param text
+ */
+declare const t: (text: string) => string;
+export declare const Utils: any;
+export { t };
+export default t;
 //# sourceMappingURL=Utils.d.ts.map

package/requiments/Utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Utils.d.ts","sourceRoot":"","sources":["../../src/requiments/Utils.ts"],"names":[],"mappings":";AA2GA,wBAQC"}
+{"version":3,"file":"Utils.d.ts","sourceRoot":"","sources":["../../src/requiments/Utils.ts"],"names":[],"mappings":"AAkGA;;;GAGG;AACH,QAAA,MAAM,CAAC,SAAmB,MAAM,WAE/B,CAAA;AAED,eAAO,MAAM,KAAK,KAOjB,CAAA;AACD,OAAO,EAAC,CAAC,EAAC,CAAA;AACV,eAAe,CAAC,CAAC"}

package/requiments/Utils.js

@@ -7,6 +7,7 @@
  */
 // import _ from "lodash";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.t = exports.Utils = void 0;
 const _ = require('lodash');
 /**
  *
@@ -102,9 +103,10 @@ const matchWildcard = (pattern, string, options = {}) => {
 const t = function (text) {
     return text;
 };
-exports.default = Object.assign({ t,
+exports.t = t;
+exports.Utils = Object.assign({ findKeyValue,
     createObject,
-    findKeyValue,
     sleep,
     matchWildcard,
     toQuery }, _);
+exports.default = t;

package/web/WebUser.js

@@ -23,7 +23,7 @@ const BaseChyz_1 = __importDefault(require("../BaseChyz"));
 const Component_1 = require("../base/Component");
 const ForbiddenHttpException_1 = require("../base/ForbiddenHttpException");
 const InvalidConfigException_1 = require("../base/InvalidConfigException");
-const Utils_1 = __importDefault(require("../requiments/Utils"));
+const Utils_1 = require("../requiments/Utils");
 class WebUser extends Component_1.Component {
     constructor() {
         super(...arguments);
@@ -137,7 +137,7 @@ class WebUser extends Component_1.Component {
             if ((accessChecker = this.getAccessChecker()) == null)
                 return false;
             access = yield accessChecker.checkAccess(this.getId(), permissionName, params);
-            if (allowCaching && Utils_1.default.isEmpty(params)) {
+            if (allowCaching && Utils_1.Utils.isEmpty(params)) {
                 // this._access[$permissionName] = $access;
             }
             return access;