chyz 1.2.5-rc.3 → 2.0.0-rc.11

package/BaseChyz.d.ts

@@ -1,4 +1,4 @@
-import 'reflect-metadata';
+import { Logs } from "./base/Logs";
 export default class BaseChyz {
     private config;
     static app: string;
@@ -7,16 +7,17 @@ export default class BaseChyz {
     private _port;
     static db: any;
     static routes: any;
+    static logs: Logs;
     private static _validate;
-    private _logConfig;
     private _controllerpath;
     private static controllers;
     static components: any;
     static middlewares: any;
-    get logConfig(): any;
-    set logConfig(value: any);
     get controllerpath(): string;
     set controllerpath(value: string);
+    /**
+     *
+     */
     init(): void;
     /**
      * Listen port number
@@ -32,9 +33,6 @@ export default class BaseChyz {
     static get validate(): any;
     static set validate(value: any);
     app(config?: any): BaseChyz;
-    logProvider(): any;
-    getLogger(): any;
-    static logs(...args: any[]): any;
     static trace(...args: any[]): void;
     static debug(...args: any[]): void;
     static info(...args: any[]): void;

package/BaseChyz.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseChyz.d.ts","sourceRoot":"","sources":["../src/BaseChyz.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAwD1B,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,MAAY;IAC1B,OAAO,CAAC,KAAK,CAAgB;IAC7B,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC;IACf,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACnB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAiB;IACzC,OAAO,CAAC,UAAU,CAAiD;IACnE,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,SAAS,IAAI,GAAG,CAEnB;IAED,IAAI,SAAS,CAAC,KAAK,EAAE,GAAG,EAEvB;IAED,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,MAAM,EAE/B;IAED,IAAI;IA0DJ;;;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;IA6CxB,WAAW;IAIX,SAAS;IAIhB,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAIZ,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;IAsBhB;;OAEG;IACG,cAAc;IAoEb,UAAU;IAwCV,KAAK;CA0Bf"}
+{"version":3,"file":"BaseChyz.d.ts","sourceRoot":"","sources":["../src/BaseChyz.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,IAAI,EAAC,MAAM,aAAa,CAAC;AA8EjC,MAAM,CAAC,OAAO,OAAO,QAAQ;IACzB,OAAO,CAAC,MAAM,CAAuB;IACrC,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;;OAEG;IACH,IAAI;IAmCJ;;;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;WAiDjB,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;IAwDV,KAAK;CAwBf"}

package/BaseChyz.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    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 __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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,17 +31,13 @@ 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 });
-require("reflect-metadata");
 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");
 const compression = require('compression');
-const log4js = require("log4js");
 const fs = require('fs');
 const validate = require('validate.js');
 /**
@@ -43,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(",");
@@ -53,49 +72,46 @@ 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 };
 };
-var ip = require('ip');
-var bodyParser = require('body-parser');
-var methodOverride = require('method-override');
+const ip = require('ip');
+const bodyParser = require('body-parser');
+const methodOverride = require('method-override');
+const Server = express();
+const cors = require('cors');
+/**
+ * set request id
+ */
+Object.defineProperty(Server.request, 'reqId', {
+    configurable: true,
+    enumerable: true,
+    writable: true
+});
+Object.defineProperty(Server.request, 'user', {
+    configurable: true,
+    enumerable: true,
+    writable: true
+});
+Object.defineProperty(Server.request, 'identity', {
+    configurable: true,
+    enumerable: true,
+    writable: true
+});
 class BaseChyz {
     constructor() {
-        var _a;
         this._port = 3001;
-        this._logConfig = (_a = require('./log/config/log4js.json')) !== null && _a !== void 0 ? _a : {};
         this._controllerpath = "Controllers";
     }
-    get logConfig() {
-        return this._logConfig;
-    }
-    set logConfig(value) {
-        this._logConfig = value;
-    }
     get controllerpath() {
         return this._controllerpath;
     }
     set controllerpath(value) {
         this._controllerpath = value;
     }
+    /**
+     *
+     */
     init() {
-        /**
-         * set request id
-         */
-        Object.defineProperty(BaseChyz.express.request, 'reqId', {
-            configurable: true,
-            enumerable: true,
-            writable: true
-        });
-        Object.defineProperty(BaseChyz.express.request, 'user', {
-            configurable: true,
-            enumerable: true,
-            writable: true
-        });
-        Object.defineProperty(BaseChyz.express.request, 'identity', {
-            configurable: true,
-            enumerable: true,
-            writable: true
-        });
         /**
          * server port setting
          */
@@ -147,16 +163,19 @@ class BaseChyz {
          * Config set
          */
         this.config = config;
-        // logger setting
-        this.logProvider().level = log4js.levels.ALL;
-        this.logProvider().configure(this._logConfig);
-        let components = Utils_1.default.findKeyValue(config, "components");
+        /**
+         * log setting
+         */
+        if (this.config.logs instanceof Logs_1.Logs) {
+            BaseChyz.logs = this.config.logs;
+        }
+        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) {
@@ -164,11 +183,11 @@ 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];
-                BaseChyz.logs().debug("Create middlewares ", middlewareKey);
+                BaseChyz.debug("Create middlewares ", middlewareKey);
                 BaseChyz.middlewares[middlewareKey] = middleware1;
                 // BaseChyz.middlewares[middlewareKey] = Utils.createObject(new middleware1.class, middleware1);
             }
@@ -176,35 +195,26 @@ class BaseChyz {
         this.init();
         return this;
     }
-    logProvider() {
-        return log4js;
-    }
-    getLogger() {
-        return this.logProvider().getLogger(this.constructor.name);
-    }
-    static logs(...args) {
-        return log4js.getLogger(this.name);
-    }
     static trace(...args) {
-        BaseChyz.logs().fatal(...arguments);
+        BaseChyz.logs.fatal(...arguments);
     }
     static debug(...args) {
-        BaseChyz.logs().debug(...arguments);
+        BaseChyz.logs.debug(...arguments);
     }
     static info(...args) {
-        BaseChyz.logs().info(...arguments);
+        BaseChyz.logs.info(...arguments);
     }
     static warn(...args) {
-        BaseChyz.logs().warn(...arguments);
+        BaseChyz.logs.warn(...arguments);
     }
     static error(...args) {
-        BaseChyz.logs().error(...arguments);
+        BaseChyz.logs.error(...arguments);
     }
     static fatal(...args) {
-        BaseChyz.logs().fatal(...arguments);
+        BaseChyz.logs.fatal(...arguments);
     }
     static warning(...args) {
-        BaseChyz.logs().warn(...arguments);
+        BaseChyz.logs.warn(...arguments);
     }
     static t(text) {
         return text;
@@ -251,6 +261,9 @@ class BaseChyz {
                         models[className.replace("Class", "")] = new model[className];
                 }
             });
+            /**
+             *
+             */
             base_1.ModelManager._register(models);
             for (const key of Object.keys(base_1.ModelManager)) {
                 if (key != "_register") {
@@ -266,8 +279,17 @@ class BaseChyz {
         return __awaiter(this, void 0, void 0, function* () {
             // let articlesEndpoints: string[] = [];
             for (const file of fs.readdirSync(`${this._controllerpath}/`)) {
-                let controller = require(`${this._controllerpath}/${file}`);
-                // let controller = await import(`${this._controllerpath}/${file}`);
+                // let controller = require(`${this._controllerpath}/${file}`);
+                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);
@@ -277,12 +299,12 @@ class BaseChyz {
                 // Our `routes` array containing all our routes for this controller
                 // @ts-ignore
                 const routes = Reflect.getMetadata('routes', controller);
-                BaseChyz.logs().debug("Controller load ", controller.name, `(${prefix})`);
+                BaseChyz.debug("Controller load ", controller.name, `(${prefix})`);
                 if (routes) {
                     routes.forEach(route => {
                         let actionId = route.path == "/" || route.path == "" ? instance.defaultAction : route.path;
                         route.id = actionId;
-                        BaseChyz.logs().debug("Controller route Path", prefix + (route.path.startsWith("/") ? route.path : `/${route.path}`));
+                        BaseChyz.debug("Controller route Path", prefix + (route.path.startsWith("/") ? route.path : `/${route.path}`));
                         BaseChyz.express[route.requestMethod](prefix + (route.path.startsWith("/") ? route.path : `/${route.path}`), (req, res, next) => __awaiter(this, void 0, void 0, function* () {
                             try {
                                 BaseChyz.debug(`Call Request id ${instance.id}`);
@@ -325,23 +347,39 @@ class BaseChyz {
         BaseChyz.express.use(bodyParser.json({ limit: '1mb' }));
         BaseChyz.express.use(bodyParser.urlencoded({ limit: '1mb', extended: true })); // support encoded bodies
         BaseChyz.express.use(methodOverride());
-        BaseChyz.express.use(methodOverride());
-        // CORS
-        BaseChyz.express.use(function (req, res, next) {
-            // @ts-ignore
-            req.reqId = Utils_1.default.uniqueId("chyzzzz_");
-            res.setHeader('Content-Type', 'application/json');
-            res.setHeader("Access-Control-Allow-Origin", "*");
-            res.setHeader("Access-Control-Allow-Credentials", "true");
-            res.setHeader("Access-Control-Allow-Methods", "GET,HEAD,OPTIONS,POST,PUT");
-            res.setHeader("Access-Control-Allow-Headers", "Access-Control-Allow-Origin,Access-Control-Allow-Headers, Origin,Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers,Authorization");
-            next();
-        });
+        BaseChyz.express.use(cors());
+        //
+        // // CORS
+        // BaseChyz.express.use(function (req: any, res: Response, next: any) {
+        //     // @ts-ignore
+        //     req.reqId = Utils.uniqueId("chyzzzz_")
+        //     res.setHeader('Content-Type', 'application/json');
+        //     res.setHeader("Access-Control-Allow-Origin", "*");
+        //     res.setHeader("Access-Control-Allow-Credentials", "true");
+        //     res.setHeader("Access-Control-Allow-Methods", "GET,HEAD,OPTIONS,POST,PUT");
+        //     res.setHeader("Access-Control-Allow-Headers", "Access-Control-Allow-Origin,Access-Control-Allow-Headers, Origin,Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers,Authorization");
+        //     next();
+        // });
+        //
         // compress all responses
-        BaseChyz.express.use(compression());
+        const shouldCompress = (req, res) => {
+            // don't compress responses explicitly asking not
+            if (req.headers["x-no-compression"] || res.getHeader('Content-Type') === 'text/event-stream') {
+                return false;
+            }
+            // use compression filter function
+            return compression.filter(req, res);
+        };
+        BaseChyz.express.use(compression({ filter: shouldCompress }));
+        //
+        // //static file path
+        if (this.config.staticFilePath) {
+            BaseChyz.info('Static file path', this.config.staticFilePath);
+            BaseChyz.express.use(express.static(this.config.staticFilePath));
+        }
         //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));
             }
@@ -376,7 +414,8 @@ class BaseChyz {
     }
 }
 exports.default = BaseChyz;
-BaseChyz.express = express();
+BaseChyz.express = Server;
+BaseChyz.logs = new Logs_1.Logs();
 BaseChyz._validate = validate;
 BaseChyz.controllers = [];
 BaseChyz.components = {};

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/CBaseObject.js

@@ -7,10 +7,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CBaseObject = void 0;
-const Logger_1 = require("./Logger");
+const index_1 = require("../index");
 class CBaseObject {
     init() {
-        Logger_1.Logger.debug("BaseObject init.....");
+        index_1.BaseChyz.debug("BaseObject init.....");
     }
 }
 exports.CBaseObject = CBaseObject;

package/base/CRequest.d.ts

@@ -0,0 +1,2 @@
+export { Request, Response, NextFunction } from "express";
+//# sourceMappingURL=CRequest.d.ts.map

package/base/CRequest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CRequest.d.ts","sourceRoot":"","sources":["../../src/base/CRequest.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAC,MAAM,SAAS,CAAC"}

package/base/CRequest.js

@@ -0,0 +1,10 @@
+"use strict";
+/*
+ *
+ * Copyright (c) 2022.. Chy Bilgisayar Bilisim
+ * Author: Cihan Ozturk
+ *  E-mail: cihan@chy.com.tr
+ *  Github:https://github.com/cihan53/
+ *
+ */
+Object.defineProperty(exports, "__esModule", { value: true });

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/Logs.d.ts

@@ -0,0 +1,22 @@
+import { Configurable } from "./Configurable";
+export declare class Logs implements Configurable {
+    name: string;
+    configs: any;
+    constructor(name?: string, configs?: any);
+    init(): void;
+    /**
+     *
+     * @constructor
+     */
+    Provider(): any;
+    logs(...args: any[]): any;
+    debug(...args: any[]): void;
+    info(...args: any[]): void;
+    warn(...args: any[]): void;
+    error(...args: any[]): void;
+    fatal(...args: any[]): void;
+    warning(...args: any[]): void;
+}
+declare const _default: Logs;
+export default _default;
+//# sourceMappingURL=Logs.d.ts.map

package/base/Logs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Logs.d.ts","sourceRoot":"","sources":["../../src/base/Logs.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAI5C,qBAAa,IAAK,YAAW,YAAY;IAE9B,IAAI,SAAyB;IAC7B,OAAO,EAAE,GAAG,CAA6C;gBAGpD,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG;IASxC,IAAI;IAKJ;;;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

@@ -0,0 +1,57 @@
+"use strict";
+/*
+ *
+ * Copyright (c) 2022.. Chy Bilgisayar Bilisim
+ * Author: Cihan Ozturk
+ *  E-mail: cihan@chy.com.tr
+ *  Github:https://github.com/cihan53/
+ *
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Logs = void 0;
+const log4js = require("log4js");
+class Logs {
+    constructor(name, configs) {
+        var _a;
+        this.name = this.constructor.name;
+        this.configs = (_a = require('../log/config/log4js.json')) !== null && _a !== void 0 ? _a : {};
+        if (name)
+            this.name = name;
+        if (configs)
+            this.configs = configs;
+        this.Provider().configure(this.configs);
+    }
+    init() {
+        this.Provider().configure(this.configs);
+    }
+    /**
+     *
+     * @constructor
+     */
+    Provider() {
+        return log4js;
+    }
+    logs(...args) {
+        return log4js.getLogger(this.name);
+    }
+    debug(...args) {
+        this.logs().debug(...arguments);
+    }
+    info(...args) {
+        this.logs().info(...arguments);
+    }
+    warn(...args) {
+        this.logs().warn(...arguments);
+    }
+    error(...args) {
+        this.logs().error(...arguments);
+    }
+    fatal(...args) {
+        this.logs().fatal(...arguments);
+    }
+    warning(...args) {
+        this.logs().warn(...arguments);
+    }
+}
+exports.Logs = Logs;
+exports.default = new Logs();

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/base/RestClient.d.ts

@@ -4,6 +4,4 @@ export declare class RestClient extends Component {
     get(url: string, args: any[], headers?: any): any;
     Rest(params: any): any;
 }
-declare const _default: RestClient;
-export default _default;
 //# sourceMappingURL=RestClient.d.ts.map

package/base/RestClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RestClient.d.ts","sourceRoot":"","sources":["../../src/base/RestClient.ts"],"names":[],"mappings":"AAUA,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAItC,qBAAa,UAAW,SAAQ,SAAS;IAC9B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAC,OAAO,GAAC,GAAM;IAI5C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAC,OAAO,GAAC,GAAM;IAI3C,IAAI,CAAC,MAAM,EAAE,GAAG;CAG1B;;AACD,wBAAgC"}
+{"version":3,"file":"RestClient.d.ts","sourceRoot":"","sources":["../../src/base/RestClient.ts"],"names":[],"mappings":"AAUA,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAItC,qBAAa,UAAW,SAAQ,SAAS;IAC9B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAC,OAAO,GAAC,GAAM;IAI5C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAC,OAAO,GAAC,GAAM;IAI3C,IAAI,CAAC,MAAM,EAAE,GAAG;CAG1B"}

package/base/RestClient.js

@@ -23,4 +23,3 @@ class RestClient extends Component_1.Component {
     }
 }
 exports.RestClient = RestClient;
-exports.default = new RestClient();

package/base/index.d.ts

@@ -1,3 +1,4 @@
+export { Logs } from "./Logs";
 export { BaseError } from "./BaseError";
 export { ActionFilter } from "./ActionFilter";
 export { Behavior } from "./Behavior";

package/base/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/base/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAA;AACrC,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAA;AACnC,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAA;AACrC,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAC,wBAAwB,EAAC,MAAM,4BAA4B,CAAA;AACnE,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAC,yBAAyB,EAAC,MAAM,6BAA6B,CAAA;AACrE,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAA;AACjE,OAAO,EAAC,KAAK,EAAC,QAAQ,EAAC,SAAS,EAAE,GAAG,EAAC,MAAM,SAAS,CAAA;AACrD,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AACvC,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/base/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAA;AACrC,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAA;AACnC,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAA;AACrC,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAC,wBAAwB,EAAC,MAAM,4BAA4B,CAAA;AACnE,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAC,yBAAyB,EAAC,MAAM,6BAA6B,CAAA;AACrE,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAA;AACjE,OAAO,EAAC,KAAK,EAAC,QAAQ,EAAC,SAAS,EAAE,GAAG,EAAC,MAAM,SAAS,CAAA;AACrD,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AACvC,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA"}

package/base/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelManager = exports.RestClient = exports.NOW = exports.DataTypes = 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.ActionFilter = exports.BaseError = void 0;
+exports.ModelManager = exports.RestClient = exports.NOW = exports.DataTypes = 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.ActionFilter = exports.BaseError = exports.Logs = void 0;
+var Logs_1 = require("./Logs");
+Object.defineProperty(exports, "Logs", { enumerable: true, get: function () { return Logs_1.Logs; } });
 var BaseError_1 = require("./BaseError");
 Object.defineProperty(exports, "BaseError", { enumerable: true, get: function () { return BaseError_1.BaseError; } });
 var ActionFilter_1 = require("./ActionFilter");

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

@@ -1,17 +1,22 @@
-import RestClient from "./base/RestClient";
+declare module "express-serve-static-core" {
+    interface Request {
+        identity: any;
+    }
+}
+import { RestClient } from "./base/RestClient";
 import BaseChyz from "./BaseChyz";
 /**
  *
  */
 declare const Chyz: BaseChyz;
-export { Request, Response, NextFunction } from "express";
+export { Request, Response, NextFunction } from "./base/CRequest";
 export { RouteDefinition } from "./model/RouteDefinition";
 export { WebUser } from "./web/WebUser";
 export { BaseChyz, RestClient };
-export { ActionFilter, BaseError, Behavior, Component, Configurable, CWebController, DbConnection, ForbiddenHttpException, InvalidConfigException, InvalidArgumentException, NotFoundHttpException, UnauthorizedHttpException, DataErrorDbException, ValidationHttpException, Model, ModelManager, } from "./base";
+export { Logs, ActionFilter, BaseError, Behavior, Component, Configurable, CWebController, DbConnection, ForbiddenHttpException, InvalidConfigException, InvalidArgumentException, NotFoundHttpException, UnauthorizedHttpException, DataErrorDbException, ValidationHttpException, Model, ModelManager, } from "./base";
 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":"AASA,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC;;GAEG;AACH,QAAA,MAAM,IAAI,UAAiB,CAAC;AAC5B,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAC,MAAM,SAAS,CAAC;AACxD,OAAO,EAAC,eAAe,EAAC,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,QAAQ,EAAC,UAAU,EAAC,CAAA;AAC5B,OAAO,EACH,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,28 +18,16 @@ 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.RestClient = exports.BaseChyz = exports.WebUser = void 0;
-const RestClient_1 = __importDefault(require("./base/RestClient"));
-exports.RestClient = RestClient_1.default;
+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"));
 exports.BaseChyz = BaseChyz_1.default;
 /**
@@ -49,6 +37,7 @@ const Chyz = new BaseChyz_1.default();
 var WebUser_1 = require("./web/WebUser");
 Object.defineProperty(exports, "WebUser", { enumerable: true, get: function () { return WebUser_1.WebUser; } });
 var base_1 = require("./base");
+Object.defineProperty(exports, "Logs", { enumerable: true, get: function () { return base_1.Logs; } });
 Object.defineProperty(exports, "ActionFilter", { enumerable: true, get: function () { return base_1.ActionFilter; } });
 Object.defineProperty(exports, "BaseError", { enumerable: true, get: function () { return base_1.BaseError; } });
 Object.defineProperty(exports, "Behavior", { enumerable: true, get: function () { return base_1.Behavior; } });
@@ -67,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,8 +1,6 @@
 {
   "name": "chyz",
-  "version": "1.2.5-rc.3",
-  "main":"./index.js",
-  "type": "./index.d.ts",
+  "version": "2.0.0-rc.11",
   "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/IdentityInterface.d.ts

@@ -50,6 +50,6 @@ export interface IdentityInterface {
     /**
      *
      */
-    can(permissionName: string, params: any[], allowCaching: boolean): (boolean | null);
+    can(permissionName: string, params: any[], allowCaching: boolean): Promise<(boolean | null)>;
 }
 //# sourceMappingURL=IdentityInterface.d.ts.map

package/web/IdentityInterface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IdentityInterface.d.ts","sourceRoot":"","sources":["../../src/web/IdentityInterface.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,iBAAiB;IAC9B;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,GAAG,CAAA;IAE7B;;;;;;;;OAQG;IACH,yBAAyB,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;IAEzD;;;OAGG;IACH,KAAK,IAAI,MAAM,CAAC;IAEhB;;;;;;;;;;;;;;;OAeG;IACH,UAAU,IAAI,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAGnD;;OAEG;IACH,GAAG,CAAC,cAAc,EAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,EAAI,YAAY,EAAE,OAAO,GAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;CAE1F"}
+{"version":3,"file":"IdentityInterface.d.ts","sourceRoot":"","sources":["../../src/web/IdentityInterface.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,iBAAiB;IAC9B;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,GAAG,CAAA;IAE7B;;;;;;;;OAQG;IACH,yBAAyB,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;IAEzD;;;OAGG;IACH,KAAK,IAAI,MAAM,CAAC;IAEhB;;;;;;;;;;;;;;;OAeG;IACH,UAAU,IAAI,MAAM,CAAC;IAErB;;;;;;OAMG;IACH,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAGnD;;OAEG;IACH,GAAG,CAAC,cAAc,EAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,EAAI,YAAY,EAAE,OAAO,GAAI,OAAO,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAE;CAEnG"}

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;

package/base/Logger.d.ts

@@ -1,18 +0,0 @@
-import { Configurable } from "./Configurable";
-export declare class Logger implements Configurable {
-    configs: any;
-    init(): void;
-    /**
-     *
-     * @constructor
-     */
-    Provider(): any;
-    static logs(...args: any[]): any;
-    static debug(...args: any[]): void;
-    static info(...args: any[]): void;
-    static warn(...args: any[]): void;
-    static error(...args: any[]): void;
-    static fatal(...args: any[]): void;
-    static warning(...args: any[]): void;
-}
-//# sourceMappingURL=Logger.d.ts.map

package/base/Logger.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/base/Logger.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAI5C,qBAAa,MAAO,YAAW,YAAY;IAEhC,OAAO,EAAE,GAAG,CAA4C;IAE/D,IAAI;IAIJ;;;OAGG;IACH,QAAQ;IAIR,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;WAIZ,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;CAIvC"}

package/base/Logger.js

@@ -1,49 +0,0 @@
-"use strict";
-/*
- *
- * Copyright (c) 2022.. Chy Bilgisayar Bilisim
- * Author: Cihan Ozturk
- *  E-mail: cihan@chy.com.tr
- *  Github:https://github.com/cihan53/
- *
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Logger = void 0;
-const log4js = require("log4js");
-class Logger {
-    constructor() {
-        var _a;
-        this.configs = (_a = require('./log/config/log4js.json')) !== null && _a !== void 0 ? _a : {};
-    }
-    init() {
-    }
-    /**
-     *
-     * @constructor
-     */
-    Provider() {
-        return log4js;
-    }
-    static logs(...args) {
-        return log4js.getLogger(this.name);
-    }
-    static debug(...args) {
-        Logger.logs().debug(...arguments);
-    }
-    static info(...args) {
-        Logger.logs().info(...arguments);
-    }
-    static warn(...args) {
-        Logger.logs().warn(...arguments);
-    }
-    static error(...args) {
-        Logger.logs().error(...arguments);
-    }
-    static fatal(...args) {
-        Logger.logs().fatal(...arguments);
-    }
-    static warning(...args) {
-        Logger.logs().warn(...arguments);
-    }
-}
-exports.Logger = Logger;