Turned EntryReference into Reference and removed redundant interface

src/adapter/etl-adapter-chartjs/src/Flow/ETL/Adapter/ChartJS/Chart.php

@@ -4,7 +4,7 @@
 
 namespace Flow\ETL\Adapter\ChartJS;
 
-use Flow\ETL\Row\EntryReference;
+use Flow\ETL\Row\Reference;
 use Flow\ETL\Rows;
 
 interface Chart
@@ -13,7 +13,7 @@ public function collect(Rows $rows) : void;
 
     public function data() : array;
 
-    public function setDatasetOptions(EntryReference $dataset, array $options) : self;
+    public function setDatasetOptions(Reference $dataset, array $options) : self;
 
     public function setOptions(array $options) : self;
 }

src/adapter/etl-adapter-chartjs/src/Flow/ETL/Adapter/ChartJS/functions.php

@@ -6,23 +6,23 @@
 
 use Flow\ETL\Adapter\ChartJS\Chart\{BarChart, LineChart, PieChart};
 use Flow\ETL\Attribute\{DocumentationDSL, Module, Type};
-use Flow\ETL\Row\{EntryReference, References};
+use Flow\ETL\Row\{Reference, References};
 use Flow\Filesystem\Path;
 
 #[DocumentationDSL(module: Module::CHART_JS, type: Type::HELPER)]
-function bar_chart(EntryReference $label, References $datasets) : BarChart
+function bar_chart(Reference $label, References $datasets) : BarChart
 {
     return new BarChart($label, $datasets);
 }
 
 #[DocumentationDSL(module: Module::CHART_JS, type: Type::HELPER)]
-function line_chart(EntryReference $label, References $datasets) : LineChart
+function line_chart(Reference $label, References $datasets) : LineChart
 {
     return new LineChart($label, $datasets);
 }
 
 #[DocumentationDSL(module: Module::CHART_JS, type: Type::HELPER)]
-function pie_chart(EntryReference $label, References $datasets) : PieChart
+function pie_chart(Reference $label, References $datasets) : PieChart
 {
     return new PieChart($label, $datasets);
 }

src/adapter/etl-adapter-doctrine/src/Flow/ETL/Adapter/Doctrine/Parameter.php

@@ -5,29 +5,29 @@
 namespace Flow\ETL\Adapter\Doctrine;
 
 use Doctrine\DBAL\ArrayParameterType;
