@nativescript/canvas 2.0.0-alpha.2 → 2.0.0-alpha.3

package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/Modules/module.modulemap

@@ -6,6 +6,6 @@ framework module CanvasNative {
 }
 
 module CanvasNative.Swift {
-    header "CanvasNative-Swift.h"
-    requires objc
+  header "CanvasNative-Swift.h"
+  requires objc
 }

package/platforms/ios/CanvasNative.xcframework/ios-arm64_x86_64-simulator/CanvasNative.framework/_CodeSignature/CodeResources

@@ -6,91 +6,75 @@
 	<dict>
 		<key>Headers/CanvasNative-Swift.h</key>
 		<data>
-		Z9nbVWMOM090hryVQGih6F19jIU=
+		ldeV7fidMLgfiiTfxOg9yY9gZHw=
 		</data>
 		<key>Headers/CanvasNative.h</key>
 		<data>
-		cz6tCd141BIQfcRU9gJ89V9nbZs=
+		ZMHrbnL4GsXoVIIuWgQTvm0zpBY=
 		</data>
-		<key>Headers/Utils.h</key>
+		<key>Headers/canvas_native.h</key>
 		<data>
-		iXZ3qr3/+WiSXgv5Lah/QMixGOQ=
+		boGfduuaBuCzW0e5/Lq693uAUaU=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		oWrFU5eA19jSs8BVe1nzVZD3Hac=
+		VhrbJikfAL6yn4J+rfiUSfq4Luk=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		ZbO7JUZjMqa94AcZH8HJKb3nXGs=
+		sOighQd72EqDqIK/0TE/+MA/q5I=
 		</data>
-		<key>Modules/CanvasNative.swiftmodule/Project/arm64.swiftsourceinfo</key>
+		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
-		ZbO7JUZjMqa94AcZH8HJKb3nXGs=
+		e4gPywpjjDgNs4gj/MzGwDYR2f8=
 		</data>
-		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
+		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>
-		scEXVtC20uoFfbaepLCnAVvxlhU=
+		YjN88+ydu39xFWCZaIjqubuj/LM=
 		</data>
-		<key>Modules/CanvasNative.swiftmodule/Project/x86_64.swiftsourceinfo</key>
+		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
-		scEXVtC20uoFfbaepLCnAVvxlhU=
+		GtFXL8aMteQWLimAr5fZdbkEeqo=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
 		<data>
-		IjkaH6M3xZGLhGgTjn6D/VUxUrg=
+		ECdY3x5N6YKCh2soIDhUEympMD4=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
 		<data>
-		kuWbNCTKosZvdUt3gU73y1waWs8=
+		GtFXL8aMteQWLimAr5fZdbkEeqo=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		58nZ2ZmakCLGERSctVJfJQQO71w=
-		</data>
-		<key>Modules/CanvasNative.swiftmodule/arm64.swiftdoc</key>
-		<data>
-		IjkaH6M3xZGLhGgTjn6D/VUxUrg=
+		3u0EZQ9GI0PPFjfAguRcw5DDuHA=
 		</data>
-		<key>Modules/CanvasNative.swiftmodule/arm64.swiftinterface</key>
+		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<data>
-		kuWbNCTKosZvdUt3gU73y1waWs8=
+		YjN88+ydu39xFWCZaIjqubuj/LM=
 		</data>
-		<key>Modules/CanvasNative.swiftmodule/arm64.swiftmodule</key>
+		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<data>
-		58nZ2ZmakCLGERSctVJfJQQO71w=
+		4RKVRTvfXEmECMmY3Y+pvntAXBM=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
 		<data>
-		TkTTJlG59luRYYvsRal+S3z9rMY=
+		YRp9iFKV0/ZIsRIGjRB6TpBcVIc=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
 		<data>
-		AbDPycNtJUV9gOyUihoklM+9vx8=
+		4RKVRTvfXEmECMmY3Y+pvntAXBM=
 		</data>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<data>
-		j3OiALKyb2ZS0kB2CrnH5M/8lHs=
-		</data>
-		<key>Modules/CanvasNative.swiftmodule/x86_64.swiftdoc</key>
-		<data>
-		TkTTJlG59luRYYvsRal+S3z9rMY=
-		</data>
-		<key>Modules/CanvasNative.swiftmodule/x86_64.swiftinterface</key>
-		<data>
-		AbDPycNtJUV9gOyUihoklM+9vx8=
-		</data>
-		<key>Modules/CanvasNative.swiftmodule/x86_64.swiftmodule</key>
-		<data>
-		j3OiALKyb2ZS0kB2CrnH5M/8lHs=
+		7NtElPjsXsOkMmrLy0ie6e4EPDM=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
-		XZvX+DI0zyNqirarGmz86QaqQDY=
+		BjDNiznFmjQirdULxZi9ZgNi/VI=
 		</data>
-		<key>TNSCanvas.nib</key>
+		<key>NSCCanvas.nib</key>
 		<data>
