Reorganize

Author: danog

schemas

@@ -1,5 +1,5 @@
 // Root
-fileReferenceOrigins#8260b721 db_schema:string ctxs:Vector<Origin> = FileReferenceOrigins;
+fileReferenceOrigins#fe633fe7 db_schema:string db_schema_json:string ctxs:Vector<Origin> = 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;
 

src/TL_filerefs.tl src/TL_file_ref_map_schema.tlsrc/TL_filerefs.tl renamed to src/TL_file_ref_map_schema.tl

@@ -55,24 +55,30 @@ public static function crc(string $schema): string
         return $id;
     }
 
-    public function finalize(string $refMapFile, string $dbSchemaFile): void
+    public function finalize(string $refMapFile, string $refMapFileJson): void
     {
         $dbSchema = '';
         foreach ($this->outputSchema as $constructor => $params) {
             $dbSchema .= self::stringifySchema($constructor, $params)."\n";
         }
-        file_put_contents($dbSchemaFile, $dbSchema);
-        $value = ['_' => 'fileReferenceOrigins', 'db_schema' => $dbSchema, 'ctxs' => $this->output];
+        $dbSchemaJSON = (new TL(null))->toJson($dbSchema);
+        $value = [
+            '_' => 'fileReferenceOrigins',
+            'db_schema' => $dbSchema,
+            'db_schema_json' => json_encode($dbSchemaJSON, flags: JSON_THROW_ON_ERROR),
+            'ctxs' => $this->output,
+        ];
         Magic::start(false);
 
         $s = new TLSchema;
-        $s = $s->setOther(['filerefs' => __DIR__ . '/../../../src/TL_filerefs.tl']);
+        $s = $s->setOther(['filerefs' => __DIR__ . '/../../../src/TL_file_ref_map_schema.tl']);
         $TL = new TL((new ReflectionClass(MTProto::class))->newInstanceWithoutConstructor());
         $TL->init($s);
         $serialized = $TL->serializeObject(['type' => 'FileReferenceOrigins'], $value, '');
         $valueDe = $TL->deserialize($serialized, ['type' => '', 'connection' => null, 'encrypted' => true]);
         Assert::true($value == $valueDe);
         file_put_contents($refMapFile, $serialized);
+        file_put_contents($refMapFileJson, json_encode($valueDe, flags: JSON_THROW_ON_ERROR));
     }
 
     private static function stringifySchema(string $constructor, array $params): string

src/TL_filerefs_db.tl

@@ -34,17 +34,14 @@
 use danog\MadelineProto\FileRefExtractor\Ops\Noop;
 use danog\MadelineProto\FileRefExtractor\Ops\PrimitiveLiteralOp;
 use danog\MadelineProto\FileRefExtractor\Ops\ThemeFormatOp;
-use danog\MadelineProto\FileRefExtractor\Path;
-use danog\MadelineProto\FileRefExtractor\TLContext;
-use danog\MadelineProto\FileRefExtractor\TLWrapper;
 use danog\MadelineProto\Logger;
 use danog\MadelineProto\Magic;
 use danog\MadelineProto\Settings\TLSchema;
 use danog\MadelineProto\TL\TL;
 
 final class FileRefGenerator
 {
-    public static function generate(int $layer, string $inputSchema, string $outputFile, string $outputSchema): void
+    public static function generate(int $layer, string $inputSchema, string $outputFile, string $outputFileJson): void
     {
         Magic::start(false);
         $schema = new TLSchema;
@@ -626,10 +623,7 @@ static function (array $stack) use ($locations, $TL, $tmp, &$validated, $storyMe
             }
         }
 
-        $output->finalize(
-            $outputFile,
-            $outputSchema,
-        );
+        $output->finalize($outputFile, $outputFileJson);
 
         echo("OK $layer!\n".PHP_EOL);
     }

src/file_ref_map.dat

@@ -116,7 +116,7 @@ public function buildPath(TLContext $tl, string $extractor): array
             }
             $new[] = $newPart;
         }
-        $serialized = $extractor.json_encode($new);
+        $serialized = $extractor.json_encode($new, flags: JSON_THROW_ON_ERROR);
         if (isset($tl->buildMode->stored[$serialized])) {
             $name = $tl->buildMode->stored[$serialized]['name'];
         } else {

src/file_ref_map.json

@@ -13,7 +13,7 @@ function layerUpgrade(int $layer): void
     file_put_contents('docs/docs/docs/USING_METHODS.md', $doc);
 
     foreach (glob('src/*.tl') as $file) {
-        if (basename($file) === 'TL_filerefs.tl') {
+        if (basename($file) === 'TL_file_ref_map_schema.tl') {
             continue;
         }
         unlink($file);

tools/FileRefExtractor/BuildMode/Ast.php

@@ -2,11 +2,12 @@
 
 use danog\MadelineProto\FileRefExtractor\BuildMode\Ast;
 use danog\MadelineProto\FileRefExtractor\FileRefGenerator;
+use danog\MadelineProto\TL\TL;
 
 require 'vendor/autoload.php';
 
 // Cleanup schema
-$schemaFile = __DIR__.'/../src/TL_filerefs.tl';
+$schemaFile = __DIR__.'/../src/TL_file_ref_map_schema.tl';
 $schema = explode("\n", file_get_contents($schemaFile));
 foreach ($schema as &$line) {
     $line = rtrim(trim($line), ';');
@@ -37,14 +38,22 @@
     $last,
     __DIR__."/../src/TL_telegram_v$last.tl",
     __DIR__.'/../src/file_ref_map.dat',
-    __DIR__.'/../src/TL_filerefs_db.tl',
+    __DIR__.'/../src/file_ref_map.json',
 );
 
 copy(
-    __DIR__."/../src/TL_filerefs_db.tl",
-    __DIR__."/../schemas/TL_telegram_v{$last}_filerefs_db.tl"
+    __DIR__."/../src/TL_file_ref_map_schema.tl",
+    __DIR__."/../schemas/TL_telegram_v{$last}_file_ref_map_schema.tl"
 );
+
+$TL = new TL(null);
+file_put_contents(__DIR__."/../schemas/TL_telegram_v{$last}_file_ref_map_schema.json", json_encode($TL->toJson($schema), flags: JSON_THROW_ON_ERROR));
+
 copy(
     __DIR__."/../src/file_ref_map.dat",
     __DIR__."/../schemas/TL_telegram_v{$last}_file_ref_map.dat"
-);
+);
+copy(
+    __DIR__."/../src/file_ref_map.json",
+    __DIR__."/../schemas/TL_telegram_v{$last}_file_ref_map.json"
+);