Merge pull request #17 from NativeScript/pete/fix-conflicting-namespaces

Fix conflicting top-level namespace hijacking

Author: petekanev

dts-generator/src/main/java/com/telerik/dts/DtsApi.java

@@ -33,13 +33,16 @@ public class DtsApi {
     private Set<String> baseMethodNames;
     private List<Method> baseMethods;
     private Map<String, Method> mapNameMethod;
+    private Map<String, String> aliasedTypes;
+    private String[] namespaceParts;
     private int indent = 0;
 
-
     public DtsApi() {
         this.indent = 0;
 
         overrideFieldComparator();
+
+        this.aliasedTypes = new HashMap<>();
     }
 
     public String generateDtsContent(List<JavaClass> javaClasses) {
@@ -64,6 +67,11 @@ public String generateDtsContent(List<JavaClass> javaClasses) {
                     continue;
                 }
 
+                // check if processed class hijacks a namespace
+                // TODO: optimize
+
+                this.namespaceParts = currentFileClassname.split("\\.");
+
                 boolean isInterface = currClass.isInterface();
                 boolean isAbstract = currClass.isAbstract();
 
@@ -166,13 +174,48 @@ private String getExtendsLine(JavaClass superClass, List<JavaClass> interfaces)
             implementsSegmentSb.append(" implements ");
 
             for (JavaClass clazz : interfaces) {
-                implementsSegmentSb.append(clazz.getClassName().replaceAll("\\$", "\\.") + ", ");
+                String implementedInterface = clazz.getClassName().replaceAll("\\$", "\\.");
+                if(!typeBelongsInCurrentTopLevelNamespace(implementedInterface)) {
+                    implementedInterface = getAliasedClassName(implementedInterface);
+                }
+
+                implementsSegmentSb.append(implementedInterface + ", ");
             }
 
             implementsSegment = implementsSegmentSb.substring(0, implementsSegmentSb.lastIndexOf(","));
+
+        }
+
+        String extendedClass = superClass.getClassName().replaceAll("\\$", "\\.");
+        if(!typeBelongsInCurrentTopLevelNamespace(extendedClass)) {
+            extendedClass = getAliasedClassName(extendedClass);
+        }
+
+        return " extends " + extendedClass + implementsSegment;
+    }
+
+    private String getAliasedClassName(String className) {
+        String aliasedType = aliasedTypes.get(className);
+        if (aliasedType == null) {
+            aliasedType = mangleClassname(className);
+            aliasedTypes.put(className, aliasedType);
+
+            sbHeaders.append("import ");
+            sbHeaders.append(aliasedType);
+            sbHeaders.append(" = ");
+            sbHeaders.append(className);
+            sbHeaders.appendln(";");
         }
 
-        return " extends " + superClass.getClassName().replaceAll("\\$", "\\.") + implementsSegment;
+        return aliasedType;
+    }
+
+    private boolean typeBelongsInCurrentTopLevelNamespace(String className) {
+        return className.startsWith(this.namespaceParts[0] + ".");
+    }
+
+    private String mangleClassname(String className) {
+        return className.replaceAll("\\.", "");
     }
 
     private int closePackage(JavaClass prevClass, JavaClass currClass) {
@@ -641,8 +684,12 @@ private void convertToTypeScriptType(Type type, StringBuilder tsType) {
                 typeName = typeName.replaceAll("\\$", "\\.");
             }
 
-            // TODO: Pete:
-            tsType.append(typeName);
+            if (!typeBelongsInCurrentTopLevelNamespace(typeName) && !typeName.startsWith("java.util.function.")) {
+                tsType.append(getAliasedClassName(typeName));
+            } else {
+                tsType.append(typeName);
+            }
+
             addReference(type);
         } else {
             throw new RuntimeException("Unhandled type=" + type.getSignature());