Moved implementations to extensions

src/cpl_query/extension/__init__.py

@@ -20,6 +20,11 @@ __version__ = '2021.10.0.post1'
 from collections import namedtuple
 
 # imports:
+from iterable_abc import IterableABC
+from iterable import Iterable
+from list import List
+from ordered_iterable_abc import OrderedIterableABC
+from ordered_iterable import OrderedIterable
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major='2021', minor='10', micro='0.post1')

src/cpl_query/extension/iterable.py

@@ -0,0 +1,115 @@
+from typing import Optional, Callable, Union
+
+from cpl_query.extension.ordered_iterable_abc import OrderedIterableABC
+from .._query.all import all_query
+from .._query.any import any_query
+from .._query.avg import avg_query
+from .._query.contains import contains_query
+from .._query.count import count_query
+from .._query.distinct import distinct_query
+from .._query.element_at import element_at_query, element_at_or_default_query
+from .._query.first_last import first_or_default_query, first_query, last_or_default_query, last_query
+from .._query.for_each import for_each_query
+from .._query.max_min import max_query, min_query
+from .._query.order_by import order_by_query, order_by_descending_query
+from .._query.reverse import reverse_query
+from .._query.single import single_query, single_or_default_query
+from .._query.skip_take import skip_query, skip_last_query, take_query, take_last_query
+from .._query.sum import sum_query
+from .._query.where import where_query
+from cpl_query.extension.iterable_abc import IterableABC
+
+
+class Iterable(IterableABC):
+
+    def __init__(self, t: type = None, values: list = None):
+        IterableABC.__init__(self, t, values)
+
+    def any(self, func: Callable) -> bool:
+        return any_query(self, func)
+
+    def all(self, func: Callable) -> bool:
+        return all_query(self, func)
+
+    def average(self, func: Callable = None) -> Union[int, float, complex]:
+        return avg_query(self, func)
+
+    def contains(self, value: object) -> bool:
+        return contains_query(self, value)
+
+    def count(self, func: Callable = None) -> int:
+        return count_query(self, func)
+
+    def distinct(self, func: Callable) -> IterableABC:
+        return self.__to_self(distinct_query(self, func))
+
+    def element_at(self, index: int) -> any:
+        return element_at_query(self, index)
+
+    def element_at_or_default(self, index: int) -> Optional[any]:
+        return element_at_or_default_query(self, index)
+
+    def last(self) -> any:
+        return last_query(self)
+
+    def last_or_default(self) -> Optional[any]:
+        return last_or_default_query(self)
+
+    def first(self) -> any:
+        return first_query(self)
+
+    def first_or_default(self) -> Optional[any]:
+        return first_or_default_query(self)
+
+    def for_each(self, func: Callable):
+        for_each_query(self, func)
+
+    def max(self, func: Callable = None) -> Union[int, float, complex]:
+        return max_query(self, func)
+
+    def min(self, func: Callable = None) -> Union[int, float, complex]:
+        return min_query(self, func)
+
+    def order_by(self, func: Callable) -> OrderedIterableABC:
+        res = order_by_query(self, func)
+        from cpl_query._extension.ordered_iterable import OrderedIterable
+        res.__class__ = OrderedIterable
+        return res
+
+    def order_by_descending(self, func: Callable) -> OrderedIterableABC:
+        res = order_by_descending_query(self, func)
+        from cpl_query._extension.ordered_iterable import OrderedIterable
+        res.__class__ = OrderedIterable
+        return res
+
+    def reverse(self) -> IterableABC:
+        return reverse_query(self)
+
+    def single(self) -> any:
+        return single_query(self)
+
+    def single_or_default(self) -> Optional[any]:
+        return single_or_default_query(self)
+
+    def skip(self, index: int) -> IterableABC:
+        return self.__to_self(skip_query(self, index))
+
+    def skip_last(self, index: int) -> IterableABC:
+        return self.__to_self(skip_last_query(self, index))
+
+    def sum(self, func: Callable = None) -> Union[int, float, complex]:
+        return sum_query(self, func)
+
+    def take(self, index: int) -> IterableABC:
+        return self.__to_self(take_query(self, index))
+
+    def take_last(self, index: int) -> IterableABC:
+        return self.__to_self(take_last_query(self, index))
+
+    def where(self, func: Callable) -> IterableABC:
+        return self.__to_self(where_query(self, func))
+
+    @staticmethod
+    def __to_self(obj: IterableABC) -> IterableABC:
+        obj.__class__ = Iterable
+        return obj

src/cpl_query/extension/list.py

@@ -1,7 +1,9 @@
-from .._extension.iterable import Iterable
+from iterable import Iterable
 
 
 class List(Iterable):
+    r"""Implementation of :class: `cpl_query.Iterable`
+    """
 
     def __init__(self, t: type = None, values: list = None):
         Iterable.__init__(self, t, values)

src/cpl_query/extension/ordered_iterable.py

@@ -0,0 +1,20 @@
+from collections import Callable
+
+from .iterable import Iterable
+from .._query.order_by import then_by_query, then_by_descending_query
+from cpl_query.extension.ordered_iterable_abc import OrderedIterableABC
+
+
+class OrderedIterable(Iterable, OrderedIterableABC):
+
+    def __init__(self):
+        Iterable.__init__(self)
+        OrderedIterableABC.__init__(self)
+
+    def then_by(self, _func: Callable) -> OrderedIterableABC:
+        self._funcs.append(_func)
+        return then_by_query(self, lambda *args: [f(*args) for f in self._funcs])
+
+    def then_by_descending(self, _func: Callable) -> OrderedIterableABC:
+        self._funcs.append(_func)
+        return then_by_descending_query(self, lambda *args: [f(*args) for f in self._funcs])

src/cpl_query/extension/ordered_iterable_abc.py

@@ -1,7 +1,7 @@
 from abc import abstractmethod
 from collections import Callable
 
-from cpl_query.extension.iterable_abc import IterableABC
+from iterable_abc import IterableABC
 
 
 class OrderedIterableABC(IterableABC):