chore: remove borrowed object

Author: DjDeveloperr

include/ObjCBridge.h

@@ -36,10 +36,6 @@ typedef enum ObjectOwnership {
   // we will call retain and release when the JS object is
   // garbage collected.
   kUnownedObject,
-  // The object is not owned by JS land, but we will not call
-  // retain/release at all. This is useful for objects that
-  // passed to JS land as callback parameters.
-  kBorrowedObject,
 } ObjectOwnership;
 
 class ObjCBridgeState {

metadata/metadata.ios.nsmd

@@ -7093,6 +7093,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;
@@ -9787,6 +9791,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;
@@ -11512,6 +11520,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

@@ -7844,6 +7844,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>;
@@ -19516,6 +19526,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;

packages/ios/types/UIKit.d.ts

@@ -17,6 +17,7 @@
 /// <reference path="./QuartzCore.d.ts" />
 /// <reference path="./ModelIO.d.ts" />
 /// <reference path="./MetalKit.d.ts" />
+/// <reference path="./TNSWidgets.d.ts" />
 /// <reference path="./WebKit.d.ts" />
 /// <reference path="./CoreServices.d.ts" />
 /// <reference path="./Security.d.ts" />

packages/ios/types/index.d.ts

@@ -116,7 +116,7 @@ for (const framework of sdk.frameworks) {
 }
 
 // TODO: commit these files to the repo
-const withNativeScriptCore = false;
+const withNativeScriptCore = true;
 if(withNativeScriptCore){
   const customFrameworks = [
     "/Users/dj/Projects/NativeScript/packages/ui-mobile-base/dist/package/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework",

scripts/metagen.ts

@@ -65,12 +65,6 @@ void finalize_objc_object(napi_env /*env*/, void *data, void *hint) {
   bridgeState->unregisterObject(object);
 }
 
-void finalize_objc_object_borrowed(napi_env, void *data, void *hint) {
-  id object = static_cast<id>(data);
-  ObjCBridgeState *bridgeState = static_cast<ObjCBridgeState *>(hint);
-  bridgeState->objectRefs.erase(object);
-}
-
 napi_value ObjCBridgeState::getObject(napi_env env, id obj,
                                       napi_value constructor,
                                       ObjectOwnership ownership) {
@@ -128,11 +122,8 @@ void finalize_objc_object_borrowed(napi_env, void *data, void *hint) {
     napi_wrap(env, result, obj, nullptr, nullptr, nullptr);
 
     napi_ref ref = nullptr;
-    NAPI_GUARD(napi_add_finalizer(env, result, obj,
-                                  ownership == kBorrowedObject
-                                      ? finalize_objc_object_borrowed
-                                      : finalize_objc_object,
-                                  this, &ref)) {
+    NAPI_GUARD(napi_add_finalizer(env, result, obj, finalize_objc_object, this,
+                                  &ref)) {
       NAPI_THROW_LAST_ERROR
       return nullptr;
     }
@@ -142,6 +133,24 @@ void finalize_objc_object_borrowed(napi_env, void *data, void *hint) {
     if (ownership == kUnownedObject) {
       [obj retain];
     }
+// #if DEBUG
+    // napi_value global, Error, error, stack;
+    // napi_get_global(env, &global);
+    // napi_get_named_property(env, global, "Error", &Error);
+    // napi_new_instance(env, Error, 0, nullptr, &error);
+    // napi_get_named_property(env, error, "stack", &stack);
+
+    // size_t stackSize;
+    // napi_get_value_string_utf8(env, stack, nullptr, 0, &stackSize);
+    // char *stackStr = new char[stackSize + 1];
+    // napi_get_value_string_utf8(env, stack, stackStr, stackSize + 1, nullptr);
+
+    // NSString *str = [NSString stringWithFormat:@"Wrapped object <%s: %p> @ %ld # %s",
+    //       class_getName(cls), obj, [obj retainCount], stackStr];
+    // dbglog([str UTF8String]);
+
+    // delete[] stackStr;
+// #endif
   }
 
   return result;
@@ -297,6 +306,14 @@ napi_value findConstructorForObject(napi_env env, ObjCBridgeState *bridgeState,
 }
 
 void ObjCBridgeState::unregisterObject(id object) noexcept {
+// #if DEBUG
+  // NSString *string = [NSString stringWithFormat: @"Unregistering object <%s: %p> @ %ld # success: %d, finalized: %d",
+  //     class_getName(object_getClass(object)), object, [object retainCount],
+  //     (int)objectRefs.contains(object), (int)finalized];
+  
+  // dbglog([string UTF8String]);
+// #endif
+
   if (objectRefs.contains(object)) {
     objectRefs.erase(object);
     [object release];

src/Object.mm

@@ -878,8 +878,6 @@ napi_value toJS(napi_env env, void *value, uint32_t flags) override {
     ObjectOwnership ownership;
     if ((flags & kReturnOwned) != 0) {
       ownership = kOwnedObject;
-    } else if ((flags & kBlockParam) != 0) {
-      ownership = kBorrowedObject;
     } else {
       ownership = kUnownedObject;
     }
@@ -891,6 +889,7 @@ napi_value toJS(napi_env env, void *value, uint32_t flags) override {
       napi_get_null(env, &null);
       return null;
     }
+
     return object;
   }
 
@@ -1098,8 +1097,6 @@ void toNative(napi_env env, napi_value value, void *result, bool *shouldFree,
   napi_value toJS(napi_env env, void *value, uint32_t flags) override {
     Class cls = *((Class *)value);
 
-    NSLog(@"class toJS: %@", cls);
-
     if (cls == nullptr) {
       return nullptr;
     }