@auto_js/v8_exports 0.0.2 → 0.0.4

package/CMakeLists.txt

@@ -1,15 +1,14 @@
 # Library name: google_v8, or nodejs_v8
-set(CXX_MODULE_NAME v8)
-if(PACKAGE_NAME STREQUAL "@auto_js/v8_exports")
-	set(TARGET_NAME "nodejs_v8")
-elseif(PACKAGE_NAME STREQUAL "@isolated-vm/embedded_v8")
-	set(TARGET_NAME "google_v8")
+if(NPM_PACKAGE_NAME STREQUAL @auto_js/isolated_v8_exports)
+	set(google_v8 embedded_v8)
 else()
-	message(FATAL_ERROR "Missing or unknown @auto_js/v8_exports PACKAGE_NAME: '${PACKAGE_NAME}'")
+	set(google_v8 nodejs_v8)
 endif()
-add_library("${TARGET_NAME}" STATIC)
+add_library(${google_v8} STATIC)
+set_npm_package_properties(@auto_js/v8_exports google_v8)
+target_compile_features(${google_v8} PUBLIC cxx_std_23)
 
-if(TARGET_NAME STREQUAL "google_v8")
+if(NPM_PACKAGE_NAME STREQUAL @auto_js/isolated_v8_exports)
 	# Header files (embedded)
 	if(NOT DEFINED V8_INCLUDE_DIR)
 		set(V8_INCLUDE_DIR "$ENV{V8_BUNDLE_PATH}/../include")
@@ -33,6 +32,10 @@ if(TARGET_NAME STREQUAL "google_v8")
 		message(FATAL_ERROR "Missing v8-gn.h")
 	endif()
 	message(STATUS "Using v8-gn.h from '${V8_INCLUDE_GN_FILE}'")
+	target_compile_options(${google_v8} PRIVATE -include "${V8_INCLUDE_GN_FILE}")
+
+	# Include deeper v8 headers not provided by nodejs
+	target_compile_definitions(${google_v8} PRIVATE INCLUDE_V8_PLATFORM)
 
 	# v8 pre-built library
 	if(NOT DEFINED V8_LIBRARY_PATH)
@@ -53,68 +56,56 @@ if(TARGET_NAME STREQUAL "google_v8")
 	message(STATUS "Using v8 library type '${V8_LIBRARY_TYPE}'")
 
 	# Preprocessor macros which enable dual v8 in the same process
