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

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

@@ -20,7 +20,7 @@ void GPUImpl::Init(const v8::Local<v8::Object> &canvasModule, v8::Isolate *isola
     auto context = isolate->GetCurrentContext();
     auto func = ctor->GetFunction(context).ToLocalChecked();
 
-    canvasModule->Set(context, ConvertToV8String(isolate, "GPU"), func).FromJust();;
+    canvasModule->Set(context, ConvertToV8String(isolate, "GPU"), func).FromJust();
 }
 
 
@@ -69,7 +69,7 @@ void GPUImpl::Ctor(const v8::FunctionCallbackInfo<v8::Value> &args) {
 
     ret->SetAlignedPointerInInternalField(0, object);
 
-    SetNativeType(ret, NativeType::GPUInstance);
+    SetNativeType(object, NativeType::GPUInstance);
 
     object->BindFinalizer(isolate, ret);
 
@@ -122,49 +122,62 @@ void GPUImpl::RequestAdapter(const v8::FunctionCallbackInfo<v8::Value> &args) {
         }
     }
 
-    v8::Global<v8::Function> func(isolate, args[1].As<v8::Function>());
+
     auto callback = new AsyncCallback{
             isolate,
-            std::move(func)
+            args[1].As<v8::Function>(),
+            [](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);
+
+                        if (func->data != nullptr) {
+                            auto impl = new GPUAdapterImpl(
+                                    static_cast<const CanvasGPUAdapter *>(func->data));
+                            auto ret = GPUAdapterImpl::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);
+                        } else {
+                            v8::Local<v8::Value> args[1] = {
+                                    v8::Null(isolate)};
+
+                            callback->Call(context, context->Global(),
+                                           1,
+                                           args);  // ignore JS return value
+                            delete static_cast<AsyncCallback *>(data);
+                        }
+                    }
+                }
+            }
     };
+    callback->prepare();
     canvas_native_webgpu_request_adapter(ptr->GetGPUInstance(), &opts,
                                          [](const CanvasGPUAdapter *adapter, 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 (adapter != nullptr) {
-                                                         auto impl = new GPUAdapterImpl(adapter);
-                                                         auto ret = GPUAdapterImpl::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);
-                                                     } else {
-                                                         v8::Local<v8::Value> args[1] = {
-                                                                 v8::Null(isolate)};
-
-                                                         callback->Call(context, context->Global(),
-                                                                        1,
-                                                                        args);  // ignore JS return value
-                                                         delete static_cast<AsyncCallback *>(data);
-                                                     }
+                                                 auto async_data = static_cast<AsyncCallback *>(data);
+                                                 auto inner = async_data->inner_.get();
+                                                 if (inner != nullptr) {
+                                                     inner->data = (void *) adapter;
+                                                     async_data->execute(true);
                                                  }
                                              }
                                          }, callback);
@@ -180,7 +193,7 @@ void GPUImpl::__GetPointer(const v8::FunctionCallbackInfo<v8::Value> &args) {
 
     auto isolate = args.GetIsolate();
 
-    auto pointer = (intptr_t *) ptr->GetGPUInstance();
-    auto ret = std::to_string((intptr_t) pointer);
+    auto pointer = canvas_native_webgpu_get_pointer_addr(ptr->GetGPUInstance());
+    auto ret = std::to_string(pointer);
     args.GetReturnValue().Set(ConvertToV8String(isolate, ret));
 }

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

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

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

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

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

@@ -26,14 +26,15 @@ public:
 
     static v8::Local<v8::FunctionTemplate> GetCtor(v8::Isolate *isolate);
 
