Merge pull request #79 from Distributive-Network/wes/pmjs-use-inspect

pmjs + util.inspect

Author: Hamada-Distributed

pmjs

@@ -45,7 +45,7 @@ cmds.python = function pythonCmd(...args) {
 
   const retval = python.eval(cmd);
   pythonCmd.serial = (pythonCmd.serial || 0) + 1;
-  python.print('$' + pythonCmd.serial, '=', formatResult(retval));
+  python.print('$' + pythonCmd.serial, '=', util.inspect(retval));
   globalThis['$' + pythonCmd.serial] = retval;
 };
 
@@ -77,52 +77,6 @@ globalThis.replCmd = function replCmd(cmdLine)
   return cmds[cmdName].apply(null, argv);
 }
 
-/** Return String(val) surrounded by appropriate ANSI escape codes to change the console text colour. */
-function colour(colourCode, val)
-{
-  const esc=String.fromCharCode(27);
-  return `${esc}[${colourCode}m${val}${esc}[0m`
-}
-
-/** 
- * Format result more intelligently than toString. Inspired by Node.js util.inspect, but far less 
- * capable.
- */
-globalThis.formatResult = function formatResult(result)
-{
-  switch (typeof result)
-  {
-    case 'undefined':
-      return colour(90, result);
-    case 'function':
-      return colour(36, result);
-    case 'string':
-      return colour(32, `'${result}'`);
-    case 'boolean':
-    case 'number':
-      return colour(33, result);
-    case 'object':
-      if (result instanceof Date)
-        return colour(35, result.toISOString());
-      if (result instanceof Error)
-      {
-        const error = result;
-        const LF = String.fromCharCode(10);
-        const stackEls = error.stack
-                         .split(LF)
-                         .filter(a => a.length > 0)
-                         .map(a => `    ${a}`);
-        return (`${error.name}: ${error.message}` + LF
-          + stackEls[0] + LF
-          + colour(90, stackEls.slice(1).join(LF))
-        );
-      }
-      return JSON.stringify(result);
-    default:
-      return colour(31, `<unknown type ${typeof result}>${result}`);
-  }
-}
-
 /**
  * Evaluate a complete statement, built by the Python readline loop.
  */
@@ -132,11 +86,11 @@ globalThis.replEval = function replEval(statement)
   try
   {
     const result = indirectEval(`${statement}`);
-    return formatResult(result);
+    return util.inspect(result);
   }
   catch(error)
   {
-    return formatResult(error);
+    return util.inspect(error);
   }
 }
 """);
@@ -348,6 +302,7 @@ def main():
         globalInitModule.patchGlobalRequire()
         pm.runProgramModule(args[0], args, requirePath)
     elif (enterRepl or forceRepl):
+        globalInitModule.initReplLibs()
         repl()
 
 if __name__ == "__main__":

pmjs-lib/global-init.js

@@ -40,7 +40,12 @@ exports.makeArgvBuilder = function pmjsRequire$$makeArgvBuilder()
  * side effects in terms of local module id resolution, so this patch happens only right before we want
  * to fire up the program module.
  */
-exports.patchGlobalRequire = function pmjsRequire$$patchGlobalRequire()
+exports.patchGlobalRequire = function pmjs$$patchGlobalRequire()
 {
   globalThis.require = require;
 }
+
+exports.initReplLibs = function pmjs$$initReplLibs()
+{
+  globalThis.util = require('util');
+}

python/pythonmonkey/builtin_modules/util.js

@@ -115,7 +115,13 @@ const inspectDefaultOptions = Object.seal({
 const propertyIsEnumerable = Object.prototype.propertyIsEnumerable;
 const regExpToString = RegExp.prototype.toString;
 const dateToISOString = Date.prototype.toISOString;
-const errorToString = Error.prototype.toString;
+
+/** Return String(val) surrounded by appropriate ANSI escape codes to change the console text colour. */
+function colour(colourCode, val)
+{
+  const esc=String.fromCharCode(27);
+  return `${esc}[${colourCode}m${val}${esc}[0m`
+}
 
 var CIRCULAR_ERROR_MESSAGE;
 
@@ -357,7 +363,8 @@ inspect.styles = Object.assign(Object.create(null), {
   'symbol': 'green',
   'date': 'magenta',
   // "name": intentionally not styling
-  'regexp': 'red'
+  'regexp': 'red',
+  'error2': 'grey',
 });
 
 function stylizeWithColor(str, styleType) {
@@ -524,8 +531,8 @@ function formatValue(ctx, value, recurseTimes, ln) {
     } else if (isError(value)) {
       // Make error with message first say the error
       if (keyLength === 0)
-        return formatError(value);
-      base = ` ${formatError(value)}`;
+        return formatError(ctx, value);
+      base = ` ${formatError(ctx, value)}`;
     } else if (isAnyArrayBuffer(value)) {
       // Fast path for ArrayBuffer and SharedArrayBuffer.
       // Can't do the same for DataView because it has a non-primitive
@@ -620,8 +627,30 @@ function formatPrimitive(fn, value) {
   return fn(value.toString(), 'symbol');
 }
 
-function formatError(value) {
-  return `[${errorToString.call(value)}]`;
+/**
+ * Format an instance of Error. Error is the only type which is typically displayed using two different 
+ * colours -- the stack gets darker at the bottom where it's less relevant.
+ *
+ * @param ctx   {object}  inspect context - lets us know if we're using colors or not
+ * @param error {object}  instance of Error to inspect
+ */
+function formatError(ctx, error)
+{
+  function style(str)
+  {
+    if (!ctx.stylize)
+      return str;
+    return ctx.stylize(str, 'error2');
+  }
+  
+  const stackEls = error.stack
+        .split('\n')
+        .filter(a => a.length > 0)
+        .map(a => `    ${a}`);
+  return (`${error.name}: ${error.message}\n`
+          + stackEls[0] + '\n'
+          + style(stackEls.slice(1).join('\n'))
+         );
 }
 
 function formatObject(ctx, value, recurseTimes, keys) {