-	if(V8_TRICKSHOT)
-		set(MODULE_NAME z8)
-		target_compile_definitions("${TARGET_NAME}" PUBLIC
-			cppgc=zppgc
-			unibrow=znibrow
-			v8_crdtp=z8_crdtp
-			V8_Dcheck=Z8_Dcheck
-			V8_Fatal=Z8_Fatal
-			v8_inspector=z8_inspector
-			v8=z8
-		)
-	endif()
-else()
-	# Header files (nodejs)
-	if(NOT DEFINED NODE_DIST_DIR)
-		message(FATAL_ERROR "'NODE_DIST_DIR' is not set")
-	endif()
-	set(V8_INCLUDE_DIR "${NODE_DIST_DIR}/include/node")
-	if(NOT EXISTS "${V8_INCLUDE_DIR}/v8.h")
-		message(FATAL_ERROR "Missing '${V8_INCLUDE_DIR}/v8.h'")
-	endif()
-	message(STATUS "Using v8 headers from '${V8_INCLUDE_DIR}'")
-endif()
-
-# version.h
-target_include_directories("${TARGET_NAME}" SYSTEM PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
-
-# v8 headers
-target_include_directories("${TARGET_NAME}" SYSTEM PRIVATE "${V8_INCLUDE_DIR}")
-
-if(TARGET_NAME STREQUAL "google_v8")
-	# Include v8-gn.h
-	target_compile_options("${TARGET_NAME}" PRIVATE -include "${V8_INCLUDE_GN_FILE}")
-
-	# Include deeper v8 headers not provided by nodejs
-	target_compile_definitions("${TARGET_NAME}" PRIVATE INCLUDE_V8_PLATFORM)
+	target_compile_definitions(${google_v8} PUBLIC
+		cppgc=zppgc
+		unibrow=znibrow
+		v8_crdtp=z8_crdtp
+		V8_Dcheck=Z8_Dcheck
+		V8_Fatal=Z8_Fatal
+		v8_inspector=z8_inspector
+		v8=z8
+	)
 
 	# Link against v8, which is built elsewhere
 	if(V8_LIBRARY_TYPE STREQUAL static)
-		target_link_directories("${TARGET_NAME}" PUBLIC "${V8_LIBRARY_PATH}/obj")
-		target_link_libraries("${TARGET_NAME}" PUBLIC v8_monolith)
+		target_link_directories(${google_v8} PUBLIC "${V8_LIBRARY_PATH}/obj")
+		target_link_libraries(${google_v8} PRIVATE v8_monolith)
 		if(WIN32)
-			target_link_libraries("${TARGET_NAME}" PUBLIC dbghelp)
+			target_link_libraries(${google_v8} PRIVATE dbghelp)
 		endif()
 
 		# Building v8 against libstdc++ w/ clang requires `-latomic`
 		# TODO(?): We would need to record how v8 was compiled, not which toolchain is compiling *this*
 		# project.
 		# if(GLIBCXX)
-		# 	target_link_libraries(google_v8 PUBLIC atomic)
+		# 	target_link_libraries(google_v8 PRIVATE atomic)
 		# endif()
 	elseif(V8_LIBRARY_TYPE STREQUAL shared)
-		target_link_directories("${TARGET_NAME}" PUBLIC "${V8_LIBRARY_PATH}")
-		target_link_libraries("${TARGET_NAME}" PUBLIC v8 v8_libbase v8_libplatform icuuc)
+		target_link_directories(${google_v8} PRIVATE "${V8_LIBRARY_PATH}")
+		target_link_libraries(${google_v8} PRIVATE v8 v8_libbase v8_libplatform icuuc)
 	else()
 		message(FATAL_ERROR "Unknown v8 library type")
 	endif()
+else()
+	# Header files (nodejs)
+	if(NOT DEFINED NODE_DIST_DIR)
+		message(FATAL_ERROR "'NODE_DIST_DIR' is not set")
+	endif()
+	set(V8_INCLUDE_DIR "${NODE_DIST_DIR}/include/node")
+	if(NOT EXISTS "${V8_INCLUDE_DIR}/v8.h")
+		message(FATAL_ERROR "Missing '${V8_INCLUDE_DIR}/v8.h'")
+	endif()
+	message(STATUS "Using v8 headers from '${V8_INCLUDE_DIR}'")
 endif()
 
-# Sources which will be preprocessed by `expand_def`
-include(./PreprocessedSources.cmake)
-target_preprocessed_sources("${TARGET_NAME}" v8 "${CXX_MODULE_NAME}"
+# version.h
+target_include_directories(${google_v8} SYSTEM PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
+
+# v8 headers
+target_include_directories(${google_v8} SYSTEM PRIVATE "${V8_INCLUDE_DIR}")
+
+# Sources
+target_sources(${google_v8}
 	PUBLIC FILE_SET CXX_MODULES FILES
 		v8.cc
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@auto_js/v8_exports",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "C++ module exports for v8",
   "author": "https://github.com/laverdet/",
   "homepage": "https://github.com/laverdet/isolated-vm/tree/experimental/packages/third_party/v8",

package/v8.cc

@@ -63,9 +63,11 @@ using v8::V8FatalErrorCallback;
 using v8::Isolate;
 
 // v8-local-handle.h
+using v8::EscapableHandleScope;
 using v8::HandleScope;
 using v8::Local;
 using v8::MaybeLocal;
+using v8::SealHandleScope;
 
 // v8-locker.h
 using v8::Locker;

package/PreprocessedSources.cmake

@@ -1,37 +0,0 @@
-# Generate lightly preprocessed C++ source files, to workaround P3034R1
-function(target_preprocessed_sources TARGET SEARCH REPLACE)
-	set(FILE_SET ${ARGV})
-	list(POP_FRONT FILE_SET) # TARGET
-	list(POP_FRONT FILE_SET) # SEARCH
-	list(POP_FRONT FILE_SET) # REPLACE
-
-	if("${SEARCH}" STREQUAL "${REPLACE}")
-		# No-op replacement directly uses original sources
-		target_sources(${TARGET} ${FILE_SET})
-	else()
-		# Generated sources with macro replacement
-		set(GEN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/.${REPLACE}")
-		file(MAKE_DIRECTORY "${GEN_DIR}")
-		file(WRITE "${GEN_DIR}/.clang-tidy" "Checks: '-*'")
-		set(SCOPE)
-		set(NEXT_SCOPE)
-		foreach(FILE ${FILE_SET})
-			# Uppercase "files" are actually scope keywords
-			if("${FILE}" MATCHES "^[A-Z_]+$")
-				list(APPEND NEXT_SCOPE "${FILE}")
-				continue()
-			elseif(NEXT_SCOPE)
-				set(SCOPE ${NEXT_SCOPE})
-				set(NEXT_SCOPE)
-			endif()
-			# Add generator command
-			add_custom_command(
-				DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${FILE}"
-				OUTPUT "${GEN_DIR}/${FILE}"
-				COMMAND sh -c "${CMAKE_CURRENT_LIST_DIR}/expand_def ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} -D${SEARCH}=${REPLACE} >${GEN_DIR}/${FILE}"
-			)
-			set_source_files_properties("${GEN_DIR}/${FILE}" PROPERTIES GENERATED TRUE)
-			target_sources(${TARGET} ${SCOPE} "${GEN_DIR}/${FILE}")
-		endforeach()
-	endif()
-endfunction()

package/expand_def

@@ -1,23 +0,0 @@
-#!/bin/sh
-# Use the c preprocessor to expand command-line macros. This works around the draconian P3034R1
-# standard.
-# Usage: expand_def source.cc -Dfrom=to
-set -eu
-FILE="$1"
-shift
-
-replace() {
-	sed -E -e "s/(\s*#)/__REMOVE_PRE__\1/" -e "s/^\s*\/\/([A-Za-z0-9 ()_\-]+$)/__COMMENT__\1/" | \
-	cpp -E "$@" | \
-	sed -E -e "s/__REMOVE_PRE__//" -e "s/__COMMENT__/\/\//" | \
-	grep -Ev "^# [01]"
-}
-
-# nb: First line *must* be the module declaration, if it exists. So the `#line` directive happens
-# after that.
-CONTENT=$(cat "$FILE")
-echo "$CONTENT" | head -n1 | replace "$@"
-echo "// NOLINTBEGIN(google-readability-namespace-comments)"
-echo "#line 2 \"$FILE\""
-echo "$CONTENT" | tail -n+2 | replace "$@"
-echo "// NOLINTEND(google-readability-namespace-comments)"