-    static v8::Local<v8::Object> NewInstance(v8::Isolate *isolate, GPUPipelineLayoutImpl *device) {
+    static v8::Local<v8::Object>
+    NewInstance(v8::Isolate *isolate, GPUPipelineLayoutImpl *pipeline) {
         auto context = isolate->GetCurrentContext();
         v8::EscapableHandleScope scope(isolate);
         auto object = GPUPipelineLayoutImpl::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType(object, NativeType::GPUPipelineLayout);
-        object->SetAlignedPointerInInternalField(0, device);
-        device->BindFinalizer(isolate, object);
+        SetNativeType(pipeline, NativeType::GPUPipelineLayout);
+        object->SetAlignedPointerInInternalField(0, pipeline);
+        pipeline->BindFinalizer(isolate, object);
         return scope.Escape(object);
     }
 

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

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

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

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

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

@@ -30,7 +30,7 @@ void GPUQueueImpl::Init(v8::Local<v8::Object> canvasModule, v8::Isolate *isolate
     auto context = isolate->GetCurrentContext();
     auto func = ctor->GetFunction(context).ToLocalChecked();
 
-    canvasModule->Set(context, ConvertToV8String(isolate, "GPUQueue"), func).FromJust();;
+    canvasModule->Set(context, ConvertToV8String(isolate, "GPUQueue"), func).FromJust();
 }
 
 GPUQueueImpl *GPUQueueImpl::GetPointer(const v8::Local<v8::Object> &object) {
@@ -306,33 +306,48 @@ void GPUQueueImpl::SubmitWorkDone(const v8::FunctionCallbackInfo<v8::Value> &arg
     }
 
     auto isolate = args.GetIsolate();
+    auto cb = args[0].As<v8::Function>();
+    auto callback = new AsyncCallback(isolate, cb, [](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);
+
+                if (func->data != nullptr) {
+                    // todo handle error
+                    canvas_native_string_destroy(static_cast<char *>(func->data));
+                    func->data = nullptr;
+                }
 
-    auto cb = args[0];
-    auto callback = new JSICallback(isolate, cb.As<v8::Function>());
-
-    canvas_native_webgpu_queue_on_submitted_work_done(ptr->GetGPUQueue(),
-                                                      [](char *error, void *data) {
-                                                          auto cb = static_cast<JSICallback *>(data);
-
-                                                          v8::Isolate *isolate = cb->isolate_;
-                                                          v8::Locker locker(isolate);
-                                                          v8::Isolate::Scope isolate_scope(
-                                                                  isolate);
-                                                          v8::HandleScope handle_scope(
-                                                                  isolate);
-                                                          v8::Local<v8::Function> callback = cb->callback_->Get(
-                                                                  isolate);
-                                                          v8::Local<v8::Context> context = callback->GetCreationContextChecked();
-                                                          v8::Context::Scope context_scope(
-                                                                  context);
+                callback->Call(context,
+                               context->Global(),
+                               0, nullptr);
 
+                delete static_cast<AsyncCallback *>(data);
+            }
 
-                                                          callback->Call(context,
-                                                                         context->Global(),
-                                                                         0, nullptr);
+        }
+    });
 
+    callback->prepare();
 
-                                                          delete static_cast<JSICallback *>(data);
+    canvas_native_webgpu_queue_on_submitted_work_done(ptr->GetGPUQueue(),
+                                                      [](char *error, void *data) {
+                                                          if (data != nullptr) {
+                                                              auto async_data = static_cast<AsyncCallback *>(data);
+                                                              async_data->execute(true);
+                                                          }
                                                       },
                                                       callback);
 

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

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

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

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

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

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

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

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

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

@@ -28,7 +28,7 @@ void GPURenderPassEncoderImpl::Init(v8::Local<v8::Object> canvasModule, v8::Isol
     auto func = ctor->GetFunction(context).ToLocalChecked();
 
     canvasModule->Set(context, ConvertToV8String(isolate, "GPURenderPassEncoder"),
-                      func).FromJust();;
+                      func).FromJust();
 }
 
 GPURenderPassEncoderImpl *
@@ -228,9 +228,10 @@ void GPURenderPassEncoderImpl::DrawIndexed(const v8::FunctionCallbackInfo<v8::Va
             firstInstance = firstInstanceVal.As<v8::Uint32>()->Value();
         }
 
