From 1f4d0e32bf46c3aa3cfa9c8e1bfb012af3dc8eaf Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Thu, 30 Apr 2015 01:40:22 +0200 Subject: [PATCH] pretty printing in js console in progress --- libjsengine/CMakeLists.txt | 3 ++ libjsengine/JSResources.cmake | 7 +++ libjsengine/JSV8Printer.cpp | 6 +++ libjsengine/PrettyPrint.js | 88 +++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+) create mode 100644 libjsengine/JSResources.cmake create mode 100644 libjsengine/PrettyPrint.js diff --git a/libjsengine/CMakeLists.txt b/libjsengine/CMakeLists.txt index 20de06d1d..eb90bff61 100644 --- a/libjsengine/CMakeLists.txt +++ b/libjsengine/CMakeLists.txt @@ -19,6 +19,9 @@ file(GLOB HEADERS "*.h") add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) +include(EthUtils) +eth_add_resources(${EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/JSResources.cmake") + # macos brew version of v8 needs to be compiled with libstdc++ # it also needs to be dynamic library # xcode needs libstdc++ to be explicitly set as it's attribute diff --git a/libjsengine/JSResources.cmake b/libjsengine/JSResources.cmake new file mode 100644 index 000000000..442bbcf6b --- /dev/null +++ b/libjsengine/JSResources.cmake @@ -0,0 +1,7 @@ + +set(pretty_print "${CMAKE_CURRENT_LIST_DIR}/PrettyPrint.js") + +set(ETH_RESOURCE_NAME "JSEngineResources") +set(ETH_RESOURCE_LOCATION "${CMAKE_CURRENT_BINARY_DIR}") +set(ETH_RESOURCES "pretty_print") + diff --git a/libjsengine/JSV8Printer.cpp b/libjsengine/JSV8Printer.cpp index 3ac7d475b..14bc66315 100644 --- a/libjsengine/JSV8Printer.cpp +++ b/libjsengine/JSV8Printer.cpp @@ -2,13 +2,19 @@ // Created by Marek Kotewicz on 28/04/15. // +#include #include "JSV8Printer.h" +#include "libjsengine/JSEngineResources.hpp" +using namespace std; using namespace dev; using namespace eth; JSV8Printer::JSV8Printer(JSV8Engine const& _engine) { + JSEngineResources resources; + string prettyPrint = resources.loadResourceAsString("pretty_print"); + _engine.eval(prettyPrint.c_str()); } const char* JSV8Printer::prettyPrint(JSV8Value const& _value) const diff --git a/libjsengine/PrettyPrint.js b/libjsengine/PrettyPrint.js new file mode 100644 index 000000000..f8b26f58a --- /dev/null +++ b/libjsengine/PrettyPrint.js @@ -0,0 +1,88 @@ +var prettyPrint = (function () { + function pp(object, indent) { + try { + JSON.stringify(object) + } catch(e) { + return pp(e, indent); + } + var str = ""; + if(object instanceof Array) { + str += "["; + for(var i = 0, l = object.length; i < l; i++) { + str += pp(object[i], indent); + if(i < l-1) { + str += ", "; + } + } + str += " ]"; + } else if (object instanceof Error) { + str += "\033[31m" + "Error:\033[0m " + object.message; + } else if (isBigNumber(object)) { + str += "\033[32m'" + object.toString(10) + "'"; + } else if(typeof(object) === "object") { + str += "{\n"; + indent += " "; + var last = getFields(object).pop() + getFields(object).forEach(function (k) { + str += indent + k + ": "; + try { + str += pp(object[k], indent); + } catch (e) { + str += pp(e, indent); + } + if(k !== last) { + str += ","; + } + str += "\n"; + }); + str += indent.substr(2, indent.length) + "}"; + } else if(typeof(object) === "string") { + str += "\033[32m'" + object + "'"; + } else if(typeof(object) === "undefined") { + str += "\033[1m\033[30m" + object; + } else if(typeof(object) === "number") { + str += "\033[31m" + object; + } else if(typeof(object) === "function") { + str += "\033[35m[Function]"; + } else { + str += object; + } + str += "\033[0m"; + return str; + } + var redundantFields = [ + 'valueOf', + 'toString', + 'toLocaleString', + 'hasOwnProperty', + 'isPrototypeOf', + 'propertyIsEnumerable', + 'constructor', + '__defineGetter__', + '__defineSetter__', + '__lookupGetter__', + '__lookupSetter__', + '__proto__' + ]; + var getFields = function (object) { + var result = Object.getOwnPropertyNames(object); + if (object.constructor && object.constructor.prototype) { + result = result.concat(Object.getOwnPropertyNames(object.constructor.prototype)); + } + return result.filter(function (field) { + return redundantFields.indexOf(field) === -1; + }); + }; + var isBigNumber = function (object) { + return typeof BigNumber !== 'undefined' && object instanceof BigNumber; + }; + function prettyPrintInner(/* */) { + var args = arguments; + var ret = ""; + for(var i = 0, l = args.length; i < l; i++) { + ret += pp(args[i], "") + "\n"; + } + return ret; + }; + return prettyPrintInner; +})();