@auto_js/v8_exports 0.0.4 → 0.0.6

package/CMakeLists.txt

@@ -56,15 +56,32 @@ if(NPM_PACKAGE_NAME STREQUAL @auto_js/isolated_v8_exports)
 	message(STATUS "Using v8 library type '${V8_LIBRARY_TYPE}'")
 
 	# Preprocessor macros which enable dual v8 in the same process
-	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
-	)
+	if(NOT DEFINED V8_TRICKSHOT)
+		if(DEFINED ENV{V8_TRICKSHOT})
+			set(V8_TRICKSHOT "$ENV{V8_TRICKSHOT}" CACHE STRING "")
+		else()
+			# nb: For older bundles where it was not defined
+			set(V8_TRICKSHOT blam)
+		endif()
+	endif()
+	if(V8_TRICKSHOT)
+		target_compile_definitions(${google_v8} PUBLIC
+			cppgc=yppgc
+			unibrow=ynibrow
+			v8_crdtp=y8_crdtp
+			V8_Dcheck=Y8_Dcheck
+			V8_Fatal=Y8_Fatal
+			v8_inspector=y8_inspector
+			v8=y8
+		)
+	endif()
+
+	# P3034R1 workaround for gcc
+	if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+		set(v8 y8)
+	else()
+		set(v8 v8)
+	endif()
 
 	# Link against v8, which is built elsewhere
 	if(V8_LIBRARY_TYPE STREQUAL static)
@@ -87,6 +104,7 @@ if(NPM_PACKAGE_NAME STREQUAL @auto_js/isolated_v8_exports)
 		message(FATAL_ERROR "Unknown v8 library type")
 	endif()
 else()
+	set(v8 v8)
 	# Header files (nodejs)
 	if(NOT DEFINED NODE_DIST_DIR)
 		message(FATAL_ERROR "'NODE_DIST_DIR' is not set")
@@ -96,16 +114,24 @@ else()
 		message(FATAL_ERROR "Missing '${V8_INCLUDE_DIR}/v8.h'")
 	endif()
 	message(STATUS "Using v8 headers from '${V8_INCLUDE_DIR}'")
+
+	# nodejs v8 is linked as a shared library
+	target_compile_definitions(${google_v8} PRIVATE USING_V8_SHARED)
 endif()
 
+# These need to be public, for version detection. I was hoping I could do it with constexpr but
+# apparently not:
+# https://github.com/llvm/llvm-project/issues/203372
+
 # version.h
-target_include_directories(${google_v8} SYSTEM PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(${google_v8} SYSTEM PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 
 # v8 headers
-target_include_directories(${google_v8} SYSTEM PRIVATE "${V8_INCLUDE_DIR}")
+target_include_directories(${google_v8} SYSTEM PUBLIC "${V8_INCLUDE_DIR}")
 
-# Sources
-target_sources(${google_v8}
+# Sources which may be preprocessed by `expand_def`
+include(./PreprocessedSources.cmake)
+target_preprocessed_sources(${google_v8} v8 ${v8}
 	PUBLIC FILE_SET CXX_MODULES FILES
 		v8.cc
 )

package/PreprocessedSources.cmake

@@ -0,0 +1,37 @@
+# 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

@@ -0,0 +1,23 @@
+#!/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)"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@auto_js/v8_exports",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "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

@@ -1,6 +1,16 @@
 module;
+// Pull in `V8_EXPORT`
+#include "v8config.h"
+
+// Redefine `V8_EXPORT` with weak attribute
+#if USING_V8_SHARED
+#undef V8_EXPORT
+#include "v8_js/extern.h"
+#endif
+
+// Continue with the rest of the include chain
 #include "v8.h"
-#include "version.h"
+#include "v8_js/version.h"
 #ifdef INCLUDE_V8_PLATFORM
 #include "libplatform/libplatform.h"
 #include "v8-platform.h"
@@ -61,6 +71,9 @@ using v8::V8FatalErrorCallback;
 
 // v8-isolate.h
 using v8::Isolate;
+using v8::IsolateGroup;
+using v8::MemoryPressureLevel;
+using v8::ResourceConstraints;
 
 // v8-local-handle.h
 using v8::EscapableHandleScope;
@@ -140,25 +153,13 @@ using v8::AccessCheckCallback;
 using v8::ConstructorBehavior;
 using v8::DictionaryTemplate;
 using v8::FunctionTemplate;
-using v8::GenericNamedPropertyDefinerCallback;
-using v8::GenericNamedPropertyDeleterCallback;
-using v8::GenericNamedPropertyDescriptorCallback;
-using v8::GenericNamedPropertyEnumeratorCallback;
-using v8::GenericNamedPropertyQueryCallback;
-using v8::GenericNamedPropertySetterCallback;
-using v8::IndexedPropertyDefinerCallback;
 using v8::IndexedPropertyDefinerCallbackV2;
-using v8::IndexedPropertyDeleterCallback;
 using v8::IndexedPropertyDeleterCallbackV2;
-using v8::IndexedPropertyDescriptorCallback;
 using v8::IndexedPropertyDescriptorCallbackV2;
 using v8::IndexedPropertyEnumeratorCallback;
-using v8::IndexedPropertyGetterCallback;
 using v8::IndexedPropertyGetterCallbackV2;
 using v8::IndexedPropertyHandlerConfiguration;
-using v8::IndexedPropertyQueryCallback;
 using v8::IndexedPropertyQueryCallbackV2;
-using v8::IndexedPropertySetterCallback;
 using v8::IndexedPropertySetterCallbackV2;
 using v8::Intercepted;
 using v8::NamedPropertyDefinerCallback;

package/v8_js/extern.h

@@ -0,0 +1,9 @@
+#if __linux__
+#define V8_EXPORT __attribute__((weak))
+#elif __APPLE__
+#define V8_EXPORT __attribute__((weak))
+#elif _WIN64
+#define V8_EXPORT __declspec(dllimport) __attribute__((weak))
+#else
+#define V8_EXPORT
+#endif

package/{version.h → v8_js/version.h}

@@ -9,3 +9,9 @@
 
 // https://github.com/v8/v8/commit/4f8d4447533bc8d119048961c2f103d9875674e0
 #define V8_HAS_NUMERIC V8_AT_LEAST(11, 7, 352)
+
+// e1aadd4b3ec
+#define V8_HAS_TAGGED_EXTERNAL V8_AT_LEAST(14, 3, 30)
+
+// 7f7b4b9e4c8
+#define V8_HAS_CONTEXT_FREE_FIXED_ARRAY V8_AT_LEAST(14, 4, 111)