@nativescript/canvas 2.0.0-webgpu.1 → 2.0.0-webgpu.3

package/platforms/ios/src/cpp/webgl2/WebGL2RenderingContext.h

@@ -115,7 +115,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = WebGL2RenderingContext::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType(object, NativeType::WebGLRenderingContextBase);
+        SetNativeType(renderingContext, NativeType::WebGLRenderingContextBase);
         object->SetAlignedPointerInInternalField(0, renderingContext);
         renderingContext->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/platforms/ios/src/cpp/webgl2/WebGLQuery.h

@@ -35,7 +35,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = WebGLQuery::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType( object, NativeType::WebGLQuery);
+        SetNativeType( query, NativeType::WebGLQuery);
         object->SetAlignedPointerInInternalField(0, query);
         query->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/platforms/ios/src/cpp/webgl2/WebGLSampler.h

@@ -36,7 +36,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = WebGLSampler::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType( object, NativeType::WebGLSampler);
+        SetNativeType( sampler, NativeType::WebGLSampler);
         object->SetAlignedPointerInInternalField(0, sampler);
         sampler->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/platforms/ios/src/cpp/webgl2/WebGLSyncImpl.h

@@ -35,7 +35,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = WebGLSyncImpl::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType( object, NativeType::WebGLSync);
+        SetNativeType( sync, NativeType::WebGLSync);
         object->SetAlignedPointerInInternalField(0, sync);
         sync->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/platforms/ios/src/cpp/webgl2/WebGLTransformFeedback.h

@@ -37,7 +37,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = WebGLTransformFeedback::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType( object, NativeType::WebGLTransformFeedback);
+        SetNativeType( feedback, NativeType::WebGLTransformFeedback);
         object->SetAlignedPointerInInternalField(0, feedback);
         feedback->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/platforms/ios/src/cpp/webgl2/WebGLVertexArrayObject.h

@@ -9,7 +9,7 @@
 #include "Helpers.h"
 #include "ObjectWrapperImpl.h"
 
