Fixes

Author: danog

tools/FileRefExtractor/BuildMode/Ast.php

@@ -90,31 +90,44 @@ public function addNode(TLContext $ctx, ?array $action = null, ?string $why = nu
             $constructor = $action['stored_constructor'];
 
             $names = $this->storedNames;
+            $flags = [];
             if ($this->storedFlags) {
+                foreach ($names as $name => $type) {
+                    if (str_starts_with($type, 'flags.')) {
+                        $flags[$name] = $type;
+                    }
+                }
                 $names = [
                     'flags' => '#',
                     ...$names
                 ];
             }
 
             if (isset($this->outputSchema[$constructor])) {
-                foreach ($this->outputSchema[$constructor] as $name => $type) {
+                $existing = $this->outputSchema[$constructor];
+                foreach ($existing as $name => $type) {
+                    if (str_starts_with($type, 'flags.')) {
+                        if (isset($flags[$name])) {
+                            unset($flags[$name], $names[$name]);
+                        }
+                    }
+                }
+                if ($flags) {
+                    throw new AssertionError("Have leftover flags: ".implode(' ', $flags));
+                }
+                foreach ($existing as $name => $type) {
                     if (isset($names[$name])) {
                         if ($names[$name] === $type) {
                             unset($names[$name]);
                         } else {
                             throw new AssertionError("Type mismatch for $constructor.$name: have {$names[$name]}, need $type");
                         }
-                    } else if (str_starts_with($type, 'flags.')) {
-                        if ($this->storedFlags) {
-                            throw new AssertionError("Have conflicting flag $constructor.$name:$type; new schema is ".self::stringifySchema($constructor, $names));
-                        }
-                    } elseif ($name !== 'flags') {
+                    } elseif (!str_starts_with($type, 'flags.') && $name !== 'flags') {
                         throw new AssertionError("Missing pre-existing parameter $constructor.$name for $constructor");
                     }
                 }
                 foreach ($names as $name => $type) {
-                    throw new AssertionError("Leftover parameter $constructor.$name:$type for $constructor");
+                    throw new AssertionError("Leftover parameter $constructor.$name:$type for ".self::stringifySchema($constructor, $existing));
                 }
             } else {
                 $this->outputSchema[$constructor] = $names;

tools/gen_filerefmap.php

@@ -503,8 +503,10 @@
     ],
     'fileSourceStarsTransaction' => [
         'flags' => '#',
+        'peer' => 'InputPeer',
         'id' => 'string',
         'refund' => 'flags.0?true',
+        'ton' => 'flags.1?true',
     ]
 ];