configurable json type

CMakeLists.txt

@@ -11,6 +11,7 @@ option(BUILD_TESTING "Build unit tests" ON)
 option(INJA_BUILD_TESTS "Build unit tests when BUILD_TESTING is enabled." ON)
 option(BUILD_BENCHMARK "Build benchmark" ON)
 option(COVERALLS "Generate coveralls data" OFF)
+set(INJA_TYPES_FILE "types.hpp.in" CACHE FILEPATH "Use the types definition")
 
 
 set(INJA_INSTALL_INCLUDE_DIR "include")
@@ -23,13 +24,14 @@ if(MSVC)
   add_compile_options(/utf-8 /Zc:__cplusplus)
 endif()
 
-
+configure_file("${INJA_TYPES_FILE}" "${CMAKE_CURRENT_BINARY_DIR}/types.hpp" COPYONLY)
 add_library(inja INTERFACE)
 add_library(pantor::inja ALIAS inja)
 
 
 target_include_directories(inja INTERFACE
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
   $<INSTALL_INTERFACE:${INJA_INSTALL_INCLUDE_DIR}>
 )
 target_compile_features(inja INTERFACE cxx_std_11)
@@ -171,6 +173,10 @@ if(INJA_INSTALL)
     DESTINATION ${INJA_INSTALL_INCLUDE_DIR}
     FILES_MATCHING PATTERN "*.hpp"
   )
+  install(
+    FILES "${CMAKE_CURRENT_BINARY_DIR}/types.hpp" 
+    DESTINATION "${INJA_INSTALL_INCLUDE_DIR}/inja"
+  )
   if(INJA_USE_EMBEDDED_JSON)
     install(
       DIRECTORY third_party/include/nlohmann

include/inja/environment.hpp

@@ -7,8 +7,7 @@
 #include <sstream>
 #include <string>
 
-#include <nlohmann/json.hpp>
-
+#include "types.hpp"
 #include "config.hpp"
 #include "function_storage.hpp"
 #include "parser.hpp"
@@ -19,7 +18,6 @@
 
 namespace inja {
 
-using json = nlohmann::json;
 
 /*!
  * \brief Class for changing the configuration.

include/inja/function_storage.hpp

@@ -3,12 +3,11 @@
 
 #include <vector>
 
+#include "types.hpp"
 #include "string_view.hpp"
 
 namespace inja {
 
-using json = nlohmann::json;
-
 using Arguments = std::vector<const json *>;
 using CallbackFunction = std::function<json(Arguments &args)>;
 using VoidCallbackFunction = std::function<void(Arguments &args)>;

include/inja/node.hpp

@@ -4,8 +4,7 @@
 #include <string>
 #include <utility>
 
-#include <nlohmann/json.hpp>
-
+#include "types.hpp"
 #include "function_storage.hpp"
 #include "string_view.hpp"
 
@@ -100,9 +99,9 @@ class ExpressionNode : public AstNode {
 
 class LiteralNode : public ExpressionNode {
 public:
-  const nlohmann::json value;
+  const json value;
 
-  explicit LiteralNode(const nlohmann::json& value, size_t pos) : ExpressionNode(pos), value(value) { }
+  explicit LiteralNode(const json& value, size_t pos) : ExpressionNode(pos), value(value) { }
 
   void accept(NodeVisitor& v) const {
     v.visit(*this);

include/inja/renderer.hpp

@@ -689,7 +689,7 @@ class Renderer : public NodeVisitor  {
     std::string ptr = node.key;
     replace_substring(ptr, ".", "/");
     ptr = "/" + ptr;
-    json_additional_data[nlohmann::json::json_pointer(ptr)] = *eval_expression_list(node.expression);
+    json_additional_data[json::json_pointer(ptr)] = *eval_expression_list(node.expression);
   }
 
 public:

single_include/inja/inja.hpp

@@ -51,8 +51,18 @@ SOFTWARE.
 #include <sstream>
 #include <string>
 
+// #include "types.hpp"
+#ifndef INCLUDE_INJA_TYPES_HPP_
+#define INCLUDE_INJA_TYPES_HPP_
+
 #include <nlohmann/json.hpp>
 
+namespace inja {
+using json = nlohmann::json;
+}
+
+#endif
+
 // #include "config.hpp"
 #ifndef INCLUDE_INJA_CONFIG_HPP_
 #define INCLUDE_INJA_CONFIG_HPP_
@@ -1557,13 +1567,13 @@ struct RenderConfig {
 
 #include <vector>
 
+// #include "types.hpp"
+
 // #include "string_view.hpp"
 
 
 namespace inja {
 
-using json = nlohmann::json;
-
 using Arguments = std::vector<const json *>;
 using CallbackFunction = std::function<json(Arguments &args)>;
 using VoidCallbackFunction = std::function<void(Arguments &args)>;
@@ -2367,7 +2377,7 @@ class Lexer {
 #include <string>
 #include <utility>
 
-#include <nlohmann/json.hpp>
+// #include "types.hpp"
 
 // #include "function_storage.hpp"
 
@@ -2465,9 +2475,9 @@ class ExpressionNode : public AstNode {
 
 class LiteralNode : public ExpressionNode {
 public:
-  const nlohmann::json value;
+  const json value;
 
-  explicit LiteralNode(const nlohmann::json& value, size_t pos) : ExpressionNode(pos), value(value) { }
+  explicit LiteralNode(const json& value, size_t pos) : ExpressionNode(pos), value(value) { }
 
   void accept(NodeVisitor& v) const {
     v.visit(*this);
@@ -4185,7 +4195,7 @@ class Renderer : public NodeVisitor  {
     std::string ptr = node.key;
     replace_substring(ptr, ".", "/");
     ptr = "/" + ptr;
-    json_additional_data[nlohmann::json::json_pointer(ptr)] = *eval_expression_list(node.expression);
+    json_additional_data[json::json_pointer(ptr)] = *eval_expression_list(node.expression);
   }
 
 public:
@@ -4221,7 +4231,6 @@ class Renderer : public NodeVisitor  {
 
 namespace inja {
 
-using json = nlohmann::json;
 
 /*!
  * \brief Class for changing the configuration.

test/test.cpp

@@ -5,7 +5,7 @@
 #include "doctest/doctest.h"
 #include "inja/inja.hpp"
 
-using json = nlohmann::json;
+using json = inja::json;
 
 const std::string test_file_directory {"../test/data/"};
 

types.hpp.in

@@ -0,0 +1,10 @@
+#ifndef INCLUDE_INJA_TYPES_HPP_
+#define INCLUDE_INJA_TYPES_HPP_
+
+#include <nlohmann/json.hpp>
+
+namespace inja {
+using json = nlohmann::json;
+}
+
+#endif