add AppMode for best boundaries over stdlib
JaCoCo Coverage #### Project Overview No changes detected, that affect the code coverage. * Line Coverage: 61.98% (17344/27983) * Branch Coverage: 53.07% (6720/12663) * Lines of Code: 27983 * Cyclomatic Complexity: 11207 #### Quality Gates Summary Output truncated.
Test / Build skipped: 11, passed: 581
Intrepid/Prometeu/Studio/pipeline/head This commit looks good
Intrepid/Prometeu/Studio/pipeline/pr-master This commit looks good

This commit is contained in:
2026-05-14 11:15:00 +01:00
parent 22887b56cd
commit 991863d086
54 changed files with 700 additions and 546 deletions
@@ -2,6 +2,8 @@ package p.studio.projects;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.EnumUtils;
import p.studio.AppMode;
import p.studio.projectstate.ProjectLocalStudioSetup;
import p.studio.projectstate.ProjectLocalStudioSetupService;
@@ -70,11 +72,11 @@ public final class ProjectCatalogService {
}
public ProjectReference createProject(String projectName) {
return createProject(new ProjectCreationRequest(projectName, projectsRoot, "pbs", 1, "src", 4, null));
return createProject(new ProjectCreationRequest(projectName, projectsRoot, "pbs", 1, AppMode.Game, "src", 4, null));
}
public ProjectReference createProject(String projectName, Path parentLocation) {
return createProject(new ProjectCreationRequest(projectName, parentLocation, "pbs", 1, "src", 4, null));
return createProject(new ProjectCreationRequest(projectName, parentLocation, "pbs", 1, AppMode.Game, "src", 4, null));
}
public ProjectReference createProject(ProjectCreationRequest request) {
@@ -90,6 +92,9 @@ public final class ProjectCatalogService {
if (request.stdlib() <= 0) {
throw new IllegalArgumentException("project stdlib major must be positive");
}
if (request.target() == null) {
throw new IllegalArgumentException("project target must not be null");
}
if (request.indentationWidth() <= 0) {
throw new IllegalArgumentException("project indentation width must be positive");
}
@@ -115,13 +120,14 @@ public final class ProjectCatalogService {
"1.0.0",
languageId,
request.stdlib(),
request.target(),
projectRoot);
Files.createDirectories(ProjectStudioPaths.studioRoot(projectReference));
Files.createDirectories(projectRoot.resolve(sourceRoot));
Files.createDirectories(projectRoot.resolve("assets"));
Files.createDirectories(projectRoot.resolve("build"));
Files.createDirectories(projectRoot.resolve("cartridge"));
Files.writeString(manifestPath(projectRoot), defaultManifest(displayName, languageId, request.stdlib()));
Files.writeString(manifestPath(projectRoot), defaultManifest(displayName, languageId, request.stdlib(), request.target()));
Files.writeString(projectRoot.resolve(".gitignore"), defaultGitIgnore());
projectLocalStudioSetupService.save(
projectReference,
@@ -151,6 +157,9 @@ public final class ProjectCatalogService {
if (manifest.version() == null || manifest.version().isBlank()) {
throw new IllegalArgumentException("project manifest missing version: " + manifestPath);
}
if (manifest.target() == null || manifest.target().isBlank()) {
throw new IllegalArgumentException("project manifest missing target: " + manifestPath);
}
if (manifest.language() == null || manifest.language().isBlank()) {
throw new IllegalArgumentException("project manifest missing language: " + manifestPath);
}
@@ -160,11 +169,16 @@ public final class ProjectCatalogService {
} catch (RuntimeException runtimeException) {
throw new IllegalArgumentException("project manifest invalid stdlib: " + manifestPath, runtimeException);
}
final AppMode target = EnumUtils.getEnum(AppMode.class, manifest.target());
if (target == null) {
throw new IllegalArgumentException("project manifest invalid target: " + manifestPath);
}
return new ProjectReference(
manifest.name().trim(),
manifest.version().trim(),
manifest.language().trim(),
stdlibMajor,
target,
normalizedRoot);
}
@@ -188,17 +202,22 @@ public final class ProjectCatalogService {
return normalized;
}
private String defaultManifest(String projectName, String languageId, int stdlibMajor) {
private String defaultManifest(
final String projectName,
final String languageId,
final int stdlibMajor,
final AppMode target) {
return """
{
"name": "%s",
"version": "1.0.0",
"language": "%s",
"stdlib": "%d",
"target": "%s",
"dependencies": [
]
}
""".formatted(projectName, languageId, stdlibMajor);
""".formatted(projectName, languageId, stdlibMajor, target.exportReferenceName());
}
private String defaultGitIgnore() {
@@ -223,7 +242,7 @@ public final class ProjectCatalogService {
}
@JsonIgnoreProperties(ignoreUnknown = true)
private record ProjectManifestSummary(String name, String version, String language, String stdlib) {
private record ProjectManifestSummary(String name, String version, String language, String stdlib, String target) {
}
private String sanitizeProjectName(String rawName) {
@@ -1,5 +1,7 @@
package p.studio.projects;
import p.studio.AppMode;
import java.nio.file.Path;
public record ProjectCreationRequest(
@@ -7,6 +9,7 @@ public record ProjectCreationRequest(
Path parentLocation,
String languageId,
int stdlib,
AppMode target,
String sourceRoot,
int indentationWidth,
String runtimePath) {
@@ -2,6 +2,7 @@ package p.studio.projects;
import org.apache.commons.lang3.StringUtils;
import p.packer.messages.PackerProjectContext;
import p.studio.AppMode;
import p.studio.lsp.messages.LspProjectContext;
import java.nio.file.Path;
@@ -11,6 +12,7 @@ public record ProjectReference(
String version,
String languageId,
int stdlibVersion,
AppMode target,
Path rootPath) {
@Override
public String toString() {
@@ -181,7 +181,7 @@ public final class StudioShipperService {
manifest.put("app_id", stableAppId(projectReference));
manifest.put("title", projectReference.name());
manifest.put("app_version", projectReference.version());
manifest.put("app_mode", "Game");
manifest.put("app_mode", projectReference.target().exportReferenceName());
manifest.set("capabilities", capabilitiesNode(buildResult));
manifest.set("asset_table", readArrayOrEmpty(projectReference.rootPath().resolve(BUILD_DIR).resolve(ASSET_TABLE_FILE)));
manifest.set("preload", readArrayOrEmpty(projectReference.rootPath().resolve(BUILD_DIR).resolve(PRELOAD_FILE)));
@@ -14,6 +14,7 @@ import javafx.stage.DirectoryChooser;
import javafx.stage.Modality;
import javafx.stage.Stage;
import javafx.stage.Window;
import p.studio.AppMode;
import p.studio.Container;
import p.studio.projects.*;
import p.studio.utilities.i18n.I18n;
@@ -298,6 +299,7 @@ public final class NewProjectWizard {
Path.of(locationField.getText().trim()),
selectedLanguageId(),
selectedStdlib().version(),
AppMode.Game, // hardcoded for now, we can add a separate step for this if needed
selectedSourceRoot(),
selectedIndentationWidth(),
selectedRuntimePath())));
@@ -2,6 +2,7 @@ package p.studio.controls.shell;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import p.studio.AppMode;
import p.studio.projects.ProjectReference;
import p.studio.projects.ProjectStudioPaths;
@@ -64,6 +65,6 @@ final class StudioActivityStorageServiceTest {
private ProjectReference project(String name) {
final Path projectRoot = tempDir.resolve(name);
return new ProjectReference("Main", "1.0.0", "pbs", 1, projectRoot);
return new ProjectReference("Main", "1.0.0", "pbs", 1, AppMode.Game, projectRoot);
}
}
@@ -1,6 +1,7 @@
package p.studio.execution;
import org.junit.jupiter.api.Test;
import p.studio.AppMode;
import p.studio.StudioBackgroundTasks;
import p.studio.debug.runtime.StudioRuntimeDebugConnectionSettings;
import p.studio.debug.runtime.StudioRuntimeHandshakeClient;
@@ -183,7 +184,7 @@ final class StudioPlayStopCoordinatorTest {
}
private ProjectReference projectReference() {
return new ProjectReference("Main", "1.0.0", "pbs", 1, Path.of("/tmp/prometeu-play-stop"));
return new ProjectReference("Main", "1.0.0", "pbs", 1, AppMode.Game, Path.of("/tmp/prometeu-play-stop"));
}
private static final class RecordingHandshakeClient implements StudioRuntimeHandshakeClient {
@@ -2,6 +2,7 @@ package p.studio.projects;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import p.studio.AppMode;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -34,7 +35,7 @@ final class KnownProjectsServiceTest {
final Path projectsRoot = tempDir.resolve("projects");
Files.createDirectories(projectsRoot.resolve("alpha"));
Files.writeString(projectsRoot.resolve("alpha").resolve("prometeu.json"), manifest("Alpha Project"));
final ProjectReference alpha = new ProjectReference("Alpha Project", "1.0.0", "pbs", 1, projectsRoot.resolve("alpha"));
final ProjectReference alpha = new ProjectReference("Alpha Project", "1.0.0", "pbs", 1, AppMode.Game, projectsRoot.resolve("alpha"));
final KnownProjectsService service = new KnownProjectsService(
tempDir.resolve("known-projects.txt"),
@@ -52,7 +53,7 @@ final class KnownProjectsServiceTest {
final Path projectsRoot = tempDir.resolve("projects");
Files.createDirectories(projectsRoot.resolve("alpha"));
Files.writeString(projectsRoot.resolve("alpha").resolve("prometeu.json"), manifest("Alpha Project"));
final ProjectReference alpha = new ProjectReference("Alpha Project", "1.0.0", "pbs", 1, projectsRoot.resolve("alpha"));
final ProjectReference alpha = new ProjectReference("Alpha Project", "1.0.0", "pbs", 1, AppMode.Game, projectsRoot.resolve("alpha"));
final KnownProjectsService service = new KnownProjectsService(
tempDir.resolve("known-projects.txt"),
@@ -74,6 +75,7 @@ final class KnownProjectsServiceTest {
"version": "1.0.0",
"language": "pbs",
"stdlib": "1",
"target": "Game",
"dependencies": []
}
""".formatted(name);
@@ -2,6 +2,7 @@ package p.studio.projects;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import p.studio.AppMode;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -38,6 +39,7 @@ final class ProjectCatalogServiceTest {
assertEquals("1.0.0", project.version());
assertEquals("pbs", project.languageId());
assertEquals(1, project.stdlibVersion());
assertEquals(AppMode.Game, project.target());
assertTrue(Files.isDirectory(project.rootPath()));
assertTrue(Files.isRegularFile(project.rootPath().resolve("prometeu.json")));
assertTrue(Files.isRegularFile(project.rootPath().resolve(".gitignore")));
@@ -84,6 +86,7 @@ final class ProjectCatalogServiceTest {
tempDir,
"pbs",
7,
AppMode.Game,
"code",
8,
"/opt/prometeu/runtime"));
@@ -135,6 +138,7 @@ final class ProjectCatalogServiceTest {
"version": "1.0.0",
"language": "pbs",
"stdlib": "1",
"target": "Game",
"dependencies": []
}
""".formatted(name);
@@ -1,6 +1,7 @@
package p.studio.projectsessions;
import org.junit.jupiter.api.Test;
import p.studio.AppMode;
import p.studio.lsp.api.LspServerLifecycle;
import p.studio.lsp.messages.LspProjectContext;
import p.studio.lsp.messages.LspServerConfiguration;
@@ -29,6 +30,7 @@ final class StudioProjectSessionFactoryTest {
"1.0.0",
"pbs",
1,
AppMode.Game,
Path.of("/tmp/example"));
final StudioProjectSession session = sessionFactory.open(projectReference);
@@ -58,6 +60,7 @@ final class StudioProjectSessionFactoryTest {
"1.0.0",
"pbs",
1,
AppMode.Game,
Path.of("/tmp/example"))));
assertEquals("boom", failure.getMessage());
@@ -1,6 +1,7 @@
package p.studio.projectsessions;
import org.junit.jupiter.api.Test;
import p.studio.AppMode;
import p.studio.execution.StudioExecutionSessionService;
import p.studio.lsp.api.LspServerLifecycle;
import p.studio.lsp.messages.LspProjectContext;
@@ -72,7 +73,7 @@ final class StudioProjectSessionTest {
}
private ProjectReference projectReference() {
return new ProjectReference("Example", "1.0.0", "pbs", 1, Path.of("/tmp/example"));
return new ProjectReference("Example", "1.0.0", "pbs", 1, AppMode.Game, Path.of("/tmp/example"));
}
private static final class RecordingProjectLocalStudioStateService extends ProjectLocalStudioStateService {
@@ -2,6 +2,7 @@ package p.studio.projectstate;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import p.studio.AppMode;
import p.studio.projects.ProjectReference;
import p.studio.projects.ProjectStudioPaths;
@@ -75,6 +76,6 @@ final class ProjectLocalStudioSetupServiceTest {
private ProjectReference project(final String name) {
final Path projectRoot = tempDir.resolve(name);
return new ProjectReference("Main", "1.0.0", "pbs", 1, projectRoot);
return new ProjectReference("Main", "1.0.0", "pbs", 1, AppMode.Game, projectRoot);
}
}
@@ -2,6 +2,7 @@ package p.studio.projectstate;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import p.studio.AppMode;
import p.studio.projects.ProjectReference;
import p.studio.projects.ProjectStudioPaths;
@@ -97,6 +98,6 @@ final class ProjectLocalStudioStateServiceTest {
private ProjectReference project(final String name) {
final Path projectRoot = tempDir.resolve(name);
return new ProjectReference("Main", "1.0.0", "pbs", 1, projectRoot);
return new ProjectReference("Main", "1.0.0", "pbs", 1, AppMode.Game, projectRoot);
}
}
@@ -10,6 +10,7 @@ import p.packer.messages.assets.AssetFamilyCatalog;
import p.packer.messages.assets.OutputCodecCatalog;
import p.packer.messages.assets.OutputFormatCatalog;
import p.packer.messages.assets.PackerCodecConfigurationFieldType;
import p.studio.AppMode;
import p.studio.projects.ProjectReference;
import p.studio.workspaces.assets.metadata.AssetStudioGlyphSpecialization;
import p.studio.workspaces.assets.metadata.AssetStudioSceneBankMetadata;
@@ -118,7 +119,7 @@ final class SceneBankWorkflowServiceTest {
}
private ProjectReference projectReference() {
return new ProjectReference("main", "1", "pbs", 1, tempDir.resolve("project"));
return new ProjectReference("main", "1", "pbs", 1, AppMode.Game, tempDir.resolve("project"));
}
private AssetWorkspaceAssetDetails createValidScene(ProjectReference project) throws Exception {
@@ -8,13 +8,10 @@ import p.packer.messages.assets.AssetFamilyCatalog;
import p.packer.messages.assets.OutputCodecCatalog;
import p.packer.messages.assets.OutputFormatCatalog;
import p.packer.messages.assets.PackerCodecConfigurationFieldType;
import p.studio.AppMode;
import p.studio.projects.ProjectReference;
import p.studio.workspaces.assets.metadata.AssetStudioGlyphSpecialization;
import p.studio.workspaces.assets.metadata.AssetStudioMetadataService;
import p.studio.workspaces.assets.metadata.AssetStudioSceneBankMetadata;
import p.studio.workspaces.assets.metadata.AssetStudioSceneLayerBinding;
import p.studio.workspaces.assets.metadata.AssetStudioSceneTile;
import p.studio.workspaces.assets.messages.*;
import p.studio.workspaces.assets.metadata.*;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -45,8 +42,8 @@ final class TiledAssetGenerationServiceTest {
assertTrue(Files.isRegularFile(tsxPath));
final TiledTilesetDocument tileset = codec.readTileset(tsxPath);
assertEquals(2, tileset.tiles().size());
assertEquals("a.png", tileset.tiles().get(0).imageSource());
assertEquals("glyph_id", tileset.tiles().get(0).properties().getFirst().name());
assertEquals("a.png", tileset.tiles().getFirst().imageSource());
assertEquals("glyph_id", tileset.tiles().getFirst().properties().getFirst().name());
}
@Test
@@ -70,7 +67,7 @@ final class TiledAssetGenerationServiceTest {
final Path sceneRoot = projectRoot.resolve("assets/scenes/overworld");
Files.createDirectories(sceneRoot);
final AssetWorkspaceAssetDetails details = sceneDetails(sceneRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, projectRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, AppMode.Game, projectRoot);
final TiledAssetGenerationResult result = service.exportSceneBankTmx(projectReference, details);
@@ -105,7 +102,7 @@ final class TiledAssetGenerationServiceTest {
final Path sceneRoot = projectRoot.resolve("assets/scenes/overworld");
Files.createDirectories(sceneRoot);
final AssetWorkspaceAssetDetails details = sceneDetails(sceneRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, projectRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, AppMode.Game, projectRoot);
final Path tmxPath = sceneRoot.resolve("scene.tmx");
Files.writeString(tmxPath, "legacy");
@@ -145,7 +142,7 @@ final class TiledAssetGenerationServiceTest {
final Path sceneRoot = projectRoot.resolve("assets/scenes/overworld");
Files.createDirectories(sceneRoot);
final AssetWorkspaceAssetDetails details = sceneDetails(sceneRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, projectRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, AppMode.Game, projectRoot);
assertTrue(service.exportSceneBankTmx(projectReference, details).success());
final Path tmxPath = sceneRoot.resolve("scene.tmx");
@@ -183,7 +180,7 @@ final class TiledAssetGenerationServiceTest {
final Path sceneRoot = projectRoot.resolve("assets/scenes/overworld");
Files.createDirectories(sceneRoot);
final AssetWorkspaceAssetDetails details = sceneDetails(sceneRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, projectRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, AppMode.Game, projectRoot);
assertTrue(service.exportSceneBankTmx(projectReference, details).success());
final Path tsxPath = tilesetRoot.resolve(TiledAssetGenerationService.GENERATED_TSX_FILE);
@@ -224,7 +221,7 @@ final class TiledAssetGenerationServiceTest {
final Path sceneRoot = projectRoot.resolve("assets/scenes/overworld");
Files.createDirectories(sceneRoot);
final AssetWorkspaceAssetDetails details = sceneDetails(sceneRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, projectRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, AppMode.Game, projectRoot);
assertTrue(service.exportSceneBankTmx(projectReference, details).success());
final Path tmxPath = sceneRoot.resolve("scene.tmx");
@@ -290,7 +287,7 @@ final class TiledAssetGenerationServiceTest {
final Path sceneRoot = projectRoot.resolve("assets/scenes/overworld");
Files.createDirectories(sceneRoot);
final AssetWorkspaceAssetDetails details = sceneDetails(sceneRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, projectRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, AppMode.Game, projectRoot);
assertTrue(service.exportSceneBankTmx(projectReference, details).success());
final Path tmxPath = sceneRoot.resolve("scene.tmx");
@@ -361,7 +358,7 @@ final class TiledAssetGenerationServiceTest {
final Path sceneRoot = projectRoot.resolve("assets/scenes/overworld");
Files.createDirectories(sceneRoot);
final AssetWorkspaceAssetDetails details = sceneDetails(sceneRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, projectRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, AppMode.Game, projectRoot);
final Path tmxPath = sceneRoot.resolve("scene.tmx");
Files.writeString(tmxPath, """
@@ -398,7 +395,7 @@ final class TiledAssetGenerationServiceTest {
final Path sceneRoot = projectRoot.resolve("assets/scenes/overworld");
Files.createDirectories(sceneRoot);
final AssetWorkspaceAssetDetails details = sceneDetails(sceneRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, projectRoot);
final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, AppMode.Game, projectRoot);
final Path tmxPath = sceneRoot.resolve("scene.tmx");
Files.writeString(tmxPath, """