-use Flow\ETL\Row\EntryReference;
+use Flow\ETL\Row\Reference;
 use Flow\ETL\Rows;
 
 final class Parameter implements QueryParameter
 {
     public function __construct(
         private readonly string $queryParamName,
-        private readonly EntryReference $ref,
+        private readonly Reference $ref,
         private readonly int|ArrayParameterType $type = ArrayParameterType::STRING,
     ) {
     }
 
-    public static function asciis(string $queryParamName, EntryReference $ref) : self
+    public static function asciis(string $queryParamName, Reference $ref) : self
     {
         return new self($queryParamName, $ref, ArrayParameterType::ASCII);
     }
 
-    public static function ints(string $queryParamName, EntryReference $ref) : self
+    public static function ints(string $queryParamName, Reference $ref) : self
     {
         return new self($queryParamName, $ref, ArrayParameterType::INTEGER);
     }
 
-    public static function strings(string $queryParamName, EntryReference $ref) : self
+    public static function strings(string $queryParamName, Reference $ref) : self
     {
         return new self($queryParamName, $ref, ArrayParameterType::STRING);
     }

src/core/etl/src/Flow/ETL/DSL/functions.php

@@ -95,7 +95,7 @@
 use Flow\ETL\Row\Factory\NativeEntryFactory;
 use Flow\ETL\Row\Schema\Formatter\ASCIISchemaFormatter;
 use Flow\ETL\Row\Schema\{Definition, Matcher\EvolvingSchemaMatcher, Matcher\StrictSchemaMatcher, SchemaFormatter};
-use Flow\ETL\Row\{Entry, EntryFactory, EntryReference, Reference, References, Schema};
+use Flow\ETL\Row\{Entry, EntryFactory, Reference, References, Schema};
 use Flow\ETL\{Attribute\DocumentationDSL,
     Attribute\DocumentationExample,
     Attribute\Module,
@@ -647,26 +647,26 @@ function rows_partitioned(array $rows, array|Partitions $partitions) : Rows
  * An alias for `ref`.
  */
 #[DocumentationDSL(module: Module::CORE, type: DSLType::DATA_FRAME)]
-function col(string $entry) : EntryReference
+function col(string $entry) : Reference
 {
-    return new EntryReference($entry);
+    return new Reference($entry);
 }
 
 /**
  * An alias for `ref`.
  */
 #[DocumentationDSL(module: Module::CORE, type: DSLType::SCALAR_FUNCTION)]
 #[DocumentationExample(topic: 'data_frame', example: 'create_entries')]
-function entry(string $entry) : EntryReference
+function entry(string $entry) : Reference
 {
-    return new EntryReference($entry);
+    return new Reference($entry);
 }
 
 #[DocumentationDSL(module: Module::CORE, type: DSLType::SCALAR_FUNCTION)]
 #[DocumentationExample(topic: 'data_frame', example: 'create_entries')]
-function ref(string $entry) : EntryReference
+function ref(string $entry) : Reference
 {
-    return new EntryReference($entry);
+    return new Reference($entry);
 }
 
 #[DocumentationDSL(module: Module::CORE, type: DSLType::SCALAR_FUNCTION)]
@@ -837,7 +837,7 @@ function cast(mixed $value, ScalarFunction|string|Type $type) : Cast
 }
 
 #[DocumentationDSL(module: Module::CORE, type: DSLType::AGGREGATING_FUNCTION)]
-function count(EntryReference $function) : Count
+function count(Reference $function) : Count
 {
     return new Count($function);
 }
@@ -1135,19 +1135,19 @@ function dense_rank() : DenseRank
 }
 
 #[DocumentationDSL(module: Module::CORE, type: DSLType::AGGREGATING_FUNCTION)]
-function average(EntryReference|string $ref) : Average
+function average(Reference|string $ref) : Average
 {
     return new Average(is_string($ref) ? ref($ref) : $ref);
 }
 
 #[DocumentationDSL(module: Module::CORE, type: DSLType::AGGREGATING_FUNCTION)]
-function collect(EntryReference|string $ref) : Collect
+function collect(Reference|string $ref) : Collect
 {
     return new Collect(is_string($ref) ? ref($ref) : $ref);
 }
 
 #[DocumentationDSL(module: Module::CORE, type: DSLType::AGGREGATING_FUNCTION)]
-function collect_unique(EntryReference|string $ref) : CollectUnique
+function collect_unique(Reference|string $ref) : CollectUnique
 {
     return new CollectUnique(is_string($ref) ? ref($ref) : $ref);
 }
@@ -1159,31 +1159,31 @@ function window() : Window
 }
 
 #[DocumentationDSL(module: Module::CORE, type: DSLType::AGGREGATING_FUNCTION)]
-function sum(EntryReference|string $ref) : Sum
+function sum(Reference|string $ref) : Sum
 {
     return new Sum(is_string($ref) ? ref($ref) : $ref);
 }
 
 #[DocumentationDSL(module: Module::CORE, type: DSLType::AGGREGATING_FUNCTION)]
-function first(EntryReference|string $ref) : First
+function first(Reference|string $ref) : First
 {
     return new First(is_string($ref) ? ref($ref) : $ref);
 }
 
 #[DocumentationDSL(module: Module::CORE, type: DSLType::AGGREGATING_FUNCTION)]
-function last(EntryReference|string $ref) : Last
+function last(Reference|string $ref) : Last
 {
     return new Last(is_string($ref) ? ref($ref) : $ref);
 }
 
 #[DocumentationDSL(module: Module::CORE, type: DSLType::AGGREGATING_FUNCTION)]
-function max(EntryReference|string $ref) : Max
+function max(Reference|string $ref) : Max
 {
     return new Max(is_string($ref) ? ref($ref) : $ref);
 }
 
 #[DocumentationDSL(module: Module::CORE, type: DSLType::AGGREGATING_FUNCTION)]
