fix: missing arguments due to ellipsis

Author: clatapie

src/pyconverter/xml2py/ast_tree.py

@@ -256,17 +256,17 @@ def to_py_arg_name(name: str) -> str:
 
 
 def get_complete_args_from_initial_arg(
-    initial_args: List[str], elipsis_args: List[str]
+    initial_args: List[str], ellipsis_args: List[str]
 ) -> List[str]:
     """
-    Get the complete argument list from a list with elipsis.
+    Get the complete argument list from a list with ellipsis.
 
     Parameters
     ----------
     initial_args : list
         List of initial arguments.
 
-    elipsis_args : list
+    ellipsis_args : list
         List of containing the elipsed arguments.
 
     Returns
@@ -277,14 +277,12 @@ def get_complete_args_from_initial_arg(
     Examples
     --------
     >>> initial_args = ['energytype', 'cname1', 'cname2', 'cname3', 'cname4', 'cname5', 'cname6']
-    >>> elipsis_args = ['Cname1', ' Cname2',' …']
-    >>> get_complete_args_from_initial_arg(initial_args, elipsis_args)
+    >>> ellipsis_args = ['Cname1', ' Cname2',' …']
+    >>> get_complete_args_from_initial_arg(initial_args, ellipsis_args)
     ['cname1', 'cname2', 'cname3', 'cname4', 'cname5', 'cname6']
     """
-
-    first_arg_name = to_py_arg_name(elipsis_args[0])
-    name_without_iter, first_num = get_iter_values(first_arg_name)
-
+    first_arg_name = to_py_arg_name(ellipsis_args[0])
+    name_without_iter, _ = get_iter_values(first_arg_name)
     complete_args = []
     for i, arg in enumerate(initial_args):
         if name_without_iter in arg:
@@ -293,14 +291,14 @@ def get_complete_args_from_initial_arg(
     return complete_args
 
 
-def is_elipsis(name: str) -> bool:
+def is_ellipsis(name: str) -> bool:
     """
-    Check if a name is an elipsis.
+    Check if a name is an ellipsis.
 
     Returns
     -------
     bool
-        True if the argument is an elipsis, False otherwise.
+        True if the argument is an ellipsis, False otherwise.
     """
     if any(elips in name for elips in [". . .", "...", "…"]):
         return True
@@ -2137,7 +2135,7 @@ def args(self):
 
             elif arg in ["...", ". . ."]:
                 # Elipsis, needs to be skipped
-                pass
+                args.append("...")
 
             elif arg.isidentifier() is False:
                 raise ValueError(
@@ -2158,6 +2156,21 @@ def args(self):
                                 args[j] = f"{arg}{i:d}"
                                 i += 1
 
+        # Handle ellipsis expansion
+        if "..." in args:
+            ellipsis_index = args.index("...")
+            previous_arg = args[ellipsis_index - 1]
+            next_arg = args[ellipsis_index + 1]
+            name_without_iter, previous_iter = get_iter_values(previous_arg)
+            _, next_iter = get_iter_values(next_arg)
+            if previous_iter and next_iter:
+                expanded_args = []
+                for i in range(previous_iter + 1, next_iter):
+                    expanded_args.append(name_without_iter + str(i))
+                args = args[:ellipsis_index] + expanded_args + args[ellipsis_index + 1 :]
+            else:  # one of them is not iterable - ``xn`` for instance
+                args.remove("...")
+
         return args
 
 
@@ -2665,6 +2678,16 @@ def __init__(
         self._terms = terms
         self._description = description
         self._initial_arguments = initial_arguments
+        if "VAL1" in self._initial_arguments:
+            print(self._initial_arguments)
+
+    # def fix_initial_arguments(self, initial_arguments: List) -> None:
+    #     """Fix the initial arguments."""
+    #     # All arguments are present, need to add the missing ones
+    #     _, start_iter = get_iter_values(ellipsis_args[0])
+    #     _, end_iter = get_iter_values(ellipsis_args[-1])
+    #     for i in range(start_iter, end_iter + 1):
+    #         complete_args.append(f"{name_without_iter}{i}")
 
     @property
     def py_arg_name(self) -> str:
@@ -2679,33 +2702,32 @@ def description(self) -> str:
         return str(self._description)
 
     @property
-    def is_arg_elipsis(self):
+    def is_arg_ellipsis(self):
         """
-        Check if the argument is an elipsis.
+        Check if the argument is an ellipsis.
 
         Returns
         -------
         bool
-            True if the argument is an elipsis, False otherwise.
+            True if the argument is an ellipsis, False otherwise.
         """
-        return is_elipsis(str(self._name))
+        return is_ellipsis(str(self._name))
 
     @property
     def multiple_args(self):
         additional_args = []
         if "," in str(self._name):
             split_name = str(self._name).split(",")
-            if not self.is_arg_elipsis:
+            if not self.is_arg_ellipsis:
                 for item_name in split_name:
                     arg_name = item_name.strip()
                     new_arg = Argument(
                         self._terms, arg_name, self._initial_arguments, self._description
                     )
                     additional_args.append(new_arg)
             else:
-
                 complete_args = get_complete_args_from_initial_arg(
-                    elipsis_args=split_name, initial_args=self._initial_arguments
+                    ellipsis_args=split_name, initial_args=self._initial_arguments
                 )
 
                 if len(complete_args) > 0:
@@ -2724,7 +2746,7 @@ def multiple_args(self):
                                 self._terms, arg_name, self._initial_arguments, self._description
                             )
                             additional_args.append(new_arg)
-                        elif is_elipsis(item_name):
+                        elif is_ellipsis(item_name):
 
                             if "+" in split_name[i + 1]:
                                 number_final_iter, (