Merge pull request #2 from adhocore/develop

Refactor core, add more collection and array functionalities

Author: adhocore

composer.json

@@ -14,7 +14,7 @@
         "psr-4": {
             "Ahc\\Underscore\\": "src/"
         },
-        "files": []
+        "files": ["src/functions.php"]
     },
     "autoload-dev": {
         "psr-4": {

src/Helper.php

@@ -2,273 +2,6 @@
 
 namespace Ahc\Underscore;
 
-class Underscore implements \ArrayAccess, \Countable, \IteratorAggregate, \JsonSerializable
+final class Underscore extends UnderscoreCollection
 {
-    const VERSION = '0.0.1';
-
-    /** @var array The array manipulated by this object */
-    protected $data;
-
-    /**
-     * Constructor.
-     *
-     * @param array|mixed $data.
-     */
-    public function __construct($data = [])
-    {
-        $this->data = \is_array($data) ? $data : Helper::asArray($data);
-    }
-
-    /**
-     * Get the underlying array data.
-     *
-     * @param string|int|null $index
-     *
-     * @return mixed
-     */
-    public function get($index = null)
-    {
-        if (null === $index) {
-            return $this->data;
-        }
-
-        return $this->data[$index];
-    }
-
-    public function each(callable $fn)
-    {
-        foreach ($this->data as $index => $value) {
-            $fn($value, $index);
-        }
-
-        return $this;
-    }
-
-    public function map(callable $fn)
-    {
-        $data = [];
-
-        foreach ($this->data as $index => $value) {
-            $data[$index] = $fn($value, $index);
-        }
-
-        return new static($data);
-    }
-
-    public function collect(callable $fn)
-    {
-        return $this->map($fn);
-    }
-
-    public function reduce(callable $fn, $memo)
-    {
-        return \array_reduce($this->data, $fn, $memo);
-    }
-
-    public function foldl(callable $fn, $memo)
-    {
-        return $this->reduce($fn, $memo);
-    }
-
-    public function inject(callable $fn, $memo)
-    {
-        return $this->reduce($fn, $memo);
-    }
-
-    public function reduceRight(callable $fn, $memo)
-    {
-        return \array_reduce(\array_reverse($this->data), $fn, $memo);
-    }
-
-    public function foldr(callable $fn, $memo)
-    {
-        return $this->reduceRight($fn, $memo);
-    }
-
-    public function find(callable $fn)
-    {
-        foreach ($this->data as $index => $value) {
-            if ($fn($value, $index)) {
-                return $value;
-            }
-        }
-    }
-
-    public function detect(callable $fn)
-    {
-        return $this->find($fn);
-    }
-
-    public function filter(callable $fn)
-    {
-        $data = \array_filter($this->data, $fn, \ARRAY_FILTER_USE_BOTH);
-
-        return new static($data);
-    }
-
-    public function select(callable $fn)
-    {
-        return $this->filter($fn);
-    }
-
-    public function reject(callable $fn)
-    {
-        $data = \array_filter($this->data, $this->negate($fn), \ARRAY_FILTER_USE_BOTH);
-
-        return new static($data);
-    }
-
-    protected function negate(callable $fn)
-    {
-        return function () use ($fn) {
-            return !\call_user_func_array($fn, \func_get_args());
-        };
-    }
-
-    public function every(callable $fn)
-    {
-        return $this->match($fn, true);
-    }
-
-    public function all(callable $fn)
-    {
-        return $this->every($fn);
-    }
-
-    public function some(callable $fn)
-    {
-        return $this->match($fn, false);
-    }
-
-    public function any(callable $fn)
-    {
-        return $this->some($fn);
-    }
-
-    protected function match(callable $fn, $all = true)
-    {
-        foreach ($this->data as $index => $value) {
-            if ($all ^ $fn($value, $index)) {
-                return !$all;
-            }
-        }
-
-        return $all;
-    }
-
-    public function contains($item)
-    {
-        return \in_array($item, $this->data);
-    }
-
-    public function includes($item)
-    {
-        return $this->contains($item);
-    }
-
-    public function invoke(callable $fn)
-    {
-        return \call_user_func_array($fn, $this->data);
-    }
-
-    public function pluck($columnKey, $indexKey = null)
-    {
-        $data = \array_column($this->data, $columnKey, $indexKey);
-
-        return new static($data);
-    }
-
-    public function where(array $props)
-    {
-        return $this->filter($this->matcher($props));
-    }
-
-    public function findWhere(array $props)
-    {
-        return $this->find($this->matcher($props));
-    }
-
-    protected function matcher(array $props)
-    {
-        return function ($value, $index) use ($props) {
-            foreach ($props as $prop => $criteria) {
-                if (\array_column([$value], $prop) != [$criteria]) {
-                    return false;
-                }
-            }
-
-            return true;
-        };
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function offsetExists($index)
-    {
-        return \array_key_exists($index, $this->data);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function offsetGet($index)
-    {
-        return $this->data[$index];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function offsetSet($index, $value)
-    {
-        $this->data[$index] = $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function offsetUnset($index)
-    {
-        unset($this->data[$index]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function count()
-    {
-        return \count($this->data);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->data);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function jsonSerialize()
-    {
-        return $this->data;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        return \json_encode($this->data);
-    }
-
-    public static function _($data)
-    {
-        return new static($data);
-    }
 }
-
-\class_alias('Ahc\Underscore\Underscore', 'Ahc\Underscore');

src/Underscore.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Ahc\Underscore;
+
+class UnderscoreArray extends UnderscoreBase
+{
+    public function first()
+    {
+        return \reset($this->data);
+    }
+
+    public function last()
+    {
+        return \end($this->data);
+    }
+
+    public function compact()
+    {
+        return new static(\array_filter($this->data));
+    }
+
+    public function flatten()
+    {
+        return new static($this->flat($this->data));
+    }
+
+    public function unique($fn = null)
+    {
+        if (null === $fn) {
+            return new static(\array_unique($this->data));
+        }
+
+        $ids = $data = [];
+        $fn  = $this->valueFn($fn);
+
+        foreach ($this->data as $index => $value) {
+            if (!isset($ids[$id = $fn($value, $index)])) {
+                $ids[$id] = true;
+
+                $data[$index] = $value;
+            }
+        }
+
+        return new static($data);
+    }
+
+    public function uniq($fn)
+    {
+        return $this->unique($fn);
+    }
+}