Merge pull request #1047 from NativeScript/trifonov/keyword-namespace

Add $ in front when the root namespace matches JS keyword

Author: vtrifonov

test-app/app/src/main/assets/app/tests/testMetadata.js

@@ -1,10 +1,10 @@
 describe("Tests metadata", function () {
-	
+
 	it("Can_access_protected_static_members_of_protected_interface", function () {
 		var accountType = android.provider.ContactsContract.SyncColumns.ACCOUNT_TYPE;
 		expect(accountType).toBeTruthy(accountType !== undefined);
 	});
-	
+
 	it("should access public methods of non-public base classes", function () {
 		var c = new com.tns.tests.MyTestDerivedClass();
 		var exceptionCaught = false;
@@ -23,10 +23,16 @@ describe("Tests metadata", function () {
 
 	it("should be able to access static fields declared in interface from implementing class", function () {
 		var c = new com.tns.tests.MyTestDerivedClass();
-		
+
 		var staticFieldFromInterface = android.app.Activity.TRIM_MEMORY_RUNNING_MODERATE;
 		var expected = 5;
-		
+
 		expect(staticFieldFromInterface).toBe(expected);
 	});
+
+	it("should be able to access keyword namespace bu prefixing the namespace with $", function () {
+		var keywordClass = new $in.tns.tests.JavascriptKeywordClass();
+		var expected = 5;
+		expect(keywordClass.getValue5()).toBe(expected);
+	});
 });

test-app/app/src/main/java/in/tns/tests/JavascriptKeywordClass.java

@@ -0,0 +1,8 @@
+package in.tns.tests;
+
+public class JavascriptKeywordClass {
+    public int getValue5()
+    {
+        return 5;
+    }
+}

test-app/runtime/src/main/cpp/MetadataNode.cpp

@@ -1619,7 +1619,12 @@ void MetadataNode::CreateTopLevelNamespaces(Isolate* isolate, const Local<Object
             auto node = GetOrCreateInternal(treeNode);
 
             auto packageObj = node->CreateWrapper(isolate);
-            global->Set(ArgConverter::ConvertToV8String(isolate, node->m_treeNode->name), packageObj);
+            string nameSpace = node->m_treeNode->name;
+            // if the namespaces matches a javascript keyword, prefix it with $ to avoid TypeScript and JavaScript errors
+            if(IsJavascriptKeyword(nameSpace)) {
+                nameSpace = "$" + nameSpace;
+            }
+            global->Set(ArgConverter::ConvertToV8String(isolate, nameSpace), packageObj);
         }
     }
 }
@@ -1640,25 +1645,29 @@ void MetadataNode::EnableProfiler(bool enableProfiler) {
     s_profilerEnabled = enableProfiler;
 }
 
-Local<Function> MetadataNode::Wrap(Isolate* isolate, const Local<Function>& function, const string& name, const string& origin, bool isCtorFunc) {
-    if (!s_profilerEnabled || name == "<init>") {
-        return function;
-    }
-
+bool MetadataNode::IsJavascriptKeyword(std::string word) {
     static set<string> keywords;
 
     if (keywords.empty()) {
         string kw[] { "abstract", "arguments", "boolean", "break", "byte", "case", "catch", "char", "class", "const", "continue", "debugger", "default", "delete", "do",
                       "double", "else", "enum", "eval", "export", "extends", "false", "final", "finally", "float", "for", "function", "goto", "if", "implements",
                       "import", "in", "instanceof", "int", "interface", "let", "long", "native", "new", "null", "package", "private", "protected", "public", "return",
                       "short", "static", "super", "switch", "synchronized", "this", "throw", "throws", "transient", "true", "try", "typeof", "var", "void", "volatile", "while", "with", "yield"
-                    };
+        };
 
         keywords = set<string>(kw, kw + sizeof(kw)/sizeof(kw[0]));
     }
 
+    return keywords.find(word) != keywords.end();
+}
+
+Local<Function> MetadataNode::Wrap(Isolate* isolate, const Local<Function>& function, const string& name, const string& origin, bool isCtorFunc) {
+    if (!s_profilerEnabled || name == "<init>") {
+        return function;
+    }
+
     string actualName = name;
-    while (keywords.find(actualName) != keywords.end()) {
+    while (IsJavascriptKeyword(actualName)) {
         actualName.append("_");
     }
 

test-app/runtime/src/main/cpp/MetadataNode.h

@@ -56,7 +56,6 @@ namespace tns {
         static MetadataNode* GetOrCreate(const std::string& className);
 
         static std::string GetTypeMetadataName(v8::Isolate* isolate, v8::Local<v8::Value>& value);
-
     private:
         struct MethodCallbackData;
 
@@ -70,6 +69,7 @@ namespace tns {
 
         MetadataNode(MetadataTreeNode* treeNode);
 
+        static bool IsJavascriptKeyword(std::string word);
         v8::Local<v8::Object> CreatePackageObject(v8::Isolate* isolate);
 
         v8::Local<v8::Function> GetConstructorFunction(v8::Isolate* isolate);