Fixes

Author: danog

tools/FileRefExtractor/BuildMode/Ast.php

@@ -42,7 +42,6 @@ final class Ast implements BuildMode
     private ?string $needsParent = null;
 
     public function __construct(
-        public readonly bool $allowBackrefs,
         public readonly bool $allowUnpacking,
         private array $outputSchema = []
     ) {
@@ -159,9 +158,6 @@ public function getNeedsParent(): ?string
 
     public function setNeedsParent(string $needsParent): void
     {
-        if (!$this->allowBackrefs) {
-            throw new \LogicException('Cannot set needsParent when backreferences are not allowed.');
-        }
         if ($this->needsParent !== null && $this->needsParent !== $needsParent) {
             throw new \LogicException("Cannot change needsParent from {$this->needsParent} to {$needsParent} once it has been set.");
         }

tools/FileRefExtractor/Path.php

@@ -31,7 +31,7 @@
     public function __construct(
         /** @var list<list{0: string, 1: string, 2?: int-mask-of<self::FLAG_*>|TypedOp}> */
         public array $path,
-        public ?bool $isFromParent = null,
+        public bool $isFromParent = false,
     ) {
         foreach ($path as $k => $elem) {
             if (\count($elem) !== 2 && \count($elem) !== 3) {
@@ -57,7 +57,6 @@ public function __construct(
 
     public function normalize(array $stack, string $current, bool $ignoreFlag): ?self
     {
-        Assert::null($this->isFromParent, 'Already normalized');
         $new = [];
         foreach ($this->path as $i => $part) {
             if ($ignoreFlag && \array_key_exists(2, $part) && \is_int($part[2]) && ($part[2] & self::FLAG_IF_ABSENT_ABORT)) {
@@ -72,17 +71,18 @@ public function normalize(array $stack, string $current, bool $ignoreFlag): ?sel
             }
             $new[$i] = $part;
         }
-        if ($current === $this->path[0][0]) {
-            return new self(
-                [...$stack, ...$new],
-                false,
-            );
-        }
-        // From parent
-        if ($stack[0][0] === $this->path[0][0]) {
-            return new static($new, true);
+        if ($this->isFromParent) {
+            // From parent
+            if ($stack[0][0] === $this->path[0][0]) {
+                return new static($new, true);
+            }
+            return null;
         }
-        return null;
+        Assert::eq($this->path[0][0], $current);
+        return new self(
+            [...$stack, ...$new],
+            false,
+        );
     }
 
     public function buildPath(TLContext $tl, string $extractor): array
@@ -166,7 +166,6 @@ public function buildPath(TLContext $tl, string $extractor): array
                 'type' => $type,
             ];
         }
-        Assert::notNull($this->isFromParent, 'Not normalized');
         if ($this->isFromParent) {
             $tl->buildMode->setNeedsParent($this->path[0][0]);
         }

tools/FileRefExtractor/TLWrapper.php

@@ -19,7 +19,6 @@
 namespace danog\MadelineProto\FileRefExtractor;
 
 use danog\MadelineProto\TL\TL;
-use danog\MadelineProto\TL\TLInterface;
 use Webmozart\Assert\Assert;
 
 final class TLWrapper

tools/gen_filerefmap.php

@@ -11,7 +11,6 @@
 use danog\MadelineProto\FileRefExtractor\Ops\GetInputStickerSet;
 use danog\MadelineProto\FileRefExtractor\Ops\GetInputUserOp;
 use danog\MadelineProto\FileRefExtractor\Ops\GetMessageOp;
-use danog\MadelineProto\FileRefExtractor\Ops\GetStickerSetFromDocumentAttributesOp;
 use danog\MadelineProto\FileRefExtractor\Ops\Noop;
 use danog\MadelineProto\FileRefExtractor\Ops\PrimitiveLiteralOp;
 use danog\MadelineProto\FileRefExtractor\Ops\ThemeFormatOp;
@@ -59,7 +58,7 @@
             'stories.getStoriesByID',
             [
                 'id' => new ArrayOp(new CopyOp([['storyItem', 'id']])),
-                'peer' => new GetInputPeerOp(new Path([[$method, 'peer']])),
+                'peer' => new GetInputPeerOp(new Path([[$method, 'peer']], true)),
             ],
             'fileSourceStory'
         );
@@ -112,7 +111,7 @@
     'stories.getStoriesByID',
     [
         'id' => new ArrayOp(new CopyOp([['storyItem', 'id']])),
-        'peer' => new GetInputPeerOp(new Path([['peerStories', 'peer']])),
+        'peer' => new GetInputPeerOp(new Path([['peerStories', 'peer']], true)),
     ],
     'fileSourceStory'
 );
@@ -163,7 +162,7 @@
 $locations['channelAdminLogEvent'][] = new CallOp(
     'channels.getAdminLog',
     [
-        'channel' => new GetInputChannelOp(new Path([['channels.getAdminLog', 'channel']])),
+        'channel' => new GetInputChannelOp(new Path([['channels.getAdminLog', 'channel']], true)),
         'max_id' => new CopyOp([['channelAdminLogEvent', 'id']]),
         'min_id' => new CopyOp([['channelAdminLogEvent', 'id']]),
         'limit' => new PrimitiveLiteralOp('int', 1),
@@ -248,7 +247,7 @@
         'payments.getStarsTransactionsByID',
         [
             'peer' => new CopyOp([[$method, 'peer']]),
-            ...($method === 'payments.getStarsSubscriptions' ? [] : ['ton' => new CopyOp([[$method, 'ton', Path::FLAG_PASSTHROUGH]])]),
+            ...($method === 'payments.getStarsSubscriptions' ? [] : ['ton' => new CopyOp(new Path([[$method, 'ton', Path::FLAG_PASSTHROUGH]], true))]),
             'id' => new ArrayOp(new ConstructorOp(
                 'inputStarsTransaction',
                 [
@@ -356,7 +355,7 @@
 $locations['photo'][] = new CallOp(
     'photos.getUserPhotos',
     [
-        'user_id' => new CopyOp([['photos.getUserPhotos', 'user_id']]),
+        'user_id' => new CopyOp(new Path([['photos.getUserPhotos', 'user_id']], true)),
         'offset' => new PrimitiveLiteralOp('int', -1),
         'max_id' => new CopyOp([['photo', 'id']]),
         'limit' => new PrimitiveLiteralOp('int', 1),
@@ -512,7 +511,7 @@
 
 $validated = [];
 
-$tmp = new Ast(allowBackrefs: true, allowUnpacking: true, outputSchema: $pre);
+$tmp = new Ast(allowUnpacking: true, outputSchema: $pre);
 foreach (['Document' => 'document', 'Photo' => 'photo'] as $type => $constructor) {
     $stack = [[$constructor, 'file_reference']];
     $stackTypes = [$type => 1];
@@ -600,7 +599,7 @@ static function (array $stack) use ($locations, $TL, $tmp, &$validated, $storyMe
     throw new AssertionError("Leftover ops!");
 }
 
-$output = new Ast(allowBackrefs: true, allowUnpacking: false, outputSchema: $pre);
+$output = new Ast(allowUnpacking: false, outputSchema: $pre);
 foreach ($locations as $constructor => $ops) {
     foreach ($ops as $idx => $op) {
         $op->build(new TLContext($TL, $output, $constructor, $TL->isConstructor($constructor)));