Add force_instance_methods; rename shortcut funcs

Refactor macOS shortcut parsing helpers to use more specific names (e.g. ToLower -> ShortcutToLower, SplitAccelerator -> SplitShortcutAccelerator, ParseAcceleratorTokens -> ParseShortcutAcceleratorTokens, ParseAcceleratorMac -> ParseMacShortcutAccelerator) and update their call sites. Also add a new TypeMapper option force_instance_methods (loaded from config) and honor it when mapping methods by computing a method key and forcing instance dispatch (adjusting static and needs_instance_handle) for listed methods.

Author: lijy91

src/platform/macos/shortcut_manager_macos.mm

@@ -14,13 +14,13 @@
 namespace nativeapi {
 namespace {
 
-std::string ToLower(std::string value) {
+std::string ShortcutToLower(std::string value) {
   std::transform(value.begin(), value.end(), value.begin(),
                  [](unsigned char ch) { return static_cast<char>(std::tolower(ch)); });
   return value;
 }
 
-std::vector<std::string> SplitAccelerator(const std::string& accelerator) {
+std::vector<std::string> SplitShortcutAccelerator(const std::string& accelerator) {
   std::vector<std::string> parts;
   std::string current;
   for (char ch : accelerator) {
@@ -39,19 +39,19 @@
   return parts;
 }
 
-bool ParseAcceleratorTokens(const std::string& accelerator,
-                            std::vector<std::string>& modifiers,
-                            std::string& key_token) {
+bool ParseShortcutAcceleratorTokens(const std::string& accelerator,
+                                    std::vector<std::string>& modifiers,
+                                    std::string& key_token) {
   modifiers.clear();
   key_token.clear();
 
-  auto parts = SplitAccelerator(accelerator);
+  auto parts = SplitShortcutAccelerator(accelerator);
   if (parts.empty()) {
     return false;
   }
 
   for (auto& part : parts) {
-    std::string token = ToLower(part);
+    std::string token = ShortcutToLower(part);
     if (token == "ctrl" || token == "control" || token == "alt" || token == "shift" ||
         token == "cmd" || token == "command" || token == "super" || token == "meta" ||
         token == "cmdorctrl") {
@@ -67,13 +67,15 @@ bool ParseAcceleratorTokens(const std::string& accelerator,
   return !key_token.empty();
 }
 
-bool ParseAcceleratorMac(const std::string& accelerator, UInt32& modifiers, UInt32& keycode) {
+bool ParseMacShortcutAccelerator(const std::string& accelerator,
+                                 UInt32& modifiers,
+                                 UInt32& keycode) {
   modifiers = 0;
   keycode = 0;
 
   std::vector<std::string> modifier_tokens;
   std::string key_token;
-  if (!ParseAcceleratorTokens(accelerator, modifier_tokens, key_token)) {
+  if (!ParseShortcutAcceleratorTokens(accelerator, modifier_tokens, key_token)) {
     return false;
   }
 
@@ -235,7 +237,7 @@ bool RegisterShortcut(const std::shared_ptr<Shortcut>& shortcut) override {
 
     UInt32 modifiers = 0;
     UInt32 keycode = 0;
-    if (!ParseAcceleratorMac(shortcut->GetAccelerator(), modifiers, keycode)) {
+    if (!ParseMacShortcutAccelerator(shortcut->GetAccelerator(), modifiers, keycode)) {
       return false;
     }
 

tools/bindgen/codegen/context.py

@@ -225,6 +225,7 @@ def __init__(self, config: MappingConfig):
         options = config.options or {}
         self.symbol_overrides: Dict[str, str] = dict(options.get("symbol_overrides", {}) or {})
         self.singleton_classes = set(options.get("singleton_classes", []) or [])
+        self.force_instance_methods = set(options.get("force_instance_methods", []) or [])
         self.cstring_free_symbols: Dict[str, str] = dict(options.get("cstring_free_symbols", {}) or {})
         self.bridge_types: Dict[str, str] = dict(options.get("bridge_types", {}) or {})
         self.api_type_exact: Dict[str, str] = dict(
@@ -558,6 +559,9 @@ def map_method(self, ir_method: IRMethod, ir_class: IRClass) -> MappedMethod:
         api_return_type = self._api_type(return_type)
         call_symbol = self._symbol_for_method(ir_class, ir_method)
         params = [self.map_param(p) for p in ir_method.params]
+        class_key = ir_class.qualified_name or ir_class.name
+        method_key = f"{class_key}::{ir_method.name}"
+        force_instance = method_key in self.force_instance_methods
 
         call_args: List[str] = []
         for param in params:
@@ -600,8 +604,8 @@ def map_method(self, ir_method: IRMethod, ir_class: IRClass) -> MappedMethod:
             is_property=is_property,
             property_name=property_name,
             method_kind=ir_method.kind,
-            static=ir_method.static,
-            needs_instance_handle=not ir_method.static,
+            static=ir_method.static and not force_instance,
+            needs_instance_handle=(not ir_method.static) or force_instance,
             const=ir_method.const,
             access=ir_method.access,
             variadic=ir_method.variadic,