Add a new DataFrame::renameEach()

stloyd · stloyd · commit bc40be66a807 · 2025-05-04T13:56:29.000+02:00
diff --git a/src/core/etl/src/Flow/ETL/DSL/functions.php b/src/core/etl/src/Flow/ETL/DSL/functions.php
@@ -36,7 +36,7 @@
     Schema\SchemaFormatter,
     Transformation,
     Transformer,
-    Transformer\StyleConverter\Style,
+    Transformer\Rename\Style,
     Window,
     WithEntry};
 use Flow\ETL\ErrorHandler\{IgnoreError, SkipRows, ThrowError};
@@ -349,21 +349,21 @@ function to_branch(ScalarFunction $condition, Loader $loader) : Loader\Branching
 }
 
 #[DocumentationDSL(module: Module::CORE, type: DSLType::TRANSFORMER)]
-function rename_style(Style $style) : Transformer\StyleConverter\RenameCaseEntryStrategy
+function rename_style(Style $style) : Transformer\Rename\RenameCaseEntryStrategy
 {
-    return new Transformer\StyleConverter\RenameCaseEntryStrategy($style);
+    return new Transformer\Rename\RenameCaseEntryStrategy($style);
 }
 
 #[DocumentationDSL(module: Module::CORE, type: DSLType::TRANSFORMER)]
-function rename_replace(string $search, string $replace) : Transformer\StyleConverter\RenameReplaceEntryStrategy
+function rename_replace(string $search, string $replace) : Transformer\Rename\RenameReplaceEntryStrategy
 {
-    return new Transformer\StyleConverter\RenameReplaceEntryStrategy($search, $replace);
+    return new Transformer\Rename\RenameReplaceEntryStrategy($search, $replace);
 }
 
 #[DocumentationDSL(module: Module::CORE, type: DSLType::TRANSFORMER)]
-function rename_transliterate(string $transliterator = 'Any-Latin; Latin-ASCII; Lower()') : Transformer\StyleConverter\RenameTransliterateEntryStrategy
+function rename_transliterate(string $transliterator = 'Any-Latin; Latin-ASCII; Lower()') : Transformer\Rename\RenameTransliterateEntryStrategy
 {
-    return new Transformer\StyleConverter\RenameTransliterateEntryStrategy($transliterator);
+    return new Transformer\Rename\RenameTransliterateEntryStrategy($transliterator);
 }
 
 #[DocumentationDSL(module: Module::CORE, type: DSLType::ENTRY)]
diff --git a/src/core/etl/src/Flow/ETL/DataFrame.php b/src/core/etl/src/Flow/ETL/DataFrame.php
@@ -42,15 +42,15 @@
     OrderEntriesTransformer,
     OrderEntries\Comparator,
     OrderEntries\TypeComparator,
-    RenameEachTransformer,
+    RenameEachEntryTransformer,
     RenameEntryTransformer,
+    Rename\RenameCaseEntryStrategy,
+    Rename\RenameEntryStrategy,
+    Rename\RenameReplaceEntryStrategy,
+    Rename\Style,
     ScalarFunctionFilterTransformer,
     ScalarFunctionTransformer,
     SelectEntriesTransformer,
-    StyleConverter\RenameCaseEntryStrategy,
-    StyleConverter\RenameEntryStrategy,
-    StyleConverter\RenameReplaceEntryStrategy,
-    StyleConverter\Style,
     UntilTransformer,
     WindowFunctionTransformer
 };
@@ -706,7 +706,7 @@ public function renameAllUpperCaseWord() : self
 
     public function renameEach(RenameEntryStrategy $strategy) : self
     {
-        $this->pipeline->add(new RenameEachTransformer($strategy));
+        $this->pipeline->add(new RenameEachEntryTransformer($strategy));
 
         return $this;
     }
diff --git a/src/core/etl/src/Flow/ETL/Pipeline/Optimizer/LimitOptimization.php b/src/core/etl/src/Flow/ETL/Pipeline/Optimizer/LimitOptimization.php
@@ -13,7 +13,7 @@
     EntryNameStyleConverterTransformer,
     LimitTransformer,
     RenameAllCaseTransformer,
-    RenameEachTransformer,
+    RenameEachEntryTransformer,
     RenameEntryTransformer,
     RenameStrReplaceAllEntriesTransformer,
     ScalarFunctionTransformer,
@@ -36,7 +36,7 @@ final class LimitOptimization implements Optimization
         SelectEntriesTransformer::class,
         DropEntriesTransformer::class,
         RenameAllCaseTransformer::class,
