@auto_js/v8 0.0.5 → 0.0.7

package/CMakeLists.txt

@@ -1,25 +1,20 @@
+# Locate dependencies
 find_package(Boost 1.83 REQUIRED)
-if(PACKAGE_NAME STREQUAL "@auto_js/v8")
-	set(TARGET_NAME "v8_js")
-	find_package_from_npm(@auto_js/v8_exports)
-elseif(PACKAGE_NAME STREQUAL "@isolated-vm/embedded_v8_js")
-	set(TARGET_NAME "embedded_v8_js")
-	find_package_from_npm(@auto_js/v8_exports @isolated-vm/embedded_v8)
-else()
-	message(FATAL_ERROR "Missing or unknown @auto_js/v8 PACKAGE_NAME: '${PACKAGE_NAME}'")
-endif()
-find_package_from_npm(@auto_js/js)
+find_package_from_npm(@auto_js/v8_exports AS @auto_js/${AUTO_JS_PREFIX}v8_exports PROPAGATE google_v8)
+find_package_from_npm(@auto_js/js AS @auto_js/${AUTO_JS_PREFIX}js PROPAGATE auto_js)
 
-add_library("${TARGET_NAME}" OBJECT)
-target_link_libraries("${TARGET_NAME}" PUBLIC Boost::boost auto_js utility_js)
-if(TARGET_NAME STREQUAL "v8_js")
-	target_link_libraries("${TARGET_NAME}" PUBLIC nodejs_v8)
-else()
-	target_compile_definitions("${TARGET_NAME}" PRIVATE INCLUDE_ISOLATED_V8)
-	target_link_libraries("${TARGET_NAME}" PUBLIC google_v8)
-endif()
+# Initialize target [v8_js or v8_isolated_js]
+set(v8_js ${AUTO_JS_PREFIX}v8_js)
+add_library(${v8_js} STATIC)
+set_npm_package_properties(@auto_js/v8 auto_js v8_js)
+target_compile_features(${auto_js} PUBLIC cxx_std_23)
+
+# Link dependencies
+target_link_libraries(${v8_js} PRIVATE Boost::boost ${auto_js} utility_js)
+target_link_libraries(${v8_js} PUBLIC ${google_v8})
 
