nodenetcdf 4.9.32 → 4.9.34

package/LICENSE

@@ -11,3 +11,22 @@ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Copyright (c) Luke Shore <luke.a.shore@oliva.energy>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -2,7 +2,7 @@
 
 A Node.js native addon for reading and writing NodeNetCDF files, providing a comprehensive interface to the NetCDF-4 C library.
 
-IMPORTANT NOTE: this project dose not follow conventional open source standards we will accept PR's but we will not be actively changeing code unless something breaks
+IMPORTANT NOTE: this project does not follow conventional open source standards we will accept PR's but we will not be actively changeing code unless something breaks
 
 ## Overview
 
@@ -294,7 +294,7 @@ The build process uses:
 
 ## Original Project and License
 
-This is a fork and modernization of the original [nodenetcdf](https://github.com/parro-it/nodenetcdf) project.
+This is a fork and modernization of the original [netcdf4](https://github.com/parro-it/netcdf4) project.
 
 ### Original Contributors
 
@@ -323,6 +323,27 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+MIT License
+
+Copyright (c) Luke Shore <luke.a.shore@oliva.energy>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 ## Links
 
 - [Original Project](https://github.com/parro-it/nodenetcdf)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodenetcdf",
-  "version": "4.9.32",
+  "version": "4.9.34",
   "description": "Read and write NodeNetCDF files",
   "main": "./build/Release/nodenetcdf.node",
   "types": "./index.d.ts",

package/src/Attribute.cpp

@@ -4,7 +4,6 @@
 #include <iostream>
 #include <netcdf.h>
 
-
 namespace nodenetcdfjs
 {
 
@@ -21,9 +20,7 @@ Attribute::Attribute(const char *name_, int var_id_, int parent_id_) noexcept
     Wrap(obj);
     const int retval = nc_inq_atttype(parent_id, var_id_, name_, &type);
     if (retval != NC_NOERR)
-    {
         throw_netcdf_error(isolate, retval);
-    }
 }
 
 Attribute::Attribute(const char *name_, int var_id_, int parent_id_, int type_) noexcept
@@ -108,9 +105,7 @@ void Attribute::GetValue(v8::Local<v8::String> property, const v8::PropertyCallb
         std::vector<int8_t> v(len);
         retval = nc_get_att(obj->parent_id, obj->var_id, obj->name.c_str(), v.data());
         if (len == 1)
-        {
             info.GetReturnValue().Set(v8::Integer::New(isolate, v[0]));
-        }
         else
         {
             v8::Local<v8::ArrayBuffer> buffer = v8::ArrayBuffer::New(isolate, len * sizeof(int8_t));
@@ -123,9 +118,7 @@ void Attribute::GetValue(v8::Local<v8::String> property, const v8::PropertyCallb
         std::vector<int16_t> v(len);
         retval = nc_get_att(obj->parent_id, obj->var_id, obj->name.c_str(), v.data());
         if (len == 1)
-        {
             info.GetReturnValue().Set(v8::Integer::New(isolate, v[0]));
-        }
         else
         {
             v8::Local<v8::ArrayBuffer> buffer = v8::ArrayBuffer::New(isolate, len * sizeof(int16_t));
@@ -138,9 +131,7 @@ void Attribute::GetValue(v8::Local<v8::String> property, const v8::PropertyCallb
         std::vector<int32_t> v(len);
         retval = nc_get_att(obj->parent_id, obj->var_id, obj->name.c_str(), v.data());
         if (len == 1)
-        {
             info.GetReturnValue().Set(v8::Integer::New(isolate, v[0]));
-        }
         else
         {
             v8::Local<v8::ArrayBuffer> buffer = v8::ArrayBuffer::New(isolate, len * sizeof(int32_t));
@@ -153,9 +144,7 @@ void Attribute::GetValue(v8::Local<v8::String> property, const v8::PropertyCallb
         std::vector<float> v(len);
         retval = nc_get_att(obj->parent_id, obj->var_id, obj->name.c_str(), v.data());
         if (len == 1)
-        {
             info.GetReturnValue().Set(v8::Number::New(isolate, v[0]));
-        }
         else
         {
             v8::Local<v8::ArrayBuffer> buffer = v8::ArrayBuffer::New(isolate, len * sizeof(float));
@@ -168,9 +157,7 @@ void Attribute::GetValue(v8::Local<v8::String> property, const v8::PropertyCallb
         std::vector<double> v(len);
         retval = nc_get_att(obj->parent_id, obj->var_id, obj->name.c_str(), v.data());
         if (len == 1)
-        {
             info.GetReturnValue().Set(v8::Number::New(isolate, v[0]));
-        }
         else
         {
             v8::Local<v8::ArrayBuffer> buffer = v8::ArrayBuffer::New(isolate, len * sizeof(double));
@@ -183,9 +170,7 @@ void Attribute::GetValue(v8::Local<v8::String> property, const v8::PropertyCallb
         std::vector<uint8_t> v(len);
         retval = nc_get_att(obj->parent_id, obj->var_id, obj->name.c_str(), v.data());
         if (len == 1)
-        {
             info.GetReturnValue().Set(v8::Integer::New(isolate, v[0]));
-        }
         else
         {
             v8::Local<v8::ArrayBuffer> buffer = v8::ArrayBuffer::New(isolate, len * sizeof(uint8_t));
@@ -198,9 +183,7 @@ void Attribute::GetValue(v8::Local<v8::String> property, const v8::PropertyCallb
         std::vector<uint16_t> v(len);
         retval = nc_get_att(obj->parent_id, obj->var_id, obj->name.c_str(), v.data());
         if (len == 1)
-        {
             info.GetReturnValue().Set(v8::Integer::New(isolate, v[0]));
-        }
         else
         {
             v8::Local<v8::ArrayBuffer> buffer = v8::ArrayBuffer::New(isolate, len * sizeof(uint16_t));
@@ -213,9 +196,7 @@ void Attribute::GetValue(v8::Local<v8::String> property, const v8::PropertyCallb
         std::vector<uint32_t> v(len);
         retval = nc_get_att(obj->parent_id, obj->var_id, obj->name.c_str(), v.data());
         if (len == 1)
-        {
             info.GetReturnValue().Set(v8::Integer::NewFromUnsigned(isolate, v[0]));
-        }
         else
         {
             v8::Local<v8::ArrayBuffer> buffer = v8::ArrayBuffer::New(isolate, len * sizeof(uint32_t));
@@ -228,9 +209,7 @@ void Attribute::GetValue(v8::Local<v8::String> property, const v8::PropertyCallb
         std::vector<int64_t> v(len);
         retval = nc_get_att(obj->parent_id, obj->var_id, obj->name.c_str(), v.data());
         if (len == 1)
-        {
             info.GetReturnValue().Set(v8::Integer::New(isolate, static_cast<int32_t>(v[0])));
-        }
         else
         {
             v8::Local<v8::ArrayBuffer> buffer = v8::ArrayBuffer::New(isolate, len * sizeof(int64_t));
@@ -243,9 +222,7 @@ void Attribute::GetValue(v8::Local<v8::String> property, const v8::PropertyCallb
         std::vector<uint64_t> v(len);
         retval = nc_get_att(obj->parent_id, obj->var_id, obj->name.c_str(), v.data());
         if (len == 1)
-        {
             info.GetReturnValue().Set(v8::Integer::NewFromUnsigned(isolate, static_cast<uint32_t>(v[0])));
-        }
         else
         {
             v8::Local<v8::ArrayBuffer> buffer = v8::ArrayBuffer::New(isolate, len * sizeof(uint64_t));
@@ -264,9 +241,7 @@ void Attribute::GetValue(v8::Local<v8::String> property, const v8::PropertyCallb
     break;
     }
     if (retval != NC_NOERR)
-    {
         throw_netcdf_error(isolate, retval);
-    }
 }
 
 void Attribute::SetValue(v8::Local<v8::String> property, v8::Local<v8::Value> val,
@@ -311,9 +286,7 @@ void Attribute::set_value(const v8::Local<v8::Value> &val)
     }
 
     if (retval != NC_NOERR)
-    {
         throw_netcdf_error(isolate, retval);
-    }
 }
 
 void Attribute::Delete(const v8::FunctionCallbackInfo<v8::Value> &args)
@@ -321,9 +294,7 @@ void Attribute::Delete(const v8::FunctionCallbackInfo<v8::Value> &args)
     auto *obj = node::ObjectWrap::Unwrap<Attribute>(args.Holder());
     const int retval = nc_del_att(obj->parent_id, obj->var_id, obj->name.c_str());
     if (retval != NC_NOERR)
-    {
         throw_netcdf_error(args.GetIsolate(), retval);
-    }
 }
 
 void Attribute::Inspect(const v8::FunctionCallbackInfo<v8::Value> &args)
@@ -338,40 +309,32 @@ void Attribute::ToJSON(const v8::FunctionCallbackInfo<v8::Value> &args)
     v8::Isolate *isolate = args.GetIsolate();
     v8::Local<v8::Context> context = isolate->GetCurrentContext();
     const auto *obj = node::ObjectWrap::Unwrap<Attribute>(args.Holder());
-    
-    // Use internalized strings for better performance
+
     v8::Local<v8::String> name_str = v8::String::NewFromUtf8Literal(isolate, "name");
     v8::Local<v8::String> value_str = v8::String::NewFromUtf8Literal(isolate, "value");
-    
+
     v8::Local<v8::Object> json = v8::Object::New(isolate);
-    
-    // Add name
-    (void)json->CreateDataProperty(context, name_str,
-              v8::String::NewFromUtf8(isolate, obj->name.c_str(), v8::NewStringType::kInternalized).ToLocalChecked());
-    
-    // Add value - get from the object's value property
-    // Use a TryCatch to handle errors when getting the value
+
+    (void)json->CreateDataProperty(
+        context, name_str,
+        v8::String::NewFromUtf8(isolate, obj->name.c_str(), v8::NewStringType::kInternalized).ToLocalChecked());
+
     v8::TryCatch try_catch(isolate);
     v8::MaybeLocal<v8::Value> maybeValue = args.Holder()->Get(context, value_str);
     v8::Local<v8::Value> value;
-    
+
     if (!maybeValue.ToLocal(&value) || try_catch.HasCaught())
     {
-        // If getting the value failed or threw an exception, clear the exception
-        // and set value to null instead of crashing
         if (try_catch.HasCaught())
-        {
             try_catch.Reset();
-        }
         value = v8::Null(isolate);
     }
     else if (value->IsTypedArray())
     {
-        // Convert TypedArray to regular array for JSON serialization
         v8::Local<v8::TypedArray> typedArray = v8::Local<v8::TypedArray>::Cast(value);
         uint32_t length = typedArray->Length();
         v8::Local<v8::Array> array = v8::Array::New(isolate, length);
-        
+
         for (uint32_t i = 0; i < length; i++)
         {
             v8::Local<v8::Value> element = typedArray->Get(context, i).ToLocalChecked();
@@ -379,10 +342,9 @@ void Attribute::ToJSON(const v8::FunctionCallbackInfo<v8::Value> &args)
         }
         value = array;
     }
-    // Don't wrap primitives - only convert TypedArrays to arrays
-    
+
     (void)json->CreateDataProperty(context, value_str, value);
-    
+
     args.GetReturnValue().Set(json);
 }
 } // namespace nodenetcdfjs

package/src/Attribute.h

@@ -8,13 +8,56 @@
 namespace nodenetcdfjs
 {
 
+/**
+ * @brief Represents a NetCDF attribute wrapper for Node.js
+ * 
+ * This class provides a Node.js interface to NetCDF attributes, which are metadata
+ * associated with variables or groups. Attributes can store information such as
+ * units, descriptions, valid ranges, and other metadata about the data.
+ * 
+ * The class extends node::ObjectWrap to provide JavaScript binding capabilities,
+ * allowing attributes to be manipulated from JavaScript code.
+ */
 class Attribute : public node::ObjectWrap
 {
   public:
+    /**
+     * @brief Initialize the Attribute class and register it with Node.js
+     * @param exports The exports object to attach the Attribute constructor to
+     * 
+     * This static method sets up the Attribute class for use in Node.js,
+     * defining its constructor and prototype methods.
+     */
     static void Init(v8::Local<v8::Object> exports);
+    
+    /**
+     * @brief Construct an Attribute object
+     * @param name_ The name of the attribute
+     * @param var_id_ The variable ID this attribute belongs to
+     * @param parent_id_ The parent group/file ID
+     * 
+     * Creates a new attribute with the specified name and parent identifiers.
+     */
     Attribute(const char *name_, int var_id_, int parent_id_) noexcept;
+    
+    /**
+     * @brief Construct an Attribute object with explicit type
+     * @param name_ The name of the attribute
+     * @param var_id_ The variable ID this attribute belongs to
+     * @param parent_id_ The parent group/file ID
+     * @param type_ The NetCDF data type of the attribute
+     * 
+     * Creates a new attribute with the specified name, parent identifiers, and data type.
+     */
     Attribute(const char *name_, int var_id_, int parent_id_, int type_) noexcept;
 
+    /**
+     * @brief Set the value of the attribute
+     * @param val The value to set (as a V8 value from JavaScript)
+     * 
+     * Sets the attribute's value from a JavaScript value, performing appropriate
+     * type conversions as needed.
+     */
     void set_value(const v8::Local<v8::Value> &val);
 
   private:
@@ -24,21 +67,69 @@ class Attribute : public node::ObjectWrap
     Attribute(Attribute &&) = delete;
     Attribute &operator=(Attribute &&) = delete;
 
+    /// Persistent reference to the JavaScript constructor function
     static v8::Persistent<v8::Function> constructor;
 
+    /**
+     * @brief Delete this attribute from the NetCDF file
+     * @param args JavaScript function arguments
+     */
     static void Delete(const v8::FunctionCallbackInfo<v8::Value> &args);
+    
+    /**
+     * @brief Getter for the attribute name property
+     * @param property The property name being accessed
+     * @param info Callback info containing the return value
+     */
     static void GetName(v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value> &info);
+    
+    /**
+     * @brief Setter for the attribute name property
+     * @param property The property name being set
+     * @param val The new value to set
+     * @param info Callback info for the setter
+     */
     static void SetName(v8::Local<v8::String> property, v8::Local<v8::Value> val,
                         const v8::PropertyCallbackInfo<void> &info);
+    
+    /**
+     * @brief Getter for the attribute value property
+     * @param property The property name being accessed
+     * @param info Callback info containing the return value
+     */
     static void GetValue(v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value> &info);
+    
+    /**
+     * @brief Setter for the attribute value property
+     * @param property The property name being set
+     * @param val The new value to set
+     * @param info Callback info for the setter
+     */
     static void SetValue(v8::Local<v8::String> property, v8::Local<v8::Value> val,
                          const v8::PropertyCallbackInfo<void> &info);
+    
+    /**
+     * @brief Custom inspect method for Node.js console output
+     * @param args JavaScript function arguments
+     */
     static void Inspect(const v8::FunctionCallbackInfo<v8::Value> &args);
+    
+    /**
+     * @brief Convert attribute to JSON representation
+     * @param args JavaScript function arguments
+     */
     static void ToJSON(const v8::FunctionCallbackInfo<v8::Value> &args);
 
+    /// The name of the attribute
     std::string name{};
+    
+    /// The variable ID this attribute belongs to (-1 for global attributes)
     int var_id{-1};
+    
+    /// The parent group/file ID
     int parent_id{-1};
+    
+    /// The NetCDF data type of the attribute
     int type{-1};
 };
 

package/src/Dimension.cpp

@@ -2,7 +2,6 @@
 #include "nodenetcdfjs.h"
 #include <netcdf.h>
 
-
 namespace nodenetcdfjs
 {
 
@@ -92,9 +91,7 @@ void Dimension::SetName(v8::Local<v8::String> property, v8::Local<v8::Value> val
     const int retval = nc_rename_dim(obj->parent_id, obj->id, *new_name_);
 
     if (retval != NC_NOERR)
-    {
         throw_netcdf_error(isolate, retval);
-    }
 }
 
 void Dimension::Inspect(const v8::FunctionCallbackInfo<v8::Value> &args)
@@ -109,33 +106,26 @@ void Dimension::ToJSON(const v8::FunctionCallbackInfo<v8::Value> &args)
     v8::Isolate *isolate = args.GetIsolate();
     v8::Local<v8::Context> context = isolate->GetCurrentContext();
     const auto *obj = node::ObjectWrap::Unwrap<Dimension>(args.Holder());
-    
-    // Use internalized strings for better performance
+
     v8::Local<v8::String> id_str = v8::String::NewFromUtf8Literal(isolate, "id");
     v8::Local<v8::String> name_str = v8::String::NewFromUtf8Literal(isolate, "name");
     v8::Local<v8::String> length_str = v8::String::NewFromUtf8Literal(isolate, "length");
-    
+
     v8::Local<v8::Object> json = v8::Object::New(isolate);
-    
-    // Add id
+
     (void)json->CreateDataProperty(context, id_str, v8::Integer::New(isolate, obj->id));
-    
-    // Add name
+
     std::array<char, NC_MAX_NAME + 1> name{};
     if (obj->get_name(name.data()))
-    {
-        (void)json->CreateDataProperty(context, name_str,
-                  v8::String::NewFromUtf8(isolate, name.data(), v8::NewStringType::kInternalized).ToLocalChecked());
-    }
-    
-    // Add length
+        (void)json->CreateDataProperty(
+            context, name_str,
+            v8::String::NewFromUtf8(isolate, name.data(), v8::NewStringType::kInternalized).ToLocalChecked());
+
     size_t len = 0;
     const int retval = nc_inq_dimlen(obj->parent_id, obj->id, &len);
     if (retval == NC_NOERR)
-    {
         (void)json->CreateDataProperty(context, length_str, v8::Integer::New(isolate, static_cast<int32_t>(len)));
-    }
-    
+
     args.GetReturnValue().Set(json);
 }
 } // namespace nodenetcdfjs

package/src/Dimension.h

@@ -7,12 +7,45 @@
 namespace nodenetcdfjs
 {
 
+/**
+ * @brief Represents a NetCDF dimension wrapper for Node.js
+ * 
+ * This class provides a Node.js interface to NetCDF dimensions, which define
+ * the shape and size of variables in a NetCDF file. Dimensions can be either
+ * fixed-length or unlimited (allowing growth over time).
+ * 
+ * The class extends node::ObjectWrap to provide JavaScript binding capabilities,
+ * allowing dimensions to be queried and manipulated from JavaScript code.
+ */
 class Dimension : public node::ObjectWrap
 {
   public:
+    /**
+     * @brief Initialize the Dimension class and register it with Node.js
+     * @param exports The exports object to attach the Dimension constructor to
+     * 
+     * This static method sets up the Dimension class for use in Node.js,
+     * defining its constructor and prototype methods.
+     */
     static void Init(v8::Local<v8::Object> exports);
+    
+    /**
+     * @brief Construct a Dimension object
+     * @param id_ The dimension ID in the NetCDF file
+     * @param parent_id_ The parent group/file ID
+     * 
+     * Creates a new dimension wrapper for an existing NetCDF dimension.
+     */
     Dimension(int id_, int parent_id_) noexcept;
 
+    /**
+     * @brief Get the name of this dimension
+     * @param name Buffer to store the dimension name
+     * @return true if successful, false otherwise
+     * 
+     * Retrieves the dimension name from the NetCDF file and stores it
+     * in the provided buffer.
+     */
     [[nodiscard]] bool get_name(char *name) const noexcept;
 
   private:
@@ -22,17 +55,55 @@ class Dimension : public node::ObjectWrap
     Dimension(Dimension &&) = delete;
     Dimension &operator=(Dimension &&) = delete;
 
+    /// Persistent reference to the JavaScript constructor function
     static v8::Persistent<v8::Function> constructor;
 
+    /**
+     * @brief Getter for the dimension ID property
+     * @param property The property name being accessed
+     * @param info Callback info containing the return value
+     */
     static void GetId(v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value> &info);
+    
+    /**
+     * @brief Getter for the dimension length property
+     * @param property The property name being accessed
+     * @param info Callback info containing the return value
+     */
     static void GetLength(v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value> &info);
+    
+    /**
+     * @brief Getter for the dimension name property
+     * @param property The property name being accessed
+     * @param info Callback info containing the return value
+     */
     static void GetName(v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value> &info);
+    
+    /**
+     * @brief Setter for the dimension name property
+     * @param property The property name being set
+     * @param val The new value to set
+     * @param info Callback info for the setter
+     */
     static void SetName(v8::Local<v8::String> property, v8::Local<v8::Value> val,
                         const v8::PropertyCallbackInfo<void> &info);
+    
+    /**
+     * @brief Custom inspect method for Node.js console output
+     * @param args JavaScript function arguments
+     */
     static void Inspect(const v8::FunctionCallbackInfo<v8::Value> &args);
+    
+    /**
+     * @brief Convert dimension to JSON representation
+     * @param args JavaScript function arguments
+     */
     static void ToJSON(const v8::FunctionCallbackInfo<v8::Value> &args);
 
+    /// The dimension ID in the NetCDF file
     int id{-1};
+    
+    /// The parent group/file ID
     int parent_id{-1};
 };
 

package/src/File.cpp

@@ -5,7 +5,6 @@
 #include <netcdf.h>
 #include <string>
 
-
 namespace nodenetcdfjs
 {
 
@@ -21,11 +20,8 @@ File::~File()
 {
     if (!closed)
     {
-        int retval = nc_close(id);
-        if (retval != NC_NOERR)
-        {
+        if (const int retval = nc_close(id); retval != NC_NOERR)
             throw_netcdf_error(v8::Isolate::GetCurrent(), retval);
-        }
     }
 }
 
@@ -73,21 +69,13 @@ void File::New(const v8::FunctionCallbackInfo<v8::Value> &args)
                 *v8::String::Utf8Value(isolate, args[2]->ToString(isolate->GetCurrentContext()).ToLocalChecked());
 
             if (format_arg == "classic")
-            {
                 format = 0;
-            }
             else if (format_arg == "classic64")
-            {
                 format = NC_64BIT_OFFSET;
-            }
             else if (format_arg == "nodenetcdf")
-            {
                 format = NC_NETCDF4;
-            }
             else if (format_arg == "nodenetcdfclassic")
-            {
                 format = NC_NETCDF4 | NC_CLASSIC_MODEL;
-            }
             else
             {
                 isolate->ThrowException(v8::Exception::TypeError(
@@ -99,21 +87,13 @@ void File::New(const v8::FunctionCallbackInfo<v8::Value> &args)
 
         int retval = NC_NOERR;
         if (mode_arg == "r")
-        {
             retval = nc_open(filename.c_str(), NC_NOWRITE, &id);
-        }
         else if (mode_arg == "w")
-        {
             retval = nc_open(filename.c_str(), NC_WRITE, &id);
-        }
         else if (mode_arg == "c")
-        {
             retval = nc_create(filename.c_str(), format | NC_NOCLOBBER, &id);
-        }
         else if (mode_arg == "c!")
-        {
             retval = nc_create(filename.c_str(), format | NC_CLOBBER, &id);
-        }
         else
         {
             isolate->ThrowException(v8::Exception::TypeError(
@@ -146,9 +126,7 @@ void File::Sync(const v8::FunctionCallbackInfo<v8::Value> &args)
     File *obj = node::ObjectWrap::Unwrap<File>(args.Holder());
     int retval = nc_sync(obj->id);
     if (retval != NC_NOERR)
-    {
         throw_netcdf_error(args.GetIsolate(), retval);
-    }
 }
 
 void File::Close(const v8::FunctionCallbackInfo<v8::Value> &args)
@@ -156,9 +134,7 @@ void File::Close(const v8::FunctionCallbackInfo<v8::Value> &args)
     File *obj = node::ObjectWrap::Unwrap<File>(args.Holder());
     int retval = nc_close(obj->id);
     if (retval != NC_NOERR)
-    {
         throw_netcdf_error(args.GetIsolate(), retval);
-    }
     obj->closed = true;
 }
 
@@ -173,12 +149,27 @@ void File::ToJSON(const v8::FunctionCallbackInfo<v8::Value> &args)
 {
     v8::Isolate *isolate = args.GetIsolate();
     v8::Local<v8::Context> context = isolate->GetCurrentContext();
-    
-    // Get the root group and serialize it
-    v8::Local<v8::String> rootProp = v8::String::NewFromUtf8(isolate, "root", v8::NewStringType::kNormal).ToLocalChecked();
+
+    v8::Local<v8::String> rootProp =
+        v8::String::NewFromUtf8(isolate, "root", v8::NewStringType::kNormal).ToLocalChecked();
     v8::Local<v8::Value> root = args.Holder()->Get(context, rootProp).ToLocalChecked();
-    
-    // The root group's toJSON will automatically serialize all children recursively
+
+    if (root->IsObject())
+    {
+        v8::Local<v8::Object> rootObj = root->ToObject(context).ToLocalChecked();
+        v8::Local<v8::String> toJSONProp =
+            v8::String::NewFromUtf8(isolate, "toJSON", v8::NewStringType::kNormal).ToLocalChecked();
+        v8::Local<v8::Value> toJSONMethod = rootObj->Get(context, toJSONProp).ToLocalChecked();
+
+        if (toJSONMethod->IsFunction())
+        {
+            v8::Local<v8::Function> toJSONFunc = v8::Local<v8::Function>::Cast(toJSONMethod);
+            v8::Local<v8::Value> result = toJSONFunc->Call(context, rootObj, 0, nullptr).ToLocalChecked();
+            args.GetReturnValue().Set(result);
+            return;
+        }
+    }
+
     args.GetReturnValue().Set(root);
 }
 } // namespace nodenetcdfjs