Merge branch 'master' into boost-1.85

Author: buffer

.github/workflows/sdist.yml

@@ -25,7 +25,7 @@ jobs:
           python3 -m pip install build --user
 
       - name: Build a source tarball
-        run: python3 -m build --sdist
+        run: python3 setup.py sdist
 
       - name: Store the distribution packages
         uses: actions/upload-artifact@v4

examples/circle.py

@@ -5,7 +5,7 @@
 import STPyV8
 
 with STPyV8.JSContext() as ctxt:
-  ctxt.eval("""
+    ctxt.eval("""
     class Circle {
       constructor(radius) {
         this.radius = radius;
@@ -18,5 +18,5 @@ class Circle {
       }
   }
   """)
-  circle = ctxt.eval("new Circle(10)")
-  print("Area of the circle: " + str(circle.area))
+    circle = ctxt.eval("new Circle(10)")
+    print("Area of the circle: " + str(circle.area))

examples/console.py

@@ -5,29 +5,32 @@
 from logging import getLogger, basicConfig, INFO
 import STPyV8 as V8
 
-basicConfig(format='%(asctime)-15s %(message)s',
-            datefmt='%Y-%m-%d %H:%M:%S')
-log = getLogger('myapp')
+basicConfig(format="%(asctime)-15s %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
+log = getLogger("myapp")
 log.setLevel(INFO)
 
+
 class Console(object):
-  def log(self, message):
-    log.info(message)
+    def log(self, message):
+        log.info(message)
+
+    def error(self, message):
+        log.error(message)
 
-  def error(self, message):
-    log.error(message)
 
 class Global(V8.JSClass):
-  custom_console = Console()
+    custom_console = Console()
+
 
 def load(js_file):
-  with open(js_file, 'r') as f:
-    return f.read()
+    with open(js_file, "r") as f:
+        return f.read()
+
 
 def run(js_file):
-  with V8.JSContext(Global()) as ctxt:
-    ctxt.eval('this.console = custom_console;')
-    ctxt.eval(load(js_file))
+    with V8.JSContext(Global()) as ctxt:
+        ctxt.eval("this.console = custom_console;")
+        ctxt.eval(load(js_file))
 
-run('simple.js')
 
+run("simple.js")

examples/global.py

@@ -4,25 +4,27 @@
 
 import STPyV8 as V8
 
+
 class Global(V8.JSClass):
-  version = "1.0"
+    version = "1.0"
+
+    def hello(self, name):
+        return "Hello " + name
 
-  def hello(self, name):
-    return "Hello " + name
 
 with V8.JSContext(Global()) as ctxt:
-  print(ctxt.eval("version"))          # 1.0
-  print(ctxt.eval("hello('World')"))   # Hello World
-  print(ctxt.eval("hello.toString()")) # function () { [native code] }
+    print(ctxt.eval("version"))  # 1.0
+    print(ctxt.eval("hello('World')"))  # Hello World
+    print(ctxt.eval("hello.toString()"))  # function () { [native code] }
 
 # "simulate" a browser, defining the js 'window' object in python
 # see https://github.com/buffer/thug for a robust implementation
 
+
 class window(V8.JSClass):
+    def alert(self, message):
+        print("Popping up an alert with message " + message)
 
-  def alert(self, message):
-    print("Popping up an alert with message " + message)
 
 with V8.JSContext(window()) as browser_ctxt:
-  browser_ctxt.eval("alert('Hello')")
-
+    browser_ctxt.eval("alert('Hello')")

examples/meaning.py

@@ -4,13 +4,14 @@
 
 import STPyV8
 
+
 class MyClass(STPyV8.JSClass):
-  def reallyComplexFunction(self, addme):
-    return 10 * 3 + addme
+    def reallyComplexFunction(self, addme):
+        return 10 * 3 + addme
+
 
 my_class = MyClass()
 
 with STPyV8.JSContext(my_class) as ctxt:
-  meaning = ctxt.eval("this.reallyComplexFunction(2) + 10;")
-  print("The meaning of life: " + str(meaning))
-
+    meaning = ctxt.eval("this.reallyComplexFunction(2) + 10;")
+    print("The meaning of life: " + str(meaning))

examples/simple.py

@@ -5,10 +5,9 @@
 import STPyV8
 
 with STPyV8.JSContext() as ctxt:
-  upcase = ctxt.eval("""
+    upcase = ctxt.eval("""
     ( (lowerString) => {
         return lowerString.toUpperCase();
     })
   """)
-  print(upcase("hello world!"))
-
+    print(upcase("hello world!"))

ruff.toml

@@ -0,0 +1 @@
+exclude = ["docs"]

settings.py

@@ -7,7 +7,7 @@
 V8_HOME = os.environ.get("V8_HOME", os.path.join(STPYV8_HOME, "v8"))
 
 V8_GIT_URL = "https://chromium.googlesource.com/v8/v8.git"
-V8_GIT_TAG_STABLE = "12.4.254.14"
+V8_GIT_TAG_STABLE = "12.7.224.16"
 V8_GIT_TAG_MASTER = "master"
 V8_GIT_TAG = V8_GIT_TAG_STABLE
 DEPOT_GIT_URL = "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
@@ -117,7 +117,7 @@ def get_libboost_python_name():
         library_dirs.add(os.path.join(os.environ["Python_ROOT_DIR"], "libs"))
 
     libraries += ["winmm", "ws2_32", "Advapi32", "dbghelp", "v8_monolith"]
-    extra_compile_args += ["/O2", "/GL", "/MT", "/EHsc", "/Gy", "/Zi", "/std:c++20"]
+    extra_compile_args += ["/O2", "/GL", "/MT", "/EHsc", "/Gy", "/Zi", "/std:c++20", "/Zc:__cplusplus"]
     extra_link_args += ["/DLL", "/OPT:REF", "/OPT:ICF", "/MACHINE:X64"]
     macros += [
         ("HAVE_SNPRINTF", None),
@@ -134,10 +134,12 @@ def get_libboost_python_name():
         STPYV8_BOOST_PYTHON.replace(".", ""),
     ]
 
-    extra_compile_args.append("-std=c++17")
-
     if platform.system() in ("Linux",):
         libraries.append("rt")
+        extra_compile_args.append("-std=c++2a")
+    else:
+        extra_compile_args.append("-std=c++20")
+        extra_link_args.append("-headerpad_max_install_names")
 
 
 GN_ARGS = " ".join(f"{key}={value}" for key, value in gn_args.items())

setup.py

@@ -247,18 +247,19 @@ def run(self):
     version=STPYV8_VERSION,
     description="Python Wrapper for Google V8 Engine",
     long_description=open("README.md").read(),
-    platforms="x86",
+    platforms=["Linux", "MacOS", "Windows"],
     author="Philip Syme, Angelo Dell'Aera",
     url="https://github.com/cloudflare/stpyv8",
     license="Apache License 2.0",
     py_modules=["STPyV8"],
     ext_modules=[stpyv8],
-    install_requires=["wheel", "importlib_resources; python_version < '3.10'"],
+    install_requires=["importlib_resources; python_version < '3.10'"],
+    setup_requires=["wheel"],
     data_files=[
         (ICU_DATA_PACKAGE_FOLDER, [ICU_DATA_V8_FILE_PATH]),
     ],
     classifiers=[
-        "Development Status :: 4 - Beta",
+        "Development Status :: 5 - Production/Stable",
         "Environment :: Plugins",
         "Intended Audience :: Developers",
         "Intended Audience :: System Administrators",
@@ -273,10 +274,12 @@ def run(self):
         "Topic :: Utilities",
         "Operating System :: POSIX :: Linux",
         "Operating System :: MacOS :: MacOS X",
+        "Operating System :: Microsoft :: Windows",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
     ],
     long_description_content_type="text/markdown",
     cmdclass=dict(

src/Engine.cpp

@@ -157,12 +157,12 @@ std::shared_ptr<CScript> CEngine::InternalCompile(v8::Handle<v8::String> src,
 
     if (line >= 0 && col >= 0)
     {
-        v8::ScriptOrigin script_origin(m_isolate, name, line, col);
+        v8::ScriptOrigin script_origin(name, line, col);
         script = v8::Script::Compile(context, source, &script_origin);
     }
     else
     {
-        v8::ScriptOrigin script_origin(m_isolate, name);
+        v8::ScriptOrigin script_origin(name);
         script = v8::Script::Compile(context, source, &script_origin);
     }
 

src/Wrapper.cpp

@@ -750,7 +750,7 @@ void CPythonObject::SetupObjectTemplate(v8::Isolate *isolate, v8::Handle<v8::Obj
 
     clazz->SetInternalFieldCount(1);
     clazz->SetHandler(v8::NamedPropertyHandlerConfiguration(NamedGetter, NamedSetter, NamedQuery, NamedDeleter, NamedEnumerator));
-    clazz->SetIndexedPropertyHandler(IndexedGetter, IndexedSetter, IndexedQuery, IndexedDeleter, IndexedEnumerator);
+    clazz->SetHandler(v8::IndexedPropertyHandlerConfiguration(IndexedGetter, IndexedSetter, IndexedQuery, IndexedDeleter, IndexedEnumerator));
     clazz->SetCallAsFunctionHandler(Caller);
 }
 

src/utf8/checked.h

@@ -261,11 +261,15 @@ namespace utf8
 
     // The iterator class
     template <typename octet_iterator>
-    class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
+    // class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
+    class iterator {
       octet_iterator it;
       octet_iterator range_start;
       octet_iterator range_end;
       public:
+      using iterator_category = std::bidirectional_iterator_tag;
+      using value_type = uint32_t;
+
       iterator () {};
       explicit iterator (const octet_iterator& octet_it,
                          const octet_iterator& range_start,

src/utf8/unchecked.h

@@ -176,9 +176,13 @@ namespace utf8
 
         // The iterator class
         template <typename octet_iterator>
-          class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> { 
+          // class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
+          class iterator {
             octet_iterator it;
             public:
+            using iterator_category = std::bidirectional_iterator_tag;
+            using value_type = uint32_t;
+
             iterator () {};
             explicit iterator (const octet_iterator& octet_it): it(octet_it) {}
             // the default "big three" are OK