implements PR-022

This commit is contained in:
2026-03-24 13:42:46 +00:00
parent a14a0b8b37
commit 165be76128
16 changed files with 508 additions and 22 deletions
@@ -14,4 +14,6 @@ public interface PackerWorkspaceService {
CreateAssetResult createAsset(CreateAssetRequest request);
RegisterAssetResult registerAsset(RegisterAssetRequest request);
DeleteAssetResult deleteAsset(DeleteAssetRequest request);
}
@@ -0,0 +1,13 @@
package p.packer.messages;
import java.util.Objects;
public record DeleteAssetRequest(
PackerProjectContext project,
AssetReference assetReference) {
public DeleteAssetRequest {
Objects.requireNonNull(project, "project");
Objects.requireNonNull(assetReference, "assetReference");
}
}
@@ -0,0 +1,25 @@
package p.packer.messages;
import java.nio.file.Path;
import java.util.Objects;
public record DeleteAssetResult(
PackerOperationStatus status,
String summary,
Path assetRoot,
Path manifestPath) {
public DeleteAssetResult {
Objects.requireNonNull(status, "status");
summary = Objects.requireNonNull(summary, "summary").trim();
if (summary.isBlank()) {
throw new IllegalArgumentException("summary must not be blank");
}
if (assetRoot != null) {
assetRoot = assetRoot.toAbsolutePath().normalize();
}
if (manifestPath != null) {
manifestPath = manifestPath.toAbsolutePath().normalize();
}
}
}
@@ -1,5 +1,6 @@
package p.packer.messages.assets;
public enum AssetAction {
REGISTER
REGISTER,
DELETE
}
@@ -0,0 +1,20 @@
package p.packer.models;
import java.util.List;
import java.util.Objects;
public record PackerDeleteAssetEvaluation(
PackerResolvedAssetReference resolved,
List<PackerDiagnostic> diagnostics,
boolean canDelete,
String reason) {
public PackerDeleteAssetEvaluation {
Objects.requireNonNull(resolved, "resolved");
diagnostics = List.copyOf(Objects.requireNonNull(diagnostics, "diagnostics"));
reason = reason == null ? null : reason.trim();
if (reason != null && reason.isBlank()) {
reason = null;
}
}
}
@@ -17,6 +17,8 @@ import p.packer.events.PackerEventSink;
import p.packer.events.PackerProgress;
import p.packer.messages.CreateAssetRequest;
import p.packer.messages.CreateAssetResult;
import p.packer.messages.DeleteAssetRequest;
import p.packer.messages.DeleteAssetResult;
import p.packer.messages.GetAssetDetailsRequest;
import p.packer.messages.GetAssetDetailsResult;
import p.packer.messages.InitWorkspaceRequest;
@@ -27,6 +29,7 @@ import p.packer.messages.RegisterAssetRequest;
import p.packer.messages.RegisterAssetResult;
import p.packer.PackerWorkspaceService;
import p.packer.models.PackerAssetDeclarationParseResult;
import p.packer.models.PackerDeleteAssetEvaluation;
import p.packer.models.PackerAssetIdentity;
import p.packer.models.PackerRegisterAssetEvaluation;
import p.packer.models.PackerAssetSummary;
@@ -166,6 +169,14 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
return writeCoordinator.execute(project, () -> registerAssetInWriteLane(safeRequest, events));
}
@Override
public DeleteAssetResult deleteAsset(DeleteAssetRequest request) {
final DeleteAssetRequest safeRequest = Objects.requireNonNull(request, "request");
final PackerProjectContext project = safeRequest.project();
final PackerOperationEventEmitter events = new PackerOperationEventEmitter(project, eventSink);
return writeCoordinator.execute(project, () -> deleteAssetInWriteLane(safeRequest, events));
}
private CreateAssetResult createAssetInWriteLane(
CreateAssetRequest request,
PackerOperationEventEmitter events) {
@@ -295,6 +306,50 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
}
}
private DeleteAssetResult deleteAssetInWriteLane(
DeleteAssetRequest request,
PackerOperationEventEmitter events) {
final PackerProjectContext project = request.project();
workspaceFoundation.initWorkspace(new InitWorkspaceRequest(project));
final PackerRuntimeSnapshot snapshot = runtimeRegistry.getOrLoad(project).snapshot();
final PackerDeleteAssetEvaluation evaluation = actionReadService.evaluateDelete(snapshot, project, request.assetReference());
final Path assetRoot = evaluation.resolved().assetRoot();
final Path manifestPath = assetRoot.resolve("asset.json");
final String relativeAssetRoot = relativeAssetRoot(project, assetRoot);
if (!evaluation.canDelete()) {
final String summary = Objects.requireNonNullElse(evaluation.reason(), "Asset cannot be deleted.");
return deleteFailureResult(events, summary, assetRoot, manifestPath, List.of(relativeAssetRoot));
}
try {
final PackerRegistryState registry = workspaceFoundation.loadRegistry(project);
final PackerRegistryState updatedRegistry = removeRegistryEntry(registry, evaluation.resolved().registryEntry().orElse(null));
Files.deleteIfExists(manifestPath);
if (!updatedRegistry.equals(registry)) {
workspaceFoundation.saveRegistry(project, updatedRegistry);
}
runtimeRegistry.update(project, (currentSnapshot, generation) -> runtimePatchService.afterDeleteAsset(
currentSnapshot,
generation,
updatedRegistry,
assetRoot));
final DeleteAssetResult result = new DeleteAssetResult(
PackerOperationStatus.SUCCESS,
"Asset deleted: " + relativeAssetRoot,
assetRoot,
manifestPath);
events.emit(PackerEventKind.ACTION_APPLIED, result.summary(), List.of(relativeAssetRoot));
return result;
} catch (IOException exception) {
return deleteFailureResult(
events,
"Unable to delete asset: " + exception.getMessage(),
assetRoot,
manifestPath,
List.of(relativeAssetRoot));
}
}
private CreateAssetResult failureResult(
PackerOperationEventEmitter events,
String summary,
@@ -327,6 +382,21 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
return result;
}
private DeleteAssetResult deleteFailureResult(
PackerOperationEventEmitter events,
String summary,
Path assetRoot,
Path manifestPath,
List<String> affectedAssets) {
final DeleteAssetResult result = new DeleteAssetResult(
PackerOperationStatus.FAILED,
summary,
assetRoot,
manifestPath);
events.emit(PackerEventKind.ACTION_FAILED, result.summary(), affectedAssets);
return result;
}
private void writeManifest(Path manifestPath, CreateAssetRequest request, String assetUuid) throws IOException {
final Map<String, Object> manifest = new LinkedHashMap<>();
manifest.put("schema_version", 1);
@@ -420,4 +490,16 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
private String relativeAssetRoot(PackerProjectContext project, Path assetRoot) {
return PackerWorkspacePaths.relativeAssetRoot(project, assetRoot).replace('\\', '/');
}
private PackerRegistryState removeRegistryEntry(
PackerRegistryState registry,
PackerRegistryEntry entry) {
if (entry == null) {
return registry;
}
final List<PackerRegistryEntry> updatedEntries = registry.assets().stream()
.filter(candidate -> candidate.assetId() != entry.assetId())
.toList();
return registry.withAssets(updatedEntries, registry.nextAssetId());
}
}
@@ -12,6 +12,7 @@ import p.packer.messages.diagnostics.PackerDiagnosticSeverity;
import p.packer.models.PackerAssetActionAvailability;
import p.packer.models.PackerAssetDeclaration;
import p.packer.models.PackerAssetDeclarationParseResult;
import p.packer.models.PackerDeleteAssetEvaluation;
import p.packer.models.PackerDiagnostic;
import p.packer.models.PackerRegisterAssetEvaluation;
import p.packer.models.PackerRegistryEntry;
@@ -43,6 +44,7 @@ public final class PackerAssetActionReadService {
final PackerProjectContext project = Objects.requireNonNull(request, "request").project();
final PackerRuntimeSnapshot snapshot = runtimeRegistry.getOrLoad(project).snapshot();
final PackerRegisterAssetEvaluation registerEvaluation = evaluateRegister(snapshot, project, request.assetReference());
final PackerDeleteAssetEvaluation deleteEvaluation = evaluateDelete(snapshot, project, request.assetReference());
final List<PackerAssetActionAvailability> actions = new ArrayList<>();
if (registerEvaluation.resolved().registryEntry().isEmpty()) {
actions.add(new PackerAssetActionAvailability(
@@ -51,11 +53,18 @@ public final class PackerAssetActionReadService {
true,
registerEvaluation.reason()));
}
if (deleteEvaluation.resolved().runtimeAsset().isPresent()) {
actions.add(new PackerAssetActionAvailability(
AssetAction.DELETE,
deleteEvaluation.canDelete(),
true,
deleteEvaluation.reason()));
}
final PackerOperationStatus status;
if (registerEvaluation.resolved().runtimeAsset().isEmpty()) {
if (registerEvaluation.resolved().runtimeAsset().isEmpty() && deleteEvaluation.resolved().runtimeAsset().isEmpty()) {
status = PackerOperationStatus.FAILED;
} else if (registerEvaluation.diagnostics().stream().anyMatch(PackerDiagnostic::blocking)) {
} else if (combinedDiagnostics(registerEvaluation.diagnostics(), deleteEvaluation.diagnostics()).stream().anyMatch(PackerDiagnostic::blocking)) {
status = PackerOperationStatus.PARTIAL;
} else {
status = PackerOperationStatus.SUCCESS;
@@ -64,7 +73,7 @@ public final class PackerAssetActionReadService {
status,
"Asset action capabilities resolved from runtime snapshot.",
PackerReadMessageMapper.toAssetActionAvailabilityDTOs(actions),
PackerReadMessageMapper.toDiagnosticDTOs(registerEvaluation.diagnostics()));
PackerReadMessageMapper.toDiagnosticDTOs(combinedDiagnostics(registerEvaluation.diagnostics(), deleteEvaluation.diagnostics())));
}
public PackerRegisterAssetEvaluation evaluateRegister(
@@ -120,6 +129,30 @@ public final class PackerAssetActionReadService {
return new PackerRegisterAssetEvaluation(resolved, diagnostics, true, null);
}
public PackerDeleteAssetEvaluation evaluateDelete(
PackerRuntimeSnapshot snapshot,
PackerProjectContext project,
AssetReference assetReference) {
final PackerResolvedAssetReference resolved = assetReferenceResolver.resolve(project, snapshot, assetReference);
final List<PackerDiagnostic> diagnostics = new ArrayList<>(resolved.diagnostics());
if (resolved.runtimeAsset().isEmpty()) {
if (resolved.registryEntry().isPresent()) {
diagnostics.add(new PackerDiagnostic(
PackerDiagnosticSeverity.ERROR,
PackerDiagnosticCategory.STRUCTURAL,
"asset.json was not found for the requested asset root.",
resolved.assetRoot().resolve("asset.json"),
true));
}
return new PackerDeleteAssetEvaluation(
resolved,
diagnostics,
false,
"asset.json was not found for the requested asset root.");
}
return new PackerDeleteAssetEvaluation(resolved, diagnostics, true, null);
}
private String firstBlockingReason(List<PackerDiagnostic> diagnostics, String fallback) {
return diagnostics.stream()
.filter(PackerDiagnostic::blocking)
@@ -128,4 +161,12 @@ public final class PackerAssetActionReadService {
.findFirst()
.orElse(fallback);
}
private List<PackerDiagnostic> combinedDiagnostics(
List<PackerDiagnostic> left,
List<PackerDiagnostic> right) {
final List<PackerDiagnostic> combined = new ArrayList<>(left);
combined.addAll(right);
return combined;
}
}
@@ -65,4 +65,15 @@ public final class PackerRuntimePatchService {
}
return new PackerRuntimeSnapshot(generation, updatedRegistry, updatedAssets);
}
public PackerRuntimeSnapshot afterDeleteAsset(
PackerRuntimeSnapshot snapshot,
long generation,
PackerRegistryState updatedRegistry,
Path assetRoot) {
final List<PackerRuntimeAsset> updatedAssets = snapshot.assets().stream()
.filter(asset -> !asset.assetRoot().equals(assetRoot.toAbsolutePath().normalize()))
.toList();
return new PackerRuntimeSnapshot(generation, updatedRegistry, updatedAssets);
}
}
@@ -14,6 +14,8 @@ import p.packer.events.PackerEvent;
import p.packer.events.PackerEventKind;
import p.packer.messages.CreateAssetRequest;
import p.packer.messages.CreateAssetResult;
import p.packer.messages.DeleteAssetRequest;
import p.packer.messages.DeleteAssetResult;
import p.packer.messages.GetAssetActionsRequest;
import p.packer.messages.GetAssetDetailsRequest;
import p.packer.messages.ListAssetsRequest;
@@ -183,11 +185,15 @@ final class FileSystemPackerWorkspaceServiceTest {
AssetReference.forRelativeAssetRoot("orphans/ui_sounds")));
assertEquals(PackerOperationStatus.SUCCESS, result.status());
assertEquals(1, result.actions().size());
assertEquals(AssetAction.REGISTER, result.actions().getFirst().action());
assertTrue(result.actions().getFirst().visible());
assertTrue(result.actions().getFirst().enabled());
assertNull(result.actions().getFirst().reason());
assertEquals(2, result.actions().size());
assertEquals(AssetAction.REGISTER, result.actions().get(0).action());
assertTrue(result.actions().get(0).visible());
assertTrue(result.actions().get(0).enabled());
assertNull(result.actions().get(0).reason());
assertEquals(AssetAction.DELETE, result.actions().get(1).action());
assertTrue(result.actions().get(1).visible());
assertTrue(result.actions().get(1).enabled());
assertNull(result.actions().get(1).reason());
}
@Test
@@ -200,7 +206,9 @@ final class FileSystemPackerWorkspaceServiceTest {
AssetReference.forAssetId(1)));
assertEquals(PackerOperationStatus.SUCCESS, result.status());
assertTrue(result.actions().isEmpty());
assertEquals(1, result.actions().size());
assertEquals(AssetAction.DELETE, result.actions().getFirst().action());
assertTrue(result.actions().getFirst().enabled());
}
@Test
@@ -246,7 +254,8 @@ final class FileSystemPackerWorkspaceServiceTest {
final var actionsResult = service.getAssetActions(new GetAssetActionsRequest(
project(projectRoot),
registerResult.assetReference()));
assertTrue(actionsResult.actions().isEmpty());
assertEquals(1, actionsResult.actions().size());
assertEquals(AssetAction.DELETE, actionsResult.actions().getFirst().action());
assertEquals(1, loader.loadCount());
}
@@ -260,9 +269,12 @@ final class FileSystemPackerWorkspaceServiceTest {
AssetReference.forRelativeAssetRoot("bad")));
assertEquals(PackerOperationStatus.PARTIAL, result.status());
assertEquals(1, result.actions().size());
assertFalse(result.actions().getFirst().enabled());
assertNotNull(result.actions().getFirst().reason());
assertEquals(2, result.actions().size());
assertEquals(AssetAction.REGISTER, result.actions().get(0).action());
assertFalse(result.actions().get(0).enabled());
assertNotNull(result.actions().get(0).reason());
assertEquals(AssetAction.DELETE, result.actions().get(1).action());
assertTrue(result.actions().get(1).enabled());
}
@Test
@@ -322,9 +334,12 @@ final class FileSystemPackerWorkspaceServiceTest {
final var actions = service.getAssetActions(new GetAssetActionsRequest(
project(projectRoot),
AssetReference.forRelativeAssetRoot("orphans/ui_clone")));
assertEquals(1, actions.actions().size());
assertFalse(actions.actions().getFirst().enabled());
assertNotNull(actions.actions().getFirst().reason());
assertEquals(2, actions.actions().size());
assertEquals(AssetAction.REGISTER, actions.actions().get(0).action());
assertFalse(actions.actions().get(0).enabled());
assertNotNull(actions.actions().get(0).reason());
assertEquals(AssetAction.DELETE, actions.actions().get(1).action());
assertTrue(actions.actions().get(1).enabled());
final RegisterAssetResult registerResult = service.registerAsset(new RegisterAssetRequest(
project(projectRoot),
@@ -333,6 +348,55 @@ final class FileSystemPackerWorkspaceServiceTest {
assertNull(registerResult.assetReference());
}
@Test
void deletesRegisteredAssetJsonWithoutDeletingDirectoryContents() throws Exception {
final Path projectRoot = tempDir.resolve("delete-registered");
final FileSystemPackerWorkspaceService service = service();
final CreateAssetResult createResult = service.createAsset(new CreateAssetRequest(
project(projectRoot),
"ui/delete-me",
"delete_me",
AssetFamilyCatalog.IMAGE_BANK,
OutputFormatCatalog.TILES_INDEXED_V1,
OutputCodecCatalog.NONE,
false));
final Path assetRoot = projectRoot.resolve("assets/ui/delete-me");
Files.writeString(assetRoot.resolve("atlas.png"), "fixture");
final DeleteAssetResult deleteResult = service.deleteAsset(new DeleteAssetRequest(
project(projectRoot),
createResult.assetReference()));
assertEquals(PackerOperationStatus.SUCCESS, deleteResult.status());
assertTrue(Files.isDirectory(assetRoot));
assertFalse(Files.exists(assetRoot.resolve("asset.json")));
assertTrue(Files.isRegularFile(assetRoot.resolve("atlas.png")));
final var listResult = service.listAssets(new ListAssetsRequest(project(projectRoot)));
assertTrue(listResult.assets().isEmpty());
}
@Test
void deletesUnregisteredAssetJsonAndRemovesItFromSnapshot() throws Exception {
final Path projectRoot = copyFixture("workspaces/orphan-valid", tempDir.resolve("delete-unregistered"));
final FileSystemPackerWorkspaceService service = service();
final Path assetRoot = projectRoot.resolve("assets/orphans/ui_sounds");
Files.writeString(assetRoot.resolve("notes.txt"), "keep me");
final DeleteAssetResult deleteResult = service.deleteAsset(new DeleteAssetRequest(
project(projectRoot),
AssetReference.forRelativeAssetRoot("orphans/ui_sounds")));
assertEquals(PackerOperationStatus.SUCCESS, deleteResult.status());
assertTrue(Files.isDirectory(assetRoot));
assertFalse(Files.exists(assetRoot.resolve("asset.json")));
assertTrue(Files.isRegularFile(assetRoot.resolve("notes.txt")));
final var listResult = service.listAssets(new ListAssetsRequest(project(projectRoot)));
assertTrue(listResult.assets().isEmpty());
}
@Test
void rejectsUnsupportedFormatForSelectedFamily() {
final Path projectRoot = tempDir.resolve("unsupported");