Update method forwarding.

kishikawakatsumi · kishikawakatsumi · commit 0fb6d2138eab · 2014-01-03T16:07:06.000+09:00
diff --git a/Classes/JSBScriptingSupport.m b/Classes/JSBScriptingSupport.m
@@ -169,9 +169,34 @@ static void setReturnValue(JSValue *value, NSInvocation *invocation)
     }
 }
 
+static void setupForwardingImplementations(Class cls, JSValue *functions)
+{
+    unsigned int count = 0;
+    Method *methods = class_copyMethodList(cls, &count);
+    for (unsigned int i = 0; i < count; i++) {
+        Method m = methods[i];
+        struct objc_method_description *description = method_getDescription(m);
+        
+        NSString *propertyName = propertyNameFromSelector(description->name);
+        JSValue *function = functions[propertyName];
+        if (!function.isUndefined) {
+            method_setImplementation(m, _objc_msgForward);
+        }
+    }
+    if (methods) {
+        free(methods);
+    }
+    
+    Class superClass = class_getSuperclass(cls);
+    if (superClass) {
+        setupForwardingImplementations(superClass, functions);
+    }
+}
+
 static void forwardInvocation(id self, SEL _cmd, NSInvocation *invocation)
 {
-    JSValue *value = globalContext[NSStringFromClass([self class])][propertyNameFromSelector(invocation.selector)];
+    NSString *propertyName = propertyNameFromSelector(invocation.selector);
+    JSValue *value = globalContext[NSStringFromClass([self class])][@"instanceMembers"][propertyName];
     
     NSArray *arguments = extractArguments(invocation);
     JSValue *returnValue = [value callWithArguments:arguments];
@@ -195,7 +220,9 @@ static void forwardInvocation(id self, SEL _cmd, NSInvocation *invocation)
 
 static BOOL respondsToSelector(id self, SEL _cmd, SEL selector)
 {
-    JSValue *value = globalContext[NSStringFromClass([self class])][propertyNameFromSelector(selector)];
+    NSString *propertyName = propertyNameFromSelector(selector);
+    JSValue *value = globalContext[NSStringFromClass([self class])][@"instanceMembers"][propertyName];
+    
     return !value.isUndefined;
 }
 
@@ -210,18 +237,18 @@ + (void)initialize
             
         };
         
+        [globalContext addScriptingSupport:@"Foundation"];
+        [globalContext addScriptingSupport:@"UIKit"];
+        [globalContext addScriptingSupport:@"QuartzCore"];
+        
+        globalContext[@"JSB"] = [JSBScriptingSupport class];
         [globalContext evaluateScript:
          @"JSB.Class = {};"
          @""
          @"JSB.Class.define = function(declaration, instanceMembers, staticMembers) {"
          @"  JSB.defineClass(declaration, instanceMembers, staticMembers);"
          @"};"
          ];
-        globalContext[@"JSB"] = [JSBScriptingSupport class];
-        
-        [globalContext addScriptingSupport:@"Foundation"];
-        [globalContext addScriptingSupport:@"UIKit"];
-        [globalContext addScriptingSupport:@"QuartzCore"];
     });
 }
 
@@ -258,6 +285,12 @@ + (void)defineClass:(NSString *)declaration
     }
     
     Class cls = objc_allocateClassPair(NSClassFromString(parentClassName), className.UTF8String, 0);
+    objc_registerClassPair(cls);
+    
+    Class superClass = class_getSuperclass(cls);
+    if (superClass) {
+        setupForwardingImplementations(superClass, instanceMembers);
+    }
     
     NSString *types;
     BOOL result;
@@ -276,15 +309,12 @@ + (void)defineClass:(NSString *)declaration
     }
     
     class_addProtocol(cls, @protocol(JSBNSObject));
+#if DEBUG
     class_addProtocol(cls, @protocol(JSBScriptingSupport));
-    objc_registerClassPair(cls);
+#endif
     
     globalContext[className] = cls;
-    
-    for (NSString *key in instanceMembers.toDictionary.allKeys) {
-        JSValue *instanceMember = instanceMembers[key];
-        globalContext[className][key] = instanceMember;
-    }
+    globalContext[className][@"instanceMembers"] = instanceMembers;
 }
 
 + (void)dump:(id)object
diff --git a/Examples/UICatalog/UICatalog/AppDelegate.h b/Examples/UICatalog/UICatalog/AppDelegate.h
@@ -10,4 +10,6 @@
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
 
+@property (nonatomic) UIWindow *window;
+
 @end
diff --git a/Examples/UICatalog/UICatalog/main.js b/Examples/UICatalog/UICatalog/main.js
@@ -1,12 +1,4 @@
-// var window = UIWindow.alloc().initWithFrame(UIScreen.mainScreen().bounds);
-// window.backgroundColor = UIColor.whiteColor();
-
-// var navigationController = UINavigationController.new();
-// window.rootViewController = navigationController;
-
-// window.makeKeyAndVisible();
-
-JSB.Class.define('JSBTableViewDataSource : NSObject <UITableViewDataSource, UITableViewDelegate>',
+JSB.Class.define('MainViewController : UITableViewController',
 {
  numberOfSectionsInTableView: function (tableView) {
    return 2;
@@ -23,17 +15,14 @@ JSB.Class.define('JSBTableViewDataSource : NSObject <UITableViewDataSource, UITa
 
 });
 
-var dataSource = JSBTableViewDataSource.new();
-
-var window = UIWindow.new();
-window.frame = UIScreen.mainScreen().bounds;
+var window = UIWindow.alloc().initWithFrame(UIScreen.mainScreen().bounds);
 window.backgroundColor = UIColor.whiteColor();
 
-var tableView = UITableView.new();
-tableView.frame = window.bounds;
-tableView.rowHeight = 44;
-tableView.dataSource = dataSource;
+var navigationController = UINavigationController.new();
+
+var mainViewController = MainViewController.new();
+navigationController.viewControllers = [mainViewController];
 
-window.addSubview(tableView);
+window.rootViewController = navigationController;
 
 window.makeKeyAndVisible();
diff --git a/Project/JavaScriptBridge/JavaScriptBridge/JSBAppDelegate.m b/Project/JavaScriptBridge/JavaScriptBridge/JSBAppDelegate.m
@@ -7,15 +7,26 @@
 //
 
 #import "JSBAppDelegate.h"
+#import "JavaScriptBridge.h"
 
 @implementation JSBAppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-    
-    self.window.backgroundColor = [UIColor whiteColor];
-    [self.window makeKeyAndVisible];
+    JSContext *context = [JSBScriptingSupport globalContext];
+    [context evaluateScript:
+     @"var window = UIWindow.alloc().initWithFrame(UIScreen.mainScreen().bounds);"
+     @"window.backgroundColor = UIColor.whiteColor();"
+     @""
+     @"var navigationController = UINavigationController.new();"
+     @""
+     @"var tableViewController = UITableViewController.new();"
+     @"navigationController.viewControllers = [tableViewController];"
+     @""
+     @"window.rootViewController = navigationController;"
+     @""
+     @"window.makeKeyAndVisible();"
+     ];
     
     return YES;
 }
