Merge pull request #213 from SylvainCorlay/factor-mime_bundle_repr

Precompile xcommon mime_bundle_repr
jupyter-xeus · Nov 10, 2020 · b20af60 · b20af60
2 parents 0d2a942 + 399b7d9
commit b20af60
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/include/xwidgets/xcommon.hpp b/include/xwidgets/xcommon.hpp
@@ -96,6 +96,12 @@ namespace xw
 
     void XWIDGETS_API to_json(nl::json& j, const xcommon& o);
 
+    /***********************************
+     * mime_bundle_repr specialization *
+     ***********************************/
+
+    nl::json XWIDGETS_API mime_bundle_repr(const xcommon& val);
+
     /********************************************
      * xcommon template methods implementations *
      ********************************************/

diff --git a/include/xwidgets/xmaterialize.hpp b/include/xwidgets/xmaterialize.hpp
@@ -14,6 +14,7 @@
 #include "nlohmann/json.hpp"
 
 #include "xwidgets_config.hpp"
+#include "xcommon.hpp"
 
 namespace nl = nlohmann;
 
@@ -132,18 +133,7 @@ namespace xw
     template <template <class> class B, class... P>
     nl::json mime_bundle_repr(const xmaterialize<B, P...>& val)
     {
-        nl::json mime_bundle;
-
-        // application/vnd.jupyter.widget-view+json
-        nl::json widgets_json;
-        widgets_json["version_major"] = XWIDGETS_PROTOCOL_VERSION_MAJOR;
-        widgets_json["version_minor"] = XWIDGETS_PROTOCOL_VERSION_MINOR;
-        widgets_json["model_id"] = val.id();
-        mime_bundle["application/vnd.jupyter.widget-view+json"] = std::move(widgets_json);
-
-        // text/plain
-        mime_bundle["text/plain"] = "A Jupyter widget";
-        return mime_bundle;
+        return mime_bundle_repr(static_cast<const xcommon&>(val));
     }
 
     /*************

diff --git a/src/xcommon.cpp b/src/xcommon.cpp
@@ -223,4 +223,20 @@ namespace xw
     {
         j = "IPY_MODEL_" + std::string(o.id());
     }
+
+    nl::json mime_bundle_repr(const xcommon& val)
+    {
+        nl::json mime_bundle;
+
+        // application/vnd.jupyter.widget-view+json
+        nl::json widgets_json;
+        widgets_json["version_major"] = XWIDGETS_PROTOCOL_VERSION_MAJOR;
+        widgets_json["version_minor"] = XWIDGETS_PROTOCOL_VERSION_MINOR;
+        widgets_json["model_id"] = val.id();
+        mime_bundle["application/vnd.jupyter.widget-view+json"] = std::move(widgets_json);
+
+        // text/plain
+        mime_bundle["text/plain"] = "A Jupyter widget with unique id: " + std::string(val.id());
+        return mime_bundle;
+    }
 }