xeus 4.0 updates (#12)

* using 4.0.1

Author: DerThorsten

BuildWasmDockerfile

@@ -29,7 +29,7 @@ RUN cd /deps/xtl/build && \
 # nloman json
 ##################################################################
 RUN mkdir -p /deps/nlohmannjson/build && \
-    git clone --branch v3.9.1 --depth 1 https://github.com/nlohmann/json.git /deps/nlohmannjson/src
+    git clone --branch v3.11.3 --depth 1 https://github.com/nlohmann/json.git /deps/nlohmannjson/src
 
 RUN cd /deps/nlohmannjson/build && \
     emcmake cmake ../src/   -DCMAKE_INSTALL_PREFIX=/install -DJSON_BuildTests=OFF
@@ -42,14 +42,14 @@ RUN cd /deps/nlohmannjson/build && \
 ##################################################################
 
 RUN mkdir -p /deps/xeus/build
-RUN git clone --branch 3.2.0 https://github.com/jupyter-xeus/xeus.git /deps/xeus/src
+RUN git clone --branch 4.0.1 https://github.com/jupyter-xeus/xeus.git /deps/xeus/src
 
 #COPY xeus /deps/xeus/src
 
 RUN cd /deps/xeus/build && \
     emcmake cmake ../src  \
         -DCMAKE_INSTALL_PREFIX=/install \
-        -Dnlohmann_json_DIR=/install/lib/cmake/nlohmann_json \
+        -Dnlohmann_json_DIR=/install/share/cmake/nlohmann_json \
         -Dxtl_DIR=/install/share/cmake/xtl \
         -DXEUS_EMSCRIPTEN_WASM_BUILD=ON
 
@@ -68,7 +68,7 @@ ADD ./test /test
 RUN mkdir -p /xeus-build && cd /xeus-build && \
     emcmake cmake  .. \
         -DCMAKE_INSTALL_PREFIX=/install \
-        -Dnlohmann_json_DIR=/install/lib/cmake/nlohmann_json \
+        -Dnlohmann_json_DIR=/install/share/cmake/nlohmann_json \
         -Dxtl_DIR=/install/share/cmake/xtl \
         -Dxeus_DIR=/install/lib/cmake/xeus \
         -DXEUS_LITE_BUILD_BROWSER_TEST_KERNEL=ON \

CMakeLists.txt

@@ -54,13 +54,8 @@ message(STATUS "XEUS_LITE_BUILD_NODE_TESTS:                ${XEUS_LITE_BUILD_NOD
 # Dependencies
 # ============
 
-set(nlohmann_json_REQUIRED_VERSION 3.2.0)
 set(xtl_REQUIRED_VERSION 0.7)
-set(xeus_REQUIRED_VERSION 3.2.0)
-
-if (NOT TARGET nlohmann_json)
-    find_package(nlohmann_json ${nlohmann_json_REQUIRED_VERSION} REQUIRED)
-endif ()
+set(xeus_REQUIRED_VERSION 4.0.0)
 
 if (NOT TARGET xtl)
     find_package(xtl ${xtl_REQUIRED_VERSION} REQUIRED)
@@ -98,7 +93,6 @@ target_include_directories(
 )
 target_link_libraries(
     xeus-lite
-    PUBLIC nlohmann_json::nlohmann_json
     PUBLIC xtl
     PUBLIC xeus-static
 )

include/xeus-lite/xembind.hpp

@@ -25,6 +25,10 @@ namespace ems = emscripten;
 namespace xeus
 {
 
+    struct empty_context_tag
+    {
+    };
+
     void buffer_sequence_from_js_buffer(buffer_sequence& self, ems::val buffers);
     xmessage xmessage_from_js_message(ems::val js_message);
     ems::val js_message_from_xmessage(const xmessage & message, bool copy);
@@ -46,7 +50,7 @@ namespace xeus
         using interpreter_ptr = std::unique_ptr<interpreter_type>;
 
         auto interpreter = interpreter_ptr(new interpreter_type());
-        auto context = xeus::make_empty_context();
+        auto context = std::make_unique<xeus::xcontext_impl<empty_context_tag>>();
 
         xeus::xkernel * kernel = new xeus::xkernel(config,
                              xeus::get_user_name(),

test/xmock_interpreter.cpp

@@ -29,21 +29,21 @@ namespace xeus
         using function_type = std::function<void(xeus::xcomm&&, const xeus::xmessage&)>;
     }
 
-    nl::json xmock_interpreter::execute_request_impl(int execution_counter,
-                                                     const std::string& code,
-                                                     bool /* silent */,
-                                                     bool /* store_history */,
-                                                     nl::json /* user_expressions */,
-                                                     bool /* allow_stdin */)
+    void xmock_interpreter::execute_request_impl(xrequest_context request_context,
+                                                 send_reply_callback cb,       
+                                                 int execution_counter,
+                                                 const std::string& code,
+                                                 execute_request_config config,
+                                                 nl::json /* user_expressions */)
     {
         if (code.compare("hello, world") == 0)
         {
-            publish_stream("stdout", code);
+            publish_stream(request_context, "stdout", code);
         }
 
         if (code.compare("error") == 0)
         {
-            publish_stream("stderr", code);
+            publish_stream(request_context, "stderr", code);
         }
 
         if (code.compare("?") == 0)
@@ -61,14 +61,16 @@ namespace xeus
                             {"start", 0}
                         });
 
-            return xeus::create_successful_reply(payload);
+            cb(xeus::create_successful_reply(payload));
+            return;
         }
 
         nl::json pub_data;
         pub_data["text/plain"] = code;
-        publish_execution_result(execution_counter, std::move(pub_data), nl::json::object());
+        publish_execution_result(request_context, execution_counter, std::move(pub_data), nl::json::object());
 
-        return xeus::create_successful_reply();
+        cb(xeus::create_successful_reply());
+        return;
     }
 
     nl::json xmock_interpreter::complete_request_impl(const std::string& /* code */,

test/xmock_interpreter.hpp

@@ -21,16 +21,17 @@ namespace xeus
         xmock_interpreter() = default;
         virtual ~xmock_interpreter() = default;
 
+        
     private:
 
         void configure_impl() override;
 
-        nl::json execute_request_impl(int execution_counter,
-                                      const std::string& code,
-                                      bool silent,
-                                      bool store_history,
-                                      nl::json user_expressions,
-                                      bool allow_stdin) override;
+        void execute_request_impl(xrequest_context context,
+                                  send_reply_callback cb,
+                                  int execution_counter,
+                                  const std::string& code,
+                                  execute_request_config config,
+                                  nl::json user_expressions) override;
 
         nl::json complete_request_impl(const std::string& code,
                                        int cursor_pos) override;

xeus-liteConfig.cmake.in

@@ -24,7 +24,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR};${CMAKE_MODULE_PATH}")
 
 include(CMakeFindDependencyMacro)
 find_dependency(xtl @xtl_REQUIRED_VERSION@)
-find_dependency(nlohmann_json @nlohmann_json_REQUIRED_VERSION@)
 find_dependency(xeus @xeus_REQUIRED_VERSION@)
 
 if(NOT TARGET xeus-lite)