Simplify context

Author: SerafimArts

src/Context/ChildContext.php

@@ -16,15 +16,14 @@ final class ChildContext extends Context
 {
     protected function __construct(
         public readonly Context $parent,
-        private readonly EntryInterface $entry,
+        public readonly EntryInterface $entry,
         mixed $value,
         Direction $direction,
         Configuration $config,
         TypeExtractorInterface $extractor,
         TypeParserInterface $parser,
         TypeRepositoryInterface $types,
-        private readonly ?bool $overrideStrictTypes = null,
-        private readonly ?bool $overrideObjectAsArray = null,
+        public readonly ?Configuration $override = null,
     ) {
         parent::__construct(
             value: $value,
@@ -39,31 +38,18 @@ protected function __construct(
     #[\Override]
     public function isStrictTypesEnabled(): bool
     {
-        return $this->overrideStrictTypes
+        return $this->override?->isStrictTypesEnabled()
             ?? parent::isStrictTypesEnabled();
     }
 
     #[\Override]
     public function isObjectAsArray(): bool
     {
-        return $this->overrideObjectAsArray
+        return $this->override?->isObjectAsArray()
             ?? parent::isObjectAsArray();
     }
 
-    /**
-     * Gets parent context
-     *
-     * @api
-     */
-    public function getParent(): Context
-    {
-        return $this->parent;
-    }
-
-    /**
-     * @return iterable<array-key, Context>
-     */
-    private function getStack(): iterable
+    public function getIterator(): \Traversable
     {
         yield $current = $this;
 
@@ -76,7 +62,7 @@ public function getPath(): PathInterface
     {
         $entries = [];
 
-        foreach ($this->getStack() as $context) {
+        foreach ($this as $context) {
             if ($context instanceof self) {
                 $entries[] = $context->entry;
             }

src/Context/Context.php

@@ -14,29 +14,30 @@
 use TypeLang\Mapper\Type\TypeInterface;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 
+/**
+ * @template-implements \IteratorAggregate<array-key, Context>
+ */
 abstract class Context implements
     TypeExtractorInterface,
     TypeParserInterface,
-    TypeRepositoryInterface
+    TypeRepositoryInterface,
+    \IteratorAggregate,
+    \Countable
 {
     protected function __construct(
-        protected readonly mixed $value,
-        protected readonly Direction $direction,
-        protected readonly Configuration $config,
-        protected readonly TypeExtractorInterface $extractor,
-        protected readonly TypeParserInterface $parser,
-        protected readonly TypeRepositoryInterface $types,
+        public readonly mixed $value,
+        public readonly Direction $direction,
+        public readonly Configuration $config,
+        public readonly TypeExtractorInterface $extractor,
+        public readonly TypeParserInterface $parser,
+        public readonly TypeRepositoryInterface $types,
     ) {}
 
     /**
      * Creates new child context.
      */
-    public function enter(
-        mixed $value,
-        EntryInterface $entry,
-        ?bool $strictTypes = null,
-        ?bool $objectAsArray = null,
-    ): self {
+    public function enter(mixed $value, EntryInterface $entry, ?Configuration $override = null): self
+    {
         return new ChildContext(
             parent: $this,
             entry: $entry,
@@ -46,16 +47,10 @@ public function enter(
             extractor: $this->extractor,
             parser: $this->parser,
             types: $this->types,
-            overrideStrictTypes: $strictTypes,
-            overrideObjectAsArray: $objectAsArray,
+            override: $override,
         );
     }
 
-    public function getValue(): mixed
-    {
-        return $this->value;
-    }
-
     public function isObjectAsArray(): bool
     {
         return $this->config->isObjectAsArray();
@@ -127,7 +122,15 @@ public function getStatementByValue(mixed $value): TypeStatement
     public function getTypeByValue(mixed $value): TypeInterface
     {
         return $this->types->getTypeByStatement(
-            statement: $this->getStatementByValue($value)
+            statement: $this->getStatementByValue($value),
         );
     }
+
+    /**
+     * @return int<1, max>
+     */
+    public function count(): int
+    {
+        return \iterator_count($this);
+    }
 }

src/Context/RootContext.php

@@ -71,4 +71,9 @@ public function getPath(): PathInterface
     {
         return $this->path ??= new Path();
     }
+
+    public function getIterator(): \Traversable
+    {
+        yield $this;
+    }
 }

src/Type/ClassTypeFromArrayType.php

@@ -121,7 +121,7 @@ private function denormalizeObject(array $value, object $object, Context $contex
             $entrance = $context->enter(
                 value: $value,
                 entry: new ObjectPropertyEntry($meta->alias),
-                strictTypes: $meta->write->strict,
+                override: $context->config->withStrictTypes($meta->write->strict)
             );
 
             // Skip the property when not writable

src/Type/ClassTypeToArrayType.php

@@ -77,7 +77,7 @@ protected function normalizeObject(object $object, Context $context): array
             $entrance = $context->enter(
                 value: $object,
                 entry: new ObjectPropertyEntry($meta->name),
-                strictTypes: $meta->read->strict,
+                override: $context->config->withStrictTypes($meta->read->strict),
             );
 
             // Skip the property when not readable