Enforce instance of EntryFactory in the join methods

Author: stloyd

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

@@ -203,6 +203,7 @@
     UnionType
 };
 use Flow\Types\Type\Types;
+use Flow\Types\Value\HTMLDocument;
 use UnitEnum;
 
 /**
@@ -1957,6 +1958,15 @@ function json_schema(string $name, bool $nullable = false, ?Metadata $metadata =
     return Definition::json($name, $nullable, $metadata);
 }
 
+/**
+ * @return Definition<HTMLDocument>
+ */
+#[DocumentationDSL(module: Module::CORE, type: DSLType::SCHEMA)]
+function html_schema(string $name, bool $nullable = false, ?Metadata $metadata = null) : Definition
+{
+    return Definition::html($name, $nullable, $metadata);
+}
+
 /**
  * @return Definition<\DOMDocument>
  */

src/core/etl/src/Flow/ETL/Row/EntryFactory.php

@@ -14,7 +14,6 @@ enum_entry,
     json_object_entry,
     list_entry,
     map_entry,
-    str_entry,
     string_entry,
     struct_entry,
     time_entry,
@@ -156,7 +155,7 @@ public function createAs(string $entryName, mixed $value, Definition|Type $defin
 
         if (null === $value && $type instanceof OptionalType) {
             return match ($type->base()::class) {
-                StringType::class => str_entry($entryName, null, $metadata),
+                StringType::class => string_entry($entryName, null, $metadata),
                 IntegerType::class => int_entry($entryName, null, $metadata),
                 FloatType::class => float_entry($entryName, null, $metadata),
                 BooleanType::class => bool_entry($entryName, null, $metadata),
@@ -186,7 +185,7 @@ public function createAs(string $entryName, mixed $value, Definition|Type $defin
             }
 
             if ($type instanceof StringType) {
-                return str_entry($entryName, type_optional($type)->cast($value), $metadata);
+                return string_entry($entryName, type_optional($type)->cast($value), $metadata);
             }
 
             if ($type instanceof IntegerType) {

src/core/etl/src/Flow/ETL/Schema/Formatter/PHPSchemaFormatter.php

@@ -115,6 +115,7 @@ private function formatSchema(Schema $schema, int $level = 1) : string
                 TimeType::class,
                 JsonType::class,
                 UuidType::class,
+                HTMLType::class,
                 XMLType::class,
                 XMLElementType::class,
                 DateTimeType::class => $this->simpleType($definition),

src/core/etl/tests/Flow/ETL/Tests/Unit/Schema/Formatter/PHPSchemaFormatterTest.php

@@ -9,6 +9,7 @@
     datetime_schema,
     enum_schema,
     float_schema,
+    html_schema,
     int_schema,
     json_schema,
     list_schema,
@@ -107,6 +108,7 @@ public function test_formatting_simple_schema() : void
     \\Flow\\ETL\\DSL\\uuid_schema("uuid", nullable: true, metadata: \\Flow\\ETL\\DSL\\schema_metadata()),
     \\Flow\\ETL\\DSL\\xml_schema("xml", nullable: true, metadata: \\Flow\\ETL\\DSL\\schema_metadata()),
     \\Flow\\ETL\\DSL\\xml_element_schema("xml_element", nullable: true, metadata: \\Flow\\ETL\\DSL\\schema_metadata()),
+    \\Flow\\ETL\\DSL\\html_schema("html", nullable: true, metadata: \\Flow\\ETL\\DSL\\schema_metadata()),
 );
 PHP,
             (new PHPSchemaFormatter())->format(schema(
@@ -120,6 +122,7 @@ public function test_formatting_simple_schema() : void
                 uuid_schema('uuid', nullable: true),
                 xml_schema('xml', nullable: true),
                 xml_element_schema('xml_element', nullable: true),
+                html_schema('html', nullable: true),
             ))
         );
     }

src/lib/types/src/Flow/Types/Type/Logical/NonEmptyStringType.php

@@ -50,7 +50,7 @@ public function cast(mixed $value) : string
             }
 
             if ($value instanceof \DOMDocument) {
-                return $this->assert(($value->saveXML($value->documentElement) ?: $value->saveHtml($value->documentElement)) ?: '');
+                return $this->assert($value->saveXML($value->documentElement) ?: '');
             }
 
             if ($value instanceof \DOMElement) {

src/lib/types/src/Flow/Types/Type/Logical/XMLType.php

@@ -4,7 +4,7 @@
 
 namespace Flow\Types\Type\Logical;
 
-use function Flow\Types\DSL\type_string;
+use function Flow\Types\DSL\{type_string, type_xml};
 use Flow\Types\Exception\{CastingException, InvalidTypeException};
 use Flow\Types\Type;
 
@@ -28,24 +28,26 @@ public function cast(mixed $value) : \DOMDocument
             return $value;
         }
 
-        $document = new \DOMDocument();
-
         if (\is_string($value)) {
-            if (!$this->isXml($document, $value)) {
-                throw new CastingException($value, $this);
+            $doc = new \DOMDocument();
+
+            if (!@$doc->loadXML($value)) {
+                throw new CastingException($value, type_xml());
             }
 
-            return $document;
+            return $doc;
         }
 
         try {
             $stringValue = type_string()->cast($value);
 
-            if (!$this->isXml($document, $stringValue)) {
+            $doc = new \DOMDocument();
+
+            if (!@$doc->loadXML((string) $stringValue)) {
                 throw new CastingException($stringValue, $this);
             }
 
-            return $document;
+            return $doc;
         } catch (CastingException $e) {
             throw new CastingException($value, $this, $e);
         }
@@ -54,7 +56,7 @@ public function cast(mixed $value) : \DOMDocument
     public function isValid(mixed $value) : bool
     {
         if ($value instanceof \DOMDocument) {
-            return $this->isXml($value, (string) $value->saveXML());
+            return true;
         }
 
         return false;
@@ -71,9 +73,4 @@ public function toString() : string
     {
         return 'xml';
     }
-
-    private function isXml(\DOMDocument $document, string $value) : bool
-    {
-        return (bool) @$document->loadXML($value);
-    }
 }