node-gtk 0.14.0 → 1.0.0

package/README.md

@@ -19,8 +19,8 @@ Node-Gtk is a [gobject-introspection](https://gi.readthedocs.io/en/latest) libra
 use any introspected library, such as Gtk+, usable.  It is similar in essence to [GJS](https://wiki.gnome.org/action/show/Projects/Gjs) or [PyGObject](https://pygobject.readthedocs.io). Please note this project is currently in a _beta_ state and is being developed. Any contributors willing to help
 will be welcomed.
 
-Supported Node.js versions: **16**, **18** (other versions should work but are untested)<br>
-Pre-built binaries available for: **Linux**, **macOS** (all supported versions except 18)
+Supported Node.js versions: **20**, **22**, **24** (other versions may work but are untested)<br>
+Pre-built binaries available for: **Linux**, **macOS**
 
 ### Table of contents
 
@@ -120,9 +120,13 @@ Install basic dependencies:
 sudo dnf install \
   @development-tools \
   nodejs \
+  nodejs-devel \
   gobject-introspection \
+  gobject-introspection-devel \
   gtk3 \
-  cairo
+  gtk3-devel \
+  cairo \
+  cairo-devel
 ```
 
 After installing of packages, run `npm install node-gtk`.
@@ -252,17 +256,12 @@ Once installed, you can `./examples/browser.js google.com` or any other page, an
 ## Contributing
 
 If you'd like to help, we'd be more than happy to have support. To setup your development environment, you can
-run `npm run configure`. You can then build the project with `npm run build`.
+run `npm run configure`. You can then build the project with `npm run build`. To generate the `compile_commands.json`
+for LSP to work nicely, you can use [bear](https://github.com/rizsotto/Bear) as `bear -- npm run build`.
 
  - https://developer.gnome.org/gi/stable/index.html
  - https://v8docs.nodesource.com/
  - https://github.com/nodejs/nan#api
 
-Don't hesitate to join our [Discord channel](https://discord.gg/r2VqPUV).
-
-### Contributors
-
- - [magcius](https://github.com/magcius)
- - [WebReflection](https://github.com/WebReflection)
- - [romgrk](https://github.com/romgrk)
- - [wotzlaff](https://github.com/wotzlaff)
+There is a [Discord channel](https://discord.gg/r2VqPUV) but it receives little monitoring, use github issues or
+discussions preferably.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-gtk",
-  "version": "0.14.0",
+  "version": "1.0.0",
   "description": "GNOME Gtk+ bindings for NodeJS",
   "main": "lib/index.js",
   "scripts": {
@@ -36,8 +36,8 @@
     "lodash.camelcase": "4.3.0",
     "lodash.isequal": "4.5.0",
     "lodash.snakecase": "^4.1.1",
-    "nan": "^2.17.0",
-    "node-gyp": "^9.3.1",
+    "nan": "^2.23.0",
+    "node-gyp": "^11.2.0",
     "remove-trailing-spaces": "^1.0.7",
     "unindent": "^2.0.0"
   },
@@ -45,10 +45,10 @@
     "assert": "^1.5.0",
     "aws-sdk": "^2.452.0",
     "chalk": "^2.4.2",
-    "deasync": "^0.1.19",
+    "deasync": "^0.1.30",
     "mocha": "^7.1.0",
     "nid-parser": "0.0.5",
-    "node-pre-gyp-github": "^1.4.3"
+    "node-pre-gyp-github": "^1.4.5"
   },
   "files": [
     "/lib",

package/scripts/ci.sh

@@ -41,13 +41,15 @@ function npm_test() {
     echo "### Running tests ###";
 
     if [[ $(uname -s) == 'Darwin' ]]; then
-        export GST_PLUGIN_SYSTEM_PATH=/usr/local/lib/gstreamer-1.0;
+        export GST_PLUGIN_SYSTEM_PATH=$(brew --prefix gstreamer)/lib/gstreamer-1.0;
         npx mocha                                 \
                   --skip=callback                 \
-                  --skip=error                    \
+                  --skip=union__fields            \
                   tests/__run__.js
     else
-        xvfb-run -a npm test -- --skip=callback;
+        xvfb-run -a npm test --                   \
+                  --skip=callback                 \
+                  --skip=union__fields;
     fi;
 }
 

package/src/boxed.cc

@@ -174,11 +174,11 @@ static void BoxedConstructor(const Nan::FunctionCallbackInfo<Value> &info) {
 
     if (info[0]->IsExternal ()) {
         /* The External case. This is how WrapperFromBoxed is called. */
-        bool mustCopy = Nan::To<bool> (info[1]).ToChecked();
+        auto ownership = (ResourceOwnership) Nan::To<int32_t> (info[1]).ToChecked();
 
         boxed = External::Cast(*info[0])->Value();
 
-        if (mustCopy) {
+        if (ownership == kCopy) {
             if (gtype != G_TYPE_NONE) {
                 boxed = g_boxed_copy (gtype, boxed);
             }
@@ -192,7 +192,7 @@ static void BoxedConstructor(const Nan::FunctionCallbackInfo<Value> &info) {
             }
         }
         else {
-            owns_memory = false;
+            owns_memory = ownership == kTransfer;
         }
     } else {
         /* User code calling `new Pango.AttrList()` */
@@ -286,12 +286,12 @@ static void BoxedDestroyed(const Nan::WeakCallbackInfo<Boxed> &info) {
     delete box;
 }
 
-static void BoxedClassDestroyed(const v8::WeakCallbackInfo<GIBaseInfo> &info) {
+static void BoxedClassDestroyed(const Nan::WeakCallbackInfo<GIBaseInfo> &info) {
     GIBaseInfo *gi_info = info.GetParameter ();
     GType gtype = g_registered_type_info_get_g_type ((GIRegisteredTypeInfo *) gi_info);
 
-    auto *persistent_template = (Persistent<FunctionTemplate> *) g_type_get_qdata (gtype, GNodeJS::template_quark());
-    auto *persistent_function = (Persistent<FunctionTemplate> *) g_type_get_qdata (gtype, GNodeJS::function_quark());
+    auto *persistent_template = (Nan::Persistent<FunctionTemplate> *) g_type_get_qdata (gtype, GNodeJS::template_quark());
+    auto *persistent_function = (Nan::Persistent<FunctionTemplate> *) g_type_get_qdata (gtype, GNodeJS::function_quark());
     delete persistent_template;
     delete persistent_function;
 
@@ -324,7 +324,7 @@ Local<FunctionTemplate> GetBoxedTemplate(GIBaseInfo *info, GType gtype) {
      */
 
     if (data) {
-        auto *persistent = (Persistent<FunctionTemplate> *) data;
+        auto *persistent = (Nan::Persistent<FunctionTemplate> *) data;
         auto tpl = Nan::New<FunctionTemplate> (*persistent);
         return tpl;
     }
@@ -353,7 +353,7 @@ Local<FunctionTemplate> GetBoxedTemplate(GIBaseInfo *info, GType gtype) {
     if (gtype == G_TYPE_NONE)
         return tpl;
 
-    auto *persistent = new Persistent<FunctionTemplate>(Isolate::GetCurrent(), tpl);
+    auto *persistent = new Nan::Persistent<FunctionTemplate>(tpl);
     persistent->SetWeak(
             g_base_info_ref(info),
             BoxedClassDestroyed,
@@ -380,7 +380,7 @@ Local<Function> GetBoxedFunction(GIBaseInfo *info, GType gtype) {
     }
 
     if (data) {
-        auto *persistent = (Persistent<Function> *) data;
+        auto *persistent = (Nan::Persistent<Function> *) data;
         auto fn = Nan::New<Function> (*persistent);
         return fn;
     }
@@ -391,7 +391,7 @@ Local<Function> GetBoxedFunction(GIBaseInfo *info, GType gtype) {
     if (gtype == G_TYPE_NONE)
         return fn;
 
-    auto *persistent = new Persistent<Function>(Isolate::GetCurrent(), fn);
+    auto *persistent = new Nan::Persistent<Function>(fn);
 
     g_type_set_qdata(gtype, GNodeJS::function_quark(), persistent);
 
@@ -419,15 +419,15 @@ Local<Function> MakeBoxedClass(GIBaseInfo *info) {
     return GetBoxedFunction (info, gtype);
 }
 
-Local<Value> WrapperFromBoxed(GIBaseInfo *info, void *data, bool mustCopy) {
+Local<Value> WrapperFromBoxed(GIBaseInfo *info, void *data, ResourceOwnership ownership) {
     if (data == NULL)
         return Nan::Null();
 
     Local<Function> constructor = MakeBoxedClass (info);
 
-    Local<Value> boxed_external = Nan::New<External> (data);
-    Local<Value> must_copy_value = Nan::New<v8::Boolean> (mustCopy);
-    Local<Value> args[] = { boxed_external, must_copy_value };
+    Local<Value> jsBoxed = Nan::New<External> (data);
+    Local<Value> jsOwnership = Nan::New<v8::Int32> ((int32_t) ownership);
+    Local<Value> args[] = { jsBoxed, jsOwnership };
 
     MaybeLocal<Object> instance = Nan::NewInstance(constructor, 2, args);
 

package/src/boxed.h

@@ -1,6 +1,7 @@
 
 #pragma once
 
+#include "value.h"
 #include <nan.h>
 #include <node.h>
 #include <girepository.h>
@@ -30,7 +31,7 @@ public:
 
 Local<Function>         MakeBoxedClass   (GIBaseInfo *info);
 Local<FunctionTemplate> GetBoxedTemplate (GIBaseInfo *info, GType gtype);
-Local<Value>            WrapperFromBoxed (GIBaseInfo *info, void *data, bool mustCopy = false);
+Local<Value>            WrapperFromBoxed (GIBaseInfo *info, void *data, ResourceOwnership ownership = kNone);
 void *                  PointerFromWrapper (Local<Value>);
 
 };

package/src/callback.cc

@@ -117,14 +117,14 @@ void Callback::Execute (GIArgument *result, GIArgument **args, Callback *callbac
 
         bool isOutArgument = g_arg_info_get_direction(&arg_info) == GI_DIRECTION_OUT;
         bool isPrimitive = Type::IsPrimitive(&arg_type);
-        bool mustCopy = isOutArgument ? false : true;
+        ResourceOwnership ownership = isOutArgument ? kNone : kCopy;
 
         if (isPrimitive && isOutArgument) {
             n_return_values += 1;
             primitive_out_arguments_mask |= 1 << i;
             js_args[i] = Nan::Null();
         } else {
-            js_args[i] = GIArgumentToV8 (&arg_type, args[i + args_offset], -1, mustCopy);
+            js_args[i] = GIArgumentToV8 (&arg_type, args[i + args_offset], -1, ownership);
         }
     }
 

package/src/closure.cc

@@ -63,26 +63,30 @@ void Closure::Execute(GICallableInfo *info, guint signal_id,
             g_callable_info_load_arg(info, i - 1, &arg_info);
             g_arg_info_load_type(&arg_info, &type_info);
 
-            bool mustCopy = true;
+            ResourceOwnership ownership = kCopy;
 
             if (signal_query.signal_id) {
-                mustCopy = (signal_query.param_types[i - 1] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0;
+                if ((signal_query.param_types[i - 1] & G_SIGNAL_TYPE_STATIC_SCOPE) != 0) {
+                    ownership = kNone;
+                }
             }
             if (g_arg_info_get_direction(&arg_info) == GI_DIRECTION_OUT) {
-                mustCopy = false;
+                ownership = kNone;
             }
 
-            js_args[i - 1] = GIArgumentToV8(&type_info, &argument, -1, mustCopy);
+            js_args[i - 1] = GIArgumentToV8(&type_info, &argument, -1, ownership);
         }
     } else {
         /* CallableInfo is not available: use GValueToV8 */
         for (guint i = 1; i < n_param_values; i++) {
-            bool mustCopy = true;
+            ResourceOwnership ownership = kCopy;
 
             if (signal_query.signal_id) {
-                mustCopy = (signal_query.param_types[i - 1] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0;
+                if ((signal_query.param_types[i - 1] & G_SIGNAL_TYPE_STATIC_SCOPE) != 0) {
+                    ownership = kNone;
+                }
             }
-            js_args[i - 1] = GValueToV8(&param_values[i], mustCopy);
+            js_args[i - 1] = GValueToV8(&param_values[i], ownership);
         }
     }
 
@@ -101,7 +105,7 @@ void Closure::Execute(GICallableInfo *info, guint signal_id,
             && result.ToLocal(&return_value)) {
 
         if (g_return_value) {
-            if (!V8ToGValue (g_return_value, return_value, true))
+            if (!V8ToGValue (g_return_value, return_value, kCopy))
                 goto throw_exception;
         }
 

package/src/debug.cc

@@ -10,6 +10,7 @@
 #include "type.h"
 
 #include <cstdio>
+#include <cinttypes>
 
 namespace GNodeJS {
 
@@ -245,16 +246,16 @@ void print_gtype (GType type) {
 void print_type (GType type) {
     GType t = type;
     while(!G_TYPE_IS_FUNDAMENTAL(type) && t != 0) {
-        printf("\t\x1b[92m -> %s \t (%lu)\x1b[0m\n", g_type_name(t), t);
+        printf("\t\x1b[92m -> %s \t (%" PRIuPTR ")\x1b[0m\n", g_type_name(t), (uintptr_t)t);
         t = g_type_parent(t);
     }
 }
 
 void print_klass (void * klass) {
     printf("\x1b[38;5;202m");
-    printf("klass: %s  (type: %lu )",
+    printf("klass: %s  (type: %" PRIuPTR " )",
             G_OBJECT_CLASS_NAME (klass),
-            G_OBJECT_CLASS_TYPE (klass) );
+            (uintptr_t)G_OBJECT_CLASS_TYPE (klass) );
     printf("\x1b[0m\n");
 }
 

package/src/function.cc

@@ -335,7 +335,7 @@ Local<Value> FunctionCall (
 
     if (func->is_method) {
         GIBaseInfo *container = g_base_info_get_container (gi_info);
-        V8ToGIArgument(container, &total_arg_values[0], info.This());
+        V8ToGIArgumentInterface(container, &total_arg_values[0], info.This());
         callable_arg_values = &total_arg_values[1];
     } else {
         callable_arg_values = &total_arg_values[0];
@@ -488,24 +488,29 @@ Local<Value> FunctionCall (
             Nan::ThrowError(error_stack->message);
             g_error_free(error_stack);
         }
+
+        /*
+        * Fifth, free the return value and arguments
+        */
+
+        if (!use_return_value)
+            FreeGIArgument(&return_type, &return_value_stack, return_transfer);
+
     } else if (!use_return_value) {
-        jsReturnValue = func->GetReturnValue (
+
+        // Value transferred to jsReturnValue
+        jsReturnValue = func->JsReturnValue (
                 info.This(),
                 &return_type,
-                use_return_value ? return_value : &return_value_stack,
-                callable_arg_values);
+                &return_value_stack,
+                callable_arg_values,
+                return_transfer);
     } else {
+
+        // Value returned in return_value
         jsReturnValue = Nan::Undefined();
     }
 
-
-    /*
-     * Fifth, free the return value and arguments
-     */
-
-    if (!use_return_value)
-        FreeGIArgument(&return_type, &return_value_stack, return_transfer);
-
     for (int i = 0; i < func->n_callable_args; i++) {
         GIArgInfo  arg_info = {};
         GITypeInfo arg_type;
@@ -553,11 +558,12 @@ Local<Value> FunctionCall (
  * Creates the JS return value from the C arguments list
  * @returns the JS return value
  */
-Local<Value> FunctionInfo::GetReturnValue (
+Local<Value> FunctionInfo::JsReturnValue (
         Local<Value> self,
         GITypeInfo* return_type,
         GIArgument* return_value,
-        GIArgument* callable_arg_values) {
+        GIArgument* callable_arg_values,
+        GITransfer return_transfer) {
 
     Local<Value> jsReturnValue;
     int jsReturnIndex = 0;
@@ -591,7 +597,10 @@ Local<Value> FunctionInfo::GetReturnValue (
         // When a method returns the instance itself, skip the conversion and just return the
         // existent wrapper
         bool isReturningSelf = is_method && PointerFromWrapper(self) == return_value->v_pointer;
-        ADD_RETURN (isReturningSelf ? self : GIArgumentToV8 (return_type, return_value, length))
+        ADD_RETURN (isReturningSelf ? self :
+            GIArgumentToV8 (
+                return_type, return_value, length,
+                return_transfer == GI_TRANSFER_EVERYTHING ? kTransfer : kNone))
     }
 
     for (int i = 0; i < n_callable_args; i++) {
@@ -630,13 +639,15 @@ Local<Value> FunctionInfo::GetReturnValue (
                 ADD_RETURN (result)
 
             } else if (param.type == ParameterType::kNORMAL) {
+                GITransfer transfer = g_arg_info_get_ownership_transfer(&arg_info);
+                ResourceOwnership ownership = transfer == GI_TRANSFER_EVERYTHING ? kTransfer : kNone;
 
                 if (IsPointerType(&arg_type) && g_arg_info_is_caller_allocates(&arg_info)) {
                     void *pointer = &arg_value.v_pointer;
-                    ADD_RETURN (GIArgumentToV8(&arg_type, (GIArgument*) pointer))
+                    ADD_RETURN (GIArgumentToV8(&arg_type, (GIArgument*) pointer, -1, ownership))
                 }
                 else {
-                    ADD_RETURN (GIArgumentToV8(&arg_type, (GIArgument*) arg_value.v_pointer))
+                    ADD_RETURN (GIArgumentToV8(&arg_type, (GIArgument*) arg_value.v_pointer, -1, ownership))
                 }
             }
         }
@@ -647,19 +658,6 @@ Local<Value> FunctionInfo::GetReturnValue (
     return jsReturnValue;
 }
 
-/**
- * Frees the C return value
- * @param return_value the return value pointer
- */
-void FunctionInfo::FreeReturnValue (GIArgument *return_value) {
-    GITypeInfo return_type;
-    g_callable_info_load_return_type(info, &return_type);
-    GITransfer return_transfer = g_callable_info_get_caller_owns(info);
-
-    FreeGIArgument(&return_type, return_value, return_transfer);
-}
-
-
 
 Local<Function> MakeFunction(GIBaseInfo *info) {
     FunctionInfo *func = new FunctionInfo(info);
@@ -673,8 +671,8 @@ Local<Function> MakeFunction(GIBaseInfo *info) {
     auto fn = Nan::GetFunction (tpl).ToLocalChecked();
     fn->SetName(name);
 
-    Persistent<FunctionTemplate> persistent(Isolate::GetCurrent(), tpl);
-    persistent.SetWeak(func, FunctionDestroyed, WeakCallbackType::kParameter);
+    func->persistent = new Nan::Persistent<FunctionTemplate>(tpl);
+    func->persistent->SetWeak(func, FunctionDestroyed, WeakCallbackType::kParameter);
 
     return fn;
 }
@@ -691,8 +689,9 @@ void FunctionInvoker(const Nan::FunctionCallbackInfo<Value> &info) {
     Callback::AsyncFree();
 }
 
-void FunctionDestroyed(const v8::WeakCallbackInfo<FunctionInfo> &data) {
+void FunctionDestroyed(const Nan::WeakCallbackInfo<FunctionInfo> &data) {
     FunctionInfo *func = data.GetParameter ();
+    delete func->persistent;
     delete func;
 }
 

package/src/function.h

@@ -40,14 +40,14 @@ struct FunctionInfo {
     int n_in_args;
 
     Parameter* call_parameters;
+    Nan::Persistent<FunctionTemplate> *persistent;
 
     FunctionInfo(GIBaseInfo* info);
     ~FunctionInfo();
 
     bool Init();
     bool TypeCheck (const Nan::FunctionCallbackInfo<Value> &info);
-    Local<Value> GetReturnValue (Local<Value> self, GITypeInfo* return_type, GIArgument* return_value, GIArgument* callable_arg_values);
-    void FreeReturnValue (GIArgument *return_value);
+    Local<Value> JsReturnValue (Local<Value> self, GITypeInfo* return_type, GIArgument* return_value, GIArgument* callable_arg_values, GITransfer return_transfer);
 };
 
 bool IsDestroyNotify (GIBaseInfo *info);
@@ -55,7 +55,7 @@ bool IsDestroyNotify (GIBaseInfo *info);
 Local<Value> FunctionCall (FunctionInfo *func, const Nan::FunctionCallbackInfo<Value> &info, GIArgument *return_value = NULL, GError **error = NULL);
 
 void FunctionInvoker (const Nan::FunctionCallbackInfo<Value> &info);
-void FunctionDestroyed (const v8::WeakCallbackInfo<FunctionInfo> &data);
+void FunctionDestroyed (const Nan::WeakCallbackInfo<FunctionInfo> &data);
 
 Local<Function>      MakeFunction (GIBaseInfo *base_info);
 

package/src/gi.cc

@@ -283,7 +283,7 @@ NAN_METHOD(StructFieldGetter) {
     }
 
     GIArgument value;
-    bool mustCopy = true;
+    GNodeJS::ResourceOwnership ownership = GNodeJS::kCopy;
     BaseInfo typeInfo = g_field_info_get_type(*fieldInfo);
 
     if (!g_field_info_get_field(*fieldInfo, boxed, &value)) {
@@ -300,13 +300,13 @@ NAN_METHOD(StructFieldGetter) {
         // auto offset = g_field_info_get_offset(*fieldInfo);
         // auto fieldPtr = G_STRUCT_MEMBER_P(boxed, offset);
         // value.v_pointer = fieldPtr;
-        // mustCopy = false;
+        // ownership = kNone;
 
         Nan::ThrowError("Converting non-primitive fields is not allowed");
         return;
     }
 
-    RETURN(GNodeJS::GIArgumentToV8(*typeInfo, &value, -1, mustCopy));
+    RETURN(GNodeJS::GIArgumentToV8(*typeInfo, &value, -1, ownership));
 }
 
 NAN_METHOD(StartLoop) {

package/src/gobject.cc

@@ -4,13 +4,11 @@
 #include "boxed.h"
 #include "callback.h"
 #include "closure.h"
-#include "debug.h"
 #include "error.h"
 #include "function.h"
 #include "gi.h"
 #include "gobject.h"
 #include "macros.h"
-#include "type.h"
 #include "util.h"
 #include "value.h"
 
@@ -21,7 +19,6 @@ using v8::Function;
 using v8::FunctionTemplate;
 using v8::Local;
 using v8::MaybeLocal;
-using v8::Number;
 using v8::Object;
 using v8::String;
 using Nan::New;
@@ -75,7 +72,7 @@ static GObject* CreateGObjectFromObject(GType gtype, Local<Value> object) {
 
         g_value_init(&values[index], value_spec->value_type);
 
-        if (!V8ToGValue(&values[index], value, true)) {
+        if (!V8ToGValue(&values[index], value, kCopy)) {
             // V8ToGValue throws the error
             goto out;
         }
@@ -102,7 +99,7 @@ static void ToggleNotify(gpointer user_data, GObject *gobject, gboolean toggle_d
 
     g_assert (data != NULL);
 
-    auto *persistent = (Persistent<Object> *) data;
+    auto *persistent = (Nan::Persistent<Object> *) data;
 
     if (toggle_down) {
         /* We're dropping from 2 refs to 1 ref. We are the last holder. Make
@@ -120,7 +117,7 @@ static void AssociateGObject(Local<Object> object, GObject *gobject, GType gtype
 
     SET_OBJECT_GTYPE(object, gtype);
 
-    Persistent<Object> *persistent = new Persistent<Object>(object);
+    auto *persistent = new Nan::Persistent<Object>(object);
     g_object_set_qdata (gobject, GNodeJS::object_quark(), persistent);
 
     // Because we can't sink floating ref and add toggle ref at the same time,
@@ -184,7 +181,7 @@ static void GObjectDestroyed(const Nan::WeakCallbackInfo<GObject> &data) {
     GObject *gobject = data.GetParameter ();
 
     void *type_data = g_object_get_qdata (gobject, GNodeJS::object_quark());
-    Persistent<Object> *persistent = (Persistent<Object> *) type_data;
+    auto *persistent = (Nan::Persistent<Object> *) type_data;
     delete persistent;
 
     /* We're destroying the wrapper object, so make sure to clear out
@@ -200,9 +197,9 @@ static void GObjectClassDestroyed(const Nan::WeakCallbackInfo<GType> &info) {
 
     DestroyVFuncs(gtype);
 
-    auto persistentTpl = (Persistent<FunctionTemplate> *)
+    auto persistentTpl = (Nan::Persistent<FunctionTemplate> *)
         g_type_get_qdata (gtype, GNodeJS::template_quark());
-    auto persistentFn  = (Persistent<Function> *)
+    auto persistentFn  = (Nan::Persistent<Function> *)
         g_type_get_qdata (gtype, GNodeJS::function_quark());
     delete persistentTpl;
     delete persistentFn;
@@ -212,8 +209,18 @@ static void GObjectClassDestroyed(const Nan::WeakCallbackInfo<GType> &info) {
     g_free(gtypePtr);
 }
 
-static void GObjectFallbackPropertyGetter(Local<v8::Name> property,
-                                            const v8::PropertyCallbackInfo<Value>& info) {
+#if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION > 12 || \
+    (V8_MAJOR_VERSION == 12 && defined(V8_MINOR_VERSION) && V8_MINOR_VERSION > 4))
+#define PROPERTY_CALLBACK_RETURN_TYPE v8::Intercepted
+#define PROPERTY_CALLBACK_INFO_TYPE v8::PropertyCallbackInfo<void>
+#else
+#define PROPERTY_CALLBACK_RETURN_TYPE void
+#define PROPERTY_CALLBACK_INFO_TYPE v8::PropertyCallbackInfo<Value>
+#endif
+
+static PROPERTY_CALLBACK_RETURN_TYPE
+GObjectFallbackPropertyGetter(Local<v8::Name> property,
+                              const v8::PropertyCallbackInfo<Value>& info) {
     auto self = info.Holder();
     GObject *gobject = GObjectFromWrapper (self);
 
@@ -225,20 +232,25 @@ static void GObjectFallbackPropertyGetter(Local<v8::Name> property,
     if (strstr(prop_name_camel, "-")) {
         // Has dash, not a camel-case property name.
         RETURN(Nan::Undefined());
-        return;
+        return Nan::Intercepted::Yes();
     }
 
     char *prop_name = Util::ToDashed(prop_name_camel);
 
     auto value = GetGObjectProperty(gobject, prop_name);
-    if (!value.IsEmpty())
+    if (!value.IsEmpty()) {
         RETURN(value.ToLocalChecked());
+        g_free(prop_name);
+        return Nan::Intercepted::Yes();
+    }
 
     g_free(prop_name);
+    return Nan::Intercepted::No();
 }
 
-static void GObjectFallbackPropertySetter (Local<v8::Name> property, Local<Value> value,
-                                            const v8::PropertyCallbackInfo<Value>& info) {
+static PROPERTY_CALLBACK_RETURN_TYPE
+GObjectFallbackPropertySetter(Local<v8::Name> property, Local<Value> value,
+                              const PROPERTY_CALLBACK_INFO_TYPE& info) {
     auto self = info.Holder();
     GObject *gobject = GNodeJS::GObjectFromWrapper (self);
 
@@ -247,7 +259,7 @@ static void GObjectFallbackPropertySetter (Local<v8::Name> property, Local<Value
 
     if (strstr(prop_name_camel, "-")) {
         // Has dash, not a camel-case property name.
-        return;
+        return Nan::Intercepted::No();
     }
 
     char *prop_name = Util::ToDashed(prop_name_camel);
@@ -255,20 +267,22 @@ static void GObjectFallbackPropertySetter (Local<v8::Name> property, Local<Value
     if (gobject == NULL) {
         WARN("Can't set \"%s\" on null GObject", prop_name);
         g_free(prop_name);
-        return;
+        return Nan::Intercepted::No();
     }
 
     auto setResult = SetGObjectProperty(gobject, prop_name, value);
     if (setResult.IsEmpty()) {
         // Non-existent property. Let node consider the set not intercepted
         // by not setting return value;
+        g_free(prop_name);
+        return Nan::Intercepted::No();
     } else {
         // Property exists. Whether we can convert the value and set the
         // property or not, consider the set intercepted.
         RETURN(value);
+        g_free(prop_name);
+        return Nan::Intercepted::Yes();
     }
-
-    g_free(prop_name);
 }
 
 static GISignalInfo* FindSignalInfo(GIObjectInfo *info, const char *signal_detail) {
@@ -463,9 +477,9 @@ NAN_METHOD(SignalEmit) {
         g_value_init(gvalue, signal_query.param_types[i] & ~G_SIGNAL_TYPE_STATIC_SCOPE);
 
         if ((signal_query.param_types[i] & G_SIGNAL_TYPE_STATIC_SCOPE) != 0)
-            failed = !V8ToGValue(gvalue, info[i + 1], false); // no-copy
+            failed = !V8ToGValue(gvalue, info[i + 1], kNone); // no-copy
         else
-            failed = !V8ToGValue(gvalue, info[i + 1], true); // copy
+            failed = !V8ToGValue(gvalue, info[i + 1], kCopy); // copy
 
         if (failed)
             break;
@@ -551,9 +565,8 @@ static MaybeLocal<FunctionTemplate> NewClassTemplate (GType gtype) {
     // Set the fallback accessor to allow non-introspected property.
     // Nan::SetNamedPropertyHandler() does not support flags. Thus, using
     // V8 interface directly.
-    v8::NamedPropertyHandlerConfiguration config;
-    config.getter = GObjectFallbackPropertyGetter;
-    config.setter = GObjectFallbackPropertySetter;
+    v8::NamedPropertyHandlerConfiguration config(GObjectFallbackPropertyGetter,
+        GObjectFallbackPropertySetter);
     config.flags = static_cast<v8::PropertyHandlerFlags>(
         static_cast<int>(v8::PropertyHandlerFlags::kNonMasking) |
         static_cast<int>(v8::PropertyHandlerFlags::kOnlyInterceptStrings));
@@ -566,7 +579,7 @@ static MaybeLocal<FunctionTemplate> GetClassTemplate(GType gtype) {
     void *data = g_type_get_qdata (gtype, GNodeJS::template_quark());
 
     if (data) {
-        auto *persistent = (Persistent<FunctionTemplate> *) data;
+        auto *persistent = (Nan::Persistent<FunctionTemplate> *) data;
         auto tpl = New<FunctionTemplate> (*persistent);
         return tpl;
     }
@@ -577,8 +590,8 @@ static MaybeLocal<FunctionTemplate> GetClassTemplate(GType gtype) {
 
     auto tpl = maybeTpl.ToLocalChecked();
     auto fn = Nan::GetFunction (tpl).ToLocalChecked();
-    auto persistentTpl = new Persistent<FunctionTemplate>(tpl);
-    auto persistentFn  = new Persistent<Function>(fn);
+    auto persistentTpl = new Nan::Persistent<FunctionTemplate>(tpl);
+    auto persistentFn  = new Nan::Persistent<Function>(fn);
 
     GType *gtypePtr = g_new(GType, 1);
     *gtypePtr = gtype;
@@ -596,7 +609,7 @@ static MaybeLocal<Function> GetClass(GType gtype) {
     void *data = g_type_get_qdata (gtype, GNodeJS::function_quark());
 
     if (data) {
-        auto persistent = (Persistent<Function> *) data;
+        auto persistent = (Nan::Persistent<Function> *) data;
         auto fn = New<Function> (*persistent);
         return MaybeLocal<Function> (fn);
     }
@@ -611,7 +624,7 @@ static MaybeLocal<Function> GetClass(GType gtype) {
     data = g_type_get_qdata (gtype, GNodeJS::function_quark());
 
     if (data) {
-        auto persistent = (Persistent<Function> *) data;
+        auto persistent = (Nan::Persistent<Function> *) data;
         auto fn = New<Function> (*persistent);
         return MaybeLocal<Function> (fn);
     }
@@ -640,7 +653,7 @@ Local<Value> WrapperFromGObject(GObject *gobject) {
 
     if (data) {
         /* Easy case: we already have an object. */
-        auto *persistent = (Persistent<Object> *) data;
+        auto *persistent = (Nan::Persistent<Object> *) data;
         auto obj = New<Object> (*persistent);
         return obj;
     }
@@ -680,7 +693,7 @@ MaybeLocal<Value> GetGObjectProperty(GObject * gobject, const char *prop_name) {
     g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (pspec));
     g_object_get_property (gobject, prop_name, &value);
 
-    auto ret = GNodeJS::GValueToV8(&value, true);
+    auto ret = GNodeJS::GValueToV8(&value, kCopy);
 
     g_value_unset(&value);
 
@@ -699,7 +712,7 @@ MaybeLocal<v8::Boolean> SetGObjectProperty(GObject * gobject, const char *prop_n
     GValue gvalue = G_VALUE_INIT;
     g_value_init(&gvalue, G_PARAM_SPEC_VALUE_TYPE (pspec));
 
-    if (GNodeJS::V8ToGValue (&gvalue, value, true)) {
+    if (GNodeJS::V8ToGValue (&gvalue, value, kCopy)) {
         g_object_set_property (gobject, prop_name, &gvalue);
         ret = Nan::True();
     } else {

package/src/loop.cc

@@ -73,7 +73,7 @@ static gboolean loop_source_dispatch (GSource *base, GSourceFunc callback, gpoin
     v8::Context::Scope context_scope(context);
 
     // Perform microtask checkpoint after running JavaScript.
-    MicrotasksScope micro_scope(isolate, MicrotasksScope::kRunMicrotasks);
+    MicrotasksScope micro_scope(isolate, NULL, MicrotasksScope::kRunMicrotasks);
 
     // Deal with uv events.
     uv_run (source->loop, UV_RUN_NOWAIT);

package/src/modules/cairo/glyph.cc

@@ -103,6 +103,7 @@ NAN_INDEX_GETTER(Glyph::IndexGetter) {
   Nan::Set (returnValue, UTF8("x"),     Nan::New<Number> (glyph->x));
   Nan::Set (returnValue, UTF8("y"),     Nan::New<Number> (glyph->y));
   RETURN(returnValue);
+  return Nan::Intercepted::Yes();
 }
 
 

package/src/modules/cairo/text-cluster.cc

@@ -110,6 +110,7 @@ NAN_INDEX_GETTER(TextCluster::IndexGetter) {
   Nan::Set (returnValue, UTF8("num_bytes"),  Nan::New<Number> (text_cluster->num_bytes));
   Nan::Set (returnValue, UTF8("num_glyphs"), Nan::New<Number> (text_cluster->num_glyphs));
   RETURN(returnValue);
+  return Nan::Intercepted::Yes();
 }
 
 

package/src/modules/system.cc

@@ -65,8 +65,8 @@ NAN_METHOD(ConvertGValue) {
         return;
     }
     void *ptr = obj->GetAlignedPointerFromInternalField (0);
-    bool mustCopy = true;
-    RETURN(GValueToV8(reinterpret_cast<GValue *>(ptr), mustCopy));
+    ResourceOwnership ownership = kCopy;
+    RETURN(GValueToV8(reinterpret_cast<GValue *>(ptr), ownership));
 }
 
 NAN_METHOD(GetMemoryContent) {

package/src/value.cc

@@ -36,7 +36,7 @@ static void HashPointerToGIArgument (GIArgument *arg, GITypeInfo *type_info);
 static bool IsUint8Array (GITypeInfo *type_info);
 
 
-Local<Value> GIArgumentToV8(GITypeInfo *type_info, GIArgument *arg, long length, bool mustCopy) {
+Local<Value> GIArgumentToV8(GITypeInfo *type_info, GIArgument *arg, long length, ResourceOwnership ownership) {
     GITypeTag type_tag = g_type_info_get_tag (type_info);
 
     switch (type_tag) {
@@ -128,7 +128,7 @@ Local<Value> GIArgumentToV8(GITypeInfo *type_info, GIArgument *arg, long length,
             case GI_INFO_TYPE_BOXED:
             case GI_INFO_TYPE_STRUCT:
             case GI_INFO_TYPE_UNION:
-                value = WrapperFromBoxed (interface_info, arg->v_pointer, mustCopy);
+                value = WrapperFromBoxed (interface_info, arg->v_pointer, ownership);
                 break;
             case GI_INFO_TYPE_ENUM:
                 value = New<Number>(arg->v_int);
@@ -162,7 +162,7 @@ Local<Value> GIArgumentToV8(GITypeInfo *type_info, GIArgument *arg, long length,
         return GHashToV8(type_info, (GHashTable *)arg->v_pointer);
 
     case GI_TYPE_TAG_ERROR:
-        return GErrorToV8(type_info, (GError *)arg->v_pointer);
+        return GErrorToV8(type_info, (GError *)arg->v_pointer, ownership);
 
     default:
         ERROR("Unhandled tag type: %s", g_type_tag_to_string(type_tag));
@@ -232,9 +232,9 @@ Local<Value> GHashToV8 (GITypeInfo *type_info, GHashTable *hash_table) {
     return object;
 }
 
-Local<Value> GErrorToV8 (GITypeInfo *type_info, GError *err) {
-    auto err_info = g_irepository_find_by_name(NULL, "GLib", "Error");
-    auto obj = WrapperFromBoxed (err_info, err, true);
+Local<Value> GErrorToV8 (GITypeInfo *type_info, GError *err, ResourceOwnership ownership) {
+    auto err_info = g_irepository_find_by_gtype(NULL, g_error_get_type());
+    auto obj = WrapperFromBoxed (err_info, err, ownership);
     return obj;
 }
 
@@ -682,7 +682,7 @@ item_error:
     return hash_table;
 }
 
-bool V8ToGIArgument(GIBaseInfo *gi_info, GIArgument *arg, Local<Value> value) {
+bool V8ToGIArgumentInterface(GIBaseInfo *gi_info, GIArgument *arg, Local<Value> value) {
     GIInfoType type = g_base_info_get_type (gi_info);
 
     memset(arg, 0, sizeof(GIArgument));
@@ -828,7 +828,7 @@ bool V8ToGIArgument(GITypeInfo *type_info, GIArgument *arg, Local<Value> value,
     case GI_TYPE_TAG_INTERFACE:
         {
             GIBaseInfo *interface_info = g_type_info_get_interface (type_info);
-            V8ToGIArgument (interface_info, arg, value);
+            V8ToGIArgumentInterface (interface_info, arg, value);
             g_base_info_unref(interface_info);
         }
         break;
@@ -1241,7 +1241,7 @@ void FreeGIArgument(GITypeInfo *type_info, GIArgument *arg, GITransfer transfer,
 
     case GI_TYPE_TAG_ERROR:
     {
-        g_error_free((GError *)arg->v_pointer);
+        // no g_error_free as the ptr is taken directly from box
         break;
     }
 
@@ -1424,7 +1424,7 @@ bool CanConvertV8ToGValue(GValue *gvalue, Local<Value> value) {
             G_VALUE_TYPE_NAME (gvalue));
 }
 
-bool V8ToGValue(GValue *gvalue, Local<Value> value, bool mustCopy) {
+bool V8ToGValue(GValue *gvalue, Local<Value> value, ResourceOwnership ownership) {
     if (!CanConvertV8ToGValue(gvalue, value)) {
         auto maybeDetailString = Nan::ToDetailString(value);
         Nan::Utf8String utf8String(
@@ -1487,7 +1487,7 @@ bool V8ToGValue(GValue *gvalue, Local<Value> value, bool mustCopy) {
             Throw::CannotConvertGType("boxed", G_VALUE_TYPE (gvalue));
             return false;
         }
-        if (mustCopy)
+        if (ownership == kCopy)
             g_value_set_boxed (gvalue, PointerFromWrapper(value));
         else
             g_value_set_static_boxed (gvalue, PointerFromWrapper(value));
@@ -1508,7 +1508,7 @@ bool V8ToGValue(GValue *gvalue, Local<Value> value, bool mustCopy) {
     return true;
 }
 
-Local<Value> GValueToV8(const GValue *gvalue, bool mustCopy) {
+Local<Value> GValueToV8(const GValue *gvalue, ResourceOwnership ownership) {
     // by-value types
     if (G_VALUE_HOLDS_BOOLEAN (gvalue)) {
         return New<v8::Boolean>(g_value_get_boolean (gvalue));
@@ -1555,7 +1555,7 @@ Local<Value> GValueToV8(const GValue *gvalue, bool mustCopy) {
             Throw::InvalidGType(gtype);
             return Nan::Null(); // FIXME(return a MaybeLocal instead?)
         }
-        Local<Value> obj = WrapperFromBoxed(info, g_value_get_boxed(gvalue), mustCopy);
+        Local<Value> obj = WrapperFromBoxed(info, g_value_get_boxed(gvalue), ownership);
         g_base_info_unref(info);
         return obj;
     } else if (G_VALUE_HOLDS_PARAM (gvalue)) {

package/src/value.h

@@ -11,23 +11,29 @@ using v8::Local;
 
 namespace GNodeJS {
 
+enum ResourceOwnership {
+    kNone,
+    kCopy,
+    kTransfer
+};
+
 Local<Value> GListToV8  (GITypeInfo *info, GList  *glist);
 Local<Value> GSListToV8 (GITypeInfo *info, GSList *glist);
 Local<Value> GHashToV8 (GITypeInfo *info, GHashTable *hash);
 Local<Value> ArrayToV8  (GITypeInfo *info, gpointer data, long length = -1);
-Local<Value> GErrorToV8 (GITypeInfo *type_info, GError *err);
-Local<Value> GIArgumentToV8 (GITypeInfo *type_info, GIArgument *argument, long length = -1, bool mustCopy = false);
+Local<Value> GErrorToV8 (GITypeInfo *type_info, GError *err, ResourceOwnership ownership = kNone);
+Local<Value> GIArgumentToV8 (GITypeInfo *type_info, GIArgument *argument, long length = -1, ResourceOwnership ownership = kNone);
 long         GIArgumentToLength(GITypeInfo *type_info, GIArgument *arg, bool is_pointer);
 
-bool         V8ToGIArgument (GITypeInfo *type_info, GIArgument *argument, Local<Value> value);
+bool         V8ToGIArgumentInterface (GIBaseInfo *gi_info, GIArgument *argument, Local<Value> value);
 bool         V8ToGIArgument (GITypeInfo *type_info, GIArgument *argument, Local<Value> value, bool may_be_null);
 bool         V8ToOutGIArgument(GITypeInfo *type_info, GIArgument *arg, Local<Value> value, bool may_be_null);
 void         FreeGIArgument (GITypeInfo *type_info, GIArgument *argument, GITransfer transfer = GI_TRANSFER_EVERYTHING, GIDirection direction = GI_DIRECTION_OUT);
 void         FreeGIArgumentArray (GITypeInfo *type_info, GIArgument *arg, GITransfer transfer = GI_TRANSFER_EVERYTHING, GIDirection direction = GI_DIRECTION_OUT, long length = -1);
 bool         CanConvertV8ToGIArgument (GITypeInfo *type_info, Local<Value> value, bool may_be_null);
 
-bool         V8ToGValue(GValue *gvalue, Local<Value> value, bool mustCopy = false);
-Local<Value> GValueToV8(const GValue *gvalue, bool mustCopy = false);
+bool         V8ToGValue(GValue *gvalue, Local<Value> value, ResourceOwnership ownership = kNone);
+Local<Value> GValueToV8(const GValue *gvalue, ResourceOwnership ownership = kNone);
 bool         CanConvertV8ToGValue(GValue *gvalue, Local<Value> value);
 
 bool         ValueHasInternalField  (Local<Value> value);