-function min(EntryReference|string $ref) : Min
+function min(Reference|string $ref) : Min
 {
     return new Min(is_string($ref) ? ref($ref) : $ref);
 }

src/core/etl/src/Flow/ETL/Function/ListSelect.php

@@ -6,7 +6,7 @@
 
 use Flow\ETL\Row;
 use Flow\ETL\Row\Entry\ListEntry;
-use Flow\ETL\Row\{EntryReference, Reference, References};
+use Flow\ETL\Row\{Reference, References};
 
 final class ListSelect implements ScalarFunction
 {
@@ -18,7 +18,7 @@ public function __construct(
         Reference|string $ref,
         Reference|string ...$refs,
     ) {
-        $this->ref = EntryReference::init($ref);
+        $this->ref = Reference::init($ref);
         $this->refs = References::init(...$refs);
     }
 

src/core/etl/src/Flow/ETL/Function/StructureSelect.php

@@ -6,7 +6,7 @@
 
 use Flow\ETL\Row;
 use Flow\ETL\Row\Entry\StructureEntry;
-use Flow\ETL\Row\{EntryReference, Reference, References};
+use Flow\ETL\Row\{Reference, References};
 
 final class StructureSelect implements ScalarFunction
 {
@@ -18,7 +18,7 @@ public function __construct(
         Reference|string $ref,
         Reference|string ...$refs,
     ) {
-        $this->ref = EntryReference::init($ref);
+        $this->ref = Reference::init($ref);
         $this->refs = References::init(...$refs);
     }
 

src/core/etl/src/Flow/ETL/Join/Comparison/Equal.php

@@ -6,7 +6,7 @@
 
 use Flow\ETL\Join\Comparison;
 use Flow\ETL\Row;
-use Flow\ETL\Row\{EntryReference, Reference};
+use Flow\ETL\Row\{Reference};
 
 final class Equal implements Comparison
 {
@@ -26,14 +26,14 @@ public function compare(Row $left, Row $right) : bool
      */
     public function left() : array
     {
-        return [\is_string($this->entryLeft) ? EntryReference::init($this->entryLeft) : $this->entryLeft];
+        return [\is_string($this->entryLeft) ? Reference::init($this->entryLeft) : $this->entryLeft];
     }
 
     /**
      * @return array<Reference>
      */
     public function right() : array
     {
-        return [\is_string($this->entryRight) ? EntryReference::init($this->entryRight) : $this->entryRight];
+        return [\is_string($this->entryRight) ? Reference::init($this->entryRight) : $this->entryRight];
     }
 }

src/core/etl/src/Flow/ETL/Join/Comparison/Identical.php

@@ -6,7 +6,7 @@
 
 use Flow\ETL\Join\Comparison;
 use Flow\ETL\Row;
-use Flow\ETL\Row\{EntryReference, Reference};
+use Flow\ETL\Row\{Reference};
 
 final class Identical implements Comparison
 {
@@ -26,14 +26,14 @@ public function compare(Row $left, Row $right) : bool
      */
     public function left() : array
     {
-        return [\is_string($this->entryLeft) ? EntryReference::init($this->entryLeft) : $this->entryLeft];
+        return [\is_string($this->entryLeft) ? Reference::init($this->entryLeft) : $this->entryLeft];
     }
 
     /**
      * @return array<Reference>
      */
     public function right() : array
     {
-        return [\is_string($this->entryRight) ? EntryReference::init($this->entryRight) : $this->entryRight];
+        return [\is_string($this->entryRight) ? Reference::init($this->entryRight) : $this->entryRight];
     }
 }

src/core/etl/src/Flow/ETL/Row/Entry/EntryRef.php

@@ -4,7 +4,7 @@
 
 namespace Flow\ETL\Row\Entry;
 
-use Flow\ETL\Row\{EntryReference, Reference};
+use Flow\ETL\Row\{Reference};
 
 trait EntryRef
 {
@@ -15,7 +15,7 @@ abstract public function name() : string;
     public function ref() : Reference
     {
         if ($this->ref === null) {
-            $this->ref = new EntryReference($this->name());
+            $this->ref = new Reference($this->name());
         }
 
         return $this->ref;