fix(Bridge): Native bridge is expected to normalize module names

rozele · rozele · commit 168c8e4fecd1 · 2016-10-13T13:32:44.000-04:00
A long time ago, before we had the `windows` platform option working, we were matching iOS names (e.g., RK*, RCT*) for modules. These names haven't changed, but the requirements for normalizing these prefixes away has.
diff --git a/ReactWindows/ReactNative/Bridge/NativeModuleRegistry.cs b/ReactWindows/ReactNative/Bridge/NativeModuleRegistry.cs
@@ -291,13 +291,30 @@ public NativeModuleRegistry Build()
 
                 foreach (var module in _modules.Values)
                 {
-                    var moduleDef = new ModuleDefinition(module.Name, module);
+                    var name = NormalizeModuleName(module.Name);
+                    var moduleDef = new ModuleDefinition(name, module);
                     moduleTable.Add(moduleDef);
                     moduleInstances.Add(module.GetType(), module);
                 }
 
                 return new NativeModuleRegistry(moduleTable, moduleInstances);
             }
+
+            private static string NormalizeModuleName(string name)
+            {
+                if (name.StartsWith("RCT"))
+                {
+                    return name.Substring(3);
+                }
+                else if (name.StartsWith("RK"))
+                {
+                    return name.Substring(2);
+                }
+                else
+                {
+                    return name;
+                }
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -291,13 +291,30 @@ public NativeModuleRegistry Build()`
`291`	`291`
`292`	`292`	`foreach (var module in _modules.Values)`
`293`	`293`	`{`
`294`		`- var moduleDef = new ModuleDefinition(module.Name, module);`
	`294`	`+ var name = NormalizeModuleName(module.Name);`
	`295`	`+ var moduleDef = new ModuleDefinition(name, module);`
`295`	`296`	`moduleTable.Add(moduleDef);`
`296`	`297`	`moduleInstances.Add(module.GetType(), module);`
`297`	`298`	`}`
`298`	`299`
`299`	`300`	`return new NativeModuleRegistry(moduleTable, moduleInstances);`
`300`	`301`	`}`
	`302`	`+`
	`303`	`+ private static string NormalizeModuleName(string name)`
	`304`	`+ {`
	`305`	`+ if (name.StartsWith("RCT"))`
	`306`	`+ {`
	`307`	`+ return name.Substring(3);`
	`308`	`+ }`
	`309`	`+ else if (name.StartsWith("RK"))`
	`310`	`+ {`
	`311`	`+ return name.Substring(2);`
	`312`	`+ }`
	`313`	`+ else`
	`314`	`+ {`
	`315`	`+ return name;`
	`316`	`+ }`
	`317`	`+ }`
`301`	`318`	`}`
`302`	`319`	`}`
`303`	`320`	`}`