+        auto indexCount = indexCountVal->Uint32Value(
+                                                     context).FromJust();
         canvas_native_webgpu_render_pass_encoder_draw_indexed(ptr->GetPass(),
-                                                              indexCountVal->Uint32Value(
-                                                                      context).FromJust(),
+                                                              indexCount,
                                                               instanceCount, firstIndex,
                                                               baseVertex,
                                                               firstInstance);

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -11,7 +11,7 @@
 
 class GPUShaderModuleImpl : ObjectWrapperImpl {
 public:
-    GPUShaderModuleImpl(const CanvasGPUShaderModule *shaderModule);
+    explicit GPUShaderModuleImpl(const CanvasGPUShaderModule *shaderModule);
 
     ~GPUShaderModuleImpl() {
         canvas_native_webgpu_shader_module_release(this->GetShaderModule());
@@ -31,7 +31,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = GPUShaderModuleImpl::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType(object, NativeType::GPUShaderModule);
+        SetNativeType(shaderModule, NativeType::GPUShaderModule);
         object->SetAlignedPointerInInternalField(0, shaderModule);
         shaderModule->BindFinalizer(isolate, object);
         return scope.Escape(object);

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

@@ -22,7 +22,7 @@ void GPUSupportedLimitsImpl::Init(v8::Local<v8::Object> canvasModule, v8::Isolat
     auto context = isolate->GetCurrentContext();
     auto func = ctor->GetFunction(context).ToLocalChecked();
 
-    canvasModule->Set(context, ConvertToV8String(isolate, "GPUSupportedLimits"), func).FromJust();;
+    canvasModule->Set(context, ConvertToV8String(isolate, "GPUSupportedLimits"), func).FromJust();
 }
 
 GPUSupportedLimitsImpl *GPUSupportedLimitsImpl::GetPointer(v8::Local<v8::Object> object) {
@@ -281,7 +281,7 @@ void GPUSupportedLimitsImpl::Ctor(const v8::FunctionCallbackInfo<v8::Value> &arg
 
     ret->SetAlignedPointerInInternalField(0, object);
 
-    SetNativeType(ret, NativeType::GPUSupportedLimits);
+    SetNativeType(object, NativeType::GPUSupportedLimits);
 
     object->BindFinalizer(isolate, ret);
 

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

@@ -10,7 +10,7 @@
 
 class GPUSupportedLimitsImpl : public ObjectWrapperImpl {
 public:
-    GPUSupportedLimitsImpl(CanvasGPUSupportedLimits *limits);
+    explicit GPUSupportedLimitsImpl(CanvasGPUSupportedLimits *limits);
 
     ~GPUSupportedLimitsImpl() {
         canvas_native_webgpu_limits_release(this->limits_);
@@ -23,7 +23,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = GPUSupportedLimitsImpl::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType(object, NativeType::GPUSupportedLimits);
+        SetNativeType(limits, NativeType::GPUSupportedLimits);
         object->SetAlignedPointerInInternalField(0, limits);
         limits->BindFinalizer(isolate, object);
         return scope.Escape(object);

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

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

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

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

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

@@ -11,7 +11,7 @@
 
 class GPUTextureViewImpl : ObjectWrapperImpl {
 public:
-    GPUTextureViewImpl(const CanvasGPUTextureView *view);
+    explicit GPUTextureViewImpl(const CanvasGPUTextureView *view);
 
     ~GPUTextureViewImpl() {
         canvas_native_webgpu_texture_view_release(this->GetTextureView());
@@ -30,7 +30,7 @@ public:
         v8::EscapableHandleScope scope(isolate);
         auto object = GPUTextureViewImpl::GetCtor(isolate)->GetFunction(
                 context).ToLocalChecked()->NewInstance(context).ToLocalChecked();
-        SetNativeType(object, NativeType::GPUTextureView);
+        SetNativeType(view, NativeType::GPUTextureView);
         object->SetAlignedPointerInInternalField(0, view);
         view->BindFinalizer(isolate, object);
         return scope.Escape(object);

package/react/index.d.ts

@@ -13,7 +13,7 @@ export declare type CanvasAttributes = ViewAttributes & {
     onReady?: (arg: EventData) => void;
 };
 declare global {
-    module JSX {
+    namespace JSX {
         interface IntrinsicElements {
             tnsCanvas: NativeScriptProps<CanvasAttributes, Canvas>;
         }

package/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../packages/canvas/utils.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,KAAK;IAIV,MAAM,CAAC,SAAS,CAAC,KAAK;QAC5B,IAAI,MAAM,CAAC,KAAK,EAAE;YACjB,IAAI,KAAK,YAAY,OAAO,EAAE;gBAC7B,MAAM,OAAO,GAAG,EAAE,CAAC;gBACnB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;gBAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;oBAC/B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;iBACrC;gBACD,OAAO,OAAO,CAAC;aACf;SACD;QAED,IAAI,MAAM,CAAC,SAAS,EAAE;YACrB,MAAM,OAAO,GAAG,EAAE,CAAC;YACnB,IAAI,KAAK,YAAY,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACzC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;oBAC/B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC3B;gBACD,OAAO,OAAO,CAAC;aACf;YAED,IAAI,KAAK,YAAY,aAAa,CAAC,KAAK,EAAE;gBACzC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;gBAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;oBAC/B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;iBACvB;aACD;SACD;QAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC1B,OAAO,EAAE,CAAC;SACV;aAAM;YACN,OAAO,KAAK,CAAC;SACb;IACF,CAAC;IAEM,MAAM,KAAK,iCAAiC;QAClD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAC/B,MAAM,OAAO,GAAS,MAAO,CAAC,gBAAgB,CAAC;YAC/C,IAAI,CAAC,qBAAqB,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,+BAA+B,CAAC;YAChH,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;SACjC;QACD,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,KAAK;QACxB,OAAO,KAAK,YAAY,iBAAiB,IAAI,KAAK,YAAY,UAAU,IAAI,KAAK,YAAY,SAAS,IAAI,KAAK,YAAY,WAAW,IAAI,KAAK,YAAY,UAAU,IAAI,KAAK,YAAY,WAAW,IAAI,KAAK,YAAY,UAAU,IAAI,KAAK,YAAY,YAAY,CAAA;IACtQ,CAAC;;AAnDM,qCAA+B,GAAG,OAAO,CAAC;AAC1C,2BAAqB,GAAG,KAAK,CAAC;AAC9B,0BAAoB,GAAG,KAAK,CAAC;AAqDrC,MAAM,CAAC,OAAO,UAAU,IAAI,CAAI,MAAe;IAC9C,IAAI,MAAS,CAAC;IAEd,OAAO,GAAG,EAAE,CAAC,MAAM,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../packages/canvas/utils.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,KAAK;IAIV,MAAM,CAAC,SAAS,CAAC,KAAK;QAC5B,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YAClB,IAAI,KAAK,YAAY,OAAO,EAAE,CAAC;gBAC9B,MAAM,OAAO,GAAG,EAAE,CAAC;gBACnB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;gBAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;oBAChC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtC,CAAC;gBACD,OAAO,OAAO,CAAC;YAChB,CAAC;QACF,CAAC;QAED,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG,EAAE,CAAC;YACnB,IAAI,KAAK,YAAY,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC1C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;oBAChC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5B,CAAC;gBACD,OAAO,OAAO,CAAC;YAChB,CAAC;YAED,IAAI,KAAK,YAAY,aAAa,CAAC,KAAK,EAAE,CAAC;gBAC1C,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;gBAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;oBAChC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,EAAE,CAAC;QACX,CAAC;aAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;IAEM,MAAM,KAAK,iCAAiC;QAClD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAChC,MAAM,OAAO,GAAS,MAAO,CAAC,gBAAgB,CAAC;YAC/C,IAAI,CAAC,qBAAqB,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,+BAA+B,CAAC;YAChH,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QAClC,CAAC;QACD,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,KAAK;QACxB,OAAO,KAAK,YAAY,iBAAiB,IAAI,KAAK,YAAY,UAAU,IAAI,KAAK,YAAY,SAAS,IAAI,KAAK,YAAY,WAAW,IAAI,KAAK,YAAY,UAAU,IAAI,KAAK,YAAY,WAAW,IAAI,KAAK,YAAY,UAAU,IAAI,KAAK,YAAY,YAAY,CAAA;IACtQ,CAAC;;AAnDM,qCAA+B,GAAG,OAAO,CAAC;AAC1C,2BAAqB,GAAG,KAAK,CAAC;AAC9B,0BAAoB,GAAG,KAAK,CAAC;AAqDrC,MAAM,CAAC,OAAO,UAAU,IAAI,CAAI,MAAe;IAC9C,IAAI,MAAS,CAAC;IAEd,OAAO,GAAG,EAAE,CAAC,MAAM,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAC5C,CAAC"}

package/angular/fesm2015/nativescript-canvas-angular.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"nativescript-canvas-angular.mjs","sources":["../../../../../packages/canvas/angular/index.ts","../../../../../packages/canvas/angular/nativescript-canvas-angular.ts"],"sourcesContent":["import {NgModule, NO_ERRORS_SCHEMA} from '@angular/core';\nimport {registerElement} from '@nativescript/angular';\n\nregisterElement('Canvas', () => require('@nativescript/canvas').Canvas);\n\n\n@NgModule({\n  schemas: [NO_ERRORS_SCHEMA]\n})\n// @ts-ignore\nexport class CanvasModule {\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":";;;;AAGA,eAAe,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC;AAMxE;MACa,YAAY,CAAA;;0GAAZ,YAAY,EAAA,IAAA,EAAA,EAAA,EAAA,MAAA,EAAA,EAAA,CAAA,eAAA,CAAA,QAAA,EAAA,CAAA,CAAA;2GAAZ,YAAY,EAAA,CAAA,CAAA;2GAAZ,YAAY,EAAA,CAAA,CAAA;4FAAZ,YAAY,EAAA,UAAA,EAAA,CAAA;kBAJxB,QAAQ;AAAC,YAAA,IAAA,EAAA,CAAA;oBACR,OAAO,EAAE,CAAC,gBAAgB,CAAC;iBAC5B,CAAA;;;ACRD;;AAEG;;;;"}

package/angular/fesm2020/nativescript-canvas-angular.mjs

@@ -1,24 +0,0 @@
-import * as i0 from '@angular/core';
-import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
-import { registerElement } from '@nativescript/angular';
-
-registerElement('Canvas', () => require('@nativescript/canvas').Canvas);
-// @ts-ignore
-class CanvasModule {
-}
-CanvasModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: CanvasModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-CanvasModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.10", ngImport: i0, type: CanvasModule });
-CanvasModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: CanvasModule });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: CanvasModule, decorators: [{
-            type: NgModule,
-            args: [{
-                    schemas: [NO_ERRORS_SCHEMA]
-                }]
-        }] });
-
-/**
- * Generated bundle index. Do not edit.
- */
-
-export { CanvasModule };
-//# sourceMappingURL=nativescript-canvas-angular.mjs.map