@coderich/sandman 0.0.2 → 0.0.4

package/package.json

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

package/src/FetchService.js

@@ -1,5 +1,7 @@
 const Merge = require('lodash.merge');
 
+function shq(s) { return `'${String(s).replace(/'/g, `'"'"'`)}'`; }
+
 exports.fetch = (req) => {
   return new Promise((resolve, reject) => {
     const { url, ...params } = exports.normalizeRequest({ ...req });
@@ -57,3 +59,48 @@ exports.decorateRequest = (mergeData, key, request) => {
 
   return Merge({}, toMerge, request);
 };
+
+exports.toCURL = (request, { pretty = true, redactAuth = false } = {}) => {
+  if (!request) return '<no request>';
+
+  const { url, path, method, headers, params, data } = request;
+
+  const base = new URL(url);
+  const full = new URL(path || '', base);
+
+  // append query params
+  for (const [k, v] of Object.entries(params || {})) {
+    if (v == null) continue;
+    Array.isArray(v) ? v.forEach(x => full.searchParams.append(k, String(x))) : full.searchParams.append(k, String(v));
+  }
+
+  const parts = ['curl', '-sS'];
+  if (method) parts.push('-X', method.toUpperCase());
+
+  // headers
+  const hdrs = { ...headers };
+  for (const k of Object.keys(hdrs)) {
+    if (redactAuth && /^authorization$/i.test(k)) {
+      hdrs[k] = hdrs[k].replace(/(?<=^.{6}).+/, '***REDACTED***');
+    }
+    parts.push('-H', shq(`${k}: ${hdrs[k]}`));
+  }
+
+  // body (skip for GET)
+  if (data != null && !/^GET$/i.test(method)) {
+    if (typeof data === 'string') {
+      parts.push('--data-raw', shq(data));
+    } else if (data instanceof URLSearchParams) {
+      parts.push('-H', shq('Content-Type: application/x-www-form-urlencoded'));
+      parts.push('--data', shq(data.toString()));
+    } else if (typeof data === 'object') {
+      // JSON by default
+      const hasCT = Object.keys(hdrs).some(h => /^content-type$/i.test(h));
+      if (!hasCT) parts.push('-H', shq('Content-Type: application/json'));
+      parts.push('--data-raw', shq(JSON.stringify(data)));
+    }
+  }
+
+  parts.push(shq(full.toString()));
+  return pretty ? parts.join(' \\\n  ') : parts.join(' ');
+};

package/src/Sandman.js

@@ -1,4 +1,5 @@
 const Path = require('path');
+const Merge = require('lodash.merge');
 const Readline = require('readline');
 const Chokidar = require('chokidar');
 const EventEmitter = require('events');
@@ -10,7 +11,7 @@ const resolveSymbol = Symbol('resolve');
 
 module.exports = class Sandman extends EventEmitter {
   #configClient; #configDir; #options; #watcher; #readline; #mergeData = {}; #cli;
-  #captureCandidates = false; #candidates = []; #tabCounter = 0; #candidateIndex = 0; #line; #lastToken;
+  #captureCandidates = false; #candidates = []; #tabCounter = 0; #candidateIndex; #line; #lastToken;
 
   constructor(configDir, options) {
     super();
@@ -36,7 +37,6 @@ module.exports = class Sandman extends EventEmitter {
       resolve: {
         value: (...args) => {
           this.#configClient.resolve(...args);
-          this.#prompt();
           return this.#cli;
         },
         configurable: true,
@@ -71,10 +71,10 @@ module.exports = class Sandman extends EventEmitter {
     const value = get(config, key);
 
     if (value?.request) {
-      const request = FetchService.decorateRequest(this.#mergeData, key, value.request);
-      const $request = this.#configClient.set(resolveSymbol, request).get(resolveSymbol);
+      const $request = FetchService.decorateRequest(this.#mergeData, key, value.request);
+      const request = this.#configClient.set(resolveSymbol, $request).get(resolveSymbol);
       this.#configClient.del(resolveSymbol);
-      return $request;
+      return Merge({}, value, { request });
     }
 
     return this.#configClient.get(key, ...rest);
@@ -88,6 +88,7 @@ module.exports = class Sandman extends EventEmitter {
       get: (...args) => this.#get(...args),
       set: (key = '', value = null) => this.#configClient.set(key, value),
       del: (key = '') => this.#configClient.del(key),
+      curl: key => FetchService.toCURL(this.#get(key, {}).request),
       quit: () => process.exit(),
     }, {
       get(obj, prop, receiver) {
@@ -95,8 +96,9 @@ module.exports = class Sandman extends EventEmitter {
 
         if (typeof value === 'function') {
           return (...args) => {
+            self.#readline.pause();
             const result = value(...args);
-            setImmediate(() => self.#prompt());
+            Promise.resolve().then(() => result).catch(() => null).finally(() => self.#prompt());
             return result;
           };
         }
@@ -153,7 +155,8 @@ module.exports = class Sandman extends EventEmitter {
         });
 
         const candidates = Array.from(new Set(startsWithCandidates.concat(requestKeyCandidates)));
-        if (this.#captureCandidates) { this.#candidates = candidates; this.#line = line; this.#lastToken = lastToken; }
+        if (this.#captureCandidates) { this.#candidates = candidates; this.#line = line; this.#lastToken = lastToken; this.#candidateIndex = -1; }
+        if (candidates.length === 1 && candidates[0] === lastToken) return [[], lastToken];
         return [candidates, lastToken];
       },
     });
@@ -168,14 +171,8 @@ module.exports = class Sandman extends EventEmitter {
         Readline.clearLine(process.stdout, 0);
         this.#readline.prompt();
       } else if (this.#tabCounter > 2 && this.#candidates.length) {
-        let value = this.#candidates.at(this.#candidateIndex++);
-
-        if (!value) {
-          this.#candidateIndex = 0;
-          value = this.#candidates.at(this.#candidateIndex++);
-        }
-
-        value = this.#line.replace(this.#lastToken, value);
+        const candidate = this.#candidates[this.#candidateIndex = ++this.#candidateIndex % this.#candidates.length];
+        const value = this.#line.replace(this.#lastToken, candidate);
         this.#readline.line = value;
         this.#readline.cursor = value.length;
         this.#readline.prompt(true);
@@ -196,7 +193,7 @@ module.exports = class Sandman extends EventEmitter {
       if (['add', 'change'].includes(event)) {
         const api = ConfigClient.parseFile(path);
         if (key) this.#configClient.set(key, api);
-        else this.#configClient.merge(api);
+        else this.#configClient.merge(api); // index.yaml
         if (api.request) this.emit('save', { key, api });
         this.#prompt();
       } else if (['unlink', 'unlinkDir'].includes(event)) {