configre 1.0.4 → 1.0.8

package/README.md

@@ -18,7 +18,7 @@ To get started with Configre, follow these steps:
    First, make sure you have `Node.js` installed. Then, add Configre to your project:
 
    ```bash
-   npm install Configre --save
+   npm install configre --save
    ```
 
 2. **Setup Your Configuration Files**
@@ -34,7 +34,7 @@ To get started with Configre, follow these steps:
    Import and use Configre to load your configurations:
 
    ```javascript
-   const cfg = require("Configre")(__dirname + "/config");
+   const cfg = require("Configre")(); // default dir '/config'
    console.log(cfg.db); // Access your db configuration
    ```
 

package/core.js

@@ -0,0 +1,36 @@
+const fs = require("fs");
+const os = require("os");
+const obj = require("lodash/object");
+
+class ConfigreCore {
+    constructor(path, log) {
+        this.dirname = path;
+        this.log = log;
+        this.profile = process.argv.length > 2 ? process.argv[2] : os.hostname();
+        this.devFile = `${this.dirname}/${this.profile}.dev.js`;
+        this.localFile = `${this.dirname}/${this.profile}.js`;
+    }
+
+    getFiles() {
+        return {
+            devFile: this.devFile,
+            localFile: this.localFile,
+            indexFile: `${this.dirname}/index.js`
+        };
+    }
+
+    checkFileExists(file) {
+        return fs.existsSync(file);
+    }
+
+    merge(defaultSettings, profileSettings) {
+        return obj.merge({}, defaultSettings, profileSettings);
+    }
+
+    logConfig(file, type) {
+        this.log.warn(file, type);
+    }
+}
+
+module.exports = ConfigreCore;
+

package/demo/module/config/hostname.js

@@ -0,0 +1,7 @@
+export default {
+    db: {
+        user: 'john',
+        password: 'johns-password'
+    }
+}
+

package/demo/module/config/index.js

@@ -0,0 +1,11 @@
+export default {
+    db: {
+        host: 'localhost',
+        user: 'myuser',
+        password: 'mypassword'
+    },
+    api: {
+        key: 'development-api-key'
+    }
+}
+

package/demo/module/demo.js

@@ -0,0 +1,11 @@
+import Configre from "../../index.mjs";
+import lemonlog from "lemonlog";
+import { fileURLToPath } from "url";
+import { dirname } from "path";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const log = lemonlog("Configre");
+
+const cfg = await Configre(__dirname + "/config");
+log.info(cfg.db);

package/demo/module/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "configre-module-demo",
+  "version": "1.0.0",
+  "type": "module",
+  "private": true
+}
+

package/index.js

@@ -1,33 +1,30 @@
-const fs = require("fs");
-const os = require("os");
-const obj = require("lodash/object");
 const log = require("lemonlog")("Configre");
+const ConfigreCore = require("./core");
 
 class ConfigreClass {
-    constructor(path) {
+    constructor(path = __dirname + "/../../config") {
+        this.core = new ConfigreCore(path, log);
         this.defaultSettings = require(path);
-        this.dirname = path;
-        this.profile = process.argv.length > 2 ? process.argv[2] : os.hostname();
-        this.devFile = `${this.dirname}/${this.profile}.dev.js`;
-        this.localFile = `${this.dirname}/${this.profile}.js`;
         this.profileSettings = this.loadProfileSettings();
     }
 
     loadProfileSettings() {
-        if (fs.existsSync(this.devFile)) {
-            log.warn(this.devFile, "DEV CONFIG");
-            return require(this.devFile);
-        } else if (fs.existsSync(this.localFile)) {
-            log.warn(this.localFile, "PRO CONFIG");
-            return require(this.localFile);
+        const { devFile, localFile } = this.core.getFiles();
+        
+        if (this.core.checkFileExists(devFile)) {
+            this.core.logConfig(devFile, "DEV CONFIG");
+            return require(devFile);
+        } else if (this.core.checkFileExists(localFile)) {
+            this.core.logConfig(localFile, "PRO CONFIG");
+            return require(localFile);
         } else {
-            log.warn(this.localFile, "NOT FOUND, USING DEFAULTS");
+            this.core.logConfig(localFile, "NOT FOUND, USING DEFAULTS");
             return {};
         }
     }
 
     get() {
-        return obj.merge({}, this.defaultSettings, this.profileSettings);
+        return this.core.merge(this.defaultSettings, this.profileSettings);
     }
 }
 

package/index.mjs

@@ -0,0 +1,53 @@
+import lemonlog from "lemonlog";
+import { fileURLToPath } from "url";
+import { dirname } from "path";
+import { pathToFileURL } from "url";
+import { createRequire } from "module";
+
+const require = createRequire(import.meta.url);
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const log = lemonlog("Configre");
+const ConfigreCore = require("./core.js");
+
+class ConfigreClass {
+    constructor(path = __dirname + "/../../config") {
+        this.core = new ConfigreCore(path, log);
+    }
+
+    async loadDefaultSettings() {
+        const { indexFile } = this.core.getFiles();
+        const module = await import(pathToFileURL(indexFile).href);
+        return module.default;
+    }
+
+    async loadProfileSettings() {
+        const { devFile, localFile } = this.core.getFiles();
+        
+        if (this.core.checkFileExists(devFile)) {
+            this.core.logConfig(devFile, "DEV CONFIG");
+            const module = await import(pathToFileURL(devFile).href);
+            return module.default;
+        } else if (this.core.checkFileExists(localFile)) {
+            this.core.logConfig(localFile, "PRO CONFIG");
+            const module = await import(pathToFileURL(localFile).href);
+            return module.default;
+        } else {
+            this.core.logConfig(localFile, "NOT FOUND, USING DEFAULTS");
+            return {};
+        }
+    }
+
+    async get() {
+        const defaultSettings = await this.loadDefaultSettings();
+        const profileSettings = await this.loadProfileSettings();
+        return this.core.merge(defaultSettings, profileSettings);
+    }
+}
+
+// Wrapper function to support both constructor and function usage
+async function Configre(path) {
+    return await new ConfigreClass(path).get();
+}
+
+export default Configre;

package/package.json

@@ -1,12 +1,18 @@
 {
   "name": "configre",
-  "version": "1.0.4",
+  "version": "1.0.8",
   "description": "🔧 Effortlessly Tailor Your Settings",
+  "main": "index.js",
+  "exports": {
+    ".": {
+      "import": "./index.mjs",
+      "require": "./index.js"
+    }
+  },
   "dependencies": {
     "lemonlog": "^1.0.2",
     "lodash": "^4.17.21"
   },
-  "main": "index.js",
   "keywords": [
     "json",
     "config",
@@ -21,7 +27,8 @@
     "inheritance",
     "objects",
     "user-friendly",
-    "intuitive"
+    "intuitive",
+    "clasen"
   ],
   "author": "Martin Clasen",
   "license": "MIT",