packer-pipeline-metadata-ownership

This commit is contained in:
2026-04-10 05:58:27 +01:00
parent 11b24b0707
commit 76b5717cd8
6 changed files with 107 additions and 25 deletions
@@ -878,7 +878,7 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
"size", packedAsset.payload().length,
"decoded_size", packedAsset.decodedSize(),
"codec", packedAsset.codec(),
"metadata", packedAsset.metadata())));
"metadata", packedAsset.runtimeMetadata())));
if (packedAsset.preloadEnabled()) {
final int slot = nextPreloadSlotByBankType.getOrDefault(packedAsset.bankType(), 0);
nextPreloadSlotByBankType.put(packedAsset.bankType(), slot + 1);
@@ -888,7 +888,7 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
}
assetTableMetadata.add(new LinkedHashMap<>(Map.of(
"asset_id", packedAsset.assetId(),
"metadata", packedAsset.metadata())));
"metadata", packedAsset.toolingMetadata())));
}
final byte[] headerBytes = canonicalJsonBytes(Map.of(
@@ -960,20 +960,22 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
System.arraycopy(packedPixels, 0, payload, 0, packedPixels.length);
System.arraycopy(paletteBytes, 0, payload, packedPixels.length, paletteBytes.length);
final LinkedHashMap<String, Object> metadata = new LinkedHashMap<>();
metadata.put("tile_size", tileSize);
metadata.put("width", width);
metadata.put("height", height);
metadata.put("palette_count", 64);
metadata.put("palette_authored", countAuthoredTileBankPalettes(declaration));
metadata.put("codec", Map.of());
metadata.put("pipeline", normalizeTileBankRuntimePipelineMetadata(declaration));
final LinkedHashMap<String, Object> runtimeMetadata = new LinkedHashMap<>();
runtimeMetadata.put("tile_size", tileSize);
runtimeMetadata.put("width", width);
runtimeMetadata.put("height", height);
runtimeMetadata.put("palette_count", 64);
runtimeMetadata.put("palette_authored", countAuthoredTileBankPalettes(declaration));
runtimeMetadata.put("codec", Map.of());
declaration.outputMetadata().forEach((key, value) -> {
if (!"tile_size".equals(key)) {
metadata.putIfAbsent(key, value);
runtimeMetadata.putIfAbsent(key, value);
}
});
final LinkedHashMap<String, Object> toolingMetadata = new LinkedHashMap<>(runtimeMetadata);
toolingMetadata.put("pipeline", normalizeToolingPipelineMetadata(declaration));
final PackerRegistryEntry registryEntry = runtimeAsset.registryEntry()
.orElseThrow(() -> new IllegalStateException("Packed runtime asset must be registered"));
return new PackedAsset(
@@ -983,7 +985,8 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
"NONE",
payload,
width * height + 2048,
metadata,
runtimeMetadata,
toolingMetadata,
declaration.preloadEnabled());
}
@@ -1044,11 +1047,8 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
return palettesNode instanceof ArrayNode palettesArray ? palettesArray.size() : 0;
}
private Map<String, Object> normalizeTileBankRuntimePipelineMetadata(PackerAssetDeclaration declaration) {
final LinkedHashMap<String, Object> pipeline = new LinkedHashMap<>(
PackerReadMessageMapper.normalizeMetadata(declaration.outputPipelineMetadata()));
pipeline.remove("palettes");
return pipeline;
private Map<String, Object> normalizeToolingPipelineMetadata(PackerAssetDeclaration declaration) {
return new LinkedHashMap<>(PackerReadMessageMapper.normalizeMetadata(declaration.outputPipelineMetadata()));
}
private byte[] buildPrelude(int headerLength) {
@@ -1111,7 +1111,8 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
String codec,
byte[] payload,
int decodedSize,
Map<String, Object> metadata,
Map<String, Object> runtimeMetadata,
Map<String, Object> toolingMetadata,
boolean preloadEnabled) {
}
@@ -337,8 +337,7 @@ final class FileSystemPackerWorkspaceServiceTest {
assertEquals(256, assetTable.get(0).path("metadata").path("height").asInt());
assertEquals(64, assetTable.get(0).path("metadata").path("palette_count").asInt());
assertEquals(1, assetTable.get(0).path("metadata").path("palette_authored").asInt());
assertTrue(assetTable.get(0).path("metadata").path("pipeline").isObject());
assertTrue(assetTable.get(0).path("metadata").path("pipeline").path("palettes").isMissingNode());
assertTrue(assetTable.get(0).path("metadata").path("pipeline").isMissingNode());
final var preload = MAPPER.readTree(projectRoot.resolve("build/preload.json").toFile());
assertEquals(1, preload.size());
@@ -348,7 +347,8 @@ final class FileSystemPackerWorkspaceServiceTest {
final var assetTableMetadata = MAPPER.readTree(projectRoot.resolve("build/asset_table_metadata.json").toFile());
assertEquals(1, assetTableMetadata.size());
assertEquals(1, assetTableMetadata.get(0).path("metadata").path("palette_authored").asInt());
assertTrue(assetTableMetadata.get(0).path("metadata").path("pipeline").path("palettes").isMissingNode());
assertEquals(1, assetTableMetadata.get(0).path("metadata").path("pipeline").path("palettes").size());
assertEquals(0, assetTableMetadata.get(0).path("metadata").path("pipeline").path("palettes").get(0).path("index").asInt());
}
@Test