configre 1.2.0 → 1.2.4

package/index.js

@@ -1,20 +1,27 @@
 const fs = require("fs");
+const path = require("path");
 const os = require("os");
-const obj = require("lodash/object");
+const obj = require("./merge");
 const log = require("lemonlog")("Configre");
 
 class ConfigreClass {
-    constructor(path = __dirname + "/../../config") {
+    constructor(pathOrDir = __dirname + "/../../config") {
+        const dir = path.join(pathOrDir);
+        const isNested = (ConfigreClass._nesting || 0) > 0;
+        ConfigreClass._nesting = (ConfigreClass._nesting || 0) + 1;
+
         this.defaultSettings = this.tryRequire([
-            path,
-            path + '/index.cjs',
-            path + '.cjs'
+            dir,
+            path.join(dir, "index.cjs"),
+            pathOrDir + ".cjs"
         ]);
-        
-        this.dirname = path;
+
+        this.dirname = dir;
+        this._isNested = isNested;
         const configArg = process.argv.find(arg => arg.startsWith('--config='));
         this.profile = configArg ? configArg.slice('--config='.length) : os.hostname();
         this.profileSettings = this.loadProfileSettings();
+        ConfigreClass._nesting -= 1;
     }
 
     // Helper method to try requiring files with different extensions or paths
@@ -32,7 +39,7 @@ class ConfigreClass {
     // Helper method to try loading a file with .cjs extension only
     tryRequireWithExtensions(basePath) {
         const ext = '.cjs';
-        const fullPath = basePath + ext;
+        const fullPath = path.join(basePath + ext);
         if (fs.existsSync(fullPath)) {
             return { path: fullPath, module: require(fullPath) };
         }
@@ -41,19 +48,21 @@ class ConfigreClass {
 
     loadProfileSettings() {
         const basePaths = [
-            { base: `${this.dirname}/${this.profile}.dev`, type: "DEV CONFIG" },
-            { base: `${this.dirname}/${this.profile}`, type: "PRO CONFIG" }
+            { base: path.join(this.dirname, `${this.profile}.dev`), type: "DEV CONFIG" },
+            { base: path.join(this.dirname, this.profile), type: "PRO CONFIG" }
         ];
 
         for (const { base, type } of basePaths) {
             const result = this.tryRequireWithExtensions(base);
             if (result) {
-                log.warn(result.path, type);
+                if (!this._isNested) log.warn(result.path, type);
                 return result.module;
             }
         }
 
-        log.warn(`${this.dirname}/${this.profile}.cjs`, "NOT FOUND, USING DEFAULTS");
+        if (!this._isNested) {
+            log.warn(path.join(this.dirname, `${this.profile}.cjs`), "NOT FOUND, USING DEFAULTS");
+        }
         return {};
     }
 

package/merge.js

@@ -0,0 +1,81 @@
+function isPlainObject(value) {
+    if (value === null || typeof value !== "object") {
+        return false;
+    }
+    const proto = Object.getPrototypeOf(value);
+    return proto === Object.prototype || proto === null;
+}
+
+function isUnsafeKey(key) {
+    return key === "__proto__" || key === "constructor" || key === "prototype";
+}
+
+function mergeArray(target, source) {
+    const result = target.slice();
+
+    for (let index = 0; index < source.length; index += 1) {
+        const srcValue = source[index];
+        const objValue = result[index];
+
+        if (Array.isArray(srcValue)) {
+            result[index] = mergeArray(Array.isArray(objValue) ? objValue : [], srcValue);
+            continue;
+        }
+
+        if (isPlainObject(srcValue)) {
+            result[index] = baseMerge(isPlainObject(objValue) ? objValue : {}, srcValue);
+            continue;
+        }
+
+        if (srcValue !== undefined || result[index] === undefined) {
+            result[index] = srcValue;
+        }
+    }
+
+    return result;
+}
+
+function baseMerge(object, source) {
+    if (object === source || source === null || typeof source !== "object") {
+        return object;
+    }
+
+    for (const key in source) {
+        if (isUnsafeKey(key)) {
+            continue;
+        }
+
+        const srcValue = source[key];
+        const objValue = object[key];
+
+        if (Array.isArray(srcValue)) {
+            object[key] = mergeArray(Array.isArray(objValue) ? objValue : [], srcValue);
+            continue;
+        }
+
+        if (isPlainObject(srcValue)) {
+            object[key] = baseMerge(isPlainObject(objValue) ? objValue : {}, srcValue);
+            continue;
+        }
+
+        if (srcValue !== undefined || object[key] === undefined) {
+            object[key] = srcValue;
+        }
+    }
+
+    return object;
+}
+
+function merge(object, ...sources) {
+    const output = (object !== null && typeof object === "object") ? object : {};
+
+    for (const source of sources) {
+        baseMerge(output, source);
+    }
+
+    return output;
+}
+
+module.exports = {
+    merge
+};

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "configre",
-  "version": "1.2.0",
+  "version": "1.2.4",
   "description": "🔧 Effortlessly Tailor Your Settings",
   "dependencies": {
-    "lemonlog": "^1.0.2",
-    "lodash": "^4.17.21"
+    "lemonlog": "^1.2.2"
   },
   "main": "index.js",
   "keywords": [
@@ -34,4 +33,4 @@
     "url": "https://github.com/clasen/Configre/issues"
   },
   "homepage": "https://github.com/clasen/Configre#readme"
-}
+}