Simplify

Author: danog

schemas

@@ -1,15 +1,16 @@
 // Root
-fileReferenceOrigins#fe633fe7 db_schema:string db_schema_json:string ctxs:Vector<Origin> = FileReferenceOrigins;
+fileReferenceOrigins#45a1a693 db_schema:string db_schema_json:string ctxs:Vector<Origin> skipped:Vector<SkippedOrigin>= FileReferenceOrigins;
 
-origin#72cc7c04 flags:# predicate:string is_constructor:flags.0?true action:ActionOp needs_parent:flags.3?string parent_is_constructor:flags.4?true = origin;
+origin#24443b33 flags:# predicate:string is_constructor:flags.0?true action:ActionOp stored_constructor:string skipped_flags:Vector<string> needs_parent:flags.3?string parent_is_constructor:flags.4?true = origin;
 
-// For string => TypedOp dictionaries
-typedOpArg#3a2930c2 key:string value:TypedOp = TypedOpArg;
+skippedOrigin#7c62809e flags:# predicate:string is_constructor:flags.0?true why:string = SkippedOrigin;
 
 // Actions
-callOp#95a107ea method:string args:Vector<TypedOpArg> stored_constructor:string skipped_flags:Vector<string> = ActionOp;
-getMessageOp#defc2466 flags:# peer:TypedOp id:TypedOp from_scheduled:flags.0?TypedOp stored_constructor:string skipped_flags:Vector<string> = ActionOp;
-noOp#c4d8df73 why:string = ActionOp;
+callOp#c2ff3383 method:string args:Vector<TypedOpArg> = ActionOp;
+getMessageOp#84b69f70 flags:# peer:TypedOp id:TypedOp from_scheduled:flags.0?TypedOp = ActionOp;
+
+// For string => TypedOp dictionaries
+typedOpArg#3a2930c2 key:string value:TypedOp = TypedOpArg;
 
 // Field extraction path
 paramNotFlag#acd9d5cf = ParamFlag;

src/TL_file_ref_map_schema.tl

@@ -39,6 +39,7 @@ final class Ast implements BuildMode
     public ?string $curKey = null;
 
     private array $output = [];
+    private array $skipped = [];
     private ?string $needsParent = null;
 
     public function __construct(
@@ -67,6 +68,7 @@ public function finalize(string $refMapFile, string $refMapFileJson): void
             'db_schema' => $dbSchema,
             'db_schema_json' => json_encode($dbSchemaJSON, flags: JSON_THROW_ON_ERROR),
             'ctxs' => $this->output,
+            'skipped' => $this->skipped,
         ];
         Magic::start(false);
 
@@ -76,6 +78,8 @@ public function finalize(string $refMapFile, string $refMapFileJson): void
         $TL->init($s);
         $serialized = $TL->serializeObject(['type' => 'FileReferenceOrigins'], $value, '');
         $valueDe = $TL->deserialize($serialized, ['type' => '', 'connection' => null, 'encrypted' => true]);
+        file_put_contents('/tmp/a.json', json_encode($valueDe, flags: JSON_THROW_ON_ERROR));
+        file_put_contents('/tmp/b.json', json_encode($value, flags: JSON_THROW_ON_ERROR));
         Assert::true($value == $valueDe);
         file_put_contents($refMapFile, $serialized);
         file_put_contents($refMapFileJson, json_encode($valueDe, flags: JSON_THROW_ON_ERROR));
@@ -104,21 +108,11 @@ private static function stringifySchema(string $constructor, array $params): str
     }
     public function addNode(TLContext $ctx, ?array $action = null, ?string $why = null): void
     {
-        $out = [
-            '_' => 'origin',
-            'predicate' => $ctx->position,
-            'is_constructor' => $ctx->isConstructor,
-            'parent_is_constructor' => false,
-        ];
-        if ($this->needsParent !== null) {
-            $out['needs_parent'] = $this->needsParent;
-            $out['parent_is_constructor'] = $ctx->tl->isConstructor($this->needsParent);
-        }
         if ($action !== null) {
             Assert::keyExists($action, 'stored_constructor');
 
             $constructor = $action['stored_constructor'];
-            $action['skipped_flags'] = [];
+            unset($action['stored_constructor']);
 
             $names = $this->storedNames;
             $flags = [];
@@ -133,6 +127,7 @@ public function addNode(TLContext $ctx, ?array $action = null, ?string $why = nu
                     ...$names,
                 ];
             }
+            $skipped = [];
 
             if (isset($this->outputSchema[$constructor])) {
                 $existing = $this->outputSchema[$constructor];
@@ -141,7 +136,7 @@ public function addNode(TLContext $ctx, ?array $action = null, ?string $why = nu
                         if (isset($flags[$name])) {
                             unset($flags[$name], $names[$name]);
                         } else {
-                            $action['skipped_flags'][]= $name;
+                            $skipped[]= $name;
                         }
                     }
                 }
@@ -166,22 +161,39 @@ public function addNode(TLContext $ctx, ?array $action = null, ?string $why = nu
                 $this->outputSchema[$constructor] = $names;
             }
 
-            $out['action'] = $action;
+            $out = [
+                '_' => 'origin',
+                'predicate' => $ctx->position,
+                'is_constructor' => $ctx->isConstructor,
+                'action' => $action,
+                'stored_constructor' => $constructor,
+                'skipped_flags' => $skipped,
+                'parent_is_constructor' => false,
+            ];
+            if ($this->needsParent !== null) {
+                $out['needs_parent'] = $this->needsParent;
+                $out['parent_is_constructor'] = $ctx->tl->isConstructor($this->needsParent);
+            }
+            $this->output[] = $out;
 
             $this->storedFlags = 0;
             $this->stored = [];
             $this->storedNames = [];
             Assert::null($why);
         } elseif ($why !== null) {
-            $out['action'] = ['_' => 'noOp', 'why' => $why];
+            $this->skipped[] = [
+                '_' => 'skippedOrigin',
+                'why' => $why,
+                'predicate' => $ctx->position,
+                'is_constructor' => $ctx->isConstructor,
+            ];
             Assert::null($action);
             Assert::isEmpty($this->stored);
             Assert::isEmpty($this->storedNames);
             Assert::eq($this->storedFlags, 0);
         } else {
             throw new AssertionError("Either 'action' or 'why' must be provided.");
         }
-        $this->output[] = $out;
         $this->needsParent = null;
         $this->curKey = null;
     }

src/file_ref_map.dat

@@ -60,6 +60,20 @@ function generate(int $layer, string $schema) {
     );
 }
 
+if (isset($argv[1])) {
+    if (count($argv) < 4) {
+        die("Usage:\n{$argv[0]} <inputSchema> <output> <outputJson>\nOR\n{$argv[0]} (no args, uses schemas in schemas folder)\n");
+    }
+
+    FileRefGenerator::generate(
+        $layer,
+        $argv[1],
+        $argv[2],
+        $argv[3],
+    );
+    die;
+}
+
 $res = [];
 foreach (glob(getcwd().'/schemas/TL_telegram_*_file_ref_map.json') as $file) {
     preg_match("/telegram_v(\d+)/", $file, $matches);
@@ -78,4 +92,6 @@ function generate(int $layer, string $schema) {
 }
 ksort($res);
 
+generate($last, $schema);
+
 file_put_contents(getcwd().'/schemas/list_file_ref_map.json', json_encode(array_keys($res)));