added collection objects to visited and removed __eq__ functionality

Author: WolfpackWilson

pyvba/__init__.py

@@ -1,3 +1,3 @@
 from .viewer import Viewer, FunctionViewer, CollectionViewer
 from .browser import Browser, CollectionBrowser
-from .export import XMLExport, JSONExport
+from .export import ExportStr, XMLExport, JSONExport

pyvba/browser.py

@@ -104,8 +104,6 @@ def _generate(self):
 
                 if value not in visited[value.type]:
                     visited[value.type].append(value)
-                else:
-                    self._all[name] = visited[value.type][visited[value.type].index(value)]
 
     def browse_all(self):
         """Populate the browser and all descendents of the browser."""
@@ -114,61 +112,33 @@ def browse_all(self):
 
         # populate child browsers if not already visited
         for name, value in self._all.items():
-            if type(value) is Browser and value not in visited[value.type]:
+            if isinstance(value, Browser) and value not in visited[value.type]:
                 name.browse_all()
 
-    def search(self, name: str, exact: bool = False):
-        """Return a dictionary in format {path: item} matching the name.
-
-        Search for all instances of a method or object containing a name.
-
-        Parameters
-        ----------
-        exact: bool
-            A flag that searches for exact matches.
-        name: str
-            The name of the attribute to search for.
-
-        Returns
-        -------
-        dict
-            The results of the search in format {path: item}.
-        """
-        ...
-
-    def goto(self, path: str):
-        """Retrieve an object at a given location.
-
-        Parameters
-        ----------
-        path: str
-            The location of the item delimited by '/'.
-
-        Examples
-        --------
-        `goto('Bodies/Item/1/HybridShapes/GetItem')` yields the 'GetItem' function.
-
-        """
-        ...
-
-    def view_vba(self) -> str:
-        """Returns a string that replicates the VBA tree."""
-        ...
-
     def regen(self):
         """Regenerate the `all` property."""
         self._all = {}
         self._generate()
 
 
 class CollectionBrowser(Browser, CollectionViewer):
-    def __init__(self, obj: CollectionViewer):
+    def __init__(self, obj):
         super().__init__(obj.com, obj.name, obj.parent)
-        self._items = [self.from_viewer(i) for i in self._items]
+        self._items = [self.from_viewer(item) for item in self._items]
 
     def __str__(self):
         return "<class 'CollectionBrowser'>: " + self._name
 
     def _generate(self):
+        global visited
         super()._generate()
         self._all['Item'] = self._items
+
+        # add items to the visited dictionary
+        for value in self._all['Item']:
+            if isinstance(value, Viewer):
+                if value.type not in visited:
+                    visited[value.type] = []
+
+                if value not in visited[value.type]:
+                    visited[value.type].append(value)

pyvba/export.py

@@ -435,8 +435,8 @@ def _generate_vba(self, elem, tabs: int = 0, **kwargs) -> str:
         return json
 
     def _generate_dict(self) -> str:
-        # collect visited data and obtain a copy
-        """Begin generating the XML string based on the visited dictionary."""
+        """Begin generating the JSON string based on the visited dictionary."""
+
         # populate browser and copy visited
         self._browser.browse_all()
         visited2 = copy.copy(visited)
@@ -464,7 +464,7 @@ def _generate_dict(self) -> str:
                         json += '\t\t\t]},\n'
                     else:
                         if isinstance(value2, Browser):
-                            json += f'\t\t\t{{ \"{value2.name}\": \"BrowserObject\" }},\n'
+                            json += f'\t\t\t{{ "{value2.name}": "BrowserObject" }},\n'
 
                         elif isinstance(value2, com_error):
                             if self._skip_err:

pyvba/viewer.py

@@ -41,9 +41,6 @@ def __init__(self, app, name: str = None, parent: object = None):
 
         self._errors = {}
 
-    def __eq__(self, other):
-        return other.type == self._type and other.name == self._name
-
     def __getattr__(self, item):
         return self.getattr(item)
 
@@ -190,7 +187,6 @@ def __init__(self, obj, name: str = None, parent: object = None):
         self._items = [
             Viewer.gettype(i, name, self)
             for i in self._com
-            if i is not super()._com
         ]
 
     def __str__(self):