continue work on NativeScriptRuntime.xcframework

Author: DjDeveloperr

.gitignore

@@ -14,3 +14,4 @@ libffi/darwin_*
 libffi/x86_64-*
 compile_commands.json
 .cache/
+runtime/Frameworks/hermes.xcframework

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.15)
 
-set(BRIDGE_TARGET_PLATFORM "macos" CACHE STRING "Target platform for the Objective-C bridge")
+set(TARGET_PLATFORM "macos" CACHE STRING "Target platform for the Objective-C bridge")
 set(METADATA_SIZE 0 CACHE STRING "Size of embedded metadata in bytes")
 
 project(NativeScript)
@@ -19,7 +19,7 @@ set(BUILD_FRAMEWORK TRUE)
 
 find_program(XCODEBUILD_EXECUTABLE xcodebuild)
 
-if(BRIDGE_TARGET_PLATFORM STREQUAL "ios")
+if(TARGET_PLATFORM STREQUAL "ios")
   set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "13.0")
   set(CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2")
   set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
@@ -28,7 +28,7 @@ if(BRIDGE_TARGET_PLATFORM STREQUAL "ios")
   set(TARGET_PLATFORM_IOS TRUE)
   set(SDK_NAME "iphoneos")
   set(CMAKE_OSX_ARCHITECTURES "arm64")
-elseif(BRIDGE_TARGET_PLATFORM STREQUAL "ios-sim")
+elseif(TARGET_PLATFORM STREQUAL "ios-sim")
   set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "13.0")
   set(CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2")
   set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
@@ -38,7 +38,7 @@ elseif(BRIDGE_TARGET_PLATFORM STREQUAL "ios-sim")
   set(TARGET_PLATFORM_SIM TRUE)
   set(SDK_NAME "iphonesimulator")
   set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
-elseif(BRIDGE_TARGET_PLATFORM STREQUAL "macos")
+elseif(TARGET_PLATFORM STREQUAL "macos")
   set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET "13.0")
   set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0")
   set(LIBFFI_BUILD "macosx-universal")
@@ -47,7 +47,7 @@ elseif(BRIDGE_TARGET_PLATFORM STREQUAL "macos")
   set(SDK_NAME "macosx")
   set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 else()
-  message(FATAL_ERROR "Unknown target platform: ${BRIDGE_TARGET_PLATFORM}")
+  message(FATAL_ERROR "Unknown target platform: ${TARGET_PLATFORM}")
   return()
 endif()
 
@@ -59,7 +59,7 @@ else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DEMBED_METADATA_SIZE=${METADATA_SIZE}")
 endif()
 
