@coderich/sandman 0.0.7 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coderich/sandman",
-  "version": "0.0.7",
+  "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');
@@ -9,31 +10,53 @@ module.exports = class ConfigClient extends Config {
   #configDir; #mergeData = {};
 
   constructor(configDir) {
-    super();
+    super({}, {
+      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();
   }
 
   get(key, ...args) {
-    const data = super.get(key, ...args);
-    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)));
-
-    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] };
-      });
-    });
+    if (key?.startsWith?.('.')) {
+      const { dictionary } = this.toObject();
+      const k = key.substring(1);
+      return k.length ? Util.get(dictionary['.'], k) : dictionary['.'];
+    }
 
-    const unflatData = Util.unflatten(flatData);
-    const rawData = key === undefined ? unflatData : Util.get(unflatData, key);
-    super.set(dataSymbol, rawData);
+    const data = super.get(key, ...args);
+    const mergedData = this.#mergeMergeData(key, data);
+    this.set(dataSymbol, mergedData);
     const resolvedData = super.get(dataSymbol);
-    super.del(dataSymbol);
+    this.del(dataSymbol);
     return resolvedData;
   }
 
+  raw(key) {
+    const data = Util.get(this.toObject().config, key);
+    return this.#mergeMergeData(key, data);
+  }
+
+  set(key = '', value) {
+    if (key.startsWith?.('.')) return this.resolve({ '.': { [key.substring(1)]: value } });
+    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)));
   }
@@ -61,6 +84,31 @@ module.exports = class ConfigClient extends Config {
     return watcher;
   }
 
+  #mergeMergeData(key, data) {
+    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) => {
+      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);
+    return key === undefined ? unflatData : Util.get(unflatData, key);
+  }
+
   #ignore({ name, filepath, paths }) {
     if (name.startsWith('.')) return true;
 
@@ -83,29 +131,6 @@ module.exports = class ConfigClient extends Config {
     return { ...parsed, filepath, paths, key };
   };
 
-  // exports.decorateRequest = (mergeData, key, request) => {
-  //   const toMerge = key.split('.').reduce((prev, k, i, arr) => {
-  //     const $key = arr.slice(0, i).join('.');
-  //     return Merge({}, prev, mergeData[$key]?.request);
-  //   }, Merge({}, mergeData.request));
-
-  //   return Merge({}, toMerge, request);
-  // };
-
-  // #get(key, ...rest) {
-  //   const { config } = this.#configClient.toObject();
-  //   const value = get(config, key);
-
-  //   if (value?.request) {
-  //     const $request = FetchService.decorateRequest(this.#mergeData, key, value.request);
-  //     const request = this.#configClient.resolve({ vars: value.request.vars }).set(resolveSymbol, $request).get(resolveSymbol);
-  //     this.#configClient.del(resolveSymbol);
-  //     return Merge({}, value, { request });
-  //   }
-
-  //   return this.#configClient.get(key, ...rest);
-  // }
-
   // mergeConfigDir(dir) {
   //   const ignored = (parsed) => {
   //     if (parsed.name.startsWith('.')) return true;

package/src/ReadlineService.js

@@ -1,5 +1,5 @@
 const Readline = require('readline');
-const { get, flatten } = require('@coderich/util');
+const Util = require('@coderich/util');
 
 exports.createInterface = (cli, configClient) => {
   const captureInfo = {
@@ -28,13 +28,16 @@ exports.createInterface = (cli, configClient) => {
       if (lastToken.startsWith('.')) {
         const api = configClient.get(tokens.at(-2));
         if (!api?.request) return [[], path];
-        const dataPath = ['request'].concat(paths.slice(1, -1)).join('.');
-        const data = get(api, dataPath, {});
-        return [Object.keys(data).filter(k => k.toLowerCase().startsWith(path.toLowerCase())), path];
+        const { config } = configClient.toObject();
+        const conf = Util.get(config, tokens.at(-2), {});
+        return [Object.keys(conf), path];
+        // const dataPath = ['request'].concat(paths.slice(1, -1)).join('.');
+        // const data = get(api, dataPath, {});
+        // return [Object.keys(data).filter(k => k.toLowerCase().startsWith(path.toLowerCase())), path];
       }
 
       //
-      const flatKeys = Object.keys(flatten(configClient.get()));
+      const flatKeys = Object.keys(Util.flatten(configClient.get()));
 
       // These keys follow the typing of the user
       const startsWithCandidates = Array.from(new Set(flatKeys.map((flatKey) => {

package/src/Sandman.js

@@ -15,7 +15,7 @@ module.exports = class Sandman extends EventEmitter {
 
     this.#readline.on('line', async (line) => {
       if (!line) return this.#prompt();
-      const [cmd, ...args] = line.trim().split(' ');
+      const [cmd, ...args] = Sandman.parseArgs(line.trim());
       const info = this.#cli[cmd] ? { cmd, args } : { cmd: 'run', args: [cmd, ...args] };
       const value = await Promise.resolve(this.#cli[info.cmd](...info.args)).catch(e => e);
       return this.emit(cmd, value);
@@ -26,15 +26,7 @@ module.exports = class Sandman extends EventEmitter {
   }
 
   cli() {
-    return Object.defineProperties(this.#cli, {
-      resolve: {
-        value: (...args) => {
-          this.#configClient.resolve(...args);
-          return this.#cli;
-        },
-        configurable: true,
-      },
-    });
+    return this.#cli;
   }
 
   #run(key) {
@@ -61,14 +53,19 @@ module.exports = class Sandman extends EventEmitter {
     return this;
   }
 
+  set(key, value) {
+    if (key.startsWith?.('.')) this.resolve({ '.': { [key.substring(1)]: value } });
+    return super.set(key, value);
+  }
+
   #createCLI() {
     const self = this;
 
-    this.#cli = new Proxy({
-      run: (...args) => this.#run(...args),
+    this.#cli = Object.defineProperties(new Proxy({
+      raw: key => this.#configClient.raw(key),
       get: (...args) => this.#configClient.get(...args),
-      set: (key = '', value = null) => this.#configClient.set(key, value),
-      del: (key = '') => this.#configClient.del(key),
+      set: (...args) => this.#configClient.set(...args),
+      del: (...args) => this.#configClient.del(...args),
       curl: key => FetchService.toCURL(this.#configClient.get(key, {}).request),
       quit: () => process.exit(),
     }, {
@@ -89,6 +86,40 @@ module.exports = class Sandman extends EventEmitter {
 
         return value;
       },
+    }), {
+      '/': {
+        configurable: true,
+        value: (...args) => this.#run(...args),
+      },
+      run: {
+        configurable: true,
+        value: (...args) => this.#run(...args),
+      },
+      resolve: {
+        configurable: true,
+        value: (...args) => {
+          this.#configClient.resolve(...args);
+          return this.#cli;
+        },
+      },
     });
   }
+
+  static parseArgs(line) {
+    const regex = /"([^"]*)"|'([^']*)'|(\S+)/g;
+    const args = [];
+    let match;
+
+    while ((match = regex.exec(line)) !== null) {
+      if (match[1] !== undefined) {
+        args.push(match[1]); // double-quoted
+      } else if (match[2] !== undefined) {
+        args.push(match[2]); // single-quoted
+      } else if (match[3] !== undefined) {
+        args.push(match[3]); // bare word
+      }
+    }
+
+    return args;
+  }
 };