collections appear to be working correctly

Author: WolfpackWilson

pyvba/browser.py

@@ -102,7 +102,7 @@ def _generate(self):
                 if value.type not in visited:
                     visited[value.type] = []
 
-                if value not in visited[value.type]:
+                if not any(map(lambda item: value.cf(item), visited[value.type])):
                     visited[value.type].append(value)
 
     def browse_all(self):
@@ -112,9 +112,20 @@ def browse_all(self):
 
         # populate child browsers if not already visited
         for name, value in self._all.items():
-            if isinstance(value, Browser) and value not in visited[value.type]:
+            if isinstance(value, Browser) and not any(map(lambda item: value.cf(item), visited[value.type])):
                 name.browse_all()
 
+    def cf(self, other) -> bool:
+        """Comparison alternative to __eq__.
+
+        The comparison avoids checking any Viewer instances and compares the values of the standard objects within.
+        """
+        return super().cf(other) and all([
+            a == b
+            for a, b in zip(self._all.values(), other.all.values())
+            if not isinstance(a, (Viewer, FunctionViewer, list)) and not isinstance(b, (Viewer, FunctionViewer, list))
+        ])
+
     def regen(self):
         """Regenerate the `all` property."""
         self._all = {}
@@ -134,6 +145,10 @@ def _generate(self):
         super()._generate()
         self._all['Item'] = self._items
 
+        # generate the Item list
+        if len(self._items) > 0 and isinstance(self._items[0], Browser):
+            _ = [item.all for item in self._items]
+
         # add items to the visited dictionary
         for value in self._all['Item']:
             if isinstance(value, Viewer):
@@ -142,3 +157,4 @@ def _generate(self):
 
                 if value not in visited[value.type]:
                     visited[value.type].append(value)
+

pyvba/export.py

@@ -150,7 +150,7 @@ def _generate_tag(self, elem, tabs: int = 0, **kwargs) -> str:
             tag = XMLExport.Tag(elem.name)
 
             # check if in stack already
-            if elem in stack:
+            if any(map(lambda obj: elem.cf(obj), stack)):
                 return tag.enclose('BrowserObject: See ancestors', tabs)
             else:
                 stack.append(elem)
@@ -384,7 +384,7 @@ def _generate_vba(self, elem, tabs: int = 0, **kwargs) -> str:
 
         if isinstance(elem, Browser):
             # check if in stack already
-            if elem in stack:
+            if any(map(lambda obj: elem.cf(obj), stack)):
                 return "\t" * tabs + f"{{ \"{self.json_encode(elem.name)}\": \"BrowserObject: See ancestors\" }},\n"
             else:
                 stack.append(elem)

pyvba/viewer.py

@@ -90,18 +90,27 @@ def getattr(self, item):
 
         return self.gettype(obj, item)
 
+    def cf(self, other) -> bool:
+        """Comparison alternative to __eq__.
+
+        The comparison avoids checking any Viewer instances and compares the values of the standard objects within.
+        """
+        if type(self) != type(other):
+            return False
+        return self._type == other.type and self._name == other.name and self._objects == other.objects
+
     @property
     def com(self):
         """Return the COM object."""
         return self._com
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Return the name of the COM object."""
         return self._name
 
     @property
-    def type(self):
+    def type(self) -> str:
         """Return the type of the object within the COM object."""
         return self._type
 
@@ -121,7 +130,7 @@ def methods(self) -> list:
         return self._methods
 
     @property
-    def errors(self):
+    def errors(self) -> dict:
         """Return a dictionary in format {obj: Error}."""
         return self._errors