-message(STATUS "BRIDGE_TARGET_PLATFORM = ${BRIDGE_TARGET_PLATFORM}")
+message(STATUS "TARGET_PLATFORM = ${TARGET_PLATFORM}")
 
 execute_process(
   COMMAND ${XCODEBUILD_EXECUTABLE} -version -sdk ${SDK_NAME} Path
@@ -111,13 +111,20 @@ add_library(
   ${LIB_SOURCE_FILES}
 )
 
+target_sources(
+  ${NAME}
+  PRIVATE
+  "include/NativeScript.h"
+)
+
 set_target_properties(${NAME} PROPERTIES
   VERSION ${VERSION}
   SOVERSION ${VERSION}
   FRAMEWORK_VERSION ${VERSION}
   MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${VERSION}
   MACOSX_FRAMEWORK_BUNDLE_VERSION ${VERSION}
-  MACOSX_FRAMEWORK_IDENTIFIER org.nativescript.nativescript-${BRIDGE_TARGET_PLATFORM}
+  MACOSX_FRAMEWORK_IDENTIFIER org.nativescript.nativescript-${TARGET_PLATFORM}
+  PUBLIC_HEADER "include/NativeScript.h"
 )
 
 if (BUILD_FRAMEWORK)

deno.json

@@ -11,10 +11,10 @@
   "tasks": {
     "build-libffi": "deno run -A scripts/build_libffi.ts",
     "build": "deno run -A scripts/build.ts",
-    "bench": "node examples/main.js",
-    "deno": "../deno/target/release/deno run -A",
+
     "bundle": "deno run -A scripts/bundler.ts",
     "open-bundle": "open \"NativeScript for macOS.app\"",
+
     "metagen": "deno run -A scripts/metagen.ts",
     "build-metagen": "cd metadata && deno task build"
   },

include/NativeScript.h

@@ -0,0 +1,6 @@
+#ifndef NATIVESCRIPT_H
+#define NATIVESCRIPT_H
+
+extern "C" void objc_bridge_init(void *env, const char *metadata_path);
+
+#endif /* NATIVESCRIPT_H */

include/ObjCBridge.h

@@ -10,6 +10,7 @@
 #include "Struct.h"
 #include "TypeConv.h"
 #include "js_native_api.h"
+#include "NativeScript.h"
 #include "objc/runtime.h"
 #include <dlfcn.h>
 #include <map>
@@ -19,7 +20,6 @@
 #include <unordered_map>
 #include <unordered_set>
 
-extern "C" void objc_bridge_init(napi_env env, const char *metadata_path);
 extern "C" napi_value napi_register_module_v1(napi_env env, napi_value exports);
 
 using namespace metagen;

metadata/metadata.ios.nsmd

@@ -7107,6 +7107,10 @@ declare class NSData extends NSObject implements NSCopying, NSMutableCopying, NS
 
   base64Encoding(): string;
 
+  static dataWithContentsOfFileCompletion(path: string, callback: (p1: NSData) => void): void;
+
+  writeToFileAtomicallyCompletion(path: string, atomically: boolean, callback: () => void): void;
+
   copyWithZone(zone: interop.PointerConvertible): interop.Object;
 
   mutableCopyWithZone(zone: interop.PointerConvertible): interop.Object;
@@ -9785,6 +9789,10 @@ declare class NSFileHandle extends NSObject implements NSSecureCoding {
 
   closeFile(): void;
 
+  appendDataCompletion(data: NSData, callback: (p1: NSError) => void): void;
+
+  static fileHandleWithDataCompletion(path: string, data: NSData, callback: (p1: NSFileHandle, p2: NSError) => void): void;
+
   static readonly supportsSecureCoding: boolean;
 
   encodeWithCoder(coder: NSCoder): void;
@@ -11510,6 +11518,10 @@ declare class NSString extends NSObject implements NSCopying, NSMutableCopying,
 
   static localizedUserNotificationStringForKeyArguments(key: string, arguments$: NSArray<interop.Object> | Array<interop.Object> | null): string;
 
+  static stringWithContentsOfFileEncodingCompletion(path: string, enc: number, callback: (p1: string, p2: NSError) => void): void;
+
+  writeToFileAtomicallyEncodingCompletion(path: string, atomically: boolean, enc: number, callback: (p1: NSError) => void): void;
+
   copyWithZone(zone: interop.PointerConvertible): interop.Object;
 
   mutableCopyWithZone(zone: interop.PointerConvertible): interop.Object;

packages/ios/types/Foundation.d.ts

@@ -132,6 +132,13 @@ declare interface NSObjectProtocol {
 declare class NSObjectProtocol extends NativeObject implements NSObjectProtocol {
 }
 
+declare interface NativeScriptEmbedderDelegate {
+  presentNativeScriptApp(vc: UIViewController): interop.Object;
+}
+
+declare class NativeScriptEmbedderDelegate extends NativeObject implements NativeScriptEmbedderDelegate {
+}
+
 declare class NSObject extends NativeObject implements NSObjectProtocol {
   static load(): void;
 
@@ -525,10 +532,30 @@ declare class NSObject extends NativeObject implements NSObjectProtocol {
   readonly debugDescription: string;
 }
 
+declare class NativeScriptEmbedder extends NSObject {
+  readonly delegate: NativeScriptEmbedderDelegate;
+
+  static sharedInstance(): NativeScriptEmbedder;
+}
+
 declare class OS_object extends NSObject {
   init(): this;
 }
 
+declare class NativeScriptUtils extends NSObject {
+  static getSystemFontWeightItalicSymbolicTraits(size: number, weight: number, italic: boolean, symbolicTraits: interop.Enum<typeof UIFontDescriptorSymbolicTraits>): UIFont;
+
+  static createUIFont(font: NSDictionary<interop.Object, interop.Object> | Record<interop.Object, interop.Object>): UIFont;
+
+  static createMutableStringWithDetails(details: NSDictionary<interop.Object, interop.Object> | Record<interop.Object, interop.Object>): NSMutableAttributedString;
+
+  static createMutableStringForSpanFontColorBackgroundColorTextDecorationBaselineOffset(text: string, font: UIFont, color: UIColor, backgroundColor: UIColor, textDecoration: string, baselineOffset: number): NSMutableAttributedString;
+
+  static scaleImageWidthHeightScaleFactor(image: UIImage, width: number, height: number, scaleFactor: number): UIImage;
+
+  static getImageDataFormatQuality(image: UIImage, format: string, quality: number): NSData;
+}
+
 declare class OS_os_workgroup extends OS_object {
   init(): this;
 }

packages/ios/types/Runtime.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="@nativescript/objc-node-api" />
+/// <reference path="./UIKit.d.ts" />
+
+declare const TNSWidgetsVersionNumber: number;
+
+declare const TNSWidgetsVersionString: interop.Pointer;
+
+declare function __tns_uptime(): number;
+
+declare function __nslog(message: string): void;
+
+declare class TNSLabel extends UILabel {
+  padding: UIEdgeInsets;
+
+  borderThickness: UIEdgeInsets;
+}
+

packages/ios/types/TNSWidgets.d.ts

@@ -7866,6 +7866,16 @@ declare class UIView extends UIResponder implements NSCoding, UIAppearance, UIAp
 
   drawRectForViewPrintFormatter(rect: CGRect, formatter: UIViewPrintFormatter): void;
 
+  passThroughParent(): boolean;
+
+  setPassThroughParent(passThroughParent: boolean): void;
+
+  nativeScriptSetTextDecorationAndTransformTextDecorationLetterSpacingLineHeight(text: string, textDecoration: string, letterSpacing: number, lineHeight: number): void;
+
+  nativeScriptSetFormattedTextDecorationAndTransformLetterSpacingLineHeight(details: NSDictionary<interop.Object, interop.Object> | Record<interop.Object, interop.Object>, letterSpacing: number, lineHeight: number): void;
+
+  nativeScriptSetFormattedTextStrokeColor(width: number, color: UIColor): void;
+
   encodeWithCoder(coder: NSCoder): void;
 
   static appearance<This extends abstract new (...args: any) => any>(this: This): InstanceType<This>;
@@ -19576,6 +19586,14 @@ declare class UIImage extends NSObject implements NSSecureCoding {
 
   readonly topCapHeight: number;
 
+  static tns_safeDecodeImageNamedCompletion(name: string, callback: (p1: UIImage) => void): void;
+
+  static tns_safeImageNamed(name: string): UIImage;
+
+  static tns_decodeImageWithDataCompletion(data: NSData, callback: (p1: UIImage) => void): void;
+
+  static tns_decodeImageWidthContentsOfFileCompletion(file: string, callback: (p1: UIImage) => void): void;
+
   static readonly supportsSecureCoding: boolean;
 
   encodeWithCoder(coder: NSCoder): void;