-target_sources("${TARGET_NAME}"
+# Common sources (nodejs + iv8::isolated)
+target_sources(${v8_js}
 	PRIVATE
 		handle/remote.cc
 		support/error.cc
@@ -58,8 +53,10 @@ target_sources("${TARGET_NAME}"
 		value/value.cc
 )
 
-if(TARGET_NAME STREQUAL "embedded_v8_js")
-	target_sources("${TARGET_NAME}"
+# iv8::isolated sources
+if(v8_js STREQUAL isolated_v8_js)
+	target_compile_definitions(${v8_js} PRIVATE INCLUDE_ISOLATED_V8)
+	target_sources(${v8_js}
 		PRIVATE
 			evaluation/module.cc
 			evaluation/script.cc

package/handle/collected_handle.cc

@@ -1,3 +1,5 @@
+module;
+#include <v8/version.h>
 export module v8_js:collected_handle;
 import :lock;
 import std;
@@ -64,7 +66,7 @@ auto collected_handle<Value, Type>::reset(const collected_handle_lock& lock, uni
 			[](const v8::WeakCallbackInfo<collected_handle>& data) -> auto {
 				auto* ptr = data.GetParameter();
 				auto unique = ptr->pool_.get().reacquire(ptr);
-				unique->global_.ClearWeak();
+				unique->global_.template ClearWeak<void>();
 			},
 			v8::WeakCallbackType::kParameter
 		);
@@ -74,7 +76,11 @@ auto collected_handle<Value, Type>::reset(const collected_handle_lock& lock, uni
 export template <class Type>
 auto make_collected_external(const collected_handle_lock& lock, auto&&... args) -> v8::Local<v8::External> {
 	auto unique = collected_external_of<Type>::make(lock, std::forward<decltype(args)>(args)...);
+#if V8_HAS_TAGGED_EXTERNAL
+	auto value = v8::External::New(lock.isolate(), unique.get(), 0);
+#else
 	auto value = v8::External::New(lock.isolate(), unique.get());
+#endif
 	collected_handle<v8::External, Type>::reset(lock, std::move(unique), value);
 	return value;
 }
@@ -82,7 +88,12 @@ auto make_collected_external(const collected_handle_lock& lock, auto&&... args)
 export template <class Type>
 auto unwrap_collected_external(v8::Local<v8::External> external) -> Type& {
 	using handle_type = collected_external_of<Type>;
+#if V8_HAS_TAGGED_EXTERNAL
+	// TODO: Use this feature
+	return **static_cast<handle_type*>(external->Value(0));
+#else
 	return **static_cast<handle_type*>(external->Value());
+#endif
 }
 
 } // namespace js::iv8

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@auto_js/v8",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "author": "https://github.com/laverdet/",
   "homepage": "https://github.com/laverdet/isolated-vm/tree/experimental/packages/auto_js/v8",
   "license": "ISC",
   "dependencies": {
-    "@auto_js/js": "^0.0.5",
-    "@auto_js/v8_exports": "^0.0.3"
+    "@auto_js/js": "^0.0.7",
+    "@auto_js/v8_exports": "^0.0.5"
   },
   "repository": {
     "type": "git",

package/support/callback_storage.cc

@@ -1,3 +1,5 @@
+module;
+#include <v8/version.h>
 export module v8_js:callback_storage;
 import :collected_handle;
 import :unmaybe;
@@ -71,7 +73,7 @@ auto make_callback_storage(const auto& lock, auto function) {
 		static_assert(std::is_trivially_destructible_v<bound_type>);
 		if constexpr (std::is_empty_v<bound_type>) {
 			// Constant expression function of 0 size. No data needed at all!
-			auto data = v8::Local<v8::Data>{};
+			auto data = v8::Local<v8::Value>{};
 			const auto callback = v8::FunctionCallback{[](const v8::FunctionCallbackInfo<v8::Value>& info) -> void {
 				auto invoke = bound_type{};
 				invoke(info);
@@ -79,9 +81,22 @@ auto make_callback_storage(const auto& lock, auto function) {
 			return std::tuple{callback, data};
 		} else if constexpr (sizeof(bound_type) == sizeof(void*)) {
 			// Trivial function of pointer type. Data() is the function data.
-			auto data = v8::External::New(lock.isolate(), std::bit_cast<void*>(bound));
+			auto data = [ & ]() -> auto {
+#if V8_HAS_TAGGED_EXTERNAL
+				return v8::External::New(lock.isolate(), std::bit_cast<void*>(bound), 0);
+#else
+				return v8::External::New(lock.isolate(), std::bit_cast<void*>(bound));
+#endif
+			}();
 			const auto callback = v8::FunctionCallback{[](const v8::FunctionCallbackInfo<v8::Value>& info) -> void {
-				auto invoke = std::bit_cast<bound_type>(info.Data().As<v8::External>()->Value());
+				auto invoke = [ & ]() -> auto {
+#if V8_HAS_TAGGED_EXTERNAL
+					// TODO: Use this feature
+					return std::bit_cast<bound_type>(info.Data().As<v8::External>()->Value(0));
+#else
+					return std::bit_cast<bound_type>(info.Data().As<v8::External>()->Value());
+#endif
+				}();
 				invoke(info);
 			}};
 			return std::tuple{callback, data};

package/transfer/visit.cc

@@ -486,7 +486,7 @@ struct visit<Meta, v8::FunctionCallbackInfo<v8::Value>> : visit<Meta, v8::Local<
 		using visit_type::operator();
 
 		template <class Accept>
-		auto operator()(v8::FunctionCallbackInfo<v8::Value> info, const Accept& accept) -> accept_target_t<Accept> {
+		auto operator()(const v8::FunctionCallbackInfo<v8::Value>& info, const Accept& accept) -> accept_target_t<Accept> {
 			return accept(vector_tag{}, *this, iv8::callback_info{info});
 		}
 };

package/value/fixed_array.cc

@@ -1,3 +1,5 @@
+module;
+#include <v8/version.h>
 module v8_js;
 import v8;
 
@@ -25,7 +27,11 @@ fixed_array::iterator::iterator(v8::Local<v8::FixedArray> array, v8::Local<v8::C
 		index_{index} {}
 
 auto fixed_array::iterator::operator*() const -> value_type {
+#if V8_HAS_CONTEXT_FREE_FIXED_ARRAY
+	return array_->Get(index_);
+#else
 	return array_->Get(context_, index_);
+#endif
 }
 
 auto fixed_array::iterator::operator+=(difference_type offset) -> iterator& {

package/value/function.cc

@@ -8,7 +8,7 @@ import v8;
 
 namespace js::iv8 {
 
-template <class Result = std::monostate>
+template <class Result>
 auto Function::apply(context_lock_witness lock, auto&& args) -> Result {
 	auto result = [ & ]() {
 		using args_type = std::vector<v8::Local<v8::Value>>;
@@ -21,7 +21,7 @@ auto Function::apply(context_lock_witness lock, auto&& args) -> Result {
 	return js::transfer_out<Result>(result, lock);
 }
 
-template <class Result = std::monostate>
+template <class Result>
 auto Function::call(context_lock_witness lock, auto&&... args) -> Result {
 	auto result = [ & ]() {
 		using args_type = std::array<v8::Local<v8::Value>, sizeof...(args) + 1>;

package/value/primitive.cc

@@ -1,3 +1,5 @@
+module;
+#include <v8/version.h>
 module v8_js;
 import :primitive;
 import std;
@@ -42,7 +44,7 @@ value_for_string::operator std::string() const {
 	string.resize_and_overwrite((*this)->Length(), [ this ](char* data, std::size_t length) -> std::size_t {
 		if (length > 0) {
 			auto* data_uint8 = reinterpret_cast<std::uint8_t*>(data);
-			(*this)->WriteOneByteV2(isolate(), 0, length, data_uint8, v8::String::WriteOptions::NO_NULL_TERMINATION);
+			(*this)->WriteOneByteV2(isolate(), 0, length, data_uint8, v8::String::WriteFlags::kNone);
 		}
 		return length;
 	});
@@ -54,7 +56,7 @@ value_for_string::operator std::u16string() const {
 	string.resize_and_overwrite((*this)->Length(), [ this ](char16_t* data, std::size_t length) -> std::size_t {
 		if (length > 0) {
 			auto* data_uint16 = reinterpret_cast<std::uint16_t*>(data);
-			(*this)->WriteV2(isolate(), 0, length, data_uint16, v8::String::WriteOptions::NO_NULL_TERMINATION);
+			(*this)->WriteV2(isolate(), 0, length, data_uint16, v8::String::WriteFlags::kNone);
 		}
 		return length;
 	});
@@ -68,7 +70,12 @@ value_for_date::operator js_clock::time_point() const {
 
 // `value_for_external`
 value_for_external::operator void*() const {
+#if V8_HAS_TAGGED_EXTERNAL
+	// TODO: Use this feature
+	return (*this)->Value(0);
+#else
 	return (*this)->Value();
+#endif
 }
 
 } // namespace js::iv8