@coderich/sandman 0.0.10 → 0.0.12

package/package.json

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

package/src/ConfigClient.js

@@ -42,7 +42,7 @@ module.exports = class ConfigClient extends Config {
     return resolvedData;
   }
 
-  raw(key) {
+  raw(key = '') {
     const data = Util.get(this.toObject().config, key);
     return this.#mergeMergeData(key, data);
   }

package/src/ReadlineService.js

@@ -26,7 +26,8 @@ exports.createInterface = (cli, configClient) => {
       const lastArg = args.at(-1) || '';
       const lastPaths = lastArg.split('.');
       const lastPath = lastPaths.at(-1); // current typing
-      const previousPath = lastPaths.slice(0, -1).join('.');
+      const previousPaths = lastPaths.slice(0, -1);
+      const previousPath = previousPaths.join('.');
 
       // Specific request.data selector
       if (lastArg.startsWith('.')) {
@@ -40,9 +41,14 @@ exports.createInterface = (cli, configClient) => {
       const requestKeys = flatKeys.map(k => k.substring(0, Math.max(k.indexOf('.request'), 0))).filter(Boolean);
 
       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())))
+        .filter((requestKey) => {
+          const requestPaths = requestKey.split('.').map(rp => rp.toLowerCase());
+          return previousPaths.every(path => requestPaths.includes(path.toLowerCase()));
+        })
+        .filter((requestKey) => {
+          const requestPaths = requestKey.split('.');
+          return requestPaths.slice(lastPaths.length - 1).join('.').toLowerCase().includes(lastPath.toLowerCase());
+        })
       ));
 
       if (captureInfo.captureCandidates && lastArg) { captureInfo.candidates = candidates; captureInfo.line = line; captureInfo.lastArg = lastArg; captureInfo.candidateIndex = -1; }

package/src/Sandman.js

@@ -1,26 +1,31 @@
+const Path = require('path');
 const EventEmitter = require('events');
+const { spawn } = require('child_process');
 const ReadlineService = require('./ReadlineService');
 const UtilService = require('./UtilService');
 const FetchService = require('./FetchService');
 const ConfigClient = require('./ConfigClient');
 
+const cmdNotFound = Symbol('cmdNotFound');
+
 module.exports = class Sandman extends EventEmitter {
-  #configClient; #options; #readline; #cli; #cliCounter = 0;
+  #configClient; #options; #readline; #cli; #cliCounter = 0; #configDir;
 
   constructor(configDir, options) {
     super();
     this.#options = options;
-    this.#configClient = new ConfigClient(configDir);
+    this.#configDir = configDir;
+    this.#configClient = new ConfigClient(this.#configDir);
     this.#createCLI();
     this.#readline = ReadlineService.createInterface(this.#cli, this.#configClient);
-    this.#configClient.watch(configDir, event => this.emit('save', event));
+    this.#configClient.watch(this.#configDir, event => this.emit('save', event));
 
     this.#readline.on('line', async (line) => {
       if (!line) return this.#prompt();
-      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);
+      const [cmd, key, ...args] = UtilService.parseArgs(line.trim());
+      const $cmd = Object.keys(this.#cli).includes(cmd) ? cmd : cmdNotFound;
+      const value = await Promise.resolve(this.#cli[$cmd](key, ...args)).catch(e => e);
+      return this.emit($cmd, value);
     });
 
     this.#prompt();
@@ -63,10 +68,17 @@ module.exports = class Sandman extends EventEmitter {
     const self = this;
 
     this.#cli = Object.defineProperties(new Proxy({
-      raw: key => this.#configClient.raw(key),
-      get: (...args) => this.#configClient.get(...args),
-      set: (...args) => this.#configClient.set(...args),
-      del: (...args) => this.#configClient.del(...args),
+      '/': (...args) => this.#run(...args),
+      edit: (key, ext = '.yaml') => {
+        const path = this.#configClient.get('ide', 'open');
+        const filePath = Path.join(this.#configDir, ...key.split('.')).concat('.yaml');
+        const child = spawn(path, [filePath], { detached: true, stdio: 'ignore' });
+        child.unref();
+      },
+      view: key => ({
+        $: this.#configClient.raw(key),
+        [key]: this.#configClient.get(key),
+      }),
       curl: key => FetchService.toCURL(this.#configClient.get(key, {}).request),
       quit: () => process.exit(),
     }, {
@@ -88,14 +100,26 @@ module.exports = class Sandman extends EventEmitter {
         return value;
       },
     }), {
-      '/': {
+      get: {
         configurable: true,
-        value: (...args) => this.#run(...args),
+        value: (...args) => this.#configClient.get(...args),
+      },
+      set: {
+        configurable: true,
+        value: (...args) => this.#configClient.set(...args),
+      },
+      del: {
+        configurable: true,
+        value: (...args) => this.#configClient.del(...args),
       },
       run: {
         configurable: true,
         value: (...args) => this.#run(...args),
       },
+      [cmdNotFound]: {
+        configurable: true,
+        value: key => this.emit('error', { key, error: 'Command Not Found' }),
+      },
       resolve: {
         configurable: true,
         value: (...args) => {