fixed old and important bug that didn't show packages named same as classes

Author: nikitaeverywhere

cache/projectTemplate.xml

@@ -4,7 +4,7 @@
 <Description>
 Cache UML Explorer vX.X.X/*build.replace:pkg.version*/
 Class contains methods that return structured classes/packages data.</Description>
-<TimeChanged>63843,54972.140109</TimeChanged>
+<TimeChanged>63843,83200.096917</TimeChanged>
 <TimeCreated>63653,67019.989197</TimeCreated>
 
 <Method name="getAllNamespacesList">
@@ -45,33 +45,34 @@ Returns structured class tree with all classes available in current namespace</D
     set level = 1
     do objects.SetAt(resp, level)
 
-
     do classes.Execute()
     while (classes.Next()) {
         set name = classes.Data("Name")
         if ($EXTRACT(name, 1, 1) = "%") && ($NAMESPACE '= "%SYS") { continue }
         set parts = $LISTFROMSTRING(name, ".")
-        set i = 0
-        while (i < $LISTLENGTH(parts)) && ($LISTGET(lastParts, i + 1) = $LISTGET(parts, i + 1)) {
-            set i = i + 1
+        set level = 1
+        while ((level < $LISTLENGTH(parts)) && ($LISTGET(lastParts, level) = ("/"_$LISTGET(parts, level)))) {
+            set level = level + 1
         }
-        set level = i + 1
         set resp = objects.GetAt(level)
         if (resp="") {
             set resp = ##class(%ZEN.proxyObject).%New()
-            do objects.GetAt(level - 1).%DispatchSetProperty($LISTGET(parts, level - 1), resp)
+            do objects.GetAt(level - 1).%DispatchSetProperty("/" _ $LISTGET(parts, level - 1), resp)
             do objects.SetAt(resp, level)
         }
         while ($LISTLENGTH(parts) > level) {
             set level = level + 1
             set resp = ##class(%ZEN.proxyObject).%New()
-            do objects.GetAt(level - 1).%DispatchSetProperty($LISTGET(parts, level - 1), resp)
+            do objects.GetAt(level - 1).%DispatchSetProperty("/" _ $LISTGET(parts, level - 1), resp)
             do objects.SetAt(resp, level)
         }
         if ($LISTLENGTH(parts) = level) {
             do resp.%DispatchSetProperty($LISTGET(parts, level), classes.Data("Hidden"))
         }
         set lastParts = parts
+        for i=1:1:$LISTLENGTH(lastParts)-1 {
+            set $LIST(lastParts, i) = "/"_$LISTGET(lastParts, i)
+        }
     }
 
     quit objects.GetAt(1)
@@ -96,18 +97,25 @@ Return structured data about class.</Description>
     set oQueries = ##class(%ZEN.proxyObject).%New()
     set oIndices = ##class(%ZEN.proxyObject).%New()
 
-    set oClass.NAMESPACE = $NAMESPACE
-    set oClass.SYSTEM = classDefinition.System
-    set oClass.PROCEDUREBLOCK = classDefinition.ProcedureBlock
-    set oClass.ABSTRACT = classDefinition.Abstract
-    set oClass.FINAL = classDefinition.Final
-    set oClass.HIDDEN = classDefinition.Hidden
-    set oClass.classType = classDefinition.ClassType
-    set oClass.serverOnly = classDefinition.ServerOnly // -
     set oClass.isDataType = classDefinition.ClientDataTypeIsDefined()
+    set oClass.isOdbcType = classDefinition.OdbcTypeIsDefined()
+    set oClass.isSoapBindingStyle = classDefinition.SoapBindingStyleIsDefined()
+    set oClass.isSoapBodyUse = classDefinition.SoapBodyUseIsDefined()
+    set oClass.isSqlCategory = classDefinition.SqlCategoryIsDefined()
+
+    set props = ##class(%Dictionary.ClassDefinition).%OpenId("%Dictionary.ClassDefinition")
+    for j=1:1:props.Properties.Count() {
+        set pname = props.Properties.GetAt(j).Name
+        set:((pname '= "parent")
+             && ('props.Properties.GetAt(j).Private)
+             && ('$IsObject($PROPERTY(classDefinition, pname)))) $PROPERTY(oClass, pname) = $PROPERTY(classDefinition, pname)
+    }
+    if (oClass.TimeChanged) { set oClass.TimeChanged = $zdatetime(oClass.TimeChanged) }
+    if (oClass.TimeCreated) { set oClass.TimeCreated = $zdatetime(oClass.TimeCreated) }
 
+    set oClass.Super = "" // do not quit with super at this moment
     if (oData.restrictPackage) && ('..inPackage(oData.basePackageName, package)) quit oClass
-    set oClass.super = ..correctInheritance(oData, classDefinition, package)
+    set oClass.Super = ..correctInheritance(oData, classDefinition, package) // now expand super names
 
     set oClass.properties = oProperties
     set count = classDefinition.Properties.Count()
@@ -185,7 +193,7 @@ Return structured data about class.</Description>
         do oIndices.%DispatchSetProperty(ind.Name, oProp)
     }
 
-    do ..collectInheritance(oData, oClass.super)
+    do ..collectInheritance(oData, oClass.Super)
 
     quit oClass
 ]]></Implementation>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CacheUMLExplorer",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "An UML Class explorer for InterSystems Caché",
   "directories": {
     "test": "test"

web/js/ClassTree.js

@@ -186,13 +186,18 @@ ClassTree.prototype.updateTree = function (treeObject, doNotChangeRoot) {
 
     };
 
+    var getRealName = function (modName) {
+        modName = modName + "";
+        return modName.slice((modName || "")[0] === "/" ? 1 : 0, modName.length);
+    };
+
     var build = function (rootElement, object, path, level) {
 
         var i, element, rec,
             arr = [];
 
         for (i in object) {
-            arr.push({ name: i, val: object[i] });
+            arr.push({ name: getRealName(i), val: object[i] });
         }
 
         arr.sort(function (a, b) {
@@ -209,7 +214,7 @@ ClassTree.prototype.updateTree = function (treeObject, doNotChangeRoot) {
                     path.join("."),
                     level
                 )) {
-                build(rec, element.val, path.concat([element.name]), level + 1);
+                build(rec, element.val, path.concat([getRealName(element.name)]), level + 1);
             }
         }