@miso.ai/server-commons 0.6.2-beta.0 → 0.6.3-beta.0

package/package.json

@@ -20,5 +20,5 @@
     "uuid": "^9.0.0",
     "yargs": "^17.5.1"
   },
-  "version": "0.6.2-beta.0"
+  "version": "0.6.3-beta.0"
 }

package/src/object.js

@@ -43,6 +43,18 @@ export function asNumber(value) {
   return isNaN(value) ? undefined : value;
 }
 
+/**
+ * Get value from a Map if available, compute and set it otherwise.
+ */
+export function computeIfAbsent(map, key, fn) {
+  if (map.has(key)) {
+    return map.get(key);
+  }
+  const value = fn(key);
+  map.set(key, value);
+  return value;
+}
+
 /**
  * Assign values on target object with Object.defineProperties() from source object.
  */

package/src/stream/misc.js

@@ -1,14 +1,23 @@
 import { Transform, pipeline as _pipeline } from 'stream';
 
-export function parse() {
+export function parse({ lenient } = {}) {
+  const parsnFn = lenient ? parseJsonIfPossible : JSON.parse;
   return new Transform({
     transform(chunk, _, callback) {
-      callback(null, JSON.parse(chunk));
+      callback(null, parsnFn(chunk));
     },
     readableObjectMode: true,
   });
 }
 
+function parseJsonIfPossible(chunk) {
+  try {
+    return JSON.parse(chunk);
+  } catch(_) {
+    return undefined;
+  }
+}
+
 export function stringify() {
   return new Transform({
     transform(chunk, _, callback) {

package/src/yargs.js

@@ -2,7 +2,7 @@ import 'dotenv/config';
 import _yargs from 'yargs/yargs';
 import { hideBin } from 'yargs/helpers';
 
-function hasDefaultCommand(args) {
+function isDefaultCommand(args) {
   let args0 = args[0];
   const command = typeof args0 === 'object' ? args0.command : typeof args0 === 'string' ? args0 : undefined;
   if (!command) {
@@ -16,38 +16,35 @@ function hasDefaultCommand(args) {
   return false;
 }
 
-class Tracker {
-
-  constructor() {}
-
-  get hasDefaultCommand() {
-    return !!this._hasDefaultCommand;
-  }
-
-  shim(yargs) {
-    const _command = yargs.command;
-    yargs.command = (...args) => {
-      if (hasDefaultCommand(args)) {
-        this._hasDefaultCommand = true;
-      }
-      return _command.apply(yargs, args);
-    };
-    return yargs;
+function shim(yargs) {
+  let hasDefaultCommand = false;
+  // command(): track whether a default command is registered
+  const _command = yargs.command;
+  yargs.command = (...args) => {
+    if (isDefaultCommand(args)) {
+      hasDefaultCommand = true;
+    }
+    return _command.apply(yargs, args);
+  };
+  // get hasDefaultCommand
+  Object.defineProperty(yargs, 'hasDefaultCommand', {
+    get: () => hasDefaultCommand,
+  });
+  // showHelpOnZeroCommand()
+  yargs.showHelpOnZeroCommand = function() {
+    return this.command('*', false, () => {}, () => this.showHelp());
   }
-
+  return yargs;
 }
 
 export function build(fn) {
   handleEpipe();
-  const yargs = _yargs(hideBin(process.argv));
-
-  const tracker = new Tracker();
-  tracker.shim(yargs);
+  const yargs = shim(_yargs(hideBin(process.argv)));
 
   fn(yargs);
 
-  if (!tracker.hasDefaultCommand) {
-    yargs.command('*', '', () => {}, () => yargs.showHelp())
+  if (!yargs.hasDefaultCommand) {
+    yargs.showHelpOnZeroCommand();
   }
 
   return yargs