Differentiate Operation and Transformation.

spec/drupol/collection/CollectionSpec.php

@@ -832,41 +832,35 @@ public function it_can_rsample(): void
     public function it_can_run_an_operation(Operation $operation): void
     {
         $square = new class() implements Operation {
-            public function on(iterable $collection)
+            public function on(iterable $collection): \Closure
             {
-                return Collection::with(
-                    static function () use ($collection) {
-                        foreach ($collection as $item) {
-                            yield $item ** 2;
-                        }
+                return static function () use ($collection) {
+                    foreach ($collection as $item) {
+                        yield $item ** 2;
                     }
-                );
+                };
             }
         };
 
         $sqrt = new class() implements Operation {
-            public function on(iterable $collection)
+            public function on(iterable $collection): \Closure
             {
-                return Collection::with(
-                    static function () use ($collection) {
-                        foreach ($collection as $item) {
-                            yield $item ** .5;
-                        }
+                return static function () use ($collection) {
+                    foreach ($collection as $item) {
+                        yield $item ** .5;
                     }
-                );
+                };
             }
         };
 
         $map = new class() implements Operation {
-            public function on(iterable $collection)
+            public function on(iterable $collection): \Closure
             {
-                return Collection::with(
-                    static function () use ($collection) {
-                        foreach ($collection as $item) {
-                            yield (int) $item;
-                        }
+                return static function () use ($collection) {
+                    foreach ($collection as $item) {
+                        yield (int) $item;
                     }
-                );
+                };
             }
         };
 

src/Base.php

@@ -6,8 +6,10 @@
 
 use drupol\collection\Contract\Base as BaseInterface;
 use drupol\collection\Contract\Operation;
+use drupol\collection\Contract\Transformer;
 use drupol\collection\Iterator\ClosureIterator;
-use drupol\collection\Operation\Run;
+use drupol\collection\Transformation\Run;
+use drupol\collection\Transformation\Transform;
 
 /**
  * Class Base.
@@ -66,12 +68,10 @@ public function run(Operation ...$operations)
     }
 
     /**
-     * @param array $data
-     *
-     * @return \drupol\collection\Contract\Base
+     * {@inheritdoc}
      */
-    public static function with($data = []): BaseInterface
+    public function transform(Transformer ...$transformers)
     {
-        return new static($data);
+        return (new Transform(...$transformers))->on($this);
     }
 }

src/Collection.php

@@ -6,25 +6,18 @@
 
 use drupol\collection\Contract\Base as BaseInterface;
 use drupol\collection\Contract\Collection as CollectionInterface;
-use drupol\collection\Operation\All;
 use drupol\collection\Operation\Append;
 use drupol\collection\Operation\Apply;
 use drupol\collection\Operation\Chunk;
 use drupol\collection\Operation\Collapse;
 use drupol\collection\Operation\Combine;
-use drupol\collection\Operation\Contains;
-use drupol\collection\Operation\Count;
 use drupol\collection\Operation\Distinct;
 use drupol\collection\Operation\Filter;
-use drupol\collection\Operation\First;
 use drupol\collection\Operation\Flatten;
 use drupol\collection\Operation\Flip;
 use drupol\collection\Operation\Forget;
-use drupol\collection\Operation\Get;
-use drupol\collection\Operation\Implode;
 use drupol\collection\Operation\Intersperse;
 use drupol\collection\Operation\Keys;
-use drupol\collection\Operation\Last;
 use drupol\collection\Operation\Limit;
 use drupol\collection\Operation\Merge;
 use drupol\collection\Operation\Normalize;
@@ -34,14 +27,21 @@
 use drupol\collection\Operation\Pluck;
 use drupol\collection\Operation\Prepend;
 use drupol\collection\Operation\Range;
-use drupol\collection\Operation\Reduce;
 use drupol\collection\Operation\Reduction;
-use drupol\collection\Operation\Run;
 use drupol\collection\Operation\Skip;
 use drupol\collection\Operation\Slice;
 use drupol\collection\Operation\Sort;
 use drupol\collection\Operation\Walk;
 use drupol\collection\Operation\Zip;
+use drupol\collection\Transformation\All;
+use drupol\collection\Transformation\Contains;
+use drupol\collection\Transformation\Count;
+use drupol\collection\Transformation\First;
+use drupol\collection\Transformation\Get;
+use drupol\collection\Transformation\Implode;
+use drupol\collection\Transformation\Last;
+use drupol\collection\Transformation\Reduce;
+use drupol\collection\Transformation\Run;
 
 /**
  * Class Collection.
@@ -53,7 +53,7 @@ final class Collection extends Base implements CollectionInterface
      */
     public function all(): array
     {
-        return $this->run(new All());
+        return $this->transform(new All());
     }
 
     /**
@@ -111,15 +111,15 @@ public function combine($keys): BaseInterface
      */
     public function contains($key): bool
     {
-        return $this->run(new Contains($key));
+        return $this->transform(new Contains($key));
     }
 
     /**
      * {@inheritdoc}
      */
     public function count(): int
     {
-        return $this->run(new Count());
+        return $this->transform(new Count());
     }
 
     /**
@@ -157,7 +157,7 @@ public function filter(callable ...$callbacks): BaseInterface
      */
     public function first(callable $callback = null, $default = null)
     {
-        return $this->run(new First($callback, $default));
+        return $this->transform(new First($callback, $default));
     }
 
     /**
@@ -195,15 +195,15 @@ public function forget(...$keys): BaseInterface
      */
     public function get($key, $default = null)
     {
-        return $this->run(new Get($key, $default));
+        return $this->transform(new Get($key, $default));
     }
 
     /**
      * {@inheritdoc}
      */
-    public function implode(string $implode = ''): string
+    public function implode(string $glue = ''): string
     {
-        return (new Implode($implode))->on($this);
+        return $this->transform(new Implode($glue));
     }
 
     /**
@@ -253,7 +253,7 @@ public function keys(): BaseInterface
      */
     public function last()
     {
-        return $this->run(new Last());
+        return $this->transform(new Last());
     }
 
     /**
@@ -363,15 +363,15 @@ public static function range(int $start = 0, $end = \INF, $step = 1): Collection
      */
     public function rebase(): BaseInterface
     {
-        return new Collection($this->run(new All()));
+        return new Collection($this->transform(new All()));
     }
 
     /**
      * {@inheritdoc}
      */
     public function reduce(callable $callback, $initial = null)
     {
-        return $this->run(new Reduce($callback, $initial));
+        return $this->transform(new Reduce($callback, $initial));
     }
 
     /**
@@ -461,9 +461,9 @@ public function walk(callable ...$callbacks): BaseInterface
     }
 
     /**
-     * {@inheritdoc}
+     * @param array $data
      *
-     * @return \drupol\collection\Contract\Collection
+     * @return \drupol\collection\Contract\Base
      */
     public static function with($data = []): BaseInterface
     {

src/Contract/Base.php

@@ -7,6 +7,6 @@
 /**
  * Interface Base.
  */
-interface Base extends \IteratorAggregate, Runable
+interface Base extends \IteratorAggregate, Runable, Transformable
 {
 }

src/Contract/Operation.php

@@ -7,12 +7,12 @@
 /**
  * Interface Operation.
  */
-interface Operation
+interface Operation extends Transformer
 {
     /**
      * @param iterable $collection
      *
-     * @return mixed
+     * @return \Closure
      */
-    public function on(iterable $collection);
+    public function on(iterable $collection): \Closure;
 }

src/Contract/Transformable.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace drupol\collection\Contract;
+
+/**
+ * Interface Transformable.
+ */
+interface Transformable
+{
+    /**
+     * @param \drupol\collection\Contract\Transformer ...$transformers
+     *
+     * @return bool|int|mixed|string
+     */
+    public function transform(Transformer ...$transformers);
+}

src/Contract/Transformer.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace drupol\collection\Contract;
+
+/**
+ * Interface Transformer.
+ */
+interface Transformer
+{
+    /**
+     * @param iterable $collection
+     *
+     * @return bool|mixed
+     */
+    public function on(iterable $collection);
+}

src/Operation/Distinct.php

@@ -15,7 +15,7 @@ final class Distinct implements Operation
     /**
      * {@inheritdoc}
      */
-    public function on(iterable $collection)
+    public function on(iterable $collection): \Closure
     {
         return static function () use ($collection) {
             $seen = new Collection([]);

src/Operation/Only.php

@@ -29,7 +29,7 @@ public function __construct(...$keys)
     /**
      * {@inheritdoc}
      */
-    public function on(iterable $collection)
+    public function on(iterable $collection): \Closure
     {
         [$keys] = $this->keys;
 

src/Operation/Pluck.php

@@ -7,6 +7,7 @@
 use ArrayAccess;
 use drupol\collection\Contract\Collection;
 use drupol\collection\Contract\Operation;
+use drupol\collection\Transformation\Get;
 
 /**
  * Class Pluck.

src/Operation/Reduction.php

@@ -36,7 +36,7 @@ public function __construct(callable $callback, $initial)
     /**
      * {@inheritdoc}
      */
-    public function on(iterable $collection)
+    public function on(iterable $collection): \Closure
     {
         $callback = $this->callback;
         $initial = $this->initial;

src/Operation/All.php → src/Transformation/All.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace drupol\collection\Operation;
+namespace drupol\collection\Transformation;
 
-use drupol\collection\Contract\Operation;
+use drupol\collection\Contract\Transformer;
 
 /**
  * Class All.
  */
-final class All implements Operation
+final class All implements Transformer
 {
     /**
      * {@inheritdoc}

src/Operation/Contains.php → src/Transformation/Contains.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace drupol\collection\Operation;
+namespace drupol\collection\Transformation;
 
-use drupol\collection\Contract\Operation;
+use drupol\collection\Contract\Transformer;
 
 /**
  * Class Contains.
  */
-final class Contains implements Operation
+final class Contains implements Transformer
 {
     /**
      * @var mixed

src/Operation/Count.php → src/Transformation/Count.php

@@ -2,17 +2,17 @@
 
 declare(strict_types=1);
 
-namespace drupol\collection\Operation;
+namespace drupol\collection\Transformation;
 
-use drupol\collection\Contract\Operation;
+use drupol\collection\Contract\Transformer;
 use drupol\collection\Iterator\ClosureIterator;
 
 /**
  * Class Count.
  *
  * Be careful, this will only work with finite collection sets.
  */
-final class Count implements Operation
+final class Count implements Transformer
 {
     /**
      * {@inheritdoc}