finish addMethod API

Author: DjDeveloperr

examples/appkit.js

@@ -13,40 +13,10 @@ export class ApplicationDelegate extends NSObject {
   }
 
   running = true;
-
   /**
-   * @param {NSNotification} _notification
+   * @type {Window | null}
    */
-  applicationDidFinishLaunching(_notification) {
-    this.window = Window.new();
-
-    NSApp.activateIgnoringOtherApps(false);
-
-    NSApp.stop(this);
-
-    const loop = () => {
-      const event = NSApp.nextEventMatchingMaskUntilDateInModeDequeue(
-        NSEventMask.Any,
-        null,
-        "kCFRunLoopDefaultMode",
-        true,
-      );
-
-      if (event != null) {
-        NSApp.sendEvent(event);
-      }
-
-      if (this.running) {
-        setTimeout(loop, 10);
-      }
-    };
-
-    setTimeout(loop, 0);
-
-    setTimeout(() => {
-      console.log("[setTimeout] after 2 seconds");
-    }, 2000);
-  }
+  window = null;
 
   /**
    * @param {NSNotification} _notification
@@ -167,5 +137,46 @@ export class Window extends NSWindow {
 const NSApp = NSApplication.sharedApplication;
 
 NSApp.setActivationPolicy(NSApplicationActivationPolicy.Regular);
-NSApp.delegate = ApplicationDelegate.new();
+
+// Class is lazily initialized when first used
+const delegate = ApplicationDelegate.new();
+
+// Add a method to the delegate class after it has been registered with the runtime,
+// dynamically.
+interop.addMethod(
+  ApplicationDelegate,
+  function applicationDidFinishLaunching(_notification) {
+    this.window = Window.new();
+
+    NSApp.activateIgnoringOtherApps(false);
+
+    NSApp.stop(this);
+
+    const loop = () => {
+      const event = NSApp.nextEventMatchingMaskUntilDateInModeDequeue(
+        NSEventMask.Any,
+        null,
+        "kCFRunLoopDefaultMode",
+        true,
+      );
+
+      if (event != null) {
+        NSApp.sendEvent(event);
+      }
+
+      if (this.running) {
+        setTimeout(loop, 10);
+      }
+    };
+
+    setTimeout(loop, 0);
+
+    setTimeout(() => {
+      console.log("[setTimeout] after 2 seconds");
+    }, 2000);
+  },
+);
+
+NSApp.delegate = delegate;
+
 NSApp.run();

lib/types.d.ts

@@ -93,6 +93,16 @@ declare global {
 
     export type Enum<_T extends Record<string, number>> = number;
 
+    export function addMethod<
+      T extends abstract new (...args: unknown[]) => unknown,
+    >(
+      constructor: T,
+      method: (this: InstanceType<T>, ...args: unknown[]) => unknown,
+    ): void;
+    export function addProtocol(
+      constructor: unknown,
+      protocol: PointerObject,
+    ): void;
     export function adopt(ptr: Pointer): Pointer;
     export function free(ptr: Pointer): void;
     export function sizeof(obj: unknown): number;

src/ClassBuilder.mm

@@ -109,7 +109,7 @@
           !findMethod->second.classMethod) {
         return &findMethod->second.methodOrGetter;
       }
-      // return processProtocols(protocol->protocols);
+      return processProtocols(protocol->protocols);
     }
     return (MethodDescriptor *)nullptr;
   };

src/Closure.mm

@@ -34,7 +34,11 @@ void JSIMP(ffi_cif *cif, void *ret, void *args[], void *data) {
   }
 
   napi_value func;
-  napi_get_named_property(env, thisArg, closure->propertyName.c_str(), &func);
+  if (closure->func != nullptr) {
+    func = get_ref_value(env, closure->func);
+  } else {
+    napi_get_named_property(env, thisArg, closure->propertyName.c_str(), &func);
+  }
 
   napi_valuetype funcType;
   napi_typeof(env, func, &funcType);

src/Interop.mm

@@ -253,22 +253,29 @@ napi_value interop_addMethod(napi_env env, napi_callback_info info) {
     napi_throw_error(env, nullptr, "Invalid class");
     return nullptr;
   }
+  ObjCBridgeState *bridgeState = ObjCBridgeState::InstanceData(env);
+  builder = (ClassBuilder *)bridgeState->classesByPointer[(id)builder];
 
   napi_value name;
   napi_get_named_property(env, argv[1], "name", &name);
 
-  static char funcNameBuf[512];
-  napi_get_value_string_utf8(env, name, funcNameBuf, 512, nullptr);
-  std::string funcName = funcNameBuf;
+  if (builder->isFinal) {
+    static char funcNameBuf[512];
+    napi_get_value_string_utf8(env, name, funcNameBuf, 512, nullptr);
+    std::string funcName = funcNameBuf;
 
-  MethodDescriptor *desc = builder->lookupMethodDescriptor(funcName);
-  if (desc == nullptr) {
-    napi_throw_error(env, nullptr, "Invalid method, descriptor not found");
-    return nullptr;
-  }
-
-  builder->addMethod(funcName, desc, name, argv[1]);
+    MethodDescriptor *desc = builder->lookupMethodDescriptor(funcName);
+    if (desc == nullptr) {
+      napi_throw_error(env, nullptr, "Invalid method, descriptor not found");
+      return nullptr;
+    }
 
+    builder->addMethod(funcName, desc, name, argv[1]);
+  } else {
+    napi_set_property(env, get_ref_value(env, builder->prototype), name,
+                      argv[1]);
+  }
+  
   return nullptr;
 }
 
@@ -283,6 +290,8 @@ napi_value interop_addProtocol(napi_env env, napi_callback_info info) {
     napi_throw_error(env, nullptr, "Invalid class");
     return nullptr;
   }
+  ObjCBridgeState *bridgeState = ObjCBridgeState::InstanceData(env);
+  builder = (ClassBuilder *)bridgeState->classesByPointer[(id)builder];
 
   ObjCProtocol *proto = nullptr;
   napi_unwrap(env, argv[1], (void **)&proto);