@coderich/sandman 0.0.8 → 0.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coderich/sandman",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "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,11 +52,16 @@ 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)));
   }
 
-  watch(dir = this.#configDir) {
+  watch(dir = this.#configDir, onSave) {
     const watcher = Chokidar.watch(dir, {
       awaitWriteFinish: true,
       ignoreInitial: true,
@@ -59,7 +75,7 @@ module.exports = class ConfigClient extends Config {
         const api = Config.parseFile(path);
         if (key) this.set(key, api);
         else this.merge(api); // index.yaml
-        // if (api.request) this.emit('save', { key, api });
+        if (api.request) onSave({ key, api });
       } else if (['unlink', 'unlinkDir'].includes(event)) {
         this.del(key);
       }
@@ -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/ReadlineService.js

@@ -1,10 +1,11 @@
 const Readline = require('readline');
 const Util = require('@coderich/util');
+const UtilService = require('./UtilService');
 
 exports.createInterface = (cli, configClient) => {
   const captureInfo = {
     line: '',
-    lastToken: '',
+    lastArg: '',
     candidates: [],
     tabCounter: 0,
     candidateIndex: -1,
@@ -16,53 +17,37 @@ exports.createInterface = (cli, configClient) => {
     output: process.stdout,
     terminal: true,
     completer: (line) => {
+      const [cmd, ...args] = UtilService.parseArgs(line);
+
       // Show available CLI commands
-      if (!line) return [Object.keys(cli), line];
+      if (!cmd) return [Object.keys(cli), line];
+      if (line.split(' ').length < 2) return [Object.keys(cli).filter(key => key.toLowerCase().startsWith(cmd.toLowerCase())), line];
 
-      const tokens = line.split(' ');
-      const lastToken = tokens.at(-1);
-      const paths = lastToken.split('.');
-      const path = paths.at(-1);
+      const lastArg = args.at(-1) || '';
+      const lastPaths = lastArg.split('.');
+      const lastPath = lastPaths.at(-1); // current typing
+      const previousPath = lastPaths.slice(0, -1).join('.');
 
       // Specific request.data selector
-      if (lastToken.startsWith('.')) {
-        const api = configClient.get(tokens.at(-2));
-        if (!api?.request) return [[], 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];
+      if (lastArg.startsWith('.')) {
+        const requestAttrPath = `${args.at(-2)}.request${previousPath}`;
+        const requestAttrObj = configClient.get(requestAttrPath, {});
+        return [Object.keys(requestAttrObj).filter(key => key.toLowerCase().startsWith(lastPath.toLowerCase())), lastPath];
       }
 
       //
       const flatKeys = Object.keys(Util.flatten(configClient.get()));
+      const requestKeys = flatKeys.map(k => k.substring(0, Math.max(k.indexOf('.request'), 0))).filter(Boolean);
 
-      // These keys follow the typing of the user
-      const startsWithCandidates = Array.from(new Set(flatKeys.map((flatKey) => {
-        return flatKey.split('.').slice(0, paths.length).join('.');
-      }))).filter((c) => {
-        return c.toLowerCase().startsWith(lastToken.toLowerCase());
-      }); // .map(p => p.split('.').at(-1)); // Here!
-
-      // These are shortcut keys to requests
-      const requestKeyCandidates = Array.from(new Set(flatKeys.map((flatKey) => {
-        const keys = flatKey.split('.');
-        const index = keys.indexOf('request');
-        return index && flatKey.split('.').slice(0, index).join('.');
-        // const typedPath = keys.slice(0, paths.length - 1).join('.');
-        // const autocompletePath = keys.slice(paths.length - 1, index).join('.');
-        // return index > 0 && lastToken.toLowerCase().startsWith(typedPath.toLowerCase()) && autocompletePath;
-      }).filter(Boolean))).filter((c) => {
-        return c.toLowerCase().includes(lastToken.toLowerCase());
-        // return c.toLowerCase().includes(path.toLowerCase());
-      });
+      const candidates = Array.from(new Set(requestKeys
+        .filter(requestKey => requestKey.toLowerCase().startsWith(previousPath.toLowerCase()))
+        .filter(requestKey => requestKey.split('.').slice(lastPaths.length - 1).join('.').toLowerCase().includes(lastPath.toLowerCase()))
+        // .concat(Object.keys(cli).filter(key => key.toLowerCase().startsWith(cmd.toLowerCase())))
+      ));
 
-      const candidates = Array.from(new Set(startsWithCandidates.concat(requestKeyCandidates)));
-      if (captureInfo.captureCandidates) { captureInfo.candidates = candidates; captureInfo.line = line; captureInfo.lastToken = lastToken; captureInfo.candidateIndex = -1; }
-      if (candidates.length === 1 && candidates[0] === lastToken) return [[], lastToken];
-      return [candidates, lastToken];
+      if (captureInfo.captureCandidates && lastArg) { captureInfo.candidates = candidates; captureInfo.line = line; captureInfo.lastArg = lastArg; captureInfo.candidateIndex = -1; }
+      if (captureInfo.tabbing || (candidates.length === 1 && candidates[0] === lastArg)) return [[], lastArg];
+      return [candidates, lastArg];
     },
   });
 
@@ -76,11 +61,14 @@ exports.createInterface = (cli, configClient) => {
       Readline.clearLine(process.stdout, 0);
       readline.prompt();
     } else if (captureInfo.tabCounter > 2 && captureInfo.candidates.length) {
+      captureInfo.tabbing = true;
       const candidate = captureInfo.candidates[captureInfo.candidateIndex = ++captureInfo.candidateIndex % captureInfo.candidates.length];
-      const value = captureInfo.line.replace(captureInfo.lastToken, candidate);
+      const value = captureInfo.line.replace(captureInfo.lastArg, candidate);
       readline.line = value;
       readline.cursor = value.length;
       readline.prompt(true);
+    } else {
+      captureInfo.tabbing = false;
     }
   });
 

package/src/Sandman.js

@@ -1,5 +1,6 @@
 const EventEmitter = require('events');
 const ReadlineService = require('./ReadlineService');
+const UtilService = require('./UtilService');
 const FetchService = require('./FetchService');
 const ConfigClient = require('./ConfigClient');
 
@@ -12,16 +13,16 @@ module.exports = class Sandman extends EventEmitter {
     this.#configClient = new ConfigClient(configDir);
     this.#createCLI();
     this.#readline = ReadlineService.createInterface(this.#cli, this.#configClient);
+    this.#configClient.watch(configDir, event => this.emit('save', event));
 
     this.#readline.on('line', async (line) => {
       if (!line) return this.#prompt();
-      const [cmd, ...args] = Sandman.parseArgs(line.trim());
+      const [cmd, ...args] = UtilService.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);
     });
 
-    this.#configClient.watch();
     this.#prompt();
   }
 
@@ -65,6 +66,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 +88,10 @@ module.exports = class Sandman extends EventEmitter {
         return value;
       },
     }), {
+      '/': {
+        configurable: true,
+        value: (...args) => this.#run(...args),
+      },
       run: {
         configurable: true,
         value: (...args) => this.#run(...args),
@@ -99,22 +105,4 @@ module.exports = class Sandman extends EventEmitter {
       },
     });
   }
-
-  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;
-  }
 };

package/src/UtilService.js

@@ -0,0 +1,17 @@
+exports.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;
+};