binhend 2.2.3 → 2.2.4

package/index.js

@@ -14,11 +14,16 @@ const { cors, trycatch } = require('./packages/middlewares');
 
 const { HTTPS } = require('./packages/https');
 
-const { config, ConfigLoader } = require('./packages/config');
+const { config, ConfigLoader } = require('./packages/config/src/configuration');
 
 const { WebBuild, binh } = require('./packages/web');
 
-const { create: CSD, Controller: CinCSD, Service: SinCSD, DAO: DinCSD } = require('./packages/csd');
+// const { create: CSD, Controller: CinCSD, Service: SinCSD, DAO: DinCSD } = require('./packages/csd/src/');
+
+const CSD = require('./packages/csd/src/csd');
+const CinCSD = require('./packages/csd/src/controller');
+const SinCSD = require('./packages/csd/src/service');
+const DinCSD = require('./packages/csd/src/dao');
 
 const { crypto } = require('./packages/crypto');
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "binhend",
-    "version": "2.2.3",
+    "version": "2.2.4",
     "description": "",
     "main": "index.js",
     "author": "Nguyen Duc Binh",

package/packages/config/index.js

@@ -1,145 +1,3 @@
-
-const fs = require('fs');
-const path = require('path');
-const { isEmptyArray, isArray, isObject, mustString, isNullish, isString } = require('@binhend/types');
-
-// @ts-ignore
-function ConfigLoader(configObject, { rootPath } = {}) {
-    const configs = configObject || {};
-
-    rootPath = mustString(rootPath) || require.main.path;
-
-    function getConfigPosition(key) {
-        return key == undefined ? configs : configs[key] || (configs[key] = {});
-    };
-
-    // @ts-ignore
-    this.object = (object, { key, filter: filters, overwrite, use } = {}) => {
-        let config = getConfigPosition(key);
-        let filtered = isArray(filters) ? filter(object, filters) : object;
-
-        remap(object, use);
-        assign(config, filtered, overwrite);
-
-        return this;
-    };
-
-    this.cli = (options) => {
-        return this.object(cli(), options);
-    };
-
-    this.file = (filepath, options) => {
-        let filePath = path.resolve(rootPath, filepath);
-        return this.object(file(filePath, options?.encoding), options);
-    };
-}
-
-ConfigLoader.cli = cli;
-ConfigLoader.file = file;
-ConfigLoader.require = require.main.require;
-
-function filter(object, filterKeys) {
-    if (!isObject(object) || isEmptyArray(filterKeys)) return {};
-
-    var filtered = {};
-
-    filterKeys.forEach((field) => {
-        if (object.hasOwnProperty(field)) {
-            filtered[field] = object[field];
-        }
-    });
-
-    return filtered;
+module.exports = {
+    ...require('./src/configuration'),
 };
-
-function assign(config, filtered, overwrite) {
-    if (overwrite !== false) {
-        Object.assign(config, filtered);
-    }
-    else for (var key in filtered) {
-        if (isNullish(config[key])) {
-            config[key] = filtered[key];
-        }
-    }
-    return config;
-};
-
-function remap(object, use) {
-    if (!isString(use)) return object;
-
-    for (var key in object) {
-        const value = object[key];
-        const hasValue = isObject(value) && value.hasOwnProperty(use);
-        if (hasValue) object[key] = value[use];
-        // else if value is not an object or has no "env" key, then the desired value is itself => no new assignment
-    }
-
-    return object;
-};
-
-function cli() {
-    return processKeyValueStrings(process.argv);
-}
-
-function file(filepath, encoding) {
-    encoding = encoding || 'utf8';
-
-    try {
-        var fileExtension = path.parse(filepath).ext;
-
-        switch (fileExtension) {
-            case '.js':
-            case '.json':
-                return ConfigLoader.require(filepath);
-
-            default:
-                var source = fs.readFileSync(filepath, { encoding });
-                // @ts-ignore
-                source = source.replace(/\r\n?/mg, '\n');
-                // @ts-ignore
-                var lines = source.split('\n');
-
-                return processKeyValueStrings(lines);
-        }
-    }
-    catch (error) {
-        console.log(`[BINHEND] Failed loading config from: ${filepath}`);
-        console.log('[BINHEND] Details:', error);
-        return {};
-    }
-}
-
-function processKeyValueStrings(strings) {
-    var output = {};
-
-    if (strings == undefined || !strings.length) {
-        return output;
-    }
-
-    var regex_is_comment = /^#/;
-
-    strings.forEach(function (string) {
-        if (regex_is_comment.test(string.trim())) return;
-
-        var parsed = parseKeyValue(string);
-        if (parsed.success) {
-            output[parsed.key] = parsed.value;
-        }
-    });
-
-    return output;
-}
-
-function parseKeyValue(string) {
-    var delimiter = '=';
-
-    var parts = string.split(delimiter);
-    if (parts.length < 2) return { success: false };
-
-    var key = parts[0];
-    var value = parts.splice(1).join(delimiter);
-
-    return { key, value, success: true };
-}
-
-module.exports = { ConfigLoader, config: {} };