-		UAhwoslGeDCqnvroh+eu0Kemoyk=
+		qkDQhhutZTxgDZ7F7lJ6nvazIjk=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -99,147 +83,119 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			qk66L7b13ugBWMYrNuT2vTLUbqT09HlYm9Dpzqcet0k=
+			s4OUEStdftXKWmUY1RlNdzuqnBCeVbWVEEMuOU9MRcc=
 			</data>
 		</dict>
 		<key>Headers/CanvasNative.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			o6AMlPsUCYUawWX7wNOA9l2oBFsQb8UKlR9wNLg+Rlg=
+			h6rWgL2qxZtLvvwnVfWZJ661yWKbzxWli7B8pITHakI=
 			</data>
 		</dict>
-		<key>Headers/Utils.h</key>
+		<key>Headers/canvas_native.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			EOmMU+bRK1XbWu3t/+AJNjORBBFlA5I94/1l3F8RxRc=
+			0FyAor54IyOsgQ3FiMZcj+Ekq3Ob+SgMR0Pu8ug3GBE=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			fOsGH4uyqM0WKhfO2pJzEpsMkQfSZHS8sOXVkfi2h6c=
+			JiDxA6ihsLqYqnJBwVI5x4wV9YqcDY8eiH6b6iL5reI=
 			</data>
 		</dict>
-		<key>Modules/CanvasNative.swiftmodule/Project/arm64.swiftsourceinfo</key>
+		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			fOsGH4uyqM0WKhfO2pJzEpsMkQfSZHS8sOXVkfi2h6c=
+			/ODllxA+Z5Qj8yJdX30SbakAwLR1PpQ7Upos2GOkRBg=
 			</data>
 		</dict>
-		<key>Modules/CanvasNative.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
+		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			WjN/7okXVI7AD0EDZQbOj6IULIAne92MVxCq4bXuQKQ=
+			8puaa/D0NsVbHOew6Mdg8nu234jCGZhJ4OudicHxYGk=
 			</data>
 		</dict>
-		<key>Modules/CanvasNative.swiftmodule/Project/x86_64.swiftsourceinfo</key>
+		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			WjN/7okXVI7AD0EDZQbOj6IULIAne92MVxCq4bXuQKQ=
+			XBS1v/8zzG7N483HRt4wh3O43iqg47uI3nlEJ9UUsRE=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			qNYCKq46uIdd4d6zWA57dYFuaJMqJ8doTKgHwIWm6Lc=
+			Y1a74PsPzlrgEGtG7bKHT11kz2TfsAsT2Sm4UmK1VNY=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			As9vu5ql2ZV7CxRtpDGmgicr+3wYSTC/VfsqkyW/0BM=
+			XBS1v/8zzG7N483HRt4wh3O43iqg47uI3nlEJ9UUsRE=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/arm64-apple-ios-simulator.swiftmodule</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			/+pHYNAKlDf7otQDERiuOZdTVODPxeT7dVQxo/bGQo4=
-			</data>
-		</dict>
-		<key>Modules/CanvasNative.swiftmodule/arm64.swiftdoc</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			qNYCKq46uIdd4d6zWA57dYFuaJMqJ8doTKgHwIWm6Lc=
+			rrX9bnieA5a48i9X9mkPzFVmnOpI5gsodbQO58Xanzs=
 			</data>
 		</dict>
-		<key>Modules/CanvasNative.swiftmodule/arm64.swiftinterface</key>
+		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.abi.json</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			As9vu5ql2ZV7CxRtpDGmgicr+3wYSTC/VfsqkyW/0BM=
+			8puaa/D0NsVbHOew6Mdg8nu234jCGZhJ4OudicHxYGk=
 			</data>
 		</dict>
-		<key>Modules/CanvasNative.swiftmodule/arm64.swiftmodule</key>
+		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			/+pHYNAKlDf7otQDERiuOZdTVODPxeT7dVQxo/bGQo4=
+			qFiH4mFou8D92xNeGzG1YemJYCBGokfPmALSuncAnyQ=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			uPuiuQO3TXhQxHoBLO9P6r5h/UBg0ItpSXfc5dE8YCE=
+			SPlCrSLvqiOiv2YiUMpUjYaNahEHel5+PxrHlpvUgM0=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftinterface</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			jIo/YRDaJBDwCP4OPJxYTdS3wZmB9yboS28YBVWMM5A=
+			qFiH4mFou8D92xNeGzG1YemJYCBGokfPmALSuncAnyQ=
 			</data>
 		</dict>
 		<key>Modules/CanvasNative.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			qCoKeptVkRrDCx8ScLkmZnbogfUqlQ08eFP+mQeP42I=
-			</data>
-		</dict>
-		<key>Modules/CanvasNative.swiftmodule/x86_64.swiftdoc</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			uPuiuQO3TXhQxHoBLO9P6r5h/UBg0ItpSXfc5dE8YCE=
-			</data>
-		</dict>
-		<key>Modules/CanvasNative.swiftmodule/x86_64.swiftinterface</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			jIo/YRDaJBDwCP4OPJxYTdS3wZmB9yboS28YBVWMM5A=
-			</data>
-		</dict>
-		<key>Modules/CanvasNative.swiftmodule/x86_64.swiftmodule</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			qCoKeptVkRrDCx8ScLkmZnbogfUqlQ08eFP+mQeP42I=
+			AbUA0v8gyVjUMx1swGlGIY/zRw1zkiEUlcgxQsAJGks=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			8iIkhxd5OAnp5sHOd5hd0owVgZ7+uSOi+vgsgZ/0fC8=
+			c22jqd6c3wxNlwA7iH09q2NMxJr84gsbuvLmUk0O2GU=
 			</data>
 		</dict>
