@coderich/sandman 0.0.8 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coderich/sandman",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "main": "index.js",
   "publishConfig": {
     "access": "public"

package/src/ConfigClient.js

@@ -1,3 +1,4 @@
+const FS = require('fs');
 const Path = require('path');
 const Chokidar = require('chokidar');
 const Config = require('@coderich/config');
@@ -10,7 +11,17 @@ module.exports = class ConfigClient extends Config {
 
   constructor(configDir) {
     super({}, {
-      file: name => `file-${name}`,
+      file: (name) => {
+        if (name == null || `${name}` === 'undefined') return name;
+        const path = Path.resolve(process.cwd(), name);
+        try {
+          const buffer = FS.readFileSync(path);
+          return new File([buffer], name);
+        } catch {
+          process.stdout.write(`Unable to load file: "${name}"\n`);
+          return undefined;
+        }
+      },
     });
     this.#configDir = configDir;
     this.mergeDir();
@@ -41,6 +52,11 @@ module.exports = class ConfigClient extends Config {
     return super.set(key, value);
   }
 
+  del(key = '') {
+    if (key.startsWith?.('.')) return Util.set(this.toObject().dictionary['.'], [key.substring(1)], undefined);
+    return super.del(key);
+  }
+
   mergeDir(dir = this.#configDir) {
     return this.merge(Config.parseDir(dir, (...args) => this.#ignore(...args)));
   }
@@ -72,11 +88,21 @@ module.exports = class ConfigClient extends Config {
     const flatData = key === undefined ? Util.flatten(data) : Util.flatten({ [key]: data });
     const apiKeys = Array.from(new Set(Object.keys(flatData).map(k => k.substring(0, Math.max(k.indexOf('.request'), 0))).filter(Boolean)));
 
+    const mergeKeys = Object.keys(this.#mergeData).reverse();
+
     apiKeys.forEach((apiKey) => {
-      Reflect.ownKeys(this.#mergeData).forEach((mergeKey) => {
-        if (mergeKey === dataSymbol) flatData[apiKey] = { ...this.#mergeData[dataSymbol], ...flatData[apiKey] };
-        else if (apiKey.startsWith(mergeKey)) flatData[apiKey] = { ...this.#mergeData[mergeKey][dataSymbol], ...flatData[apiKey] };
+      mergeKeys.forEach((mergeKey) => {
+        if (apiKey.startsWith(mergeKey)) {
+          Object.entries(this.#mergeData[mergeKey][dataSymbol]).forEach(([k, v]) => {
+            flatData[`${apiKey}.${k}`] ??= v;
+          });
+        }
       });
+      if (this.#mergeData[dataSymbol]) {
+        Object.entries(this.#mergeData[dataSymbol]).forEach(([k, v]) => {
+          flatData[`${apiKey}.${k}`] ??= v;
+        });
+      }
     });
 
     const unflatData = Util.unflatten(flatData);

package/src/Sandman.js

@@ -65,6 +65,7 @@ module.exports = class Sandman extends EventEmitter {
       raw: key => this.#configClient.raw(key),
       get: (...args) => this.#configClient.get(...args),
       set: (...args) => this.#configClient.set(...args),
+      del: (...args) => this.#configClient.del(...args),
       curl: key => FetchService.toCURL(this.#configClient.get(key, {}).request),
       quit: () => process.exit(),
     }, {
@@ -86,6 +87,10 @@ module.exports = class Sandman extends EventEmitter {
         return value;
       },
     }), {
+      '/': {
+        configurable: true,
+        value: (...args) => this.#run(...args),
+      },
       run: {
         configurable: true,
         value: (...args) => this.#run(...args),