Add ext-ds to replace array to vector for performance optimization

.github/workflows/benchmark.yml

@@ -80,6 +80,7 @@ jobs:
         with:
           php-version: 8.3
           coverage: none
+          extensions: ds
           ini-values: opcache.enable_cli=1, opcache.jit=1255
 
       - name: Build local Phar file

.github/workflows/main.yml

@@ -56,7 +56,7 @@ jobs:
         with:
           php-version: 8.3
           coverage: xdebug
-          extensions: ast
+          extensions: ast, ds
 
       - name: Build project
         run: make build --no-print-directory
@@ -100,7 +100,7 @@ jobs:
         with:
           php-version: 8.1
           coverage: none
-          extensions: ast
+          extensions: ast, ds
 
       - name: Install project
         run: make build --no-print-directory
@@ -142,7 +142,7 @@ jobs:
         with:
           php-version: highest
           coverage: none
-          extensions: ast
+          extensions: ast, ds
 
       - name: Install project
         run: make build --no-print-directory
@@ -182,6 +182,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: 8.3
+          extensions: ds
 
       - name: Build project in production mode
         run: make build-prod --no-print-directory
@@ -214,6 +215,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
+          extensions: ds
 
       - name: Build project in production mode
         run: make build-prod build-phar-file --no-print-directory

.github/workflows/publish.yml

@@ -32,6 +32,7 @@ jobs:
         with:
           php-version: 8.3
           tools: composer
+          extensions: ds
 
       - name: Build project in production mode
         run: make build-prod build-phar-file --no-print-directory

Dockerfile

@@ -21,7 +21,7 @@ FROM php:8.3-cli-alpine
 
 # Install PHP extensions
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
-RUN install-php-extensions opcache @composer
+RUN install-php-extensions opcache ds @composer
 
 # Install application
 # run `make build-version` before!

composer.json