-class WebGLVertexArrayObject: ObjectWrapperImpl {
+class WebGLVertexArrayObject : ObjectWrapperImpl {
 public:
     WebGLVertexArrayObject(uint32_t vertexArrayObject) : vertexArrayObject_(vertexArrayObject) {}
 
@@ -38,7 +38,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = WebGLVertexArrayObject::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType( object, NativeType::WebGLVertexArrayObject);
+        SetNativeType(vertexArrayObject, NativeType::WebGLVertexArrayObject);
         object->SetAlignedPointerInInternalField(0, vertexArrayObject);
         vertexArrayObject->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/platforms/ios/src/cpp/webgpu/GPUAdapterImpl.cpp

@@ -100,7 +100,7 @@ GPUAdapterImpl::GetFeatures(v8::Local<v8::Name> name,
             }
 
         }
-        canvas_native_string_buffer_destroy(features);
+        canvas_native_string_buffer_release(features);
 
         info.GetReturnValue().Set(map);
 
@@ -158,6 +158,24 @@ void GPUAdapterImpl::RequestAdapterInfo(const v8::FunctionCallbackInfo<v8::Value
 
 }
 
+struct RequestData {
+    char *error_;
+    const CanvasGPUDevice *device_;
+    char **required_features_data_;
+
+    ~RequestData() {
+        if (required_features_data_ != nullptr) {
+            delete[] required_features_data_;
+            required_features_data_ = nullptr;
+        }
+
+        if (error_ != nullptr) {
+            canvas_native_string_destroy(error_);
+            error_ = nullptr;
+        }
+    }
+};
+
 void GPUAdapterImpl::RequestDevice(const v8::FunctionCallbackInfo<v8::Value> &args) {
     GPUAdapterImpl *ptr = GetPointer(args.This());
     auto isolate = args.GetIsolate();
@@ -170,7 +188,7 @@ void GPUAdapterImpl::RequestDevice(const v8::FunctionCallbackInfo<v8::Value> &ar
         return;
     }
 
-    v8::Global<v8::Function> func(isolate, cb.As<v8::Function>());
+    auto func = cb.As<v8::Function>();
 
     std::string label;
 
@@ -210,7 +228,6 @@ void GPUAdapterImpl::RequestDevice(const v8::FunctionCallbackInfo<v8::Value> &ar
             }
         }
 
-
         v8::Local<v8::Value> limitsValue;
 
         options->Get(context, ConvertToV8String(isolate, "requiredLimits")).ToLocal(
@@ -235,68 +252,117 @@ void GPUAdapterImpl::RequestDevice(const v8::FunctionCallbackInfo<v8::Value> &ar
         }
     }
 
-
     auto callback = new AsyncCallback{
             isolate,
-            std::move(func),
-            static_cast<void *>(required_features_data)
+            func,
+            [](bool done, void *data) {
+                if (data != nullptr) {
+                    auto async_data = static_cast<AsyncCallback *>(data);
+                    auto func = async_data->inner_.get();
+                    if (func != nullptr && func->isolate_ != nullptr) {
+                        v8::Isolate *isolate = func->isolate_;
+                        v8::Locker locker(isolate);
+                        v8::Isolate::Scope isolate_scope(isolate);
+                        v8::HandleScope handle_scope(isolate);
+                        v8::Local<v8::Function> callback = func->callback_.Get(
+                                isolate);
+                        v8::Local<v8::Context> context = callback->GetCreationContextChecked();
+                        v8::Context::Scope context_scope(context);
+
+                        RequestData *requestData = nullptr;
+                        if (func->data != nullptr) {
+                            requestData = static_cast<RequestData *>(func->data);
+                        }
+
+                        if (requestData == nullptr) {
+                            // Should never happen
+                            v8::Local<v8::Value> args[1] = {
+                                    v8::Exception::Error(
+                                            ConvertToV8String(isolate, "Internal Error"))};
+
+                            callback->Call(context, context->Global(),
+                                           1,
+                                           args);  // ignore JS return value
+                            delete static_cast<AsyncCallback *>(data);
+
+                            return;
+                        }
+
+                        if (requestData->error_ != nullptr) {
+                            v8::Local<v8::Value> args[1] = {
+                                    v8::Exception::Error(
+                                            ConvertToV8String(isolate,
+                                                              requestData->error_))};
+
+                            callback->Call(context, context->Global(),
+                                           1,
+                                           args);  // ignore JS return value
+                            delete static_cast<AsyncCallback *>(data);
+                        } else {
+
+                            auto impl = new GPUDeviceImpl(requestData->device_);
+                            auto ret = GPUDeviceImpl::NewInstance(
+                                    isolate, impl);
+
+                            v8::Local<v8::Value> args[2] = {
+                                    v8::Null(isolate), ret};
+
+
+                            callback->Call(context, context->Global(),
+                                           2,
+                                           args);  // ignore JS return value
+
+                            delete static_cast<AsyncCallback *>(data);
+                        }
+
+                        if (requestData != nullptr) {
+                            delete requestData;
+                            requestData = nullptr;
+                        }
+                    }
+                }
+            }
     };
 
-    canvas_native_webgpu_adapter_request_device(ptr->GetGPUAdapter(),
-                                        label.empty() ? nullptr : label.c_str(),
-                                        required_features_data, required_features_data_length,
-                                        limits,
-                                        [](char *error, const CanvasGPUDevice *device, void *data) {
-                                            if (data != nullptr) {
-                                                auto func = static_cast<AsyncCallback *>(data);
-                                                if (func->isolate != nullptr) {
-                                                    v8::Isolate *isolate = func->isolate;
-                                                    v8::Locker locker(isolate);
-                                                    v8::Isolate::Scope isolate_scope(isolate);
-                                                    v8::HandleScope handle_scope(isolate);
-                                                    v8::Local<v8::Function> callback = func->callback.Get(
-                                                            isolate);
-                                                    v8::Local<v8::Context> context = callback->GetCreationContextChecked();
-                                                    v8::Context::Scope context_scope(context);
-
-                                                    if (func->data != nullptr) {
-                                                        delete[] static_cast<char **>(func->data);
-                                                        func->data = nullptr;
-                                                    }
-
-                                                    if (error != nullptr) {
-                                                        v8::Local<v8::Value> args[1] = {
-                                                                v8::Exception::Error(
-                                                                        ConvertToV8String(isolate,
-                                                                                          error))};
-
-                                                        canvas_native_string_destroy(error);
-
-                                                        callback->Call(context, context->Global(),
-                                                                       1,
-                                                                       args);  // ignore JS return value
-                                                        delete static_cast<AsyncCallback *>(data);
-                                                    } else {
-
-                                                        auto impl = new GPUDeviceImpl(device);
-                                                        auto ret = GPUDeviceImpl::NewInstance(
-                                                                isolate, impl);
-
+    auto inner = callback->inner_.get();
 
-                                                        v8::Local<v8::Value> args[2] = {
-                                                                v8::Null(isolate), ret};
-
-
-                                                        callback->Call(context, context->Global(),
-                                                                       2,
-                                                                       args);  // ignore JS return value
+    if (required_features_data != nullptr) {
+        inner->data = new RequestData{
+                nullptr,
+                nullptr,
+                required_features_data
+        };
+    }
 
-                                                        delete static_cast<AsyncCallback *>(data);
+    callback->prepare();
 
+    canvas_native_webgpu_adapter_request_device(ptr->GetGPUAdapter(),
+                                                label.empty() ? nullptr : label.c_str(),
+                                                required_features_data,
+                                                required_features_data_length,
+                                                limits,
+                                                [](char *error, const CanvasGPUDevice *device,
+                                                   void *data) {
+                                                    if (data != nullptr) {
+                                                        auto async_data = static_cast<AsyncCallback *>(data);
+                                                        auto inner = async_data->inner_.get();
+                                                        if (inner != nullptr) {
+                                                            if (inner->data == nullptr) {
+                                                                inner->data = new RequestData{
+                                                                        error,
+                                                                        device
+                                                                };
+                                                            } else {
+                                                                auto request_data = static_cast<RequestData *>(inner->data);
+                                                                request_data->error_ = error;
+                                                                request_data->device_ = device;
+                                                                delete request_data->required_features_data_;
+                                                                request_data->required_features_data_ = nullptr;
+                                                            }
+
+                                                            async_data->execute(true);
+                                                        }
                                                     }
-                                                }
-                                            }
-                                        }, callback);
-
+                                                }, callback);
 
 }

package/platforms/ios/src/cpp/webgpu/GPUAdapterImpl.h

@@ -33,7 +33,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = GPUAdapterImpl::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType(object, NativeType::GPUAdapter);
+        SetNativeType(adapter, NativeType::GPUAdapter);
         object->SetAlignedPointerInInternalField(0, adapter);
         adapter->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/platforms/ios/src/cpp/webgpu/GPUAdapterInfoImpl.cpp

@@ -21,7 +21,7 @@ void GPUAdapterInfoImpl::Init(v8::Local<v8::Object> canvasModule, v8::Isolate *i
     auto context = isolate->GetCurrentContext();
     auto func = ctor->GetFunction(context).ToLocalChecked();
 
-    canvasModule->Set(context, ConvertToV8String(isolate, "GPUAdapterInfo"), func).FromJust();;
+    canvasModule->Set(context, ConvertToV8String(isolate, "GPUAdapterInfo"), func).FromJust();
 }
 
 GPUAdapterInfoImpl *GPUAdapterInfoImpl::GetPointer(const v8::Local<v8::Object> &object) {

package/platforms/ios/src/cpp/webgpu/GPUAdapterInfoImpl.h

@@ -30,7 +30,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = GPUAdapterInfoImpl::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType(object, NativeType::GPUAdapterInfo);
+        SetNativeType(info, NativeType::GPUAdapterInfo);
         object->SetAlignedPointerInInternalField(0, info);
         info->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/platforms/ios/src/cpp/webgpu/GPUBindGroupImpl.cpp

@@ -22,7 +22,7 @@ void GPUBindGroupImpl::Init(v8::Local <v8::Object> canvasModule, v8::Isolate *is
     auto context = isolate->GetCurrentContext();
     auto func = ctor->GetFunction(context).ToLocalChecked();
 
-    canvasModule->Set(context, ConvertToV8String(isolate, "GPUBindGroup"), func).FromJust();;
+    canvasModule->Set(context, ConvertToV8String(isolate, "GPUBindGroup"), func).FromJust();
 }
 
 GPUBindGroupImpl *GPUBindGroupImpl::GetPointer(const v8::Local <v8::Object> &object) {

package/platforms/ios/src/cpp/webgpu/GPUBindGroupImpl.h

@@ -31,7 +31,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = GPUBindGroupImpl::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType(object, NativeType::GPUBindGroup);
+        SetNativeType(groupLayout, NativeType::GPUBindGroup);
         object->SetAlignedPointerInInternalField(0, groupLayout);
         groupLayout->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/platforms/ios/src/cpp/webgpu/GPUBindGroupLayoutImpl.cpp

@@ -22,7 +22,7 @@ void GPUBindGroupLayoutImpl::Init(v8::Local<v8::Object> canvasModule, v8::Isolat
     auto context = isolate->GetCurrentContext();
     auto func = ctor->GetFunction(context).ToLocalChecked();
 
-    canvasModule->Set(context, ConvertToV8String(isolate, "GPUBindGroupLayout"), func).FromJust();;
+    canvasModule->Set(context, ConvertToV8String(isolate, "GPUBindGroupLayout"), func).FromJust();
 }
 
 GPUBindGroupLayoutImpl *GPUBindGroupLayoutImpl::GetPointer(const v8::Local<v8::Object> &object) {

package/platforms/ios/src/cpp/webgpu/GPUBindGroupLayoutImpl.h

@@ -31,7 +31,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = GPUBindGroupLayoutImpl::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType(object, NativeType::GPUBindGroupLayout);
+        SetNativeType(groupLayout, NativeType::GPUBindGroupLayout);
         object->SetAlignedPointerInInternalField(0, groupLayout);
         groupLayout->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/platforms/ios/src/cpp/webgpu/GPUBufferImpl.cpp

@@ -21,7 +21,7 @@ void GPUBufferImpl::Init(v8::Local<v8::Object> canvasModule, v8::Isolate *isolat
     auto context = isolate->GetCurrentContext();
     auto func = ctor->GetFunction(context).ToLocalChecked();
 
-    canvasModule->Set(context, ConvertToV8String(isolate, "GPUBuffer"), func).FromJust();;
+    canvasModule->Set(context, ConvertToV8String(isolate, "GPUBuffer"), func).FromJust();
 }
 
 GPUBufferImpl *GPUBufferImpl::GetPointer(const v8::Local<v8::Object> &object) {
@@ -154,42 +154,56 @@ void GPUBufferImpl::MapAsync(const v8::FunctionCallbackInfo<v8::Value> &args) {
     auto resolver = v8::Promise::Resolver::New(isolate->GetCurrentContext()).ToLocalChecked();
     args.GetReturnValue().Set(resolver->GetPromise());
 
-    v8::Global<v8::Promise::Resolver> promise(isolate, resolver);
     auto callback = new PromiseCallback{
             isolate,
-            std::move(promise)
+            resolver,
+            [](bool done, void *data){
+                auto async_data = static_cast<PromiseCallback *>(data);
+                auto func = async_data->inner_.get();
+                if (func != nullptr && func->isolate_ != nullptr) {
+                    v8::Isolate *isolate = func->isolate_;
+                    v8::Locker locker(isolate);
+                    v8::Isolate::Scope isolate_scope(
+                            isolate);
+                    v8::HandleScope handle_scope(
+                            isolate);
+                    v8::Local<v8::Promise::Resolver> callback = func->callback_.Get(
+                            isolate);
+                    v8::Local<v8::Context> context = callback->GetCreationContextChecked();
+                    v8::Context::Scope context_scope(
+                            context);
+
+
+                    if (func->data == nullptr) {
+                        callback->Resolve(context, v8::Undefined(isolate));
+                    } else {
+                        char* error = static_cast<char*>(func->data);
+                        callback->Reject(context,
+                                         v8::Exception::Error(
+                                                 ConvertToV8String(
+                                                         isolate,
+                                                         error)));
+                        canvas_native_string_destroy(
+                                error);
+                        func->data = nullptr;
+                    }
+                    delete static_cast<PromiseCallback *>(data);
+                }
+            }
     };
+    callback->prepare();
+
+
     canvas_native_webgpu_buffer_map_async(ptr->GetGPUBuffer(), (GPUMapMode) mode, offset, size,
                                           [](char *error, void *data) {
                                               if (data != nullptr) {
-                                                  auto func = static_cast<PromiseCallback *>(data);
-                                                  if (func->isolate != nullptr) {
-                                                      v8::Isolate *isolate = func->isolate;
-                                                      v8::Locker locker(isolate);
-                                                      v8::Isolate::Scope isolate_scope(
-                                                              isolate);
-                                                      v8::HandleScope handle_scope(
-                                                              isolate);
-                                                      v8::Local<v8::Promise::Resolver> callback = func->callback.Get(
-                                                              isolate);
-                                                      v8::Local<v8::Context> context = callback->GetCreationContextChecked();
-                                                      v8::Context::Scope context_scope(
-                                                              context);
-
-                                                      auto ret = v8::Object::New(
-                                                              isolate);
-                                                      if (error == nullptr) {
-                                                          callback->Resolve(context, ret);
-                                                      } else {
-                                                          callback->Reject(context,
-                                                                           v8::Exception::Error(
-                                                                                   ConvertToV8String(
-                                                                                           isolate,
-                                                                                           error)));
-                                                          canvas_native_string_destroy(
-                                                                  error);
+                                                  auto async_data = static_cast<PromiseCallback *>(data);
+                                                  auto inner = async_data->inner_.get();
+                                                  if (inner != nullptr) {
+                                                      if(error != nullptr){
+                                                          inner->data = error;
                                                       }
-                                                      delete static_cast<PromiseCallback *>(data);
+                                                      async_data->execute(true);
                                                   }
                                               }
                                           }, callback);

package/platforms/ios/src/cpp/webgpu/GPUBufferImpl.h

@@ -24,14 +24,14 @@ public:
 
     static v8::Local<v8::FunctionTemplate> GetCtor(v8::Isolate *isolate);
 
-    static v8::Local<v8::Object> NewInstance(v8::Isolate *isolate, GPUBufferImpl *adapter) {
+    static v8::Local<v8::Object> NewInstance(v8::Isolate *isolate, GPUBufferImpl *buffer) {
         auto context = isolate->GetCurrentContext();
         v8::EscapableHandleScope scope(isolate);
         auto object = GPUBufferImpl::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType(object, NativeType::GPUBuffer);
-        object->SetAlignedPointerInInternalField(0, adapter);
-        adapter->BindFinalizer(isolate, object);
+        SetNativeType(buffer, NativeType::GPUBuffer);
+        object->SetAlignedPointerInInternalField(0, buffer);
+        buffer->BindFinalizer(isolate, object);
         return scope.Escape(object);
     }
 

package/platforms/ios/src/cpp/webgpu/GPUCanvasContextImpl.cpp

@@ -270,7 +270,7 @@ void GPUCanvasContextImpl::GetCapabilities(const v8::FunctionCallbackInfo<v8::Va
             auto formats = v8::Array::New(isolate, (int) formats_len);
             for (int i = 0; i < formats_len; i++) {
                 auto format = canvas_native_string_buffer_get_value_at(cap->formats, i);
-                formats->Set(context, i, ConvertToV8String(isolate, format));
+                formats->Set(context, i, ConvertToV8String(isolate, format)).FromJust();
                 canvas_native_string_destroy(format);
             }
 
@@ -280,7 +280,7 @@ void GPUCanvasContextImpl::GetCapabilities(const v8::FunctionCallbackInfo<v8::Va
 
             for (int i = 0; i < present_modes_len; i++) {
                 auto mode = canvas_native_string_buffer_get_value_at(cap->present_modes, i);
-                present_modes->Set(context, i, ConvertToV8String(isolate, mode));
+                present_modes->Set(context, i, ConvertToV8String(isolate, mode)).FromJust();
                 canvas_native_string_destroy(mode);
             }
 
@@ -290,15 +290,15 @@ void GPUCanvasContextImpl::GetCapabilities(const v8::FunctionCallbackInfo<v8::Va
 
             for (int i = 0; i < alpha_modes_len; i++) {
                 auto mode = canvas_native_string_buffer_get_value_at(cap->alpha_modes, i);
-                alpha_modes->Set(context, i, ConvertToV8String(isolate, mode));
+                alpha_modes->Set(context, i, ConvertToV8String(isolate, mode)).FromJust();
                 canvas_native_string_destroy(mode);
             }
 
-            ret->Set(context, ConvertToV8String(isolate, "format"), formats);
-            ret->Set(context, ConvertToV8String(isolate, "presentModes"), present_modes);
-            ret->Set(context, ConvertToV8String(isolate, "alphaModes"), alpha_modes);
+            ret->Set(context, ConvertToV8String(isolate, "format"), formats).FromJust();
+            ret->Set(context, ConvertToV8String(isolate, "presentModes"), present_modes).FromJust();
+            ret->Set(context, ConvertToV8String(isolate, "alphaModes"), alpha_modes).FromJust();
             ret->Set(context, ConvertToV8String(isolate, "usages"),
-                     v8::Uint32::NewFromUnsigned(isolate, cap->usages));
+                     v8::Uint32::NewFromUnsigned(isolate, cap->usages)).FromJust();
 
             canvas_native_webgpu_struct_surface_capabilities_release(cap);
 
@@ -309,9 +309,9 @@ void GPUCanvasContextImpl::GetCapabilities(const v8::FunctionCallbackInfo<v8::Va
 
     }
 
-    ret->Set(context, ConvertToV8String(isolate, "format"), v8::Array::New(isolate));
-    ret->Set(context, ConvertToV8String(isolate, "presentModes"), v8::Array::New(isolate));
-    ret->Set(context, ConvertToV8String(isolate, "alphaModes"), v8::Array::New(isolate));
-    ret->Set(context, ConvertToV8String(isolate, "usages"), v8::Uint32::New(isolate, 0));
+    ret->Set(context, ConvertToV8String(isolate, "format"), v8::Array::New(isolate)).FromJust();
+    ret->Set(context, ConvertToV8String(isolate, "presentModes"), v8::Array::New(isolate)).FromJust();
+    ret->Set(context, ConvertToV8String(isolate, "alphaModes"), v8::Array::New(isolate)).FromJust();
+    ret->Set(context, ConvertToV8String(isolate, "usages"), v8::Uint32::New(isolate, 0)).FromJust();
     args.GetReturnValue().Set(ret);
 }

package/platforms/ios/src/cpp/webgpu/GPUCanvasContextImpl.h

@@ -31,7 +31,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = GPUCanvasContextImpl::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType(object, NativeType::GPUCanvasContext);
+        SetNativeType(ctx, NativeType::GPUCanvasContext);
         object->SetAlignedPointerInInternalField(0, ctx);
         ctx->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/platforms/ios/src/cpp/webgpu/GPUCommandBufferImpl.cpp

@@ -22,7 +22,7 @@ void GPUCommandBufferImpl::Init(v8::Local<v8::Object> canvasModule, v8::Isolate
     auto context = isolate->GetCurrentContext();
     auto func = ctor->GetFunction(context).ToLocalChecked();
 
-    canvasModule->Set(context, ConvertToV8String(isolate, "GPUCommandBuffer"), func).FromJust();;
+    canvasModule->Set(context, ConvertToV8String(isolate, "GPUCommandBuffer"), func).FromJust();
 }
 
 GPUCommandBufferImpl *GPUCommandBufferImpl::GetPointer(const v8::Local<v8::Object> &object) {

package/platforms/ios/src/cpp/webgpu/GPUCommandBufferImpl.h

@@ -31,7 +31,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = GPUCommandBufferImpl::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType(object, NativeType::GPUCommandBuffer);
+        SetNativeType(commandBuffer, NativeType::GPUCommandBuffer);
         object->SetAlignedPointerInInternalField(0, commandBuffer);
         commandBuffer->BindFinalizer(isolate, object);
         return scope.Escape(object);