-        RenameEachTransformer::class,
+        RenameEachEntryTransformer::class,
         RenameEntryTransformer::class,
         RenameStrReplaceAllEntriesTransformer::class,
         LimitTransformer::class,
diff --git a/src/core/etl/src/Flow/ETL/Transformer/Rename/RenameCaseEntryStrategy.php b/src/core/etl/src/Flow/ETL/Transformer/Rename/RenameCaseEntryStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Transformer\StyleConverter;
+namespace Flow\ETL\Transformer\Rename;
 
 use Flow\ETL\{FlowContext, Row, Row\Entry};
 
diff --git a/src/core/etl/src/Flow/ETL/Transformer/Rename/RenameEntryStrategy.php b/src/core/etl/src/Flow/ETL/Transformer/Rename/RenameEntryStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Transformer\StyleConverter;
+namespace Flow\ETL\Transformer\Rename;
 
 use Flow\ETL\{FlowContext, Row};
 use Flow\ETL\Row\Entry;
diff --git a/src/core/etl/src/Flow/ETL/Transformer/Rename/RenameReplaceEntryStrategy.php b/src/core/etl/src/Flow/ETL/Transformer/Rename/RenameReplaceEntryStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Transformer\StyleConverter;
+namespace Flow\ETL\Transformer\Rename;
 
 use Flow\ETL\{FlowContext, Row, Row\Entry};
 
diff --git a/src/core/etl/src/Flow/ETL/Transformer/Rename/RenameTransliterateEntryStrategy.php b/src/core/etl/src/Flow/ETL/Transformer/Rename/RenameTransliterateEntryStrategy.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Transformer\StyleConverter;
+namespace Flow\ETL\Transformer\Rename;
 
 use Flow\ETL\{FlowContext, Row, Row\Entry};
 