@@ -1,6 +1,6 @@
 {
     "name"              : "jbzoo/csv-blueprint",
-    "type" : "project",
+    "type"              : "project",
     "description"       : "CLI Utility for Validating and Generating CSV Files Based on Custom Rules. It ensures your data meets specified criteria, streamlining data management and integrity checks.",
     "license"           : "MIT",
     "keywords"          : [
@@ -29,6 +29,7 @@
     "require"           : {
         "php"                                 : "^8.1",
         "ext-mbstring"                        : "*",
+        "ext-ds" : "*",
 
         "league/csv"                          : "^9.15.0",
         "jbzoo/data"                          : "^7.1.1",

src/Rules/AbstarctRule.php

@@ -16,6 +16,7 @@
 
 namespace JBZoo\CsvBlueprint\Rules;
 
+use Ds\Vector;
 use JBZoo\CsvBlueprint\Utils;
 use JBZoo\CsvBlueprint\Validators\Error;
 use JBZoo\CsvBlueprint\Validators\ValidatorColumn;
@@ -61,7 +62,7 @@ public function __construct(
         // TODO: Move resolving and validating expected value on this stage to make it only once (before validation).
     }
 
-    public function validate(array|string $cellValue, int $line = ValidatorColumn::FALLBACK_LINE): ?Error
+    public function validate(array|string|Vector $cellValue, int $line = ValidatorColumn::FALLBACK_LINE): ?Error
     {
         // TODO: Extract to abstract boolean cell/agregate rule
         if ($this->isEnabled($cellValue) === false) {
@@ -185,7 +186,7 @@ protected function getOptionAsArray(): array
      * Optimize performance
      * There is no need to validate empty values for predicates or if it's disabled.
      */
-    protected function isEnabled(array|string $cellValue): bool
+    protected function isEnabled(string|Vector $cellValue): bool
     {
         // List of rules that should be checked for empty values
         $exclusions = [

src/Rules/AbstarctRuleCombo.php

@@ -16,6 +16,7 @@
 
 namespace JBZoo\CsvBlueprint\Rules;
 
+use Ds\Vector;
 use JBZoo\CsvBlueprint\Rules\Aggregate\AbstractAggregateRuleCombo;
 use JBZoo\CsvBlueprint\Rules\Cell\AbstractCellRuleCombo;
 use JBZoo\CsvBlueprint\Validators\Error;
@@ -38,7 +39,7 @@ abstract protected function getExpected(): float;
 
     abstract protected function getActual(array|string $value): float;
 
-    public function validate(array|string $cellValue, int $line = ValidatorColumn::FALLBACK_LINE): ?Error
+    public function validate(string|Vector $cellValue, int $line = ValidatorColumn::FALLBACK_LINE): ?Error
     {
         $error = $this->validateCombo($cellValue);
 
@@ -51,7 +52,7 @@ public function validate(array|string $cellValue, int $line = ValidatorColumn::F
 
     public function test(array|string $cellValue, bool $isHtml = false): string
     {
-        $errorMessage = (string)$this->validateCombo($cellValue);
+        $errorMessage = (string)$this->validateCombo(new Vector($cellValue));
 
         return $isHtml ? $errorMessage : \strip_tags($errorMessage);
     }
@@ -96,7 +97,7 @@ protected static function compare(float $expected, float $actual, string $mode):
         };
     }
 
-    private function validateCombo(array|string $cellValue): ?string
+    private function validateCombo(string|Vector $cellValue): ?string
     {
         if ($this instanceof AbstractCellRuleCombo) {
             if (!\is_string($cellValue)) {
@@ -107,7 +108,7 @@ private function validateCombo(array|string $cellValue): ?string
         }
 
         if ($this instanceof AbstractAggregateRuleCombo) {
-            if (!\is_array($cellValue)) {
+            if (!$cellValue instanceof Vector) {
                 throw new \InvalidArgumentException('The value should be an array of numbers/strings');
             }
 

src/Rules/Aggregate/AbstractAggregateRule.php

@@ -16,6 +16,7 @@
 
 namespace JBZoo\CsvBlueprint\Rules\Aggregate;
 
+use Ds\Vector;
 use JBZoo\CsvBlueprint\Rules\AbstarctRule;
 
 abstract class AbstractAggregateRule extends AbstarctRule
@@ -28,10 +29,8 @@ abstract class AbstractAggregateRule extends AbstarctRule
      * TODO: This method takes an array reference &$columnValues as input and returns a nullable string.
      * We use a reference to the array to avoid copying the array. Important memory optimization!
      * Please DO NOT change the array in this method!
-     *
-     * @param string[] $columnValues
      */
-    abstract public function validateRule(array $columnValues): ?string;
+    abstract public function validateRule(Vector $columnValues): ?string;
 
     public function test(array $cellValue, bool $isHtml = false): string
     {

src/Rules/Aggregate/AbstractAggregateRuleCombo.php

@@ -16,14 +16,15 @@
 
 namespace JBZoo\CsvBlueprint\Rules\Aggregate;
 
+use Ds\Vector;
 use JBZoo\CsvBlueprint\Rules\AbstarctRule;
 use JBZoo\CsvBlueprint\Rules\AbstarctRuleCombo;
 
 abstract class AbstractAggregateRuleCombo extends AbstarctRuleCombo
 {
     public const INPUT_TYPE = AbstarctRule::INPUT_TYPE_STRINGS;
 
-    abstract protected function getActualAggregate(array $colValues): ?float;
+    abstract protected function getActualAggregate(Vector $colValues): ?float;
 
     public function getRuleCode(?string $mode = null): string
     {
@@ -46,21 +47,21 @@ protected function getExpected(): float
         return $this->getOptionAsFloat();
     }
 
-    protected function validateComboAggregate(array $colValues, string $mode): ?string
+    protected function validateComboAggregate(Vector $colValues, string $mode): ?string
     {
         $prefix = $mode === self::NOT ? 'not ' : '';
         $verb = static::VERBS[$mode];
         $name = static::NAME;
 
         try {
             // TODO: Think about the performance optimization here
-            if (static::INPUT_TYPE === AbstarctRule::INPUT_TYPE_FLOATS) {
-                $colValues = \array_map('floatval', $colValues);
-            }
-
-            if (static::INPUT_TYPE === AbstarctRule::INPUT_TYPE_INTS) {
-                $colValues = \array_map('intval', $colValues);
-            }
+            // if (static::INPUT_TYPE === AbstarctRule::INPUT_TYPE_FLOATS) {
+            //     $colValues = \array_map('floatval', $colValues);
+            // }
+            //
+            // if (static::INPUT_TYPE === AbstarctRule::INPUT_TYPE_INTS) {
+            //     $colValues = \array_map('intval', $colValues);
+            // }
 
             $actual = $this->getActualAggregate($colValues); // Important to use the original method here!
         } catch (\Throwable $exception) {

src/Rules/Aggregate/ComboAverage.php

@@ -16,6 +16,7 @@
 
 namespace JBZoo\CsvBlueprint\Rules\Aggregate;
 
+use Ds\Vector;
 use JBZoo\CsvBlueprint\Rules\AbstarctRule;
 use MathPHP\Statistics\Average;
 
@@ -30,12 +31,12 @@ public function getHelpMeta(): array
         return [['Regular the arithmetic mean. The sum of the numbers divided by the count.'], []];
     }
 
-    protected function getActualAggregate(array $colValues): ?float
+    protected function getActualAggregate(Vector $colValues): ?float
     {
         if (\count($colValues) === 0) {
             return null;
         }
 
-        return Average::mean($colValues);
+        return Average::mean($colValues->toArray());
     }
 }

src/Rules/Aggregate/ComboCoefOfVar.php

@@ -16,6 +16,7 @@
 
 namespace JBZoo\CsvBlueprint\Rules\Aggregate;
 
+use Ds\Vector;
 use JBZoo\CsvBlueprint\Rules\AbstarctRule;
 use MathPHP\Statistics\Descriptive;
 
@@ -38,7 +39,7 @@ public function getHelpMeta(): array
         ];
     }
 
-    protected function getActualAggregate(array $colValues): ?float
+    protected function getActualAggregate(Vector $colValues): ?float
     {
         if (\count($colValues) === 0) {
             return null;

src/Rules/Aggregate/ComboContraharmonicMean.php

@@ -16,6 +16,7 @@
 
 namespace JBZoo\CsvBlueprint\Rules\Aggregate;
 
+use Ds\Vector;
 use JBZoo\CsvBlueprint\Rules\AbstarctRule;
 use MathPHP\Statistics\Average;
 
@@ -37,7 +38,7 @@ public function getHelpMeta(): array
         ];
     }
 
-    protected function getActualAggregate(array $colValues): ?float
+    protected function getActualAggregate(Vector $colValues): ?float
     {
         if (\count($colValues) === 0) {
             return null;

src/Rules/Aggregate/ComboCount.php

@@ -16,6 +16,7 @@
 
 namespace JBZoo\CsvBlueprint\Rules\Aggregate;
 
+use Ds\Vector;
 use JBZoo\CsvBlueprint\Rules\AbstarctRule;
 
 final class ComboCount extends AbstractAggregateRuleCombo
@@ -36,7 +37,7 @@ public function getHelpMeta(): array
         ];
     }
 
-    protected function getActualAggregate(array $colValues): ?float
+    protected function getActualAggregate(Vector $colValues): ?float
     {
         return \count($colValues);
     }

src/Rules/Aggregate/ComboCountDistinct.php

@@ -16,6 +16,7 @@
 
 namespace JBZoo\CsvBlueprint\Rules\Aggregate;
 
+use Ds\Vector;
 use JBZoo\CsvBlueprint\Rules\AbstarctRule;
 
 final class ComboCountDistinct extends AbstractAggregateRuleCombo
@@ -29,7 +30,7 @@ public function getHelpMeta(): array
         return [['Number of unique values.'], []];
     }
 
-    protected function getActualAggregate(array $colValues): ?float
+    protected function getActualAggregate(Vector $colValues): ?float
     {
         if (\count($colValues) === 0) {
             return null;

src/Rules/Aggregate/ComboCountEmpty.php

@@ -16,6 +16,7 @@
 
 namespace JBZoo\CsvBlueprint\Rules\Aggregate;
 
+use Ds\Vector;
 use JBZoo\CsvBlueprint\Rules\AbstarctRule;
 
 final class ComboCountEmpty extends AbstractAggregateRuleCombo
@@ -29,7 +30,7 @@ public function getHelpMeta(): array
         return [['Counts only empty values (string length is 0).'], []];
     }
 
-    protected function getActualAggregate(array $colValues): ?float
+    protected function getActualAggregate(Vector $colValues): ?float
     {
         if (\count($colValues) === 0) {
             return null;

src/Rules/Aggregate/ComboCountEven.php

@@ -16,6 +16,7 @@
 
 namespace JBZoo\CsvBlueprint\Rules\Aggregate;
 
+use Ds\Vector;
 use JBZoo\CsvBlueprint\Rules\AbstarctRule;
 
 final class ComboCountEven extends AbstractAggregateRuleCombo
@@ -29,7 +30,7 @@ public function getHelpMeta(): array
         return [['Number of even values.'], []];
     }
 
-    protected function getActualAggregate(array $colValues): ?float
+    protected function getActualAggregate(Vector $colValues): ?float
     {
         if (\count($colValues) === 0) {
             return null;

src/Rules/Aggregate/ComboCountNegative.php

@@ -16,6 +16,7 @@
 
 namespace JBZoo\CsvBlueprint\Rules\Aggregate;
 
+use Ds\Vector;
 use JBZoo\CsvBlueprint\Rules\AbstarctRule;
 
 final class ComboCountNegative extends AbstractAggregateRuleCombo
@@ -29,7 +30,7 @@ public function getHelpMeta(): array
         return [['Number of negative values.'], []];
     }
 
-    protected function getActualAggregate(array $colValues): ?float
+    protected function getActualAggregate(Vector $colValues): ?float
     {
         if (\count($colValues) === 0) {
             return null;

src/Rules/Aggregate/ComboCountNotEmpty.php

@@ -16,6 +16,7 @@
 
 namespace JBZoo\CsvBlueprint\Rules\Aggregate;
 
+use Ds\Vector;
 use JBZoo\CsvBlueprint\Rules\AbstarctRule;
 
 final class ComboCountNotEmpty extends AbstractAggregateRuleCombo
@@ -29,7 +30,7 @@ public function getHelpMeta(): array
         return [['Counts only not empty values (string length is not 0).'], []];
     }
 
-    protected function getActualAggregate(array $colValues): ?float
+    protected function getActualAggregate(Vector $colValues): ?float
     {
         if (\count($colValues) === 0) {
             return null;

src/Rules/Aggregate/ComboCountOdd.php

@@ -16,6 +16,7 @@
 
 namespace JBZoo\CsvBlueprint\Rules\Aggregate;
 
+use Ds\Vector;
 use JBZoo\CsvBlueprint\Rules\AbstarctRule;
 
 final class ComboCountOdd extends AbstractAggregateRuleCombo
@@ -29,7 +30,7 @@ public function getHelpMeta(): array
         return [['Number of odd values.'], []];
     }
 
-    protected function getActualAggregate(array $colValues): ?float
+    protected function getActualAggregate(Vector $colValues): ?float
     {
         if (\count($colValues) === 0) {
             return null;