Improve fileref file

Author: danog

schemas

@@ -25,9 +25,13 @@
             "type": "Vector t"
         },
         {
-            "id": "1304071212",
+            "id": "679692403",
             "predicate": "fileReferenceMap",
             "params": [
+                {
+                    "name": "layer",
+                    "type": "int"
+                },
                 {
                     "name": "db_schema",
                     "type": "string"

src/TL_file_ref_map_schema.json

@@ -5,7 +5,7 @@ true#3fedd339 = True;
 vector#1cb5c415 {t:Type} # [ t ] = Vector t;
 
 // Root
-fileReferenceMap#4dba8c2c db_schema:string db_schema_json:string locations:Vector<Location> sources:Vector<Source> skipped:Vector<SkippedSource> actions:Vector<Action> = FileReferenceMap;
+fileReferenceMap#28834873 layer:int db_schema:string db_schema_json:string locations:Vector<Location> sources:Vector<Source> skipped:Vector<SkippedSource> actions:Vector<Action> = FileReferenceMap;
 
 locationIncoming#e18770f4 predicate:string stored_constructor:string = Location;
 locationOutgoing#e7740ae0 predicate:string stored_constructor:string = Location;

src/TL_file_ref_map_schema.tl

@@ -58,7 +58,7 @@ public static function crc(string $schema): string
         return $id;
     }
 
-    public function finalize(array $outgoingCons, array $incomingCons, string $refMapFile, string $refMapFileJson): void
+    public function finalize(int $layer, array $outgoingCons, array $incomingCons, string $refMapFile, string $refMapFileJson): void
     {
         $locations = [];
 
@@ -103,6 +103,7 @@ public function finalize(array $outgoingCons, array $incomingCons, string $refMa
         }
         $value = [
             '_' => 'fileReferenceMap',
+            'layer' => $layer,
             'db_schema' => $dbSchema,
             'db_schema_json' => json_encode($dbSchemaJSON, flags: JSON_THROW_ON_ERROR),
             'locations' => $locations,

src/file_ref_map.dat

@@ -42,7 +42,7 @@
 
 final class FileRefGenerator
 {
-    public static function generate(int|string $layer, string $inputSchema, string $outputFile, string $outputFileJson): void
+    public static function generate(int $layer, string $inputSchema, string $outputFile, string $outputFileJson): void
     {
         Magic::start(false);
         $schema = new TLSchema;
@@ -680,7 +680,7 @@ static function (array $stack) use ($locations, $TL, $tmp, &$traversalPairs, &$v
             }
         }
 
-        $output->finalize(array_filter($outgoingCons), $incomingCons, $outputFile, $outputFileJson);
+        $output->finalize($layer, array_filter($outgoingCons), $incomingCons, $outputFile, $outputFileJson);
 
         echo("OK $layer!\n".PHP_EOL);
     }

src/file_ref_map.json

@@ -64,15 +64,15 @@ function generate(int $layer, string $schema): void
 }
 
 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");
+    if (count($argv) < 5) {
+        die("Usage:\n{$argv[0]} <layer> <inputSchema> <output> <outputJson>\nOR\n{$argv[0]} (no args, uses schemas in schemas folder)\n");
     }
 
     FileRefGenerator::generate(
-        $argv[1],
-        $argv[1],
+        (int)$argv[1],
         $argv[2],
         $argv[3],
+        $argv[4],
     );
     die;
 }