diff --git a/src/core/etl/src/Flow/ETL/Transformer/Rename/Style.php b/src/core/etl/src/Flow/ETL/Transformer/Rename/Style.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Transformer\StyleConverter;
+namespace Flow\ETL\Transformer\Rename;
 
 enum Style : string
 {
diff --git a/src/core/etl/src/Flow/ETL/Transformer/RenameAllCaseTransformer.php b/src/core/etl/src/Flow/ETL/Transformer/RenameAllCaseTransformer.php
@@ -8,8 +8,8 @@
     Row,
     Rows,
     Transformer,
-    Transformer\StyleConverter\RenameCaseEntryStrategy,
-    Transformer\StyleConverter\Style};
+    Transformer\Rename\RenameCaseEntryStrategy,
+    Transformer\Rename\Style};
 
 /**
  * @deprecated Use `DataFrame::renameEach()` and `RenameCaseTransformer`
diff --git a/src/core/etl/src/Flow/ETL/Transformer/RenameEachEntryTransformer.php b/src/core/etl/src/Flow/ETL/Transformer/RenameEachEntryTransformer.php
@@ -4,14 +4,9 @@
 
 namespace Flow\ETL\Transformer;
 
-use Flow\ETL\{FlowContext,
-    Row,
-    Rows,
-    Transformer,
-    Transformer\StyleConverter\RenameEntryStrategy
-};
+use Flow\ETL\{FlowContext, Row, Rows, Transformer, Transformer\Rename\RenameEntryStrategy};
 
-final readonly class RenameEachTransformer implements Transformer
+final readonly class RenameEachEntryTransformer implements Transformer
 {
     public function __construct(
         private RenameEntryStrategy $strategy,
diff --git a/src/core/etl/src/Flow/ETL/Transformer/RenameStrReplaceAllEntriesTransformer.php b/src/core/etl/src/Flow/ETL/Transformer/RenameStrReplaceAllEntriesTransformer.php
@@ -4,7 +4,7 @@
 
 namespace Flow\ETL\Transformer;
 
-use Flow\ETL\{FlowContext, Row, Rows, Transformer, Transformer\StyleConverter\RenameReplaceEntryStrategy};
+use Flow\ETL\{FlowContext, Row, Rows, Transformer, Transformer\Rename\RenameReplaceEntryStrategy};
 
 /**
  * @deprecated Use `DataFrame::renameEach()` and `RenameReplaceStrategy`
diff --git a/src/core/etl/tests/Flow/ETL/Tests/Integration/DataFrame/RenameAllCaseTransformerTest.php b/src/core/etl/tests/Flow/ETL/Tests/Integration/DataFrame/RenameAllCaseTransformerTest.php
@@ -0,0 +1,123 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Flow\ETL\Tests\Integration\DataFrame;
+
+use function Flow\ETL\DSL\{bool_entry, df, from_rows, int_entry, str_entry};
+use function Flow\ETL\DSL\{row, rows};
+use Flow\ETL\Tests\FlowIntegrationTestCase;
+use Flow\ETL\{Transformer\RenameAllCaseTransformer};
+use PHPUnit\Framework\Attributes\{IgnoreDeprecations};
+
+#[IgnoreDeprecations]
+final class RenameAllCaseTransformerTest extends FlowIntegrationTestCase
+{
+    public function test_rename_all_lower_case() : void
+    {
+        $rows = rows(row(int_entry('ID', 1), str_entry('NAME', 'name'), bool_entry('ACTIVE', true)), row(int_entry('ID', 2), str_entry('NAME', 'name'), bool_entry('ACTIVE', false)));
+
+        $ds = df()
+            ->read(from_rows($rows))
+            ->transform(new RenameAllCaseTransformer(lower: true))
+            ->getEachAsArray();
+
+        self::assertEquals(
+            [
+                ['id' => 1, 'name' => 'name', 'active' => true],
+                ['id' => 2, 'name' => 'name', 'active' => false],
+            ],
+            \iterator_to_array($ds)
+        );
+    }
+
+    public function test_rename_all_lower_case_i18n() : void
+    {
+        $rows = rows(row(int_entry('ILOŚĆ PRZEDMIOTÓW', 0)), row(int_entry('ILOŚĆ PRZEDMIOTÓW', 10)));
+
+        $ds = df()
+            ->read(from_rows($rows))
+            ->transform(new RenameAllCaseTransformer(lower: true))
+            ->getEachAsArray();
+
+        self::assertEquals(
+            [
+                ['ilość przedmiotów' => 0],
+                ['ilość przedmiotów' => 10],
+            ],
+            \iterator_to_array($ds)
+        );
+    }
+
+    public function test_rename_all_upper_case() : void
+    {
+        $rows = rows(row(int_entry('id', 1), str_entry('name', 'name'), bool_entry('active', true)), row(int_entry('id', 2), str_entry('name', 'name'), bool_entry('active', false)));
+
+        $ds = df()
+            ->read(from_rows($rows))
+            ->transform(new RenameAllCaseTransformer(upper: true))
+            ->getEachAsArray();
+
+        self::assertEquals(
+            [
+                ['ID' => 1, 'NAME' => 'name', 'ACTIVE' => true],
+                ['ID' => 2, 'NAME' => 'name', 'ACTIVE' => false],
+            ],
+            \iterator_to_array($ds)
+        );
+    }
+
+    public function test_rename_all_upper_case_first() : void
+    {
+        $rows = rows(row(int_entry('id', 1), str_entry('name', 'name'), bool_entry('active', true)), row(int_entry('id', 2), str_entry('name', 'name'), bool_entry('active', false)));
+
+        $ds = df()
+            ->read(from_rows($rows))
+            ->transform(new RenameAllCaseTransformer(ucfirst: true))
+            ->getEachAsArray();
+
+        self::assertEquals(
+            [
+                ['Id' => 1, 'Name' => 'name', 'Active' => true],
+                ['Id' => 2, 'Name' => 'name', 'Active' => false],
+            ],
+            \iterator_to_array($ds)
+        );
+    }
+
+    public function test_rename_all_upper_case_word() : void
+    {
+        $rows = rows(row(int_entry('id', 1), str_entry('name', 'name'), bool_entry('active', true)), row(int_entry('id', 2), str_entry('name', 'name'), bool_entry('active', false)));
+
+        $ds = df()
+            ->read(from_rows($rows))
+            ->transform(new RenameAllCaseTransformer(ucwords: true))
+            ->getEachAsArray();
+
+        self::assertEquals(
+            [
+                ['Id' => 1, 'Name' => 'name', 'Active' => true],
+                ['Id' => 2, 'Name' => 'name', 'Active' => false],
+            ],
+            \iterator_to_array($ds)
+        );
+    }
+
+    public function test_rename_all_upper_case_word_i18n() : void
+    {
+        $rows = rows(row(int_entry('ósmy', 8)), row(int_entry('dziewiąty', 9)));
+
+        $ds = df()
+            ->read(from_rows($rows))
+            ->transform(new RenameAllCaseTransformer(ucwords: true))
+            ->getEachAsArray();
+
+        self::assertEquals(
+            [
+                ['Ósmy' => 8],
+                ['Dziewiąty' => 9],
+            ],
+            \iterator_to_array($ds)
+        );
+    }
+}
diff --git a/src/core/etl/tests/Flow/ETL/Tests/Integration/DataFrame/RenameStrReplaceAllCaseTransformerTest.php b/src/core/etl/tests/Flow/ETL/Tests/Integration/DataFrame/RenameStrReplaceAllCaseTransformerTest.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Flow\ETL\Tests\Integration\DataFrame;
+
+use function Flow\ETL\DSL\{df, from_rows, json_entry, ref};
+use function Flow\ETL\DSL\{row, rows};
+use Flow\ETL\Tests\FlowIntegrationTestCase;
+use Flow\ETL\Transformer\{RenameStrReplaceAllEntriesTransformer};
+use PHPUnit\Framework\Attributes\{IgnoreDeprecations};
+
+#[IgnoreDeprecations]
+final class RenameStrReplaceAllCaseTransformerTest extends FlowIntegrationTestCase
+{
+    public function test_rename_all() : void
+    {
+        $rows = rows(row(json_entry('array', ['id' => 1, 'name' => 'name', 'active' => true])), row(json_entry('array', ['id' => 2, 'name' => 'name', 'active' => false])));
+
+        $ds = df()
+            ->read(from_rows($rows))
+            ->withEntry('row', ref('array')->unpack())
+            ->transform(new RenameStrReplaceAllEntriesTransformer('row.', ''))
+            ->drop('array')
+            ->getEachAsArray();
+
+        self::assertEquals(
+            [
+                ['id' => 1, 'name' => 'name', 'active' => true],
+                ['id' => 2, 'name' => 'name', 'active' => false],
+            ],
+            \iterator_to_array($ds)
+        );
+    }
+}
diff --git a/src/core/etl/tests/Flow/ETL/Tests/Integration/DataFrame/RenameTest.php b/src/core/etl/tests/Flow/ETL/Tests/Integration/DataFrame/RenameTest.php
diff --git a/web/landing/resources/dsl.json b/web/landing/resources/dsl.json

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`Schema\SchemaFormatter,`
`37`	`37`	`Transformation,`
`38`	`38`	`Transformer,`
`39`		`- Transformer\StyleConverter\Style,`
	`39`	`+ Transformer\Rename\Style,`
`40`	`40`	`Window,`
`41`	`41`	`WithEntry};`
`42`	`42`	`use Flow\ETL\ErrorHandler\{IgnoreError, SkipRows, ThrowError};`
`@@ -349,21 +349,21 @@ function to_branch(ScalarFunction $condition, Loader $loader) : Loader\Branching`
`349`	`349`	`}`
`350`	`350`
`351`	`351`	`#[DocumentationDSL(module: Module::CORE, type: DSLType::TRANSFORMER)]`
`352`		`-function rename_style(Style $style) : Transformer\StyleConverter\RenameCaseEntryStrategy`
	`352`	`+function rename_style(Style $style) : Transformer\Rename\RenameCaseEntryStrategy`
`353`	`353`	`{`
`354`		`- return new Transformer\StyleConverter\RenameCaseEntryStrategy($style);`
	`354`	`+ return new Transformer\Rename\RenameCaseEntryStrategy($style);`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`#[DocumentationDSL(module: Module::CORE, type: DSLType::TRANSFORMER)]`
`358`		`-function rename_replace(string $search, string $replace) : Transformer\StyleConverter\RenameReplaceEntryStrategy`
	`358`	`+function rename_replace(string $search, string $replace) : Transformer\Rename\RenameReplaceEntryStrategy`
`359`	`359`	`{`
`360`		`- return new Transformer\StyleConverter\RenameReplaceEntryStrategy($search, $replace);`
	`360`	`+ return new Transformer\Rename\RenameReplaceEntryStrategy($search, $replace);`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`#[DocumentationDSL(module: Module::CORE, type: DSLType::TRANSFORMER)]`
`364`		`-function rename_transliterate(string $transliterator = 'Any-Latin; Latin-ASCII; Lower()') : Transformer\StyleConverter\RenameTransliterateEntryStrategy`
	`364`	`+function rename_transliterate(string $transliterator = 'Any-Latin; Latin-ASCII; Lower()') : Transformer\Rename\RenameTransliterateEntryStrategy`
`365`	`365`	`{`
`366`		`- return new Transformer\StyleConverter\RenameTransliterateEntryStrategy($transliterator);`
	`366`	`+ return new Transformer\Rename\RenameTransliterateEntryStrategy($transliterator);`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`#[DocumentationDSL(module: Module::CORE, type: DSLType::ENTRY)]`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-namespace Flow\ETL\Transformer\StyleConverter;`
	`5`	`+namespace Flow\ETL\Transformer\Rename;`
`6`	`6`
`7`	`7`	`enum Style : string`
`8`	`8`	`{`