-		<key>TNSCanvas.nib</key>
+		<key>NSCCanvas.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			xsFdekn46TUXi24LiYKgnN2oZDR8aHxVSMqLhBHn/Pw=
+			tQH3V4xc4MFZrUOJCe2pDezkuoSIUkNxdyuLs8Ri2Hc=
 			</data>
 		</dict>
 	</dict>

package/platforms/ios/Podfile

@@ -1,6 +1,7 @@
-use_frameworks!
 platform :ios, '11.0'
 #pod 'CanvasNative' , '~> 1.0.0.alpha.11'
 #pod 'CanvasNative', :path => "$(SRCROOT)/../../../../../"
 #pod 'CanvasNative', :git => 'https://github.com/NativeScript/canvas.git', :tag => '1.0.0-alpha.2'
 
+pod 'NativeScript', path: "../../node_modules/@nativescript/canvas/pods/NativeScript.podspec"
+

package/platforms/ios/build.xcconfig

@@ -0,0 +1,5 @@
+OTHER_LDFLAGS[sdk=*] = $(inherited) -framework CanvasNative -framework OpenGLES -framework GLKit
+
+HEADER_SEARCH_PATHS = $(inherited) "$(SRCROOT)/../../../../packages/canvas/platforms/ios/src" "$(SRCROOT)/../../../../packages/canvas/platforms/ios/src/cpp"
+
+CLANG_CXX_LANGUAGE_STANDARD = c++17

package/platforms/ios/src/CanvasModule.h

@@ -0,0 +1,10 @@
+#import "Foundation/Foundation.h"
+#import "NativeScript/JSIRuntime.h"
+#import "cpp/CanvasJSIModule.h"
+#import <sstream>
+
+@interface CanvasModule : NSObject
+
+- (void) install;
+
+@end

package/platforms/ios/src/CanvasModule.mm

@@ -0,0 +1,14 @@
+#import "CanvasModule.h"
+
+
+using namespace facebook::jsi;
+using namespace std;
+
+@implementation CanvasModule
+
+- (void )install {
+    std::shared_ptr<facebook::jsi::Runtime> rt = [JSIRuntime runtime];
+    CanvasJSIModule::install(*rt);
+}
+
+@end

package/platforms/ios/src/cpp/CanvasJSIModule.h

@@ -0,0 +1,60 @@
+//
+// Created by Osei Fortune on 25/02/2023.
+//
+
+#pragma once
+
+#include <memory>
+#include <array>
+#include "NativeScript/JSIRuntime.h"
+#include "canvas2d/CanvasRenderingContext2DImpl.h"
+
+#import "canvas-cxx/src/lib.rs.h"
+#include "Helpers.h"
+
+#include "ImageAssetImpl.h"
+#include "ImageBitmapImpl.h"
+#include "TextDecoderImpl.h"
+#include "TextEncoderImpl.h"
+#include "canvas2d/MatrixImpl.h"
+
+#include "webgl/WebGLRenderingContextBase.h"
+#include "webgl/WebGLRenderingContext.h"
+#include "webgl2/WebGL2RenderingContext.h"
+
+using namespace facebook;
+using namespace org::nativescript::canvas;
+
+template<typename NativeFunc>
+static void
+createGlobalFunc(jsi::Runtime &jsiRuntime, const char *prop, int paramCount, NativeFunc &&func) {
+    auto f = jsi::Function::createFromHostFunction(jsiRuntime,
+                                                   jsi::PropNameID::forAscii(jsiRuntime, prop),
+                                                   paramCount,
+                                                   std::forward<NativeFunc>(func));
+    jsiRuntime.global().setProperty(jsiRuntime, prop, std::move(f));
+}
+
+#define CREATE_GLOBAL_FUNC(prop, paramCount, func) \
+    createFunc(jsiRuntime, prop, paramCount, func)
+
+
+template<typename NativeFunc>
+static void
+createFunc(jsi::Runtime &jsiRuntime, jsi::Object &object, const char *prop, int paramCount,
+           NativeFunc &&func) {
+    auto f = jsi::Function::createFromHostFunction(jsiRuntime,
+                                                   jsi::PropNameID::forAscii(jsiRuntime, prop),
+                                                   paramCount,
+                                                   std::forward<NativeFunc>(func));
+    object.setProperty(jsiRuntime, prop, std::move(f));
+}
+
+#define CREATE_FUNC(prop, object, paramCount, func) \
+    createFunc(jsiRuntime, object, prop, paramCount, func)
+
+class CanvasJSIModule {
+public:
+    static void install(facebook::jsi::Runtime &rt);
+};
+