diff --git a/.gitignore b/.gitignore index ed6683b7..ab067ab2 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,8 @@ build **/.studio/** .DS_Store + +# Discussion workflow state is local; only consolidated lessons are versioned. +discussion/* +!discussion/lessons/ +!discussion/lessons/** diff --git a/README.md b/README.md index 25ad11c8..0a339e57 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,10 @@ This repository packages the Studio shell together with the embedded services it The root project is a monorepo with these main areas: -- `prometeu-app`: JavaFX application entry point (`p.studio.App`). -- `prometeu-studio`: Studio UI, workspaces, project session lifecycle, play/stop flow, and debugger-facing surfaces. +- `prometeu-app`: Spring Boot non-web composition, concrete adapters, packaging, and JavaFX entry point (`p.studio.app.StudioLauncher`). +- `prometeu-studio-api`: toolkit-neutral Studio contracts and operation surfaces. +- `prometeu-studio-core`: JavaFX-free project, session, assets, shipper, runtime, and execution services. +- `prometeu-studio-ui-javafx`: the current human-facing JavaFX adapter. - `prometeu-packer`: embedded packer APIs and implementation used by Studio. - `prometeu-compiler`: compiler core, build pipeline, frontend APIs, and the PBS frontend. - `prometeu-infra`: shared infrastructure used across modules. @@ -64,9 +66,11 @@ Generate the aggregated coverage report: If you are new to the codebase, this order is usually the fastest path: 1. Start at `prometeu-app` to see application bootstrap. -2. Read `prometeu-studio` for the shell, workspaces, and user-facing flows. -3. Read `prometeu-packer` for asset and packaging boundaries. -4. Read `prometeu-compiler` when you need compiler or PBS language behavior. +2. Read `prometeu-studio-api` and `prometeu-studio-core` for Studio contracts and application services. +3. Read `prometeu-studio-ui-javafx` for the current shell, workspaces, and human-facing flows. +4. Read `prometeu-app` for Spring composition and provider gateways. +5. Read `prometeu-packer` for asset and packaging boundaries. +6. Read `prometeu-compiler` when you need compiler or PBS language behavior. ## Specs And Architecture @@ -76,4 +80,4 @@ Important reference surfaces: - `docs/specs/packer/`: packer specifications - `docs/vm-arch/`: VM and ISA architecture references -These documents are the long-term normative source for behavior and contracts. When code and docs diverge, fix the divergence explicitly instead of relying on tribal knowledge. \ No newline at end of file +These documents are the long-term normative source for behavior and contracts. When code and docs diverge, fix the divergence explicitly instead of relying on tribal knowledge. diff --git a/discussion/.backups/index.ndjson.20260331-103611.bak b/discussion/.backups/index.ndjson.20260331-103611.bak deleted file mode 100644 index 4b185fce..00000000 --- a/discussion/.backups/index.ndjson.20260331-103611.bak +++ /dev/null @@ -1,14 +0,0 @@ -{"type":"meta","next_id":{"DSC":14,"AGD":15,"DEC":10,"PLN":19,"LSN":28,"CLSN":1}} -{"type":"discussion","id":"DSC-0001","status":"done","ticket":"studio-docs-import","title":"Import docs/studio into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0001","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0001-assets-workspace-execution-wave-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0002","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0002-bank-composition-editor-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0003","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0003-mental-model-asset-mutations-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0004","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0004-mental-model-assets-workspace-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0005","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0005-mental-model-studio-events-and-components-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0006","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0006-mental-model-studio-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0007","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0007-pack-wizard-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0008","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0008-project-scoped-state-and-activity-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0016","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0016-studio-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0002","status":"open","ticket":"palette-management-in-studio","title":"Palette Management in Studio","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","legacy-import","palette-management","tile-bank","packer-boundary"],"agendas":[{"id":"AGD-0002","file":"AGD-0002-palette-management-in-studio.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0003","status":"done","ticket":"packer-docs-import","title":"Import docs/packer into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0009","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0009-mental-model-packer-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0010","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0010-asset-identity-and-runtime-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0011","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0011-foundations-workspace-runtime-and-build-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0012","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0012-runtime-ownership-and-studio-boundary-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0013","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0013-metadata-convergence-and-runtime-sink-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0014","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0014-pack-wizard-summary-validation-and-pack-execution-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0015","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0015-tile-bank-packing-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0017","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0017-packer-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0004","status":"open","ticket":"tilemap-and-metatile-runtime-binary-layout","title":"Tilemap and Metatile Runtime Binary Layout","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tilemap","metatile","runtime-layout"],"agendas":[{"id":"AGD-0004","file":"AGD-0004-tilemap-and-metatile-runtime-binary-layout.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0005","status":"open","ticket":"variable-tile-bank-palette-serialization","title":"Variable Tile Bank Palette Serialization","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tile-bank","palette-serialization","versioning"],"agendas":[{"id":"AGD-0005","file":"AGD-0005-variable-tile-bank-palette-serialization.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0006","status":"done","ticket":"pbs-game-facing-asset-refs-and-call-result-discard","title":"PBS Game-Facing Asset References and Ignored Call Result Lowering","created_at":"2026-03-27","updated_at":"2026-03-30","tags":["compiler","pbs","ergonomics","lowering","runtime","asset-identity","expression-statements"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0024","file":"discussion/lessons/DSC-0006-pbs-game-facing-asset-refs-and-call-result-discard/LSN-0024-addressable-surface-host-metadata-and-ignored-value-discipline.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0007","status":"done","ticket":"pbs-learn-to-discussion-lessons-migration","title":"Migrate PBS Learn Documents into Discussion Lessons","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","migration","discussion-framework","lessons","learn-prune"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0018","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0018-pbs-ast-and-parser-contract-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0019","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0019-pbs-name-resolution-and-linking-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0020","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0020-pbs-runtime-values-identity-memory-boundaries-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0021","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0021-pbs-diagnostics-and-conformance-governance-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0022","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0022-pbs-globals-lifecycle-and-published-entrypoint-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0008","status":"done","ticket":"pbs-low-level-asset-manager-surface","title":"PBS Low-Level Asset Manager Surface for Runtime AssetManager","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","runtime","asset-manager","host-abi","stdlib","asset"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0023","file":"discussion/lessons/DSC-0008-pbs-low-level-asset-manager-surface/LSN-0023-lowassets-runtime-aligned-sdk-surface.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0009","status":"open","ticket":"studio-debugger-workspace-integration","title":"Integrate ../debugger into Studio as a dedicated workspace","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["studio","debugger","workspace","integration","shell"],"agendas":[{"id":"AGD-0009","file":"AGD-0009-studio-debugger-workspace-integration.md","status":"open","created_at":"2026-03-30","updated_at":"2026-03-30"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0010","status":"done","ticket":"studio-code-editor-workspace-foundations","title":"Establish Code Editor workspace foundations in Studio without LSP","created_at":"2026-03-30","updated_at":"2026-03-31","tags":["studio","editor","workspace","multi-frontend","lsp-deferred"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0026","file":"discussion/lessons/DSC-0010-studio-code-editor-workspace-foundations/LSN-0026-read-only-editor-foundations-and-semantic-deferral.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0011","status":"done","ticket":"compiler-analyze-compile-build-pipeline-split","title":"Split compiler pipeline into analyze, compile, and build entrypoints","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["compiler","pipeline","artifacts","build","analysis"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0025","file":"discussion/lessons/DSC-0011-compiler-analyze-compile-build-pipeline-split/LSN-0025-compiler-pipeline-entrypoints-and-result-boundaries.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0012","status":"done","ticket":"studio-editor-document-vfs-boundary","title":"Definir um boundary de VFS documental para tree/view/open files no Code Editor do Studio","created_at":"2026-03-31","updated_at":"2026-03-31","tags":["studio","editor","workspace","vfs","filesystem","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0027","file":"discussion/lessons/DSC-0012-studio-editor-document-vfs-boundary/LSN-0027-project-document-vfs-and-session-owned-editor-boundary.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0013","status":"open","ticket":"studio-editor-write-wave-supported-non-frontend-files","title":"Definir a wave inicial de edicao no Code Editor apenas para arquivos aceitos e nao relacionados ao FE","created_at":"2026-03-31","updated_at":"2026-03-31","tags":["studio","editor","workspace","write","read-only","vfs","frontend-boundary"],"agendas":[{"id":"AGD-0013","file":"AGD-0013-studio-editor-write-wave-supported-non-frontend-files.md","status":"accepted","created_at":"2026-03-31","updated_at":"2026-03-31"},{"id":"AGD-0014","file":"AGD-0014-studio-editor-frontend-edit-rights.md","status":"open","created_at":"2026-03-31","updated_at":"2026-03-31"}],"decisions":[],"plans":[],"lessons":[]} diff --git a/discussion/.backups/index.ndjson.20260331-104906.bak b/discussion/.backups/index.ndjson.20260331-104906.bak deleted file mode 100644 index 02fa4796..00000000 --- a/discussion/.backups/index.ndjson.20260331-104906.bak +++ /dev/null @@ -1,14 +0,0 @@ -{"type":"meta","next_id":{"DSC":14,"AGD":15,"DEC":12,"PLN":19,"LSN":28,"CLSN":1}} -{"type":"discussion","id":"DSC-0001","status":"done","ticket":"studio-docs-import","title":"Import docs/studio into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0001","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0001-assets-workspace-execution-wave-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0002","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0002-bank-composition-editor-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0003","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0003-mental-model-asset-mutations-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0004","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0004-mental-model-assets-workspace-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0005","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0005-mental-model-studio-events-and-components-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0006","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0006-mental-model-studio-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0007","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0007-pack-wizard-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0008","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0008-project-scoped-state-and-activity-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0016","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0016-studio-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0002","status":"open","ticket":"palette-management-in-studio","title":"Palette Management in Studio","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","legacy-import","palette-management","tile-bank","packer-boundary"],"agendas":[{"id":"AGD-0002","file":"AGD-0002-palette-management-in-studio.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0003","status":"done","ticket":"packer-docs-import","title":"Import docs/packer into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0009","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0009-mental-model-packer-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0010","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0010-asset-identity-and-runtime-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0011","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0011-foundations-workspace-runtime-and-build-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0012","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0012-runtime-ownership-and-studio-boundary-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0013","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0013-metadata-convergence-and-runtime-sink-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0014","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0014-pack-wizard-summary-validation-and-pack-execution-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0015","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0015-tile-bank-packing-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0017","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0017-packer-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0004","status":"open","ticket":"tilemap-and-metatile-runtime-binary-layout","title":"Tilemap and Metatile Runtime Binary Layout","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tilemap","metatile","runtime-layout"],"agendas":[{"id":"AGD-0004","file":"AGD-0004-tilemap-and-metatile-runtime-binary-layout.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0005","status":"open","ticket":"variable-tile-bank-palette-serialization","title":"Variable Tile Bank Palette Serialization","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tile-bank","palette-serialization","versioning"],"agendas":[{"id":"AGD-0005","file":"AGD-0005-variable-tile-bank-palette-serialization.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0006","status":"done","ticket":"pbs-game-facing-asset-refs-and-call-result-discard","title":"PBS Game-Facing Asset References and Ignored Call Result Lowering","created_at":"2026-03-27","updated_at":"2026-03-30","tags":["compiler","pbs","ergonomics","lowering","runtime","asset-identity","expression-statements"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0024","file":"discussion/lessons/DSC-0006-pbs-game-facing-asset-refs-and-call-result-discard/LSN-0024-addressable-surface-host-metadata-and-ignored-value-discipline.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0007","status":"done","ticket":"pbs-learn-to-discussion-lessons-migration","title":"Migrate PBS Learn Documents into Discussion Lessons","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","migration","discussion-framework","lessons","learn-prune"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0018","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0018-pbs-ast-and-parser-contract-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0019","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0019-pbs-name-resolution-and-linking-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0020","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0020-pbs-runtime-values-identity-memory-boundaries-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0021","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0021-pbs-diagnostics-and-conformance-governance-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0022","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0022-pbs-globals-lifecycle-and-published-entrypoint-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0008","status":"done","ticket":"pbs-low-level-asset-manager-surface","title":"PBS Low-Level Asset Manager Surface for Runtime AssetManager","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","runtime","asset-manager","host-abi","stdlib","asset"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0023","file":"discussion/lessons/DSC-0008-pbs-low-level-asset-manager-surface/LSN-0023-lowassets-runtime-aligned-sdk-surface.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0009","status":"open","ticket":"studio-debugger-workspace-integration","title":"Integrate ../debugger into Studio as a dedicated workspace","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["studio","debugger","workspace","integration","shell"],"agendas":[{"id":"AGD-0009","file":"AGD-0009-studio-debugger-workspace-integration.md","status":"open","created_at":"2026-03-30","updated_at":"2026-03-30"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0010","status":"done","ticket":"studio-code-editor-workspace-foundations","title":"Establish Code Editor workspace foundations in Studio without LSP","created_at":"2026-03-30","updated_at":"2026-03-31","tags":["studio","editor","workspace","multi-frontend","lsp-deferred"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0026","file":"discussion/lessons/DSC-0010-studio-code-editor-workspace-foundations/LSN-0026-read-only-editor-foundations-and-semantic-deferral.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0011","status":"done","ticket":"compiler-analyze-compile-build-pipeline-split","title":"Split compiler pipeline into analyze, compile, and build entrypoints","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["compiler","pipeline","artifacts","build","analysis"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0025","file":"discussion/lessons/DSC-0011-compiler-analyze-compile-build-pipeline-split/LSN-0025-compiler-pipeline-entrypoints-and-result-boundaries.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0012","status":"done","ticket":"studio-editor-document-vfs-boundary","title":"Definir um boundary de VFS documental para tree/view/open files no Code Editor do Studio","created_at":"2026-03-31","updated_at":"2026-03-31","tags":["studio","editor","workspace","vfs","filesystem","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0027","file":"discussion/lessons/DSC-0012-studio-editor-document-vfs-boundary/LSN-0027-project-document-vfs-and-session-owned-editor-boundary.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0013","status":"open","ticket":"studio-editor-write-wave-supported-non-frontend-files","title":"Definir a wave inicial de edicao no Code Editor apenas para arquivos aceitos e nao relacionados ao FE","created_at":"2026-03-31","updated_at":"2026-03-31","tags":["studio","editor","workspace","write","read-only","vfs","frontend-boundary"],"agendas":[{"id":"AGD-0013","file":"AGD-0013-studio-editor-write-wave-supported-non-frontend-files.md","status":"accepted","created_at":"2026-03-31","updated_at":"2026-03-31"},{"id":"AGD-0014","file":"AGD-0014-studio-editor-frontend-edit-rights.md","status":"accepted","created_at":"2026-03-31","updated_at":"2026-03-31"}],"decisions":[{"id":"DEC-0010","file":"DEC-0010-studio-controlled-non-frontend-editor-write-wave.md","status":"accepted","created_at":"2026-03-31","updated_at":"2026-03-31","ref_agenda":"AGD-0013"},{"id":"DEC-0011","file":"DEC-0011-studio-frontend-read-only-minimum-lsp-phase.md","status":"accepted","created_at":"2026-03-31","updated_at":"2026-03-31","ref_agenda":"AGD-0014"}],"plans":[],"lessons":[]} diff --git a/discussion/.backups/index.ndjson.20260402-170740.bak b/discussion/.backups/index.ndjson.20260402-170740.bak deleted file mode 100644 index 7ac22b0e..00000000 --- a/discussion/.backups/index.ndjson.20260402-170740.bak +++ /dev/null @@ -1,15 +0,0 @@ -{"type":"meta","next_id":{"DSC":14,"AGD":15,"DEC":13,"PLN":29,"LSN":28,"CLSN":1}} -{"type":"discussion","id":"DSC-0001","status":"done","ticket":"studio-docs-import","title":"Import docs/studio into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0001","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0001-assets-workspace-execution-wave-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0002","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0002-bank-composition-editor-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0003","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0003-mental-model-asset-mutations-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0004","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0004-mental-model-assets-workspace-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0005","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0005-mental-model-studio-events-and-components-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0006","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0006-mental-model-studio-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0007","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0007-pack-wizard-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0008","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0008-project-scoped-state-and-activity-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0016","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0016-studio-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0002","status":"open","ticket":"palette-management-in-studio","title":"Palette Management in Studio","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","legacy-import","palette-management","tile-bank","packer-boundary"],"agendas":[{"id":"AGD-0002","file":"AGD-0002-palette-management-in-studio.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0003","status":"done","ticket":"packer-docs-import","title":"Import docs/packer into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0009","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0009-mental-model-packer-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0010","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0010-asset-identity-and-runtime-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0011","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0011-foundations-workspace-runtime-and-build-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0012","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0012-runtime-ownership-and-studio-boundary-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0013","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0013-metadata-convergence-and-runtime-sink-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0014","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0014-pack-wizard-summary-validation-and-pack-execution-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0015","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0015-tile-bank-packing-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0017","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0017-packer-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0004","status":"open","ticket":"tilemap-and-metatile-runtime-binary-layout","title":"Tilemap and Metatile Runtime Binary Layout","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tilemap","metatile","runtime-layout"],"agendas":[{"id":"AGD-0004","file":"AGD-0004-tilemap-and-metatile-runtime-binary-layout.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0005","status":"open","ticket":"variable-tile-bank-palette-serialization","title":"Variable Tile Bank Palette Serialization","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tile-bank","palette-serialization","versioning"],"agendas":[{"id":"AGD-0005","file":"AGD-0005-variable-tile-bank-palette-serialization.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0006","status":"done","ticket":"pbs-game-facing-asset-refs-and-call-result-discard","title":"PBS Game-Facing Asset References and Ignored Call Result Lowering","created_at":"2026-03-27","updated_at":"2026-03-30","tags":["compiler","pbs","ergonomics","lowering","runtime","asset-identity","expression-statements"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0024","file":"discussion/lessons/DSC-0006-pbs-game-facing-asset-refs-and-call-result-discard/LSN-0024-addressable-surface-host-metadata-and-ignored-value-discipline.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0007","status":"done","ticket":"pbs-learn-to-discussion-lessons-migration","title":"Migrate PBS Learn Documents into Discussion Lessons","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","migration","discussion-framework","lessons","learn-prune"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0018","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0018-pbs-ast-and-parser-contract-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0019","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0019-pbs-name-resolution-and-linking-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0020","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0020-pbs-runtime-values-identity-memory-boundaries-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0021","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0021-pbs-diagnostics-and-conformance-governance-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0022","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0022-pbs-globals-lifecycle-and-published-entrypoint-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0008","status":"done","ticket":"pbs-low-level-asset-manager-surface","title":"PBS Low-Level Asset Manager Surface for Runtime AssetManager","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","runtime","asset-manager","host-abi","stdlib","asset"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0023","file":"discussion/lessons/DSC-0008-pbs-low-level-asset-manager-surface/LSN-0023-lowassets-runtime-aligned-sdk-surface.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0009","status":"open","ticket":"studio-debugger-workspace-integration","title":"Integrate ../debugger into Studio as a dedicated workspace","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["studio","debugger","workspace","integration","shell"],"agendas":[{"id":"AGD-0009","file":"AGD-0009-studio-debugger-workspace-integration.md","status":"open","created_at":"2026-03-30","updated_at":"2026-03-30"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0010","status":"done","ticket":"studio-code-editor-workspace-foundations","title":"Establish Code Editor workspace foundations in Studio without LSP","created_at":"2026-03-30","updated_at":"2026-03-31","tags":["studio","editor","workspace","multi-frontend","lsp-deferred"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0026","file":"discussion/lessons/DSC-0010-studio-code-editor-workspace-foundations/LSN-0026-read-only-editor-foundations-and-semantic-deferral.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0011","status":"done","ticket":"compiler-analyze-compile-build-pipeline-split","title":"Split compiler pipeline into analyze, compile, and build entrypoints","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["compiler","pipeline","artifacts","build","analysis"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0025","file":"discussion/lessons/DSC-0011-compiler-analyze-compile-build-pipeline-split/LSN-0025-compiler-pipeline-entrypoints-and-result-boundaries.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0012","status":"done","ticket":"studio-editor-document-vfs-boundary","title":"Definir um boundary de VFS documental para tree/view/open files no Code Editor do Studio","created_at":"2026-03-31","updated_at":"2026-03-31","tags":["studio","editor","workspace","vfs","filesystem","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0027","file":"discussion/lessons/DSC-0012-studio-editor-document-vfs-boundary/LSN-0027-project-document-vfs-and-session-owned-editor-boundary.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0013","status":"open","ticket":"studio-editor-write-wave-supported-non-frontend-files","title":"Definir a wave inicial de edicao no Code Editor apenas para arquivos aceitos e nao relacionados ao FE","created_at":"2026-03-31","updated_at":"2026-03-31","tags":["studio","editor","workspace","write","read-only","vfs","frontend-boundary"],"agendas":[{"id":"AGD-0013","file":"AGD-0013-studio-editor-write-wave-supported-non-frontend-files.md","status":"accepted","created_at":"2026-03-31","updated_at":"2026-03-31"},{"id":"AGD-0014","file":"AGD-0014-studio-editor-frontend-edit-rights.md","status":"accepted","created_at":"2026-03-31","updated_at":"2026-03-31"}],"decisions":[{"id":"DEC-0010","file":"DEC-0010-studio-controlled-non-frontend-editor-write-wave.md","status":"accepted","created_at":"2026-03-31","updated_at":"2026-03-31","ref_agenda":"AGD-0013"},{"id":"DEC-0011","file":"DEC-0011-studio-frontend-read-only-minimum-lsp-phase.md","status":"accepted","created_at":"2026-03-31","updated_at":"2026-03-31","ref_agenda":"AGD-0014"}],"plans":[{"id":"PLN-0019","file":"PLN-0019-propagate-dec-0010-into-studio-and-vfs-specs.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31","ref_decisions":["DEC-0010"]},{"id":"PLN-0020","file":"PLN-0020-build-dec-0010-vfs-access-policy-and-save-core.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31","ref_decisions":["DEC-0010"]},{"id":"PLN-0021","file":"PLN-0021-integrate-dec-0010-editor-write-ui-and-workflow.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31","ref_decisions":["DEC-0010"]},{"id":"PLN-0022","file":"PLN-0022-propagate-dec-0011-into-studio-vfs-and-lsp-specs.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31","ref_decisions":["DEC-0011"]},{"id":"PLN-0023","file":"PLN-0023-scaffold-flat-packed-prometeu-lsp-api-and-session-seams.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31","ref_decisions":["DEC-0011"]},{"id":"PLN-0024","file":"PLN-0024-implement-read-only-fe-diagnostics-symbols-and-definition.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31","ref_decisions":["DEC-0011"]},{"id":"PLN-0025","file":"PLN-0025-implement-fe-semantic-highlight-consumption.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31","ref_decisions":["DEC-0011"]}],"lessons":[]} -{"type":"discussion","id":"DSC-0014","status":"open","ticket":"studio-frontend-owned-semantic-editor-presentation","title":"Definir ownership do schema visual semantico do editor por frontend","created_at":"2026-04-02","updated_at":"2026-04-02","tags":["studio","editor","frontend","presentation","semantic-highlighting","compiler","pbs"],"agendas":[{"id":"AGD-0015","file":"AGD-0015-studio-frontend-owned-semantic-editor-presentation.md","status":"accepted","created_at":"2026-04-02","updated_at":"2026-04-02"}],"decisions":[{"id":"DEC-0012","file":"DEC-0012-frontend-owned-semantic-editor-presentation.md","status":"accepted","created_at":"2026-04-02","updated_at":"2026-04-02","ref_agenda":"AGD-0015"}],"plans":[{"id":"PLN-0026","file":"PLN-0026-propagate-dec-0012-into-studio-and-frontend-specs.md","status":"review","created_at":"2026-04-02","updated_at":"2026-04-02","ref_decisions":["DEC-0012"]},{"id":"PLN-0027","file":"PLN-0027-add-frontend-semantic-presentation-contract-and-lsp-descriptor.md","status":"review","created_at":"2026-04-02","updated_at":"2026-04-02","ref_decisions":["DEC-0012"]},{"id":"PLN-0028","file":"PLN-0028-consume-frontend-owned-semantic-presentation-in-studio.md","status":"review","created_at":"2026-04-02","updated_at":"2026-04-02","ref_decisions":["DEC-0012"]}],"lessons":[]} diff --git a/discussion/.backups/index.ndjson.20260402-171350.bak b/discussion/.backups/index.ndjson.20260402-171350.bak deleted file mode 100644 index f0484296..00000000 --- a/discussion/.backups/index.ndjson.20260402-171350.bak +++ /dev/null @@ -1,15 +0,0 @@ -{"type":"meta","next_id":{"DSC":15,"AGD":16,"DEC":13,"PLN":29,"LSN":29,"CLSN":1}} -{"type":"discussion","id":"DSC-0001","status":"done","ticket":"studio-docs-import","title":"Import docs/studio into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0001","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0001-assets-workspace-execution-wave-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0002","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0002-bank-composition-editor-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0003","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0003-mental-model-asset-mutations-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0004","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0004-mental-model-assets-workspace-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0005","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0005-mental-model-studio-events-and-components-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0006","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0006-mental-model-studio-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0007","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0007-pack-wizard-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0008","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0008-project-scoped-state-and-activity-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0016","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0016-studio-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0002","status":"open","ticket":"palette-management-in-studio","title":"Palette Management in Studio","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","legacy-import","palette-management","tile-bank","packer-boundary"],"agendas":[{"id":"AGD-0002","file":"AGD-0002-palette-management-in-studio.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0003","status":"done","ticket":"packer-docs-import","title":"Import docs/packer into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0009","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0009-mental-model-packer-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0010","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0010-asset-identity-and-runtime-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0011","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0011-foundations-workspace-runtime-and-build-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0012","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0012-runtime-ownership-and-studio-boundary-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0013","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0013-metadata-convergence-and-runtime-sink-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0014","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0014-pack-wizard-summary-validation-and-pack-execution-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0015","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0015-tile-bank-packing-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0017","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0017-packer-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0004","status":"open","ticket":"tilemap-and-metatile-runtime-binary-layout","title":"Tilemap and Metatile Runtime Binary Layout","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tilemap","metatile","runtime-layout"],"agendas":[{"id":"AGD-0004","file":"AGD-0004-tilemap-and-metatile-runtime-binary-layout.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0005","status":"open","ticket":"variable-tile-bank-palette-serialization","title":"Variable Tile Bank Palette Serialization","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tile-bank","palette-serialization","versioning"],"agendas":[{"id":"AGD-0005","file":"AGD-0005-variable-tile-bank-palette-serialization.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0006","status":"done","ticket":"pbs-game-facing-asset-refs-and-call-result-discard","title":"PBS Game-Facing Asset References and Ignored Call Result Lowering","created_at":"2026-03-27","updated_at":"2026-03-30","tags":["compiler","pbs","ergonomics","lowering","runtime","asset-identity","expression-statements"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0024","file":"discussion/lessons/DSC-0006-pbs-game-facing-asset-refs-and-call-result-discard/LSN-0024-addressable-surface-host-metadata-and-ignored-value-discipline.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0007","status":"done","ticket":"pbs-learn-to-discussion-lessons-migration","title":"Migrate PBS Learn Documents into Discussion Lessons","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","migration","discussion-framework","lessons","learn-prune"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0018","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0018-pbs-ast-and-parser-contract-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0019","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0019-pbs-name-resolution-and-linking-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0020","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0020-pbs-runtime-values-identity-memory-boundaries-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0021","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0021-pbs-diagnostics-and-conformance-governance-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0022","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0022-pbs-globals-lifecycle-and-published-entrypoint-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0008","status":"done","ticket":"pbs-low-level-asset-manager-surface","title":"PBS Low-Level Asset Manager Surface for Runtime AssetManager","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","runtime","asset-manager","host-abi","stdlib","asset"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0023","file":"discussion/lessons/DSC-0008-pbs-low-level-asset-manager-surface/LSN-0023-lowassets-runtime-aligned-sdk-surface.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0009","status":"open","ticket":"studio-debugger-workspace-integration","title":"Integrate ../debugger into Studio as a dedicated workspace","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["studio","debugger","workspace","integration","shell"],"agendas":[{"id":"AGD-0009","file":"AGD-0009-studio-debugger-workspace-integration.md","status":"open","created_at":"2026-03-30","updated_at":"2026-03-30"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0010","status":"done","ticket":"studio-code-editor-workspace-foundations","title":"Establish Code Editor workspace foundations in Studio without LSP","created_at":"2026-03-30","updated_at":"2026-03-31","tags":["studio","editor","workspace","multi-frontend","lsp-deferred"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0026","file":"discussion/lessons/DSC-0010-studio-code-editor-workspace-foundations/LSN-0026-read-only-editor-foundations-and-semantic-deferral.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0011","status":"done","ticket":"compiler-analyze-compile-build-pipeline-split","title":"Split compiler pipeline into analyze, compile, and build entrypoints","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["compiler","pipeline","artifacts","build","analysis"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0025","file":"discussion/lessons/DSC-0011-compiler-analyze-compile-build-pipeline-split/LSN-0025-compiler-pipeline-entrypoints-and-result-boundaries.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0012","status":"done","ticket":"studio-editor-document-vfs-boundary","title":"Definir um boundary de VFS documental para tree/view/open files no Code Editor do Studio","created_at":"2026-03-31","updated_at":"2026-03-31","tags":["studio","editor","workspace","vfs","filesystem","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0027","file":"discussion/lessons/DSC-0012-studio-editor-document-vfs-boundary/LSN-0027-project-document-vfs-and-session-owned-editor-boundary.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0013","status":"done","ticket":"studio-editor-write-wave-supported-non-frontend-files","title":"Definir a wave inicial de edicao no Code Editor apenas para arquivos aceitos e nao relacionados ao FE","created_at":"2026-03-31","updated_at":"2026-04-02","tags":["studio","editor","workspace","write","read-only","vfs","frontend-boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0028","file":"discussion/lessons/DSC-0013-studio-editor-write-wave-supported-non-frontend-files/LSN-0028-controlled-editor-write-wave-and-read-only-frontend-semantic-phase.md","status":"done","created_at":"2026-04-02","updated_at":"2026-04-02"}]} -{"type":"discussion","id":"DSC-0014","status":"open","ticket":"studio-frontend-owned-semantic-editor-presentation","title":"Definir ownership do schema visual semantico do editor por frontend","created_at":"2026-04-02","updated_at":"2026-04-02","tags":["studio","editor","frontend","presentation","semantic-highlighting","compiler","pbs"],"agendas":[{"id":"AGD-0015","file":"AGD-0015-studio-frontend-owned-semantic-editor-presentation.md","status":"accepted","created_at":"2026-04-02","updated_at":"2026-04-02"}],"decisions":[{"id":"DEC-0012","file":"DEC-0012-frontend-owned-semantic-editor-presentation.md","status":"accepted","created_at":"2026-04-02","updated_at":"2026-04-02","ref_agenda":"AGD-0015"}],"plans":[{"id":"PLN-0026","file":"PLN-0026-propagate-dec-0012-into-studio-and-frontend-specs.md","status":"review","created_at":"2026-04-02","updated_at":"2026-04-02","ref_decisions":["DEC-0012"]},{"id":"PLN-0027","file":"PLN-0027-add-frontend-semantic-presentation-contract-and-lsp-descriptor.md","status":"review","created_at":"2026-04-02","updated_at":"2026-04-02","ref_decisions":["DEC-0012"]},{"id":"PLN-0028","file":"PLN-0028-consume-frontend-owned-semantic-presentation-in-studio.md","status":"review","created_at":"2026-04-02","updated_at":"2026-04-02","ref_decisions":["DEC-0012"]}],"lessons":[]} diff --git a/discussion/.backups/index.ndjson.20260404-065912.bak b/discussion/.backups/index.ndjson.20260404-065912.bak deleted file mode 100644 index 876a17ac..00000000 --- a/discussion/.backups/index.ndjson.20260404-065912.bak +++ /dev/null @@ -1,19 +0,0 @@ -{"type":"meta","next_id":{"DSC":19,"AGD":20,"DEC":17,"PLN":38,"LSN":31,"CLSN":1}} -{"type":"discussion","id":"DSC-0001","status":"done","ticket":"studio-docs-import","title":"Import docs/studio into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0001","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0001-assets-workspace-execution-wave-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0002","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0002-bank-composition-editor-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0003","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0003-mental-model-asset-mutations-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0004","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0004-mental-model-assets-workspace-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0005","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0005-mental-model-studio-events-and-components-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0006","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0006-mental-model-studio-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0007","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0007-pack-wizard-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0008","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0008-project-scoped-state-and-activity-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0016","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0016-studio-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0002","status":"open","ticket":"palette-management-in-studio","title":"Palette Management in Studio","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","legacy-import","palette-management","tile-bank","packer-boundary"],"agendas":[{"id":"AGD-0002","file":"AGD-0002-palette-management-in-studio.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0003","status":"done","ticket":"packer-docs-import","title":"Import docs/packer into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0009","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0009-mental-model-packer-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0010","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0010-asset-identity-and-runtime-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0011","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0011-foundations-workspace-runtime-and-build-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0012","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0012-runtime-ownership-and-studio-boundary-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0013","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0013-metadata-convergence-and-runtime-sink-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0014","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0014-pack-wizard-summary-validation-and-pack-execution-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0015","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0015-tile-bank-packing-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0017","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0017-packer-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0004","status":"open","ticket":"tilemap-and-metatile-runtime-binary-layout","title":"Tilemap and Metatile Runtime Binary Layout","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tilemap","metatile","runtime-layout"],"agendas":[{"id":"AGD-0004","file":"AGD-0004-tilemap-and-metatile-runtime-binary-layout.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0005","status":"open","ticket":"variable-tile-bank-palette-serialization","title":"Variable Tile Bank Palette Serialization","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tile-bank","palette-serialization","versioning"],"agendas":[{"id":"AGD-0005","file":"AGD-0005-variable-tile-bank-palette-serialization.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0006","status":"done","ticket":"pbs-game-facing-asset-refs-and-call-result-discard","title":"PBS Game-Facing Asset References and Ignored Call Result Lowering","created_at":"2026-03-27","updated_at":"2026-03-30","tags":["compiler","pbs","ergonomics","lowering","runtime","asset-identity","expression-statements"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0024","file":"discussion/lessons/DSC-0006-pbs-game-facing-asset-refs-and-call-result-discard/LSN-0024-addressable-surface-host-metadata-and-ignored-value-discipline.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0007","status":"done","ticket":"pbs-learn-to-discussion-lessons-migration","title":"Migrate PBS Learn Documents into Discussion Lessons","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","migration","discussion-framework","lessons","learn-prune"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0018","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0018-pbs-ast-and-parser-contract-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0019","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0019-pbs-name-resolution-and-linking-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0020","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0020-pbs-runtime-values-identity-memory-boundaries-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0021","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0021-pbs-diagnostics-and-conformance-governance-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0022","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0022-pbs-globals-lifecycle-and-published-entrypoint-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0008","status":"done","ticket":"pbs-low-level-asset-manager-surface","title":"PBS Low-Level Asset Manager Surface for Runtime AssetManager","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","runtime","asset-manager","host-abi","stdlib","asset"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0023","file":"discussion/lessons/DSC-0008-pbs-low-level-asset-manager-surface/LSN-0023-lowassets-runtime-aligned-sdk-surface.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0009","status":"open","ticket":"studio-debugger-workspace-integration","title":"Integrate ../debugger into Studio as a dedicated workspace","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["studio","debugger","workspace","integration","shell"],"agendas":[{"id":"AGD-0009","file":"AGD-0009-studio-debugger-workspace-integration.md","status":"open","created_at":"2026-03-30","updated_at":"2026-03-30"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0010","status":"done","ticket":"studio-code-editor-workspace-foundations","title":"Establish Code Editor workspace foundations in Studio without LSP","created_at":"2026-03-30","updated_at":"2026-03-31","tags":["studio","editor","workspace","multi-frontend","lsp-deferred"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0026","file":"discussion/lessons/DSC-0010-studio-code-editor-workspace-foundations/LSN-0026-read-only-editor-foundations-and-semantic-deferral.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0011","status":"done","ticket":"compiler-analyze-compile-build-pipeline-split","title":"Split compiler pipeline into analyze, compile, and build entrypoints","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["compiler","pipeline","artifacts","build","analysis"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0025","file":"discussion/lessons/DSC-0011-compiler-analyze-compile-build-pipeline-split/LSN-0025-compiler-pipeline-entrypoints-and-result-boundaries.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0012","status":"done","ticket":"studio-editor-document-vfs-boundary","title":"Definir um boundary de VFS documental para tree/view/open files no Code Editor do Studio","created_at":"2026-03-31","updated_at":"2026-03-31","tags":["studio","editor","workspace","vfs","filesystem","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0027","file":"discussion/lessons/DSC-0012-studio-editor-document-vfs-boundary/LSN-0027-project-document-vfs-and-session-owned-editor-boundary.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0013","status":"done","ticket":"studio-editor-write-wave-supported-non-frontend-files","title":"Definir a wave inicial de edicao no Code Editor apenas para arquivos aceitos e nao relacionados ao FE","created_at":"2026-03-31","updated_at":"2026-04-02","tags":["studio","editor","workspace","write","read-only","vfs","frontend-boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0028","file":"discussion/lessons/DSC-0013-studio-editor-write-wave-supported-non-frontend-files/LSN-0028-controlled-editor-write-wave-and-read-only-frontend-semantic-phase.md","status":"done","created_at":"2026-04-02","updated_at":"2026-04-02"}]} -{"type":"discussion","id":"DSC-0014","status":"done","ticket":"studio-frontend-owned-semantic-editor-presentation","title":"Definir ownership do schema visual semantico do editor por frontend","created_at":"2026-04-02","updated_at":"2026-04-02","tags":["studio","editor","frontend","presentation","semantic-highlighting","compiler","pbs"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0029","file":"discussion/lessons/DSC-0014-studio-frontend-owned-semantic-editor-presentation/LSN-0029-frontend-owned-semantic-presentation-descriptor-and-host-consumption.md","status":"done","created_at":"2026-04-02","updated_at":"2026-04-02"}]} -{"type":"discussion","id":"DSC-0015","status":"done","ticket":"pbs-service-facade-reserved-metadata","title":"SDK Service Bodies Calling Builtin/Intrinsic Proxies as Ordinary PBS Code","created_at":"2026-04-03","updated_at":"2026-04-03","tags":["compiler","pbs","sdk","stdlib","lowering","service","intrinsic","sdk-interface"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0030","file":"discussion/lessons/DSC-0015-pbs-service-facade-reserved-metadata/LSN-0030-sdk-service-bodies-over-private-reserved-proxies.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"}]} -{"type":"discussion","id":"DSC-0016","status":"open","ticket":"studio-editor-scope-guides-and-brace-anchoring","title":"Scope Guides do Code Editor com ancoragem exata em braces e destaque do escopo ativo","created_at":"2026-04-03","updated_at":"2026-04-03","tags":["studio","editor","scope-guides","braces","semantic-read","frontend-contract"],"agendas":[{"id":"AGD-0017","file":"AGD-0017-studio-editor-scope-guides-and-brace-anchoring.md","status":"accepted","created_at":"2026-04-03","updated_at":"2026-04-03"}],"decisions":[{"id":"DEC-0014","file":"DEC-0014-studio-editor-active-scope-and-structural-anchors.md","status":"accepted","created_at":"2026-04-03","updated_at":"2026-04-03"}],"plans":[{"id":"PLN-0030","file":"PLN-0030-studio-active-container-and-active-scope-gutter-wave-1.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"},{"id":"PLN-0031","file":"PLN-0031-studio-structural-anchor-semantic-surface-specification.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"},{"id":"PLN-0032","file":"PLN-0032-frontend-structural-anchor-payloads-and-anchor-aware-tests.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"}],"lessons":[]} -{"type":"discussion","id":"DSC-0017","status":"open","ticket":"studio-editor-inline-type-hints-for-let-bindings","title":"Inline Type Hints for Let Bindings in the Studio Editor","created_at":"2026-04-03","updated_at":"2026-04-03","tags":["studio","editor","inline-hints","inlay-hints","lsp","pbs","type-inference"],"agendas":[{"id":"AGD-0018","file":"AGD-0018-studio-editor-inline-type-hints-for-let-bindings.md","status":"accepted","created_at":"2026-04-03","updated_at":"2026-04-03"}],"decisions":[{"id":"DEC-0015","file":"DEC-0015-studio-editor-inline-type-hints-contract-and-rendering-model.md","status":"accepted","created_at":"2026-04-03","updated_at":"2026-04-03","ref_agenda":"AGD-0018"}],"plans":[{"id":"PLN-0033","file":"PLN-0033-inline-hint-spec-and-contract-propagation.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03","ref_decisions":["DEC-0015"]},{"id":"PLN-0034","file":"PLN-0034-lsp-inline-hint-transport-contract.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03","ref_decisions":["DEC-0015"]},{"id":"PLN-0035","file":"PLN-0035-pbs-inline-type-hint-payload-production.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03","ref_decisions":["DEC-0015"]},{"id":"PLN-0036","file":"PLN-0036-studio-inline-hint-rendering-and-rollout.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03","ref_decisions":["DEC-0015"]}],"lessons":[]} -{"type":"discussion","id":"DSC-0018","status":"open","ticket":"studio-project-local-studio-state-under-dot-studio","title":"Persist project-local Studio state under .studio","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","project-session","project-state","persistence","dot-studio","shell","layout","setup"],"agendas":[{"id":"AGD-0019","file":"AGD-0019-studio-project-open-state-under-dot-studio.md","status":"accepted","created_at":"2026-04-04","updated_at":"2026-04-04"}],"decisions":[{"id":"DEC-0016","file":"DEC-0016-project-local-studio-state-under-dot-studio.md","status":"accepted","created_at":"2026-04-04","updated_at":"2026-04-04","ref_agenda":"AGD-0019"}],"plans":[{"id":"PLN-0037","file":"PLN-0037-project-local-studio-state-store-and-restoration.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04","ref_decisions":["DEC-0016"]}],"lessons":[]} diff --git a/discussion/.backups/index.ndjson.20260404-073314.bak b/discussion/.backups/index.ndjson.20260404-073314.bak deleted file mode 100644 index 9d5647ae..00000000 --- a/discussion/.backups/index.ndjson.20260404-073314.bak +++ /dev/null @@ -1,20 +0,0 @@ -{"type":"meta","next_id":{"DSC":20,"AGD":21,"DEC":18,"PLN":39,"LSN":32,"CLSN":1}} -{"type":"discussion","id":"DSC-0001","status":"done","ticket":"studio-docs-import","title":"Import docs/studio into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0001","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0001-assets-workspace-execution-wave-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0002","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0002-bank-composition-editor-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0003","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0003-mental-model-asset-mutations-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0004","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0004-mental-model-assets-workspace-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0005","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0005-mental-model-studio-events-and-components-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0006","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0006-mental-model-studio-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0007","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0007-pack-wizard-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0008","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0008-project-scoped-state-and-activity-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0016","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0016-studio-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0002","status":"open","ticket":"palette-management-in-studio","title":"Palette Management in Studio","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","legacy-import","palette-management","tile-bank","packer-boundary"],"agendas":[{"id":"AGD-0002","file":"AGD-0002-palette-management-in-studio.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0003","status":"done","ticket":"packer-docs-import","title":"Import docs/packer into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0009","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0009-mental-model-packer-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0010","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0010-asset-identity-and-runtime-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0011","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0011-foundations-workspace-runtime-and-build-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0012","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0012-runtime-ownership-and-studio-boundary-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0013","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0013-metadata-convergence-and-runtime-sink-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0014","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0014-pack-wizard-summary-validation-and-pack-execution-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0015","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0015-tile-bank-packing-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0017","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0017-packer-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0004","status":"open","ticket":"tilemap-and-metatile-runtime-binary-layout","title":"Tilemap and Metatile Runtime Binary Layout","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tilemap","metatile","runtime-layout"],"agendas":[{"id":"AGD-0004","file":"AGD-0004-tilemap-and-metatile-runtime-binary-layout.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0005","status":"open","ticket":"variable-tile-bank-palette-serialization","title":"Variable Tile Bank Palette Serialization","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tile-bank","palette-serialization","versioning"],"agendas":[{"id":"AGD-0005","file":"AGD-0005-variable-tile-bank-palette-serialization.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0006","status":"done","ticket":"pbs-game-facing-asset-refs-and-call-result-discard","title":"PBS Game-Facing Asset References and Ignored Call Result Lowering","created_at":"2026-03-27","updated_at":"2026-03-30","tags":["compiler","pbs","ergonomics","lowering","runtime","asset-identity","expression-statements"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0024","file":"discussion/lessons/DSC-0006-pbs-game-facing-asset-refs-and-call-result-discard/LSN-0024-addressable-surface-host-metadata-and-ignored-value-discipline.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0007","status":"done","ticket":"pbs-learn-to-discussion-lessons-migration","title":"Migrate PBS Learn Documents into Discussion Lessons","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","migration","discussion-framework","lessons","learn-prune"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0018","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0018-pbs-ast-and-parser-contract-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0019","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0019-pbs-name-resolution-and-linking-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0020","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0020-pbs-runtime-values-identity-memory-boundaries-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0021","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0021-pbs-diagnostics-and-conformance-governance-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0022","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0022-pbs-globals-lifecycle-and-published-entrypoint-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0008","status":"done","ticket":"pbs-low-level-asset-manager-surface","title":"PBS Low-Level Asset Manager Surface for Runtime AssetManager","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","runtime","asset-manager","host-abi","stdlib","asset"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0023","file":"discussion/lessons/DSC-0008-pbs-low-level-asset-manager-surface/LSN-0023-lowassets-runtime-aligned-sdk-surface.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0009","status":"open","ticket":"studio-debugger-workspace-integration","title":"Integrate ../debugger into Studio as a dedicated workspace","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["studio","debugger","workspace","integration","shell"],"agendas":[{"id":"AGD-0009","file":"AGD-0009-studio-debugger-workspace-integration.md","status":"open","created_at":"2026-03-30","updated_at":"2026-03-30"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0010","status":"done","ticket":"studio-code-editor-workspace-foundations","title":"Establish Code Editor workspace foundations in Studio without LSP","created_at":"2026-03-30","updated_at":"2026-03-31","tags":["studio","editor","workspace","multi-frontend","lsp-deferred"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0026","file":"discussion/lessons/DSC-0010-studio-code-editor-workspace-foundations/LSN-0026-read-only-editor-foundations-and-semantic-deferral.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0011","status":"done","ticket":"compiler-analyze-compile-build-pipeline-split","title":"Split compiler pipeline into analyze, compile, and build entrypoints","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["compiler","pipeline","artifacts","build","analysis"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0025","file":"discussion/lessons/DSC-0011-compiler-analyze-compile-build-pipeline-split/LSN-0025-compiler-pipeline-entrypoints-and-result-boundaries.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0012","status":"done","ticket":"studio-editor-document-vfs-boundary","title":"Definir um boundary de VFS documental para tree/view/open files no Code Editor do Studio","created_at":"2026-03-31","updated_at":"2026-03-31","tags":["studio","editor","workspace","vfs","filesystem","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0027","file":"discussion/lessons/DSC-0012-studio-editor-document-vfs-boundary/LSN-0027-project-document-vfs-and-session-owned-editor-boundary.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0013","status":"done","ticket":"studio-editor-write-wave-supported-non-frontend-files","title":"Definir a wave inicial de edicao no Code Editor apenas para arquivos aceitos e nao relacionados ao FE","created_at":"2026-03-31","updated_at":"2026-04-02","tags":["studio","editor","workspace","write","read-only","vfs","frontend-boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0028","file":"discussion/lessons/DSC-0013-studio-editor-write-wave-supported-non-frontend-files/LSN-0028-controlled-editor-write-wave-and-read-only-frontend-semantic-phase.md","status":"done","created_at":"2026-04-02","updated_at":"2026-04-02"}]} -{"type":"discussion","id":"DSC-0014","status":"done","ticket":"studio-frontend-owned-semantic-editor-presentation","title":"Definir ownership do schema visual semantico do editor por frontend","created_at":"2026-04-02","updated_at":"2026-04-02","tags":["studio","editor","frontend","presentation","semantic-highlighting","compiler","pbs"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0029","file":"discussion/lessons/DSC-0014-studio-frontend-owned-semantic-editor-presentation/LSN-0029-frontend-owned-semantic-presentation-descriptor-and-host-consumption.md","status":"done","created_at":"2026-04-02","updated_at":"2026-04-02"}]} -{"type":"discussion","id":"DSC-0015","status":"done","ticket":"pbs-service-facade-reserved-metadata","title":"SDK Service Bodies Calling Builtin/Intrinsic Proxies as Ordinary PBS Code","created_at":"2026-04-03","updated_at":"2026-04-03","tags":["compiler","pbs","sdk","stdlib","lowering","service","intrinsic","sdk-interface"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0030","file":"discussion/lessons/DSC-0015-pbs-service-facade-reserved-metadata/LSN-0030-sdk-service-bodies-over-private-reserved-proxies.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"}]} -{"type":"discussion","id":"DSC-0016","status":"open","ticket":"studio-editor-scope-guides-and-brace-anchoring","title":"Scope Guides do Code Editor com ancoragem exata em braces e destaque do escopo ativo","created_at":"2026-04-03","updated_at":"2026-04-03","tags":["studio","editor","scope-guides","braces","semantic-read","frontend-contract"],"agendas":[{"id":"AGD-0017","file":"AGD-0017-studio-editor-scope-guides-and-brace-anchoring.md","status":"accepted","created_at":"2026-04-03","updated_at":"2026-04-03"}],"decisions":[{"id":"DEC-0014","file":"DEC-0014-studio-editor-active-scope-and-structural-anchors.md","status":"accepted","created_at":"2026-04-03","updated_at":"2026-04-03"}],"plans":[{"id":"PLN-0030","file":"PLN-0030-studio-active-container-and-active-scope-gutter-wave-1.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"},{"id":"PLN-0031","file":"PLN-0031-studio-structural-anchor-semantic-surface-specification.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"},{"id":"PLN-0032","file":"PLN-0032-frontend-structural-anchor-payloads-and-anchor-aware-tests.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"}],"lessons":[]} -{"type":"discussion","id":"DSC-0017","status":"open","ticket":"studio-editor-inline-type-hints-for-let-bindings","title":"Inline Type Hints for Let Bindings in the Studio Editor","created_at":"2026-04-03","updated_at":"2026-04-03","tags":["studio","editor","inline-hints","inlay-hints","lsp","pbs","type-inference"],"agendas":[{"id":"AGD-0018","file":"AGD-0018-studio-editor-inline-type-hints-for-let-bindings.md","status":"accepted","created_at":"2026-04-03","updated_at":"2026-04-03"}],"decisions":[{"id":"DEC-0015","file":"DEC-0015-studio-editor-inline-type-hints-contract-and-rendering-model.md","status":"accepted","created_at":"2026-04-03","updated_at":"2026-04-03","ref_agenda":"AGD-0018"}],"plans":[{"id":"PLN-0033","file":"PLN-0033-inline-hint-spec-and-contract-propagation.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03","ref_decisions":["DEC-0015"]},{"id":"PLN-0034","file":"PLN-0034-lsp-inline-hint-transport-contract.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03","ref_decisions":["DEC-0015"]},{"id":"PLN-0035","file":"PLN-0035-pbs-inline-type-hint-payload-production.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03","ref_decisions":["DEC-0015"]},{"id":"PLN-0036","file":"PLN-0036-studio-inline-hint-rendering-and-rollout.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03","ref_decisions":["DEC-0015"]}],"lessons":[]} -{"type":"discussion","id":"DSC-0018","status":"done","ticket":"studio-project-local-studio-state-under-dot-studio","title":"Persist project-local Studio state under .studio","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","project-session","project-state","persistence","dot-studio","shell","layout","setup"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0031","file":"discussion/lessons/DSC-0018-studio-project-local-studio-state-under-dot-studio/LSN-0031-project-local-studio-state-and-lifecycle-safe-layout-restoration.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0019","status":"open","ticket":"studio-project-local-setup-separate-from-main-studio-state","title":"Separate project-local setup from the main Studio state under .studio","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","project-session","project-state","persistence","dot-studio","setup","boundary"],"agendas":[{"id":"AGD-0020","file":"AGD-0020-project-local-setup-separate-from-main-studio-state.md","status":"accepted","created_at":"2026-04-04","updated_at":"2026-04-04"}],"decisions":[{"id":"DEC-0017","file":"DEC-0017-project-local-setup-separate-from-session-state.md","status":"accepted","created_at":"2026-04-04","updated_at":"2026-04-04","ref_agenda":"AGD-0020"}],"plans":[{"id":"PLN-0038","file":"PLN-0038-separate-project-local-setup-from-session-state.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04","ref_decisions":["DEC-0017"]}],"lessons":[]} diff --git a/discussion/.backups/index.ndjson.20260406-043719.bak b/discussion/.backups/index.ndjson.20260406-043719.bak deleted file mode 100644 index 8ed6dede..00000000 --- a/discussion/.backups/index.ndjson.20260406-043719.bak +++ /dev/null @@ -1,22 +0,0 @@ -{"type":"meta","next_id":{"DSC":22,"AGD":23,"DEC":20,"PLN":41,"LSN":34,"CLSN":1}} -{"type":"discussion","id":"DSC-0001","status":"done","ticket":"studio-docs-import","title":"Import docs/studio into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0001","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0001-assets-workspace-execution-wave-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0002","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0002-bank-composition-editor-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0003","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0003-mental-model-asset-mutations-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0004","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0004-mental-model-assets-workspace-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0005","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0005-mental-model-studio-events-and-components-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0006","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0006-mental-model-studio-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0007","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0007-pack-wizard-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0008","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0008-project-scoped-state-and-activity-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0016","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0016-studio-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0002","status":"open","ticket":"palette-management-in-studio","title":"Palette Management in Studio","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","legacy-import","palette-management","tile-bank","packer-boundary"],"agendas":[{"id":"AGD-0002","file":"AGD-0002-palette-management-in-studio.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0003","status":"done","ticket":"packer-docs-import","title":"Import docs/packer into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0009","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0009-mental-model-packer-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0010","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0010-asset-identity-and-runtime-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0011","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0011-foundations-workspace-runtime-and-build-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0012","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0012-runtime-ownership-and-studio-boundary-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0013","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0013-metadata-convergence-and-runtime-sink-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0014","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0014-pack-wizard-summary-validation-and-pack-execution-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0015","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0015-tile-bank-packing-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0017","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0017-packer-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0004","status":"open","ticket":"tilemap-and-metatile-runtime-binary-layout","title":"Tilemap and Metatile Runtime Binary Layout","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tilemap","metatile","runtime-layout"],"agendas":[{"id":"AGD-0004","file":"AGD-0004-tilemap-and-metatile-runtime-binary-layout.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0005","status":"open","ticket":"variable-tile-bank-palette-serialization","title":"Variable Tile Bank Palette Serialization","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tile-bank","palette-serialization","versioning"],"agendas":[{"id":"AGD-0005","file":"AGD-0005-variable-tile-bank-palette-serialization.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0006","status":"done","ticket":"pbs-game-facing-asset-refs-and-call-result-discard","title":"PBS Game-Facing Asset References and Ignored Call Result Lowering","created_at":"2026-03-27","updated_at":"2026-03-30","tags":["compiler","pbs","ergonomics","lowering","runtime","asset-identity","expression-statements"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0024","file":"discussion/lessons/DSC-0006-pbs-game-facing-asset-refs-and-call-result-discard/LSN-0024-addressable-surface-host-metadata-and-ignored-value-discipline.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0007","status":"done","ticket":"pbs-learn-to-discussion-lessons-migration","title":"Migrate PBS Learn Documents into Discussion Lessons","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","migration","discussion-framework","lessons","learn-prune"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0018","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0018-pbs-ast-and-parser-contract-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0019","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0019-pbs-name-resolution-and-linking-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0020","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0020-pbs-runtime-values-identity-memory-boundaries-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0021","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0021-pbs-diagnostics-and-conformance-governance-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0022","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0022-pbs-globals-lifecycle-and-published-entrypoint-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0008","status":"done","ticket":"pbs-low-level-asset-manager-surface","title":"PBS Low-Level Asset Manager Surface for Runtime AssetManager","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","runtime","asset-manager","host-abi","stdlib","asset"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0023","file":"discussion/lessons/DSC-0008-pbs-low-level-asset-manager-surface/LSN-0023-lowassets-runtime-aligned-sdk-surface.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0009","status":"open","ticket":"studio-debugger-workspace-integration","title":"Integrate ../debugger into Studio as a dedicated workspace","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["studio","debugger","workspace","integration","shell"],"agendas":[{"id":"AGD-0009","file":"AGD-0009-studio-debugger-workspace-integration.md","status":"open","created_at":"2026-03-30","updated_at":"2026-03-30"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0010","status":"done","ticket":"studio-code-editor-workspace-foundations","title":"Establish Code Editor workspace foundations in Studio without LSP","created_at":"2026-03-30","updated_at":"2026-03-31","tags":["studio","editor","workspace","multi-frontend","lsp-deferred"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0026","file":"discussion/lessons/DSC-0010-studio-code-editor-workspace-foundations/LSN-0026-read-only-editor-foundations-and-semantic-deferral.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0011","status":"done","ticket":"compiler-analyze-compile-build-pipeline-split","title":"Split compiler pipeline into analyze, compile, and build entrypoints","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["compiler","pipeline","artifacts","build","analysis"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0025","file":"discussion/lessons/DSC-0011-compiler-analyze-compile-build-pipeline-split/LSN-0025-compiler-pipeline-entrypoints-and-result-boundaries.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0012","status":"done","ticket":"studio-editor-document-vfs-boundary","title":"Definir um boundary de VFS documental para tree/view/open files no Code Editor do Studio","created_at":"2026-03-31","updated_at":"2026-03-31","tags":["studio","editor","workspace","vfs","filesystem","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0027","file":"discussion/lessons/DSC-0012-studio-editor-document-vfs-boundary/LSN-0027-project-document-vfs-and-session-owned-editor-boundary.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0013","status":"done","ticket":"studio-editor-write-wave-supported-non-frontend-files","title":"Definir a wave inicial de edicao no Code Editor apenas para arquivos aceitos e nao relacionados ao FE","created_at":"2026-03-31","updated_at":"2026-04-02","tags":["studio","editor","workspace","write","read-only","vfs","frontend-boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0028","file":"discussion/lessons/DSC-0013-studio-editor-write-wave-supported-non-frontend-files/LSN-0028-controlled-editor-write-wave-and-read-only-frontend-semantic-phase.md","status":"done","created_at":"2026-04-02","updated_at":"2026-04-02"}]} -{"type":"discussion","id":"DSC-0014","status":"done","ticket":"studio-frontend-owned-semantic-editor-presentation","title":"Definir ownership do schema visual semantico do editor por frontend","created_at":"2026-04-02","updated_at":"2026-04-02","tags":["studio","editor","frontend","presentation","semantic-highlighting","compiler","pbs"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0029","file":"discussion/lessons/DSC-0014-studio-frontend-owned-semantic-editor-presentation/LSN-0029-frontend-owned-semantic-presentation-descriptor-and-host-consumption.md","status":"done","created_at":"2026-04-02","updated_at":"2026-04-02"}]} -{"type":"discussion","id":"DSC-0015","status":"done","ticket":"pbs-service-facade-reserved-metadata","title":"SDK Service Bodies Calling Builtin/Intrinsic Proxies as Ordinary PBS Code","created_at":"2026-04-03","updated_at":"2026-04-03","tags":["compiler","pbs","sdk","stdlib","lowering","service","intrinsic","sdk-interface"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0030","file":"discussion/lessons/DSC-0015-pbs-service-facade-reserved-metadata/LSN-0030-sdk-service-bodies-over-private-reserved-proxies.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"}]} -{"type":"discussion","id":"DSC-0016","status":"open","ticket":"studio-editor-scope-guides-and-brace-anchoring","title":"Scope Guides do Code Editor com ancoragem exata em braces e destaque do escopo ativo","created_at":"2026-04-03","updated_at":"2026-04-03","tags":["studio","editor","scope-guides","braces","semantic-read","frontend-contract"],"agendas":[{"id":"AGD-0017","file":"AGD-0017-studio-editor-scope-guides-and-brace-anchoring.md","status":"accepted","created_at":"2026-04-03","updated_at":"2026-04-03"}],"decisions":[{"id":"DEC-0014","file":"DEC-0014-studio-editor-active-scope-and-structural-anchors.md","status":"accepted","created_at":"2026-04-03","updated_at":"2026-04-03"}],"plans":[{"id":"PLN-0030","file":"PLN-0030-studio-active-container-and-active-scope-gutter-wave-1.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"},{"id":"PLN-0031","file":"PLN-0031-studio-structural-anchor-semantic-surface-specification.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"},{"id":"PLN-0032","file":"PLN-0032-frontend-structural-anchor-payloads-and-anchor-aware-tests.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"}],"lessons":[]} -{"type":"discussion","id":"DSC-0017","status":"open","ticket":"studio-editor-inline-type-hints-for-let-bindings","title":"Inline Type Hints for Let Bindings in the Studio Editor","created_at":"2026-04-03","updated_at":"2026-04-03","tags":["studio","editor","inline-hints","inlay-hints","lsp","pbs","type-inference"],"agendas":[{"id":"AGD-0018","file":"AGD-0018-studio-editor-inline-type-hints-for-let-bindings.md","status":"accepted","created_at":"2026-04-03","updated_at":"2026-04-03"}],"decisions":[{"id":"DEC-0015","file":"DEC-0015-studio-editor-inline-type-hints-contract-and-rendering-model.md","status":"accepted","created_at":"2026-04-03","updated_at":"2026-04-03","ref_agenda":"AGD-0018"}],"plans":[{"id":"PLN-0033","file":"PLN-0033-inline-hint-spec-and-contract-propagation.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03","ref_decisions":["DEC-0015"]},{"id":"PLN-0034","file":"PLN-0034-lsp-inline-hint-transport-contract.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03","ref_decisions":["DEC-0015"]},{"id":"PLN-0035","file":"PLN-0035-pbs-inline-type-hint-payload-production.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03","ref_decisions":["DEC-0015"]},{"id":"PLN-0036","file":"PLN-0036-studio-inline-hint-rendering-and-rollout.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03","ref_decisions":["DEC-0015"]}],"lessons":[]} -{"type":"discussion","id":"DSC-0018","status":"done","ticket":"studio-project-local-studio-state-under-dot-studio","title":"Persist project-local Studio state under .studio","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","project-session","project-state","persistence","dot-studio","shell","layout","setup"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0031","file":"discussion/lessons/DSC-0018-studio-project-local-studio-state-under-dot-studio/LSN-0031-project-local-studio-state-and-lifecycle-safe-layout-restoration.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0019","status":"done","ticket":"studio-project-local-setup-separate-from-main-studio-state","title":"Separate project-local setup from the main Studio state under .studio","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","project-session","project-state","persistence","dot-studio","setup","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0032","file":"discussion/lessons/DSC-0019-studio-project-local-setup-separate-from-main-studio-state/LSN-0032-separate-project-config-from-session-restoration-state.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0020","status":"done","ticket":"studio-editor-indentation-policy-and-project-setup","title":"Indentation Policy, Status-Bar Semantics, and Project-Local Editor Setup","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","editor","indentation","tabs","setup","dot-studio","configuration","ux"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0033","file":"discussion/lessons/DSC-0020-studio-editor-indentation-policy-and-project-setup/LSN-0033-setup-owned-indentation-policy-and-project-bootstrap-defaults.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0021","status":"open","ticket":"studio-frontend-editor-write-and-save-wave","title":"Enable Frontend Editing and Save in the Studio Code Editor","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","editor","frontend","write","save","vfs","lsp","pbs","access-policy"],"agendas":[{"id":"AGD-0022","file":"AGD-0022-studio-frontend-editor-write-and-save-wave.md","status":"accepted","created_at":"2026-04-04","updated_at":"2026-04-04"}],"decisions":[{"id":"DEC-0019","file":"DEC-0019-studio-frontend-editor-write-and-save-wave.md","status":"accepted","created_at":"2026-04-04","updated_at":"2026-04-04","ref_agenda":"AGD-0022"}],"plans":[{"id":"PLN-0040","file":"PLN-0040-studio-frontend-editor-write-and-save-wave.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04","ref_decisions":["DEC-0019"]}],"lessons":[]} diff --git a/discussion/.backups/index.ndjson.20260501-111858.bak b/discussion/.backups/index.ndjson.20260501-111858.bak deleted file mode 100644 index 1c6ed076..00000000 --- a/discussion/.backups/index.ndjson.20260501-111858.bak +++ /dev/null @@ -1,31 +0,0 @@ -{"type":"meta","next_id":{"DSC":31,"AGD":34,"DEC":31,"PLN":62,"LSN":47,"CLSN":1}} -{"type":"discussion","id":"DSC-0030","status":"done","ticket":"studio-scene-pack-runtime-binary-contract","title":"Studio scene pack contract for runtime SCENE binary payload","created_at":"2026-04-24","updated_at":"2026-05-01","tags":["studio","packer","runtime","scene","asset-pack","binary-format","tiled"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0046","file":"discussion/lessons/DSC-0030-studio-scene-pack-runtime-binary-contract/LSN-0046-canonical-scene-owns-editorial-truth-while-pack-stays-request-driven.md","status":"done","created_at":"2026-05-01","updated_at":"2026-05-01"}]} -{"type":"discussion","id":"DSC-0029","status":"done","ticket":"studio-frame-composer-syscall-and-sprite-alignment","title":"Studio Alignment with Runtime FrameComposer Syscalls and Sprite Composition","created_at":"2026-04-18","updated_at":"2026-04-18","tags":["studio","compiler","pbs","stdlib","runtime-alignment","abi","syscall","frame-composer","sprites"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0041","file":"discussion/lessons/DSC-0029-studio-frame-composer-syscall-and-sprite-alignment/LSN-0041-composer-must-own-public-sprite-composition.md","status":"done","created_at":"2026-04-18","updated_at":"2026-04-18"}]} -{"type":"discussion","id":"DSC-0028","status":"done","ticket":"studio-tiled-parser-assets-scene-asset-type","title":"Tiled Parser and Scene Asset-Type Ownership in Assets Workspace","created_at":"2026-04-15","updated_at":"2026-04-23","tags":["studio","assets","scene","tiled","parser","asset-type"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0045","file":"discussion/lessons/DSC-0028-studio-tiled-parser-assets-scene-asset-type/LSN-0045-asset-owned-scene-bank-and-tiled-xml-workflow.md","status":"done","created_at":"2026-04-23","updated_at":"2026-04-23"}]} -{"type":"discussion","id":"DSC-0027","status":"abandoned","ticket":"studio-scene-workspace","title":"Scene Workspace for SCENE Authoring","created_at":"2026-04-14","updated_at":"2026-04-15","tags":["studio","workspace","scene","tilemap","asset","runtime-alignment"],"agendas":[{"id":"AGD-0029","file":"AGD-0029-studio-scene-workspace.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","_override_reason":"Explicit user request on 2026-04-15 to abandon the accepted agenda and its downstream work."}],"decisions":[{"id":"DEC-0026","file":"DEC-0026-studio-scene-workspace.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_agenda":"AGD-0029","_override_reason":"Explicit user request on 2026-04-15 to abandon the accepted decision and stop using it as normative guidance."}],"plans":[{"id":"PLN-0049","file":"PLN-0049-scene-workspace-spec-and-boundary-propagation.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."},{"id":"PLN-0050","file":"PLN-0050-scene-workspace-shell-and-project-state-foundations.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."},{"id":"PLN-0051","file":"PLN-0051-scene-artifact-and-assets-handoff-contract.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."},{"id":"PLN-0052","file":"PLN-0052-scene-workspace-wave-1-tilemap-editor.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."}],"lessons":[]} -{"type":"discussion","id":"DSC-0026","status":"done","ticket":"glyph-bank-naming-alignment-with-runtime","title":"Glyph Bank Naming Alignment with Runtime DEC-0006","created_at":"2026-04-10","updated_at":"2026-04-10","tags":["packer","studio","naming","asset-contract","runtime-alignment","glyph-bank"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0040","file":"discussion/lessons/DSC-0026-glyph-bank-naming-alignment-with-runtime/LSN-0040-glyph-bank-artifact-naming-alignment.md","status":"done","created_at":"2026-04-10","updated_at":"2026-04-10"}]} -{"type":"discussion","id":"DSC-0025","status":"done","ticket":"packer-pipeline-metadata-ownership","title":"Pipeline Metadata Ownership and Runtime Contract","created_at":"2026-04-09","updated_at":"2026-04-10","tags":["packer","metadata","runtime-contract","tooling","studio"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0039","file":"discussion/lessons/DSC-0025-packer-pipeline-metadata-ownership/LSN-0039-runtime-header-boundary-and-tooling-owned-pipeline-metadata.md","status":"done","created_at":"2026-04-10","updated_at":"2026-04-10"}]} -{"type":"discussion","id":"DSC-0024","status":"done","ticket":"jacoco-reports-consolidation","title":"JaCoCo Reports Consolidation in Gradle","created_at":"2026-04-07","updated_at":"2026-04-07","tags":["infra","gradle","jacoco","coverage","jenkins"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0038","file":"discussion/lessons/DSC-0024-jacoco-reports-consolidation/LSN-0038-jacoco-reports-consolidation.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"},{"id":"LSN-0044","file":"discussion/lessons/DSC-0024-jacoco-reports-consolidation/LSN-0044-jenkins-jacoco-alignment.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"}]} -{"type":"discussion","id":"DSC-0001","status":"done","ticket":"studio-docs-import","title":"Import docs/studio into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0001","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0001-assets-workspace-execution-wave-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0002","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0002-bank-composition-editor-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0003","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0003-mental-model-asset-mutations-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0004","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0004-mental-model-assets-workspace-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0005","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0005-mental-model-studio-events-and-components-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0006","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0006-mental-model-studio-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0007","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0007-pack-wizard-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0008","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0008-project-scoped-state-and-activity-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0016","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0016-studio-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0002","status":"done","ticket":"palette-management-in-studio","title":"Palette Management in Studio","created_at":"2026-03-26","updated_at":"2026-04-23","tags":["studio","legacy-import","palette-management","tile-bank","packer-boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0042","file":"discussion/lessons/DSC-0002-palette-management-in-studio/LSN-0042-schema-driven-palette-authoring-and-local-metadata-events.md","status":"done","created_at":"2026-04-23","updated_at":"2026-04-23"}]} -{"type":"discussion","id":"DSC-0003","status":"done","ticket":"packer-docs-import","title":"Import docs/packer into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0009","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0009-mental-model-packer-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0010","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0010-asset-identity-and-runtime-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0011","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0011-foundations-workspace-runtime-and-build-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0012","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0012-runtime-ownership-and-studio-boundary-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0013","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0013-metadata-convergence-and-runtime-sink-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0014","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0014-pack-wizard-summary-validation-and-pack-execution-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0015","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0015-tile-bank-packing-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0017","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0017-packer-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0004","status":"abandoned","ticket":"tilemap-and-metatile-runtime-binary-layout","title":"Tilemap and Metatile Runtime Binary Layout","created_at":"2026-03-26","updated_at":"2026-04-24","tags":["packer","legacy-import","tilemap","metatile","runtime-layout"],"agendas":[{"id":"AGD-0004","file":"AGD-0004-tilemap-and-metatile-runtime-binary-layout.md","status":"abandoned","created_at":"2026-03-26","updated_at":"2026-04-24","_override_reason":"Explicit user request on 2026-04-24 to abandon AGD-0004 because the agenda is no longer valid."}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0005","status":"open","ticket":"variable-tile-bank-palette-serialization","title":"Variable Tile Bank Palette Serialization","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tile-bank","palette-serialization","versioning"],"agendas":[{"id":"AGD-0005","file":"AGD-0005-variable-tile-bank-palette-serialization.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0006","status":"done","ticket":"pbs-game-facing-asset-refs-and-call-result-discard","title":"PBS Game-Facing Asset References and Ignored Call Result Lowering","created_at":"2026-03-27","updated_at":"2026-03-30","tags":["compiler","pbs","ergonomics","lowering","runtime","asset-identity","expression-statements"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0024","file":"discussion/lessons/DSC-0006-pbs-game-facing-asset-refs-and-call-result-discard/LSN-0024-addressable-surface-host-metadata-and-ignored-value-discipline.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0007","status":"done","ticket":"pbs-learn-to-discussion-lessons-migration","title":"Migrate PBS Learn Documents into Discussion Lessons","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","migration","discussion-framework","lessons","learn-prune"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0018","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0018-pbs-ast-and-parser-contract-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0019","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0019-pbs-name-resolution-and-linking-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0020","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0020-pbs-runtime-values-identity-memory-boundaries-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0021","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0021-pbs-diagnostics-and-conformance-governance-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0022","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0022-pbs-globals-lifecycle-and-published-entrypoint-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0008","status":"done","ticket":"pbs-low-level-asset-manager-surface","title":"PBS Low-Level Asset Manager Surface for Runtime AssetManager","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","runtime","asset-manager","host-abi","stdlib","asset"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0023","file":"discussion/lessons/DSC-0008-pbs-low-level-asset-manager-surface/LSN-0023-lowassets-runtime-aligned-sdk-surface.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0009","status":"done","ticket":"studio-debugger-workspace-integration","title":"Integrate ../debugger into Studio as a dedicated workspace","created_at":"2026-03-30","updated_at":"2026-04-07","tags":["studio","debugger","workspace","integration","shell"],"agendas":[],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0010","status":"done","ticket":"studio-code-editor-workspace-foundations","title":"Establish Code Editor workspace foundations in Studio without LSP","created_at":"2026-03-30","updated_at":"2026-03-31","tags":["studio","editor","workspace","multi-frontend","lsp-deferred"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0026","file":"discussion/lessons/DSC-0010-studio-code-editor-workspace-foundations/LSN-0026-read-only-editor-foundations-and-semantic-deferral.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0011","status":"done","ticket":"compiler-analyze-compile-build-pipeline-split","title":"Split compiler pipeline into analyze, compile, and build entrypoints","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["compiler","pipeline","artifacts","build","analysis"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0025","file":"discussion/lessons/DSC-0011-compiler-analyze-compile-build-pipeline-split/LSN-0025-compiler-pipeline-entrypoints-and-result-boundaries.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0012","status":"done","ticket":"studio-editor-document-vfs-boundary","title":"Definir um boundary de VFS documental para tree/view/open files no Code Editor do Studio","created_at":"2026-03-31","updated_at":"2026-03-31","tags":["studio","editor","workspace","vfs","filesystem","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0027","file":"discussion/lessons/DSC-0012-studio-editor-document-vfs-boundary/LSN-0027-project-document-vfs-and-session-owned-editor-boundary.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0013","status":"done","ticket":"studio-editor-write-wave-supported-non-frontend-files","title":"Definir a wave inicial de edicao no Code Editor apenas para arquivos aceitos e nao relacionados ao FE","created_at":"2026-03-31","updated_at":"2026-04-02","tags":["studio","editor","workspace","write","read-only","vfs","frontend-boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0028","file":"discussion/lessons/DSC-0013-studio-editor-write-wave-supported-non-frontend-files/LSN-0028-controlled-editor-write-wave-and-read-only-frontend-semantic-phase.md","status":"done","created_at":"2026-04-02","updated_at":"2026-04-02"}]} -{"type":"discussion","id":"DSC-0014","status":"done","ticket":"studio-frontend-owned-semantic-editor-presentation","title":"Definir ownership do schema visual semantico do editor por frontend","created_at":"2026-04-02","updated_at":"2026-04-02","tags":["studio","editor","frontend","presentation","semantic-highlighting","compiler","pbs"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0029","file":"discussion/lessons/DSC-0014-studio-frontend-owned-semantic-editor-presentation/LSN-0029-frontend-owned-semantic-presentation-descriptor-and-host-consumption.md","status":"done","created_at":"2026-04-02","updated_at":"2026-04-02"}]} -{"type":"discussion","id":"DSC-0015","status":"done","ticket":"pbs-service-facade-reserved-metadata","title":"SDK Service Bodies Calling Builtin/Intrinsic Proxies as Ordinary PBS Code","created_at":"2026-04-03","updated_at":"2026-04-03","tags":["compiler","pbs","sdk","stdlib","lowering","service","intrinsic","sdk-interface"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0030","file":"discussion/lessons/DSC-0015-pbs-service-facade-reserved-metadata/LSN-0030-sdk-service-bodies-over-private-reserved-proxies.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"}]} -{"type":"discussion","id":"DSC-0016","status":"done","ticket":"studio-editor-scope-guides-and-brace-anchoring","title":"Scope Guides do Code Editor com ancoragem exata em braces e destaque do escopo ativo","created_at":"2026-04-03","updated_at":"2026-04-06","tags":["studio","editor","scope-guides","braces","semantic-read","frontend-contract"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0034","file":"discussion/lessons/DSC-0016-studio-editor-scope-guides-and-brace-anchoring/LSN-0034-active-scope-gutter-and-frontend-owned-structural-anchors.md","status":"done","created_at":"2026-04-06","updated_at":"2026-04-06"}]} -{"type":"discussion","id":"DSC-0017","status":"done","ticket":"studio-editor-inline-type-hints-for-let-bindings","title":"Inline Type Hints for Let Bindings in the Studio Editor","created_at":"2026-04-03","updated_at":"2026-04-06","tags":["studio","editor","inline-hints","inlay-hints","lsp","pbs","type-inference"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0035","file":"discussion/lessons/DSC-0017-studio-editor-inline-type-hints-for-let-bindings/LSN-0035-frontend-owned-inline-hints-with-decorative-inline-rendering.md","status":"done","created_at":"2026-04-06","updated_at":"2026-04-06"}]} -{"type":"discussion","id":"DSC-0018","status":"done","ticket":"studio-project-local-studio-state-under-dot-studio","title":"Persist project-local Studio state under .studio","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","project-session","project-state","persistence","dot-studio","shell","layout","setup"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0031","file":"discussion/lessons/DSC-0018-studio-project-local-studio-state-under-dot-studio/LSN-0031-project-local-studio-state-and-lifecycle-safe-layout-restoration.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0019","status":"done","ticket":"studio-project-local-setup-separate-from-main-studio-state","title":"Separate project-local setup from the main Studio state under .studio","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","project-session","project-state","persistence","dot-studio","setup","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0032","file":"discussion/lessons/DSC-0019-studio-project-local-setup-separate-from-main-studio-state/LSN-0032-separate-project-config-from-session-restoration-state.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0020","status":"done","ticket":"studio-editor-indentation-policy-and-project-setup","title":"Indentation Policy, Status-Bar Semantics, and Project-Local Editor Setup","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","editor","indentation","tabs","setup","dot-studio","configuration","ux"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0033","file":"discussion/lessons/DSC-0020-studio-editor-indentation-policy-and-project-setup/LSN-0033-setup-owned-indentation-policy-and-project-bootstrap-defaults.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0021","status":"done","ticket":"studio-frontend-editor-write-and-save-wave","title":"Enable Frontend Editing and Save in the Studio Code Editor","created_at":"2026-04-04","updated_at":"2026-04-06","tags":["studio","editor","frontend","write","save","vfs","lsp","pbs","access-policy"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0036","file":"discussion/lessons/DSC-0021-studio-frontend-editor-write-and-save-wave/LSN-0036-vfs-owned-frontend-edit-and-save-wave.md","status":"done","created_at":"2026-04-06","updated_at":"2026-04-06"}]} -{"type":"discussion","id":"DSC-0022","status":"done","ticket":"studio-play-stop-cartridge-flow","title":"Wire the Studio Play/Stop button to shipper phase 1 cartridge preparation and runtime execution","created_at":"2026-04-06","updated_at":"2026-04-07","tags":["studio","play-stop","shipper","runtime","cartridge","shell"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0043","file":"discussion/lessons/DSC-0022-studio-play-stop-and-debugger-integration/LSN-0043-studio-play-stop-and-debugger-integration.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"}]} -{"type":"discussion","id":"DSC-0023","status":"done","ticket":"gradle-version-catalog-migration","title":"Move dependency version management to Version Catalog (TOML)","created_at":"2026-04-07","updated_at":"2026-04-07","tags":["gradle","buildSrc","dependency-management","version-catalog"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0037","file":"discussion/lessons/DSC-0023-gradle-version-catalog-migration/LSN-0037-gradle-version-catalog-adoption.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"}]} diff --git a/discussion/.backups/index.ndjson.20260507-142320.bak b/discussion/.backups/index.ndjson.20260507-142320.bak deleted file mode 100644 index f17e173d..00000000 --- a/discussion/.backups/index.ndjson.20260507-142320.bak +++ /dev/null @@ -1,35 +0,0 @@ -{"type":"meta","next_id":{"DSC":35,"AGD":38,"DEC":35,"PLN":75,"LSN":47,"CLSN":1}} -{"type":"discussion","id":"DSC-0034","status":"in_progress","ticket":"frontend-semantic-host-projection-flexibility","title":"Frontend semantic vocabulary flexibility and declarative host projection","created_at":"2026-05-06","updated_at":"2026-05-06","tags":["compiler","compiler-general","frontend","semantics","vscode","host-projection","lsp"],"agendas":[{"id":"AGD-0037","file":"AGD-0037-frontend-semantic-host-projection-flexibility.md","status":"accepted","created_at":"2026-05-06","updated_at":"2026-05-06"}],"decisions":[{"id":"DEC-0034","file":"DEC-0034-frontend-semantic-host-projection-flexibility.md","status":"accepted","created_at":"2026-05-06","updated_at":"2026-05-06","ref_agenda":"AGD-0037"}],"plans":[{"id":"PLN-0072","file":"PLN-0072-frontend-semantic-host-projection-contract.md","status":"done","created_at":"2026-05-06","updated_at":"2026-05-06","ref_decisions":["DEC-0034"]},{"id":"PLN-0073","file":"PLN-0073-lsp-semantic-host-projection-transport.md","status":"done","created_at":"2026-05-06","updated_at":"2026-05-06","ref_decisions":["DEC-0034"]},{"id":"PLN-0074","file":"PLN-0074-vscode-semantic-host-projection-adapter.md","status":"done","created_at":"2026-05-06","updated_at":"2026-05-06","ref_decisions":["DEC-0034"]}],"lessons":[]} -{"type":"discussion","id":"DSC-0033","status":"in_progress","ticket":"frontend-visual-theme-spec-and-css-retirement","title":"Frontend visual theme spec and retirement of host-consumed semantic CSS","created_at":"2026-05-06","updated_at":"2026-05-06","tags":["compiler","compiler-general","frontend","presentation","theming","studio","vscode","lsp","pbs"],"agendas":[{"id":"AGD-0036","file":"AGD-0036-frontend-visual-theme-spec-and-css-retirement.md","status":"accepted","created_at":"2026-05-06","updated_at":"2026-05-06"}],"decisions":[{"id":"DEC-0033","file":"DEC-0033-frontend-visual-theme-spec-and-css-retirement.md","status":"accepted","created_at":"2026-05-06","updated_at":"2026-05-06","ref_agenda":"AGD-0036"}],"plans":[{"id":"PLN-0068","file":"PLN-0068-frontend-visual-contract-and-pbs-migration.md","status":"open","created_at":"2026-05-06","updated_at":"2026-05-06","ref_decisions":["DEC-0033"]},{"id":"PLN-0069","file":"PLN-0069-lsp-visual-theme-transport-and-selection.md","status":"open","created_at":"2026-05-06","updated_at":"2026-05-06","ref_decisions":["DEC-0033"]},{"id":"PLN-0070","file":"PLN-0070-studio-visual-theme-adapter-and-css-retirement.md","status":"open","created_at":"2026-05-06","updated_at":"2026-05-06","ref_decisions":["DEC-0033"]},{"id":"PLN-0071","file":"PLN-0071-vscode-dynamic-theme-translation-adapter.md","status":"open","created_at":"2026-05-06","updated_at":"2026-05-06","ref_decisions":["DEC-0033"]}],"lessons":[]} -{"type":"discussion","id":"DSC-0032","status":"in_progress","ticket":"studio-new-lsp-api-and-v1-boundary","title":"Novo boundary entre lsp-api, lsp-v1 e a extensao VS Code","created_at":"2026-05-05","updated_at":"2026-05-05","tags":["studio","lsp","vscode","protocol","api","boundary"],"agendas":[{"id":"AGD-0035","file":"AGD-0035-studio-new-lsp-api-and-v1-boundary.md","status":"accepted","created_at":"2026-05-05","updated_at":"2026-05-05"}],"decisions":[{"id":"DEC-0032","file":"DEC-0032-studio-new-lsp-api-and-v1-boundary.md","status":"accepted","created_at":"2026-05-05","updated_at":"2026-05-05","ref_agenda":"AGD-0035"}],"plans":[{"id":"PLN-0065","file":"PLN-0065-lsp-boundary-and-module-scaffolding.md","status":"done","created_at":"2026-05-05","updated_at":"2026-05-05","ref_decisions":["DEC-0032"]},{"id":"PLN-0066","file":"PLN-0066-project-scoped-lsp-server-lifecycle-in-studio.md","status":"done","created_at":"2026-05-05","updated_at":"2026-05-05","ref_decisions":["DEC-0032"]},{"id":"PLN-0067","file":"PLN-0067-compiler-backed-dumb-lsp-server-baseline.md","status":"done","created_at":"2026-05-05","updated_at":"2026-05-05","ref_decisions":["DEC-0032"]}],"lessons":[]} -{"type":"discussion","id":"DSC-0031","status":"in_progress","ticket":"studio-editor-workspace-cleanup","title":"Limpeza completa do Workspace Editor do Studio e remoção dos acoplamentos legados","created_at":"2026-05-05","updated_at":"2026-05-05","tags":["studio","editor","cleanup","vfs","lsp","migration"],"agendas":[{"id":"AGD-0034","file":"AGD-0034-vscode-editor-migration-feasibility.md","status":"accepted","created_at":"2026-05-05","updated_at":"2026-05-05"}],"decisions":[{"id":"DEC-0031","file":"DEC-0031-studio-editor-workspace-cleanup.md","status":"in_progress","created_at":"2026-05-05","updated_at":"2026-05-05","ref_agenda":"AGD-0034"}],"plans":[{"id":"PLN-0062","file":"PLN-0062-shell-session-and-state-cleanup-after-editor-removal.md","status":"done","created_at":"2026-05-05","updated_at":"2026-05-05","ref_decisions":["DEC-0031"]},{"id":"PLN-0063","file":"PLN-0063-legacy-lsp-and-vfs-module-removal-with-runtime-preservation.md","status":"done","created_at":"2026-05-05","updated_at":"2026-05-05","ref_decisions":["DEC-0031"]},{"id":"PLN-0064","file":"PLN-0064-normative-test-and-lesson-cleanup-for-editor-stack-removal.md","status":"done","created_at":"2026-05-05","updated_at":"2026-05-05","ref_decisions":["DEC-0031"]}],"lessons":[]} -{"type":"discussion","id":"DSC-0030","status":"done","ticket":"studio-scene-pack-runtime-binary-contract","title":"Studio scene pack contract for runtime SCENE binary payload","created_at":"2026-04-24","updated_at":"2026-05-01","tags":["studio","packer","runtime","scene","asset-pack","binary-format","tiled"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0046","file":"discussion/lessons/DSC-0030-studio-scene-pack-runtime-binary-contract/LSN-0046-canonical-scene-owns-editorial-truth-while-pack-stays-request-driven.md","status":"done","created_at":"2026-05-01","updated_at":"2026-05-01"}]} -{"type":"discussion","id":"DSC-0029","status":"done","ticket":"studio-frame-composer-syscall-and-sprite-alignment","title":"Studio Alignment with Runtime FrameComposer Syscalls and Sprite Composition","created_at":"2026-04-18","updated_at":"2026-04-18","tags":["studio","compiler","pbs","stdlib","runtime-alignment","abi","syscall","frame-composer","sprites"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0041","file":"discussion/lessons/DSC-0029-studio-frame-composer-syscall-and-sprite-alignment/LSN-0041-composer-must-own-public-sprite-composition.md","status":"done","created_at":"2026-04-18","updated_at":"2026-04-18"}]} -{"type":"discussion","id":"DSC-0028","status":"done","ticket":"studio-tiled-parser-assets-scene-asset-type","title":"Tiled Parser and Scene Asset-Type Ownership in Assets Workspace","created_at":"2026-04-15","updated_at":"2026-04-23","tags":["studio","assets","scene","tiled","parser","asset-type"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0045","file":"discussion/lessons/DSC-0028-studio-tiled-parser-assets-scene-asset-type/LSN-0045-asset-owned-scene-bank-and-tiled-xml-workflow.md","status":"done","created_at":"2026-04-23","updated_at":"2026-04-23"}]} -{"type":"discussion","id":"DSC-0027","status":"abandoned","ticket":"studio-scene-workspace","title":"Scene Workspace for SCENE Authoring","created_at":"2026-04-14","updated_at":"2026-04-15","tags":["studio","workspace","scene","tilemap","asset","runtime-alignment"],"agendas":[{"id":"AGD-0029","file":"AGD-0029-studio-scene-workspace.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","_override_reason":"Explicit user request on 2026-04-15 to abandon the accepted agenda and its downstream work."}],"decisions":[{"id":"DEC-0026","file":"DEC-0026-studio-scene-workspace.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_agenda":"AGD-0029","_override_reason":"Explicit user request on 2026-04-15 to abandon the accepted decision and stop using it as normative guidance."}],"plans":[{"id":"PLN-0049","file":"PLN-0049-scene-workspace-spec-and-boundary-propagation.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."},{"id":"PLN-0050","file":"PLN-0050-scene-workspace-shell-and-project-state-foundations.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."},{"id":"PLN-0051","file":"PLN-0051-scene-artifact-and-assets-handoff-contract.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."},{"id":"PLN-0052","file":"PLN-0052-scene-workspace-wave-1-tilemap-editor.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."}],"lessons":[]} -{"type":"discussion","id":"DSC-0026","status":"done","ticket":"glyph-bank-naming-alignment-with-runtime","title":"Glyph Bank Naming Alignment with Runtime DEC-0006","created_at":"2026-04-10","updated_at":"2026-04-10","tags":["packer","studio","naming","asset-contract","runtime-alignment","glyph-bank"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0040","file":"discussion/lessons/DSC-0026-glyph-bank-naming-alignment-with-runtime/LSN-0040-glyph-bank-artifact-naming-alignment.md","status":"done","created_at":"2026-04-10","updated_at":"2026-04-10"}]} -{"type":"discussion","id":"DSC-0025","status":"done","ticket":"packer-pipeline-metadata-ownership","title":"Pipeline Metadata Ownership and Runtime Contract","created_at":"2026-04-09","updated_at":"2026-04-10","tags":["packer","metadata","runtime-contract","tooling","studio"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0039","file":"discussion/lessons/DSC-0025-packer-pipeline-metadata-ownership/LSN-0039-runtime-header-boundary-and-tooling-owned-pipeline-metadata.md","status":"done","created_at":"2026-04-10","updated_at":"2026-04-10"}]} -{"type":"discussion","id":"DSC-0024","status":"done","ticket":"jacoco-reports-consolidation","title":"JaCoCo Reports Consolidation in Gradle","created_at":"2026-04-07","updated_at":"2026-04-07","tags":["infra","gradle","jacoco","coverage","jenkins"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0038","file":"discussion/lessons/DSC-0024-jacoco-reports-consolidation/LSN-0038-jacoco-reports-consolidation.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"},{"id":"LSN-0044","file":"discussion/lessons/DSC-0024-jacoco-reports-consolidation/LSN-0044-jenkins-jacoco-alignment.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"}]} -{"type":"discussion","id":"DSC-0001","status":"done","ticket":"studio-docs-import","title":"Import docs/studio into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0001","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0001-assets-workspace-execution-wave-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0002","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0002-bank-composition-editor-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0003","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0003-mental-model-asset-mutations-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0004","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0004-mental-model-assets-workspace-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0005","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0005-mental-model-studio-events-and-components-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0006","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0006-mental-model-studio-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0007","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0007-pack-wizard-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0008","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0008-project-scoped-state-and-activity-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0016","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0016-studio-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0002","status":"done","ticket":"palette-management-in-studio","title":"Palette Management in Studio","created_at":"2026-03-26","updated_at":"2026-04-23","tags":["studio","legacy-import","palette-management","tile-bank","packer-boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0042","file":"discussion/lessons/DSC-0002-palette-management-in-studio/LSN-0042-schema-driven-palette-authoring-and-local-metadata-events.md","status":"done","created_at":"2026-04-23","updated_at":"2026-04-23"}]} -{"type":"discussion","id":"DSC-0003","status":"done","ticket":"packer-docs-import","title":"Import docs/packer into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0009","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0009-mental-model-packer-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0010","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0010-asset-identity-and-runtime-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0011","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0011-foundations-workspace-runtime-and-build-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0012","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0012-runtime-ownership-and-studio-boundary-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0013","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0013-metadata-convergence-and-runtime-sink-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0014","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0014-pack-wizard-summary-validation-and-pack-execution-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0015","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0015-tile-bank-packing-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0017","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0017-packer-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0004","status":"abandoned","ticket":"tilemap-and-metatile-runtime-binary-layout","title":"Tilemap and Metatile Runtime Binary Layout","created_at":"2026-03-26","updated_at":"2026-04-24","tags":["packer","legacy-import","tilemap","metatile","runtime-layout"],"agendas":[{"id":"AGD-0004","file":"AGD-0004-tilemap-and-metatile-runtime-binary-layout.md","status":"abandoned","created_at":"2026-03-26","updated_at":"2026-04-24","_override_reason":"Explicit user request on 2026-04-24 to abandon AGD-0004 because the agenda is no longer valid."}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0005","status":"open","ticket":"variable-tile-bank-palette-serialization","title":"Variable Tile Bank Palette Serialization","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tile-bank","palette-serialization","versioning"],"agendas":[{"id":"AGD-0005","file":"AGD-0005-variable-tile-bank-palette-serialization.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0006","status":"done","ticket":"pbs-game-facing-asset-refs-and-call-result-discard","title":"PBS Game-Facing Asset References and Ignored Call Result Lowering","created_at":"2026-03-27","updated_at":"2026-03-30","tags":["compiler","pbs","ergonomics","lowering","runtime","asset-identity","expression-statements"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0024","file":"discussion/lessons/DSC-0006-pbs-game-facing-asset-refs-and-call-result-discard/LSN-0024-addressable-surface-host-metadata-and-ignored-value-discipline.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0007","status":"done","ticket":"pbs-learn-to-discussion-lessons-migration","title":"Migrate PBS Learn Documents into Discussion Lessons","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","migration","discussion-framework","lessons","learn-prune"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0018","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0018-pbs-ast-and-parser-contract-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0019","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0019-pbs-name-resolution-and-linking-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0020","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0020-pbs-runtime-values-identity-memory-boundaries-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0021","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0021-pbs-diagnostics-and-conformance-governance-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0022","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0022-pbs-globals-lifecycle-and-published-entrypoint-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0008","status":"done","ticket":"pbs-low-level-asset-manager-surface","title":"PBS Low-Level Asset Manager Surface for Runtime AssetManager","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","runtime","asset-manager","host-abi","stdlib","asset"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0023","file":"discussion/lessons/DSC-0008-pbs-low-level-asset-manager-surface/LSN-0023-lowassets-runtime-aligned-sdk-surface.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0009","status":"done","ticket":"studio-debugger-workspace-integration","title":"Integrate ../debugger into Studio as a dedicated workspace","created_at":"2026-03-30","updated_at":"2026-04-07","tags":["studio","debugger","workspace","integration","shell"],"agendas":[],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0010","status":"done","ticket":"studio-code-editor-workspace-foundations","title":"Establish Code Editor workspace foundations in Studio without LSP","created_at":"2026-03-30","updated_at":"2026-03-31","tags":["studio","editor","workspace","multi-frontend","lsp-deferred"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0026","file":"discussion/lessons/DSC-0010-studio-code-editor-workspace-foundations/LSN-0026-read-only-editor-foundations-and-semantic-deferral.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0011","status":"done","ticket":"compiler-analyze-compile-build-pipeline-split","title":"Split compiler pipeline into analyze, compile, and build entrypoints","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["compiler","pipeline","artifacts","build","analysis"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0025","file":"discussion/lessons/DSC-0011-compiler-analyze-compile-build-pipeline-split/LSN-0025-compiler-pipeline-entrypoints-and-result-boundaries.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0012","status":"done","ticket":"studio-editor-document-vfs-boundary","title":"Definir um boundary de VFS documental para tree/view/open files no Code Editor do Studio","created_at":"2026-03-31","updated_at":"2026-03-31","tags":["studio","editor","workspace","vfs","filesystem","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0027","file":"discussion/lessons/DSC-0012-studio-editor-document-vfs-boundary/LSN-0027-project-document-vfs-and-session-owned-editor-boundary.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0013","status":"done","ticket":"studio-editor-write-wave-supported-non-frontend-files","title":"Definir a wave inicial de edicao no Code Editor apenas para arquivos aceitos e nao relacionados ao FE","created_at":"2026-03-31","updated_at":"2026-04-02","tags":["studio","editor","workspace","write","read-only","vfs","frontend-boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0028","file":"discussion/lessons/DSC-0013-studio-editor-write-wave-supported-non-frontend-files/LSN-0028-controlled-editor-write-wave-and-read-only-frontend-semantic-phase.md","status":"done","created_at":"2026-04-02","updated_at":"2026-04-02"}]} -{"type":"discussion","id":"DSC-0014","status":"done","ticket":"studio-frontend-owned-semantic-editor-presentation","title":"Definir ownership do schema visual semantico do editor por frontend","created_at":"2026-04-02","updated_at":"2026-04-02","tags":["studio","editor","frontend","presentation","semantic-highlighting","compiler","pbs"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0029","file":"discussion/lessons/DSC-0014-studio-frontend-owned-semantic-editor-presentation/LSN-0029-frontend-owned-semantic-presentation-descriptor-and-host-consumption.md","status":"done","created_at":"2026-04-02","updated_at":"2026-04-02"}]} -{"type":"discussion","id":"DSC-0015","status":"done","ticket":"pbs-service-facade-reserved-metadata","title":"SDK Service Bodies Calling Builtin/Intrinsic Proxies as Ordinary PBS Code","created_at":"2026-04-03","updated_at":"2026-04-03","tags":["compiler","pbs","sdk","stdlib","lowering","service","intrinsic","sdk-interface"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0030","file":"discussion/lessons/DSC-0015-pbs-service-facade-reserved-metadata/LSN-0030-sdk-service-bodies-over-private-reserved-proxies.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"}]} -{"type":"discussion","id":"DSC-0016","status":"done","ticket":"studio-editor-scope-guides-and-brace-anchoring","title":"Scope Guides do Code Editor com ancoragem exata em braces e destaque do escopo ativo","created_at":"2026-04-03","updated_at":"2026-04-06","tags":["studio","editor","scope-guides","braces","semantic-read","frontend-contract"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0034","file":"discussion/lessons/DSC-0016-studio-editor-scope-guides-and-brace-anchoring/LSN-0034-active-scope-gutter-and-frontend-owned-structural-anchors.md","status":"done","created_at":"2026-04-06","updated_at":"2026-04-06"}]} -{"type":"discussion","id":"DSC-0017","status":"done","ticket":"studio-editor-inline-type-hints-for-let-bindings","title":"Inline Type Hints for Let Bindings in the Studio Editor","created_at":"2026-04-03","updated_at":"2026-04-06","tags":["studio","editor","inline-hints","inlay-hints","lsp","pbs","type-inference"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0035","file":"discussion/lessons/DSC-0017-studio-editor-inline-type-hints-for-let-bindings/LSN-0035-frontend-owned-inline-hints-with-decorative-inline-rendering.md","status":"done","created_at":"2026-04-06","updated_at":"2026-04-06"}]} -{"type":"discussion","id":"DSC-0018","status":"done","ticket":"studio-project-local-studio-state-under-dot-studio","title":"Persist project-local Studio state under .studio","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","project-session","project-state","persistence","dot-studio","shell","layout","setup"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0031","file":"discussion/lessons/DSC-0018-studio-project-local-studio-state-under-dot-studio/LSN-0031-project-local-studio-state-and-lifecycle-safe-layout-restoration.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0019","status":"done","ticket":"studio-project-local-setup-separate-from-main-studio-state","title":"Separate project-local setup from the main Studio state under .studio","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","project-session","project-state","persistence","dot-studio","setup","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0032","file":"discussion/lessons/DSC-0019-studio-project-local-setup-separate-from-main-studio-state/LSN-0032-separate-project-config-from-session-restoration-state.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0020","status":"done","ticket":"studio-editor-indentation-policy-and-project-setup","title":"Indentation Policy, Status-Bar Semantics, and Project-Local Editor Setup","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","editor","indentation","tabs","setup","dot-studio","configuration","ux"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0033","file":"discussion/lessons/DSC-0020-studio-editor-indentation-policy-and-project-setup/LSN-0033-setup-owned-indentation-policy-and-project-bootstrap-defaults.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0021","status":"done","ticket":"studio-frontend-editor-write-and-save-wave","title":"Enable Frontend Editing and Save in the Studio Code Editor","created_at":"2026-04-04","updated_at":"2026-04-06","tags":["studio","editor","frontend","write","save","vfs","lsp","pbs","access-policy"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0036","file":"discussion/lessons/DSC-0021-studio-frontend-editor-write-and-save-wave/LSN-0036-vfs-owned-frontend-edit-and-save-wave.md","status":"done","created_at":"2026-04-06","updated_at":"2026-04-06"}]} -{"type":"discussion","id":"DSC-0022","status":"done","ticket":"studio-play-stop-cartridge-flow","title":"Wire the Studio Play/Stop button to shipper phase 1 cartridge preparation and runtime execution","created_at":"2026-04-06","updated_at":"2026-04-07","tags":["studio","play-stop","shipper","runtime","cartridge","shell"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0043","file":"discussion/lessons/DSC-0022-studio-play-stop-and-debugger-integration/LSN-0043-studio-play-stop-and-debugger-integration.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"}]} -{"type":"discussion","id":"DSC-0023","status":"done","ticket":"gradle-version-catalog-migration","title":"Move dependency version management to Version Catalog (TOML)","created_at":"2026-04-07","updated_at":"2026-04-07","tags":["gradle","buildSrc","dependency-management","version-catalog"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0037","file":"discussion/lessons/DSC-0023-gradle-version-catalog-migration/LSN-0037-gradle-version-catalog-adoption.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"}]} diff --git a/discussion/.backups/index.ndjson.20260508-091553.bak b/discussion/.backups/index.ndjson.20260508-091553.bak deleted file mode 100644 index b88da099..00000000 --- a/discussion/.backups/index.ndjson.20260508-091553.bak +++ /dev/null @@ -1,35 +0,0 @@ -{"type":"meta","next_id":{"DSC":35,"AGD":38,"DEC":35,"PLN":75,"LSN":49,"CLSN":1}} -{"type":"discussion","id":"DSC-0034","status":"done","ticket":"frontend-semantic-host-projection-flexibility","title":"Frontend semantic vocabulary flexibility and declarative host projection","created_at":"2026-05-06","updated_at":"2026-05-07","tags":["compiler","compiler-general","frontend","semantics","vscode","host-projection","lsp"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0048","file":"discussion/lessons/DSC-0034-frontend-semantic-host-projection-flexibility/LSN-0048-frontend-owned-semantic-vocabularies-with-declarative-host-projection.md","status":"done","created_at":"2026-05-07","updated_at":"2026-05-07"}]} -{"type":"discussion","id":"DSC-0033","status":"in_progress","ticket":"frontend-visual-theme-spec-and-css-retirement","title":"Frontend visual theme spec and retirement of host-consumed semantic CSS","created_at":"2026-05-06","updated_at":"2026-05-06","tags":["compiler","compiler-general","frontend","presentation","theming","studio","vscode","lsp","pbs"],"agendas":[{"id":"AGD-0036","file":"AGD-0036-frontend-visual-theme-spec-and-css-retirement.md","status":"accepted","created_at":"2026-05-06","updated_at":"2026-05-06"}],"decisions":[{"id":"DEC-0033","file":"DEC-0033-frontend-visual-theme-spec-and-css-retirement.md","status":"accepted","created_at":"2026-05-06","updated_at":"2026-05-06","ref_agenda":"AGD-0036"}],"plans":[{"id":"PLN-0068","file":"PLN-0068-frontend-visual-contract-and-pbs-migration.md","status":"open","created_at":"2026-05-06","updated_at":"2026-05-06","ref_decisions":["DEC-0033"]},{"id":"PLN-0069","file":"PLN-0069-lsp-visual-theme-transport-and-selection.md","status":"open","created_at":"2026-05-06","updated_at":"2026-05-06","ref_decisions":["DEC-0033"]},{"id":"PLN-0070","file":"PLN-0070-studio-visual-theme-adapter-and-css-retirement.md","status":"open","created_at":"2026-05-06","updated_at":"2026-05-06","ref_decisions":["DEC-0033"]},{"id":"PLN-0071","file":"PLN-0071-vscode-dynamic-theme-translation-adapter.md","status":"open","created_at":"2026-05-06","updated_at":"2026-05-06","ref_decisions":["DEC-0033"]}],"lessons":[]} -{"type":"discussion","id":"DSC-0032","status":"done","ticket":"studio-new-lsp-api-and-v1-boundary","title":"Novo boundary entre lsp-api, lsp-v1 e a extensao VS Code","created_at":"2026-05-05","updated_at":"2026-05-07","tags":["studio","lsp","vscode","protocol","api","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0047","file":"discussion/lessons/DSC-0032-studio-new-lsp-api-and-v1-boundary/LSN-0047-project-scoped-lsp-boundary-and-protocol-containment.md","status":"done","created_at":"2026-05-07","updated_at":"2026-05-07"}]} -{"type":"discussion","id":"DSC-0031","status":"in_progress","ticket":"studio-editor-workspace-cleanup","title":"Limpeza completa do Workspace Editor do Studio e remoção dos acoplamentos legados","created_at":"2026-05-05","updated_at":"2026-05-05","tags":["studio","editor","cleanup","vfs","lsp","migration"],"agendas":[{"id":"AGD-0034","file":"AGD-0034-vscode-editor-migration-feasibility.md","status":"accepted","created_at":"2026-05-05","updated_at":"2026-05-05"}],"decisions":[{"id":"DEC-0031","file":"DEC-0031-studio-editor-workspace-cleanup.md","status":"in_progress","created_at":"2026-05-05","updated_at":"2026-05-05","ref_agenda":"AGD-0034"}],"plans":[{"id":"PLN-0062","file":"PLN-0062-shell-session-and-state-cleanup-after-editor-removal.md","status":"done","created_at":"2026-05-05","updated_at":"2026-05-05","ref_decisions":["DEC-0031"]},{"id":"PLN-0063","file":"PLN-0063-legacy-lsp-and-vfs-module-removal-with-runtime-preservation.md","status":"done","created_at":"2026-05-05","updated_at":"2026-05-05","ref_decisions":["DEC-0031"]},{"id":"PLN-0064","file":"PLN-0064-normative-test-and-lesson-cleanup-for-editor-stack-removal.md","status":"done","created_at":"2026-05-05","updated_at":"2026-05-05","ref_decisions":["DEC-0031"]}],"lessons":[]} -{"type":"discussion","id":"DSC-0030","status":"done","ticket":"studio-scene-pack-runtime-binary-contract","title":"Studio scene pack contract for runtime SCENE binary payload","created_at":"2026-04-24","updated_at":"2026-05-01","tags":["studio","packer","runtime","scene","asset-pack","binary-format","tiled"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0046","file":"discussion/lessons/DSC-0030-studio-scene-pack-runtime-binary-contract/LSN-0046-canonical-scene-owns-editorial-truth-while-pack-stays-request-driven.md","status":"done","created_at":"2026-05-01","updated_at":"2026-05-01"}]} -{"type":"discussion","id":"DSC-0029","status":"done","ticket":"studio-frame-composer-syscall-and-sprite-alignment","title":"Studio Alignment with Runtime FrameComposer Syscalls and Sprite Composition","created_at":"2026-04-18","updated_at":"2026-04-18","tags":["studio","compiler","pbs","stdlib","runtime-alignment","abi","syscall","frame-composer","sprites"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0041","file":"discussion/lessons/DSC-0029-studio-frame-composer-syscall-and-sprite-alignment/LSN-0041-composer-must-own-public-sprite-composition.md","status":"done","created_at":"2026-04-18","updated_at":"2026-04-18"}]} -{"type":"discussion","id":"DSC-0028","status":"done","ticket":"studio-tiled-parser-assets-scene-asset-type","title":"Tiled Parser and Scene Asset-Type Ownership in Assets Workspace","created_at":"2026-04-15","updated_at":"2026-04-23","tags":["studio","assets","scene","tiled","parser","asset-type"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0045","file":"discussion/lessons/DSC-0028-studio-tiled-parser-assets-scene-asset-type/LSN-0045-asset-owned-scene-bank-and-tiled-xml-workflow.md","status":"done","created_at":"2026-04-23","updated_at":"2026-04-23"}]} -{"type":"discussion","id":"DSC-0027","status":"abandoned","ticket":"studio-scene-workspace","title":"Scene Workspace for SCENE Authoring","created_at":"2026-04-14","updated_at":"2026-04-15","tags":["studio","workspace","scene","tilemap","asset","runtime-alignment"],"agendas":[{"id":"AGD-0029","file":"AGD-0029-studio-scene-workspace.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","_override_reason":"Explicit user request on 2026-04-15 to abandon the accepted agenda and its downstream work."}],"decisions":[{"id":"DEC-0026","file":"DEC-0026-studio-scene-workspace.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_agenda":"AGD-0029","_override_reason":"Explicit user request on 2026-04-15 to abandon the accepted decision and stop using it as normative guidance."}],"plans":[{"id":"PLN-0049","file":"PLN-0049-scene-workspace-spec-and-boundary-propagation.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."},{"id":"PLN-0050","file":"PLN-0050-scene-workspace-shell-and-project-state-foundations.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."},{"id":"PLN-0051","file":"PLN-0051-scene-artifact-and-assets-handoff-contract.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."},{"id":"PLN-0052","file":"PLN-0052-scene-workspace-wave-1-tilemap-editor.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."}],"lessons":[]} -{"type":"discussion","id":"DSC-0026","status":"done","ticket":"glyph-bank-naming-alignment-with-runtime","title":"Glyph Bank Naming Alignment with Runtime DEC-0006","created_at":"2026-04-10","updated_at":"2026-04-10","tags":["packer","studio","naming","asset-contract","runtime-alignment","glyph-bank"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0040","file":"discussion/lessons/DSC-0026-glyph-bank-naming-alignment-with-runtime/LSN-0040-glyph-bank-artifact-naming-alignment.md","status":"done","created_at":"2026-04-10","updated_at":"2026-04-10"}]} -{"type":"discussion","id":"DSC-0025","status":"done","ticket":"packer-pipeline-metadata-ownership","title":"Pipeline Metadata Ownership and Runtime Contract","created_at":"2026-04-09","updated_at":"2026-04-10","tags":["packer","metadata","runtime-contract","tooling","studio"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0039","file":"discussion/lessons/DSC-0025-packer-pipeline-metadata-ownership/LSN-0039-runtime-header-boundary-and-tooling-owned-pipeline-metadata.md","status":"done","created_at":"2026-04-10","updated_at":"2026-04-10"}]} -{"type":"discussion","id":"DSC-0024","status":"done","ticket":"jacoco-reports-consolidation","title":"JaCoCo Reports Consolidation in Gradle","created_at":"2026-04-07","updated_at":"2026-04-07","tags":["infra","gradle","jacoco","coverage","jenkins"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0038","file":"discussion/lessons/DSC-0024-jacoco-reports-consolidation/LSN-0038-jacoco-reports-consolidation.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"},{"id":"LSN-0044","file":"discussion/lessons/DSC-0024-jacoco-reports-consolidation/LSN-0044-jenkins-jacoco-alignment.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"}]} -{"type":"discussion","id":"DSC-0001","status":"done","ticket":"studio-docs-import","title":"Import docs/studio into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0001","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0001-assets-workspace-execution-wave-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0002","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0002-bank-composition-editor-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0003","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0003-mental-model-asset-mutations-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0004","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0004-mental-model-assets-workspace-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0005","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0005-mental-model-studio-events-and-components-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0006","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0006-mental-model-studio-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0007","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0007-pack-wizard-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0008","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0008-project-scoped-state-and-activity-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0016","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0016-studio-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0002","status":"done","ticket":"palette-management-in-studio","title":"Palette Management in Studio","created_at":"2026-03-26","updated_at":"2026-04-23","tags":["studio","legacy-import","palette-management","tile-bank","packer-boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0042","file":"discussion/lessons/DSC-0002-palette-management-in-studio/LSN-0042-schema-driven-palette-authoring-and-local-metadata-events.md","status":"done","created_at":"2026-04-23","updated_at":"2026-04-23"}]} -{"type":"discussion","id":"DSC-0003","status":"done","ticket":"packer-docs-import","title":"Import docs/packer into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0009","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0009-mental-model-packer-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0010","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0010-asset-identity-and-runtime-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0011","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0011-foundations-workspace-runtime-and-build-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0012","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0012-runtime-ownership-and-studio-boundary-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0013","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0013-metadata-convergence-and-runtime-sink-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0014","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0014-pack-wizard-summary-validation-and-pack-execution-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0015","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0015-tile-bank-packing-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0017","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0017-packer-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0004","status":"abandoned","ticket":"tilemap-and-metatile-runtime-binary-layout","title":"Tilemap and Metatile Runtime Binary Layout","created_at":"2026-03-26","updated_at":"2026-04-24","tags":["packer","legacy-import","tilemap","metatile","runtime-layout"],"agendas":[{"id":"AGD-0004","file":"AGD-0004-tilemap-and-metatile-runtime-binary-layout.md","status":"abandoned","created_at":"2026-03-26","updated_at":"2026-04-24","_override_reason":"Explicit user request on 2026-04-24 to abandon AGD-0004 because the agenda is no longer valid."}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0005","status":"open","ticket":"variable-tile-bank-palette-serialization","title":"Variable Tile Bank Palette Serialization","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","legacy-import","tile-bank","palette-serialization","versioning"],"agendas":[{"id":"AGD-0005","file":"AGD-0005-variable-tile-bank-palette-serialization.md","status":"open","created_at":"2026-03-26","updated_at":"2026-03-26"}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0006","status":"done","ticket":"pbs-game-facing-asset-refs-and-call-result-discard","title":"PBS Game-Facing Asset References and Ignored Call Result Lowering","created_at":"2026-03-27","updated_at":"2026-03-30","tags":["compiler","pbs","ergonomics","lowering","runtime","asset-identity","expression-statements"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0024","file":"discussion/lessons/DSC-0006-pbs-game-facing-asset-refs-and-call-result-discard/LSN-0024-addressable-surface-host-metadata-and-ignored-value-discipline.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0007","status":"done","ticket":"pbs-learn-to-discussion-lessons-migration","title":"Migrate PBS Learn Documents into Discussion Lessons","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","migration","discussion-framework","lessons","learn-prune"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0018","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0018-pbs-ast-and-parser-contract-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0019","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0019-pbs-name-resolution-and-linking-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0020","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0020-pbs-runtime-values-identity-memory-boundaries-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0021","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0021-pbs-diagnostics-and-conformance-governance-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0022","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0022-pbs-globals-lifecycle-and-published-entrypoint-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0008","status":"done","ticket":"pbs-low-level-asset-manager-surface","title":"PBS Low-Level Asset Manager Surface for Runtime AssetManager","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","runtime","asset-manager","host-abi","stdlib","asset"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0023","file":"discussion/lessons/DSC-0008-pbs-low-level-asset-manager-surface/LSN-0023-lowassets-runtime-aligned-sdk-surface.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0009","status":"done","ticket":"studio-debugger-workspace-integration","title":"Integrate ../debugger into Studio as a dedicated workspace","created_at":"2026-03-30","updated_at":"2026-04-07","tags":["studio","debugger","workspace","integration","shell"],"agendas":[],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0010","status":"done","ticket":"studio-code-editor-workspace-foundations","title":"Establish Code Editor workspace foundations in Studio without LSP","created_at":"2026-03-30","updated_at":"2026-03-31","tags":["studio","editor","workspace","multi-frontend","lsp-deferred"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0026","file":"discussion/lessons/DSC-0010-studio-code-editor-workspace-foundations/LSN-0026-read-only-editor-foundations-and-semantic-deferral.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0011","status":"done","ticket":"compiler-analyze-compile-build-pipeline-split","title":"Split compiler pipeline into analyze, compile, and build entrypoints","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["compiler","pipeline","artifacts","build","analysis"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0025","file":"discussion/lessons/DSC-0011-compiler-analyze-compile-build-pipeline-split/LSN-0025-compiler-pipeline-entrypoints-and-result-boundaries.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0012","status":"done","ticket":"studio-editor-document-vfs-boundary","title":"Definir um boundary de VFS documental para tree/view/open files no Code Editor do Studio","created_at":"2026-03-31","updated_at":"2026-03-31","tags":["studio","editor","workspace","vfs","filesystem","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0027","file":"discussion/lessons/DSC-0012-studio-editor-document-vfs-boundary/LSN-0027-project-document-vfs-and-session-owned-editor-boundary.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0013","status":"done","ticket":"studio-editor-write-wave-supported-non-frontend-files","title":"Definir a wave inicial de edicao no Code Editor apenas para arquivos aceitos e nao relacionados ao FE","created_at":"2026-03-31","updated_at":"2026-04-02","tags":["studio","editor","workspace","write","read-only","vfs","frontend-boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0028","file":"discussion/lessons/DSC-0013-studio-editor-write-wave-supported-non-frontend-files/LSN-0028-controlled-editor-write-wave-and-read-only-frontend-semantic-phase.md","status":"done","created_at":"2026-04-02","updated_at":"2026-04-02"}]} -{"type":"discussion","id":"DSC-0014","status":"done","ticket":"studio-frontend-owned-semantic-editor-presentation","title":"Definir ownership do schema visual semantico do editor por frontend","created_at":"2026-04-02","updated_at":"2026-04-02","tags":["studio","editor","frontend","presentation","semantic-highlighting","compiler","pbs"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0029","file":"discussion/lessons/DSC-0014-studio-frontend-owned-semantic-editor-presentation/LSN-0029-frontend-owned-semantic-presentation-descriptor-and-host-consumption.md","status":"done","created_at":"2026-04-02","updated_at":"2026-04-02"}]} -{"type":"discussion","id":"DSC-0015","status":"done","ticket":"pbs-service-facade-reserved-metadata","title":"SDK Service Bodies Calling Builtin/Intrinsic Proxies as Ordinary PBS Code","created_at":"2026-04-03","updated_at":"2026-04-03","tags":["compiler","pbs","sdk","stdlib","lowering","service","intrinsic","sdk-interface"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0030","file":"discussion/lessons/DSC-0015-pbs-service-facade-reserved-metadata/LSN-0030-sdk-service-bodies-over-private-reserved-proxies.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"}]} -{"type":"discussion","id":"DSC-0016","status":"done","ticket":"studio-editor-scope-guides-and-brace-anchoring","title":"Scope Guides do Code Editor com ancoragem exata em braces e destaque do escopo ativo","created_at":"2026-04-03","updated_at":"2026-04-06","tags":["studio","editor","scope-guides","braces","semantic-read","frontend-contract"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0034","file":"discussion/lessons/DSC-0016-studio-editor-scope-guides-and-brace-anchoring/LSN-0034-active-scope-gutter-and-frontend-owned-structural-anchors.md","status":"done","created_at":"2026-04-06","updated_at":"2026-04-06"}]} -{"type":"discussion","id":"DSC-0017","status":"done","ticket":"studio-editor-inline-type-hints-for-let-bindings","title":"Inline Type Hints for Let Bindings in the Studio Editor","created_at":"2026-04-03","updated_at":"2026-04-06","tags":["studio","editor","inline-hints","inlay-hints","lsp","pbs","type-inference"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0035","file":"discussion/lessons/DSC-0017-studio-editor-inline-type-hints-for-let-bindings/LSN-0035-frontend-owned-inline-hints-with-decorative-inline-rendering.md","status":"done","created_at":"2026-04-06","updated_at":"2026-04-06"}]} -{"type":"discussion","id":"DSC-0018","status":"done","ticket":"studio-project-local-studio-state-under-dot-studio","title":"Persist project-local Studio state under .studio","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","project-session","project-state","persistence","dot-studio","shell","layout","setup"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0031","file":"discussion/lessons/DSC-0018-studio-project-local-studio-state-under-dot-studio/LSN-0031-project-local-studio-state-and-lifecycle-safe-layout-restoration.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0019","status":"done","ticket":"studio-project-local-setup-separate-from-main-studio-state","title":"Separate project-local setup from the main Studio state under .studio","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","project-session","project-state","persistence","dot-studio","setup","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0032","file":"discussion/lessons/DSC-0019-studio-project-local-setup-separate-from-main-studio-state/LSN-0032-separate-project-config-from-session-restoration-state.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0020","status":"done","ticket":"studio-editor-indentation-policy-and-project-setup","title":"Indentation Policy, Status-Bar Semantics, and Project-Local Editor Setup","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","editor","indentation","tabs","setup","dot-studio","configuration","ux"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0033","file":"discussion/lessons/DSC-0020-studio-editor-indentation-policy-and-project-setup/LSN-0033-setup-owned-indentation-policy-and-project-bootstrap-defaults.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0021","status":"done","ticket":"studio-frontend-editor-write-and-save-wave","title":"Enable Frontend Editing and Save in the Studio Code Editor","created_at":"2026-04-04","updated_at":"2026-04-06","tags":["studio","editor","frontend","write","save","vfs","lsp","pbs","access-policy"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0036","file":"discussion/lessons/DSC-0021-studio-frontend-editor-write-and-save-wave/LSN-0036-vfs-owned-frontend-edit-and-save-wave.md","status":"done","created_at":"2026-04-06","updated_at":"2026-04-06"}]} -{"type":"discussion","id":"DSC-0022","status":"done","ticket":"studio-play-stop-cartridge-flow","title":"Wire the Studio Play/Stop button to shipper phase 1 cartridge preparation and runtime execution","created_at":"2026-04-06","updated_at":"2026-04-07","tags":["studio","play-stop","shipper","runtime","cartridge","shell"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0043","file":"discussion/lessons/DSC-0022-studio-play-stop-and-debugger-integration/LSN-0043-studio-play-stop-and-debugger-integration.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"}]} -{"type":"discussion","id":"DSC-0023","status":"done","ticket":"gradle-version-catalog-migration","title":"Move dependency version management to Version Catalog (TOML)","created_at":"2026-04-07","updated_at":"2026-04-07","tags":["gradle","buildSrc","dependency-management","version-catalog"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0037","file":"discussion/lessons/DSC-0023-gradle-version-catalog-migration/LSN-0037-gradle-version-catalog-adoption.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"}]} diff --git a/discussion/index.ndjson b/discussion/index.ndjson deleted file mode 100644 index f006b70d..00000000 --- a/discussion/index.ndjson +++ /dev/null @@ -1,67 +0,0 @@ -{"type":"meta","next_id":{"DSC":67,"AGD":70,"DEC":59,"PLN":138,"LSN":75,"CLSN":1}} -{"type":"discussion","id":"DSC-0066","status":"done","ticket":"pbs-lsp-remaining-editor-surface","title":"PBS LSP Remaining Editor Surface","created_at":"2026-09-22","updated_at":"2026-09-22","tags":["studio","lsp","vscode","compiler-pbs","editor"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0074","file":"discussion/lessons/DSC-0066-pbs-lsp-remaining-editor-surface/LSN-0074-pbs-remaining-editor-surface-is-frontend-owned.md","status":"done","created_at":"2026-09-22","updated_at":"2026-09-22"}]} -{"type":"discussion","id":"DSC-0065","status":"done","ticket":"multi-frontend-avoid-premature-abstractions","title":"Evitar abstracoes prematuras na preparacao multi-frontend","created_at":"2026-07-15","updated_at":"2026-09-19","tags":["compiler","compiler-general","studio","frontend","architecture","multi-frontend","simplicity"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0067","file":"discussion/lessons/DSC-0065-multi-frontend-avoid-premature-abstractions/LSN-0067-multi-frontend-phase-rejects-premature-infrastructure.md","status":"done","created_at":"2026-09-19","updated_at":"2026-09-19"}]} -{"type":"discussion","id":"DSC-0064","status":"done","ticket":"multi-frontend-architectural-tests","title":"Testes arquiteturais para fronteiras multi-frontend","created_at":"2026-07-15","updated_at":"2026-09-19","tags":["compiler","compiler-general","studio","frontend","architecture","tests","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0066","file":"discussion/lessons/DSC-0064-multi-frontend-architectural-tests/LSN-0066-archunit-guards-java-multi-frontend-boundaries.md","status":"done","created_at":"2026-09-19","updated_at":"2026-09-19"}]} -{"type":"discussion","id":"DSC-0063","status":"done","ticket":"multi-frontend-synthetic-test-frontend","title":"Frontend sintetico de teste para provar neutralidade do pipeline","created_at":"2026-07-15","updated_at":"2026-09-19","tags":["compiler","compiler-general","frontend","tests","backend","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0065","file":"discussion/lessons/DSC-0063-multi-frontend-synthetic-test-frontend/LSN-0065-synthetic-test-frontend-proves-pipeline-neutrality.md","status":"done","created_at":"2026-09-19","updated_at":"2026-09-19"}]} -{"type":"discussion","id":"DSC-0062","status":"done","ticket":"multi-frontend-pvm-neutrality","title":"Neutralidade da PVM e identificacao PBX independente de PBS","created_at":"2026-07-15","updated_at":"2026-09-18","tags":["vm-arch","runtime","pvm","pbx","compiler","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0061","file":"discussion/lessons/DSC-0062-multi-frontend-pvm-neutrality/LSN-0061-pbx-runtime-boundary.md","status":"done","created_at":"2026-09-18","updated_at":"2026-09-18"}]} -{"type":"discussion","id":"DSC-0061","status":"done","ticket":"multi-frontend-sdk-canonical-definition","title":"Auditoria e centralizacao gradual da definicao canonica do SDK","created_at":"2026-07-15","updated_at":"2026-09-19","tags":["compiler","compiler-general","sdk","stdlib","hostcalls","intrinsics","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0064","file":"discussion/lessons/DSC-0061-multi-frontend-sdk-canonical-definition/LSN-0064-runtime-owns-console-abi-pbs-is-delivery.md","status":"done","created_at":"2026-09-19","updated_at":"2026-09-19"}]} -{"type":"discussion","id":"DSC-0060","status":"done","ticket":"multi-frontend-validation-boundaries","title":"Separar validacoes de linguagem e validacoes de plataforma","created_at":"2026-07-15","updated_at":"2026-09-19","tags":["compiler","compiler-general","compiler-pbs","backend","validation","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0063","file":"discussion/lessons/DSC-0060-multi-frontend-validation-boundaries/LSN-0063-language-vs-platform-validation-ownership.md","status":"done","created_at":"2026-09-19","updated_at":"2026-09-19"}]} -{"type":"discussion","id":"DSC-0059","status":"done","ticket":"multi-frontend-common-lifecycle","title":"Extrair lifecycle comum das responsabilidades do frontend PBS","created_at":"2026-07-15","updated_at":"2026-09-19","tags":["compiler","compiler-general","compiler-pbs","lifecycle","backend","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0062","file":"discussion/lessons/DSC-0059-multi-frontend-common-lifecycle/LSN-0062-common-lifecycle-assembly-stage.md","status":"done","created_at":"2026-09-19","updated_at":"2026-09-19"}]} -{"type":"discussion","id":"DSC-0058","status":"done","ticket":"multi-frontend-serializable-ir","title":"Manter a IR comum serializavel por design","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","ir","backend","serialization","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0060","file":"discussion/lessons/DSC-0058-multi-frontend-serializable-ir/LSN-0060-data-contract-first-for-serializable-irbackend.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15"}]} -{"type":"discussion","id":"DSC-0057","status":"done","ticket":"multi-frontend-frontend-backend-contract","title":"Estabilizar contrato entre frontend e backend comum","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","compiler-pbs","ir","backend","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0059","file":"discussion/lessons/DSC-0057-multi-frontend-frontend-backend-contract/LSN-0059-common-irbackend-handoff-and-backend-guardrails.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15"}]} -{"type":"discussion","id":"DSC-0056","status":"done","ticket":"multi-frontend-remove-pbs-branches","title":"Generalizar o contrato LSP/editorial para frontends","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","compiler-pbs","studio","frontend","coupling","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0058","file":"discussion/lessons/DSC-0056-multi-frontend-remove-pbs-branches/LSN-0058-generic-frontend-editorial-contract-for-lsp.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15"}]} -{"type":"discussion","id":"DSC-0055","status":"done","ticket":"multi-frontend-compiler-vs-language-services","title":"Separar compilacao de servicos editoriais de frontend","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","studio","lsp","editor","frontend","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0056","file":"discussion/lessons/DSC-0055-multi-frontend-compiler-vs-language-services/LSN-0056-compile-first-frontends-with-optional-editorial-capabilities.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15"}]} -{"type":"discussion","id":"DSC-0054","status":"done","ticket":"multi-frontend-provider-contract","title":"Introduzir provider completo de frontend","created_at":"2026-07-15","updated_at":"2026-07-15","tags":["compiler","compiler-general","studio","frontend","registry","multi-frontend"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0055","file":"discussion/lessons/DSC-0054-multi-frontend-provider-contract/LSN-0055-static-frontend-providers-before-plugin-architecture.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15"}]} -{"type":"discussion","id":"DSC-0053","status":"done","ticket":"pbs-lsp-call-and-type-hierarchy","title":"PBS LSP Call and Type Hierarchy","created_at":"2026-07-15","updated_at":"2026-09-22","tags":["studio","lsp","vscode","compiler-pbs","editor","call-hierarchy","type-hierarchy"],"agendas":[],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0052","status":"done","ticket":"pbs-lsp-document-links","title":"PBS LSP Document Links","created_at":"2026-07-15","updated_at":"2026-09-22","tags":["studio","lsp","vscode","compiler-pbs","editor","document-links","imports"],"agendas":[],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0051","status":"done","ticket":"pbs-lsp-diagnostics-ux","title":"PBS LSP Diagnostics UX","created_at":"2026-07-15","updated_at":"2026-09-22","tags":["studio","lsp","vscode","compiler-pbs","editor","diagnostics","ux"],"agendas":[],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0050","status":"done","ticket":"pbs-lsp-folding-and-selection-ranges","title":"PBS LSP Folding and Selection Ranges","created_at":"2026-07-15","updated_at":"2026-09-22","tags":["studio","lsp","vscode","compiler-pbs","editor","folding","selection-range"],"agendas":[],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0049","status":"done","ticket":"pbs-lsp-completion-depth","title":"PBS LSP Completion Depth","created_at":"2026-07-15","updated_at":"2026-09-22","tags":["studio","lsp","vscode","compiler-pbs","editor","completion"],"agendas":[],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0048","status":"done","ticket":"pbs-lsp-performance-cache-and-snapshots","title":"PBS LSP Performance Cache and Snapshots","created_at":"2026-07-15","updated_at":"2026-09-22","tags":["studio","lsp","vscode","compiler-pbs","editor","performance","caching"],"agendas":[],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0047","status":"done","ticket":"pbs-lsp-semantic-tokens-semantic-classification","title":"PBS LSP Semantic Token Classification","created_at":"2026-07-15","updated_at":"2026-09-22","tags":["studio","lsp","vscode","compiler-pbs","editor","semantic-tokens"],"agendas":[],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0046","status":"done","ticket":"pbs-lsp-import-assistance","title":"PBS LSP Import Assistance","created_at":"2026-07-15","updated_at":"2026-09-22","tags":["studio","lsp","vscode","compiler-pbs","editor","imports","completion"],"agendas":[],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0045","status":"done","ticket":"pbs-lsp-formatting","title":"PBS LSP Formatting","created_at":"2026-07-15","updated_at":"2026-09-22","tags":["studio","lsp","vscode","compiler-pbs","editor","formatting"],"agendas":[],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0044","status":"done","ticket":"pbs-lsp-code-actions","title":"PBS LSP Code Actions and Quick Fixes","created_at":"2026-07-15","updated_at":"2026-09-22","tags":["studio","lsp","vscode","compiler-pbs","editor","code-actions","quick-fix"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0073","file":"discussion/lessons/DSC-0044-pbs-lsp-code-actions/LSN-0073-pbs-quick-fixes-are-frontend-repairs-transported-by-the-lsp.md","status":"done","created_at":"2026-09-22","updated_at":"2026-09-22"}]} -{"type":"discussion","id":"DSC-0043","status":"done","ticket":"pbs-lsp-rename-symbol","title":"PBS LSP Rename Symbol","created_at":"2026-07-15","updated_at":"2026-09-22","tags":["studio","lsp","vscode","compiler-pbs","editor","rename"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0072","file":"discussion/lessons/DSC-0043-pbs-lsp-rename-symbol/LSN-0072-pbs-rename-is-a-validated-physical-workspace-edit.md","status":"done","created_at":"2026-09-22","updated_at":"2026-09-22"}]} -{"type":"discussion","id":"DSC-0042","status":"done","ticket":"pbs-lsp-workspace-symbols","title":"PBS LSP Workspace Symbols","created_at":"2026-07-15","updated_at":"2026-09-21","tags":["studio","lsp","vscode","compiler-pbs","editor","workspace-symbols"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0071","file":"discussion/lessons/DSC-0042-pbs-lsp-workspace-symbols/LSN-0071-pbs-workspace-symbols-are-a-physical-named-declaration-search.md","status":"done","created_at":"2026-09-21","updated_at":"2026-09-21"}]} -{"type":"discussion","id":"DSC-0041","status":"done","ticket":"pbs-lsp-document-symbols-outline","title":"PBS LSP Document Symbols and Outline","created_at":"2026-07-15","updated_at":"2026-09-21","tags":["studio","lsp","vscode","compiler-pbs","editor","outline","document-symbols"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0070","file":"discussion/lessons/DSC-0041-pbs-lsp-document-symbols-outline/LSN-0070-pbs-outline-is-an-ast-backed-document-symbol-tree.md","status":"done","created_at":"2026-09-21","updated_at":"2026-09-21"}]} -{"type":"discussion","id":"DSC-0040","status":"done","ticket":"pbs-lsp-find-references","title":"PBS LSP Find References","created_at":"2026-07-15","updated_at":"2026-09-21","tags":["studio","lsp","vscode","compiler-pbs","editor","references"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0069","file":"discussion/lessons/DSC-0040-pbs-lsp-find-references/LSN-0069-pbs-find-references-is-the-physical-inverse-of-definition.md","status":"done","created_at":"2026-09-21","updated_at":"2026-09-21"}]} -{"type":"discussion","id":"DSC-0039","status":"done","ticket":"pbs-lsp-go-to-definition","title":"PBS LSP Go to Definition","created_at":"2026-07-15","updated_at":"2026-09-21","tags":["studio","lsp","vscode","compiler-pbs","editor","definition"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0068","file":"discussion/lessons/DSC-0039-pbs-lsp-go-to-definition/LSN-0068-pbs-go-to-definition-uses-editorial-lookup-and-physical-files.md","status":"done","created_at":"2026-09-21","updated_at":"2026-09-21"}]} -{"type":"discussion","id":"DSC-0038","status":"done","ticket":"studio-packer-rgba8888-asset-pipeline","title":"Studio and Packer RGBA8888 Asset Pipeline Alignment","created_at":"2026-05-23","updated_at":"2026-07-14","tags":["studio","packer","assets","glyph-bank","palette","rgba8888","runtime-alignment"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0053","file":"discussion/lessons/DSC-0038-studio-packer-rgba8888-asset-pipeline/LSN-0053-rgba8888-is-the-canonical-studio-packer-palette-contract.md","status":"done","created_at":"2026-07-14","updated_at":"2026-07-14"}]} -{"type":"discussion","id":"DSC-0037","status":"done","ticket":"pbs-autocomplete-parameter-names","title":"PBS autocomplete parameter names for stdlib and method calls","created_at":"2026-05-08","updated_at":"2026-05-14","tags":["compiler-pbs","studio","lsp","autocomplete","signature-help","stdlib"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0052","file":"discussion/lessons/DSC-0037-pbs-autocomplete-parameter-names/LSN-0052-canonical-callable-parameter-names-through-pbs-editor-assistance.md","status":"done","created_at":"2026-05-14","updated_at":"2026-05-14"}]} -{"type":"discussion","id":"DSC-0036","status":"done","ticket":"pbs-symbol-documentation-and-hover-markdown","title":"Modelo de documentacao de simbolos em PBS e consumo markdown no hover","created_at":"2026-05-08","updated_at":"2026-07-15","tags":["compiler","compiler-pbs","studio","lsp","vscode","editor","hover","documentation","markdown"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0057","file":"discussion/lessons/DSC-0036-pbs-symbol-documentation-and-hover-markdown/LSN-0057-compiler-owned-pbs-doc-markdown-for-editor-assistance.md","status":"done","created_at":"2026-07-15","updated_at":"2026-07-15"}]} -{"type":"discussion","id":"DSC-0035","status":"done","ticket":"pbs-lsp-editor-assistance-wave-1","title":"Wave 1 de assistencia editorial via LSP para PBS no VS Code","created_at":"2026-05-08","updated_at":"2026-05-08","tags":["studio","lsp","vscode","compiler","compiler-pbs","editor","completion","hover","signature-help"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0051","file":"discussion/lessons/DSC-0035-pbs-lsp-editor-assistance-wave-1/LSN-0051-compiler-backed-editor-assistance-for-pbs.md","status":"done","created_at":"2026-05-08","updated_at":"2026-05-08"}]} -{"type":"discussion","id":"DSC-0034","status":"done","ticket":"frontend-semantic-host-projection-flexibility","title":"Frontend semantic vocabulary flexibility and declarative host projection","created_at":"2026-05-06","updated_at":"2026-05-07","tags":["compiler","compiler-general","frontend","semantics","vscode","host-projection","lsp"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0048","file":"discussion/lessons/DSC-0034-frontend-semantic-host-projection-flexibility/LSN-0048-frontend-owned-semantic-vocabularies-with-declarative-host-projection.md","status":"done","created_at":"2026-05-07","updated_at":"2026-05-07"}]} -{"type":"discussion","id":"DSC-0033","status":"done","ticket":"frontend-visual-theme-spec-and-css-retirement","title":"Frontend visual theme spec and retirement of host-consumed semantic CSS","created_at":"2026-05-06","updated_at":"2026-05-08","tags":["compiler","compiler-general","frontend","presentation","theming","studio","vscode","lsp","pbs"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0050","file":"discussion/lessons/DSC-0033-frontend-visual-theme-spec-and-css-retirement/LSN-0050-frontend-owned-visual-themes-with-structured-contract-and-host-adapters.md","status":"done","created_at":"2026-05-08","updated_at":"2026-05-08"}]} -{"type":"discussion","id":"DSC-0032","status":"done","ticket":"studio-new-lsp-api-and-v1-boundary","title":"Novo boundary entre lsp-api, lsp-v1 e a extensao VS Code","created_at":"2026-05-05","updated_at":"2026-05-07","tags":["studio","lsp","vscode","protocol","api","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0047","file":"discussion/lessons/DSC-0032-studio-new-lsp-api-and-v1-boundary/LSN-0047-project-scoped-lsp-boundary-and-protocol-containment.md","status":"done","created_at":"2026-05-07","updated_at":"2026-05-07"}]} -{"type":"discussion","id":"DSC-0031","status":"done","ticket":"studio-editor-workspace-cleanup","title":"Limpeza completa do Workspace Editor do Studio e remoção dos acoplamentos legados","created_at":"2026-05-05","updated_at":"2026-05-08","tags":["studio","editor","cleanup","vfs","lsp","migration"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0049","file":"discussion/lessons/DSC-0031-studio-editor-workspace-cleanup/LSN-0049-remove-the-embedded-editor-stack-before-rebuilding-code-workflows.md","status":"done","created_at":"2026-05-08","updated_at":"2026-05-08"}]} -{"type":"discussion","id":"DSC-0030","status":"done","ticket":"studio-scene-pack-runtime-binary-contract","title":"Studio scene pack contract for runtime SCENE binary payload","created_at":"2026-04-24","updated_at":"2026-05-01","tags":["studio","packer","runtime","scene","asset-pack","binary-format","tiled"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0046","file":"discussion/lessons/DSC-0030-studio-scene-pack-runtime-binary-contract/LSN-0046-canonical-scene-owns-editorial-truth-while-pack-stays-request-driven.md","status":"done","created_at":"2026-05-01","updated_at":"2026-05-01"}]} -{"type":"discussion","id":"DSC-0029","status":"done","ticket":"studio-frame-composer-syscall-and-sprite-alignment","title":"Studio Alignment with Runtime FrameComposer Syscalls and Sprite Composition","created_at":"2026-04-18","updated_at":"2026-04-18","tags":["studio","compiler","pbs","stdlib","runtime-alignment","abi","syscall","frame-composer","sprites"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0041","file":"discussion/lessons/DSC-0029-studio-frame-composer-syscall-and-sprite-alignment/LSN-0041-composer-must-own-public-sprite-composition.md","status":"done","created_at":"2026-04-18","updated_at":"2026-04-18"}]} -{"type":"discussion","id":"DSC-0028","status":"done","ticket":"studio-tiled-parser-assets-scene-asset-type","title":"Tiled Parser and Scene Asset-Type Ownership in Assets Workspace","created_at":"2026-04-15","updated_at":"2026-04-23","tags":["studio","assets","scene","tiled","parser","asset-type"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0045","file":"discussion/lessons/DSC-0028-studio-tiled-parser-assets-scene-asset-type/LSN-0045-asset-owned-scene-bank-and-tiled-xml-workflow.md","status":"done","created_at":"2026-04-23","updated_at":"2026-04-23"}]} -{"type":"discussion","id":"DSC-0027","status":"abandoned","ticket":"studio-scene-workspace","title":"Scene Workspace for SCENE Authoring","created_at":"2026-04-14","updated_at":"2026-04-15","tags":["studio","workspace","scene","tilemap","asset","runtime-alignment"],"agendas":[{"id":"AGD-0029","file":"AGD-0029-studio-scene-workspace.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","_override_reason":"Explicit user request on 2026-04-15 to abandon the accepted agenda and its downstream work."}],"decisions":[{"id":"DEC-0026","file":"DEC-0026-studio-scene-workspace.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_agenda":"AGD-0029","_override_reason":"Explicit user request on 2026-04-15 to abandon the accepted decision and stop using it as normative guidance."}],"plans":[{"id":"PLN-0049","file":"PLN-0049-scene-workspace-spec-and-boundary-propagation.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."},{"id":"PLN-0050","file":"PLN-0050-scene-workspace-shell-and-project-state-foundations.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."},{"id":"PLN-0051","file":"PLN-0051-scene-artifact-and-assets-handoff-contract.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."},{"id":"PLN-0052","file":"PLN-0052-scene-workspace-wave-1-tilemap-editor.md","status":"abandoned","created_at":"2026-04-14","updated_at":"2026-04-15","ref_decisions":["DEC-0026"],"_override_reason":"Explicit user request on 2026-04-15 to abandon all plans derived from DEC-0026."}],"lessons":[]} -{"type":"discussion","id":"DSC-0026","status":"done","ticket":"glyph-bank-naming-alignment-with-runtime","title":"Glyph Bank Naming Alignment with Runtime DEC-0006","created_at":"2026-04-10","updated_at":"2026-04-10","tags":["packer","studio","naming","asset-contract","runtime-alignment","glyph-bank"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0040","file":"discussion/lessons/DSC-0026-glyph-bank-naming-alignment-with-runtime/LSN-0040-glyph-bank-artifact-naming-alignment.md","status":"done","created_at":"2026-04-10","updated_at":"2026-04-10"}]} -{"type":"discussion","id":"DSC-0025","status":"done","ticket":"packer-pipeline-metadata-ownership","title":"Pipeline Metadata Ownership and Runtime Contract","created_at":"2026-04-09","updated_at":"2026-04-10","tags":["packer","metadata","runtime-contract","tooling","studio"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0039","file":"discussion/lessons/DSC-0025-packer-pipeline-metadata-ownership/LSN-0039-runtime-header-boundary-and-tooling-owned-pipeline-metadata.md","status":"done","created_at":"2026-04-10","updated_at":"2026-04-10"}]} -{"type":"discussion","id":"DSC-0024","status":"done","ticket":"jacoco-reports-consolidation","title":"JaCoCo Reports Consolidation in Gradle","created_at":"2026-04-07","updated_at":"2026-04-07","tags":["infra","gradle","jacoco","coverage","jenkins"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0038","file":"discussion/lessons/DSC-0024-jacoco-reports-consolidation/LSN-0038-jacoco-reports-consolidation.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"},{"id":"LSN-0044","file":"discussion/lessons/DSC-0024-jacoco-reports-consolidation/LSN-0044-jenkins-jacoco-alignment.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"}]} -{"type":"discussion","id":"DSC-0001","status":"done","ticket":"studio-docs-import","title":"Import docs/studio into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["studio","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0001","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0001-assets-workspace-execution-wave-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0002","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0002-bank-composition-editor-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0003","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0003-mental-model-asset-mutations-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0004","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0004-mental-model-assets-workspace-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0005","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0005-mental-model-studio-events-and-components-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0006","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0006-mental-model-studio-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0007","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0007-pack-wizard-shell-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0008","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0008-project-scoped-state-and-activity-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0016","file":"discussion/lessons/DSC-0001-studio-docs-import/LSN-0016-studio-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0002","status":"done","ticket":"palette-management-in-studio","title":"Palette Management in Studio","created_at":"2026-03-26","updated_at":"2026-04-23","tags":["studio","legacy-import","palette-management","tile-bank","packer-boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0042","file":"discussion/lessons/DSC-0002-palette-management-in-studio/LSN-0042-schema-driven-palette-authoring-and-local-metadata-events.md","status":"done","created_at":"2026-04-23","updated_at":"2026-04-23"}]} -{"type":"discussion","id":"DSC-0003","status":"done","ticket":"packer-docs-import","title":"Import docs/packer into discussion-framework artifacts","created_at":"2026-03-26","updated_at":"2026-03-26","tags":["packer","migration","discussion-framework","docs-import"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0009","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0009-mental-model-packer-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0010","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0010-asset-identity-and-runtime-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0011","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0011-foundations-workspace-runtime-and-build-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0012","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0012-runtime-ownership-and-studio-boundary-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0013","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0013-metadata-convergence-and-runtime-sink-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0014","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0014-pack-wizard-summary-validation-and-pack-execution-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0015","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0015-tile-bank-packing-contract-legacy.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"},{"id":"LSN-0017","file":"discussion/lessons/DSC-0003-packer-docs-import/LSN-0017-packer-docs-import-pattern.md","status":"done","created_at":"2026-03-26","updated_at":"2026-03-26"}]} -{"type":"discussion","id":"DSC-0004","status":"abandoned","ticket":"tilemap-and-metatile-runtime-binary-layout","title":"Tilemap and Metatile Runtime Binary Layout","created_at":"2026-03-26","updated_at":"2026-04-24","tags":["packer","legacy-import","tilemap","metatile","runtime-layout"],"agendas":[{"id":"AGD-0004","file":"AGD-0004-tilemap-and-metatile-runtime-binary-layout.md","status":"abandoned","created_at":"2026-03-26","updated_at":"2026-04-24","_override_reason":"Explicit user request on 2026-04-24 to abandon AGD-0004 because the agenda is no longer valid."}],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0005","status":"done","ticket":"variable-tile-bank-palette-serialization","title":"Variable Glyph Bank Palette Serialization","created_at":"2026-03-26","updated_at":"2026-07-14","tags":["packer","legacy-import","glyph-bank","palette-serialization","rgba8888","runtime-alignment"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0054","file":"discussion/lessons/DSC-0005-variable-glyph-bank-palette-serialization/LSN-0054-runtime-owned-variable-glyph-palette-counts.md","status":"done","created_at":"2026-07-14","updated_at":"2026-07-14"}]} -{"type":"discussion","id":"DSC-0006","status":"done","ticket":"pbs-game-facing-asset-refs-and-call-result-discard","title":"PBS Game-Facing Asset References and Ignored Call Result Lowering","created_at":"2026-03-27","updated_at":"2026-03-30","tags":["compiler","pbs","ergonomics","lowering","runtime","asset-identity","expression-statements"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0024","file":"discussion/lessons/DSC-0006-pbs-game-facing-asset-refs-and-call-result-discard/LSN-0024-addressable-surface-host-metadata-and-ignored-value-discipline.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0007","status":"done","ticket":"pbs-learn-to-discussion-lessons-migration","title":"Migrate PBS Learn Documents into Discussion Lessons","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","migration","discussion-framework","lessons","learn-prune"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0018","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0018-pbs-ast-and-parser-contract-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0019","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0019-pbs-name-resolution-and-linking-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0020","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0020-pbs-runtime-values-identity-memory-boundaries-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0021","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0021-pbs-diagnostics-and-conformance-governance-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"},{"id":"LSN-0022","file":"discussion/lessons/DSC-0007-pbs-learn-to-discussion-lessons-migration/LSN-0022-pbs-globals-lifecycle-and-published-entrypoint-legacy.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0008","status":"done","ticket":"pbs-low-level-asset-manager-surface","title":"PBS Low-Level Asset Manager Surface for Runtime AssetManager","created_at":"2026-03-27","updated_at":"2026-03-27","tags":["compiler","pbs","runtime","asset-manager","host-abi","stdlib","asset"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0023","file":"discussion/lessons/DSC-0008-pbs-low-level-asset-manager-surface/LSN-0023-lowassets-runtime-aligned-sdk-surface.md","status":"done","created_at":"2026-03-27","updated_at":"2026-03-27"}]} -{"type":"discussion","id":"DSC-0009","status":"done","ticket":"studio-debugger-workspace-integration","title":"Integrate ../debugger into Studio as a dedicated workspace","created_at":"2026-03-30","updated_at":"2026-04-07","tags":["studio","debugger","workspace","integration","shell"],"agendas":[],"decisions":[],"plans":[],"lessons":[]} -{"type":"discussion","id":"DSC-0010","status":"done","ticket":"studio-code-editor-workspace-foundations","title":"Establish Code Editor workspace foundations in Studio without LSP","created_at":"2026-03-30","updated_at":"2026-03-31","tags":["studio","editor","workspace","multi-frontend","lsp-deferred"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0026","file":"discussion/lessons/DSC-0010-studio-code-editor-workspace-foundations/LSN-0026-read-only-editor-foundations-and-semantic-deferral.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0011","status":"done","ticket":"compiler-analyze-compile-build-pipeline-split","title":"Split compiler pipeline into analyze, compile, and build entrypoints","created_at":"2026-03-30","updated_at":"2026-03-30","tags":["compiler","pipeline","artifacts","build","analysis"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0025","file":"discussion/lessons/DSC-0011-compiler-analyze-compile-build-pipeline-split/LSN-0025-compiler-pipeline-entrypoints-and-result-boundaries.md","status":"done","created_at":"2026-03-30","updated_at":"2026-03-30"}]} -{"type":"discussion","id":"DSC-0012","status":"done","ticket":"studio-editor-document-vfs-boundary","title":"Definir um boundary de VFS documental para tree/view/open files no Code Editor do Studio","created_at":"2026-03-31","updated_at":"2026-03-31","tags":["studio","editor","workspace","vfs","filesystem","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0027","file":"discussion/lessons/DSC-0012-studio-editor-document-vfs-boundary/LSN-0027-project-document-vfs-and-session-owned-editor-boundary.md","status":"done","created_at":"2026-03-31","updated_at":"2026-03-31"}]} -{"type":"discussion","id":"DSC-0013","status":"done","ticket":"studio-editor-write-wave-supported-non-frontend-files","title":"Definir a wave inicial de edicao no Code Editor apenas para arquivos aceitos e nao relacionados ao FE","created_at":"2026-03-31","updated_at":"2026-04-02","tags":["studio","editor","workspace","write","read-only","vfs","frontend-boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0028","file":"discussion/lessons/DSC-0013-studio-editor-write-wave-supported-non-frontend-files/LSN-0028-controlled-editor-write-wave-and-read-only-frontend-semantic-phase.md","status":"done","created_at":"2026-04-02","updated_at":"2026-04-02"}]} -{"type":"discussion","id":"DSC-0014","status":"done","ticket":"studio-frontend-owned-semantic-editor-presentation","title":"Definir ownership do schema visual semantico do editor por frontend","created_at":"2026-04-02","updated_at":"2026-04-02","tags":["studio","editor","frontend","presentation","semantic-highlighting","compiler","pbs"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0029","file":"discussion/lessons/DSC-0014-studio-frontend-owned-semantic-editor-presentation/LSN-0029-frontend-owned-semantic-presentation-descriptor-and-host-consumption.md","status":"done","created_at":"2026-04-02","updated_at":"2026-04-02"}]} -{"type":"discussion","id":"DSC-0015","status":"done","ticket":"pbs-service-facade-reserved-metadata","title":"SDK Service Bodies Calling Builtin/Intrinsic Proxies as Ordinary PBS Code","created_at":"2026-04-03","updated_at":"2026-04-03","tags":["compiler","pbs","sdk","stdlib","lowering","service","intrinsic","sdk-interface"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0030","file":"discussion/lessons/DSC-0015-pbs-service-facade-reserved-metadata/LSN-0030-sdk-service-bodies-over-private-reserved-proxies.md","status":"done","created_at":"2026-04-03","updated_at":"2026-04-03"}]} -{"type":"discussion","id":"DSC-0016","status":"done","ticket":"studio-editor-scope-guides-and-brace-anchoring","title":"Scope Guides do Code Editor com ancoragem exata em braces e destaque do escopo ativo","created_at":"2026-04-03","updated_at":"2026-04-06","tags":["studio","editor","scope-guides","braces","semantic-read","frontend-contract"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0034","file":"discussion/lessons/DSC-0016-studio-editor-scope-guides-and-brace-anchoring/LSN-0034-active-scope-gutter-and-frontend-owned-structural-anchors.md","status":"done","created_at":"2026-04-06","updated_at":"2026-04-06"}]} -{"type":"discussion","id":"DSC-0017","status":"done","ticket":"studio-editor-inline-type-hints-for-let-bindings","title":"Inline Type Hints for Let Bindings in the Studio Editor","created_at":"2026-04-03","updated_at":"2026-04-06","tags":["studio","editor","inline-hints","inlay-hints","lsp","pbs","type-inference"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0035","file":"discussion/lessons/DSC-0017-studio-editor-inline-type-hints-for-let-bindings/LSN-0035-frontend-owned-inline-hints-with-decorative-inline-rendering.md","status":"done","created_at":"2026-04-06","updated_at":"2026-04-06"}]} -{"type":"discussion","id":"DSC-0018","status":"done","ticket":"studio-project-local-studio-state-under-dot-studio","title":"Persist project-local Studio state under .studio","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","project-session","project-state","persistence","dot-studio","shell","layout","setup"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0031","file":"discussion/lessons/DSC-0018-studio-project-local-studio-state-under-dot-studio/LSN-0031-project-local-studio-state-and-lifecycle-safe-layout-restoration.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0019","status":"done","ticket":"studio-project-local-setup-separate-from-main-studio-state","title":"Separate project-local setup from the main Studio state under .studio","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","project-session","project-state","persistence","dot-studio","setup","boundary"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0032","file":"discussion/lessons/DSC-0019-studio-project-local-setup-separate-from-main-studio-state/LSN-0032-separate-project-config-from-session-restoration-state.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0020","status":"done","ticket":"studio-editor-indentation-policy-and-project-setup","title":"Indentation Policy, Status-Bar Semantics, and Project-Local Editor Setup","created_at":"2026-04-04","updated_at":"2026-04-04","tags":["studio","editor","indentation","tabs","setup","dot-studio","configuration","ux"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0033","file":"discussion/lessons/DSC-0020-studio-editor-indentation-policy-and-project-setup/LSN-0033-setup-owned-indentation-policy-and-project-bootstrap-defaults.md","status":"done","created_at":"2026-04-04","updated_at":"2026-04-04"}]} -{"type":"discussion","id":"DSC-0021","status":"done","ticket":"studio-frontend-editor-write-and-save-wave","title":"Enable Frontend Editing and Save in the Studio Code Editor","created_at":"2026-04-04","updated_at":"2026-04-06","tags":["studio","editor","frontend","write","save","vfs","lsp","pbs","access-policy"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0036","file":"discussion/lessons/DSC-0021-studio-frontend-editor-write-and-save-wave/LSN-0036-vfs-owned-frontend-edit-and-save-wave.md","status":"done","created_at":"2026-04-06","updated_at":"2026-04-06"}]} -{"type":"discussion","id":"DSC-0022","status":"done","ticket":"studio-play-stop-cartridge-flow","title":"Wire the Studio Play/Stop button to shipper phase 1 cartridge preparation and runtime execution","created_at":"2026-04-06","updated_at":"2026-04-07","tags":["studio","play-stop","shipper","runtime","cartridge","shell"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0043","file":"discussion/lessons/DSC-0022-studio-play-stop-and-debugger-integration/LSN-0043-studio-play-stop-and-debugger-integration.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"}]} -{"type":"discussion","id":"DSC-0023","status":"done","ticket":"gradle-version-catalog-migration","title":"Move dependency version management to Version Catalog (TOML)","created_at":"2026-04-07","updated_at":"2026-04-07","tags":["gradle","buildSrc","dependency-management","version-catalog"],"agendas":[],"decisions":[],"plans":[],"lessons":[{"id":"LSN-0037","file":"discussion/lessons/DSC-0023-gradle-version-catalog-migration/LSN-0037-gradle-version-catalog-adoption.md","status":"done","created_at":"2026-04-07","updated_at":"2026-04-07"}]} diff --git a/discussion/lessons/DSC-0067-studio-core-javafx-decoupling/LSN-0075-studio-services-must-outlive-the-current-ui.md b/discussion/lessons/DSC-0067-studio-core-javafx-decoupling/LSN-0075-studio-services-must-outlive-the-current-ui.md new file mode 100644 index 00000000..46c87a84 --- /dev/null +++ b/discussion/lessons/DSC-0067-studio-core-javafx-decoupling/LSN-0075-studio-services-must-outlive-the-current-ui.md @@ -0,0 +1,103 @@ +--- +id: LSN-0075 +ticket: studio-core-javafx-decoupling +title: Studio Services Must Outlive the Current UI +created: 2026-09-25 +tags: [studio, architecture, spring, spring-modulith, javafx, adapters] +--- + +## Context + +Prometeu Studio began as a desktop application in which JavaFX controls, application workflows, provider integrations, background execution, and lifecycle management shared one Gradle module. A static `p.studio.Container` made these dependencies easy to reach, but it also made the visual adapter the practical center of the product. That shape could not support another consumer, such as a future agent adapter, without either driving the UI or duplicating Studio behavior. + +The migration needed to preserve the existing Java product and its behavior while making JavaFX replaceable. It also needed to preserve the autonomy of compiler, LSP, runtime, and especially `p.packer`; separating Studio did not authorize absorbing those domains. + +## Key Decisions + +### Human and non-visual adapters consume the same Studio services + +**What:** The Studio is physically divided into `prometeu-studio-api`, `prometeu-studio-core`, `prometeu-studio-ui-javafx`, and `prometeu-app`. JavaFX depends on the neutral API, Core implements application use cases, and the application module composes concrete adapters. + +**Why:** The stable boundary is UI versus application services, not JavaFX versus a future web framework. A future agent can depend on the same API without moving application rules out of Core. + +**Trade-offs:** More constructor parameters and explicit contracts are required. That cost is intentional: dependencies are visible, testable, and constrained by Gradle instead of hidden behind a global container. + +### Spring is a composition mechanism, not a domain dependency + +**What:** Spring Boot runs in non-web mode only in `prometeu-app`. Core objects remain constructor-injected POJOs. Spring Modulith verifies the six functional Core modules: project, session, assets, shipper, runtime, and execution. + +**Why:** Spring provides deterministic construction and lifecycle without contaminating the public API or Core. Modulith supplies executable documentation and dependency checks while Gradle remains the physical classpath boundary. + +**Trade-offs:** The application configuration is deliberately explicit. Broad component scanning and turning JavaFX controls into Spring singletons would recreate hidden ownership and lifecycle problems. + +### Provider boundaries follow stability, not uniformity + +**What:** Core uses a provider's public API directly when it is stable and neutral. It owns a narrow port when the available integration is static, concrete, lifecycle-oriented, or otherwise unsuitable for Core. Packer's stable API is consumed directly; compiler static access, LSP lifecycle, and runtime process integration are isolated behind consumer-owned gateways implemented in `prometeu-app`. + +**Why:** Wrapping every dependency creates redundant abstractions, while importing concrete implementations leaks infrastructure into Core. The useful boundary depends on the provider contract. + +**Trade-offs:** The integration matrix must be reviewed case by case. There is no universal rule that every provider receives a gateway. + +### Long-running work is a neutral application contract + +**What:** Build, pack, and execution expose `OperationHandle` with identity, snapshots, completion, cancellation, updates, and typed results. The application owns the executor implementation; JavaFX only projects operation state and switches to the FX thread. + +**Why:** Background work must be equally consumable by JavaFX and future adapters. An executor or JavaFX `Task` is an implementation detail, not an application contract. + +**Trade-offs:** Cancellation races and terminal state transitions require explicit tests. In particular, stopping execution must cancel the outer execution handle before its nested preparation handle can complete it successfully. + +## Patterns and Algorithms + +The dependency pattern is: + +```text +JavaFX adapter ---> Studio API <--- future adapters + ^ + | + Studio Core + ^ + | + Spring non-web composition +``` + +External providers remain outside the Core module graph. Stable public provider APIs may be direct Core dependencies; concrete adapters remain in the application module. + +Operational failures that a caller can recover from are returned as typed results or diagnostics. For example, metadata writes convert I/O failures into `AssetMetadataWriteResult`. JavaFX renders that result and does not treat an unexpected exception message or stack trace as a functional contract. + +The removal sequence for a service locator is also reusable: + +1. establish architecture tests and final modules; +2. introduce neutral contracts and explicit factories; +3. move behavior slice by slice into constructor-injected services; +4. reduce static call sites to zero; +5. delete the static container and manual composition together; +6. remove the mixed legacy module; +7. run the full build, packaging, desktop smoke, and shutdown gate as one indivisible acceptance step. + +## Pitfalls + +- Renaming packages without changing Gradle dependencies does not create a replaceable frontend. +- Replacing `Container` with `ApplicationContext.getBean()` throughout the code is still a service locator. Context lookup belongs only at the explicit application bootstrap boundary. +- Registering every control or dialog as a Spring singleton gives Spring ownership of visual lifecycle and makes multiple windows or future adapters harder. +- A gateway that merely mirrors a stable provider API adds indirection without protection. Conversely, direct use of static or concrete provider entry points leaks infrastructure into Core. +- Moving Packer behavior into `p.studio.core.assets` would reverse domain ownership. Studio coordinates Packer; `p.packer` remains independently consumable. +- Returning raw exception messages to JavaFX turns implementation accidents into an unstable user-facing protocol. Expected failures need neutral results or diagnostics. +- Marking the migration complete after compilation alone misses packaging, restoration, real JavaFX interaction, cancellation, and shutdown leaks. + +## Takeaways + +- The durable product boundary is the Studio service surface, not the current frontend technology. +- Spring belongs in composition; Spring Modulith belongs in verification and documentation; neither belongs in the neutral API. +- Gradle modules enforce physical isolation, while functional Core modules express ownership and allowed dependencies. +- JavaFX is an equivalent adapter, not the owner of project, asset, build, runtime, or execution rules. +- `Container` removal is a completion criterion, not an optional cleanup step. +- A future agent module can now be added as another API consumer without revisiting this migration or coupling AI concerns to JavaFX. + +## References + +- Decision: `DEC-0059` — Separate Studio Core from JavaFX with Spring Boot non-web and Spring Modulith. +- Plan: `PLN-0138` — Complete Studio Core and JavaFX Boundary Migration. +- Studio architecture: `docs/specs/studio/9. Studio Core and Adapter Architecture Specification.md`. +- Studio specifications: `docs/specs/studio/README.md`. +- Packer boundary: `docs/specs/packer/1. Domain and Artifact Boundary Specification.md`. +- Packer integration: `docs/specs/packer/5. Diagnostics, Operations, and Studio Integration Specification.md`. diff --git a/docs/specs/packer/1. Domain and Artifact Boundary Specification.md b/docs/specs/packer/1. Domain and Artifact Boundary Specification.md index 4cd9dc21..f7f8d862 100644 --- a/docs/specs/packer/1. Domain and Artifact Boundary Specification.md +++ b/docs/specs/packer/1. Domain and Artifact Boundary Specification.md @@ -25,6 +25,9 @@ Runtime-side reading semantics for `assets.pa` are defined upstream in `../runti 5. A future shipper is a consumer of packer artifacts, not a co-author of the asset contract. 6. Runtime reading semantics are not redefined by the packer. 7. The packer must stop at artifact publication, not cartridge assembly. +8. The packer's Java package root is `p.packer`; it must not be moved under `p.studio` or treated as a Studio subdomain. +9. The packer must remain independently consumable by Studio, command-line tooling, build tooling, and future automation adapters. +10. No Packer module may depend on `p.studio`, Studio UI, or Studio application modules. ## Packer-Owned Artifacts @@ -57,6 +60,18 @@ Rules: - shipper-specific workflow detail is deferred; - published artifact names and meanings must remain documented and stable enough for later consumption. +## Studio Consumption Boundary + +Studio is a consumer of Packer capabilities, not the owner of Packer semantics. + +Rules: + +- Studio should consume a stable, neutral, use-case-oriented public Packer API directly; +- Studio must not add a gateway that merely mirrors an already suitable public Packer API; +- when only concrete, static, infrastructure-oriented, unstable, or excessively broad integration is available, the Studio consumer may define a narrow consumer-owned gateway; +- implementations of Studio-owned gateways must stay outside Packer and outside the Studio Core functional contract; +- Studio projections and orchestration must not duplicate Packer validation, packing, diagnostic, concurrency, or artifact semantics. + ## Non-Goals - cartridge assembly flow diff --git a/docs/specs/packer/5. Diagnostics, Operations, and Studio Integration Specification.md b/docs/specs/packer/5. Diagnostics, Operations, and Studio Integration Specification.md index 5be89877..adafcb00 100644 --- a/docs/specs/packer/5. Diagnostics, Operations, and Studio Integration Specification.md +++ b/docs/specs/packer/5. Diagnostics, Operations, and Studio Integration Specification.md @@ -60,10 +60,24 @@ When the packer is embedded inside another host such as Studio, the host must bo Rules: -- the embedded packer runtime must receive a typed event bus reference from the host when shared host visibility is part of the integration contract; +- the embedded packer runtime must receive a typed event sink or adapter from the host when shared host visibility is part of the integration contract; - that reference is the baseline path for packer publish/subscribe integration in the embedded host; - the embedded packer runtime must not quietly create a disconnected parallel event system when host integration expects shared operational visibility; -- in Studio, this shared typed event bus reference is owned by the Studio `Container`. +- in Studio, bootstrap, shutdown, and event adaptation are owned by the `prometeu-app` composition root; +- the embedded integration must not use `p.studio.Container`, Spring context lookup, or another static service locator. + +### Studio Dependency Rule + +The dependency direction is always Studio to Packer. + +Rules: + +- Studio Core may consume stable public contracts from `prometeu-packer-api` directly; +- a Studio-owned gateway is required only when an integration is concrete, static, infrastructure-oriented, unstable, excessively broad, or leaks provider lifecycle details; +- such a gateway must expose only the capabilities required by its consuming Studio module; +- gateway implementations and Packer bootstrap belong in `prometeu-app` or another explicit infrastructure adapter; +- the JavaFX adapter must consume neutral Studio API contracts and must not call Packer directly; +- Packer must not depend on `p.studio` and must not publish Studio UI events as part of its domain contract. Baseline core services: diff --git a/docs/specs/packer/README.md b/docs/specs/packer/README.md index c3a13127..de45717f 100644 --- a/docs/specs/packer/README.md +++ b/docs/specs/packer/README.md @@ -52,6 +52,10 @@ Specs should normally be fed by: If a spec edit would require guessing an unresolved design choice, stop and surface the missing decision first. +## Integration Boundary + +The Packer package root is `p.packer`, and Packer remains autonomous from Studio. Studio consumes stable public Packer APIs directly and introduces a narrow consumer-owned gateway only for concrete, static, unstable, or infrastructure-specific integration. Packer never depends on `p.studio`. + ## Current Corpus The current packer core corpus is: diff --git a/docs/specs/studio/1. Studio Shell and Workspace Layout Specification.md b/docs/specs/studio/1. Studio Shell and Workspace Layout Specification.md index 5de9ba5a..d73e6496 100644 --- a/docs/specs/studio/1. Studio Shell and Workspace Layout Specification.md +++ b/docs/specs/studio/1. Studio Shell and Workspace Layout Specification.md @@ -57,11 +57,13 @@ The shell-level workspace host exists to mount independently authored workspaces Baseline workspace architecture rules are: - each workspace should have a composition root that mounts the workspace into the shell; +- the shell and workspace composition roots must receive neutral Studio API services through explicit constructor or factory injection; - a workspace composition root should coordinate workspace services, state orchestration, and structural sync, but it should not own every local render path directly; - project-session services that must survive workspace focus changes should be owned above individual workspace focus lifecycles and then consumed by workspace composition roots; - event-observing workspace controls must be lifecycle-managed; - workspace-local updates should flow through the Studio event system rather than ad hoc imperative redraw chains; - future workspaces should consume shared Studio workspace framework primitives where those primitives already cover the needed behavior. +- shell and workspace code must not resolve application services through a static container or Spring application-context lookup. The shell must not encourage a workspace model where every interaction falls back to whole-workspace refresh. diff --git a/docs/specs/studio/2. Studio UI Foundations Specification.md b/docs/specs/studio/2. Studio UI Foundations Specification.md index 64f6bc6a..482412d0 100644 --- a/docs/specs/studio/2. Studio UI Foundations Specification.md +++ b/docs/specs/studio/2. Studio UI Foundations Specification.md @@ -73,13 +73,14 @@ Propagation rules: - propagation is workspace to global; - global-to-workspace rebroadcast is not baseline behavior. -The global Studio bus is backed by a typed event bus reference owned by the Studio application container. +The global Studio bus is a JavaFX-adapter facility created by the application composition root and injected into the UI factory. -Container rules: +Composition rules: -- the Studio `Container` owns the global typed event bus reference used by `StudioEventBus`; -- host-integrated services that need shared Studio operational visibility should receive that container-owned typed event bus reference during bootstrap instead of allocating disconnected local buses; -- the `Container` must be initialized during Studio boot before packer-backed integration services, workspaces, or adapters begin use. +- `prometeu-app` owns construction and lifecycle of the shared UI bus; +- UI composition roots receive the bus explicitly and workspace buses derive from that injected instance; +- host integrations publish neutral application facts through their owning API boundary and may be adapted to UI events at the JavaFX edge; +- `p.studio.Container`, Spring context lookup, or another static service locator must not participate in event access. This topology exists so callers do not need to duplicate publication decisions manually. @@ -98,6 +99,8 @@ Illustrative baseline categories include: - diagnostics update events; - asset selection events. +Selection, navigation, attach/detach, edit scope, and presentation refresh are UI-local event categories. Application facts such as execution state, build results, runtime state, and asset operation results belong to neutral API contracts owned by their functional module and must not be defined only as JavaFX events. + For project bootstrap and splash/loading integration, the Studio event catalog should reserve typed events for: - project loading started; diff --git a/docs/specs/studio/3. Studio Components Module Specification.md b/docs/specs/studio/3. Studio Components Module Specification.md index 0cdd24f6..db82fbe2 100644 --- a/docs/specs/studio/3. Studio Components Module Specification.md +++ b/docs/specs/studio/3. Studio Components Module Specification.md @@ -1,169 +1,66 @@ -# Studio Components Module Specification +# Studio JavaFX Components Boundary Specification -Status: Draft -Scope: `prometeu-studio-components` role, admission policy, and JavaFX wrapping boundary -Purpose: Define the authoritative visual control layer for the Studio. +## Status + +Active + +## Applies To + +- `prometeu-studio-ui-javafx` +- shared Studio controls and workspace-framework primitives +- JavaFX controls actively used by the Studio + +## Purpose + +Define the visual component boundary inside the JavaFX adapter without creating a second application or domain layer. ## Authority and Precedence -This specification consolidates the accepted Studio components module decision into normative form. - -## Normative Inputs - -- `prometeu-studio-components` -- Studio shell and workspace UI needs -- JavaFX controls actively used by the Studio +This specification is subordinate to [`9. Studio Core and Adapter Architecture Specification.md`](9.%20Studio%20Core%20and%20Adapter%20Architecture%20Specification.md). ## Core Rules -1. `prometeu-studio-components` is the official visual control module for Studio UI. -2. Studio UI should normally consume visual controls from `prometeu-studio-components`, not directly from raw JavaFX. -3. A control enters the module when it is needed by the current Studio UI wave. -4. Controls in the module wrap and shape the JavaFX controls the Studio actively uses, but do not clone the full JavaFX API. -5. Every admitted control must preserve theme and i18n compatibility. -6. Reusable event-driven workspace controls should be admitted when they are part of the active Studio workspace framework. +1. Reusable Studio visual controls belong to `prometeu-studio-ui-javafx`. +2. The JavaFX adapter may organize reusable controls by shell, forms, banks, lifecycle, navigation, feedback, and inspection roles. +3. A control is admitted when it has an immediate Studio consumer; speculative mirroring of JavaFX is forbidden. +4. Shared controls must preserve theme, localization, and explicit visual-state behavior. +5. Controls that observe UI events must expose predictable attach/detach or subscribe/unsubscribe lifecycle behavior. +6. Visual controls must depend on neutral Studio API contracts, not core or provider implementations. +7. Domain rules, application orchestration, filesystem workflows, compiler/Packer/LSP/runtime calls, and Spring composition do not belong in the visual component layer. -## Module Role +## JavaFX Wrapping Boundary -`prometeu-studio-components` is: +The Studio may use raw JavaFX for trivial local composition. A reusable control should expose the Studio-facing API actually needed instead of cloning the complete upstream JavaFX surface. -- the authoritative Studio control layer; -- the home of the Studio visual dialect; -- the place where Studio-facing controls are shaped for Studio use; -- the preferred home for reusable lifecycle-aware workspace controls when those controls are part of the visible Studio UI dialect. +Shared controls may include: -`prometeu-studio-components` is not: +- shell and action controls; +- workspace rails and hosts; +- form sections and action bars; +- list, tree, inspector, and dual-list surfaces; +- activity, progress, badges, headers, and feedback controls; +- lifecycle-managed visual primitives. -- a speculative generic framework; -- a full reimplementation of JavaFX; -- a dumping ground for unrelated non-visual infrastructure. +## Construction and Lifecycle -## Admission Policy +Controls, rows, dialogs, and views MUST NOT be Spring singletons by default. A Spring-managed JavaFX composition factory may create them with explicit constructor dependencies. -A control is admissible when it is needed by the current Studio UI work. +Controls that attach event subscriptions MUST release them when detached. UI-local events may coordinate selection, navigation, editing scope, attach/detach, and presentation refresh. Request/response application behavior MUST use injected Studio API services directly. -Rules: +## State Boundary -- immediate current Studio use is sufficient justification; -- a second use is not required when the control is clearly part of the shell or the current workspace surface; -- no control should be added without an immediate Studio consumer. -- a control needed first by one workspace may still be admitted when it is clearly intended as a reusable Studio workspace primitive. +Presentation-only view models, form drafts, selection state, and formatting helpers may live beside JavaFX controls when they do not determine domain outcomes. -## Studio Usage Rule - -The baseline Studio UI should not rely on raw JavaFX controls as its normal visual surface. - -Rules: - -- a visual control used by Studio should normally come from `prometeu-studio-components`; -- extremely trivial local composition may stay in `prometeu-studio`; -- local exceptions must remain exceptional rather than becoming the default path. - -## Wrapping Boundary - -Controls in `prometeu-studio-components` must wrap the JavaFX controls the Studio actively uses. - -Rules: - -- the Studio-layer control should expose the Studio-facing API actually needed; -- exhaustive mirroring of upstream JavaFX APIs is not required; -- the goal is consistency and clarity, not a perfect one-to-one mirror of every JavaFX type. - -## Control Lifecycle Hooks - -Studio controls may need to observe event buses or other external state. - -Rules: - -- the control layer must provide explicit subscribe and unsubscribe lifecycle methods that can be overridden when needed; -- the control layer should also provide `onAttached()` and `onDetached()` lifecycle hooks; -- `onAttached()` should call `subscribe()`; -- `onDetached()` should call `unsubscribe()`; -- controls that attach subscriptions must also define how those subscriptions are released; -- event-driven controls must not hide subscription lifecycle completely inside ad hoc local wiring. - -These hooks exist so event-driven controls remain predictable and safe to embed in shell and workspace UI. - -## Reusable Workspace Primitives - -Some reusable controls are not shell-only and are not domain-specific either. - -They may still belong in `prometeu-studio-components` when they are part of the visible Studio workspace framework. - -Illustrative admissible examples include: - -- projection hosts for list/tree/detail surfaces; -- lifecycle-managed row or item controls; -- reusable section or inspector surfaces; -- visible controls that encode local-patch versus structural-sync interaction patterns. - -What does not belong here: - -- workspace-specific orchestration logic; -- domain-specific service calls; -- hidden coordination code with no visible control responsibility. - -## Typical Control Scope - -Typical controls that belong in the module include: - -- shell controls; -- action controls and buttons; -- tab systems; -- tree and list controls; -- inspector and panel surfaces; -- activity and feedback surfaces; -- badges, headers, and related Studio primitives. - -What stays outside the module: - -- workspace-specific composition logic; -- non-visual domain behavior; -- speculative controls with no immediate Studio consumer. - -## Theme and i18n - -Every admitted control must support: - -- CSS-based theming; -- safe locale-aware text behavior when text is exposed; -- no hardcoded user-facing text; -- explicit visual states where state matters. - -## Organization Guidance - -The module should be organized by Studio role rather than vague technical buckets. - -Illustrative areas include: - -- shell; -- actions; -- navigation; -- feedback; -- inspection; -- trees. - -## Anti-Bloat Rule - -The module must remain: - -- intentional; -- Studio-driven; -- small enough to reason about; -- broad enough to prevent UI entropy in the application. +Non-visual policies and workflows that determine asset validity, capacity, metadata, build, runtime, project, or semantic results MUST live behind `prometeu-studio-api` and be implemented by `prometeu-studio-core` or an explicit infrastructure adapter. ## Non-Goals -- defining the first concrete component set in full detail -- defining final package layout exhaustively -- mirroring the entire JavaFX control hierarchy -- storing domain-specific workspace orchestration code in the components module +- creating a standalone `prometeu-studio-components` Gradle module; +- wrapping the full JavaFX API; +- storing workspace business logic in controls; +- using Spring as a registry for each visual object; +- defining components for a future web UI. ## Exit Criteria -This specification is complete enough when: - -- the module role is unambiguous; -- admission rules are stable enough to guide implementation; -- reusable workspace-control admission is clear enough to prevent local reimplementation drift; -- the JavaFX wrapping boundary is clear enough to prevent drift. +This specification is satisfied when reusable JavaFX controls have clear visual ownership, explicit lifecycle behavior, neutral injected dependencies, and no application or provider implementation responsibilities. diff --git a/docs/specs/studio/4. Assets Workspace Specification.md b/docs/specs/studio/4. Assets Workspace Specification.md index 29ac5444..57656b6b 100644 --- a/docs/specs/studio/4. Assets Workspace Specification.md +++ b/docs/specs/studio/4. Assets Workspace Specification.md @@ -6,7 +6,10 @@ Active ## Applies To -- `prometeu-studio` +- `prometeu-studio-api` +- `prometeu-studio-core` +- `prometeu-studio-ui-javafx` +- `prometeu-app` - the Studio `Assets` workspace - packer-facing Studio service integration for asset browsing, inspection, diagnostics, and staged mutations @@ -29,6 +32,7 @@ This specification extends: - [`1. Studio Shell and Workspace Layout Specification.md`](1.%20Studio%20Shell%20and%20Workspace%20Layout%20Specification.md) - [`2. Studio UI Foundations Specification.md`](2.%20Studio%20UI%20Foundations%20Specification.md) - [`3. Studio Components Module Specification.md`](3.%20Studio%20Components%20Module%20Specification.md) +- [`9. Studio Core and Adapter Architecture Specification.md`](9.%20Studio%20Core%20and%20Adapter%20Architecture%20Specification.md) For packer-facing semantics, this specification must align with: @@ -52,7 +56,7 @@ The workspace must assume: - diagnostics, activity, progress, and staged mutation responses are available from Studio-facing services; - packer-facing operational freshness may surface states such as `healthy`, `stale`, `diverged`, `reconciling`, or `failed`. -Packer-backed operational events consumed by this workspace are expected to enter Studio through the container-owned typed event bus path rather than through workspace-local ad hoc bus creation. +The JavaFX workspace must consume neutral Studio asset contracts. Stable public Packer APIs are consumed by Studio Core where appropriate; Packer bootstrap and concrete integration remain in `prometeu-app`. Packer-backed application facts may be projected into UI-local events at the JavaFX edge, but the workspace must not call Packer directly or create an ad hoc provider integration. ## Workspace Model @@ -100,6 +104,7 @@ The `Assets` workspace must be implemented as a composition root plus lifecycle- Rules: - the workspace root should coordinate service calls, workspace state, and structural synchronization; +- service calls must target injected `prometeu-studio-api` contracts; domain workflows and filesystem orchestration must not be implemented by the workspace root; - the workspace root should not own the render and update path of every navigator row, details section, and form control directly; - the navigator host, asset rows, selected-asset details host, and details-internal sections/forms should subscribe only to the events and state they consume; - event-consuming controls must subscribe only while mounted in the UI tree; diff --git a/docs/specs/studio/8. Project-Local Studio State Specification.md b/docs/specs/studio/8. Project-Local Studio State Specification.md index 3f50d8ff..db6d3f2a 100644 --- a/docs/specs/studio/8. Project-Local Studio State Specification.md +++ b/docs/specs/studio/8. Project-Local Studio State Specification.md @@ -6,7 +6,10 @@ Active ## Applies To -- `prometeu-studio` +- `prometeu-studio-api` +- `prometeu-studio-core` +- `prometeu-studio-ui-javafx` +- `prometeu-app` - Studio project-session persistence under `.studio/` - project-local Studio session restoration state - project-local Studio setup configuration @@ -26,7 +29,7 @@ It extends: ## Core Rules 1. The canonical root for project-local Studio persistence MUST be `.studio/` in the project root. -2. The main project-local Studio session-restoration store MUST be owned by `StudioProjectSession`, or by a service explicitly owned by `StudioProjectSession`. +2. The main project-local Studio session-restoration store MUST be owned by the neutral project-session boundary, implemented in `p.studio.core.session` or by a project service explicitly composed into that session. 3. The main session-restoration store MUST remain a single file at `.studio/state.json`. 4. The main session-restoration store MUST be versioned. 5. The main session-restoration store MUST load when the project session opens. diff --git a/docs/specs/studio/9. Studio Core and Adapter Architecture Specification.md b/docs/specs/studio/9. Studio Core and Adapter Architecture Specification.md new file mode 100644 index 00000000..d8a6f806 --- /dev/null +++ b/docs/specs/studio/9. Studio Core and Adapter Architecture Specification.md @@ -0,0 +1,159 @@ +# Studio Core and Adapter Architecture Specification + +## Status + +Active + +## Applies To + +- `prometeu-studio-api` +- `prometeu-studio-core` +- `prometeu-studio-ui-javafx` +- `prometeu-app` +- integrations with compiler, Packer, LSP, and the runtime + +## Purpose + +Define the physical and functional boundary that makes the Studio consumable by interchangeable human and automation adapters without coupling application behavior to JavaFX, Spring, or a specific external provider. + +## Authority and Precedence + +This specification implements `DEC-0059` and is the normative architecture reference for the Studio split. More specific domain specs may refine behavior, but they MUST preserve the dependency direction defined here. + +## Architectural Model + +The Studio is a set of project and tooling services consumed by adapters: + +```text +JavaFX UI ──> Studio API <── future non-visual adapters + │ + ▼ + Studio Core + ▲ + │ + application/infrastructure adapters +``` + +JavaFX is the current human adapter. A future agent surface is not part of this specification, but MUST be able to consume the same neutral services instead of simulating UI interaction. + +## Physical Modules + +1. `prometeu-studio-api` MUST contain toolkit-neutral contracts, commands, queries, DTOs, diagnostics, results, events, and operation contracts. +2. `prometeu-studio-core` MUST contain JavaFX-free application services, sessions, policies, orchestration, and Studio-owned use-case implementations. +3. `prometeu-studio-ui-javafx` MUST contain visual workspaces, controls, dialogs, bindings, navigation, presentation projections, theme application, localization binding, and JavaFX-thread dispatch. +4. `prometeu-app` MUST contain the desktop entry point, Spring composition, concrete integration adapters, lifecycle, and packaging. + +Gradle is the physical classpath boundary. Spring Modulith verifies the functional modules rooted exclusively at `p.studio.core`; it does not replace the Gradle modules. + +The legacy mixed `prometeu-studio` module and the static `p.studio.Container` service locator MUST NOT exist in the final architecture. + +## API Neutrality + +The public Studio API MUST be plain Java and MUST NOT depend on: + +- JavaFX; +- Spring Framework, Spring Boot, or Spring Modulith; +- AI, MCP, or provider SDKs; +- concrete compiler, Packer, LSP, or runtime implementations; +- `p.studio.core` or `p.studio.ui.javafx` internals. + +Public contracts MUST NOT expose `Stage`, `Scene`, `Node`, JavaFX properties, controls, `Task`, `ApplicationContext`, Spring events, or provider-specific implementation types. + +Expected failures MUST use domain status, diagnostics, and typed results. A universal `Result` abstraction MUST NOT be introduced. + +## Core Rules + +Core classes MUST be POJOs with constructor injection and MUST remain testable without a Spring context. + +The core module MUST NOT: + +- depend on JavaFX or UI packages; +- call `Platform.runLater`; +- perform navigation or workspace selection; +- use presentation severity or visual state as domain semantics; +- obtain dependencies from a static holder or `ApplicationContext` lookup. + +The functional core modules are: + +- `project`: project identity, catalog, creation, paths, setup, and restoration state; +- `session`: open-project lifecycle, ordered cleanup, execution ownership, and the LSP lifecycle port; +- `assets`: Studio-owned asset projections, metadata, policies, non-visual sessions, validation, and workflow orchestration; +- `shipper`: build/pack coordination, manifest generation, artifacts, and neutral logs/results; +- `runtime`: runtime settings, handshake, process/client lifecycle, and technical logs; +- `execution`: play/stop state, cancellation, shutdown, and orchestration of shipper and runtime. + +The functional dependency direction MUST remain: + +```text +assets --> project +shipper --> project +runtime --> project +execution --> project, shipper, runtime +session --> project, execution, LSP port +``` + +## JavaFX Adapter Rules + +The JavaFX module MUST depend on Studio API contracts rather than core or provider implementations. It owns visual state, UI events, navigation, FX-thread transitions, CSS, fonts, locale bindings, and lifecycle of visual objects. + +JavaFX controls and dialogs MUST be constructed by UI factories or composition roots. They MUST NOT become Spring singletons by default. + +Presentation-only drafts and projections MAY remain in the JavaFX module. Rules that determine project, asset, build, runtime, or semantic outcomes MUST live behind neutral API contracts and core services. + +The JavaFX module MUST NOT directly invoke compiler implementations, `p.packer`, LSP implementations, runtime implementations, or filesystem orchestration. + +## Spring Composition + +Spring Boot MUST be used only by `prometeu-app` as a non-web composition and lifecycle mechanism. The application MUST start with `WebApplicationType.NONE` or an equivalent guarantee and MUST NOT introduce Spring Web, WebFlux, Data, AI, durable events, or a web server without a later accepted decision. + +Spring configuration MAY create core services, infrastructure adapters, and a JavaFX composition factory. It MUST NOT use field injection, context lookup, broad service bags, or a replacement static container. + +The desktop entry point MUST retain the JavaFX composition root and close it before closing the Spring context. Closing that root MUST be idempotent and MUST close any active or asynchronously opening project session, execution surface, loading window, project window, and launcher window before provider beans and executors are destroyed. + +Spring Modulith verification MUST use `p.studio.core` as its exclusive application root and MUST run as an architecture gate. + +## External Integration Rule + +An integration MUST use the provider's public API directly when that API is stable, neutral, use-case oriented, and safe to compose and test. A redundant gateway that merely mirrors such an API MUST NOT be created. + +A narrow consumer-owned gateway MUST be used when the available integration is concrete, static, infrastructure-oriented, unstable, excessively broad, or leaks lifecycle and implementation details. Its implementation belongs in `prometeu-app` or another explicit infrastructure adapter. + +| Studio consumer | Provider | Required boundary | +| --- | --- | --- | +| `assets` | `p.packer` | Stable public Packer API directly; narrow assets-owned gateway only when necessary | +| `shipper` | compiler and `p.packer` | Stable public APIs or a narrow shipper-owned compiler gateway | +| `session` | LSP | Neutral session-owned lifecycle port | +| `runtime` | external runtime/process | Narrow runtime-owned gateway | +| JavaFX UI | Studio | Studio API only | + +`p.packer` remains an autonomous domain and MUST NOT depend on any `p.studio` package. Studio MUST NOT copy or assume ownership of Packer semantics. + +## Commands, Events, and Operations + +Commands and queries requiring an immediate response MUST use direct service calls. In-process events MAY communicate facts that require no response, and each application event MUST be owned by the functional module that owns the fact. + +Selection, navigation, attach/detach, and visual lifecycle events remain UI-local. + +Long-running build, pack, runtime, and execution work MUST expose a neutral operation contract with stable identity, observable snapshot, standard-Java asynchronous completion, cancellation, updates, and a typed result. + +Core services MUST submit such work through the neutral `OperationExecutor` port. `prometeu-app` owns the executor-backed implementation and its thread lifecycle; JavaFX consumes `OperationHandle` completion and snapshots and performs only the required FX-thread projection. + +## Conformance Gates + +The architecture is conformant only when all of the following hold together: + +- API and core compile without JavaFX or Spring dependencies; +- UI has no dependency on core or concrete external providers; +- `ApplicationModules.verify()` succeeds for the exclusive `p.studio.core` root; +- the application boots and shuts down in non-web mode; +- `Container`, `AppContainer`, compatibility allowlists, and the mixed module are absent; +- unit, integration, architecture, packaging, and desktop smoke tests pass; +- no service locator or context lookup replaces the removed static container. + +## Non-Goals + +- creating an agent or MCP module; +- replacing JavaFX with a web UI; +- migrating the Studio to Rust, Electron, Tauri, or a parallel rewrite; +- redesigning compiler, Packer, LSP, or runtime semantics; +- introducing microservices or durable event infrastructure. diff --git a/docs/specs/studio/README.md b/docs/specs/studio/README.md index affec2d3..d3b02240 100644 --- a/docs/specs/studio/README.md +++ b/docs/specs/studio/README.md @@ -55,6 +55,7 @@ The current Studio core corpus is: 3. [`3. Studio Components Module Specification.md`](3.%20Studio%20Components%20Module%20Specification.md) 4. [`4. Assets Workspace Specification.md`](4.%20Assets%20Workspace%20Specification.md) 5. [`8. Project-Local Studio State Specification.md`](8.%20Project-Local%20Studio%20State%20Specification.md) +6. [`9. Studio Core and Adapter Architecture Specification.md`](9.%20Studio%20Core%20and%20Adapter%20Architecture%20Specification.md) ## Reading Order @@ -64,7 +65,8 @@ Recommended order: 2. shared UI foundations; 3. components module policy; 4. assets workspace behavior; -5. project-local Studio state behavior. +5. project-local Studio state behavior; +6. Studio Core, adapter, composition, and external integration boundaries. ## Current Wave Notes @@ -75,3 +77,6 @@ Normative reminders: - the active Studio workspace corpus is `Assets`, `Debug`, and `Shipper`; - project-local Studio session state remains normative and is owned by `StudioProjectSession`; - any future external-editor backend or replacement language-service architecture requires a new accepted decision before new Studio specs are introduced. +- the Studio backend is exposed through neutral API contracts shared by the JavaFX adapter and future non-visual adapters; +- Spring Boot is a non-web composition root, while Spring Modulith verifies the JavaFX-free `p.studio.core` boundary; +- `p.studio.Container`, `AppContainer`, and the mixed `prometeu-studio` module are not valid final architecture. diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 097bd713..e55198f6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,6 +8,8 @@ junit-jupiter = "5.12.1" archunit = "1.4.2" slf4j = "2.0.7" lsp4j = "1.0.0" +spring-boot = "3.5.16" +spring-modulith = "1.4.13" [libraries] javafx-controls = { group = "org.openjfx", name = "javafx-controls", version.ref = "javafx" } @@ -24,6 +26,9 @@ archunit-junit5 = { group = "com.tngtech.archunit", name = "archunit-junit5", ve slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" } slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" } lsp4j = { group = "org.eclipse.lsp4j", name = "org.eclipse.lsp4j", version.ref = "lsp4j" } +spring-boot = { group = "org.springframework.boot", name = "spring-boot", version.ref = "spring-boot" } +spring-modulith-core = { group = "org.springframework.modulith", name = "spring-modulith-core", version.ref = "spring-modulith" } +spring-modulith-docs = { group = "org.springframework.modulith", name = "spring-modulith-docs", version.ref = "spring-modulith" } [plugins] javafx = { id = "org.openjfx.javafxplugin", version = "0.1.0" } diff --git a/prometeu-app/build.gradle.kts b/prometeu-app/build.gradle.kts index 8338bc9a..56dde4e9 100644 --- a/prometeu-app/build.gradle.kts +++ b/prometeu-app/build.gradle.kts @@ -7,16 +7,21 @@ dependencies { implementation(project(":prometeu-infra")) implementation(project(":prometeu-lsp:prometeu-lsp-api")) implementation(project(":prometeu-lsp:prometeu-lsp-v1")) + implementation(project(":prometeu-compiler:prometeu-compiler-core")) + implementation(project(":prometeu-compiler:prometeu-build-pipeline")) implementation(project(":prometeu-compiler:prometeu-frontend-registry")) implementation(project(":prometeu-packer:prometeu-packer-api")) implementation(project(":prometeu-packer:prometeu-packer-v1")) - implementation(project(":prometeu-studio")) + implementation(project(":prometeu-studio-api")) + implementation(project(":prometeu-studio-core")) + implementation(project(":prometeu-studio-ui-javafx")) + implementation(libs.spring.boot) implementation(libs.javafx.controls) implementation(libs.javafx.fxml) } application { - mainClass = "p.studio.App" + mainClass = "p.studio.app.StudioLauncher" } javafx { diff --git a/prometeu-app/src/main/java/p/studio/App.java b/prometeu-app/src/main/java/p/studio/App.java deleted file mode 100644 index f4233600..00000000 --- a/prometeu-app/src/main/java/p/studio/App.java +++ /dev/null @@ -1,29 +0,0 @@ -package p.studio; - -import javafx.application.Application; -import javafx.stage.Stage; -import p.studio.window.StudioWindowCoordinator; - -public class App extends Application { - - @Override - public void init() throws Exception { - super.init(); - Container.install(new AppContainer()); - } - - @Override - public void start(Stage stage) { - new StudioWindowCoordinator(stage).showLauncher(); - } - - @Override - public void stop() throws Exception { - Container.shutdown(); - super.stop(); - } - - public static void main(String[] args) { - launch(); - } -} diff --git a/prometeu-app/src/main/java/p/studio/AppContainer.java b/prometeu-app/src/main/java/p/studio/AppContainer.java deleted file mode 100644 index a73d0b74..00000000 --- a/prometeu-app/src/main/java/p/studio/AppContainer.java +++ /dev/null @@ -1,91 +0,0 @@ -package p.studio; - -import com.fasterxml.jackson.databind.ObjectMapper; -import p.packer.Packer; -import p.studio.compiler.FrontendRegistryService; -import p.studio.lsp.api.LspServerLifecycle; -import p.studio.lsp.events.StudioEventBus; -import p.studio.lsp.events.StudioPackerEventAdapter; -import p.studio.lsp.services.LspServerLifecycleImpl; -import p.studio.utilities.ThemeService; -import p.studio.utilities.i18n.I18nService; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.atomic.AtomicInteger; - -public final class AppContainer implements Container { - private final I18nService i18nService; - private final ThemeService themeService; - private final StudioEventBus studioEventBus; - private final ObjectMapper mapper; - private final EmbeddedPacker embeddedPacker; - private final StudioBackgroundTasks backgroundTasks; - private final LspServerLifecycle lspServerLifecycle; - - public AppContainer() { - FrontendRegistryService.bootstrapDefaults(); - this.i18nService = new I18nService(); - this.themeService = new ThemeService(); - this.studioEventBus = new StudioEventBus(); - this.mapper = new ObjectMapper(); - final ExecutorService backgroundExecutor = Executors.newFixedThreadPool(2, new StudioWorkerThreadFactory()); - this.backgroundTasks = new StudioBackgroundTasks(backgroundExecutor); - final Packer packer = Packer.bootstrap(this.mapper, new StudioPackerEventAdapter(studioEventBus)); - this.embeddedPacker = new EmbeddedPacker(packer.workspaceService(), packer::close); - this.lspServerLifecycle = new LspServerLifecycleImpl(); - } - - @Override - public I18nService getI18n() { - return i18nService; - } - - @Override - public ThemeService getTheme() { - return themeService; - } - - @Override - public StudioEventBus getEventBus() { - return studioEventBus; - } - - @Override - public ObjectMapper getMapper() { - return mapper; - } - - @Override - public EmbeddedPacker getPacker() { - return embeddedPacker; - } - - @Override - public StudioBackgroundTasks getBackgroundTasks() { - return backgroundTasks; - } - - @Override - public p.studio.lsp.api.LspServerLifecycle getLspServerLifecycle() { - return lspServerLifecycle; - } - - @Override - public void shutdownContainer() { - embeddedPacker.shutdown(); - backgroundTasks.shutdown(); - } - - private static final class StudioWorkerThreadFactory implements ThreadFactory { - private final AtomicInteger nextId = new AtomicInteger(1); - - @Override - public Thread newThread(Runnable runnable) { - final Thread thread = new Thread(runnable, "studio-worker-" + nextId.getAndIncrement()); - thread.setDaemon(true); - return thread; - } - } -} diff --git a/prometeu-app/src/main/java/p/studio/app/App.java b/prometeu-app/src/main/java/p/studio/app/App.java new file mode 100644 index 00000000..8a76e33e --- /dev/null +++ b/prometeu-app/src/main/java/p/studio/app/App.java @@ -0,0 +1,63 @@ +package p.studio.app; + +import javafx.application.Application; +import javafx.stage.Stage; +import org.springframework.boot.WebApplicationType; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.context.ConfigurableApplicationContext; +import p.studio.ui.javafx.window.StudioWindowCoordinator; + +public class App extends Application { + private ConfigurableApplicationContext applicationContext; + private StudioWindowCoordinator studioWindowCoordinator; + + @Override + public void init() throws Exception { + super.init(); + applicationContext = new SpringApplicationBuilder(StudioApplicationConfiguration.class) + .web(WebApplicationType.NONE) + .headless(false) + .run(); + } + + @Override + public void start(Stage stage) { + studioWindowCoordinator = applicationContext.getBean(StudioUiFactory.class).create(stage); + studioWindowCoordinator.showLauncher(); + } + + @Override + public void stop() throws Exception { + Exception failure = null; + try { + if (studioWindowCoordinator != null) { + studioWindowCoordinator.close(); + } + } catch (RuntimeException exception) { + failure = exception; + } + try { + if (applicationContext != null) { + applicationContext.close(); + } + } catch (RuntimeException exception) { + failure = append(failure, exception); + } + try { + super.stop(); + } catch (Exception exception) { + failure = append(failure, exception); + } + if (failure != null) { + throw failure; + } + } + + private static Exception append(Exception prior, Exception failure) { + if (prior == null) { + return failure; + } + prior.addSuppressed(failure); + return prior; + } +} diff --git a/prometeu-app/src/main/java/p/studio/app/StudioApplicationConfiguration.java b/prometeu-app/src/main/java/p/studio/app/StudioApplicationConfiguration.java new file mode 100644 index 00000000..ccf134b8 --- /dev/null +++ b/prometeu-app/src/main/java/p/studio/app/StudioApplicationConfiguration.java @@ -0,0 +1,308 @@ +package p.studio.app; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import p.packer.PackerWorkspaceService; +import p.studio.api.project.KnownProjects; +import p.studio.api.assets.AssetCatalog; +import p.studio.api.assets.AssetCommands; +import p.studio.api.assets.AssetPacking; +import p.studio.api.assets.AssetDetails; +import p.studio.api.assets.AssetCreationCatalog; +import p.studio.api.assets.AssetWorkspaceStorage; +import p.studio.api.assets.AssetCapacityPolicy; +import p.studio.api.assets.schema.AssetColorSchemaFactory; +import p.studio.api.assets.bank.AssetBankCompositionSessionFactory; +import p.studio.api.assets.metadata.AssetMetadataService; +import p.studio.core.assets.PackerAssetCatalog; +import p.studio.core.assets.PackerAssetCommands; +import p.studio.core.assets.PackerAssetPacking; +import p.studio.core.assets.PackerAssetDetails; +import p.studio.core.assets.PackerAssetCreationCatalog; +import p.studio.core.assets.FileSystemAssetWorkspaceStorage; +import p.studio.core.assets.DefaultAssetCapacityPolicy; +import p.studio.core.assets.schema.DefaultAssetColorSchemaFactory; +import p.studio.core.assets.bank.DefaultAssetBankCompositionSessionFactory; +import p.studio.core.assets.metadata.AssetStudioMetadataService; +import p.studio.api.assets.scene.SceneBankWorkflow; +import p.studio.api.assets.tiled.TiledAssetService; +import p.studio.core.assets.scene.SceneBankWorkflowService; +import p.studio.core.assets.tiled.TiledAssetGenerationService; +import p.studio.api.project.ProjectCatalog; +import p.studio.api.project.ProjectLanguageCatalog; +import p.studio.app.compiler.CompilerProjectLanguageCatalog; +import p.studio.app.compiler.CompilerBuildGatewayAdapter; +import p.studio.api.shipper.Shipper; +import p.studio.core.shipper.CompilerBuildGateway; +import p.studio.core.shipper.StudioShipperService; +import p.studio.core.project.KnownProjectsService; +import p.studio.core.project.ProjectCatalogService; +import p.studio.core.project.ProjectLocalStudioSetupStore; +import p.studio.core.project.ProjectLocalStudioStateStore; +import p.studio.api.project.ProjectWorkspaceInitializer; +import p.studio.core.project.PackerProjectWorkspaceInitializer; +import p.studio.api.session.ProjectSessionFactory; +import p.studio.app.lsp.LspLifecycleAdapter; +import p.studio.core.session.DefaultProjectSessionFactory; +import p.studio.core.session.LspLifecyclePort; +import p.studio.lsp.api.LspServerLifecycle; +import p.studio.lsp.services.LspServerLifecycleImpl; +import p.studio.ui.javafx.events.StudioEventBus; +import p.studio.ui.javafx.utilities.ThemeService; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.packer.Packer; +import p.studio.compiler.FrontendRegistryService; +import p.studio.api.execution.ExecutionControllerFactory; +import p.studio.app.runtime.ExternalRuntimeGateway; +import p.studio.core.execution.DefaultExecutionControllerFactory; +import p.studio.core.runtime.RuntimeGateway; +import p.studio.api.preferences.WindowStateStore; +import p.studio.core.project.preferences.JsonWindowStateStore; +import p.studio.api.preferences.ProjectActivityHistoryStore; +import p.studio.core.project.preferences.JsonProjectActivityHistoryStore; +import p.studio.api.operation.OperationExecutor; +import p.studio.app.operation.ExecutorOperationExecutor; + +import java.nio.file.Path; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +@Configuration(proxyBeanMethods = false) +public class StudioApplicationConfiguration { + @Bean + ObjectMapper objectMapper() { + return new ObjectMapper(); + } + + @Bean + I18nService i18nService() { + return new I18nService(); + } + + @Bean + ThemeService themeService() { + return new ThemeService(); + } + + @Bean + StudioEventBus studioEventBus() { + return new StudioEventBus(); + } + + @Bean(destroyMethod = "close") + Packer packer(ObjectMapper mapper, StudioEventBus events) { + return Packer.bootstrap(mapper, new StudioPackerEventAdapter(events)); + } + + @Bean + PackerWorkspaceService packerWorkspaceService(Packer packer) { + return packer.workspaceService(); + } + + @Bean + AssetCatalog assetCatalog(PackerWorkspaceService packer) { + return new PackerAssetCatalog(packer); + } + + @Bean + AssetCommands assetCommands(PackerWorkspaceService packer) { + return new PackerAssetCommands(packer); + } + + @Bean + AssetPacking assetPacking(PackerWorkspaceService packer, OperationExecutor operations) { + return new PackerAssetPacking(packer, operations); + } + + @Bean + AssetDetails assetDetails(PackerWorkspaceService packer) { + return new PackerAssetDetails(packer); + } + + @Bean + AssetCreationCatalog assetCreationCatalog() { + return new PackerAssetCreationCatalog(); + } + + @Bean + AssetWorkspaceStorage assetWorkspaceStorage() { + return new FileSystemAssetWorkspaceStorage(); + } + + @Bean + AssetCapacityPolicy assetCapacityPolicy() { + return new DefaultAssetCapacityPolicy(); + } + + @Bean + AssetColorSchemaFactory assetColorSchemaFactory() { + return new DefaultAssetColorSchemaFactory(); + } + + @Bean + AssetBankCompositionSessionFactory assetBankCompositionSessionFactory(AssetCapacityPolicy capacityPolicy) { + return new DefaultAssetBankCompositionSessionFactory(capacityPolicy); + } + + @Bean + AssetMetadataService assetMetadataService(ObjectMapper mapper) { + return new AssetStudioMetadataService(mapper); + } + + @Bean + SceneBankWorkflow sceneBankWorkflow(AssetCatalog assetCatalog, ObjectMapper mapper) { + return new SceneBankWorkflowService(assetCatalog, mapper); + } + + @Bean + TiledAssetService tiledAssetService(AssetMetadataService metadataService) { + return new TiledAssetGenerationService(metadataService); + } + + @Bean + WindowStateStore windowStateStore(ObjectMapper mapper) { + return new JsonWindowStateStore(resolveWindowStateStorage(), mapper); + } + + @Bean + ProjectActivityHistoryStore projectActivityHistoryStore(ObjectMapper mapper) { + return new JsonProjectActivityHistoryStore(mapper); + } + + @Bean + CompilerBuildGateway compilerBuildGateway() { + return new CompilerBuildGatewayAdapter(); + } + + @Bean + Shipper shipper(CompilerBuildGateway compiler, PackerWorkspaceService packer, ObjectMapper mapper, + OperationExecutor operations) { + return new StudioShipperService(compiler, packer, mapper, operations); + } + + @Bean(destroyMethod = "shutdown") + ExecutorService studioExecutor() { + return Executors.newFixedThreadPool(4, Thread.ofPlatform().daemon().name("studio-worker-", 1).factory()); + } + + @Bean + OperationExecutor operationExecutor(ExecutorService studioExecutor) { + return new ExecutorOperationExecutor(studioExecutor); + } + + @Bean + RuntimeGateway runtimeGateway(ObjectMapper mapper, ExecutorService studioExecutor) { + return new ExternalRuntimeGateway(mapper, studioExecutor); + } + + @Bean + ExecutionControllerFactory executionControllerFactory(Shipper shipper, RuntimeGateway runtime, + OperationExecutor operations) { + return new DefaultExecutionControllerFactory(shipper, runtime, operations); + } + + @Bean + ProjectLocalStudioSetupStore projectLocalStudioSetupStore(ObjectMapper mapper) { + return new ProjectLocalStudioSetupStore(mapper); + } + + @Bean + ProjectLocalStudioStateStore projectLocalStudioStateStore(ObjectMapper mapper) { + return new ProjectLocalStudioStateStore(mapper); + } + + @Bean + LspServerLifecycle lspServerLifecycle() { + return new LspServerLifecycleImpl(); + } + + @Bean + LspLifecyclePort lspLifecyclePort(LspServerLifecycle lifecycle) { + return new LspLifecycleAdapter(lifecycle); + } + + @Bean + ProjectSessionFactory projectSessionFactory(ProjectLocalStudioStateStore stateStore, + ProjectLocalStudioSetupStore setupStore, LspLifecyclePort lsp) { + return new DefaultProjectSessionFactory(stateStore, setupStore, lsp); + } + + @Bean + ProjectCatalog projectCatalog(ObjectMapper mapper, ProjectLocalStudioSetupStore setupStore) { + return new ProjectCatalogService(resolveDefaultProjectsRoot(), mapper, setupStore); + } + + @Bean + KnownProjects knownProjects(ProjectCatalog projectCatalog) { + return new KnownProjectsService(resolveKnownProjectsStorage(), projectCatalog); + } + + @Bean + ProjectWorkspaceInitializer projectWorkspaceInitializer(PackerWorkspaceService packer) { + return new PackerProjectWorkspaceInitializer(packer); + } + + @Bean + ProjectLanguageCatalog projectLanguageCatalog() { + FrontendRegistryService.bootstrapDefaults(); + return new CompilerProjectLanguageCatalog(); + } + + @Bean + StudioUiFactory studioUiFactory( + ProjectCatalog projectCatalog, + KnownProjects knownProjects, + ProjectLanguageCatalog languageCatalog, + ProjectSessionFactory projectSessionFactory, + ExecutionControllerFactory executionControllerFactory, + ProjectWorkspaceInitializer projectWorkspaceInitializer, + ExecutorService studioExecutor, + I18nService i18n, + ThemeService theme, + StudioEventBus eventBus, + Shipper shipper, + AssetCatalog assetCatalog, + AssetCommands assetCommands, + AssetPacking assetPacking, + AssetDetails assetDetails, + AssetCreationCatalog assetCreationCatalog, + AssetMetadataService assetMetadataService, + AssetWorkspaceStorage assetWorkspaceStorage, + AssetCapacityPolicy assetCapacityPolicy, + AssetBankCompositionSessionFactory bankCompositionSessionFactory, + AssetColorSchemaFactory assetColorSchemaFactory, + TiledAssetService tiledAssetService, + SceneBankWorkflow sceneBankWorkflow, + WindowStateStore windowStateStore, + ProjectActivityHistoryStore activityHistoryStore) { + return new StudioUiFactory(projectCatalog, knownProjects, languageCatalog, projectSessionFactory, + executionControllerFactory, projectWorkspaceInitializer, studioExecutor, i18n, theme, eventBus, shipper, + assetCatalog, assetCommands, assetPacking, assetDetails, assetCreationCatalog, assetMetadataService, + assetWorkspaceStorage, assetCapacityPolicy, bankCompositionSessionFactory, assetColorSchemaFactory, + tiledAssetService, sceneBankWorkflow, windowStateStore, + activityHistoryStore); + } + + private static Path resolveDefaultProjectsRoot() { + Path cursor = Path.of(System.getProperty("user.dir")).toAbsolutePath().normalize(); + while (cursor != null) { + if (cursor.resolve("settings.gradle.kts").toFile().exists() + && cursor.resolve("test-projects").toFile().exists()) { + return cursor.resolve("test-projects"); + } + cursor = cursor.getParent(); + } + return Path.of("test-projects").toAbsolutePath().normalize(); + } + + private static Path resolveKnownProjectsStorage() { + return Path.of(System.getProperty("user.home"), ".prometeu-studio", "known-projects.txt") + .toAbsolutePath().normalize(); + } + + private static Path resolveWindowStateStorage() { + return Path.of(System.getProperty("user.home"), ".prometeu-studio", "window-state.json") + .toAbsolutePath().normalize(); + } +} diff --git a/prometeu-app/src/main/java/p/studio/app/StudioLauncher.java b/prometeu-app/src/main/java/p/studio/app/StudioLauncher.java new file mode 100644 index 00000000..8ca6ca55 --- /dev/null +++ b/prometeu-app/src/main/java/p/studio/app/StudioLauncher.java @@ -0,0 +1,12 @@ +package p.studio.app; + +import javafx.application.Application; + +public final class StudioLauncher { + private StudioLauncher() { + } + + public static void main(String[] args) { + Application.launch(App.class, args); + } +} diff --git a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioPackerEventAdapter.java b/prometeu-app/src/main/java/p/studio/app/StudioPackerEventAdapter.java similarity index 63% rename from prometeu-studio/src/main/java/p/studio/lsp/events/StudioPackerEventAdapter.java rename to prometeu-app/src/main/java/p/studio/app/StudioPackerEventAdapter.java index b4be5ac3..5969af8d 100644 --- a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioPackerEventAdapter.java +++ b/prometeu-app/src/main/java/p/studio/app/StudioPackerEventAdapter.java @@ -1,14 +1,17 @@ -package p.studio.lsp.events; +package p.studio.app; import p.packer.events.PackerEvent; import p.packer.events.PackerEventSink; +import p.studio.ui.javafx.events.StudioEventBus; +import p.studio.ui.javafx.events.StudioPackerOperationEvent; +import p.studio.ui.javafx.events.StudioPackerOperationKind; import java.util.Objects; -public final class StudioPackerEventAdapter implements PackerEventSink { +final class StudioPackerEventAdapter implements PackerEventSink { private final StudioEventBus eventBus; - public StudioPackerEventAdapter(StudioEventBus eventBus) { + StudioPackerEventAdapter(StudioEventBus eventBus) { this.eventBus = Objects.requireNonNull(eventBus, "eventBus"); } @@ -17,7 +20,7 @@ public final class StudioPackerEventAdapter implements PackerEventSink { final PackerEvent packerEvent = Objects.requireNonNull(event, "event"); eventBus.publish(new StudioPackerOperationEvent( packerEvent.operationId(), - packerEvent.kind(), + StudioPackerOperationKind.valueOf(packerEvent.kind().name()), packerEvent.summary(), packerEvent.progress() == null ? null : packerEvent.progress().value(), packerEvent.progress() == null || packerEvent.progress().indeterminate())); diff --git a/prometeu-app/src/main/java/p/studio/app/StudioUiFactory.java b/prometeu-app/src/main/java/p/studio/app/StudioUiFactory.java new file mode 100644 index 00000000..898eef58 --- /dev/null +++ b/prometeu-app/src/main/java/p/studio/app/StudioUiFactory.java @@ -0,0 +1,121 @@ +package p.studio.app; + +import javafx.stage.Stage; +import p.studio.api.assets.AssetCatalog; +import p.studio.api.assets.AssetCommands; +import p.studio.api.assets.AssetPacking; +import p.studio.api.assets.AssetDetails; +import p.studio.api.assets.AssetCreationCatalog; +import p.studio.api.assets.AssetWorkspaceStorage; +import p.studio.api.assets.AssetCapacityPolicy; +import p.studio.api.assets.schema.AssetColorSchemaFactory; +import p.studio.api.assets.bank.AssetBankCompositionSessionFactory; +import p.studio.api.assets.metadata.AssetMetadataService; +import p.studio.api.assets.scene.SceneBankWorkflow; +import p.studio.api.assets.tiled.TiledAssetService; +import p.studio.api.project.KnownProjects; +import p.studio.api.project.ProjectCatalog; +import p.studio.api.project.ProjectLanguageCatalog; +import p.studio.api.shipper.Shipper; +import p.studio.api.session.ProjectSessionFactory; +import p.studio.api.execution.ExecutionControllerFactory; +import p.studio.api.project.ProjectWorkspaceInitializer; +import p.studio.api.preferences.WindowStateStore; +import p.studio.api.preferences.ProjectActivityHistoryStore; +import p.studio.ui.javafx.window.StudioWindowCoordinator; + +import java.util.Objects; +import java.util.concurrent.Executor; +import p.studio.ui.javafx.utilities.ThemeService; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.ui.javafx.events.StudioEventBus; + +public final class StudioUiFactory { + private final ProjectCatalog projectCatalog; + private final KnownProjects knownProjects; + private final ProjectLanguageCatalog languageCatalog; + private final ProjectSessionFactory projectSessionFactory; + private final ExecutionControllerFactory executionControllerFactory; + private final ProjectWorkspaceInitializer projectWorkspaceInitializer; + private final Executor executor; + private final I18nService i18n; + private final ThemeService theme; + private final StudioEventBus eventBus; + private final Shipper shipper; + private final AssetCatalog assetCatalog; + private final AssetCommands assetCommands; + private final AssetPacking assetPacking; + private final AssetDetails assetDetails; + private final AssetCreationCatalog assetCreationCatalog; + private final AssetMetadataService assetMetadataService; + private final AssetWorkspaceStorage assetWorkspaceStorage; + private final AssetCapacityPolicy assetCapacityPolicy; + private final AssetBankCompositionSessionFactory bankCompositionSessionFactory; + private final AssetColorSchemaFactory assetColorSchemaFactory; + private final TiledAssetService tiledAssetService; + private final SceneBankWorkflow sceneBankWorkflow; + private final WindowStateStore windowStateStore; + private final ProjectActivityHistoryStore activityHistoryStore; + + public StudioUiFactory( + ProjectCatalog projectCatalog, + KnownProjects knownProjects, + ProjectLanguageCatalog languageCatalog, + ProjectSessionFactory projectSessionFactory, + ExecutionControllerFactory executionControllerFactory, + ProjectWorkspaceInitializer projectWorkspaceInitializer, + Executor executor, + I18nService i18n, + ThemeService theme, + StudioEventBus eventBus, + Shipper shipper, + AssetCatalog assetCatalog, + AssetCommands assetCommands, + AssetPacking assetPacking, + AssetDetails assetDetails, + AssetCreationCatalog assetCreationCatalog, + AssetMetadataService assetMetadataService, + AssetWorkspaceStorage assetWorkspaceStorage, + AssetCapacityPolicy assetCapacityPolicy, + AssetBankCompositionSessionFactory bankCompositionSessionFactory, + AssetColorSchemaFactory assetColorSchemaFactory, + TiledAssetService tiledAssetService, + SceneBankWorkflow sceneBankWorkflow, + WindowStateStore windowStateStore, + ProjectActivityHistoryStore activityHistoryStore) { + this.projectCatalog = Objects.requireNonNull(projectCatalog, "projectCatalog"); + this.knownProjects = Objects.requireNonNull(knownProjects, "knownProjects"); + this.languageCatalog = Objects.requireNonNull(languageCatalog, "languageCatalog"); + this.projectSessionFactory = Objects.requireNonNull(projectSessionFactory, "projectSessionFactory"); + this.executionControllerFactory = Objects.requireNonNull(executionControllerFactory, "executionControllerFactory"); + this.projectWorkspaceInitializer = Objects.requireNonNull(projectWorkspaceInitializer, "projectWorkspaceInitializer"); + this.executor = Objects.requireNonNull(executor, "executor"); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.theme = Objects.requireNonNull(theme, "theme"); + this.eventBus = Objects.requireNonNull(eventBus, "eventBus"); + this.shipper = Objects.requireNonNull(shipper, "shipper"); + this.assetCatalog = Objects.requireNonNull(assetCatalog, "assetCatalog"); + this.assetCommands = Objects.requireNonNull(assetCommands, "assetCommands"); + this.assetPacking = Objects.requireNonNull(assetPacking, "assetPacking"); + this.assetDetails = Objects.requireNonNull(assetDetails, "assetDetails"); + this.assetCreationCatalog = Objects.requireNonNull(assetCreationCatalog, "assetCreationCatalog"); + this.assetMetadataService = Objects.requireNonNull(assetMetadataService, "assetMetadataService"); + this.assetWorkspaceStorage = Objects.requireNonNull(assetWorkspaceStorage, "assetWorkspaceStorage"); + this.assetCapacityPolicy = Objects.requireNonNull(assetCapacityPolicy, "assetCapacityPolicy"); + this.bankCompositionSessionFactory = Objects.requireNonNull(bankCompositionSessionFactory, "bankCompositionSessionFactory"); + this.assetColorSchemaFactory = Objects.requireNonNull(assetColorSchemaFactory, "assetColorSchemaFactory"); + this.tiledAssetService = Objects.requireNonNull(tiledAssetService, "tiledAssetService"); + this.sceneBankWorkflow = Objects.requireNonNull(sceneBankWorkflow, "sceneBankWorkflow"); + this.windowStateStore = Objects.requireNonNull(windowStateStore, "windowStateStore"); + this.activityHistoryStore = Objects.requireNonNull(activityHistoryStore, "activityHistoryStore"); + } + + public StudioWindowCoordinator create(Stage stage) { + return new StudioWindowCoordinator(stage, projectCatalog, knownProjects, languageCatalog, projectSessionFactory, + executionControllerFactory, projectWorkspaceInitializer, executor, i18n, theme, eventBus, shipper, + assetCatalog, assetCommands, assetPacking, assetDetails, assetCreationCatalog, assetMetadataService, + assetWorkspaceStorage, assetCapacityPolicy, bankCompositionSessionFactory, assetColorSchemaFactory, + tiledAssetService, sceneBankWorkflow, windowStateStore, + activityHistoryStore); + } +} diff --git a/prometeu-app/src/main/java/p/studio/app/compiler/CompilerBuildGatewayAdapter.java b/prometeu-app/src/main/java/p/studio/app/compiler/CompilerBuildGatewayAdapter.java new file mode 100644 index 00000000..5f7852f0 --- /dev/null +++ b/prometeu-app/src/main/java/p/studio/app/compiler/CompilerBuildGatewayAdapter.java @@ -0,0 +1,25 @@ +package p.studio.app.compiler; + +import p.studio.api.project.ProjectReference; +import p.studio.compiler.messages.BuilderPipelineConfig; +import p.studio.compiler.models.BuilderPipelineContext; +import p.studio.compiler.workspaces.BuilderPipelineService; +import p.studio.core.shipper.CompilerBuildGateway; +import p.studio.utilities.logs.LogAggregator; + +import java.util.LinkedHashSet; +import java.util.function.Consumer; + +public final class CompilerBuildGatewayAdapter implements CompilerBuildGateway { + @Override + public CompilerBuildOutput compile(ProjectReference project, Consumer logSink) { + final var config = new BuilderPipelineConfig(false, project.rootPath().toString()); + final var result = BuilderPipelineService.INSTANCE.build( + BuilderPipelineContext.fromConfig(config), + LogAggregator.with(logSink)); + final var capabilities = new LinkedHashSet<>( + result.compileResult().analysisSnapshot().irBackend() + .getReservedMetadata().requiredCapabilities().asList()); + return new CompilerBuildOutput(result.bytecodeArtifactPath(), capabilities.stream().toList()); + } +} diff --git a/prometeu-app/src/main/java/p/studio/app/compiler/CompilerProjectLanguageCatalog.java b/prometeu-app/src/main/java/p/studio/app/compiler/CompilerProjectLanguageCatalog.java new file mode 100644 index 00000000..0995342a --- /dev/null +++ b/prometeu-app/src/main/java/p/studio/app/compiler/CompilerProjectLanguageCatalog.java @@ -0,0 +1,36 @@ +package p.studio.app.compiler; + +import p.studio.api.project.ProjectLanguageCatalog; +import p.studio.api.project.ProjectLanguageTemplate; +import p.studio.compiler.FrontendRegistryService; +import p.studio.compiler.models.FrontendSpec; + +import java.util.Comparator; +import java.util.List; + +public final class CompilerProjectLanguageCatalog implements ProjectLanguageCatalog { + @Override + public List listLanguageTemplates() { + return FrontendRegistryService.listProviders().stream() + .map(provider -> toTemplate(provider.specification())) + .sorted(Comparator.comparing(ProjectLanguageTemplate::languageId, String.CASE_INSENSITIVE_ORDER)) + .toList(); + } + + private ProjectLanguageTemplate toTemplate(FrontendSpec spec) { + final List roots = spec.getSourceRoots().stream().sorted(String.CASE_INSENSITIVE_ORDER).toList(); + final List options = spec.getStdlibVersions().stream() + .map(value -> new ProjectLanguageTemplate.StdlibOption( + value.version(), ProjectLanguageTemplate.Stability.valueOf(value.type().name()))) + .sorted(Comparator.comparingInt(ProjectLanguageTemplate.StdlibOption::version)) + .toList(); + final ProjectLanguageTemplate.StdlibOption defaultOption = options.stream() + .filter(value -> value.stability() == ProjectLanguageTemplate.Stability.DEFAULT) + .findFirst().orElseGet(() -> options.isEmpty() + ? new ProjectLanguageTemplate.StdlibOption(1, ProjectLanguageTemplate.Stability.DEFAULT) + : options.getFirst()); + return new ProjectLanguageTemplate( + spec.getLanguageId(), options, defaultOption, roots, + roots.isEmpty() ? "src" : roots.getFirst()); + } +} diff --git a/prometeu-app/src/main/java/p/studio/app/lsp/LspLifecycleAdapter.java b/prometeu-app/src/main/java/p/studio/app/lsp/LspLifecycleAdapter.java new file mode 100644 index 00000000..a1aef156 --- /dev/null +++ b/prometeu-app/src/main/java/p/studio/app/lsp/LspLifecycleAdapter.java @@ -0,0 +1,35 @@ +package p.studio.app.lsp; + +import p.studio.api.project.ProjectReference; +import p.studio.core.session.LspLifecyclePort; +import p.studio.lsp.api.LspServerLifecycle; +import p.studio.lsp.messages.LspProjectContext; +import p.studio.lsp.messages.LspServerConfiguration; + +import java.util.Objects; + +public final class LspLifecycleAdapter implements LspLifecyclePort { + private final LspServerLifecycle lifecycle; + + public LspLifecycleAdapter(LspServerLifecycle lifecycle) { + this.lifecycle = Objects.requireNonNull(lifecycle, "lifecycle"); + } + + @Override + public void boot(ProjectReference project) { + lifecycle.bootServer(LspServerConfiguration.defaults(), context(project)); + } + + @Override + public void shutdown(ProjectReference project) { + lifecycle.shutdownServer(context(project)); + } + + private static LspProjectContext context(ProjectReference project) { + final var safeProject = Objects.requireNonNull(project, "project"); + return new LspProjectContext( + safeProject.rootPath().toAbsolutePath().normalize().toString(), + safeProject.languageId(), + safeProject.rootPath()); + } +} diff --git a/prometeu-app/src/main/java/p/studio/app/operation/ExecutorOperationExecutor.java b/prometeu-app/src/main/java/p/studio/app/operation/ExecutorOperationExecutor.java new file mode 100644 index 00000000..b128c030 --- /dev/null +++ b/prometeu-app/src/main/java/p/studio/app/operation/ExecutorOperationExecutor.java @@ -0,0 +1,161 @@ +package p.studio.app.operation; + +import p.studio.api.operation.OperationExecutor; +import p.studio.api.operation.OperationHandle; +import p.studio.api.operation.OperationId; +import p.studio.api.operation.OperationSnapshot; +import p.studio.api.operation.OperationState; +import p.studio.api.operation.OperationSubscription; + +import java.time.Instant; +import java.util.Objects; +import java.util.UUID; +import java.util.concurrent.Callable; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.FutureTask; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Consumer; + +public final class ExecutorOperationExecutor implements OperationExecutor { + private final ExecutorService executor; + + public ExecutorOperationExecutor(ExecutorService executor) { + this.executor = Objects.requireNonNull(executor, "executor"); + } + + @Override + public OperationHandle submit(String summary, Callable operation) { + final ExecutorOperationHandle handle = new ExecutorOperationHandle<>(summary, operation); + handle.start(executor); + return handle; + } + + private static final class ExecutorOperationHandle implements OperationHandle { + private final OperationId id = new OperationId(UUID.randomUUID().toString()); + private final String summary; + private final Callable operation; + private final CompletableFuture completion = new CompletableFuture<>(); + private final CopyOnWriteArrayList> subscribers = new CopyOnWriteArrayList<>(); + private final AtomicReference snapshot; + private volatile Future task; + + private ExecutorOperationHandle(String summary, Callable operation) { + this.summary = Objects.requireNonNullElse(summary, ""); + this.operation = Objects.requireNonNull(operation, "operation"); + this.snapshot = new AtomicReference<>(new OperationSnapshot(id, OperationState.PENDING, Instant.now(), this.summary)); + } + + private void start(ExecutorService executor) { + final FutureTask submitted = new FutureTask<>(() -> { + try { + final R result = operation.call(); + if (transitionTerminal(OperationState.SUCCEEDED, summary)) { + completion.complete(result); + } + } catch (Throwable failure) { + if (transitionTerminal(OperationState.FAILED, failureSummary(failure))) { + completion.completeExceptionally(failure); + } + } + return null; + }); + task = submitted; + try { + transition(OperationState.RUNNING, summary); + executor.execute(submitted); + } catch (RuntimeException failure) { + if (transitionTerminal(OperationState.FAILED, failureSummary(failure))) { + completion.completeExceptionally(failure); + } + } + } + + @Override + public OperationId id() { + return id; + } + + @Override + public OperationSnapshot snapshot() { + return snapshot.get(); + } + + @Override + public CompletionStage completion() { + return completion; + } + + @Override + public boolean cancel() { + while (true) { + final OperationSnapshot current = snapshot.get(); + if (terminal(current.state())) { + return false; + } + final OperationSnapshot cancelled = new OperationSnapshot(id, OperationState.CANCELLED, Instant.now(), summary); + if (snapshot.compareAndSet(current, cancelled)) { + final Future submitted = task; + if (submitted != null) { + submitted.cancel(true); + } + completion.cancel(false); + publish(cancelled); + return true; + } + } + } + + @Override + public OperationSubscription subscribe(Consumer subscriber) { + final Consumer listener = Objects.requireNonNull(subscriber, "subscriber"); + subscribers.add(listener); + notifySubscriber(listener, snapshot.get()); + return () -> subscribers.remove(listener); + } + + private void transition(OperationState state, String message) { + final OperationSnapshot next = new OperationSnapshot(id, state, Instant.now(), message); + snapshot.set(next); + publish(next); + } + + private boolean transitionTerminal(OperationState state, String message) { + while (true) { + final OperationSnapshot current = snapshot.get(); + if (terminal(current.state())) { + return false; + } + final OperationSnapshot next = new OperationSnapshot(id, state, Instant.now(), message); + if (snapshot.compareAndSet(current, next)) { + publish(next); + return true; + } + } + } + + private void publish(OperationSnapshot value) { + subscribers.forEach(subscriber -> notifySubscriber(subscriber, value)); + } + + private static void notifySubscriber(Consumer subscriber, OperationSnapshot value) { + try { + subscriber.accept(value); + } catch (RuntimeException ignored) { + // Observation must not change operation completion. + } + } + + private static boolean terminal(OperationState state) { + return state == OperationState.SUCCEEDED || state == OperationState.FAILED || state == OperationState.CANCELLED; + } + + private String failureSummary(Throwable failure) { + final String message = failure.getMessage(); + return message == null || message.isBlank() ? summary : message; + } + } +} diff --git a/prometeu-app/src/main/java/p/studio/app/runtime/ExternalRuntimeGateway.java b/prometeu-app/src/main/java/p/studio/app/runtime/ExternalRuntimeGateway.java new file mode 100644 index 00000000..1a25db26 --- /dev/null +++ b/prometeu-app/src/main/java/p/studio/app/runtime/ExternalRuntimeGateway.java @@ -0,0 +1,159 @@ +package p.studio.app.runtime; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import p.studio.api.project.ProjectLocalStudioSetup; +import p.studio.api.project.ProjectReference; +import p.studio.api.runtime.RuntimeLogEntry; +import p.studio.core.runtime.RuntimeConnection; +import p.studio.core.runtime.RuntimeGateway; + +import java.io.*; +import java.net.InetSocketAddress; +import java.net.Socket; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Objects; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; +import java.util.function.Consumer; + +public final class ExternalRuntimeGateway implements RuntimeGateway { + private static final int DEBUG_PORT = 7777; + private final ObjectMapper mapper; + private final Executor executor; + + public ExternalRuntimeGateway(ObjectMapper mapper, Executor executor) { + this.mapper = Objects.requireNonNull(mapper, "mapper"); + this.executor = Objects.requireNonNull(executor, "executor"); + } + + @Override + public RuntimeConnection start(ProjectReference project, ProjectLocalStudioSetup setup, + Consumer logs) throws Exception { + final Consumer sink = Objects.requireNonNull(logs, "logs"); + final Path executable = resolveExecutable(setup); + final Process process = new ProcessBuilder(executable.toString(), "debug", "build") + .directory(project.rootPath().toFile()).start(); + stream(process.getInputStream(), false, sink); + stream(process.getErrorStream(), true, sink); + try { + final Socket socket = connectWithRetry(); + final BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8)); + final BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), StandardCharsets.UTF_8)); + final JsonNode handshake = mapper.readTree(requireLine(reader, "connection closed during handshake")); + if (handshake == null || !"handshake".equals(handshake.path("type").asText())) { + throw new IOException("invalid runtime handshake"); + } + writer.write("{\"type\":\"start\"}"); + writer.newLine(); + writer.flush(); + sink.accept(RuntimeLogEntry.info("Runtime protocol %d (%s)".formatted( + handshake.path("protocol_version").asInt(), handshake.path("runtime_version").asText("unknown")))); + final var connection = new ProcessRuntimeConnection(process, socket, reader, writer); + executor.execute(() -> receive(reader, sink, connection)); + return connection; + } catch (Exception failure) { + process.descendants().forEach(ProcessHandle::destroyForcibly); + process.destroyForcibly(); + throw failure; + } + } + + private static Path resolveExecutable(ProjectLocalStudioSetup setup) throws IOException { + if (setup.prometeuRuntimePath() == null) throw new IOException("prometeuRuntimePath is missing"); + final Path executable = Path.of(setup.prometeuRuntimePath()).resolve("prometeu").toAbsolutePath().normalize(); + if (!Files.isRegularFile(executable)) throw new IOException("runtime not found at " + executable); + if (!Files.isExecutable(executable)) throw new IOException("runtime is not executable at " + executable); + return executable; + } + + private Socket connectWithRetry() throws IOException { + IOException failure = null; + for (int attempt = 0; attempt < 20; attempt++) { + final Socket socket = new Socket(); + try { + socket.connect(new InetSocketAddress("127.0.0.1", DEBUG_PORT), 500); + socket.setSoTimeout(5_000); + return socket; + } catch (IOException exception) { + failure = exception; + closeQuietly(socket); + try { Thread.sleep(100L); } catch (InterruptedException interrupted) { + Thread.currentThread().interrupt(); + throw new IOException("runtime connection interrupted", interrupted); + } + } + } + throw failure == null ? new IOException("runtime connection failed") : failure; + } + + private void stream(InputStream stream, boolean error, Consumer sink) { + executor.execute(() -> { + try (var reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) { + String line; + while ((line = reader.readLine()) != null) sink.accept(error ? RuntimeLogEntry.error(line) : RuntimeLogEntry.info(line)); + } catch (IOException ignored) { } + }); + } + + private void receive(BufferedReader reader, Consumer sink, ProcessRuntimeConnection connection) { + try { + String line; + while ((line = reader.readLine()) != null) { + final JsonNode event = mapper.readTree(line); + if (event != null && "log".equals(event.path("event").asText())) { + final String source = event.path("source").asText(""); + final String message = event.path("msg").asText(""); + final String rendered = source.isBlank() ? message : "[" + source + "] " + message; + final boolean error = switch (event.path("level").asText("").toUpperCase()) { + case "ERROR", "FATAL" -> true; + default -> false; + }; + sink.accept(error ? RuntimeLogEntry.error(rendered) : RuntimeLogEntry.info(rendered)); + } + } + } catch (IOException failure) { + if (!connection.closed) sink.accept(RuntimeLogEntry.error("Runtime debug connection lost: " + failure.getMessage())); + } + } + + private static String requireLine(BufferedReader reader, String message) throws IOException { + final String line = reader.readLine(); + if (line == null) throw new IOException(message); + return line; + } + + private static void closeQuietly(Closeable closeable) { + if (closeable == null) return; + try { closeable.close(); } catch (IOException ignored) { } + } + + private static final class ProcessRuntimeConnection implements RuntimeConnection { + private final Process process; + private final Socket socket; + private final Reader reader; + private final Writer writer; + private volatile boolean closed; + + private ProcessRuntimeConnection(Process process, Socket socket, Reader reader, Writer writer) { + this.process = process; + this.socket = socket; + this.reader = reader; + this.writer = writer; + } + + @Override public CompletableFuture completion() { return process.onExit().thenApply(Process::exitValue); } + + @Override public void close() { + if (closed) return; + closed = true; + closeQuietly(reader); + closeQuietly(writer); + closeQuietly(socket); + process.descendants().forEach(ProcessHandle::destroyForcibly); + process.destroyForcibly(); + } + } +} diff --git a/prometeu-app/src/test/java/p/studio/app/StudioApplicationConfigurationTest.java b/prometeu-app/src/test/java/p/studio/app/StudioApplicationConfigurationTest.java new file mode 100644 index 00000000..897df9b9 --- /dev/null +++ b/prometeu-app/src/test/java/p/studio/app/StudioApplicationConfigurationTest.java @@ -0,0 +1,33 @@ +package p.studio.app; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.WebApplicationType; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.context.ConfigurableApplicationContext; +import p.packer.PackerWorkspaceService; +import p.studio.api.operation.OperationExecutor; + +import java.util.concurrent.ExecutorService; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class StudioApplicationConfigurationTest { + @Test + void bootsAndClosesWithoutAWebApplicationContext() { + final ConfigurableApplicationContext context = new SpringApplicationBuilder(StudioApplicationConfiguration.class) + .web(WebApplicationType.NONE) + .headless(true) + .run(); + final ExecutorService executor = context.getBean(ExecutorService.class); + try (context) { + assertNotNull(context.getBean(StudioUiFactory.class)); + assertNotNull(context.getBean(PackerWorkspaceService.class)); + assertNotNull(context.getBean(OperationExecutor.class)); + assertFalse(context.getClass().getName().contains("WebServer")); + assertFalse(executor.isShutdown()); + } + assertTrue(executor.isShutdown()); + } +} diff --git a/prometeu-app/src/test/java/p/studio/app/StudioPackerEventAdapterTest.java b/prometeu-app/src/test/java/p/studio/app/StudioPackerEventAdapterTest.java new file mode 100644 index 00000000..86160529 --- /dev/null +++ b/prometeu-app/src/test/java/p/studio/app/StudioPackerEventAdapterTest.java @@ -0,0 +1,32 @@ +package p.studio.app; + +import org.junit.jupiter.api.Test; +import p.packer.events.PackerEvent; +import p.packer.events.PackerEventKind; +import p.packer.events.PackerProgress; +import p.studio.ui.javafx.events.StudioEventBus; +import p.studio.ui.javafx.events.StudioPackerOperationEvent; +import p.studio.ui.javafx.events.StudioPackerOperationKind; + +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +final class StudioPackerEventAdapterTest { + @Test + void translatesProviderEventsIntoStudioEvents() { + final StudioEventBus globalBus = new StudioEventBus(); + final List events = new ArrayList<>(); + globalBus.subscribe(StudioPackerOperationEvent.class, events::add); + + new StudioPackerEventAdapter(globalBus).publish(new PackerEvent( + "main", "op-1", 0L, PackerEventKind.ASSET_DISCOVERED, Instant.now(), + "Discovered asset.", new PackerProgress(0.25d, false), List.of("ui_atlas"))); + + assertEquals(1, events.size()); + assertEquals(StudioPackerOperationKind.ASSET_DISCOVERED, events.getFirst().kind()); + assertEquals(0.25d, events.getFirst().progress()); + } +} diff --git a/prometeu-app/src/test/java/p/studio/app/compiler/CompilerProjectLanguageCatalogTest.java b/prometeu-app/src/test/java/p/studio/app/compiler/CompilerProjectLanguageCatalogTest.java new file mode 100644 index 00000000..9cf61b9f --- /dev/null +++ b/prometeu-app/src/test/java/p/studio/app/compiler/CompilerProjectLanguageCatalogTest.java @@ -0,0 +1,18 @@ +package p.studio.app.compiler; + +import org.junit.jupiter.api.Test; +import p.studio.compiler.FrontendRegistryService; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class CompilerProjectLanguageCatalogTest { + @Test + void listsLanguagesFromRegisteredProviders() { + FrontendRegistryService.bootstrapDefaults(); + + final var templates = new CompilerProjectLanguageCatalog().listLanguageTemplates(); + + assertEquals(1, templates.size()); + assertEquals("pbs", templates.getFirst().languageId()); + } +} diff --git a/prometeu-app/src/test/java/p/studio/app/operation/ExecutorOperationExecutorTest.java b/prometeu-app/src/test/java/p/studio/app/operation/ExecutorOperationExecutorTest.java new file mode 100644 index 00000000..61ad1075 --- /dev/null +++ b/prometeu-app/src/test/java/p/studio/app/operation/ExecutorOperationExecutorTest.java @@ -0,0 +1,49 @@ +package p.studio.app.operation; + +import org.junit.jupiter.api.Test; +import p.studio.api.operation.OperationState; + +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +final class ExecutorOperationExecutorTest { + @Test + void completesWithTypedResultAndTerminalSnapshot() throws Exception { + final var executor = Executors.newSingleThreadExecutor(); + try { + final var handle = new ExecutorOperationExecutor(executor).submit("test operation", () -> 42); + + assertEquals(42, handle.completion().toCompletableFuture().get(2, TimeUnit.SECONDS)); + assertEquals(OperationState.SUCCEEDED, handle.snapshot().state()); + assertEquals("test operation", handle.snapshot().summary()); + } finally { + executor.shutdownNow(); + } + } + + @Test + void cancellationInterruptsWorkAndCancelsCompletion() throws Exception { + final var executor = Executors.newSingleThreadExecutor(); + final var started = new CountDownLatch(1); + try { + final var handle = new ExecutorOperationExecutor(executor).submit("cancel operation", () -> { + started.countDown(); + new CountDownLatch(1).await(); + return 42; + }); + assertTrue(started.await(2, TimeUnit.SECONDS)); + + assertTrue(handle.cancel()); + assertEquals(OperationState.CANCELLED, handle.snapshot().state()); + assertThrows(java.util.concurrent.CancellationException.class, + () -> handle.completion().toCompletableFuture().join()); + } finally { + executor.shutdownNow(); + } + } +} diff --git a/prometeu-architecture-tests/build.gradle.kts b/prometeu-architecture-tests/build.gradle.kts index e0eee078..924412b0 100644 --- a/prometeu-architecture-tests/build.gradle.kts +++ b/prometeu-architecture-tests/build.gradle.kts @@ -14,7 +14,11 @@ dependencies { testImplementation(project(":prometeu-infra")) testImplementation(project(":prometeu-lsp:prometeu-lsp-api")) testImplementation(project(":prometeu-lsp:prometeu-lsp-v1")) - testImplementation(project(":prometeu-studio")) + testImplementation(project(":prometeu-packer:prometeu-packer-api")) + testImplementation(project(":prometeu-packer:prometeu-packer-v1")) + testImplementation(project(":prometeu-studio-api")) + testImplementation(project(":prometeu-studio-core")) + testImplementation(project(":prometeu-studio-ui-javafx")) testImplementation(project(":prometeu-app")) } diff --git a/prometeu-architecture-tests/src/test/java/p/studio/architecture/StudioBoundaryArchTest.java b/prometeu-architecture-tests/src/test/java/p/studio/architecture/StudioBoundaryArchTest.java new file mode 100644 index 00000000..11c8ea44 --- /dev/null +++ b/prometeu-architecture-tests/src/test/java/p/studio/architecture/StudioBoundaryArchTest.java @@ -0,0 +1,90 @@ +package p.studio.architecture; + +import com.tngtech.archunit.core.importer.ImportOption; +import com.tngtech.archunit.junit.AnalyzeClasses; +import com.tngtech.archunit.junit.ArchTest; +import com.tngtech.archunit.lang.ArchRule; + +import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses; + +@AnalyzeClasses(packages = {"p.studio", "p.packer"}, importOptions = ImportOption.DoNotIncludeTests.class) +class StudioBoundaryArchTest { + @ArchTest + static final ArchRule staticContainerCannotReturn = noClasses() + .that().resideInAnyPackage("p.studio..") + .should().haveSimpleName("Container") + .because("DEC-0059 requires the static service locator to be physically absent"); + + @ArchTest + static final ArchRule appContainerCompatibilityBridgeCannotReturn = noClasses() + .that().resideInAnyPackage("p.studio..") + .should().haveSimpleName("AppContainer") + .because("DEC-0059 requires Spring composition without a legacy service bag"); + + @ArchTest + static final ArchRule studioApiIsFrameworkAndProviderNeutral = noClasses() + .that().resideInAPackage("p.studio.api..") + .should().dependOnClassesThat().resideInAnyPackage( + "javafx..", + "org.springframework..", + "org.springframework.modulith..", + "p.packer..", + "p.studio.compiler..", + "p.studio.lsp..", + "p.studio.utilities..", + "p.studio.core..", + "p.studio.ui..") + .because("DEC-0059 requires a toolkit and provider neutral public Studio API"); + + @ArchTest + static final ArchRule studioCoreDoesNotDependOnJavaFx = noClasses() + .that().resideInAPackage("p.studio.core..") + .should().dependOnClassesThat().resideInAPackage("javafx..") + .because("DEC-0059 requires the Studio Core to compile without JavaFX"); + + @ArchTest + static final ArchRule studioCoreDoesNotDependOnSpring = noClasses() + .that().resideInAPackage("p.studio.core..") + .should().dependOnClassesThat().resideInAPackage("org.springframework..") + .because("DEC-0059 confines Spring to application composition and keeps core as constructor-injected POJOs"); + + @ArchTest + static final ArchRule studioCoreDoesNotDependOnLegacySharedInfrastructure = noClasses() + .that().resideInAPackage("p.studio.core..") + .should().dependOnClassesThat().resideInAPackage("p.studio.utilities..") + .because("DEC-0059 requires the extracted core to own explicit contracts instead of inheriting the mixed Studio utility classpath"); + + @ArchTest + static final ArchRule javaFxAdapterDoesNotDependOnCoreOrProviderImplementations = noClasses() + .that().resideInAPackage("p.studio.ui.javafx..") + .should().dependOnClassesThat().resideInAnyPackage( + "p.studio.core..", + "p.packer..", + "p.studio.compiler..", + "p.studio.lsp..", + "p.studio.utilities..") + .because("DEC-0059 requires JavaFX to consume Studio API contracts only"); + + @ArchTest + static final ArchRule javaFxAdapterDoesNotOrchestrateTheFileSystem = noClasses() + .that().resideInAPackage("p.studio.ui.javafx..") + .should().dependOnClassesThat().haveFullyQualifiedName("java.nio.file.Files") + .because("DEC-0059 keeps filesystem orchestration behind neutral Studio services"); + + @ArchTest + static final ArchRule javaFxAdapterDoesNotOwnSerialization = noClasses() + .that().resideInAPackage("p.studio.ui.javafx..") + .should().dependOnClassesThat().resideInAPackage("com.fasterxml.jackson..") + .because("DEC-0059 keeps serialization in core or application adapters, not visual controls"); + + @ArchTest + static final ArchRule packerDoesNotDependOnStudio = noClasses() + .that().resideInAPackage("p.packer..") + .should().dependOnClassesThat().resideInAnyPackage( + "p.studio.api..", + "p.studio.core..", + "p.studio.ui..", + "p.studio.ui.javafx.window..", + "p.studio.ui.javafx.workspaces..") + .because("DEC-0059 keeps p.packer autonomous and dependency direction Studio to Packer"); +} diff --git a/prometeu-studio-api/build.gradle.kts b/prometeu-studio-api/build.gradle.kts new file mode 100644 index 00000000..a6775d6e --- /dev/null +++ b/prometeu-studio-api/build.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("gradle.java-library-conventions") +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetActionAvailability.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetActionAvailability.java new file mode 100644 index 00000000..ad50c9a0 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetActionAvailability.java @@ -0,0 +1,4 @@ +package p.studio.api.assets; + +public record AssetActionAvailability(String action, boolean enabled, boolean visible, String reason) { +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetBankComposition.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetBankComposition.java new file mode 100644 index 00000000..a48f700a --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetBankComposition.java @@ -0,0 +1,13 @@ +package p.studio.api.assets; + +import java.util.List; + +public record AssetBankComposition( + List availableFiles, + List selectedFiles, + long measuredBankSizeBytes) { + public AssetBankComposition { + availableFiles = List.copyOf(availableFiles); + selectedFiles = List.copyOf(selectedFiles); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetBankFile.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetBankFile.java new file mode 100644 index 00000000..ff3802b1 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetBankFile.java @@ -0,0 +1,15 @@ +package p.studio.api.assets; + +import java.util.Map; + +public record AssetBankFile( + String path, + String displayName, + long size, + long lastModified, + String fingerprint, + Map metadata) { + public AssetBankFile { + metadata = Map.copyOf(metadata); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetBuildParticipation.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetBuildParticipation.java new file mode 100644 index 00000000..34965444 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetBuildParticipation.java @@ -0,0 +1,6 @@ +package p.studio.api.assets; + +public enum AssetBuildParticipation { + INCLUDED, + EXCLUDED +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCapacityLevel.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCapacityLevel.java new file mode 100644 index 00000000..114e77b6 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCapacityLevel.java @@ -0,0 +1,7 @@ +package p.studio.api.assets; + +public enum AssetCapacityLevel { + SAFE, + WARNING, + EXHAUSTED +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCapacityPolicy.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCapacityPolicy.java new file mode 100644 index 00000000..82b09d22 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCapacityPolicy.java @@ -0,0 +1,14 @@ +package p.studio.api.assets; + +import java.util.Map; + +public interface AssetCapacityPolicy { + AssetCapacityState evaluate( + AssetFamily assetFamily, + int artifactCount, + Map outputMetadata, + Map outputPipeline, + long usedBytes); + + int maxArtifactsForGlyphBank(Map outputMetadata); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCapacityState.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCapacityState.java new file mode 100644 index 00000000..cf9b8b61 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCapacityState.java @@ -0,0 +1,18 @@ +package p.studio.api.assets; + +import java.util.Objects; + +public record AssetCapacityState( + double progress, + AssetCapacityLevel level, + boolean blocked, + String labelText, + String hintText) { + + public AssetCapacityState { + progress = Math.max(0.0d, Math.min(1.0d, progress)); + level = Objects.requireNonNullElse(level, AssetCapacityLevel.SAFE); + labelText = Objects.requireNonNullElse(labelText, ""); + hintText = Objects.requireNonNullElse(hintText, ""); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCatalog.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCatalog.java new file mode 100644 index 00000000..699099fb --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCatalog.java @@ -0,0 +1,9 @@ +package p.studio.api.assets; + +import p.studio.api.project.ProjectReference; + +import java.util.List; + +public interface AssetCatalog { + List list(ProjectReference projectReference, boolean deepSync); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCommands.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCommands.java new file mode 100644 index 00000000..dbafdc5f --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCommands.java @@ -0,0 +1,46 @@ +package p.studio.api.assets; + +import p.studio.api.project.ProjectReference; + +import java.util.List; +import java.util.Map; + +public interface AssetCommands { + AssetMutationResult create( + ProjectReference project, + String assetRoot, + String assetName, + AssetFamily assetFamily, + String outputFormat, + String outputCodec, + boolean preloadEnabled); + + AssetMutationResult move(ProjectReference project, AssetReference assetReference, String targetRoot); + + AssetMutationResult register(ProjectReference project, AssetReference assetReference); + + AssetMutationResult delete(ProjectReference project, AssetReference assetReference); + + AssetMutationResult updateBuildParticipation( + ProjectReference project, + AssetReference assetReference, + boolean includeInBuild); + + AssetUpdateResult updateContract( + ProjectReference project, + AssetReference assetReference, + boolean preload, + String outputCodec, + Map codecFieldValues, + Map metadataFieldValues); + + AssetUpdateResult applyBankComposition( + ProjectReference project, + AssetReference assetReference, + List selectedPaths); + + AssetUpdateResult applyPaletteOverhauling( + ProjectReference project, + AssetReference assetReference, + List> selectedPalettes); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetConfigurationField.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetConfigurationField.java new file mode 100644 index 00000000..898612d1 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetConfigurationField.java @@ -0,0 +1,15 @@ +package p.studio.api.assets; + +import java.util.List; + +public record AssetConfigurationField( + String key, + String label, + String fieldType, + String value, + boolean required, + List options) { + public AssetConfigurationField { + options = List.copyOf(options); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCreationCatalog.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCreationCatalog.java new file mode 100644 index 00000000..dc6d941f --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetCreationCatalog.java @@ -0,0 +1,14 @@ +package p.studio.api.assets; + +import java.util.List; + +/** Provides the asset creation choices owned by the configured packing provider. */ +public interface AssetCreationCatalog { + List supportedFamilies(); + + List supportedFormats(AssetFamily family); + + List availableCodecs(String outputFormat); + + boolean supports(String outputFormat, String outputCodec); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetDetails.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetDetails.java new file mode 100644 index 00000000..0591be4b --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetDetails.java @@ -0,0 +1,7 @@ +package p.studio.api.assets; + +import p.studio.api.project.ProjectReference; + +public interface AssetDetails { + AssetDetailsSnapshot get(ProjectReference project, AssetReference assetReference); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetDetailsSnapshot.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetDetailsSnapshot.java new file mode 100644 index 00000000..0c93513c --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetDetailsSnapshot.java @@ -0,0 +1,27 @@ +package p.studio.api.assets; + +import java.util.List; +import java.util.Map; + +public record AssetDetailsSnapshot( + AssetSummary summary, + List actions, + String outputFormat, + String outputCodec, + List availableOutputCodecs, + Map> codecConfigurationFieldsByCodec, + List metadataFields, + Map outputPipeline, + AssetBankComposition bankComposition, + List> pipelinePalettes, + List diagnostics) { + public AssetDetailsSnapshot { + actions = List.copyOf(actions); + availableOutputCodecs = List.copyOf(availableOutputCodecs); + codecConfigurationFieldsByCodec = Map.copyOf(codecConfigurationFieldsByCodec); + metadataFields = List.copyOf(metadataFields); + outputPipeline = Map.copyOf(outputPipeline); + pipelinePalettes = List.copyOf(pipelinePalettes); + diagnostics = List.copyOf(diagnostics); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetDiagnostic.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetDiagnostic.java new file mode 100644 index 00000000..c2be1f17 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetDiagnostic.java @@ -0,0 +1,11 @@ +package p.studio.api.assets; + +import java.nio.file.Path; + +public record AssetDiagnostic( + String severity, + String category, + String message, + Path evidencePath, + boolean blocking) { +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetEmittedArtifact.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetEmittedArtifact.java new file mode 100644 index 00000000..757a8df5 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetEmittedArtifact.java @@ -0,0 +1,6 @@ +package p.studio.api.assets; + +import java.nio.file.Path; + +public record AssetEmittedArtifact(String label, Path path, boolean canonical, long sizeBytes) { +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetFamily.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetFamily.java new file mode 100644 index 00000000..65807cac --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetFamily.java @@ -0,0 +1,22 @@ +package p.studio.api.assets; + +public enum AssetFamily { + GLYPH_BANK("glyph_bank"), + SCENE_BANK("scene_bank"), + SOUND_BANK("sound_bank"), + UNKNOWN("unknown"); + + private final String manifestType; + + AssetFamily(String manifestType) { + this.manifestType = manifestType; + } + + public String manifestType() { + return manifestType; + } + + public boolean matchesQuery(String normalizedQuery) { + return manifestType.contains(normalizedQuery); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetMutationResult.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetMutationResult.java new file mode 100644 index 00000000..076d7871 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetMutationResult.java @@ -0,0 +1,23 @@ +package p.studio.api.assets; + +import java.nio.file.Path; +import java.util.Objects; + +public record AssetMutationResult( + AssetOperationStatus status, + String summary, + AssetReference assetReference, + Path assetRoot, + Path manifestPath) { + + public AssetMutationResult { + Objects.requireNonNull(status, "status"); + summary = Objects.requireNonNullElse(summary, "").trim(); + assetRoot = assetRoot == null ? null : assetRoot.toAbsolutePath().normalize(); + manifestPath = manifestPath == null ? null : manifestPath.toAbsolutePath().normalize(); + } + + public boolean successful() { + return status == AssetOperationStatus.SUCCESS; + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetOperationStatus.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetOperationStatus.java new file mode 100644 index 00000000..51b1a57d --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetOperationStatus.java @@ -0,0 +1,7 @@ +package p.studio.api.assets; + +public enum AssetOperationStatus { + SUCCESS, + PARTIAL, + FAILED +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackDiagnostic.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackDiagnostic.java new file mode 100644 index 00000000..89b9d0bb --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackDiagnostic.java @@ -0,0 +1,4 @@ +package p.studio.api.assets; + +public record AssetPackDiagnostic(String severity, String message, boolean blocking) { +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackExecution.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackExecution.java new file mode 100644 index 00000000..6de4f082 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackExecution.java @@ -0,0 +1,15 @@ +package p.studio.api.assets; + +import java.util.List; + +public record AssetPackExecution( + AssetOperationStatus status, + String summary, + String canonicalArtifactName, + int packedAssetCount, + long elapsedMillis, + List emittedArtifacts) { + public AssetPackExecution { + emittedArtifacts = List.copyOf(emittedArtifacts); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackSummary.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackSummary.java new file mode 100644 index 00000000..f2ba1117 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackSummary.java @@ -0,0 +1,13 @@ +package p.studio.api.assets; + +import java.util.List; + +public record AssetPackSummary( + AssetOperationStatus status, + String summary, + int totalIncludedAssetCount, + List assets) { + public AssetPackSummary { + assets = List.copyOf(assets); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackSummaryItem.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackSummaryItem.java new file mode 100644 index 00000000..34302bfc --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackSummaryItem.java @@ -0,0 +1,12 @@ +package p.studio.api.assets; + +import java.util.Map; + +public record AssetPackSummaryItem( + int assetId, + String assetName, + AssetFamily assetFamily, + int artifactCount, + Map outputMetadata, + Map outputPipeline) { +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackValidation.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackValidation.java new file mode 100644 index 00000000..83b7dbf6 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackValidation.java @@ -0,0 +1,16 @@ +package p.studio.api.assets; + +import java.util.List; + +public record AssetPackValidation( + AssetOperationStatus status, + String summary, + List assets) { + public AssetPackValidation { + assets = List.copyOf(assets); + } + + public boolean canPack() { + return assets.isEmpty(); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackValidationItem.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackValidationItem.java new file mode 100644 index 00000000..d588bd5d --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPackValidationItem.java @@ -0,0 +1,19 @@ +package p.studio.api.assets; + +import java.nio.file.Path; +import java.util.List; + +public record AssetPackValidationItem( + int assetId, + String assetName, + Path assetPath, + long lastModified, + List diagnostics) { + public AssetPackValidationItem { + diagnostics = List.copyOf(diagnostics); + } + + public boolean blocked() { + return diagnostics.stream().anyMatch(AssetPackDiagnostic::blocking); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPacking.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPacking.java new file mode 100644 index 00000000..3b507396 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetPacking.java @@ -0,0 +1,14 @@ +package p.studio.api.assets; + +import p.studio.api.project.ProjectReference; +import p.studio.api.operation.OperationHandle; + +public interface AssetPacking { + OperationHandle deepSync(ProjectReference project); + + OperationHandle summarize(ProjectReference project); + + OperationHandle validate(ProjectReference project); + + OperationHandle pack(ProjectReference project); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetReference.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetReference.java new file mode 100644 index 00000000..d15d9b55 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetReference.java @@ -0,0 +1,53 @@ +package p.studio.api.assets; + +import java.util.Objects; + +/** Stable Studio identity for an asset, independent of the backing asset provider. */ +public record AssetReference(String value) { + private static final String ASSET_ID_PREFIX = "asset:id:"; + private static final String ASSET_ROOT_PREFIX = "asset:root:"; + + public AssetReference { + value = Objects.requireNonNull(value, "value").trim(); + if (value.isBlank()) { + throw new IllegalArgumentException("value must not be blank"); + } + } + + public static AssetReference of(String value) { + return new AssetReference(value); + } + + public static AssetReference forAssetId(int assetId) { + if (assetId <= 0) { + throw new IllegalArgumentException("assetId must be positive"); + } + return new AssetReference(ASSET_ID_PREFIX + assetId); + } + + public static AssetReference forRelativeAssetRoot(String relativeAssetRoot) { + final String normalized = Objects.requireNonNull(relativeAssetRoot, "relativeAssetRoot").trim(); + if (normalized.isBlank()) { + throw new IllegalArgumentException("relativeAssetRoot must not be blank"); + } + return new AssetReference(ASSET_ROOT_PREFIX + normalized); + } + + public boolean isAssetIdReference() { + return value.startsWith(ASSET_ID_PREFIX); + } + + public boolean isAssetRootReference() { + return value.startsWith(ASSET_ROOT_PREFIX); + } + + public String rawValue() { + if (isAssetIdReference()) { + return value.substring(ASSET_ID_PREFIX.length()); + } + if (isAssetRootReference()) { + return value.substring(ASSET_ROOT_PREFIX.length()); + } + return value; + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetRegistrationState.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetRegistrationState.java new file mode 100644 index 00000000..2bff6db3 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetRegistrationState.java @@ -0,0 +1,6 @@ +package p.studio.api.assets; + +public enum AssetRegistrationState { + REGISTERED, + UNREGISTERED +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetSummary.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetSummary.java new file mode 100644 index 00000000..841cd251 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetSummary.java @@ -0,0 +1,28 @@ +package p.studio.api.assets; + +import java.nio.file.Path; +import java.util.Objects; + +public record AssetSummary( + AssetReference reference, + String name, + AssetRegistrationState registrationState, + AssetBuildParticipation buildParticipation, + Integer assetId, + AssetFamily family, + Path root, + boolean preload, + boolean hasDiagnostics) { + + public AssetSummary { + Objects.requireNonNull(reference, "reference"); + name = Objects.requireNonNull(name, "name").trim(); + Objects.requireNonNull(registrationState, "registrationState"); + Objects.requireNonNull(buildParticipation, "buildParticipation"); + family = Objects.requireNonNullElse(family, AssetFamily.UNKNOWN); + root = Objects.requireNonNull(root, "root").toAbsolutePath().normalize(); + if (name.isBlank()) { + throw new IllegalArgumentException("name must not be blank"); + } + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetSyncResult.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetSyncResult.java new file mode 100644 index 00000000..55411f57 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetSyncResult.java @@ -0,0 +1,10 @@ +package p.studio.api.assets; + +import java.util.Objects; + +public record AssetSyncResult(AssetOperationStatus status, String summary) { + public AssetSyncResult { + Objects.requireNonNull(status, "status"); + summary = Objects.requireNonNullElse(summary, "").trim(); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetUpdateResult.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetUpdateResult.java new file mode 100644 index 00000000..c0a4d27b --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetUpdateResult.java @@ -0,0 +1,4 @@ +package p.studio.api.assets; + +public record AssetUpdateResult(boolean success, String errorMessage) { +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetWorkspacePreparation.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetWorkspacePreparation.java new file mode 100644 index 00000000..18efefc4 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetWorkspacePreparation.java @@ -0,0 +1,11 @@ +package p.studio.api.assets; + +import java.nio.file.Path; +import java.util.Objects; + +public record AssetWorkspacePreparation(boolean success, Path assetsRoot, String message) { + public AssetWorkspacePreparation { + assetsRoot = Objects.requireNonNull(assetsRoot, "assetsRoot").toAbsolutePath().normalize(); + message = Objects.requireNonNullElse(message, ""); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetWorkspaceStorage.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetWorkspaceStorage.java new file mode 100644 index 00000000..f2511473 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/AssetWorkspaceStorage.java @@ -0,0 +1,13 @@ +package p.studio.api.assets; + +import p.studio.api.project.ProjectReference; + +import java.nio.file.Path; + +public interface AssetWorkspaceStorage { + Path assetsRoot(ProjectReference projectReference); + + AssetWorkspacePreparation prepare(ProjectReference projectReference); + + boolean assetManifestExists(ProjectReference projectReference, String relativeAssetRoot); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/bank/AssetBankCompositionSession.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/bank/AssetBankCompositionSession.java new file mode 100644 index 00000000..8b53270b --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/bank/AssetBankCompositionSession.java @@ -0,0 +1,20 @@ +package p.studio.api.assets.bank; + +import p.studio.api.assets.workspace.AssetWorkspaceAssetDetails; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; + +import java.util.List; + +public interface AssetBankCompositionSession { + void replaceDetails(AssetWorkspaceAssetDetails details); + boolean ready(); + void beginEdit(); + void apply(); + void reset(); + void cancel(); + void moveToSelected(List files); + void moveToAvailable(List files); + void moveUp(int selectedIndex); + void moveDown(int selectedIndex); + AssetBankCompositionState state(); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/bank/AssetBankCompositionSessionFactory.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/bank/AssetBankCompositionSessionFactory.java new file mode 100644 index 00000000..fae54fe2 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/bank/AssetBankCompositionSessionFactory.java @@ -0,0 +1,5 @@ +package p.studio.api.assets.bank; + +public interface AssetBankCompositionSessionFactory { + AssetBankCompositionSession createSession(); +} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionViewModel.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/bank/AssetBankCompositionState.java similarity index 63% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionViewModel.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/bank/AssetBankCompositionState.java index 9e9fa075..cb5808e1 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionViewModel.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/bank/AssetBankCompositionState.java @@ -1,18 +1,19 @@ -package p.studio.workspaces.assets.details.bank; +package p.studio.api.assets.bank; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; +import p.studio.api.assets.AssetCapacityState; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; import java.util.List; import java.util.Objects; -public record AssetDetailsBankCompositionViewModel( +public record AssetBankCompositionState( boolean editing, boolean dirty, List availableFiles, List selectedFiles, - AssetDetailsBankCompositionCapacityState capacityState) { + AssetCapacityState capacityState) { - public AssetDetailsBankCompositionViewModel { + public AssetBankCompositionState { availableFiles = List.copyOf(Objects.requireNonNull(availableFiles, "availableFiles")); selectedFiles = List.copyOf(Objects.requireNonNull(selectedFiles, "selectedFiles")); capacityState = Objects.requireNonNull(capacityState, "capacityState"); diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetMetadataService.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetMetadataService.java new file mode 100644 index 00000000..c13478b5 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetMetadataService.java @@ -0,0 +1,15 @@ +package p.studio.api.assets.metadata; + +import p.studio.api.assets.AssetFamily; + +import java.nio.file.Path; + +public interface AssetMetadataService { + AssetStudioMetadataSnapshot read(Path assetRoot, AssetFamily assetFamily); + + AssetMetadataWriteResult writeSceneBankMetadata(Path assetRoot, AssetStudioSceneBankMetadata metadata); + + AssetMetadataWriteResult writeGlyphSpecialization(Path assetRoot, AssetStudioGlyphSpecialization specialization); + + AssetMetadataWriteResult writeGlyphMaterialMetadata(Path assetRoot, AssetStudioGlyphMaterialMetadata metadata); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetMetadataWriteResult.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetMetadataWriteResult.java new file mode 100644 index 00000000..9b3321bd --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetMetadataWriteResult.java @@ -0,0 +1,17 @@ +package p.studio.api.assets.metadata; + +import java.util.Objects; + +public record AssetMetadataWriteResult(boolean successful, String message) { + public AssetMetadataWriteResult { + message = Objects.requireNonNullElse(message, ""); + } + + public static AssetMetadataWriteResult success() { + return new AssetMetadataWriteResult(true, ""); + } + + public static AssetMetadataWriteResult failure(String message) { + return new AssetMetadataWriteResult(false, message); + } +} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphMaterialArtifactBinding.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphMaterialArtifactBinding.java similarity index 93% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphMaterialArtifactBinding.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphMaterialArtifactBinding.java index df485e37..be20a511 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphMaterialArtifactBinding.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphMaterialArtifactBinding.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.metadata; +package p.studio.api.assets.metadata; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphMaterialMetadata.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphMaterialMetadata.java similarity index 94% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphMaterialMetadata.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphMaterialMetadata.java index 43cbdca1..fcd587ec 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphMaterialMetadata.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphMaterialMetadata.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.metadata; +package p.studio.api.assets.metadata; import java.nio.file.Path; import java.util.List; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphMaterialPalette.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphMaterialPalette.java similarity index 97% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphMaterialPalette.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphMaterialPalette.java index 89033a42..e285ec4c 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphMaterialPalette.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphMaterialPalette.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.metadata; +package p.studio.api.assets.metadata; import java.util.ArrayList; import java.util.List; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphMaterialSchema.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphMaterialSchema.java similarity index 95% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphMaterialSchema.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphMaterialSchema.java index 033ef10d..f1a874ad 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphMaterialSchema.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphMaterialSchema.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.metadata; +package p.studio.api.assets.metadata; import java.util.LinkedHashMap; import java.util.List; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphMaterialSchemaStatus.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphMaterialSchemaStatus.java similarity index 94% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphMaterialSchemaStatus.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphMaterialSchemaStatus.java index be3c7277..45709e19 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphMaterialSchemaStatus.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphMaterialSchemaStatus.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.metadata; +package p.studio.api.assets.metadata; public enum AssetStudioGlyphMaterialSchemaStatus { OK("ok"), diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphSpecialization.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphSpecialization.java similarity index 94% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphSpecialization.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphSpecialization.java index 1115d28d..6b21d6a8 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioGlyphSpecialization.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioGlyphSpecialization.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.metadata; +package p.studio.api.assets.metadata; import java.util.Locale; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioMetadataSnapshot.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioMetadataSnapshot.java similarity index 90% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioMetadataSnapshot.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioMetadataSnapshot.java index 18cce5b5..feacb7e5 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioMetadataSnapshot.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioMetadataSnapshot.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.metadata; +package p.studio.api.assets.metadata; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioSceneBankMetadata.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioSceneBankMetadata.java similarity index 96% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioSceneBankMetadata.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioSceneBankMetadata.java index 615c2167..28ce8bf6 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioSceneBankMetadata.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioSceneBankMetadata.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.metadata; +package p.studio.api.assets.metadata; import java.nio.file.Path; import java.util.List; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioSceneLayerBinding.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioSceneLayerBinding.java similarity index 98% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioSceneLayerBinding.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioSceneLayerBinding.java index 492446d9..0f4a16cb 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioSceneLayerBinding.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioSceneLayerBinding.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.metadata; +package p.studio.api.assets.metadata; import java.util.ArrayList; import java.util.List; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioSceneTile.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioSceneTile.java similarity index 92% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioSceneTile.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioSceneTile.java index 8f5f4f14..49c73de7 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioSceneTile.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/metadata/AssetStudioSceneTile.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.metadata; +package p.studio.api.assets.metadata; public record AssetStudioSceneTile( boolean active, diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/palette/AssetPaletteSession.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/palette/AssetPaletteSession.java new file mode 100644 index 00000000..93c5d08e --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/palette/AssetPaletteSession.java @@ -0,0 +1,33 @@ +package p.studio.api.assets.palette; + +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialMetadata; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialSchema; +import p.studio.api.assets.workspace.AssetWorkspaceAssetDetails; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; + +import java.util.List; + +public interface AssetPaletteSession { + void replaceDetails(AssetWorkspaceAssetDetails details); + void replaceMaterialMetadata(AssetStudioGlyphMaterialMetadata metadata); + boolean ready(); + AssetWorkspaceAssetDetails details(); + void beginEdit(); + void apply(); + void reset(); + void cancel(); + void moveToSelected(List files); + void moveToAvailable(List files); + void selectPreviewTile(AssetWorkspaceBankCompositionFile file); + void selectPreviewPalette(AssetWorkspaceBankCompositionFile file); + AssetPaletteState state(); + List readySchemas(); + String nextPaletteId(); + boolean duplicatePaletteExists(String paletteId, String schemaId, List colors); + AssetStudioGlyphMaterialMetadata upsertPalette( + String paletteId, String displayName, String schemaId, List colors); + AssetStudioGlyphMaterialMetadata removePalette(String paletteId); + AssetWorkspaceBankCompositionFile paletteFileById(String paletteId); + boolean paletteIsOriginal(AssetWorkspaceBankCompositionFile file); + String generatedDisplayName(List colors); +} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingViewModel.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/palette/AssetPaletteState.java similarity index 78% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingViewModel.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/palette/AssetPaletteState.java index bede099e..91281bdc 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingViewModel.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/palette/AssetPaletteState.java @@ -1,11 +1,11 @@ -package p.studio.workspaces.assets.details.palette; +package p.studio.api.assets.palette; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; import java.util.List; import java.util.Objects; -public record AssetDetailsPaletteOverhaulingViewModel( +public record AssetPaletteState( boolean editing, boolean dirty, List previewTileFiles, @@ -16,7 +16,7 @@ public record AssetDetailsPaletteOverhaulingViewModel( AssetWorkspaceBankCompositionFile previewPaletteFile, int renderableFileCount) { - public AssetDetailsPaletteOverhaulingViewModel { + public AssetPaletteState { previewTileFiles = List.copyOf(Objects.requireNonNull(previewTileFiles, "previewTileFiles")); allFiles = List.copyOf(Objects.requireNonNull(allFiles, "allFiles")); availableFiles = List.copyOf(Objects.requireNonNull(availableFiles, "availableFiles")); diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/scene/SceneBankWorkflow.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/scene/SceneBankWorkflow.java new file mode 100644 index 00000000..059ca7c0 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/scene/SceneBankWorkflow.java @@ -0,0 +1,18 @@ +package p.studio.api.assets.scene; + +import p.studio.api.assets.workspace.AssetWorkspaceAssetDetails; +import p.studio.api.project.ProjectReference; + +public interface SceneBankWorkflow { + SceneBankWorkflowResult inspect(ProjectReference projectReference, AssetWorkspaceAssetDetails details); + + SceneBankWorkflowResult validate(ProjectReference projectReference, AssetWorkspaceAssetDetails details); + + SceneBankWorkflowResult accept(ProjectReference projectReference, AssetWorkspaceAssetDetails details); + + SceneBankWorkflowResult inspectLayer(ProjectReference projectReference, AssetWorkspaceAssetDetails details, int layerIndex); + + SceneBankWorkflowResult validateLayer(ProjectReference projectReference, AssetWorkspaceAssetDetails details, int layerIndex); + + SceneBankWorkflowResult acceptLayer(ProjectReference projectReference, AssetWorkspaceAssetDetails details, int layerIndex); +} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/scene/SceneBankWorkflowResult.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/scene/SceneBankWorkflowResult.java similarity index 70% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/scene/SceneBankWorkflowResult.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/scene/SceneBankWorkflowResult.java index 9fd6d718..2b15426a 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/scene/SceneBankWorkflowResult.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/scene/SceneBankWorkflowResult.java @@ -1,7 +1,7 @@ -package p.studio.workspaces.assets.scene; +package p.studio.api.assets.scene; -import p.packer.dtos.PackerDiagnosticDTO; -import p.studio.workspaces.assets.messages.AssetWorkspaceSceneBankValidation; +import p.studio.api.assets.AssetDiagnostic; +import p.studio.api.assets.workspace.AssetWorkspaceSceneBankValidation; import java.util.List; import java.util.Objects; @@ -10,7 +10,7 @@ public record SceneBankWorkflowResult( boolean success, String message, AssetWorkspaceSceneBankValidation validation, - List diagnostics) { + List diagnostics) { public SceneBankWorkflowResult { message = Objects.requireNonNullElse(message, ""); diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/schema/AssetColorSchemaFactory.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/schema/AssetColorSchemaFactory.java new file mode 100644 index 00000000..6ce13fd8 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/schema/AssetColorSchemaFactory.java @@ -0,0 +1,11 @@ +package p.studio.api.assets.schema; + +import p.studio.api.assets.palette.AssetPaletteSession; + +public interface AssetColorSchemaFactory { + AssetColorSchemaSession createSession(); + + AssetColorSchemaRules rules(); + + AssetPaletteSession createPaletteSession(); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/schema/AssetColorSchemaRules.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/schema/AssetColorSchemaRules.java new file mode 100644 index 00000000..b1f5e848 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/schema/AssetColorSchemaRules.java @@ -0,0 +1,21 @@ +package p.studio.api.assets.schema; + +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialSchema; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialSchemaStatus; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; + +import java.util.List; + +public interface AssetColorSchemaRules { + AssetStudioGlyphMaterialSchemaStatus effectiveStatus( + AssetStudioGlyphMaterialSchema schema, + List selectedTiles); + + boolean supportsSchemaAuthoring(AssetWorkspaceBankCompositionFile file); + + String artifactId(AssetWorkspaceBankCompositionFile file); + + String fingerprint(AssetWorkspaceBankCompositionFile file); + + List tileColors(AssetWorkspaceBankCompositionFile file); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/schema/AssetColorSchemaSession.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/schema/AssetColorSchemaSession.java new file mode 100644 index 00000000..21f88db0 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/schema/AssetColorSchemaSession.java @@ -0,0 +1,41 @@ +package p.studio.api.assets.schema; + +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialMetadata; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialSchema; +import p.studio.api.assets.workspace.AssetWorkspaceAssetDetails; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; + +import java.util.List; +import java.util.Optional; + +public interface AssetColorSchemaSession { + void replaceDetails(AssetWorkspaceAssetDetails details); + void replaceMaterialMetadata(AssetStudioGlyphMaterialMetadata metadata); + boolean ready(); + void beginEdit(); + void apply(); + void reset(); + void cancel(); + void selectSchema(String schemaId); + void createSchema(); + void markSelectedSchemaForRemoval(); + void moveToAssigned(List files); + void moveToAvailable(List files); + void moveAssignedUp(int index); + void moveAssignedDown(int index); + AssetColorSchemaState state(); + AssetStudioGlyphMaterialMetadata metadata(); + List schemas(); + List selectedTiles(); + List availableTilesForCreate(); + List availableTilesForEdit(String schemaId); + boolean canRemove(String schemaId); + Optional findSchema(String schemaId); + AssetStudioGlyphMaterialMetadata upsertSchema( + String schemaId, + List assignedTiles, + List orderedColors); + AssetStudioGlyphMaterialMetadata removeSchema(String schemaId); + String nextSchemaId(); + int unassignedTileCount(); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/schema/AssetColorSchemaState.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/schema/AssetColorSchemaState.java new file mode 100644 index 00000000..10b53bce --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/schema/AssetColorSchemaState.java @@ -0,0 +1,27 @@ +package p.studio.api.assets.schema; + +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; + +import java.util.List; +import java.util.Objects; + +public record AssetColorSchemaState( + boolean editing, + boolean dirty, + String schemaId, + boolean existingSchema, + boolean removeRequested, + List availableTiles, + List assignedTiles, + List orderedColors) { + + public AssetColorSchemaState { + availableTiles = List.copyOf(Objects.requireNonNull(availableTiles, "availableTiles")); + assignedTiles = List.copyOf(Objects.requireNonNull(assignedTiles, "assignedTiles")); + orderedColors = List.copyOf(Objects.requireNonNull(orderedColors, "orderedColors")); + } + + public boolean selected() { + return schemaId != null && !schemaId.isBlank(); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/tiled/SceneTmxExportDisposition.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/tiled/SceneTmxExportDisposition.java new file mode 100644 index 00000000..8960dfdb --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/tiled/SceneTmxExportDisposition.java @@ -0,0 +1,6 @@ +package p.studio.api.assets.tiled; + +public enum SceneTmxExportDisposition { + OVERWRITE, + KEEP_BOTH +} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledAssetGenerationResult.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/tiled/TiledAssetGenerationResult.java similarity index 80% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledAssetGenerationResult.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/tiled/TiledAssetGenerationResult.java index b38a022d..2d9ed9f2 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledAssetGenerationResult.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/tiled/TiledAssetGenerationResult.java @@ -1,6 +1,6 @@ -package p.studio.workspaces.assets.tiled; +package p.studio.api.assets.tiled; -import p.studio.workspaces.assets.metadata.AssetStudioSceneLayerBinding; +import p.studio.api.assets.metadata.AssetStudioSceneLayerBinding; import java.nio.file.Path; import java.util.List; diff --git a/prometeu-studio-api/src/main/java/p/studio/api/assets/tiled/TiledAssetService.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/tiled/TiledAssetService.java new file mode 100644 index 00000000..ac76b6f1 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/tiled/TiledAssetService.java @@ -0,0 +1,19 @@ +package p.studio.api.assets.tiled; + +import p.studio.api.assets.workspace.AssetWorkspaceAssetDetails; +import p.studio.api.project.ProjectReference; + +public interface TiledAssetService { + boolean sceneTmxExists(AssetWorkspaceAssetDetails details); + + TiledAssetGenerationResult exportTilesetTsx(AssetWorkspaceAssetDetails details); + + TiledAssetGenerationResult exportSceneBankTmx( + ProjectReference projectReference, + AssetWorkspaceAssetDetails details, + SceneTmxExportDisposition disposition); + + TiledAssetGenerationResult importSceneBankTmx( + ProjectReference projectReference, + AssetWorkspaceAssetDetails details); +} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceAssetAction.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceAssetAction.java similarity index 66% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceAssetAction.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceAssetAction.java index 0b4da1c6..e5dc48f6 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceAssetAction.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceAssetAction.java @@ -1,17 +1,15 @@ -package p.studio.workspaces.assets.messages; - -import p.packer.messages.assets.AssetAction; +package p.studio.api.assets.workspace; import java.util.Objects; public record AssetWorkspaceAssetAction( - AssetAction action, + String action, boolean enabled, boolean visible, String reason) { public AssetWorkspaceAssetAction { - Objects.requireNonNull(action, "action"); + action = Objects.requireNonNull(action, "action").trim(); reason = reason == null ? null : reason.trim(); if (reason != null && reason.isBlank()) { reason = null; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceAssetDetails.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceAssetDetails.java similarity index 80% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceAssetDetails.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceAssetDetails.java index 6420ce20..8f199828 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceAssetDetails.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceAssetDetails.java @@ -1,11 +1,9 @@ -package p.studio.workspaces.assets.messages; +package p.studio.api.assets.workspace; -import p.packer.dtos.PackerCodecConfigurationFieldDTO; -import p.packer.dtos.PackerDiagnosticDTO; -import p.packer.messages.assets.OutputCodecCatalog; -import p.packer.messages.assets.OutputFormatCatalog; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialMetadata; -import p.studio.workspaces.assets.metadata.AssetStudioSceneBankMetadata; +import p.studio.api.assets.AssetConfigurationField; +import p.studio.api.assets.AssetDiagnostic; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialMetadata; +import p.studio.api.assets.metadata.AssetStudioSceneBankMetadata; import java.util.List; import java.util.Map; @@ -14,24 +12,24 @@ import java.util.Objects; public record AssetWorkspaceAssetDetails( AssetWorkspaceAssetSummary summary, List actions, - OutputFormatCatalog outputFormat, - OutputCodecCatalog outputCodec, - List availableOutputCodecs, - Map> codecConfigurationFieldsByCodec, - List metadataFields, + String outputFormat, + String outputCodec, + List availableOutputCodecs, + Map> codecConfigurationFieldsByCodec, + List metadataFields, Map outputPipeline, AssetWorkspaceBankCompositionDetails bankComposition, List> pipelinePalettes, AssetStudioGlyphMaterialMetadata glyphMaterialMetadata, AssetStudioSceneBankMetadata sceneBankMetadata, AssetWorkspaceSceneBankValidation sceneBankValidation, - List diagnostics) { + List diagnostics) { public AssetWorkspaceAssetDetails { Objects.requireNonNull(summary, "summary"); actions = List.copyOf(Objects.requireNonNull(actions, "actions")); - outputFormat = Objects.requireNonNullElse(outputFormat, OutputFormatCatalog.UNKNOWN); - outputCodec = Objects.requireNonNullElse(outputCodec, OutputCodecCatalog.UNKNOWN); + outputFormat = Objects.requireNonNullElse(outputFormat, "UNKNOWN"); + outputCodec = Objects.requireNonNullElse(outputCodec, "UNKNOWN"); availableOutputCodecs = List.copyOf(Objects.requireNonNull(availableOutputCodecs, "availableOutputCodecs")); codecConfigurationFieldsByCodec = Map.copyOf(Objects.requireNonNull(codecConfigurationFieldsByCodec, "codecConfigurationFieldsByCodec")); metadataFields = List.copyOf(Objects.requireNonNull(metadataFields, "metadataFields")); diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceAssetState.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceAssetState.java similarity index 62% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceAssetState.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceAssetState.java index 92a45749..68955b91 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceAssetState.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceAssetState.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.messages; +package p.studio.api.assets.workspace; public enum AssetWorkspaceAssetState { REGISTERED, diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceAssetSummary.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceAssetSummary.java similarity index 84% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceAssetSummary.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceAssetSummary.java index bca9b9ca..c8ae3286 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceAssetSummary.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceAssetSummary.java @@ -1,8 +1,8 @@ -package p.studio.workspaces.assets.messages; +package p.studio.api.assets.workspace; -import p.packer.messages.AssetReference; -import p.packer.messages.assets.AssetFamilyCatalog; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphSpecialization; +import p.studio.api.assets.AssetReference; +import p.studio.api.assets.AssetFamily; +import p.studio.api.assets.metadata.AssetStudioGlyphSpecialization; import java.nio.file.Path; import java.util.Objects; @@ -13,7 +13,7 @@ public record AssetWorkspaceAssetSummary( AssetWorkspaceAssetState state, AssetWorkspaceBuildParticipation buildParticipation, Integer assetId, - AssetFamilyCatalog assetFamily, + AssetFamily assetFamily, AssetStudioGlyphSpecialization glyphSpecialization, Path assetRoot, boolean preload, @@ -24,7 +24,7 @@ public record AssetWorkspaceAssetSummary( assetName = Objects.requireNonNull(assetName, "assetName").trim(); Objects.requireNonNull(state, "state"); Objects.requireNonNull(buildParticipation, "buildParticipation"); - assetFamily = Objects.requireNonNullElse(assetFamily, AssetFamilyCatalog.UNKNOWN); + assetFamily = Objects.requireNonNullElse(assetFamily, AssetFamily.UNKNOWN); glyphSpecialization = Objects.requireNonNullElse(glyphSpecialization, AssetStudioGlyphSpecialization.NONE); assetRoot = Objects.requireNonNull(assetRoot, "assetRoot").toAbsolutePath().normalize(); if (assetName.isBlank()) { diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceBankCompositionDetails.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceBankCompositionDetails.java similarity index 94% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceBankCompositionDetails.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceBankCompositionDetails.java index 6d3b5b03..fcaa6d39 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceBankCompositionDetails.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceBankCompositionDetails.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.messages; +package p.studio.api.assets.workspace; import java.util.List; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceBankCompositionFile.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceBankCompositionFile.java similarity index 96% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceBankCompositionFile.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceBankCompositionFile.java index 3e60a471..c5470458 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceBankCompositionFile.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceBankCompositionFile.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.messages; +package p.studio.api.assets.workspace; import java.util.LinkedHashMap; import java.util.Map; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceBuildParticipation.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceBuildParticipation.java similarity index 63% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceBuildParticipation.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceBuildParticipation.java index cbd750e7..88e7c2ff 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceBuildParticipation.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceBuildParticipation.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.messages; +package p.studio.api.assets.workspace; public enum AssetWorkspaceBuildParticipation { INCLUDED, diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceSceneBankStatus.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceSceneBankStatus.java similarity index 77% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceSceneBankStatus.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceSceneBankStatus.java index 72090756..eddf3ce4 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceSceneBankStatus.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceSceneBankStatus.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.messages; +package p.studio.api.assets.workspace; public enum AssetWorkspaceSceneBankStatus { NOT_APPLICABLE, diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceSceneBankValidation.java b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceSceneBankValidation.java similarity index 95% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceSceneBankValidation.java rename to prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceSceneBankValidation.java index df80e247..af944c09 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceSceneBankValidation.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/assets/workspace/AssetWorkspaceSceneBankValidation.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.messages; +package p.studio.api.assets.workspace; import java.util.Objects; diff --git a/prometeu-studio-api/src/main/java/p/studio/api/diagnostic/DiagnosticSeverity.java b/prometeu-studio-api/src/main/java/p/studio/api/diagnostic/DiagnosticSeverity.java new file mode 100644 index 00000000..03cd5670 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/diagnostic/DiagnosticSeverity.java @@ -0,0 +1,7 @@ +package p.studio.api.diagnostic; + +public enum DiagnosticSeverity { + INFO, + WARNING, + ERROR +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/diagnostic/StudioDiagnostic.java b/prometeu-studio-api/src/main/java/p/studio/api/diagnostic/StudioDiagnostic.java new file mode 100644 index 00000000..2e14d94f --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/diagnostic/StudioDiagnostic.java @@ -0,0 +1,14 @@ +package p.studio.api.diagnostic; + +import java.util.Objects; + +public record StudioDiagnostic(String code, DiagnosticSeverity severity, String message) { + public StudioDiagnostic { + Objects.requireNonNull(code, "code"); + Objects.requireNonNull(severity, "severity"); + Objects.requireNonNull(message, "message"); + if (code.isBlank()) { + throw new IllegalArgumentException("code must not be blank"); + } + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionController.java b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionController.java new file mode 100644 index 00000000..dc0fc54e --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionController.java @@ -0,0 +1,16 @@ +package p.studio.api.execution; + +import p.studio.api.operation.OperationHandle; + +public interface ExecutionController extends AutoCloseable { + OperationHandle play(); + + void stop(); + + default void shutdown() { + close(); + } + + @Override + void close(); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionControllerFactory.java b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionControllerFactory.java new file mode 100644 index 00000000..0f6c22cf --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionControllerFactory.java @@ -0,0 +1,8 @@ +package p.studio.api.execution; + +import p.studio.api.project.ProjectLocalStudioSetup; +import p.studio.api.project.ProjectReference; + +public interface ExecutionControllerFactory { + ExecutionController create(ProjectReference project, ProjectLocalStudioSetup setup, ExecutionSession session); +} diff --git a/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionLogEntry.java b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionLogEntry.java similarity index 76% rename from prometeu-studio/src/main/java/p/studio/execution/StudioExecutionLogEntry.java rename to prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionLogEntry.java index ad6e9b4d..5b629a41 100644 --- a/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionLogEntry.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionLogEntry.java @@ -1,16 +1,16 @@ -package p.studio.execution; +package p.studio.api.execution; import java.time.Instant; import java.util.Objects; -public record StudioExecutionLogEntry( +public record ExecutionLogEntry( long sequence, Instant timestamp, - StudioExecutionLogSource source, - StudioExecutionLogSeverity severity, + ExecutionLogSource source, + ExecutionLogSeverity severity, String message) { - public StudioExecutionLogEntry { + public ExecutionLogEntry { if (sequence <= 0L) { throw new IllegalArgumentException("sequence must be positive"); } diff --git a/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionLogSeverity.java b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionLogSeverity.java new file mode 100644 index 00000000..008341f1 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionLogSeverity.java @@ -0,0 +1,6 @@ +package p.studio.api.execution; + +public enum ExecutionLogSeverity { + INFO, + ERROR +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionLogSource.java b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionLogSource.java new file mode 100644 index 00000000..41b4faef --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionLogSource.java @@ -0,0 +1,9 @@ +package p.studio.api.execution; + +public enum ExecutionLogSource { + BUILD, + PACK_VALIDATION, + PACK, + MANIFEST, + RUNTIME +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionSession.java b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionSession.java new file mode 100644 index 00000000..c05a2eb0 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionSession.java @@ -0,0 +1,36 @@ +package p.studio.api.execution; + +import p.studio.api.operation.OperationSubscription; +import p.studio.api.shipper.ShipperLogEntry; + +import java.time.Instant; +import java.util.function.Consumer; + +public interface ExecutionSession extends AutoCloseable { + ExecutionSnapshot snapshot(); + + OperationSubscription subscribe(Consumer listener); + + void beginPreparationCycle(); + + void transitionToPrepareFailed(); + + void transitionToConnecting(); + + void transitionToRunning(); + + void transitionToRuntimeFailed(); + + void transitionToStopped(); + + void resetToIdle(); + + void appendShipperLog(ShipperLogEntry entry); + + void appendRuntimeLog(ExecutionLogSeverity severity, String message); + + void appendRuntimeLog(ExecutionLogSeverity severity, String message, Instant timestamp); + + @Override + void close(); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionSnapshot.java b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionSnapshot.java new file mode 100644 index 00000000..e7b0ecf1 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionSnapshot.java @@ -0,0 +1,11 @@ +package p.studio.api.execution; + +import java.util.List; +import java.util.Objects; + +public record ExecutionSnapshot(ExecutionState state, List logs) { + public ExecutionSnapshot { + Objects.requireNonNull(state, "state"); + logs = List.copyOf(Objects.requireNonNull(logs, "logs")); + } +} diff --git a/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionState.java b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionState.java similarity index 63% rename from prometeu-studio/src/main/java/p/studio/execution/StudioExecutionState.java rename to prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionState.java index 49e3e6d3..825f43c5 100644 --- a/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionState.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/execution/ExecutionState.java @@ -1,6 +1,6 @@ -package p.studio.execution; +package p.studio.api.execution; -public enum StudioExecutionState { +public enum ExecutionState { IDLE, PREPARING, PREPARE_FAILED, diff --git a/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationExecutor.java b/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationExecutor.java new file mode 100644 index 00000000..b70af1c7 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationExecutor.java @@ -0,0 +1,7 @@ +package p.studio.api.operation; + +import java.util.concurrent.Callable; + +public interface OperationExecutor { + OperationHandle submit(String summary, Callable operation); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationHandle.java b/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationHandle.java new file mode 100644 index 00000000..56edd2c3 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationHandle.java @@ -0,0 +1,16 @@ +package p.studio.api.operation; + +import java.util.concurrent.CompletionStage; +import java.util.function.Consumer; + +public interface OperationHandle { + OperationId id(); + + OperationSnapshot snapshot(); + + CompletionStage completion(); + + boolean cancel(); + + OperationSubscription subscribe(Consumer subscriber); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationId.java b/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationId.java new file mode 100644 index 00000000..419bfc8e --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationId.java @@ -0,0 +1,12 @@ +package p.studio.api.operation; + +import java.util.Objects; + +public record OperationId(String value) { + public OperationId { + Objects.requireNonNull(value, "value"); + if (value.isBlank()) { + throw new IllegalArgumentException("value must not be blank"); + } + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationSnapshot.java b/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationSnapshot.java new file mode 100644 index 00000000..a2e894a5 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationSnapshot.java @@ -0,0 +1,17 @@ +package p.studio.api.operation; + +import java.time.Instant; +import java.util.Objects; + +public record OperationSnapshot( + OperationId id, + OperationState state, + Instant updatedAt, + String summary) { + public OperationSnapshot { + Objects.requireNonNull(id, "id"); + Objects.requireNonNull(state, "state"); + Objects.requireNonNull(updatedAt, "updatedAt"); + summary = Objects.requireNonNullElse(summary, ""); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationState.java b/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationState.java new file mode 100644 index 00000000..22fcc8c1 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationState.java @@ -0,0 +1,9 @@ +package p.studio.api.operation; + +public enum OperationState { + PENDING, + RUNNING, + SUCCEEDED, + FAILED, + CANCELLED +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationSubscription.java b/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationSubscription.java new file mode 100644 index 00000000..fc8719e3 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/operation/OperationSubscription.java @@ -0,0 +1,11 @@ +package p.studio.api.operation; + +@FunctionalInterface +public interface OperationSubscription extends AutoCloseable { + @Override + void close(); + + default void unsubscribe() { + close(); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/preferences/ProjectActivityHistoryStore.java b/prometeu-studio-api/src/main/java/p/studio/api/preferences/ProjectActivityHistoryStore.java new file mode 100644 index 00000000..bff4f45b --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/preferences/ProjectActivityHistoryStore.java @@ -0,0 +1,11 @@ +package p.studio.api.preferences; + +import p.studio.api.project.ProjectReference; + +import java.util.List; + +public interface ProjectActivityHistoryStore { + List load(ProjectReference projectReference); + + void save(ProjectReference projectReference, List entries); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/preferences/ProjectActivityRecord.java b/prometeu-studio-api/src/main/java/p/studio/api/preferences/ProjectActivityRecord.java new file mode 100644 index 00000000..6d80ea4b --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/preferences/ProjectActivityRecord.java @@ -0,0 +1,11 @@ +package p.studio.api.preferences; + +import java.util.Objects; + +public record ProjectActivityRecord(String source, String message, String severity, boolean sticky) { + public ProjectActivityRecord { + source = Objects.requireNonNull(source, "source"); + message = Objects.requireNonNull(message, "message"); + severity = Objects.requireNonNull(severity, "severity"); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/preferences/WindowGeometry.java b/prometeu-studio-api/src/main/java/p/studio/api/preferences/WindowGeometry.java new file mode 100644 index 00000000..81e4d164 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/preferences/WindowGeometry.java @@ -0,0 +1,4 @@ +package p.studio.api.preferences; + +public record WindowGeometry(double x, double y, double width, double height, boolean maximized) { +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/preferences/WindowStateStore.java b/prometeu-studio-api/src/main/java/p/studio/api/preferences/WindowStateStore.java new file mode 100644 index 00000000..6ce3b4ac --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/preferences/WindowStateStore.java @@ -0,0 +1,11 @@ +package p.studio.api.preferences; + +import p.studio.api.project.ProjectReference; + +import java.util.Optional; + +public interface WindowStateStore { + Optional load(ProjectReference projectReference); + + void save(ProjectReference projectReference, WindowGeometry geometry); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/project/KnownProjects.java b/prometeu-studio-api/src/main/java/p/studio/api/project/KnownProjects.java new file mode 100644 index 00000000..609014de --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/project/KnownProjects.java @@ -0,0 +1,11 @@ +package p.studio.api.project; + +import java.util.List; + +public interface KnownProjects { + List listKnownProjects(); + + void remember(ProjectReference projectReference); + + void forget(ProjectReference projectReference); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectCatalog.java b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectCatalog.java new file mode 100644 index 00000000..a8433aa1 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectCatalog.java @@ -0,0 +1,16 @@ +package p.studio.api.project; + +import java.nio.file.Path; +import java.util.List; + +public interface ProjectCatalog { + Path projectsRoot(); + + List listProjects(); + + ProjectReference openProject(Path projectPath); + + ProjectReference openProjectManifest(Path manifestPath); + + ProjectReference createProject(ProjectCreationRequest request); +} diff --git a/prometeu-studio/src/main/java/p/studio/projects/ProjectCreationRequest.java b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectCreationRequest.java similarity index 77% rename from prometeu-studio/src/main/java/p/studio/projects/ProjectCreationRequest.java rename to prometeu-studio-api/src/main/java/p/studio/api/project/ProjectCreationRequest.java index 8a5bbf63..2a1c05d2 100644 --- a/prometeu-studio/src/main/java/p/studio/projects/ProjectCreationRequest.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectCreationRequest.java @@ -1,6 +1,4 @@ -package p.studio.projects; - -import p.studio.AppMode; +package p.studio.api.project; import java.nio.file.Path; @@ -9,7 +7,7 @@ public record ProjectCreationRequest( Path parentLocation, String languageId, int stdlib, - AppMode target, + ProjectTarget target, String sourceRoot, int indentationWidth, String runtimePath) { diff --git a/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectLanguageCatalog.java b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectLanguageCatalog.java new file mode 100644 index 00000000..e1a601d0 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectLanguageCatalog.java @@ -0,0 +1,12 @@ +package p.studio.api.project; + +import java.util.List; + +public interface ProjectLanguageCatalog { + List listLanguageTemplates(); + + default ProjectLanguageTemplate defaultTemplate() { + return listLanguageTemplates().stream().findFirst() + .orElseThrow(() -> new IllegalStateException("no frontend languages are registered")); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectLanguageTemplate.java b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectLanguageTemplate.java new file mode 100644 index 00000000..67c557e9 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectLanguageTemplate.java @@ -0,0 +1,40 @@ +package p.studio.api.project; + +import java.util.List; +import java.util.Objects; + +public record ProjectLanguageTemplate( + String languageId, + List stdlibOptions, + StdlibOption defaultStdlib, + List sourceRoots, + String defaultSourceRoot) { + public ProjectLanguageTemplate { + languageId = Objects.requireNonNull(languageId, "languageId"); + stdlibOptions = List.copyOf(stdlibOptions); + Objects.requireNonNull(defaultStdlib, "defaultStdlib"); + sourceRoots = List.copyOf(sourceRoots); + defaultSourceRoot = Objects.requireNonNull(defaultSourceRoot, "defaultSourceRoot"); + } + + public enum Stability { + DEFAULT, + STABLE, + EXPERIMENTAL + } + + public record StdlibOption(int version, Stability stability) { + public StdlibOption { + Objects.requireNonNull(stability, "stability"); + } + + @Override + public String toString() { + return switch (stability) { + case DEFAULT -> version + " (default)"; + case STABLE -> version + " (stable)"; + case EXPERIMENTAL -> version + " (experimental)"; + }; + } + } +} diff --git a/prometeu-studio/src/main/java/p/studio/projectstate/ProjectLocalStudioSetup.java b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectLocalStudioSetup.java similarity index 58% rename from prometeu-studio/src/main/java/p/studio/projectstate/ProjectLocalStudioSetup.java rename to prometeu-studio-api/src/main/java/p/studio/api/project/ProjectLocalStudioSetup.java index aba2747f..22f54e0b 100644 --- a/prometeu-studio/src/main/java/p/studio/projectstate/ProjectLocalStudioSetup.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectLocalStudioSetup.java @@ -1,8 +1,5 @@ -package p.studio.projectstate; +package p.studio.api.project; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown = true) public record ProjectLocalStudioSetup( String prometeuRuntimePath, EditorIndentationSetup editorIndentation) { @@ -17,7 +14,7 @@ public record ProjectLocalStudioSetup( return new ProjectLocalStudioSetup(null, EditorIndentationSetup.defaults()); } - private static String normalizeText(final String value) { + private static String normalizeText(String value) { if (value == null) { return null; } @@ -25,16 +22,13 @@ public record ProjectLocalStudioSetup( return trimmed.isEmpty() ? null : trimmed; } - @JsonIgnoreProperties(ignoreUnknown = true) - public record EditorIndentationSetup( - String mode, - Integer width) { + public record EditorIndentationSetup(String mode, Integer width) { private static final String DEFAULT_MODE = "spaces"; private static final int DEFAULT_WIDTH = 4; public EditorIndentationSetup { mode = normalizeMode(mode); - width = normalizeWidth(width); + width = width == null || width <= 0 ? DEFAULT_WIDTH : width; } public static EditorIndentationSetup defaults() { @@ -46,35 +40,21 @@ public record ProjectLocalStudioSetup( } public String statusLabel() { - return switch (mode) { - case "tabs" -> "Tabs: " + width; - default -> "Spaces: " + width; - }; + return "tabs".equals(mode) ? "Tabs: " + width : "Spaces: " + width; } public String tabInsertion() { return " ".repeat(width); } - private static String normalizeMode(final String value) { + private static String normalizeMode(String value) { if (value == null) { return DEFAULT_MODE; } - final String normalized = value.trim().toLowerCase(); - if (normalized.isBlank()) { - return DEFAULT_MODE; - } - return switch (normalized) { - case "tabs", "spaces" -> normalized; + return switch (value.trim().toLowerCase()) { + case "tabs" -> "tabs"; default -> DEFAULT_MODE; }; } - - private static Integer normalizeWidth(final Integer value) { - if (value == null || value <= 0) { - return DEFAULT_WIDTH; - } - return value; - } } } diff --git a/prometeu-studio/src/main/java/p/studio/projectstate/ProjectLocalStudioState.java b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectLocalStudioState.java similarity index 65% rename from prometeu-studio/src/main/java/p/studio/projectstate/ProjectLocalStudioState.java rename to prometeu-studio-api/src/main/java/p/studio/api/project/ProjectLocalStudioState.java index 120b6c36..dbda1c71 100644 --- a/prometeu-studio/src/main/java/p/studio/projectstate/ProjectLocalStudioState.java +++ b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectLocalStudioState.java @@ -1,15 +1,9 @@ -package p.studio.projectstate; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +package p.studio.api.project; import java.util.ArrayList; import java.util.List; -@JsonIgnoreProperties(ignoreUnknown = true) -public record ProjectLocalStudioState( - int version, - ShellLayout shellLayout, - OpenShellState openShellState) { +public record ProjectLocalStudioState(int version, ShellLayout shellLayout, OpenShellState openShellState) { public static final int CURRENT_VERSION = 1; public ProjectLocalStudioState { @@ -19,21 +13,17 @@ public record ProjectLocalStudioState( } public static ProjectLocalStudioState defaults() { - return new ProjectLocalStudioState( - CURRENT_VERSION, - ShellLayout.defaults(), - OpenShellState.defaults()); + return new ProjectLocalStudioState(CURRENT_VERSION, ShellLayout.defaults(), OpenShellState.defaults()); } - public ProjectLocalStudioState withShellLayout(final ShellLayout nextShellLayout) { - return new ProjectLocalStudioState(version, nextShellLayout, openShellState); + public ProjectLocalStudioState withShellLayout(ShellLayout value) { + return new ProjectLocalStudioState(version, value, openShellState); } - public ProjectLocalStudioState withOpenShellState(final OpenShellState nextOpenShellState) { - return new ProjectLocalStudioState(version, shellLayout, nextOpenShellState); + public ProjectLocalStudioState withOpenShellState(OpenShellState value) { + return new ProjectLocalStudioState(version, shellLayout, value); } - @JsonIgnoreProperties(ignoreUnknown = true) public record ShellLayout(AssetsLayoutState assetsLayout) { public ShellLayout { assetsLayout = assetsLayout == null ? AssetsLayoutState.defaults() : assetsLayout.normalize(); @@ -48,7 +38,6 @@ public record ProjectLocalStudioState( } } - @JsonIgnoreProperties(ignoreUnknown = true) public record AssetsLayoutState(List contentSplitDividers) { public AssetsLayoutState { contentSplitDividers = normalizeDividerPositions(contentSplitDividers); @@ -63,7 +52,6 @@ public record ProjectLocalStudioState( } } - @JsonIgnoreProperties(ignoreUnknown = true) public record OpenShellState(String selectedWorkspaceId) { public OpenShellState { selectedWorkspaceId = normalizeText(selectedWorkspaceId); @@ -81,7 +69,7 @@ public record ProjectLocalStudioState( } } - private static String normalizeText(final String value) { + private static String normalizeText(String value) { if (value == null) { return null; } @@ -89,16 +77,15 @@ public record ProjectLocalStudioState( return trimmed.isEmpty() ? null : trimmed; } - private static List normalizeDividerPositions(final List values) { + private static List normalizeDividerPositions(List values) { if (values == null || values.isEmpty()) { return List.of(); } final List normalized = new ArrayList<>(); - for (final Double value : values) { - if (value == null || value.isNaN() || value.isInfinite()) { - continue; + for (Double value : values) { + if (value != null && !value.isNaN() && !value.isInfinite()) { + normalized.add(Math.max(0.0d, Math.min(1.0d, value))); } - normalized.add(Math.max(0.0d, Math.min(1.0d, value))); } return List.copyOf(normalized); } diff --git a/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectReference.java b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectReference.java new file mode 100644 index 00000000..d2fd0115 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectReference.java @@ -0,0 +1,36 @@ +package p.studio.api.project; + +import java.nio.file.Path; +import java.util.Objects; + +public record ProjectReference( + String name, + String version, + String languageId, + int stdlibVersion, + ProjectTarget target, + Path rootPath) { + public ProjectReference { + name = requireText(name, "name"); + version = requireText(version, "version"); + languageId = requireText(languageId, "languageId"); + if (stdlibVersion <= 0) { + throw new IllegalArgumentException("stdlibVersion must be positive"); + } + Objects.requireNonNull(target, "target"); + rootPath = Objects.requireNonNull(rootPath, "rootPath").toAbsolutePath().normalize(); + } + + @Override + public String toString() { + return name; + } + + private static String requireText(String value, String label) { + final String normalized = Objects.requireNonNull(value, label).trim(); + if (normalized.isEmpty()) { + throw new IllegalArgumentException(label + " must not be blank"); + } + return normalized; + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectTarget.java b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectTarget.java new file mode 100644 index 00000000..c927da11 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectTarget.java @@ -0,0 +1,16 @@ +package p.studio.api.project; + +public enum ProjectTarget { + Game("Game"), + Shell("Shell"); + + private final String reference; + + ProjectTarget(String reference) { + this.reference = reference; + } + + public String exportReferenceName() { + return reference; + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectWorkspaceInitializer.java b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectWorkspaceInitializer.java new file mode 100644 index 00000000..a77e206a --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/project/ProjectWorkspaceInitializer.java @@ -0,0 +1,6 @@ +package p.studio.api.project; + +@FunctionalInterface +public interface ProjectWorkspaceInitializer { + void initialize(ProjectReference project); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/runtime/RuntimeLogEntry.java b/prometeu-studio-api/src/main/java/p/studio/api/runtime/RuntimeLogEntry.java new file mode 100644 index 00000000..b80ff1de --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/runtime/RuntimeLogEntry.java @@ -0,0 +1,23 @@ +package p.studio.api.runtime; + +import p.studio.api.execution.ExecutionLogSeverity; + +import java.time.Instant; +import java.util.Objects; + +public record RuntimeLogEntry(ExecutionLogSeverity severity, String message, Instant timestamp) { + public RuntimeLogEntry { + Objects.requireNonNull(severity, "severity"); + message = Objects.requireNonNull(message, "message").trim(); + if (message.isBlank()) throw new IllegalArgumentException("message must not be blank"); + timestamp = timestamp == null ? Instant.now() : timestamp; + } + + public static RuntimeLogEntry info(String message) { + return new RuntimeLogEntry(ExecutionLogSeverity.INFO, message, Instant.now()); + } + + public static RuntimeLogEntry error(String message) { + return new RuntimeLogEntry(ExecutionLogSeverity.ERROR, message, Instant.now()); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/session/ProjectSession.java b/prometeu-studio-api/src/main/java/p/studio/api/session/ProjectSession.java new file mode 100644 index 00000000..6210746e --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/session/ProjectSession.java @@ -0,0 +1,23 @@ +package p.studio.api.session; + +import p.studio.api.execution.ExecutionSession; +import p.studio.api.project.ProjectLocalStudioSetup; +import p.studio.api.project.ProjectLocalStudioState; +import p.studio.api.project.ProjectReference; + +public interface ProjectSession extends AutoCloseable { + ProjectReference projectReference(); + + ProjectLocalStudioState projectLocalStudioState(); + + ProjectLocalStudioSetup projectLocalStudioSetup(); + + ExecutionSession executionSession(); + + void replaceProjectLocalStudioState(ProjectLocalStudioState state); + + void saveProjectLocalStudioState(); + + @Override + void close(); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/session/ProjectSessionFactory.java b/prometeu-studio-api/src/main/java/p/studio/api/session/ProjectSessionFactory.java new file mode 100644 index 00000000..7dfe2b9c --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/session/ProjectSessionFactory.java @@ -0,0 +1,7 @@ +package p.studio.api.session; + +import p.studio.api.project.ProjectReference; + +public interface ProjectSessionFactory { + ProjectSession open(ProjectReference projectReference); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/shipper/Shipper.java b/prometeu-studio-api/src/main/java/p/studio/api/shipper/Shipper.java new file mode 100644 index 00000000..f1f4f175 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/shipper/Shipper.java @@ -0,0 +1,10 @@ +package p.studio.api.shipper; + +import p.studio.api.project.ProjectReference; +import p.studio.api.operation.OperationHandle; + +import java.util.function.Consumer; + +public interface Shipper { + OperationHandle prepare(ProjectReference project, Consumer logSink); +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/shipper/ShipperLogEntry.java b/prometeu-studio-api/src/main/java/p/studio/api/shipper/ShipperLogEntry.java new file mode 100644 index 00000000..d78bc43b --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/shipper/ShipperLogEntry.java @@ -0,0 +1,28 @@ +package p.studio.api.shipper; + +import java.time.Instant; +import java.util.Objects; + +public record ShipperLogEntry( + ShipperLogSource source, + ShipperLogSeverity severity, + String message, + Instant timestamp) { + public ShipperLogEntry { + Objects.requireNonNull(source, "source"); + Objects.requireNonNull(severity, "severity"); + message = Objects.requireNonNull(message, "message").trim(); + timestamp = timestamp == null ? Instant.now() : timestamp; + if (message.isEmpty()) { + throw new IllegalArgumentException("message must not be blank"); + } + } + + public static ShipperLogEntry info(ShipperLogSource source, String message) { + return new ShipperLogEntry(source, ShipperLogSeverity.INFO, message, Instant.now()); + } + + public static ShipperLogEntry error(ShipperLogSource source, String message) { + return new ShipperLogEntry(source, ShipperLogSeverity.ERROR, message, Instant.now()); + } +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/shipper/ShipperLogSeverity.java b/prometeu-studio-api/src/main/java/p/studio/api/shipper/ShipperLogSeverity.java new file mode 100644 index 00000000..71fa272c --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/shipper/ShipperLogSeverity.java @@ -0,0 +1,6 @@ +package p.studio.api.shipper; + +public enum ShipperLogSeverity { + INFO, + ERROR +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/shipper/ShipperLogSource.java b/prometeu-studio-api/src/main/java/p/studio/api/shipper/ShipperLogSource.java new file mode 100644 index 00000000..f06acdd5 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/shipper/ShipperLogSource.java @@ -0,0 +1,8 @@ +package p.studio.api.shipper; + +public enum ShipperLogSource { + BUILD, + PACK_VALIDATION, + PACK, + MANIFEST +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/shipper/ShipperPreparationStatus.java b/prometeu-studio-api/src/main/java/p/studio/api/shipper/ShipperPreparationStatus.java new file mode 100644 index 00000000..2cd5b103 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/shipper/ShipperPreparationStatus.java @@ -0,0 +1,6 @@ +package p.studio.api.shipper; + +public enum ShipperPreparationStatus { + SUCCESS, + FAILED +} diff --git a/prometeu-studio-api/src/main/java/p/studio/api/shipper/ShipperPrepareResult.java b/prometeu-studio-api/src/main/java/p/studio/api/shipper/ShipperPrepareResult.java new file mode 100644 index 00000000..2cf383a0 --- /dev/null +++ b/prometeu-studio-api/src/main/java/p/studio/api/shipper/ShipperPrepareResult.java @@ -0,0 +1,28 @@ +package p.studio.api.shipper; + +import java.nio.file.Path; +import java.util.List; +import java.util.Objects; + +public record ShipperPrepareResult( + ShipperPreparationStatus status, + List logs, + Path manifestPath, + List emittedArtifacts, + List diagnostics) { + public ShipperPrepareResult { + Objects.requireNonNull(status, "status"); + logs = List.copyOf(Objects.requireNonNull(logs, "logs")); + manifestPath = manifestPath == null ? null : manifestPath.toAbsolutePath().normalize(); + emittedArtifacts = List.copyOf(Objects.requireNonNull(emittedArtifacts, "emittedArtifacts")); + diagnostics = List.copyOf(Objects.requireNonNull(diagnostics, "diagnostics")); + } + + public boolean success() { + return status == ShipperPreparationStatus.SUCCESS; + } + + public static ShipperPrepareResult failed(List logs, List diagnostics) { + return new ShipperPrepareResult(ShipperPreparationStatus.FAILED, logs, null, List.of(), diagnostics); + } +} diff --git a/prometeu-studio-api/src/test/java/p/studio/api/operation/OperationIdTest.java b/prometeu-studio-api/src/test/java/p/studio/api/operation/OperationIdTest.java new file mode 100644 index 00000000..bd11e1d5 --- /dev/null +++ b/prometeu-studio-api/src/test/java/p/studio/api/operation/OperationIdTest.java @@ -0,0 +1,18 @@ +package p.studio.api.operation; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +class OperationIdTest { + @Test + void rejectsBlankValues() { + assertThrows(IllegalArgumentException.class, () -> new OperationId(" ")); + } + + @Test + void preservesStableValue() { + assertEquals("build-42", new OperationId("build-42").value()); + } +} diff --git a/prometeu-studio-core/build.gradle.kts b/prometeu-studio-core/build.gradle.kts new file mode 100644 index 00000000..33223cc5 --- /dev/null +++ b/prometeu-studio-core/build.gradle.kts @@ -0,0 +1,12 @@ +plugins { + id("gradle.java-library-conventions") +} + +dependencies { + api(project(":prometeu-studio-api")) + implementation(project(":prometeu-packer:prometeu-packer-api")) + implementation(libs.jackson.databind) + + testImplementation(libs.spring.modulith.core) + testImplementation(libs.spring.modulith.docs) +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/StudioCore.java b/prometeu-studio-core/src/main/java/p/studio/core/StudioCore.java new file mode 100644 index 00000000..ff5df86b --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/StudioCore.java @@ -0,0 +1,6 @@ +package p.studio.core; + +public final class StudioCore { + private StudioCore() { + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/assets/AssetsModule.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/AssetsModule.java new file mode 100644 index 00000000..3036b4f7 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/AssetsModule.java @@ -0,0 +1,6 @@ +package p.studio.core.assets; + +final class AssetsModule { + private AssetsModule() { + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/assets/DefaultAssetCapacityPolicy.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/DefaultAssetCapacityPolicy.java new file mode 100644 index 00000000..3e465f8e --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/DefaultAssetCapacityPolicy.java @@ -0,0 +1,89 @@ +package p.studio.core.assets; + +import p.studio.api.assets.AssetCapacityLevel; +import p.studio.api.assets.AssetCapacityPolicy; +import p.studio.api.assets.AssetCapacityState; +import p.studio.api.assets.AssetFamily; + +import java.util.Map; +import java.util.Objects; + +public final class DefaultAssetCapacityPolicy implements AssetCapacityPolicy { + private static final int TILE_ATLAS_SIZE_PX = 256; + private static final long SOUND_BANK_MAX_BYTES = 1024L * 1024L; + + @Override + public AssetCapacityState evaluate(AssetFamily family, int artifactCount, Map metadata, + Map pipeline, long usedBytes) { + final AssetFamily safeFamily = Objects.requireNonNullElse(family, AssetFamily.UNKNOWN); + final Map safeMetadata = Map.copyOf(Objects.requireNonNull(metadata, "metadata")); + final Map safePipeline = Map.copyOf(Objects.requireNonNull(pipeline, "pipeline")); + return switch (safeFamily) { + case GLYPH_BANK -> evaluateGlyphBank(artifactCount, safeMetadata); + case SCENE_BANK -> new AssetCapacityState(0, AssetCapacityLevel.SAFE, false, artifactCount + " support files", ""); + case SOUND_BANK -> evaluateSoundBank(resolveSoundBankUsedBytes(safePipeline, usedBytes)); + case UNKNOWN -> new AssetCapacityState(0, AssetCapacityLevel.SAFE, false, artifactCount + " selected", ""); + }; + } + + @Override + public int maxArtifactsForGlyphBank(Map metadata) { + return switch (Objects.requireNonNull(metadata, "metadata").getOrDefault("tile_size", "16x16")) { + case "8x8" -> slotsForTileSize(8); + case "32x32" -> slotsForTileSize(32); + default -> slotsForTileSize(16); + }; + } + + private AssetCapacityState evaluateGlyphBank(int count, Map metadata) { + final int maximum = maxArtifactsForGlyphBank(metadata); + final int used = Math.max(0, count); + final double progress = maximum <= 0 ? 0 : (double) used / maximum; + final boolean blocked = used >= maximum; + return new AssetCapacityState(progress, levelFor(progress), blocked, used + " / " + maximum, + blocked ? "Glyph bank slot capacity reached." : ""); + } + + private AssetCapacityState evaluateSoundBank(long usedBytes) { + final long used = Math.max(0, usedBytes); + final double progress = (double) used / SOUND_BANK_MAX_BYTES; + final boolean blocked = used >= SOUND_BANK_MAX_BYTES; + return new AssetCapacityState(progress, levelFor(progress), blocked, + used + " / " + SOUND_BANK_MAX_BYTES + " bytes", + blocked ? "Sound bank byte capacity reached." : ""); + } + + private long resolveSoundBankUsedBytes(Map pipeline, long fallback) { + final Object samplesNode = pipeline.get("samples"); + if (!(samplesNode instanceof Map samples)) { + return Math.max(0, fallback); + } + long maximum = 0; + for (Object value : samples.values()) { + if (value instanceof Map sample) { + maximum = Math.max(maximum, Math.max(0, longValue(sample.get("offset"))) + + Math.max(0, Math.max(longValue(sample.get("len")), longValue(sample.get("length"))))); + } + } + return Math.max(maximum, Math.max(0, fallback)); + } + + private long longValue(Object value) { + if (value instanceof Number number) return number.longValue(); + if (value instanceof String text) { + try { return Long.parseLong(text.trim()); } catch (NumberFormatException ignored) { return 0; } + } + return 0; + } + + private int slotsForTileSize(int tileSize) { + final int perAxis = Math.max(1, TILE_ATLAS_SIZE_PX / tileSize); + return perAxis * perAxis; + } + + private AssetCapacityLevel levelFor(double progress) { + if (progress >= 0.95) return AssetCapacityLevel.EXHAUSTED; + if (progress >= 0.65) return AssetCapacityLevel.WARNING; + return AssetCapacityLevel.SAFE; + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/assets/FileSystemAssetWorkspaceStorage.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/FileSystemAssetWorkspaceStorage.java new file mode 100644 index 00000000..c7c13cff --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/FileSystemAssetWorkspaceStorage.java @@ -0,0 +1,43 @@ +package p.studio.core.assets; + +import p.studio.api.assets.AssetWorkspacePreparation; +import p.studio.api.assets.AssetWorkspaceStorage; +import p.studio.api.project.ProjectReference; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Objects; + +public final class FileSystemAssetWorkspaceStorage implements AssetWorkspaceStorage { + @Override + public Path assetsRoot(ProjectReference projectReference) { + return Objects.requireNonNull(projectReference, "projectReference") + .rootPath() + .resolve("assets") + .toAbsolutePath() + .normalize(); + } + + @Override + public AssetWorkspacePreparation prepare(ProjectReference projectReference) { + final Path root = assetsRoot(projectReference); + try { + Files.createDirectories(root); + return new AssetWorkspacePreparation(true, root, ""); + } catch (IOException exception) { + return new AssetWorkspacePreparation(false, root, Objects.requireNonNullElse(exception.getMessage(), "Unable to prepare assets directory.")); + } + } + + @Override + public boolean assetManifestExists(ProjectReference projectReference, String relativeAssetRoot) { + final String candidate = Objects.requireNonNullElse(relativeAssetRoot, "").trim(); + if (candidate.isBlank()) { + return false; + } + final Path root = assetsRoot(projectReference); + final Path assetRoot = root.resolve(candidate).toAbsolutePath().normalize(); + return assetRoot.startsWith(root) && Files.isRegularFile(assetRoot.resolve("asset.json")); + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/assets/PackerAssetCatalog.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/PackerAssetCatalog.java new file mode 100644 index 00000000..4345f9c1 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/PackerAssetCatalog.java @@ -0,0 +1,41 @@ +package p.studio.core.assets; + +import p.packer.PackerWorkspaceService; +import p.packer.messages.ListAssetsRequest; +import p.studio.api.assets.AssetBuildParticipation; +import p.studio.api.assets.AssetCatalog; +import p.studio.api.assets.AssetFamily; +import p.studio.api.assets.AssetReference; +import p.studio.api.assets.AssetRegistrationState; +import p.studio.api.assets.AssetSummary; +import p.studio.api.project.ProjectReference; + +import java.util.List; +import java.util.Objects; + +public final class PackerAssetCatalog implements AssetCatalog { + private final PackerWorkspaceService packer; + + public PackerAssetCatalog(PackerWorkspaceService packer) { + this.packer = Objects.requireNonNull(packer, "packer"); + } + + @Override + public List list(ProjectReference projectReference, boolean deepSync) { + final var context = new p.packer.messages.PackerProjectContext( + projectReference.name(), + projectReference.rootPath()); + return packer.listAssets(new ListAssetsRequest(context, deepSync)).assets().stream() + .map(summary -> new AssetSummary( + AssetReference.of(summary.assetReference().value()), + summary.identity().assetName(), + AssetRegistrationState.valueOf(summary.state().name()), + AssetBuildParticipation.valueOf(summary.buildParticipation().name()), + summary.identity().assetId(), + AssetFamily.valueOf(summary.assetFamily().name()), + summary.identity().assetRoot(), + summary.preloadEnabled(), + summary.hasDiagnostics())) + .toList(); + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/assets/PackerAssetCommands.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/PackerAssetCommands.java new file mode 100644 index 00000000..a79552cc --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/PackerAssetCommands.java @@ -0,0 +1,103 @@ +package p.studio.core.assets; + +import p.packer.PackerWorkspaceService; +import p.packer.messages.*; +import p.packer.messages.assets.AssetFamilyCatalog; +import p.packer.messages.assets.OutputCodecCatalog; +import p.packer.messages.assets.OutputFormatCatalog; +import p.studio.api.assets.*; +import p.studio.api.assets.AssetReference; +import p.studio.api.project.ProjectReference; + +import java.util.List; +import java.util.Map; +import java.util.Objects; + +public final class PackerAssetCommands implements AssetCommands { + private final PackerWorkspaceService packer; + + public PackerAssetCommands(PackerWorkspaceService packer) { + this.packer = Objects.requireNonNull(packer, "packer"); + } + + @Override + public AssetMutationResult create(ProjectReference project, String assetRoot, String assetName, + AssetFamily assetFamily, String outputFormat, String outputCodec, boolean preloadEnabled) { + final var result = packer.createAsset(new CreateAssetRequest( + context(project), assetRoot, assetName, + AssetFamilyCatalog.valueOf(assetFamily.name()), + OutputFormatCatalog.valueOf(outputFormat), + OutputCodecCatalog.valueOf(outputCodec), + preloadEnabled)); + return mutation(result.status(), result.summary(), result.assetReference(), result.assetRoot(), result.manifestPath()); + } + + @Override + public AssetMutationResult move(ProjectReference project, AssetReference assetReference, String targetRoot) { + final var result = packer.moveAsset(new MoveAssetRequest(context(project), reference(assetReference), targetRoot)); + return mutation(result.status(), result.summary(), result.assetReference(), result.assetRoot(), result.manifestPath()); + } + + @Override + public AssetMutationResult register(ProjectReference project, AssetReference assetReference) { + final var result = packer.registerAsset(new RegisterAssetRequest(context(project), reference(assetReference))); + return mutation(result.status(), result.summary(), result.assetReference(), result.assetRoot(), result.manifestPath()); + } + + @Override + public AssetMutationResult delete(ProjectReference project, AssetReference assetReference) { + final var result = packer.deleteAsset(new DeleteAssetRequest(context(project), reference(assetReference))); + return mutation(result.status(), result.summary(), reference(assetReference), result.assetRoot(), result.manifestPath()); + } + + @Override + public AssetMutationResult updateBuildParticipation(ProjectReference project, AssetReference assetReference, + boolean includeInBuild) { + final var result = packer.updateAssetBuildParticipation(new UpdateAssetBuildParticipationRequest( + context(project), reference(assetReference), includeInBuild)); + return mutation(result.status(), result.summary(), result.assetReference(), null, null); + } + + @Override + public AssetUpdateResult updateContract(ProjectReference project, AssetReference assetReference, boolean preload, + String outputCodec, Map codecFieldValues, Map metadataFieldValues) { + final var result = packer.updateAssetContract(new UpdateAssetContractRequest( + context(project), reference(assetReference), preload, OutputCodecCatalog.valueOf(outputCodec), + codecFieldValues, metadataFieldValues)); + return new AssetUpdateResult(result.success(), result.errorMessage()); + } + + @Override + public AssetUpdateResult applyBankComposition(ProjectReference project, AssetReference assetReference, + List selectedPaths) { + final var result = packer.applyBankComposition(new ApplyBankCompositionRequest( + context(project), reference(assetReference), selectedPaths)); + return new AssetUpdateResult(result.success(), result.errorMessage()); + } + + @Override + public AssetUpdateResult applyPaletteOverhauling(ProjectReference project, AssetReference assetReference, + List> selectedPalettes) { + final var result = packer.applyPaletteOverhauling(new ApplyPaletteOverhaulingRequest( + context(project), reference(assetReference), selectedPalettes)); + return new AssetUpdateResult(result.success(), result.errorMessage()); + } + + private static PackerProjectContext context(ProjectReference project) { + return new PackerProjectContext(project.name(), project.rootPath()); + } + + private static p.packer.messages.AssetReference reference(AssetReference reference) { + return p.packer.messages.AssetReference.of(reference.value()); + } + + private static AssetMutationResult mutation(PackerOperationStatus status, String summary, + p.packer.messages.AssetReference reference, java.nio.file.Path assetRoot, java.nio.file.Path manifestPath) { + return new AssetMutationResult( + AssetOperationStatus.valueOf(status.name()), + summary, + reference == null ? null : AssetReference.of(reference.value()), + assetRoot, + manifestPath); + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/assets/PackerAssetCreationCatalog.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/PackerAssetCreationCatalog.java new file mode 100644 index 00000000..2ad48230 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/PackerAssetCreationCatalog.java @@ -0,0 +1,59 @@ +package p.studio.core.assets; + +import p.packer.messages.assets.AssetFamilyCatalog; +import p.packer.messages.assets.OutputCodecCatalog; +import p.packer.messages.assets.OutputFormatCatalog; +import p.studio.api.assets.AssetCreationCatalog; +import p.studio.api.assets.AssetFamily; + +import java.util.Arrays; +import java.util.List; + +public final class PackerAssetCreationCatalog implements AssetCreationCatalog { + @Override + public List supportedFamilies() { + return Arrays.stream(AssetFamilyCatalog.values()) + .filter(family -> family != AssetFamilyCatalog.UNKNOWN) + .map(family -> AssetFamily.valueOf(family.name())) + .toList(); + } + + @Override + public List supportedFormats(AssetFamily family) { + if (family == null || family == AssetFamily.UNKNOWN) { + return List.of(); + } + return OutputFormatCatalog.supportedFor(AssetFamilyCatalog.valueOf(family.name())).stream() + .map(Enum::name) + .toList(); + } + + @Override + public List availableCodecs(String outputFormat) { + final OutputFormatCatalog format = format(outputFormat); + return format == null ? List.of() : format.availableCodecs().stream().map(Enum::name).toList(); + } + + @Override + public boolean supports(String outputFormat, String outputCodec) { + final OutputFormatCatalog format = format(outputFormat); + final OutputCodecCatalog codec = codec(outputCodec); + return format != null && codec != null && format.supports(codec); + } + + private OutputFormatCatalog format(String value) { + try { + return OutputFormatCatalog.valueOf(value); + } catch (IllegalArgumentException | NullPointerException ignored) { + return null; + } + } + + private OutputCodecCatalog codec(String value) { + try { + return OutputCodecCatalog.valueOf(value); + } catch (IllegalArgumentException | NullPointerException ignored) { + return null; + } + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/assets/PackerAssetDetails.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/PackerAssetDetails.java new file mode 100644 index 00000000..de714013 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/PackerAssetDetails.java @@ -0,0 +1,97 @@ +package p.studio.core.assets; + +import p.packer.PackerWorkspaceService; +import p.packer.dtos.PackerBankCompositionDetailsDTO; +import p.packer.dtos.PackerBankCompositionFileDTO; +import p.packer.dtos.PackerCodecConfigurationFieldDTO; +import p.packer.dtos.PackerDiagnosticDTO; +import p.packer.messages.GetAssetActionsRequest; +import p.packer.messages.GetAssetDetailsRequest; +import p.packer.messages.PackerProjectContext; +import p.studio.api.assets.*; +import p.studio.api.assets.AssetReference; +import p.studio.api.project.ProjectReference; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +public final class PackerAssetDetails implements AssetDetails { + private final PackerWorkspaceService packer; + + public PackerAssetDetails(PackerWorkspaceService packer) { + this.packer = Objects.requireNonNull(packer, "packer"); + } + + @Override + public AssetDetailsSnapshot get(ProjectReference project, AssetReference assetReference) { + final var context = new PackerProjectContext(project.name(), project.rootPath()); + final var reference = p.packer.messages.AssetReference.of(assetReference.value()); + final var detailsResult = packer.getAssetDetails(new GetAssetDetailsRequest(context, reference)); + final var actionsResult = packer.getAssetActions(new GetAssetActionsRequest(context, reference)); + final var details = detailsResult.details(); + final var codecFields = details.codecConfigurationFieldsByCodec().entrySet().stream() + .collect(Collectors.toMap( + entry -> entry.getKey().name(), + entry -> entry.getValue().stream().map(PackerAssetDetails::field).toList(), + (left, right) -> left, + LinkedHashMap::new)); + final List diagnostics = java.util.stream.Stream + .concat(details.diagnostics().stream(), detailsResult.diagnostics().stream()) + .distinct() + .map(PackerAssetDetails::diagnostic) + .toList(); + return new AssetDetailsSnapshot( + summary(details.summary()), + actionsResult.actions().stream() + .map(action -> new AssetActionAvailability( + action.action().name(), action.enabled(), action.visible(), action.reason())) + .toList(), + details.outputFormat().name(), + details.outputCodec().name(), + details.availableOutputCodecs().stream().map(Enum::name).toList(), + codecFields, + details.metadataFields().stream().map(PackerAssetDetails::field).toList(), + details.outputPipeline(), + bank(details.bankComposition()), + details.pipelinePalettes(), + diagnostics); + } + + private static AssetSummary summary(p.packer.dtos.PackerAssetSummaryDTO summary) { + return new AssetSummary( + AssetReference.of(summary.assetReference().value()), + summary.identity().assetName(), + AssetRegistrationState.valueOf(summary.state().name()), + AssetBuildParticipation.valueOf(summary.buildParticipation().name()), + summary.identity().assetId(), + AssetFamily.valueOf(summary.assetFamily().name()), + summary.identity().assetRoot(), + summary.preloadEnabled(), + summary.hasDiagnostics()); + } + + private static AssetConfigurationField field(PackerCodecConfigurationFieldDTO field) { + return new AssetConfigurationField( + field.key(), field.label(), field.fieldType().name(), field.value(), field.required(), field.options()); + } + + private static AssetDiagnostic diagnostic(PackerDiagnosticDTO diagnostic) { + return new AssetDiagnostic( + diagnostic.severity().name(), diagnostic.category().name(), diagnostic.message(), + diagnostic.evidencePath(), diagnostic.blocking()); + } + + private static AssetBankComposition bank(PackerBankCompositionDetailsDTO bank) { + return new AssetBankComposition( + bank.availableFiles().stream().map(PackerAssetDetails::bankFile).toList(), + bank.selectedFiles().stream().map(PackerAssetDetails::bankFile).toList(), + bank.measuredBankSizeBytes()); + } + + private static AssetBankFile bankFile(PackerBankCompositionFileDTO file) { + return new AssetBankFile( + file.path(), file.displayName(), file.size(), file.lastModified(), file.fingerprint(), file.metadata()); + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/assets/PackerAssetPacking.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/PackerAssetPacking.java new file mode 100644 index 00000000..f9918794 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/PackerAssetPacking.java @@ -0,0 +1,87 @@ +package p.studio.core.assets; + +import p.packer.PackerWorkspaceService; +import p.packer.messages.*; +import p.studio.api.assets.*; +import p.studio.api.project.ProjectReference; +import p.studio.api.operation.OperationExecutor; +import p.studio.api.operation.OperationHandle; + +import java.util.Objects; + +public final class PackerAssetPacking implements AssetPacking { + private final PackerWorkspaceService packer; + private final OperationExecutor operations; + + public PackerAssetPacking(PackerWorkspaceService packer, OperationExecutor operations) { + this.packer = Objects.requireNonNull(packer, "packer"); + this.operations = Objects.requireNonNull(operations, "operations"); + } + + @Override + public OperationHandle deepSync(ProjectReference project) { + return operations.submit("Synchronize project assets", () -> deepSyncNow(project)); + } + + private AssetSyncResult deepSyncNow(ProjectReference project) { + final var result = packer.listAssets(new ListAssetsRequest(context(project), true)); + return new AssetSyncResult(status(result.status()), result.summary()); + } + + @Override + public OperationHandle summarize(ProjectReference project) { + return operations.submit("Summarize project assets", () -> summarizeNow(project)); + } + + private AssetPackSummary summarizeNow(ProjectReference project) { + final var result = packer.getPackWorkspaceSummary(new PackWorkspaceSummaryRequest(context(project))); + return new AssetPackSummary( + status(result.status()), result.summary(), result.packSummary().totalIncludedAssetCount(), + result.packSummary().assets().stream() + .map(asset -> new AssetPackSummaryItem( + asset.assetId(), asset.assetName(), AssetFamily.valueOf(asset.assetFamily().name()), + asset.artifactCount(), asset.outputMetadata(), asset.outputPipeline())) + .toList()); + } + + @Override + public OperationHandle validate(ProjectReference project) { + return operations.submit("Validate project asset pack", () -> validateNow(project)); + } + + private AssetPackValidation validateNow(ProjectReference project) { + final var result = packer.validatePackWorkspace(new ValidatePackWorkspaceRequest(context(project))); + return new AssetPackValidation(status(result.status()), result.summary(), result.assets().stream() + .map(asset -> new AssetPackValidationItem( + asset.assetId(), asset.assetName(), asset.assetPath(), asset.lastModified(), + asset.diagnostics().stream() + .map(diagnostic -> new AssetPackDiagnostic( + diagnostic.severity().name(), diagnostic.message(), diagnostic.blocking())) + .toList())) + .toList()); + } + + @Override + public OperationHandle pack(ProjectReference project) { + return operations.submit("Pack project assets", () -> packNow(project)); + } + + private AssetPackExecution packNow(ProjectReference project) { + final var result = packer.packWorkspace(new PackWorkspaceRequest(context(project))); + return new AssetPackExecution( + status(result.status()), result.summary(), result.result().canonicalArtifactName(), + result.result().packedAssetCount(), result.result().elapsedMillis(), + result.result().emittedArtifacts().stream() + .map(artifact -> new AssetEmittedArtifact( + artifact.label(), artifact.path(), artifact.canonical(), artifact.sizeBytes())) + .toList()); + } + + private static PackerProjectContext context(ProjectReference project) { + return new PackerProjectContext(project.name(), project.rootPath()); + } + + private static AssetOperationStatus status(PackerOperationStatus status) { + return AssetOperationStatus.valueOf(status.name()); + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/assets/bank/DefaultAssetBankCompositionSession.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/bank/DefaultAssetBankCompositionSession.java new file mode 100644 index 00000000..99551ff0 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/bank/DefaultAssetBankCompositionSession.java @@ -0,0 +1,251 @@ +package p.studio.core.assets.bank; + +import p.studio.api.assets.AssetCapacityPolicy; +import p.studio.api.assets.AssetCapacityState; +import p.studio.api.assets.AssetFamily; +import p.studio.api.assets.bank.AssetBankCompositionSession; +import p.studio.api.assets.bank.AssetBankCompositionState; +import p.studio.api.assets.workspace.AssetWorkspaceAssetDetails; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; + +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +public final class DefaultAssetBankCompositionSession implements AssetBankCompositionSession { + private static final long MAX_SOUND_BANK_BYTES = 1024L * 1024L; + + private final AssetCapacityPolicy capacityPolicy; + private CompositionRules rules; + private Draft source; + private Draft draft; + private boolean editing; + + public DefaultAssetBankCompositionSession(AssetCapacityPolicy capacityPolicy) { + this.capacityPolicy = Objects.requireNonNull(capacityPolicy, "capacityPolicy"); + } + + @Override + public void replaceDetails(AssetWorkspaceAssetDetails details) { + if (details == null) { + rules = null; + source = null; + draft = null; + editing = false; + return; + } + rules = rulesFor(details); + final Draft replacement = createDraft(details); + if (!Objects.equals(source, replacement)) { + source = replacement; + draft = replacement; + editing = false; + } + } + + @Override + public boolean ready() { + return rules != null && source != null && draft != null; + } + + @Override + public void beginEdit() { + if (ready()) { + editing = true; + } + } + + @Override + public void apply() { + if (ready()) { + source = draft; + editing = false; + } + } + + @Override + public void reset() { + if (ready()) { + draft = source; + } + } + + @Override + public void cancel() { + if (ready()) { + draft = source; + editing = false; + } + } + + @Override + public void moveToSelected(List files) { + if (!ready() || !editing) { + return; + } + final List requested = List.copyOf(files); + final var requestedSet = new LinkedHashSet<>(requested); + final List accepted = new ArrayList<>(); + for (AssetWorkspaceBankCompositionFile file : draft.availableFiles()) { + if (requestedSet.contains(file) && rules.canAdd(draft, accepted, file)) { + accepted.add(file); + } + } + draft = draft.removeFromAvailable(accepted).appendToSelected(accepted); + } + + @Override + public void moveToAvailable(List files) { + if (!ready() || !editing) { + return; + } + final List returned = new ArrayList<>(files); + returned.sort(java.util.Comparator.comparing(AssetWorkspaceBankCompositionFile::path, String.CASE_INSENSITIVE_ORDER)); + draft = draft.removeFromSelected(files).appendToAvailable(returned); + } + + @Override + public void moveUp(int selectedIndex) { + if (!ready() || !editing || selectedIndex <= 0 || selectedIndex >= draft.selectedFiles().size()) { + return; + } + final List reordered = new ArrayList<>(draft.selectedFiles()); + final AssetWorkspaceBankCompositionFile moved = reordered.remove(selectedIndex); + reordered.add(selectedIndex - 1, moved); + draft = new Draft(draft.availableFiles(), reordered); + } + + @Override + public void moveDown(int selectedIndex) { + if (!ready() || !editing || selectedIndex < 0 || selectedIndex >= draft.selectedFiles().size() - 1) { + return; + } + final List reordered = new ArrayList<>(draft.selectedFiles()); + final AssetWorkspaceBankCompositionFile moved = reordered.remove(selectedIndex); + reordered.add(selectedIndex + 1, moved); + draft = new Draft(draft.availableFiles(), reordered); + } + + @Override + public AssetBankCompositionState state() { + if (!ready()) { + return new AssetBankCompositionState(false, false, List.of(), List.of(), emptyCapacity()); + } + return new AssetBankCompositionState( + editing, + !Objects.equals(source, draft), + draft.availableFiles(), + draft.selectedFiles(), + rules.evaluate(draft)); + } + + private Draft createDraft(AssetWorkspaceAssetDetails details) { + final List selected = details.bankComposition().selectedFiles(); + final var selectedPaths = selected.stream() + .map(AssetWorkspaceBankCompositionFile::path) + .collect(java.util.stream.Collectors.toSet()); + final List available = details.bankComposition().availableFiles().stream() + .filter(file -> !selectedPaths.contains(file.path())) + .toList(); + return new Draft(available, selected); + } + + private CompositionRules rulesFor(AssetWorkspaceAssetDetails details) { + if (details.summary().assetFamily() == AssetFamily.GLYPH_BANK) { + final String tileSize = details.metadataFields().stream() + .filter(field -> field.key().equals("tile_size")) + .map(field -> field.value()) + .findFirst() + .orElse("16x16"); + final Map metadata = Map.of("tile_size", tileSize); + final int maximum = capacityPolicy.maxArtifactsForGlyphBank(metadata); + return new CompositionRules() { + @Override + public boolean canAdd(Draft current, List accepted, + AssetWorkspaceBankCompositionFile candidate) { + return current.selectedFiles().size() + accepted.size() < maximum; + } + + @Override + public AssetCapacityState evaluate(Draft current) { + return capacityPolicy.evaluate(AssetFamily.GLYPH_BANK, current.selectedFiles().size(), metadata, Map.of(), 0L); + } + }; + } + if (details.summary().assetFamily() == AssetFamily.SOUND_BANK) { + final Map outputPipeline = details.outputPipeline(); + return new CompositionRules() { + @Override + public boolean canAdd(Draft current, List accepted, + AssetWorkspaceBankCompositionFile candidate) { + return selectedBytes(current.selectedFiles()) + selectedBytes(accepted) + candidate.size() <= MAX_SOUND_BANK_BYTES; + } + + @Override + public AssetCapacityState evaluate(Draft current) { + return capacityPolicy.evaluate(AssetFamily.SOUND_BANK, current.selectedFiles().size(), Map.of(), + outputPipeline, selectedBytes(current.selectedFiles())); + } + }; + } + return new CompositionRules() { + @Override + public boolean canAdd(Draft current, List accepted, + AssetWorkspaceBankCompositionFile candidate) { + return true; + } + + @Override + public AssetCapacityState evaluate(Draft current) { + return capacityPolicy.evaluate(AssetFamily.UNKNOWN, current.selectedFiles().size(), Map.of(), Map.of(), 0L); + } + }; + } + + private static long selectedBytes(List files) { + return files.stream().mapToLong(AssetWorkspaceBankCompositionFile::size).sum(); + } + + private static AssetCapacityState emptyCapacity() { + return new AssetCapacityState(0.0d, null, false, "", ""); + } + + private interface CompositionRules { + boolean canAdd(Draft current, List accepted, + AssetWorkspaceBankCompositionFile candidate); + AssetCapacityState evaluate(Draft current); + } + + private record Draft( + List availableFiles, + List selectedFiles) { + private Draft { + availableFiles = List.copyOf(availableFiles); + selectedFiles = List.copyOf(selectedFiles); + } + + private Draft removeFromAvailable(List files) { + final var removed = new LinkedHashSet<>(files); + return new Draft(availableFiles.stream().filter(file -> !removed.contains(file)).toList(), selectedFiles); + } + + private Draft appendToSelected(List files) { + final List next = new ArrayList<>(selectedFiles); + next.addAll(files); + return new Draft(availableFiles, next); + } + + private Draft removeFromSelected(List files) { + final var removed = new LinkedHashSet<>(files); + return new Draft(availableFiles, selectedFiles.stream().filter(file -> !removed.contains(file)).toList()); + } + + private Draft appendToAvailable(List files) { + final List next = new ArrayList<>(availableFiles); + next.addAll(files); + return new Draft(next, selectedFiles); + } + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/assets/bank/DefaultAssetBankCompositionSessionFactory.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/bank/DefaultAssetBankCompositionSessionFactory.java new file mode 100644 index 00000000..32649a78 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/bank/DefaultAssetBankCompositionSessionFactory.java @@ -0,0 +1,20 @@ +package p.studio.core.assets.bank; + +import p.studio.api.assets.AssetCapacityPolicy; +import p.studio.api.assets.bank.AssetBankCompositionSession; +import p.studio.api.assets.bank.AssetBankCompositionSessionFactory; + +import java.util.Objects; + +public final class DefaultAssetBankCompositionSessionFactory implements AssetBankCompositionSessionFactory { + private final AssetCapacityPolicy capacityPolicy; + + public DefaultAssetBankCompositionSessionFactory(AssetCapacityPolicy capacityPolicy) { + this.capacityPolicy = Objects.requireNonNull(capacityPolicy, "capacityPolicy"); + } + + @Override + public AssetBankCompositionSession createSession() { + return new DefaultAssetBankCompositionSession(capacityPolicy); + } +} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioMetadataService.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/metadata/AssetStudioMetadataService.java similarity index 86% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioMetadataService.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/metadata/AssetStudioMetadataService.java index e4661aa6..421f98c1 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/metadata/AssetStudioMetadataService.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/metadata/AssetStudioMetadataService.java @@ -1,9 +1,10 @@ -package p.studio.workspaces.assets.metadata; +package p.studio.core.assets.metadata; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; -import p.packer.messages.assets.AssetFamilyCatalog; +import p.studio.api.assets.AssetFamily; +import p.studio.api.assets.metadata.*; import java.io.IOException; import java.nio.file.Files; @@ -16,14 +17,23 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -public final class AssetStudioMetadataService { +public final class AssetStudioMetadataService implements AssetMetadataService { public static final String STUDIO_ASSET_METADATA_FILE = "studio.asset.json"; public static final String SCENE_BANK_SUPPORT_FILE = "scene-bank.studio.json"; public static final String GLYPH_MATERIAL_SUPPORT_FILE = "glyph-material.json"; - private final ObjectMapper mapper = new ObjectMapper(); + private final ObjectMapper mapper; - public AssetStudioMetadataSnapshot read(Path assetRoot, AssetFamilyCatalog assetFamily) { + public AssetStudioMetadataService(ObjectMapper mapper) { + this.mapper = Objects.requireNonNull(mapper, "mapper"); + } + + public AssetStudioMetadataService() { + this(new ObjectMapper()); + } + + @Override + public AssetStudioMetadataSnapshot read(Path assetRoot, AssetFamily assetFamily) { final Path normalizedAssetRoot = Objects.requireNonNull(assetRoot, "assetRoot").toAbsolutePath().normalize(); return new AssetStudioMetadataSnapshot( readGlyphSpecialization(normalizedAssetRoot, assetFamily), @@ -31,7 +41,17 @@ public final class AssetStudioMetadataService { readGlyphMaterialMetadata(normalizedAssetRoot, assetFamily)); } - public void writeSceneBankMetadata(Path assetRoot, AssetStudioSceneBankMetadata metadata) throws IOException { + @Override + public AssetMetadataWriteResult writeSceneBankMetadata(Path assetRoot, AssetStudioSceneBankMetadata metadata) { + try { + writeSceneBankMetadataFile(assetRoot, metadata); + return AssetMetadataWriteResult.success(); + } catch (IOException exception) { + return AssetMetadataWriteResult.failure(message("Unable to write scene-bank metadata.", exception)); + } + } + + private void writeSceneBankMetadataFile(Path assetRoot, AssetStudioSceneBankMetadata metadata) throws IOException { final Path normalizedAssetRoot = Objects.requireNonNull(assetRoot, "assetRoot").toAbsolutePath().normalize(); final AssetStudioSceneBankMetadata normalized = Objects.requireNonNull(metadata, "metadata"); final var root = mapper.createObjectNode(); @@ -69,7 +89,17 @@ public final class AssetStudioMetadataService { root); } - public void writeGlyphSpecialization(Path assetRoot, AssetStudioGlyphSpecialization specialization) throws IOException { + @Override + public AssetMetadataWriteResult writeGlyphSpecialization(Path assetRoot, AssetStudioGlyphSpecialization specialization) { + try { + writeGlyphSpecializationFile(assetRoot, specialization); + return AssetMetadataWriteResult.success(); + } catch (IOException exception) { + return AssetMetadataWriteResult.failure(message("Unable to write glyph specialization metadata.", exception)); + } + } + + private void writeGlyphSpecializationFile(Path assetRoot, AssetStudioGlyphSpecialization specialization) throws IOException { final Path metadataPath = Objects.requireNonNull(assetRoot, "assetRoot") .toAbsolutePath() .normalize() @@ -87,7 +117,17 @@ public final class AssetStudioMetadataService { mapper.writerWithDefaultPrettyPrinter().writeValue(metadataPath.toFile(), root); } - public void writeGlyphMaterialMetadata(Path assetRoot, AssetStudioGlyphMaterialMetadata metadata) throws IOException { + @Override + public AssetMetadataWriteResult writeGlyphMaterialMetadata(Path assetRoot, AssetStudioGlyphMaterialMetadata metadata) { + try { + writeGlyphMaterialMetadataFile(assetRoot, metadata); + return AssetMetadataWriteResult.success(); + } catch (IOException exception) { + return AssetMetadataWriteResult.failure(message("Unable to write glyph-material metadata.", exception)); + } + } + + private void writeGlyphMaterialMetadataFile(Path assetRoot, AssetStudioGlyphMaterialMetadata metadata) throws IOException { final Path normalizedAssetRoot = Objects.requireNonNull(assetRoot, "assetRoot").toAbsolutePath().normalize(); final AssetStudioGlyphMaterialMetadata normalized = Objects.requireNonNull(metadata, "metadata"); final var root = mapper.createObjectNode(); @@ -126,8 +166,14 @@ public final class AssetStudioMetadataService { root); } - private AssetStudioGlyphSpecialization readGlyphSpecialization(Path assetRoot, AssetFamilyCatalog assetFamily) { - if (assetFamily != AssetFamilyCatalog.GLYPH_BANK) { + private static String message(String fallback, IOException exception) { + return exception.getMessage() == null || exception.getMessage().isBlank() + ? fallback + : exception.getMessage(); + } + + private AssetStudioGlyphSpecialization readGlyphSpecialization(Path assetRoot, AssetFamily assetFamily) { + if (assetFamily != AssetFamily.GLYPH_BANK) { return AssetStudioGlyphSpecialization.NONE; } final Path metadataPath = assetRoot.resolve(STUDIO_ASSET_METADATA_FILE); @@ -145,8 +191,8 @@ public final class AssetStudioMetadataService { } } - private AssetStudioSceneBankMetadata readSceneBankMetadata(Path assetRoot, AssetFamilyCatalog assetFamily) { - if (assetFamily != AssetFamilyCatalog.SCENE_BANK) { + private AssetStudioSceneBankMetadata readSceneBankMetadata(Path assetRoot, AssetFamily assetFamily) { + if (assetFamily != AssetFamily.SCENE_BANK) { return null; } final Path supportFile = assetRoot.resolve(SCENE_BANK_SUPPORT_FILE); @@ -207,8 +253,8 @@ public final class AssetStudioMetadataService { } } - private AssetStudioGlyphMaterialMetadata readGlyphMaterialMetadata(Path assetRoot, AssetFamilyCatalog assetFamily) { - if (assetFamily != AssetFamilyCatalog.GLYPH_BANK) { + private AssetStudioGlyphMaterialMetadata readGlyphMaterialMetadata(Path assetRoot, AssetFamily assetFamily) { + if (assetFamily != AssetFamily.GLYPH_BANK) { return null; } final Path supportFile = assetRoot.resolve(GLYPH_MATERIAL_SUPPORT_FILE); diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingDraft.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/palette/AssetPaletteDraft.java similarity index 73% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingDraft.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/palette/AssetPaletteDraft.java index 69a17c28..452c12fa 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingDraft.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/palette/AssetPaletteDraft.java @@ -1,12 +1,12 @@ -package p.studio.workspaces.assets.details.palette; +package p.studio.core.assets.palette; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; import java.util.ArrayList; import java.util.List; import java.util.Objects; -public record AssetDetailsPaletteOverhaulingDraft( +record AssetPaletteDraft( List previewTileFiles, List allFiles, List availableFiles, @@ -16,7 +16,7 @@ public record AssetDetailsPaletteOverhaulingDraft( private static final int MIN_SELECTED = 1; private static final int MAX_SELECTED = 64; - public AssetDetailsPaletteOverhaulingDraft { + AssetPaletteDraft { previewTileFiles = List.copyOf(Objects.requireNonNull(previewTileFiles, "previewTileFiles")); allFiles = List.copyOf(Objects.requireNonNull(allFiles, "allFiles")); availableFiles = List.copyOf(Objects.requireNonNull(availableFiles, "availableFiles")); @@ -25,7 +25,7 @@ public record AssetDetailsPaletteOverhaulingDraft( previewPalettePath = normalize(previewPalettePath); } - public AssetDetailsPaletteOverhaulingDraft moveToSelected(List files) { + AssetPaletteDraft moveToSelected(List files) { final List accepted = new ArrayList<>(); for (AssetWorkspaceBankCompositionFile file : files) { if (file == null || !availableFiles.contains(file) || selectedFiles.contains(file)) { @@ -45,10 +45,10 @@ public record AssetDetailsPaletteOverhaulingDraft( final List nextSelected = new ArrayList<>(selectedFiles); nextSelected.addAll(accepted); final String nextPreviewPalettePath = previewPalettePath == null ? accepted.getFirst().path() : previewPalettePath; - return new AssetDetailsPaletteOverhaulingDraft(previewTileFiles, allFiles, nextAvailable, nextSelected, previewTilePath, nextPreviewPalettePath); + return new AssetPaletteDraft(previewTileFiles, allFiles, nextAvailable, nextSelected, previewTilePath, nextPreviewPalettePath); } - public AssetDetailsPaletteOverhaulingDraft moveToAvailable(List files) { + AssetPaletteDraft moveToAvailable(List files) { final List removed = new ArrayList<>(); for (AssetWorkspaceBankCompositionFile file : files) { if (file != null && selectedFiles.contains(file)) { @@ -66,23 +66,23 @@ public record AssetDetailsPaletteOverhaulingDraft( final String nextPreviewPalettePath = removed.stream().anyMatch(file -> file.path().equals(previewPalettePath)) ? nextSelected.getFirst().path() : previewPalettePath; - return new AssetDetailsPaletteOverhaulingDraft(previewTileFiles, allFiles, nextAvailable, nextSelected, previewTilePath, nextPreviewPalettePath); + return new AssetPaletteDraft(previewTileFiles, allFiles, nextAvailable, nextSelected, previewTilePath, nextPreviewPalettePath); } - public AssetDetailsPaletteOverhaulingDraft selectPreviewTile(String path) { + AssetPaletteDraft selectPreviewTile(String path) { final String normalized = normalize(path); if (normalized == null || previewTileFiles.stream().noneMatch(file -> file.path().equals(normalized))) { return this; } - return new AssetDetailsPaletteOverhaulingDraft(previewTileFiles, allFiles, availableFiles, selectedFiles, normalized, previewPalettePath); + return new AssetPaletteDraft(previewTileFiles, allFiles, availableFiles, selectedFiles, normalized, previewPalettePath); } - public AssetDetailsPaletteOverhaulingDraft selectPreviewPalette(String path) { + AssetPaletteDraft selectPreviewPalette(String path) { final String normalized = normalize(path); if (normalized == null || allFiles.stream().noneMatch(file -> file.path().equals(normalized))) { return this; } - return new AssetDetailsPaletteOverhaulingDraft(previewTileFiles, allFiles, availableFiles, selectedFiles, previewTilePath, normalized); + return new AssetPaletteDraft(previewTileFiles, allFiles, availableFiles, selectedFiles, previewTilePath, normalized); } private static String normalize(String path) { diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingCoordinator.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/palette/DefaultAssetPaletteSession.java similarity index 85% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingCoordinator.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/palette/DefaultAssetPaletteSession.java index c7144bda..4fccad56 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingCoordinator.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/palette/DefaultAssetPaletteSession.java @@ -1,28 +1,37 @@ -package p.studio.workspaces.assets.details.palette; +package p.studio.core.assets.palette; -import p.packer.messages.assets.AssetFamilyCatalog; -import p.studio.controls.forms.StudioFormMode; -import p.studio.controls.forms.StudioFormSession; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialArtifactBinding; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialMetadata; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialPalette; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialSchema; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialSchemaStatus; -import p.studio.workspaces.assets.details.schema.AssetDetailsColorSchemaCoordinator; +import p.studio.api.assets.AssetFamily; +import p.studio.api.assets.palette.AssetPaletteSession; +import p.studio.api.assets.palette.AssetPaletteState; +import p.studio.api.assets.workspace.AssetWorkspaceAssetDetails; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialArtifactBinding; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialMetadata; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialPalette; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialSchema; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialSchemaStatus; +import p.studio.api.assets.schema.AssetColorSchemaRules; import java.util.*; -public final class AssetDetailsPaletteOverhaulingCoordinator { - private StudioFormSession formSession; +public final class DefaultAssetPaletteSession implements AssetPaletteSession { + private final AssetColorSchemaRules schemaRules; + private AssetPaletteDraft source; + private AssetPaletteDraft draft; + private boolean editing; private AssetWorkspaceAssetDetails details; private AssetStudioGlyphMaterialMetadata localMaterialMetadata; + public DefaultAssetPaletteSession(AssetColorSchemaRules schemaRules) { + this.schemaRules = Objects.requireNonNull(schemaRules, "schemaRules"); + } + public void replaceDetails(AssetWorkspaceAssetDetails details) { this.details = details; - if (details == null || details.summary().assetFamily() != AssetFamilyCatalog.GLYPH_BANK) { - formSession = null; + if (details == null || details.summary().assetFamily() != AssetFamily.GLYPH_BANK) { + source = null; + draft = null; + editing = false; localMaterialMetadata = null; return; } @@ -31,7 +40,7 @@ public final class AssetDetailsPaletteOverhaulingCoordinator { } public void replaceMaterialMetadata(AssetStudioGlyphMaterialMetadata metadata) { - if (details == null || details.summary().assetFamily() != AssetFamilyCatalog.GLYPH_BANK) { + if (details == null || details.summary().assetFamily() != AssetFamily.GLYPH_BANK) { return; } localMaterialMetadata = Objects.requireNonNull(metadata, "metadata"); @@ -41,13 +50,13 @@ public final class AssetDetailsPaletteOverhaulingCoordinator { private void rebuildSession() { final List allFiles = paletteFiles(details); final List previewTileFiles = details.bankComposition().selectedFiles().stream() - .filter(AssetDetailsPaletteOverhaulingCoordinator::supportsPalettePreview) + .filter(DefaultAssetPaletteSession::supportsPalettePreview) .toList(); final List initialSelected = initialSelectedPaletteFiles(details, allFiles); final List available = new ArrayList<>(allFiles); available.removeAll(initialSelected); - final AssetDetailsPaletteOverhaulingDraft source = new AssetDetailsPaletteOverhaulingDraft( + final AssetPaletteDraft replacement = new AssetPaletteDraft( previewTileFiles, allFiles, available, @@ -56,24 +65,27 @@ public final class AssetDetailsPaletteOverhaulingCoordinator { initialSelected.isEmpty() ? allFiles.isEmpty() ? null : allFiles.getFirst().path() : initialSelected.getFirst().path()); - if (formSession == null) { - formSession = new StudioFormSession<>(source); + if (source == null) { + source = replacement; + draft = replacement; + editing = false; return; } - if (!Objects.equals(formSession.source(), source)) { - if (formSession.mode() == StudioFormMode.EDITING) { - final AssetDetailsPaletteOverhaulingDraft currentDraft = formSession.draft(); - formSession = new StudioFormSession<>(source); - formSession.beginEdit(); - formSession.setDraft(rebindDraft(currentDraft, source)); + if (!Objects.equals(source, replacement)) { + if (editing) { + final AssetPaletteDraft currentDraft = draft; + source = replacement; + draft = rebindDraft(currentDraft, replacement); return; } - formSession.replaceSource(source); + source = replacement; + draft = replacement; + editing = false; } } public boolean ready() { - return formSession != null; + return source != null && draft != null; } public AssetWorkspaceAssetDetails details() { @@ -82,61 +94,62 @@ public final class AssetDetailsPaletteOverhaulingCoordinator { public void beginEdit() { if (ready()) { - formSession.beginEdit(); + editing = true; } } public void apply() { if (ready()) { - formSession.apply(); + source = draft; + editing = false; } } public void reset() { if (ready()) { - formSession.resetDraft(); + draft = source; } } public void cancel() { if (ready()) { - formSession.cancelEdit(); + draft = source; + editing = false; } } public void moveToSelected(List files) { - if (ready() && formSession.mode() == StudioFormMode.EDITING) { + if (ready() && editing) { final List validFiles = files.stream() - .filter(AssetDetailsPaletteOverhaulingCoordinator::paletteIsValid) + .filter(DefaultAssetPaletteSession::paletteIsValid) .toList(); - formSession.updateDraft(current -> current.moveToSelected(validFiles)); + draft = draft.moveToSelected(validFiles); } } public void moveToAvailable(List files) { - if (ready() && formSession.mode() == StudioFormMode.EDITING) { - formSession.updateDraft(current -> current.moveToAvailable(files)); + if (ready() && editing) { + draft = draft.moveToAvailable(files); } } public void selectPreviewTile(AssetWorkspaceBankCompositionFile file) { if (ready() && file != null) { - formSession.updateDraft(current -> current.selectPreviewTile(file.path())); + draft = draft.selectPreviewTile(file.path()); } } public void selectPreviewPalette(AssetWorkspaceBankCompositionFile file) { if (ready() && file != null) { - formSession.updateDraft(current -> current.selectPreviewPalette(file.path())); + draft = draft.selectPreviewPalette(file.path()); } } - public AssetDetailsPaletteOverhaulingViewModel viewModel() { + public AssetPaletteState state() { if (!ready()) { - return new AssetDetailsPaletteOverhaulingViewModel(false, false, List.of(), List.of(), List.of(), List.of(), null, null, 0); + return new AssetPaletteState(false, false, List.of(), List.of(), List.of(), List.of(), null, null, 0); } - final AssetDetailsPaletteOverhaulingDraft draft = formSession.draft(); final AssetWorkspaceBankCompositionFile previewPaletteFile = fileByPath(draft.allFiles(), draft.previewPalettePath()); final List schemaPreviewTileFiles = previewTileFilesForPalette( draft.previewTileFiles(), @@ -144,9 +157,9 @@ public final class AssetDetailsPaletteOverhaulingCoordinator { final AssetWorkspaceBankCompositionFile previewTileFile = Optional .ofNullable(fileByPath(schemaPreviewTileFiles, draft.previewTilePath())) .orElse(schemaPreviewTileFiles.isEmpty() ? null : schemaPreviewTileFiles.getFirst()); - return new AssetDetailsPaletteOverhaulingViewModel( - formSession.mode() == StudioFormMode.EDITING, - formSession.isDirty(), + return new AssetPaletteState( + editing, + !Objects.equals(source, draft), schemaPreviewTileFiles, draft.allFiles(), draft.availableFiles(), @@ -174,7 +187,7 @@ public final class AssetDetailsPaletteOverhaulingCoordinator { } public boolean duplicatePaletteExists(String paletteId, String schemaId, List colors) { - final List normalized = colors.stream().map(AssetDetailsPaletteOverhaulingCoordinator::normalizeHtmlColor).toList(); + final List normalized = colors.stream().map(DefaultAssetPaletteSession::normalizeHtmlColor).toList(); return allPaletteRecords().stream() .filter(record -> !Objects.equals(record.paletteId(), paletteId)) .anyMatch(record -> record.schemaId().equals(schemaId) && record.colors().equals(normalized)); @@ -182,7 +195,7 @@ public final class AssetDetailsPaletteOverhaulingCoordinator { public AssetStudioGlyphMaterialMetadata upsertPalette(String paletteId, String displayName, String schemaId, List colors) { final AssetStudioGlyphMaterialMetadata current = materialMetadata(); - final List normalized = colors.stream().map(AssetDetailsPaletteOverhaulingCoordinator::normalizeHtmlColor).toList(); + final List normalized = colors.stream().map(DefaultAssetPaletteSession::normalizeHtmlColor).toList(); final int schemaVersion = current.findSchema(schemaId).map(AssetStudioGlyphMaterialSchema::version).orElse(1); final String resolvedDisplayName = displayName == null || displayName.trim().isBlank() ? generatedDisplayName(normalized) @@ -243,7 +256,7 @@ public final class AssetDetailsPaletteOverhaulingCoordinator { return !Boolean.FALSE.equals(file.metadata().get("valid")); } - public static boolean paletteIsOriginal(AssetWorkspaceBankCompositionFile file) { + public boolean paletteIsOriginal(AssetWorkspaceBankCompositionFile file) { return file != null && Boolean.TRUE.equals(file.metadata().get("derivedOriginal")); } @@ -278,7 +291,7 @@ public final class AssetDetailsPaletteOverhaulingCoordinator { final AssetStudioGlyphMaterialMetadata metadata = materialMetadata(); final List records = new ArrayList<>(); for (AssetStudioGlyphMaterialSchema schema : metadata.schemas()) { - final AssetStudioGlyphMaterialSchemaStatus effectiveSchemaStatus = AssetDetailsColorSchemaCoordinator.effectiveStatus( + final AssetStudioGlyphMaterialSchemaStatus effectiveSchemaStatus = schemaRules.effectiveStatus( schema, details.bankComposition().selectedFiles()); final List originalColors = schema.materialIndices().entrySet().stream() @@ -303,7 +316,7 @@ public final class AssetDetailsPaletteOverhaulingCoordinator { final AssetStudioGlyphMaterialSchema schema = metadata.findSchema(palette.schemaId()).orElse(null); final AssetStudioGlyphMaterialSchemaStatus effectiveSchemaStatus = schema == null ? AssetStudioGlyphMaterialSchemaStatus.INCONSISTENT - : AssetDetailsColorSchemaCoordinator.effectiveStatus(schema, details.bankComposition().selectedFiles()); + : schemaRules.effectiveStatus(schema, details.bankComposition().selectedFiles()); final boolean valid = schema != null && effectiveSchemaStatus == AssetStudioGlyphMaterialSchemaStatus.OK && palette.version() >= schema.version(); @@ -335,10 +348,10 @@ public final class AssetDetailsPaletteOverhaulingCoordinator { private AssetWorkspaceBankCompositionFile toPaletteFile(PaletteRecord record) { final List argb = record.colors().stream() - .map(AssetDetailsPaletteOverhaulingCoordinator::htmlToArgb8888) + .map(DefaultAssetPaletteSession::htmlToArgb8888) .toList(); final List rgba = record.colors().stream() - .map(AssetDetailsPaletteOverhaulingCoordinator::htmlToRgba8888) + .map(DefaultAssetPaletteSession::htmlToRgba8888) .toList(); final Map palette = Map.of( "originalArgb8888", argb, @@ -368,9 +381,9 @@ public final class AssetDetailsPaletteOverhaulingCoordinator { metadata); } - static String generatedDisplayName(List colors) { + public String generatedDisplayName(List colors) { final List samples = colors.stream() - .map(AssetDetailsPaletteOverhaulingCoordinator::toColorSample) + .map(DefaultAssetPaletteSession::toColorSample) .toList(); if (samples.isEmpty()) { return "quiet shade"; @@ -476,7 +489,7 @@ public final class AssetDetailsPaletteOverhaulingCoordinator { return new ColorSample(hue < 0.0 ? hue + 360.0 : hue, saturation, lightness); } - private static String displayName(PaletteRecord record) { + private String displayName(PaletteRecord record) { if (record.derivedOriginal()) { return record.schemaId() + " / original"; } @@ -548,9 +561,9 @@ public final class AssetDetailsPaletteOverhaulingCoordinator { .orElse(null); } - private static AssetDetailsPaletteOverhaulingDraft rebindDraft( - AssetDetailsPaletteOverhaulingDraft draft, - AssetDetailsPaletteOverhaulingDraft source) { + private static AssetPaletteDraft rebindDraft( + AssetPaletteDraft draft, + AssetPaletteDraft source) { final Set selectedPaths = draft.selectedFiles().stream() .map(AssetWorkspaceBankCompositionFile::path) .collect(java.util.stream.Collectors.toCollection(LinkedHashSet::new)); @@ -566,7 +579,7 @@ public final class AssetDetailsPaletteOverhaulingCoordinator { final String previewTilePath = fileByPath(source.previewTileFiles(), draft.previewTilePath()) == null ? source.previewTilePath() : draft.previewTilePath(); - return new AssetDetailsPaletteOverhaulingDraft( + return new AssetPaletteDraft( source.previewTileFiles(), source.allFiles(), available, diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/scene/SceneBankWorkflowService.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/scene/SceneBankWorkflowService.java similarity index 85% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/scene/SceneBankWorkflowService.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/scene/SceneBankWorkflowService.java index 7d721d80..790a28ae 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/scene/SceneBankWorkflowService.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/scene/SceneBankWorkflowService.java @@ -1,20 +1,19 @@ -package p.studio.workspaces.assets.scene; +package p.studio.core.assets.scene; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import p.packer.dtos.PackerDiagnosticDTO; -import p.packer.messages.ListAssetsRequest; -import p.packer.messages.assets.AssetFamilyCatalog; -import p.packer.messages.diagnostics.PackerDiagnosticCategory; -import p.packer.messages.diagnostics.PackerDiagnosticSeverity; -import p.studio.Container; -import p.studio.projects.ProjectReference; -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.AssetWorkspaceAssetDetails; -import p.studio.workspaces.assets.messages.AssetWorkspaceSceneBankStatus; -import p.studio.workspaces.assets.messages.AssetWorkspaceSceneBankValidation; +import p.studio.api.assets.AssetFamily; +import p.studio.api.assets.AssetDiagnostic; +import p.studio.api.project.ProjectReference; +import p.studio.api.assets.AssetCatalog; +import p.studio.api.assets.scene.SceneBankWorkflow; +import p.studio.api.assets.scene.SceneBankWorkflowResult; +import p.studio.api.assets.metadata.AssetStudioSceneBankMetadata; +import p.studio.api.assets.metadata.AssetStudioSceneLayerBinding; +import p.studio.api.assets.metadata.AssetStudioSceneTile; +import p.studio.api.assets.workspace.AssetWorkspaceAssetDetails; +import p.studio.api.assets.workspace.AssetWorkspaceSceneBankStatus; +import p.studio.api.assets.workspace.AssetWorkspaceSceneBankValidation; import java.io.IOException; import java.nio.file.Files; @@ -23,39 +22,44 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -public final class SceneBankWorkflowService { +public final class SceneBankWorkflowService implements SceneBankWorkflow { public static final String ACCEPTED_REQUEST_FILE = "scene-bank.pack-request.json"; - private final ObjectMapper mapper = new ObjectMapper(); + private final ObjectMapper mapper; private final SceneBankGlyphAssetResolver glyphAssetResolver; - public SceneBankWorkflowService() { - this((projectReference, tilesetAssetRoot) -> Container.packer().workspaceService() - .listAssets(new ListAssetsRequest(projectReference.toPackerProjectContext())) - .assets() + public SceneBankWorkflowService(AssetCatalog assetCatalog, ObjectMapper mapper) { + this((SceneBankGlyphAssetResolver) (projectReference, tilesetAssetRoot) -> Objects.requireNonNull(assetCatalog, "assetCatalog") + .list(projectReference, false) .stream() - .filter(asset -> asset.assetFamily() == AssetFamilyCatalog.GLYPH_BANK) + .filter(asset -> asset.family() == AssetFamily.GLYPH_BANK) .filter(asset -> projectReference.rootPath() .resolve("assets") .resolve(tilesetAssetRoot) .toAbsolutePath() .normalize() - .equals(asset.identity().assetRoot().toAbsolutePath().normalize())) + .equals(asset.root().toAbsolutePath().normalize())) .findFirst() - .map(asset -> asset.identity().assetId() == null ? -1 : asset.identity().assetId()) - .orElse(-1)); + .map(asset -> asset.assetId() == null ? -1 : asset.assetId()) + .orElse(-1), mapper); } SceneBankWorkflowService(SceneBankGlyphAssetResolver glyphAssetResolver) { - this.glyphAssetResolver = Objects.requireNonNull(glyphAssetResolver, "glyphAssetResolver"); + this(glyphAssetResolver, new ObjectMapper()); } + SceneBankWorkflowService(SceneBankGlyphAssetResolver glyphAssetResolver, ObjectMapper mapper) { + this.glyphAssetResolver = Objects.requireNonNull(glyphAssetResolver, "glyphAssetResolver"); + this.mapper = Objects.requireNonNull(mapper, "mapper"); + } + + @Override public SceneBankWorkflowResult inspect(ProjectReference projectReference, AssetWorkspaceAssetDetails details) { - if (details == null || details.summary().assetFamily() != AssetFamilyCatalog.SCENE_BANK) { + if (details == null || details.summary().assetFamily() != AssetFamily.SCENE_BANK) { return new SceneBankWorkflowResult(true, "", AssetWorkspaceSceneBankValidation.NOT_APPLICABLE, List.of()); } - final List diagnostics = new ArrayList<>(validateDiagnostics(projectReference, details)); - if (diagnostics.stream().noneMatch(PackerDiagnosticDTO::blocking)) { + final List diagnostics = new ArrayList<>(validateDiagnostics(projectReference, details)); + if (diagnostics.stream().noneMatch(AssetDiagnostic::blocking)) { try { writeAcceptedRequest( details.summary().assetRoot().resolve(ACCEPTED_REQUEST_FILE), @@ -68,34 +72,39 @@ public final class SceneBankWorkflowService { } final AssetWorkspaceSceneBankValidation validation = validationState(diagnostics); return new SceneBankWorkflowResult( - diagnostics.stream().noneMatch(PackerDiagnosticDTO::blocking), + diagnostics.stream().noneMatch(AssetDiagnostic::blocking), messageFor(validation), validation, List.copyOf(diagnostics)); } + @Override public SceneBankWorkflowResult validate(ProjectReference projectReference, AssetWorkspaceAssetDetails details) { return inspect(projectReference, details); } + @Override public SceneBankWorkflowResult accept(ProjectReference projectReference, AssetWorkspaceAssetDetails details) { return inspect(projectReference, details); } + @Override public SceneBankWorkflowResult inspectLayer(ProjectReference projectReference, AssetWorkspaceAssetDetails details, int layerIndex) { return inspect(projectReference, details); } + @Override public SceneBankWorkflowResult validateLayer(ProjectReference projectReference, AssetWorkspaceAssetDetails details, int layerIndex) { return inspect(projectReference, details); } + @Override public SceneBankWorkflowResult acceptLayer(ProjectReference projectReference, AssetWorkspaceAssetDetails details, int layerIndex) { return inspect(projectReference, details); } - private List validateDiagnostics(ProjectReference projectReference, AssetWorkspaceAssetDetails details) { - final List diagnostics = new ArrayList<>(); + private List validateDiagnostics(ProjectReference projectReference, AssetWorkspaceAssetDetails details) { + final List diagnostics = new ArrayList<>(); final AssetStudioSceneBankMetadata metadata = details.sceneBankMetadata(); if (metadata == null) { diagnostics.add(error("Scene Bank support metadata is missing or invalid.", @@ -302,8 +311,8 @@ public final class SceneBankWorkflowService { } } - private AssetWorkspaceSceneBankValidation validationState(List diagnostics) { - if (diagnostics.stream().anyMatch(PackerDiagnosticDTO::blocking)) { + private AssetWorkspaceSceneBankValidation validationState(List diagnostics) { + if (diagnostics.stream().anyMatch(AssetDiagnostic::blocking)) { return new AssetWorkspaceSceneBankValidation( AssetWorkspaceSceneBankStatus.VALIDATION_FAILED, false, @@ -330,10 +339,10 @@ public final class SceneBankWorkflowService { }; } - private PackerDiagnosticDTO error(String message, Path path) { - return new PackerDiagnosticDTO( - PackerDiagnosticSeverity.ERROR, - PackerDiagnosticCategory.STRUCTURAL, + private AssetDiagnostic error(String message, Path path) { + return new AssetDiagnostic( + "ERROR", + "STRUCTURAL", message, path, true); diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/scene/ScenePackLayerRequest.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/scene/ScenePackLayerRequest.java similarity index 96% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/scene/ScenePackLayerRequest.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/scene/ScenePackLayerRequest.java index 02880df5..509cd9b8 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/scene/ScenePackLayerRequest.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/scene/ScenePackLayerRequest.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.scene; +package p.studio.core.assets.scene; import java.util.List; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/scene/ScenePackRequest.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/scene/ScenePackRequest.java similarity index 92% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/scene/ScenePackRequest.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/scene/ScenePackRequest.java index e2a9b4d2..d318db64 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/scene/ScenePackRequest.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/scene/ScenePackRequest.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.scene; +package p.studio.core.assets.scene; import java.util.List; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/scene/ScenePackTileRequest.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/scene/ScenePackTileRequest.java similarity index 91% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/scene/ScenePackTileRequest.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/scene/ScenePackTileRequest.java index abacc39d..caa914ce 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/scene/ScenePackTileRequest.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/scene/ScenePackTileRequest.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.scene; +package p.studio.core.assets.scene; public record ScenePackTileRequest( boolean active, diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/schema/AssetDetailsColorSchemaDraft.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/schema/AssetColorSchemaDraft.java similarity index 61% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/schema/AssetDetailsColorSchemaDraft.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/schema/AssetColorSchemaDraft.java index d176ed04..8a3d37de 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/schema/AssetDetailsColorSchemaDraft.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/schema/AssetColorSchemaDraft.java @@ -1,12 +1,13 @@ -package p.studio.workspaces.assets.details.schema; +package p.studio.core.assets.schema; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; +import p.studio.api.assets.schema.AssetColorSchemaRules; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; -record AssetDetailsColorSchemaDraft( +record AssetColorSchemaDraft( String schemaId, boolean existingSchema, boolean removeRequested, @@ -15,21 +16,17 @@ record AssetDetailsColorSchemaDraft( List preferredColors, boolean deriveColorsFromTiles) { - AssetDetailsColorSchemaDraft { + AssetColorSchemaDraft { availableTiles = List.copyOf(availableTiles); assignedTiles = List.copyOf(assignedTiles); preferredColors = normalize(preferredColors); } - static AssetDetailsColorSchemaDraft noSelection() { - return new AssetDetailsColorSchemaDraft(null, false, false, List.of(), List.of(), List.of(), false); + static AssetColorSchemaDraft noSelection() { + return new AssetColorSchemaDraft(null, false, false, List.of(), List.of(), List.of(), false); } - boolean selected() { - return schemaId != null && !schemaId.isBlank(); - } - - AssetDetailsColorSchemaDraft moveToAssigned(List files) { + AssetColorSchemaDraft moveToAssigned(List files, AssetColorSchemaRules rules) { final List nextAvailable = new ArrayList<>(availableTiles); final List nextAssigned = new ArrayList<>(assignedTiles); for (AssetWorkspaceBankCompositionFile file : files) { @@ -37,10 +34,10 @@ record AssetDetailsColorSchemaDraft( nextAssigned.add(file); } } - return withTiles(nextAvailable, nextAssigned); + return withTiles(nextAvailable, nextAssigned, rules); } - AssetDetailsColorSchemaDraft moveToAvailable(List files) { + AssetColorSchemaDraft moveToAvailable(List files, AssetColorSchemaRules rules) { final List nextAvailable = new ArrayList<>(availableTiles); final List nextAssigned = new ArrayList<>(assignedTiles); for (AssetWorkspaceBankCompositionFile file : files) { @@ -48,49 +45,49 @@ record AssetDetailsColorSchemaDraft( nextAvailable.add(file); } } - return withTiles(nextAvailable, nextAssigned); + return withTiles(nextAvailable, nextAssigned, rules); } - AssetDetailsColorSchemaDraft moveAssignedUp(int index) { + AssetColorSchemaDraft moveAssignedUp(int index, AssetColorSchemaRules rules) { if (index <= 0 || index >= assignedTiles.size()) { return this; } final List nextAssigned = new ArrayList<>(assignedTiles); final AssetWorkspaceBankCompositionFile file = nextAssigned.remove(index); nextAssigned.add(index - 1, file); - return withTiles(availableTiles, nextAssigned); + return withTiles(availableTiles, nextAssigned, rules); } - AssetDetailsColorSchemaDraft moveAssignedDown(int index) { + AssetColorSchemaDraft moveAssignedDown(int index, AssetColorSchemaRules rules) { if (index < 0 || index >= assignedTiles.size() - 1) { return this; } final List nextAssigned = new ArrayList<>(assignedTiles); final AssetWorkspaceBankCompositionFile file = nextAssigned.remove(index); nextAssigned.add(index + 1, file); - return withTiles(availableTiles, nextAssigned); + return withTiles(availableTiles, nextAssigned, rules); } - AssetDetailsColorSchemaDraft markForRemoval() { - if (!selected()) { + AssetColorSchemaDraft markForRemoval() { + if (schemaId == null || schemaId.isBlank()) { return this; } - return new AssetDetailsColorSchemaDraft(schemaId, existingSchema, true, availableTiles, assignedTiles, preferredColors, deriveColorsFromTiles); + return new AssetColorSchemaDraft(schemaId, existingSchema, true, availableTiles, assignedTiles, + preferredColors, deriveColorsFromTiles); } - AssetDetailsColorSchemaDraft asUpdateDraft() { - return new AssetDetailsColorSchemaDraft(schemaId, existingSchema, false, availableTiles, assignedTiles, orderedColors(), true); + AssetColorSchemaDraft asUpdateDraft(AssetColorSchemaRules rules) { + return new AssetColorSchemaDraft(schemaId, existingSchema, false, availableTiles, assignedTiles, + orderedColors(rules), true); } - List orderedColors() { + List orderedColors(AssetColorSchemaRules rules) { if (!deriveColorsFromTiles) { return preferredColors; } final LinkedHashSet active = new LinkedHashSet<>(); for (AssetWorkspaceBankCompositionFile tile : assignedTiles) { - AssetDetailsColorSchemaCoordinator.tileColors(tile).stream() - .map(AssetDetailsColorSchemaDraft::normalize) - .forEach(active::add); + rules.tileColors(tile).stream().map(AssetColorSchemaDraft::normalize).forEach(active::add); } final List ordered = new ArrayList<>(); for (String preferredColor : preferredColors) { @@ -106,19 +103,20 @@ record AssetDetailsColorSchemaDraft( return List.copyOf(ordered); } - private AssetDetailsColorSchemaDraft withTiles( + private AssetColorSchemaDraft withTiles( List nextAvailable, - List nextAssigned) { - return new AssetDetailsColorSchemaDraft(schemaId, existingSchema, false, nextAvailable, nextAssigned, orderedColors(), true); + List nextAssigned, + AssetColorSchemaRules rules) { + return new AssetColorSchemaDraft(schemaId, existingSchema, false, nextAvailable, nextAssigned, + orderedColors(rules), true); } private static List normalize(List colors) { final List normalized = new ArrayList<>(); for (String color : colors) { - if (color == null || color.isBlank()) { - continue; + if (color != null && !color.isBlank()) { + normalized.add(normalize(color)); } - normalized.add(normalize(color)); } return List.copyOf(normalized); } diff --git a/prometeu-studio-core/src/main/java/p/studio/core/assets/schema/DefaultAssetColorSchemaFactory.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/schema/DefaultAssetColorSchemaFactory.java new file mode 100644 index 00000000..94ed5cb5 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/schema/DefaultAssetColorSchemaFactory.java @@ -0,0 +1,26 @@ +package p.studio.core.assets.schema; + +import p.studio.api.assets.schema.AssetColorSchemaFactory; +import p.studio.api.assets.schema.AssetColorSchemaRules; +import p.studio.api.assets.schema.AssetColorSchemaSession; +import p.studio.api.assets.palette.AssetPaletteSession; +import p.studio.core.assets.palette.DefaultAssetPaletteSession; + +public final class DefaultAssetColorSchemaFactory implements AssetColorSchemaFactory { + private final AssetColorSchemaRules rules = new DefaultAssetColorSchemaRules(); + + @Override + public AssetColorSchemaSession createSession() { + return new DefaultAssetColorSchemaSession(rules); + } + + @Override + public AssetColorSchemaRules rules() { + return rules; + } + + @Override + public AssetPaletteSession createPaletteSession() { + return new DefaultAssetPaletteSession(rules); + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/assets/schema/DefaultAssetColorSchemaRules.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/schema/DefaultAssetColorSchemaRules.java new file mode 100644 index 00000000..92024b59 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/schema/DefaultAssetColorSchemaRules.java @@ -0,0 +1,111 @@ +package p.studio.core.assets.schema; + +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialArtifactBinding; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialSchema; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialSchemaStatus; +import p.studio.api.assets.schema.AssetColorSchemaRules; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +public final class DefaultAssetColorSchemaRules implements AssetColorSchemaRules { + @Override + public AssetStudioGlyphMaterialSchemaStatus effectiveStatus( + AssetStudioGlyphMaterialSchema schema, + List selectedTiles) { + if (schema.status() == AssetStudioGlyphMaterialSchemaStatus.INCONSISTENT) { + return AssetStudioGlyphMaterialSchemaStatus.INCONSISTENT; + } + final Map selectedByArtifactId = new HashMap<>(); + for (AssetWorkspaceBankCompositionFile tile : selectedTiles) { + final String artifactId = artifactId(tile); + if (artifactId != null) { + selectedByArtifactId.put(artifactId, tile); + } + } + for (AssetStudioGlyphMaterialArtifactBinding binding : schema.artifactBindings()) { + final AssetWorkspaceBankCompositionFile selectedTile = selectedByArtifactId.get(binding.artifactId()); + if (selectedTile == null || !Objects.equals(binding.fingerprint(), fingerprint(selectedTile))) { + return AssetStudioGlyphMaterialSchemaStatus.INCONSISTENT; + } + } + return AssetStudioGlyphMaterialSchemaStatus.OK; + } + + @Override + public boolean supportsSchemaAuthoring(AssetWorkspaceBankCompositionFile file) { + return file != null && artifactId(file) != null && fingerprint(file) != null; + } + + @Override + public String artifactId(AssetWorkspaceBankCompositionFile file) { + if (file == null) { + return null; + } + final Object artifactId = file.metadata().get("artifactId"); + if (artifactId instanceof String value && !value.isBlank()) { + return value.trim(); + } + return null; + } + + @Override + public String fingerprint(AssetWorkspaceBankCompositionFile file) { + if (file == null) { + return null; + } + if (file.fingerprint() != null && !file.fingerprint().isBlank()) { + return file.fingerprint().trim(); + } + final Object selectedFingerprint = file.metadata().get("selectedFingerprint"); + if (selectedFingerprint instanceof String value && !value.isBlank()) { + return value.trim(); + } + return null; + } + + @Override + public List tileColors(AssetWorkspaceBankCompositionFile file) { + final Map palette = nestedMap(file.metadata(), "palette"); + if (palette == null) { + return List.of(); + } + final List colors = new ArrayList<>(); + final Object rgbaColors = palette.get("rgba8888"); + if (rgbaColors instanceof Iterable rgbaIterable) { + for (Object item : rgbaIterable) { + if (!(item instanceof Number number)) { + continue; + } + final int value = number.intValue(); + final int alpha = value & 0xFF; + colors.add(alpha == 0xFF + ? String.format("#%02X%02X%02X", (value >>> 24) & 0xFF, (value >>> 16) & 0xFF, (value >>> 8) & 0xFF) + : String.format("#%02X%02X%02X%02X", (value >>> 24) & 0xFF, (value >>> 16) & 0xFF, (value >>> 8) & 0xFF, alpha)); + } + if (!colors.isEmpty()) { + return List.copyOf(colors); + } + } + final Object originalColors = palette.get("originalArgb8888"); + if (originalColors instanceof Iterable argbIterable) { + for (Object item : argbIterable) { + if (item instanceof Number number) { + colors.add(String.format("#%02X%02X%02X", (number.intValue() >> 16) & 0xFF, + (number.intValue() >> 8) & 0xFF, number.intValue() & 0xFF)); + } + } + } + return List.copyOf(colors); + } + + @SuppressWarnings("unchecked") + private static Map nestedMap(Map metadata, String key) { + final Object value = metadata.get(key); + return value instanceof Map nested ? (Map) nested : null; + } +} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/schema/AssetDetailsColorSchemaCoordinator.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/schema/DefaultAssetColorSchemaSession.java similarity index 51% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/schema/AssetDetailsColorSchemaCoordinator.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/schema/DefaultAssetColorSchemaSession.java index b9449ace..2412a6fd 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/schema/AssetDetailsColorSchemaCoordinator.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/schema/DefaultAssetColorSchemaSession.java @@ -1,31 +1,156 @@ -package p.studio.workspaces.assets.details.schema; +package p.studio.core.assets.schema; -import p.packer.messages.assets.AssetFamilyCatalog; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialArtifactBinding; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialMetadata; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialPalette; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialSchema; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialSchemaStatus; +import p.studio.api.assets.AssetFamily; +import p.studio.api.assets.workspace.AssetWorkspaceAssetDetails; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialArtifactBinding; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialMetadata; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialPalette; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialSchema; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialSchemaStatus; +import p.studio.api.assets.schema.AssetColorSchemaRules; +import p.studio.api.assets.schema.AssetColorSchemaSession; +import p.studio.api.assets.schema.AssetColorSchemaState; import java.util.*; -public final class AssetDetailsColorSchemaCoordinator { +public final class DefaultAssetColorSchemaSession implements AssetColorSchemaSession { + private final AssetColorSchemaRules rules; private AssetWorkspaceAssetDetails details; private AssetStudioGlyphMaterialMetadata localMaterialMetadata; + private AssetColorSchemaDraft source; + private AssetColorSchemaDraft draft; + private boolean editing; + + public DefaultAssetColorSchemaSession(AssetColorSchemaRules rules) { + this.rules = Objects.requireNonNull(rules, "rules"); + } public void replaceDetails(AssetWorkspaceAssetDetails details) { this.details = details; this.localMaterialMetadata = details == null ? null : details.glyphMaterialMetadata(); + if (!ready()) { + source = null; + draft = null; + editing = false; + return; + } + selectSchema(defaultSchemaId()); } public void replaceMaterialMetadata(AssetStudioGlyphMaterialMetadata metadata) { this.localMaterialMetadata = Objects.requireNonNull(metadata, "metadata"); + if (ready() && !editing) { + final String selected = draft == null ? null : draft.schemaId(); + selectSchema(findSchema(selected).isPresent() ? selected : defaultSchemaId()); + } } public boolean ready() { - return details != null && details.summary().assetFamily() == AssetFamilyCatalog.GLYPH_BANK; + return details != null && details.summary().assetFamily() == AssetFamily.GLYPH_BANK; + } + + @Override + public void beginEdit() { + if (ready()) { + source = AssetColorSchemaDraft.noSelection(); + draft = source; + editing = true; + } + } + + @Override + public void apply() { + if (draft != null) { + source = draft; + editing = false; + } + } + + @Override + public void reset() { + if (source != null) { + draft = source; + } + } + + @Override + public void cancel() { + reset(); + editing = false; + } + + @Override + public void selectSchema(String schemaId) { + if (!ready()) { + return; + } + final AssetColorSchemaDraft selected = schemaId == null ? AssetColorSchemaDraft.noSelection() : sourceDraft(schemaId); + if (editing) { + draft = selected.asUpdateDraft(rules); + } else { + source = selected; + draft = selected; + } + } + + @Override + public void createSchema() { + if (ready() && editing) { + draft = sourceDraft(nextSchemaId()).asUpdateDraft(rules); + } + } + + @Override + public void markSelectedSchemaForRemoval() { + if (!editing || draft == null) { + return; + } + draft = draft.existingSchema() ? draft.markForRemoval() : AssetColorSchemaDraft.noSelection(); + } + + @Override + public void moveToAssigned(List files) { + if (editing && draft != null) { + draft = draft.moveToAssigned(files, rules); + } + } + + @Override + public void moveToAvailable(List files) { + if (editing && draft != null) { + draft = draft.moveToAvailable(files, rules); + } + } + + @Override + public void moveAssignedUp(int index) { + if (editing && draft != null) { + draft = draft.moveAssignedUp(index, rules); + } + } + + @Override + public void moveAssignedDown(int index) { + if (editing && draft != null) { + draft = draft.moveAssignedDown(index, rules); + } + } + + @Override + public AssetColorSchemaState state() { + if (draft == null) { + return new AssetColorSchemaState(false, false, null, false, false, List.of(), List.of(), List.of()); + } + return new AssetColorSchemaState( + editing, + !Objects.equals(source, draft), + draft.schemaId(), + draft.existingSchema(), + draft.removeRequested(), + draft.availableTiles(), + draft.assignedTiles(), + draft.orderedColors(rules)); } public AssetStudioGlyphMaterialMetadata metadata() { @@ -44,8 +169,8 @@ public final class AssetDetailsColorSchemaCoordinator { return List.of(); } return details.bankComposition().selectedFiles().stream() - .filter(AssetDetailsColorSchemaCoordinator::supportsSchemaAuthoring) - .filter(file -> artifactId(file) != null) + .filter(rules::supportsSchemaAuthoring) + .filter(file -> rules.artifactId(file) != null) .toList(); } @@ -55,7 +180,7 @@ public final class AssetDetailsColorSchemaCoordinator { schema.artifactBindings().forEach(binding -> reservedArtifactIds.add(binding.artifactId())); } return selectedTiles().stream() - .filter(file -> !reservedArtifactIds.contains(artifactId(file))) + .filter(file -> !reservedArtifactIds.contains(rules.artifactId(file))) .toList(); } @@ -75,7 +200,7 @@ public final class AssetDetailsColorSchemaCoordinator { candidate.artifactBindings().forEach(binding -> reservedElsewhere.add(binding.artifactId())); } return selectedTiles().stream() - .filter(file -> current.contains(artifactId(file)) || !reservedElsewhere.contains(artifactId(file))) + .filter(file -> current.contains(rules.artifactId(file)) || !reservedElsewhere.contains(rules.artifactId(file))) .toList(); } @@ -135,26 +260,34 @@ public final class AssetDetailsColorSchemaCoordinator { return availableTilesForCreate().size(); } - public static AssetStudioGlyphMaterialSchemaStatus effectiveStatus( - AssetStudioGlyphMaterialSchema schema, - List selectedTiles) { - if (schema.status() == AssetStudioGlyphMaterialSchemaStatus.INCONSISTENT) { - return AssetStudioGlyphMaterialSchemaStatus.INCONSISTENT; - } - final Map selectedByArtifactId = new HashMap<>(); - for (AssetWorkspaceBankCompositionFile tile : selectedTiles) { - final String artifactId = artifactId(tile); - if (artifactId != null) { - selectedByArtifactId.put(artifactId, tile); - } - } - for (AssetStudioGlyphMaterialArtifactBinding binding : schema.artifactBindings()) { - final AssetWorkspaceBankCompositionFile selectedTile = selectedByArtifactId.get(binding.artifactId()); - if (selectedTile == null || !Objects.equals(binding.fingerprint(), fingerprint(selectedTile))) { - return AssetStudioGlyphMaterialSchemaStatus.INCONSISTENT; - } - } - return AssetStudioGlyphMaterialSchemaStatus.OK; + private AssetColorSchemaDraft sourceDraft(String schemaId) { + final AssetStudioGlyphMaterialSchema schema = findSchema(schemaId).orElse(null); + final List selectableTiles = schema == null + ? availableTilesForCreate() + : availableTilesForEdit(schema.schemaId()); + final Set assignedArtifactIds = schema == null + ? Set.of() + : schema.artifactBindings().stream() + .map(AssetStudioGlyphMaterialArtifactBinding::artifactId) + .collect(java.util.stream.Collectors.toCollection(LinkedHashSet::new)); + final List assignedTiles = selectableTiles.stream() + .filter(file -> assignedArtifactIds.contains(rules.artifactId(file))) + .toList(); + final List availableTiles = selectableTiles.stream() + .filter(file -> !assignedArtifactIds.contains(rules.artifactId(file))) + .toList(); + final List preferredColors = schema == null + ? List.of() + : schema.materialIndices().entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .map(Map.Entry::getValue) + .toList(); + return new AssetColorSchemaDraft(schemaId, schema != null, false, availableTiles, assignedTiles, + preferredColors, schema == null); + } + + private String defaultSchemaId() { + return schemas().stream().map(AssetStudioGlyphMaterialSchema::schemaId).findFirst().orElse(null); } private AssetStudioGlyphMaterialSchema buildSchema( @@ -167,7 +300,7 @@ public final class AssetDetailsColorSchemaCoordinator { materialIndices.put(index, normalizeHtmlColor(orderedColors.get(index))); } final List bindings = assignedTiles.stream() - .map(file -> new AssetStudioGlyphMaterialArtifactBinding(artifactId(file), fingerprint(file))) + .map(file -> new AssetStudioGlyphMaterialArtifactBinding(rules.artifactId(file), rules.fingerprint(file))) .toList(); final boolean unchanged = existing != null && existing.materialIndices().equals(materialIndices) @@ -181,93 +314,6 @@ public final class AssetDetailsColorSchemaCoordinator { return new AssetStudioGlyphMaterialSchema(schemaId, status, version, materialIndices, bindings); } - static boolean supportsSchemaAuthoring(AssetWorkspaceBankCompositionFile file) { - return file != null - && artifactId(file) != null - && fingerprint(file) != null; - } - - static String artifactId(AssetWorkspaceBankCompositionFile file) { - if (file == null) { - return null; - } - final Object artifactId = file.metadata().get("artifactId"); - if (artifactId instanceof String value && !value.isBlank()) { - return value.trim(); - } - return null; - } - - static String fingerprint(AssetWorkspaceBankCompositionFile file) { - if (file == null) { - return null; - } - if (file.fingerprint() != null && !file.fingerprint().isBlank()) { - return file.fingerprint().trim(); - } - final Object selectedFingerprint = file.metadata().get("selectedFingerprint"); - if (selectedFingerprint instanceof String value && !value.isBlank()) { - return value.trim(); - } - return null; - } - - static List tileColors(AssetWorkspaceBankCompositionFile file) { - final Map palette = nestedMap(file.metadata(), "palette"); - if (palette == null) { - return List.of(); - } - final List colors = new ArrayList<>(); - final Object rgbaColors = palette.get("rgba8888"); - if (rgbaColors instanceof Iterable rgbaIterable) { - for (Object item : rgbaIterable) { - if (!(item instanceof Number number)) { - continue; - } - final int value = number.intValue(); - final int alpha = value & 0xFF; - colors.add(alpha == 0xFF - ? String.format( - "#%02X%02X%02X", - (value >>> 24) & 0xFF, - (value >>> 16) & 0xFF, - (value >>> 8) & 0xFF) - : String.format( - "#%02X%02X%02X%02X", - (value >>> 24) & 0xFF, - (value >>> 16) & 0xFF, - (value >>> 8) & 0xFF, - alpha)); - } - if (!colors.isEmpty()) { - return List.copyOf(colors); - } - } - final Object originalColors = palette.get("originalArgb8888"); - if (originalColors instanceof Iterable argbIterable) { - for (Object item : argbIterable) { - if (!(item instanceof Number number)) { - continue; - } - colors.add(String.format( - "#%02X%02X%02X", - (number.intValue() >> 16) & 0xFF, - (number.intValue() >> 8) & 0xFF, - number.intValue() & 0xFF)); - } - } - return List.copyOf(colors); - } - - @SuppressWarnings("unchecked") - private static Map nestedMap(Map metadata, String key) { - final Object value = metadata.get(key); - if (value instanceof Map nested) { - return (Map) nested; - } - return null; - } - private static String normalizeHtmlColor(String color) { return Objects.requireNonNull(color, "color").trim().toUpperCase(); } diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledAssetGenerationService.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledAssetGenerationService.java similarity index 91% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledAssetGenerationService.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledAssetGenerationService.java index 60611aea..4283c146 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledAssetGenerationService.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledAssetGenerationService.java @@ -1,15 +1,18 @@ -package p.studio.workspaces.assets.tiled; +package p.studio.core.assets.tiled; -import p.packer.dtos.PackerCodecConfigurationFieldDTO; -import p.packer.messages.assets.AssetFamilyCatalog; -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.AssetWorkspaceAssetDetails; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; +import p.studio.api.assets.AssetConfigurationField; +import p.studio.api.assets.AssetFamily; +import p.studio.api.project.ProjectReference; +import p.studio.api.assets.metadata.AssetStudioGlyphSpecialization; +import p.studio.api.assets.metadata.AssetMetadataService; +import p.studio.api.assets.metadata.AssetStudioSceneBankMetadata; +import p.studio.api.assets.metadata.AssetStudioSceneLayerBinding; +import p.studio.api.assets.metadata.AssetStudioSceneTile; +import p.studio.api.assets.workspace.AssetWorkspaceAssetDetails; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; +import p.studio.api.assets.tiled.SceneTmxExportDisposition; +import p.studio.api.assets.tiled.TiledAssetGenerationResult; +import p.studio.api.assets.tiled.TiledAssetService; import java.io.IOException; import java.nio.file.Files; @@ -21,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; -public final class TiledAssetGenerationService { +public final class TiledAssetGenerationService implements TiledAssetService { public static final String GENERATED_TSX_FILE = "tileset.tsx"; private static final long FLIP_HORIZONTAL_FLAG = 0x80000000L; @@ -30,20 +33,29 @@ public final class TiledAssetGenerationService { private static final long GID_MASK = ~(FLIP_HORIZONTAL_FLAG | FLIP_VERTICAL_FLAG | FLIP_DIAGONAL_FLAG); private final TiledXmlCodec codec = new TiledXmlCodec(); - private final AssetStudioMetadataService metadataService = new AssetStudioMetadataService(); + private final AssetMetadataService metadataService; - public enum SceneTmxExportDisposition { - OVERWRITE, - KEEP_BOTH + public TiledAssetGenerationService(AssetMetadataService metadataService) { + this.metadataService = Objects.requireNonNull(metadataService, "metadataService"); + } + + @Override + public boolean sceneTmxExists(AssetWorkspaceAssetDetails details) { + if (details == null || details.sceneBankMetadata() == null) { + return false; + } + final String sceneTilemap = resolveSceneTilemap(details.sceneBankMetadata()); + return sceneTilemap != null && Files.isRegularFile(details.summary().assetRoot().resolve(sceneTilemap)); } public TiledAssetGenerationResult generateTilesetTsx(AssetWorkspaceAssetDetails details) { return exportTilesetTsx(details); } + @Override public TiledAssetGenerationResult exportTilesetTsx(AssetWorkspaceAssetDetails details) { if (details == null - || details.summary().assetFamily() != AssetFamilyCatalog.GLYPH_BANK + || details.summary().assetFamily() != AssetFamily.GLYPH_BANK || details.summary().glyphSpecialization() != AssetStudioGlyphSpecialization.TILESET) { return new TiledAssetGenerationResult(false, "TSX export is available only for Tileset-specialized glyph banks.", List.of(), List.of()); } @@ -94,11 +106,12 @@ public final class TiledAssetGenerationService { return exportSceneBankTmx(projectReference, details, SceneTmxExportDisposition.OVERWRITE); } + @Override public TiledAssetGenerationResult exportSceneBankTmx( ProjectReference projectReference, AssetWorkspaceAssetDetails details, SceneTmxExportDisposition disposition) { - if (details == null || details.summary().assetFamily() != AssetFamilyCatalog.SCENE_BANK) { + if (details == null || details.summary().assetFamily() != AssetFamily.SCENE_BANK) { return new TiledAssetGenerationResult(false, "TMX export is available only for Scene Bank assets.", List.of(), List.of()); } final AssetStudioSceneBankMetadata metadata = details.sceneBankMetadata(); @@ -182,8 +195,9 @@ public final class TiledAssetGenerationService { } } + @Override public TiledAssetGenerationResult importSceneBankTmx(ProjectReference projectReference, AssetWorkspaceAssetDetails details) { - if (details == null || details.summary().assetFamily() != AssetFamilyCatalog.SCENE_BANK) { + if (details == null || details.summary().assetFamily() != AssetFamily.SCENE_BANK) { return new TiledAssetGenerationResult(false, "TMX import is available only for Scene Bank assets.", List.of(), List.of()); } final AssetStudioSceneBankMetadata metadata = details.sceneBankMetadata(); @@ -295,12 +309,20 @@ public final class TiledAssetGenerationService { .mapToInt(AssetStudioSceneLayerBinding::height) .max() .orElse(metadata.mapHeight())); - metadataService.writeSceneBankMetadata(details.summary().assetRoot(), new AssetStudioSceneBankMetadata( + final var metadataWrite = metadataService.writeSceneBankMetadata( + details.summary().assetRoot(), new AssetStudioSceneBankMetadata( mapWidth, mapHeight, metadata.layerCount(), updatedBindings, metadata.supportFile())); + if (!metadataWrite.successful()) { + return new TiledAssetGenerationResult( + false, + "Unable to import TMX: " + metadataWrite.message(), + List.of(), + List.of()); + } return new TiledAssetGenerationResult(true, "Imported TMX successfully.", updatedBindings, List.of(inputPath, metadata.supportFile())); } catch (IOException | TiledUnsupportedFeatureException exception) { return new TiledAssetGenerationResult(false, "Unable to import TMX: " + exception.getMessage(), List.of(), List.of()); @@ -401,10 +423,10 @@ public final class TiledAssetGenerationService { return tilemaps.size() == 1 ? tilemaps.iterator().next() : null; } - private int parseTileSize(List metadataFields) { + private int parseTileSize(List metadataFields) { final String value = metadataFields.stream() .filter(field -> "tile_size".equals(field.key())) - .map(PackerCodecConfigurationFieldDTO::value) + .map(AssetConfigurationField::value) .findFirst() .orElse("16x16"); final String normalized = value.trim().toLowerCase(); diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledMapDocument.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledMapDocument.java similarity index 96% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledMapDocument.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledMapDocument.java index c95ebece..df989e77 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledMapDocument.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledMapDocument.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.tiled; +package p.studio.core.assets.tiled; import java.util.List; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledObjectData.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledObjectData.java similarity index 92% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledObjectData.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledObjectData.java index 3831db2f..5b642a82 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledObjectData.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledObjectData.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.tiled; +package p.studio.core.assets.tiled; import java.util.List; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledObjectLayer.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledObjectLayer.java similarity index 91% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledObjectLayer.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledObjectLayer.java index f08dc562..43a247b2 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledObjectLayer.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledObjectLayer.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.tiled; +package p.studio.core.assets.tiled; import java.util.List; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledPoint.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledPoint.java similarity index 54% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledPoint.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledPoint.java index 2fb4561f..40e5963d 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledPoint.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledPoint.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.tiled; +package p.studio.core.assets.tiled; public record TiledPoint(double x, double y) { } diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledProperty.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledProperty.java similarity index 92% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledProperty.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledProperty.java index 02ecd4f8..2d649f55 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledProperty.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledProperty.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.tiled; +package p.studio.core.assets.tiled; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledTileLayer.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledTileLayer.java similarity index 91% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledTileLayer.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledTileLayer.java index fd5fba06..d9ede110 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledTileLayer.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledTileLayer.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.tiled; +package p.studio.core.assets.tiled; import java.util.List; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledTilesetDocument.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledTilesetDocument.java similarity index 95% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledTilesetDocument.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledTilesetDocument.java index 5cd0efb1..8e9333f3 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledTilesetDocument.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledTilesetDocument.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.tiled; +package p.studio.core.assets.tiled; import java.util.List; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledTilesetReference.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledTilesetReference.java similarity index 91% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledTilesetReference.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledTilesetReference.java index 579460cf..a8ee4771 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledTilesetReference.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledTilesetReference.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.tiled; +package p.studio.core.assets.tiled; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledTilesetTile.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledTilesetTile.java similarity index 93% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledTilesetTile.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledTilesetTile.java index 468241da..48baac0c 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledTilesetTile.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledTilesetTile.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.tiled; +package p.studio.core.assets.tiled; import java.util.List; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledUnsupportedFeatureException.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledUnsupportedFeatureException.java similarity index 80% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledUnsupportedFeatureException.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledUnsupportedFeatureException.java index a9ac37ea..dc0c4e55 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledUnsupportedFeatureException.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledUnsupportedFeatureException.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.tiled; +package p.studio.core.assets.tiled; public final class TiledUnsupportedFeatureException extends RuntimeException { public TiledUnsupportedFeatureException(String message) { diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledXmlCodec.java b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledXmlCodec.java similarity index 99% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledXmlCodec.java rename to prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledXmlCodec.java index afaa4202..1728c248 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/tiled/TiledXmlCodec.java +++ b/prometeu-studio-core/src/main/java/p/studio/core/assets/tiled/TiledXmlCodec.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.tiled; +package p.studio.core.assets.tiled; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/prometeu-studio-core/src/main/java/p/studio/core/execution/DefaultExecutionControllerFactory.java b/prometeu-studio-core/src/main/java/p/studio/core/execution/DefaultExecutionControllerFactory.java new file mode 100644 index 00000000..4daf71a7 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/execution/DefaultExecutionControllerFactory.java @@ -0,0 +1,29 @@ +package p.studio.core.execution; + +import p.studio.api.execution.ExecutionController; +import p.studio.api.execution.ExecutionControllerFactory; +import p.studio.api.execution.ExecutionSession; +import p.studio.api.project.ProjectLocalStudioSetup; +import p.studio.api.project.ProjectReference; +import p.studio.api.shipper.Shipper; +import p.studio.core.runtime.RuntimeGateway; +import p.studio.api.operation.OperationExecutor; + +import java.util.Objects; + +public final class DefaultExecutionControllerFactory implements ExecutionControllerFactory { + private final Shipper shipper; + private final RuntimeGateway runtime; + private final OperationExecutor operations; + + public DefaultExecutionControllerFactory(Shipper shipper, RuntimeGateway runtime, OperationExecutor operations) { + this.shipper = Objects.requireNonNull(shipper, "shipper"); + this.runtime = Objects.requireNonNull(runtime, "runtime"); + this.operations = Objects.requireNonNull(operations, "operations"); + } + + @Override + public ExecutionController create(ProjectReference project, ProjectLocalStudioSetup setup, ExecutionSession session) { + return new PlayStopExecutionController(project, setup, session, shipper, runtime, operations); + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/execution/DefaultExecutionSession.java b/prometeu-studio-core/src/main/java/p/studio/core/execution/DefaultExecutionSession.java new file mode 100644 index 00000000..34c14b36 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/execution/DefaultExecutionSession.java @@ -0,0 +1,146 @@ +package p.studio.core.execution; + +import p.studio.api.execution.ExecutionLogEntry; +import p.studio.api.execution.ExecutionLogSeverity; +import p.studio.api.execution.ExecutionLogSource; +import p.studio.api.execution.ExecutionSession; +import p.studio.api.execution.ExecutionSnapshot; +import p.studio.api.execution.ExecutionState; +import p.studio.api.operation.OperationSubscription; +import p.studio.api.shipper.ShipperLogEntry; + +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.function.Consumer; + +public final class DefaultExecutionSession implements ExecutionSession { + private final Object monitor = new Object(); + private final ArrayList logs = new ArrayList<>(); + private final CopyOnWriteArrayList> listeners = new CopyOnWriteArrayList<>(); + private ExecutionState state = ExecutionState.IDLE; + private long nextSequence = 1L; + + @Override + public ExecutionSnapshot snapshot() { + synchronized (monitor) { + return snapshotLocked(); + } + } + + @Override + public OperationSubscription subscribe(Consumer listener) { + final Consumer safeListener = Objects.requireNonNull(listener, "listener"); + listeners.add(safeListener); + safeListener.accept(snapshot()); + return () -> listeners.remove(safeListener); + } + + @Override + public void beginPreparationCycle() { publish(transitionLocked(ExecutionState.PREPARING, true)); } + + @Override + public void transitionToPrepareFailed() { publish(transitionLocked(ExecutionState.PREPARE_FAILED, false)); } + + @Override + public void transitionToConnecting() { publish(transitionLocked(ExecutionState.CONNECTING, false)); } + + @Override + public void transitionToRunning() { publish(transitionLocked(ExecutionState.RUNNING, false)); } + + @Override + public void transitionToRuntimeFailed() { publish(transitionLocked(ExecutionState.RUNTIME_FAILED, false)); } + + @Override + public void transitionToStopped() { publish(transitionLocked(ExecutionState.STOPPED, false)); } + + @Override + public void resetToIdle() { publish(transitionLocked(ExecutionState.IDLE, false)); } + + @Override + public void appendShipperLog(ShipperLogEntry entry) { + final ShipperLogEntry safeEntry = Objects.requireNonNull(entry, "entry"); + appendLog( + switch (safeEntry.source()) { + case BUILD -> ExecutionLogSource.BUILD; + case PACK_VALIDATION -> ExecutionLogSource.PACK_VALIDATION; + case PACK -> ExecutionLogSource.PACK; + case MANIFEST -> ExecutionLogSource.MANIFEST; + }, + switch (safeEntry.severity()) { + case INFO -> ExecutionLogSeverity.INFO; + case ERROR -> ExecutionLogSeverity.ERROR; + }, + safeEntry.message(), + safeEntry.timestamp()); + } + + @Override + public void appendRuntimeLog(ExecutionLogSeverity severity, String message) { + appendRuntimeLog(severity, message, Instant.now()); + } + + @Override + public void appendRuntimeLog(ExecutionLogSeverity severity, String message, Instant timestamp) { + appendLog(ExecutionLogSource.RUNTIME, severity, message, timestamp); + } + + @Override + public void close() { + final ExecutionState current = snapshot().state(); + if (current == ExecutionState.PREPARING + || current == ExecutionState.CONNECTING + || current == ExecutionState.RUNNING) { + transitionToStopped(); + } + listeners.clear(); + } + + private void appendLog(ExecutionLogSource source, ExecutionLogSeverity severity, String message, Instant timestamp) { + final ExecutionSnapshot snapshot; + synchronized (monitor) { + logs.add(new ExecutionLogEntry(nextSequence++, timestamp, source, severity, message)); + snapshot = snapshotLocked(); + } + publish(snapshot); + } + + private ExecutionSnapshot transitionLocked(ExecutionState target, boolean clearLogs) { + final ExecutionSnapshot snapshot; + synchronized (monitor) { + ensureTransitionAllowed(state, Objects.requireNonNull(target, "target")); + state = target; + if (clearLogs) { + logs.clear(); + nextSequence = 1L; + } + snapshot = snapshotLocked(); + } + return snapshot; + } + + private ExecutionSnapshot snapshotLocked() { + return new ExecutionSnapshot(state, List.copyOf(logs)); + } + + private static void ensureTransitionAllowed(ExecutionState current, ExecutionState next) { + if (current == next) return; + final boolean allowed = switch (current) { + case IDLE -> next == ExecutionState.PREPARING; + case PREPARING -> next == ExecutionState.PREPARE_FAILED + || next == ExecutionState.CONNECTING + || next == ExecutionState.STOPPED; + case PREPARE_FAILED -> next == ExecutionState.IDLE || next == ExecutionState.PREPARING; + case CONNECTING -> next == ExecutionState.RUNNING || next == ExecutionState.RUNTIME_FAILED || next == ExecutionState.STOPPED; + case RUNNING -> next == ExecutionState.STOPPED || next == ExecutionState.RUNTIME_FAILED; + case RUNTIME_FAILED, STOPPED -> next == ExecutionState.IDLE || next == ExecutionState.PREPARING; + }; + if (!allowed) throw new IllegalStateException("illegal execution transition: " + current + " -> " + next); + } + + private void publish(ExecutionSnapshot snapshot) { + listeners.forEach(listener -> listener.accept(snapshot)); + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/execution/ExecutionModule.java b/prometeu-studio-core/src/main/java/p/studio/core/execution/ExecutionModule.java new file mode 100644 index 00000000..98df9170 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/execution/ExecutionModule.java @@ -0,0 +1,6 @@ +package p.studio.core.execution; + +final class ExecutionModule { + private ExecutionModule() { + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/execution/PlayStopExecutionController.java b/prometeu-studio-core/src/main/java/p/studio/core/execution/PlayStopExecutionController.java new file mode 100644 index 00000000..a05ac817 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/execution/PlayStopExecutionController.java @@ -0,0 +1,166 @@ +package p.studio.core.execution; + +import p.studio.api.execution.ExecutionController; +import p.studio.api.execution.ExecutionLogSeverity; +import p.studio.api.execution.ExecutionSession; +import p.studio.api.execution.ExecutionSnapshot; +import p.studio.api.execution.ExecutionState; +import p.studio.api.project.ProjectLocalStudioSetup; +import p.studio.api.project.ProjectReference; +import p.studio.api.shipper.Shipper; +import p.studio.api.shipper.ShipperPrepareResult; +import p.studio.api.operation.OperationExecutor; +import p.studio.api.operation.OperationHandle; +import p.studio.core.runtime.RuntimeConnection; +import p.studio.core.runtime.RuntimeGateway; + +import java.util.Objects; +import java.util.concurrent.CancellationException; +import java.util.concurrent.CompletionException; + +final class PlayStopExecutionController implements ExecutionController { + private final Object monitor = new Object(); + private final ProjectReference project; + private final ProjectLocalStudioSetup setup; + private final ExecutionSession session; + private final Shipper shipper; + private final RuntimeGateway runtime; + private final OperationExecutor operations; + private RuntimeConnection connection; + private OperationHandle activeOperation; + private OperationHandle preparationOperation; + private boolean stopRequested; + + PlayStopExecutionController(ProjectReference project, ProjectLocalStudioSetup setup, + ExecutionSession session, Shipper shipper, RuntimeGateway runtime, OperationExecutor operations) { + this.project = Objects.requireNonNull(project, "project"); + this.setup = Objects.requireNonNull(setup, "setup"); + this.session = Objects.requireNonNull(session, "session"); + this.shipper = Objects.requireNonNull(shipper, "shipper"); + this.runtime = Objects.requireNonNull(runtime, "runtime"); + this.operations = Objects.requireNonNull(operations, "operations"); + } + + @Override + public OperationHandle play() { + synchronized (monitor) { + if (isBusy(session.snapshot().state()) && activeOperation != null) { + return activeOperation; + } + stopRequested = false; + session.beginPreparationCycle(); + activeOperation = operations.submit("Run " + project.name(), this::runPlay); + return activeOperation; + } + } + + @Override + public void stop() { + final ExecutionState state = session.snapshot().state(); + final RuntimeConnection active; + final OperationHandle preparation; + final OperationHandle execution; + synchronized (monitor) { + stopRequested = true; + active = connection; + connection = null; + preparation = preparationOperation; + preparationOperation = null; + execution = activeOperation; + } + if (execution != null) execution.cancel(); + if (preparation != null) preparation.cancel(); + if (active != null) active.close(); + if (state == ExecutionState.PREPARING || state == ExecutionState.CONNECTING || state == ExecutionState.RUNNING) { + session.transitionToStopped(); + } + } + + @Override + public void close() { + stop(); + } + + private ExecutionSnapshot runPlay() { + final OperationHandle preparation = shipper.prepare(project, session::appendShipperLog); + synchronized (monitor) { + preparationOperation = preparation; + if (stopRequested) { + preparation.cancel(); + return session.snapshot(); + } + } + final ShipperPrepareResult prepared; + try { + prepared = preparation.completion().toCompletableFuture().join(); + } catch (CancellationException failure) { + return session.snapshot(); + } catch (CompletionException failure) { + if (stopRequested) { + return session.snapshot(); + } + session.appendRuntimeLog(ExecutionLogSeverity.ERROR, + "Preparation failed: " + message(failure.getCause() == null ? failure : failure.getCause())); + session.transitionToPrepareFailed(); + return session.snapshot(); + } finally { + synchronized (monitor) { + if (preparationOperation == preparation) { + preparationOperation = null; + } + } + } + if (!prepared.success()) { + session.transitionToPrepareFailed(); + return session.snapshot(); + } + synchronized (monitor) { + if (stopRequested) return session.snapshot(); + } + session.transitionToConnecting(); + try { + final RuntimeConnection started = runtime.start(project, setup, + log -> session.appendRuntimeLog(log.severity(), log.message(), log.timestamp())); + synchronized (monitor) { + if (stopRequested) { + started.close(); + session.transitionToStopped(); + return session.snapshot(); + } + connection = started; + } + session.transitionToRunning(); + started.completion().whenComplete((exitCode, failure) -> handleExit(started, exitCode, failure)); + } catch (Exception failure) { + session.appendRuntimeLog(ExecutionLogSeverity.ERROR, "Runtime startup failed: " + message(failure)); + session.transitionToRuntimeFailed(); + } + return session.snapshot(); + } + + private void handleExit(RuntimeConnection started, Integer exitCode, Throwable failure) { + final boolean stopped; + synchronized (monitor) { + if (connection == started) connection = null; + stopped = stopRequested; + } + if (stopped || session.snapshot().state() == ExecutionState.STOPPED) return; + if (failure == null && exitCode != null && exitCode == 0) { + session.appendRuntimeLog(ExecutionLogSeverity.INFO, "Runtime process exited successfully."); + session.transitionToStopped(); + } else { + session.appendRuntimeLog(ExecutionLogSeverity.ERROR, + failure == null ? "Runtime process exited with code " + exitCode + "." : "Runtime process failed: " + message(failure)); + session.transitionToRuntimeFailed(); + } + } + + private static boolean isBusy(ExecutionState state) { + return state == ExecutionState.PREPARING || state == ExecutionState.CONNECTING || state == ExecutionState.RUNNING; + } + + private static String message(Throwable failure) { + return failure.getMessage() == null || failure.getMessage().isBlank() + ? failure.getClass().getSimpleName() : failure.getMessage(); + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/project/KnownProjectsService.java b/prometeu-studio-core/src/main/java/p/studio/core/project/KnownProjectsService.java new file mode 100644 index 00000000..e7bb362e --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/project/KnownProjectsService.java @@ -0,0 +1,98 @@ +package p.studio.core.project; + +import p.studio.api.project.KnownProjects; +import p.studio.api.project.ProjectCatalog; +import p.studio.api.project.ProjectReference; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; + +public final class KnownProjectsService implements KnownProjects { + private final Path storageFile; + private final ProjectCatalog catalog; + + public KnownProjectsService(Path storageFile, ProjectCatalog catalog) { + this.storageFile = Objects.requireNonNull(storageFile, "storageFile").toAbsolutePath().normalize(); + this.catalog = Objects.requireNonNull(catalog, "catalog"); + } + + @Override + public List listKnownProjects() { + final boolean exists = Files.isRegularFile(storageFile); + final Set paths = readStoredPaths(); + if (!exists && paths.isEmpty()) { + final List discovered = catalog.listProjects(); + writeStoredPaths(discovered.stream().map(ProjectReference::rootPath).toList()); + return discovered; + } + final List projects = new ArrayList<>(); + boolean mutated = false; + for (Path path : paths) { + if (!Files.isDirectory(path)) { + mutated = true; + } else { + projects.add(catalog.openProject(path)); + } + } + projects.sort(Comparator.comparing(ProjectReference::name, String.CASE_INSENSITIVE_ORDER)); + if (mutated) { + writeStoredPaths(projects.stream().map(ProjectReference::rootPath).toList()); + } + return List.copyOf(projects); + } + + @Override + public void remember(ProjectReference project) { + final Set paths = readStoredPaths(); + paths.add(normalize(project.rootPath())); + writeStoredPaths(paths); + } + + @Override + public void forget(ProjectReference project) { + final Set paths = readStoredPaths(); + paths.remove(normalize(project.rootPath())); + writeStoredPaths(paths); + } + + private Set readStoredPaths() { + if (!Files.isRegularFile(storageFile)) { + return new LinkedHashSet<>(); + } + try { + final Set paths = new LinkedHashSet<>(); + for (String line : Files.readAllLines(storageFile, StandardCharsets.UTF_8)) { + if (!line.isBlank()) { + paths.add(normalize(Path.of(line.trim()))); + } + } + return paths; + } catch (IOException exception) { + throw new UncheckedIOException(exception); + } + } + + private void writeStoredPaths(Iterable paths) { + try { + Files.createDirectories(storageFile.getParent()); + final List lines = new ArrayList<>(); + paths.forEach(path -> lines.add(normalize(path).toString())); + Files.write(storageFile, lines, StandardCharsets.UTF_8); + } catch (IOException exception) { + throw new UncheckedIOException(exception); + } + } + + private Path normalize(Path path) { + return Objects.requireNonNull(path, "path").toAbsolutePath().normalize(); + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/project/PackerProjectWorkspaceInitializer.java b/prometeu-studio-core/src/main/java/p/studio/core/project/PackerProjectWorkspaceInitializer.java new file mode 100644 index 00000000..96cbf5f1 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/project/PackerProjectWorkspaceInitializer.java @@ -0,0 +1,24 @@ +package p.studio.core.project; + +import p.packer.PackerWorkspaceService; +import p.packer.messages.InitWorkspaceRequest; +import p.packer.messages.PackerProjectContext; +import p.studio.api.project.ProjectReference; +import p.studio.api.project.ProjectWorkspaceInitializer; + +import java.util.Objects; + +public final class PackerProjectWorkspaceInitializer implements ProjectWorkspaceInitializer { + private final PackerWorkspaceService packer; + + public PackerProjectWorkspaceInitializer(PackerWorkspaceService packer) { + this.packer = Objects.requireNonNull(packer, "packer"); + } + + @Override + public void initialize(ProjectReference project) { + final ProjectReference safeProject = Objects.requireNonNull(project, "project"); + packer.initWorkspace(new InitWorkspaceRequest(new PackerProjectContext( + safeProject.name(), safeProject.rootPath()))); + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectCatalogService.java b/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectCatalogService.java new file mode 100644 index 00000000..774865b3 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectCatalogService.java @@ -0,0 +1,188 @@ +package p.studio.core.project; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import p.studio.api.project.ProjectCatalog; +import p.studio.api.project.ProjectCreationRequest; +import p.studio.api.project.ProjectLocalStudioSetup; +import p.studio.api.project.ProjectReference; +import p.studio.api.project.ProjectTarget; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Comparator; +import java.util.List; +import java.util.Locale; +import java.util.Objects; +import java.util.stream.Stream; + +public final class ProjectCatalogService implements ProjectCatalog { + private static final String MANIFEST_FILE_NAME = "prometeu.json"; + private final Path projectsRoot; + private final ObjectMapper mapper; + private final ProjectLocalStudioSetupStore setupStore; + + public ProjectCatalogService(Path projectsRoot, ObjectMapper mapper, ProjectLocalStudioSetupStore setupStore) { + this.projectsRoot = Objects.requireNonNull(projectsRoot, "projectsRoot").toAbsolutePath().normalize(); + this.mapper = Objects.requireNonNull(mapper, "mapper").copy() + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + this.setupStore = Objects.requireNonNull(setupStore, "setupStore"); + } + + @Override + public Path projectsRoot() { + return projectsRoot; + } + + @Override + public List listProjects() { + if (!Files.isDirectory(projectsRoot)) { + return List.of(); + } + try (Stream children = Files.list(projectsRoot)) { + return children.filter(this::isValidProjectRoot) + .map(this::buildReference) + .sorted(Comparator.comparing(ProjectReference::name, String.CASE_INSENSITIVE_ORDER)) + .toList(); + } catch (IOException exception) { + throw new UncheckedIOException(exception); + } + } + + @Override + public ProjectReference openProject(Path projectPath) { + return openProjectManifest(manifestPath(Objects.requireNonNull(projectPath, "projectPath").toAbsolutePath().normalize())); + } + + @Override + public ProjectReference openProjectManifest(Path manifestPath) { + final Path normalized = Objects.requireNonNull(manifestPath, "manifestPath").toAbsolutePath().normalize(); + if (!normalized.getFileName().toString().equals(MANIFEST_FILE_NAME) || !Files.isRegularFile(normalized)) { + throw new IllegalArgumentException("project manifest not found: expected " + normalized); + } + final Path root = normalized.getParent(); + if (root == null || !Files.isDirectory(root)) { + throw new IllegalArgumentException("project root does not exist: " + normalized); + } + return buildReference(root); + } + + @Override + public ProjectReference createProject(ProjectCreationRequest request) { + Objects.requireNonNull(request, "request"); + final String displayName = requireText(request.projectName(), "project name"); + final String directoryName = sanitizeProjectName(displayName); + final String languageId = requireText(request.languageId(), "project language"); + if (request.stdlib() <= 0 || request.indentationWidth() <= 0 || request.target() == null) { + throw new IllegalArgumentException("invalid project configuration"); + } + final Path sourceRoot = normalizeSourceRoot(request.sourceRoot()); + final Path parent = Objects.requireNonNull(request.parentLocation(), "parentLocation").toAbsolutePath().normalize(); + if (Files.exists(parent) && !Files.isDirectory(parent)) { + throw new IllegalArgumentException("project location is not a directory: " + parent); + } + final Path root = parent.resolve(directoryName).normalize(); + if (Files.exists(root)) { + throw new IllegalArgumentException("project already exists: " + directoryName); + } + final ProjectReference project = new ProjectReference(displayName, "1.0.0", languageId, + request.stdlib(), request.target(), root); + try { + Files.createDirectories(ProjectStudioPaths.studioRoot(project)); + Files.createDirectories(root.resolve(".workspace")); + Files.createDirectories(root.resolve(sourceRoot)); + Files.createDirectories(root.resolve("assets")); + Files.createDirectories(root.resolve("build")); + Files.createDirectories(root.resolve("cartridge")); + Files.writeString(manifestPath(root), defaultManifest(project)); + Files.writeString(root.resolve(".gitignore"), defaultGitIgnore()); + setupStore.save(project, new ProjectLocalStudioSetup(request.runtimePath(), + new ProjectLocalStudioSetup.EditorIndentationSetup("spaces", request.indentationWidth()))); + } catch (IOException exception) { + throw new UncheckedIOException(exception); + } + return openProject(root); + } + + private ProjectReference buildReference(Path root) { + final Path normalized = root.toAbsolutePath().normalize(); + final ProjectManifestSummary manifest; + try { + manifest = mapper.readValue(manifestPath(normalized).toFile(), ProjectManifestSummary.class); + } catch (IOException exception) { + throw new UncheckedIOException(exception); + } + final String name = requireText(manifest.name(), "manifest name"); + final String version = requireText(manifest.version(), "manifest version"); + final String language = requireText(manifest.language(), "manifest language"); + final int stdlib; + try { + stdlib = Integer.parseInt(requireText(manifest.stdlib(), "manifest stdlib")); + } catch (NumberFormatException exception) { + throw new IllegalArgumentException("project manifest invalid stdlib: " + manifestPath(normalized), exception); + } + final ProjectTarget target; + try { + target = ProjectTarget.valueOf(requireText(manifest.target(), "manifest target")); + } catch (IllegalArgumentException exception) { + throw new IllegalArgumentException("project manifest invalid target: " + manifestPath(normalized), exception); + } + return new ProjectReference(name, version, language, stdlib, target, normalized); + } + + private boolean isValidProjectRoot(Path path) { + return Files.isDirectory(path) && Files.isRegularFile(manifestPath(path)); + } + + private Path manifestPath(Path root) { + return root.resolve(MANIFEST_FILE_NAME); + } + + private Path normalizeSourceRoot(String value) { + final Path path = Path.of(requireText(value, "project source root")).normalize(); + if (path.isAbsolute() || path.startsWith("..")) { + throw new IllegalArgumentException("project source root must be a relative project path"); + } + return path; + } + + private String defaultManifest(ProjectReference project) { + return """ + { + "name": "%s", + "version": "%s", + "language": "%s", + "stdlib": "%d", + "target": "%s", + "dependencies": [] + } + """.formatted(project.name(), project.version(), project.languageId(), + project.stdlibVersion(), project.target().exportReferenceName()); + } + + private String defaultGitIgnore() { + return ".studio/\n.workspace/\nbuild/\n\n.DS_Store\n.AppleDouble\n.LSOverride\nThumbs.db\nDesktop.ini\n.directory\n*~\n"; + } + + private String sanitizeProjectName(String value) { + final String result = requireText(value, "project name").toLowerCase(Locale.ROOT) + .replaceAll("[^a-z0-9]+", "-").replaceAll("^-+", "").replaceAll("-+$", ""); + if (result.isEmpty()) { + throw new IllegalArgumentException("project name must contain a letter or number"); + } + return result; + } + + private static String requireText(String value, String label) { + final String result = Objects.requireNonNull(value, label).trim(); + if (result.isEmpty()) { + throw new IllegalArgumentException(label + " must not be blank"); + } + return result; + } + + private record ProjectManifestSummary(String name, String version, String language, String stdlib, String target) { + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectLocalStudioSetupStore.java b/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectLocalStudioSetupStore.java new file mode 100644 index 00000000..218ed310 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectLocalStudioSetupStore.java @@ -0,0 +1,43 @@ +package p.studio.core.project; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import p.studio.api.project.ProjectLocalStudioSetup; +import p.studio.api.project.ProjectReference; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Objects; + +public final class ProjectLocalStudioSetupStore { + private final ObjectMapper mapper; + + public ProjectLocalStudioSetupStore(ObjectMapper mapper) { + this.mapper = Objects.requireNonNull(mapper, "mapper").copy() + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + } + + public ProjectLocalStudioSetup load(ProjectReference project) { + final Path path = ProjectStudioPaths.setupPath(project); + if (!Files.isRegularFile(path)) { + return ProjectLocalStudioSetup.defaults(); + } + try { + final ProjectLocalStudioSetup loaded = mapper.readValue(path.toFile(), ProjectLocalStudioSetup.class); + return loaded == null ? ProjectLocalStudioSetup.defaults() : loaded; + } catch (IOException | RuntimeException ignored) { + return ProjectLocalStudioSetup.defaults(); + } + } + + public void save(ProjectReference project, ProjectLocalStudioSetup setup) { + final Path path = ProjectStudioPaths.setupPath(project); + try { + Files.createDirectories(path.getParent()); + mapper.writerWithDefaultPrettyPrinter().writeValue(path.toFile(), Objects.requireNonNull(setup, "setup")); + } catch (IOException exception) { + throw new IllegalStateException("unable to save project setup: " + path, exception); + } + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectLocalStudioStateStore.java b/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectLocalStudioStateStore.java new file mode 100644 index 00000000..e75a22a7 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectLocalStudioStateStore.java @@ -0,0 +1,48 @@ +package p.studio.core.project; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import p.studio.api.project.ProjectLocalStudioState; +import p.studio.api.project.ProjectReference; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Objects; + +public final class ProjectLocalStudioStateStore { + private final ObjectMapper mapper; + + public ProjectLocalStudioStateStore(ObjectMapper mapper) { + this.mapper = Objects.requireNonNull(mapper, "mapper").copy() + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .enable(SerializationFeature.INDENT_OUTPUT); + } + + public ProjectLocalStudioState load(ProjectReference project) { + final Path path = ProjectStudioPaths.statePath(project); + if (!Files.isRegularFile(path)) { + return ProjectLocalStudioState.defaults(); + } + try { + final ProjectLocalStudioState loaded = mapper.readValue(path.toFile(), ProjectLocalStudioState.class); + return loaded == null || loaded.version() != ProjectLocalStudioState.CURRENT_VERSION + ? ProjectLocalStudioState.defaults() + : loaded; + } catch (IOException | RuntimeException ignored) { + return ProjectLocalStudioState.defaults(); + } + } + + public void save(ProjectReference project, ProjectLocalStudioState state) { + final Path path = ProjectStudioPaths.statePath(project); + try { + Files.createDirectories(path.getParent()); + mapper.writeValue(path.toFile(), Objects.requireNonNull(state, "state")); + } catch (IOException exception) { + throw new UncheckedIOException(exception); + } + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectModule.java b/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectModule.java new file mode 100644 index 00000000..89f78d22 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectModule.java @@ -0,0 +1,6 @@ +package p.studio.core.project; + +final class ProjectModule { + private ProjectModule() { + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectStudioPaths.java b/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectStudioPaths.java new file mode 100644 index 00000000..3a7fd0d8 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/project/ProjectStudioPaths.java @@ -0,0 +1,27 @@ +package p.studio.core.project; + +import p.studio.api.project.ProjectReference; + +import java.nio.file.Path; +import java.util.Objects; + +public final class ProjectStudioPaths { + private ProjectStudioPaths() { + } + + public static Path studioRoot(ProjectReference project) { + return Objects.requireNonNull(project, "project").rootPath().resolve(".studio").toAbsolutePath().normalize(); + } + + public static Path activitiesPath(ProjectReference project) { + return studioRoot(project).resolve("activities.json"); + } + + public static Path setupPath(ProjectReference project) { + return studioRoot(project).resolve("setup.json"); + } + + public static Path statePath(ProjectReference project) { + return studioRoot(project).resolve("state.json"); + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/project/preferences/JsonProjectActivityHistoryStore.java b/prometeu-studio-core/src/main/java/p/studio/core/project/preferences/JsonProjectActivityHistoryStore.java new file mode 100644 index 00000000..9d43e837 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/project/preferences/JsonProjectActivityHistoryStore.java @@ -0,0 +1,56 @@ +package p.studio.core.project.preferences; + +import com.fasterxml.jackson.databind.ObjectMapper; +import p.studio.api.preferences.ProjectActivityHistoryStore; +import p.studio.api.preferences.ProjectActivityRecord; +import p.studio.api.project.ProjectReference; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +public final class JsonProjectActivityHistoryStore implements ProjectActivityHistoryStore { + private final ObjectMapper mapper; + + public JsonProjectActivityHistoryStore(ObjectMapper mapper) { + this.mapper = Objects.requireNonNull(mapper, "mapper").copy(); + } + + @Override + public List load(ProjectReference projectReference) { + final Path path = activitiesPath(projectReference); + if (!Files.isRegularFile(path)) { + return List.of(); + } + try { + final ProjectActivityRecord[] entries = mapper.readValue(path.toFile(), ProjectActivityRecord[].class); + return entries == null ? List.of() : List.copyOf(Arrays.asList(entries)); + } catch (IOException | RuntimeException ignored) { + return List.of(); + } + } + + @Override + public void save(ProjectReference projectReference, List entries) { + final Path path = activitiesPath(projectReference); + try { + Files.createDirectories(path.getParent()); + mapper.writerWithDefaultPrettyPrinter().writeValue(path.toFile(), List.copyOf(entries)); + } catch (IOException exception) { + throw new UncheckedIOException(exception); + } + } + + private Path activitiesPath(ProjectReference projectReference) { + return Objects.requireNonNull(projectReference, "projectReference") + .rootPath() + .resolve(".studio") + .resolve("activities.json") + .toAbsolutePath() + .normalize(); + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/project/preferences/JsonWindowStateStore.java b/prometeu-studio-core/src/main/java/p/studio/core/project/preferences/JsonWindowStateStore.java new file mode 100644 index 00000000..b4abc86a --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/project/preferences/JsonWindowStateStore.java @@ -0,0 +1,70 @@ +package p.studio.core.project.preferences; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.ObjectMapper; +import p.studio.api.preferences.WindowGeometry; +import p.studio.api.preferences.WindowStateStore; +import p.studio.api.project.ProjectReference; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +public final class JsonWindowStateStore implements WindowStateStore { + private final Path storageFile; + private final ObjectMapper mapper; + + public JsonWindowStateStore(Path storageFile, ObjectMapper mapper) { + this.storageFile = Objects.requireNonNull(storageFile, "storageFile").toAbsolutePath().normalize(); + this.mapper = Objects.requireNonNull(mapper, "mapper").copy(); + } + + @Override + public Optional load(ProjectReference projectReference) { + return Optional.ofNullable(loadFile().projects().get(projectKey(projectReference))); + } + + @Override + public void save(ProjectReference projectReference, WindowGeometry geometry) { + final WindowStateFile current = loadFile(); + current.projects().put(projectKey(projectReference), Objects.requireNonNull(geometry, "geometry")); + try { + Files.createDirectories(storageFile.getParent()); + mapper.writerWithDefaultPrettyPrinter().writeValue(storageFile.toFile(), current.normalize()); + } catch (IOException exception) { + throw new UncheckedIOException(exception); + } + } + + private WindowStateFile loadFile() { + if (!Files.isRegularFile(storageFile)) { + return WindowStateFile.empty(); + } + try { + final WindowStateFile loaded = mapper.readValue(storageFile.toFile(), WindowStateFile.class); + return loaded == null ? WindowStateFile.empty() : loaded.normalize(); + } catch (IOException exception) { + throw new UncheckedIOException(exception); + } + } + + private String projectKey(ProjectReference projectReference) { + return Objects.requireNonNull(projectReference, "projectReference").rootPath().toAbsolutePath().normalize().toString(); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + private record WindowStateFile(Object launcher, Map projects) { + private static WindowStateFile empty() { + return new WindowStateFile(null, new LinkedHashMap<>()); + } + + private WindowStateFile normalize() { + return new WindowStateFile(launcher, projects == null ? new LinkedHashMap<>() : new LinkedHashMap<>(projects)); + } + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/runtime/RuntimeConnection.java b/prometeu-studio-core/src/main/java/p/studio/core/runtime/RuntimeConnection.java new file mode 100644 index 00000000..a332a425 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/runtime/RuntimeConnection.java @@ -0,0 +1,10 @@ +package p.studio.core.runtime; + +import java.util.concurrent.CompletableFuture; + +public interface RuntimeConnection extends AutoCloseable { + CompletableFuture completion(); + + @Override + void close(); +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/runtime/RuntimeGateway.java b/prometeu-studio-core/src/main/java/p/studio/core/runtime/RuntimeGateway.java new file mode 100644 index 00000000..3522c40e --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/runtime/RuntimeGateway.java @@ -0,0 +1,12 @@ +package p.studio.core.runtime; + +import p.studio.api.project.ProjectLocalStudioSetup; +import p.studio.api.project.ProjectReference; +import p.studio.api.runtime.RuntimeLogEntry; + +import java.util.function.Consumer; + +public interface RuntimeGateway { + RuntimeConnection start(ProjectReference project, ProjectLocalStudioSetup setup, + Consumer logs) throws Exception; +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/runtime/RuntimeModule.java b/prometeu-studio-core/src/main/java/p/studio/core/runtime/RuntimeModule.java new file mode 100644 index 00000000..0b167c9b --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/runtime/RuntimeModule.java @@ -0,0 +1,6 @@ +package p.studio.core.runtime; + +final class RuntimeModule { + private RuntimeModule() { + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/session/DefaultProjectSession.java b/prometeu-studio-core/src/main/java/p/studio/core/session/DefaultProjectSession.java new file mode 100644 index 00000000..976ac425 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/session/DefaultProjectSession.java @@ -0,0 +1,59 @@ +package p.studio.core.session; + +import p.studio.api.execution.ExecutionSession; +import p.studio.api.project.ProjectLocalStudioSetup; +import p.studio.api.project.ProjectLocalStudioState; +import p.studio.api.project.ProjectReference; +import p.studio.api.session.ProjectSession; +import p.studio.core.project.ProjectLocalStudioStateStore; + +import java.util.Objects; + +public final class DefaultProjectSession implements ProjectSession { + private final ProjectReference project; + private final ProjectLocalStudioStateStore stateStore; + private final ProjectLocalStudioSetup setup; + private final ExecutionSession execution; + private final LspLifecyclePort lsp; + private ProjectLocalStudioState state; + private boolean closed; + + DefaultProjectSession(ProjectReference project, ProjectLocalStudioStateStore stateStore, + ProjectLocalStudioSetup setup, ExecutionSession execution, LspLifecyclePort lsp, + ProjectLocalStudioState state) { + this.project = Objects.requireNonNull(project, "project"); + this.stateStore = Objects.requireNonNull(stateStore, "stateStore"); + this.setup = Objects.requireNonNull(setup, "setup"); + this.execution = Objects.requireNonNull(execution, "execution"); + this.lsp = Objects.requireNonNull(lsp, "lsp"); + this.state = Objects.requireNonNull(state, "state"); + } + + @Override public ProjectReference projectReference() { return project; } + @Override public ProjectLocalStudioState projectLocalStudioState() { return state; } + @Override public ProjectLocalStudioSetup projectLocalStudioSetup() { return setup; } + @Override public ExecutionSession executionSession() { return execution; } + @Override public void replaceProjectLocalStudioState(ProjectLocalStudioState next) { state = Objects.requireNonNull(next, "state"); } + @Override public void saveProjectLocalStudioState() { stateStore.save(project, state); } + + @Override + public synchronized void close() { + if (closed) return; + closed = true; + RuntimeException failure = attempt(this::saveProjectLocalStudioState, null); + failure = attempt(execution::close, failure); + failure = attempt(() -> lsp.shutdown(project), failure); + if (failure != null) throw failure; + } + + private static RuntimeException attempt(Runnable action, RuntimeException prior) { + try { + action.run(); + return prior; + } catch (RuntimeException failure) { + if (prior == null) return failure; + prior.addSuppressed(failure); + return prior; + } + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/session/DefaultProjectSessionFactory.java b/prometeu-studio-core/src/main/java/p/studio/core/session/DefaultProjectSessionFactory.java new file mode 100644 index 00000000..db6ffba6 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/session/DefaultProjectSessionFactory.java @@ -0,0 +1,32 @@ +package p.studio.core.session; + +import p.studio.api.project.ProjectReference; +import p.studio.api.session.ProjectSession; +import p.studio.api.session.ProjectSessionFactory; +import p.studio.core.execution.DefaultExecutionSession; +import p.studio.core.project.ProjectLocalStudioSetupStore; +import p.studio.core.project.ProjectLocalStudioStateStore; + +import java.util.Objects; + +public final class DefaultProjectSessionFactory implements ProjectSessionFactory { + private final ProjectLocalStudioStateStore stateStore; + private final ProjectLocalStudioSetupStore setupStore; + private final LspLifecyclePort lsp; + + public DefaultProjectSessionFactory(ProjectLocalStudioStateStore stateStore, + ProjectLocalStudioSetupStore setupStore, LspLifecyclePort lsp) { + this.stateStore = Objects.requireNonNull(stateStore, "stateStore"); + this.setupStore = Objects.requireNonNull(setupStore, "setupStore"); + this.lsp = Objects.requireNonNull(lsp, "lsp"); + } + + @Override + public ProjectSession open(ProjectReference projectReference) { + final ProjectReference project = Objects.requireNonNull(projectReference, "projectReference"); + final var setup = setupStore.load(project); + final var state = stateStore.load(project); + lsp.boot(project); + return new DefaultProjectSession(project, stateStore, setup, new DefaultExecutionSession(), lsp, state); + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/session/LspLifecyclePort.java b/prometeu-studio-core/src/main/java/p/studio/core/session/LspLifecyclePort.java new file mode 100644 index 00000000..1ca64485 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/session/LspLifecyclePort.java @@ -0,0 +1,9 @@ +package p.studio.core.session; + +import p.studio.api.project.ProjectReference; + +public interface LspLifecyclePort { + void boot(ProjectReference project); + + void shutdown(ProjectReference project); +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/session/SessionModule.java b/prometeu-studio-core/src/main/java/p/studio/core/session/SessionModule.java new file mode 100644 index 00000000..9ad15fd9 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/session/SessionModule.java @@ -0,0 +1,6 @@ +package p.studio.core.session; + +final class SessionModule { + private SessionModule() { + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/shipper/CompilerBuildGateway.java b/prometeu-studio-core/src/main/java/p/studio/core/shipper/CompilerBuildGateway.java new file mode 100644 index 00000000..9aea8814 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/shipper/CompilerBuildGateway.java @@ -0,0 +1,18 @@ +package p.studio.core.shipper; + +import p.studio.api.project.ProjectReference; + +import java.nio.file.Path; +import java.util.List; +import java.util.function.Consumer; + +public interface CompilerBuildGateway { + CompilerBuildOutput compile(ProjectReference project, Consumer logSink); + + record CompilerBuildOutput(Path bytecodeArtifact, List requiredCapabilities) { + public CompilerBuildOutput { + bytecodeArtifact = bytecodeArtifact == null ? null : bytecodeArtifact.toAbsolutePath().normalize(); + requiredCapabilities = List.copyOf(requiredCapabilities); + } + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/shipper/ShipperModule.java b/prometeu-studio-core/src/main/java/p/studio/core/shipper/ShipperModule.java new file mode 100644 index 00000000..f77937a0 --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/shipper/ShipperModule.java @@ -0,0 +1,6 @@ +package p.studio.core.shipper; + +final class ShipperModule { + private ShipperModule() { + } +} diff --git a/prometeu-studio-core/src/main/java/p/studio/core/shipper/StudioShipperService.java b/prometeu-studio-core/src/main/java/p/studio/core/shipper/StudioShipperService.java new file mode 100644 index 00000000..08ddcd9b --- /dev/null +++ b/prometeu-studio-core/src/main/java/p/studio/core/shipper/StudioShipperService.java @@ -0,0 +1,142 @@ +package p.studio.core.shipper; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import p.packer.PackerWorkspaceService; +import p.packer.messages.PackWorkspaceRequest; +import p.packer.messages.PackerOperationStatus; +import p.packer.messages.PackerProjectContext; +import p.packer.messages.ValidatePackWorkspaceRequest; +import p.studio.api.project.ProjectReference; +import p.studio.api.shipper.Shipper; +import p.studio.api.shipper.ShipperLogEntry; +import p.studio.api.shipper.ShipperLogSource; +import p.studio.api.shipper.ShipperPrepareResult; +import p.studio.api.shipper.ShipperPreparationStatus; +import p.studio.api.operation.OperationExecutor; +import p.studio.api.operation.OperationHandle; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Objects; +import java.util.function.Consumer; + +public final class StudioShipperService implements Shipper { + private final CompilerBuildGateway compiler; + private final PackerWorkspaceService packer; + private final ObjectMapper mapper; + private final OperationExecutor operations; + + public StudioShipperService(CompilerBuildGateway compiler, PackerWorkspaceService packer, ObjectMapper mapper, + OperationExecutor operations) { + this.compiler = Objects.requireNonNull(compiler, "compiler"); + this.packer = Objects.requireNonNull(packer, "packer"); + this.mapper = Objects.requireNonNull(mapper, "mapper"); + this.operations = Objects.requireNonNull(operations, "operations"); + } + + @Override + public OperationHandle prepare(ProjectReference project, Consumer sink) { + Objects.requireNonNull(project, "project"); + Objects.requireNonNull(sink, "sink"); + return operations.submit("Build and pack " + project.name(), () -> prepareNow(project, sink)); + } + + private ShipperPrepareResult prepareNow(ProjectReference project, Consumer sink) { + Objects.requireNonNull(project, "project"); + Objects.requireNonNull(sink, "sink"); + final List logs = new ArrayList<>(); + final List diagnostics = new ArrayList<>(); + try { + final CompilerBuildGateway.CompilerBuildOutput build = compiler.compile(project, + message -> emit(logs, sink, ShipperLogEntry.info(ShipperLogSource.BUILD, normalize(message)))); + if (build.bytecodeArtifact() != null) { + emit(logs, sink, ShipperLogEntry.info(ShipperLogSource.BUILD, + "Prepared program bytecode at " + build.bytecodeArtifact())); + } + final PackerProjectContext context = new PackerProjectContext(project.name(), project.rootPath()); + final var validation = packer.validatePackWorkspace(new ValidatePackWorkspaceRequest(context)); + emit(logs, sink, logFor(validation.status(), ShipperLogSource.PACK_VALIDATION, validation.summary())); + validation.assets().forEach(asset -> asset.diagnostics().forEach(value -> diagnostics.add(value.message()))); + if (!validation.canPack()) { + return ShipperPrepareResult.failed(logs, diagnostics); + } + final var packed = packer.packWorkspace(new PackWorkspaceRequest(context)); + emit(logs, sink, logFor(packed.status(), ShipperLogSource.PACK, packed.summary())); + if (packed.status() != PackerOperationStatus.SUCCESS) { + diagnostics.add(packed.summary()); + return ShipperPrepareResult.failed(logs, diagnostics); + } + final List artifacts = packed.result().emittedArtifacts().stream() + .map(value -> value.path().toAbsolutePath().normalize()).toList(); + artifacts.forEach(path -> emit(logs, sink, ShipperLogEntry.info(ShipperLogSource.PACK, "Emitted " + path))); + final Path manifest = writeManifest(project, build, logs, sink); + return new ShipperPrepareResult(ShipperPreparationStatus.SUCCESS, logs, manifest, artifacts, diagnostics); + } catch (RuntimeException exception) { + final String message = exception.getMessage() == null ? exception.getClass().getSimpleName() : exception.getMessage(); + diagnostics.add(message); + emit(logs, sink, ShipperLogEntry.error(ShipperLogSource.BUILD, message)); + return ShipperPrepareResult.failed(logs, diagnostics); + } + } + + private Path writeManifest(ProjectReference project, CompilerBuildGateway.CompilerBuildOutput build, + List logs, Consumer sink) { + final Path buildRoot = project.rootPath().resolve("build").toAbsolutePath().normalize(); + final Path manifestPath = buildRoot.resolve("manifest.json"); + try { + Files.createDirectories(buildRoot); + final ObjectNode manifest = mapper.createObjectNode(); + manifest.put("magic", "PMTU"); + manifest.put("cartridge_version", 1); + manifest.put("app_id", stableAppId(project)); + manifest.put("title", project.name()); + manifest.put("app_version", project.version()); + manifest.put("app_mode", project.target().exportReferenceName()); + final ArrayNode capabilities = mapper.createArrayNode(); + new LinkedHashSet<>(build.requiredCapabilities()).forEach(capabilities::add); + manifest.set("capabilities", capabilities); + manifest.set("asset_table", readArrayOrEmpty(buildRoot.resolve("asset_table.json"))); + manifest.set("preload", readArrayOrEmpty(buildRoot.resolve("preload.json"))); + mapper.writerWithDefaultPrettyPrinter().writeValue(manifestPath.toFile(), manifest); + emit(logs, sink, ShipperLogEntry.info(ShipperLogSource.MANIFEST, "Generated manifest at " + manifestPath)); + return manifestPath; + } catch (IOException exception) { + throw new IllegalStateException("failed to write build manifest: " + manifestPath, exception); + } + } + + private JsonNode readArrayOrEmpty(Path path) throws IOException { + if (!Files.isRegularFile(path)) { + return mapper.createArrayNode(); + } + final JsonNode loaded = mapper.readTree(path.toFile()); + return loaded != null && loaded.isArray() ? loaded : mapper.createArrayNode(); + } + + private int stableAppId(ProjectReference project) { + final int hash = Objects.hash(project.name(), project.version(), project.languageId(), project.stdlibVersion()); + return hash == Integer.MIN_VALUE ? 1 : Math.max(1, Math.abs(hash)); + } + + private ShipperLogEntry logFor(PackerOperationStatus status, ShipperLogSource source, String message) { + return status == PackerOperationStatus.SUCCESS + ? ShipperLogEntry.info(source, message) + : ShipperLogEntry.error(source, message); + } + + private void emit(List logs, Consumer sink, ShipperLogEntry entry) { + logs.add(entry); + sink.accept(entry); + } + + private String normalize(String message) { + return message == null || message.isBlank() ? "(empty build log entry)" : message.strip(); + } +} diff --git a/prometeu-studio-core/src/test/java/p/studio/core/StudioModularityTest.java b/prometeu-studio-core/src/test/java/p/studio/core/StudioModularityTest.java new file mode 100644 index 00000000..306731fd --- /dev/null +++ b/prometeu-studio-core/src/test/java/p/studio/core/StudioModularityTest.java @@ -0,0 +1,26 @@ +package p.studio.core; + +import org.junit.jupiter.api.Test; +import org.springframework.modulith.core.ApplicationModules; +import org.springframework.modulith.docs.Documenter; + +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class StudioModularityTest { + private final ApplicationModules modules = ApplicationModules.of(StudioCore.class.getPackageName()); + + @Test + void verifiesStudioCoreApplicationModules() { + modules.verify(); + assertEquals( + Set.of("project", "session", "assets", "shipper", "runtime", "execution"), + modules.stream().map(module -> module.getIdentifier().toString()).collect(java.util.stream.Collectors.toSet())); + } + + @Test + void documentsStudioCoreApplicationModules() { + new Documenter(modules).writeDocumentation(); + } +} diff --git a/prometeu-studio-core/src/test/java/p/studio/core/assets/DefaultAssetCapacityPolicyTest.java b/prometeu-studio-core/src/test/java/p/studio/core/assets/DefaultAssetCapacityPolicyTest.java new file mode 100644 index 00000000..ebb820f6 --- /dev/null +++ b/prometeu-studio-core/src/test/java/p/studio/core/assets/DefaultAssetCapacityPolicyTest.java @@ -0,0 +1,34 @@ +package p.studio.core.assets; + +import org.junit.jupiter.api.Test; +import p.studio.api.assets.AssetCapacityLevel; +import p.studio.api.assets.AssetFamily; + +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +final class DefaultAssetCapacityPolicyTest { + private final DefaultAssetCapacityPolicy policy = new DefaultAssetCapacityPolicy(); + + @Test + void derivesGlyphCapacityFromTileSize() { + assertEquals(1024, policy.maxArtifactsForGlyphBank(Map.of("tile_size", "8x8"))); + assertEquals(256, policy.maxArtifactsForGlyphBank(Map.of("tile_size", "16x16"))); + assertEquals(64, policy.maxArtifactsForGlyphBank(Map.of("tile_size", "32x32"))); + } + + @Test + void reportsExhaustedGlyphAndSoundBanks() { + final var glyph = policy.evaluate(AssetFamily.GLYPH_BANK, 64, Map.of("tile_size", "32x32"), Map.of(), 0); + final var sound = policy.evaluate(AssetFamily.SOUND_BANK, 2, Map.of(), Map.of("samples", Map.of( + "1", Map.of("offset", 0, "length", 600_000), + "2", Map.of("offset", 600_000, "length", 600_000))), 0); + + assertTrue(glyph.blocked()); + assertEquals(AssetCapacityLevel.EXHAUSTED, glyph.level()); + assertTrue(sound.blocked()); + assertEquals("1200000 / 1048576 bytes", sound.labelText()); + } +} diff --git a/prometeu-studio-core/src/test/java/p/studio/core/assets/FileSystemAssetWorkspaceStorageTest.java b/prometeu-studio-core/src/test/java/p/studio/core/assets/FileSystemAssetWorkspaceStorageTest.java new file mode 100644 index 00000000..7088dae4 --- /dev/null +++ b/prometeu-studio-core/src/test/java/p/studio/core/assets/FileSystemAssetWorkspaceStorageTest.java @@ -0,0 +1,30 @@ +package p.studio.core.assets; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import p.studio.api.project.ProjectReference; +import p.studio.api.project.ProjectTarget; + +import java.nio.file.Files; +import java.nio.file.Path; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +final class FileSystemAssetWorkspaceStorageTest { + @TempDir + Path tempDir; + + @Test + void preparesAssetsRootAndDetectsOnlyContainedAssetManifests() throws Exception { + final var storage = new FileSystemAssetWorkspaceStorage(); + final var project = new ProjectReference("main", "1", "pbs", 1, ProjectTarget.Game, tempDir.resolve("project")); + + assertTrue(storage.prepare(project).success()); + Files.createDirectories(storage.assetsRoot(project).resolve("scenes/main")); + Files.writeString(storage.assetsRoot(project).resolve("scenes/main/asset.json"), "{}"); + + assertTrue(storage.assetManifestExists(project, "scenes/main")); + assertFalse(storage.assetManifestExists(project, "../outside")); + } +} diff --git a/prometeu-studio-core/src/test/java/p/studio/core/assets/PackerAssetCreationCatalogTest.java b/prometeu-studio-core/src/test/java/p/studio/core/assets/PackerAssetCreationCatalogTest.java new file mode 100644 index 00000000..4972b64f --- /dev/null +++ b/prometeu-studio-core/src/test/java/p/studio/core/assets/PackerAssetCreationCatalogTest.java @@ -0,0 +1,28 @@ +package p.studio.core.assets; + +import org.junit.jupiter.api.Test; +import p.studio.api.assets.AssetFamily; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +final class PackerAssetCreationCatalogTest { + private final PackerAssetCreationCatalog catalog = new PackerAssetCreationCatalog(); + + @Test + void exposesProviderCreationChoicesWithoutLeakingProviderTypes() { + assertTrue(catalog.supportedFamilies().contains(AssetFamily.GLYPH_BANK)); + assertFalse(catalog.supportedFamilies().contains(AssetFamily.UNKNOWN)); + assertTrue(catalog.supportedFormats(AssetFamily.GLYPH_BANK).contains("GLYPH_INDEXED_V1")); + } + + @Test + void validatesFormatAndCodecCombinations() { + final String format = catalog.supportedFormats(AssetFamily.GLYPH_BANK).getFirst(); + final String codec = catalog.availableCodecs(format).getFirst(); + + assertTrue(catalog.supports(format, codec)); + assertFalse(catalog.supports(format, "NOT_A_CODEC")); + assertFalse(catalog.supports("NOT_A_FORMAT", codec)); + } +} diff --git a/prometeu-studio-core/src/test/java/p/studio/core/assets/bank/DefaultAssetBankCompositionSessionTest.java b/prometeu-studio-core/src/test/java/p/studio/core/assets/bank/DefaultAssetBankCompositionSessionTest.java new file mode 100644 index 00000000..73cced45 --- /dev/null +++ b/prometeu-studio-core/src/test/java/p/studio/core/assets/bank/DefaultAssetBankCompositionSessionTest.java @@ -0,0 +1,203 @@ +package p.studio.core.assets.bank; + +import p.studio.api.assets.workspace.*; + +import org.junit.jupiter.api.Test; +import p.studio.api.assets.AssetConfigurationField; +import p.studio.api.assets.AssetReference; +import p.studio.api.assets.AssetFamily; +import p.studio.api.assets.AssetCapacityLevel; +import p.studio.api.assets.AssetCapacityPolicy; +import p.studio.api.assets.AssetCapacityState; +import p.studio.api.assets.metadata.AssetStudioGlyphSpecialization; + +import java.nio.file.Path; +import java.util.List; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.*; + +final class DefaultAssetBankCompositionSessionTest { + private DefaultAssetBankCompositionSession coordinator() { + return new DefaultAssetBankCompositionSession(new TestCapacityPolicy()); + } + + @Test + void tileFamilyBlocksSelectionAfterSlotCapacity() { + final DefaultAssetBankCompositionSession coordinator = coordinator(); + coordinator.replaceDetails(tileDetails("32x32", 65)); + coordinator.beginEdit(); + + coordinator.moveToSelected(coordinator.state().availableFiles()); + + assertEquals(64, coordinator.state().selectedFiles().size()); + assertTrue(coordinator.state().capacityState().blocked()); + } + + @Test + void tileFamilyUsesAtlasCapacityFor8x8Tiles() { + final DefaultAssetBankCompositionSession coordinator = coordinator(); + coordinator.replaceDetails(tileDetails("8x8", 1_100)); + coordinator.beginEdit(); + + coordinator.moveToSelected(coordinator.state().availableFiles()); + + assertEquals(1_024, coordinator.state().selectedFiles().size()); + assertEquals("1024 / 1024", coordinator.state().capacityState().labelText()); + assertTrue(coordinator.state().capacityState().blocked()); + } + + @Test + void tileFamilyUsesAtlasCapacityFor16x16Tiles() { + final DefaultAssetBankCompositionSession coordinator = coordinator(); + coordinator.replaceDetails(tileDetails("16x16", 300)); + coordinator.beginEdit(); + + coordinator.moveToSelected(coordinator.state().availableFiles()); + + assertEquals(256, coordinator.state().selectedFiles().size()); + assertEquals("256 / 256", coordinator.state().capacityState().labelText()); + assertTrue(coordinator.state().capacityState().blocked()); + } + + @Test + void tileFamilyUsesAtlasCapacityFor32x32Tiles() { + final DefaultAssetBankCompositionSession coordinator = coordinator(); + coordinator.replaceDetails(tileDetails("32x32", 100)); + coordinator.beginEdit(); + + coordinator.moveToSelected(coordinator.state().availableFiles()); + + assertEquals(64, coordinator.state().selectedFiles().size()); + assertEquals("64 / 64", coordinator.state().capacityState().labelText()); + assertTrue(coordinator.state().capacityState().blocked()); + } + + @Test + void soundFamilyBlocksSelectionAfterByteCapacity() { + final DefaultAssetBankCompositionSession coordinator = coordinator(); + coordinator.replaceDetails(soundDetails(600_000L, 600_000L)); + coordinator.beginEdit(); + + coordinator.moveToSelected(coordinator.state().availableFiles()); + + assertEquals(1, coordinator.state().selectedFiles().size()); + assertTrue(coordinator.state().capacityState().progress() > 0.5d); + } + + @Test + void resetAndCancelFollowStudioFormSessionLifecycle() { + final DefaultAssetBankCompositionSession coordinator = coordinator(); + coordinator.replaceDetails(tileDetails("16x16", 2)); + coordinator.beginEdit(); + + final var firstFile = coordinator.state().availableFiles().subList(0, 1); + coordinator.moveToSelected(firstFile); + assertTrue(coordinator.state().dirty()); + + coordinator.reset(); + assertFalse(coordinator.state().dirty()); + + coordinator.moveToSelected(firstFile); + assertTrue(coordinator.state().dirty()); + coordinator.cancel(); + assertFalse(coordinator.state().editing()); + assertFalse(coordinator.state().dirty()); + } + + private AssetWorkspaceAssetDetails tileDetails(String tileSize, int fileCount) { + return new AssetWorkspaceAssetDetails( + summary(AssetFamily.GLYPH_BANK), + List.of(), + "GLYPH_INDEXED_V1", + "NONE", + List.of("NONE"), + Map.of("NONE", List.of()), + List.of(new AssetConfigurationField("tile_size", "Tile Size", "TEXT", tileSize, true, List.of())), + Map.of(), + new AssetWorkspaceBankCompositionDetails( + files("tile", fileCount, 1024L), + List.of(), + 0L), + List.of(), + null, + null, + AssetWorkspaceSceneBankValidation.NOT_APPLICABLE, + List.of()); + } + + private AssetWorkspaceAssetDetails soundDetails(long firstSize, long secondSize) { + return new AssetWorkspaceAssetDetails( + summary(AssetFamily.SOUND_BANK), + List.of(), + "SOUND_V1", + "NONE", + List.of("NONE"), + Map.of("NONE", List.of()), + List.of(), + Map.of("samples", Map.of( + "1", Map.of("offset", 0L, "length", firstSize), + "2", Map.of("offset", firstSize, "length", secondSize))), + new AssetWorkspaceBankCompositionDetails( + List.of( + new AssetWorkspaceBankCompositionFile("a.wav", "a.wav", firstSize, 1L, null, Map.of()), + new AssetWorkspaceBankCompositionFile("b.wav", "b.wav", secondSize, 1L, null, Map.of())), + List.of(), + 0L), + List.of(), + null, + null, + AssetWorkspaceSceneBankValidation.NOT_APPLICABLE, + List.of()); + } + + private List files(String prefix, int count, long size) { + return java.util.stream.IntStream.range(0, count) + .mapToObj(index -> new AssetWorkspaceBankCompositionFile( + prefix + "-" + index + ".png", + prefix + "-" + index + ".png", + size, + 1L, + null, + Map.of())) + .toList(); + } + + private AssetWorkspaceAssetSummary summary(AssetFamily family) { + return new AssetWorkspaceAssetSummary( + AssetReference.forAssetId(1), + "bank", + AssetWorkspaceAssetState.REGISTERED, + AssetWorkspaceBuildParticipation.INCLUDED, + 1, + family, + AssetStudioGlyphSpecialization.NONE, + Path.of("/tmp/bank"), + false, + false); + } + + private static final class TestCapacityPolicy implements AssetCapacityPolicy { + @Override + public AssetCapacityState evaluate(AssetFamily family, int count, Map metadata, + Map pipeline, long usedBytes) { + if (family == AssetFamily.GLYPH_BANK) { + final int maximum = maxArtifactsForGlyphBank(metadata); + return new AssetCapacityState((double) count / maximum, AssetCapacityLevel.SAFE, + count >= maximum, count + " / " + maximum, ""); + } + final long maximum = 1024L * 1024L; + return new AssetCapacityState((double) usedBytes / maximum, AssetCapacityLevel.SAFE, + usedBytes >= maximum, usedBytes + " / " + maximum + " bytes", ""); + } + + @Override + public int maxArtifactsForGlyphBank(Map metadata) { + return switch (metadata.getOrDefault("tile_size", "16x16")) { + case "8x8" -> 1024; + case "32x32" -> 64; + default -> 256; + }; + } + } +} diff --git a/prometeu-studio/src/test/java/p/studio/workspaces/assets/metadata/AssetStudioMetadataServiceTest.java b/prometeu-studio-core/src/test/java/p/studio/core/assets/metadata/AssetStudioMetadataServiceTest.java similarity index 90% rename from prometeu-studio/src/test/java/p/studio/workspaces/assets/metadata/AssetStudioMetadataServiceTest.java rename to prometeu-studio-core/src/test/java/p/studio/core/assets/metadata/AssetStudioMetadataServiceTest.java index b2d2846b..5436839d 100644 --- a/prometeu-studio/src/test/java/p/studio/workspaces/assets/metadata/AssetStudioMetadataServiceTest.java +++ b/prometeu-studio-core/src/test/java/p/studio/core/assets/metadata/AssetStudioMetadataServiceTest.java @@ -1,8 +1,9 @@ -package p.studio.workspaces.assets.metadata; +package p.studio.core.assets.metadata; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import p.packer.messages.assets.AssetFamilyCatalog; +import p.studio.api.assets.AssetFamily; +import p.studio.api.assets.metadata.*; import java.nio.file.Files; import java.nio.file.Path; @@ -21,9 +22,9 @@ final class AssetStudioMetadataServiceTest { void readsGlyphSpecializationFromStudioMetadataFile() throws Exception { final Path assetRoot = tempDir.resolve("tileset"); Files.createDirectories(assetRoot); - service.writeGlyphSpecialization(assetRoot, AssetStudioGlyphSpecialization.TILESET); + assertTrue(service.writeGlyphSpecialization(assetRoot, AssetStudioGlyphSpecialization.TILESET).successful()); - final AssetStudioMetadataSnapshot snapshot = service.read(assetRoot, AssetFamilyCatalog.GLYPH_BANK); + final AssetStudioMetadataSnapshot snapshot = service.read(assetRoot, AssetFamily.GLYPH_BANK); assertEquals(AssetStudioGlyphSpecialization.TILESET, snapshot.glyphSpecialization()); assertNull(snapshot.sceneBankMetadata()); @@ -35,7 +36,7 @@ final class AssetStudioMetadataServiceTest { final Path assetRoot = tempDir.resolve("legacy-glyph"); Files.createDirectories(assetRoot); - final AssetStudioMetadataSnapshot snapshot = service.read(assetRoot, AssetFamilyCatalog.GLYPH_BANK); + final AssetStudioMetadataSnapshot snapshot = service.read(assetRoot, AssetFamily.GLYPH_BANK); assertEquals(AssetStudioGlyphSpecialization.NONE, snapshot.glyphSpecialization()); assertNull(snapshot.sceneBankMetadata()); @@ -62,9 +63,9 @@ final class AssetStudioMetadataServiceTest { 2, List.of("#8B4513", "#00AA0000"))), null); - service.writeGlyphMaterialMetadata(assetRoot, metadata); + assertTrue(service.writeGlyphMaterialMetadata(assetRoot, metadata).successful()); - final AssetStudioMetadataSnapshot snapshot = service.read(assetRoot, AssetFamilyCatalog.GLYPH_BANK); + final AssetStudioMetadataSnapshot snapshot = service.read(assetRoot, AssetFamily.GLYPH_BANK); assertNotNull(snapshot.glyphMaterialMetadata()); assertEquals(1, snapshot.glyphMaterialMetadata().schemas().size()); @@ -107,7 +108,7 @@ final class AssetStudioMetadataServiceTest { } """); - final AssetStudioMetadataSnapshot snapshot = service.read(assetRoot, AssetFamilyCatalog.SCENE_BANK); + final AssetStudioMetadataSnapshot snapshot = service.read(assetRoot, AssetFamily.SCENE_BANK); assertNotNull(snapshot.sceneBankMetadata()); assertEquals(20, snapshot.sceneBankMetadata().mapWidth()); @@ -146,7 +147,7 @@ final class AssetStudioMetadataServiceTest { } """); - final AssetStudioMetadataSnapshot snapshot = service.read(assetRoot, AssetFamilyCatalog.SCENE_BANK); + final AssetStudioMetadataSnapshot snapshot = service.read(assetRoot, AssetFamily.SCENE_BANK); assertNull(snapshot.sceneBankMetadata()); } @@ -166,7 +167,7 @@ final class AssetStudioMetadataServiceTest { new AssetStudioSceneLayerBinding(false, 4, "Layer 4", 16, 12, "layer-4.tmx", "", 1.0f, 1.0f, 0)), assetRoot.resolve(AssetStudioMetadataService.SCENE_BANK_SUPPORT_FILE)); - service.writeSceneBankMetadata(assetRoot, metadata); + assertTrue(service.writeSceneBankMetadata(assetRoot, metadata).successful()); final String json = Files.readString(assetRoot.resolve(AssetStudioMetadataService.SCENE_BANK_SUPPORT_FILE)); assertTrue(json.contains("\"parallax_factor_x\"")); @@ -204,7 +205,7 @@ final class AssetStudioMetadataServiceTest { new AssetStudioSceneLayerBinding(false, 4, "Layer 4", 2, 2, "layer-4.tmx", "", 1.0f, 1.0f, 0)), assetRoot.resolve(AssetStudioMetadataService.SCENE_BANK_SUPPORT_FILE)); - service.writeSceneBankMetadata(assetRoot, metadata); + assertTrue(service.writeSceneBankMetadata(assetRoot, metadata).successful()); final String json = Files.readString(assetRoot.resolve(AssetStudioMetadataService.SCENE_BANK_SUPPORT_FILE)); assertTrue(json.contains("\"tiles\"")); @@ -216,10 +217,23 @@ final class AssetStudioMetadataServiceTest { final Path assetRoot = tempDir.resolve("scene-missing"); Files.createDirectories(assetRoot); - final AssetStudioMetadataSnapshot snapshot = service.read(assetRoot, AssetFamilyCatalog.SCENE_BANK); + final AssetStudioMetadataSnapshot snapshot = service.read(assetRoot, AssetFamily.SCENE_BANK); assertNotNull(snapshot.sceneBankMetadata()); assertEquals(16, snapshot.sceneBankMetadata().mapWidth()); assertEquals("scene.tmx", snapshot.sceneBankMetadata().layerBindings().getFirst().tilemap()); } + + @Test + void convertsMetadataIoFailureToTypedResult() throws Exception { + final Path assetRoot = tempDir.resolve("not-a-directory"); + Files.writeString(assetRoot, "occupied"); + + final AssetMetadataWriteResult result = service.writeGlyphSpecialization( + assetRoot, + AssetStudioGlyphSpecialization.TILESET); + + assertFalse(result.successful()); + assertFalse(result.message().isBlank()); + } } diff --git a/prometeu-studio/src/test/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingCoordinatorTest.java b/prometeu-studio-core/src/test/java/p/studio/core/assets/palette/DefaultAssetPaletteSessionTest.java similarity index 81% rename from prometeu-studio/src/test/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingCoordinatorTest.java rename to prometeu-studio-core/src/test/java/p/studio/core/assets/palette/DefaultAssetPaletteSessionTest.java index 3fe6702e..92b37c8b 100644 --- a/prometeu-studio/src/test/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingCoordinatorTest.java +++ b/prometeu-studio-core/src/test/java/p/studio/core/assets/palette/DefaultAssetPaletteSessionTest.java @@ -1,12 +1,11 @@ -package p.studio.workspaces.assets.details.palette; +package p.studio.core.assets.palette; + +import p.studio.api.assets.workspace.*; import org.junit.jupiter.api.Test; -import p.packer.messages.AssetReference; -import p.packer.messages.assets.AssetFamilyCatalog; -import p.packer.messages.assets.OutputCodecCatalog; -import p.packer.messages.assets.OutputFormatCatalog; -import p.studio.workspaces.assets.metadata.*; -import p.studio.workspaces.assets.messages.*; +import p.studio.api.assets.AssetReference; +import p.studio.api.assets.AssetFamily; +import p.studio.api.assets.metadata.*; import java.nio.file.Path; import java.util.List; @@ -14,10 +13,14 @@ import java.util.Map; import static org.junit.jupiter.api.Assertions.*; -final class AssetDetailsPaletteOverhaulingCoordinatorTest { +final class DefaultAssetPaletteSessionTest { + private DefaultAssetPaletteSession coordinator() { + return new DefaultAssetPaletteSession(new TestAssetColorSchemaRules()); + } + @Test void derivesOriginalPaletteFromReadySchemaWhenNoPaletteRecordExists() { - final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator(); + final DefaultAssetPaletteSession coordinator = coordinator(); coordinator.replaceDetails(details( List.of(tile("tile-a.png", "artifact-a")), new AssetStudioGlyphMaterialMetadata( @@ -32,13 +35,13 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { List.of())); assertTrue(coordinator.ready()); - assertEquals(1, coordinator.viewModel().allFiles().size()); - assertEquals("schema-1 / original", coordinator.viewModel().allFiles().getFirst().displayName()); + assertEquals(1, coordinator.state().allFiles().size()); + assertEquals("schema-1 / original", coordinator.state().allFiles().getFirst().displayName()); } @Test void initialSelectionMatchesPersistedPackerPipelinePalettePayload() { - final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator(); + final DefaultAssetPaletteSession coordinator = coordinator(); final AssetStudioGlyphMaterialPalette persisted = new AssetStudioGlyphMaterialPalette( "palette-1", "schema-1", @@ -59,13 +62,13 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { "index", 0, "rgba8888", List.of(0xFF0000FF, 0x00FF00FF))))); - assertEquals(1, coordinator.viewModel().selectedFiles().size()); - assertEquals("palette-1", coordinator.viewModel().selectedFiles().getFirst().metadata().get("paletteId")); + assertEquals(1, coordinator.state().selectedFiles().size()); + assertEquals("palette-1", coordinator.state().selectedFiles().getFirst().metadata().get("paletteId")); } @Test void previewPaletteDefaultsToAvailablePaletteWhenBuildSelectionIsEmpty() { - final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator(); + final DefaultAssetPaletteSession coordinator = coordinator(); coordinator.replaceDetails(details( List.of(tile("tile-a.png", "artifact-a")), new AssetStudioGlyphMaterialMetadata( @@ -83,13 +86,13 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { null), List.of())); - assertNotNull(coordinator.viewModel().previewPaletteFile()); - assertTrue(coordinator.viewModel().availableFiles().contains(coordinator.viewModel().previewPaletteFile())); + assertNotNull(coordinator.state().previewPaletteFile()); + assertTrue(coordinator.state().availableFiles().contains(coordinator.state().previewPaletteFile())); } @Test void originalPaletteRemainsSyntheticEvenWhenUserPaletteHasSameColors() { - final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator(); + final DefaultAssetPaletteSession coordinator = coordinator(); coordinator.replaceDetails(details( List.of(tile("tile-a.png", "artifact-a")), new AssetStudioGlyphMaterialMetadata( @@ -107,23 +110,23 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { null), List.of())); - assertEquals(2, coordinator.viewModel().allFiles().size()); - final AssetWorkspaceBankCompositionFile original = coordinator.viewModel().allFiles().stream() - .filter(AssetDetailsPaletteOverhaulingCoordinator::paletteIsOriginal) + assertEquals(2, coordinator.state().allFiles().size()); + final AssetWorkspaceBankCompositionFile original = coordinator.state().allFiles().stream() + .filter(coordinator::paletteIsOriginal) .findFirst() .orElseThrow(); - final AssetWorkspaceBankCompositionFile userPalette = coordinator.viewModel().allFiles().stream() + final AssetWorkspaceBankCompositionFile userPalette = coordinator.state().allFiles().stream() .filter(file -> "palette-1".equals(file.metadata().get("paletteId"))) .findFirst() .orElseThrow(); assertEquals("schema-schema-1-original", original.metadata().get("paletteId")); - assertFalse(AssetDetailsPaletteOverhaulingCoordinator.paletteIsOriginal(userPalette)); + assertFalse(coordinator.paletteIsOriginal(userPalette)); } @Test void originalPaletteTracksSchemaMaterialColorsAfterMetadataUpdate() { - final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator(); + final DefaultAssetPaletteSession coordinator = coordinator(); coordinator.replaceDetails(details( List.of(tile("tile-a.png", "artifact-a")), new AssetStudioGlyphMaterialMetadata( @@ -147,8 +150,8 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { List.of(), null)); - final AssetWorkspaceBankCompositionFile original = coordinator.viewModel().allFiles().stream() - .filter(AssetDetailsPaletteOverhaulingCoordinator::paletteIsOriginal) + final AssetWorkspaceBankCompositionFile original = coordinator.state().allFiles().stream() + .filter(coordinator::paletteIsOriginal) .findFirst() .orElseThrow(); @@ -159,7 +162,7 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { @Test void duplicateDetectionUsesSameSchemaColorsAndOrder() { - final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator(); + final DefaultAssetPaletteSession coordinator = coordinator(); coordinator.replaceDetails(details( List.of(tile("tile-a.png", "artifact-a")), new AssetStudioGlyphMaterialMetadata( @@ -183,7 +186,7 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { @Test void paletteDisplayNameUsesExplicitNameWhenPresent() { - final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator(); + final DefaultAssetPaletteSession coordinator = coordinator(); coordinator.replaceDetails(details( List.of(tile("tile-a.png", "artifact-a")), new AssetStudioGlyphMaterialMetadata( @@ -202,14 +205,14 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { null), List.of())); - final AssetWorkspaceBankCompositionFile palette = coordinator.viewModel().allFiles().getFirst(); + final AssetWorkspaceBankCompositionFile palette = coordinator.state().allFiles().getFirst(); assertEquals("Forest", palette.displayName()); assertEquals("Forest", palette.metadata().get("explicitPaletteDisplayName")); } @Test void paletteDisplayNameFallsBackToColorsWhenNameIsBlank() { - final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator(); + final DefaultAssetPaletteSession coordinator = coordinator(); coordinator.replaceDetails(details( List.of(tile("tile-a.png", "artifact-a")), new AssetStudioGlyphMaterialMetadata( @@ -227,20 +230,20 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { null), List.of())); - final AssetWorkspaceBankCompositionFile palette = coordinator.viewModel().allFiles().getFirst(); + final AssetWorkspaceBankCompositionFile palette = coordinator.state().allFiles().getFirst(); assertEquals("ember bloom", palette.displayName()); assertFalse(palette.metadata().containsKey("explicitPaletteDisplayName")); } @Test void generatedPaletteDisplayNameUsesPoeticColorWords() { - assertEquals("snow white", AssetDetailsPaletteOverhaulingCoordinator.generatedDisplayName(List.of("#FFFFFF"))); - assertEquals("fog twist", AssetDetailsPaletteOverhaulingCoordinator.generatedDisplayName(List.of("#F2F4F4", "#707878"))); + assertEquals("snow white", coordinator().generatedDisplayName(List.of("#FFFFFF"))); + assertEquals("fog twist", coordinator().generatedDisplayName(List.of("#F2F4F4", "#707878"))); } @Test void upsertPalettePersistsGeneratedDisplayNameWhenNameIsBlank() { - final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator(); + final DefaultAssetPaletteSession coordinator = coordinator(); coordinator.replaceDetails(details( List.of(tile("tile-a.png", "artifact-a")), new AssetStudioGlyphMaterialMetadata( @@ -265,7 +268,7 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { @Test void removePaletteDeletesUserPaletteEvenWhenSelectedForBuild() { - final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator(); + final DefaultAssetPaletteSession coordinator = coordinator(); coordinator.replaceDetails(details( List.of(tile("tile-a.png", "artifact-a")), new AssetStudioGlyphMaterialMetadata( @@ -292,7 +295,7 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { @Test void removePaletteRejectsSyntheticOriginalPalette() { - final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator(); + final DefaultAssetPaletteSession coordinator = coordinator(); coordinator.replaceDetails(details( List.of(tile("tile-a.png", "artifact-a")), new AssetStudioGlyphMaterialMetadata( @@ -311,7 +314,7 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { @Test void stalePaletteIsProjectedAsInvalid() { - final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator(); + final DefaultAssetPaletteSession coordinator = coordinator(); coordinator.replaceDetails(details( List.of(tile("tile-a.png", "artifact-a")), new AssetStudioGlyphMaterialMetadata( @@ -329,14 +332,14 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { null), List.of())); - final AssetWorkspaceBankCompositionFile palette = coordinator.viewModel().allFiles().getFirst(); + final AssetWorkspaceBankCompositionFile palette = coordinator.state().allFiles().getFirst(); assertEquals(Boolean.FALSE, palette.metadata().get("valid")); assertTrue(((String) palette.metadata().get("invalidReason")).contains("stale")); } @Test void paletteIsInvalidWhenSchemaArtifactFingerprintDrifts() { - final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator(); + final DefaultAssetPaletteSession coordinator = coordinator(); coordinator.replaceDetails(details( List.of(tile("tile-a.png", "artifact-a")), new AssetStudioGlyphMaterialMetadata( @@ -354,7 +357,7 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { null), List.of())); - final AssetWorkspaceBankCompositionFile palette = coordinator.viewModel().allFiles().getFirst(); + final AssetWorkspaceBankCompositionFile palette = coordinator.state().allFiles().getFirst(); assertEquals(Boolean.FALSE, palette.metadata().get("valid")); assertTrue(((String) palette.metadata().get("invalidReason")).contains("inconsistent")); } @@ -362,7 +365,7 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { @Test void previewTilesAreScopedToSelectedPaletteSchema() { - final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator(); + final DefaultAssetPaletteSession coordinator = coordinator(); coordinator.replaceDetails(details( List.of(tile("tile-a.png", "artifact-a"), tile("tile-b.png", "artifact-b")), new AssetStudioGlyphMaterialMetadata( @@ -383,15 +386,15 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { null), List.of())); - final AssetWorkspaceBankCompositionFile schema2Palette = coordinator.viewModel().allFiles().stream() + final AssetWorkspaceBankCompositionFile schema2Palette = coordinator.state().allFiles().stream() .filter(file -> "schema-2".equals(file.metadata().get("schemaId"))) .findFirst() .orElseThrow(); coordinator.selectPreviewPalette(schema2Palette); - assertEquals(List.of("tile-b.png"), coordinator.viewModel().previewTileFiles().stream().map(AssetWorkspaceBankCompositionFile::path).toList()); - assertEquals("schema-2", coordinator.viewModel().previewPaletteFile().metadata().get("schemaId")); - assertEquals(Map.of(1, "#0000FF"), coordinator.viewModel().previewPaletteFile().metadata().get("schemaMaterialIndices")); + assertEquals(List.of("tile-b.png"), coordinator.state().previewTileFiles().stream().map(AssetWorkspaceBankCompositionFile::path).toList()); + assertEquals("schema-2", coordinator.state().previewPaletteFile().metadata().get("schemaId")); + assertEquals(Map.of(1, "#0000FF"), coordinator.state().previewPaletteFile().metadata().get("schemaMaterialIndices")); } private AssetWorkspaceAssetDetails details( @@ -405,16 +408,16 @@ final class AssetDetailsPaletteOverhaulingCoordinatorTest { AssetWorkspaceAssetState.REGISTERED, AssetWorkspaceBuildParticipation.INCLUDED, 1, - AssetFamilyCatalog.GLYPH_BANK, + AssetFamily.GLYPH_BANK, AssetStudioGlyphSpecialization.SPRITES, Path.of("/tmp/bank"), false, false), List.of(), - OutputFormatCatalog.GLYPH_INDEXED_V1, - OutputCodecCatalog.NONE, - List.of(OutputCodecCatalog.NONE), - Map.of(OutputCodecCatalog.NONE, List.of()), + "GLYPH_INDEXED_V1", + "NONE", + List.of("NONE"), + Map.of("NONE", List.of()), List.of(), Map.of(), new AssetWorkspaceBankCompositionDetails(List.of(), selectedFiles, 0L), diff --git a/prometeu-studio-core/src/test/java/p/studio/core/assets/palette/TestAssetColorSchemaRules.java b/prometeu-studio-core/src/test/java/p/studio/core/assets/palette/TestAssetColorSchemaRules.java new file mode 100644 index 00000000..78a333c8 --- /dev/null +++ b/prometeu-studio-core/src/test/java/p/studio/core/assets/palette/TestAssetColorSchemaRules.java @@ -0,0 +1,62 @@ +package p.studio.core.assets.palette; + +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialArtifactBinding; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialSchema; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialSchemaStatus; +import p.studio.api.assets.schema.AssetColorSchemaRules; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +final class TestAssetColorSchemaRules implements AssetColorSchemaRules { + @Override + public AssetStudioGlyphMaterialSchemaStatus effectiveStatus( + AssetStudioGlyphMaterialSchema schema, + List selectedTiles) { + if (schema.status() == AssetStudioGlyphMaterialSchemaStatus.INCONSISTENT) { + return AssetStudioGlyphMaterialSchemaStatus.INCONSISTENT; + } + final Map selectedByArtifactId = new HashMap<>(); + for (AssetWorkspaceBankCompositionFile tile : selectedTiles) { + if (artifactId(tile) != null) { + selectedByArtifactId.put(artifactId(tile), tile); + } + } + for (AssetStudioGlyphMaterialArtifactBinding binding : schema.artifactBindings()) { + final AssetWorkspaceBankCompositionFile tile = selectedByArtifactId.get(binding.artifactId()); + if (tile == null || !Objects.equals(binding.fingerprint(), fingerprint(tile))) { + return AssetStudioGlyphMaterialSchemaStatus.INCONSISTENT; + } + } + return AssetStudioGlyphMaterialSchemaStatus.OK; + } + + @Override + public boolean supportsSchemaAuthoring(AssetWorkspaceBankCompositionFile file) { + return artifactId(file) != null && fingerprint(file) != null; + } + + @Override + public String artifactId(AssetWorkspaceBankCompositionFile file) { + if (file == null || !(file.metadata().get("artifactId") instanceof String value) || value.isBlank()) { + return null; + } + return value.trim(); + } + + @Override + public String fingerprint(AssetWorkspaceBankCompositionFile file) { + if (file == null) { + return null; + } + return file.fingerprint() == null || file.fingerprint().isBlank() ? null : file.fingerprint().trim(); + } + + @Override + public List tileColors(AssetWorkspaceBankCompositionFile file) { + return List.of(); + } +} diff --git a/prometeu-studio/src/test/java/p/studio/workspaces/assets/scene/SceneBankWorkflowServiceTest.java b/prometeu-studio-core/src/test/java/p/studio/core/assets/scene/SceneBankWorkflowServiceTest.java similarity index 85% rename from prometeu-studio/src/test/java/p/studio/workspaces/assets/scene/SceneBankWorkflowServiceTest.java rename to prometeu-studio-core/src/test/java/p/studio/core/assets/scene/SceneBankWorkflowServiceTest.java index e7e1f9d6..31e9f425 100644 --- a/prometeu-studio/src/test/java/p/studio/workspaces/assets/scene/SceneBankWorkflowServiceTest.java +++ b/prometeu-studio-core/src/test/java/p/studio/core/assets/scene/SceneBankWorkflowServiceTest.java @@ -1,22 +1,20 @@ -package p.studio.workspaces.assets.scene; +package p.studio.core.assets.scene; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import p.packer.dtos.PackerCodecConfigurationFieldDTO; -import p.packer.messages.AssetReference; -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; -import p.studio.workspaces.assets.metadata.AssetStudioSceneLayerBinding; -import p.studio.workspaces.assets.metadata.AssetStudioSceneTile; -import p.studio.workspaces.assets.messages.*; +import p.studio.api.assets.AssetConfigurationField; +import p.studio.api.assets.AssetReference; +import p.studio.api.assets.AssetFamily; +import p.studio.api.project.ProjectTarget; +import p.studio.api.project.ProjectReference; +import p.studio.api.assets.metadata.AssetStudioGlyphSpecialization; +import p.studio.api.assets.metadata.AssetStudioSceneBankMetadata; +import p.studio.api.assets.metadata.AssetStudioSceneLayerBinding; +import p.studio.api.assets.metadata.AssetStudioSceneTile; +import p.studio.api.assets.scene.SceneBankWorkflowResult; +import p.studio.api.assets.workspace.*; import java.nio.file.Files; import java.nio.file.Path; @@ -59,16 +57,16 @@ final class SceneBankWorkflowServiceTest { AssetWorkspaceAssetState.REGISTERED, AssetWorkspaceBuildParticipation.EXCLUDED, 2, - AssetFamilyCatalog.SCENE_BANK, + AssetFamily.SCENE_BANK, AssetStudioGlyphSpecialization.NONE, sceneRoot, false, false), List.of(), - OutputFormatCatalog.SCENE_TILED_V1, - OutputCodecCatalog.NONE, - List.of(OutputCodecCatalog.NONE), - Map.of(OutputCodecCatalog.NONE, List.of()), + "SCENE_TILED_V1", + "NONE", + List.of("NONE"), + Map.of("NONE", List.of()), List.of(), Map.of(), new AssetWorkspaceBankCompositionDetails(List.of(), List.of(), 0L), @@ -119,7 +117,7 @@ final class SceneBankWorkflowServiceTest { } private ProjectReference projectReference() { - return new ProjectReference("main", "1", "pbs", 1, AppMode.Game, tempDir.resolve("project")); + return new ProjectReference("main", "1", "pbs", 1, ProjectTarget.Game, tempDir.resolve("project")); } private AssetWorkspaceAssetDetails createValidScene(ProjectReference project) throws Exception { @@ -149,20 +147,20 @@ final class SceneBankWorkflowServiceTest { AssetWorkspaceAssetState.REGISTERED, AssetWorkspaceBuildParticipation.EXCLUDED, 2, - AssetFamilyCatalog.SCENE_BANK, + AssetFamily.SCENE_BANK, AssetStudioGlyphSpecialization.NONE, assetRoot, false, false), List.of(), - OutputFormatCatalog.SCENE_TILED_V1, - OutputCodecCatalog.NONE, - List.of(OutputCodecCatalog.NONE), - Map.of(OutputCodecCatalog.NONE, List.of()), - List.of(new PackerCodecConfigurationFieldDTO( + "SCENE_TILED_V1", + "NONE", + List.of("NONE"), + Map.of("NONE", List.of()), + List.of(new AssetConfigurationField( "tile_size", "Tile Size", - PackerCodecConfigurationFieldType.ENUM, + "ENUM", "16x16", true, List.of("8x8", "16x16", "32x32"))), diff --git a/prometeu-studio/src/test/java/p/studio/workspaces/assets/details/schema/AssetDetailsColorSchemaCoordinatorTest.java b/prometeu-studio-core/src/test/java/p/studio/core/assets/schema/DefaultAssetColorSchemaSessionTest.java similarity index 71% rename from prometeu-studio/src/test/java/p/studio/workspaces/assets/details/schema/AssetDetailsColorSchemaCoordinatorTest.java rename to prometeu-studio-core/src/test/java/p/studio/core/assets/schema/DefaultAssetColorSchemaSessionTest.java index 5c259447..aae143ed 100644 --- a/prometeu-studio/src/test/java/p/studio/workspaces/assets/details/schema/AssetDetailsColorSchemaCoordinatorTest.java +++ b/prometeu-studio-core/src/test/java/p/studio/core/assets/schema/DefaultAssetColorSchemaSessionTest.java @@ -1,12 +1,11 @@ -package p.studio.workspaces.assets.details.schema; +package p.studio.core.assets.schema; + +import p.studio.api.assets.workspace.*; import org.junit.jupiter.api.Test; -import p.packer.messages.AssetReference; -import p.packer.messages.assets.AssetFamilyCatalog; -import p.packer.messages.assets.OutputCodecCatalog; -import p.packer.messages.assets.OutputFormatCatalog; -import p.studio.workspaces.assets.metadata.*; -import p.studio.workspaces.assets.messages.*; +import p.studio.api.assets.AssetReference; +import p.studio.api.assets.AssetFamily; +import p.studio.api.assets.metadata.*; import java.nio.file.Path; import java.util.List; @@ -14,10 +13,12 @@ import java.util.Map; import static org.junit.jupiter.api.Assertions.*; -final class AssetDetailsColorSchemaCoordinatorTest { +final class DefaultAssetColorSchemaSessionTest { + private final DefaultAssetColorSchemaRules rules = new DefaultAssetColorSchemaRules(); + @Test void createFlowExcludesTilesAlreadyBoundToAnotherSchema() { - final AssetDetailsColorSchemaCoordinator coordinator = new AssetDetailsColorSchemaCoordinator(); + final DefaultAssetColorSchemaSession coordinator = session(); final AssetWorkspaceBankCompositionFile tileA = tile("a.png", "artifact-a", "fp-a", List.of("#FF0000")); final AssetWorkspaceBankCompositionFile tileB = tile("b.png", "artifact-b", "fp-b", List.of("#00FF00")); coordinator.replaceDetails(details( @@ -37,14 +38,14 @@ final class AssetDetailsColorSchemaCoordinatorTest { @Test void createFlowListsSelectedTilesBeforePaletteMetadataExists() { - final AssetDetailsColorSchemaCoordinator coordinator = new AssetDetailsColorSchemaCoordinator(); + final DefaultAssetColorSchemaSession coordinator = session(); final AssetWorkspaceBankCompositionFile tile = selectedArtifactOnly("a.png", "artifact-a", "fp-a"); coordinator.replaceDetails(details( List.of(tile), new AssetStudioGlyphMaterialMetadata(List.of(), List.of(), null))); assertEquals(List.of(tile), coordinator.availableTilesForCreate()); - assertEquals(List.of(), AssetDetailsColorSchemaCoordinator.tileColors(tile)); + assertEquals(List.of(), rules.tileColors(tile)); } @Test @@ -60,12 +61,12 @@ final class AssetDetailsColorSchemaCoordinatorTest { "tile", Map.of("width", 8, "height", 8, "paletteIndices", List.of(0, 1)), "palette", Map.of("rgba8888", List.of(0x00000000, 0xFF0000FF)))); - assertEquals(List.of("#00000000", "#FF0000"), AssetDetailsColorSchemaCoordinator.tileColors(tile)); + assertEquals(List.of("#00000000", "#FF0000"), rules.tileColors(tile)); } @Test void createFlowUsesSelectedFingerprintWhenCurrentFileFingerprintIsMissing() { - final AssetDetailsColorSchemaCoordinator coordinator = new AssetDetailsColorSchemaCoordinator(); + final DefaultAssetColorSchemaSession coordinator = session(); final AssetWorkspaceBankCompositionFile tile = new AssetWorkspaceBankCompositionFile( "a.png", "a.png", @@ -89,7 +90,7 @@ final class AssetDetailsColorSchemaCoordinatorTest { @Test void updateFlowKeepsCurrentTilesAndIncrementsVersionWhenSchemaChanges() { - final AssetDetailsColorSchemaCoordinator coordinator = new AssetDetailsColorSchemaCoordinator(); + final DefaultAssetColorSchemaSession coordinator = session(); final AssetWorkspaceBankCompositionFile tileA = tile("a.png", "artifact-a", "fp-a", List.of("#FF0000")); final AssetWorkspaceBankCompositionFile tileB = tile("b.png", "artifact-b", "fp-b", List.of("#00FF00")); coordinator.replaceDetails(details( @@ -117,7 +118,7 @@ final class AssetDetailsColorSchemaCoordinatorTest { @Test void removeIsBlockedWhenPalettesStillReferenceSchema() { - final AssetDetailsColorSchemaCoordinator coordinator = new AssetDetailsColorSchemaCoordinator(); + final DefaultAssetColorSchemaSession coordinator = session(); coordinator.replaceDetails(details( List.of(tile("a.png", "artifact-a", "fp-a", List.of("#FF0000"))), new AssetStudioGlyphMaterialMetadata( @@ -145,14 +146,14 @@ final class AssetDetailsColorSchemaCoordinatorTest { assertEquals( AssetStudioGlyphMaterialSchemaStatus.INCONSISTENT, - AssetDetailsColorSchemaCoordinator.effectiveStatus( + rules.effectiveStatus( schema, List.of(tile("a.png", "artifact-a", "fp-new", List.of("#FF0000", "#FF0001"))))); } @Test void schemaUpdateCanRefreshOnlyFingerprintAndIncrementVersion() { - final AssetDetailsColorSchemaCoordinator coordinator = new AssetDetailsColorSchemaCoordinator(); + final DefaultAssetColorSchemaSession coordinator = session(); final AssetWorkspaceBankCompositionFile changedTile = tile("a.png", "artifact-a", "fp-new", List.of("#FF0000")); coordinator.replaceDetails(details( List.of(changedTile), @@ -176,6 +177,60 @@ final class AssetDetailsColorSchemaCoordinatorTest { assertEquals("fp-new", updated.artifactBindings().getFirst().fingerprint()); } + @Test + void editSessionOwnsDraftMovementColorDerivationAndReset() { + final DefaultAssetColorSchemaSession coordinator = session(); + final AssetWorkspaceBankCompositionFile tileA = tile("a.png", "artifact-a", "fp-a", List.of("#FF0000")); + final AssetWorkspaceBankCompositionFile tileB = tile("b.png", "artifact-b", "fp-b", List.of("#00FF00")); + coordinator.replaceDetails(details( + List.of(tileA, tileB), + new AssetStudioGlyphMaterialMetadata(List.of(), List.of(), null))); + + coordinator.beginEdit(); + coordinator.createSchema(); + assertEquals("schema-1", coordinator.state().schemaId()); + assertEquals(List.of(tileA, tileB), coordinator.state().availableTiles()); + + coordinator.moveToAssigned(List.of(tileA, tileB)); + assertEquals(List.of(tileA, tileB), coordinator.state().assignedTiles()); + assertEquals(List.of("#FF0000", "#00FF00"), coordinator.state().orderedColors()); + assertTrue(coordinator.state().dirty()); + + coordinator.reset(); + assertFalse(coordinator.state().selected()); + assertFalse(coordinator.state().dirty()); + assertTrue(coordinator.state().editing()); + + coordinator.cancel(); + assertFalse(coordinator.state().editing()); + } + + @Test + void editSessionOwnsExistingSchemaRemovalState() { + final DefaultAssetColorSchemaSession coordinator = session(); + final AssetWorkspaceBankCompositionFile tile = tile("a.png", "artifact-a", "fp-a", List.of("#FF0000")); + coordinator.replaceDetails(details( + List.of(tile), + new AssetStudioGlyphMaterialMetadata( + List.of(new AssetStudioGlyphMaterialSchema( + "schema-1", + AssetStudioGlyphMaterialSchemaStatus.OK, + 1, + Map.of(0, "#FF0000"), + List.of(new AssetStudioGlyphMaterialArtifactBinding("artifact-a", "fp-a")))), + List.of(), + null))); + + coordinator.beginEdit(); + coordinator.selectSchema("schema-1"); + assertTrue(coordinator.state().existingSchema()); + assertEquals(List.of(tile), coordinator.state().assignedTiles()); + + coordinator.markSelectedSchemaForRemoval(); + assertTrue(coordinator.state().removeRequested()); + assertTrue(coordinator.state().dirty()); + } + private AssetWorkspaceAssetDetails details( List selectedTiles, AssetStudioGlyphMaterialMetadata metadata) { @@ -186,16 +241,16 @@ final class AssetDetailsColorSchemaCoordinatorTest { AssetWorkspaceAssetState.REGISTERED, AssetWorkspaceBuildParticipation.INCLUDED, 1, - AssetFamilyCatalog.GLYPH_BANK, + AssetFamily.GLYPH_BANK, AssetStudioGlyphSpecialization.SPRITES, Path.of("/tmp/glyph"), false, false), List.of(), - OutputFormatCatalog.GLYPH_INDEXED_V1, - OutputCodecCatalog.NONE, - List.of(OutputCodecCatalog.NONE), - Map.of(OutputCodecCatalog.NONE, List.of()), + "GLYPH_INDEXED_V1", + "NONE", + List.of("NONE"), + Map.of("NONE", List.of()), List.of(), Map.of(), new AssetWorkspaceBankCompositionDetails(List.of(), selectedTiles, 0L), @@ -206,6 +261,10 @@ final class AssetDetailsColorSchemaCoordinatorTest { List.of()); } + private DefaultAssetColorSchemaSession session() { + return new DefaultAssetColorSchemaSession(rules); + } + private AssetWorkspaceBankCompositionFile tile(String path, String artifactId, String fingerprint, List colors) { final List argb = colors.stream() .map(color -> Integer.parseUnsignedInt("FF" + color.substring(1), 16)) diff --git a/prometeu-studio/src/test/java/p/studio/workspaces/assets/tiled/TiledAssetGenerationServiceTest.java b/prometeu-studio-core/src/test/java/p/studio/core/assets/tiled/TiledAssetGenerationServiceTest.java similarity index 92% rename from prometeu-studio/src/test/java/p/studio/workspaces/assets/tiled/TiledAssetGenerationServiceTest.java rename to prometeu-studio-core/src/test/java/p/studio/core/assets/tiled/TiledAssetGenerationServiceTest.java index 91e23a74..d1a834f5 100644 --- a/prometeu-studio/src/test/java/p/studio/workspaces/assets/tiled/TiledAssetGenerationServiceTest.java +++ b/prometeu-studio-core/src/test/java/p/studio/core/assets/tiled/TiledAssetGenerationServiceTest.java @@ -1,17 +1,18 @@ -package p.studio.workspaces.assets.tiled; +package p.studio.core.assets.tiled; + +import p.studio.api.assets.tiled.SceneTmxExportDisposition; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import p.packer.dtos.PackerCodecConfigurationFieldDTO; -import p.packer.messages.AssetReference; -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.messages.*; -import p.studio.workspaces.assets.metadata.*; +import p.studio.api.assets.AssetConfigurationField; +import p.studio.api.assets.AssetReference; +import p.studio.api.assets.AssetFamily; +import p.studio.api.project.ProjectTarget; +import p.studio.api.project.ProjectReference; +import p.studio.api.assets.workspace.*; +import p.studio.api.assets.metadata.*; +import p.studio.api.assets.tiled.TiledAssetGenerationResult; +import p.studio.core.assets.metadata.AssetStudioMetadataService; import java.nio.file.Files; import java.nio.file.Path; @@ -22,7 +23,8 @@ import java.util.Map; import static org.junit.jupiter.api.Assertions.*; final class TiledAssetGenerationServiceTest { - private final TiledAssetGenerationService service = new TiledAssetGenerationService(); + private final AssetStudioMetadataService metadataService = new AssetStudioMetadataService(); + private final TiledAssetGenerationService service = new TiledAssetGenerationService(metadataService); private final TiledXmlCodec codec = new TiledXmlCodec(); @TempDir @@ -67,7 +69,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, AppMode.Game, projectRoot); + final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, ProjectTarget.Game, projectRoot); final TiledAssetGenerationResult result = service.exportSceneBankTmx(projectReference, details); @@ -102,7 +104,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, AppMode.Game, projectRoot); + final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, ProjectTarget.Game, projectRoot); final Path tmxPath = sceneRoot.resolve("scene.tmx"); Files.writeString(tmxPath, "legacy"); @@ -110,7 +112,7 @@ final class TiledAssetGenerationServiceTest { final TiledAssetGenerationResult result = service.exportSceneBankTmx( projectReference, details, - TiledAssetGenerationService.SceneTmxExportDisposition.KEEP_BOTH); + SceneTmxExportDisposition.KEEP_BOTH); assertTrue(result.success()); final Path backupPath = sceneRoot.resolve("scene.bkp-1.tmx"); @@ -142,7 +144,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, AppMode.Game, projectRoot); + final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, ProjectTarget.Game, projectRoot); assertTrue(service.exportSceneBankTmx(projectReference, details).success()); final Path tmxPath = sceneRoot.resolve("scene.tmx"); @@ -152,7 +154,7 @@ final class TiledAssetGenerationServiceTest { assertTrue(result.success()); final AssetStudioMetadataService metadataService = new AssetStudioMetadataService(); - final var snapshot = metadataService.read(sceneRoot, AssetFamilyCatalog.SCENE_BANK); + final var snapshot = metadataService.read(sceneRoot, AssetFamily.SCENE_BANK); assertNotNull(snapshot.sceneBankMetadata()); assertTrue(snapshot.sceneBankMetadata().layerBindings().getFirst().tiles().getFirst().active()); assertEquals(1, snapshot.sceneBankMetadata().layerBindings().getFirst().tiles().getFirst().glyphId()); @@ -180,7 +182,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, AppMode.Game, projectRoot); + final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, ProjectTarget.Game, projectRoot); assertTrue(service.exportSceneBankTmx(projectReference, details).success()); final Path tsxPath = tilesetRoot.resolve(TiledAssetGenerationService.GENERATED_TSX_FILE); @@ -195,7 +197,7 @@ final class TiledAssetGenerationServiceTest { assertTrue(result.success()); final AssetStudioMetadataService metadataService = new AssetStudioMetadataService(); - final var snapshot = metadataService.read(sceneRoot, AssetFamilyCatalog.SCENE_BANK); + final var snapshot = metadataService.read(sceneRoot, AssetFamily.SCENE_BANK); assertNotNull(snapshot.sceneBankMetadata()); assertEquals(3, snapshot.sceneBankMetadata().layerBindings().getFirst().tiles().getFirst().glyphId()); } @@ -221,7 +223,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, AppMode.Game, projectRoot); + final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, ProjectTarget.Game, projectRoot); assertTrue(service.exportSceneBankTmx(projectReference, details).success()); final Path tmxPath = sceneRoot.resolve("scene.tmx"); @@ -252,7 +254,7 @@ final class TiledAssetGenerationServiceTest { assertTrue(result.success()); final AssetStudioMetadataService metadataService = new AssetStudioMetadataService(); - final var snapshot = metadataService.read(sceneRoot, AssetFamilyCatalog.SCENE_BANK); + final var snapshot = metadataService.read(sceneRoot, AssetFamily.SCENE_BANK); assertNotNull(snapshot.sceneBankMetadata()); assertEquals(6, snapshot.sceneBankMetadata().mapWidth()); assertEquals(5, snapshot.sceneBankMetadata().mapHeight()); @@ -287,7 +289,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, AppMode.Game, projectRoot); + final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, ProjectTarget.Game, projectRoot); assertTrue(service.exportSceneBankTmx(projectReference, details).success()); final Path tmxPath = sceneRoot.resolve("scene.tmx"); @@ -325,7 +327,7 @@ final class TiledAssetGenerationServiceTest { assertTrue(result.success()); final AssetStudioMetadataService metadataService = new AssetStudioMetadataService(); - final var snapshot = metadataService.read(sceneRoot, AssetFamilyCatalog.SCENE_BANK); + final var snapshot = metadataService.read(sceneRoot, AssetFamily.SCENE_BANK); assertNotNull(snapshot.sceneBankMetadata()); assertEquals(3, snapshot.sceneBankMetadata().enabledLayerCount()); assertTrue(snapshot.sceneBankMetadata().layerBindings().get(2).enabled()); @@ -358,7 +360,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, AppMode.Game, projectRoot); + final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, ProjectTarget.Game, projectRoot); final Path tmxPath = sceneRoot.resolve("scene.tmx"); Files.writeString(tmxPath, """ @@ -395,7 +397,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, AppMode.Game, projectRoot); + final ProjectReference projectReference = new ProjectReference("main", "1", "pbs", 1, ProjectTarget.Game, projectRoot); final Path tmxPath = sceneRoot.resolve("scene.tmx"); Files.writeString(tmxPath, """ @@ -424,20 +426,20 @@ final class TiledAssetGenerationServiceTest { AssetWorkspaceAssetState.REGISTERED, AssetWorkspaceBuildParticipation.INCLUDED, 1, - AssetFamilyCatalog.GLYPH_BANK, + AssetFamily.GLYPH_BANK, AssetStudioGlyphSpecialization.TILESET, assetRoot, false, false), List.of(), - OutputFormatCatalog.GLYPH_INDEXED_V1, - OutputCodecCatalog.NONE, - List.of(OutputCodecCatalog.NONE), - Map.of(OutputCodecCatalog.NONE, List.of()), - List.of(new PackerCodecConfigurationFieldDTO( + "GLYPH_INDEXED_V1", + "NONE", + List.of("NONE"), + Map.of("NONE", List.of()), + List.of(new AssetConfigurationField( "tile_size", "Tile Size", - PackerCodecConfigurationFieldType.ENUM, + "ENUM", "16x16", true, List.of("8x8", "16x16", "32x32"))), @@ -463,16 +465,16 @@ final class TiledAssetGenerationServiceTest { AssetWorkspaceAssetState.REGISTERED, AssetWorkspaceBuildParticipation.EXCLUDED, 2, - AssetFamilyCatalog.SCENE_BANK, + AssetFamily.SCENE_BANK, AssetStudioGlyphSpecialization.NONE, assetRoot, false, false), List.of(), - OutputFormatCatalog.SCENE_TILED_V1, - OutputCodecCatalog.NONE, - List.of(OutputCodecCatalog.NONE), - Map.of(OutputCodecCatalog.NONE, List.of()), + "SCENE_TILED_V1", + "NONE", + List.of("NONE"), + Map.of("NONE", List.of()), List.of(), Map.of(), new AssetWorkspaceBankCompositionDetails(List.of(), List.of(), 0L), diff --git a/prometeu-studio/src/test/java/p/studio/workspaces/assets/tiled/TiledXmlCodecTest.java b/prometeu-studio-core/src/test/java/p/studio/core/assets/tiled/TiledXmlCodecTest.java similarity index 98% rename from prometeu-studio/src/test/java/p/studio/workspaces/assets/tiled/TiledXmlCodecTest.java rename to prometeu-studio-core/src/test/java/p/studio/core/assets/tiled/TiledXmlCodecTest.java index b7401de8..1c3b717b 100644 --- a/prometeu-studio/src/test/java/p/studio/workspaces/assets/tiled/TiledXmlCodecTest.java +++ b/prometeu-studio-core/src/test/java/p/studio/core/assets/tiled/TiledXmlCodecTest.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.tiled; +package p.studio.core.assets.tiled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/prometeu-studio-core/src/test/java/p/studio/core/execution/DefaultExecutionSessionTest.java b/prometeu-studio-core/src/test/java/p/studio/core/execution/DefaultExecutionSessionTest.java new file mode 100644 index 00000000..8e6d1452 --- /dev/null +++ b/prometeu-studio-core/src/test/java/p/studio/core/execution/DefaultExecutionSessionTest.java @@ -0,0 +1,48 @@ +package p.studio.core.execution; + +import org.junit.jupiter.api.Test; +import p.studio.api.execution.ExecutionLogSeverity; +import p.studio.api.execution.ExecutionLogSource; +import p.studio.api.execution.ExecutionSnapshot; +import p.studio.api.execution.ExecutionState; +import p.studio.api.shipper.ShipperLogEntry; +import p.studio.api.shipper.ShipperLogSeverity; +import p.studio.api.shipper.ShipperLogSource; + +import java.time.Instant; +import java.util.ArrayList; + +import static org.junit.jupiter.api.Assertions.*; + +final class DefaultExecutionSessionTest { + @Test + void enforcesStateMachineAndPreservesLogIdentity() { + final var session = new DefaultExecutionSession(); + final Instant now = Instant.parse("2026-04-06T10:15:30Z"); + assertEquals(ExecutionState.IDLE, session.snapshot().state()); + assertThrows(IllegalStateException.class, session::transitionToRunning); + + session.beginPreparationCycle(); + session.appendShipperLog(new ShipperLogEntry(ShipperLogSource.BUILD, ShipperLogSeverity.INFO, "Compiler started", now)); + session.appendRuntimeLog(ExecutionLogSeverity.ERROR, "Runtime failed", now.plusSeconds(1)); + session.transitionToPrepareFailed(); + + assertEquals(ExecutionState.PREPARE_FAILED, session.snapshot().state()); + assertEquals(ExecutionLogSource.BUILD, session.snapshot().logs().get(0).source()); + assertEquals(ExecutionLogSource.RUNTIME, session.snapshot().logs().get(1).source()); + assertEquals(2L, session.snapshot().logs().get(1).sequence()); + } + + @Test + void publishesImmutableSnapshotsAndCanUnsubscribe() { + final var session = new DefaultExecutionSession(); + final ArrayList snapshots = new ArrayList<>(); + final var subscription = session.subscribe(snapshots::add); + session.beginPreparationCycle(); + subscription.close(); + session.transitionToPrepareFailed(); + assertEquals(2, snapshots.size()); + assertEquals(ExecutionState.IDLE, snapshots.getFirst().state()); + assertEquals(ExecutionState.PREPARING, snapshots.getLast().state()); + } +} diff --git a/prometeu-studio-core/src/test/java/p/studio/core/execution/PlayStopExecutionControllerTest.java b/prometeu-studio-core/src/test/java/p/studio/core/execution/PlayStopExecutionControllerTest.java new file mode 100644 index 00000000..8e098589 --- /dev/null +++ b/prometeu-studio-core/src/test/java/p/studio/core/execution/PlayStopExecutionControllerTest.java @@ -0,0 +1,214 @@ +package p.studio.core.execution; + +import org.junit.jupiter.api.Test; +import p.studio.api.execution.ExecutionState; +import p.studio.api.project.ProjectLocalStudioSetup; +import p.studio.api.project.ProjectReference; +import p.studio.api.project.ProjectTarget; +import p.studio.api.runtime.RuntimeLogEntry; +import p.studio.api.shipper.Shipper; +import p.studio.api.shipper.ShipperPreparationStatus; +import p.studio.api.shipper.ShipperPrepareResult; +import p.studio.core.runtime.RuntimeConnection; +import p.studio.core.runtime.RuntimeGateway; +import p.studio.api.operation.OperationExecutor; +import p.studio.api.operation.OperationHandle; +import p.studio.api.operation.OperationId; +import p.studio.api.operation.OperationSnapshot; +import p.studio.api.operation.OperationState; +import p.studio.api.operation.OperationSubscription; + +import java.nio.file.Path; +import java.time.Instant; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Callable; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Consumer; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +final class PlayStopExecutionControllerTest { + private static final OperationExecutor OPERATIONS = new ImmediateOperationExecutor(); + + @Test + void successfulPreparationStartsRuntimeAndProjectsExit() { + final var session = new DefaultExecutionSession(); + final var completion = new CompletableFuture(); + final RuntimeGateway runtime = (project, setup, logs) -> { + logs.accept(RuntimeLogEntry.info("connected")); + return connection(completion); + }; + final var controller = new PlayStopExecutionController(project(), ProjectLocalStudioSetup.defaults(), + session, successfulShipper(), runtime, OPERATIONS); + + controller.play(); + assertEquals(ExecutionState.RUNNING, session.snapshot().state()); + completion.complete(0); + assertEquals(ExecutionState.STOPPED, session.snapshot().state()); + } + + @Test + void preparationFailureDoesNotStartRuntime() { + final var session = new DefaultExecutionSession(); + final RuntimeGateway runtime = (project, setup, logs) -> { throw new AssertionError("must not start"); }; + final Shipper shipper = (project, logs) -> OPERATIONS.submit("prepare", () -> new ShipperPrepareResult( + ShipperPreparationStatus.FAILED, List.of(), null, List.of(), List.of())); + final var controller = new PlayStopExecutionController(project(), ProjectLocalStudioSetup.defaults(), + session, shipper, runtime, OPERATIONS); + + controller.play(); + assertEquals(ExecutionState.PREPARE_FAILED, session.snapshot().state()); + } + + @Test + void stopCancelsPreparationAndExecutionOperations() throws Exception { + final var session = new DefaultExecutionSession(); + final var preparationStarted = new CountDownLatch(1); + final var releasePreparation = new CountDownLatch(1); + final RuntimeGateway runtime = (project, setup, logs) -> { + throw new AssertionError("runtime must not start after cancellation"); + }; + try (var operations = new AsyncOperationExecutor()) { + final Shipper shipper = (project, logs) -> operations.submit("prepare", () -> { + preparationStarted.countDown(); + releasePreparation.await(); + return new ShipperPrepareResult( + ShipperPreparationStatus.SUCCESS, List.of(), Path.of("manifest.json"), List.of(), List.of()); + }); + final var controller = new PlayStopExecutionController(project(), ProjectLocalStudioSetup.defaults(), + session, shipper, runtime, operations); + + final OperationHandle execution = controller.play(); + assertTrue(preparationStarted.await(2, TimeUnit.SECONDS)); + controller.stop(); + + assertEquals(ExecutionState.STOPPED, session.snapshot().state()); + assertEquals(OperationState.CANCELLED, execution.snapshot().state()); + releasePreparation.countDown(); + } + } + + private static Shipper successfulShipper() { + return (project, logs) -> OPERATIONS.submit("prepare", () -> new ShipperPrepareResult( + ShipperPreparationStatus.SUCCESS, List.of(), Path.of("manifest.json"), List.of(), List.of())); + } + + private static RuntimeConnection connection(CompletableFuture completion) { + return new RuntimeConnection() { + @Override public CompletableFuture completion() { return completion; } + @Override public void close() { completion.complete(-1); } + }; + } + + private static ProjectReference project() { + return new ProjectReference("Example", "1", "pbs", 1, ProjectTarget.Game, Path.of(".")); + } + + private static final class ImmediateOperationExecutor implements OperationExecutor { + @Override + public OperationHandle submit(String summary, Callable operation) { + try { + return new CompletedOperationHandle<>(summary, operation.call()); + } catch (Exception failure) { + throw new RuntimeException(failure); + } + } + } + + private static final class CompletedOperationHandle implements OperationHandle { + private final OperationSnapshot snapshot; + private final CompletableFuture completion; + + private CompletedOperationHandle(String summary, R result) { + final OperationId id = new OperationId(UUID.randomUUID().toString()); + snapshot = new OperationSnapshot(id, OperationState.SUCCEEDED, Instant.now(), summary); + completion = CompletableFuture.completedFuture(result); + } + + @Override public OperationId id() { return snapshot.id(); } + @Override public OperationSnapshot snapshot() { return snapshot; } + @Override public CompletionStage completion() { return completion; } + @Override public boolean cancel() { return false; } + @Override public OperationSubscription subscribe(Consumer subscriber) { + subscriber.accept(snapshot); + return () -> { }; + } + } + + private static final class AsyncOperationExecutor implements OperationExecutor, AutoCloseable { + private final ExecutorService executor = Executors.newFixedThreadPool(4); + + @Override + public OperationHandle submit(String summary, Callable operation) { + final AsyncOperationHandle handle = new AsyncOperationHandle<>(summary); + handle.start(executor, operation); + return handle; + } + + @Override + public void close() { + executor.shutdownNow(); + } + } + + private static final class AsyncOperationHandle implements OperationHandle { + private final OperationId id = new OperationId(UUID.randomUUID().toString()); + private final CompletableFuture completion = new CompletableFuture<>(); + private final AtomicReference snapshot; + private volatile Future task; + + private AsyncOperationHandle(String summary) { + snapshot = new AtomicReference<>(new OperationSnapshot(id, OperationState.PENDING, Instant.now(), summary)); + } + + private void start(ExecutorService executor, Callable operation) { + snapshot.set(new OperationSnapshot(id, OperationState.RUNNING, Instant.now(), snapshot.get().summary())); + task = executor.submit(() -> { + try { + final R result = operation.call(); + if (!completion.isCancelled()) { + snapshot.set(new OperationSnapshot(id, OperationState.SUCCEEDED, Instant.now(), snapshot.get().summary())); + completion.complete(result); + } + } catch (Throwable failure) { + if (!completion.isCancelled()) { + snapshot.set(new OperationSnapshot(id, OperationState.FAILED, Instant.now(), snapshot.get().summary())); + completion.completeExceptionally(failure); + } + } + }); + } + + @Override public OperationId id() { return id; } + @Override public OperationSnapshot snapshot() { return snapshot.get(); } + @Override public CompletionStage completion() { return completion; } + + @Override + public boolean cancel() { + if (!completion.cancel(false)) { + return false; + } + snapshot.set(new OperationSnapshot(id, OperationState.CANCELLED, Instant.now(), snapshot.get().summary())); + final Future submitted = task; + if (submitted != null) { + submitted.cancel(true); + } + return true; + } + + @Override + public OperationSubscription subscribe(Consumer subscriber) { + subscriber.accept(snapshot.get()); + return () -> { }; + } + } +} diff --git a/prometeu-studio-core/src/test/java/p/studio/core/project/KnownProjectsServiceTest.java b/prometeu-studio-core/src/test/java/p/studio/core/project/KnownProjectsServiceTest.java new file mode 100644 index 00000000..773487ea --- /dev/null +++ b/prometeu-studio-core/src/test/java/p/studio/core/project/KnownProjectsServiceTest.java @@ -0,0 +1,34 @@ +package p.studio.core.project; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import p.studio.api.project.ProjectReference; + +import java.nio.file.Files; +import java.nio.file.Path; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class KnownProjectsServiceTest { + @TempDir + Path tempDir; + + @Test + void seedsRemembersAndForgetsWithoutDeletingProjects() throws Exception { + final Path root = tempDir.resolve("projects"); + Files.createDirectories(root.resolve("alpha")); + Files.writeString(root.resolve("alpha/prometeu.json"), """ + {"name":"Alpha","version":"1","language":"pbs","stdlib":"1","target":"Game"} + """); + final ObjectMapper mapper = new ObjectMapper(); + final var catalog = new ProjectCatalogService(root, mapper, new ProjectLocalStudioSetupStore(mapper)); + final var known = new KnownProjectsService(tempDir.resolve("known.txt"), catalog); + + final ProjectReference alpha = known.listKnownProjects().getFirst(); + known.forget(alpha); + assertEquals(java.util.List.of(), known.listKnownProjects()); + known.remember(alpha); + assertEquals(java.util.List.of("Alpha"), known.listKnownProjects().stream().map(ProjectReference::name).toList()); + } +} diff --git a/prometeu-studio-core/src/test/java/p/studio/core/project/ProjectCatalogServiceTest.java b/prometeu-studio-core/src/test/java/p/studio/core/project/ProjectCatalogServiceTest.java new file mode 100644 index 00000000..9600a491 --- /dev/null +++ b/prometeu-studio-core/src/test/java/p/studio/core/project/ProjectCatalogServiceTest.java @@ -0,0 +1,49 @@ +package p.studio.core.project; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import p.studio.api.project.ProjectCreationRequest; +import p.studio.api.project.ProjectReference; +import p.studio.api.project.ProjectTarget; + +import java.nio.file.Files; +import java.nio.file.Path; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class ProjectCatalogServiceTest { + @TempDir + Path tempDir; + + @Test + void createsAndReopensAProjectWithLocalSetup() throws Exception { + final ProjectCatalogService service = service(tempDir); + final ProjectReference project = service.createProject(new ProjectCreationRequest( + "Core Project", tempDir, "pbs", 7, ProjectTarget.Game, "code", 8, "/runtime")); + + assertEquals("Core Project", project.name()); + assertEquals(ProjectTarget.Game, project.target()); + assertTrue(Files.isDirectory(project.rootPath().resolve("code"))); + assertTrue(Files.isRegularFile(project.rootPath().resolve(".studio/setup.json"))); + assertEquals(project, service.openProject(project.rootPath())); + } + + @Test + void listsOnlyDirectoriesWithValidProjectManifests() throws Exception { + Files.createDirectories(tempDir.resolve("alpha")); + Files.createDirectories(tempDir.resolve("scratch")); + Files.writeString(tempDir.resolve("alpha/prometeu.json"), """ + {"name":"Alpha","version":"1","language":"pbs","stdlib":"1","target":"Game"} + """); + + assertEquals(java.util.List.of("Alpha"), + service(tempDir).listProjects().stream().map(ProjectReference::name).toList()); + } + + private ProjectCatalogService service(Path root) { + final ObjectMapper mapper = new ObjectMapper(); + return new ProjectCatalogService(root, mapper, new ProjectLocalStudioSetupStore(mapper)); + } +} diff --git a/prometeu-studio/src/test/java/p/studio/projectstate/ProjectLocalStudioSetupServiceTest.java b/prometeu-studio-core/src/test/java/p/studio/core/project/ProjectLocalStudioSetupStoreTest.java similarity index 73% rename from prometeu-studio/src/test/java/p/studio/projectstate/ProjectLocalStudioSetupServiceTest.java rename to prometeu-studio-core/src/test/java/p/studio/core/project/ProjectLocalStudioSetupStoreTest.java index eb8e57d4..aa437483 100644 --- a/prometeu-studio/src/test/java/p/studio/projectstate/ProjectLocalStudioSetupServiceTest.java +++ b/prometeu-studio-core/src/test/java/p/studio/core/project/ProjectLocalStudioSetupStoreTest.java @@ -1,23 +1,24 @@ -package p.studio.projectstate; +package p.studio.core.project; +import p.studio.api.project.ProjectLocalStudioSetup; 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; +import p.studio.api.project.ProjectTarget; +import p.studio.api.project.ProjectReference; + import java.nio.file.Files; import java.nio.file.Path; import static org.junit.jupiter.api.Assertions.assertEquals; -final class ProjectLocalStudioSetupServiceTest { +final class ProjectLocalStudioSetupStoreTest { @TempDir Path tempDir; @Test void loadsDedicatedProjectSetupFile() throws Exception { - final ProjectLocalStudioSetupService service = new ProjectLocalStudioSetupService(); + final ProjectLocalStudioSetupStore service = new ProjectLocalStudioSetupStore(new com.fasterxml.jackson.databind.ObjectMapper()); final ProjectReference project = project("main"); Files.createDirectories(ProjectStudioPaths.studioRoot(project)); Files.writeString( @@ -41,14 +42,14 @@ final class ProjectLocalStudioSetupServiceTest { @Test void missingDedicatedProjectSetupFileFallsBackToDefaults() { - final ProjectLocalStudioSetupService service = new ProjectLocalStudioSetupService(); + final ProjectLocalStudioSetupStore service = new ProjectLocalStudioSetupStore(new com.fasterxml.jackson.databind.ObjectMapper()); assertEquals(ProjectLocalStudioSetup.defaults(), service.load(project("main"))); } @Test void malformedDedicatedProjectSetupFileFallsBackToDefaults() throws Exception { - final ProjectLocalStudioSetupService service = new ProjectLocalStudioSetupService(); + final ProjectLocalStudioSetupStore service = new ProjectLocalStudioSetupStore(new com.fasterxml.jackson.databind.ObjectMapper()); final ProjectReference project = project("main"); Files.createDirectories(ProjectStudioPaths.studioRoot(project)); Files.writeString(ProjectStudioPaths.setupPath(project), "{ not valid json"); @@ -58,7 +59,7 @@ final class ProjectLocalStudioSetupServiceTest { @Test void saveWritesNormalizedDedicatedProjectSetupFile() throws Exception { - final ProjectLocalStudioSetupService service = new ProjectLocalStudioSetupService(); + final ProjectLocalStudioSetupStore service = new ProjectLocalStudioSetupStore(new com.fasterxml.jackson.databind.ObjectMapper()); final ProjectReference project = project("main"); service.save( @@ -76,6 +77,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, AppMode.Game, projectRoot); + return new ProjectReference("Main", "1.0.0", "pbs", 1, ProjectTarget.Game, projectRoot); } } diff --git a/prometeu-studio/src/test/java/p/studio/projectstate/ProjectLocalStudioStateServiceTest.java b/prometeu-studio-core/src/test/java/p/studio/core/project/ProjectLocalStudioStateStoreTest.java similarity index 79% rename from prometeu-studio/src/test/java/p/studio/projectstate/ProjectLocalStudioStateServiceTest.java rename to prometeu-studio-core/src/test/java/p/studio/core/project/ProjectLocalStudioStateStoreTest.java index 5bbc3742..3ad14990 100644 --- a/prometeu-studio/src/test/java/p/studio/projectstate/ProjectLocalStudioStateServiceTest.java +++ b/prometeu-studio-core/src/test/java/p/studio/core/project/ProjectLocalStudioStateStoreTest.java @@ -1,10 +1,11 @@ -package p.studio.projectstate; +package p.studio.core.project; +import p.studio.api.project.ProjectLocalStudioState; 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; +import p.studio.api.project.ProjectTarget; +import p.studio.api.project.ProjectReference; + import java.nio.file.Files; import java.nio.file.Path; @@ -13,13 +14,13 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -final class ProjectLocalStudioStateServiceTest { +final class ProjectLocalStudioStateStoreTest { @TempDir Path tempDir; @Test void savesAndLoadsSingleFileProjectLocalStudioState() { - final ProjectLocalStudioStateService service = new ProjectLocalStudioStateService(); + final ProjectLocalStudioStateStore service = new ProjectLocalStudioStateStore(new com.fasterxml.jackson.databind.ObjectMapper()); final ProjectReference project = project("main"); final ProjectLocalStudioState state = new ProjectLocalStudioState( ProjectLocalStudioState.CURRENT_VERSION, @@ -35,7 +36,7 @@ final class ProjectLocalStudioStateServiceTest { @Test void malformedStateFallsBackToDefaults() throws Exception { - final ProjectLocalStudioStateService service = new ProjectLocalStudioStateService(); + final ProjectLocalStudioStateStore service = new ProjectLocalStudioStateStore(new com.fasterxml.jackson.databind.ObjectMapper()); final ProjectReference project = project("main"); Files.createDirectories(ProjectStudioPaths.studioRoot(project)); Files.writeString(ProjectStudioPaths.statePath(project), "{ not valid json"); @@ -45,7 +46,7 @@ final class ProjectLocalStudioStateServiceTest { @Test void unsupportedVersionFallsBackToDefaults() throws Exception { - final ProjectLocalStudioStateService service = new ProjectLocalStudioStateService(); + final ProjectLocalStudioStateStore service = new ProjectLocalStudioStateStore(new com.fasterxml.jackson.databind.ObjectMapper()); final ProjectReference project = project("main"); Files.createDirectories(ProjectStudioPaths.studioRoot(project)); Files.writeString( @@ -61,7 +62,7 @@ final class ProjectLocalStudioStateServiceTest { @Test void legacyEditorStateLoadsWithAssetsFallbackAndIgnoresEditorFields() throws Exception { - final ProjectLocalStudioStateService service = new ProjectLocalStudioStateService(); + final ProjectLocalStudioStateStore service = new ProjectLocalStudioStateStore(new com.fasterxml.jackson.databind.ObjectMapper()); final ProjectReference project = project("main"); Files.createDirectories(ProjectStudioPaths.studioRoot(project)); Files.writeString( @@ -98,6 +99,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, AppMode.Game, projectRoot); + return new ProjectReference("Main", "1.0.0", "pbs", 1, ProjectTarget.Game, projectRoot); } } diff --git a/prometeu-studio-core/src/test/java/p/studio/core/project/preferences/JsonProjectActivityHistoryStoreTest.java b/prometeu-studio-core/src/test/java/p/studio/core/project/preferences/JsonProjectActivityHistoryStoreTest.java new file mode 100644 index 00000000..b090929d --- /dev/null +++ b/prometeu-studio-core/src/test/java/p/studio/core/project/preferences/JsonProjectActivityHistoryStoreTest.java @@ -0,0 +1,32 @@ +package p.studio.core.project.preferences; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import p.studio.api.preferences.ProjectActivityRecord; +import p.studio.api.project.ProjectReference; +import p.studio.api.project.ProjectTarget; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +final class JsonProjectActivityHistoryStoreTest { + @TempDir + Path tempDir; + + @Test + void persistsProjectScopedHistoryAndToleratesMalformedStorage() throws Exception { + final var store = new JsonProjectActivityHistoryStore(new ObjectMapper()); + final var project = new ProjectReference("main", "1", "pbs", 1, ProjectTarget.Game, tempDir.resolve("project")); + final var history = List.of(new ProjectActivityRecord("Studio", "Opened", "SUCCESS", false)); + + store.save(project, history); + assertEquals(history, store.load(project)); + + Files.writeString(project.rootPath().resolve(".studio/activities.json"), "{ invalid"); + assertEquals(List.of(), store.load(project)); + } +} diff --git a/prometeu-studio-core/src/test/java/p/studio/core/project/preferences/JsonWindowStateStoreTest.java b/prometeu-studio-core/src/test/java/p/studio/core/project/preferences/JsonWindowStateStoreTest.java new file mode 100644 index 00000000..a0fcc3b9 --- /dev/null +++ b/prometeu-studio-core/src/test/java/p/studio/core/project/preferences/JsonWindowStateStoreTest.java @@ -0,0 +1,47 @@ +package p.studio.core.project.preferences; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import p.studio.api.preferences.WindowGeometry; +import p.studio.api.project.ProjectReference; +import p.studio.api.project.ProjectTarget; + +import java.nio.file.Files; +import java.nio.file.Path; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +final class JsonWindowStateStoreTest { + @TempDir + Path tempDir; + + @Test + void persistsGeometryByNormalizedProjectRoot() { + final Path storage = tempDir.resolve("window-state.json"); + final var project = new ProjectReference("main", "1", "pbs", 1, ProjectTarget.Game, tempDir.resolve("project")); + final var geometry = new WindowGeometry(12, 34, 1280, 840, true); + + new JsonWindowStateStore(storage, new ObjectMapper()).save(project, geometry); + + assertEquals(geometry, new JsonWindowStateStore(storage, new ObjectMapper()).load(project).orElseThrow()); + } + + @Test + void readsExistingFileWhileIgnoringLegacyLauncherState() throws Exception { + final Path projectRoot = tempDir.resolve("project").toAbsolutePath().normalize(); + final Path storage = tempDir.resolve("window-state.json"); + Files.writeString(storage, """ + { + "launcher": {"x": 1, "y": 2, "width": 3, "height": 4, "maximized": false}, + "projects": { + "%s": {"x": 10, "y": 20, "width": 900, "height": 700, "maximized": false} + } + } + """.formatted(projectRoot.toString().replace("\\", "\\\\"))); + final var project = new ProjectReference("main", "1", "pbs", 1, ProjectTarget.Game, projectRoot); + + assertEquals(new WindowGeometry(10, 20, 900, 700, false), + new JsonWindowStateStore(storage, new ObjectMapper()).load(project).orElseThrow()); + } +} diff --git a/prometeu-studio-core/src/test/java/p/studio/core/session/DefaultProjectSessionTest.java b/prometeu-studio-core/src/test/java/p/studio/core/session/DefaultProjectSessionTest.java new file mode 100644 index 00000000..712008bb --- /dev/null +++ b/prometeu-studio-core/src/test/java/p/studio/core/session/DefaultProjectSessionTest.java @@ -0,0 +1,66 @@ +package p.studio.core.session; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import p.studio.api.project.ProjectLocalStudioState; +import p.studio.api.project.ProjectReference; +import p.studio.api.project.ProjectTarget; +import p.studio.core.project.ProjectLocalStudioSetupStore; +import p.studio.core.project.ProjectLocalStudioStateStore; + +import java.nio.file.Path; + +import static org.junit.jupiter.api.Assertions.*; + +final class DefaultProjectSessionTest { + @TempDir Path temporaryDirectory; + + @Test + void factoryLoadsStateBootsLspAndCloseIsOrderedAndIdempotent() { + final var mapper = new ObjectMapper(); + final var stateStore = new ProjectLocalStudioStateStore(mapper); + final var setupStore = new ProjectLocalStudioSetupStore(mapper); + final var lsp = new RecordingLsp(); + final var factory = new DefaultProjectSessionFactory(stateStore, setupStore, lsp); + final var project = project(); + + final var session = factory.open(project); + final var next = ProjectLocalStudioState.defaults() + .withOpenShellState(new ProjectLocalStudioState.OpenShellState("DEBUG")); + session.replaceProjectLocalStudioState(next); + session.close(); + session.close(); + + assertEquals(1, lsp.boots); + assertEquals(1, lsp.shutdowns); + assertEquals(next, stateStore.load(project)); + } + + @Test + void closeAggregatesCleanupFailures() { + final var mapper = new ObjectMapper(); + final var lsp = new RecordingLsp(); + lsp.failShutdown = true; + final var session = new DefaultProjectSessionFactory( + new ProjectLocalStudioStateStore(mapper), + new ProjectLocalStudioSetupStore(mapper), lsp).open(project()); + final var failure = assertThrows(IllegalStateException.class, session::close); + assertEquals("lsp shutdown", failure.getMessage()); + } + + private ProjectReference project() { + return new ProjectReference("Example", "1.0.0", "pbs", 1, ProjectTarget.Game, temporaryDirectory); + } + + private static final class RecordingLsp implements LspLifecyclePort { + int boots; + int shutdowns; + boolean failShutdown; + @Override public void boot(ProjectReference project) { boots++; } + @Override public void shutdown(ProjectReference project) { + shutdowns++; + if (failShutdown) throw new IllegalStateException("lsp shutdown"); + } + } +} diff --git a/prometeu-studio-ui-javafx/build.gradle.kts b/prometeu-studio-ui-javafx/build.gradle.kts new file mode 100644 index 00000000..0f2a251a --- /dev/null +++ b/prometeu-studio-ui-javafx/build.gradle.kts @@ -0,0 +1,16 @@ +plugins { + id("gradle.java-library-conventions") + alias(libs.plugins.javafx) +} + +dependencies { + api(project(":prometeu-studio-api")) + implementation(libs.javafx.controls) + implementation(libs.javafx.fxml) + implementation(libs.richtextfx) +} + +javafx { + version = libs.versions.javafx.get() + modules("javafx.controls", "javafx.fxml") +} diff --git a/prometeu-studio/src/main/java/p/studio/StudioAppInfo.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/StudioAppInfo.java similarity index 95% rename from prometeu-studio/src/main/java/p/studio/StudioAppInfo.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/StudioAppInfo.java index 77183ea5..71bd2879 100644 --- a/prometeu-studio/src/main/java/p/studio/StudioAppInfo.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/StudioAppInfo.java @@ -1,4 +1,4 @@ -package p.studio; +package p.studio.ui.javafx; import java.util.Optional; diff --git a/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/StudioJavaFx.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/StudioJavaFx.java new file mode 100644 index 00000000..8703bb77 --- /dev/null +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/StudioJavaFx.java @@ -0,0 +1,6 @@ +package p.studio.ui.javafx; + +public final class StudioJavaFx { + private StudioJavaFx() { + } +} diff --git a/prometeu-studio/src/main/java/p/studio/controls/WorkspaceDockPane.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/WorkspaceDockPane.java similarity index 99% rename from prometeu-studio/src/main/java/p/studio/controls/WorkspaceDockPane.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/WorkspaceDockPane.java index 05ecd35d..a4d955c7 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/WorkspaceDockPane.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/WorkspaceDockPane.java @@ -1,4 +1,4 @@ -package p.studio.controls; +package p.studio.ui.javafx.controls; import javafx.application.Platform; import javafx.beans.value.ChangeListener; diff --git a/prometeu-studio/src/main/java/p/studio/controls/banks/StudioAssetCapacityMeter.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/banks/StudioAssetCapacityMeter.java similarity index 98% rename from prometeu-studio/src/main/java/p/studio/controls/banks/StudioAssetCapacityMeter.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/banks/StudioAssetCapacityMeter.java index 33c35eca..5bf62c67 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/banks/StudioAssetCapacityMeter.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/banks/StudioAssetCapacityMeter.java @@ -1,4 +1,4 @@ -package p.studio.controls.banks; +package p.studio.ui.javafx.controls.banks; import javafx.geometry.Pos; import javafx.scene.control.Label; diff --git a/prometeu-studio/src/main/java/p/studio/controls/banks/StudioAssetCapacitySeverity.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/banks/StudioAssetCapacitySeverity.java similarity index 63% rename from prometeu-studio/src/main/java/p/studio/controls/banks/StudioAssetCapacitySeverity.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/banks/StudioAssetCapacitySeverity.java index 9659d5ce..ba8e5bb0 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/banks/StudioAssetCapacitySeverity.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/banks/StudioAssetCapacitySeverity.java @@ -1,4 +1,4 @@ -package p.studio.controls.banks; +package p.studio.ui.javafx.controls.banks; public enum StudioAssetCapacitySeverity { GREEN, diff --git a/prometeu-studio/src/main/java/p/studio/controls/banks/StudioDualListView.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/banks/StudioDualListView.java similarity index 99% rename from prometeu-studio/src/main/java/p/studio/controls/banks/StudioDualListView.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/banks/StudioDualListView.java index 730a875c..39823060 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/banks/StudioDualListView.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/banks/StudioDualListView.java @@ -1,4 +1,4 @@ -package p.studio.controls.banks; +package p.studio.ui.javafx.controls.banks; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/prometeu-studio/src/main/java/p/studio/controls/forms/StudioFormActionBar.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioFormActionBar.java similarity index 72% rename from prometeu-studio/src/main/java/p/studio/controls/forms/StudioFormActionBar.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioFormActionBar.java index d5059316..038788a1 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/forms/StudioFormActionBar.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioFormActionBar.java @@ -1,21 +1,26 @@ -package p.studio.controls.forms; +package p.studio.ui.javafx.controls.forms; import javafx.scene.control.Button; import javafx.scene.layout.HBox; -import p.studio.Container; -import p.studio.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; public final class StudioFormActionBar extends HBox { - private final Button changeButton = createButton(I18n.FORM_ACTION_CHANGE); - private final Button applyButton = createButton(I18n.FORM_ACTION_APPLY); - private final Button resetButton = createButton(I18n.FORM_ACTION_RESET); - private final Button cancelButton = createButton(I18n.FORM_ACTION_CANCEL); + private final Button changeButton; + private final Button applyButton; + private final Button resetButton; + private final Button cancelButton; public StudioFormActionBar( + I18nService i18n, Runnable onChange, Runnable onApply, Runnable onReset, Runnable onCancel) { + changeButton = createButton(i18n, I18n.FORM_ACTION_CHANGE); + applyButton = createButton(i18n, I18n.FORM_ACTION_APPLY); + resetButton = createButton(i18n, I18n.FORM_ACTION_RESET); + cancelButton = createButton(i18n, I18n.FORM_ACTION_CANCEL); setSpacing(8); getStyleClass().add("studio-form-actions"); changeButton.getStyleClass().add("studio-button-secondary"); @@ -44,9 +49,9 @@ public final class StudioFormActionBar extends HBox { resetButton.setDisable(!dirty); } - private Button createButton(I18n label) { + private Button createButton(I18nService i18n, I18n label) { final Button button = new Button(); - button.textProperty().bind(Container.i18n().bind(label)); + button.textProperty().bind(i18n.bind(label)); button.getStyleClass().add("studio-button"); return button; } diff --git a/prometeu-studio/src/main/java/p/studio/controls/forms/StudioFormEditScopeChangedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioFormEditScopeChangedEvent.java similarity index 59% rename from prometeu-studio/src/main/java/p/studio/controls/forms/StudioFormEditScopeChangedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioFormEditScopeChangedEvent.java index ee09a093..149e652f 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/forms/StudioFormEditScopeChangedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioFormEditScopeChangedEvent.java @@ -1,6 +1,6 @@ -package p.studio.controls.forms; +package p.studio.ui.javafx.controls.forms; -import p.studio.lsp.events.StudioEvent; +import p.studio.ui.javafx.events.StudioEvent; public record StudioFormEditScopeChangedEvent( String scopeKey, diff --git a/prometeu-studio/src/main/java/p/studio/controls/forms/StudioFormMode.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioFormMode.java similarity index 57% rename from prometeu-studio/src/main/java/p/studio/controls/forms/StudioFormMode.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioFormMode.java index 0f2f8414..3a2412f0 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/forms/StudioFormMode.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioFormMode.java @@ -1,4 +1,4 @@ -package p.studio.controls.forms; +package p.studio.ui.javafx.controls.forms; public enum StudioFormMode { READ_ONLY, diff --git a/prometeu-studio/src/main/java/p/studio/controls/forms/StudioFormSection.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioFormSection.java similarity index 92% rename from prometeu-studio/src/main/java/p/studio/controls/forms/StudioFormSection.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioFormSection.java index 3e8f3396..26a8172c 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/forms/StudioFormSection.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioFormSection.java @@ -1,4 +1,4 @@ -package p.studio.controls.forms; +package p.studio.ui.javafx.controls.forms; import javafx.application.Platform; import javafx.scene.Node; @@ -6,22 +6,21 @@ import javafx.scene.Parent; import javafx.scene.control.ScrollPane; import javafx.scene.layout.Priority; import javafx.scene.layout.VBox; -import p.studio.lsp.events.StudioWorkspaceEventBus; +import p.studio.ui.javafx.events.StudioWorkspaceEventBus; +import p.studio.ui.javafx.utilities.i18n.I18nService; import java.util.Objects; public abstract class StudioFormSection extends StudioSection { - private final StudioFormActionBar actionBar = new StudioFormActionBar( - this::handleBeginEdit, - this::handleApply, - this::handleReset, - this::handleCancel); + private final StudioFormActionBar actionBar; private final VBox contentHost = new VBox(); private boolean editAllowed = true; private VBox mountedSection; - protected StudioFormSection() { + protected StudioFormSection(I18nService i18n) { super(); + actionBar = new StudioFormActionBar(i18n, this::handleBeginEdit, this::handleApply, + this::handleReset, this::handleCancel); actionBar.getStyleClass().add("studio-form-section-actions"); contentHost.setFillWidth(true); VBox.setVgrow(contentHost, Priority.ALWAYS); diff --git a/prometeu-studio/src/main/java/p/studio/controls/forms/StudioFormSession.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioFormSession.java similarity index 96% rename from prometeu-studio/src/main/java/p/studio/controls/forms/StudioFormSession.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioFormSession.java index 320f626d..19200962 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/forms/StudioFormSession.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioFormSession.java @@ -1,4 +1,4 @@ -package p.studio.controls.forms; +package p.studio.ui.javafx.controls.forms; import java.util.Objects; import java.util.function.UnaryOperator; diff --git a/prometeu-studio/src/main/java/p/studio/controls/forms/StudioSection.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioSection.java similarity index 90% rename from prometeu-studio/src/main/java/p/studio/controls/forms/StudioSection.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioSection.java index 92321938..18def95d 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/forms/StudioSection.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/forms/StudioSection.java @@ -1,4 +1,4 @@ -package p.studio.controls.forms; +package p.studio.ui.javafx.controls.forms; import javafx.scene.Node; import javafx.scene.control.Label; @@ -6,8 +6,8 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; -import p.studio.controls.lifecycle.StudioControlLifecycle; -import p.studio.controls.lifecycle.StudioControlLifecycleSupport; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycle; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycleSupport; public abstract class StudioSection extends VBox implements StudioControlLifecycle { protected StudioSection() { diff --git a/prometeu-studio/src/main/java/p/studio/controls/lifecycle/StudioControlLifecycle.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/lifecycle/StudioControlLifecycle.java similarity index 72% rename from prometeu-studio/src/main/java/p/studio/controls/lifecycle/StudioControlLifecycle.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/lifecycle/StudioControlLifecycle.java index 8042902f..ed288967 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/lifecycle/StudioControlLifecycle.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/lifecycle/StudioControlLifecycle.java @@ -1,4 +1,4 @@ -package p.studio.controls.lifecycle; +package p.studio.ui.javafx.controls.lifecycle; public interface StudioControlLifecycle { default void subscribe() { diff --git a/prometeu-studio/src/main/java/p/studio/controls/lifecycle/StudioControlLifecycleSupport.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/lifecycle/StudioControlLifecycleSupport.java similarity index 95% rename from prometeu-studio/src/main/java/p/studio/controls/lifecycle/StudioControlLifecycleSupport.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/lifecycle/StudioControlLifecycleSupport.java index 8ad685dd..57420c89 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/lifecycle/StudioControlLifecycleSupport.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/lifecycle/StudioControlLifecycleSupport.java @@ -1,4 +1,4 @@ -package p.studio.controls.lifecycle; +package p.studio.ui.javafx.controls.lifecycle; import javafx.scene.Node; import javafx.scene.Scene; diff --git a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioActivityEntry.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioActivityEntry.java similarity index 92% rename from prometeu-studio/src/main/java/p/studio/controls/shell/StudioActivityEntry.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioActivityEntry.java index cf2777bd..2cf9e88f 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioActivityEntry.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioActivityEntry.java @@ -1,4 +1,4 @@ -package p.studio.controls.shell; +package p.studio.ui.javafx.controls.shell; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioActivityEntrySeverity.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioActivityEntrySeverity.java similarity index 67% rename from prometeu-studio/src/main/java/p/studio/controls/shell/StudioActivityEntrySeverity.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioActivityEntrySeverity.java index 3bf40694..a9387e24 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioActivityEntrySeverity.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioActivityEntrySeverity.java @@ -1,4 +1,4 @@ -package p.studio.controls.shell; +package p.studio.ui.javafx.controls.shell; public enum StudioActivityEntrySeverity { INFO, diff --git a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioActivityEventMapper.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioActivityEventMapper.java similarity index 84% rename from prometeu-studio/src/main/java/p/studio/controls/shell/StudioActivityEventMapper.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioActivityEventMapper.java index 7fc2630c..7016e921 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioActivityEventMapper.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioActivityEventMapper.java @@ -1,9 +1,9 @@ -package p.studio.controls.shell; +package p.studio.ui.javafx.controls.shell; -import p.studio.lsp.events.*; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshFailedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshStartedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshedEvent; +import p.studio.ui.javafx.events.*; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshFailedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshStartedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshedEvent; import java.util.Optional; @@ -28,7 +28,7 @@ public final class StudioActivityEventMapper { case StudioAssetsWorkspaceRefreshFailedEvent failed -> Optional.of(new StudioActivityEntry("Assets", failed.message(), StudioActivityEntrySeverity.ERROR, true)); case StudioPackerOperationEvent packerEvent -> - Optional.of(new StudioActivityEntry("Assets", packerEvent.summary(), severity(packerEvent), packerEvent.kind() == p.packer.events.PackerEventKind.ACTION_FAILED)); + Optional.of(new StudioActivityEntry("Assets", packerEvent.summary(), severity(packerEvent), packerEvent.kind() == StudioPackerOperationKind.ACTION_FAILED)); case StudioExecutionLifecycleEvent executionEvent -> Optional.of(new StudioActivityEntry(executionEvent.source(), executionEvent.message(), executionEvent.severity(), executionEvent.sticky())); default -> Optional.empty(); diff --git a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioActivityFeedControl.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioActivityFeedControl.java similarity index 80% rename from prometeu-studio/src/main/java/p/studio/controls/shell/StudioActivityFeedControl.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioActivityFeedControl.java index dd927770..3ddfe665 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioActivityFeedControl.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioActivityFeedControl.java @@ -1,4 +1,4 @@ -package p.studio.controls.shell; +package p.studio.ui.javafx.controls.shell; import javafx.application.Platform; import javafx.collections.FXCollections; @@ -10,16 +10,17 @@ import javafx.scene.control.ListCell; import javafx.scene.control.ListView; import javafx.scene.control.ProgressBar; import javafx.scene.layout.VBox; -import p.studio.Container; -import p.studio.controls.lifecycle.StudioControlLifecycle; -import p.studio.controls.lifecycle.StudioControlLifecycleSupport; -import p.studio.lsp.events.*; -import p.studio.projects.ProjectReference; -import p.studio.utilities.events.EventSubscription; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshFailedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshStartedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshedEvent; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycle; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycleSupport; +import p.studio.ui.javafx.events.*; +import p.studio.api.project.ProjectReference; +import p.studio.api.preferences.ProjectActivityHistoryStore; +import p.studio.ui.javafx.events.StudioEventSubscription; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshFailedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshStartedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshedEvent; import java.util.ArrayList; import java.util.List; @@ -28,25 +29,31 @@ import java.util.Objects; public final class StudioActivityFeedControl extends VBox implements StudioControlLifecycle { private final ProjectReference projectReference; private final StudioActivityStorageService storageService; + private final I18nService i18n; + private final StudioEventBus eventBus; private final ObservableList entries = FXCollections.observableArrayList(); - private final List subscriptions = new ArrayList<>(); + private final List subscriptions = new ArrayList<>(); private final Label progressLabel = new Label(); private final ProgressBar progressBar = new ProgressBar(); private final ListView listView = new ListView<>(entries); - public StudioActivityFeedControl(ProjectReference projectReference) { - this(projectReference, new StudioActivityStorageService()); + public StudioActivityFeedControl(ProjectReference projectReference, ProjectActivityHistoryStore historyStore, + I18nService i18n, StudioEventBus eventBus) { + this(projectReference, new StudioActivityStorageService(historyStore), i18n, eventBus); } - StudioActivityFeedControl(ProjectReference projectReference, StudioActivityStorageService storageService) { + StudioActivityFeedControl(ProjectReference projectReference, StudioActivityStorageService storageService, + I18nService i18n, StudioEventBus eventBus) { StudioControlLifecycleSupport.install(this, this); this.projectReference = Objects.requireNonNull(projectReference, "projectReference"); this.storageService = Objects.requireNonNull(storageService, "storageService"); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.eventBus = Objects.requireNonNull(eventBus, "eventBus"); getStyleClass().add("studio-activity-feed"); setSpacing(10); setPadding(new Insets(12)); - progressLabel.setText(Container.i18n().text(I18n.ACTIVITY_PROGRESS_IDLE)); + progressLabel.setText(i18n.text(I18n.ACTIVITY_PROGRESS_IDLE)); progressLabel.getStyleClass().add("studio-activity-progress-label"); progressBar.getStyleClass().add("studio-activity-progress-bar"); progressBar.setVisible(false); @@ -64,7 +71,6 @@ public final class StudioActivityFeedControl extends VBox implements StudioContr if (!subscriptions.isEmpty()) { return; } - final StudioEventBus eventBus = Container.eventBus(); subscriptions.add(eventBus.subscribe(StudioProjectOpenedEvent.class, this::onEvent)); subscriptions.add(eventBus.subscribe(StudioProjectLoadingStartedEvent.class, this::onEvent)); subscriptions.add(eventBus.subscribe(StudioProjectLoadingProgressEvent.class, this::onProjectLoadingProgress)); @@ -79,7 +85,7 @@ public final class StudioActivityFeedControl extends VBox implements StudioContr @Override public void unsubscribe() { - subscriptions.forEach(EventSubscription::unsubscribe); + subscriptions.forEach(StudioEventSubscription::unsubscribe); subscriptions.clear(); } @@ -113,7 +119,7 @@ public final class StudioActivityFeedControl extends VBox implements StudioContr private void onAssetsRefreshStarted(StudioAssetsWorkspaceRefreshStartedEvent event) { onEvent(event); Platform.runLater(() -> { - progressLabel.setText(Container.i18n().text(I18n.ACTIVITY_PROGRESS_ASSETS_REFRESH)); + progressLabel.setText(i18n.text(I18n.ACTIVITY_PROGRESS_ASSETS_REFRESH)); progressBar.setVisible(true); progressBar.setManaged(true); progressBar.setProgress(ProgressBar.INDETERMINATE_PROGRESS); @@ -140,15 +146,15 @@ public final class StudioActivityFeedControl extends VBox implements StudioContr progressBar.setProgress(event.indeterminate() ? ProgressBar.INDETERMINATE_PROGRESS : event.progress()); }); } - if (event.kind() == p.packer.events.PackerEventKind.ACTION_APPLIED - || event.kind() == p.packer.events.PackerEventKind.ACTION_FAILED) { + if (event.kind() == StudioPackerOperationKind.ACTION_APPLIED + || event.kind() == StudioPackerOperationKind.ACTION_FAILED) { clearProgress(); } } private void clearProgress() { Platform.runLater(() -> { - progressLabel.setText(Container.i18n().text(I18n.ACTIVITY_PROGRESS_IDLE)); + progressLabel.setText(i18n.text(I18n.ACTIVITY_PROGRESS_IDLE)); progressBar.setVisible(false); progressBar.setManaged(false); }); diff --git a/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioActivityStorageService.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioActivityStorageService.java new file mode 100644 index 00000000..1cb620ec --- /dev/null +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioActivityStorageService.java @@ -0,0 +1,68 @@ +package p.studio.ui.javafx.controls.shell; + +import p.studio.api.preferences.ProjectActivityHistoryStore; +import p.studio.api.preferences.ProjectActivityRecord; +import p.studio.api.project.ProjectReference; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +public final class StudioActivityStorageService { + public static final int MAX_HISTORY = 500; + + private final ProjectActivityHistoryStore store; + + public StudioActivityStorageService(ProjectActivityHistoryStore store) { + this.store = Objects.requireNonNull(store, "store"); + } + + public List load(ProjectReference projectReference) { + final List entries = new ArrayList<>(); + for (ProjectActivityRecord persistedEntry : store.load(projectReference)) { + final StudioActivityEntry mapped = map(persistedEntry); + if (mapped != null) { + entries.add(mapped); + } + } + return bounded(entries); + } + + public void save(ProjectReference projectReference, List entries) { + final List boundedEntries = bounded(entries); + final List persistedEntries = boundedEntries.stream() + .map(entry -> new ProjectActivityRecord( + entry.source(), + entry.message(), + entry.severity().name(), + entry.sticky())) + .toList(); + store.save(projectReference, persistedEntries); + } + + public List bounded(List entries) { + final List normalized = List.copyOf(Objects.requireNonNull(entries, "entries")); + if (normalized.size() <= MAX_HISTORY) { + return normalized; + } + return List.copyOf(normalized.subList(0, MAX_HISTORY)); + } + + private StudioActivityEntry map(ProjectActivityRecord persistedEntry) { + if (persistedEntry == null + || persistedEntry.source() == null + || persistedEntry.message() == null + || persistedEntry.severity() == null) { + return null; + } + try { + return new StudioActivityEntry( + persistedEntry.source(), + persistedEntry.message(), + StudioActivityEntrySeverity.valueOf(persistedEntry.severity().trim()), + persistedEntry.sticky()); + } catch (RuntimeException ignored) { + return null; + } + } +} diff --git a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioRightUtilityPanelControl.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioRightUtilityPanelControl.java similarity index 89% rename from prometeu-studio/src/main/java/p/studio/controls/shell/StudioRightUtilityPanelControl.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioRightUtilityPanelControl.java index c26f2b0b..8b49ffd1 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioRightUtilityPanelControl.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioRightUtilityPanelControl.java @@ -1,4 +1,4 @@ -package p.studio.controls.shell; +package p.studio.ui.javafx.controls.shell; import javafx.beans.value.ObservableValue; import javafx.scene.Node; @@ -7,8 +7,8 @@ import javafx.scene.control.Tab; import javafx.scene.control.TabPane; import javafx.scene.layout.BorderPane; import javafx.scene.layout.VBox; -import p.studio.controls.lifecycle.StudioControlLifecycle; -import p.studio.controls.lifecycle.StudioControlLifecycleSupport; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycle; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycleSupport; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioRunSurfaceControl.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioRunSurfaceControl.java similarity index 72% rename from prometeu-studio/src/main/java/p/studio/controls/shell/StudioRunSurfaceControl.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioRunSurfaceControl.java index 826a644d..f20ab701 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioRunSurfaceControl.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioRunSurfaceControl.java @@ -1,4 +1,4 @@ -package p.studio.controls.shell; +package p.studio.ui.javafx.controls.shell; import javafx.application.Platform; import javafx.beans.binding.Bindings; @@ -9,27 +9,28 @@ import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.layout.HBox; import javafx.scene.layout.StackPane; -import p.studio.Container; -import p.studio.controls.lifecycle.StudioControlLifecycle; -import p.studio.controls.lifecycle.StudioControlLifecycleSupport; -import p.studio.execution.StudioExecutionSessionService; -import p.studio.execution.StudioExecutionSnapshot; -import p.studio.execution.StudioExecutionState; -import p.studio.utilities.events.EventSubscription; -import p.studio.utilities.i18n.I18n; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycle; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycleSupport; +import p.studio.api.execution.ExecutionSession; +import p.studio.api.execution.ExecutionSnapshot; +import p.studio.api.execution.ExecutionState; +import p.studio.api.operation.OperationSubscription; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; public final class StudioRunSurfaceControl extends HBox implements StudioControlLifecycle { private final BooleanProperty running = new SimpleBooleanProperty(false); - private final StudioExecutionSessionService executionSessionService; + private final ExecutionSession executionSessionService; private final Runnable playAction; private final Runnable stopAction; private final Button toggleButton = new Button(); - private EventSubscription sessionSubscription; + private OperationSubscription sessionSubscription; public StudioRunSurfaceControl( - final StudioExecutionSessionService executionSessionService, + final ExecutionSession executionSessionService, final Runnable playAction, - final Runnable stopAction) { + final Runnable stopAction, + final I18nService i18n) { StudioControlLifecycleSupport.install(this, this); this.executionSessionService = executionSessionService; this.playAction = playAction; @@ -48,7 +49,7 @@ public final class StudioRunSurfaceControl extends HBox implements StudioControl final Label text = new Label(); text.getStyleClass().add("studio-run-toggle-text"); text.textProperty().bind(Bindings.createStringBinding( - () -> Container.i18n().text(running.get() ? I18n.TOOLBAR_STOP : I18n.TOOLBAR_PLAY), + () -> i18n.text(running.get() ? I18n.TOOLBAR_STOP : I18n.TOOLBAR_PLAY), running)); final HBox content = new HBox(8, iconShell, text); @@ -83,7 +84,7 @@ public final class StudioRunSurfaceControl extends HBox implements StudioControl sessionSubscription = executionSessionService.subscribe(this::handleSessionUpdate); } - private void handleSessionUpdate(final StudioExecutionSnapshot snapshot) { + private void handleSessionUpdate(final ExecutionSnapshot snapshot) { if (Platform.isFxApplicationThread()) { running.set(isRunningState(snapshot.state())); return; @@ -101,7 +102,7 @@ public final class StudioRunSurfaceControl extends HBox implements StudioControl } private void handleToggleRequested() { - final StudioExecutionState state = executionSessionService.snapshot().state(); + final ExecutionState state = executionSessionService.snapshot().state(); if (isRunningState(state)) { stopAction.run(); return; @@ -109,9 +110,9 @@ public final class StudioRunSurfaceControl extends HBox implements StudioControl playAction.run(); } - private boolean isRunningState(final StudioExecutionState state) { - return state == StudioExecutionState.PREPARING - || state == StudioExecutionState.CONNECTING - || state == StudioExecutionState.RUNNING; + private boolean isRunningState(final ExecutionState state) { + return state == ExecutionState.PREPARING + || state == ExecutionState.CONNECTING + || state == ExecutionState.RUNNING; } } diff --git a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioShellMenuBarControl.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioShellMenuBarControl.java similarity index 52% rename from prometeu-studio/src/main/java/p/studio/controls/shell/StudioShellMenuBarControl.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioShellMenuBarControl.java index eb92f254..45d5bdb9 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioShellMenuBarControl.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioShellMenuBarControl.java @@ -1,42 +1,42 @@ -package p.studio.controls.shell; +package p.studio.ui.javafx.controls.shell; import javafx.scene.control.Menu; import javafx.scene.control.MenuItem; -import p.studio.Container; -import p.studio.controls.lifecycle.StudioControlLifecycle; -import p.studio.controls.lifecycle.StudioControlLifecycleSupport; -import p.studio.utilities.i18n.I18n; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycle; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycleSupport; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; public final class StudioShellMenuBarControl extends javafx.scene.control.MenuBar implements StudioControlLifecycle { - public StudioShellMenuBarControl() { + public StudioShellMenuBarControl(I18nService i18n) { StudioControlLifecycleSupport.install(this, this); getStyleClass().add("studio-shell-menu-bar"); final Menu fileMenu = new Menu(); - fileMenu.textProperty().bind(Container.i18n().bind(I18n.MENU_FILE)); + fileMenu.textProperty().bind(i18n.bind(I18n.MENU_FILE)); final MenuItem newProjectItem = new MenuItem(); - newProjectItem.textProperty().bind(Container.i18n().bind(I18n.MENU_FILE_NEWPROJECT)); + newProjectItem.textProperty().bind(i18n.bind(I18n.MENU_FILE_NEWPROJECT)); newProjectItem.setOnAction(ignored -> { }); final MenuItem openItem = new MenuItem(); - openItem.textProperty().bind(Container.i18n().bind(I18n.MENU_FILE_OPEN)); + openItem.textProperty().bind(i18n.bind(I18n.MENU_FILE_OPEN)); openItem.setOnAction(ignored -> { }); final MenuItem saveItem = new MenuItem(); - saveItem.textProperty().bind(Container.i18n().bind(I18n.MENU_FILE_SAVE)); + saveItem.textProperty().bind(i18n.bind(I18n.MENU_FILE_SAVE)); saveItem.setOnAction(ignored -> { }); fileMenu.getItems().addAll(newProjectItem, openItem, saveItem); final Menu editMenu = new Menu(); - editMenu.textProperty().bind(Container.i18n().bind(I18n.MENU_EDIT)); + editMenu.textProperty().bind(i18n.bind(I18n.MENU_EDIT)); final Menu viewMenu = new Menu(); - viewMenu.textProperty().bind(Container.i18n().bind(I18n.MENU_VIEW)); + viewMenu.textProperty().bind(i18n.bind(I18n.MENU_VIEW)); final Menu helpMenu = new Menu(); - helpMenu.textProperty().bind(Container.i18n().bind(I18n.MENU_HELP)); + helpMenu.textProperty().bind(i18n.bind(I18n.MENU_HELP)); getMenus().setAll(fileMenu, editMenu, viewMenu, helpMenu); } diff --git a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioShellTopBarControl.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioShellTopBarControl.java similarity index 65% rename from prometeu-studio/src/main/java/p/studio/controls/shell/StudioShellTopBarControl.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioShellTopBarControl.java index b5cf3cea..335fd96a 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioShellTopBarControl.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioShellTopBarControl.java @@ -1,9 +1,9 @@ -package p.studio.controls.shell; +package p.studio.ui.javafx.controls.shell; import javafx.scene.Node; import javafx.scene.layout.BorderPane; -import p.studio.controls.lifecycle.StudioControlLifecycle; -import p.studio.controls.lifecycle.StudioControlLifecycleSupport; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycle; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycleSupport; public final class StudioShellTopBarControl extends BorderPane implements StudioControlLifecycle { public StudioShellTopBarControl(Node menuBar) { diff --git a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioWorkspaceRailControl.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioWorkspaceRailControl.java similarity index 91% rename from prometeu-studio/src/main/java/p/studio/controls/shell/StudioWorkspaceRailControl.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioWorkspaceRailControl.java index b62e033a..1cc11268 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioWorkspaceRailControl.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioWorkspaceRailControl.java @@ -1,12 +1,12 @@ -package p.studio.controls.shell; +package p.studio.ui.javafx.controls.shell; import javafx.geometry.Insets; import javafx.scene.control.ToggleButton; import javafx.scene.control.ToggleGroup; import javafx.scene.control.Tooltip; import javafx.scene.layout.VBox; -import p.studio.controls.lifecycle.StudioControlLifecycle; -import p.studio.controls.lifecycle.StudioControlLifecycleSupport; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycle; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycleSupport; import java.util.Collection; import java.util.HashMap; diff --git a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioWorkspaceRailItem.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioWorkspaceRailItem.java similarity index 79% rename from prometeu-studio/src/main/java/p/studio/controls/shell/StudioWorkspaceRailItem.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioWorkspaceRailItem.java index bf457054..38ae47a7 100644 --- a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioWorkspaceRailItem.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/controls/shell/StudioWorkspaceRailItem.java @@ -1,4 +1,4 @@ -package p.studio.controls.shell; +package p.studio.ui.javafx.controls.shell; import javafx.beans.value.ObservableValue; diff --git a/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioEvent.java new file mode 100644 index 00000000..d7f3d319 --- /dev/null +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioEvent.java @@ -0,0 +1,4 @@ +package p.studio.ui.javafx.events; + +public interface StudioEvent { +} diff --git a/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioEventBus.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioEventBus.java new file mode 100644 index 00000000..a4ccdd73 --- /dev/null +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioEventBus.java @@ -0,0 +1,18 @@ +package p.studio.ui.javafx.events; + +import java.util.function.Consumer; + +public final class StudioEventBus { + private final StudioTypedEventBus delegate = new StudioTypedEventBus(); + + public StudioEventBus() { + } + + public StudioEventSubscription subscribe(Class eventType, Consumer consumer) { + return delegate.subscribe(eventType, consumer); + } + + public void publish(StudioEvent event) { + delegate.publish(event); + } +} diff --git a/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioEventSubscription.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioEventSubscription.java new file mode 100644 index 00000000..8fb2552c --- /dev/null +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioEventSubscription.java @@ -0,0 +1,11 @@ +package p.studio.ui.javafx.events; + +@FunctionalInterface +public interface StudioEventSubscription extends AutoCloseable { + void unsubscribe(); + + @Override + default void close() { + unsubscribe(); + } +} diff --git a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioExecutionLifecycleEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioExecutionLifecycleEvent.java similarity index 64% rename from prometeu-studio/src/main/java/p/studio/lsp/events/StudioExecutionLifecycleEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioExecutionLifecycleEvent.java index a89b516f..7be0c3e4 100644 --- a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioExecutionLifecycleEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioExecutionLifecycleEvent.java @@ -1,6 +1,6 @@ -package p.studio.lsp.events; +package p.studio.ui.javafx.events; -import p.studio.controls.shell.StudioActivityEntrySeverity; +import p.studio.ui.javafx.controls.shell.StudioActivityEntrySeverity; public record StudioExecutionLifecycleEvent( String source, diff --git a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioPackerOperationEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioPackerOperationEvent.java similarity index 89% rename from prometeu-studio/src/main/java/p/studio/lsp/events/StudioPackerOperationEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioPackerOperationEvent.java index 6b2cd1ec..5f555be9 100644 --- a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioPackerOperationEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioPackerOperationEvent.java @@ -1,12 +1,10 @@ -package p.studio.lsp.events; - -import p.packer.events.PackerEventKind; +package p.studio.ui.javafx.events; import java.util.Objects; public record StudioPackerOperationEvent( String operationId, - PackerEventKind kind, + StudioPackerOperationKind kind, String summary, Double progress, boolean indeterminate) implements StudioEvent { diff --git a/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioPackerOperationKind.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioPackerOperationKind.java new file mode 100644 index 00000000..4313da32 --- /dev/null +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioPackerOperationKind.java @@ -0,0 +1,8 @@ +package p.studio.ui.javafx.events; + +public enum StudioPackerOperationKind { + ASSET_DISCOVERED, + DIAGNOSTICS_UPDATED, + ACTION_APPLIED, + ACTION_FAILED +} diff --git a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectCreatedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectCreatedEvent.java similarity index 66% rename from prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectCreatedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectCreatedEvent.java index 68b750e4..1364157d 100644 --- a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectCreatedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectCreatedEvent.java @@ -1,4 +1,4 @@ -package p.studio.lsp.events; +package p.studio.ui.javafx.events; public record StudioProjectCreatedEvent() implements StudioEvent { } diff --git a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectLoadingCompletedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectLoadingCompletedEvent.java similarity index 69% rename from prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectLoadingCompletedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectLoadingCompletedEvent.java index bb65d652..ca32f17c 100644 --- a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectLoadingCompletedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectLoadingCompletedEvent.java @@ -1,4 +1,4 @@ -package p.studio.lsp.events; +package p.studio.ui.javafx.events; public record StudioProjectLoadingCompletedEvent() implements StudioEvent { } diff --git a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectLoadingFailedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectLoadingFailedEvent.java similarity index 90% rename from prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectLoadingFailedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectLoadingFailedEvent.java index 57a0f062..99e98e98 100644 --- a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectLoadingFailedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectLoadingFailedEvent.java @@ -1,4 +1,4 @@ -package p.studio.lsp.events; +package p.studio.ui.javafx.events; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectLoadingPhase.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectLoadingPhase.java similarity index 81% rename from prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectLoadingPhase.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectLoadingPhase.java index c123051d..41775bf8 100644 --- a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectLoadingPhase.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectLoadingPhase.java @@ -1,4 +1,4 @@ -package p.studio.lsp.events; +package p.studio.ui.javafx.events; public enum StudioProjectLoadingPhase { RESOLVING_PROJECT, diff --git a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectLoadingProgressEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectLoadingProgressEvent.java similarity index 94% rename from prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectLoadingProgressEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectLoadingProgressEvent.java index 226a0784..314ccb60 100644 --- a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectLoadingProgressEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectLoadingProgressEvent.java @@ -1,4 +1,4 @@ -package p.studio.lsp.events; +package p.studio.ui.javafx.events; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectLoadingStartedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectLoadingStartedEvent.java similarity index 68% rename from prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectLoadingStartedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectLoadingStartedEvent.java index b5c0ebd7..39a10ec0 100644 --- a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectLoadingStartedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectLoadingStartedEvent.java @@ -1,4 +1,4 @@ -package p.studio.lsp.events; +package p.studio.ui.javafx.events; public record StudioProjectLoadingStartedEvent() implements StudioEvent { } diff --git a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectOpenedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectOpenedEvent.java similarity index 66% rename from prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectOpenedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectOpenedEvent.java index 641628bf..9b457fa7 100644 --- a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioProjectOpenedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioProjectOpenedEvent.java @@ -1,4 +1,4 @@ -package p.studio.lsp.events; +package p.studio.ui.javafx.events; public record StudioProjectOpenedEvent() implements StudioEvent { } diff --git a/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioTypedEventBus.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioTypedEventBus.java new file mode 100644 index 00000000..669db734 --- /dev/null +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioTypedEventBus.java @@ -0,0 +1,50 @@ +package p.studio.ui.javafx.events; + +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Consumer; + +final class StudioTypedEventBus { + private final AtomicLong nextSubscriptionId = new AtomicLong(1L); + private final ConcurrentMap, ConcurrentMap>> subscriptionsByType = + new ConcurrentHashMap<>(); + + StudioEventSubscription subscribe( + Class eventType, + Consumer consumer) { + Objects.requireNonNull(eventType, "eventType"); + Objects.requireNonNull(consumer, "consumer"); + + final long subscriptionId = nextSubscriptionId.getAndIncrement(); + final Consumer erasedConsumer = event -> consumer.accept(eventType.cast(event)); + final ConcurrentMap> subscriptions = + subscriptionsByType.computeIfAbsent(eventType, ignored -> new ConcurrentHashMap<>()); + subscriptions.put(subscriptionId, erasedConsumer); + + final AtomicBoolean active = new AtomicBoolean(true); + return () -> { + if (!active.compareAndSet(true, false)) { + return; + } + final ConcurrentMap> currentSubscriptions = subscriptionsByType.get(eventType); + if (currentSubscriptions == null) { + return; + } + currentSubscriptions.remove(subscriptionId); + if (currentSubscriptions.isEmpty()) { + subscriptionsByType.remove(eventType, currentSubscriptions); + } + }; + } + + void publish(StudioEvent event) { + Objects.requireNonNull(event, "event"); + final ConcurrentMap> subscriptions = subscriptionsByType.get(event.getClass()); + if (subscriptions != null) { + subscriptions.values().forEach(consumer -> consumer.accept(event)); + } + } +} diff --git a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioWorkspaceEventBus.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioWorkspaceEventBus.java similarity index 65% rename from prometeu-studio/src/main/java/p/studio/lsp/events/StudioWorkspaceEventBus.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioWorkspaceEventBus.java index 078c1e3a..c3f47697 100644 --- a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioWorkspaceEventBus.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioWorkspaceEventBus.java @@ -1,8 +1,6 @@ -package p.studio.lsp.events; +package p.studio.ui.javafx.events; -import p.studio.utilities.events.EventSubscription; -import p.studio.utilities.events.TypedEventBus; -import p.studio.workspaces.WorkspaceId; +import p.studio.ui.javafx.workspaces.WorkspaceId; import java.util.Objects; import java.util.function.Consumer; @@ -10,19 +8,19 @@ import java.util.function.Consumer; public final class StudioWorkspaceEventBus { private final WorkspaceId workspaceId; private final StudioEventBus globalBus; - private final TypedEventBus localBus; + private final StudioTypedEventBus localBus; public StudioWorkspaceEventBus(WorkspaceId workspaceId, StudioEventBus globalBus) { this.workspaceId = Objects.requireNonNull(workspaceId, "workspaceId"); this.globalBus = Objects.requireNonNull(globalBus, "globalBus"); - this.localBus = new TypedEventBus(); + this.localBus = new StudioTypedEventBus(); } public WorkspaceId workspaceId() { return workspaceId; } - public EventSubscription subscribe(Class eventType, Consumer consumer) { + public StudioEventSubscription subscribe(Class eventType, Consumer consumer) { return localBus.subscribe(eventType, consumer); } diff --git a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioWorkspaceSelectedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioWorkspaceSelectedEvent.java similarity index 53% rename from prometeu-studio/src/main/java/p/studio/lsp/events/StudioWorkspaceSelectedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioWorkspaceSelectedEvent.java index 2bbf6afd..b78da7a7 100644 --- a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioWorkspaceSelectedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/events/StudioWorkspaceSelectedEvent.java @@ -1,6 +1,6 @@ -package p.studio.lsp.events; +package p.studio.ui.javafx.events; -import p.studio.workspaces.WorkspaceId; +import p.studio.ui.javafx.workspaces.WorkspaceId; public record StudioWorkspaceSelectedEvent(WorkspaceId workspaceId) implements StudioEvent { } diff --git a/prometeu-studio/src/main/java/p/studio/utilities/ThemeService.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/utilities/ThemeService.java similarity index 97% rename from prometeu-studio/src/main/java/p/studio/utilities/ThemeService.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/utilities/ThemeService.java index 2d77fd9a..0648f7ef 100644 --- a/prometeu-studio/src/main/java/p/studio/utilities/ThemeService.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/utilities/ThemeService.java @@ -1,4 +1,4 @@ -package p.studio.utilities; +package p.studio.ui.javafx.utilities; import javafx.scene.text.Font; diff --git a/prometeu-studio/src/main/java/p/studio/utilities/i18n/I18n.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/utilities/i18n/I18n.java similarity index 99% rename from prometeu-studio/src/main/java/p/studio/utilities/i18n/I18n.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/utilities/i18n/I18n.java index b423f17b..a067142e 100644 --- a/prometeu-studio/src/main/java/p/studio/utilities/i18n/I18n.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/utilities/i18n/I18n.java @@ -1,4 +1,4 @@ -package p.studio.utilities.i18n; +package p.studio.ui.javafx.utilities.i18n; import lombok.Getter; diff --git a/prometeu-studio/src/main/java/p/studio/utilities/i18n/I18nService.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/utilities/i18n/I18nService.java similarity index 96% rename from prometeu-studio/src/main/java/p/studio/utilities/i18n/I18nService.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/utilities/i18n/I18nService.java index 288287cd..67f5a8ef 100644 --- a/prometeu-studio/src/main/java/p/studio/utilities/i18n/I18nService.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/utilities/i18n/I18nService.java @@ -1,4 +1,4 @@ -package p.studio.utilities.i18n; +package p.studio.ui.javafx.utilities.i18n; import javafx.beans.binding.Bindings; import javafx.beans.binding.StringBinding; diff --git a/prometeu-studio/src/main/java/p/studio/utilities/logspane/LogsPane.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/utilities/logspane/LogsPane.java similarity index 91% rename from prometeu-studio/src/main/java/p/studio/utilities/logspane/LogsPane.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/utilities/logspane/LogsPane.java index 27d7b91e..ac43c68d 100644 --- a/prometeu-studio/src/main/java/p/studio/utilities/logspane/LogsPane.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/utilities/logspane/LogsPane.java @@ -1,12 +1,12 @@ -package p.studio.utilities.logspane; +package p.studio.ui.javafx.utilities.logspane; import javafx.application.Platform; import javafx.beans.value.ObservableValue; import javafx.scene.control.TextArea; import javafx.scene.control.TitledPane; -import p.studio.controls.WorkspaceDockPane; -import p.studio.controls.lifecycle.StudioControlLifecycle; -import p.studio.controls.lifecycle.StudioControlLifecycleSupport; +import p.studio.ui.javafx.controls.WorkspaceDockPane; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycle; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycleSupport; import java.util.Objects; diff --git a/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/MainView.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/MainView.java new file mode 100644 index 00000000..f4f3780e --- /dev/null +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/MainView.java @@ -0,0 +1,174 @@ +package p.studio.ui.javafx.window; + +import javafx.scene.layout.BorderPane; +import p.studio.api.assets.AssetCatalog; +import p.studio.api.assets.AssetCommands; +import p.studio.api.assets.AssetPacking; +import p.studio.api.assets.AssetDetails; +import p.studio.api.assets.AssetCreationCatalog; +import p.studio.api.assets.AssetWorkspaceStorage; +import p.studio.api.assets.AssetCapacityPolicy; +import p.studio.api.assets.schema.AssetColorSchemaFactory; +import p.studio.api.assets.bank.AssetBankCompositionSessionFactory; +import p.studio.api.assets.metadata.AssetMetadataService; +import p.studio.api.assets.scene.SceneBankWorkflow; +import p.studio.api.assets.tiled.TiledAssetService; +import p.studio.ui.javafx.controls.shell.*; +import p.studio.api.execution.ExecutionController; +import p.studio.api.execution.ExecutionControllerFactory; +import p.studio.api.project.ProjectLocalStudioSetup; +import p.studio.ui.javafx.events.StudioWorkspaceSelectedEvent; +import p.studio.api.project.ProjectLocalStudioState; +import p.studio.api.project.ProjectReference; +import p.studio.api.preferences.ProjectActivityHistoryStore; +import p.studio.api.shipper.Shipper; +import p.studio.api.session.ProjectSession; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.ui.javafx.events.StudioEventBus; +import p.studio.ui.javafx.workspaces.WorkspaceHost; +import p.studio.ui.javafx.workspaces.WorkspaceId; +import p.studio.ui.javafx.workspaces.assets.AssetWorkspace; +import p.studio.ui.javafx.workspaces.builder.ShipperWorkspace; +import p.studio.ui.javafx.workspaces.debug.DebugWorkspace; + +import java.util.List; + +public final class MainView extends BorderPane { + private final WorkspaceHost host = new WorkspaceHost(); + private final ProjectReference projectReference; + private final ProjectSession projectSession; + private final AssetWorkspace assetWorkspace; + private final StudioEventBus eventBus; + private final StudioWorkspaceRailControl workspaceRail; + private final ExecutionController playStopCoordinator; + private boolean initializing; + private boolean workspaceLifecycleInitialized; + + public MainView(final ProjectSession projectSession, final Shipper shipper, + final ExecutionControllerFactory executionControllerFactory, + final I18nService i18n, + final StudioEventBus eventBus, + final java.util.concurrent.Executor executor, + final p.studio.ui.javafx.utilities.ThemeService theme, + final AssetCatalog assetCatalog, + final AssetCommands assetCommands, + final AssetPacking assetPacking, + final AssetDetails assetDetails, + final AssetCreationCatalog assetCreationCatalog, + final AssetMetadataService assetMetadataService, + final AssetWorkspaceStorage assetWorkspaceStorage, + final AssetCapacityPolicy assetCapacityPolicy, + final AssetBankCompositionSessionFactory bankCompositionSessionFactory, + final AssetColorSchemaFactory assetColorSchemaFactory, + final TiledAssetService tiledAssetService, + final SceneBankWorkflow sceneBankWorkflow, + final ProjectActivityHistoryStore activityHistoryStore) { + initializing = true; + this.eventBus = eventBus; + this.projectSession = projectSession; + this.projectReference = projectSession.projectReference(); + final ProjectLocalStudioState persistedState = projectSession.projectLocalStudioState(); + final ProjectLocalStudioSetup projectSetup = projectSession.projectLocalStudioSetup(); + final var menuBar = new StudioShellMenuBarControl(i18n); + playStopCoordinator = executionControllerFactory.create( + projectReference, + projectSetup, + projectSession.executionSession()); + final var runSurface = new StudioRunSurfaceControl( + projectSession.executionSession(), + () -> { + selectWorkspace(WorkspaceId.DEBUG); + playStopCoordinator.play(); + }, + playStopCoordinator::stop, + i18n); + setTop(new StudioShellTopBarControl(menuBar)); + + assetWorkspace = new AssetWorkspace(projectReference, eventBus, i18n, executor, theme, + assetCatalog, assetCommands, assetPacking, assetDetails, assetCreationCatalog, assetMetadataService, + assetWorkspaceStorage, assetCapacityPolicy, bankCompositionSessionFactory, assetColorSchemaFactory, + tiledAssetService, sceneBankWorkflow); + host.register(assetWorkspace); + assetWorkspace.restoreProjectLocalState(persistedState); + assetWorkspace.setStateChangedAction(this::persistProjectLocalState); + host.register(new DebugWorkspace(projectReference, projectSession.executionSession(), i18n, eventBus)); + host.register(new ShipperWorkspace(projectReference, shipper, i18n, eventBus)); + + workspaceRail = new StudioWorkspaceRailControl<>( + List.of( + new StudioWorkspaceRailItem<>(WorkspaceId.ASSETS, "📦", i18n.bind(I18n.WORKSPACE_ASSETS)), + new StudioWorkspaceRailItem<>(WorkspaceId.DEBUG, "🎮", i18n.bind(I18n.WORKSPACE_DEBUG)), + new StudioWorkspaceRailItem<>(WorkspaceId.SHIPPER, "⚙️", i18n.bind(I18n.WORKSPACE_SHIPPER)) + ), + this::loadWorkspace); + setLeft(workspaceRail); + setCenter(host); + setRight(new StudioRightUtilityPanelControl( + runSurface, + i18n.bind(I18n.SHELL_ACTIVITY), + new StudioActivityFeedControl(projectReference, activityHistoryStore, i18n, eventBus))); + + final WorkspaceId initialWorkspace = restoreInitialWorkspace(persistedState.openShellState()); + workspaceRail.select(initialWorkspace); + loadWorkspace(initialWorkspace); + workspaceLifecycleInitialized = true; + initializing = false; + } + + public ProjectReference projectReference() { + return projectReference; + } + + public ProjectSession projectSession() { + return projectSession; + } + + public void persistProjectLocalState() { + if (initializing) { + return; + } + final WorkspaceId selectedWorkspace = host.getCurrentWorkspaceId() == null ? WorkspaceId.ASSETS : host.getCurrentWorkspaceId(); + final ProjectLocalStudioState current = projectSession.projectLocalStudioState(); + projectSession.replaceProjectLocalStudioState( + current.withOpenShellState(new ProjectLocalStudioState.OpenShellState(selectedWorkspace.name())) + .withShellLayout(new ProjectLocalStudioState.ShellLayout( + assetWorkspace.captureLayoutState()))); + } + + public void reapplyProjectLocalLayout() { + assetWorkspace.reapplyPendingLayoutState(); + } + + public void close() { + playStopCoordinator.shutdown(); + persistProjectLocalState(); + host.deactivateCurrentWorkspace(); + } + + private void loadWorkspace(WorkspaceId workspaceId) { + host.change(workspaceId); + if (workspaceLifecycleInitialized) { + persistProjectLocalState(); + projectSession.saveProjectLocalStudioState(); + } + eventBus.publish(new StudioWorkspaceSelectedEvent(workspaceId)); + } + + private void selectWorkspace(final WorkspaceId workspaceId) { + workspaceRail.select(workspaceId); + loadWorkspace(workspaceId); + } + + private WorkspaceId restoreInitialWorkspace(final ProjectLocalStudioState.OpenShellState openShellState) { + if (openShellState.selectedWorkspaceId() == null) { + return WorkspaceId.ASSETS; + } + try { + return WorkspaceId.valueOf(openShellState.selectedWorkspaceId()); + } catch (IllegalArgumentException ignored) { + return WorkspaceId.ASSETS; + } + } + +} diff --git a/prometeu-studio/src/main/java/p/studio/window/NewProjectWizard.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/NewProjectWizard.java similarity index 72% rename from prometeu-studio/src/main/java/p/studio/window/NewProjectWizard.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/NewProjectWizard.java index c8667f32..879ce314 100644 --- a/prometeu-studio/src/main/java/p/studio/window/NewProjectWizard.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/NewProjectWizard.java @@ -1,4 +1,4 @@ -package p.studio.window; +package p.studio.ui.javafx.window; import javafx.geometry.Insets; import javafx.geometry.Pos; @@ -14,10 +14,15 @@ 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; +import p.studio.api.project.ProjectTarget; +import p.studio.api.project.ProjectCreationRequest; +import p.studio.api.project.ProjectCatalog; +import p.studio.api.project.ProjectLanguageCatalog; +import p.studio.api.project.ProjectLanguageTemplate; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.ThemeService; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; import java.io.File; import java.nio.file.Path; @@ -25,8 +30,10 @@ import java.util.*; import java.util.concurrent.atomic.AtomicReference; public final class NewProjectWizard { - private final ProjectCatalogService projectCatalogService; - private final ProjectLanguageCatalogService projectLanguageCatalogService; + private final ProjectCatalog projectCatalogService; + private final ProjectLanguageCatalog projectLanguageCatalogService; + private final I18nService i18n; + private final ThemeService theme; private final Stage stage; private final AtomicReference result = new AtomicReference<>(); private final Label stepTitle = new Label(); @@ -46,19 +53,26 @@ public final class NewProjectWizard { private final Map languageTemplatesById = new LinkedHashMap<>(); private int stepIndex = 0; - private NewProjectWizard(Window owner, ProjectCatalogService projectCatalogService) { + private NewProjectWizard( + Window owner, + ProjectCatalog projectCatalogService, + ProjectLanguageCatalog projectLanguageCatalogService, + I18nService i18n, + ThemeService theme) { this.projectCatalogService = Objects.requireNonNull(projectCatalogService, "projectCatalogService"); - this.projectLanguageCatalogService = new ProjectLanguageCatalogService(); + this.projectLanguageCatalogService = Objects.requireNonNull(projectLanguageCatalogService, "projectLanguageCatalogService"); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.theme = Objects.requireNonNull(theme, "theme"); this.stage = new Stage(); stage.initOwner(owner); stage.initModality(Modality.WINDOW_MODAL); - stage.setTitle(Container.i18n().text(I18n.WIZARD_TITLE)); + stage.setTitle(i18n.text(I18n.WIZARD_TITLE)); stage.setScene(new Scene(buildRoot(), 700, 420)); - stage.getScene().getStylesheets().add(Container.theme().getDefaultTheme()); + stage.getScene().getStylesheets().add(theme.getDefaultTheme()); - projectNameField.promptTextProperty().bind(Container.i18n().bind(I18n.LAUNCHER_PROJECT_NAME_PROMPT)); + projectNameField.promptTextProperty().bind(i18n.bind(I18n.LAUNCHER_PROJECT_NAME_PROMPT)); locationField.setText(projectCatalogService.projectsRoot().toString()); - runtimePathField.promptTextProperty().bind(Container.i18n().bind(I18n.WIZARD_RUNTIME_PROMPT)); + runtimePathField.promptTextProperty().bind(i18n.bind(I18n.WIZARD_RUNTIME_PROMPT)); indentationWidthCombo.getItems().setAll(2, 4, 8); indentationWidthCombo.getSelectionModel().select(Integer.valueOf(4)); initializeLanguageTemplates(); @@ -66,8 +80,13 @@ public final class NewProjectWizard { renderStep(); } - public static Optional showAndWait(Window owner, ProjectCatalogService projectCatalogService) { - final NewProjectWizard wizard = new NewProjectWizard(owner, projectCatalogService); + public static Optional showAndWait( + Window owner, + ProjectCatalog projectCatalogService, + ProjectLanguageCatalog projectLanguageCatalogService, + I18nService i18n, + ThemeService theme) { + final NewProjectWizard wizard = new NewProjectWizard(owner, projectCatalogService, projectLanguageCatalogService, i18n, theme); wizard.stage.showAndWait(); return Optional.ofNullable(wizard.result.get()); } @@ -78,20 +97,20 @@ public final class NewProjectWizard { feedbackLabel.getStyleClass().add("studio-launcher-feedback"); feedbackLabel.setWrapText(true); - backButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_BACK)); + backButton.textProperty().bind(i18n.bind(I18n.WIZARD_BACK)); backButton.getStyleClass().addAll("studio-button", "studio-button-secondary"); backButton.setOnAction(ignored -> goBack()); - nextButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_NEXT)); + nextButton.textProperty().bind(i18n.bind(I18n.WIZARD_NEXT)); nextButton.getStyleClass().addAll("studio-button", "studio-button-primary"); nextButton.setOnAction(ignored -> goNext()); - createButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_CREATE)); + createButton.textProperty().bind(i18n.bind(I18n.WIZARD_CREATE)); createButton.getStyleClass().addAll("studio-button", "studio-button-primary"); createButton.setOnAction(ignored -> finishCreate()); final Button cancelButton = new Button(); - cancelButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_CANCEL)); + cancelButton.textProperty().bind(i18n.bind(I18n.WIZARD_CANCEL)); cancelButton.getStyleClass().addAll("studio-button", "studio-button-cancel"); cancelButton.setOnAction(ignored -> stage.close()); @@ -125,20 +144,20 @@ public final class NewProjectWizard { private void renderNameStep() { stepTitle.textProperty().unbind(); stepDescription.textProperty().unbind(); - stepTitle.textProperty().bind(Container.i18n().bind(I18n.WIZARD_STEP_NAME_TITLE)); - stepDescription.textProperty().bind(Container.i18n().bind(I18n.WIZARD_STEP_NAME_DESCRIPTION)); + stepTitle.textProperty().bind(i18n.bind(I18n.WIZARD_STEP_NAME_TITLE)); + stepDescription.textProperty().bind(i18n.bind(I18n.WIZARD_STEP_NAME_DESCRIPTION)); stepBody.getChildren().setAll(projectNameField); } private void renderLanguageStep() { stepTitle.textProperty().unbind(); stepDescription.textProperty().unbind(); - stepTitle.textProperty().bind(Container.i18n().bind(I18n.WIZARD_STEP_LANGUAGE_TITLE)); - stepDescription.textProperty().bind(Container.i18n().bind(I18n.WIZARD_STEP_LANGUAGE_DESCRIPTION)); + stepTitle.textProperty().bind(i18n.bind(I18n.WIZARD_STEP_LANGUAGE_TITLE)); + stepDescription.textProperty().bind(i18n.bind(I18n.WIZARD_STEP_LANGUAGE_DESCRIPTION)); - final Label languageLabel = new Label(Container.i18n().text(I18n.WIZARD_LANGUAGE_LABEL)); - final Label stdlibLabel = new Label(Container.i18n().text(I18n.WIZARD_STDLIB_LABEL)); - final Label sourceRootLabel = new Label(Container.i18n().text(I18n.WIZARD_SOURCE_ROOT_LABEL)); + final Label languageLabel = new Label(i18n.text(I18n.WIZARD_LANGUAGE_LABEL)); + final Label stdlibLabel = new Label(i18n.text(I18n.WIZARD_STDLIB_LABEL)); + final Label sourceRootLabel = new Label(i18n.text(I18n.WIZARD_SOURCE_ROOT_LABEL)); languageCombo.setMaxWidth(Double.MAX_VALUE); stdlibCombo.setMaxWidth(Double.MAX_VALUE); @@ -153,11 +172,11 @@ public final class NewProjectWizard { private void renderLocationStep() { stepTitle.textProperty().unbind(); stepDescription.textProperty().unbind(); - stepTitle.textProperty().bind(Container.i18n().bind(I18n.WIZARD_STEP_LOCATION_TITLE)); - stepDescription.textProperty().bind(Container.i18n().bind(I18n.WIZARD_STEP_LOCATION_DESCRIPTION)); + stepTitle.textProperty().bind(i18n.bind(I18n.WIZARD_STEP_LOCATION_TITLE)); + stepDescription.textProperty().bind(i18n.bind(I18n.WIZARD_STEP_LOCATION_DESCRIPTION)); final Button browseButton = new Button(); - browseButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_BROWSE)); + browseButton.textProperty().bind(i18n.bind(I18n.WIZARD_BROWSE)); browseButton.getStyleClass().addAll("studio-button", "studio-button-secondary"); browseButton.setOnAction(ignored -> browseForLocation()); @@ -170,17 +189,17 @@ public final class NewProjectWizard { private void renderConfirmStep() { stepTitle.textProperty().unbind(); stepDescription.textProperty().unbind(); - stepTitle.textProperty().bind(Container.i18n().bind(I18n.WIZARD_STEP_CONFIRM_TITLE)); - stepDescription.textProperty().bind(Container.i18n().bind(I18n.WIZARD_STEP_CONFIRM_DESCRIPTION)); + stepTitle.textProperty().bind(i18n.bind(I18n.WIZARD_STEP_CONFIRM_TITLE)); + stepDescription.textProperty().bind(i18n.bind(I18n.WIZARD_STEP_CONFIRM_DESCRIPTION)); - final Label projectName = new Label(Container.i18n().format(I18n.WIZARD_CONFIRM_NAME, sanitizedName())); - final Label projectLanguage = new Label(Container.i18n().format(I18n.WIZARD_CONFIRM_LANGUAGE, selectedLanguageId())); - final Label projectStdlib = new Label(Container.i18n().format(I18n.WIZARD_CONFIRM_STDLIB, selectedStdlibLabel())); - final Label projectSourceRoot = new Label(Container.i18n().format(I18n.WIZARD_CONFIRM_SOURCE_ROOT, selectedSourceRoot())); - final Label projectLocation = new Label(Container.i18n().format(I18n.WIZARD_CONFIRM_LOCATION, locationField.getText().trim())); - final Label projectIndentation = new Label(Container.i18n().format(I18n.WIZARD_CONFIRM_INDENTATION, selectedIndentationLabel())); - final Label projectRuntime = new Label(Container.i18n().format(I18n.WIZARD_CONFIRM_RUNTIME, selectedRuntimePathLabel())); - final Label projectRoot = new Label(Container.i18n().format(I18n.WIZARD_CONFIRM_ROOT, resolvedProjectRoot().toString())); + final Label projectName = new Label(i18n.format(I18n.WIZARD_CONFIRM_NAME, sanitizedName())); + final Label projectLanguage = new Label(i18n.format(I18n.WIZARD_CONFIRM_LANGUAGE, selectedLanguageId())); + final Label projectStdlib = new Label(i18n.format(I18n.WIZARD_CONFIRM_STDLIB, selectedStdlibLabel())); + final Label projectSourceRoot = new Label(i18n.format(I18n.WIZARD_CONFIRM_SOURCE_ROOT, selectedSourceRoot())); + final Label projectLocation = new Label(i18n.format(I18n.WIZARD_CONFIRM_LOCATION, locationField.getText().trim())); + final Label projectIndentation = new Label(i18n.format(I18n.WIZARD_CONFIRM_INDENTATION, selectedIndentationLabel())); + final Label projectRuntime = new Label(i18n.format(I18n.WIZARD_CONFIRM_RUNTIME, selectedRuntimePathLabel())); + final Label projectRoot = new Label(i18n.format(I18n.WIZARD_CONFIRM_ROOT, resolvedProjectRoot().toString())); stepBody.getChildren().setAll( projectName, @@ -196,13 +215,13 @@ public final class NewProjectWizard { private void renderDetailsStep() { stepTitle.textProperty().unbind(); stepDescription.textProperty().unbind(); - stepTitle.textProperty().bind(Container.i18n().bind(I18n.WIZARD_STEP_DETAILS_TITLE)); - stepDescription.textProperty().bind(Container.i18n().bind(I18n.WIZARD_STEP_DETAILS_DESCRIPTION)); + stepTitle.textProperty().bind(i18n.bind(I18n.WIZARD_STEP_DETAILS_TITLE)); + stepDescription.textProperty().bind(i18n.bind(I18n.WIZARD_STEP_DETAILS_DESCRIPTION)); - final Label indentationLabel = new Label(Container.i18n().text(I18n.WIZARD_INDENTATION_LABEL)); - final Label runtimeLabel = new Label(Container.i18n().text(I18n.WIZARD_RUNTIME_LABEL)); + final Label indentationLabel = new Label(i18n.text(I18n.WIZARD_INDENTATION_LABEL)); + final Label runtimeLabel = new Label(i18n.text(I18n.WIZARD_RUNTIME_LABEL)); final Button runtimeBrowseButton = new Button(); - runtimeBrowseButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_BROWSE)); + runtimeBrowseButton.textProperty().bind(i18n.bind(I18n.WIZARD_BROWSE)); runtimeBrowseButton.getStyleClass().addAll("studio-button", "studio-button-secondary"); runtimeBrowseButton.setOnAction(ignored -> browseForRuntimePath()); indentationWidthCombo.setMaxWidth(Double.MAX_VALUE); @@ -243,7 +262,7 @@ public final class NewProjectWizard { private boolean validateName() { if (sanitizedName().isBlank()) { - feedbackLabel.setText(Container.i18n().text(I18n.WIZARD_ERROR_NAME_REQUIRED)); + feedbackLabel.setText(i18n.text(I18n.WIZARD_ERROR_NAME_REQUIRED)); return false; } return true; @@ -251,15 +270,15 @@ public final class NewProjectWizard { private boolean validateLanguageSettings() { if (selectedLanguageId().isBlank()) { - feedbackLabel.setText(Container.i18n().text(I18n.WIZARD_ERROR_LANGUAGE_REQUIRED)); + feedbackLabel.setText(i18n.text(I18n.WIZARD_ERROR_LANGUAGE_REQUIRED)); return false; } if (selectedSourceRoot().isBlank()) { - feedbackLabel.setText(Container.i18n().text(I18n.WIZARD_ERROR_SOURCE_ROOT_REQUIRED)); + feedbackLabel.setText(i18n.text(I18n.WIZARD_ERROR_SOURCE_ROOT_REQUIRED)); return false; } if (selectedStdlib() == null) { - feedbackLabel.setText(Container.i18n().text(I18n.WIZARD_ERROR_STDLIB_REQUIRED)); + feedbackLabel.setText(i18n.text(I18n.WIZARD_ERROR_STDLIB_REQUIRED)); return false; } return true; @@ -268,7 +287,7 @@ public final class NewProjectWizard { private boolean validateLocation() { final String rawLocation = locationField.getText().trim(); if (rawLocation.isBlank()) { - feedbackLabel.setText(Container.i18n().text(I18n.WIZARD_ERROR_LOCATION_REQUIRED)); + feedbackLabel.setText(i18n.text(I18n.WIZARD_ERROR_LOCATION_REQUIRED)); return false; } try { @@ -282,7 +301,7 @@ public final class NewProjectWizard { private boolean validateDetails() { if (selectedIndentationWidth() <= 0) { - feedbackLabel.setText(Container.i18n().text(I18n.WIZARD_ERROR_INDENTATION_REQUIRED)); + feedbackLabel.setText(i18n.text(I18n.WIZARD_ERROR_INDENTATION_REQUIRED)); return false; } return true; @@ -299,7 +318,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 + ProjectTarget.Game, // hardcoded for now, we can add a separate step for this if needed selectedSourceRoot(), selectedIndentationWidth(), selectedRuntimePath()))); @@ -311,7 +330,7 @@ public final class NewProjectWizard { private void browseForLocation() { final DirectoryChooser chooser = new DirectoryChooser(); - chooser.setTitle(Container.i18n().text(I18n.WIZARD_BROWSE)); + chooser.setTitle(i18n.text(I18n.WIZARD_BROWSE)); final String currentText = locationField.getText().trim(); if (!currentText.isBlank()) { @@ -329,7 +348,7 @@ public final class NewProjectWizard { private void browseForRuntimePath() { final DirectoryChooser chooser = new DirectoryChooser(); - chooser.setTitle(Container.i18n().text(I18n.WIZARD_RUNTIME_LABEL)); + chooser.setTitle(i18n.text(I18n.WIZARD_RUNTIME_LABEL)); final String currentText = runtimePathField.getText().trim(); if (!currentText.isBlank()) { @@ -357,7 +376,7 @@ public final class NewProjectWizard { languageCombo.getItems().setAll(languageTemplatesById.keySet()); languageCombo.getSelectionModel().selectedItemProperty().addListener((ignored, oldValue, newValue) -> applyLanguageTemplate(newValue)); if (!templates.isEmpty()) { - languageCombo.getSelectionModel().select(projectLanguageCatalogService.getDefaultTemplate().languageId()); + languageCombo.getSelectionModel().select(projectLanguageCatalogService.defaultTemplate().languageId()); } } diff --git a/prometeu-studio/src/main/java/p/studio/window/ProjectLauncherView.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/ProjectLauncherView.java similarity index 82% rename from prometeu-studio/src/main/java/p/studio/window/ProjectLauncherView.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/ProjectLauncherView.java index 1aaced20..8f0803d9 100644 --- a/prometeu-studio/src/main/java/p/studio/window/ProjectLauncherView.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/ProjectLauncherView.java @@ -1,4 +1,4 @@ -package p.studio.window; +package p.studio.ui.javafx.window; import javafx.collections.FXCollections; import javafx.geometry.Insets; @@ -10,11 +10,13 @@ import javafx.scene.control.ListView; import javafx.scene.input.MouseButton; import javafx.scene.layout.*; import javafx.stage.FileChooser; -import p.studio.Container; -import p.studio.projects.KnownProjectsService; -import p.studio.projects.ProjectCatalogService; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; +import p.studio.api.project.KnownProjects; +import p.studio.api.project.ProjectCatalog; +import p.studio.api.project.ProjectLanguageCatalog; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.ui.javafx.utilities.ThemeService; import java.io.File; import java.nio.file.Path; @@ -22,8 +24,11 @@ import java.util.Objects; import java.util.function.Consumer; public final class ProjectLauncherView extends BorderPane { - private final KnownProjectsService knownProjectsService; - private final ProjectCatalogService projectCatalogService; + private final KnownProjects knownProjectsService; + private final ProjectCatalog projectCatalogService; + private final ProjectLanguageCatalog languageCatalog; + private final I18nService i18n; + private final ThemeService theme; private final Consumer onOpenProject; private final Consumer onAddProject; private final Consumer onCreateProject; @@ -32,14 +37,20 @@ public final class ProjectLauncherView extends BorderPane { private final Label feedbackLabel = new Label(); public ProjectLauncherView( - KnownProjectsService knownProjectsService, - ProjectCatalogService projectCatalogService, + KnownProjects knownProjectsService, + ProjectCatalog projectCatalogService, + ProjectLanguageCatalog languageCatalog, + I18nService i18n, + ThemeService theme, Consumer onOpenProject, Consumer onAddProject, Consumer onCreateProject, Consumer onForgetProject) { this.knownProjectsService = Objects.requireNonNull(knownProjectsService, "knownProjectsService"); this.projectCatalogService = Objects.requireNonNull(projectCatalogService, "projectCatalogService"); + this.languageCatalog = Objects.requireNonNull(languageCatalog, "languageCatalog"); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.theme = Objects.requireNonNull(theme, "theme"); this.onOpenProject = Objects.requireNonNull(onOpenProject, "onOpenProject"); this.onAddProject = Objects.requireNonNull(onAddProject, "onAddProject"); this.onCreateProject = Objects.requireNonNull(onCreateProject, "onCreateProject"); @@ -62,15 +73,15 @@ public final class ProjectLauncherView extends BorderPane { private VBox buildContent() { final Label title = new Label(); - title.textProperty().bind(Container.i18n().bind(I18n.LAUNCHER_TITLE)); + title.textProperty().bind(i18n.bind(I18n.LAUNCHER_TITLE)); title.getStyleClass().add("studio-launcher-title"); final Label subtitle = new Label(); - subtitle.textProperty().bind(Container.i18n().bind(I18n.LAUNCHER_SUBTITLE)); + subtitle.textProperty().bind(i18n.bind(I18n.LAUNCHER_SUBTITLE)); subtitle.getStyleClass().add("studio-launcher-subtitle"); final Label listTitle = new Label(); - listTitle.textProperty().bind(Container.i18n().bind(I18n.LAUNCHER_EXISTING_PROJECTS)); + listTitle.textProperty().bind(i18n.bind(I18n.LAUNCHER_EXISTING_PROJECTS)); listTitle.getStyleClass().add("studio-launcher-section-title"); projectList.getStyleClass().add("studio-project-list"); @@ -83,18 +94,18 @@ public final class ProjectLauncherView extends BorderPane { VBox.setVgrow(projectList, Priority.ALWAYS); final Button openButton = new Button(); - openButton.textProperty().bind(Container.i18n().bind(I18n.LAUNCHER_OPEN_PROJECT)); + openButton.textProperty().bind(i18n.bind(I18n.LAUNCHER_OPEN_PROJECT)); openButton.getStyleClass().addAll("studio-button", "studio-button-primary"); openButton.disableProperty().bind(projectList.getSelectionModel().selectedItemProperty().isNull()); openButton.setOnAction(ignored -> openSelectedProject()); final Button addButton = new Button(); - addButton.textProperty().bind(Container.i18n().bind(I18n.LAUNCHER_ADD_PROJECT)); + addButton.textProperty().bind(i18n.bind(I18n.LAUNCHER_ADD_PROJECT)); addButton.getStyleClass().addAll("studio-button", "studio-button-secondary"); addButton.setOnAction(ignored -> addExistingProject()); final Button forgetButton = new Button(); - forgetButton.textProperty().bind(Container.i18n().bind(I18n.LAUNCHER_FORGET_PROJECT)); + forgetButton.textProperty().bind(i18n.bind(I18n.LAUNCHER_FORGET_PROJECT)); forgetButton.getStyleClass().addAll("studio-button", "studio-button-warning"); forgetButton.disableProperty().bind(projectList.getSelectionModel().selectedItemProperty().isNull()); forgetButton.setOnAction(ignored -> forgetSelectedProject()); @@ -103,11 +114,11 @@ public final class ProjectLauncherView extends BorderPane { openRow.setAlignment(Pos.CENTER_LEFT); final Label createTitle = new Label(); - createTitle.textProperty().bind(Container.i18n().bind(I18n.LAUNCHER_CREATE_PROJECT)); + createTitle.textProperty().bind(i18n.bind(I18n.LAUNCHER_CREATE_PROJECT)); createTitle.getStyleClass().add("studio-launcher-section-title"); final Button createButton = new Button(); - createButton.textProperty().bind(Container.i18n().bind(I18n.LAUNCHER_CREATE_BUTTON)); + createButton.textProperty().bind(i18n.bind(I18n.LAUNCHER_CREATE_BUTTON)); createButton.getStyleClass().addAll("studio-button", "studio-button-primary"); createButton.setOnAction(ignored -> openCreateWizard()); @@ -162,7 +173,7 @@ public final class ProjectLauncherView extends BorderPane { } private void openCreateWizard() { - NewProjectWizard.showAndWait(getScene().getWindow(), projectCatalogService).ifPresent(created -> { + NewProjectWizard.showAndWait(getScene().getWindow(), projectCatalogService, languageCatalog, i18n, theme).ifPresent(created -> { reloadProjects(); projectList.getSelectionModel().select(created); feedbackLabel.textProperty().unbind(); @@ -173,7 +184,7 @@ public final class ProjectLauncherView extends BorderPane { private void addExistingProject() { final FileChooser chooser = new FileChooser(); - chooser.setTitle(Container.i18n().text(I18n.LAUNCHER_ADD_PROJECT)); + chooser.setTitle(i18n.text(I18n.LAUNCHER_ADD_PROJECT)); chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Prometeu Project", "prometeu.json")); chooser.setInitialFileName("prometeu.json"); final File initialDirectory = projectCatalogService.projectsRoot().toFile(); diff --git a/prometeu-studio/src/main/java/p/studio/window/ProjectLoadingShieldView.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/ProjectLoadingShieldView.java similarity index 69% rename from prometeu-studio/src/main/java/p/studio/window/ProjectLoadingShieldView.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/ProjectLoadingShieldView.java index cf33c466..aa928ebd 100644 --- a/prometeu-studio/src/main/java/p/studio/window/ProjectLoadingShieldView.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/ProjectLoadingShieldView.java @@ -1,4 +1,4 @@ -package p.studio.window; +package p.studio.ui.javafx.window; import javafx.animation.KeyFrame; import javafx.animation.Timeline; @@ -11,16 +11,17 @@ import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; import javafx.util.Duration; -import p.studio.Container; -import p.studio.StudioAppInfo; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; +import p.studio.ui.javafx.StudioAppInfo; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; import java.util.Objects; public final class ProjectLoadingShieldView extends VBox { - public ProjectLoadingShieldView(ProjectReference projectReference) { + public ProjectLoadingShieldView(ProjectReference projectReference, I18nService i18n) { Objects.requireNonNull(projectReference, "projectReference"); + Objects.requireNonNull(i18n, "i18n"); getStyleClass().add("studio-project-loading-shield"); setPadding(new Insets(28)); @@ -30,10 +31,10 @@ public final class ProjectLoadingShieldView extends VBox { final Label markLabel = new Label("P"); markLabel.getStyleClass().add("studio-project-loading-mark"); - final Label appTitle = new Label(Container.i18n().text(I18n.APP_TITLE)); + final Label appTitle = new Label(i18n.text(I18n.APP_TITLE)); appTitle.getStyleClass().add("studio-project-loading-title"); - final Label appVersion = new Label(Container.i18n().format(I18n.SHIELD_VERSION, StudioAppInfo.version())); + final Label appVersion = new Label(i18n.format(I18n.SHIELD_VERSION, StudioAppInfo.version())); appVersion.getStyleClass().add("studio-project-loading-version"); final VBox brandBlock = new VBox(4, appTitle, appVersion); @@ -43,7 +44,7 @@ public final class ProjectLoadingShieldView extends VBox { final Label projectLabel = new Label(projectReference.name()); projectLabel.getStyleClass().add("studio-project-loading-project"); - final Label statusLabel = new Label(Container.i18n().format(I18n.SHIELD_LOADING_PROJECT, projectReference.name())); + final Label statusLabel = new Label(i18n.format(I18n.SHIELD_LOADING_PROJECT, projectReference.name())); statusLabel.getStyleClass().add("studio-project-loading-status"); final ProgressBar progressBar = new ProgressBar(0.18); @@ -52,29 +53,29 @@ public final class ProjectLoadingShieldView extends VBox { final HBox phaseRow = new HBox( 8, - phasePill(Container.i18n().text(I18n.SHIELD_PHASE_INDEXING), true), - phasePill(Container.i18n().text(I18n.SHIELD_PHASE_PREPARING), false), - phasePill(Container.i18n().text(I18n.SHIELD_PHASE_RESTORING), false)); + phasePill(i18n.text(I18n.SHIELD_PHASE_INDEXING), true), + phasePill(i18n.text(I18n.SHIELD_PHASE_PREPARING), false), + phasePill(i18n.text(I18n.SHIELD_PHASE_RESTORING), false)); phaseRow.setAlignment(Pos.CENTER_LEFT); - final Label tipLabel = new Label(Container.i18n().text(I18n.SHIELD_TIP_SHORTCUTS)); + final Label tipLabel = new Label(i18n.text(I18n.SHIELD_TIP_SHORTCUTS)); tipLabel.getStyleClass().add("studio-project-loading-tip"); tipLabel.setWrapText(true); final Timeline timeline = new Timeline( new KeyFrame(Duration.ZERO, ignored -> { - statusLabel.setText(Container.i18n().format(I18n.SHIELD_LOADING_PROJECT, projectReference.name())); - tipLabel.setText(Container.i18n().text(I18n.SHIELD_TIP_SHORTCUTS)); + statusLabel.setText(i18n.format(I18n.SHIELD_LOADING_PROJECT, projectReference.name())); + tipLabel.setText(i18n.text(I18n.SHIELD_TIP_SHORTCUTS)); progressBar.setProgress(0.24); }), new KeyFrame(Duration.millis(500), ignored -> { - statusLabel.setText(Container.i18n().text(I18n.SHIELD_STATUS_INDEXING)); - tipLabel.setText(Container.i18n().text(I18n.SHIELD_TIP_WORKSPACES)); + statusLabel.setText(i18n.text(I18n.SHIELD_STATUS_INDEXING)); + tipLabel.setText(i18n.text(I18n.SHIELD_TIP_WORKSPACES)); progressBar.setProgress(0.58); }), new KeyFrame(Duration.millis(1000), ignored -> { - statusLabel.setText(Container.i18n().text(I18n.SHIELD_STATUS_RESTORING)); - tipLabel.setText(Container.i18n().text(I18n.SHIELD_TIP_ACTIVITY)); + statusLabel.setText(i18n.text(I18n.SHIELD_STATUS_RESTORING)); + tipLabel.setText(i18n.text(I18n.SHIELD_TIP_ACTIVITY)); progressBar.setProgress(0.86); })); timeline.setCycleCount(Timeline.INDEFINITE); diff --git a/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/StudioWindowCoordinator.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/StudioWindowCoordinator.java new file mode 100644 index 00000000..c4e25bdc --- /dev/null +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/StudioWindowCoordinator.java @@ -0,0 +1,397 @@ +package p.studio.ui.javafx.window; + +import javafx.application.Platform; +import javafx.scene.Scene; +import javafx.stage.Stage; +import javafx.stage.StageStyle; +import p.studio.api.assets.AssetCatalog; +import p.studio.api.assets.AssetCommands; +import p.studio.api.assets.AssetPacking; +import p.studio.api.assets.AssetDetails; +import p.studio.api.assets.AssetCreationCatalog; +import p.studio.api.assets.AssetWorkspaceStorage; +import p.studio.api.assets.AssetCapacityPolicy; +import p.studio.api.assets.schema.AssetColorSchemaFactory; +import p.studio.api.assets.bank.AssetBankCompositionSessionFactory; +import p.studio.api.assets.metadata.AssetMetadataService; +import p.studio.api.assets.scene.SceneBankWorkflow; +import p.studio.api.assets.tiled.TiledAssetService; +import p.studio.api.project.KnownProjects; +import p.studio.api.project.ProjectCatalog; +import p.studio.api.project.ProjectLanguageCatalog; +import p.studio.ui.javafx.events.*; +import p.studio.api.project.ProjectReference; +import p.studio.api.shipper.Shipper; +import p.studio.api.session.ProjectSession; +import p.studio.api.session.ProjectSessionFactory; +import p.studio.api.execution.ExecutionControllerFactory; +import p.studio.api.project.ProjectWorkspaceInitializer; +import p.studio.api.preferences.WindowStateStore; +import p.studio.api.preferences.ProjectActivityHistoryStore; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.ui.javafx.utilities.ThemeService; +import p.studio.ui.javafx.events.StudioEventBus; + +import java.util.Objects; +import java.util.concurrent.Executor; + +public final class StudioWindowCoordinator implements AutoCloseable { + private static final double LAUNCHER_WIDTH = 760; + private static final double LAUNCHER_HEIGHT = 750; + private static final double PROJECT_LOADING_WIDTH = 460; + private static final double PROJECT_LOADING_HEIGHT = 250; + private static final double PROJECT_WIDTH = 1280; + private static final double PROJECT_HEIGHT = 840; + + private final Stage launcherStage; + private final ProjectCatalog projectCatalogService; + private final KnownProjects knownProjectsService; + private final WindowStateService windowStateService; + private final ProjectLauncherView launcherView; + private final ProjectSessionFactory projectSessionFactory; + private final Shipper shipper; + private final ExecutionControllerFactory executionControllerFactory; + private final ProjectWorkspaceInitializer projectWorkspaceInitializer; + private final Executor executor; + private final I18nService i18n; + private final ThemeService theme; + private final StudioEventBus eventBus; + private final AssetCatalog assetCatalog; + private final AssetCommands assetCommands; + private final AssetPacking assetPacking; + private final AssetDetails assetDetails; + private final AssetCreationCatalog assetCreationCatalog; + private final AssetMetadataService assetMetadataService; + private final AssetWorkspaceStorage assetWorkspaceStorage; + private final AssetCapacityPolicy assetCapacityPolicy; + private final AssetBankCompositionSessionFactory bankCompositionSessionFactory; + private final AssetColorSchemaFactory assetColorSchemaFactory; + private final TiledAssetService tiledAssetService; + private final SceneBankWorkflow sceneBankWorkflow; + private final ProjectActivityHistoryStore activityHistoryStore; + private final Object lifecycleMonitor = new Object(); + private volatile boolean closed; + private volatile ProjectSession pendingProjectSession; + private Stage loadingStage; + private Stage projectStage; + private MainView mainView; + private ProjectSession projectSession; + + public StudioWindowCoordinator( + Stage launcherStage, + ProjectCatalog projectCatalogService, + KnownProjects knownProjectsService, + ProjectLanguageCatalog languageCatalog, + ProjectSessionFactory projectSessionFactory, + ExecutionControllerFactory executionControllerFactory, + ProjectWorkspaceInitializer projectWorkspaceInitializer, + Executor executor, + I18nService i18n, + ThemeService theme, + StudioEventBus eventBus, + Shipper shipper, + AssetCatalog assetCatalog, + AssetCommands assetCommands, + AssetPacking assetPacking, + AssetDetails assetDetails, + AssetCreationCatalog assetCreationCatalog, + AssetMetadataService assetMetadataService, + AssetWorkspaceStorage assetWorkspaceStorage, + AssetCapacityPolicy assetCapacityPolicy, + AssetBankCompositionSessionFactory bankCompositionSessionFactory, + AssetColorSchemaFactory assetColorSchemaFactory, + TiledAssetService tiledAssetService, + SceneBankWorkflow sceneBankWorkflow, + WindowStateStore windowStateStore, + ProjectActivityHistoryStore activityHistoryStore) { + this.launcherStage = Objects.requireNonNull(launcherStage, "launcherStage"); + this.projectCatalogService = Objects.requireNonNull(projectCatalogService, "projectCatalogService"); + this.knownProjectsService = Objects.requireNonNull(knownProjectsService, "knownProjectsService"); + this.shipper = Objects.requireNonNull(shipper, "shipper"); + this.windowStateService = new WindowStateService(windowStateStore); + this.projectSessionFactory = Objects.requireNonNull(projectSessionFactory, "projectSessionFactory"); + this.executionControllerFactory = Objects.requireNonNull(executionControllerFactory, "executionControllerFactory"); + this.projectWorkspaceInitializer = Objects.requireNonNull(projectWorkspaceInitializer, "projectWorkspaceInitializer"); + this.executor = Objects.requireNonNull(executor, "executor"); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.theme = Objects.requireNonNull(theme, "theme"); + this.eventBus = Objects.requireNonNull(eventBus, "eventBus"); + this.assetCatalog = Objects.requireNonNull(assetCatalog, "assetCatalog"); + this.assetCommands = Objects.requireNonNull(assetCommands, "assetCommands"); + this.assetPacking = Objects.requireNonNull(assetPacking, "assetPacking"); + this.assetDetails = Objects.requireNonNull(assetDetails, "assetDetails"); + this.assetCreationCatalog = Objects.requireNonNull(assetCreationCatalog, "assetCreationCatalog"); + this.assetMetadataService = Objects.requireNonNull(assetMetadataService, "assetMetadataService"); + this.assetWorkspaceStorage = Objects.requireNonNull(assetWorkspaceStorage, "assetWorkspaceStorage"); + this.assetCapacityPolicy = Objects.requireNonNull(assetCapacityPolicy, "assetCapacityPolicy"); + this.bankCompositionSessionFactory = Objects.requireNonNull(bankCompositionSessionFactory, "bankCompositionSessionFactory"); + this.assetColorSchemaFactory = Objects.requireNonNull(assetColorSchemaFactory, "assetColorSchemaFactory"); + this.tiledAssetService = Objects.requireNonNull(tiledAssetService, "tiledAssetService"); + this.sceneBankWorkflow = Objects.requireNonNull(sceneBankWorkflow, "sceneBankWorkflow"); + this.activityHistoryStore = Objects.requireNonNull(activityHistoryStore, "activityHistoryStore"); + this.launcherView = new ProjectLauncherView( + knownProjectsService, + projectCatalogService, + languageCatalog, + i18n, + theme, + this::openProject, + this::addProject, + this::createProject, + this::forgetProject); + } + + public void showLauncher() { + if (closed) { + throw new IllegalStateException("Studio window coordinator is closed"); + } + final Scene scene = new Scene(launcherView, LAUNCHER_WIDTH, LAUNCHER_HEIGHT); + scene.getStylesheets().add(theme.getDefaultTheme()); + + launcherStage.titleProperty().bind(i18n.bind(I18n.APP_TITLE)); + launcherStage.setScene(scene); + windowStateService.installLauncherState(launcherStage, LAUNCHER_WIDTH, LAUNCHER_HEIGHT); + launcherStage.setResizable(false); + launcherStage.setWidth(LAUNCHER_WIDTH); + launcherStage.setHeight(LAUNCHER_HEIGHT); + launcherStage.setMinWidth(LAUNCHER_WIDTH); + launcherStage.setMaxWidth(LAUNCHER_WIDTH); + launcherStage.setMinHeight(LAUNCHER_HEIGHT); + launcherStage.setMaxHeight(LAUNCHER_HEIGHT); + launcherStage.show(); + launcherStage.centerOnScreen(); + launcherStage.toFront(); + } + + private void openProject(ProjectReference projectReference) { + final ProjectReference opened = projectCatalogService.openProject(projectReference.rootPath()); + knownProjectsService.remember(opened); + eventBus.publish(new StudioProjectOpenedEvent()); + openProjectWindow(opened); + } + + private void createProject(ProjectReference projectReference) { + knownProjectsService.remember(projectReference); + eventBus.publish(new StudioProjectCreatedEvent()); + eventBus.publish(new StudioProjectOpenedEvent()); + openProjectWindow(projectReference); + } + + private void addProject(ProjectReference projectReference) { + knownProjectsService.remember(projectReference); + launcherView.reloadProjects(); + } + + private void forgetProject(ProjectReference projectReference) { + knownProjectsService.forget(projectReference); + launcherView.reloadProjects(); + } + + private void openProjectWindow(ProjectReference projectReference) { + if (closed) { + return; + } + final Stage projectLoadingStage = createProjectLoadingStage(projectReference); + loadingStage = projectLoadingStage; + launcherStage.hide(); + projectLoadingStage.show(); + projectLoadingStage.centerOnScreen(); + projectLoadingStage.toFront(); + publishProjectLoadingStarted(projectReference); + executor.execute(() -> initializeProjectAndOpenWindow(projectReference, projectLoadingStage)); + } + + private Stage createProjectLoadingStage(ProjectReference projectReference) { + final Stage loadingStage = new Stage(StageStyle.UNDECORATED); + loadingStage.initOwner(launcherStage); + loadingStage.setResizable(false); + + final Scene scene = new Scene( + new ProjectLoadingShieldView(projectReference, i18n), + PROJECT_LOADING_WIDTH, + PROJECT_LOADING_HEIGHT); + scene.getStylesheets().add(theme.getDefaultTheme()); + loadingStage.setScene(scene); + return loadingStage; + } + + private void initializeProjectAndOpenWindow(ProjectReference projectReference, Stage loadingStage) { + ProjectSession projectSession = null; + try { + eventBus.publish(new StudioProjectLoadingProgressEvent( + StudioProjectLoadingPhase.INITIALIZING_SERVICES, + i18n.text(I18n.SHIELD_STATUS_INDEXING), + Progress.INITIALIZING_SERVICES, + false)); + projectWorkspaceInitializer.initialize(projectReference); + eventBus.publish(new StudioProjectLoadingProgressEvent( + StudioProjectLoadingPhase.RESTORING_WORKSPACES, + i18n.text(I18n.SHIELD_STATUS_RESTORING), + Progress.RESTORING_WORKSPACES, + false)); + projectSession = projectSessionFactory.open(projectReference); + final ProjectSession readySession = projectSession; + synchronized (lifecycleMonitor) { + if (closed) { + projectSession.close(); + return; + } + pendingProjectSession = readySession; + } + Platform.runLater(() -> finishProjectOpen(readySession, loadingStage)); + } catch (RuntimeException exception) { + if (projectSession != null) { + projectSession.close(); + } + Platform.runLater(() -> failProjectOpen(projectReference, loadingStage, exception)); + } + } + + private void finishProjectOpen(ProjectSession projectSession, Stage loadingStage) { + synchronized (lifecycleMonitor) { + if (closed || pendingProjectSession != projectSession) { + projectSession.close(); + loadingStage.close(); + return; + } + pendingProjectSession = null; + } + final ProjectReference projectReference = projectSession.projectReference(); + projectStage = new Stage(); + mainView = new MainView(projectSession, shipper, executionControllerFactory, i18n, eventBus, + executor, theme, assetCatalog, assetCommands, assetPacking, assetDetails, assetCreationCatalog, + assetMetadataService, assetWorkspaceStorage, assetCapacityPolicy, bankCompositionSessionFactory, + assetColorSchemaFactory, tiledAssetService, sceneBankWorkflow, + activityHistoryStore); + this.projectSession = projectSession; + final Scene scene = new Scene(mainView, PROJECT_WIDTH, PROJECT_HEIGHT); + scene.getStylesheets().add(theme.getDefaultTheme()); + + projectStage.setTitle(i18n.format(I18n.APP_PROJECT_TITLE, projectReference.name())); + projectStage.setScene(scene); + windowStateService.installProjectShellState(projectStage, projectReference, PROJECT_WIDTH, PROJECT_HEIGHT); + projectStage.setOnHidden(ignored -> closeProjectAndReturnToLauncher()); + + eventBus.publish(new StudioProjectLoadingProgressEvent( + StudioProjectLoadingPhase.READY, + i18n.format(I18n.APP_PROJECT_TITLE, projectReference.name()), + Progress.READY, + false)); + eventBus.publish(new StudioProjectLoadingCompletedEvent()); + loadingStage.close(); + this.loadingStage = null; + projectStage.show(); + projectStage.toFront(); + Platform.runLater(mainView::reapplyProjectLocalLayout); + } + + private void failProjectOpen( + ProjectReference projectReference, + Stage loadingStage, + RuntimeException exception) { + final String message = "Unable to initialize project services for " + projectReference.name() + "."; + eventBus.publish(new StudioProjectLoadingFailedEvent( + StudioProjectLoadingPhase.INITIALIZING_SERVICES, + message)); + loadingStage.close(); + this.loadingStage = null; + launcherStage.show(); + launcherStage.centerOnScreen(); + launcherStage.toFront(); + } + + private void publishProjectLoadingStarted(ProjectReference projectReference) { + eventBus.publish(new StudioProjectLoadingStartedEvent()); + eventBus.publish(new StudioProjectLoadingProgressEvent( + StudioProjectLoadingPhase.RESOLVING_PROJECT, + i18n.format(I18n.SHIELD_LOADING_PROJECT, projectReference.name()), + Progress.RESOLVING_PROJECT, + false)); + } + + private void closeProjectAndReturnToLauncher() { + RuntimeException failure = closeActiveProject(null); + if (!closed) { + failure = attempt(launcherView::reloadProjects, failure); + failure = attempt(launcherStage::show, failure); + failure = attempt(launcherStage::centerOnScreen, failure); + failure = attempt(launcherStage::toFront, failure); + } + if (failure != null) { + throw failure; + } + } + + private RuntimeException closeActiveProject(RuntimeException prior) { + final MainView view = mainView; + final ProjectSession session = projectSession; + mainView = null; + projectSession = null; + projectStage = null; + RuntimeException failure = prior; + if (view != null) { + failure = attempt(view::close, failure); + } + if (session != null) { + failure = attempt(session::close, failure); + } + return failure; + } + + @Override + public void close() { + final ProjectSession pending; + synchronized (lifecycleMonitor) { + if (closed) { + return; + } + closed = true; + pending = pendingProjectSession; + pendingProjectSession = null; + } + + RuntimeException failure = null; + final Stage activeProjectStage = projectStage; + if (activeProjectStage != null) { + failure = attempt(() -> activeProjectStage.setOnHidden(null), failure); + failure = attempt(activeProjectStage::close, failure); + } + failure = closeActiveProject(failure); + if (pending != null) { + failure = attempt(pending::close, failure); + } + if (loadingStage != null) { + failure = attempt(loadingStage::close, failure); + loadingStage = null; + } + failure = attempt(launcherStage::close, failure); + if (failure != null) { + throw failure; + } + } + + private static RuntimeException attempt(Runnable action, RuntimeException prior) { + try { + action.run(); + return prior; + } catch (RuntimeException failure) { + if (prior == null) { + return failure; + } + prior.addSuppressed(failure); + return prior; + } + } + + private static final class Progress { + private static final double RESOLVING_PROJECT = 0.20d; + private static final double INITIALIZING_SERVICES = 0.58d; + private static final double RESTORING_WORKSPACES = 0.86d; + private static final double READY = 1.0d; + + private Progress() { + } + } + +} diff --git a/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/WindowStateService.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/WindowStateService.java new file mode 100644 index 00000000..aad2ee07 --- /dev/null +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/window/WindowStateService.java @@ -0,0 +1,71 @@ +package p.studio.ui.javafx.window; + +import javafx.application.Platform; +import javafx.stage.Stage; +import p.studio.api.preferences.WindowGeometry; +import p.studio.api.preferences.WindowStateStore; +import p.studio.api.project.ProjectReference; + +import java.util.Objects; + +public final class WindowStateService { + private final WindowStateStore store; + + public WindowStateService(WindowStateStore store) { + this.store = Objects.requireNonNull(store, "store"); + } + + public void installLauncherState(Stage stage, double defaultWidth, double defaultHeight) { + stage.setWidth(defaultWidth); + stage.setHeight(defaultHeight); + + stage.maximizedProperty().addListener((ignored, oldValue, newValue) -> { + if (Boolean.TRUE.equals(newValue)) { + Platform.runLater(() -> stage.setMaximized(false)); + } + }); + stage.fullScreenProperty().addListener((ignored, oldValue, newValue) -> { + if (Boolean.TRUE.equals(newValue)) { + Platform.runLater(() -> stage.setFullScreen(false)); + } + }); + } + + public void installProjectShellState( + Stage stage, + ProjectReference projectReference, + double defaultWidth, + double defaultHeight) { + final WindowGeometry state = store.load(projectReference).orElse(null); + applyState(stage, state, defaultWidth, defaultHeight); + + stage.xProperty().addListener((ignored, oldValue, newValue) -> saveProjectState(projectReference, stage)); + stage.yProperty().addListener((ignored, oldValue, newValue) -> saveProjectState(projectReference, stage)); + stage.widthProperty().addListener((ignored, oldValue, newValue) -> saveProjectState(projectReference, stage)); + stage.heightProperty().addListener((ignored, oldValue, newValue) -> saveProjectState(projectReference, stage)); + stage.maximizedProperty().addListener((ignored, oldValue, newValue) -> saveProjectState(projectReference, stage)); + } + + private void applyState(Stage stage, WindowGeometry state, double defaultWidth, double defaultHeight) { + stage.setWidth(state != null && state.width() > 0 ? state.width() : defaultWidth); + stage.setHeight(state != null && state.height() > 0 ? state.height() : defaultHeight); + if (state != null && !Double.isNaN(state.x())) { + stage.setX(state.x()); + } + if (state != null && !Double.isNaN(state.y())) { + stage.setY(state.y()); + } + if (state != null && state.maximized()) { + stage.setMaximized(true); + } + } + + private void saveProjectState(ProjectReference projectReference, Stage stage) { + store.save(projectReference, new WindowGeometry( + stage.getX(), + stage.getY(), + stage.getWidth(), + stage.getHeight(), + stage.isMaximized())); + } +} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/StudioWorkspaceLifecycleSupport.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/StudioWorkspaceLifecycleSupport.java similarity index 94% rename from prometeu-studio/src/main/java/p/studio/workspaces/StudioWorkspaceLifecycleSupport.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/StudioWorkspaceLifecycleSupport.java index b854ecdc..58383dad 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/StudioWorkspaceLifecycleSupport.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/StudioWorkspaceLifecycleSupport.java @@ -1,11 +1,11 @@ -package p.studio.workspaces; +package p.studio.ui.javafx.workspaces; import javafx.application.Platform; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; import javafx.scene.Node; import javafx.scene.Scene; -import p.studio.controls.lifecycle.StudioControlLifecycle; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycle; import java.util.List; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/Workspace.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/Workspace.java similarity index 58% rename from prometeu-studio/src/main/java/p/studio/workspaces/Workspace.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/Workspace.java index a92bbbb2..b86537b4 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/Workspace.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/Workspace.java @@ -1,10 +1,10 @@ -package p.studio.workspaces; +package p.studio.ui.javafx.workspaces; -import p.studio.Container; -import p.studio.controls.lifecycle.StudioControlLifecycle; -import p.studio.lsp.events.StudioWorkspaceEventBus; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycle; +import p.studio.ui.javafx.events.StudioWorkspaceEventBus; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.events.StudioEventBus; import java.util.List; @@ -12,9 +12,9 @@ public abstract class Workspace { protected final ProjectReference projectReference; protected final StudioWorkspaceEventBus workspaceEventBus; - public Workspace(final ProjectReference projectReference) { + public Workspace(final ProjectReference projectReference, final StudioEventBus eventBus) { this.projectReference = projectReference; - this.workspaceEventBus = new StudioWorkspaceEventBus(workspaceId(), Container.eventBus()); + this.workspaceEventBus = new StudioWorkspaceEventBus(workspaceId(), eventBus); } public abstract WorkspaceId workspaceId(); diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/WorkspaceHost.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/WorkspaceHost.java similarity index 97% rename from prometeu-studio/src/main/java/p/studio/workspaces/WorkspaceHost.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/WorkspaceHost.java index 4548ec0b..15d2187d 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/WorkspaceHost.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/WorkspaceHost.java @@ -1,4 +1,4 @@ -package p.studio.workspaces; +package p.studio.ui.javafx.workspaces; import javafx.scene.Node; import javafx.scene.layout.StackPane; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/WorkspaceId.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/WorkspaceId.java similarity index 62% rename from prometeu-studio/src/main/java/p/studio/workspaces/WorkspaceId.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/WorkspaceId.java index c3c88b44..3d346af8 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/WorkspaceId.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/WorkspaceId.java @@ -1,4 +1,4 @@ -package p.studio.workspaces; +package p.studio.ui.javafx.workspaces; public enum WorkspaceId { ASSETS, diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/AssetLogsPane.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/AssetLogsPane.java similarity index 50% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/AssetLogsPane.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/AssetLogsPane.java index 094d0c51..d4858c48 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/AssetLogsPane.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/AssetLogsPane.java @@ -1,26 +1,29 @@ -package p.studio.workspaces.assets; +package p.studio.ui.javafx.workspaces.assets; -import p.studio.Container; -import p.studio.lsp.events.StudioPackerOperationEvent; -import p.studio.lsp.events.StudioWorkspaceEventBus; -import p.studio.utilities.i18n.I18n; -import p.studio.utilities.logspane.LogsPane; -import p.studio.workspaces.assets.messages.events.StudioAssetLogEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshFailedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshStartedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshedEvent; -import p.studio.workspaces.framework.StudioEventAware; -import p.studio.workspaces.framework.StudioEventBindings; +import p.studio.ui.javafx.events.StudioEventBus; +import p.studio.ui.javafx.events.StudioPackerOperationEvent; +import p.studio.ui.javafx.events.StudioWorkspaceEventBus; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.ui.javafx.utilities.logspane.LogsPane; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetLogEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshFailedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshStartedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshedEvent; +import p.studio.ui.javafx.workspaces.framework.StudioEventAware; +import p.studio.ui.javafx.workspaces.framework.StudioEventBindings; import java.util.Objects; public final class AssetLogsPane extends LogsPane implements StudioEventAware { private final StudioWorkspaceEventBus workspaceBus; + private final StudioEventBus eventBus; private final StudioEventBindings eventBindings = new StudioEventBindings(); - public AssetLogsPane(StudioWorkspaceEventBus workspaceBus) { - super(Container.i18n().bind(I18n.ASSETS_LOGS_TITLE), "assets", false); + public AssetLogsPane(StudioWorkspaceEventBus workspaceBus, StudioEventBus eventBus, I18nService i18n) { + super(Objects.requireNonNull(i18n, "i18n").bind(I18n.ASSETS_LOGS_TITLE), "assets", false); this.workspaceBus = Objects.requireNonNull(workspaceBus, "workspaceBus"); + this.eventBus = Objects.requireNonNull(eventBus, "eventBus"); } @Override @@ -42,7 +45,7 @@ public final class AssetLogsPane extends LogsPane implements StudioEventAware { eventBindings.listen(workspaceBus, StudioAssetsWorkspaceRefreshFailedEvent.class).handle(event -> { appendLine("[error] " + event.message()); }); - eventBindings.listen(Container.eventBus(), StudioPackerOperationEvent.class).handle(event -> { + eventBindings.listen(eventBus, StudioPackerOperationEvent.class).handle(event -> { appendLine("[" + event.kind().name().toLowerCase() + "] " + event.summary()); }); } diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/AssetWorkspace.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/AssetWorkspace.java similarity index 61% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/AssetWorkspace.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/AssetWorkspace.java index 32d72a5e..02f742bf 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/AssetWorkspace.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/AssetWorkspace.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets; +package p.studio.ui.javafx.workspaces.assets; import javafx.geometry.Pos; import javafx.scene.Node; @@ -8,18 +8,30 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.VBox; -import p.studio.Container; -import p.studio.projectstate.ProjectLocalStudioState; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.Workspace; -import p.studio.workspaces.WorkspaceId; -import p.studio.workspaces.assets.details.AssetDetailsControl; -import p.studio.workspaces.assets.list.AssetListControl; -import p.studio.workspaces.assets.messages.events.StudioAssetsRefreshRequestedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceSelectionRequestedEvent; -import p.studio.workspaces.assets.wizards.AddAssetWizard; -import p.studio.workspaces.assets.wizards.PackWorkspaceWizard; +import p.studio.api.assets.AssetCatalog; +import p.studio.api.assets.AssetCommands; +import p.studio.api.assets.AssetPacking; +import p.studio.api.assets.AssetDetails; +import p.studio.api.assets.AssetCreationCatalog; +import p.studio.api.assets.AssetWorkspaceStorage; +import p.studio.api.assets.AssetCapacityPolicy; +import p.studio.api.assets.schema.AssetColorSchemaFactory; +import p.studio.api.assets.bank.AssetBankCompositionSessionFactory; +import p.studio.api.assets.metadata.AssetMetadataService; +import p.studio.api.assets.scene.SceneBankWorkflow; +import p.studio.api.assets.tiled.TiledAssetService; +import p.studio.api.project.ProjectLocalStudioState; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.workspaces.Workspace; +import p.studio.ui.javafx.workspaces.WorkspaceId; +import p.studio.ui.javafx.workspaces.assets.details.AssetDetailsControl; +import p.studio.ui.javafx.workspaces.assets.list.AssetListControl; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsRefreshRequestedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceSelectionRequestedEvent; +import p.studio.ui.javafx.workspaces.assets.wizards.AddAssetWizard; +import p.studio.ui.javafx.workspaces.assets.wizards.PackWorkspaceWizard; +import p.studio.ui.javafx.events.StudioEventBus; import java.util.List; @@ -32,12 +44,48 @@ public final class AssetWorkspace extends Workspace { private Runnable stateChangedAction = () -> { }; private ProjectLocalStudioState.AssetsLayoutState pendingAssetsLayoutState = ProjectLocalStudioState.AssetsLayoutState.defaults(); private boolean applyingPendingLayoutState; + private final java.util.concurrent.Executor executor; + private final p.studio.ui.javafx.utilities.i18n.I18nService i18n; + private final p.studio.ui.javafx.utilities.ThemeService theme; + private final AssetCommands assetCommands; + private final AssetPacking assetPacking; + private final AssetCreationCatalog assetCreationCatalog; + private final AssetMetadataService assetMetadataService; + private final AssetWorkspaceStorage assetWorkspaceStorage; + private final AssetCapacityPolicy assetCapacityPolicy; - public AssetWorkspace(final ProjectReference projectReference) { - super(projectReference); - this.assetListControl = new AssetListControl(this.projectReference, this.workspaceEventBus); - this.detailsControl = new AssetDetailsControl(this.projectReference, this.workspaceEventBus); - this.logsPane = new AssetLogsPane(this.workspaceEventBus); + public AssetWorkspace(final ProjectReference projectReference, final StudioEventBus eventBus, + final p.studio.ui.javafx.utilities.i18n.I18nService i18n, + final java.util.concurrent.Executor executor, + final p.studio.ui.javafx.utilities.ThemeService theme, + final AssetCatalog assetCatalog, + final AssetCommands assetCommands, + final AssetPacking assetPacking, + final AssetDetails assetDetails, + final AssetCreationCatalog assetCreationCatalog, + final AssetMetadataService assetMetadataService, + final AssetWorkspaceStorage assetWorkspaceStorage, + final AssetCapacityPolicy assetCapacityPolicy, + final AssetBankCompositionSessionFactory bankCompositionSessionFactory, + final AssetColorSchemaFactory assetColorSchemaFactory, + final TiledAssetService tiledAssetService, + final SceneBankWorkflow sceneBankWorkflow) { + super(projectReference, eventBus); + this.executor = executor; + this.i18n = i18n; + this.theme = theme; + this.assetCommands = java.util.Objects.requireNonNull(assetCommands, "assetCommands"); + this.assetPacking = java.util.Objects.requireNonNull(assetPacking, "assetPacking"); + this.assetCreationCatalog = java.util.Objects.requireNonNull(assetCreationCatalog, "assetCreationCatalog"); + this.assetMetadataService = java.util.Objects.requireNonNull(assetMetadataService, "assetMetadataService"); + this.assetWorkspaceStorage = java.util.Objects.requireNonNull(assetWorkspaceStorage, "assetWorkspaceStorage"); + this.assetCapacityPolicy = java.util.Objects.requireNonNull(assetCapacityPolicy, "assetCapacityPolicy"); + this.assetListControl = new AssetListControl(this.projectReference, this.workspaceEventBus, i18n, executor, assetCatalog); + this.detailsControl = new AssetDetailsControl(this.projectReference, this.workspaceEventBus, i18n, executor, theme, + assetCatalog, assetCommands, assetDetails, assetMetadataService, assetCapacityPolicy, + bankCompositionSessionFactory, assetColorSchemaFactory, tiledAssetService, + sceneBankWorkflow); + this.logsPane = new AssetLogsPane(this.workspaceEventBus, eventBus, i18n); root.getStyleClass().add("assets-workspace"); root.setCenter(buildLayout()); root.setBottom(logsPane.getPane()); @@ -70,7 +118,7 @@ public final class AssetWorkspace extends Workspace { } @Override - public List lifecycleParticipants() { + public List lifecycleParticipants() { return List.of(assetListControl, detailsControl, logsPane); } @@ -130,7 +178,7 @@ public final class AssetWorkspace extends Workspace { private Button createRefreshButton() { final var refreshButton = new Button(); - refreshButton.textProperty().bind(Container.i18n().bind(I18n.ASSETS_NAVIGATOR_ACTION_REFRESH)); + refreshButton.textProperty().bind(i18n.bind(I18n.ASSETS_NAVIGATOR_ACTION_REFRESH)); refreshButton.getStyleClass().addAll("studio-button", "studio-button-primary", "assets-workspace-action-button"); refreshButton.setMaxWidth(Double.MAX_VALUE); refreshButton.setOnAction(event -> refreshAssets()); @@ -143,7 +191,7 @@ public final class AssetWorkspace extends Workspace { private Button createAddAssetButton() { final var addAssetButton = new Button(); - addAssetButton.textProperty().bind(Container.i18n().bind(I18n.ASSETS_NAVIGATOR_ACTION_ADD)); + addAssetButton.textProperty().bind(i18n.bind(I18n.ASSETS_NAVIGATOR_ACTION_ADD)); addAssetButton.getStyleClass().addAll( "studio-button", "studio-button-secondary", @@ -155,7 +203,7 @@ public final class AssetWorkspace extends Workspace { private Button createPackButton() { final var packButton = new Button(); - packButton.textProperty().bind(Container.i18n().bind(I18n.ASSETS_NAVIGATOR_ACTION_PACK)); + packButton.textProperty().bind(i18n.bind(I18n.ASSETS_NAVIGATOR_ACTION_PACK)); packButton.getStyleClass().addAll( "studio-button", "studio-button-secondary", @@ -168,7 +216,8 @@ public final class AssetWorkspace extends Workspace { if (root.getScene() == null) { return; } - AddAssetWizard.showAndWait(root.getScene().getWindow(), projectReference).ifPresent(assetReference -> { + AddAssetWizard.showAndWait(root.getScene().getWindow(), projectReference, executor, i18n, theme, + assetCommands, assetCreationCatalog, assetMetadataService, assetWorkspaceStorage).ifPresent(assetReference -> { workspaceEventBus.publish(new StudioAssetsRefreshRequestedEvent(assetReference)); }); } @@ -177,7 +226,8 @@ public final class AssetWorkspace extends Workspace { if (root.getScene() == null) { return; } - PackWorkspaceWizard.showAndWait(root.getScene().getWindow(), projectReference); + PackWorkspaceWizard.showAndWait(root.getScene().getWindow(), projectReference, i18n, theme, + assetPacking, assetCapacityPolicy); } private SplitPane createAssetSplitPane() { diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/AssetWorkspaceState.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/AssetWorkspaceState.java similarity index 93% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/AssetWorkspaceState.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/AssetWorkspaceState.java index 824ffaf3..5dca1e27 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/AssetWorkspaceState.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/AssetWorkspaceState.java @@ -1,8 +1,8 @@ -package p.studio.workspaces.assets; +package p.studio.ui.javafx.workspaces.assets; -import p.packer.messages.AssetReference; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary; -import p.studio.workspaces.assets.messages.AssetWorkspaceStatus; +import p.studio.api.assets.AssetReference; +import p.studio.api.assets.workspace.AssetWorkspaceAssetSummary; +import p.studio.ui.javafx.workspaces.assets.messages.AssetWorkspaceStatus; import java.util.Comparator; import java.util.List; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetDetailsControl.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/AssetDetailsControl.java similarity index 73% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetDetailsControl.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/AssetDetailsControl.java index 541533a6..e4fb5dae 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetDetailsControl.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/AssetDetailsControl.java @@ -1,4 +1,6 @@ -package p.studio.workspaces.assets.details; +package p.studio.ui.javafx.workspaces.assets.details; + +import p.studio.api.assets.workspace.*; import javafx.application.Platform; import javafx.scene.Node; @@ -6,43 +8,44 @@ import javafx.scene.control.*; import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.VBox; -import org.apache.commons.collections4.CollectionUtils; -import p.packer.dtos.PackerAssetActionAvailabilityDTO; -import p.packer.dtos.PackerAssetDetailsDTO; -import p.packer.dtos.PackerDiagnosticDTO; -import p.packer.messages.*; -import p.packer.messages.assets.AssetFamilyCatalog; -import p.studio.Container; -import p.studio.controls.forms.StudioFormEditScopeChangedEvent; -import p.studio.controls.forms.StudioSection; -import p.studio.lsp.events.StudioWorkspaceEventBus; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.details.bank.AssetDetailsBankCompositionControl; -import p.studio.workspaces.assets.details.contract.AssetDetailsContractControl; -import p.studio.workspaces.assets.details.palette.AssetDetailsPaletteOverhaulingControl; -import p.studio.workspaces.assets.details.scene.AssetDetailsSceneLayersControl; -import p.studio.workspaces.assets.details.schema.AssetDetailsColorSchemaGroupsControl; -import p.studio.workspaces.assets.details.summary.AssetDetailsSummaryControl; -import p.studio.workspaces.assets.dialogs.AssetDiagnosticsDialog; -import p.studio.workspaces.assets.messages.*; -import p.studio.workspaces.assets.messages.events.*; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphSpecialization; -import p.studio.workspaces.assets.metadata.AssetStudioMetadataService; -import p.studio.workspaces.assets.metadata.AssetStudioMetadataSnapshot; -import p.studio.workspaces.assets.scene.SceneBankWorkflowResult; -import p.studio.workspaces.assets.scene.SceneBankWorkflowService; -import p.studio.workspaces.assets.tiled.TiledAssetGenerationResult; -import p.studio.workspaces.assets.tiled.TiledAssetGenerationService; -import p.studio.workspaces.assets.tiled.TiledAssetGenerationService.SceneTmxExportDisposition; -import p.studio.workspaces.assets.wizards.DeleteAssetDialog; -import p.studio.workspaces.assets.wizards.MoveAssetWizard; -import p.studio.workspaces.framework.StudioEventAware; -import p.studio.workspaces.framework.StudioEventBindings; +import p.studio.api.assets.AssetDiagnostic; +import p.studio.api.assets.AssetFamily; +import p.studio.ui.javafx.controls.forms.StudioFormEditScopeChangedEvent; +import p.studio.api.assets.AssetReference; +import p.studio.api.assets.AssetCatalog; +import p.studio.api.assets.AssetCommands; +import p.studio.api.assets.AssetMutationResult; +import p.studio.api.assets.AssetDetails; +import p.studio.api.assets.AssetDetailsSnapshot; +import p.studio.api.assets.AssetCapacityPolicy; +import p.studio.api.assets.schema.AssetColorSchemaFactory; +import p.studio.api.assets.bank.AssetBankCompositionSessionFactory; +import p.studio.ui.javafx.controls.forms.StudioSection; +import p.studio.ui.javafx.events.StudioWorkspaceEventBus; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.workspaces.assets.details.bank.AssetDetailsBankCompositionControl; +import p.studio.ui.javafx.workspaces.assets.details.contract.AssetDetailsContractControl; +import p.studio.ui.javafx.workspaces.assets.details.palette.AssetDetailsPaletteOverhaulingControl; +import p.studio.ui.javafx.workspaces.assets.details.scene.AssetDetailsSceneLayersControl; +import p.studio.ui.javafx.workspaces.assets.details.schema.AssetDetailsColorSchemaGroupsControl; +import p.studio.ui.javafx.workspaces.assets.details.summary.AssetDetailsSummaryControl; +import p.studio.ui.javafx.workspaces.assets.dialogs.AssetDiagnosticsDialog; +import p.studio.ui.javafx.workspaces.assets.messages.*; +import p.studio.ui.javafx.workspaces.assets.messages.events.*; +import p.studio.api.assets.metadata.AssetStudioGlyphSpecialization; +import p.studio.api.assets.metadata.AssetMetadataService; +import p.studio.api.assets.metadata.AssetStudioMetadataSnapshot; +import p.studio.api.assets.scene.SceneBankWorkflow; +import p.studio.api.assets.scene.SceneBankWorkflowResult; +import p.studio.api.assets.tiled.SceneTmxExportDisposition; +import p.studio.api.assets.tiled.TiledAssetGenerationResult; +import p.studio.api.assets.tiled.TiledAssetService; +import p.studio.ui.javafx.workspaces.assets.wizards.DeleteAssetDialog; +import p.studio.ui.javafx.workspaces.assets.wizards.MoveAssetWizard; +import p.studio.ui.javafx.workspaces.framework.StudioEventAware; +import p.studio.ui.javafx.workspaces.framework.StudioEventBindings; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.LinkedHashSet; import java.util.List; import java.util.Objects; import java.util.concurrent.atomic.AtomicLong; @@ -63,14 +66,19 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware private final AssetDetailsColorSchemaGroupsControl colorSchemaGroupsControl; private final AssetDetailsPaletteOverhaulingControl paletteOverhaulingControl; private final AssetDetailsSceneLayersControl sceneLayersControl; - private final AssetStudioMetadataService studioMetadataService = new AssetStudioMetadataService(); - private final TiledAssetGenerationService tiledGenerationService = new TiledAssetGenerationService(); - private final SceneBankWorkflowService sceneBankWorkflowService = new SceneBankWorkflowService(); + private final AssetMetadataService studioMetadataService; + private final TiledAssetService tiledGenerationService; + private final SceneBankWorkflow sceneBankWorkflowService; private final VBox actionsContent = new VBox(10); private final ScrollPane actionsScroll = new ScrollPane(); private final VBox actionsSection; private final HBox primarySectionsRow = new HBox(12); private final AtomicLong loadGeneration = new AtomicLong(); + private final java.util.concurrent.Executor executor; + private final p.studio.ui.javafx.utilities.i18n.I18nService i18n; + private final p.studio.ui.javafx.utilities.ThemeService theme; + private final AssetCommands assetCommands; + private final AssetDetails assetDetails; private AssetWorkspaceDetailsViewState viewState = AssetDetailsViewStateFactory.empty(); private boolean readyMounted; @@ -79,15 +87,39 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware public AssetDetailsControl( ProjectReference projectReference, - StudioWorkspaceEventBus workspaceBus) { + StudioWorkspaceEventBus workspaceBus, + p.studio.ui.javafx.utilities.i18n.I18nService i18n, + java.util.concurrent.Executor executor, + p.studio.ui.javafx.utilities.ThemeService theme, + AssetCatalog assetCatalog, + AssetCommands assetCommands, + AssetDetails assetDetails, + AssetMetadataService assetMetadataService, + AssetCapacityPolicy assetCapacityPolicy, + AssetBankCompositionSessionFactory bankCompositionSessionFactory, + AssetColorSchemaFactory assetColorSchemaFactory, + TiledAssetService tiledAssetService, + SceneBankWorkflow sceneBankWorkflow) { this.projectReference = Objects.requireNonNull(projectReference, "projectReference"); this.workspaceBus = Objects.requireNonNull(workspaceBus, "workspaceBus"); - this.summaryControl = new AssetDetailsSummaryControl(projectReference, workspaceBus); - this.contractControl = new AssetDetailsContractControl(projectReference, workspaceBus); - this.bankCompositionControl = new AssetDetailsBankCompositionControl(projectReference, workspaceBus); - this.colorSchemaGroupsControl = new AssetDetailsColorSchemaGroupsControl(projectReference, workspaceBus); - this.paletteOverhaulingControl = new AssetDetailsPaletteOverhaulingControl(projectReference, workspaceBus); - this.sceneLayersControl = new AssetDetailsSceneLayersControl(projectReference, workspaceBus); + this.executor = Objects.requireNonNull(executor, "executor"); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.theme = Objects.requireNonNull(theme, "theme"); + this.assetCommands = Objects.requireNonNull(assetCommands, "assetCommands"); + this.assetDetails = Objects.requireNonNull(assetDetails, "assetDetails"); + this.studioMetadataService = Objects.requireNonNull(assetMetadataService, "assetMetadataService"); + this.tiledGenerationService = Objects.requireNonNull(tiledAssetService, "tiledAssetService"); + this.sceneBankWorkflowService = Objects.requireNonNull(sceneBankWorkflow, "sceneBankWorkflow"); + this.summaryControl = new AssetDetailsSummaryControl(projectReference, workspaceBus, i18n); + this.contractControl = new AssetDetailsContractControl(projectReference, workspaceBus, i18n, executor, assetCommands); + this.bankCompositionControl = new AssetDetailsBankCompositionControl(projectReference, workspaceBus, i18n, executor, + assetDetails, assetCommands, bankCompositionSessionFactory); + this.colorSchemaGroupsControl = new AssetDetailsColorSchemaGroupsControl(projectReference, workspaceBus, i18n, executor, + assetMetadataService, assetColorSchemaFactory); + this.paletteOverhaulingControl = new AssetDetailsPaletteOverhaulingControl(projectReference, workspaceBus, i18n, executor, theme, + assetCommands, assetMetadataService, assetColorSchemaFactory); + this.sceneLayersControl = new AssetDetailsSceneLayersControl(projectReference, workspaceBus, i18n, executor, assetCatalog, + assetMetadataService); this.actionsSection = createActionsSection(); getStyleClass().add("assets-workspace-pane"); @@ -152,7 +184,7 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware actionRunning = false; actionFeedbackMessage = null; publishViewState(AssetDetailsViewStateFactory.loading(assetReference)); - Container.backgroundTasks().submit(() -> loadDetails(generation, assetReference)); + executor.execute(() -> loadDetails(generation, assetReference)); } private void clearSelection() { @@ -172,18 +204,7 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware private void loadDetails(long generation, AssetReference assetReference) { try { - final var workspaceService = Container.packer().workspaceService(); - final var response = workspaceService - .getAssetDetails(new GetAssetDetailsRequest( - projectReference.toPackerProjectContext(), - assetReference)); - final var actionsResponse = workspaceService.getAssetActions(new GetAssetActionsRequest( - projectReference.toPackerProjectContext(), - assetReference)); - final AssetWorkspaceAssetDetails details = mapDetails( - response.details(), - response.diagnostics(), - actionsResponse.actions()); + final AssetWorkspaceAssetDetails details = mapDetails(assetDetails.get(projectReference, assetReference)); Platform.runLater(() -> applyLoadedDetails(generation, assetReference, details)); } catch (RuntimeException exception) { Platform.runLater(() -> applyLoadFailure(generation, assetReference, exception)); @@ -207,9 +228,7 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware if (generation != loadGeneration.get()) { return; } - final String message = exception.getMessage() == null || exception.getMessage().isBlank() - ? Container.i18n().text(I18n.ASSETS_DETAILS_EMPTY) - : exception.getMessage(); + final String message = i18n.text(I18n.ASSETS_DETAILS_EMPTY); publishViewState(AssetDetailsViewStateFactory.error(assetReference, message)); } @@ -235,24 +254,24 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware case EMPTY -> { readyMounted = false; setDetailsTitle(null); - setWorkspaceSummary(Container.i18n().text(I18n.ASSETS_SUMMARY_EMPTY)); + setWorkspaceSummary(i18n.text(I18n.ASSETS_SUMMARY_EMPTY)); renderActions(); - detailsContent.getChildren().setAll(AssetDetailsUiSupport.createSectionMessage(Container.i18n().text(I18n.ASSETS_DETAILS_NO_SELECTION))); + detailsContent.getChildren().setAll(AssetDetailsUiSupport.createSectionMessage(i18n.text(I18n.ASSETS_DETAILS_NO_SELECTION))); } case LOADING -> { readyMounted = false; setDetailsTitle(null); - setWorkspaceSummary(Container.i18n().text(I18n.ASSETS_SUMMARY_LOADING)); + setWorkspaceSummary(i18n.text(I18n.ASSETS_SUMMARY_LOADING)); renderActions(); - detailsContent.getChildren().setAll(AssetDetailsUiSupport.createSectionMessage(Container.i18n().text(I18n.ASSETS_DETAILS_LOADING))); + detailsContent.getChildren().setAll(AssetDetailsUiSupport.createSectionMessage(i18n.text(I18n.ASSETS_DETAILS_LOADING))); } case ERROR -> { readyMounted = false; setDetailsTitle(null); - setWorkspaceSummary(Container.i18n().text(I18n.ASSETS_SUMMARY_ERROR)); + setWorkspaceSummary(i18n.text(I18n.ASSETS_SUMMARY_ERROR)); renderActions(); detailsContent.getChildren().setAll(AssetDetailsUiSupport.createSectionMessage( - Objects.requireNonNullElse(viewState.detailsErrorMessage(), Container.i18n().text(I18n.ASSETS_DETAILS_EMPTY)))); + Objects.requireNonNullElse(viewState.detailsErrorMessage(), i18n.text(I18n.ASSETS_DETAILS_EMPTY)))); } case READY -> { if (viewState.selectedAssetDetails() == null) { @@ -260,7 +279,7 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware setDetailsTitle(null); setWorkspaceSummary(null); renderActions(); - detailsContent.getChildren().setAll(AssetDetailsUiSupport.createSectionMessage(Container.i18n().text(I18n.ASSETS_DETAILS_NO_SELECTION))); + detailsContent.getChildren().setAll(AssetDetailsUiSupport.createSectionMessage(i18n.text(I18n.ASSETS_DETAILS_NO_SELECTION))); return; } @@ -293,17 +312,17 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware } private boolean hidesBankComposition(AssetWorkspaceAssetDetails details) { - return details != null && details.summary().assetFamily() == AssetFamilyCatalog.SCENE_BANK; + return details != null && details.summary().assetFamily() == AssetFamily.SCENE_BANK; } private boolean showsSceneLayers(AssetWorkspaceAssetDetails details) { return details != null - && details.summary().assetFamily() == AssetFamilyCatalog.SCENE_BANK + && details.summary().assetFamily() == AssetFamily.SCENE_BANK && details.sceneBankMetadata() != null; } private boolean showsColorSchemaGroups(AssetWorkspaceAssetDetails details) { - return details != null && details.summary().assetFamily() == AssetFamilyCatalog.GLYPH_BANK; + return details != null && details.summary().assetFamily() == AssetFamily.GLYPH_BANK; } private VBox createActionsSection() { @@ -347,7 +366,7 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware private java.util.List buildActionNodes() { final java.util.List nodes = new java.util.ArrayList<>(); if (viewState.selectedAssetDetails() == null) { - nodes.add(AssetDetailsUiSupport.createSectionMessage(Container.i18n().text(I18n.ASSETS_ACTIONS_EMPTY))); + nodes.add(AssetDetailsUiSupport.createSectionMessage(i18n.text(I18n.ASSETS_ACTIONS_EMPTY))); return nodes; } final var visibleActions = viewState.selectedAssetDetails().actions().stream() @@ -355,28 +374,28 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware .toList(); if (visibleActions.isEmpty() && viewState.selectedAssetDetails().diagnostics().isEmpty() - && viewState.selectedAssetDetails().summary().state() == p.studio.workspaces.assets.messages.AssetWorkspaceAssetState.UNREGISTERED) { - nodes.add(AssetDetailsUiSupport.createSectionMessage(Container.i18n().text(I18n.ASSETS_ACTIONS_EMPTY))); + && viewState.selectedAssetDetails().summary().state() == p.studio.api.assets.workspace.AssetWorkspaceAssetState.UNREGISTERED) { + nodes.add(AssetDetailsUiSupport.createSectionMessage(i18n.text(I18n.ASSETS_ACTIONS_EMPTY))); return nodes; } - final Button analyseButton = AssetDetailsUiSupport.createActionButton(Container.i18n().text(I18n.ASSETS_ACTION_ANALYSE)); + final Button analyseButton = AssetDetailsUiSupport.createActionButton(i18n.text(I18n.ASSETS_ACTION_ANALYSE)); AssetDetailsUiSupport.applyActionTone(analyseButton, "studio-button-warning"); analyseButton.setDisable(actionRunning || viewState.selectedAssetDetails().diagnostics().isEmpty()); analyseButton.setOnAction(ignored -> openDiagnosticsDialog()); nodes.add(analyseButton); if (canGenerateTsx()) { - final Button exportTsxButton = AssetDetailsUiSupport.createActionButton(Container.i18n().text(I18n.ASSETS_ACTION_EXPORT_TSX)); + final Button exportTsxButton = AssetDetailsUiSupport.createActionButton(i18n.text(I18n.ASSETS_ACTION_EXPORT_TSX)); exportTsxButton.setDisable(actionRunning); exportTsxButton.setOnAction(ignored -> generateTsx()); nodes.add(exportTsxButton); } if (canSceneTmxInteroperability()) { - final Button importTmxButton = AssetDetailsUiSupport.createActionButton(Container.i18n().text(I18n.ASSETS_ACTION_IMPORT_TMX)); + final Button importTmxButton = AssetDetailsUiSupport.createActionButton(i18n.text(I18n.ASSETS_ACTION_IMPORT_TMX)); importTmxButton.setDisable(actionRunning); importTmxButton.setOnAction(ignored -> importTmx()); nodes.add(importTmxButton); - final Button exportTmxButton = AssetDetailsUiSupport.createActionButton(Container.i18n().text(I18n.ASSETS_ACTION_EXPORT_TMX)); + final Button exportTmxButton = AssetDetailsUiSupport.createActionButton(i18n.text(I18n.ASSETS_ACTION_EXPORT_TMX)); exportTmxButton.setDisable(actionRunning); exportTmxButton.setOnAction(ignored -> exportTmx()); nodes.add(exportTmxButton); @@ -393,13 +412,13 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware final var orderedActions = visibleActions.stream() .sorted(comparingInt(action -> switch (action.action()) { - case DELETE -> 2; + case "DELETE" -> 2; default -> 1; })) .toList(); for (AssetWorkspaceAssetAction action : orderedActions) { - final Button button = AssetDetailsUiSupport.createActionButton(AssetDetailsUiSupport.actionLabel(action.action())); - if (action.action() == p.packer.messages.assets.AssetAction.DELETE) { + final Button button = AssetDetailsUiSupport.createActionButton(AssetDetailsUiSupport.actionLabel(i18n, action.action())); + if ("DELETE".equals(action.action())) { AssetDetailsUiSupport.applyActionTone(button, "studio-button-danger"); } button.setDisable(actionRunning || !action.enabled()); @@ -414,14 +433,15 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware return; } switch (action.action()) { - case REGISTER -> { + case "REGISTER" -> { actionRunning = true; actionFeedbackMessage = null; renderActions(); - Container.backgroundTasks().submit(() -> registerSelectedAsset(viewState.selectedAssetReference())); + executor.execute(() -> registerSelectedAsset(viewState.selectedAssetReference())); } - case MOVE -> openMoveWizard(); - case DELETE -> confirmDeleteAction(); + case "MOVE" -> openMoveWizard(); + case "DELETE" -> confirmDeleteAction(); + default -> throw new IllegalArgumentException("Unsupported asset action: " + action.action()); } } @@ -433,7 +453,8 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware getScene().getWindow(), projectReference, viewState.selectedAssetReference(), - viewState.selectedAssetDetails().summary()).ifPresent(assetReference -> { + viewState.selectedAssetDetails().summary(), + executor, i18n, theme, assetCommands).ifPresent(assetReference -> { workspaceBus.publish(new StudioAssetsRefreshRequestedEvent(assetReference)); }); } @@ -444,7 +465,7 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware } final boolean confirmed = DeleteAssetDialog.showAndWait( getScene().getWindow(), - viewState.selectedAssetDetails().summary().assetName()); + viewState.selectedAssetDetails().summary().assetName(), i18n, theme); if (!confirmed) { return; } @@ -452,7 +473,7 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware actionFeedbackMessage = null; renderActions(); final AssetReference assetReference = viewState.selectedAssetReference(); - Container.backgroundTasks().submit(() -> deleteSelectedAsset(assetReference)); + executor.execute(() -> deleteSelectedAsset(assetReference)); } private void openDiagnosticsDialog() { @@ -463,18 +484,20 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware getScene().getWindow(), projectReference, viewState.selectedAssetDetails().summary().assetName(), - viewState.selectedAssetDetails().diagnostics()); + viewState.selectedAssetDetails().diagnostics(), + i18n, + theme); } private boolean canToggleBuildParticipation() { return viewState.selectedAssetDetails() != null - && viewState.selectedAssetDetails().summary().state() == p.studio.workspaces.assets.messages.AssetWorkspaceAssetState.REGISTERED + && viewState.selectedAssetDetails().summary().state() == p.studio.api.assets.workspace.AssetWorkspaceAssetState.REGISTERED && (!isSceneBankAwaitingActiveLayerForBuild()); } private boolean isSceneBankAwaitingActiveLayerForBuild() { return viewState.selectedAssetDetails() != null - && viewState.selectedAssetDetails().summary().assetFamily() == AssetFamilyCatalog.SCENE_BANK + && viewState.selectedAssetDetails().summary().assetFamily() == AssetFamily.SCENE_BANK && currentBuildParticipation() != AssetWorkspaceBuildParticipation.INCLUDED && (viewState.selectedAssetDetails().sceneBankMetadata() == null || viewState.selectedAssetDetails().sceneBankMetadata().enabledLayerCount() == 0); @@ -486,8 +509,8 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware private String buildParticipationActionLabel() { return currentBuildParticipation() == AssetWorkspaceBuildParticipation.INCLUDED - ? Container.i18n().text(I18n.ASSETS_ACTION_EXCLUDE_FROM_BUILD) - : Container.i18n().text(I18n.ASSETS_ACTION_INCLUDE_IN_BUILD); + ? i18n.text(I18n.ASSETS_ACTION_EXCLUDE_FROM_BUILD) + : i18n.text(I18n.ASSETS_ACTION_INCLUDE_IN_BUILD); } private void updateBuildParticipation() { @@ -499,13 +522,10 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware renderActions(); final AssetReference assetReference = viewState.selectedAssetReference(); final boolean includeInBuild = currentBuildParticipation() != AssetWorkspaceBuildParticipation.INCLUDED; - Container.backgroundTasks().submit(() -> { + executor.execute(() -> { try { - final UpdateAssetBuildParticipationResult result = Container.packer().workspaceService() - .updateAssetBuildParticipation(new UpdateAssetBuildParticipationRequest( - projectReference.toPackerProjectContext(), - assetReference, - includeInBuild)); + final AssetMutationResult result = assetCommands.updateBuildParticipation( + projectReference, assetReference, includeInBuild); Platform.runLater(() -> applyBuildParticipationResult(result)); } catch (RuntimeException exception) { Platform.runLater(() -> applyBuildParticipationFailure(exception)); @@ -515,13 +535,13 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware private boolean canGenerateTsx() { return viewState.selectedAssetDetails() != null - && viewState.selectedAssetDetails().summary().assetFamily() == p.packer.messages.assets.AssetFamilyCatalog.GLYPH_BANK + && viewState.selectedAssetDetails().summary().assetFamily() == AssetFamily.GLYPH_BANK && viewState.selectedAssetDetails().summary().glyphSpecialization() == AssetStudioGlyphSpecialization.TILESET; } private boolean canSceneTmxInteroperability() { return viewState.selectedAssetDetails() != null - && viewState.selectedAssetDetails().summary().assetFamily() == AssetFamilyCatalog.SCENE_BANK + && viewState.selectedAssetDetails().summary().assetFamily() == AssetFamily.SCENE_BANK && viewState.selectedAssetDetails().sceneBankMetadata() != null; } @@ -533,7 +553,7 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware actionFeedbackMessage = null; renderActions(); final AssetWorkspaceAssetDetails details = viewState.selectedAssetDetails(); - Container.backgroundTasks().submit(() -> { + executor.execute(() -> { final TiledAssetGenerationResult result = tiledGenerationService.exportTilesetTsx(details); Platform.runLater(() -> applyTiledGenerationResult("glyph-bank-tileset-export", result)); }); @@ -550,15 +570,14 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware } actionRunning = true; actionFeedbackMessage = null; - Container.backgroundTasks().submit(() -> { + executor.execute(() -> { final TiledAssetGenerationResult result = tiledGenerationService.exportSceneBankTmx(projectReference, details, disposition); Platform.runLater(() -> applyTiledGenerationResult("scene-bank-tmx-export", result)); }); } private SceneTmxExportDisposition chooseSceneTmxExportDisposition(AssetWorkspaceAssetDetails details) { - final Path sceneTmxPath = resolveSceneTmxPath(details); - if (sceneTmxPath == null || !Files.isRegularFile(sceneTmxPath)) { + if (!tiledGenerationService.sceneTmxExists(details)) { return SceneTmxExportDisposition.OVERWRITE; } final Alert alert = new Alert(Alert.AlertType.CONFIRMATION); @@ -582,23 +601,6 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware return null; } - private Path resolveSceneTmxPath(AssetWorkspaceAssetDetails details) { - if (details == null || details.sceneBankMetadata() == null) { - return null; - } - final LinkedHashSet tilemaps = new LinkedHashSet<>(); - details.sceneBankMetadata().layerBindings().forEach(binding -> { - final String tilemap = Objects.requireNonNullElse(binding.tilemap(), "").trim(); - if (!tilemap.isBlank()) { - tilemaps.add(tilemap); - } - }); - if (tilemaps.size() != 1) { - return null; - } - return details.summary().assetRoot().resolve(tilemaps.getFirst()); - } - private void importTmx() { if (actionRunning || viewState.selectedAssetDetails() == null) { return; @@ -606,7 +608,7 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware actionRunning = true; actionFeedbackMessage = null; final AssetWorkspaceAssetDetails details = viewState.selectedAssetDetails(); - Container.backgroundTasks().submit(() -> { + executor.execute(() -> { final TiledAssetGenerationResult result = tiledGenerationService.importSceneBankTmx(projectReference, details); Platform.runLater(() -> applyTiledGenerationResult("scene-bank-tmx-import", result)); }); @@ -617,7 +619,7 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware actionFeedbackMessage = result.message(); workspaceBus.publish(new StudioAssetLogEvent(source, result.message())); if (result.success()) { - if (CollectionUtils.isNotEmpty(result.updatedBindings())) { + if (result.updatedBindings() != null && !result.updatedBindings().isEmpty()) { final var sceneBankMetadata = viewState.selectedAssetDetails().sceneBankMetadata().withUpdatedBindings(result.updatedBindings()); final var updatedAssetDetails = viewState.selectedAssetDetails().withSceneBankMetadata(sceneBankMetadata); viewState = viewState.withSelectedAssetReference(updatedAssetDetails); @@ -626,9 +628,9 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware } } - private void applyBuildParticipationResult(UpdateAssetBuildParticipationResult result) { + private void applyBuildParticipationResult(AssetMutationResult result) { actionRunning = false; - if (result.status() == p.packer.messages.PackerOperationStatus.SUCCESS && result.assetReference() != null) { + if (result.successful() && result.assetReference() != null) { actionFeedbackMessage = null; workspaceBus.publish(new StudioAssetsRefreshRequestedEvent(result.assetReference())); return; @@ -639,26 +641,22 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware private void applyBuildParticipationFailure(RuntimeException exception) { actionRunning = false; - actionFeedbackMessage = exception.getMessage() == null || exception.getMessage().isBlank() - ? "Unable to update asset build participation." - : exception.getMessage(); + actionFeedbackMessage = "Unable to update asset build participation."; renderActions(); } private void registerSelectedAsset(AssetReference assetReference) { try { - final RegisterAssetResult result = Container.packer().workspaceService().registerAsset(new RegisterAssetRequest( - projectReference.toPackerProjectContext(), - assetReference)); + final AssetMutationResult result = assetCommands.register(projectReference, assetReference); Platform.runLater(() -> applyRegisterResult(result)); } catch (RuntimeException exception) { Platform.runLater(() -> applyRegisterFailure(exception)); } } - private void applyRegisterResult(RegisterAssetResult result) { + private void applyRegisterResult(AssetMutationResult result) { actionRunning = false; - if (result.status() == p.packer.messages.PackerOperationStatus.SUCCESS && result.assetReference() != null) { + if (result.successful() && result.assetReference() != null) { actionFeedbackMessage = null; workspaceBus.publish(new StudioAssetsRefreshRequestedEvent(result.assetReference())); return; @@ -669,26 +667,22 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware private void applyRegisterFailure(RuntimeException exception) { actionRunning = false; - actionFeedbackMessage = exception.getMessage() == null || exception.getMessage().isBlank() - ? "Unable to register asset." - : exception.getMessage(); + actionFeedbackMessage = "Unable to register asset."; renderActions(); } private void deleteSelectedAsset(AssetReference assetReference) { try { - final DeleteAssetResult result = Container.packer().workspaceService().deleteAsset(new DeleteAssetRequest( - projectReference.toPackerProjectContext(), - assetReference)); + final AssetMutationResult result = assetCommands.delete(projectReference, assetReference); Platform.runLater(() -> applyDeleteResult(result)); } catch (RuntimeException exception) { Platform.runLater(() -> applyDeleteFailure(exception)); } } - private void applyDeleteResult(DeleteAssetResult result) { + private void applyDeleteResult(AssetMutationResult result) { actionRunning = false; - if (result.status() == p.packer.messages.PackerOperationStatus.SUCCESS) { + if (result.successful()) { actionFeedbackMessage = null; workspaceBus.publish(new StudioAssetsRefreshRequestedEvent()); return; @@ -699,29 +693,24 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware private void applyDeleteFailure(RuntimeException exception) { actionRunning = false; - actionFeedbackMessage = exception.getMessage() == null || exception.getMessage().isBlank() - ? "Unable to delete asset." - : exception.getMessage(); + actionFeedbackMessage = "Unable to delete asset."; renderActions(); } - private AssetWorkspaceAssetDetails mapDetails( - PackerAssetDetailsDTO details, - java.util.List diagnostics, - java.util.List actions) { - final var baseSummary = AssetListPackerMappings.mapSummary(details.summary()); + private AssetWorkspaceAssetDetails mapDetails(AssetDetailsSnapshot details) { + final var baseSummary = AssetListMappings.mapSummary(details.summary()); final AssetStudioMetadataSnapshot studioMetadata = studioMetadataService.read( baseSummary.assetRoot(), baseSummary.assetFamily()); - final java.util.List mappedActions = actions.stream() + final java.util.List mappedActions = details.actions().stream() .map(action -> new AssetWorkspaceAssetAction( action.action(), action.enabled(), action.visible(), action.reason())) .toList(); - final p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary mappedSummary = - new p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary( + final p.studio.api.assets.workspace.AssetWorkspaceAssetSummary mappedSummary = + new p.studio.api.assets.workspace.AssetWorkspaceAssetSummary( baseSummary.assetReference(), baseSummary.assetName(), baseSummary.state(), @@ -733,14 +722,17 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware baseSummary.preload(), baseSummary.hasDiagnostics()); final AssetWorkspaceBankCompositionDetails bankComposition = mapBankComposition(details.bankComposition()); + final var availableCodecs = details.availableOutputCodecs(); + final var codecFields = details.codecConfigurationFieldsByCodec(); + final var metadataFields = details.metadataFields(); final AssetWorkspaceAssetDetails draftDetails = new AssetWorkspaceAssetDetails( mappedSummary, mappedActions, details.outputFormat(), details.outputCodec(), - details.availableOutputCodecs(), - details.codecConfigurationFieldsByCodec(), - details.metadataFields(), + availableCodecs, + codecFields, + metadataFields, details.outputPipeline(), bankComposition, details.pipelinePalettes(), @@ -749,13 +741,8 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware AssetWorkspaceSceneBankValidation.NOT_APPLICABLE, List.of()); final SceneBankWorkflowResult sceneBankWorkflow = sceneBankWorkflowService.inspect(projectReference, draftDetails); - final java.util.List mergedDiagnostics = new java.util.ArrayList<>(details.diagnostics()); - for (PackerDiagnosticDTO diagnostic : diagnostics) { - if (!mergedDiagnostics.contains(diagnostic)) { - mergedDiagnostics.add(diagnostic); - } - } - for (PackerDiagnosticDTO diagnostic : sceneBankWorkflow.diagnostics()) { + final java.util.List mergedDiagnostics = new java.util.ArrayList<>(details.diagnostics()); + for (AssetDiagnostic diagnostic : sceneBankWorkflow.diagnostics()) { if (!mergedDiagnostics.contains(diagnostic)) { mergedDiagnostics.add(diagnostic); } @@ -765,9 +752,9 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware mappedActions, details.outputFormat(), details.outputCodec(), - details.availableOutputCodecs(), - details.codecConfigurationFieldsByCodec(), - details.metadataFields(), + availableCodecs, + codecFields, + metadataFields, details.outputPipeline(), bankComposition, details.pipelinePalettes(), @@ -777,14 +764,14 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware mergedDiagnostics); } - private AssetWorkspaceBankCompositionDetails mapBankComposition(p.packer.dtos.PackerBankCompositionDetailsDTO details) { + private AssetWorkspaceBankCompositionDetails mapBankComposition(p.studio.api.assets.AssetBankComposition details) { return new AssetWorkspaceBankCompositionDetails( details.availableFiles().stream().map(this::mapBankCompositionFile).toList(), details.selectedFiles().stream().map(this::mapBankCompositionFile).toList(), details.measuredBankSizeBytes()); } - private AssetWorkspaceBankCompositionFile mapBankCompositionFile(p.packer.dtos.PackerBankCompositionFileDTO file) { + private AssetWorkspaceBankCompositionFile mapBankCompositionFile(p.studio.api.assets.AssetBankFile file) { return new AssetWorkspaceBankCompositionFile( file.path(), file.displayName(), diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetDetailsUiSupport.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/AssetDetailsUiSupport.java similarity index 57% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetDetailsUiSupport.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/AssetDetailsUiSupport.java index 2e45cf86..71d94dff 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetDetailsUiSupport.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/AssetDetailsUiSupport.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.details; +package p.studio.ui.javafx.workspaces.assets.details; import javafx.geometry.Pos; import javafx.scene.Node; @@ -7,19 +7,17 @@ import javafx.scene.control.Label; import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.VBox; -import p.packer.messages.assets.AssetAction; -import p.packer.messages.assets.AssetFamilyCatalog; -import p.packer.messages.assets.OutputFormatCatalog; -import p.studio.Container; -import p.studio.controls.forms.StudioFormMode; -import p.studio.controls.forms.StudioFormSection; -import p.studio.controls.forms.StudioSection; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphSpecialization; -import p.studio.workspaces.assets.messages.AssetWorkspaceSceneBankStatus; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetState; -import p.studio.workspaces.assets.messages.AssetWorkspaceBuildParticipation; +import p.studio.api.assets.AssetFamily; +import p.studio.ui.javafx.controls.forms.StudioFormMode; +import p.studio.ui.javafx.controls.forms.StudioFormSection; +import p.studio.ui.javafx.controls.forms.StudioSection; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.api.assets.metadata.AssetStudioGlyphSpecialization; +import p.studio.api.assets.workspace.AssetWorkspaceSceneBankStatus; +import p.studio.api.assets.workspace.AssetWorkspaceAssetState; +import p.studio.api.assets.workspace.AssetWorkspaceBuildParticipation; import java.nio.file.Path; @@ -57,13 +55,6 @@ public final class AssetDetailsUiSupport { return createKeyValueRow(key, valueLabel); } - public static Node createKeyValueRow(String key, OutputFormatCatalog outputFormat) { - final Label valueLabel = new Label(outputFormat.displayName()); - valueLabel.getStyleClass().add("assets-details-value"); - valueLabel.setWrapText(true); - return createKeyValueRow(key, valueLabel); - } - public static Node createKeyValueRow(String key, Node valueNode) { final HBox row = new HBox(12); row.setAlignment(Pos.TOP_LEFT); @@ -105,36 +96,36 @@ public final class AssetDetailsUiSupport { button.getStyleClass().add(toneClass); } - public static String registrationLabel(AssetWorkspaceAssetState state) { + public static String registrationLabel(I18nService i18n, AssetWorkspaceAssetState state) { return switch (state) { - case REGISTERED -> Container.i18n().text(I18n.ASSETS_VALUE_REGISTERED); - case UNREGISTERED -> Container.i18n().text(I18n.ASSETS_VALUE_UNREGISTERED); + case REGISTERED -> i18n.text(I18n.ASSETS_VALUE_REGISTERED); + case UNREGISTERED -> i18n.text(I18n.ASSETS_VALUE_UNREGISTERED); }; } - public static String buildParticipationLabel(AssetWorkspaceBuildParticipation buildParticipation) { + public static String buildParticipationLabel(I18nService i18n, AssetWorkspaceBuildParticipation buildParticipation) { return switch (buildParticipation) { - case INCLUDED -> Container.i18n().text(I18n.ASSETS_VALUE_INCLUDED); - case EXCLUDED -> Container.i18n().text(I18n.ASSETS_VALUE_EXCLUDED); + case INCLUDED -> i18n.text(I18n.ASSETS_VALUE_INCLUDED); + case EXCLUDED -> i18n.text(I18n.ASSETS_VALUE_EXCLUDED); }; } - public static String booleanLabel(boolean value) { + public static String booleanLabel(I18nService i18n, boolean value) { return value - ? Container.i18n().text(I18n.ASSETS_VALUE_YES) - : Container.i18n().text(I18n.ASSETS_VALUE_NO); + ? i18n.text(I18n.ASSETS_VALUE_YES) + : i18n.text(I18n.ASSETS_VALUE_NO); } - public static String typeLabel(AssetFamilyCatalog assetFamily) { + public static String typeLabel(I18nService i18n, AssetFamily assetFamily) { return switch (assetFamily) { - case GLYPH_BANK -> Container.i18n().text(I18n.ASSETS_TYPE_GLYPH_BANK); - case SCENE_BANK -> Container.i18n().text(I18n.ASSETS_TYPE_SCENE_BANK); - case SOUND_BANK -> Container.i18n().text(I18n.ASSETS_TYPE_SOUND_BANK); - case UNKNOWN -> Container.i18n().text(I18n.ASSETS_TYPE_UNKNOWN); + case GLYPH_BANK -> i18n.text(I18n.ASSETS_TYPE_GLYPH_BANK); + case SCENE_BANK -> i18n.text(I18n.ASSETS_TYPE_SCENE_BANK); + case SOUND_BANK -> i18n.text(I18n.ASSETS_TYPE_SOUND_BANK); + case UNKNOWN -> i18n.text(I18n.ASSETS_TYPE_UNKNOWN); }; } - public static String typeChipTone(AssetFamilyCatalog assetFamily) { + public static String typeChipTone(AssetFamily assetFamily) { return switch (assetFamily) { case GLYPH_BANK -> "assets-details-chip-image"; case SCENE_BANK -> "assets-details-chip-scene"; @@ -143,33 +134,42 @@ public final class AssetDetailsUiSupport { }; } - public static String specializationLabel(AssetStudioGlyphSpecialization specialization) { + public static String specializationLabel(I18nService i18n, AssetStudioGlyphSpecialization specialization) { return switch (specialization) { - case NONE -> Container.i18n().text(I18n.ASSETS_SPECIALIZATION_NONE); - case TILESET -> Container.i18n().text(I18n.ASSETS_SPECIALIZATION_TILESET); - case SPRITES -> Container.i18n().text(I18n.ASSETS_SPECIALIZATION_SPRITES); - case UI -> Container.i18n().text(I18n.ASSETS_SPECIALIZATION_UI); + case NONE -> i18n.text(I18n.ASSETS_SPECIALIZATION_NONE); + case TILESET -> i18n.text(I18n.ASSETS_SPECIALIZATION_TILESET); + case SPRITES -> i18n.text(I18n.ASSETS_SPECIALIZATION_SPRITES); + case UI -> i18n.text(I18n.ASSETS_SPECIALIZATION_UI); }; } - public static String sceneBankStatusLabel(AssetWorkspaceSceneBankStatus status) { + public static String sceneBankStatusLabel(I18nService i18n, AssetWorkspaceSceneBankStatus status) { return switch (status) { case NOT_APPLICABLE -> ""; - case PENDING_VALIDATION -> Container.i18n().text(I18n.ASSETS_SCENE_STATUS_PENDING_VALIDATION); - case VALIDATED_PENDING_ACCEPTANCE -> Container.i18n().text(I18n.ASSETS_SCENE_STATUS_VALIDATED_PENDING_ACCEPTANCE); - case READY -> Container.i18n().text(I18n.ASSETS_SCENE_STATUS_READY); - case VALIDATION_FAILED -> Container.i18n().text(I18n.ASSETS_SCENE_STATUS_VALIDATION_FAILED); + case PENDING_VALIDATION -> i18n.text(I18n.ASSETS_SCENE_STATUS_PENDING_VALIDATION); + case VALIDATED_PENDING_ACCEPTANCE -> i18n.text(I18n.ASSETS_SCENE_STATUS_VALIDATED_PENDING_ACCEPTANCE); + case READY -> i18n.text(I18n.ASSETS_SCENE_STATUS_READY); + case VALIDATION_FAILED -> i18n.text(I18n.ASSETS_SCENE_STATUS_VALIDATION_FAILED); }; } - public static String actionLabel(AssetAction action) { + public static String actionLabel(I18nService i18n, String action) { return switch (action) { - case REGISTER -> Container.i18n().text(I18n.ASSETS_ACTION_REGISTER); - case MOVE -> Container.i18n().text(I18n.ASSETS_ACTION_RELOCATE); - case DELETE -> Container.i18n().text(I18n.ASSETS_ACTION_DELETE); + case "REGISTER" -> i18n.text(I18n.ASSETS_ACTION_REGISTER); + case "MOVE" -> i18n.text(I18n.ASSETS_ACTION_RELOCATE); + case "DELETE" -> i18n.text(I18n.ASSETS_ACTION_DELETE); + default -> action; }; } + public static String catalogLabel(String value) { + if (value == null || value.isBlank()) { + return "Unknown"; + } + final String normalized = value.replace('_', ' ').toLowerCase(java.util.Locale.ROOT); + return Character.toUpperCase(normalized.charAt(0)) + normalized.substring(1); + } + public static String registrationChipTone(AssetWorkspaceAssetState state) { return switch (state) { case REGISTERED -> "assets-details-chip-registered"; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetDetailsViewStateFactory.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/AssetDetailsViewStateFactory.java similarity index 81% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetDetailsViewStateFactory.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/AssetDetailsViewStateFactory.java index 345ac01a..0625ffdd 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetDetailsViewStateFactory.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/AssetDetailsViewStateFactory.java @@ -1,9 +1,9 @@ -package p.studio.workspaces.assets.details; +package p.studio.ui.javafx.workspaces.assets.details; -import p.packer.messages.AssetReference; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails; -import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsStatus; -import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsViewState; +import p.studio.api.assets.AssetReference; +import p.studio.api.assets.workspace.AssetWorkspaceAssetDetails; +import p.studio.ui.javafx.workspaces.assets.messages.AssetWorkspaceDetailsStatus; +import p.studio.ui.javafx.workspaces.assets.messages.AssetWorkspaceDetailsViewState; import java.util.Objects; diff --git a/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/AssetListMappings.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/AssetListMappings.java new file mode 100644 index 00000000..5e406dda --- /dev/null +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/AssetListMappings.java @@ -0,0 +1,26 @@ +package p.studio.ui.javafx.workspaces.assets.details; + +import p.studio.api.assets.AssetSummary; +import p.studio.api.assets.metadata.AssetStudioGlyphSpecialization; +import p.studio.api.assets.workspace.AssetWorkspaceAssetState; +import p.studio.api.assets.workspace.AssetWorkspaceAssetSummary; +import p.studio.api.assets.workspace.AssetWorkspaceBuildParticipation; + +public final class AssetListMappings { + private AssetListMappings() { + } + + public static AssetWorkspaceAssetSummary mapSummary(AssetSummary summary) { + return new AssetWorkspaceAssetSummary( + summary.reference(), + summary.name(), + AssetWorkspaceAssetState.valueOf(summary.registrationState().name()), + AssetWorkspaceBuildParticipation.valueOf(summary.buildParticipation().name()), + summary.assetId(), + summary.family(), + AssetStudioGlyphSpecialization.NONE, + summary.root(), + summary.preload(), + summary.hasDiagnostics()); + } +} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionControl.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/bank/AssetDetailsBankCompositionControl.java similarity index 66% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionControl.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/bank/AssetDetailsBankCompositionControl.java index 53e875b9..97866226 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionControl.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/bank/AssetDetailsBankCompositionControl.java @@ -1,33 +1,35 @@ -package p.studio.workspaces.assets.details.bank; +package p.studio.ui.javafx.workspaces.assets.details.bank; import javafx.application.Platform; import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; -import p.packer.dtos.PackerBankCompositionDetailsDTO; -import p.packer.dtos.PackerBankCompositionFileDTO; -import p.packer.messages.ApplyBankCompositionRequest; -import p.packer.messages.GetAssetDetailsRequest; -import p.studio.Container; -import p.studio.controls.banks.StudioAssetCapacityMeter; -import p.studio.controls.forms.StudioFormEditScopeChangedEvent; -import p.studio.controls.forms.StudioFormMode; -import p.studio.controls.forms.StudioFormSection; -import p.studio.lsp.events.StudioWorkspaceEventBus; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsViewState; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionDetails; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; -import p.studio.workspaces.assets.messages.events.StudioAssetBankCompositionAppliedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetBankCompositionApplyFailedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetBankCompositionApplyRequestedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetBankCompositionCapacityChangedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetBankCompositionDraftChangedEvent; -import p.studio.workspaces.assets.messages.events.StudioBankCompositionChangedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent; -import p.studio.workspaces.framework.StudioSubscriptionBag; +import p.studio.api.assets.AssetCommands; +import p.studio.api.assets.AssetDetails; +import p.studio.api.assets.bank.AssetBankCompositionSession; +import p.studio.api.assets.bank.AssetBankCompositionSessionFactory; +import p.studio.api.assets.bank.AssetBankCompositionState; +import p.studio.ui.javafx.controls.banks.StudioAssetCapacityMeter; +import p.studio.ui.javafx.controls.banks.StudioAssetCapacitySeverity; +import p.studio.ui.javafx.controls.forms.StudioFormEditScopeChangedEvent; +import p.studio.ui.javafx.controls.forms.StudioFormMode; +import p.studio.ui.javafx.controls.forms.StudioFormSection; +import p.studio.ui.javafx.events.StudioWorkspaceEventBus; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.ui.javafx.workspaces.assets.messages.AssetWorkspaceDetailsViewState; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionDetails; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetBankCompositionAppliedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetBankCompositionApplyFailedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetBankCompositionApplyRequestedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetBankCompositionCapacityChangedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetBankCompositionDraftChangedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioBankCompositionChangedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent; +import p.studio.ui.javafx.workspaces.framework.StudioSubscriptionBag; import java.util.Objects; @@ -38,17 +40,32 @@ public final class AssetDetailsBankCompositionControl extends StudioFormSection private final ProjectReference projectReference; private final StudioWorkspaceEventBus workspaceBus; private final StudioSubscriptionBag subscriptions = new StudioSubscriptionBag(); - private final AssetDetailsBankCompositionDualListView dualListView = new AssetDetailsBankCompositionDualListView(); + private final AssetDetailsBankCompositionDualListView dualListView; private final StudioAssetCapacityMeter capacityMeter = new StudioAssetCapacityMeter(); - private final AssetDetailsBankCompositionCoordinator coordinator = new AssetDetailsBankCompositionCoordinator(); - private final HBox body = new HBox(16, dualListView, capacityMeter); - private final VBox content = new VBox(12, body); + private final AssetBankCompositionSession coordinator; + private final HBox body; + private final VBox content; private AssetWorkspaceDetailsViewState viewState; + private final java.util.concurrent.Executor executor; + private final I18nService i18n; + private final AssetDetails assetDetails; + private final AssetCommands assetCommands; - public AssetDetailsBankCompositionControl(ProjectReference projectReference, StudioWorkspaceEventBus workspaceBus) { + public AssetDetailsBankCompositionControl(ProjectReference projectReference, StudioWorkspaceEventBus workspaceBus, + I18nService i18n, java.util.concurrent.Executor executor, AssetDetails assetDetails, + AssetCommands assetCommands, AssetBankCompositionSessionFactory sessionFactory) { + super(i18n); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.executor = Objects.requireNonNull(executor, "executor"); + this.assetDetails = Objects.requireNonNull(assetDetails, "assetDetails"); + this.assetCommands = Objects.requireNonNull(assetCommands, "assetCommands"); this.projectReference = Objects.requireNonNull(projectReference, "projectReference"); this.workspaceBus = Objects.requireNonNull(workspaceBus, "workspaceBus"); + this.coordinator = Objects.requireNonNull(sessionFactory, "sessionFactory").createSession(); + this.dualListView = new AssetDetailsBankCompositionDualListView(i18n); + this.body = new HBox(16, dualListView, capacityMeter); + this.content = new VBox(12, body); capacityMeter.setMinWidth(CAPACITY_METER_WIDTH); capacityMeter.setPrefWidth(CAPACITY_METER_WIDTH); capacityMeter.setMaxWidth(CAPACITY_METER_WIDTH); @@ -112,7 +129,7 @@ public final class AssetDetailsBankCompositionControl extends StudioFormSection return; } - final AssetDetailsBankCompositionViewModel viewModel = coordinator.viewModel(); + final AssetBankCompositionState viewModel = coordinator.state(); dualListView.setAssetRoot(viewState.selectedAssetDetails().summary().assetRoot()); dualListView.setLeftItems(viewModel.availableFiles()); @@ -141,7 +158,7 @@ public final class AssetDetailsBankCompositionControl extends StudioFormSection }); capacityMeter.setProgress(viewModel.capacityState().progress()); - capacityMeter.setSeverity(viewModel.capacityState().severity()); + capacityMeter.setSeverity(visualSeverity(viewModel.capacityState())); capacityMeter.setLabelText("Bank Capacity"); capacityMeter.setHintText(""); @@ -150,17 +167,17 @@ public final class AssetDetailsBankCompositionControl extends StudioFormSection @Override protected String sectionTitle() { - return Container.i18n().text(I18n.ASSETS_SECTION_BANK_COMPOSITION); + return i18n.text(I18n.ASSETS_SECTION_BANK_COMPOSITION); } @Override protected StudioFormMode formMode() { - return coordinator.ready() && coordinator.viewModel().editing() ? StudioFormMode.EDITING : StudioFormMode.READ_ONLY; + return coordinator.ready() && coordinator.state().editing() ? StudioFormMode.EDITING : StudioFormMode.READ_ONLY; } @Override protected boolean isDirty() { - return coordinator.ready() && coordinator.viewModel().dirty(); + return coordinator.ready() && coordinator.state().dirty(); } @Override @@ -186,22 +203,18 @@ public final class AssetDetailsBankCompositionControl extends StudioFormSection return; } final var assetReference = viewState.selectedAssetReference(); - final var selectedPaths = coordinator.viewModel().selectedFiles().stream() + final var selectedPaths = coordinator.state().selectedFiles().stream() .map(file -> file.path()) .toList(); workspaceBus.publish(new StudioAssetBankCompositionApplyRequestedEvent(assetReference)); - Container.backgroundTasks().submit(() -> { - final var request = new ApplyBankCompositionRequest( - projectReference.toPackerProjectContext(), - assetReference, - selectedPaths); + executor.execute(() -> { try { - final var response = Container.packer().workspaceService().applyBankComposition(request); + final var response = assetCommands.applyBankComposition(projectReference, assetReference, selectedPaths); Platform.runLater(() -> { if (response.success()) { publishEditScope(workspaceBus, currentScopeKey(), null); workspaceBus.publish(new StudioAssetBankCompositionAppliedEvent(assetReference)); - Container.backgroundTasks().submit(() -> publishAppliedBankComposition(assetReference)); + executor.execute(() -> publishAppliedBankComposition(assetReference)); } else { workspaceBus.publish(new StudioAssetBankCompositionApplyFailedEvent( assetReference, @@ -211,33 +224,31 @@ public final class AssetDetailsBankCompositionControl extends StudioFormSection } catch (Exception exception) { Platform.runLater(() -> workspaceBus.publish(new StudioAssetBankCompositionApplyFailedEvent( assetReference, - exception.getMessage()))); + "Unable to apply bank composition."))); } }); } - private void publishAppliedBankComposition(p.packer.messages.AssetReference assetReference) { + private void publishAppliedBankComposition(p.studio.api.assets.AssetReference assetReference) { try { - final var detailsResult = Container.packer().workspaceService().getAssetDetails(new GetAssetDetailsRequest( - projectReference.toPackerProjectContext(), - assetReference)); - final AssetWorkspaceBankCompositionDetails bankComposition = mapBankComposition(detailsResult.details().bankComposition()); + final var detailsResult = assetDetails.get(projectReference, assetReference); + final AssetWorkspaceBankCompositionDetails bankComposition = mapBankComposition(detailsResult.bankComposition()); Platform.runLater(() -> workspaceBus.publish(new StudioBankCompositionChangedEvent(assetReference, bankComposition))); } catch (Exception exception) { Platform.runLater(() -> workspaceBus.publish(new StudioAssetBankCompositionApplyFailedEvent( assetReference, - exception.getMessage()))); + "Unable to reload bank composition."))); } } - private AssetWorkspaceBankCompositionDetails mapBankComposition(PackerBankCompositionDetailsDTO details) { + private AssetWorkspaceBankCompositionDetails mapBankComposition(p.studio.api.assets.AssetBankComposition details) { return new AssetWorkspaceBankCompositionDetails( details.availableFiles().stream().map(this::mapBankCompositionFile).toList(), details.selectedFiles().stream().map(this::mapBankCompositionFile).toList(), details.measuredBankSizeBytes()); } - private AssetWorkspaceBankCompositionFile mapBankCompositionFile(PackerBankCompositionFileDTO file) { + private AssetWorkspaceBankCompositionFile mapBankCompositionFile(p.studio.api.assets.AssetBankFile file) { return new AssetWorkspaceBankCompositionFile( file.path(), file.displayName(), @@ -264,7 +275,7 @@ public final class AssetDetailsBankCompositionControl extends StudioFormSection if (viewState == null || viewState.selectedAssetReference() == null || !coordinator.ready()) { return; } - final AssetDetailsBankCompositionViewModel viewModel = coordinator.viewModel(); + final AssetBankCompositionState viewModel = coordinator.state(); workspaceBus.publish(new StudioAssetBankCompositionDraftChangedEvent( viewState.selectedAssetReference(), viewModel.editing(), @@ -274,7 +285,7 @@ public final class AssetDetailsBankCompositionControl extends StudioFormSection workspaceBus.publish(new StudioAssetBankCompositionCapacityChangedEvent( viewState.selectedAssetReference(), viewModel.capacityState().progress(), - viewModel.capacityState().severity(), + visualSeverity(viewModel.capacityState()), viewModel.capacityState().blocked(), viewModel.capacityState().labelText(), viewModel.capacityState().hintText())); @@ -285,4 +296,12 @@ public final class AssetDetailsBankCompositionControl extends StudioFormSection ? null : "asset-details:" + viewState.selectedAssetReference(); } + + private StudioAssetCapacitySeverity visualSeverity(p.studio.api.assets.AssetCapacityState state) { + return switch (state.level()) { + case SAFE -> StudioAssetCapacitySeverity.GREEN; + case WARNING -> StudioAssetCapacitySeverity.ORANGE; + case EXHAUSTED -> StudioAssetCapacitySeverity.RED; + }; + } } diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionDualListView.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/bank/AssetDetailsBankCompositionDualListView.java similarity index 89% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionDualListView.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/bank/AssetDetailsBankCompositionDualListView.java index 94576508..377e4c09 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionDualListView.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/bank/AssetDetailsBankCompositionDualListView.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.details.bank; +package p.studio.ui.javafx.workspaces.assets.details.bank; import javafx.geometry.Pos; import javafx.scene.Node; @@ -9,14 +9,13 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; -import p.studio.controls.banks.StudioDualListView; -import p.studio.Container; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; +import p.studio.ui.javafx.controls.banks.StudioDualListView; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; import java.util.Collection; import java.util.Map; -import java.nio.file.Files; import java.nio.file.Path; public final class AssetDetailsBankCompositionDualListView extends StudioDualListView { @@ -24,9 +23,9 @@ public final class AssetDetailsBankCompositionDualListView extends StudioDualLis private Path assetRoot; - public AssetDetailsBankCompositionDualListView() { - setLeftTitle(Container.i18n().text(I18n.ASSETS_DETAILS_BANK_COMPOSITION_AVAILABLE)); - setRightTitle(Container.i18n().text(I18n.ASSETS_DETAILS_BANK_COMPOSITION_SELECTED)); + public AssetDetailsBankCompositionDualListView(I18nService i18n) { + setLeftTitle(i18n.text(I18n.ASSETS_DETAILS_BANK_COMPOSITION_AVAILABLE)); + setRightTitle(i18n.text(I18n.ASSETS_DETAILS_BANK_COMPOSITION_SELECTED)); } public void setAssetRoot(Path assetRoot) { @@ -86,9 +85,6 @@ public final class AssetDetailsBankCompositionDualListView extends StudioDualLis if (filePath == null) { return null; } - if (!Files.isRegularFile(filePath)) { - return null; - } try { final Image image = new Image(filePath.toUri().toString(), THUMBNAIL_SIZE, THUMBNAIL_SIZE, true, true, true); if (image.isError()) { diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/contract/AssetDetailsContractControl.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/contract/AssetDetailsContractControl.java similarity index 81% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/contract/AssetDetailsContractControl.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/contract/AssetDetailsContractControl.java index 4faea893..86f0372a 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/contract/AssetDetailsContractControl.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/contract/AssetDetailsContractControl.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.details.contract; +package p.studio.ui.javafx.workspaces.assets.details.contract; import javafx.application.Platform; import javafx.collections.FXCollections; @@ -11,27 +11,25 @@ import javafx.scene.control.TextField; import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.VBox; -import p.packer.dtos.PackerCodecConfigurationFieldDTO; -import p.packer.messages.UpdateAssetContractRequest; -import p.packer.messages.assets.OutputCodecCatalog; -import p.studio.Container; -import p.studio.controls.forms.StudioFormEditScopeChangedEvent; -import p.studio.controls.forms.StudioFormMode; -import p.studio.controls.forms.StudioFormSession; -import p.studio.controls.forms.StudioFormSection; -import p.studio.controls.lifecycle.StudioControlLifecycle; -import p.studio.controls.lifecycle.StudioControlLifecycleSupport; -import p.studio.lsp.events.StudioWorkspaceEventBus; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.details.AssetDetailsUiSupport; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails; -import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsViewState; -import p.studio.workspaces.assets.messages.events.StudioAssetLogEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsRefreshRequestedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceSelectionRequestedEvent; -import p.studio.workspaces.framework.StudioSubscriptionBag; +import p.studio.api.assets.AssetConfigurationField; +import p.studio.api.assets.AssetCommands; +import p.studio.ui.javafx.controls.forms.StudioFormEditScopeChangedEvent; +import p.studio.ui.javafx.controls.forms.StudioFormMode; +import p.studio.ui.javafx.controls.forms.StudioFormSession; +import p.studio.ui.javafx.controls.forms.StudioFormSection; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycle; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycleSupport; +import p.studio.ui.javafx.events.StudioWorkspaceEventBus; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.workspaces.assets.details.AssetDetailsUiSupport; +import p.studio.api.assets.workspace.AssetWorkspaceAssetDetails; +import p.studio.ui.javafx.workspaces.assets.messages.AssetWorkspaceDetailsViewState; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetLogEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsRefreshRequestedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceSelectionRequestedEvent; +import p.studio.ui.javafx.workspaces.framework.StudioSubscriptionBag; import java.util.LinkedHashMap; import java.util.Map; @@ -44,13 +42,21 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon private final RuntimeContractSection runtimeSection; private final CodecSection codecSection; + private final p.studio.ui.javafx.utilities.i18n.I18nService i18n; + private final java.util.concurrent.Executor executor; + private final AssetCommands assetCommands; private AssetWorkspaceDetailsViewState viewState; - public AssetDetailsContractControl(ProjectReference projectReference, StudioWorkspaceEventBus workspaceBus) { + public AssetDetailsContractControl(ProjectReference projectReference, StudioWorkspaceEventBus workspaceBus, + p.studio.ui.javafx.utilities.i18n.I18nService i18n, java.util.concurrent.Executor executor, + AssetCommands assetCommands) { StudioControlLifecycleSupport.install(this, this); this.projectReference = Objects.requireNonNull(projectReference, "projectReference"); this.workspaceBus = Objects.requireNonNull(workspaceBus, "workspaceBus"); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.executor = Objects.requireNonNull(executor, "executor"); + this.assetCommands = Objects.requireNonNull(assetCommands, "assetCommands"); this.runtimeSection = new RuntimeContractSection(); this.codecSection = new CodecSection(); getStyleClass().add("assets-details-contract-body"); @@ -111,6 +117,7 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon private StudioFormSession formSession; protected BaseContractSection(String sectionId) { + super(i18n); this.sectionId = sectionId; getStyleClass().add("assets-details-contract-section-host"); content.getStyleClass().add("assets-details-contract-column"); @@ -237,10 +244,10 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon protected Node buildContent(AssetWorkspaceAssetDetails details, RuntimeContractDraft draft, boolean editing) { final VBox column = new VBox(8); column.getChildren().add(AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_LABEL_PRELOAD), + i18n.text(I18n.ASSETS_LABEL_PRELOAD), createPreloadEditor(draft, editing))); column.getChildren().add(AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_LABEL_BANK), + i18n.text(I18n.ASSETS_LABEL_BANK), draft.bank())); column.getChildren().add(createRuntimeMetadataSection(details, draft, editing)); return column; @@ -248,7 +255,7 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon @Override protected String sectionTitle() { - return Container.i18n().text(I18n.ASSETS_SECTION_RUNTIME_CONTRACT); + return i18n.text(I18n.ASSETS_SECTION_RUNTIME_CONTRACT); } @Override @@ -257,18 +264,18 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon if (details == null) { return; } - Container.backgroundTasks().submit(() -> { + executor.execute(() -> { try { - final var response = Container.packer().workspaceService().updateAssetContract(new UpdateAssetContractRequest( - projectReference.toPackerProjectContext(), + final var response = assetCommands.updateContract( + projectReference, draft.assetReference(), draft.preload(), details.outputCodec(), currentCodecFieldValues(details), - draft.metadataFieldValues())); + draft.metadataFieldValues()); Platform.runLater(() -> handleApplyResponse(response.success(), response.errorMessage())); } catch (Exception exception) { - Platform.runLater(() -> handleApplyResponse(false, exception.getMessage())); + Platform.runLater(() -> handleApplyResponse(false, "Unable to update runtime contract.")); } }); } @@ -305,13 +312,14 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon } private Node createMetadataFieldControl( - PackerCodecConfigurationFieldDTO field, + AssetConfigurationField field, RuntimeContractDraft draft, boolean editing) { return switch (field.fieldType()) { - case BOOLEAN -> createMetadataBooleanField(field, draft, editing); - case ENUM -> createMetadataEnumField(field, draft, editing); - case INTEGER, TEXT -> createMetadataTextField(field, draft, editing); + case "BOOLEAN" -> createMetadataBooleanField(field, draft, editing); + case "ENUM" -> createMetadataEnumField(field, draft, editing); + case "INTEGER", "TEXT" -> createMetadataTextField(field, draft, editing); + default -> createMetadataTextField(field, draft, editing); }; } @@ -323,10 +331,10 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon content.getStyleClass().add("assets-details-contract-metadata-content"); if (details.metadataFields().isEmpty()) { content.getChildren().add(AssetDetailsUiSupport.createSectionMessage( - Container.i18n().text(I18n.ASSETS_DETAILS_METADATA_EMPTY))); + i18n.text(I18n.ASSETS_DETAILS_METADATA_EMPTY))); return createCodecMetadataPane(content); } - for (PackerCodecConfigurationFieldDTO field : details.metadataFields()) { + for (AssetConfigurationField field : details.metadataFields()) { content.getChildren().add(createLabeledFieldRow( field.label(), createMetadataFieldControl(field, draft, editing))); @@ -334,7 +342,7 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon return createCodecMetadataPane(content); } - private Node createMetadataBooleanField(PackerCodecConfigurationFieldDTO field, RuntimeContractDraft draft, boolean editing) { + private Node createMetadataBooleanField(AssetConfigurationField field, RuntimeContractDraft draft, boolean editing) { final CheckBox checkBox = new CheckBox(); checkBox.getStyleClass().add("assets-details-readonly-check"); checkBox.setSelected(Boolean.parseBoolean(draft.metadataFieldValue(field.key(), field.value()))); @@ -351,7 +359,7 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon return checkBox; } - private Node createMetadataEnumField(PackerCodecConfigurationFieldDTO field, RuntimeContractDraft draft, boolean editing) { + private Node createMetadataEnumField(AssetConfigurationField field, RuntimeContractDraft draft, boolean editing) { final ComboBox comboBox = new ComboBox<>(FXCollections.observableArrayList(field.options())); comboBox.getStyleClass().add("assets-details-combo"); comboBox.setMaxWidth(Double.MAX_VALUE); @@ -369,7 +377,7 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon return comboBox; } - private Node createMetadataTextField(PackerCodecConfigurationFieldDTO field, RuntimeContractDraft draft, boolean editing) { + private Node createMetadataTextField(AssetConfigurationField field, RuntimeContractDraft draft, boolean editing) { final TextField textField = new TextField(draft.metadataFieldValue(field.key(), field.value())); textField.getStyleClass().add("assets-workspace-search"); textField.setMaxWidth(Double.MAX_VALUE); @@ -411,7 +419,7 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon @Override protected String sectionTitle() { - return Container.i18n().text(I18n.ASSETS_LABEL_CODEC); + return i18n.text(I18n.ASSETS_LABEL_CODEC); } @Override @@ -420,18 +428,18 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon if (details == null) { return; } - Container.backgroundTasks().submit(() -> { + executor.execute(() -> { try { - final var response = Container.packer().workspaceService().updateAssetContract(new UpdateAssetContractRequest( - projectReference.toPackerProjectContext(), + final var response = assetCommands.updateContract( + projectReference, draft.assetReference(), details.summary().preload(), draft.selectedCodec(), draft.codecFieldValues(), - currentMetadataFieldValues(details))); + currentMetadataFieldValues(details)); Platform.runLater(() -> handleApplyResponse(response.success(), response.errorMessage())); } catch (Exception exception) { - Platform.runLater(() -> handleApplyResponse(false, exception.getMessage())); + Platform.runLater(() -> handleApplyResponse(false, "Unable to update codec contract.")); } }); } @@ -451,21 +459,21 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon } private Node createCodecEditor(AssetWorkspaceAssetDetails details, CodecDraft draft, boolean editing) { - final ComboBox codecCombo = new ComboBox<>(FXCollections.observableArrayList(details.availableOutputCodecs())); + final ComboBox codecCombo = new ComboBox<>(FXCollections.observableArrayList(details.availableOutputCodecs())); codecCombo.getStyleClass().add("assets-details-combo"); codecCombo.setMaxWidth(Double.MAX_VALUE); codecCombo.setCellFactory(ignored -> new javafx.scene.control.ListCell<>() { @Override - protected void updateItem(OutputCodecCatalog item, boolean empty) { + protected void updateItem(String item, boolean empty) { super.updateItem(item, empty); - setText(empty || item == null ? null : item.displayName()); + setText(empty || item == null ? null : AssetDetailsUiSupport.catalogLabel(item)); } }); codecCombo.setButtonCell(new javafx.scene.control.ListCell<>() { @Override - protected void updateItem(OutputCodecCatalog item, boolean empty) { + protected void updateItem(String item, boolean empty) { super.updateItem(item, empty); - setText(empty || item == null ? null : item.displayName()); + setText(empty || item == null ? null : AssetDetailsUiSupport.catalogLabel(item)); } }); codecCombo.getSelectionModel().select(draft.selectedCodec()); @@ -485,30 +493,31 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon private Node createCodecConfigurationSection(AssetWorkspaceAssetDetails details, CodecDraft draft, boolean editing) { final VBox content = new VBox(8); content.getStyleClass().add("assets-details-contract-metadata-content"); - if (draft.selectedCodec() == OutputCodecCatalog.NONE || draft.selectedCodec() == OutputCodecCatalog.UNKNOWN) { + if ("NONE".equals(draft.selectedCodec()) || "UNKNOWN".equals(draft.selectedCodec())) { content.getChildren().add(AssetDetailsUiSupport.createSectionMessage( - Container.i18n().text(I18n.ASSETS_DETAILS_CODEC_CONFIGURATION_EMPTY))); + i18n.text(I18n.ASSETS_DETAILS_CODEC_CONFIGURATION_EMPTY))); return createCodecMetadataPane(content); } final var fields = details.codecConfigurationFieldsByCodec().getOrDefault(draft.selectedCodec(), java.util.List.of()); if (fields.isEmpty()) { content.getChildren().add(AssetDetailsUiSupport.createSectionMessage( - Container.i18n().text(I18n.ASSETS_DETAILS_CODEC_CONFIGURATION_EMPTY))); + i18n.text(I18n.ASSETS_DETAILS_CODEC_CONFIGURATION_EMPTY))); return createCodecMetadataPane(content); } - for (PackerCodecConfigurationFieldDTO field : fields) { + for (AssetConfigurationField field : fields) { content.getChildren().add(createCodecFieldControl(field, draft, editing)); } return createCodecMetadataPane(content); } - private Node createCodecFieldControl(PackerCodecConfigurationFieldDTO field, CodecDraft draft, boolean editing) { + private Node createCodecFieldControl(AssetConfigurationField field, CodecDraft draft, boolean editing) { final Node valueNode = switch (field.fieldType()) { - case BOOLEAN -> createBooleanField(field, draft, editing); - case ENUM -> createEnumField(field, draft, editing); - case INTEGER, TEXT -> createTextField(field, draft, editing); + case "BOOLEAN" -> createBooleanField(field, draft, editing); + case "ENUM" -> createEnumField(field, draft, editing); + case "INTEGER", "TEXT" -> createTextField(field, draft, editing); + default -> createTextField(field, draft, editing); }; if (valueNode instanceof TextField textField) { textField.setPromptText(field.label()); @@ -519,7 +528,7 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon return valueNode; } - private Node createBooleanField(PackerCodecConfigurationFieldDTO field, CodecDraft draft, boolean editing) { + private Node createBooleanField(AssetConfigurationField field, CodecDraft draft, boolean editing) { final CheckBox checkBox = new CheckBox(field.label()); checkBox.getStyleClass().add("assets-details-readonly-check"); checkBox.setSelected(draft.codecFieldValue(draft.selectedCodec(), field.key(), field.value()).equalsIgnoreCase("true")); @@ -536,7 +545,7 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon return checkBox; } - private Node createEnumField(PackerCodecConfigurationFieldDTO field, CodecDraft draft, boolean editing) { + private Node createEnumField(AssetConfigurationField field, CodecDraft draft, boolean editing) { final ComboBox comboBox = new ComboBox<>(FXCollections.observableArrayList(field.options())); comboBox.getStyleClass().add("assets-details-combo"); comboBox.setMaxWidth(Double.MAX_VALUE); @@ -554,7 +563,7 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon return comboBox; } - private Node createTextField(PackerCodecConfigurationFieldDTO field, CodecDraft draft, boolean editing) { + private Node createTextField(AssetConfigurationField field, CodecDraft draft, boolean editing) { final TextField textField = new TextField(draft.codecFieldValue(draft.selectedCodec(), field.key(), field.value())); textField.getStyleClass().add("assets-workspace-search"); textField.setMaxWidth(Double.MAX_VALUE); @@ -601,7 +610,7 @@ public final class AssetDetailsContractControl extends HBox implements StudioCon private Map currentCodecFieldValues(AssetWorkspaceAssetDetails details) { final Map values = new LinkedHashMap<>(); details.codecConfigurationFieldsByCodec().forEach((codec, fields) -> - fields.forEach(field -> values.put(codec.name() + ":" + field.key(), field.value()))); + fields.forEach(field -> values.put(codec + ":" + field.key(), field.value()))); return Map.copyOf(values); } } diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/contract/CodecDraft.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/contract/CodecDraft.java similarity index 67% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/contract/CodecDraft.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/contract/CodecDraft.java index ec06a2e7..d7e611c4 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/contract/CodecDraft.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/contract/CodecDraft.java @@ -1,8 +1,7 @@ -package p.studio.workspaces.assets.details.contract; +package p.studio.ui.javafx.workspaces.assets.details.contract; -import p.packer.messages.AssetReference; -import p.packer.messages.assets.OutputCodecCatalog; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails; +import p.studio.api.assets.AssetReference; +import p.studio.api.assets.workspace.AssetWorkspaceAssetDetails; import java.util.LinkedHashMap; import java.util.Map; @@ -10,12 +9,12 @@ import java.util.Objects; public record CodecDraft( AssetReference assetReference, - OutputCodecCatalog selectedCodec, + String selectedCodec, Map codecFieldValues) { public CodecDraft { Objects.requireNonNull(assetReference, "assetReference"); - selectedCodec = Objects.requireNonNullElse(selectedCodec, OutputCodecCatalog.UNKNOWN); + selectedCodec = Objects.requireNonNullElse(selectedCodec, "UNKNOWN"); codecFieldValues = Map.copyOf(Objects.requireNonNull(codecFieldValues, "codecFieldValues")); } @@ -29,21 +28,21 @@ public record CodecDraft( codecFieldValues); } - public CodecDraft withSelectedCodec(OutputCodecCatalog selectedCodec) { + public CodecDraft withSelectedCodec(String selectedCodec) { return new CodecDraft(assetReference, selectedCodec, codecFieldValues); } - public CodecDraft withCodecFieldValue(OutputCodecCatalog codec, String fieldKey, String value) { + public CodecDraft withCodecFieldValue(String codec, String fieldKey, String value) { final Map nextValues = new LinkedHashMap<>(codecFieldValues); nextValues.put(keyOf(codec, fieldKey), Objects.requireNonNullElse(value, "")); return new CodecDraft(assetReference, selectedCodec, nextValues); } - public String codecFieldValue(OutputCodecCatalog codec, String fieldKey, String fallback) { + public String codecFieldValue(String codec, String fieldKey, String fallback) { return codecFieldValues.getOrDefault(keyOf(codec, fieldKey), Objects.requireNonNullElse(fallback, "")); } - private static String keyOf(OutputCodecCatalog codec, String fieldKey) { - return codec.name() + ":" + fieldKey; + private static String keyOf(String codec, String fieldKey) { + return codec + ":" + fieldKey; } } diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/contract/RuntimeContractDraft.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/contract/RuntimeContractDraft.java similarity index 83% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/contract/RuntimeContractDraft.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/contract/RuntimeContractDraft.java index e6943506..4fd615bb 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/contract/RuntimeContractDraft.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/contract/RuntimeContractDraft.java @@ -1,8 +1,7 @@ -package p.studio.workspaces.assets.details.contract; +package p.studio.ui.javafx.workspaces.assets.details.contract; -import p.packer.messages.AssetReference; -import p.packer.messages.assets.OutputFormatCatalog; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails; +import p.studio.api.assets.AssetReference; +import p.studio.api.assets.workspace.AssetWorkspaceAssetDetails; import java.util.LinkedHashMap; import java.util.Map; @@ -11,12 +10,12 @@ import java.util.Objects; public record RuntimeContractDraft( AssetReference assetReference, boolean preload, - OutputFormatCatalog bank, + String bank, Map metadataFieldValues) { public RuntimeContractDraft { Objects.requireNonNull(assetReference, "assetReference"); - bank = Objects.requireNonNullElse(bank, OutputFormatCatalog.UNKNOWN); + bank = Objects.requireNonNullElse(bank, "UNKNOWN"); metadataFieldValues = Map.copyOf(Objects.requireNonNull(metadataFieldValues, "metadataFieldValues")); } diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingControl.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingControl.java similarity index 63% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingControl.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingControl.java index 37448d87..b5aeeb15 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingControl.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingControl.java @@ -1,30 +1,35 @@ -package p.studio.workspaces.assets.details.palette; +package p.studio.ui.javafx.workspaces.assets.details.palette; + +import p.studio.api.assets.workspace.*; import javafx.application.Platform; import javafx.scene.control.Button; import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.VBox; -import p.packer.events.PackerEventKind; -import p.packer.messages.ApplyPaletteOverhaulingRequest; -import p.studio.Container; -import p.studio.controls.forms.StudioFormEditScopeChangedEvent; -import p.studio.controls.forms.StudioFormMode; -import p.studio.controls.forms.StudioFormSection; -import p.studio.lsp.events.StudioPackerOperationEvent; -import p.studio.lsp.events.StudioWorkspaceEventBus; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsViewState; -import p.studio.workspaces.assets.messages.events.StudioAssetLogEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceSelectionRequestedEvent; -import p.studio.workspaces.assets.messages.events.StudioGlyphMaterialMetadataChangedEvent; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialMetadata; -import p.studio.workspaces.assets.metadata.AssetStudioMetadataService; -import p.studio.workspaces.framework.StudioSubscriptionBag; +import p.studio.api.assets.AssetCommands; +import p.studio.ui.javafx.controls.forms.StudioFormEditScopeChangedEvent; +import p.studio.ui.javafx.controls.forms.StudioFormMode; +import p.studio.ui.javafx.controls.forms.StudioFormSection; +import p.studio.ui.javafx.events.StudioPackerOperationEvent; +import p.studio.ui.javafx.events.StudioPackerOperationKind; +import p.studio.ui.javafx.events.StudioWorkspaceEventBus; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.ThemeService; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.ui.javafx.workspaces.assets.messages.AssetWorkspaceDetailsViewState; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetLogEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceSelectionRequestedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioGlyphMaterialMetadataChangedEvent; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialMetadata; +import p.studio.api.assets.metadata.AssetMetadataService; +import p.studio.api.assets.schema.AssetColorSchemaFactory; +import p.studio.api.assets.palette.AssetPaletteSession; +import p.studio.api.assets.palette.AssetPaletteState; +import p.studio.ui.javafx.workspaces.framework.StudioSubscriptionBag; -import java.io.IOException; import java.util.Map; import java.util.Objects; import java.util.UUID; @@ -35,20 +40,39 @@ public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSecti private final ProjectReference projectReference; private final StudioWorkspaceEventBus workspaceBus; private final StudioSubscriptionBag subscriptions = new StudioSubscriptionBag(); - private final AssetDetailsPaletteOverhaulingCoordinator coordinator = new AssetDetailsPaletteOverhaulingCoordinator(); - private final AssetStudioMetadataService metadataService = new AssetStudioMetadataService(); - private final AssetDetailsPaletteOverhaulingDualListView dualListView = new AssetDetailsPaletteOverhaulingDualListView(); - private final AssetDetailsPaletteOverhaulingPreviewPane previewPane = new AssetDetailsPaletteOverhaulingPreviewPane(); + private final AssetPaletteSession coordinator; + private final AssetMetadataService metadataService; + private final AssetDetailsPaletteOverhaulingDualListView dualListView; + private final AssetDetailsPaletteOverhaulingPreviewPane previewPane; private final VBox paletteActions = new VBox(6); - private final HBox listWithActions = new HBox(8, paletteActions, dualListView); - private final HBox body = new HBox(16, listWithActions, previewPane); - private final VBox content = new VBox(12, body); + private final HBox listWithActions; + private final HBox body; + private final VBox content; private AssetWorkspaceDetailsViewState viewState; + private final java.util.concurrent.Executor executor; + private final I18nService i18n; + private final ThemeService theme; + private final AssetCommands assetCommands; - public AssetDetailsPaletteOverhaulingControl(ProjectReference projectReference, StudioWorkspaceEventBus workspaceBus) { + public AssetDetailsPaletteOverhaulingControl(ProjectReference projectReference, StudioWorkspaceEventBus workspaceBus, + I18nService i18n, java.util.concurrent.Executor executor, ThemeService theme, + AssetCommands assetCommands, AssetMetadataService metadataService, + AssetColorSchemaFactory colorSchemaFactory) { + super(i18n); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.theme = Objects.requireNonNull(theme, "theme"); + this.assetCommands = Objects.requireNonNull(assetCommands, "assetCommands"); + this.metadataService = Objects.requireNonNull(metadataService, "metadataService"); + this.coordinator = Objects.requireNonNull(colorSchemaFactory, "colorSchemaFactory").createPaletteSession(); + this.executor = Objects.requireNonNull(executor, "executor"); this.projectReference = Objects.requireNonNull(projectReference, "projectReference"); this.workspaceBus = Objects.requireNonNull(workspaceBus, "workspaceBus"); + this.dualListView = new AssetDetailsPaletteOverhaulingDualListView(i18n); + this.previewPane = new AssetDetailsPaletteOverhaulingPreviewPane(i18n); + this.listWithActions = new HBox(8, paletteActions, dualListView); + this.body = new HBox(16, listWithActions, previewPane); + this.content = new VBox(12, body); body.getStyleClass().add("assets-details-palette-overhauling-body"); paletteActions.getStyleClass().add("assets-details-palette-overhauling-toolbar"); listWithActions.getStyleClass().add("assets-details-list-with-actions"); @@ -93,7 +117,7 @@ public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSecti return; } - final AssetDetailsPaletteOverhaulingViewModel viewModel = coordinator.viewModel(); + final AssetPaletteState viewModel = coordinator.state(); dualListView.setLeftItems(viewModel.availableFiles()); dualListView.setRightItems(viewModel.selectedFiles()); dualListView.setInteractionEnabled(viewModel.editing()); @@ -112,20 +136,20 @@ public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSecti if (item != null) { coordinator.selectPreviewPalette(item); previewPane.render( - coordinator.viewModel().previewTileFiles(), - coordinator.viewModel().previewTileFile(), - coordinator.viewModel().previewPaletteFile(), - coordinator.viewModel().renderableFileCount()); + coordinator.state().previewTileFiles(), + coordinator.state().previewTileFile(), + coordinator.state().previewPaletteFile(), + coordinator.state().renderableFileCount()); } }); dualListView.setOnRightSelectionChanged(item -> { if (item != null) { coordinator.selectPreviewPalette(item); previewPane.render( - coordinator.viewModel().previewTileFiles(), - coordinator.viewModel().previewTileFile(), - coordinator.viewModel().previewPaletteFile(), - coordinator.viewModel().renderableFileCount()); + coordinator.state().previewTileFiles(), + coordinator.state().previewTileFile(), + coordinator.state().previewPaletteFile(), + coordinator.state().renderableFileCount()); } }); dualListView.setOnLeftItemActivated(item -> openPaletteWizard(item)); @@ -142,10 +166,10 @@ public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSecti if (file != null) { coordinator.selectPreviewTile(file); previewPane.render( - coordinator.viewModel().previewTileFiles(), - coordinator.viewModel().previewTileFile(), - coordinator.viewModel().previewPaletteFile(), - coordinator.viewModel().renderableFileCount()); + coordinator.state().previewTileFiles(), + coordinator.state().previewTileFile(), + coordinator.state().previewPaletteFile(), + coordinator.state().renderableFileCount()); } }); previewPane.render( @@ -162,7 +186,7 @@ public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSecti final Button removeButton = new Button("-"); removeButton.getStyleClass().addAll("studio-button", "studio-button-secondary", "assets-details-mini-action-button"); removeButton.setDisable(!viewModel.editing() || viewModel.previewPaletteFile() == null); - removeButton.setOnAction(ignored -> removePalette(coordinator.viewModel().previewPaletteFile())); + removeButton.setOnAction(ignored -> removePalette(coordinator.state().previewPaletteFile())); paletteActions.getChildren().setAll(addButton, removeButton); renderFormSection(content); @@ -170,17 +194,17 @@ public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSecti @Override protected String sectionTitle() { - return Container.i18n().text(I18n.ASSETS_SECTION_PALETTE_OVERHAULING); + return i18n.text(I18n.ASSETS_SECTION_PALETTE_OVERHAULING); } @Override protected StudioFormMode formMode() { - return coordinator.ready() && coordinator.viewModel().editing() ? StudioFormMode.EDITING : StudioFormMode.READ_ONLY; + return coordinator.ready() && coordinator.state().editing() ? StudioFormMode.EDITING : StudioFormMode.READ_ONLY; } @Override protected boolean isDirty() { - return coordinator.ready() && coordinator.viewModel().dirty(); + return coordinator.ready() && coordinator.state().dirty(); } @Override @@ -194,15 +218,15 @@ public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSecti if (viewState == null || viewState.selectedAssetReference() == null || !coordinator.ready()) { return; } - final var selectedPalettes = coordinator.viewModel().selectedFiles().stream() + final var selectedPalettes = coordinator.state().selectedFiles().stream() .map(file -> palettePayload(file.metadata())) .filter(Objects::nonNull) .toList(); if (selectedPalettes.isEmpty()) { workspaceBus.publish(new StudioAssetLogEvent("palette-overhauling", "Apply failed: no palette was selected.")); - Container.eventBus().publish(new StudioPackerOperationEvent( + workspaceBus.publish(new StudioPackerOperationEvent( UUID.randomUUID().toString(), - PackerEventKind.ACTION_FAILED, + StudioPackerOperationKind.ACTION_FAILED, "Palette overhauling apply failed: no palette was selected.", null, true)); @@ -210,13 +234,9 @@ public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSecti } final var assetReference = viewState.selectedAssetReference(); - Container.backgroundTasks().submit(() -> { - final var request = new ApplyPaletteOverhaulingRequest( - projectReference.toPackerProjectContext(), - assetReference, - selectedPalettes); + executor.execute(() -> { try { - final var response = Container.packer().workspaceService().applyPaletteOverhauling(request); + final var response = assetCommands.applyPaletteOverhauling(projectReference, assetReference, selectedPalettes); Platform.runLater(() -> { if (response.success()) { coordinator.apply(); @@ -231,7 +251,7 @@ public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSecti } catch (Exception exception) { Platform.runLater(() -> workspaceBus.publish(new StudioAssetLogEvent( "palette-overhauling", - "Apply failed: " + Objects.requireNonNullElse(exception.getMessage(), "unknown error")))); + "Apply failed due to an unexpected error."))); } }); } @@ -263,42 +283,51 @@ public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSecti : "asset-details:" + viewState.selectedAssetReference(); } - private void openPaletteWizard(p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile paletteFile) { + private void openPaletteWizard(p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile paletteFile) { if (getScene() == null || !coordinator.ready() || viewState == null || viewState.selectedAssetDetails() == null) { return; } - if (AssetDetailsPaletteOverhaulingCoordinator.paletteIsOriginal(paletteFile)) { + if (coordinator.paletteIsOriginal(paletteFile)) { return; } final var result = AssetDetailsPaletteWizardDialog.showAndWait( getScene().getWindow(), coordinator, - paletteFile); - result.ifPresent(edit -> Container.backgroundTasks().submit(() -> { + paletteFile, + i18n, + theme); + result.ifPresent(edit -> executor.execute(() -> { try { final AssetStudioGlyphMaterialMetadata metadata = coordinator.upsertPalette( edit.paletteId(), edit.displayName(), edit.schemaId(), edit.colors()); - metadataService.writeGlyphMaterialMetadata(viewState.selectedAssetDetails().summary().assetRoot(), metadata); + final var writeResult = metadataService.writeGlyphMaterialMetadata( + viewState.selectedAssetDetails().summary().assetRoot(), metadata); + if (!writeResult.successful()) { + Platform.runLater(() -> workspaceBus.publish(new StudioAssetLogEvent( + "palette-overhauling", + "Unable to save palette: " + writeResult.message()))); + return; + } Platform.runLater(() -> { workspaceBus.publish(new StudioAssetLogEvent("palette-overhauling", "Palette saved: " + edit.paletteId())); workspaceBus.publish(new StudioGlyphMaterialMetadataChangedEvent(viewState.selectedAssetReference(), metadata)); }); - } catch (IOException exception) { + } catch (RuntimeException exception) { Platform.runLater(() -> workspaceBus.publish(new StudioAssetLogEvent( "palette-overhauling", - "Unable to save palette: " + Objects.requireNonNullElse(exception.getMessage(), "unknown error")))); + "Unable to save palette."))); } })); } - private void removePalette(p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile paletteFile) { + private void removePalette(p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile paletteFile) { if (paletteFile == null || viewState == null || viewState.selectedAssetDetails() == null || viewState.selectedAssetReference() == null) { return; } - if (AssetDetailsPaletteOverhaulingCoordinator.paletteIsOriginal(paletteFile)) { + if (coordinator.paletteIsOriginal(paletteFile)) { workspaceBus.publish(new StudioAssetLogEvent( "palette-overhauling", "Original schema palettes cannot be removed.")); @@ -308,10 +337,17 @@ public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSecti if (!(paletteIdValue instanceof String paletteId) || paletteId.isBlank()) { return; } - Container.backgroundTasks().submit(() -> { + executor.execute(() -> { try { final AssetStudioGlyphMaterialMetadata metadata = coordinator.removePalette(paletteId); - metadataService.writeGlyphMaterialMetadata(viewState.selectedAssetDetails().summary().assetRoot(), metadata); + final var writeResult = metadataService.writeGlyphMaterialMetadata( + viewState.selectedAssetDetails().summary().assetRoot(), metadata); + if (!writeResult.successful()) { + Platform.runLater(() -> workspaceBus.publish(new StudioAssetLogEvent( + "palette-overhauling", + "Unable to remove palette: " + writeResult.message()))); + return; + } Platform.runLater(() -> { workspaceBus.publish(new StudioAssetLogEvent("palette-overhauling", "Palette removed: " + paletteId)); workspaceBus.publish(new StudioGlyphMaterialMetadataChangedEvent(viewState.selectedAssetReference(), metadata)); @@ -319,7 +355,7 @@ public final class AssetDetailsPaletteOverhaulingControl extends StudioFormSecti } catch (Exception exception) { Platform.runLater(() -> workspaceBus.publish(new StudioAssetLogEvent( "palette-overhauling", - "Unable to remove palette: " + Objects.requireNonNullElse(exception.getMessage(), "unknown error")))); + "Unable to remove palette."))); } }); } diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingDualListView.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingDualListView.java similarity index 87% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingDualListView.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingDualListView.java index 74a0fb83..cc37199c 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingDualListView.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingDualListView.java @@ -1,22 +1,22 @@ -package p.studio.workspaces.assets.details.palette; +package p.studio.ui.javafx.workspaces.assets.details.palette; import javafx.scene.Node; import javafx.scene.control.Label; import javafx.scene.layout.HBox; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; -import p.studio.Container; -import p.studio.controls.banks.StudioDualListView; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; +import p.studio.ui.javafx.controls.banks.StudioDualListView; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; import java.util.List; import java.util.Map; public final class AssetDetailsPaletteOverhaulingDualListView extends StudioDualListView { - public AssetDetailsPaletteOverhaulingDualListView() { - setLeftTitle(Container.i18n().text(I18n.ASSETS_PALETTE_OVERHAULING_AVAILABLE)); - setRightTitle(Container.i18n().text(I18n.ASSETS_PALETTE_OVERHAULING_SELECTED)); + public AssetDetailsPaletteOverhaulingDualListView(I18nService i18n) { + setLeftTitle(i18n.text(I18n.ASSETS_PALETTE_OVERHAULING_AVAILABLE)); + setRightTitle(i18n.text(I18n.ASSETS_PALETTE_OVERHAULING_SELECTED)); } @Override diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingPreviewPane.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingPreviewPane.java similarity index 94% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingPreviewPane.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingPreviewPane.java index 61fb8690..530dea8e 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingPreviewPane.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/palette/AssetDetailsPaletteOverhaulingPreviewPane.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.details.palette; +package p.studio.ui.javafx.workspaces.assets.details.palette; import javafx.collections.FXCollections; import javafx.geometry.Pos; @@ -10,9 +10,9 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; -import p.studio.Container; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; import java.util.List; import java.util.Map; @@ -23,17 +23,20 @@ public final class AssetDetailsPaletteOverhaulingPreviewPane extends VBox { private static final double PREVIEW_SIZE = 192.0d; private static final double PREVIEW_FRAME_SIZE = PREVIEW_SIZE + 16.0d; - private final Label selectorLabel = new Label(Container.i18n().text(I18n.ASSETS_PALETTE_OVERHAULING_TILE_SELECTOR)); + private final Label selectorLabel; private final ComboBox tileSelector = new ComboBox<>(); private final Canvas tileCanvas = new Canvas(PREVIEW_SIZE, PREVIEW_SIZE); - private final Label emptyLabel = new Label(Container.i18n().text(I18n.ASSETS_PALETTE_OVERHAULING_PREVIEW_EMPTY)); - private final Label paletteLabel = new Label(Container.i18n().text(I18n.ASSETS_PALETTE_OVERHAULING_APPLIED_PALETTE)); + private final Label emptyLabel; + private final Label paletteLabel; private final HBox paletteStrip = new HBox(0); private Consumer onPreviewTileChanged = ignored -> { }; private boolean suppressSelectorEvents; - public AssetDetailsPaletteOverhaulingPreviewPane() { + public AssetDetailsPaletteOverhaulingPreviewPane(I18nService i18n) { + selectorLabel = new Label(i18n.text(I18n.ASSETS_PALETTE_OVERHAULING_TILE_SELECTOR)); + emptyLabel = new Label(i18n.text(I18n.ASSETS_PALETTE_OVERHAULING_PREVIEW_EMPTY)); + paletteLabel = new Label(i18n.text(I18n.ASSETS_PALETTE_OVERHAULING_APPLIED_PALETTE)); getStyleClass().add("assets-details-palette-preview"); setSpacing(10); setAlignment(Pos.TOP_CENTER); diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteWizardDialog.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/palette/AssetDetailsPaletteWizardDialog.java similarity index 85% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteWizardDialog.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/palette/AssetDetailsPaletteWizardDialog.java index bb96c790..a1e134e2 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/palette/AssetDetailsPaletteWizardDialog.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/palette/AssetDetailsPaletteWizardDialog.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.details.palette; +package p.studio.ui.javafx.workspaces.assets.details.palette; import javafx.collections.FXCollections; import javafx.collections.ObservableList; @@ -18,10 +18,12 @@ import javafx.scene.paint.Color; import javafx.stage.Modality; import javafx.stage.Stage; import javafx.stage.Window; -import p.studio.Container; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialSchema; +import p.studio.ui.javafx.utilities.ThemeService; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialSchema; +import p.studio.api.assets.palette.AssetPaletteSession; import java.util.ArrayList; import java.util.List; @@ -44,18 +46,22 @@ public final class AssetDetailsPaletteWizardDialog { private PaletteEditResult result; private final String paletteId; private final boolean editing; + private final I18nService i18n; private AssetDetailsPaletteWizardDialog( Window owner, - AssetDetailsPaletteOverhaulingCoordinator coordinator, - AssetWorkspaceBankCompositionFile paletteFile) { + AssetPaletteSession coordinator, + AssetWorkspaceBankCompositionFile paletteFile, + I18nService i18n, + ThemeService theme) { + this.i18n = Objects.requireNonNull(i18n, "i18n"); this.editing = paletteFile != null; this.paletteId = editing && paletteFile.metadata().get("paletteId") instanceof String id && !id.isBlank() ? id : coordinator.nextPaletteId(); stage.initOwner(owner); stage.initModality(Modality.WINDOW_MODAL); - stage.setTitle(Container.i18n().text(editing + stage.setTitle(i18n.text(editing ? I18n.ASSETS_PALETTE_WIZARD_UPDATE_TITLE : I18n.ASSETS_PALETTE_WIZARD_CREATE_TITLE)); @@ -76,7 +82,7 @@ public final class AssetDetailsPaletteWizardDialog { } editableColors.setAll(initialEditableColors(paletteFile, initialSchema)); nameField.setText(initialDisplayName(paletteFile)); - nameField.setPromptText(AssetDetailsPaletteOverhaulingCoordinator.generatedDisplayName(editableColors)); + nameField.setPromptText(coordinator.generatedDisplayName(editableColors)); schemaComboBox.valueProperty().addListener((ignored, previous, current) -> { if (current == null) { editableColors.clear(); @@ -96,7 +102,7 @@ public final class AssetDetailsPaletteWizardDialog { } }); - final Button applyColorButton = new Button(Container.i18n().text(I18n.ASSETS_PALETTE_WIZARD_APPLY_COLOR)); + final Button applyColorButton = new Button(i18n.text(I18n.ASSETS_PALETTE_WIZARD_APPLY_COLOR)); applyColorButton.getStyleClass().addAll("studio-button", "studio-button-secondary"); applyColorButton.setOnAction(ignored -> { final int index = indexListView.getSelectionModel().getSelectedIndex(); @@ -108,20 +114,20 @@ public final class AssetDetailsPaletteWizardDialog { indexListView.getSelectionModel().select(index); }); - final Button cancelButton = new Button(Container.i18n().text(I18n.FORM_ACTION_CANCEL)); + final Button cancelButton = new Button(i18n.text(I18n.FORM_ACTION_CANCEL)); cancelButton.getStyleClass().addAll("studio-button", "studio-button-secondary"); cancelButton.setOnAction(ignored -> { result = null; stage.close(); }); - final Button applyButton = new Button(Container.i18n().text(I18n.FORM_ACTION_APPLY)); + final Button applyButton = new Button(i18n.text(I18n.FORM_ACTION_APPLY)); applyButton.getStyleClass().addAll("studio-button", "studio-button-primary"); applyButton.setOnAction(ignored -> { final AssetStudioGlyphMaterialSchema selectedSchema = schemaComboBox.getSelectionModel().getSelectedItem(); if (selectedSchema == null || coordinator.duplicatePaletteExists(paletteId, selectedSchema.schemaId(), editableColors)) { return; } - result = new PaletteEditResult(paletteId, normalizedDisplayName(), selectedSchema.schemaId(), List.copyOf(editableColors)); + result = new PaletteEditResult(paletteId, normalizedDisplayName(coordinator), selectedSchema.schemaId(), List.copyOf(editableColors)); stage.close(); }); final Region spacer = new Region(); @@ -160,28 +166,30 @@ public final class AssetDetailsPaletteWizardDialog { HBox.setHgrow(nameField, Priority.ALWAYS); refreshPreview(coordinator); final Scene scene = new Scene(root, 620, 570); - scene.getStylesheets().add(Container.theme().getDefaultTheme()); + scene.getStylesheets().add(Objects.requireNonNull(theme, "theme").getDefaultTheme()); stage.setScene(scene); stage.setOnShown(ignored -> stage.centerOnScreen()); } public static Optional showAndWait( Window owner, - AssetDetailsPaletteOverhaulingCoordinator coordinator, - AssetWorkspaceBankCompositionFile paletteFile) { - final AssetDetailsPaletteWizardDialog dialog = new AssetDetailsPaletteWizardDialog(owner, coordinator, paletteFile); + AssetPaletteSession coordinator, + AssetWorkspaceBankCompositionFile paletteFile, + I18nService i18n, + ThemeService theme) { + final AssetDetailsPaletteWizardDialog dialog = new AssetDetailsPaletteWizardDialog(owner, coordinator, paletteFile, i18n, theme); dialog.stage.showAndWait(); return Optional.ofNullable(dialog.result); } private Label fieldLabel(I18n label) { - final Label node = new Label(Container.i18n().text(label)); + final Label node = new Label(i18n.text(label)); node.getStyleClass().add("assets-details-palette-wizard-label"); return node; } private AssetStudioGlyphMaterialSchema resolveInitialSchema( - AssetDetailsPaletteOverhaulingCoordinator coordinator, + AssetPaletteSession coordinator, AssetWorkspaceBankCompositionFile paletteFile, List schemas) { if (paletteFile != null && paletteFile.metadata().get("schemaId") instanceof String schemaId) { @@ -227,7 +235,7 @@ public final class AssetDetailsPaletteWizardDialog { return explicitName instanceof String value ? value : ""; } - private void refreshPreview(AssetDetailsPaletteOverhaulingCoordinator coordinator) { + private void refreshPreview(AssetPaletteSession coordinator) { final AssetStudioGlyphMaterialSchema schema = schemaComboBox.getSelectionModel().getSelectedItem(); final List originalColors = schema == null ? List.of() @@ -237,20 +245,20 @@ public final class AssetDetailsPaletteWizardDialog { .toList(); originalStrip.getChildren().setAll(originalColors.stream().map(this::swatch).toList()); editableStrip.getChildren().setAll(editableColors.stream().map(this::swatch).toList()); - nameField.setPromptText(AssetDetailsPaletteOverhaulingCoordinator.generatedDisplayName(editableColors)); + nameField.setPromptText(coordinator.generatedDisplayName(editableColors)); indexItems.setAll(java.util.stream.IntStream.range(0, editableColors.size()) .mapToObj(index -> index + " -> " + editableColors.get(index)) .toList()); final boolean duplicate = schema != null && coordinator.duplicatePaletteExists(paletteId, schema.schemaId(), editableColors); summaryLabel.setText(duplicate - ? Container.i18n().text(I18n.ASSETS_PALETTE_WIZARD_DUPLICATE) - : Container.i18n().text(I18n.ASSETS_PALETTE_WIZARD_READY)); + ? i18n.text(I18n.ASSETS_PALETTE_WIZARD_DUPLICATE) + : i18n.text(I18n.ASSETS_PALETTE_WIZARD_READY)); } - private String normalizedDisplayName() { + private String normalizedDisplayName(AssetPaletteSession coordinator) { final String value = nameField.getText(); return value == null || value.trim().isBlank() - ? AssetDetailsPaletteOverhaulingCoordinator.generatedDisplayName(editableColors) + ? coordinator.generatedDisplayName(editableColors) : value.trim(); } diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/scene/AssetDetailsSceneLayersControl.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/scene/AssetDetailsSceneLayersControl.java similarity index 86% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/scene/AssetDetailsSceneLayersControl.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/scene/AssetDetailsSceneLayersControl.java index 8f44967e..82036318 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/scene/AssetDetailsSceneLayersControl.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/scene/AssetDetailsSceneLayersControl.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.details.scene; +package p.studio.ui.javafx.workspaces.assets.details.scene; import javafx.application.Platform; import javafx.collections.FXCollections; @@ -9,26 +9,25 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; -import p.packer.messages.ListAssetsRequest; -import p.packer.messages.assets.AssetFamilyCatalog; -import p.studio.Container; -import p.studio.controls.forms.StudioFormMode; -import p.studio.controls.lifecycle.StudioControlLifecycle; -import p.studio.controls.lifecycle.StudioControlLifecycleSupport; -import p.studio.lsp.events.StudioWorkspaceEventBus; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.details.AssetDetailsUiSupport; -import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsViewState; -import p.studio.workspaces.assets.messages.events.StudioAssetLogEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceDetailsSceneLayerChangedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceSelectionRequestedEvent; -import p.studio.workspaces.assets.metadata.*; -import p.studio.workspaces.framework.StudioSubscriptionBag; +import p.studio.api.assets.AssetFamily; +import p.studio.api.assets.AssetCatalog; +import p.studio.api.assets.AssetFamily; +import p.studio.ui.javafx.controls.forms.StudioFormMode; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycle; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycleSupport; +import p.studio.ui.javafx.events.StudioWorkspaceEventBus; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.ui.javafx.workspaces.assets.details.AssetDetailsUiSupport; +import p.studio.ui.javafx.workspaces.assets.messages.AssetWorkspaceDetailsViewState; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetLogEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceDetailsSceneLayerChangedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceSelectionRequestedEvent; +import p.studio.api.assets.metadata.*; +import p.studio.ui.javafx.workspaces.framework.StudioSubscriptionBag; -import java.io.IOException; -import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.Comparator; @@ -39,17 +38,27 @@ public final class AssetDetailsSceneLayersControl extends VBox implements Studio private final ProjectReference projectReference; private final StudioWorkspaceEventBus workspaceBus; private final StudioSubscriptionBag subscriptions = new StudioSubscriptionBag(); - private final AssetStudioMetadataService metadataService = new AssetStudioMetadataService(); + private final AssetMetadataService metadataService; private AssetWorkspaceDetailsViewState viewState; private Integer editingLayerIndex; private LayerDraft editingDraft; private int selectedLayerIndex = 1; - public AssetDetailsSceneLayersControl(ProjectReference projectReference, StudioWorkspaceEventBus workspaceBus) { + private final java.util.concurrent.Executor executor; + private final I18nService i18n; + private final AssetCatalog assetCatalog; + + public AssetDetailsSceneLayersControl(ProjectReference projectReference, StudioWorkspaceEventBus workspaceBus, + I18nService i18n, java.util.concurrent.Executor executor, AssetCatalog assetCatalog, + AssetMetadataService metadataService) { StudioControlLifecycleSupport.install(this, this); this.projectReference = Objects.requireNonNull(projectReference, "projectReference"); this.workspaceBus = Objects.requireNonNull(workspaceBus, "workspaceBus"); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.executor = Objects.requireNonNull(executor, "executor"); + this.assetCatalog = Objects.requireNonNull(assetCatalog, "assetCatalog"); + this.metadataService = Objects.requireNonNull(metadataService, "metadataService"); } @Override @@ -96,7 +105,7 @@ public final class AssetDetailsSceneLayersControl extends VBox implements Studio for (int index = 1; index <= 4; index += 1) { final int layerIndex = index; final Button button = new Button(); - button.textProperty().bind(Container.i18n().bind(I18n.ASSETS_LABEL_LAYER, layerIndex)); + button.textProperty().bind(i18n.bind(I18n.ASSETS_LABEL_LAYER, layerIndex)); button.getStyleClass().addAll("studio-button", "assets-scene-layer-selector-button"); if (layerIndex == selectedLayerIndex) { button.getStyleClass().add("assets-scene-layer-selector-button-active"); @@ -122,7 +131,7 @@ public final class AssetDetailsSceneLayersControl extends VBox implements Studio final LayerDraft draft = editing ? editingDraft : LayerDraft.from(binding); final VBox formContent = buildLayerFormContent(sceneAssetRoot, binding, draft, editing); final VBox formSection = AssetDetailsUiSupport.createEditableSection( - Container.i18n().text(I18n.ASSETS_SECTION_LAYER_CONFIGURATION), + i18n.text(I18n.ASSETS_SECTION_LAYER_CONFIGURATION), createLayerFormHeaderActions(layerIndex, binding, editing), formContent, editing ? StudioFormMode.EDITING : StudioFormMode.READ_ONLY); @@ -146,7 +155,7 @@ public final class AssetDetailsSceneLayersControl extends VBox implements Studio card.getStyleClass().addAll("assets-scene-layer-card", "assets-scene-layer-config"); final CheckBox enabledCheckBox = new CheckBox(); - enabledCheckBox.textProperty().bind(Container.i18n().bind(I18n.ASSETS_LABEL_USE_LAYER)); + enabledCheckBox.textProperty().bind(i18n.bind(I18n.ASSETS_LABEL_USE_LAYER)); enabledCheckBox.setSelected(draft != null && draft.enabled()); enabledCheckBox.getStyleClass().add("assets-scene-layer-enabled"); enabledCheckBox.setDisable(!editing); @@ -159,21 +168,21 @@ public final class AssetDetailsSceneLayersControl extends VBox implements Studio card.getChildren().addAll( AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_LABEL_SCENE_DIMENSIONS), + i18n.text(I18n.ASSETS_LABEL_SCENE_DIMENSIONS), editing ? createLayerSizeEditor(draft) : new Label(draft.widthText() + " x " + draft.heightText())), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_LABEL_TILEMAP), + i18n.text(I18n.ASSETS_LABEL_TILEMAP), binding == null - ? Container.i18n().text(I18n.ASSETS_VALUE_NOT_CONFIGURED) + ? i18n.text(I18n.ASSETS_VALUE_NOT_CONFIGURED) : AssetDetailsUiSupport.projectRelativePath(projectReference, sceneAssetRoot.resolve(binding.tilemap()))), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_LABEL_TILESET), + i18n.text(I18n.ASSETS_LABEL_TILESET), editing ? createTilesetCombo(draft, true) : createTilesetReadOnlyValue(binding, draft)), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_LABEL_PARALLAX), + i18n.text(I18n.ASSETS_LABEL_PARALLAX), editing ? createParallaxEditor(draft) : new Label(draft.parallaxText())), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_LABEL_DEFAULT_PALETTE), + i18n.text(I18n.ASSETS_LABEL_DEFAULT_PALETTE), editing ? createDefaultPaletteEditor(draft) : new Label(draft.defaultPaletteText()))); return card; } @@ -182,7 +191,7 @@ public final class AssetDetailsSceneLayersControl extends VBox implements Studio final VBox overview = new VBox(10); overview.getStyleClass().add("assets-scene-layer-overview"); - final Label title = new Label(Container.i18n().text(I18n.ASSETS_LABEL_LAYER_OVERVIEW)); + final Label title = new Label(i18n.text(I18n.ASSETS_LABEL_LAYER_OVERVIEW)); title.getStyleClass().add("assets-scene-layer-overview-title"); final Region surface = new Region(); @@ -192,7 +201,7 @@ public final class AssetDetailsSceneLayersControl extends VBox implements Studio overview.getChildren().addAll( title, surface, - AssetDetailsUiSupport.createSectionMessage(Container.i18n().text(I18n.ASSETS_VALUE_LAYER_OVERVIEW_PENDING))); + AssetDetailsUiSupport.createSectionMessage(i18n.text(I18n.ASSETS_VALUE_LAYER_OVERVIEW_PENDING))); return overview; } @@ -308,26 +317,25 @@ public final class AssetDetailsSceneLayersControl extends VBox implements Studio private Node createTilesetReadOnlyValue(AssetStudioSceneLayerBinding binding, LayerDraft draft) { final String value = binding == null || draft == null || draft.tilesetAssetRoot().isBlank() - ? Container.i18n().text(I18n.ASSETS_VALUE_NOT_CONFIGURED) + ? i18n.text(I18n.ASSETS_VALUE_NOT_CONFIGURED) : tilesetPath(draft.tilesetAssetRoot()); return new Label(value); } private List loadTilesetOptions() { try { - final var response = Container.packer().workspaceService().listAssets(new ListAssetsRequest(projectReference.toPackerProjectContext())); - return response.assets().stream() - .filter(asset -> asset.assetFamily() == AssetFamilyCatalog.GLYPH_BANK) + return assetCatalog.list(projectReference, false).stream() + .filter(asset -> asset.family() == AssetFamily.GLYPH_BANK) .filter(asset -> metadataService - .read(asset.identity().assetRoot(), AssetFamilyCatalog.GLYPH_BANK) + .read(asset.root(), AssetFamily.GLYPH_BANK) .glyphSpecialization() == AssetStudioGlyphSpecialization.TILESET) .map(asset -> { final String relativeAssetRoot = projectReference.rootPath() .resolve("assets") - .relativize(asset.identity().assetRoot()) + .relativize(asset.root()) .toString() .replace('\\', '/'); - return new TilesetOption(asset.identity().assetName(), relativeAssetRoot); + return new TilesetOption(asset.name(), relativeAssetRoot); }) .sorted(Comparator.comparing(TilesetOption::label, String.CASE_INSENSITIVE_ORDER)) .toList(); @@ -359,16 +367,17 @@ public final class AssetDetailsSceneLayersControl extends VBox implements Studio metadata.layerCount(), updatedBindings, metadata.supportFile()); - Container.backgroundTasks().submit(() -> { - try { - metadataService.writeSceneBankMetadata(viewState.selectedAssetDetails().summary().assetRoot(), updatedMetadata); + executor.execute(() -> { + final var writeResult = metadataService.writeSceneBankMetadata( + viewState.selectedAssetDetails().summary().assetRoot(), updatedMetadata); + if (writeResult.successful()) { Platform.runLater(() -> { workspaceBus.publish(new StudioAssetLogEvent("scene-bank-layer", successMessage)); workspaceBus.publish(new StudioAssetsWorkspaceSelectionRequestedEvent(viewState.selectedAssetReference(), true)); }); - } catch (IOException exception) { + } else { Platform.runLater(() -> workspaceBus.publish( - new StudioAssetLogEvent("scene-bank-layer", "Unable to update layer " + layerIndex + ": " + exception.getMessage()))); + new StudioAssetLogEvent("scene-bank-layer", "Unable to update layer " + layerIndex + ": " + writeResult.message()))); } }); } @@ -444,22 +453,11 @@ public final class AssetDetailsSceneLayersControl extends VBox implements Studio } private Button createFormActionButton(I18n textKey) { - final Button button = new Button(Container.i18n().text(textKey)); + final Button button = new Button(i18n.text(textKey)); button.getStyleClass().addAll("studio-button", "studio-button-secondary"); return button; } - private boolean hasLayerTilemap(Path sceneAssetRoot, int layerIndex) { - if (viewState == null || viewState.selectedAssetDetails() == null || viewState.selectedAssetDetails().sceneBankMetadata() == null) { - return false; - } - return viewState.selectedAssetDetails().sceneBankMetadata().layerBindings().stream() - .filter(binding -> binding.index() == layerIndex) - .findFirst() - .map(binding -> Files.isRegularFile(sceneAssetRoot.resolve(binding.tilemap()))) - .orElse(false); - } - private record TilesetOption(String assetName, String relativeAssetRoot) { String label() { return assetName + " [" + relativeAssetRoot + "]"; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/schema/AssetDetailsColorSchemaGroupsControl.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/schema/AssetDetailsColorSchemaGroupsControl.java similarity index 65% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/schema/AssetDetailsColorSchemaGroupsControl.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/schema/AssetDetailsColorSchemaGroupsControl.java index 413c925e..05e2042d 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/schema/AssetDetailsColorSchemaGroupsControl.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/schema/AssetDetailsColorSchemaGroupsControl.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.details.schema; +package p.studio.ui.javafx.workspaces.assets.details.schema; import javafx.application.Platform; import javafx.scene.Node; @@ -10,42 +10,42 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; -import p.studio.Container; -import p.studio.controls.banks.StudioDualListView; -import p.studio.controls.forms.StudioFormEditScopeChangedEvent; -import p.studio.controls.forms.StudioFormMode; -import p.studio.controls.forms.StudioFormSection; -import p.studio.controls.forms.StudioFormSession; -import p.studio.lsp.events.StudioWorkspaceEventBus; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; -import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsViewState; -import p.studio.workspaces.assets.messages.events.StudioAssetLogEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent; -import p.studio.workspaces.assets.messages.events.StudioGlyphMaterialMetadataChangedEvent; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialArtifactBinding; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialMetadata; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialSchema; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialSchemaStatus; -import p.studio.workspaces.assets.metadata.AssetStudioMetadataService; -import p.studio.workspaces.framework.StudioSubscriptionBag; +import p.studio.ui.javafx.controls.banks.StudioDualListView; +import p.studio.ui.javafx.controls.forms.StudioFormEditScopeChangedEvent; +import p.studio.ui.javafx.controls.forms.StudioFormMode; +import p.studio.ui.javafx.controls.forms.StudioFormSection; +import p.studio.ui.javafx.events.StudioWorkspaceEventBus; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionFile; +import p.studio.api.assets.schema.AssetColorSchemaFactory; +import p.studio.api.assets.schema.AssetColorSchemaRules; +import p.studio.api.assets.schema.AssetColorSchemaSession; +import p.studio.api.assets.schema.AssetColorSchemaState; +import p.studio.ui.javafx.workspaces.assets.messages.AssetWorkspaceDetailsViewState; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetLogEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioGlyphMaterialMetadataChangedEvent; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialMetadata; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialSchema; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialSchemaStatus; +import p.studio.api.assets.metadata.AssetMetadataService; +import p.studio.ui.javafx.workspaces.framework.StudioSubscriptionBag; -import java.io.IOException; -import java.util.LinkedHashSet; import java.util.List; import java.util.Objects; -import java.util.Set; public final class AssetDetailsColorSchemaGroupsControl extends StudioFormSection { private static final String SECTION_ID = "asset-details.color-schema-groups"; private final StudioWorkspaceEventBus workspaceBus; private final StudioSubscriptionBag subscriptions = new StudioSubscriptionBag(); - private final AssetStudioMetadataService metadataService = new AssetStudioMetadataService(); - private final AssetDetailsColorSchemaCoordinator coordinator = new AssetDetailsColorSchemaCoordinator(); + private final AssetMetadataService metadataService; + private final AssetColorSchemaSession coordinator; + private final AssetColorSchemaRules schemaRules; private final ListView schemaListView = new ListView<>(); - private final SchemaTileDualListView tileDualListView = new SchemaTileDualListView(); + private final SchemaTileDualListView tileDualListView; private final VBox schemaActions = new VBox(6); private final HBox schemaListPane = new HBox(8, schemaActions, schemaListView); private final HBox paletteStrip = new HBox(4); @@ -58,11 +58,22 @@ public final class AssetDetailsColorSchemaGroupsControl extends StudioFormSectio private final VBox content = new VBox(12, body, summaryLabel); private AssetWorkspaceDetailsViewState viewState; - private StudioFormSession formSession; private String selectedSchemaId; private boolean selectingSchema; + private final java.util.concurrent.Executor executor; + private final I18nService i18n; - public AssetDetailsColorSchemaGroupsControl(ProjectReference projectReference, StudioWorkspaceEventBus workspaceBus) { + public AssetDetailsColorSchemaGroupsControl(ProjectReference projectReference, StudioWorkspaceEventBus workspaceBus, + I18nService i18n, java.util.concurrent.Executor executor, AssetMetadataService metadataService, + AssetColorSchemaFactory colorSchemaFactory) { + super(i18n); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.metadataService = Objects.requireNonNull(metadataService, "metadataService"); + final AssetColorSchemaFactory factory = Objects.requireNonNull(colorSchemaFactory, "colorSchemaFactory"); + this.coordinator = factory.createSession(); + this.schemaRules = factory.rules(); + this.tileDualListView = new SchemaTileDualListView(i18n); + this.executor = Objects.requireNonNull(executor, "executor"); Objects.requireNonNull(projectReference, "projectReference"); this.workspaceBus = Objects.requireNonNull(workspaceBus, "workspaceBus"); schemaListView.getStyleClass().add("assets-details-color-schema-list"); @@ -72,13 +83,7 @@ public final class AssetDetailsColorSchemaGroupsControl extends StudioFormSectio return; } selectedSchemaId = current == null ? null : current.schemaId(); - if (formMode() == StudioFormMode.EDITING) { - formSession.setDraft(selectedSchemaId == null - ? AssetDetailsColorSchemaDraft.noSelection() - : sourceDraft(selectedSchemaId).asUpdateDraft()); - } else { - replaceFormSource(); - } + coordinator.selectSchema(selectedSchemaId); renderSection(); }); schemaActions.getStyleClass().add("assets-details-color-schema-toolbar"); @@ -131,19 +136,15 @@ public final class AssetDetailsColorSchemaGroupsControl extends StudioFormSectio @Override protected void renderSection() { if (viewState == null || viewState.selectedAssetDetails() == null || !coordinator.ready()) { - formSession = null; clearRenderedSection(); return; } - if (formSession == null) { - replaceFormSource(); - } - final AssetDetailsColorSchemaDraft draft = formSession.draft(); + final AssetColorSchemaState draft = coordinator.state(); renderSchemaList(); renderSchemaActions(draft); renderEditor(draft); - summaryLabel.setText(Container.i18n().format( + summaryLabel.setText(i18n.format( I18n.ASSETS_COLOR_SCHEMA_SUMMARY, coordinator.schemas().size(), coordinator.unassignedTileCount())); @@ -153,36 +154,32 @@ public final class AssetDetailsColorSchemaGroupsControl extends StudioFormSectio @Override protected String sectionTitle() { - return Container.i18n().text(I18n.ASSETS_SECTION_COLOR_SCHEMA_GROUPS); + return i18n.text(I18n.ASSETS_SECTION_COLOR_SCHEMA_GROUPS); } @Override protected StudioFormMode formMode() { - return formSession == null ? StudioFormMode.READ_ONLY : formSession.mode(); + return coordinator.state().editing() ? StudioFormMode.EDITING : StudioFormMode.READ_ONLY; } @Override protected boolean isDirty() { - return formSession != null && formSession.isDirty(); + return coordinator.state().dirty(); } @Override protected void beginEdit() { - if (formSession == null) { - replaceFormSource(); - } + coordinator.beginEdit(); selectedSchemaId = null; - formSession.replaceSource(AssetDetailsColorSchemaDraft.noSelection()); - formSession.beginEdit(); publishEditScope(workspaceBus, currentScopeKey(), SECTION_ID); } @Override protected void apply() { - if (viewState == null || viewState.selectedAssetDetails() == null || viewState.selectedAssetReference() == null || formSession == null) { + if (viewState == null || viewState.selectedAssetDetails() == null || viewState.selectedAssetReference() == null || !coordinator.ready()) { return; } - final AssetDetailsColorSchemaDraft draft = formSession.draft(); + final AssetColorSchemaState draft = coordinator.state(); if (!draft.selected()) { workspaceBus.publish(new StudioAssetLogEvent("color-schema-groups", "Apply failed: select or create a schema first.")); return; @@ -196,21 +193,27 @@ public final class AssetDetailsColorSchemaGroupsControl extends StudioFormSectio if (orderedColors.size() > 16) { workspaceBus.publish(new StudioAssetLogEvent( "color-schema-groups", - Container.i18n().text(I18n.ASSETS_COLOR_SCHEMA_DIALOG_TOO_MANY_COLORS))); + i18n.text(I18n.ASSETS_COLOR_SCHEMA_DIALOG_TOO_MANY_COLORS))); return; } } final var assetDetails = viewState.selectedAssetDetails(); final var assetReference = viewState.selectedAssetReference(); - Container.backgroundTasks().submit(() -> { + executor.execute(() -> { try { final AssetStudioGlyphMaterialMetadata metadata = draft.removeRequested() ? coordinator.removeSchema(draft.schemaId()) : coordinator.upsertSchema(draft.schemaId(), draft.assignedTiles(), draft.orderedColors()); - metadataService.writeGlyphMaterialMetadata(assetDetails.summary().assetRoot(), metadata); + final var writeResult = metadataService.writeGlyphMaterialMetadata(assetDetails.summary().assetRoot(), metadata); + if (!writeResult.successful()) { + Platform.runLater(() -> workspaceBus.publish(new StudioAssetLogEvent( + "color-schema-groups", + "Unable to save schema: " + writeResult.message()))); + return; + } Platform.runLater(() -> { - formSession.apply(); + coordinator.apply(); selectedSchemaId = draft.removeRequested() ? null : draft.schemaId(); publishEditScope(workspaceBus, currentScopeKey(), null); workspaceBus.publish(new StudioAssetLogEvent( @@ -219,30 +222,24 @@ public final class AssetDetailsColorSchemaGroupsControl extends StudioFormSectio workspaceBus.publish(new StudioGlyphMaterialMetadataChangedEvent(assetReference, metadata)); renderSection(); }); - } catch (IOException | RuntimeException exception) { + } catch (RuntimeException exception) { Platform.runLater(() -> workspaceBus.publish(new StudioAssetLogEvent( "color-schema-groups", - "Unable to save schema: " + Objects.requireNonNullElse(exception.getMessage(), "unknown error")))); + "Unable to save schema."))); } }); } @Override protected void reset() { - if (formSession == null) { - return; - } - formSession.resetDraft(); - selectedSchemaId = formSession.draft().selected() ? formSession.draft().schemaId() : null; + coordinator.reset(); + selectedSchemaId = coordinator.state().selected() ? coordinator.state().schemaId() : null; } @Override protected void cancel() { - if (formSession == null) { - return; - } - formSession.cancelEdit(); - selectedSchemaId = formSession.draft().selected() ? formSession.draft().schemaId() : null; + coordinator.cancel(); + selectedSchemaId = coordinator.state().selected() ? coordinator.state().schemaId() : null; publishEditScope(workspaceBus, currentScopeKey(), null); } @@ -273,13 +270,13 @@ public final class AssetDetailsColorSchemaGroupsControl extends StudioFormSectio selectingSchema = false; } - private void renderSchemaActions(AssetDetailsColorSchemaDraft draft) { + private void renderSchemaActions(AssetColorSchemaState draft) { final Button newButton = new Button("+"); newButton.getStyleClass().addAll("studio-button", "studio-button-secondary", "assets-details-mini-action-button"); newButton.setDisable(formMode() != StudioFormMode.EDITING); newButton.setOnAction(ignored -> { - selectedSchemaId = coordinator.nextSchemaId(); - formSession.setDraft(sourceDraft(selectedSchemaId).asUpdateDraft()); + coordinator.createSchema(); + selectedSchemaId = coordinator.state().schemaId(); rerenderPreservingScrollPosition(); }); @@ -287,30 +284,26 @@ public final class AssetDetailsColorSchemaGroupsControl extends StudioFormSectio removeButton.getStyleClass().addAll("studio-button", "studio-button-secondary", "assets-details-mini-action-button"); removeButton.setDisable(formMode() != StudioFormMode.EDITING || !draft.selected() || (draft.existingSchema() && !coordinator.canRemove(draft.schemaId()))); removeButton.setOnAction(ignored -> { - if (draft.existingSchema()) { - formSession.updateDraft(AssetDetailsColorSchemaDraft::markForRemoval); - } else { - selectedSchemaId = null; - formSession.setDraft(AssetDetailsColorSchemaDraft.noSelection()); - } + coordinator.markSelectedSchemaForRemoval(); + selectedSchemaId = coordinator.state().schemaId(); rerenderPreservingScrollPosition(); }); if (draft.existingSchema() && !coordinator.canRemove(draft.schemaId())) { removeButton.setTooltip(new javafx.scene.control.Tooltip( - Container.i18n().format(I18n.ASSETS_COLOR_SCHEMA_REMOVE_BLOCKED, draft.schemaId()))); + i18n.format(I18n.ASSETS_COLOR_SCHEMA_REMOVE_BLOCKED, draft.schemaId()))); } schemaActions.getChildren().setAll(newButton, removeButton); } - private void renderEditor(AssetDetailsColorSchemaDraft draft) { + private void renderEditor(AssetColorSchemaState draft) { editorPane.getChildren().clear(); if (!draft.selected()) { tileDualListView.setLeftItems(List.of()); tileDualListView.setRightItems(List.of()); tileDualListView.setInteractionEnabled(false); paletteStrip.getChildren().clear(); - paletteCounterLabel.setText(Container.i18n().format(I18n.ASSETS_COLOR_SCHEMA_DIALOG_COLOR_COUNT, 0)); + paletteCounterLabel.setText(i18n.format(I18n.ASSETS_COLOR_SCHEMA_DIALOG_COLOR_COUNT, 0)); editorPane.getChildren().addAll( emptyMessage("Select a schema or create a new one to edit its tile group."), tileDualListView, @@ -325,9 +318,9 @@ public final class AssetDetailsColorSchemaGroupsControl extends StudioFormSectio final List orderedColors = draft.orderedColors(); schemaTitleLabel.setText(draft.schemaId() + (draft.existingSchema() ? "" : " (new)")); - paletteCounterLabel.setText(Container.i18n().format(I18n.ASSETS_COLOR_SCHEMA_DIALOG_COLOR_COUNT, orderedColors.size())); + paletteCounterLabel.setText(i18n.format(I18n.ASSETS_COLOR_SCHEMA_DIALOG_COLOR_COUNT, orderedColors.size())); warningLabel.setText(orderedColors.size() > 16 - ? Container.i18n().text(I18n.ASSETS_COLOR_SCHEMA_DIALOG_TOO_MANY_COLORS) + ? i18n.text(I18n.ASSETS_COLOR_SCHEMA_DIALOG_TOO_MANY_COLORS) : ""); paletteStrip.getChildren().setAll(orderedColors.stream().map(this::swatch).toList()); @@ -335,66 +328,33 @@ public final class AssetDetailsColorSchemaGroupsControl extends StudioFormSectio tileDualListView.setRightItems(draft.assignedTiles()); tileDualListView.setInteractionEnabled(formMode() == StudioFormMode.EDITING && draft.selected()); tileDualListView.setMoveToRightAllowed(true); - tileDualListView.setOnMoveToRight(items -> updateDraft(current -> current.moveToAssigned(items))); - tileDualListView.setOnMoveToLeft(items -> updateDraft(current -> current.moveToAvailable(items))); - tileDualListView.setOnMoveUp(index -> updateDraft(current -> current.moveAssignedUp(index))); - tileDualListView.setOnMoveDown(index -> updateDraft(current -> current.moveAssignedDown(index))); + tileDualListView.setOnMoveToRight(items -> updateDraft(() -> coordinator.moveToAssigned(items))); + tileDualListView.setOnMoveToLeft(items -> updateDraft(() -> coordinator.moveToAvailable(items))); + tileDualListView.setOnMoveUp(index -> updateDraft(() -> coordinator.moveAssignedUp(index))); + tileDualListView.setOnMoveDown(index -> updateDraft(() -> coordinator.moveAssignedDown(index))); editorPane.getChildren().addAll(schemaTitleLabel, tileDualListView, paletteCounterLabel, paletteStrip, warningLabel); VBox.setVgrow(tileDualListView, Priority.ALWAYS); } - private void updateDraft(java.util.function.UnaryOperator update) { - if (formMode() != StudioFormMode.EDITING || formSession == null) { + private void updateDraft(Runnable update) { + if (formMode() != StudioFormMode.EDITING) { return; } - formSession.updateDraft(update); + update.run(); rerenderPreservingScrollPosition(); } - private AssetDetailsColorSchemaDraft sourceDraft(String schemaId) { - final AssetStudioGlyphMaterialSchema schema = coordinator.findSchema(schemaId).orElse(null); - final List selectableTiles = schema == null - ? coordinator.availableTilesForCreate() - : coordinator.availableTilesForEdit(schema.schemaId()); - final Set assignedArtifactIds = schema == null - ? Set.of() - : schema.artifactBindings().stream() - .map(AssetStudioGlyphMaterialArtifactBinding::artifactId) - .collect(java.util.stream.Collectors.toCollection(LinkedHashSet::new)); - final List assignedTiles = selectableTiles.stream() - .filter(file -> assignedArtifactIds.contains(AssetDetailsColorSchemaCoordinator.artifactId(file))) - .toList(); - final List availableTiles = selectableTiles.stream() - .filter(file -> !assignedArtifactIds.contains(AssetDetailsColorSchemaCoordinator.artifactId(file))) - .toList(); - final List preferredColors = schema == null - ? List.of() - : schema.materialIndices().entrySet().stream() - .sorted(java.util.Map.Entry.comparingByKey()) - .map(java.util.Map.Entry::getValue) - .toList(); - return new AssetDetailsColorSchemaDraft(schemaId, schema != null, false, availableTiles, assignedTiles, preferredColors, schema == null); - } - private void replaceFormSource() { if (!coordinator.ready()) { - formSession = null; return; } - if (formSession != null && formSession.mode() == StudioFormMode.EDITING) { + if (coordinator.state().editing()) { return; } final String schemaId = selectedSchemaId != null ? selectedSchemaId : defaultSchemaId(); selectedSchemaId = schemaId; - final AssetDetailsColorSchemaDraft source = schemaId == null - ? AssetDetailsColorSchemaDraft.noSelection() - : sourceDraft(schemaId); - if (formSession == null) { - formSession = new StudioFormSession<>(source); - } else { - formSession.replaceSource(source); - } + coordinator.selectSchema(schemaId); } private void normalizeSelectedSchema() { @@ -413,13 +373,13 @@ public final class AssetDetailsColorSchemaGroupsControl extends StudioFormSectio private List schemaListItems() { final List items = new java.util.ArrayList<>(coordinator.schemas().stream() - .map(schema -> SchemaListItem.fromSchema(schema, coordinator.selectedTiles())) + .map(schema -> SchemaListItem.fromSchema(schema, coordinator.selectedTiles(), schemaRules)) .toList()); - if (formSession != null - && formSession.draft().selected() - && !formSession.draft().existingSchema() - && items.stream().noneMatch(item -> item.schemaId().equals(formSession.draft().schemaId()))) { - items.add(SchemaListItem.fromDraft(formSession.draft())); + final AssetColorSchemaState state = coordinator.state(); + if (state.selected() + && !state.existingSchema() + && items.stream().noneMatch(item -> item.schemaId().equals(state.schemaId()))) { + items.add(SchemaListItem.fromDraft(state)); } return List.copyOf(items); } @@ -479,9 +439,9 @@ public final class AssetDetailsColorSchemaGroupsControl extends StudioFormSectio } private static final class SchemaTileDualListView extends StudioDualListView { - private SchemaTileDualListView() { - setLeftTitle(Container.i18n().text(I18n.ASSETS_COLOR_SCHEMA_DIALOG_AVAILABLE_TILES)); - setRightTitle(Container.i18n().text(I18n.ASSETS_COLOR_SCHEMA_DIALOG_ASSIGNED_TILES)); + private SchemaTileDualListView(I18nService i18n) { + setLeftTitle(i18n.text(I18n.ASSETS_COLOR_SCHEMA_DIALOG_AVAILABLE_TILES)); + setRightTitle(i18n.text(I18n.ASSETS_COLOR_SCHEMA_DIALOG_ASSIGNED_TILES)); } @Override @@ -498,17 +458,20 @@ public final class AssetDetailsColorSchemaGroupsControl extends StudioFormSectio int tileCount, int indexCount) { - private static SchemaListItem fromSchema(AssetStudioGlyphMaterialSchema schema, List selectedTiles) { + private static SchemaListItem fromSchema( + AssetStudioGlyphMaterialSchema schema, + List selectedTiles, + AssetColorSchemaRules schemaRules) { return new SchemaListItem( schema.schemaId(), true, schema.version(), - AssetDetailsColorSchemaCoordinator.effectiveStatus(schema, selectedTiles).manifestValue(), + schemaRules.effectiveStatus(schema, selectedTiles).manifestValue(), schema.artifactBindings().size(), schema.materialIndices().size()); } - private static SchemaListItem fromDraft(AssetDetailsColorSchemaDraft draft) { + private static SchemaListItem fromDraft(AssetColorSchemaState draft) { return new SchemaListItem( draft.schemaId(), false, diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/summary/AssetDetailsSummaryControl.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/summary/AssetDetailsSummaryControl.java similarity index 60% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/details/summary/AssetDetailsSummaryControl.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/summary/AssetDetailsSummaryControl.java index 89d9d402..afd72dba 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/summary/AssetDetailsSummaryControl.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/details/summary/AssetDetailsSummaryControl.java @@ -1,34 +1,36 @@ -package p.studio.workspaces.assets.details.summary; +package p.studio.ui.javafx.workspaces.assets.details.summary; import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; -import p.studio.Container; -import p.studio.controls.lifecycle.StudioControlLifecycle; -import p.studio.controls.lifecycle.StudioControlLifecycleSupport; -import p.studio.lsp.events.StudioWorkspaceEventBus; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.details.AssetDetailsUiSupport; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphSpecialization; -import p.studio.workspaces.assets.metadata.AssetStudioSceneBankMetadata; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary; -import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsViewState; -import p.studio.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent; -import p.studio.workspaces.framework.StudioSubscriptionBag; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycle; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycleSupport; +import p.studio.ui.javafx.events.StudioWorkspaceEventBus; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.ui.javafx.workspaces.assets.details.AssetDetailsUiSupport; +import p.studio.api.assets.metadata.AssetStudioGlyphSpecialization; +import p.studio.api.assets.metadata.AssetStudioSceneBankMetadata; +import p.studio.api.assets.workspace.AssetWorkspaceAssetSummary; +import p.studio.ui.javafx.workspaces.assets.messages.AssetWorkspaceDetailsViewState; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent; +import p.studio.ui.javafx.workspaces.framework.StudioSubscriptionBag; import java.util.Objects; public final class AssetDetailsSummaryControl extends VBox implements StudioControlLifecycle { private final ProjectReference projectReference; private final StudioWorkspaceEventBus workspaceBus; + private final I18nService i18n; private final StudioSubscriptionBag subscriptions = new StudioSubscriptionBag(); private AssetWorkspaceDetailsViewState viewState; - public AssetDetailsSummaryControl(ProjectReference projectReference, StudioWorkspaceEventBus workspaceBus) { + public AssetDetailsSummaryControl(ProjectReference projectReference, StudioWorkspaceEventBus workspaceBus, I18nService i18n) { StudioControlLifecycleSupport.install(this, this); this.projectReference = Objects.requireNonNull(projectReference, "projectReference"); this.workspaceBus = Objects.requireNonNull(workspaceBus, "workspaceBus"); + this.i18n = Objects.requireNonNull(i18n, "i18n"); } @Override @@ -57,34 +59,34 @@ public final class AssetDetailsSummaryControl extends VBox implements StudioCont final VBox content = new VBox(8); content.getChildren().setAll( - AssetDetailsUiSupport.createKeyValueRow(Container.i18n().text(I18n.ASSETS_LABEL_ASSET_ID), summary.assetId() == null ? "—" : String.valueOf(summary.assetId())), - AssetDetailsUiSupport.createKeyValueRow(Container.i18n().text(I18n.ASSETS_LABEL_LOCATION), AssetDetailsUiSupport.projectRelativePath(projectReference, summary.assetRoot()))); + AssetDetailsUiSupport.createKeyValueRow(i18n.text(I18n.ASSETS_LABEL_ASSET_ID), summary.assetId() == null ? "—" : String.valueOf(summary.assetId())), + AssetDetailsUiSupport.createKeyValueRow(i18n.text(I18n.ASSETS_LABEL_LOCATION), AssetDetailsUiSupport.projectRelativePath(projectReference, summary.assetRoot()))); final HBox typeBox = new HBox(8); typeBox.getStyleClass().add("assets-details-chips"); typeBox.getChildren().add(AssetDetailsUiSupport.createChip( AssetDetailsUiSupport.typeChipTone(summary.assetFamily()), - AssetDetailsUiSupport.typeLabel(summary.assetFamily()))); + AssetDetailsUiSupport.typeLabel(i18n, summary.assetFamily()))); if (summary.glyphSpecialization() != AssetStudioGlyphSpecialization.NONE) { typeBox.getChildren().add(AssetDetailsUiSupport.createChip( AssetDetailsUiSupport.typeChipTone(summary.assetFamily()), - AssetDetailsUiSupport.specializationLabel(summary.glyphSpecialization()), + AssetDetailsUiSupport.specializationLabel(i18n, summary.glyphSpecialization()), "assets-details-chip-fixed")); } content.getChildren().add(AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_LABEL_TYPE), + i18n.text(I18n.ASSETS_LABEL_TYPE), typeBox)); content.getChildren().add(AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_LABEL_REGISTRATION), + i18n.text(I18n.ASSETS_LABEL_REGISTRATION), AssetDetailsUiSupport.createChip( AssetDetailsUiSupport.registrationChipTone(summary.state()), - AssetDetailsUiSupport.registrationLabel(summary.state())))); + AssetDetailsUiSupport.registrationLabel(i18n, summary.state())))); content.getChildren().add(AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_LABEL_BUILD_PARTICIPATION), + i18n.text(I18n.ASSETS_LABEL_BUILD_PARTICIPATION), AssetDetailsUiSupport.createChip( AssetDetailsUiSupport.buildChipTone(summary.buildParticipation()), - AssetDetailsUiSupport.buildParticipationLabel(summary.buildParticipation())))); + AssetDetailsUiSupport.buildParticipationLabel(i18n, summary.buildParticipation())))); getChildren().setAll(AssetDetailsUiSupport.createSection( - Container.i18n().text(I18n.ASSETS_SECTION_SUMMARY), + i18n.text(I18n.ASSETS_SECTION_SUMMARY), content)); } } diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/dialogs/AssetDiagnosticsDialog.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/dialogs/AssetDiagnosticsDialog.java similarity index 79% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/dialogs/AssetDiagnosticsDialog.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/dialogs/AssetDiagnosticsDialog.java index f77e6d79..fcbda7ac 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/dialogs/AssetDiagnosticsDialog.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/dialogs/AssetDiagnosticsDialog.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.dialogs; +package p.studio.ui.javafx.workspaces.assets.dialogs; import javafx.geometry.Insets; import javafx.geometry.Pos; @@ -12,12 +12,12 @@ import javafx.scene.layout.VBox; import javafx.stage.Modality; import javafx.stage.Stage; import javafx.stage.Window; -import p.packer.dtos.PackerDiagnosticDTO; -import p.packer.messages.diagnostics.PackerDiagnosticSeverity; -import p.studio.Container; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.details.AssetDetailsUiSupport; +import p.studio.api.assets.AssetDiagnostic; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.ThemeService; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.ui.javafx.workspaces.assets.details.AssetDetailsUiSupport; import java.nio.file.Path; import java.util.LinkedHashMap; @@ -31,8 +31,9 @@ public final class AssetDiagnosticsDialog { private final Stage stage; private final ProjectReference projectReference; private final String assetName; - private final List diagnostics; + private final List diagnostics; private final Map diagnosticsByGroup; + private final I18nService i18n; private final VBox groupList = new VBox(6); private final VBox diagnosticsContent = new VBox(10); @@ -42,10 +43,13 @@ public final class AssetDiagnosticsDialog { Window owner, ProjectReference projectReference, String assetName, - List diagnostics) { + List diagnostics, + I18nService i18n, + ThemeService theme) { this.projectReference = Objects.requireNonNull(projectReference, "projectReference"); this.assetName = Objects.requireNonNull(assetName, "assetName"); this.diagnostics = List.copyOf(Objects.requireNonNull(diagnostics, "diagnostics")); + this.i18n = Objects.requireNonNull(i18n, "i18n"); this.diagnosticsByGroup = buildGroups(this.diagnostics); this.selectedGroupKey = diagnosticsByGroup.containsKey(GENERAL_GROUP_KEY) ? GENERAL_GROUP_KEY @@ -53,24 +57,26 @@ public final class AssetDiagnosticsDialog { this.stage = new Stage(); stage.initOwner(owner); stage.initModality(Modality.WINDOW_MODAL); - stage.setTitle(Container.i18n().text(I18n.ASSETS_DIAGNOSTICS_DIALOG_TITLE)); + stage.setTitle(i18n.text(I18n.ASSETS_DIAGNOSTICS_DIALOG_TITLE)); stage.setScene(new Scene(buildRoot(), 720, 560)); - stage.getScene().getStylesheets().add(Container.theme().getDefaultTheme()); + stage.getScene().getStylesheets().add(Objects.requireNonNull(theme, "theme").getDefaultTheme()); } public static void showAndWait( Window owner, ProjectReference projectReference, String assetName, - List diagnostics) { - new AssetDiagnosticsDialog(owner, projectReference, assetName, diagnostics).stage.showAndWait(); + List diagnostics, + I18nService i18n, + ThemeService theme) { + new AssetDiagnosticsDialog(owner, projectReference, assetName, diagnostics, i18n, theme).stage.showAndWait(); } private VBox buildRoot() { - final Label title = new Label(Container.i18n().text(I18n.ASSETS_DIAGNOSTICS_DIALOG_TITLE)); + final Label title = new Label(i18n.text(I18n.ASSETS_DIAGNOSTICS_DIALOG_TITLE)); title.getStyleClass().add("studio-launcher-section-title"); - final Label subtitle = new Label(Container.i18n().format( + final Label subtitle = new Label(i18n.format( I18n.ASSETS_DIAGNOSTICS_DIALOG_SUMMARY, diagnostics.size(), assetName)); @@ -97,7 +103,7 @@ public final class AssetDiagnosticsDialog { renderSelectedGroup(); final Button closeButton = new Button(); - closeButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_CANCEL)); + closeButton.textProperty().bind(i18n.bind(I18n.WIZARD_CANCEL)); closeButton.getStyleClass().addAll("studio-button", "studio-button-cancel"); closeButton.setOnAction(ignored -> stage.close()); @@ -137,7 +143,7 @@ public final class AssetDiagnosticsDialog { final DiagnosticGroup group = diagnosticsByGroup.get(selectedGroupKey); if (group == null || group.diagnostics().isEmpty()) { diagnosticsContent.getChildren().add(AssetDetailsUiSupport.createSectionMessage( - Container.i18n().text(I18n.ASSETS_DIAGNOSTICS_EMPTY))); + i18n.text(I18n.ASSETS_DIAGNOSTICS_EMPTY))); return; } @@ -147,7 +153,7 @@ public final class AssetDiagnosticsDialog { group.diagnostics().forEach(diagnostic -> diagnosticsContent.getChildren().add(createDiagnosticCard(diagnostic))); } - private VBox createDiagnosticCard(PackerDiagnosticDTO diagnostic) { + private VBox createDiagnosticCard(AssetDiagnostic diagnostic) { final Label severity = new Label(severityLabel(diagnostic)); severity.getStyleClass().add("assets-details-diagnostic-severity"); @@ -159,28 +165,28 @@ public final class AssetDiagnosticsDialog { card.getStyleClass().addAll("assets-details-diagnostic-card", severityToneClass(diagnostic.severity())); card.getChildren().add(AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_DIAGNOSTICS_LABEL_CATEGORY), - diagnostic.category().name())); + i18n.text(I18n.ASSETS_DIAGNOSTICS_LABEL_CATEGORY), + diagnostic.category())); card.getChildren().add(AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_DIAGNOSTICS_LABEL_BLOCKING), - AssetDetailsUiSupport.booleanLabel(diagnostic.blocking()))); + i18n.text(I18n.ASSETS_DIAGNOSTICS_LABEL_BLOCKING), + AssetDetailsUiSupport.booleanLabel(i18n, diagnostic.blocking()))); card.getChildren().add(AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_DIAGNOSTICS_LABEL_EVIDENCE), + i18n.text(I18n.ASSETS_DIAGNOSTICS_LABEL_EVIDENCE), evidenceLabel(diagnostic.evidencePath()))); return card; } - private String severityLabel(PackerDiagnosticDTO diagnostic) { + private String severityLabel(AssetDiagnostic diagnostic) { return diagnostic.blocking() - ? diagnostic.severity().name() + " / BLOCKING" - : diagnostic.severity().name(); + ? diagnostic.severity() + " / BLOCKING" + : diagnostic.severity(); } - private String severityToneClass(PackerDiagnosticSeverity severity) { + private String severityToneClass(String severity) { return switch (severity) { - case ERROR -> "assets-details-diagnostic-blocker"; - case WARNING -> "assets-details-diagnostic-warning"; - case INFO -> "assets-details-diagnostic-hint"; + case "ERROR" -> "assets-details-diagnostic-blocker"; + case "WARNING" -> "assets-details-diagnostic-warning"; + default -> "assets-details-diagnostic-hint"; }; } @@ -191,9 +197,9 @@ public final class AssetDiagnosticsDialog { return AssetDetailsUiSupport.projectRelativePath(projectReference, evidencePath); } - private Map buildGroups(List diagnostics) { + private Map buildGroups(List diagnostics) { final Map grouped = new LinkedHashMap<>(); - for (PackerDiagnosticDTO diagnostic : diagnostics) { + for (AssetDiagnostic diagnostic : diagnostics) { final String key = groupKey(diagnostic.evidencePath()); final String title = groupTitle(key, diagnostic.evidencePath()); grouped.computeIfAbsent(key, ignored -> new DiagnosticGroup(key, title, new java.util.ArrayList<>())) @@ -242,6 +248,6 @@ public final class AssetDiagnosticsDialog { private record DiagnosticGroup( String key, String title, - List diagnostics) { + List diagnostics) { } } diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListControl.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/list/AssetListControl.java similarity index 81% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListControl.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/list/AssetListControl.java index 6ed6d7c4..7d03ad22 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListControl.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/list/AssetListControl.java @@ -1,4 +1,6 @@ -package p.studio.workspaces.assets.list; +package p.studio.ui.javafx.workspaces.assets.list; + +import p.studio.api.assets.workspace.*; import javafx.application.Platform; import javafx.geometry.Insets; @@ -10,19 +12,19 @@ import javafx.scene.control.ToggleButton; import javafx.scene.layout.FlowPane; import javafx.scene.layout.Priority; import javafx.scene.layout.VBox; -import p.packer.dtos.PackerAssetSummaryDTO; -import p.packer.messages.AssetReference; -import p.packer.messages.ListAssetsRequest; -import p.studio.Container; -import p.studio.lsp.events.StudioWorkspaceEventBus; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.AssetWorkspaceState; -import p.studio.workspaces.assets.details.AssetListPackerMappings; -import p.studio.workspaces.assets.messages.*; -import p.studio.workspaces.assets.messages.events.*; -import p.studio.workspaces.framework.StudioEventAware; -import p.studio.workspaces.framework.StudioEventBindings; +import p.studio.api.assets.AssetCatalog; +import p.studio.api.assets.AssetReference; +import p.studio.api.assets.AssetSummary; +import p.studio.ui.javafx.events.StudioWorkspaceEventBus; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.ui.javafx.workspaces.assets.AssetWorkspaceState; +import p.studio.ui.javafx.workspaces.assets.details.AssetListMappings; +import p.studio.ui.javafx.workspaces.assets.messages.*; +import p.studio.ui.javafx.workspaces.assets.messages.events.*; +import p.studio.ui.javafx.workspaces.framework.StudioEventAware; +import p.studio.ui.javafx.workspaces.framework.StudioEventBindings; import java.util.EnumSet; import java.util.List; @@ -41,16 +43,24 @@ public final class AssetListControl extends VBox implements StudioEventAware { private final ToggleButton preloadFilterButton = new ToggleButton(); private final AtomicLong refreshGeneration = new AtomicLong(); - private AssetListViewState viewState = new AssetListViewState( - AssetWorkspaceState.loading(null), - null, - Container.i18n().text(I18n.ASSETS_STATE_LOADING)); + private AssetListViewState viewState; + private final java.util.concurrent.Executor executor; + private final I18nService i18n; + private final AssetCatalog assetCatalog; public AssetListControl( ProjectReference projectReference, - StudioWorkspaceEventBus workspaceBus) { + StudioWorkspaceEventBus workspaceBus, + I18nService i18n, + java.util.concurrent.Executor executor, + AssetCatalog assetCatalog) { this.projectReference = Objects.requireNonNull(projectReference, "projectReference"); this.workspaceBus = Objects.requireNonNull(workspaceBus, "workspaceBus"); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.executor = Objects.requireNonNull(executor, "executor"); + this.assetCatalog = Objects.requireNonNull(assetCatalog, "assetCatalog"); + this.viewState = new AssetListViewState(AssetWorkspaceState.loading(null), null, + this.i18n.text(I18n.ASSETS_STATE_LOADING)); getStyleClass().add("assets-workspace-pane"); setSpacing(8); @@ -82,13 +92,13 @@ public final class AssetListControl extends VBox implements StudioEventAware { private Label createNavigatorTitle() { final var navigatorTitle = new Label(); - navigatorTitle.textProperty().bind(Container.i18n().bind(I18n.ASSETS_NAVIGATOR_TITLE)); + navigatorTitle.textProperty().bind(i18n.bind(I18n.ASSETS_NAVIGATOR_TITLE)); navigatorTitle.getStyleClass().add("assets-workspace-pane-title"); return navigatorTitle; } private TextField createSearchField() { - searchField.setPromptText(Container.i18n().text(I18n.ASSETS_SEARCH_PROMPT)); + searchField.setPromptText(i18n.text(I18n.ASSETS_SEARCH_PROMPT)); searchField.getStyleClass().add("assets-workspace-search"); return searchField; } @@ -107,7 +117,7 @@ public final class AssetListControl extends VBox implements StudioEventAware { } private ToggleButton configureFilterButton(ToggleButton button, I18n i18n) { - button.textProperty().bind(Container.i18n().bind(i18n)); + button.textProperty().bind(this.i18n.bind(i18n)); button.getStyleClass().addAll("studio-button", "studio-button-secondary", "studio-button-pill", "studio-button-toggle"); return button; } @@ -143,10 +153,10 @@ public final class AssetListControl extends VBox implements StudioEventAware { publishNavigatorViewState(new AssetListViewState( AssetWorkspaceState.loading(previousState), null, - Container.i18n().text(I18n.ASSETS_STATE_LOADING))); + i18n.text(I18n.ASSETS_STATE_LOADING))); workspaceBus.publish(new StudioAssetsWorkspaceRefreshStartedEvent()); - Container.backgroundTasks().submit(() -> loadAssets(generation, assetReference, deepSync)); + executor.execute(() -> loadAssets(generation, assetReference, deepSync)); } private void loadAssets( @@ -154,11 +164,7 @@ public final class AssetListControl extends VBox implements StudioEventAware { AssetReference preferredAssetReference, boolean deepSync) { try { - final var projectContext = projectReference.toPackerProjectContext(); - final var response = Container.packer() - .workspaceService() - .listAssets(new ListAssetsRequest(projectContext, deepSync)); - final List assets = response.assets().stream() + final List assets = assetCatalog.list(projectReference, deepSync).stream() .map(this::mapAsset) .toList(); final AssetWorkspaceState workspaceState = AssetWorkspaceState.ready(assets, preferredAssetReference); @@ -190,9 +196,7 @@ public final class AssetListControl extends VBox implements StudioEventAware { if (generation != refreshGeneration.get()) { return; } - final String message = exception.getMessage() == null || exception.getMessage().isBlank() - ? Container.i18n().text(I18n.ASSETS_STATE_ERROR) - : exception.getMessage(); + final String message = i18n.text(I18n.ASSETS_STATE_ERROR); publishNavigatorViewState(new AssetListViewState( AssetWorkspaceState.error(viewState.workspaceState(), message), viewState.projection(), @@ -226,8 +230,8 @@ public final class AssetListControl extends VBox implements StudioEventAware { workspaceBus.publish(new StudioAssetsNavigatorViewStateChangedEvent(nextViewState)); } - private AssetWorkspaceAssetSummary mapAsset(PackerAssetSummaryDTO summary) { - return AssetListPackerMappings.mapSummary(summary); + private AssetWorkspaceAssetSummary mapAsset(AssetSummary summary) { + return AssetListMappings.mapSummary(summary); } private Set currentFilters() { @@ -246,12 +250,12 @@ public final class AssetListControl extends VBox implements StudioEventAware { private String buildViewMessage(AssetWorkspaceState workspaceState, AssetListProjection projection) { return switch (workspaceState.status()) { - case LOADING -> Container.i18n().text(I18n.ASSETS_STATE_LOADING); - case EMPTY -> Container.i18n().text(I18n.ASSETS_STATE_EMPTY); + case LOADING -> i18n.text(I18n.ASSETS_STATE_LOADING); + case EMPTY -> i18n.text(I18n.ASSETS_STATE_EMPTY); case ERROR -> workspaceState.errorMessage(); case READY -> projection == null || projection.isEmpty() - ? Container.i18n().text(I18n.ASSETS_STATE_NO_RESULTS) - : Container.i18n().text(I18n.ASSETS_STATE_READY); + ? i18n.text(I18n.ASSETS_STATE_NO_RESULTS) + : i18n.text(I18n.ASSETS_STATE_READY); }; } @@ -277,6 +281,7 @@ public final class AssetListControl extends VBox implements StudioEventAware { groupBox.getChildren().add(new AssetListItemControl( projectReference, workspaceBus, + i18n, asset)); } navigatorContent.getChildren().add(groupBox); diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListFilter.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/list/AssetListFilter.java similarity index 61% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListFilter.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/list/AssetListFilter.java index 81bd65a0..f5efe847 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListFilter.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/list/AssetListFilter.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.list; +package p.studio.ui.javafx.workspaces.assets.list; public enum AssetListFilter { UNREGISTERED, diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListItemControl.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/list/AssetListItemControl.java similarity index 75% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListItemControl.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/list/AssetListItemControl.java index 4687cfbe..d495de09 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListItemControl.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/list/AssetListItemControl.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.list; +package p.studio.ui.javafx.workspaces.assets.list; import javafx.geometry.Pos; import javafx.scene.control.Label; @@ -6,15 +6,15 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; import javafx.scene.layout.VBox; -import p.packer.messages.assets.AssetFamilyCatalog; -import p.studio.Container; -import p.studio.lsp.events.StudioWorkspaceEventBus; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetState; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary; -import p.studio.workspaces.assets.messages.AssetWorkspaceBuildParticipation; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceSelectionRequestedEvent; +import p.studio.api.assets.AssetFamily; +import p.studio.ui.javafx.events.StudioWorkspaceEventBus; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.api.assets.workspace.AssetWorkspaceAssetState; +import p.studio.api.assets.workspace.AssetWorkspaceAssetSummary; +import p.studio.api.assets.workspace.AssetWorkspaceBuildParticipation; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceSelectionRequestedEvent; import java.nio.file.Path; import java.util.Objects; @@ -23,16 +23,19 @@ public final class AssetListItemControl extends VBox { private final ProjectReference projectReference; private final Path projectRoot; private final StudioWorkspaceEventBus workspaceBus; + private final I18nService i18n; private AssetWorkspaceAssetSummary summary; public AssetListItemControl( ProjectReference projectReference, StudioWorkspaceEventBus workspaceBus, + I18nService i18n, AssetWorkspaceAssetSummary summary) { this.projectReference = Objects.requireNonNull(projectReference, "projectReference"); this.projectRoot = this.projectReference.rootPath(); this.workspaceBus = Objects.requireNonNull(workspaceBus, "workspaceBus"); + this.i18n = Objects.requireNonNull(i18n, "i18n"); this.summary = Objects.requireNonNull(summary, "summary"); render(); } @@ -83,17 +86,17 @@ public final class AssetListItemControl extends VBox { private void populateBadges(HBox badges) { if (summary.state() == AssetWorkspaceAssetState.UNREGISTERED) { - badges.getChildren().add(createBadge(Container.i18n().text(I18n.ASSETS_BADGE_UNREGISTERED), "assets-workspace-badge-orphan")); + badges.getChildren().add(createBadge(i18n.text(I18n.ASSETS_BADGE_UNREGISTERED), "assets-workspace-badge-orphan")); } else if (summary.buildParticipation() == AssetWorkspaceBuildParticipation.INCLUDED) { badges.getChildren().add(createBadge(buildParticipationLabel(summary.buildParticipation()), "assets-workspace-badge-preload")); if (summary.preload()) { - badges.getChildren().add(createBadge(Container.i18n().text(I18n.ASSETS_BADGE_PRELOAD), "assets-workspace-badge-preload")); + badges.getChildren().add(createBadge(i18n.text(I18n.ASSETS_BADGE_PRELOAD), "assets-workspace-badge-preload")); } } else { badges.getChildren().add(createBadge(buildParticipationLabel(summary.buildParticipation()), "assets-workspace-badge-diagnostics")); } if (summary.hasDiagnostics()) { - badges.getChildren().add(createBadge(Container.i18n().text(I18n.ASSETS_BADGE_DIAGNOSTICS), "assets-workspace-badge-diagnostics")); + badges.getChildren().add(createBadge(i18n.text(I18n.ASSETS_BADGE_DIAGNOSTICS), "assets-workspace-badge-diagnostics")); } } @@ -105,12 +108,12 @@ public final class AssetListItemControl extends VBox { private String buildParticipationLabel(AssetWorkspaceBuildParticipation buildParticipation) { return switch (buildParticipation) { - case INCLUDED -> Container.i18n().text(I18n.ASSETS_VALUE_INCLUDED); - case EXCLUDED -> Container.i18n().text(I18n.ASSETS_VALUE_EXCLUDED); + case INCLUDED -> i18n.text(I18n.ASSETS_VALUE_INCLUDED); + case EXCLUDED -> i18n.text(I18n.ASSETS_VALUE_EXCLUDED); }; } - private String assetRowToneClass(AssetFamilyCatalog assetFamily) { + private String assetRowToneClass(AssetFamily assetFamily) { return switch (assetFamily) { case GLYPH_BANK -> "assets-workspace-asset-row-tone-image"; case SCENE_BANK -> "assets-workspace-asset-row-tone-scene"; @@ -119,7 +122,7 @@ public final class AssetListItemControl extends VBox { }; } - private String assetNameToneClass(AssetFamilyCatalog assetFamily) { + private String assetNameToneClass(AssetFamily assetFamily) { return switch (assetFamily) { case GLYPH_BANK -> "assets-workspace-asset-name-tone-image"; case SCENE_BANK -> "assets-workspace-asset-name-tone-scene"; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListProjectionBuilder.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/list/AssetListProjectionBuilder.java similarity index 92% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListProjectionBuilder.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/list/AssetListProjectionBuilder.java index 85006a6f..dcff5d81 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/list/AssetListProjectionBuilder.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/list/AssetListProjectionBuilder.java @@ -1,9 +1,9 @@ -package p.studio.workspaces.assets.list; +package p.studio.ui.javafx.workspaces.assets.list; -import p.studio.workspaces.assets.messages.AssetListGroup; -import p.studio.workspaces.assets.messages.AssetListProjection; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetState; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary; +import p.studio.ui.javafx.workspaces.assets.messages.AssetListGroup; +import p.studio.ui.javafx.workspaces.assets.messages.AssetListProjection; +import p.studio.api.assets.workspace.AssetWorkspaceAssetState; +import p.studio.api.assets.workspace.AssetWorkspaceAssetSummary; import java.nio.file.Path; import java.util.*; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetListGroup.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetListGroup.java similarity index 81% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetListGroup.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetListGroup.java index 85996386..3ee58c1b 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetListGroup.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetListGroup.java @@ -1,4 +1,6 @@ -package p.studio.workspaces.assets.messages; +package p.studio.ui.javafx.workspaces.assets.messages; + +import p.studio.api.assets.workspace.*; import java.util.List; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetListProjection.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetListProjection.java similarity index 89% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetListProjection.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetListProjection.java index e8382e61..ff27b3ca 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetListProjection.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetListProjection.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.messages; +package p.studio.ui.javafx.workspaces.assets.messages; import java.util.List; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetListViewState.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetListViewState.java similarity index 78% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetListViewState.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetListViewState.java index c90c056f..f912b840 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetListViewState.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetListViewState.java @@ -1,6 +1,6 @@ -package p.studio.workspaces.assets.messages; +package p.studio.ui.javafx.workspaces.assets.messages; -import p.studio.workspaces.assets.AssetWorkspaceState; +import p.studio.ui.javafx.workspaces.assets.AssetWorkspaceState; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceDetailsStatus.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetWorkspaceDetailsStatus.java similarity index 62% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceDetailsStatus.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetWorkspaceDetailsStatus.java index fef5616e..c65752fa 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceDetailsStatus.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetWorkspaceDetailsStatus.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.messages; +package p.studio.ui.javafx.workspaces.assets.messages; public enum AssetWorkspaceDetailsStatus { EMPTY, diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceDetailsViewState.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetWorkspaceDetailsViewState.java similarity index 82% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceDetailsViewState.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetWorkspaceDetailsViewState.java index 2a8b3075..f1d442e1 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceDetailsViewState.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetWorkspaceDetailsViewState.java @@ -1,6 +1,8 @@ -package p.studio.workspaces.assets.messages; +package p.studio.ui.javafx.workspaces.assets.messages; -import p.packer.messages.AssetReference; +import p.studio.api.assets.workspace.*; + +import p.studio.api.assets.AssetReference; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceStatus.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetWorkspaceStatus.java similarity index 60% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceStatus.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetWorkspaceStatus.java index 30740388..6547e033 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/AssetWorkspaceStatus.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/AssetWorkspaceStatus.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.messages; +package p.studio.ui.javafx.workspaces.assets.messages; public enum AssetWorkspaceStatus { LOADING, diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetBankCompositionAppliedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetBankCompositionAppliedEvent.java similarity index 64% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetBankCompositionAppliedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetBankCompositionAppliedEvent.java index 295f32f0..3c1a1190 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetBankCompositionAppliedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetBankCompositionAppliedEvent.java @@ -1,7 +1,7 @@ -package p.studio.workspaces.assets.messages.events; +package p.studio.ui.javafx.workspaces.assets.messages.events; -import p.packer.messages.AssetReference; -import p.studio.lsp.events.StudioEvent; +import p.studio.api.assets.AssetReference; +import p.studio.ui.javafx.events.StudioEvent; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetBankCompositionApplyFailedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetBankCompositionApplyFailedEvent.java similarity index 70% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetBankCompositionApplyFailedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetBankCompositionApplyFailedEvent.java index b9a2f58c..0f323507 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetBankCompositionApplyFailedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetBankCompositionApplyFailedEvent.java @@ -1,7 +1,7 @@ -package p.studio.workspaces.assets.messages.events; +package p.studio.ui.javafx.workspaces.assets.messages.events; -import p.packer.messages.AssetReference; -import p.studio.lsp.events.StudioEvent; +import p.studio.api.assets.AssetReference; +import p.studio.ui.javafx.events.StudioEvent; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetBankCompositionApplyRequestedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetBankCompositionApplyRequestedEvent.java similarity index 65% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetBankCompositionApplyRequestedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetBankCompositionApplyRequestedEvent.java index cffccc20..79c4ebba 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetBankCompositionApplyRequestedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetBankCompositionApplyRequestedEvent.java @@ -1,7 +1,7 @@ -package p.studio.workspaces.assets.messages.events; +package p.studio.ui.javafx.workspaces.assets.messages.events; -import p.packer.messages.AssetReference; -import p.studio.lsp.events.StudioEvent; +import p.studio.api.assets.AssetReference; +import p.studio.ui.javafx.events.StudioEvent; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetBankCompositionCapacityChangedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetBankCompositionCapacityChangedEvent.java similarity index 78% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetBankCompositionCapacityChangedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetBankCompositionCapacityChangedEvent.java index 1c586cd5..7501e49d 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetBankCompositionCapacityChangedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetBankCompositionCapacityChangedEvent.java @@ -1,8 +1,8 @@ -package p.studio.workspaces.assets.messages.events; +package p.studio.ui.javafx.workspaces.assets.messages.events; -import p.packer.messages.AssetReference; -import p.studio.controls.banks.StudioAssetCapacitySeverity; -import p.studio.lsp.events.StudioEvent; +import p.studio.api.assets.AssetReference; +import p.studio.ui.javafx.controls.banks.StudioAssetCapacitySeverity; +import p.studio.ui.javafx.events.StudioEvent; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetBankCompositionDraftChangedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetBankCompositionDraftChangedEvent.java similarity index 77% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetBankCompositionDraftChangedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetBankCompositionDraftChangedEvent.java index a6774ba0..7796b471 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetBankCompositionDraftChangedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetBankCompositionDraftChangedEvent.java @@ -1,7 +1,7 @@ -package p.studio.workspaces.assets.messages.events; +package p.studio.ui.javafx.workspaces.assets.messages.events; -import p.packer.messages.AssetReference; -import p.studio.lsp.events.StudioEvent; +import p.studio.api.assets.AssetReference; +import p.studio.ui.javafx.events.StudioEvent; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetLogEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetLogEvent.java similarity index 50% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetLogEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetLogEvent.java index e20b4176..d84e0a27 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetLogEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetLogEvent.java @@ -1,6 +1,6 @@ -package p.studio.workspaces.assets.messages.events; +package p.studio.ui.javafx.workspaces.assets.messages.events; -import p.studio.lsp.events.StudioEvent; +import p.studio.ui.javafx.events.StudioEvent; public record StudioAssetLogEvent( String source, diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsDetailsViewStateChangedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsDetailsViewStateChangedEvent.java similarity index 59% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsDetailsViewStateChangedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsDetailsViewStateChangedEvent.java index 025be694..079c986f 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsDetailsViewStateChangedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsDetailsViewStateChangedEvent.java @@ -1,7 +1,7 @@ -package p.studio.workspaces.assets.messages.events; +package p.studio.ui.javafx.workspaces.assets.messages.events; -import p.studio.lsp.events.StudioEvent; -import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsViewState; +import p.studio.ui.javafx.events.StudioEvent; +import p.studio.ui.javafx.workspaces.assets.messages.AssetWorkspaceDetailsViewState; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsNavigatorViewStateChangedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsNavigatorViewStateChangedEvent.java similarity index 59% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsNavigatorViewStateChangedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsNavigatorViewStateChangedEvent.java index 094362c9..407e7ff8 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsNavigatorViewStateChangedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsNavigatorViewStateChangedEvent.java @@ -1,7 +1,7 @@ -package p.studio.workspaces.assets.messages.events; +package p.studio.ui.javafx.workspaces.assets.messages.events; -import p.studio.lsp.events.StudioEvent; -import p.studio.workspaces.assets.messages.AssetListViewState; +import p.studio.ui.javafx.events.StudioEvent; +import p.studio.ui.javafx.workspaces.assets.messages.AssetListViewState; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsRefreshRequestedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsRefreshRequestedEvent.java similarity index 71% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsRefreshRequestedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsRefreshRequestedEvent.java index a2e12756..097f9e99 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsRefreshRequestedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsRefreshRequestedEvent.java @@ -1,7 +1,7 @@ -package p.studio.workspaces.assets.messages.events; +package p.studio.ui.javafx.workspaces.assets.messages.events; -import p.packer.messages.AssetReference; -import p.studio.lsp.events.StudioEvent; +import p.studio.api.assets.AssetReference; +import p.studio.ui.javafx.events.StudioEvent; public record StudioAssetsRefreshRequestedEvent( AssetReference preferredAssetReference, diff --git a/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsWorkspaceDetailsSceneLayerChangedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsWorkspaceDetailsSceneLayerChangedEvent.java new file mode 100644 index 00000000..c5f1d7bb --- /dev/null +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsWorkspaceDetailsSceneLayerChangedEvent.java @@ -0,0 +1,8 @@ +package p.studio.ui.javafx.workspaces.assets.messages.events; + +import p.studio.ui.javafx.events.StudioEvent; +import p.studio.ui.javafx.workspaces.assets.messages.AssetWorkspaceDetailsViewState; + +public record StudioAssetsWorkspaceDetailsSceneLayerChangedEvent( + AssetWorkspaceDetailsViewState viewState) implements StudioEvent { +} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshFailedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshFailedEvent.java similarity index 68% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshFailedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshFailedEvent.java index cb411ab0..d16ff107 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshFailedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshFailedEvent.java @@ -1,6 +1,6 @@ -package p.studio.workspaces.assets.messages.events; +package p.studio.ui.javafx.workspaces.assets.messages.events; -import p.studio.lsp.events.StudioEvent; +import p.studio.ui.javafx.events.StudioEvent; import java.util.Objects; diff --git a/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshStartedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshStartedEvent.java new file mode 100644 index 00000000..d2969264 --- /dev/null +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshStartedEvent.java @@ -0,0 +1,6 @@ +package p.studio.ui.javafx.workspaces.assets.messages.events; + +import p.studio.ui.javafx.events.StudioEvent; + +public record StudioAssetsWorkspaceRefreshStartedEvent() implements StudioEvent { +} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshedEvent.java similarity index 71% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshedEvent.java index f9b0bd8d..e525bcdd 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshedEvent.java @@ -1,6 +1,6 @@ -package p.studio.workspaces.assets.messages.events; +package p.studio.ui.javafx.workspaces.assets.messages.events; -import p.studio.lsp.events.StudioEvent; +import p.studio.ui.javafx.events.StudioEvent; public record StudioAssetsWorkspaceRefreshedEvent(int assetCount) implements StudioEvent { public StudioAssetsWorkspaceRefreshedEvent { diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsWorkspaceSelectionRequestedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsWorkspaceSelectionRequestedEvent.java similarity index 67% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsWorkspaceSelectionRequestedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsWorkspaceSelectionRequestedEvent.java index 08e5affe..22075b35 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsWorkspaceSelectionRequestedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioAssetsWorkspaceSelectionRequestedEvent.java @@ -1,7 +1,7 @@ -package p.studio.workspaces.assets.messages.events; +package p.studio.ui.javafx.workspaces.assets.messages.events; -import p.packer.messages.AssetReference; -import p.studio.lsp.events.StudioEvent; +import p.studio.api.assets.AssetReference; +import p.studio.ui.javafx.events.StudioEvent; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioBankCompositionChangedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioBankCompositionChangedEvent.java similarity index 65% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioBankCompositionChangedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioBankCompositionChangedEvent.java index ae6ff2f5..0e0f79b6 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioBankCompositionChangedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioBankCompositionChangedEvent.java @@ -1,8 +1,8 @@ -package p.studio.workspaces.assets.messages.events; +package p.studio.ui.javafx.workspaces.assets.messages.events; -import p.packer.messages.AssetReference; -import p.studio.lsp.events.StudioEvent; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionDetails; +import p.studio.api.assets.AssetReference; +import p.studio.ui.javafx.events.StudioEvent; +import p.studio.api.assets.workspace.AssetWorkspaceBankCompositionDetails; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioGlyphMaterialMetadataChangedEvent.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioGlyphMaterialMetadataChangedEvent.java similarity index 64% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioGlyphMaterialMetadataChangedEvent.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioGlyphMaterialMetadataChangedEvent.java index 554a86cf..941d3b82 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioGlyphMaterialMetadataChangedEvent.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/messages/events/StudioGlyphMaterialMetadataChangedEvent.java @@ -1,8 +1,8 @@ -package p.studio.workspaces.assets.messages.events; +package p.studio.ui.javafx.workspaces.assets.messages.events; -import p.packer.messages.AssetReference; -import p.studio.lsp.events.StudioEvent; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphMaterialMetadata; +import p.studio.api.assets.AssetReference; +import p.studio.ui.javafx.events.StudioEvent; +import p.studio.api.assets.metadata.AssetStudioGlyphMaterialMetadata; import java.util.Objects; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/wizards/AddAssetWizard.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/wizards/AddAssetWizard.java similarity index 58% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/wizards/AddAssetWizard.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/wizards/AddAssetWizard.java index 9f98d430..87e88100 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/wizards/AddAssetWizard.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/wizards/AddAssetWizard.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.wizards; +package p.studio.ui.javafx.workspaces.assets.wizards; import javafx.application.Platform; import javafx.collections.FXCollections; @@ -13,23 +13,20 @@ import javafx.stage.DirectoryChooser; import javafx.stage.Modality; import javafx.stage.Stage; import javafx.stage.Window; -import p.packer.messages.AssetReference; -import p.packer.messages.CreateAssetRequest; -import p.packer.messages.CreateAssetResult; -import p.packer.messages.PackerOperationStatus; -import p.packer.messages.assets.AssetFamilyCatalog; -import p.packer.messages.assets.OutputCodecCatalog; -import p.packer.messages.assets.OutputFormatCatalog; -import p.studio.Container; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.details.AssetDetailsUiSupport; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphSpecialization; -import p.studio.workspaces.assets.metadata.AssetStudioMetadataService; +import p.studio.api.assets.AssetReference; +import p.studio.api.assets.AssetCreationCatalog; +import p.studio.api.project.ProjectReference; +import p.studio.api.assets.AssetCommands; +import p.studio.api.assets.AssetFamily; +import p.studio.api.assets.AssetMutationResult; +import p.studio.api.assets.AssetWorkspacePreparation; +import p.studio.api.assets.AssetWorkspaceStorage; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.workspaces.assets.details.AssetDetailsUiSupport; +import p.studio.api.assets.metadata.AssetStudioGlyphSpecialization; +import p.studio.api.assets.metadata.AssetMetadataService; import java.io.File; -import java.io.IOException; -import java.nio.file.Files; import java.nio.file.Path; import java.util.Objects; import java.util.Optional; @@ -48,24 +45,40 @@ public final class AddAssetWizard { private final Button createButton = new Button(); private final TextField assetRootField = new TextField(); private final TextField assetNameField = new TextField(); - private final ComboBox assetFamilyCombo = new ComboBox<>(); + private final ComboBox assetFamilyCombo = new ComboBox<>(); private final ComboBox glyphSpecializationCombo = new ComboBox<>(); - private final ComboBox outputFormatCombo = new ComboBox<>(); - private final ComboBox outputCodecCombo = new ComboBox<>(); + private final ComboBox outputFormatCombo = new ComboBox<>(); + private final ComboBox outputCodecCombo = new ComboBox<>(); private final CheckBox preloadCheckBox = new CheckBox(); - private final AssetStudioMetadataService studioMetadataService = new AssetStudioMetadataService(); + private final AssetMetadataService studioMetadataService; private int stepIndex; private boolean creating; + private final java.util.concurrent.Executor executor; + private final p.studio.ui.javafx.utilities.i18n.I18nService i18n; + private final p.studio.ui.javafx.utilities.ThemeService theme; + private final AssetCommands assetCommands; + private final AssetCreationCatalog assetCreationCatalog; + private final AssetWorkspaceStorage assetWorkspaceStorage; - private AddAssetWizard(Window owner, ProjectReference projectReference) { + private AddAssetWizard(Window owner, ProjectReference projectReference, java.util.concurrent.Executor executor, + p.studio.ui.javafx.utilities.i18n.I18nService i18n, p.studio.ui.javafx.utilities.ThemeService theme, + AssetCommands assetCommands, AssetCreationCatalog assetCreationCatalog, + AssetMetadataService assetMetadataService, AssetWorkspaceStorage assetWorkspaceStorage) { this.projectReference = Objects.requireNonNull(projectReference, "projectReference"); + this.executor = Objects.requireNonNull(executor, "executor"); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.theme = Objects.requireNonNull(theme, "theme"); + this.assetCommands = Objects.requireNonNull(assetCommands, "assetCommands"); + this.assetCreationCatalog = Objects.requireNonNull(assetCreationCatalog, "assetCreationCatalog"); + this.studioMetadataService = Objects.requireNonNull(assetMetadataService, "assetMetadataService"); + this.assetWorkspaceStorage = Objects.requireNonNull(assetWorkspaceStorage, "assetWorkspaceStorage"); this.stage = new Stage(); stage.initOwner(owner); stage.initModality(Modality.WINDOW_MODAL); - stage.setTitle(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_TITLE)); + stage.setTitle(i18n.text(I18n.ASSETS_ADD_WIZARD_TITLE)); stage.setScene(new Scene(buildRoot(), 720, 500)); - stage.getScene().getStylesheets().add(Container.theme().getDefaultTheme()); + stage.getScene().getStylesheets().add(theme.getDefaultTheme()); preloadCheckBox.setSelected(false); configureAssetFamilyCombo(); @@ -75,8 +88,13 @@ public final class AddAssetWizard { renderStep(); } - public static Optional showAndWait(Window owner, ProjectReference projectReference) { - final AddAssetWizard wizard = new AddAssetWizard(owner, projectReference); + public static Optional showAndWait(Window owner, ProjectReference projectReference, + java.util.concurrent.Executor executor, p.studio.ui.javafx.utilities.i18n.I18nService i18n, + p.studio.ui.javafx.utilities.ThemeService theme, AssetCommands assetCommands, + AssetCreationCatalog assetCreationCatalog, AssetMetadataService assetMetadataService, + AssetWorkspaceStorage assetWorkspaceStorage) { + final AddAssetWizard wizard = new AddAssetWizard(owner, projectReference, executor, i18n, theme, + assetCommands, assetCreationCatalog, assetMetadataService, assetWorkspaceStorage); wizard.stage.showAndWait(); return Optional.ofNullable(wizard.result.get()); } @@ -87,20 +105,20 @@ public final class AddAssetWizard { feedbackLabel.getStyleClass().add("studio-launcher-feedback"); feedbackLabel.setWrapText(true); - backButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_BACK)); + backButton.textProperty().bind(i18n.bind(I18n.WIZARD_BACK)); backButton.getStyleClass().addAll("studio-button", "studio-button-secondary"); backButton.setOnAction(ignored -> goBack()); - nextButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_NEXT)); + nextButton.textProperty().bind(i18n.bind(I18n.WIZARD_NEXT)); nextButton.getStyleClass().addAll("studio-button", "studio-button-primary"); nextButton.setOnAction(ignored -> goNext()); - createButton.textProperty().bind(Container.i18n().bind(I18n.ASSETS_ADD_WIZARD_BUTTON_CREATE)); + createButton.textProperty().bind(i18n.bind(I18n.ASSETS_ADD_WIZARD_BUTTON_CREATE)); createButton.getStyleClass().addAll("studio-button", "studio-button-primary"); createButton.setOnAction(ignored -> finishCreate()); final Button cancelButton = new Button(); - cancelButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_CANCEL)); + cancelButton.textProperty().bind(i18n.bind(I18n.WIZARD_CANCEL)); cancelButton.getStyleClass().addAll("studio-button", "studio-button-cancel"); cancelButton.setOnAction(ignored -> stage.close()); @@ -115,28 +133,26 @@ public final class AddAssetWizard { private void configureAssetFamilyCombo() { assetFamilyCombo.setItems(FXCollections.observableArrayList( - java.util.Arrays.stream(AssetFamilyCatalog.values()) - .filter(candidate -> candidate != AssetFamilyCatalog.UNKNOWN) - .toList())); + assetCreationCatalog.supportedFamilies())); assetFamilyCombo.setMaxWidth(Double.MAX_VALUE); - assetFamilyCombo.setPromptText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_PROMPT_TYPE)); + assetFamilyCombo.setPromptText(i18n.text(I18n.ASSETS_ADD_WIZARD_PROMPT_TYPE)); assetFamilyCombo.setCellFactory(ignored -> new javafx.scene.control.ListCell<>() { @Override - protected void updateItem(AssetFamilyCatalog item, boolean empty) { + protected void updateItem(AssetFamily item, boolean empty) { super.updateItem(item, empty); - setText(empty || item == null ? null : AssetDetailsUiSupport.typeLabel(item)); + setText(empty || item == null ? null : AssetDetailsUiSupport.typeLabel(i18n, item)); } }); assetFamilyCombo.setButtonCell(new javafx.scene.control.ListCell<>() { @Override - protected void updateItem(AssetFamilyCatalog item, boolean empty) { + protected void updateItem(AssetFamily item, boolean empty) { super.updateItem(item, empty); - setText(empty || item == null ? null : AssetDetailsUiSupport.typeLabel(item)); + setText(empty || item == null ? null : AssetDetailsUiSupport.typeLabel(i18n, item)); } }); assetFamilyCombo.valueProperty().addListener((ignored, oldValue, newValue) -> { if (!Objects.equals(oldValue, newValue)) { - if (newValue != AssetFamilyCatalog.GLYPH_BANK) { + if (newValue != AssetFamily.GLYPH_BANK) { glyphSpecializationCombo.getSelectionModel().clearSelection(); } else if (glyphSpecializationCombo.getValue() == null) { glyphSpecializationCombo.getSelectionModel().select(AssetStudioGlyphSpecialization.SPRITES); @@ -155,39 +171,39 @@ public final class AddAssetWizard { .filter(candidate -> candidate != AssetStudioGlyphSpecialization.NONE) .toList())); glyphSpecializationCombo.setMaxWidth(Double.MAX_VALUE); - glyphSpecializationCombo.setPromptText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_PROMPT_SPECIALIZATION)); + glyphSpecializationCombo.setPromptText(i18n.text(I18n.ASSETS_ADD_WIZARD_PROMPT_SPECIALIZATION)); glyphSpecializationCombo.getSelectionModel().select(AssetStudioGlyphSpecialization.SPRITES); glyphSpecializationCombo.setCellFactory(ignored -> new javafx.scene.control.ListCell<>() { @Override protected void updateItem(AssetStudioGlyphSpecialization item, boolean empty) { super.updateItem(item, empty); - setText(empty || item == null ? null : AssetDetailsUiSupport.specializationLabel(item)); + setText(empty || item == null ? null : AssetDetailsUiSupport.specializationLabel(i18n, item)); } }); glyphSpecializationCombo.setButtonCell(new javafx.scene.control.ListCell<>() { @Override protected void updateItem(AssetStudioGlyphSpecialization item, boolean empty) { super.updateItem(item, empty); - setText(empty || item == null ? null : AssetDetailsUiSupport.specializationLabel(item)); + setText(empty || item == null ? null : AssetDetailsUiSupport.specializationLabel(i18n, item)); } }); } private void configureOutputFormatCombo() { outputFormatCombo.setMaxWidth(Double.MAX_VALUE); - outputFormatCombo.setPromptText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_PROMPT_FORMAT)); + outputFormatCombo.setPromptText(i18n.text(I18n.ASSETS_ADD_WIZARD_PROMPT_FORMAT)); outputFormatCombo.setCellFactory(ignored -> new javafx.scene.control.ListCell<>() { @Override - protected void updateItem(OutputFormatCatalog item, boolean empty) { + protected void updateItem(String item, boolean empty) { super.updateItem(item, empty); - setText(empty || item == null ? null : item.displayName()); + setText(empty || item == null ? null : AssetDetailsUiSupport.catalogLabel(item)); } }); outputFormatCombo.setButtonCell(new javafx.scene.control.ListCell<>() { @Override - protected void updateItem(OutputFormatCatalog item, boolean empty) { + protected void updateItem(String item, boolean empty) { super.updateItem(item, empty); - setText(empty || item == null ? null : item.displayName()); + setText(empty || item == null ? null : AssetDetailsUiSupport.catalogLabel(item)); } }); outputFormatCombo.valueProperty().addListener((ignored, oldValue, newValue) -> { @@ -199,19 +215,19 @@ public final class AddAssetWizard { private void configureOutputCodecCombo() { outputCodecCombo.setMaxWidth(Double.MAX_VALUE); - outputCodecCombo.setPromptText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_PROMPT_CODEC)); + outputCodecCombo.setPromptText(i18n.text(I18n.ASSETS_ADD_WIZARD_PROMPT_CODEC)); outputCodecCombo.setCellFactory(ignored -> new javafx.scene.control.ListCell<>() { @Override - protected void updateItem(OutputCodecCatalog item, boolean empty) { + protected void updateItem(String item, boolean empty) { super.updateItem(item, empty); - setText(empty || item == null ? null : item.displayName()); + setText(empty || item == null ? null : AssetDetailsUiSupport.catalogLabel(item)); } }); outputCodecCombo.setButtonCell(new javafx.scene.control.ListCell<>() { @Override - protected void updateItem(OutputCodecCatalog item, boolean empty) { + protected void updateItem(String item, boolean empty) { super.updateItem(item, empty); - setText(empty || item == null ? null : item.displayName()); + setText(empty || item == null ? null : AssetDetailsUiSupport.catalogLabel(item)); } }); } @@ -234,12 +250,12 @@ public final class AddAssetWizard { } private void renderRootStep() { - stepTitle.setText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_STEP_ROOT_TITLE)); - stepDescription.setText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_STEP_ROOT_DESCRIPTION)); + stepTitle.setText(i18n.text(I18n.ASSETS_ADD_WIZARD_STEP_ROOT_TITLE)); + stepDescription.setText(i18n.text(I18n.ASSETS_ADD_WIZARD_STEP_ROOT_DESCRIPTION)); - final Label rootLabel = new Label(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_LABEL_ROOT)); + final Label rootLabel = new Label(i18n.text(I18n.ASSETS_ADD_WIZARD_LABEL_ROOT)); final Button browseButton = new Button(); - browseButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_BROWSE)); + browseButton.textProperty().bind(i18n.bind(I18n.WIZARD_BROWSE)); browseButton.getStyleClass().addAll("studio-button", "studio-button-secondary"); browseButton.setDisable(creating); browseButton.setOnAction(ignored -> browseForRoot()); @@ -247,7 +263,7 @@ public final class AddAssetWizard { final HBox row = new HBox(12, assetRootField, browseButton); HBox.setHgrow(assetRootField, Priority.ALWAYS); - final Label assetsRootHint = new Label(Container.i18n().format( + final Label assetsRootHint = new Label(i18n.format( I18n.ASSETS_ADD_WIZARD_ASSETS_ROOT_HINT, projectReference.rootPath().resolve("assets"))); assetsRootHint.getStyleClass().add("studio-launcher-subtitle"); @@ -256,20 +272,20 @@ public final class AddAssetWizard { } private void renderDetailsStep() { - stepTitle.setText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_STEP_DETAILS_TITLE)); - stepDescription.setText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_STEP_DETAILS_DESCRIPTION)); + stepTitle.setText(i18n.text(I18n.ASSETS_ADD_WIZARD_STEP_DETAILS_TITLE)); + stepDescription.setText(i18n.text(I18n.ASSETS_ADD_WIZARD_STEP_DETAILS_DESCRIPTION)); - final Label nameLabel = new Label(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_LABEL_NAME)); - final Label typeLabel = new Label(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_LABEL_TYPE)); - final Label specializationLabel = new Label(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_LABEL_SPECIALIZATION)); - final Label formatLabel = new Label(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_LABEL_FORMAT)); - final Label codecLabel = new Label(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_LABEL_CODEC)); - final Label preloadLabel = new Label(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_LABEL_PRELOAD)); - final Label noteLabel = new Label(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_NOTE)); + final Label nameLabel = new Label(i18n.text(I18n.ASSETS_ADD_WIZARD_LABEL_NAME)); + final Label typeLabel = new Label(i18n.text(I18n.ASSETS_ADD_WIZARD_LABEL_TYPE)); + final Label specializationLabel = new Label(i18n.text(I18n.ASSETS_ADD_WIZARD_LABEL_SPECIALIZATION)); + final Label formatLabel = new Label(i18n.text(I18n.ASSETS_ADD_WIZARD_LABEL_FORMAT)); + final Label codecLabel = new Label(i18n.text(I18n.ASSETS_ADD_WIZARD_LABEL_CODEC)); + final Label preloadLabel = new Label(i18n.text(I18n.ASSETS_ADD_WIZARD_LABEL_PRELOAD)); + final Label noteLabel = new Label(i18n.text(I18n.ASSETS_ADD_WIZARD_NOTE)); noteLabel.setWrapText(true); noteLabel.getStyleClass().add("studio-launcher-subtitle"); final VBox specializationBox = new VBox(6, specializationLabel, glyphSpecializationCombo); - final boolean specializationVisible = selectedFamily() == AssetFamilyCatalog.GLYPH_BANK; + final boolean specializationVisible = selectedFamily() == AssetFamily.GLYPH_BANK; specializationBox.setVisible(specializationVisible); specializationBox.setManaged(specializationVisible); @@ -313,15 +329,14 @@ public final class AddAssetWizard { private boolean validateRoot() { final String relativeRoot = normalizedRelativeRoot(assetRootField.getText()); if (relativeRoot == null) { - feedbackLabel.setText(Container.i18n().text( + feedbackLabel.setText(i18n.text( assetRootField.getText().trim().isBlank() ? I18n.ASSETS_ADD_WIZARD_ERROR_ROOT : I18n.ASSETS_ADD_WIZARD_ERROR_ROOT_RELATIVE)); return false; } - final Path assetRoot = ensureAssetsRoot().resolve(relativeRoot).toAbsolutePath().normalize(); - if (Files.isRegularFile(assetRoot.resolve("asset.json"))) { - feedbackLabel.setText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_ERROR_ROOT_ALREADY_ASSET)); + if (assetWorkspaceStorage.assetManifestExists(projectReference, relativeRoot)) { + feedbackLabel.setText(i18n.text(I18n.ASSETS_ADD_WIZARD_ERROR_ROOT_ALREADY_ASSET)); return false; } return true; @@ -329,28 +344,28 @@ public final class AddAssetWizard { private boolean validateDetails() { if (assetNameField.getText().trim().isBlank()) { - feedbackLabel.setText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_ERROR_NAME)); + feedbackLabel.setText(i18n.text(I18n.ASSETS_ADD_WIZARD_ERROR_NAME)); return false; } - if (selectedFamily() == null || selectedFamily() == AssetFamilyCatalog.UNKNOWN) { - feedbackLabel.setText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_ERROR_TYPE)); + if (selectedFamily() == null || selectedFamily() == AssetFamily.UNKNOWN) { + feedbackLabel.setText(i18n.text(I18n.ASSETS_ADD_WIZARD_ERROR_TYPE)); return false; } - if (selectedFamily() == AssetFamilyCatalog.GLYPH_BANK + if (selectedFamily() == AssetFamily.GLYPH_BANK && (selectedGlyphSpecialization() == null || selectedGlyphSpecialization() == AssetStudioGlyphSpecialization.NONE)) { - feedbackLabel.setText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_ERROR_SPECIALIZATION)); + feedbackLabel.setText(i18n.text(I18n.ASSETS_ADD_WIZARD_ERROR_SPECIALIZATION)); return false; } - if (selectedFormat() == null || selectedFormat() == OutputFormatCatalog.UNKNOWN) { - feedbackLabel.setText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_ERROR_FORMAT)); + if (selectedFormat() == null || "UNKNOWN".equals(selectedFormat())) { + feedbackLabel.setText(i18n.text(I18n.ASSETS_ADD_WIZARD_ERROR_FORMAT)); return false; } - if (selectedCodec() == null || selectedCodec() == OutputCodecCatalog.UNKNOWN) { - feedbackLabel.setText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_ERROR_CODEC)); + if (selectedCodec() == null || "UNKNOWN".equals(selectedCodec())) { + feedbackLabel.setText(i18n.text(I18n.ASSETS_ADD_WIZARD_ERROR_CODEC)); return false; } - if (!selectedFormat().supports(selectedCodec())) { - feedbackLabel.setText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_ERROR_UNSUPPORTED_COMBINATION)); + if (!assetCreationCatalog.supports(selectedFormat(), selectedCodec())) { + feedbackLabel.setText(i18n.text(I18n.ASSETS_ADD_WIZARD_ERROR_UNSUPPORTED_COMBINATION)); return false; } return true; @@ -359,7 +374,7 @@ public final class AddAssetWizard { private void browseForRoot() { final Path assetsRoot = ensureAssetsRoot(); final DirectoryChooser chooser = new DirectoryChooser(); - chooser.setTitle(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_BROWSE_TITLE)); + chooser.setTitle(i18n.text(I18n.ASSETS_ADD_WIZARD_BROWSE_TITLE)); chooser.setInitialDirectory((assetsRoot.toFile().isDirectory() ? assetsRoot : projectReference.rootPath()).toFile()); final File selected = chooser.showDialog(stage); if (selected == null) { @@ -367,14 +382,15 @@ public final class AddAssetWizard { } final Path selectedPath = selected.toPath().toAbsolutePath().normalize(); if (!selectedPath.startsWith(assetsRoot)) { - feedbackLabel.setText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_ERROR_ROOT_OUTSIDE_ASSETS)); + feedbackLabel.setText(i18n.text(I18n.ASSETS_ADD_WIZARD_ERROR_ROOT_OUTSIDE_ASSETS)); return; } - if (Files.isRegularFile(selectedPath.resolve("asset.json"))) { - feedbackLabel.setText(Container.i18n().text(I18n.ASSETS_ADD_WIZARD_ERROR_ROOT_ALREADY_ASSET)); + final String selectedRoot = assetsRoot.relativize(selectedPath).toString().replace('\\', '/'); + if (assetWorkspaceStorage.assetManifestExists(projectReference, selectedRoot)) { + feedbackLabel.setText(i18n.text(I18n.ASSETS_ADD_WIZARD_ERROR_ROOT_ALREADY_ASSET)); return; } - assetRootField.setText(assetsRoot.relativize(selectedPath).toString().replace('\\', '/')); + assetRootField.setText(selectedRoot); } private void finishCreate() { @@ -385,35 +401,35 @@ public final class AddAssetWizard { creating = true; feedbackLabel.setText(""); renderStep(); - final CreateAssetRequest request = new CreateAssetRequest( - projectReference.toPackerProjectContext(), - normalizedRelativeRoot(assetRootField.getText()), - assetNameField.getText().trim(), - selectedFamily(), - selectedFormat(), - selectedCodec(), - preloadCheckBox.isSelected()); - Container.backgroundTasks().submit(() -> createAsset(request)); + final String assetRoot = normalizedRelativeRoot(assetRootField.getText()); + final String assetName = assetNameField.getText().trim(); + final AssetFamily assetFamily = selectedFamily(); + final String outputFormat = selectedFormat(); + final String outputCodec = selectedCodec(); + final boolean preload = preloadCheckBox.isSelected(); + executor.execute(() -> createAsset(assetRoot, assetName, assetFamily, outputFormat, outputCodec, preload)); } - private void createAsset(CreateAssetRequest request) { + private void createAsset(String assetRoot, String assetName, AssetFamily assetFamily, + String outputFormat, String outputCodec, boolean preload) { try { - final CreateAssetResult createResult = Container.packer().workspaceService().createAsset(request); + final AssetMutationResult createResult = assetCommands.create( + projectReference, + assetRoot, assetName, assetFamily, outputFormat, outputCodec, preload); Platform.runLater(() -> applyCreateResult(createResult)); } catch (RuntimeException exception) { Platform.runLater(() -> applyCreateFailure(exception)); } } - private void applyCreateResult(CreateAssetResult createResult) { + private void applyCreateResult(AssetMutationResult createResult) { creating = false; - if (createResult.status() == PackerOperationStatus.SUCCESS && createResult.assetReference() != null) { - try { - persistStudioMetadata(createResult.assetRoot()); - } catch (IOException exception) { - feedbackLabel.setText(exception.getMessage() == null || exception.getMessage().isBlank() + if (createResult.successful() && createResult.assetReference() != null) { + final var metadataResult = persistStudioMetadata(createResult.assetRoot()); + if (!metadataResult.successful()) { + feedbackLabel.setText(metadataResult.message().isBlank() ? "Unable to persist Studio metadata." - : exception.getMessage()); + : metadataResult.message()); renderStep(); return; } @@ -427,14 +443,12 @@ public final class AddAssetWizard { private void applyCreateFailure(RuntimeException exception) { creating = false; - feedbackLabel.setText(exception.getMessage() == null || exception.getMessage().isBlank() - ? "Unable to create asset." - : exception.getMessage()); + feedbackLabel.setText("Unable to create asset."); renderStep(); } private void refreshOutputFormats() { - outputFormatCombo.setItems(FXCollections.observableArrayList(OutputFormatCatalog.supportedFor(selectedFamily()))); + outputFormatCombo.setItems(FXCollections.observableArrayList(assetCreationCatalog.supportedFormats(selectedFamily()))); if (!outputFormatCombo.getItems().isEmpty()) { outputFormatCombo.getSelectionModel().selectFirst(); } else { @@ -444,9 +458,9 @@ public final class AddAssetWizard { } private void refreshOutputCodecs() { - final OutputFormatCatalog selectedFormat = selectedFormat(); + final String selectedFormat = selectedFormat(); outputCodecCombo.setItems(FXCollections.observableArrayList( - selectedFormat == null ? java.util.List.of() : selectedFormat.availableCodecs())); + selectedFormat == null ? java.util.List.of() : assetCreationCatalog.availableCodecs(selectedFormat))); if (!outputCodecCombo.getItems().isEmpty()) { outputCodecCombo.getSelectionModel().selectFirst(); } else { @@ -454,15 +468,15 @@ public final class AddAssetWizard { } } - private AssetFamilyCatalog selectedFamily() { + private AssetFamily selectedFamily() { return assetFamilyCombo.getValue(); } - private OutputFormatCatalog selectedFormat() { + private String selectedFormat() { return outputFormatCombo.getValue(); } - private OutputCodecCatalog selectedCodec() { + private String selectedCodec() { return outputCodecCombo.getValue(); } @@ -470,11 +484,11 @@ public final class AddAssetWizard { return glyphSpecializationCombo.getValue(); } - private void persistStudioMetadata(Path assetRoot) throws IOException { - if (selectedFamily() != AssetFamilyCatalog.GLYPH_BANK) { - return; + private p.studio.api.assets.metadata.AssetMetadataWriteResult persistStudioMetadata(Path assetRoot) { + if (selectedFamily() != AssetFamily.GLYPH_BANK) { + return p.studio.api.assets.metadata.AssetMetadataWriteResult.success(); } - studioMetadataService.writeGlyphSpecialization(assetRoot, selectedGlyphSpecialization()); + return studioMetadataService.writeGlyphSpecialization(assetRoot, selectedGlyphSpecialization()); } private String normalizedRelativeRoot(String candidate) { @@ -491,14 +505,12 @@ public final class AddAssetWizard { } private Path ensureAssetsRoot() { - final Path assetsRoot = projectReference.rootPath().resolve("assets").toAbsolutePath().normalize(); - try { - Files.createDirectories(assetsRoot); - } catch (IOException exception) { - feedbackLabel.setText(exception.getMessage() == null || exception.getMessage().isBlank() - ? Container.i18n().text(I18n.ASSETS_ADD_WIZARD_ERROR_ROOT_OUTSIDE_ASSETS) - : exception.getMessage()); + final AssetWorkspacePreparation preparation = assetWorkspaceStorage.prepare(projectReference); + if (!preparation.success()) { + feedbackLabel.setText(preparation.message().isBlank() + ? i18n.text(I18n.ASSETS_ADD_WIZARD_ERROR_ROOT_OUTSIDE_ASSETS) + : preparation.message()); } - return assetsRoot; + return preparation.assetsRoot(); } } diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/wizards/DeleteAssetDialog.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/wizards/DeleteAssetDialog.java similarity index 66% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/wizards/DeleteAssetDialog.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/wizards/DeleteAssetDialog.java index 0afc7c21..e9727883 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/wizards/DeleteAssetDialog.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/wizards/DeleteAssetDialog.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.wizards; +package p.studio.ui.javafx.workspaces.assets.wizards; import javafx.beans.binding.Bindings; import javafx.geometry.Insets; @@ -13,8 +13,7 @@ import javafx.scene.layout.VBox; import javafx.stage.Modality; import javafx.stage.Stage; import javafx.stage.Window; -import p.studio.Container; -import p.studio.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18n; import java.util.Objects; import java.util.Optional; @@ -25,40 +24,46 @@ public final class DeleteAssetDialog { private final AtomicReference result = new AtomicReference<>(false); private final String assetName; private final TextField confirmationField = new TextField(); + private final p.studio.ui.javafx.utilities.i18n.I18nService i18n; + private final p.studio.ui.javafx.utilities.ThemeService theme; - private DeleteAssetDialog(Window owner, String assetName) { + private DeleteAssetDialog(Window owner, String assetName, p.studio.ui.javafx.utilities.i18n.I18nService i18n, + p.studio.ui.javafx.utilities.ThemeService theme) { this.assetName = Objects.requireNonNull(assetName, "assetName").trim(); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.theme = Objects.requireNonNull(theme, "theme"); this.stage = new Stage(); stage.initOwner(owner); stage.initModality(Modality.WINDOW_MODAL); - stage.setTitle(Container.i18n().text(I18n.ASSETS_DELETE_DIALOG_TITLE)); + stage.setTitle(i18n.text(I18n.ASSETS_DELETE_DIALOG_TITLE)); stage.setScene(new Scene(buildRoot(), 520, 240)); - stage.getScene().getStylesheets().add(Container.theme().getDefaultTheme()); + stage.getScene().getStylesheets().add(theme.getDefaultTheme()); } - public static boolean showAndWait(Window owner, String assetName) { - final DeleteAssetDialog dialog = new DeleteAssetDialog(owner, assetName); + public static boolean showAndWait(Window owner, String assetName, p.studio.ui.javafx.utilities.i18n.I18nService i18n, + p.studio.ui.javafx.utilities.ThemeService theme) { + final DeleteAssetDialog dialog = new DeleteAssetDialog(owner, assetName, i18n, theme); dialog.stage.showAndWait(); return Optional.ofNullable(dialog.result.get()).orElse(false); } private VBox buildRoot() { - final Label title = new Label(Container.i18n().text(I18n.ASSETS_DELETE_DIALOG_TITLE)); + final Label title = new Label(i18n.text(I18n.ASSETS_DELETE_DIALOG_TITLE)); title.getStyleClass().add("studio-launcher-section-title"); - final Label description = new Label(Container.i18n().format(I18n.ASSETS_DELETE_DIALOG_DESCRIPTION, assetName)); + final Label description = new Label(i18n.format(I18n.ASSETS_DELETE_DIALOG_DESCRIPTION, assetName)); description.getStyleClass().add("studio-launcher-subtitle"); description.setWrapText(true); - confirmationField.setPromptText(Container.i18n().text(I18n.ASSETS_DELETE_DIALOG_PROMPT)); + confirmationField.setPromptText(i18n.text(I18n.ASSETS_DELETE_DIALOG_PROMPT)); confirmationField.setMaxWidth(Double.MAX_VALUE); - final Label note = new Label(Container.i18n().text(I18n.ASSETS_DELETE_DIALOG_NOTE)); + final Label note = new Label(i18n.text(I18n.ASSETS_DELETE_DIALOG_NOTE)); note.getStyleClass().add("studio-launcher-feedback"); note.setWrapText(true); final Button confirmButton = new Button(); - confirmButton.textProperty().bind(Container.i18n().bind(I18n.ASSETS_DELETE_DIALOG_CONFIRM)); + confirmButton.textProperty().bind(i18n.bind(I18n.ASSETS_DELETE_DIALOG_CONFIRM)); confirmButton.getStyleClass().addAll("studio-button", "studio-button-danger"); confirmButton.disableProperty().bind(Bindings.createBooleanBinding( () -> !assetName.equals(confirmationField.getText().trim()), @@ -69,7 +74,7 @@ public final class DeleteAssetDialog { }); final Button cancelButton = new Button(); - cancelButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_CANCEL)); + cancelButton.textProperty().bind(i18n.bind(I18n.WIZARD_CANCEL)); cancelButton.getStyleClass().addAll("studio-button", "studio-button-cancel"); cancelButton.setOnAction(ignored -> stage.close()); diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/wizards/MoveAssetWizard.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/wizards/MoveAssetWizard.java similarity index 73% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/wizards/MoveAssetWizard.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/wizards/MoveAssetWizard.java index 49642b90..e27f8ee0 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/wizards/MoveAssetWizard.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/wizards/MoveAssetWizard.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.assets.wizards; +package p.studio.ui.javafx.workspaces.assets.wizards; import javafx.application.Platform; import javafx.geometry.Insets; @@ -15,15 +15,13 @@ import javafx.stage.DirectoryChooser; import javafx.stage.Modality; import javafx.stage.Stage; import javafx.stage.Window; -import p.packer.messages.AssetReference; -import p.packer.messages.MoveAssetRequest; -import p.packer.messages.MoveAssetResult; -import p.packer.messages.PackerOperationStatus; -import p.studio.Container; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.details.AssetDetailsUiSupport; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary; +import p.studio.api.assets.AssetReference; +import p.studio.api.assets.AssetCommands; +import p.studio.api.assets.AssetMutationResult; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.workspaces.assets.details.AssetDetailsUiSupport; +import p.studio.api.assets.workspace.AssetWorkspaceAssetSummary; import java.io.File; import java.nio.file.Path; @@ -35,6 +33,10 @@ public final class MoveAssetWizard { private final ProjectReference projectReference; private final AssetReference assetReference; private final AssetWorkspaceAssetSummary assetSummary; + private final java.util.concurrent.Executor executor; + private final p.studio.ui.javafx.utilities.i18n.I18nService i18n; + private final p.studio.ui.javafx.utilities.ThemeService theme; + private final AssetCommands assetCommands; private final Stage stage; private final AtomicReference result = new AtomicReference<>(); private final Label stepTitle = new Label(); @@ -55,16 +57,24 @@ public final class MoveAssetWizard { Window owner, ProjectReference projectReference, AssetReference assetReference, - AssetWorkspaceAssetSummary assetSummary) { + AssetWorkspaceAssetSummary assetSummary, + java.util.concurrent.Executor executor, + p.studio.ui.javafx.utilities.i18n.I18nService i18n, + p.studio.ui.javafx.utilities.ThemeService theme, + AssetCommands assetCommands) { this.projectReference = Objects.requireNonNull(projectReference, "projectReference"); this.assetReference = Objects.requireNonNull(assetReference, "assetReference"); this.assetSummary = Objects.requireNonNull(assetSummary, "assetSummary"); + this.executor = Objects.requireNonNull(executor, "executor"); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.theme = Objects.requireNonNull(theme, "theme"); + this.assetCommands = Objects.requireNonNull(assetCommands, "assetCommands"); this.stage = new Stage(); stage.initOwner(owner); stage.initModality(Modality.WINDOW_MODAL); - stage.setTitle(Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_TITLE)); + stage.setTitle(i18n.text(I18n.ASSETS_RELOCATE_WIZARD_TITLE)); stage.setScene(new Scene(buildRoot(), 760, 460)); - stage.getScene().getStylesheets().add(Container.theme().getDefaultTheme()); + stage.getScene().getStylesheets().add(theme.getDefaultTheme()); stage.setOnCloseRequest(event -> { if (moving) { event.consume(); @@ -81,8 +91,13 @@ public final class MoveAssetWizard { Window owner, ProjectReference projectReference, AssetReference assetReference, - AssetWorkspaceAssetSummary assetSummary) { - final MoveAssetWizard wizard = new MoveAssetWizard(owner, projectReference, assetReference, assetSummary); + AssetWorkspaceAssetSummary assetSummary, + java.util.concurrent.Executor executor, + p.studio.ui.javafx.utilities.i18n.I18nService i18n, + p.studio.ui.javafx.utilities.ThemeService theme, + AssetCommands assetCommands) { + final MoveAssetWizard wizard = new MoveAssetWizard(owner, projectReference, assetReference, assetSummary, + executor, i18n, theme, assetCommands); wizard.stage.showAndWait(); return Optional.ofNullable(wizard.result.get()); } @@ -93,20 +108,20 @@ public final class MoveAssetWizard { feedbackLabel.getStyleClass().add("studio-launcher-feedback"); feedbackLabel.setWrapText(true); - backButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_BACK)); + backButton.textProperty().bind(i18n.bind(I18n.WIZARD_BACK)); backButton.getStyleClass().addAll("studio-button", "studio-button-secondary"); backButton.setOnAction(ignored -> goBack()); - nextButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_NEXT)); + nextButton.textProperty().bind(i18n.bind(I18n.WIZARD_NEXT)); nextButton.getStyleClass().addAll("studio-button", "studio-button-primary"); nextButton.setOnAction(ignored -> goNext()); - confirmButton.textProperty().bind(Container.i18n().bind(I18n.ASSETS_RELOCATE_WIZARD_BUTTON_CONFIRM)); + confirmButton.textProperty().bind(i18n.bind(I18n.ASSETS_RELOCATE_WIZARD_BUTTON_CONFIRM)); confirmButton.getStyleClass().addAll("studio-button", "studio-button-primary"); confirmButton.setOnAction(ignored -> confirmMove()); final Button cancelButton = new Button(); - cancelButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_CANCEL)); + cancelButton.textProperty().bind(i18n.bind(I18n.WIZARD_CANCEL)); cancelButton.getStyleClass().addAll("studio-button", "studio-button-cancel"); cancelButton.setOnAction(ignored -> { if (!moving) { @@ -144,13 +159,13 @@ public final class MoveAssetWizard { private void renderDestinationStep() { stepTitle.textProperty().unbind(); stepDescription.textProperty().unbind(); - stepTitle.textProperty().bind(Container.i18n().bind(I18n.ASSETS_RELOCATE_WIZARD_STEP_DESTINATION_TITLE)); - stepDescription.textProperty().bind(Container.i18n().bind(I18n.ASSETS_RELOCATE_WIZARD_STEP_DESTINATION_DESCRIPTION)); + stepTitle.textProperty().bind(i18n.bind(I18n.ASSETS_RELOCATE_WIZARD_STEP_DESTINATION_TITLE)); + stepDescription.textProperty().bind(i18n.bind(I18n.ASSETS_RELOCATE_WIZARD_STEP_DESTINATION_DESCRIPTION)); targetRootField.setText(displayTargetRoot()); final Button browseButton = new Button(); - browseButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_BROWSE)); + browseButton.textProperty().bind(i18n.bind(I18n.WIZARD_BROWSE)); browseButton.getStyleClass().addAll("studio-button", "studio-button-secondary"); browseButton.setOnAction(ignored -> browseForDestinationParent()); browseButton.setDisable(moving); @@ -161,7 +176,7 @@ public final class MoveAssetWizard { final HBox destinationParentRow = new HBox(12, destinationParentField, browseButton); HBox.setHgrow(destinationParentField, Priority.ALWAYS); - final Label note = new Label(Container.i18n().format( + final Label note = new Label(i18n.format( I18n.ASSETS_RELOCATE_WIZARD_ASSETS_ROOT_HINT, assetsRoot().toString())); note.getStyleClass().add("studio-launcher-feedback"); @@ -169,16 +184,16 @@ public final class MoveAssetWizard { stepBody.getChildren().setAll( AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_CURRENT_ROOT), + i18n.text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_CURRENT_ROOT), currentRelativeRoot()), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_DESTINATION_PARENT), + i18n.text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_DESTINATION_PARENT), destinationParentRow), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_DESTINATION_NAME), + i18n.text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_DESTINATION_NAME), destinationNameField), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_TARGET_ROOT), + i18n.text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_TARGET_ROOT), targetRootField), note); } @@ -186,29 +201,29 @@ public final class MoveAssetWizard { private void renderSummaryStep() { stepTitle.textProperty().unbind(); stepDescription.textProperty().unbind(); - stepTitle.textProperty().bind(Container.i18n().bind(I18n.ASSETS_RELOCATE_WIZARD_STEP_SUMMARY_TITLE)); - stepDescription.textProperty().bind(Container.i18n().bind(I18n.ASSETS_RELOCATE_WIZARD_STEP_SUMMARY_DESCRIPTION)); + stepTitle.textProperty().bind(i18n.bind(I18n.ASSETS_RELOCATE_WIZARD_STEP_SUMMARY_TITLE)); + stepDescription.textProperty().bind(i18n.bind(I18n.ASSETS_RELOCATE_WIZARD_STEP_SUMMARY_DESCRIPTION)); stepBody.getChildren().setAll( AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_CURRENT_ROOT), + i18n.text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_CURRENT_ROOT), currentRelativeRoot()), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_DESTINATION_PARENT), + i18n.text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_DESTINATION_PARENT), displayDestinationParent()), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_DESTINATION_NAME), + i18n.text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_DESTINATION_NAME), normalizedDestinationName()), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_TARGET_ROOT), + i18n.text(I18n.ASSETS_RELOCATE_WIZARD_LABEL_TARGET_ROOT), targetRelativeRoot()), - AssetDetailsUiSupport.createSectionMessage(Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_NOTE))); + AssetDetailsUiSupport.createSectionMessage(i18n.text(I18n.ASSETS_RELOCATE_WIZARD_NOTE))); } private void renderWaitingStep() { stepTitle.textProperty().unbind(); stepDescription.textProperty().unbind(); - stepTitle.textProperty().bind(Container.i18n().bind(I18n.ASSETS_RELOCATE_WIZARD_STEP_WAITING_TITLE)); - stepDescription.textProperty().bind(Container.i18n().bind(I18n.ASSETS_RELOCATE_WIZARD_STEP_WAITING_DESCRIPTION)); + stepTitle.textProperty().bind(i18n.bind(I18n.ASSETS_RELOCATE_WIZARD_STEP_WAITING_TITLE)); + stepDescription.textProperty().bind(i18n.bind(I18n.ASSETS_RELOCATE_WIZARD_STEP_WAITING_DESCRIPTION)); final ProgressIndicator indicator = new ProgressIndicator(); final VBox box = new VBox(16, indicator, AssetDetailsUiSupport.createSectionMessage(targetRelativeRoot())); box.setAlignment(Pos.CENTER_LEFT); @@ -240,25 +255,22 @@ public final class MoveAssetWizard { feedbackLabel.setText(""); stepIndex = 2; renderStep(); - final MoveAssetRequest request = new MoveAssetRequest( - projectReference.toPackerProjectContext(), - assetReference, - targetRelativeRoot()); - Container.backgroundTasks().submit(() -> moveAsset(request)); + final String targetRoot = targetRelativeRoot(); + executor.execute(() -> moveAsset(targetRoot)); } - private void moveAsset(MoveAssetRequest request) { + private void moveAsset(String targetRoot) { try { - final MoveAssetResult moveResult = Container.packer().workspaceService().moveAsset(request); + final AssetMutationResult moveResult = assetCommands.move(projectReference, assetReference, targetRoot); Platform.runLater(() -> applyMoveResult(moveResult)); } catch (RuntimeException exception) { Platform.runLater(() -> applyMoveFailure(exception)); } } - private void applyMoveResult(MoveAssetResult moveResult) { + private void applyMoveResult(AssetMutationResult moveResult) { moving = false; - if (moveResult.status() == PackerOperationStatus.SUCCESS && moveResult.assetReference() != null) { + if (moveResult.successful() && moveResult.assetReference() != null) { result.set(moveResult.assetReference()); stage.close(); return; @@ -270,16 +282,14 @@ public final class MoveAssetWizard { private void applyMoveFailure(RuntimeException exception) { moving = false; - feedbackLabel.setText(exception.getMessage() == null || exception.getMessage().isBlank() - ? "Unable to move asset." - : exception.getMessage()); + feedbackLabel.setText("Unable to move asset."); stepIndex = 0; renderStep(); } private void browseForDestinationParent() { final DirectoryChooser chooser = new DirectoryChooser(); - chooser.setTitle(Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_BROWSE_TITLE)); + chooser.setTitle(i18n.text(I18n.ASSETS_RELOCATE_WIZARD_BROWSE_TITLE)); chooser.setInitialDirectory(existingInitialBrowseDirectory().toFile()); final File selected = chooser.showDialog(stage); if (selected == null) { @@ -287,7 +297,7 @@ public final class MoveAssetWizard { } final Path selectedPath = selected.toPath().toAbsolutePath().normalize(); if (!selectedPath.startsWith(assetsRoot())) { - feedbackLabel.setText(Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_ERROR_OUTSIDE_ASSETS)); + feedbackLabel.setText(i18n.text(I18n.ASSETS_RELOCATE_WIZARD_ERROR_OUTSIDE_ASSETS)); return; } destinationParentField.setText(relativeDestinationParent(selectedPath)); @@ -298,33 +308,33 @@ public final class MoveAssetWizard { final String parent = normalizedDestinationParent(); if (parent == null) { if (showFeedback) { - feedbackLabel.setText(Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_ERROR_PARENT)); + feedbackLabel.setText(i18n.text(I18n.ASSETS_RELOCATE_WIZARD_ERROR_PARENT)); } return false; } final String name = normalizedDestinationName(); if (name == null) { if (showFeedback) { - feedbackLabel.setText(Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_ERROR_NAME)); + feedbackLabel.setText(i18n.text(I18n.ASSETS_RELOCATE_WIZARD_ERROR_NAME)); } return false; } final String targetRoot = targetRelativeRoot(); if (targetRoot == null) { if (showFeedback) { - feedbackLabel.setText(Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_ERROR_OUTSIDE_ASSETS)); + feedbackLabel.setText(i18n.text(I18n.ASSETS_RELOCATE_WIZARD_ERROR_OUTSIDE_ASSETS)); } return false; } if (targetRoot.equals(currentRelativeRoot())) { if (showFeedback) { - feedbackLabel.setText(Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_ERROR_TARGET_SAME)); + feedbackLabel.setText(i18n.text(I18n.ASSETS_RELOCATE_WIZARD_ERROR_TARGET_SAME)); } return false; } if (targetManifestPath().toFile().isFile()) { if (showFeedback) { - feedbackLabel.setText(Container.i18n().text(I18n.ASSETS_RELOCATE_WIZARD_ERROR_TARGET_ALREADY_ASSET)); + feedbackLabel.setText(i18n.text(I18n.ASSETS_RELOCATE_WIZARD_ERROR_TARGET_ALREADY_ASSET)); } return false; } diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/wizards/PackWorkspaceWizard.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/wizards/PackWorkspaceWizard.java similarity index 61% rename from prometeu-studio/src/main/java/p/studio/workspaces/assets/wizards/PackWorkspaceWizard.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/wizards/PackWorkspaceWizard.java index 9a5e3df9..1cb422e4 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/wizards/PackWorkspaceWizard.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/assets/wizards/PackWorkspaceWizard.java @@ -1,4 +1,7 @@ -package p.studio.workspaces.assets.wizards; +package p.studio.ui.javafx.workspaces.assets.wizards; + +import p.studio.api.assets.AssetCapacityState; +import p.studio.api.assets.AssetCapacityPolicy; import javafx.application.Platform; import javafx.geometry.Insets; @@ -15,24 +18,18 @@ import javafx.scene.layout.VBox; import javafx.stage.Modality; import javafx.stage.Stage; import javafx.stage.Window; -import p.packer.dtos.PackerEmittedArtifactDTO; -import p.packer.dtos.PackerPackSummaryAssetDTO; -import p.packer.dtos.PackerPackValidationAssetDTO; -import p.packer.messages.ListAssetsRequest; -import p.packer.messages.ListAssetsResult; -import p.packer.messages.PackWorkspaceRequest; -import p.packer.messages.PackWorkspaceResult; -import p.packer.messages.PackWorkspaceSummaryRequest; -import p.packer.messages.PackWorkspaceSummaryResult; -import p.packer.messages.PackerOperationStatus; -import p.packer.messages.ValidatePackWorkspaceRequest; -import p.packer.messages.ValidatePackWorkspaceResult; -import p.studio.Container; -import p.studio.projects.ProjectReference; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.assets.details.AssetDetailsUiSupport; -import p.studio.workspaces.assets.details.bank.AssetBankCapacityService; -import p.studio.workspaces.assets.details.bank.AssetDetailsBankCompositionCapacityState; +import p.studio.api.assets.AssetEmittedArtifact; +import p.studio.api.assets.AssetOperationStatus; +import p.studio.api.assets.AssetPackExecution; +import p.studio.api.assets.AssetPackSummary; +import p.studio.api.assets.AssetPackSummaryItem; +import p.studio.api.assets.AssetPackValidation; +import p.studio.api.assets.AssetPackValidationItem; +import p.studio.api.assets.AssetPacking; +import p.studio.api.assets.AssetSyncResult; +import p.studio.api.project.ProjectReference; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.workspaces.assets.details.AssetDetailsUiSupport; import java.util.List; import java.util.Objects; @@ -58,7 +55,7 @@ public final class PackWorkspaceWizard { private final Button packButton = new Button(); private final Button closeButton = new Button(); private final Button copyFailuresButton = new Button(); - private final AssetBankCapacityService bankCapacityService = new AssetBankCapacityService(); + private final AssetCapacityPolicy bankCapacityService; private Phase phase = Phase.DEEP_SYNC_INTRO; private boolean deepSyncRunning; @@ -66,19 +63,28 @@ public final class PackWorkspaceWizard { private boolean loadingSummary; private boolean loadingValidation; private boolean packing; + private final p.studio.ui.javafx.utilities.i18n.I18nService i18n; + private final p.studio.ui.javafx.utilities.ThemeService theme; + private final AssetPacking assetPacking; - private PackWorkspaceSummaryResult summaryResult; - private ValidatePackWorkspaceResult validationResult; - private PackWorkspaceResult packResult; + private AssetPackSummary summaryResult; + private AssetPackValidation validationResult; + private AssetPackExecution packResult; - private PackWorkspaceWizard(Window owner, ProjectReference projectReference) { + private PackWorkspaceWizard(Window owner, ProjectReference projectReference, + p.studio.ui.javafx.utilities.i18n.I18nService i18n, p.studio.ui.javafx.utilities.ThemeService theme, + AssetPacking assetPacking, AssetCapacityPolicy capacityPolicy) { this.projectReference = Objects.requireNonNull(projectReference, "projectReference"); + this.i18n = Objects.requireNonNull(i18n, "i18n"); + this.theme = Objects.requireNonNull(theme, "theme"); + this.assetPacking = Objects.requireNonNull(assetPacking, "assetPacking"); + this.bankCapacityService = Objects.requireNonNull(capacityPolicy, "capacityPolicy"); this.stage = new Stage(); stage.initOwner(owner); stage.initModality(Modality.WINDOW_MODAL); - stage.setTitle(Container.i18n().text(I18n.ASSETS_PACK_WIZARD_TITLE)); + stage.setTitle(i18n.text(I18n.ASSETS_PACK_WIZARD_TITLE)); stage.setScene(new Scene(buildRoot(), 760, 560)); - stage.getScene().getStylesheets().add(Container.theme().getDefaultTheme()); + stage.getScene().getStylesheets().add(theme.getDefaultTheme()); stage.setOnCloseRequest(event -> { if (packing || deepSyncRunning) { event.consume(); @@ -87,8 +93,10 @@ public final class PackWorkspaceWizard { render(); } - public static void showAndWait(Window owner, ProjectReference projectReference) { - new PackWorkspaceWizard(owner, projectReference).stage.showAndWait(); + public static void showAndWait(Window owner, ProjectReference projectReference, + p.studio.ui.javafx.utilities.i18n.I18nService i18n, p.studio.ui.javafx.utilities.ThemeService theme, + AssetPacking assetPacking, AssetCapacityPolicy capacityPolicy) { + new PackWorkspaceWizard(owner, projectReference, i18n, theme, assetPacking, capacityPolicy).stage.showAndWait(); } private VBox buildRoot() { @@ -97,23 +105,23 @@ public final class PackWorkspaceWizard { feedbackLabel.getStyleClass().add("studio-launcher-feedback"); feedbackLabel.setWrapText(true); - backButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_BACK)); + backButton.textProperty().bind(i18n.bind(I18n.WIZARD_BACK)); backButton.getStyleClass().addAll("studio-button", "studio-button-secondary"); backButton.setOnAction(ignored -> goBack()); - nextButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_NEXT)); + nextButton.textProperty().bind(i18n.bind(I18n.WIZARD_NEXT)); nextButton.getStyleClass().addAll("studio-button", "studio-button-primary"); nextButton.setOnAction(ignored -> advancePrimaryFlow()); - packButton.textProperty().bind(Container.i18n().bind(I18n.ASSETS_PACK_WIZARD_BUTTON_PACK)); + packButton.textProperty().bind(i18n.bind(I18n.ASSETS_PACK_WIZARD_BUTTON_PACK)); packButton.getStyleClass().addAll("studio-button", "studio-button-primary"); packButton.setOnAction(ignored -> startPack()); - copyFailuresButton.textProperty().bind(Container.i18n().bind(I18n.ASSETS_PACK_WIZARD_BUTTON_COPY_FAILURES)); + copyFailuresButton.textProperty().bind(i18n.bind(I18n.ASSETS_PACK_WIZARD_BUTTON_COPY_FAILURES)); copyFailuresButton.getStyleClass().addAll("studio-button", "studio-button-secondary"); copyFailuresButton.setDisable(true); - closeButton.textProperty().bind(Container.i18n().bind(I18n.ASSETS_PACK_WIZARD_BUTTON_CLOSE)); + closeButton.textProperty().bind(i18n.bind(I18n.ASSETS_PACK_WIZARD_BUTTON_CLOSE)); closeButton.getStyleClass().addAll("studio-button", "studio-button-cancel"); closeButton.setOnAction(ignored -> { if (!packing) { @@ -165,57 +173,57 @@ public final class PackWorkspaceWizard { private void renderDeepSyncIntroPhase() { stepTitle.textProperty().unbind(); stepDescription.textProperty().unbind(); - stepTitle.textProperty().bind(Container.i18n().bind(I18n.ASSETS_PACK_WIZARD_STEP_DEEP_SYNC_TITLE)); - stepDescription.textProperty().bind(Container.i18n().bind(I18n.ASSETS_PACK_WIZARD_STEP_DEEP_SYNC_DESCRIPTION)); + stepTitle.textProperty().bind(i18n.bind(I18n.ASSETS_PACK_WIZARD_STEP_DEEP_SYNC_TITLE)); + stepDescription.textProperty().bind(i18n.bind(I18n.ASSETS_PACK_WIZARD_STEP_DEEP_SYNC_DESCRIPTION)); stepBody.getChildren().setAll( - AssetDetailsUiSupport.createSectionMessage(Container.i18n().text(I18n.ASSETS_PACK_WIZARD_DEEP_SYNC_NOTE))); + AssetDetailsUiSupport.createSectionMessage(i18n.text(I18n.ASSETS_PACK_WIZARD_DEEP_SYNC_NOTE))); } private void renderDeepSyncWaitingPhase() { stepTitle.textProperty().unbind(); stepDescription.textProperty().unbind(); - stepTitle.textProperty().bind(Container.i18n().bind(I18n.ASSETS_PACK_WIZARD_STEP_DEEP_SYNC_WAITING_TITLE)); - stepDescription.textProperty().bind(Container.i18n().bind(I18n.ASSETS_PACK_WIZARD_STEP_DEEP_SYNC_WAITING_DESCRIPTION)); + stepTitle.textProperty().bind(i18n.bind(I18n.ASSETS_PACK_WIZARD_STEP_DEEP_SYNC_WAITING_TITLE)); + stepDescription.textProperty().bind(i18n.bind(I18n.ASSETS_PACK_WIZARD_STEP_DEEP_SYNC_WAITING_DESCRIPTION)); if (deepSyncRunning) { stepBody.getChildren().setAll(createBusyBox(I18n.ASSETS_PACK_WIZARD_LOADING_DEEP_SYNC)); return; } final String message = deepSyncCompleted - ? Container.i18n().text(I18n.ASSETS_PACK_WIZARD_DEEP_SYNC_COMPLETED) - : Container.i18n().text(I18n.ASSETS_PACK_WIZARD_ERROR_DEEP_SYNC); + ? i18n.text(I18n.ASSETS_PACK_WIZARD_DEEP_SYNC_COMPLETED) + : i18n.text(I18n.ASSETS_PACK_WIZARD_ERROR_DEEP_SYNC); stepBody.getChildren().setAll(AssetDetailsUiSupport.createSectionMessage(message)); } private void renderSummaryPhase() { stepTitle.textProperty().unbind(); stepDescription.textProperty().unbind(); - stepTitle.textProperty().bind(Container.i18n().bind(I18n.ASSETS_PACK_WIZARD_STEP_SUMMARY_TITLE)); - stepDescription.textProperty().bind(Container.i18n().bind(I18n.ASSETS_PACK_WIZARD_STEP_SUMMARY_DESCRIPTION)); + stepTitle.textProperty().bind(i18n.bind(I18n.ASSETS_PACK_WIZARD_STEP_SUMMARY_TITLE)); + stepDescription.textProperty().bind(i18n.bind(I18n.ASSETS_PACK_WIZARD_STEP_SUMMARY_DESCRIPTION)); if (loadingSummary) { stepBody.getChildren().setAll(createBusyBox(I18n.ASSETS_PACK_WIZARD_LOADING_SUMMARY)); return; } if (summaryResult == null) { stepBody.getChildren().setAll(AssetDetailsUiSupport.createSectionMessage( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_ERROR_SUMMARY))); + i18n.text(I18n.ASSETS_PACK_WIZARD_ERROR_SUMMARY))); return; } stepBody.getChildren().setAll( AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_INCLUDED_ASSETS), - Integer.toString(summaryResult.packSummary().totalIncludedAssetCount())), + i18n.text(I18n.ASSETS_PACK_WIZARD_LABEL_INCLUDED_ASSETS), + Integer.toString(summaryResult.totalIncludedAssetCount())), createSummaryAssetsSection(), AssetDetailsUiSupport.createSectionMessage(summaryResult.summary())); } private Node createSummaryAssetsSection() { - if (summaryResult.packSummary().assets().isEmpty()) { + if (summaryResult.assets().isEmpty()) { return AssetDetailsUiSupport.createSectionMessage( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_VALIDATION_EMPTY)); + i18n.text(I18n.ASSETS_PACK_WIZARD_VALIDATION_EMPTY)); } final VBox assets = new VBox(10); - for (PackerPackSummaryAssetDTO asset : summaryResult.packSummary().assets()) { + for (AssetPackSummaryItem asset : summaryResult.assets()) { assets.getChildren().add(createSummaryRow(asset)); } final ScrollPane scrollPane = new ScrollPane(assets); @@ -225,7 +233,7 @@ public final class PackWorkspaceWizard { return scrollPane; } - private Node createSummaryRow(PackerPackSummaryAssetDTO asset) { + private Node createSummaryRow(AssetPackSummaryItem asset) { final Label assetName = new Label(truncate(asset.assetName(), 50)); assetName.getStyleClass().add("assets-details-value"); assetName.setTextOverrun(OverrunStyle.ELLIPSIS); @@ -236,8 +244,8 @@ public final class PackWorkspaceWizard { "#" + asset.assetId()); final Label familyChip = AssetDetailsUiSupport.createChip( AssetDetailsUiSupport.typeChipTone(asset.assetFamily()), - AssetDetailsUiSupport.typeLabel(asset.assetFamily())); - final AssetDetailsBankCompositionCapacityState capacityState = summaryCapacityState(asset); + AssetDetailsUiSupport.typeLabel(i18n, asset.assetFamily())); + final AssetCapacityState capacityState = summaryCapacityState(asset); final ProgressBar capacityBar = new ProgressBar(capacityState.progress()); capacityBar.setMaxWidth(Double.MAX_VALUE); applyCapacityTone(capacityBar, capacityState); @@ -269,7 +277,7 @@ public final class PackWorkspaceWizard { return row; } - private AssetDetailsBankCompositionCapacityState summaryCapacityState(PackerPackSummaryAssetDTO asset) { + private AssetCapacityState summaryCapacityState(AssetPackSummaryItem asset) { return bankCapacityService.evaluate( asset.assetFamily(), asset.artifactCount(), @@ -278,11 +286,11 @@ public final class PackWorkspaceWizard { 0L); } - private void applyCapacityTone(ProgressBar capacityBar, AssetDetailsBankCompositionCapacityState state) { - capacityBar.setStyle(switch (state.severity()) { - case GREEN -> "-fx-accent: #2f9e44;"; - case ORANGE -> "-fx-accent: #f08c00;"; - case RED -> "-fx-accent: #e03131;"; + private void applyCapacityTone(ProgressBar capacityBar, AssetCapacityState state) { + capacityBar.setStyle(switch (state.level()) { + case SAFE -> "-fx-accent: #2f9e44;"; + case WARNING -> "-fx-accent: #f08c00;"; + case EXHAUSTED -> "-fx-accent: #e03131;"; }); } @@ -299,36 +307,36 @@ public final class PackWorkspaceWizard { private void renderValidationPhase() { stepTitle.textProperty().unbind(); stepDescription.textProperty().unbind(); - stepTitle.textProperty().bind(Container.i18n().bind(I18n.ASSETS_PACK_WIZARD_STEP_VALIDATION_TITLE)); - stepDescription.textProperty().bind(Container.i18n().bind(I18n.ASSETS_PACK_WIZARD_STEP_VALIDATION_DESCRIPTION)); + stepTitle.textProperty().bind(i18n.bind(I18n.ASSETS_PACK_WIZARD_STEP_VALIDATION_TITLE)); + stepDescription.textProperty().bind(i18n.bind(I18n.ASSETS_PACK_WIZARD_STEP_VALIDATION_DESCRIPTION)); if (loadingValidation) { stepBody.getChildren().setAll(createBusyBox(I18n.ASSETS_PACK_WIZARD_LOADING_VALIDATION)); return; } if (validationResult == null) { stepBody.getChildren().setAll(AssetDetailsUiSupport.createSectionMessage( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_ERROR_VALIDATION))); + i18n.text(I18n.ASSETS_PACK_WIZARD_ERROR_VALIDATION))); return; } final VBox content = new VBox(12); content.getChildren().addAll( AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_BLOCKED_ASSETS), + i18n.text(I18n.ASSETS_PACK_WIZARD_LABEL_BLOCKED_ASSETS), Integer.toString(validationResult.assets().size())), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_STATUS), + i18n.text(I18n.ASSETS_PACK_WIZARD_LABEL_STATUS), validationResult.canPack() - ? Container.i18n().text(I18n.ASSETS_PACK_WIZARD_STATUS_READY) - : Container.i18n().text(I18n.ASSETS_PACK_WIZARD_STATUS_BLOCKED)), + ? i18n.text(I18n.ASSETS_PACK_WIZARD_STATUS_READY) + : i18n.text(I18n.ASSETS_PACK_WIZARD_STATUS_BLOCKED)), AssetDetailsUiSupport.createSectionMessage(validationResult.summary())); if (validationResult.assets().isEmpty()) { content.getChildren().add(AssetDetailsUiSupport.createSectionMessage( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_VALIDATION_EMPTY))); + i18n.text(I18n.ASSETS_PACK_WIZARD_VALIDATION_EMPTY))); } else { final Accordion accordion = new Accordion(); - for (PackerPackValidationAssetDTO asset : validationResult.assets()) { + for (AssetPackValidationItem asset : validationResult.assets()) { accordion.getPanes().add(createValidationPane(asset)); } VBox.setVgrow(accordion, Priority.ALWAYS); @@ -337,33 +345,33 @@ public final class PackWorkspaceWizard { stepBody.getChildren().setAll(content); } - private TitledPane createValidationPane(PackerPackValidationAssetDTO asset) { + private TitledPane createValidationPane(AssetPackValidationItem asset) { final VBox content = new VBox(8); content.getChildren().addAll( AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_LABEL_NAME), + i18n.text(I18n.ASSETS_LABEL_NAME), asset.assetName()), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_LABEL_LOCATION), + i18n.text(I18n.ASSETS_LABEL_LOCATION), asset.assetPath().toString()), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_LAST_MODIFIED), + i18n.text(I18n.ASSETS_PACK_WIZARD_LABEL_LAST_MODIFIED), Long.toString(asset.lastModified())), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_STATUS), + i18n.text(I18n.ASSETS_PACK_WIZARD_LABEL_STATUS), asset.blocked() - ? Container.i18n().text(I18n.ASSETS_PACK_WIZARD_STATUS_BLOCKED) - : Container.i18n().text(I18n.ASSETS_PACK_WIZARD_STATUS_READY))); + ? i18n.text(I18n.ASSETS_PACK_WIZARD_STATUS_BLOCKED) + : i18n.text(I18n.ASSETS_PACK_WIZARD_STATUS_READY))); - final List blockingDiagnostics = asset.diagnostics().stream() - .filter(p.packer.dtos.PackerDiagnosticDTO::blocking) + final var blockingDiagnostics = asset.diagnostics().stream() + .filter(p.studio.api.assets.AssetPackDiagnostic::blocking) .toList(); if (blockingDiagnostics.isEmpty()) { content.getChildren().add(AssetDetailsUiSupport.createSectionMessage( - Container.i18n().text(I18n.ASSETS_DIAGNOSTICS_EMPTY))); + i18n.text(I18n.ASSETS_DIAGNOSTICS_EMPTY))); } else { blockingDiagnostics.forEach(diagnostic -> content.getChildren().add(AssetDetailsUiSupport.createSectionMessage( - diagnostic.severity().name() + ": " + diagnostic.message()))); + diagnostic.severity() + ": " + diagnostic.message()))); } final String title = asset.assetName() + (asset.blocked() ? " (blocked)" : " (ready)"); @@ -375,48 +383,48 @@ public final class PackWorkspaceWizard { private void renderPackingPhase() { stepTitle.textProperty().unbind(); stepDescription.textProperty().unbind(); - stepTitle.textProperty().bind(Container.i18n().bind(I18n.ASSETS_PACK_WIZARD_STEP_PACKING_TITLE)); - stepDescription.textProperty().bind(Container.i18n().bind(I18n.ASSETS_PACK_WIZARD_STEP_PACKING_DESCRIPTION)); + stepTitle.textProperty().bind(i18n.bind(I18n.ASSETS_PACK_WIZARD_STEP_PACKING_TITLE)); + stepDescription.textProperty().bind(i18n.bind(I18n.ASSETS_PACK_WIZARD_STEP_PACKING_DESCRIPTION)); stepBody.getChildren().setAll(createBusyBox(I18n.ASSETS_PACK_WIZARD_LOADING_PACKING)); } private void renderResultPhase() { stepTitle.textProperty().unbind(); stepDescription.textProperty().unbind(); - stepTitle.textProperty().bind(Container.i18n().bind(I18n.ASSETS_PACK_WIZARD_STEP_RESULT_TITLE)); - stepDescription.textProperty().bind(Container.i18n().bind(I18n.ASSETS_PACK_WIZARD_STEP_RESULT_DESCRIPTION)); + stepTitle.textProperty().bind(i18n.bind(I18n.ASSETS_PACK_WIZARD_STEP_RESULT_TITLE)); + stepDescription.textProperty().bind(i18n.bind(I18n.ASSETS_PACK_WIZARD_STEP_RESULT_DESCRIPTION)); if (packResult == null) { stepBody.getChildren().setAll(AssetDetailsUiSupport.createSectionMessage( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_ERROR_PACK))); + i18n.text(I18n.ASSETS_PACK_WIZARD_ERROR_PACK))); return; } final VBox content = new VBox(12); content.getChildren().addAll( AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_STATUS), + i18n.text(I18n.ASSETS_PACK_WIZARD_LABEL_STATUS), switch (packResult.status()) { - case SUCCESS, PARTIAL -> Container.i18n().text(I18n.ASSETS_PACK_WIZARD_STATUS_FINISHED); + case SUCCESS, PARTIAL -> i18n.text(I18n.ASSETS_PACK_WIZARD_STATUS_FINISHED); case FAILED -> packResult.status().name(); }), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_CANONICAL_ARTIFACT), - packResult.result().canonicalArtifactName()), + i18n.text(I18n.ASSETS_PACK_WIZARD_LABEL_CANONICAL_ARTIFACT), + packResult.canonicalArtifactName()), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_PACKED_ASSETS), - Integer.toString(packResult.result().packedAssetCount())), + i18n.text(I18n.ASSETS_PACK_WIZARD_LABEL_PACKED_ASSETS), + Integer.toString(packResult.packedAssetCount())), AssetDetailsUiSupport.createKeyValueRow( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_ELAPSED), - formatElapsed(packResult.result().elapsedMillis())), + i18n.text(I18n.ASSETS_PACK_WIZARD_LABEL_ELAPSED), + formatElapsed(packResult.elapsedMillis())), AssetDetailsUiSupport.createSectionMessage(packResult.summary())); - if (packResult.result().emittedArtifacts().isEmpty()) { + if (packResult.emittedArtifacts().isEmpty()) { content.getChildren().add(AssetDetailsUiSupport.createSectionMessage( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_RESULT_NO_ARTIFACTS))); + i18n.text(I18n.ASSETS_PACK_WIZARD_RESULT_NO_ARTIFACTS))); } else { final VBox artifacts = new VBox(8); - artifacts.getChildren().add(new Label(Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_EMITTED_ARTIFACTS))); - for (PackerEmittedArtifactDTO artifact : packResult.result().emittedArtifacts()) { + artifacts.getChildren().add(new Label(i18n.text(I18n.ASSETS_PACK_WIZARD_LABEL_EMITTED_ARTIFACTS))); + for (AssetEmittedArtifact artifact : packResult.emittedArtifacts()) { artifacts.getChildren().add(AssetDetailsUiSupport.createKeyValueRow( artifact.label(), artifact.path().toString())); @@ -424,7 +432,7 @@ public final class PackWorkspaceWizard { content.getChildren().add(artifacts); } content.getChildren().add(AssetDetailsUiSupport.createSectionMessage( - Container.i18n().text(I18n.ASSETS_PACK_WIZARD_RESULT_COPY_FAILURES_HINT))); + i18n.text(I18n.ASSETS_PACK_WIZARD_RESULT_COPY_FAILURES_HINT))); stepBody.getChildren().setAll(content); } @@ -432,7 +440,7 @@ public final class PackWorkspaceWizard { final ProgressIndicator indicator = new ProgressIndicator(); indicator.setProgress(ProgressIndicator.INDETERMINATE_PROGRESS); final VBox box = new VBox(16, indicator, AssetDetailsUiSupport.createSectionMessage( - Container.i18n().text(messageKey))); + i18n.text(messageKey))); box.setAlignment(Pos.CENTER_LEFT); return box; } @@ -479,25 +487,23 @@ public final class PackWorkspaceWizard { packResult = null; feedbackLabel.setText(""); render(); - Container.backgroundTasks().submit(() -> { - try { - final ListAssetsResult result = Container.packer().workspaceService().listAssets( - new ListAssetsRequest(projectReference.toPackerProjectContext(), true)); - Platform.runLater(() -> applyDeepSyncResult(result)); - } catch (RuntimeException exception) { - Platform.runLater(() -> applyDeepSyncFailure(exception)); + assetPacking.deepSync(projectReference).completion().whenComplete((result, failure) -> Platform.runLater(() -> { + if (failure == null) { + applyDeepSyncResult(result); + } else { + applyDeepSyncFailure(failure); } - }); + })); } - private void applyDeepSyncResult(ListAssetsResult result) { + private void applyDeepSyncResult(AssetSyncResult result) { deepSyncRunning = false; - deepSyncCompleted = result.status() != PackerOperationStatus.FAILED; + deepSyncCompleted = result.status() != AssetOperationStatus.FAILED; feedbackLabel.setText(deepSyncCompleted ? "" : result.summary()); render(); } - private void applyDeepSyncFailure(RuntimeException exception) { + private void applyDeepSyncFailure(Throwable exception) { deepSyncRunning = false; deepSyncCompleted = false; feedbackLabel.setText(extractMessage(exception, I18n.ASSETS_PACK_WIZARD_ERROR_DEEP_SYNC)); @@ -509,25 +515,23 @@ public final class PackWorkspaceWizard { feedbackLabel.setText(""); summaryResult = null; render(); - Container.backgroundTasks().submit(() -> { - try { - final PackWorkspaceSummaryResult result = Container.packer().workspaceService().getPackWorkspaceSummary( - new PackWorkspaceSummaryRequest(projectReference.toPackerProjectContext())); - Platform.runLater(() -> applySummaryResult(result)); - } catch (RuntimeException exception) { - Platform.runLater(() -> applySummaryFailure(exception)); + assetPacking.summarize(projectReference).completion().whenComplete((result, failure) -> Platform.runLater(() -> { + if (failure == null) { + applySummaryResult(result); + } else { + applySummaryFailure(failure); } - }); + })); } - private void applySummaryResult(PackWorkspaceSummaryResult result) { + private void applySummaryResult(AssetPackSummary result) { loadingSummary = false; summaryResult = result; - feedbackLabel.setText(result.status() == PackerOperationStatus.FAILED ? result.summary() : ""); + feedbackLabel.setText(result.status() == AssetOperationStatus.FAILED ? result.summary() : ""); render(); } - private void applySummaryFailure(RuntimeException exception) { + private void applySummaryFailure(Throwable exception) { loadingSummary = false; feedbackLabel.setText(extractMessage(exception, I18n.ASSETS_PACK_WIZARD_ERROR_SUMMARY)); render(); @@ -542,18 +546,16 @@ public final class PackWorkspaceWizard { validationResult = null; feedbackLabel.setText(""); render(); - Container.backgroundTasks().submit(() -> { - try { - final ValidatePackWorkspaceResult result = Container.packer().workspaceService().validatePackWorkspace( - new ValidatePackWorkspaceRequest(projectReference.toPackerProjectContext())); - Platform.runLater(() -> applyValidationResult(result)); - } catch (RuntimeException exception) { - Platform.runLater(() -> applyValidationFailure(exception)); + assetPacking.validate(projectReference).completion().whenComplete((result, failure) -> Platform.runLater(() -> { + if (failure == null) { + applyValidationResult(result); + } else { + applyValidationFailure(failure); } - }); + })); } - private void applyValidationResult(ValidatePackWorkspaceResult result) { + private void applyValidationResult(AssetPackValidation result) { loadingValidation = false; validationResult = result; if (!result.canPack()) { @@ -564,7 +566,7 @@ public final class PackWorkspaceWizard { render(); } - private void applyValidationFailure(RuntimeException exception) { + private void applyValidationFailure(Throwable exception) { loadingValidation = false; feedbackLabel.setText(extractMessage(exception, I18n.ASSETS_PACK_WIZARD_ERROR_VALIDATION)); render(); @@ -579,36 +581,35 @@ public final class PackWorkspaceWizard { packResult = null; feedbackLabel.setText(""); render(); - Container.backgroundTasks().submit(() -> { - try { - final PackWorkspaceResult result = Container.packer().workspaceService().packWorkspace( - new PackWorkspaceRequest(projectReference.toPackerProjectContext())); - Platform.runLater(() -> applyPackResult(result)); - } catch (RuntimeException exception) { - Platform.runLater(() -> applyPackFailure(exception)); + assetPacking.pack(projectReference).completion().whenComplete((result, failure) -> Platform.runLater(() -> { + if (failure == null) { + applyPackResult(result); + } else { + applyPackFailure(failure); } - }); + })); } - private void applyPackResult(PackWorkspaceResult result) { + private void applyPackResult(AssetPackExecution result) { packing = false; packResult = result; phase = Phase.RESULT; - feedbackLabel.setText(result.status() == PackerOperationStatus.FAILED ? result.summary() : ""); + feedbackLabel.setText(result.status() == AssetOperationStatus.FAILED ? result.summary() : ""); render(); } - private void applyPackFailure(RuntimeException exception) { + private void applyPackFailure(Throwable exception) { packing = false; phase = Phase.RESULT; feedbackLabel.setText(extractMessage(exception, I18n.ASSETS_PACK_WIZARD_ERROR_PACK)); render(); } - private String extractMessage(RuntimeException exception, I18n fallbackKey) { - final String message = exception.getMessage(); + private String extractMessage(Throwable exception, I18n fallbackKey) { + final Throwable cause = exception.getCause() == null ? exception : exception.getCause(); + final String message = cause.getMessage(); if (message == null || message.isBlank()) { - return Container.i18n().text(fallbackKey); + return i18n.text(fallbackKey); } return message; } diff --git a/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/builder/ShipperWorkspace.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/builder/ShipperWorkspace.java new file mode 100644 index 00000000..ca1a0c45 --- /dev/null +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/builder/ShipperWorkspace.java @@ -0,0 +1,127 @@ +package p.studio.ui.javafx.workspaces.builder; + +import javafx.application.Platform; +import javafx.geometry.Orientation; +import javafx.scene.Node; +import javafx.scene.control.*; +import javafx.scene.layout.BorderPane; +import javafx.scene.layout.StackPane; +import p.studio.api.project.ProjectReference; +import p.studio.api.shipper.Shipper; +import p.studio.api.shipper.ShipperPrepareResult; +import p.studio.api.operation.OperationHandle; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.ui.javafx.events.StudioEventBus; +import p.studio.ui.javafx.workspaces.Workspace; +import p.studio.ui.javafx.workspaces.WorkspaceId; + +public class ShipperWorkspace extends Workspace { + private final BorderPane root = new BorderPane(); + private final TextArea logs = new TextArea(); + private final Button buildButton = new Button(); + private final Button clearButton = new Button(); + private final Shipper shipperService; + private final I18nService i18n; + private OperationHandle buildOperation; + + public ShipperWorkspace(ProjectReference projectReference, Shipper shipperService, I18nService i18n, + StudioEventBus eventBus) { + super(projectReference, eventBus); + this.shipperService = java.util.Objects.requireNonNull(shipperService, "shipperService"); + this.i18n = java.util.Objects.requireNonNull(i18n, "i18n"); + final var toolbar = buildToolBar(); + root.setTop(toolbar); + + final var projectArea = buildProjectArea(); + final var logsPane = buildLogsPane(); + + final var split = new SplitPane(projectArea, logsPane); + split.setOrientation(Orientation.VERTICAL); + split.setDividerPositions(0.5); + + root.setCenter(split); + } + + @Override + public WorkspaceId workspaceId() { + return WorkspaceId.SHIPPER; + } + + @Override + public I18n title() { + return I18n.WORKSPACE_SHIPPER; + } + + @Override + public Node rootNode() { + return root; + } + + @Override + public void load() { + + } + + @Override + public void unLoad() { + if (buildOperation != null) { + buildOperation.cancel(); + buildOperation = null; + } + buildButton.setDisable(false); + } + + private ToolBar buildToolBar() { + buildButton.textProperty().bind(i18n.bind(I18n.WORKSPACE_SHIPPER_BUTTON_RUN)); + buildButton.getStyleClass().addAll("studio-button", "studio-button-primary"); + buildButton.setOnAction(e -> { + logs.clear(); + buildButton.setDisable(true); + final OperationHandle operation = shipperService.prepare( + projectReference, + entry -> Platform.runLater(() -> logs.appendText( + "[%s] %s%s".formatted(entry.source().name(), entry.message(), System.lineSeparator())))); + buildOperation = operation; + operation.completion() + .whenComplete((result, failure) -> Platform.runLater(() -> { + if (buildOperation != operation) { + return; + } + buildOperation = null; + buildButton.setDisable(false); + if (failure != null) { + final Throwable cause = failure.getCause() == null ? failure : failure.getCause(); + logs.appendText("[BUILD] %s%s".formatted( + java.util.Objects.requireNonNullElse(cause.getMessage(), cause.getClass().getSimpleName()), + System.lineSeparator())); + } + })); + }); + + clearButton.textProperty().bind(i18n.bind(I18n.WORKSPACE_SHIPPER_BUTTON_CLEAR)); + clearButton.getStyleClass().addAll("studio-button", "studio-button-secondary"); + clearButton.setOnAction(e -> logs.clear()); + + return new ToolBar(buildButton, clearButton); + } + + private StackPane buildProjectArea() { + final var tmpLabel = new Label("Project: " + projectReference.name()); + return new StackPane(tmpLabel); + } + + private TitledPane buildLogsPane() { + logs.setEditable(false); + logs.setWrapText(true); + logs.setMinHeight(350); + + final var pane = new TitledPane(); + pane.setContent(logs); + pane.textProperty().bind(i18n.bind(I18n.WORKSPACE_SHIPPER_LOGS)); + pane.setCollapsible(true); + pane.setExpanded(true); + + return pane; + } +} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/debug/DebugWorkspace.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/debug/DebugWorkspace.java similarity index 69% rename from prometeu-studio/src/main/java/p/studio/workspaces/debug/DebugWorkspace.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/debug/DebugWorkspace.java index 56b30dcd..2a3ed3f6 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/debug/DebugWorkspace.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/debug/DebugWorkspace.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.debug; +package p.studio.ui.javafx.workspaces.debug; import javafx.application.Platform; import javafx.geometry.Insets; @@ -8,28 +8,33 @@ import javafx.scene.control.TextArea; import javafx.scene.control.TitledPane; import javafx.scene.layout.BorderPane; import javafx.scene.layout.HBox; -import p.studio.Container; -import p.studio.execution.StudioExecutionSessionService; -import p.studio.execution.StudioExecutionSnapshot; -import p.studio.execution.StudioExecutionState; -import p.studio.projects.ProjectReference; -import p.studio.utilities.events.EventSubscription; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.Workspace; -import p.studio.workspaces.WorkspaceId; +import p.studio.api.execution.ExecutionSession; +import p.studio.api.execution.ExecutionSnapshot; +import p.studio.api.execution.ExecutionState; +import p.studio.api.project.ProjectReference; +import p.studio.api.operation.OperationSubscription; +import p.studio.ui.javafx.utilities.i18n.I18n; +import p.studio.ui.javafx.utilities.i18n.I18nService; +import p.studio.ui.javafx.events.StudioEventBus; +import p.studio.ui.javafx.workspaces.Workspace; +import p.studio.ui.javafx.workspaces.WorkspaceId; public final class DebugWorkspace extends Workspace { private final BorderPane root = new BorderPane(); - private final StudioExecutionSessionService executionSessionService; + private final ExecutionSession executionSessionService; + private final I18nService i18n; private final Label statusValue = new Label(); private final TextArea logs = new TextArea(); - private EventSubscription sessionSubscription; + private OperationSubscription sessionSubscription; public DebugWorkspace( final ProjectReference projectReference, - final StudioExecutionSessionService executionSessionService) { - super(projectReference); + final ExecutionSession executionSessionService, + final I18nService i18n, + final StudioEventBus eventBus) { + super(projectReference, eventBus); this.executionSessionService = executionSessionService; + this.i18n = i18n; root.getStyleClass().add("debug-workspace"); root.setPadding(new Insets(16)); root.setTop(buildStatusPane()); @@ -70,7 +75,7 @@ public final class DebugWorkspace extends Workspace { private Node buildStatusPane() { final Label title = new Label(); - title.textProperty().bind(Container.i18n().bind(I18n.WORKSPACE_DEBUG_STATE)); + title.textProperty().bind(i18n.bind(I18n.WORKSPACE_DEBUG_STATE)); title.getStyleClass().add("studio-section-title"); statusValue.getStyleClass().add("studio-debug-status-value"); return new HBox(12, title, statusValue); @@ -81,14 +86,14 @@ public final class DebugWorkspace extends Workspace { logs.setWrapText(true); logs.setMinHeight(360); final TitledPane pane = new TitledPane(); - pane.textProperty().bind(Container.i18n().bind(I18n.WORKSPACE_DEBUG_LOGS)); + pane.textProperty().bind(i18n.bind(I18n.WORKSPACE_DEBUG_LOGS)); pane.setContent(logs); pane.setCollapsible(false); pane.setExpanded(true); return pane; } - private void renderSnapshot(final StudioExecutionSnapshot snapshot) { + private void renderSnapshot(final ExecutionSnapshot snapshot) { if (Platform.isFxApplicationThread()) { applySnapshot(snapshot); return; @@ -96,13 +101,13 @@ public final class DebugWorkspace extends Workspace { Platform.runLater(() -> applySnapshot(snapshot)); } - private void applySnapshot(final StudioExecutionSnapshot snapshot) { + private void applySnapshot(final ExecutionSnapshot snapshot) { final DebugWorkspaceProjection projection = DebugWorkspaceProjection.from(snapshot); - statusValue.setText(Container.i18n().text(statusText(projection.state()))); + statusValue.setText(i18n.text(statusText(projection.state()))); logs.setText(String.join(System.lineSeparator(), projection.renderedLogs())); } - private I18n statusText(final StudioExecutionState state) { + private I18n statusText(final ExecutionState state) { return switch (state) { case IDLE -> I18n.WORKSPACE_DEBUG_STATUS_IDLE; case PREPARING -> I18n.WORKSPACE_DEBUG_STATUS_PREPARING; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/debug/DebugWorkspaceProjection.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/debug/DebugWorkspaceProjection.java similarity index 57% rename from prometeu-studio/src/main/java/p/studio/workspaces/debug/DebugWorkspaceProjection.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/debug/DebugWorkspaceProjection.java index 3f81198e..b40a7abc 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/debug/DebugWorkspaceProjection.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/debug/DebugWorkspaceProjection.java @@ -1,14 +1,14 @@ -package p.studio.workspaces.debug; +package p.studio.ui.javafx.workspaces.debug; -import p.studio.execution.StudioExecutionLogEntry; -import p.studio.execution.StudioExecutionSnapshot; -import p.studio.execution.StudioExecutionState; +import p.studio.api.execution.ExecutionLogEntry; +import p.studio.api.execution.ExecutionSnapshot; +import p.studio.api.execution.ExecutionState; import java.util.List; import java.util.Objects; public record DebugWorkspaceProjection( - StudioExecutionState state, + ExecutionState state, List renderedLogs) { public DebugWorkspaceProjection { @@ -16,14 +16,14 @@ public record DebugWorkspaceProjection( renderedLogs = List.copyOf(Objects.requireNonNull(renderedLogs, "renderedLogs")); } - public static DebugWorkspaceProjection from(final StudioExecutionSnapshot snapshot) { - final StudioExecutionSnapshot safeSnapshot = Objects.requireNonNull(snapshot, "snapshot"); + public static DebugWorkspaceProjection from(final ExecutionSnapshot snapshot) { + final ExecutionSnapshot safeSnapshot = Objects.requireNonNull(snapshot, "snapshot"); return new DebugWorkspaceProjection( safeSnapshot.state(), safeSnapshot.logs().stream().map(DebugWorkspaceProjection::renderLog).toList()); } - private static String renderLog(final StudioExecutionLogEntry entry) { + private static String renderLog(final ExecutionLogEntry entry) { return "[%s][%s] %s".formatted( entry.source().name(), entry.severity().name(), diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/framework/StudioEventAware.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/framework/StudioEventAware.java similarity index 75% rename from prometeu-studio/src/main/java/p/studio/workspaces/framework/StudioEventAware.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/framework/StudioEventAware.java index ce6c0d64..7553d273 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/framework/StudioEventAware.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/framework/StudioEventAware.java @@ -1,6 +1,6 @@ -package p.studio.workspaces.framework; +package p.studio.ui.javafx.workspaces.framework; -import p.studio.controls.lifecycle.StudioControlLifecycle; +import p.studio.ui.javafx.controls.lifecycle.StudioControlLifecycle; public interface StudioEventAware extends StudioControlLifecycle { StudioEventBindings eventBindings(); diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/framework/StudioEventBindings.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/framework/StudioEventBindings.java similarity index 92% rename from prometeu-studio/src/main/java/p/studio/workspaces/framework/StudioEventBindings.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/framework/StudioEventBindings.java index 55b7c266..2061eeeb 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/framework/StudioEventBindings.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/framework/StudioEventBindings.java @@ -1,8 +1,8 @@ -package p.studio.workspaces.framework; +package p.studio.ui.javafx.workspaces.framework; -import p.studio.lsp.events.StudioEvent; -import p.studio.lsp.events.StudioEventBus; -import p.studio.lsp.events.StudioWorkspaceEventBus; +import p.studio.ui.javafx.events.StudioEvent; +import p.studio.ui.javafx.events.StudioEventBus; +import p.studio.ui.javafx.events.StudioWorkspaceEventBus; import java.util.Objects; import java.util.function.Consumer; diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/framework/StudioSubscriptionBag.java b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/framework/StudioSubscriptionBag.java similarity index 52% rename from prometeu-studio/src/main/java/p/studio/workspaces/framework/StudioSubscriptionBag.java rename to prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/framework/StudioSubscriptionBag.java index 863386a4..766c71f4 100644 --- a/prometeu-studio/src/main/java/p/studio/workspaces/framework/StudioSubscriptionBag.java +++ b/prometeu-studio-ui-javafx/src/main/java/p/studio/ui/javafx/workspaces/framework/StudioSubscriptionBag.java @@ -1,20 +1,20 @@ -package p.studio.workspaces.framework; +package p.studio.ui.javafx.workspaces.framework; -import p.studio.utilities.events.EventSubscription; +import p.studio.ui.javafx.events.StudioEventSubscription; import java.util.ArrayList; import java.util.List; import java.util.Objects; public final class StudioSubscriptionBag { - private final List subscriptions = new ArrayList<>(); + private final List subscriptions = new ArrayList<>(); - public void add(EventSubscription subscription) { + public void add(StudioEventSubscription subscription) { subscriptions.add(Objects.requireNonNull(subscription, "subscription")); } public void clear() { - subscriptions.forEach(EventSubscription::unsubscribe); + subscriptions.forEach(StudioEventSubscription::unsubscribe); subscriptions.clear(); } diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/AUTHORS.txt b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/AUTHORS.txt similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/AUTHORS.txt rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/AUTHORS.txt diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/OFL.txt b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/OFL.txt similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/OFL.txt rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/OFL.txt diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Bold.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Bold.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Bold.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Bold.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-BoldItalic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-BoldItalic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-BoldItalic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-BoldItalic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraBold.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraBold.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraBold.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraBold.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraBoldItalic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraBoldItalic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraBoldItalic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraBoldItalic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraLight.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraLight.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraLight.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraLight.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraLightItalic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraLightItalic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraLightItalic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ExtraLightItalic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Italic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Italic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Italic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Italic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Light.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Light.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Light.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Light.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-LightItalic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-LightItalic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-LightItalic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-LightItalic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Medium.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Medium.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Medium.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Medium.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-MediumItalic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-MediumItalic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-MediumItalic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-MediumItalic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Regular.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Regular.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Regular.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Regular.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-SemiBold.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-SemiBold.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-SemiBold.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-SemiBold.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-SemiBoldItalic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-SemiBoldItalic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-SemiBoldItalic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-SemiBoldItalic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Thin.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Thin.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Thin.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-Thin.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ThinItalic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ThinItalic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ThinItalic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMono-ThinItalic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Bold.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Bold.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Bold.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Bold.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-BoldItalic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-BoldItalic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-BoldItalic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-BoldItalic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraBold.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraBold.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraBold.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraBold.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraBoldItalic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraBoldItalic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraBoldItalic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraBoldItalic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraLight.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraLight.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraLight.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraLight.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraLightItalic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraLightItalic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraLightItalic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ExtraLightItalic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Italic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Italic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Italic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Italic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Light.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Light.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Light.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Light.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-LightItalic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-LightItalic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-LightItalic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-LightItalic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Medium.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Medium.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Medium.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Medium.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-MediumItalic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-MediumItalic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-MediumItalic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-MediumItalic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Regular.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Regular.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Regular.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Regular.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-SemiBold.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-SemiBold.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-SemiBold.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-SemiBold.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-SemiBoldItalic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-SemiBoldItalic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-SemiBoldItalic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-SemiBoldItalic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Thin.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Thin.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Thin.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-Thin.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ThinItalic.ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ThinItalic.ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ThinItalic.ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/ttf/JetBrainsMonoNL-ThinItalic.ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/variable/JetBrainsMono-Italic[wght].ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/variable/JetBrainsMono-Italic[wght].ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/variable/JetBrainsMono-Italic[wght].ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/variable/JetBrainsMono-Italic[wght].ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/variable/JetBrainsMono[wght].ttf b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/variable/JetBrainsMono[wght].ttf similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/variable/JetBrainsMono[wght].ttf rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/variable/JetBrainsMono[wght].ttf diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Bold.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Bold.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Bold.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Bold.woff2 diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-BoldItalic.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-BoldItalic.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-BoldItalic.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-BoldItalic.woff2 diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraBold.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraBold.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraBold.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraBold.woff2 diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraBoldItalic.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraBoldItalic.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraBoldItalic.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraBoldItalic.woff2 diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraLight.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraLight.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraLight.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraLight.woff2 diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraLightItalic.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraLightItalic.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraLightItalic.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ExtraLightItalic.woff2 diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Italic.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Italic.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Italic.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Italic.woff2 diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Light.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Light.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Light.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Light.woff2 diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-LightItalic.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-LightItalic.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-LightItalic.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-LightItalic.woff2 diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Medium.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Medium.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Medium.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Medium.woff2 diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-MediumItalic.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-MediumItalic.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-MediumItalic.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-MediumItalic.woff2 diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Regular.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Regular.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Regular.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Regular.woff2 diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-SemiBold.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-SemiBold.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-SemiBold.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-SemiBold.woff2 diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-SemiBoldItalic.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-SemiBoldItalic.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-SemiBoldItalic.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-SemiBoldItalic.woff2 diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Thin.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Thin.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Thin.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-Thin.woff2 diff --git a/prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ThinItalic.woff2 b/prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ThinItalic.woff2 similarity index 100% rename from prometeu-studio/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ThinItalic.woff2 rename to prometeu-studio-ui-javafx/src/main/resources/fonts/jetbrain-mono-3.2/fonts/webfonts/JetBrainsMono-ThinItalic.woff2 diff --git a/prometeu-studio/src/main/resources/i18n/messages.properties b/prometeu-studio-ui-javafx/src/main/resources/i18n/messages.properties similarity index 100% rename from prometeu-studio/src/main/resources/i18n/messages.properties rename to prometeu-studio-ui-javafx/src/main/resources/i18n/messages.properties diff --git a/prometeu-studio/src/main/resources/i18n/messages_pt_BR.properties b/prometeu-studio-ui-javafx/src/main/resources/i18n/messages_pt_BR.properties similarity index 100% rename from prometeu-studio/src/main/resources/i18n/messages_pt_BR.properties rename to prometeu-studio-ui-javafx/src/main/resources/i18n/messages_pt_BR.properties diff --git a/prometeu-studio/src/main/resources/icons/editor/lock-closed.svg b/prometeu-studio-ui-javafx/src/main/resources/icons/editor/lock-closed.svg similarity index 100% rename from prometeu-studio/src/main/resources/icons/editor/lock-closed.svg rename to prometeu-studio-ui-javafx/src/main/resources/icons/editor/lock-closed.svg diff --git a/prometeu-studio/src/main/resources/icons/editor/lock-open.svg b/prometeu-studio-ui-javafx/src/main/resources/icons/editor/lock-open.svg similarity index 100% rename from prometeu-studio/src/main/resources/icons/editor/lock-open.svg rename to prometeu-studio-ui-javafx/src/main/resources/icons/editor/lock-open.svg diff --git a/prometeu-studio/src/main/resources/themes/default-prometeu.css b/prometeu-studio-ui-javafx/src/main/resources/themes/default-prometeu.css similarity index 100% rename from prometeu-studio/src/main/resources/themes/default-prometeu.css rename to prometeu-studio-ui-javafx/src/main/resources/themes/default-prometeu.css diff --git a/prometeu-studio/src/test/java/p/studio/controls/forms/StudioFormSessionTest.java b/prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/controls/forms/StudioFormSessionTest.java similarity index 97% rename from prometeu-studio/src/test/java/p/studio/controls/forms/StudioFormSessionTest.java rename to prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/controls/forms/StudioFormSessionTest.java index 3216181f..663986bc 100644 --- a/prometeu-studio/src/test/java/p/studio/controls/forms/StudioFormSessionTest.java +++ b/prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/controls/forms/StudioFormSessionTest.java @@ -1,4 +1,4 @@ -package p.studio.controls.forms; +package p.studio.ui.javafx.controls.forms; import org.junit.jupiter.api.Test; diff --git a/prometeu-studio/src/test/java/p/studio/controls/shell/StudioActivityEventMapperTest.java b/prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/controls/shell/StudioActivityEventMapperTest.java similarity index 78% rename from prometeu-studio/src/test/java/p/studio/controls/shell/StudioActivityEventMapperTest.java rename to prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/controls/shell/StudioActivityEventMapperTest.java index 0fdbd6a0..632628d4 100644 --- a/prometeu-studio/src/test/java/p/studio/controls/shell/StudioActivityEventMapperTest.java +++ b/prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/controls/shell/StudioActivityEventMapperTest.java @@ -1,12 +1,12 @@ -package p.studio.controls.shell; +package p.studio.ui.javafx.controls.shell; import org.junit.jupiter.api.Test; -import p.packer.events.PackerEventKind; -import p.studio.lsp.events.StudioExecutionLifecycleEvent; -import p.studio.lsp.events.StudioPackerOperationEvent; -import p.studio.lsp.events.StudioProjectOpenedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshFailedEvent; -import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshedEvent; +import p.studio.ui.javafx.events.StudioExecutionLifecycleEvent; +import p.studio.ui.javafx.events.StudioPackerOperationEvent; +import p.studio.ui.javafx.events.StudioPackerOperationKind; +import p.studio.ui.javafx.events.StudioProjectOpenedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshFailedEvent; +import p.studio.ui.javafx.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshedEvent; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -48,7 +48,7 @@ final class StudioActivityEventMapperTest { @Test void mapsPackerWriteEventToActivityEntry() { final StudioActivityEntry entry = StudioActivityEventMapper - .map(new StudioPackerOperationEvent("op-1", PackerEventKind.ACTION_APPLIED, "Asset created.", null, false)) + .map(new StudioPackerOperationEvent("op-1", StudioPackerOperationKind.ACTION_APPLIED, "Asset created.", null, false)) .orElseThrow(); assertEquals("Assets", entry.source()); diff --git a/prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/controls/shell/StudioActivityStorageServiceTest.java b/prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/controls/shell/StudioActivityStorageServiceTest.java new file mode 100644 index 00000000..bfb7d248 --- /dev/null +++ b/prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/controls/shell/StudioActivityStorageServiceTest.java @@ -0,0 +1,60 @@ +package p.studio.ui.javafx.controls.shell; + +import org.junit.jupiter.api.Test; +import p.studio.api.preferences.ProjectActivityHistoryStore; +import p.studio.api.preferences.ProjectActivityRecord; +import p.studio.api.project.ProjectReference; +import p.studio.api.project.ProjectTarget; + +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +final class StudioActivityStorageServiceTest { + private final InMemoryHistoryStore store = new InMemoryHistoryStore(); + private final StudioActivityStorageService service = new StudioActivityStorageService(store); + private final ProjectReference project = new ProjectReference( + "Main", "1.0.0", "pbs", 1, ProjectTarget.Game, Path.of("project")); + + @Test + void mapsActivityHistoryThroughNeutralStore() { + final List history = List.of( + new StudioActivityEntry("Studio", "Project opened", StudioActivityEntrySeverity.SUCCESS, false), + new StudioActivityEntry("Assets", "3 assets loaded", StudioActivityEntrySeverity.INFO, false)); + service.save(project, history); + assertEquals(history, service.load(project)); + } + + @Test + void trimsPersistedHistoryToConfiguredMaximum() { + final List history = new ArrayList<>(); + for (int index = 0; index < StudioActivityStorageService.MAX_HISTORY + 25; index += 1) { + history.add(new StudioActivityEntry("Assets", "Entry " + index, StudioActivityEntrySeverity.INFO, false)); + } + service.save(project, history); + assertEquals(StudioActivityStorageService.MAX_HISTORY, service.load(project).size()); + assertEquals("Entry 499", service.load(project).getLast().message()); + } + + @Test + void ignoresRecordsWithUnknownVisualSeverity() { + store.entries = List.of(new ProjectActivityRecord("Studio", "old", "UNKNOWN", false)); + assertEquals(List.of(), service.load(project)); + } + + private static final class InMemoryHistoryStore implements ProjectActivityHistoryStore { + private List entries = List.of(); + + @Override + public List load(ProjectReference projectReference) { + return entries; + } + + @Override + public void save(ProjectReference projectReference, List entries) { + this.entries = List.copyOf(entries); + } + } +} diff --git a/prometeu-studio/src/test/java/p/studio/lsp/events/StudioWorkspaceEventBusTest.java b/prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/events/StudioWorkspaceEventBusTest.java similarity index 96% rename from prometeu-studio/src/test/java/p/studio/lsp/events/StudioWorkspaceEventBusTest.java rename to prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/events/StudioWorkspaceEventBusTest.java index 5269aae8..6c5dd992 100644 --- a/prometeu-studio/src/test/java/p/studio/lsp/events/StudioWorkspaceEventBusTest.java +++ b/prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/events/StudioWorkspaceEventBusTest.java @@ -1,7 +1,7 @@ -package p.studio.lsp.events; +package p.studio.ui.javafx.events; import org.junit.jupiter.api.Test; -import p.studio.workspaces.WorkspaceId; +import p.studio.ui.javafx.workspaces.WorkspaceId; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/prometeu-studio/src/test/java/p/studio/workspaces/debug/DebugWorkspaceProjectionTest.java b/prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/workspaces/debug/DebugWorkspaceProjectionTest.java similarity index 53% rename from prometeu-studio/src/test/java/p/studio/workspaces/debug/DebugWorkspaceProjectionTest.java rename to prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/workspaces/debug/DebugWorkspaceProjectionTest.java index 35ff51e9..f366f3d6 100644 --- a/prometeu-studio/src/test/java/p/studio/workspaces/debug/DebugWorkspaceProjectionTest.java +++ b/prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/workspaces/debug/DebugWorkspaceProjectionTest.java @@ -1,11 +1,11 @@ -package p.studio.workspaces.debug; +package p.studio.ui.javafx.workspaces.debug; import org.junit.jupiter.api.Test; -import p.studio.execution.StudioExecutionLogEntry; -import p.studio.execution.StudioExecutionLogSeverity; -import p.studio.execution.StudioExecutionLogSource; -import p.studio.execution.StudioExecutionSnapshot; -import p.studio.execution.StudioExecutionState; +import p.studio.api.execution.ExecutionLogEntry; +import p.studio.api.execution.ExecutionLogSeverity; +import p.studio.api.execution.ExecutionLogSource; +import p.studio.api.execution.ExecutionSnapshot; +import p.studio.api.execution.ExecutionState; import java.time.Instant; import java.util.List; @@ -16,25 +16,25 @@ import static org.junit.jupiter.api.Assertions.assertTrue; final class DebugWorkspaceProjectionTest { @Test void preservesSessionStateAndVisibleLogOrigins() { - final StudioExecutionSnapshot snapshot = new StudioExecutionSnapshot( - StudioExecutionState.PREPARING, + final ExecutionSnapshot snapshot = new ExecutionSnapshot( + ExecutionState.PREPARING, List.of( - new StudioExecutionLogEntry( + new ExecutionLogEntry( 1L, Instant.parse("2026-04-06T10:00:00Z"), - StudioExecutionLogSource.BUILD, - StudioExecutionLogSeverity.INFO, + ExecutionLogSource.BUILD, + ExecutionLogSeverity.INFO, "Compiler started"), - new StudioExecutionLogEntry( + new ExecutionLogEntry( 2L, Instant.parse("2026-04-06T10:00:01Z"), - StudioExecutionLogSource.PACK, - StudioExecutionLogSeverity.ERROR, + ExecutionLogSource.PACK, + ExecutionLogSeverity.ERROR, "Pack failed"))); final DebugWorkspaceProjection projection = DebugWorkspaceProjection.from(snapshot); - assertEquals(StudioExecutionState.PREPARING, projection.state()); + assertEquals(ExecutionState.PREPARING, projection.state()); assertEquals(2, projection.renderedLogs().size()); assertTrue(projection.renderedLogs().getFirst().contains("[BUILD][INFO]")); assertTrue(projection.renderedLogs().getLast().contains("[PACK][ERROR]")); diff --git a/prometeu-studio/src/test/java/p/studio/workspaces/framework/StudioSubscriptionBagTest.java b/prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/workspaces/framework/StudioSubscriptionBagTest.java similarity index 93% rename from prometeu-studio/src/test/java/p/studio/workspaces/framework/StudioSubscriptionBagTest.java rename to prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/workspaces/framework/StudioSubscriptionBagTest.java index 639cca84..cd8015a1 100644 --- a/prometeu-studio/src/test/java/p/studio/workspaces/framework/StudioSubscriptionBagTest.java +++ b/prometeu-studio-ui-javafx/src/test/java/p/studio/ui/javafx/workspaces/framework/StudioSubscriptionBagTest.java @@ -1,4 +1,4 @@ -package p.studio.workspaces.framework; +package p.studio.ui.javafx.workspaces.framework; import org.junit.jupiter.api.Test; diff --git a/prometeu-studio/build.gradle.kts b/prometeu-studio/build.gradle.kts deleted file mode 100644 index 93d2ea90..00000000 --- a/prometeu-studio/build.gradle.kts +++ /dev/null @@ -1,23 +0,0 @@ -plugins { - id("gradle.java-library-conventions") - alias(libs.plugins.javafx) -} - -dependencies { - implementation(project(":prometeu-infra")) - implementation(project(":prometeu-lsp:prometeu-lsp-api")) - implementation(project(":prometeu-packer:prometeu-packer-api")) - implementation(project(":prometeu-compiler:prometeu-compiler-core")) - implementation(project(":prometeu-compiler:prometeu-build-pipeline")) - implementation(project(":prometeu-compiler:prometeu-frontend-api")) - implementation(project(":prometeu-compiler:prometeu-frontend-registry")) - implementation(libs.javafx.controls) - implementation(libs.javafx.fxml) - implementation(libs.richtextfx) - testImplementation(project(":prometeu-packer:prometeu-packer-v1")) -} - -javafx { - version = libs.versions.javafx.get() - modules("javafx.controls", "javafx.fxml") -} diff --git a/prometeu-studio/src/main/java/p/studio/Container.java b/prometeu-studio/src/main/java/p/studio/Container.java deleted file mode 100644 index 8af847e8..00000000 --- a/prometeu-studio/src/main/java/p/studio/Container.java +++ /dev/null @@ -1,105 +0,0 @@ -package p.studio; - -import com.fasterxml.jackson.databind.ObjectMapper; -import p.studio.lsp.api.LspServerLifecycle; -import p.studio.lsp.events.StudioEventBus; -import p.studio.utilities.ThemeService; -import p.studio.utilities.i18n.I18nService; - -import java.util.Objects; -import java.util.concurrent.atomic.AtomicReference; - -public interface Container { - I18nService getI18n(); - - ThemeService getTheme(); - - StudioEventBus getEventBus(); - - ObjectMapper getMapper(); - - EmbeddedPacker getPacker(); - - StudioBackgroundTasks getBackgroundTasks(); - - LspServerLifecycle getLspServerLifecycle(); - - void shutdownContainer(); - - static void install(Container container) { - final Container candidate = Objects.requireNonNull(container, "container"); - final Container current = Holder.CURRENT.get(); - if (current == null) { - if (Holder.CURRENT.compareAndSet(null, candidate)) { - return; - } - } - if (Holder.CURRENT.get() != candidate) { - throw new IllegalStateException("Container already installed."); - } - } - - static Container current() { - final Container container = Holder.CURRENT.get(); - if (container == null) { - throw new IllegalStateException("Container has not been installed."); - } - return container; - } - - static I18nService i18n() { - return current().getI18n(); - } - - static ThemeService theme() { - return current().getTheme(); - } - - static StudioEventBus eventBus() { - return current().getEventBus(); - } - - static ObjectMapper mapper() { - return current().getMapper(); - } - - static EmbeddedPacker packer() { - return current().getPacker(); - } - - static StudioBackgroundTasks backgroundTasks() { - return current().getBackgroundTasks(); - } - - static LspServerLifecycle lspServerLifecycle() { - return current().getLspServerLifecycle(); - } - - static void shutdown() { - final Container container = Holder.CURRENT.get(); - if (container != null) { - container.shutdownContainer(); - } - } - - record EmbeddedPacker( - p.packer.PackerWorkspaceService workspaceService, - Runnable shutdownAction) { - - public EmbeddedPacker { - Objects.requireNonNull(workspaceService, "workspaceService"); - Objects.requireNonNull(shutdownAction, "shutdownAction"); - } - - public void shutdown() { - shutdownAction.run(); - } - } - - final class Holder { - private static final AtomicReference CURRENT = new AtomicReference<>(); - - private Holder() { - } - } -} diff --git a/prometeu-studio/src/main/java/p/studio/StudioBackgroundTasks.java b/prometeu-studio/src/main/java/p/studio/StudioBackgroundTasks.java deleted file mode 100644 index f97a4c38..00000000 --- a/prometeu-studio/src/main/java/p/studio/StudioBackgroundTasks.java +++ /dev/null @@ -1,30 +0,0 @@ -package p.studio; - -import java.util.Objects; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; - -public final class StudioBackgroundTasks { - private final ExecutorService executorService; - - public StudioBackgroundTasks(ExecutorService executorService) { - this.executorService = Objects.requireNonNull(executorService, "executorService"); - } - - public Future submit(Runnable task) { - return executorService.submit(Objects.requireNonNull(task, "task")); - } - - public void shutdown() { - executorService.shutdown(); - try { - if (!executorService.awaitTermination(2, TimeUnit.SECONDS)) { - executorService.shutdownNow(); - } - } catch (InterruptedException interruptedException) { - executorService.shutdownNow(); - Thread.currentThread().interrupt(); - } - } -} diff --git a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioActivityStorageService.java b/prometeu-studio/src/main/java/p/studio/controls/shell/StudioActivityStorageService.java deleted file mode 100644 index 599f5970..00000000 --- a/prometeu-studio/src/main/java/p/studio/controls/shell/StudioActivityStorageService.java +++ /dev/null @@ -1,106 +0,0 @@ -package p.studio.controls.shell; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.databind.ObjectMapper; -import p.studio.projects.ProjectReference; -import p.studio.projects.ProjectStudioPaths; - -import java.io.IOException; -import java.io.UncheckedIOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -public final class StudioActivityStorageService { - public static final int MAX_HISTORY = 500; - - private static final ObjectMapper MAPPER = new ObjectMapper(); - - public List load(ProjectReference projectReference) { - final Path activitiesPath = ProjectStudioPaths.activitiesPath(projectReference); - if (!Files.isRegularFile(activitiesPath)) { - return List.of(); - } - - try { - final PersistedActivityEntry[] persistedEntries = MAPPER.readValue( - activitiesPath.toFile(), - PersistedActivityEntry[].class); - final List entries = new ArrayList<>(); - for (PersistedActivityEntry persistedEntry : persistedEntries) { - final StudioActivityEntry mapped = map(persistedEntry); - if (mapped != null) { - entries.add(mapped); - } - } - return bounded(entries); - } catch (IOException | RuntimeException ignored) { - return List.of(); - } - } - - public void save(ProjectReference projectReference, List entries) { - final Path activitiesPath = ProjectStudioPaths.activitiesPath(projectReference); - final List boundedEntries = bounded(entries); - final List persistedEntries = boundedEntries.stream() - .map(entry -> new PersistedActivityEntry( - entry.source(), - entry.message(), - entry.severity().name(), - entry.sticky())) - .toList(); - - try { - Files.createDirectories(activitiesPath.getParent()); - MAPPER.writerWithDefaultPrettyPrinter().writeValue(activitiesPath.toFile(), persistedEntries); - } catch (IOException ioException) { - throw new UncheckedIOException(ioException); - } - } - - public List bounded(List entries) { - final List normalized = List.copyOf(Objects.requireNonNull(entries, "entries")); - if (normalized.size() <= MAX_HISTORY) { - return normalized; - } - return List.copyOf(normalized.subList(0, MAX_HISTORY)); - } - - private StudioActivityEntry map(PersistedActivityEntry persistedEntry) { - if (persistedEntry == null - || persistedEntry.source == null - || persistedEntry.message == null - || persistedEntry.severity == null) { - return null; - } - try { - return new StudioActivityEntry( - persistedEntry.source, - persistedEntry.message, - StudioActivityEntrySeverity.valueOf(persistedEntry.severity.trim()), - persistedEntry.sticky); - } catch (RuntimeException ignored) { - return null; - } - } - - @JsonIgnoreProperties(ignoreUnknown = true) - private static final class PersistedActivityEntry { - public String source; - public String message; - public String severity; - public boolean sticky; - - public PersistedActivityEntry() { - } - - private PersistedActivityEntry(String source, String message, String severity, boolean sticky) { - this.source = source; - this.message = message; - this.severity = severity; - this.sticky = sticky; - } - } -} diff --git a/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeDebugConnectionSettings.java b/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeDebugConnectionSettings.java deleted file mode 100644 index 298d6806..00000000 --- a/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeDebugConnectionSettings.java +++ /dev/null @@ -1,19 +0,0 @@ -package p.studio.debug.runtime; - -public record StudioRuntimeDebugConnectionSettings( - String host, - int port) { - public static final String DEFAULT_HOST = "127.0.0.1"; - public static final int DEFAULT_PORT = 7777; - - public StudioRuntimeDebugConnectionSettings { - host = host == null || host.isBlank() ? DEFAULT_HOST : host.trim(); - if (port <= 0) { - port = DEFAULT_PORT; - } - } - - public static StudioRuntimeDebugConnectionSettings defaults() { - return new StudioRuntimeDebugConnectionSettings(DEFAULT_HOST, DEFAULT_PORT); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeHandshakeClient.java b/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeHandshakeClient.java deleted file mode 100644 index 5491392f..00000000 --- a/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeHandshakeClient.java +++ /dev/null @@ -1,19 +0,0 @@ -package p.studio.debug.runtime; - -import p.studio.execution.StudioExecutionSessionService; - -public interface StudioRuntimeHandshakeClient { - StudioRuntimeHandshakeResult connect(final StudioExecutionSessionService session); - - StudioRuntimeHandshakeResult connect( - final StudioExecutionSessionService session, - final StudioRuntimeDebugConnectionSettings settings); - - StudioRuntimeHandshakeResult connectWithRetry( - final StudioExecutionSessionService session, - final StudioRuntimeDebugConnectionSettings settings, - final int maxAttempts, - final long retryDelayMillis); - - void disconnect(final StudioExecutionSessionService session); -} diff --git a/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeHandshakeClientToRuntime.java b/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeHandshakeClientToRuntime.java deleted file mode 100644 index 8c7efe03..00000000 --- a/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeHandshakeClientToRuntime.java +++ /dev/null @@ -1,13 +0,0 @@ -package p.studio.debug.runtime; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public record StudioRuntimeHandshakeClientToRuntime( - @JsonProperty("type") String type) { - - public StudioRuntimeHandshakeClientToRuntime { - if (!"start".equals(type) && !"ok".equals(type)) { - throw new IllegalArgumentException("type must be 'start' or 'ok'"); - } - } -} diff --git a/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeHandshakeResult.java b/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeHandshakeResult.java deleted file mode 100644 index fe6807bf..00000000 --- a/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeHandshakeResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package p.studio.debug.runtime; - -public record StudioRuntimeHandshakeResult( - boolean success, - StudioRuntimeDebugConnectionSettings settings, - Integer protocolVersion, - String runtimeVersion, - String failureMessage) { - - public static StudioRuntimeHandshakeResult success( - final StudioRuntimeDebugConnectionSettings settings, - final int protocolVersion, - final String runtimeVersion) { - return new StudioRuntimeHandshakeResult(true, settings, protocolVersion, runtimeVersion, null); - } - - public static StudioRuntimeHandshakeResult failure( - final StudioRuntimeDebugConnectionSettings settings, - final String failureMessage) { - return new StudioRuntimeHandshakeResult(false, settings, null, null, failureMessage); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeHandshakeRuntimeToClient.java b/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeHandshakeRuntimeToClient.java deleted file mode 100644 index c532be71..00000000 --- a/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeHandshakeRuntimeToClient.java +++ /dev/null @@ -1,17 +0,0 @@ -package p.studio.debug.runtime; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; - -@JsonIgnoreProperties(ignoreUnknown = true) -public record StudioRuntimeHandshakeRuntimeToClient( - @JsonProperty("type") String type, - @JsonProperty("protocol_version") int protocolVersion, - @JsonProperty("runtime_version") String runtimeVersion) { - - public StudioRuntimeHandshakeRuntimeToClient { - if (!"handshake".equals(type)) { - throw new IllegalArgumentException("type must be 'handshake'"); - } - } -} diff --git a/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeHandshakeService.java b/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeHandshakeService.java deleted file mode 100644 index 978db5d0..00000000 --- a/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeHandshakeService.java +++ /dev/null @@ -1,268 +0,0 @@ -package p.studio.debug.runtime; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import p.studio.Container; -import p.studio.StudioBackgroundTasks; -import p.studio.execution.StudioExecutionLogSeverity; -import p.studio.execution.StudioExecutionSessionService; -import p.studio.execution.StudioExecutionState; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.net.InetSocketAddress; -import java.net.Socket; -import java.nio.charset.StandardCharsets; -import java.util.Objects; -import java.util.concurrent.Future; - -public final class StudioRuntimeHandshakeService implements StudioRuntimeHandshakeClient { - private final ObjectMapper mapper; - private final StudioBackgroundTasks backgroundTasks; - private final Object monitor = new Object(); - private Socket socket; - private BufferedReader reader; - private BufferedWriter writer; - private Future receiverTask; - private boolean intentionalDisconnect; - - public StudioRuntimeHandshakeService() { - this(Container.mapper(), Container.backgroundTasks()); - } - - public StudioRuntimeHandshakeService( - final ObjectMapper mapper, - final StudioBackgroundTasks backgroundTasks) { - this.mapper = Objects.requireNonNull(mapper, "mapper"); - this.backgroundTasks = Objects.requireNonNull(backgroundTasks, "backgroundTasks"); - } - - public StudioRuntimeHandshakeResult connect(final StudioExecutionSessionService session) { - return connectWithRetry(session, StudioRuntimeDebugConnectionSettings.defaults(), 1, 0L); - } - - @Override - public StudioRuntimeHandshakeResult connect( - final StudioExecutionSessionService session, - final StudioRuntimeDebugConnectionSettings settings) { - return connectWithRetry(session, settings, 1, 0L); - } - - @Override - public StudioRuntimeHandshakeResult connectWithRetry( - final StudioExecutionSessionService session, - final StudioRuntimeDebugConnectionSettings settings, - final int maxAttempts, - final long retryDelayMillis) { - final StudioExecutionSessionService safeSession = Objects.requireNonNull(session, "session"); - final StudioRuntimeDebugConnectionSettings safeSettings = Objects.requireNonNull(settings, "settings"); - safeSession.transitionToConnecting(); - final int attempts = Math.max(1, maxAttempts); - Exception failure = null; - for (int attempt = 1; attempt <= attempts; attempt += 1) { - try { - synchronized (monitor) { - cleanupLocked(); - intentionalDisconnect = false; - socket = new Socket(); - socket.connect(new InetSocketAddress(safeSettings.host(), safeSettings.port()), 5_000); - socket.setSoTimeout(5_000); - reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8)); - writer = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), StandardCharsets.UTF_8)); - } - - final String handshakeLine = readHandshakeLine(); - final StudioRuntimeHandshakeRuntimeToClient handshake = mapper.readValue( - handshakeLine, - StudioRuntimeHandshakeRuntimeToClient.class); - writeMessage(mapper.writeValueAsString(new StudioRuntimeHandshakeClientToRuntime("start"))); - synchronized (monitor) { - if (socket != null) { - socket.setSoTimeout(0); - } - receiverTask = backgroundTasks.submit(() -> receiveLoop(safeSession)); - } - - safeSession.appendRuntimeLog( - StudioExecutionLogSeverity.INFO, - "Runtime handshake connected to %s:%d".formatted(safeSettings.host(), safeSettings.port())); - safeSession.appendRuntimeLog( - StudioExecutionLogSeverity.INFO, - "Runtime protocol %d (%s)".formatted(handshake.protocolVersion(), handshake.runtimeVersion())); - safeSession.transitionToRunning(); - return StudioRuntimeHandshakeResult.success(safeSettings, handshake.protocolVersion(), handshake.runtimeVersion()); - } catch (Exception exception) { - failure = exception; - cleanup(); - if (attempt < attempts && retryDelayMillis > 0L) { - sleepQuietly(retryDelayMillis); - } - } - } - safeSession.appendRuntimeLog( - StudioExecutionLogSeverity.ERROR, - "Runtime handshake failed: " + failureMessage(failure == null ? new IOException("unknown handshake failure") : failure)); - safeSession.transitionToRuntimeFailed(); - return StudioRuntimeHandshakeResult.failure(safeSettings, failureMessage(failure == null ? new IOException("unknown handshake failure") : failure)); - } - - @Override - public void disconnect(final StudioExecutionSessionService session) { - final StudioExecutionSessionService safeSession = Objects.requireNonNull(session, "session"); - final boolean wasConnected; - synchronized (monitor) { - wasConnected = socket != null; - intentionalDisconnect = true; - cleanupLocked(); - } - if (wasConnected) { - safeSession.appendRuntimeLog(StudioExecutionLogSeverity.INFO, "Runtime debug connection disconnected."); - final StudioExecutionState currentState = safeSession.snapshot().state(); - if (currentState == StudioExecutionState.CONNECTING || currentState == StudioExecutionState.RUNNING) { - safeSession.transitionToStopped(); - } - } - } - - private void receiveLoop(final StudioExecutionSessionService session) { - try { - String line; - while ((line = readRuntimeLine()) != null) { - processRuntimeLine(session, line); - } - handleUnexpectedDisconnect(session, "Runtime debug connection closed."); - } catch (IOException ioException) { - handleUnexpectedDisconnect(session, "Runtime debug connection lost: " + failureMessage(ioException)); - } - } - - private void processRuntimeLine( - final StudioExecutionSessionService session, - final String line) throws IOException { - final JsonNode node = mapper.readTree(line); - if (node == null || !node.has("event")) { - return; - } - if ("log".equals(node.get("event").asText())) { - final StudioRuntimeLogEvent event = mapper.treeToValue(node, StudioRuntimeLogEvent.class); - session.appendRuntimeLog( - severityOf(event.level()), - renderRuntimeMessage(event)); - } - } - - private String renderRuntimeMessage(final StudioRuntimeLogEvent event) { - if (event.source() == null || event.source().isBlank()) { - return event.message(); - } - return "[%s] %s".formatted(event.source(), event.message()); - } - - private StudioExecutionLogSeverity severityOf(final String level) { - if (level == null) { - return StudioExecutionLogSeverity.INFO; - } - return switch (level.trim().toUpperCase()) { - case "ERROR", "FATAL" -> StudioExecutionLogSeverity.ERROR; - default -> StudioExecutionLogSeverity.INFO; - }; - } - - private String readHandshakeLine() throws IOException { - synchronized (monitor) { - if (reader == null) { - throw new IOException("runtime debug reader not available"); - } - final String line = reader.readLine(); - if (line == null) { - throw new IOException("connection closed during handshake"); - } - return line; - } - } - - private String readRuntimeLine() throws IOException { - synchronized (monitor) { - if (reader == null) { - return null; - } - return reader.readLine(); - } - } - - private void writeMessage(final String message) throws IOException { - synchronized (monitor) { - if (writer == null) { - throw new IOException("runtime debug writer not available"); - } - writer.write(message); - writer.newLine(); - writer.flush(); - } - } - - private void handleUnexpectedDisconnect( - final StudioExecutionSessionService session, - final String message) { - final boolean shouldReport; - synchronized (monitor) { - shouldReport = !intentionalDisconnect; - cleanupLocked(); - } - if (!shouldReport) { - return; - } - session.appendRuntimeLog(StudioExecutionLogSeverity.ERROR, message); - final StudioExecutionState currentState = session.snapshot().state(); - if (currentState == StudioExecutionState.CONNECTING || currentState == StudioExecutionState.RUNNING) { - session.transitionToRuntimeFailed(); - } - } - - private void cleanup() { - synchronized (monitor) { - cleanupLocked(); - } - } - - private void cleanupLocked() { - if (receiverTask != null) { - receiverTask.cancel(true); - receiverTask = null; - } - closeQuietly(reader); - closeQuietly(writer); - closeQuietly(socket); - reader = null; - writer = null; - socket = null; - } - - private void closeQuietly(final AutoCloseable closeable) { - if (closeable == null) { - return; - } - try { - closeable.close(); - } catch (Exception ignored) { - } - } - - private String failureMessage(final Exception exception) { - final String message = exception.getMessage(); - return message == null || message.isBlank() - ? exception.getClass().getSimpleName() - : message; - } - - private void sleepQuietly(final long retryDelayMillis) { - try { - Thread.sleep(retryDelayMillis); - } catch (InterruptedException interruptedException) { - Thread.currentThread().interrupt(); - } - } -} diff --git a/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeLogEvent.java b/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeLogEvent.java deleted file mode 100644 index 9a057806..00000000 --- a/prometeu-studio/src/main/java/p/studio/debug/runtime/StudioRuntimeLogEvent.java +++ /dev/null @@ -1,12 +0,0 @@ -package p.studio.debug.runtime; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; - -@JsonIgnoreProperties(ignoreUnknown = true) -public record StudioRuntimeLogEvent( - @JsonProperty("event") String event, - @JsonProperty("level") String level, - @JsonProperty("source") String source, - @JsonProperty("msg") String message) { -} diff --git a/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionLogSeverity.java b/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionLogSeverity.java deleted file mode 100644 index 93629a84..00000000 --- a/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionLogSeverity.java +++ /dev/null @@ -1,15 +0,0 @@ -package p.studio.execution; - -import p.studio.shipper.StudioShipperLogLevel; - -public enum StudioExecutionLogSeverity { - INFO, - ERROR; - - public static StudioExecutionLogSeverity fromShipper(final StudioShipperLogLevel level) { - return switch (level) { - case INFO -> INFO; - case ERROR -> ERROR; - }; - } -} diff --git a/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionLogSource.java b/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionLogSource.java deleted file mode 100644 index 7f10d8c4..00000000 --- a/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionLogSource.java +++ /dev/null @@ -1,20 +0,0 @@ -package p.studio.execution; - -import p.studio.shipper.StudioShipperLogSource; - -public enum StudioExecutionLogSource { - BUILD, - PACK_VALIDATION, - PACK, - MANIFEST, - RUNTIME; - - public static StudioExecutionLogSource fromShipper(final StudioShipperLogSource source) { - return switch (source) { - case BUILD -> BUILD; - case PACK_VALIDATION -> PACK_VALIDATION; - case PACK -> PACK; - case MANIFEST -> MANIFEST; - }; - } -} diff --git a/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionSessionService.java b/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionSessionService.java deleted file mode 100644 index b69ad2c6..00000000 --- a/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionSessionService.java +++ /dev/null @@ -1,155 +0,0 @@ -package p.studio.execution; - -import p.studio.shipper.StudioShipperLogEntry; -import p.studio.utilities.events.EventSubscription; - -import java.time.Instant; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.function.Consumer; - -public final class StudioExecutionSessionService { - private final Object monitor = new Object(); - private final ArrayList logs = new ArrayList<>(); - private final CopyOnWriteArrayList> listeners = new CopyOnWriteArrayList<>(); - private StudioExecutionState state = StudioExecutionState.IDLE; - private long nextSequence = 1L; - - public StudioExecutionSnapshot snapshot() { - synchronized (monitor) { - return snapshotLocked(); - } - } - - public EventSubscription subscribe(final Consumer listener) { - final Consumer safeListener = Objects.requireNonNull(listener, "listener"); - listeners.add(safeListener); - safeListener.accept(snapshot()); - return () -> listeners.remove(safeListener); - } - - public void beginPreparationCycle() { - publish(transitionLocked(StudioExecutionState.PREPARING, true)); - } - - public void transitionToPrepareFailed() { - publish(transitionLocked(StudioExecutionState.PREPARE_FAILED, false)); - } - - public void transitionToConnecting() { - publish(transitionLocked(StudioExecutionState.CONNECTING, false)); - } - - public void transitionToRunning() { - publish(transitionLocked(StudioExecutionState.RUNNING, false)); - } - - public void transitionToRuntimeFailed() { - publish(transitionLocked(StudioExecutionState.RUNTIME_FAILED, false)); - } - - public void transitionToStopped() { - publish(transitionLocked(StudioExecutionState.STOPPED, false)); - } - - public void resetToIdle() { - publish(transitionLocked(StudioExecutionState.IDLE, false)); - } - - public void appendShipperLog(final StudioShipperLogEntry entry) { - final StudioShipperLogEntry safeEntry = Objects.requireNonNull(entry, "entry"); - appendLog( - StudioExecutionLogSource.fromShipper(safeEntry.source()), - StudioExecutionLogSeverity.fromShipper(safeEntry.level()), - safeEntry.message(), - safeEntry.timestamp()); - } - - public void appendRuntimeLog( - final StudioExecutionLogSeverity severity, - final String message) { - appendLog(StudioExecutionLogSource.RUNTIME, severity, message, Instant.now()); - } - - public void appendRuntimeLog( - final StudioExecutionLogSeverity severity, - final String message, - final Instant timestamp) { - appendLog(StudioExecutionLogSource.RUNTIME, severity, message, timestamp); - } - - public void appendLog( - final StudioExecutionLogSource source, - final StudioExecutionLogSeverity severity, - final String message, - final Instant timestamp) { - final StudioExecutionSnapshot snapshot; - synchronized (monitor) { - final StudioExecutionLogEntry entry = new StudioExecutionLogEntry( - nextSequence++, - timestamp, - Objects.requireNonNull(source, "source"), - Objects.requireNonNull(severity, "severity"), - message); - logs.add(entry); - snapshot = snapshotLocked(); - } - publish(snapshot); - } - - private StudioExecutionSnapshot transitionLocked( - final StudioExecutionState targetState, - final boolean clearLogs) { - final StudioExecutionSnapshot snapshot; - synchronized (monitor) { - final StudioExecutionState next = Objects.requireNonNull(targetState, "targetState"); - ensureTransitionAllowed(state, next); - state = next; - if (clearLogs) { - logs.clear(); - nextSequence = 1L; - } - snapshot = snapshotLocked(); - } - return snapshot; - } - - private StudioExecutionSnapshot snapshotLocked() { - return new StudioExecutionSnapshot(state, List.copyOf(logs)); - } - - private void ensureTransitionAllowed( - final StudioExecutionState currentState, - final StudioExecutionState nextState) { - if (currentState == nextState) { - return; - } - final boolean allowed = switch (currentState) { - case IDLE -> nextState == StudioExecutionState.PREPARING; - case PREPARING -> nextState == StudioExecutionState.PREPARE_FAILED - || nextState == StudioExecutionState.CONNECTING; - case PREPARE_FAILED -> nextState == StudioExecutionState.IDLE - || nextState == StudioExecutionState.PREPARING; - case CONNECTING -> nextState == StudioExecutionState.RUNNING - || nextState == StudioExecutionState.RUNTIME_FAILED - || nextState == StudioExecutionState.STOPPED; - case RUNNING -> nextState == StudioExecutionState.STOPPED - || nextState == StudioExecutionState.RUNTIME_FAILED; - case RUNTIME_FAILED -> nextState == StudioExecutionState.IDLE - || nextState == StudioExecutionState.PREPARING; - case STOPPED -> nextState == StudioExecutionState.IDLE - || nextState == StudioExecutionState.PREPARING; - }; - if (!allowed) { - throw new IllegalStateException("illegal execution transition: " + currentState + " -> " + nextState); - } - } - - private void publish(final StudioExecutionSnapshot snapshot) { - for (final Consumer listener : listeners) { - listener.accept(snapshot); - } - } -} diff --git a/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionSnapshot.java b/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionSnapshot.java deleted file mode 100644 index 5c25c990..00000000 --- a/prometeu-studio/src/main/java/p/studio/execution/StudioExecutionSnapshot.java +++ /dev/null @@ -1,14 +0,0 @@ -package p.studio.execution; - -import java.util.List; -import java.util.Objects; - -public record StudioExecutionSnapshot( - StudioExecutionState state, - List logs) { - - public StudioExecutionSnapshot { - Objects.requireNonNull(state, "state"); - logs = List.copyOf(Objects.requireNonNull(logs, "logs")); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/execution/StudioPlayStopCoordinator.java b/prometeu-studio/src/main/java/p/studio/execution/StudioPlayStopCoordinator.java deleted file mode 100644 index 4c07e030..00000000 --- a/prometeu-studio/src/main/java/p/studio/execution/StudioPlayStopCoordinator.java +++ /dev/null @@ -1,246 +0,0 @@ -package p.studio.execution; - -import p.studio.Container; -import p.studio.StudioBackgroundTasks; -import p.studio.controls.shell.StudioActivityEntrySeverity; -import p.studio.debug.runtime.StudioRuntimeDebugConnectionSettings; -import p.studio.debug.runtime.StudioRuntimeHandshakeClient; -import p.studio.debug.runtime.StudioRuntimeHandshakeResult; -import p.studio.execution.runtime.StudioExternalRuntimeProcessLauncher; -import p.studio.execution.runtime.StudioRuntimeProcessHandle; -import p.studio.execution.runtime.StudioRuntimeProcessLauncher; -import p.studio.lsp.events.StudioExecutionLifecycleEvent; -import p.studio.projectstate.ProjectLocalStudioSetup; -import p.studio.projects.ProjectReference; -import p.studio.shipper.StudioShipperService; -import p.studio.workspaces.WorkspaceId; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Objects; -import java.util.function.Consumer; - -public final class StudioPlayStopCoordinator { - private final Object monitor = new Object(); - private final ProjectReference projectReference; - private final ProjectLocalStudioSetup projectSetup; - private final StudioExecutionSessionService executionSession; - private final StudioShipperPreparationRunner shipperRunner; - private final StudioRuntimeHandshakeClient handshakeClient; - private final StudioRuntimeProcessLauncher runtimeProcessLauncher; - private final StudioBackgroundTasks backgroundTasks; - private final Consumer workspaceSelector; - private final Consumer lifecyclePublisher; - private final boolean preflightRuntime; - private StudioRuntimeProcessHandle activeProcess; - private boolean stopRequested; - - public StudioPlayStopCoordinator( - final ProjectReference projectReference, - final ProjectLocalStudioSetup projectSetup, - final StudioExecutionSessionService executionSession, - final Consumer workspaceSelector) { - this( - projectReference, - projectSetup, - executionSession, - (project, sink) -> new StudioShipperService().prepare(project, sink), - new p.studio.debug.runtime.StudioRuntimeHandshakeService(), - new StudioExternalRuntimeProcessLauncher(), - Container.backgroundTasks(), - workspaceSelector, - event -> Container.eventBus().publish(event), - true); - } - - StudioPlayStopCoordinator( - final ProjectReference projectReference, - final ProjectLocalStudioSetup projectSetup, - final StudioExecutionSessionService executionSession, - final StudioShipperPreparationRunner shipperRunner, - final StudioRuntimeHandshakeClient handshakeClient, - final StudioRuntimeProcessLauncher runtimeProcessLauncher, - final StudioBackgroundTasks backgroundTasks, - final Consumer workspaceSelector, - final Consumer lifecyclePublisher, - final boolean preflightRuntime) { - this.projectReference = Objects.requireNonNull(projectReference, "projectReference"); - this.projectSetup = Objects.requireNonNull(projectSetup, "projectSetup"); - this.executionSession = Objects.requireNonNull(executionSession, "executionSession"); - this.shipperRunner = Objects.requireNonNull(shipperRunner, "shipperRunner"); - this.handshakeClient = Objects.requireNonNull(handshakeClient, "handshakeClient"); - this.runtimeProcessLauncher = Objects.requireNonNull(runtimeProcessLauncher, "runtimeProcessLauncher"); - this.backgroundTasks = Objects.requireNonNull(backgroundTasks, "backgroundTasks"); - this.workspaceSelector = Objects.requireNonNull(workspaceSelector, "workspaceSelector"); - this.lifecyclePublisher = Objects.requireNonNull(lifecyclePublisher, "lifecyclePublisher"); - this.preflightRuntime = preflightRuntime; - } - - public void play() { - synchronized (monitor) { - if (isBusyState(executionSession.snapshot().state())) { - return; - } - stopRequested = false; - } - workspaceSelector.accept(WorkspaceId.DEBUG); - executionSession.beginPreparationCycle(); - publishLifecycle("Play", "Play started", StudioActivityEntrySeverity.INFO, false); - backgroundTasks.submit(this::runPlayFlow); - } - - public void stop() { - final StudioExecutionState state = executionSession.snapshot().state(); - if (state == StudioExecutionState.PREPARING) { - return; - } - final StudioRuntimeProcessHandle processToStop; - synchronized (monitor) { - stopRequested = true; - processToStop = activeProcess; - activeProcess = null; - } - handshakeClient.disconnect(executionSession); - if (processToStop != null && processToStop.isAlive()) { - processToStop.destroyForcibly(); - } - publishLifecycle("Play", "Runtime stop requested", StudioActivityEntrySeverity.INFO, false); - } - - public void shutdown() { - stop(); - } - - private void runPlayFlow() { - final var prepareResult = shipperRunner.prepare(projectReference, executionSession::appendShipperLog); - if (!prepareResult.success()) { - executionSession.transitionToPrepareFailed(); - publishLifecycle("Play", "Preparation failed", StudioActivityEntrySeverity.ERROR, true); - return; - } - - executionSession.transitionToConnecting(); - final String runtimePath = validateRuntimePath(preflightRuntime); - if (runtimePath == null) { - executionSession.transitionToRuntimeFailed(); - publishLifecycle("Play", "Runtime preflight failed", StudioActivityEntrySeverity.ERROR, true); - return; - } - - final StudioRuntimeProcessHandle processHandle; - try { - processHandle = runtimeProcessLauncher.launch(projectReference, runtimePath); - } catch (IOException ioException) { - executionSession.appendRuntimeLog(StudioExecutionLogSeverity.ERROR, "Runtime preflight failed: " + ioException.getMessage()); - executionSession.transitionToRuntimeFailed(); - publishLifecycle("Play", "Runtime spawn failed", StudioActivityEntrySeverity.ERROR, true); - return; - } - - synchronized (monitor) { - activeProcess = processHandle; - stopRequested = false; - } - streamProcessOutput(processHandle.stdout(), StudioExecutionLogSeverity.INFO); - streamProcessOutput(processHandle.stderr(), StudioExecutionLogSeverity.ERROR); - processHandle.onExit().thenAccept(exitCode -> handleProcessExit(processHandle, exitCode)); - - executionSession.transitionToConnecting(); - final StudioRuntimeHandshakeResult handshake = handshakeClient.connectWithRetry( - executionSession, - StudioRuntimeDebugConnectionSettings.defaults(), - 20, - 250L); - if (!handshake.success()) { - processHandle.destroyForcibly(); - synchronized (monitor) { - if (activeProcess == processHandle) { - activeProcess = null; - } - } - publishLifecycle("Debug", "Runtime handshake failed", StudioActivityEntrySeverity.ERROR, true); - return; - } - publishLifecycle("Debug", "Runtime started", StudioActivityEntrySeverity.SUCCESS, false); - } - - private void handleProcessExit( - final StudioRuntimeProcessHandle processHandle, - final int exitCode) { - final boolean wasStopRequested; - synchronized (monitor) { - if (activeProcess == processHandle) { - activeProcess = null; - } - wasStopRequested = stopRequested; - } - if (wasStopRequested || executionSession.snapshot().state() == StudioExecutionState.STOPPED) { - executionSession.appendRuntimeLog(StudioExecutionLogSeverity.INFO, "Runtime process stopped."); - publishLifecycle("Debug", "Runtime stopped", StudioActivityEntrySeverity.INFO, false); - return; - } - if (exitCode == 0) { - executionSession.appendRuntimeLog(StudioExecutionLogSeverity.INFO, "Runtime process exited successfully."); - executionSession.transitionToStopped(); - publishLifecycle("Debug", "Runtime finished", StudioActivityEntrySeverity.SUCCESS, false); - return; - } - executionSession.appendRuntimeLog(StudioExecutionLogSeverity.ERROR, "Runtime process exited with code " + exitCode + "."); - executionSession.transitionToRuntimeFailed(); - publishLifecycle("Debug", "Runtime failed", StudioActivityEntrySeverity.ERROR, true); - } - - private void streamProcessOutput( - final InputStream stream, - final StudioExecutionLogSeverity severity) { - backgroundTasks.submit(() -> { - try (BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) { - String line; - while ((line = reader.readLine()) != null) { - executionSession.appendRuntimeLog(severity, line); - } - } catch (IOException ignored) { - } - }); - } - - private String validateRuntimePath(final boolean preflightRuntime) { - final String runtimePathValue = projectSetup.prometeuRuntimePath(); - if (runtimePathValue == null) { - executionSession.appendRuntimeLog(StudioExecutionLogSeverity.ERROR, "Runtime preflight failed: prometeuRuntimePath is missing."); - return null; - } - if (!preflightRuntime) { - return runtimePathValue; - } - final Path runtimePath = Path.of(runtimePathValue).resolve("prometeu").toAbsolutePath().normalize(); - if (!Files.isRegularFile(runtimePath)) { - executionSession.appendRuntimeLog(StudioExecutionLogSeverity.ERROR, "Runtime preflight failed: runtime not found at " + runtimePath + "."); - return null; - } - if (!Files.isExecutable(runtimePath)) { - executionSession.appendRuntimeLog(StudioExecutionLogSeverity.ERROR, "Runtime preflight failed: runtime is not executable at " + runtimePath + "."); - return null; - } - return runtimePath.toString(); - } - - private void publishLifecycle( - final String source, - final String message, - final StudioActivityEntrySeverity severity, - final boolean sticky) { - lifecyclePublisher.accept(new StudioExecutionLifecycleEvent(source, message, severity, sticky)); - } - - private boolean isBusyState(final StudioExecutionState state) { - return state == StudioExecutionState.PREPARING - || state == StudioExecutionState.CONNECTING - || state == StudioExecutionState.RUNNING; - } -} diff --git a/prometeu-studio/src/main/java/p/studio/execution/StudioShipperPreparationRunner.java b/prometeu-studio/src/main/java/p/studio/execution/StudioShipperPreparationRunner.java deleted file mode 100644 index a3664fcb..00000000 --- a/prometeu-studio/src/main/java/p/studio/execution/StudioShipperPreparationRunner.java +++ /dev/null @@ -1,12 +0,0 @@ -package p.studio.execution; - -import p.studio.projects.ProjectReference; -import p.studio.shipper.StudioShipperLogEntry; -import p.studio.shipper.StudioShipperPrepareResult; - -import java.util.function.Consumer; - -@FunctionalInterface -public interface StudioShipperPreparationRunner { - StudioShipperPrepareResult prepare(ProjectReference projectReference, Consumer logSink); -} diff --git a/prometeu-studio/src/main/java/p/studio/execution/runtime/StudioExternalRuntimeProcessLauncher.java b/prometeu-studio/src/main/java/p/studio/execution/runtime/StudioExternalRuntimeProcessLauncher.java deleted file mode 100644 index afbf74be..00000000 --- a/prometeu-studio/src/main/java/p/studio/execution/runtime/StudioExternalRuntimeProcessLauncher.java +++ /dev/null @@ -1,47 +0,0 @@ -package p.studio.execution.runtime; - -import p.studio.projects.ProjectReference; - -import java.io.IOException; -import java.io.InputStream; -import java.util.concurrent.CompletableFuture; - -public final class StudioExternalRuntimeProcessLauncher implements StudioRuntimeProcessLauncher { - @Override - public StudioRuntimeProcessHandle launch( - final ProjectReference projectReference, - final String runtimePath) throws IOException { - final Process process = new ProcessBuilder(runtimePath, "debug", "build") - .directory(projectReference.rootPath().toFile()) - .start(); - return new ExternalProcessHandle(process); - } - - private record ExternalProcessHandle(Process process) implements StudioRuntimeProcessHandle { - @Override - public InputStream stdout() { - return process.getInputStream(); - } - - @Override - public InputStream stderr() { - return process.getErrorStream(); - } - - @Override - public boolean isAlive() { - return process.isAlive(); - } - - @Override - public void destroyForcibly() { - process.descendants().forEach(ProcessHandle::destroyForcibly); - process.destroyForcibly(); - } - - @Override - public CompletableFuture onExit() { - return process.onExit().thenApply(Process::exitValue); - } - } -} diff --git a/prometeu-studio/src/main/java/p/studio/execution/runtime/StudioRuntimeProcessHandle.java b/prometeu-studio/src/main/java/p/studio/execution/runtime/StudioRuntimeProcessHandle.java deleted file mode 100644 index f6bd09ea..00000000 --- a/prometeu-studio/src/main/java/p/studio/execution/runtime/StudioRuntimeProcessHandle.java +++ /dev/null @@ -1,16 +0,0 @@ -package p.studio.execution.runtime; - -import java.io.InputStream; -import java.util.concurrent.CompletableFuture; - -public interface StudioRuntimeProcessHandle { - InputStream stdout(); - - InputStream stderr(); - - boolean isAlive(); - - void destroyForcibly(); - - CompletableFuture onExit(); -} diff --git a/prometeu-studio/src/main/java/p/studio/execution/runtime/StudioRuntimeProcessLauncher.java b/prometeu-studio/src/main/java/p/studio/execution/runtime/StudioRuntimeProcessLauncher.java deleted file mode 100644 index eba18efb..00000000 --- a/prometeu-studio/src/main/java/p/studio/execution/runtime/StudioRuntimeProcessLauncher.java +++ /dev/null @@ -1,9 +0,0 @@ -package p.studio.execution.runtime; - -import p.studio.projects.ProjectReference; - -import java.io.IOException; - -public interface StudioRuntimeProcessLauncher { - StudioRuntimeProcessHandle launch(ProjectReference projectReference, String runtimePath) throws IOException; -} diff --git a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioEvent.java b/prometeu-studio/src/main/java/p/studio/lsp/events/StudioEvent.java deleted file mode 100644 index 2ffb763d..00000000 --- a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package p.studio.lsp.events; - -import p.studio.utilities.events.SimpleEvent; - -public interface StudioEvent extends SimpleEvent { -} diff --git a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioEventBus.java b/prometeu-studio/src/main/java/p/studio/lsp/events/StudioEventBus.java deleted file mode 100644 index 7e9d2342..00000000 --- a/prometeu-studio/src/main/java/p/studio/lsp/events/StudioEventBus.java +++ /dev/null @@ -1,27 +0,0 @@ -package p.studio.lsp.events; - -import p.studio.utilities.events.EventSubscription; -import p.studio.utilities.events.TypedEventBus; - -import java.util.Objects; -import java.util.function.Consumer; - -public final class StudioEventBus { - private final TypedEventBus delegate; - - public StudioEventBus() { - this(new TypedEventBus()); - } - - public StudioEventBus(TypedEventBus delegate) { - this.delegate = Objects.requireNonNull(delegate, "delegate"); - } - - public EventSubscription subscribe(Class eventType, Consumer consumer) { - return delegate.subscribe(eventType, consumer); - } - - public void publish(StudioEvent event) { - delegate.publish(event); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/projects/KnownProjectsService.java b/prometeu-studio/src/main/java/p/studio/projects/KnownProjectsService.java deleted file mode 100644 index 5c6f7d11..00000000 --- a/prometeu-studio/src/main/java/p/studio/projects/KnownProjectsService.java +++ /dev/null @@ -1,93 +0,0 @@ -package p.studio.projects; - -import java.io.IOException; -import java.io.UncheckedIOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.*; - -public final class KnownProjectsService { - private final Path storageFile; - private final ProjectCatalogService projectCatalogService; - - public KnownProjectsService(Path storageFile, ProjectCatalogService projectCatalogService) { - this.storageFile = Objects.requireNonNull(storageFile, "storageFile").toAbsolutePath().normalize(); - this.projectCatalogService = Objects.requireNonNull(projectCatalogService, "projectCatalogService"); - } - - public List listKnownProjects() { - final boolean storageExists = Files.isRegularFile(storageFile); - final Set knownPaths = readStoredPaths(); - if (!storageExists && knownPaths.isEmpty()) { - final List discovered = projectCatalogService.listProjects(); - writeStoredPaths(discovered.stream().map(ProjectReference::rootPath).toList()); - return discovered; - } - - final List knownProjects = new ArrayList<>(); - boolean mutated = false; - for (Path knownPath : knownPaths) { - if (!Files.isDirectory(knownPath)) { - mutated = true; - continue; - } - knownProjects.add(projectCatalogService.openProject(knownPath)); - } - - knownProjects.sort(Comparator.comparing(ProjectReference::name, String.CASE_INSENSITIVE_ORDER)); - if (mutated) { - writeStoredPaths(knownProjects.stream().map(ProjectReference::rootPath).toList()); - } - return List.copyOf(knownProjects); - } - - public void remember(ProjectReference projectReference) { - final Set knownPaths = readStoredPaths(); - knownPaths.add(normalize(projectReference.rootPath())); - writeStoredPaths(knownPaths); - } - - public void forget(ProjectReference projectReference) { - final Set knownPaths = readStoredPaths(); - knownPaths.remove(normalize(projectReference.rootPath())); - writeStoredPaths(knownPaths); - } - - private Set readStoredPaths() { - if (!Files.isRegularFile(storageFile)) { - return new LinkedHashSet<>(); - } - - try { - final LinkedHashSet paths = new LinkedHashSet<>(); - for (String line : Files.readAllLines(storageFile, StandardCharsets.UTF_8)) { - final String trimmed = line.trim(); - if (trimmed.isBlank()) { - continue; - } - paths.add(normalize(Path.of(trimmed))); - } - return paths; - } catch (IOException ioException) { - throw new UncheckedIOException(ioException); - } - } - - private void writeStoredPaths(Iterable paths) { - try { - Files.createDirectories(storageFile.getParent()); - final List lines = new ArrayList<>(); - for (Path path : paths) { - lines.add(normalize(path).toString()); - } - Files.write(storageFile, lines, StandardCharsets.UTF_8); - } catch (IOException ioException) { - throw new UncheckedIOException(ioException); - } - } - - private Path normalize(Path path) { - return Objects.requireNonNull(path, "path").toAbsolutePath().normalize(); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/projects/ProjectCatalogService.java b/prometeu-studio/src/main/java/p/studio/projects/ProjectCatalogService.java deleted file mode 100644 index 5b8d06a7..00000000 --- a/prometeu-studio/src/main/java/p/studio/projects/ProjectCatalogService.java +++ /dev/null @@ -1,257 +0,0 @@ -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; - -import java.io.IOException; -import java.io.UncheckedIOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Comparator; -import java.util.List; -import java.util.Locale; -import java.util.Objects; -import java.util.stream.Stream; - -public final class ProjectCatalogService { - private static final String MANIFEST_FILE_NAME = "prometeu.json"; - private static final ObjectMapper MAPPER = new ObjectMapper(); - private final Path projectsRoot; - private final ProjectLocalStudioSetupService projectLocalStudioSetupService = new ProjectLocalStudioSetupService(); - - public ProjectCatalogService(Path projectsRoot) { - this.projectsRoot = Objects.requireNonNull(projectsRoot, "projectsRoot").toAbsolutePath().normalize(); - } - - public Path projectsRoot() { - return projectsRoot; - } - - public List listProjects() { - if (!Files.isDirectory(projectsRoot)) { - return List.of(); - } - - try (Stream children = Files.list(projectsRoot)) { - return children - .filter(this::isValidProjectRoot) - .map(this::buildReference) - .sorted(Comparator.comparing(ProjectReference::name, String.CASE_INSENSITIVE_ORDER)) - .toList(); - } catch (IOException ioException) { - throw new UncheckedIOException(ioException); - } - } - - public ProjectReference openProject(Path projectPath) { - final Path normalized = Objects.requireNonNull(projectPath, "projectPath").toAbsolutePath().normalize(); - return openProjectManifest(manifestPath(normalized)); - } - - public ProjectReference openProjectManifest(Path manifestPath) { - final Path normalizedManifest = Objects.requireNonNull(manifestPath, "manifestPath") - .toAbsolutePath() - .normalize(); - if (!normalizedManifest.getFileName().toString().equals(MANIFEST_FILE_NAME)) { - throw new IllegalArgumentException("expected " + MANIFEST_FILE_NAME + ": " + normalizedManifest); - } - if (!Files.isRegularFile(normalizedManifest)) { - throw new IllegalArgumentException("project manifest not found: expected " + normalizedManifest); - } - - final Path projectRoot = normalizedManifest.getParent(); - if (projectRoot == null || !Files.isDirectory(projectRoot)) { - throw new IllegalArgumentException("project root does not exist: " + normalizedManifest); - } - - return buildReference(projectRoot); - } - - public ProjectReference createProject(String projectName) { - 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, AppMode.Game, "src", 4, null)); - } - - public ProjectReference createProject(ProjectCreationRequest request) { - final String displayName = Objects.requireNonNull(request.projectName(), "request.projectName").trim(); - final String sanitized = sanitizeProjectName(displayName); - if (displayName.isBlank() || sanitized.isBlank()) { - throw new IllegalArgumentException("project name must not be blank"); - } - final String languageId = Objects.requireNonNull(request.languageId(), "request.languageId").trim(); - if (languageId.isBlank()) { - throw new IllegalArgumentException("project language must not be blank"); - } - 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"); - } - - final Path sourceRoot = normalizeSourceRoot(request.sourceRoot()); - final Path normalizedParent = Objects.requireNonNull(request.parentLocation(), "request.parentLocation") - .toAbsolutePath() - .normalize(); - if (Files.exists(normalizedParent) && !Files.isDirectory(normalizedParent)) { - throw new IllegalArgumentException("project location is not a directory: " + normalizedParent); - } - - final Path projectRoot = normalizedParent.resolve(sanitized).normalize(); - if (Files.exists(projectRoot)) { - throw new IllegalArgumentException("project already exists: " + sanitized); - } - - try { - Files.createDirectories(normalizedParent); - Files.createDirectories(projectRoot.resolve(".workspace")); - final ProjectReference projectReference = new ProjectReference( - displayName, - "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(), request.target())); - Files.writeString(projectRoot.resolve(".gitignore"), defaultGitIgnore()); - projectLocalStudioSetupService.save( - projectReference, - new ProjectLocalStudioSetup( - request.runtimePath(), - new ProjectLocalStudioSetup.EditorIndentationSetup("spaces", request.indentationWidth()))); - } catch (IOException ioException) { - throw new UncheckedIOException(ioException); - } - - return openProject(projectRoot); - } - - private ProjectReference buildReference(Path projectRoot) { - final Path normalizedRoot = projectRoot.toAbsolutePath().normalize(); - final Path manifestPath = manifestPath(normalizedRoot); - final ProjectManifestSummary manifest; - try { - manifest = MAPPER.readValue(manifestPath.toFile(), ProjectManifestSummary.class); - } catch (IOException ioException) { - throw new UncheckedIOException(ioException); - } - - if (manifest.name() == null || manifest.name().isBlank()) { - throw new IllegalArgumentException("project manifest missing name: " + manifestPath); - } - 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); - } - final int stdlibMajor; - try { - stdlibMajor = Integer.parseInt(Objects.requireNonNull(manifest.stdlib(), "manifest.stdlib").trim()); - } 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); - } - - private boolean isValidProjectRoot(Path path) { - return Files.isDirectory(path) && Files.isRegularFile(manifestPath(path)); - } - - private Path manifestPath(Path projectRoot) { - return projectRoot.resolve(MANIFEST_FILE_NAME); - } - - private Path normalizeSourceRoot(String sourceRoot) { - final String raw = Objects.requireNonNull(sourceRoot, "sourceRoot").trim(); - if (raw.isBlank()) { - throw new IllegalArgumentException("project source root must not be blank"); - } - final Path normalized = Path.of(raw).normalize(); - if (normalized.isAbsolute() || normalized.startsWith("..")) { - throw new IllegalArgumentException("project source root must be a relative project path"); - } - return normalized; - } - - 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, target.exportReferenceName()); - } - - private String defaultGitIgnore() { - return """ - .studio/ - .workspace/ - build/ - - # macOS - .DS_Store - .AppleDouble - .LSOverride - - # Windows - Thumbs.db - Desktop.ini - - # Linux / Unix desktop metadata - .directory - *~ - """; - } - - @JsonIgnoreProperties(ignoreUnknown = true) - private record ProjectManifestSummary(String name, String version, String language, String stdlib, String target) { - } - - private String sanitizeProjectName(String rawName) { - final String normalized = Objects.requireNonNull(rawName, "rawName") - .trim() - .toLowerCase(Locale.ROOT) - .replaceAll("[^a-z0-9]+", "-") - .replaceAll("^-+", "") - .replaceAll("-+$", ""); - return normalized; - } -} diff --git a/prometeu-studio/src/main/java/p/studio/projects/ProjectLanguageCatalogService.java b/prometeu-studio/src/main/java/p/studio/projects/ProjectLanguageCatalogService.java deleted file mode 100644 index fea4319d..00000000 --- a/prometeu-studio/src/main/java/p/studio/projects/ProjectLanguageCatalogService.java +++ /dev/null @@ -1,47 +0,0 @@ -package p.studio.projects; - -import p.studio.compiler.FrontendRegistryService; -import p.studio.compiler.models.FrontendSpec; - -import java.util.Comparator; -import java.util.List; -import java.util.Objects; - -public final class ProjectLanguageCatalogService { - public List listLanguageTemplates() { - return FrontendRegistryService.listProviders().stream() - .map(provider -> toTemplate(provider.specification())) - .sorted(Comparator.comparing(ProjectLanguageTemplate::languageId, String.CASE_INSENSITIVE_ORDER)) - .toList(); - } - - public ProjectLanguageTemplate getDefaultTemplate() { - return listLanguageTemplates().stream() - .findFirst() - .orElseThrow(() -> new IllegalStateException("no frontend languages are registered")); - } - - private ProjectLanguageTemplate toTemplate(FrontendSpec frontendSpec) { - final List sourceRoots = frontendSpec.getSourceRoots().stream() - .sorted(String.CASE_INSENSITIVE_ORDER) - .toList(); - final List stdlibOptions = frontendSpec.getStdlibVersions().stream() - .map(stdlib -> new ProjectLanguageTemplate.StdlibOption(stdlib.version(), stdlib.type())) - .sorted(Comparator.comparingInt(ProjectLanguageTemplate.StdlibOption::version)) - .toList(); - final ProjectLanguageTemplate.StdlibOption defaultStdlib = stdlibOptions.stream() - .filter(option -> option.type() == FrontendSpec.StdlibType.DEFAULT) - .findFirst() - .or(() -> stdlibOptions.stream().findFirst()) - .orElse(new ProjectLanguageTemplate.StdlibOption(1, FrontendSpec.StdlibType.DEFAULT)); - final String defaultSourceRoot = sourceRoots.stream() - .findFirst() - .orElse("src"); - return new ProjectLanguageTemplate( - Objects.requireNonNull(frontendSpec.getLanguageId(), "frontendSpec.languageId"), - stdlibOptions, - defaultStdlib, - sourceRoots, - defaultSourceRoot); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/projects/ProjectLanguageTemplate.java b/prometeu-studio/src/main/java/p/studio/projects/ProjectLanguageTemplate.java deleted file mode 100644 index 9d7ccf4c..00000000 --- a/prometeu-studio/src/main/java/p/studio/projects/ProjectLanguageTemplate.java +++ /dev/null @@ -1,24 +0,0 @@ -package p.studio.projects; - -import p.studio.compiler.models.FrontendSpec; - -import java.util.List; - -public record ProjectLanguageTemplate( - String languageId, - List stdlibOptions, - StdlibOption defaultStdlib, - List sourceRoots, - String defaultSourceRoot) { - - public record StdlibOption(int version, FrontendSpec.StdlibType type) { - @Override - public String toString() { - return switch (type) { - case DEFAULT -> version + " (default)"; - case STABLE -> version + " (stable)"; - case EXPERIMENTAL -> version + " (experimental)"; - }; - } - } -} diff --git a/prometeu-studio/src/main/java/p/studio/projects/ProjectReference.java b/prometeu-studio/src/main/java/p/studio/projects/ProjectReference.java deleted file mode 100644 index e6a622fd..00000000 --- a/prometeu-studio/src/main/java/p/studio/projects/ProjectReference.java +++ /dev/null @@ -1,48 +0,0 @@ -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; - -public record ProjectReference( - String name, - String version, - String languageId, - int stdlibVersion, - AppMode target, - Path rootPath) { - @Override - public String toString() { - return name; - } - - private Path absoluteRootPath() { - return rootPath().toAbsolutePath().normalize(); - } - - private String displayRelativePath(final String resolve) { - final Path normalizedPath = rootPath.toAbsolutePath().normalize(); - try { - final var path = StringUtils.isNotBlank(resolve) - ? absoluteRootPath().resolve(resolve) - : absoluteRootPath(); - return path.relativize(normalizedPath).toString().replace('\\', '/'); - } catch (IllegalArgumentException ignored) { - return normalizedPath.toString().replace('\\', '/'); - } - } - - public PackerProjectContext toPackerProjectContext() { - return new PackerProjectContext(name, absoluteRootPath()); - } - - public LspProjectContext toLspProjectContext() { - return new LspProjectContext( - rootPath().toAbsolutePath().normalize().toString(), - languageId(), - rootPath()); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/projects/ProjectStudioPaths.java b/prometeu-studio/src/main/java/p/studio/projects/ProjectStudioPaths.java deleted file mode 100644 index 1a88793f..00000000 --- a/prometeu-studio/src/main/java/p/studio/projects/ProjectStudioPaths.java +++ /dev/null @@ -1,43 +0,0 @@ -package p.studio.projects; - -import java.nio.file.Path; -import java.util.Objects; - -public final class ProjectStudioPaths { - private static final String STUDIO_DIR = ".studio"; - private static final String ACTIVITIES_FILE = "activities.json"; - private static final String SETUP_FILE = "setup.json"; - private static final String STATE_FILE = "state.json"; - - private ProjectStudioPaths() { - } - - public static Path studioRoot(ProjectReference projectReference) { - return Objects.requireNonNull(projectReference, "projectReference") - .rootPath() - .resolve(STUDIO_DIR) - .toAbsolutePath() - .normalize(); - } - - public static Path activitiesPath(ProjectReference projectReference) { - return studioRoot(projectReference) - .resolve(ACTIVITIES_FILE) - .toAbsolutePath() - .normalize(); - } - - public static Path statePath(ProjectReference projectReference) { - return studioRoot(projectReference) - .resolve(STATE_FILE) - .toAbsolutePath() - .normalize(); - } - - public static Path setupPath(ProjectReference projectReference) { - return studioRoot(projectReference) - .resolve(SETUP_FILE) - .toAbsolutePath() - .normalize(); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/projectsessions/StudioProjectSession.java b/prometeu-studio/src/main/java/p/studio/projectsessions/StudioProjectSession.java deleted file mode 100644 index 107c344a..00000000 --- a/prometeu-studio/src/main/java/p/studio/projectsessions/StudioProjectSession.java +++ /dev/null @@ -1,104 +0,0 @@ -package p.studio.projectsessions; - -import p.studio.execution.StudioExecutionSessionService; -import p.studio.lsp.api.LspServerLifecycle; -import p.studio.projects.ProjectReference; -import p.studio.projectstate.ProjectLocalStudioSetup; -import p.studio.projectstate.ProjectLocalStudioState; -import p.studio.projectstate.ProjectLocalStudioStateService; - -import java.util.Objects; - -public final class StudioProjectSession implements AutoCloseable { - private final ProjectReference projectReference; - private final ProjectLocalStudioStateService projectLocalStudioStateService; - private final ProjectLocalStudioSetup projectLocalStudioSetup; - private final StudioExecutionSessionService executionSessionService; - private final LspServerLifecycle lspServerLifecycle; - private ProjectLocalStudioState projectLocalStudioState; - private boolean closed; - - public StudioProjectSession( - final ProjectReference projectReference) { - this( - projectReference, - new ProjectLocalStudioStateService(), - ProjectLocalStudioSetup.defaults(), - new StudioExecutionSessionService(), - null, - ProjectLocalStudioState.defaults()); - } - - StudioProjectSession( - final ProjectReference projectReference, - final ProjectLocalStudioStateService projectLocalStudioStateService, - final ProjectLocalStudioSetup projectLocalStudioSetup, - final StudioExecutionSessionService executionSessionService, - final LspServerLifecycle lspServerLifecycle, - final ProjectLocalStudioState projectLocalStudioState) { - this.projectReference = Objects.requireNonNull(projectReference, "projectReference"); - this.projectLocalStudioStateService = Objects.requireNonNull(projectLocalStudioStateService, "projectLocalStudioStateService"); - this.projectLocalStudioSetup = Objects.requireNonNull(projectLocalStudioSetup, "projectLocalStudioSetup"); - this.executionSessionService = Objects.requireNonNull(executionSessionService, "executionSessionService"); - this.lspServerLifecycle = lspServerLifecycle; - this.projectLocalStudioState = Objects.requireNonNull(projectLocalStudioState, "projectLocalStudioState"); - } - - public ProjectReference projectReference() { - return projectReference; - } - - public ProjectLocalStudioState projectLocalStudioState() { - return projectLocalStudioState; - } - - public ProjectLocalStudioSetup projectLocalStudioSetup() { - return projectLocalStudioSetup; - } - - public StudioExecutionSessionService executionSession() { - return executionSessionService; - } - - public void replaceProjectLocalStudioState(final ProjectLocalStudioState nextProjectLocalStudioState) { - this.projectLocalStudioState = Objects.requireNonNull(nextProjectLocalStudioState, "nextProjectLocalStudioState"); - } - - public void saveProjectLocalStudioState() { - projectLocalStudioStateService.save(projectReference, projectLocalStudioState); - } - - @Override - public void close() { - if (closed) { - return; - } - closed = true; - RuntimeException failure = null; - try { - saveProjectLocalStudioState(); - } catch (RuntimeException runtimeException) { - failure = runtimeException; - } - try { - shutdownLspServer(); - } catch (RuntimeException runtimeException) { - if (failure == null) { - failure = runtimeException; - } else { - failure.addSuppressed(runtimeException); - } - } finally { - if (failure != null) { - throw failure; - } - } - } - - private void shutdownLspServer() { - if (lspServerLifecycle == null) { - return; - } - lspServerLifecycle.shutdownServer(projectReference.toLspProjectContext()); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/projectsessions/StudioProjectSessionFactory.java b/prometeu-studio/src/main/java/p/studio/projectsessions/StudioProjectSessionFactory.java deleted file mode 100644 index 2004d2ab..00000000 --- a/prometeu-studio/src/main/java/p/studio/projectsessions/StudioProjectSessionFactory.java +++ /dev/null @@ -1,46 +0,0 @@ -package p.studio.projectsessions; - -import p.studio.execution.StudioExecutionSessionService; -import p.studio.lsp.api.LspServerLifecycle; -import p.studio.lsp.messages.LspServerConfiguration; -import p.studio.projects.ProjectReference; -import p.studio.projectstate.ProjectLocalStudioSetupService; -import p.studio.projectstate.ProjectLocalStudioStateService; - -import java.util.Objects; - -public final class StudioProjectSessionFactory { - private final ProjectLocalStudioStateService projectLocalStudioStateService; - private final ProjectLocalStudioSetupService projectLocalStudioSetupService; - private final LspServerLifecycle lspServerLifecycle; - - public StudioProjectSessionFactory(final LspServerLifecycle lspServerLifecycle) { - this( - new ProjectLocalStudioStateService(), - new ProjectLocalStudioSetupService(), - Objects.requireNonNull(lspServerLifecycle, "lspServerLifecycle")); - } - - StudioProjectSessionFactory( - final ProjectLocalStudioStateService projectLocalStudioStateService, - final ProjectLocalStudioSetupService projectLocalStudioSetupService, - final LspServerLifecycle lspServerLifecycle) { - this.projectLocalStudioStateService = Objects.requireNonNull(projectLocalStudioStateService, "projectLocalStudioStateService"); - this.projectLocalStudioSetupService = Objects.requireNonNull(projectLocalStudioSetupService, "projectLocalStudioSetupService"); - this.lspServerLifecycle = Objects.requireNonNull(lspServerLifecycle, "lspServerLifecycle"); - } - - public StudioProjectSession open(final ProjectReference projectReference) { - final ProjectReference target = Objects.requireNonNull(projectReference, "projectReference"); - final var setup = projectLocalStudioSetupService.load(target); - final var state = projectLocalStudioStateService.load(target); - lspServerLifecycle.bootServer(LspServerConfiguration.defaults(), target.toLspProjectContext()); - return new StudioProjectSession( - target, - projectLocalStudioStateService, - setup, - new StudioExecutionSessionService(), - lspServerLifecycle, - state); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/projectstate/ProjectLocalStudioSetupService.java b/prometeu-studio/src/main/java/p/studio/projectstate/ProjectLocalStudioSetupService.java deleted file mode 100644 index 22b0f26e..00000000 --- a/prometeu-studio/src/main/java/p/studio/projectstate/ProjectLocalStudioSetupService.java +++ /dev/null @@ -1,39 +0,0 @@ -package p.studio.projectstate; - -import com.fasterxml.jackson.databind.ObjectMapper; -import p.studio.projects.ProjectReference; -import p.studio.projects.ProjectStudioPaths; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Objects; - -public class ProjectLocalStudioSetupService { - private static final ObjectMapper MAPPER = new ObjectMapper(); - - public ProjectLocalStudioSetup load(final ProjectReference projectReference) { - final Path setupPath = ProjectStudioPaths.setupPath(projectReference); - if (!Files.isRegularFile(setupPath)) { - return ProjectLocalStudioSetup.defaults(); - } - - try { - final ProjectLocalStudioSetup loaded = MAPPER.readValue(setupPath.toFile(), ProjectLocalStudioSetup.class); - return loaded == null ? ProjectLocalStudioSetup.defaults() : loaded; - } catch (IOException | RuntimeException ignored) { - return ProjectLocalStudioSetup.defaults(); - } - } - - public void save(final ProjectReference projectReference, final ProjectLocalStudioSetup setup) { - final Path setupPath = ProjectStudioPaths.setupPath(projectReference); - final ProjectLocalStudioSetup normalized = Objects.requireNonNull(setup, "setup"); - try { - Files.createDirectories(setupPath.getParent()); - MAPPER.writerWithDefaultPrettyPrinter().writeValue(setupPath.toFile(), normalized); - } catch (IOException ioException) { - throw new RuntimeException("unable to save project setup: " + setupPath, ioException); - } - } -} diff --git a/prometeu-studio/src/main/java/p/studio/projectstate/ProjectLocalStudioStateService.java b/prometeu-studio/src/main/java/p/studio/projectstate/ProjectLocalStudioStateService.java deleted file mode 100644 index de914324..00000000 --- a/prometeu-studio/src/main/java/p/studio/projectstate/ProjectLocalStudioStateService.java +++ /dev/null @@ -1,45 +0,0 @@ -package p.studio.projectstate; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import p.studio.projects.ProjectReference; -import p.studio.projects.ProjectStudioPaths; - -import java.io.IOException; -import java.io.UncheckedIOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Objects; - -public class ProjectLocalStudioStateService { - private static final ObjectMapper MAPPER = new ObjectMapper() - .enable(SerializationFeature.INDENT_OUTPUT); - - public ProjectLocalStudioState load(final ProjectReference projectReference) { - final Path statePath = ProjectStudioPaths.statePath(projectReference); - if (!Files.isRegularFile(statePath)) { - return ProjectLocalStudioState.defaults(); - } - - try { - final ProjectLocalStudioState loaded = MAPPER.readValue(statePath.toFile(), ProjectLocalStudioState.class); - if (loaded == null || loaded.version() != ProjectLocalStudioState.CURRENT_VERSION) { - return ProjectLocalStudioState.defaults(); - } - return loaded; - } catch (IOException | RuntimeException ignored) { - return ProjectLocalStudioState.defaults(); - } - } - - public void save(final ProjectReference projectReference, final ProjectLocalStudioState state) { - final Path statePath = ProjectStudioPaths.statePath(projectReference); - final ProjectLocalStudioState normalized = Objects.requireNonNull(state, "state"); - try { - Files.createDirectories(statePath.getParent()); - MAPPER.writeValue(statePath.toFile(), normalized); - } catch (IOException ioException) { - throw new UncheckedIOException(ioException); - } - } -} diff --git a/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperLogEntry.java b/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperLogEntry.java deleted file mode 100644 index 7aeee2dd..00000000 --- a/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperLogEntry.java +++ /dev/null @@ -1,33 +0,0 @@ -package p.studio.shipper; - -import java.time.Instant; -import java.util.Objects; - -public record StudioShipperLogEntry( - StudioShipperLogSource source, - StudioShipperLogLevel level, - String message, - Instant timestamp) { - - public StudioShipperLogEntry { - Objects.requireNonNull(source, "source"); - Objects.requireNonNull(level, "level"); - message = Objects.requireNonNull(message, "message").trim(); - timestamp = timestamp == null ? Instant.now() : timestamp; - if (message.isBlank()) { - throw new IllegalArgumentException("message must not be blank"); - } - } - - public static StudioShipperLogEntry info( - final StudioShipperLogSource source, - final String message) { - return new StudioShipperLogEntry(source, StudioShipperLogLevel.INFO, message, Instant.now()); - } - - public static StudioShipperLogEntry error( - final StudioShipperLogSource source, - final String message) { - return new StudioShipperLogEntry(source, StudioShipperLogLevel.ERROR, message, Instant.now()); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperLogLevel.java b/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperLogLevel.java deleted file mode 100644 index 4c1f2224..00000000 --- a/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperLogLevel.java +++ /dev/null @@ -1,6 +0,0 @@ -package p.studio.shipper; - -public enum StudioShipperLogLevel { - INFO, - ERROR -} diff --git a/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperLogSource.java b/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperLogSource.java deleted file mode 100644 index 4f86b129..00000000 --- a/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperLogSource.java +++ /dev/null @@ -1,8 +0,0 @@ -package p.studio.shipper; - -public enum StudioShipperLogSource { - BUILD, - PACK_VALIDATION, - PACK, - MANIFEST -} diff --git a/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperPreparationStatus.java b/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperPreparationStatus.java deleted file mode 100644 index b26f65e8..00000000 --- a/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperPreparationStatus.java +++ /dev/null @@ -1,6 +0,0 @@ -package p.studio.shipper; - -public enum StudioShipperPreparationStatus { - SUCCESS, - FAILED -} diff --git a/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperPrepareResult.java b/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperPrepareResult.java deleted file mode 100644 index 5b3c974d..00000000 --- a/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperPrepareResult.java +++ /dev/null @@ -1,28 +0,0 @@ -package p.studio.shipper; - -import p.packer.messages.PackWorkspaceResult; -import p.packer.messages.ValidatePackWorkspaceResult; -import p.studio.compiler.models.BuildResult; - -import java.nio.file.Path; -import java.util.List; -import java.util.Objects; - -public record StudioShipperPrepareResult( - StudioShipperPreparationStatus status, - List logs, - BuildResult buildResult, - ValidatePackWorkspaceResult validationResult, - PackWorkspaceResult packResult, - Path manifestPath) { - - public StudioShipperPrepareResult { - Objects.requireNonNull(status, "status"); - logs = List.copyOf(Objects.requireNonNull(logs, "logs")); - manifestPath = manifestPath == null ? null : manifestPath.toAbsolutePath().normalize(); - } - - public boolean success() { - return status == StudioShipperPreparationStatus.SUCCESS; - } -} diff --git a/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperService.java b/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperService.java deleted file mode 100644 index ad8f5b7c..00000000 --- a/prometeu-studio/src/main/java/p/studio/shipper/StudioShipperService.java +++ /dev/null @@ -1,265 +0,0 @@ -package p.studio.shipper; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import p.packer.PackerWorkspaceService; -import p.packer.dtos.PackerDiagnosticDTO; -import p.packer.dtos.PackerPackValidationAssetDTO; -import p.packer.messages.*; -import p.studio.Container; -import p.studio.compiler.messages.BuilderPipelineConfig; -import p.studio.compiler.models.BuildResult; -import p.studio.compiler.models.BuilderPipelineContext; -import p.studio.compiler.workspaces.BuilderPipelineService; -import p.studio.projects.ProjectReference; -import p.studio.utilities.logs.LogAggregator; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Objects; -import java.util.function.Consumer; - -public final class StudioShipperService { - private static final String BUILD_DIR = "build"; - private static final String MANIFEST_FILE = "manifest.json"; - private static final String PROJECT_MANIFEST_FILE = "prometeu.json"; - private static final String ASSET_TABLE_FILE = "asset_table.json"; - private static final String PRELOAD_FILE = "preload.json"; - private static final ObjectMapper MAPPER = new ObjectMapper(); - private final PackerWorkspaceService packerWorkspaceService; - - public StudioShipperService() { - this(Container.packer().workspaceService()); - } - - public StudioShipperService(final PackerWorkspaceService packerWorkspaceService) { - this.packerWorkspaceService = Objects.requireNonNull(packerWorkspaceService, "packerWorkspaceService"); - } - - public StudioShipperPrepareResult prepare(final ProjectReference projectReference) { - return prepare(projectReference, ignored -> { }); - } - - public StudioShipperPrepareResult prepare( - final ProjectReference projectReference, - final Consumer logSink) { - final ProjectReference safeProjectReference = Objects.requireNonNull(projectReference, "projectReference"); - final Consumer safeLogSink = Objects.requireNonNull(logSink, "logSink"); - final ArrayList logs = new ArrayList<>(); - - try { - final BuildResult buildResult = build(safeProjectReference, logs, safeLogSink); - final ValidatePackWorkspaceResult validationResult = validatePack(safeProjectReference, logs, safeLogSink); - if (!validationResult.canPack()) { - emit(logs, safeLogSink, StudioShipperLogEntry.error( - StudioShipperLogSource.PACK_VALIDATION, - validationResult.summary())); - logBlockedAssets(validationResult.assets(), logs, safeLogSink); - return new StudioShipperPrepareResult( - StudioShipperPreparationStatus.FAILED, - logs, - buildResult, - validationResult, - null, - null); - } - - final PackWorkspaceResult packResult = pack(safeProjectReference, logs, safeLogSink); - if (packResult.status() != PackerOperationStatus.SUCCESS) { - emit(logs, safeLogSink, logFor(packResult.status(), StudioShipperLogSource.PACK, packResult.summary())); - return new StudioShipperPrepareResult( - StudioShipperPreparationStatus.FAILED, - logs, - buildResult, - validationResult, - packResult, - null); - } - - final Path manifestPath = writeManifest(safeProjectReference, buildResult, logs, safeLogSink); - return new StudioShipperPrepareResult( - StudioShipperPreparationStatus.SUCCESS, - logs, - buildResult, - validationResult, - packResult, - manifestPath); - } catch (RuntimeException runtimeException) { - emit(logs, safeLogSink, StudioShipperLogEntry.error( - StudioShipperLogSource.BUILD, - runtimeException.getMessage() == null ? runtimeException.getClass().getSimpleName() : runtimeException.getMessage())); - return new StudioShipperPrepareResult( - StudioShipperPreparationStatus.FAILED, - logs, - null, - null, - null, - null); - } - } - - private BuildResult build( - final ProjectReference projectReference, - final List logs, - final Consumer logSink) { - final var config = new BuilderPipelineConfig(false, projectReference.rootPath().toString()); - final var ctx = BuilderPipelineContext.fromConfig(config); - final var logAggregator = LogAggregator.with(message -> emit(logs, logSink, StudioShipperLogEntry.info( - StudioShipperLogSource.BUILD, - normalizeMessage(message)))); - final BuildResult result = BuilderPipelineService.INSTANCE.build(ctx, logAggregator); - if (result.bytecodeArtifactPath() != null) { - emit(logs, logSink, StudioShipperLogEntry.info( - StudioShipperLogSource.BUILD, - "Prepared program bytecode at " + result.bytecodeArtifactPath().toAbsolutePath().normalize())); - } - return result; - } - - private ValidatePackWorkspaceResult validatePack( - final ProjectReference projectReference, - final List logs, - final Consumer logSink) { - final ValidatePackWorkspaceResult result = packerWorkspaceService - .validatePackWorkspace(new ValidatePackWorkspaceRequest(projectReference.toPackerProjectContext())); - // keep the validation source explicit even when the downstream packer reports partial status - emit(logs, logSink, logFor(result.status(), StudioShipperLogSource.PACK_VALIDATION, result.summary())); - if (!result.canPack()) { - logBlockedAssets(result.assets(), logs, logSink); - } - return result; - } - - private PackWorkspaceResult pack( - final ProjectReference projectReference, - final List logs, - final Consumer logSink) { - final PackWorkspaceResult result = packerWorkspaceService - .packWorkspace(new PackWorkspaceRequest(projectReference.toPackerProjectContext())); - emit(logs, logSink, logFor(result.status(), StudioShipperLogSource.PACK, result.summary())); - result.result().emittedArtifacts().forEach(artifact -> emit(logs, logSink, StudioShipperLogEntry.info( - StudioShipperLogSource.PACK, - "Emitted " + artifact.label() + " at " + artifact.path()))); - return result; - } - - private Path writeManifest( - final ProjectReference projectReference, - final BuildResult buildResult, - final List logs, - final Consumer logSink) { - final Path buildRoot = projectReference.rootPath().resolve(BUILD_DIR).toAbsolutePath().normalize(); - final Path manifestPath = buildRoot.resolve(MANIFEST_FILE); - try { - Files.createDirectories(buildRoot); - final ObjectNode manifest = createManifest(projectReference, buildResult); - MAPPER.writerWithDefaultPrettyPrinter().writeValue(manifestPath.toFile(), manifest); - emit(logs, logSink, StudioShipperLogEntry.info( - StudioShipperLogSource.MANIFEST, - "Generated manifest at " + manifestPath)); - return manifestPath; - } catch (IOException ioException) { - emit(logs, logSink, StudioShipperLogEntry.error( - StudioShipperLogSource.MANIFEST, - "Failed to write manifest: " + manifestPath)); - throw new RuntimeException("failed to write build manifest: " + manifestPath, ioException); - } - } - - private ObjectNode createManifest( - final ProjectReference projectReference, - final BuildResult buildResult) throws IOException { - final ObjectNode manifest = MAPPER.createObjectNode(); - manifest.put("magic", "PMTU"); - manifest.put("cartridge_version", 1); - manifest.put("app_id", stableAppId(projectReference)); - manifest.put("title", projectReference.name()); - manifest.put("app_version", projectReference.version()); - 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))); - return manifest; - } - - private ArrayNode capabilitiesNode(final BuildResult buildResult) { - final ArrayNode capabilities = MAPPER.createArrayNode(); - final var irBackend = buildResult.compileResult().analysisSnapshot().irBackend(); - final LinkedHashSet distinct = new LinkedHashSet<>(irBackend.getReservedMetadata().requiredCapabilities().asList()); - distinct.forEach(capabilities::add); - return capabilities; - } - - private JsonNode readArrayOrEmpty(final Path path) throws IOException { - if (!Files.isRegularFile(path)) { - return MAPPER.createArrayNode(); - } - final JsonNode loaded = MAPPER.readTree(path.toFile()); - return loaded != null && loaded.isArray() ? loaded : MAPPER.createArrayNode(); - } - - private int stableAppId(final ProjectReference projectReference) { - final int hash = Objects.hash( - projectReference.name(), - projectReference.version(), - projectReference.languageId(), - projectReference.stdlibVersion()); - return hash == Integer.MIN_VALUE ? 1 : Math.max(1, Math.abs(hash)); - } - - private void putIfTextual( - final ObjectNode node, - final String fieldName, - final JsonNode value) { - if (value != null && value.isTextual() && !value.asText().isBlank()) { - node.put(fieldName, value.asText()); - } - } - - private void logBlockedAssets( - final List assets, - final List logs, - final Consumer logSink) { - for (final PackerPackValidationAssetDTO asset : assets) { - emit(logs, logSink, StudioShipperLogEntry.error( - StudioShipperLogSource.PACK_VALIDATION, - "Blocked asset #" + asset.assetId() + " (" + asset.assetName() + ")")); - for (final PackerDiagnosticDTO diagnostic : asset.diagnostics()) { - emit(logs, logSink, StudioShipperLogEntry.error( - StudioShipperLogSource.PACK_VALIDATION, - diagnostic.message())); - } - } - } - - private StudioShipperLogEntry logFor( - final PackerOperationStatus status, - final StudioShipperLogSource source, - final String message) { - return status == PackerOperationStatus.FAILED || status == PackerOperationStatus.PARTIAL - ? StudioShipperLogEntry.error(source, message) - : StudioShipperLogEntry.info(source, message); - } - - private void emit( - final List logs, - final Consumer logSink, - final StudioShipperLogEntry entry) { - logs.add(entry); - logSink.accept(entry); - } - - private String normalizeMessage(final String message) { - if (message == null) { - return "(empty build log entry)"; - } - final String trimmed = message.strip(); - return trimmed.isEmpty() ? "(empty build log entry)" : trimmed; - } -} diff --git a/prometeu-studio/src/main/java/p/studio/utilities/FrontendVisualThemeCssRenderer.java b/prometeu-studio/src/main/java/p/studio/utilities/FrontendVisualThemeCssRenderer.java deleted file mode 100644 index 24fef5ab..00000000 --- a/prometeu-studio/src/main/java/p/studio/utilities/FrontendVisualThemeCssRenderer.java +++ /dev/null @@ -1,69 +0,0 @@ -package p.studio.utilities; - -import p.studio.compiler.models.FrontendSemanticPresentationSpec; -import p.studio.compiler.models.FrontendTokenStyleSpec; -import p.studio.compiler.models.FrontendVisualThemeSpec; - -import java.util.Objects; - -public final class FrontendVisualThemeCssRenderer { - - public String renderDefaultTheme( - final String languageId, - final FrontendSemanticPresentationSpec presentation) { - Objects.requireNonNull(presentation, "presentation"); - return renderTheme(languageId, presentation.defaultTheme()); - } - - public String renderTheme( - final String languageId, - final FrontendVisualThemeSpec theme) { - final String normalizedLanguageId = requireText(languageId, "languageId"); - final FrontendVisualThemeSpec resolvedTheme = Objects.requireNonNull(theme, "theme"); - final String editorSelector = ".editor-workspace-code-area-type-" + normalizedLanguageId; - final String statusChipSelector = ".editor-workspace-status-chip-type-" + normalizedLanguageId; - final StringBuilder css = new StringBuilder(); - - css.append(editorSelector).append(" {\n") - .append(" -fx-highlight-fill: ").append(resolvedTheme.editorPalette().activeHighlightBackground()).append(";\n") - .append("}\n\n") - .append(editorSelector).append(" .text {\n") - .append(" -fx-fill: ").append(resolvedTheme.editorPalette().baseForeground()).append(";\n") - .append("}\n\n") - .append(editorSelector).append(" .lineno {\n") - .append(" -fx-text-fill: ").append(resolvedTheme.editorPalette().lineNumberForeground()).append(";\n") - .append("}\n\n"); - - for (final FrontendTokenStyleSpec tokenStyle : resolvedTheme.tokenStyles()) { - css.append(editorSelector).append(" .text.editor-semantic-").append(tokenStyle.semanticKey()).append(" {\n") - .append(" -fx-fill: ").append(tokenStyle.foreground()).append(";\n"); - if (tokenStyle.italic()) { - css.append(" -fx-font-style: italic;\n"); - } - if (tokenStyle.bold()) { - css.append(" -fx-font-weight: bold;\n"); - } - if (tokenStyle.underline()) { - css.append(" -fx-underline: true;\n"); - } - css.append("}\n\n"); - } - - css.append(statusChipSelector).append(" {\n") - .append(" -fx-background-color: ").append(resolvedTheme.editorPalette().statusChipBackground()).append(";\n") - .append(" -fx-border-color: ").append(resolvedTheme.editorPalette().statusChipBorder()).append(";\n") - .append(" -fx-text-fill: ").append(resolvedTheme.editorPalette().statusChipForeground()).append(";\n") - .append("}\n"); - return css.toString(); - } - - private static String requireText( - final String value, - final String field) { - final String candidate = Objects.requireNonNull(value, field).trim(); - if (candidate.isEmpty()) { - throw new IllegalArgumentException(field + " must not be blank"); - } - return candidate; - } -} diff --git a/prometeu-studio/src/main/java/p/studio/window/MainView.java b/prometeu-studio/src/main/java/p/studio/window/MainView.java deleted file mode 100644 index 3fa406e6..00000000 --- a/prometeu-studio/src/main/java/p/studio/window/MainView.java +++ /dev/null @@ -1,132 +0,0 @@ -package p.studio.window; - -import javafx.scene.layout.BorderPane; -import p.studio.Container; -import p.studio.controls.shell.*; -import p.studio.execution.StudioPlayStopCoordinator; -import p.studio.projectstate.ProjectLocalStudioSetup; -import p.studio.lsp.events.StudioWorkspaceSelectedEvent; -import p.studio.projectstate.ProjectLocalStudioState; -import p.studio.projects.ProjectReference; -import p.studio.projectsessions.StudioProjectSession; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.WorkspaceHost; -import p.studio.workspaces.WorkspaceId; -import p.studio.workspaces.assets.AssetWorkspace; -import p.studio.workspaces.builder.ShipperWorkspace; -import p.studio.workspaces.debug.DebugWorkspace; - -import java.util.List; - -public final class MainView extends BorderPane { - private final WorkspaceHost host = new WorkspaceHost(); - private final ProjectReference projectReference; - private final StudioProjectSession projectSession; - private final AssetWorkspace assetWorkspace; - private final StudioWorkspaceRailControl workspaceRail; - private final StudioPlayStopCoordinator playStopCoordinator; - private boolean initializing; - private boolean workspaceLifecycleInitialized; - - public MainView(final StudioProjectSession projectSession) { - initializing = true; - this.projectSession = projectSession; - this.projectReference = projectSession.projectReference(); - final ProjectLocalStudioState persistedState = projectSession.projectLocalStudioState(); - final ProjectLocalStudioSetup projectSetup = projectSession.projectLocalStudioSetup(); - final var menuBar = new StudioShellMenuBarControl(); - playStopCoordinator = new StudioPlayStopCoordinator( - projectReference, - projectSetup, - projectSession.executionSession(), - this::selectWorkspace); - final var runSurface = new StudioRunSurfaceControl( - projectSession.executionSession(), - playStopCoordinator::play, - playStopCoordinator::stop); - setTop(new StudioShellTopBarControl(menuBar)); - - assetWorkspace = new AssetWorkspace(projectReference); - host.register(assetWorkspace); - assetWorkspace.restoreProjectLocalState(persistedState); - assetWorkspace.setStateChangedAction(this::persistProjectLocalState); - host.register(new DebugWorkspace(projectReference, projectSession.executionSession())); - host.register(new ShipperWorkspace(projectReference)); - - workspaceRail = new StudioWorkspaceRailControl<>( - List.of( - new StudioWorkspaceRailItem<>(WorkspaceId.ASSETS, "📦", Container.i18n().bind(I18n.WORKSPACE_ASSETS)), - new StudioWorkspaceRailItem<>(WorkspaceId.DEBUG, "🎮", Container.i18n().bind(I18n.WORKSPACE_DEBUG)), - new StudioWorkspaceRailItem<>(WorkspaceId.SHIPPER, "⚙️", Container.i18n().bind(I18n.WORKSPACE_SHIPPER)) - ), - this::loadWorkspace); - setLeft(workspaceRail); - setCenter(host); - setRight(new StudioRightUtilityPanelControl( - runSurface, - Container.i18n().bind(I18n.SHELL_ACTIVITY), - new StudioActivityFeedControl(projectReference))); - - final WorkspaceId initialWorkspace = restoreInitialWorkspace(persistedState.openShellState()); - workspaceRail.select(initialWorkspace); - loadWorkspace(initialWorkspace); - workspaceLifecycleInitialized = true; - initializing = false; - } - - public ProjectReference projectReference() { - return projectReference; - } - - public StudioProjectSession projectSession() { - return projectSession; - } - - public void persistProjectLocalState() { - if (initializing) { - return; - } - final WorkspaceId selectedWorkspace = host.getCurrentWorkspaceId() == null ? WorkspaceId.ASSETS : host.getCurrentWorkspaceId(); - final ProjectLocalStudioState current = projectSession.projectLocalStudioState(); - projectSession.replaceProjectLocalStudioState( - current.withOpenShellState(new ProjectLocalStudioState.OpenShellState(selectedWorkspace.name())) - .withShellLayout(new ProjectLocalStudioState.ShellLayout( - assetWorkspace.captureLayoutState()))); - } - - public void reapplyProjectLocalLayout() { - assetWorkspace.reapplyPendingLayoutState(); - } - - public void close() { - playStopCoordinator.shutdown(); - persistProjectLocalState(); - host.deactivateCurrentWorkspace(); - } - - private void loadWorkspace(WorkspaceId workspaceId) { - host.change(workspaceId); - if (workspaceLifecycleInitialized) { - persistProjectLocalState(); - projectSession.saveProjectLocalStudioState(); - } - Container.eventBus().publish(new StudioWorkspaceSelectedEvent(workspaceId)); - } - - private void selectWorkspace(final WorkspaceId workspaceId) { - workspaceRail.select(workspaceId); - loadWorkspace(workspaceId); - } - - private WorkspaceId restoreInitialWorkspace(final ProjectLocalStudioState.OpenShellState openShellState) { - if (openShellState.selectedWorkspaceId() == null) { - return WorkspaceId.ASSETS; - } - try { - return WorkspaceId.valueOf(openShellState.selectedWorkspaceId()); - } catch (IllegalArgumentException ignored) { - return WorkspaceId.ASSETS; - } - } - -} diff --git a/prometeu-studio/src/main/java/p/studio/window/StudioWindowCoordinator.java b/prometeu-studio/src/main/java/p/studio/window/StudioWindowCoordinator.java deleted file mode 100644 index be2b6321..00000000 --- a/prometeu-studio/src/main/java/p/studio/window/StudioWindowCoordinator.java +++ /dev/null @@ -1,233 +0,0 @@ -package p.studio.window; - -import javafx.application.Platform; -import javafx.scene.Scene; -import javafx.stage.Stage; -import javafx.stage.StageStyle; -import p.packer.messages.InitWorkspaceRequest; -import p.studio.Container; -import p.studio.lsp.events.*; -import p.studio.projects.KnownProjectsService; -import p.studio.projects.ProjectCatalogService; -import p.studio.projects.ProjectReference; -import p.studio.projectsessions.StudioProjectSession; -import p.studio.projectsessions.StudioProjectSessionFactory; -import p.studio.utilities.i18n.I18n; - -import java.nio.file.Path; -import java.util.Objects; - -public final class StudioWindowCoordinator { - private static final double LAUNCHER_WIDTH = 760; - private static final double LAUNCHER_HEIGHT = 750; - private static final double PROJECT_LOADING_WIDTH = 460; - private static final double PROJECT_LOADING_HEIGHT = 250; - private static final double PROJECT_WIDTH = 1280; - private static final double PROJECT_HEIGHT = 840; - - private final Stage launcherStage; - private final ProjectCatalogService projectCatalogService; - private final KnownProjectsService knownProjectsService; - private final WindowStateService windowStateService; - private final ProjectLauncherView launcherView; - private final StudioProjectSessionFactory projectSessionFactory; - - public StudioWindowCoordinator(Stage launcherStage) { - this.launcherStage = Objects.requireNonNull(launcherStage, "launcherStage"); - this.projectCatalogService = new ProjectCatalogService(resolveDefaultProjectsRoot()); - this.knownProjectsService = new KnownProjectsService(resolveKnownProjectsStorage(), projectCatalogService); - this.windowStateService = new WindowStateService(resolveWindowStateStorage()); - this.projectSessionFactory = new StudioProjectSessionFactory(Container.lspServerLifecycle()); - this.launcherView = new ProjectLauncherView( - knownProjectsService, - projectCatalogService, - this::openProject, - this::addProject, - this::createProject, - this::forgetProject); - } - - public void showLauncher() { - final Scene scene = new Scene(launcherView, LAUNCHER_WIDTH, LAUNCHER_HEIGHT); - scene.getStylesheets().add(Container.theme().getDefaultTheme()); - - launcherStage.titleProperty().bind(Container.i18n().bind(I18n.APP_TITLE)); - launcherStage.setScene(scene); - windowStateService.installLauncherState(launcherStage, LAUNCHER_WIDTH, LAUNCHER_HEIGHT); - launcherStage.setResizable(false); - launcherStage.setWidth(LAUNCHER_WIDTH); - launcherStage.setHeight(LAUNCHER_HEIGHT); - launcherStage.setMinWidth(LAUNCHER_WIDTH); - launcherStage.setMaxWidth(LAUNCHER_WIDTH); - launcherStage.setMinHeight(LAUNCHER_HEIGHT); - launcherStage.setMaxHeight(LAUNCHER_HEIGHT); - launcherStage.show(); - launcherStage.centerOnScreen(); - launcherStage.toFront(); - } - - private void openProject(ProjectReference projectReference) { - final ProjectReference opened = projectCatalogService.openProject(projectReference.rootPath()); - knownProjectsService.remember(opened); - Container.eventBus().publish(new StudioProjectOpenedEvent()); - openProjectWindow(opened); - } - - private void createProject(ProjectReference projectReference) { - knownProjectsService.remember(projectReference); - Container.eventBus().publish(new StudioProjectCreatedEvent()); - Container.eventBus().publish(new StudioProjectOpenedEvent()); - openProjectWindow(projectReference); - } - - private void addProject(ProjectReference projectReference) { - knownProjectsService.remember(projectReference); - launcherView.reloadProjects(); - } - - private void forgetProject(ProjectReference projectReference) { - knownProjectsService.forget(projectReference); - launcherView.reloadProjects(); - } - - private void openProjectWindow(ProjectReference projectReference) { - final Stage loadingStage = createProjectLoadingStage(projectReference); - launcherStage.hide(); - loadingStage.show(); - loadingStage.centerOnScreen(); - loadingStage.toFront(); - publishProjectLoadingStarted(projectReference); - Container.backgroundTasks().submit(() -> initializeProjectAndOpenWindow(projectReference, loadingStage)); - } - - private Stage createProjectLoadingStage(ProjectReference projectReference) { - final Stage loadingStage = new Stage(StageStyle.UNDECORATED); - loadingStage.initOwner(launcherStage); - loadingStage.setResizable(false); - - final Scene scene = new Scene( - new ProjectLoadingShieldView(projectReference), - PROJECT_LOADING_WIDTH, - PROJECT_LOADING_HEIGHT); - scene.getStylesheets().add(Container.theme().getDefaultTheme()); - loadingStage.setScene(scene); - return loadingStage; - } - - private void initializeProjectAndOpenWindow(ProjectReference projectReference, Stage loadingStage) { - StudioProjectSession projectSession = null; - try { - Container.eventBus().publish(new StudioProjectLoadingProgressEvent( - StudioProjectLoadingPhase.INITIALIZING_SERVICES, - Container.i18n().text(I18n.SHIELD_STATUS_INDEXING), - Progress.INITIALIZING_SERVICES, - false)); - Container.packer() - .workspaceService() - .initWorkspace(new InitWorkspaceRequest(projectReference.toPackerProjectContext())); - Container.eventBus().publish(new StudioProjectLoadingProgressEvent( - StudioProjectLoadingPhase.RESTORING_WORKSPACES, - Container.i18n().text(I18n.SHIELD_STATUS_RESTORING), - Progress.RESTORING_WORKSPACES, - false)); - projectSession = projectSessionFactory.open(projectReference); - final StudioProjectSession readySession = projectSession; - Platform.runLater(() -> finishProjectOpen(readySession, loadingStage)); - } catch (RuntimeException exception) { - if (projectSession != null) { - projectSession.close(); - } - Platform.runLater(() -> failProjectOpen(projectReference, loadingStage, exception)); - } - } - - private void finishProjectOpen(StudioProjectSession projectSession, Stage loadingStage) { - final ProjectReference projectReference = projectSession.projectReference(); - final Stage projectStage = new Stage(); - final MainView mainView = new MainView(projectSession); - final Scene scene = new Scene(mainView, PROJECT_WIDTH, PROJECT_HEIGHT); - scene.getStylesheets().add(Container.theme().getDefaultTheme()); - - projectStage.setTitle(Container.i18n().format(I18n.APP_PROJECT_TITLE, projectReference.name())); - projectStage.setScene(scene); - windowStateService.installProjectShellState(projectStage, projectReference, PROJECT_WIDTH, PROJECT_HEIGHT); - projectStage.setOnHidden(ignored -> { - mainView.close(); - projectSession.close(); - launcherView.reloadProjects(); - launcherStage.show(); - launcherStage.centerOnScreen(); - launcherStage.toFront(); - }); - - Container.eventBus().publish(new StudioProjectLoadingProgressEvent( - StudioProjectLoadingPhase.READY, - Container.i18n().format(I18n.APP_PROJECT_TITLE, projectReference.name()), - Progress.READY, - false)); - Container.eventBus().publish(new StudioProjectLoadingCompletedEvent()); - loadingStage.close(); - projectStage.show(); - projectStage.toFront(); - Platform.runLater(mainView::reapplyProjectLocalLayout); - } - - private void failProjectOpen( - ProjectReference projectReference, - Stage loadingStage, - RuntimeException exception) { - final String message = exception.getMessage() == null || exception.getMessage().isBlank() - ? "Unable to initialize project services for " + projectReference.name() + "." - : exception.getMessage(); - Container.eventBus().publish(new StudioProjectLoadingFailedEvent( - StudioProjectLoadingPhase.INITIALIZING_SERVICES, - message)); - loadingStage.close(); - launcherStage.show(); - launcherStage.centerOnScreen(); - launcherStage.toFront(); - } - - private void publishProjectLoadingStarted(ProjectReference projectReference) { - Container.eventBus().publish(new StudioProjectLoadingStartedEvent()); - Container.eventBus().publish(new StudioProjectLoadingProgressEvent( - StudioProjectLoadingPhase.RESOLVING_PROJECT, - Container.i18n().format(I18n.SHIELD_LOADING_PROJECT, projectReference.name()), - Progress.RESOLVING_PROJECT, - false)); - } - - private static final class Progress { - private static final double RESOLVING_PROJECT = 0.20d; - private static final double INITIALIZING_SERVICES = 0.58d; - private static final double RESTORING_WORKSPACES = 0.86d; - private static final double READY = 1.0d; - - private Progress() { - } - } - - private Path resolveDefaultProjectsRoot() { - Path cursor = Path.of(System.getProperty("user.dir")).toAbsolutePath().normalize(); - while (cursor != null) { - if (cursor.resolve("settings.gradle.kts").toFile().exists() - && cursor.resolve("test-projects").toFile().exists()) { - return cursor.resolve("test-projects"); - } - cursor = cursor.getParent(); - } - return Path.of("test-projects").toAbsolutePath().normalize(); - } - - private Path resolveKnownProjectsStorage() { - return Path.of(System.getProperty("user.home"), ".prometeu-studio", "known-projects.txt") - .toAbsolutePath() - .normalize(); - } - - private Path resolveWindowStateStorage() { - return Path.of(System.getProperty("user.home"), ".prometeu-studio", "window-state.json") - .toAbsolutePath() - .normalize(); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/window/WindowStateService.java b/prometeu-studio/src/main/java/p/studio/window/WindowStateService.java deleted file mode 100644 index 18b9e440..00000000 --- a/prometeu-studio/src/main/java/p/studio/window/WindowStateService.java +++ /dev/null @@ -1,133 +0,0 @@ -package p.studio.window; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import javafx.application.Platform; -import javafx.stage.Stage; -import p.studio.projects.ProjectReference; - -import java.io.IOException; -import java.io.UncheckedIOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Objects; - -public final class WindowStateService { - private static final ObjectMapper MAPPER = new ObjectMapper() - .enable(SerializationFeature.INDENT_OUTPUT); - - private final Path storageFile; - - public WindowStateService(Path storageFile) { - this.storageFile = Objects.requireNonNull(storageFile, "storageFile").toAbsolutePath().normalize(); - } - - public void installLauncherState(Stage stage, double defaultWidth, double defaultHeight) { - final WindowStateRecord launcherState = loadState().launcher(); - stage.setWidth(defaultWidth); - stage.setHeight(defaultHeight); - if (launcherState != null && launcherState.maximized()) { - Platform.runLater(() -> stage.setMaximized(false)); - } - - stage.maximizedProperty().addListener((ignored, oldValue, newValue) -> { - if (Boolean.TRUE.equals(newValue)) { - Platform.runLater(() -> stage.setMaximized(false)); - } - }); - stage.fullScreenProperty().addListener((ignored, oldValue, newValue) -> { - if (Boolean.TRUE.equals(newValue)) { - Platform.runLater(() -> stage.setFullScreen(false)); - } - }); - } - - public void installProjectShellState( - Stage stage, - ProjectReference projectReference, - double defaultWidth, - double defaultHeight) { - final String projectKey = normalizeProjectKey(projectReference); - final WindowStateRecord state = loadState().projects().get(projectKey); - applyState(stage, state, defaultWidth, defaultHeight); - - stage.xProperty().addListener((ignored, oldValue, newValue) -> saveProjectState(projectKey, stage)); - stage.yProperty().addListener((ignored, oldValue, newValue) -> saveProjectState(projectKey, stage)); - stage.widthProperty().addListener((ignored, oldValue, newValue) -> saveProjectState(projectKey, stage)); - stage.heightProperty().addListener((ignored, oldValue, newValue) -> saveProjectState(projectKey, stage)); - stage.maximizedProperty().addListener((ignored, oldValue, newValue) -> saveProjectState(projectKey, stage)); - } - - private void applyState(Stage stage, WindowStateRecord state, double defaultWidth, double defaultHeight) { - stage.setWidth(state != null && state.width() > 0 ? state.width() : defaultWidth); - stage.setHeight(state != null && state.height() > 0 ? state.height() : defaultHeight); - if (state != null && !Double.isNaN(state.x())) { - stage.setX(state.x()); - } - if (state != null && !Double.isNaN(state.y())) { - stage.setY(state.y()); - } - if (state != null && state.maximized()) { - stage.setMaximized(true); - } - } - - private void saveProjectState(String projectKey, Stage stage) { - final WindowStateFile file = loadState(); - file.projects().put(projectKey, new WindowStateRecord( - stage.getX(), - stage.getY(), - stage.getWidth(), - stage.getHeight(), - stage.isMaximized())); - storeState(file); - } - - private WindowStateFile loadState() { - if (!Files.isRegularFile(storageFile)) { - return WindowStateFile.empty(); - } - - try { - final WindowStateFile loaded = MAPPER.readValue(storageFile.toFile(), WindowStateFile.class); - return loaded == null ? WindowStateFile.empty() : loaded.normalize(); - } catch (IOException ioException) { - throw new UncheckedIOException(ioException); - } - } - - private void storeState(WindowStateFile file) { - try { - Files.createDirectories(storageFile.getParent()); - MAPPER.writeValue(storageFile.toFile(), file.normalize()); - } catch (IOException ioException) { - throw new UncheckedIOException(ioException); - } - } - - private String normalizeProjectKey(ProjectReference projectReference) { - return Objects.requireNonNull(projectReference, "projectReference") - .rootPath() - .toAbsolutePath() - .normalize() - .toString(); - } - - @JsonIgnoreProperties(ignoreUnknown = true) - private record WindowStateFile(WindowStateRecord launcher, Map projects) { - private static WindowStateFile empty() { - return new WindowStateFile(null, new LinkedHashMap<>()); - } - - private WindowStateFile normalize() { - return new WindowStateFile(launcher, projects == null ? new LinkedHashMap<>() : new LinkedHashMap<>(projects)); - } - } - - @JsonIgnoreProperties(ignoreUnknown = true) - private record WindowStateRecord(double x, double y, double width, double height, boolean maximized) { - } -} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetListPackerMappings.java b/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetListPackerMappings.java deleted file mode 100644 index 168f3e6a..00000000 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/AssetListPackerMappings.java +++ /dev/null @@ -1,34 +0,0 @@ -package p.studio.workspaces.assets.details; - -import p.packer.dtos.PackerAssetSummaryDTO; -import p.studio.workspaces.assets.metadata.AssetStudioGlyphSpecialization; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetState; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary; -import p.studio.workspaces.assets.messages.AssetWorkspaceBuildParticipation; - -public final class AssetListPackerMappings { - private AssetListPackerMappings() { - } - - public static AssetWorkspaceAssetSummary mapSummary(PackerAssetSummaryDTO summary) { - final AssetWorkspaceAssetState state = switch (summary.state()) { - case REGISTERED -> AssetWorkspaceAssetState.REGISTERED; - case UNREGISTERED -> AssetWorkspaceAssetState.UNREGISTERED; - }; - final AssetWorkspaceBuildParticipation buildParticipation = switch (summary.buildParticipation()) { - case INCLUDED -> AssetWorkspaceBuildParticipation.INCLUDED; - case EXCLUDED -> AssetWorkspaceBuildParticipation.EXCLUDED; - }; - return new AssetWorkspaceAssetSummary( - summary.assetReference(), - summary.identity().assetName(), - state, - buildParticipation, - summary.identity().assetId(), - summary.assetFamily(), - AssetStudioGlyphSpecialization.NONE, - summary.identity().assetRoot(), - summary.preloadEnabled(), - summary.hasDiagnostics()); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetBankCapacityService.java b/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetBankCapacityService.java deleted file mode 100644 index 64bc922b..00000000 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetBankCapacityService.java +++ /dev/null @@ -1,122 +0,0 @@ -package p.studio.workspaces.assets.details.bank; - -import p.packer.messages.assets.AssetFamilyCatalog; -import p.studio.controls.banks.StudioAssetCapacitySeverity; - -import java.util.Map; -import java.util.Objects; - -public final class AssetBankCapacityService { - private static final int TILE_ATLAS_SIZE_PX = 256; - private static final long SOUND_BANK_MAX_BYTES = 1024L * 1024L; - - public AssetDetailsBankCompositionCapacityState evaluate( - AssetFamilyCatalog assetFamily, - int artifactCount, - Map outputMetadata, - Map outputPipeline, - long usedBytes) { - final AssetFamilyCatalog safeFamily = Objects.requireNonNullElse(assetFamily, AssetFamilyCatalog.UNKNOWN); - final Map safeMetadata = Map.copyOf(Objects.requireNonNull(outputMetadata, "outputMetadata")); - final Map safePipeline = Map.copyOf(Objects.requireNonNull(outputPipeline, "outputPipeline")); - return switch (safeFamily) { - case GLYPH_BANK -> evaluateGlyphBank(artifactCount, safeMetadata); - case SCENE_BANK -> new AssetDetailsBankCompositionCapacityState( - 0.0d, - StudioAssetCapacitySeverity.GREEN, - false, - artifactCount + " support files", - ""); - case SOUND_BANK -> evaluateSoundBank(resolveSoundBankUsedBytes(safePipeline, usedBytes)); - case UNKNOWN -> new AssetDetailsBankCompositionCapacityState( - 0.0d, - StudioAssetCapacitySeverity.GREEN, - false, - artifactCount + " selected", - ""); - }; - } - - public int maxArtifactsForGlyphBank(Map outputMetadata) { - final String tileSizeValue = Objects.requireNonNull(outputMetadata, "outputMetadata") - .getOrDefault("tile_size", "16x16"); - return switch (tileSizeValue) { - case "8x8" -> slotsForTileSize(8); - case "32x32" -> slotsForTileSize(32); - default -> slotsForTileSize(16); - }; - } - - private AssetDetailsBankCompositionCapacityState evaluateGlyphBank( - int artifactCount, - Map outputMetadata) { - final int maxSlots = maxArtifactsForGlyphBank(outputMetadata); - final int safeArtifactCount = Math.max(0, artifactCount); - final double progress = maxSlots <= 0 ? 0.0d : (double) safeArtifactCount / (double) maxSlots; - final boolean blocked = safeArtifactCount >= maxSlots; - return new AssetDetailsBankCompositionCapacityState( - progress, - severityFor(progress), - blocked, - safeArtifactCount + " / " + maxSlots, - blocked ? "Glyph bank slot capacity reached." : ""); - } - - private AssetDetailsBankCompositionCapacityState evaluateSoundBank(long usedBytes) { - final long safeUsedBytes = Math.max(0L, usedBytes); - final double progress = (double) safeUsedBytes / (double) SOUND_BANK_MAX_BYTES; - final boolean blocked = safeUsedBytes >= SOUND_BANK_MAX_BYTES; - return new AssetDetailsBankCompositionCapacityState( - progress, - severityFor(progress), - blocked, - safeUsedBytes + " / " + SOUND_BANK_MAX_BYTES + " bytes", - blocked ? "Sound bank byte capacity reached." : ""); - } - - private long resolveSoundBankUsedBytes(Map outputPipeline, long fallbackUsedBytes) { - final Object samplesNode = outputPipeline.get("samples"); - if (!(samplesNode instanceof Map samples)) { - return Math.max(0L, fallbackUsedBytes); - } - long maxEndExclusive = 0L; - for (Object sampleValue : samples.values()) { - if (!(sampleValue instanceof Map sampleMetadata)) { - continue; - } - final long offset = longValue(sampleMetadata.get("offset")); - final long length = Math.max(longValue(sampleMetadata.get("len")), longValue(sampleMetadata.get("length"))); - maxEndExclusive = Math.max(maxEndExclusive, Math.max(0L, offset) + Math.max(0L, length)); - } - return Math.max(maxEndExclusive, Math.max(0L, fallbackUsedBytes)); - } - - private long longValue(Object value) { - if (value instanceof Number number) { - return number.longValue(); - } - if (value instanceof String text) { - try { - return Long.parseLong(text.trim()); - } catch (NumberFormatException ignored) { - return 0L; - } - } - return 0L; - } - - private static int slotsForTileSize(int tileSize) { - final int tilesPerAxis = Math.max(1, TILE_ATLAS_SIZE_PX / tileSize); - return tilesPerAxis * tilesPerAxis; - } - - private StudioAssetCapacitySeverity severityFor(double progress) { - if (progress >= 0.95d) { - return StudioAssetCapacitySeverity.RED; - } - if (progress >= 0.65d) { - return StudioAssetCapacitySeverity.ORANGE; - } - return StudioAssetCapacitySeverity.GREEN; - } -} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsAbstractBankCompositionFamilySupport.java b/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsAbstractBankCompositionFamilySupport.java deleted file mode 100644 index 6416781f..00000000 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsAbstractBankCompositionFamilySupport.java +++ /dev/null @@ -1,80 +0,0 @@ -package p.studio.workspaces.assets.details.bank; - -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; - -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; - -abstract class AssetDetailsAbstractBankCompositionFamilySupport implements AssetDetailsBankCompositionFamilySupport { - @Override - public AssetDetailsBankCompositionDraft createDraft(AssetWorkspaceAssetDetails details) { - final List selectedFiles = details.bankComposition().selectedFiles(); - final var selectedPaths = selectedFiles.stream().map(AssetWorkspaceBankCompositionFile::path).collect(java.util.stream.Collectors.toSet()); - final List availableFiles = details.bankComposition().availableFiles().stream() - .filter(file -> !selectedPaths.contains(file.path())) - .toList(); - return new AssetDetailsBankCompositionDraft(availableFiles, selectedFiles); - } - - @Override - public AssetDetailsBankCompositionDraft moveToSelected( - AssetDetailsBankCompositionDraft draft, - List files) { - final List movableFiles = selectMovableFiles(draft, files); - return draft.removeFromAvailable(movableFiles).appendToSelected(movableFiles); - } - - @Override - public AssetDetailsBankCompositionDraft moveToAvailable( - AssetDetailsBankCompositionDraft draft, - List files) { - final var returnedFiles = new ArrayList<>(files); - returnedFiles.sort(java.util.Comparator.comparing(AssetWorkspaceBankCompositionFile::path, String.CASE_INSENSITIVE_ORDER)); - return draft.removeFromSelected(files).appendToAvailable(returnedFiles); - } - - @Override - public AssetDetailsBankCompositionDraft moveUp(AssetDetailsBankCompositionDraft draft, int selectedIndex) { - if (selectedIndex <= 0 || selectedIndex >= draft.selectedFiles().size()) { - return draft; - } - final List reordered = new ArrayList<>(draft.selectedFiles()); - final AssetWorkspaceBankCompositionFile moved = reordered.remove(selectedIndex); - reordered.add(selectedIndex - 1, moved); - return new AssetDetailsBankCompositionDraft(draft.availableFiles(), reordered); - } - - @Override - public AssetDetailsBankCompositionDraft moveDown(AssetDetailsBankCompositionDraft draft, int selectedIndex) { - if (selectedIndex < 0 || selectedIndex >= draft.selectedFiles().size() - 1) { - return draft; - } - final List reordered = new ArrayList<>(draft.selectedFiles()); - final AssetWorkspaceBankCompositionFile moved = reordered.remove(selectedIndex); - reordered.add(selectedIndex + 1, moved); - return new AssetDetailsBankCompositionDraft(draft.availableFiles(), reordered); - } - - protected abstract boolean canAdd( - AssetDetailsBankCompositionDraft currentDraft, - List accepted, - AssetWorkspaceBankCompositionFile candidate); - - private List selectMovableFiles( - AssetDetailsBankCompositionDraft draft, - List files) { - final var requested = new LinkedHashSet<>(files); - final List movable = new ArrayList<>(); - for (AssetWorkspaceBankCompositionFile file : draft.availableFiles()) { - if (!requested.contains(file)) { - continue; - } - if (canAdd(draft, movable, file)) { - movable.add(file); - } - } - return List.copyOf(movable); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionCapacityState.java b/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionCapacityState.java deleted file mode 100644 index 222188d6..00000000 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionCapacityState.java +++ /dev/null @@ -1,20 +0,0 @@ -package p.studio.workspaces.assets.details.bank; - -import p.studio.controls.banks.StudioAssetCapacitySeverity; - -import java.util.Objects; - -public record AssetDetailsBankCompositionCapacityState( - double progress, - StudioAssetCapacitySeverity severity, - boolean blocked, - String labelText, - String hintText) { - - public AssetDetailsBankCompositionCapacityState { - progress = Math.max(0.0d, Math.min(1.0d, progress)); - severity = severity == null ? StudioAssetCapacitySeverity.GREEN : severity; - labelText = Objects.requireNonNullElse(labelText, ""); - hintText = Objects.requireNonNullElse(hintText, ""); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionCoordinator.java b/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionCoordinator.java deleted file mode 100644 index cdba82ef..00000000 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionCoordinator.java +++ /dev/null @@ -1,115 +0,0 @@ -package p.studio.workspaces.assets.details.bank; - -import p.studio.controls.forms.StudioFormMode; -import p.studio.controls.forms.StudioFormSession; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; - -import java.util.List; -import java.util.Objects; - -public final class AssetDetailsBankCompositionCoordinator { - private final List familySupports = List.of( - new AssetDetailsGlyphBankCompositionFamilySupport(), - new AssetDetailsSoundBankCompositionFamilySupport(), - new AssetDetailsFallbackBankCompositionFamilySupport()); - - private AssetDetailsBankCompositionFamilySupport familySupport; - private StudioFormSession formSession; - - public void replaceDetails(AssetWorkspaceAssetDetails details) { - if (details == null) { - familySupport = null; - formSession = null; - return; - } - - familySupport = familySupports.stream() - .filter(candidate -> candidate.supports(details.summary().assetFamily())) - .findFirst() - .orElseThrow(); - final AssetDetailsBankCompositionDraft source = familySupport.createDraft(details); - if (formSession == null) { - formSession = new StudioFormSession<>(source); - return; - } - if (!Objects.equals(formSession.source(), source)) { - formSession.replaceSource(source); - } - } - - public boolean ready() { - return formSession != null && familySupport != null; - } - - public void beginEdit() { - if (ready()) { - formSession.beginEdit(); - } - } - - public void apply() { - if (ready()) { - formSession.apply(); - } - } - - public void reset() { - if (ready()) { - formSession.resetDraft(); - } - } - - public void cancel() { - if (ready()) { - formSession.cancelEdit(); - } - } - - public void moveToSelected(List files) { - if (!ready() || formSession.mode() != StudioFormMode.EDITING) { - return; - } - formSession.updateDraft(current -> familySupport.moveToSelected(current, files)); - } - - public void moveToAvailable(List files) { - if (!ready() || formSession.mode() != StudioFormMode.EDITING) { - return; - } - formSession.updateDraft(current -> familySupport.moveToAvailable(current, files)); - } - - public void moveUp(int selectedIndex) { - if (!ready() || formSession.mode() != StudioFormMode.EDITING) { - return; - } - formSession.updateDraft(current -> familySupport.moveUp(current, selectedIndex)); - } - - public void moveDown(int selectedIndex) { - if (!ready() || formSession.mode() != StudioFormMode.EDITING) { - return; - } - formSession.updateDraft(current -> familySupport.moveDown(current, selectedIndex)); - } - - public AssetDetailsBankCompositionViewModel viewModel() { - if (!ready()) { - return new AssetDetailsBankCompositionViewModel( - false, - false, - List.of(), - List.of(), - new AssetDetailsBankCompositionCapacityState(0.0d, null, false, "", "")); - } - - final AssetDetailsBankCompositionDraft draft = formSession.draft(); - return new AssetDetailsBankCompositionViewModel( - formSession.mode() == StudioFormMode.EDITING, - formSession.isDirty(), - draft.availableFiles(), - draft.selectedFiles(), - familySupport.evaluate(draft)); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionDraft.java b/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionDraft.java deleted file mode 100644 index d018699a..00000000 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionDraft.java +++ /dev/null @@ -1,43 +0,0 @@ -package p.studio.workspaces.assets.details.bank; - -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; - -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Objects; - -public record AssetDetailsBankCompositionDraft( - List availableFiles, - List selectedFiles) { - - public AssetDetailsBankCompositionDraft { - availableFiles = List.copyOf(Objects.requireNonNull(availableFiles, "availableFiles")); - selectedFiles = List.copyOf(Objects.requireNonNull(selectedFiles, "selectedFiles")); - } - - public AssetDetailsBankCompositionDraft removeFromAvailable(List files) { - final var removed = new LinkedHashSet<>(Objects.requireNonNull(files, "files")); - return new AssetDetailsBankCompositionDraft( - availableFiles.stream().filter(file -> !removed.contains(file)).toList(), - selectedFiles); - } - - public AssetDetailsBankCompositionDraft appendToSelected(List files) { - final var nextSelected = new java.util.ArrayList<>(selectedFiles); - nextSelected.addAll(Objects.requireNonNull(files, "files")); - return new AssetDetailsBankCompositionDraft(availableFiles, nextSelected); - } - - public AssetDetailsBankCompositionDraft removeFromSelected(List files) { - final var removed = new LinkedHashSet<>(Objects.requireNonNull(files, "files")); - return new AssetDetailsBankCompositionDraft( - availableFiles, - selectedFiles.stream().filter(file -> !removed.contains(file)).toList()); - } - - public AssetDetailsBankCompositionDraft appendToAvailable(List files) { - final var nextAvailable = new java.util.ArrayList<>(availableFiles); - nextAvailable.addAll(Objects.requireNonNull(files, "files")); - return new AssetDetailsBankCompositionDraft(nextAvailable, selectedFiles); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionFamilySupport.java b/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionFamilySupport.java deleted file mode 100644 index 507b396f..00000000 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionFamilySupport.java +++ /dev/null @@ -1,31 +0,0 @@ -package p.studio.workspaces.assets.details.bank; - -import p.packer.messages.assets.AssetFamilyCatalog; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; - -import java.util.List; - -interface AssetDetailsBankCompositionFamilySupport { - boolean supports(AssetFamilyCatalog assetFamily); - - AssetDetailsBankCompositionDraft createDraft(AssetWorkspaceAssetDetails details); - - AssetDetailsBankCompositionDraft moveToSelected( - AssetDetailsBankCompositionDraft draft, - List files); - - AssetDetailsBankCompositionDraft moveToAvailable( - AssetDetailsBankCompositionDraft draft, - List files); - - AssetDetailsBankCompositionDraft moveUp( - AssetDetailsBankCompositionDraft draft, - int selectedIndex); - - AssetDetailsBankCompositionDraft moveDown( - AssetDetailsBankCompositionDraft draft, - int selectedIndex); - - AssetDetailsBankCompositionCapacityState evaluate(AssetDetailsBankCompositionDraft draft); -} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsFallbackBankCompositionFamilySupport.java b/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsFallbackBankCompositionFamilySupport.java deleted file mode 100644 index 8d4ddafa..00000000 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsFallbackBankCompositionFamilySupport.java +++ /dev/null @@ -1,34 +0,0 @@ -package p.studio.workspaces.assets.details.bank; - -import p.packer.messages.assets.AssetFamilyCatalog; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; - -import java.util.List; -import java.util.Map; - -final class AssetDetailsFallbackBankCompositionFamilySupport extends AssetDetailsAbstractBankCompositionFamilySupport { - private final AssetBankCapacityService capacityService = new AssetBankCapacityService(); - - @Override - public boolean supports(AssetFamilyCatalog assetFamily) { - return true; - } - - @Override - protected boolean canAdd( - AssetDetailsBankCompositionDraft currentDraft, - List accepted, - AssetWorkspaceBankCompositionFile candidate) { - return true; - } - - @Override - public AssetDetailsBankCompositionCapacityState evaluate(AssetDetailsBankCompositionDraft draft) { - return capacityService.evaluate( - AssetFamilyCatalog.UNKNOWN, - draft.selectedFiles().size(), - Map.of(), - Map.of(), - 0L); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsGlyphBankCompositionFamilySupport.java b/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsGlyphBankCompositionFamilySupport.java deleted file mode 100644 index 8ec40699..00000000 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsGlyphBankCompositionFamilySupport.java +++ /dev/null @@ -1,54 +0,0 @@ -package p.studio.workspaces.assets.details.bank; - -import p.packer.messages.assets.AssetFamilyCatalog; -import p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; - -import java.util.List; -import java.util.Map; - -final class AssetDetailsGlyphBankCompositionFamilySupport extends AssetDetailsAbstractBankCompositionFamilySupport { - private final AssetBankCapacityService capacityService = new AssetBankCapacityService(); - - private int maxSlots = capacityService.maxArtifactsForGlyphBank(Map.of()); - private Map outputMetadata = Map.of(); - - @Override - public boolean supports(AssetFamilyCatalog assetFamily) { - return assetFamily == AssetFamilyCatalog.GLYPH_BANK; - } - - @Override - public AssetDetailsBankCompositionDraft createDraft(AssetWorkspaceAssetDetails details) { - outputMetadata = metadataMap(details); - maxSlots = capacityService.maxArtifactsForGlyphBank(outputMetadata); - return super.createDraft(details); - } - - @Override - protected boolean canAdd( - AssetDetailsBankCompositionDraft currentDraft, - List accepted, - AssetWorkspaceBankCompositionFile candidate) { - return currentDraft.selectedFiles().size() + accepted.size() < maxSlots; - } - - @Override - public AssetDetailsBankCompositionCapacityState evaluate(AssetDetailsBankCompositionDraft draft) { - return capacityService.evaluate( - AssetFamilyCatalog.GLYPH_BANK, - draft.selectedFiles().size(), - outputMetadata, - Map.of(), - 0L); - } - - private Map metadataMap(AssetWorkspaceAssetDetails details) { - final String tileSize = details.metadataFields().stream() - .filter(field -> field.key().equals("tile_size")) - .map(field -> field.value()) - .findFirst() - .orElse("16x16"); - return Map.of("tile_size", tileSize); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsSoundBankCompositionFamilySupport.java b/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsSoundBankCompositionFamilySupport.java deleted file mode 100644 index ad062bd2..00000000 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/details/bank/AssetDetailsSoundBankCompositionFamilySupport.java +++ /dev/null @@ -1,48 +0,0 @@ -package p.studio.workspaces.assets.details.bank; - -import p.packer.messages.assets.AssetFamilyCatalog; -import p.studio.workspaces.assets.messages.AssetWorkspaceBankCompositionFile; - -import java.util.List; -import java.util.Map; - -final class AssetDetailsSoundBankCompositionFamilySupport extends AssetDetailsAbstractBankCompositionFamilySupport { - private static final long MAX_BYTES = 1024L * 1024L; - - private final AssetBankCapacityService capacityService = new AssetBankCapacityService(); - private Map outputPipeline = Map.of(); - - @Override - public AssetDetailsBankCompositionDraft createDraft(p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails details) { - outputPipeline = details.outputPipeline(); - return super.createDraft(details); - } - - @Override - public boolean supports(AssetFamilyCatalog assetFamily) { - return assetFamily == AssetFamilyCatalog.SOUND_BANK; - } - - @Override - protected boolean canAdd( - AssetDetailsBankCompositionDraft currentDraft, - List accepted, - AssetWorkspaceBankCompositionFile candidate) { - final long usedBytes = selectedBytes(currentDraft.selectedFiles()) + selectedBytes(accepted); - return usedBytes + candidate.size() <= MAX_BYTES; - } - - @Override - public AssetDetailsBankCompositionCapacityState evaluate(AssetDetailsBankCompositionDraft draft) { - return capacityService.evaluate( - AssetFamilyCatalog.SOUND_BANK, - draft.selectedFiles().size(), - Map.of(), - outputPipeline, - selectedBytes(draft.selectedFiles())); - } - - private long selectedBytes(List files) { - return files.stream().mapToLong(AssetWorkspaceBankCompositionFile::size).sum(); - } -} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsWorkspaceDetailsSceneLayerChangedEvent.java b/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsWorkspaceDetailsSceneLayerChangedEvent.java deleted file mode 100644 index a3834ed4..00000000 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsWorkspaceDetailsSceneLayerChangedEvent.java +++ /dev/null @@ -1,8 +0,0 @@ -package p.studio.workspaces.assets.messages.events; - -import p.studio.lsp.events.StudioEvent; -import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsViewState; - -public record StudioAssetsWorkspaceDetailsSceneLayerChangedEvent( - AssetWorkspaceDetailsViewState viewState) implements StudioEvent { -} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshStartedEvent.java b/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshStartedEvent.java deleted file mode 100644 index 05312b79..00000000 --- a/prometeu-studio/src/main/java/p/studio/workspaces/assets/messages/events/StudioAssetsWorkspaceRefreshStartedEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package p.studio.workspaces.assets.messages.events; - -import p.studio.lsp.events.StudioEvent; - -public record StudioAssetsWorkspaceRefreshStartedEvent() implements StudioEvent { -} diff --git a/prometeu-studio/src/main/java/p/studio/workspaces/builder/ShipperWorkspace.java b/prometeu-studio/src/main/java/p/studio/workspaces/builder/ShipperWorkspace.java deleted file mode 100644 index 0c88a924..00000000 --- a/prometeu-studio/src/main/java/p/studio/workspaces/builder/ShipperWorkspace.java +++ /dev/null @@ -1,96 +0,0 @@ -package p.studio.workspaces.builder; - -import javafx.geometry.Orientation; -import javafx.scene.Node; -import javafx.scene.control.*; -import javafx.scene.layout.BorderPane; -import javafx.scene.layout.StackPane; -import p.studio.Container; -import p.studio.projects.ProjectReference; -import p.studio.shipper.StudioShipperService; -import p.studio.utilities.i18n.I18n; -import p.studio.workspaces.Workspace; -import p.studio.workspaces.WorkspaceId; - -public class ShipperWorkspace extends Workspace { - private final BorderPane root = new BorderPane(); - private final TextArea logs = new TextArea(); - private final Button buildButton = new Button(); - private final Button clearButton = new Button(); - private final StudioShipperService shipperService = new StudioShipperService(); - - public ShipperWorkspace(ProjectReference projectReference) { - super(projectReference); - final var toolbar = buildToolBar(); - root.setTop(toolbar); - - final var projectArea = buildProjectArea(); - final var logsPane = buildLogsPane(); - - final var split = new SplitPane(projectArea, logsPane); - split.setOrientation(Orientation.VERTICAL); - split.setDividerPositions(0.5); - - root.setCenter(split); - } - - @Override - public WorkspaceId workspaceId() { - return WorkspaceId.SHIPPER; - } - - @Override - public I18n title() { - return I18n.WORKSPACE_SHIPPER; - } - - @Override - public Node rootNode() { - return root; - } - - @Override - public void load() { - - } - - @Override - public void unLoad() { - - } - - private ToolBar buildToolBar() { - buildButton.textProperty().bind(Container.i18n().bind(I18n.WORKSPACE_SHIPPER_BUTTON_RUN)); - buildButton.getStyleClass().addAll("studio-button", "studio-button-primary"); - buildButton.setOnAction(e -> { - logs.clear(); - shipperService.prepare(projectReference, entry -> logs.appendText( - "[%s] %s%s".formatted(entry.source().name(), entry.message(), System.lineSeparator()))); - }); - - clearButton.textProperty().bind(Container.i18n().bind(I18n.WORKSPACE_SHIPPER_BUTTON_CLEAR)); - clearButton.getStyleClass().addAll("studio-button", "studio-button-secondary"); - clearButton.setOnAction(e -> logs.clear()); - - return new ToolBar(buildButton, clearButton); - } - - private StackPane buildProjectArea() { - final var tmpLabel = new Label("Project: " + projectReference.name()); - return new StackPane(tmpLabel); - } - - private TitledPane buildLogsPane() { - logs.setEditable(false); - logs.setWrapText(true); - logs.setMinHeight(350); - - final var pane = new TitledPane(); - pane.setContent(logs); - pane.textProperty().bind(Container.i18n().bind(I18n.WORKSPACE_SHIPPER_LOGS)); - pane.setCollapsible(true); - pane.setExpanded(true); - - return pane; - } -} diff --git a/prometeu-studio/src/test/java/p/studio/controls/shell/StudioActivityStorageServiceTest.java b/prometeu-studio/src/test/java/p/studio/controls/shell/StudioActivityStorageServiceTest.java deleted file mode 100644 index a6c01fda..00000000 --- a/prometeu-studio/src/test/java/p/studio/controls/shell/StudioActivityStorageServiceTest.java +++ /dev/null @@ -1,70 +0,0 @@ -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; - -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -final class StudioActivityStorageServiceTest { - @TempDir - Path tempDir; - - @Test - void savesAndLoadsProjectScopedActivityHistory() throws Exception { - final StudioActivityStorageService service = new StudioActivityStorageService(); - final ProjectReference project = project("main"); - final List history = List.of( - new StudioActivityEntry("Studio", "Project opened", StudioActivityEntrySeverity.SUCCESS, false), - new StudioActivityEntry("Assets", "3 assets loaded", StudioActivityEntrySeverity.INFO, false)); - - service.save(project, history); - - assertTrue(Files.isRegularFile(ProjectStudioPaths.activitiesPath(project))); - assertEquals(history, service.load(project)); - } - - @Test - void trimsPersistedHistoryToConfiguredMaximum() { - final StudioActivityStorageService service = new StudioActivityStorageService(); - final ProjectReference project = project("main"); - final List history = new ArrayList<>(); - for (int index = 0; index < StudioActivityStorageService.MAX_HISTORY + 25; index += 1) { - history.add(new StudioActivityEntry( - "Assets", - "Entry " + index, - StudioActivityEntrySeverity.INFO, - false)); - } - - service.save(project, history); - - final List loaded = service.load(project); - assertEquals(StudioActivityStorageService.MAX_HISTORY, loaded.size()); - assertEquals("Entry 0", loaded.getFirst().message()); - assertEquals("Entry 499", loaded.getLast().message()); - } - - @Test - void malformedStorageFallsBackToEmptyHistory() throws Exception { - final StudioActivityStorageService service = new StudioActivityStorageService(); - final ProjectReference project = project("main"); - Files.createDirectories(ProjectStudioPaths.studioRoot(project)); - Files.writeString(ProjectStudioPaths.activitiesPath(project), "{ not valid json"); - - assertEquals(List.of(), service.load(project)); - } - - private ProjectReference project(String name) { - final Path projectRoot = tempDir.resolve(name); - return new ProjectReference("Main", "1.0.0", "pbs", 1, AppMode.Game, projectRoot); - } -} diff --git a/prometeu-studio/src/test/java/p/studio/debug/runtime/StudioRuntimeHandshakeServiceTest.java b/prometeu-studio/src/test/java/p/studio/debug/runtime/StudioRuntimeHandshakeServiceTest.java deleted file mode 100644 index 6cb3b3b1..00000000 --- a/prometeu-studio/src/test/java/p/studio/debug/runtime/StudioRuntimeHandshakeServiceTest.java +++ /dev/null @@ -1,115 +0,0 @@ -package p.studio.debug.runtime; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.Test; -import p.studio.StudioBackgroundTasks; -import p.studio.execution.StudioExecutionSessionService; -import p.studio.execution.StudioExecutionState; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.ServerSocket; -import java.net.Socket; -import java.nio.charset.StandardCharsets; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; - -import static org.junit.jupiter.api.Assertions.*; - -final class StudioRuntimeHandshakeServiceTest { - @Test - void connectsPublishesRuntimeHandshakeAndStreamsLogEvents() throws Exception { - try (final ServerSocket serverSocket = new ServerSocket()) { - serverSocket.bind(new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 0)); - final CountDownLatch clientStarted = new CountDownLatch(1); - final CountDownLatch eventDelivered = new CountDownLatch(1); - final Thread serverThread = new Thread(() -> serveSuccessfulHandshake(serverSocket, clientStarted, eventDelivered)); - serverThread.setDaemon(true); - serverThread.start(); - - final StudioExecutionSessionService session = new StudioExecutionSessionService(); - session.beginPreparationCycle(); - final StudioRuntimeDebugConnectionSettings settings = new StudioRuntimeDebugConnectionSettings("127.0.0.1", serverSocket.getLocalPort()); - final StudioBackgroundTasks backgroundTasks = new StudioBackgroundTasks(Executors.newSingleThreadExecutor()); - try { - final StudioRuntimeHandshakeService service = new StudioRuntimeHandshakeService(new ObjectMapper(), backgroundTasks); - final StudioRuntimeHandshakeResult result = service.connect(session, settings); - - assertTrue(result.success(), result.failureMessage()); - assertEquals(StudioExecutionState.RUNNING, session.snapshot().state()); - assertTrue(clientStarted.await(2, TimeUnit.SECONDS)); - assertTrue(eventDelivered.await(2, TimeUnit.SECONDS)); - assertTrue(session.snapshot().logs().stream().anyMatch(entry -> entry.message().contains("Runtime handshake connected"))); - assertTrue(waitForRuntimeLog(session, "[VM] Boot complete")); - - service.disconnect(session); - } finally { - backgroundTasks.shutdown(); - serverThread.join(2_000); - } - } - } - - @Test - void handshakeFailureTransitionsSessionToRuntimeFailed() { - final StudioExecutionSessionService session = new StudioExecutionSessionService(); - session.beginPreparationCycle(); - final StudioBackgroundTasks backgroundTasks = new StudioBackgroundTasks(Executors.newSingleThreadExecutor()); - try { - final StudioRuntimeHandshakeService service = new StudioRuntimeHandshakeService(new ObjectMapper(), backgroundTasks); - final StudioRuntimeHandshakeResult result = service.connect( - session, - new StudioRuntimeDebugConnectionSettings("127.0.0.1", 1)); - - assertFalse(result.success()); - assertEquals(StudioExecutionState.RUNTIME_FAILED, session.snapshot().state()); - assertTrue(session.snapshot().logs().stream().anyMatch(entry -> entry.message().contains("Runtime handshake failed"))); - } finally { - backgroundTasks.shutdown(); - } - } - - private void serveSuccessfulHandshake( - final ServerSocket serverSocket, - final CountDownLatch clientStarted, - final CountDownLatch eventDelivered) { - try (Socket socket = serverSocket.accept(); - BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8)); - BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), StandardCharsets.UTF_8))) { - writer.write("{\"type\":\"handshake\",\"protocol_version\":1,\"runtime_version\":\"1.0.0\"}"); - writer.newLine(); - writer.flush(); - final String clientHandshake = reader.readLine(); - if (!"{\"type\":\"start\"}".equals(clientHandshake)) { - throw new IllegalStateException("unexpected client handshake: " + clientHandshake); - } - clientStarted.countDown(); - writer.write("{\"event\":\"log\",\"level\":\"INFO\",\"source\":\"VM\",\"msg\":\"Boot complete\"}"); - writer.newLine(); - writer.flush(); - eventDelivered.countDown(); - } catch (Exception exception) { - if (serverSocket.isClosed()) { - return; - } - throw new RuntimeException(exception); - } - } - - private boolean waitForRuntimeLog( - final StudioExecutionSessionService session, - final String fragment) throws InterruptedException { - for (int attempt = 0; attempt < 20; attempt += 1) { - if (session.snapshot().logs().stream().anyMatch(entry -> entry.message().contains(fragment))) { - return true; - } - Thread.sleep(50L); - } - return false; - } -} diff --git a/prometeu-studio/src/test/java/p/studio/execution/StudioExecutionSessionServiceTest.java b/prometeu-studio/src/test/java/p/studio/execution/StudioExecutionSessionServiceTest.java deleted file mode 100644 index 5fad4a0e..00000000 --- a/prometeu-studio/src/test/java/p/studio/execution/StudioExecutionSessionServiceTest.java +++ /dev/null @@ -1,89 +0,0 @@ -package p.studio.execution; - -import org.junit.jupiter.api.Test; -import p.studio.shipper.StudioShipperLogEntry; -import p.studio.shipper.StudioShipperLogSource; - -import java.time.Instant; -import java.util.ArrayList; - -import static org.junit.jupiter.api.Assertions.*; - -final class StudioExecutionSessionServiceTest { - @Test - void enforcesTheMinimumExecutionStateMachine() { - final StudioExecutionSessionService service = new StudioExecutionSessionService(); - - assertEquals(StudioExecutionState.IDLE, service.snapshot().state()); - assertThrows(IllegalStateException.class, service::transitionToRunning); - - service.beginPreparationCycle(); - assertEquals(StudioExecutionState.PREPARING, service.snapshot().state()); - assertThrows(IllegalStateException.class, service::transitionToStopped); - - service.transitionToPrepareFailed(); - assertEquals(StudioExecutionState.PREPARE_FAILED, service.snapshot().state()); - - service.beginPreparationCycle(); - service.transitionToConnecting(); - service.transitionToRunning(); - service.transitionToStopped(); - - assertEquals(StudioExecutionState.STOPPED, service.snapshot().state()); - assertThrows(IllegalStateException.class, service::transitionToConnecting); - } - - @Test - void preservesSourceIdentityAndSequenceAcrossMergedLogs() { - final StudioExecutionSessionService service = new StudioExecutionSessionService(); - final Instant now = Instant.parse("2026-04-06T10:15:30Z"); - - service.beginPreparationCycle(); - service.appendShipperLog(new StudioShipperLogEntry( - StudioShipperLogSource.BUILD, - p.studio.shipper.StudioShipperLogLevel.INFO, - "Compiler started", - now)); - service.appendShipperLog(new StudioShipperLogEntry( - StudioShipperLogSource.PACK_VALIDATION, - p.studio.shipper.StudioShipperLogLevel.ERROR, - "Pack validation failed", - now.plusSeconds(1))); - service.appendShipperLog(new StudioShipperLogEntry( - StudioShipperLogSource.PACK, - p.studio.shipper.StudioShipperLogLevel.INFO, - "Pack emitted", - now.plusSeconds(2))); - service.appendRuntimeLog( - StudioExecutionLogSeverity.INFO, - "Runtime connected", - now.plusSeconds(3)); - - final var logs = service.snapshot().logs(); - assertEquals(4, logs.size()); - assertEquals(StudioExecutionLogSource.BUILD, logs.get(0).source()); - assertEquals(StudioExecutionLogSource.PACK_VALIDATION, logs.get(1).source()); - assertEquals(StudioExecutionLogSource.PACK, logs.get(2).source()); - assertEquals(StudioExecutionLogSource.RUNTIME, logs.get(3).source()); - assertEquals(1L, logs.get(0).sequence()); - assertEquals(4L, logs.get(3).sequence()); - assertEquals(now.plusSeconds(3), logs.get(3).timestamp()); - } - - @Test - void subscribersReceiveSnapshotsOutsideWorkspaceLifecycle() { - final StudioExecutionSessionService service = new StudioExecutionSessionService(); - final ArrayList snapshots = new ArrayList<>(); - - final var subscription = service.subscribe(snapshots::add); - service.beginPreparationCycle(); - service.appendShipperLog(StudioShipperLogEntry.info(StudioShipperLogSource.BUILD, "Build ok")); - service.transitionToPrepareFailed(); - subscription.unsubscribe(); - - assertFalse(snapshots.isEmpty()); - assertEquals(StudioExecutionState.IDLE, snapshots.getFirst().state()); - assertEquals(StudioExecutionState.PREPARE_FAILED, snapshots.getLast().state()); - assertTrue(snapshots.getLast().logs().stream().anyMatch(entry -> entry.source() == StudioExecutionLogSource.BUILD)); - } -} diff --git a/prometeu-studio/src/test/java/p/studio/execution/StudioPlayStopCoordinatorTest.java b/prometeu-studio/src/test/java/p/studio/execution/StudioPlayStopCoordinatorTest.java deleted file mode 100644 index 19c71b90..00000000 --- a/prometeu-studio/src/test/java/p/studio/execution/StudioPlayStopCoordinatorTest.java +++ /dev/null @@ -1,255 +0,0 @@ -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; -import p.studio.debug.runtime.StudioRuntimeHandshakeResult; -import p.studio.execution.runtime.StudioRuntimeProcessHandle; -import p.studio.projects.ProjectReference; -import p.studio.projectstate.ProjectLocalStudioSetup; -import p.studio.shipper.StudioShipperPreparationStatus; -import p.studio.shipper.StudioShipperPrepareResult; -import p.studio.workspaces.WorkspaceId; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; - -import static org.junit.jupiter.api.Assertions.*; - -final class StudioPlayStopCoordinatorTest { - @Test - void playNavigatesToDebugAndStopsOnPreparationFailure() throws Exception { - final StudioExecutionSessionService session = new StudioExecutionSessionService(); - final AtomicReference selectedWorkspace = new AtomicReference<>(); - final AtomicInteger launcherCalls = new AtomicInteger(); - final StudioBackgroundTasks backgroundTasks = new StudioBackgroundTasks(Executors.newCachedThreadPool()); - try { - final StudioPlayStopCoordinator coordinator = new StudioPlayStopCoordinator( - projectReference(), - new ProjectLocalStudioSetup("/bin/echo", ProjectLocalStudioSetup.EditorIndentationSetup.defaults()), - session, - (project, sink) -> new StudioShipperPrepareResult(StudioShipperPreparationStatus.FAILED, List.of(), null, null, null, null), - new RecordingHandshakeClient(), - (projectReference, runtimePath) -> { - launcherCalls.incrementAndGet(); - return new FakeRuntimeProcessHandle(); - }, - backgroundTasks, - selectedWorkspace::set, - ignored -> { }, - false); - - coordinator.play(); - - assertEquals(WorkspaceId.DEBUG, selectedWorkspace.get()); - assertTrue(waitForState(session, StudioExecutionState.PREPARE_FAILED)); - assertEquals(0, launcherCalls.get()); - } finally { - backgroundTasks.shutdown(); - } - } - - @Test - void repeatedPlayIsIgnoredWhileRuntimeIsActiveAndStopKillsProcess() throws Exception { - final StudioExecutionSessionService session = new StudioExecutionSessionService(); - final ArrayList selected = new ArrayList<>(); - final AtomicInteger launches = new AtomicInteger(); - final RecordingHandshakeClient handshakeClient = new RecordingHandshakeClient(); - final FakeRuntimeProcessHandle processHandle = new FakeRuntimeProcessHandle(); - final StudioBackgroundTasks backgroundTasks = new StudioBackgroundTasks(Executors.newCachedThreadPool()); - try { - final StudioPlayStopCoordinator coordinator = new StudioPlayStopCoordinator( - projectReference(), - new ProjectLocalStudioSetup("/bin/echo", ProjectLocalStudioSetup.EditorIndentationSetup.defaults()), - session, - (project, sink) -> new StudioShipperPrepareResult(StudioShipperPreparationStatus.SUCCESS, List.of(), null, null, null, null), - handshakeClient, - (projectReference, runtimePath) -> { - launches.incrementAndGet(); - return processHandle; - }, - backgroundTasks, - selected::add, - ignored -> { }, - false); - - coordinator.play(); - assertTrue(waitForState(session, StudioExecutionState.RUNNING), () -> "State was: " + session.snapshot().state() + " Logs: " + session.snapshot().logs()); - - coordinator.play(); - assertEquals(1, launches.get()); - - coordinator.stop(); - assertTrue(waitForState(session, StudioExecutionState.STOPPED)); - assertTrue(processHandle.destroyed); - assertEquals(1, handshakeClient.disconnectCalls.get()); - assertFalse(selected.isEmpty()); - } finally { - backgroundTasks.shutdown(); - } - } - - @Test - void stopDuringPreparingIsANoOp() throws Exception { - final StudioExecutionSessionService session = new StudioExecutionSessionService(); - final CountDownLatch started = new CountDownLatch(1); - final CountDownLatch release = new CountDownLatch(1); - final StudioBackgroundTasks backgroundTasks = new StudioBackgroundTasks(Executors.newCachedThreadPool()); - try { - final StudioPlayStopCoordinator coordinator = new StudioPlayStopCoordinator( - projectReference(), - new ProjectLocalStudioSetup("/bin/echo", ProjectLocalStudioSetup.EditorIndentationSetup.defaults()), - session, - (project, sink) -> { - started.countDown(); - await(release); - return new StudioShipperPrepareResult(StudioShipperPreparationStatus.FAILED, List.of(), null, null, null, null); - }, - new RecordingHandshakeClient(), - (projectReference, runtimePath) -> new FakeRuntimeProcessHandle(), - backgroundTasks, - ignored -> { }, - ignored -> { }, - false); - - coordinator.play(); - assertTrue(started.await(2, TimeUnit.SECONDS)); - assertEquals(StudioExecutionState.PREPARING, session.snapshot().state()); - - coordinator.stop(); - assertEquals(StudioExecutionState.PREPARING, session.snapshot().state()); - - release.countDown(); - assertTrue(waitForState(session, StudioExecutionState.PREPARE_FAILED)); - } finally { - backgroundTasks.shutdown(); - } - } - - @Test - void spawnFailureBecomesRuntimeFailed() throws Exception { - final StudioExecutionSessionService session = new StudioExecutionSessionService(); - final StudioBackgroundTasks backgroundTasks = new StudioBackgroundTasks(Executors.newCachedThreadPool()); - try { - final StudioPlayStopCoordinator coordinator = new StudioPlayStopCoordinator( - projectReference(), - new ProjectLocalStudioSetup("/definitely/missing/runtime", ProjectLocalStudioSetup.EditorIndentationSetup.defaults()), - session, - (project, sink) -> new StudioShipperPrepareResult(StudioShipperPreparationStatus.SUCCESS, List.of(), null, null, null, null), - new RecordingHandshakeClient(), - (projectReference, runtimePath) -> { throw new java.io.IOException("mock spawn failure"); }, - backgroundTasks, - ignored -> { }, - ignored -> { }, - false); - - coordinator.play(); - - assertTrue(waitForState(session, StudioExecutionState.RUNTIME_FAILED)); - assertTrue(session.snapshot().logs().stream().anyMatch(entry -> entry.message().contains("Runtime preflight failed")), () -> "Logs: " + session.snapshot().logs()); - } finally { - backgroundTasks.shutdown(); - } - } - - private boolean waitForState( - final StudioExecutionSessionService session, - final StudioExecutionState expected) throws InterruptedException { - for (int attempt = 0; attempt < 40; attempt += 1) { - if (session.snapshot().state() == expected) { - return true; - } - Thread.sleep(50L); - } - return false; - } - - private void await(final CountDownLatch latch) { - try { - latch.await(2, TimeUnit.SECONDS); - } catch (InterruptedException interruptedException) { - Thread.currentThread().interrupt(); - } - } - - private ProjectReference projectReference() { - return new ProjectReference("Main", "1.0.0", "pbs", 1, AppMode.Game, Path.of("/tmp/prometeu-play-stop")); - } - - private static final class RecordingHandshakeClient implements StudioRuntimeHandshakeClient { - private final AtomicInteger disconnectCalls = new AtomicInteger(); - - @Override - public StudioRuntimeHandshakeResult connect(final StudioExecutionSessionService session) { - throw new UnsupportedOperationException(); - } - - @Override - public StudioRuntimeHandshakeResult connect( - final StudioExecutionSessionService session, - final StudioRuntimeDebugConnectionSettings settings) { - return connectWithRetry(session, settings, 1, 0L); - } - - @Override - public StudioRuntimeHandshakeResult connectWithRetry( - final StudioExecutionSessionService session, - final StudioRuntimeDebugConnectionSettings settings, - final int maxAttempts, - final long retryDelayMillis) { - session.transitionToRunning(); - session.appendRuntimeLog(StudioExecutionLogSeverity.INFO, "Fake runtime handshake connected."); - return StudioRuntimeHandshakeResult.success(settings, 1, "test"); - } - - @Override - public void disconnect(final StudioExecutionSessionService session) { - disconnectCalls.incrementAndGet(); - if (session.snapshot().state() == StudioExecutionState.CONNECTING || session.snapshot().state() == StudioExecutionState.RUNNING) { - session.transitionToStopped(); - } - } - } - - private static final class FakeRuntimeProcessHandle implements StudioRuntimeProcessHandle { - private final CompletableFuture exit = new CompletableFuture<>(); - private boolean destroyed; - - @Override - public InputStream stdout() { - return new ByteArrayInputStream(new byte[0]); - } - - @Override - public InputStream stderr() { - return new ByteArrayInputStream(new byte[0]); - } - - @Override - public boolean isAlive() { - return !destroyed; - } - - @Override - public void destroyForcibly() { - destroyed = true; - exit.complete(137); - } - - @Override - public CompletableFuture onExit() { - return exit; - } - } -} diff --git a/prometeu-studio/src/test/java/p/studio/lsp/events/StudioEmbeddedPackerEventAdapterTest.java b/prometeu-studio/src/test/java/p/studio/lsp/events/StudioEmbeddedPackerEventAdapterTest.java deleted file mode 100644 index a2f01cb6..00000000 --- a/prometeu-studio/src/test/java/p/studio/lsp/events/StudioEmbeddedPackerEventAdapterTest.java +++ /dev/null @@ -1,58 +0,0 @@ -package p.studio.lsp.events; - -import org.junit.jupiter.api.Test; -import p.packer.events.PackerEvent; -import p.packer.events.PackerEventKind; -import p.packer.events.PackerProgress; - -import java.time.Instant; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -final class StudioEmbeddedPackerEventAdapterTest { - @Test - void forwardsScanEventsIntoStudioOperationEvents() { - final StudioEventBus globalBus = new StudioEventBus(); - final List events = new ArrayList<>(); - globalBus.subscribe(StudioPackerOperationEvent.class, events::add); - final StudioPackerEventAdapter adapter = new StudioPackerEventAdapter(globalBus); - - adapter.publish(new PackerEvent( - "main", - "op-1", - 0L, - PackerEventKind.ASSET_DISCOVERED, - Instant.now(), - "Discovered asset.", - new PackerProgress(0.25d, false), - List.of("ui_atlas"))); - - assertEquals(1, events.size()); - assertEquals(PackerEventKind.ASSET_DISCOVERED, events.getFirst().kind()); - assertEquals(0.25d, events.getFirst().progress()); - } - - @Test - void forwardsWriteLifecycleEventsIntoStudioOperationEvents() { - final StudioEventBus globalBus = new StudioEventBus(); - final List events = new ArrayList<>(); - globalBus.subscribe(StudioPackerOperationEvent.class, events::add); - final StudioPackerEventAdapter adapter = new StudioPackerEventAdapter(globalBus); - - adapter.publish(new PackerEvent( - "main", - "op-1", - 0L, - PackerEventKind.ACTION_APPLIED, - Instant.now(), - "Asset created.", - null, - List.of("ui_atlas"))); - - assertEquals(1, events.size()); - assertEquals(PackerEventKind.ACTION_APPLIED, events.getFirst().kind()); - assertEquals("Asset created.", events.getFirst().summary()); - } -} diff --git a/prometeu-studio/src/test/java/p/studio/projects/KnownProjectsServiceTest.java b/prometeu-studio/src/test/java/p/studio/projects/KnownProjectsServiceTest.java deleted file mode 100644 index fa9cf25d..00000000 --- a/prometeu-studio/src/test/java/p/studio/projects/KnownProjectsServiceTest.java +++ /dev/null @@ -1,83 +0,0 @@ -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; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -final class KnownProjectsServiceTest { - @TempDir - Path tempDir; - - @Test - void seedsKnownProjectsFromCatalogWhenStorageIsEmpty() throws Exception { - final Path projectsRoot = tempDir.resolve("projects"); - Files.createDirectories(projectsRoot.resolve("alpha")); - Files.createDirectories(projectsRoot.resolve("beta")); - Files.writeString(projectsRoot.resolve("alpha").resolve("prometeu.json"), manifest("Alpha Project")); - Files.writeString(projectsRoot.resolve("beta").resolve("prometeu.json"), manifest("Beta Project")); - - final KnownProjectsService service = new KnownProjectsService( - tempDir.resolve("known-projects.txt"), - new ProjectCatalogService(projectsRoot)); - - assertEquals( - java.util.List.of("Alpha Project", "Beta Project"), - service.listKnownProjects().stream().map(ProjectReference::name).toList()); - } - - @Test - void canForgetProjectWithoutDeletingDirectory() throws Exception { - 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, AppMode.Game, projectsRoot.resolve("alpha")); - - final KnownProjectsService service = new KnownProjectsService( - tempDir.resolve("known-projects.txt"), - new ProjectCatalogService(projectsRoot)); - - service.remember(alpha); - service.forget(alpha); - - assertEquals(java.util.List.of(), service.listKnownProjects()); - assertEquals(true, Files.isDirectory(alpha.rootPath())); - } - - @Test - void canRememberProjectAgainAfterItWasForgotten() throws Exception { - 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, AppMode.Game, projectsRoot.resolve("alpha")); - - final KnownProjectsService service = new KnownProjectsService( - tempDir.resolve("known-projects.txt"), - new ProjectCatalogService(projectsRoot)); - - service.remember(alpha); - service.forget(alpha); - service.remember(alpha); - - assertEquals( - java.util.List.of("Alpha Project"), - service.listKnownProjects().stream().map(ProjectReference::name).toList()); - } - - private String manifest(String name) { - return """ - { - "name": "%s", - "version": "1.0.0", - "language": "pbs", - "stdlib": "1", - "target": "Game", - "dependencies": [] - } - """.formatted(name); - } -} diff --git a/prometeu-studio/src/test/java/p/studio/projects/ProjectCatalogServiceTest.java b/prometeu-studio/src/test/java/p/studio/projects/ProjectCatalogServiceTest.java deleted file mode 100644 index 3d5159c1..00000000 --- a/prometeu-studio/src/test/java/p/studio/projects/ProjectCatalogServiceTest.java +++ /dev/null @@ -1,146 +0,0 @@ -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; - -import static org.junit.jupiter.api.Assertions.*; - -final class ProjectCatalogServiceTest { - @TempDir - Path tempDir; - - @Test - void listsExistingProjectDirectories() throws Exception { - Files.createDirectories(tempDir.resolve("alpha")); - Files.createDirectories(tempDir.resolve("beta")); - Files.createDirectories(tempDir.resolve("scratch")); - Files.writeString(tempDir.resolve("alpha").resolve("prometeu.json"), manifest("Alpha Project")); - Files.writeString(tempDir.resolve("beta").resolve("prometeu.json"), manifest("Beta Project")); - Files.createDirectories(tempDir.resolve("alpha").resolve("src")); - - final ProjectCatalogService service = new ProjectCatalogService(tempDir); - - assertEquals( - java.util.List.of("Alpha Project", "Beta Project"), - service.listProjects().stream().map(ProjectReference::name).toList()); - } - - @Test - void createsProjectWithExpectedStructure() { - final ProjectCatalogService service = new ProjectCatalogService(tempDir); - - final ProjectReference project = service.createProject("My New Project"); - - assertEquals("My New Project", project.name()); - 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"))); - assertTrue(Files.isDirectory(project.rootPath().resolve(".workspace"))); - assertTrue(Files.isDirectory(project.rootPath().resolve(".studio"))); - assertTrue(Files.isRegularFile(project.rootPath().resolve(".studio").resolve("setup.json"))); - assertTrue(Files.isDirectory(project.rootPath().resolve("src"))); - assertTrue(Files.isDirectory(project.rootPath().resolve("build"))); - assertTrue(Files.isDirectory(project.rootPath().resolve("cartridge"))); - final String gitIgnore = assertDoesNotThrow(() -> Files.readString(project.rootPath().resolve(".gitignore"))); - assertTrue(gitIgnore.contains(".studio/")); - assertTrue(gitIgnore.contains(".workspace/")); - assertTrue(gitIgnore.contains("build/")); - assertTrue(gitIgnore.contains(".DS_Store")); - assertTrue(gitIgnore.contains("Thumbs.db")); - assertTrue(gitIgnore.contains(".directory")); - } - - @Test - void createsProjectInsideExplicitParentLocation() { - final ProjectCatalogService service = new ProjectCatalogService(tempDir.resolve("ignored-default-root")); - final Path customParent = tempDir.resolve("custom-projects"); - - final ProjectReference project = service.createProject("Wizard Project", customParent); - - assertEquals("Wizard Project", project.name()); - assertEquals("1.0.0", project.version()); - assertEquals("pbs", project.languageId()); - assertEquals(1, project.stdlibVersion()); - assertEquals(customParent.resolve("wizard-project"), project.rootPath()); - assertTrue(Files.isDirectory(project.rootPath())); - assertTrue(Files.isRegularFile(project.rootPath().resolve("prometeu.json"))); - assertTrue(Files.isDirectory(project.rootPath().resolve(".workspace"))); - assertTrue(Files.isDirectory(project.rootPath().resolve(".studio"))); - assertTrue(Files.isDirectory(project.rootPath().resolve("src"))); - } - - @Test - void createsProjectUsingRequestedLanguageStdlibAndSourceRoot() throws Exception { - final ProjectCatalogService service = new ProjectCatalogService(tempDir); - - final ProjectReference project = service.createProject(new ProjectCreationRequest( - "Wizard Layout Project", - tempDir, - "pbs", - 7, - AppMode.Game, - "code", - 8, - "/opt/prometeu/runtime")); - - assertEquals("Wizard Layout Project", project.name()); - assertEquals("1.0.0", project.version()); - assertEquals("pbs", project.languageId()); - assertEquals(7, project.stdlibVersion()); - assertTrue(Files.isDirectory(project.rootPath().resolve("code"))); - assertTrue(Files.notExists(project.rootPath().resolve("src"))); - final String manifestJson = Files.readString(project.rootPath().resolve("prometeu.json")); - final String setupJson = Files.readString(project.rootPath().resolve(".studio").resolve("setup.json")); - assertTrue(manifestJson.contains("\"language\": \"pbs\"")); - assertTrue(manifestJson.contains("\"stdlib\": \"7\"")); - assertTrue(setupJson.contains("\"prometeuRuntimePath\" : \"/opt/prometeu/runtime\"")); - assertTrue(setupJson.contains("\"mode\" : \"spaces\"")); - assertTrue(setupJson.contains("\"width\" : 8")); - } - - @Test - void openProjectRejectsDirectoryWithoutPrometeuManifest() throws Exception { - final Path invalidProject = tempDir.resolve("invalid-project"); - Files.createDirectories(invalidProject); - final ProjectCatalogService service = new ProjectCatalogService(tempDir); - - assertThrows(IllegalArgumentException.class, () -> service.openProject(invalidProject)); - } - - @Test - void openProjectUsesManifestNameInsteadOfDirectoryName() throws Exception { - final Path projectRoot = tempDir.resolve("folder-name"); - Files.createDirectories(projectRoot); - Files.writeString(projectRoot.resolve("prometeu.json"), manifest("Display Name")); - final ProjectCatalogService service = new ProjectCatalogService(tempDir); - - final ProjectReference project = service.openProject(projectRoot); - - assertEquals("Display Name", project.name()); - assertEquals("1.0.0", project.version()); - assertEquals("pbs", project.languageId()); - assertEquals(1, project.stdlibVersion()); - assertEquals(projectRoot, project.rootPath()); - } - - private String manifest(String name) { - return """ - { - "name": "%s", - "version": "1.0.0", - "language": "pbs", - "stdlib": "1", - "target": "Game", - "dependencies": [] - } - """.formatted(name); - } -} diff --git a/prometeu-studio/src/test/java/p/studio/projects/ProjectLanguageCatalogServiceTest.java b/prometeu-studio/src/test/java/p/studio/projects/ProjectLanguageCatalogServiceTest.java deleted file mode 100644 index a02306af..00000000 --- a/prometeu-studio/src/test/java/p/studio/projects/ProjectLanguageCatalogServiceTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package p.studio.projects; - -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -class ProjectLanguageCatalogServiceTest { - - @Test - void shouldListLanguagesFromRegisteredProviders() { - final var service = new ProjectLanguageCatalogService(); - - final var templates = service.listLanguageTemplates(); - - assertEquals(1, templates.size()); - assertEquals("pbs", templates.getFirst().languageId()); - } -} diff --git a/prometeu-studio/src/test/java/p/studio/projectsessions/StudioProjectSessionFactoryTest.java b/prometeu-studio/src/test/java/p/studio/projectsessions/StudioProjectSessionFactoryTest.java deleted file mode 100644 index d611ffce..00000000 --- a/prometeu-studio/src/test/java/p/studio/projectsessions/StudioProjectSessionFactoryTest.java +++ /dev/null @@ -1,121 +0,0 @@ -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; -import p.studio.projects.ProjectReference; -import p.studio.projectstate.ProjectLocalStudioSetup; -import p.studio.projectstate.ProjectLocalStudioSetupService; -import p.studio.projectstate.ProjectLocalStudioState; -import p.studio.projectstate.ProjectLocalStudioStateService; - -import java.nio.file.Path; - -import static org.junit.jupiter.api.Assertions.*; - -final class StudioProjectSessionFactoryTest { - @Test - void openCreatesProjectSessionAndBootsLspServer() { - final RecordingProjectLocalStudioStateService stateService = new RecordingProjectLocalStudioStateService(); - final RecordingProjectLocalStudioSetupService setupService = new RecordingProjectLocalStudioSetupService(); - final RecordingLspServerLifecycle lspServerLifecycle = new RecordingLspServerLifecycle(); - final StudioProjectSessionFactory sessionFactory = new StudioProjectSessionFactory( - stateService, - setupService, - lspServerLifecycle); - final ProjectReference projectReference = new ProjectReference( - "Example", - "1.0.0", - "pbs", - 1, - AppMode.Game, - Path.of("/tmp/example")); - - final StudioProjectSession session = sessionFactory.open(projectReference); - - assertSame(projectReference, session.projectReference()); - assertSame(stateService.loadedState, session.projectLocalStudioState()); - assertSame(setupService.loadedSetup, session.projectLocalStudioSetup()); - assertEquals("IDLE", session.executionSession().snapshot().state().name()); - assertSame(projectReference, stateService.loadedProjectReference); - assertSame(projectReference, setupService.loadedProjectReference); - assertEquals(1, lspServerLifecycle.bootCalls); - assertEquals(projectReference.languageId(), lspServerLifecycle.lastProjectContext.languageId()); - assertEquals(projectReference.rootPath().toAbsolutePath().normalize(), lspServerLifecycle.lastProjectContext.projectRoot()); - } - - @Test - void openSurfacesLspBootFailure() { - final RecordingProjectLocalStudioStateService stateService = new RecordingProjectLocalStudioStateService(); - final RecordingProjectLocalStudioSetupService setupService = new RecordingProjectLocalStudioSetupService(); - final StudioProjectSessionFactory sessionFactory = new StudioProjectSessionFactory( - stateService, - setupService, - new FailingLspServerLifecycle()); - - final IllegalStateException failure = assertThrows(IllegalStateException.class, () -> sessionFactory.open(new ProjectReference( - "Example", - "1.0.0", - "pbs", - 1, - AppMode.Game, - Path.of("/tmp/example")))); - - assertEquals("boom", failure.getMessage()); - } - - private static final class RecordingProjectLocalStudioStateService extends ProjectLocalStudioStateService { - private ProjectReference loadedProjectReference; - private final ProjectLocalStudioState loadedState = new ProjectLocalStudioState( - ProjectLocalStudioState.CURRENT_VERSION, - ProjectLocalStudioState.ShellLayout.defaults(), - new ProjectLocalStudioState.OpenShellState("ASSETS")); - - @Override - public ProjectLocalStudioState load(final ProjectReference projectReference) { - this.loadedProjectReference = projectReference; - return loadedState; - } - } - - private static final class RecordingProjectLocalStudioSetupService extends ProjectLocalStudioSetupService { - private ProjectReference loadedProjectReference; - private final ProjectLocalStudioSetup loadedSetup = new ProjectLocalStudioSetup( - null, - new ProjectLocalStudioSetup.EditorIndentationSetup("spaces", 8)); - - @Override - public ProjectLocalStudioSetup load(final ProjectReference projectReference) { - this.loadedProjectReference = projectReference; - return loadedSetup; - } - } - - private static final class RecordingLspServerLifecycle implements LspServerLifecycle { - private int bootCalls; - private LspProjectContext lastProjectContext; - - @Override - public void bootServer(LspServerConfiguration serverConfiguration, LspProjectContext context) { - bootCalls++; - lastProjectContext = context; - } - - @Override - public void shutdownServer(final LspProjectContext project) { - } - } - - private static final class FailingLspServerLifecycle implements LspServerLifecycle { - @Override - public void bootServer(LspServerConfiguration serverConfiguration, LspProjectContext context) { - throw new IllegalStateException("boom"); - } - - @Override - public void shutdownServer(final LspProjectContext project) { - } - } -} diff --git a/prometeu-studio/src/test/java/p/studio/projectsessions/StudioProjectSessionTest.java b/prometeu-studio/src/test/java/p/studio/projectsessions/StudioProjectSessionTest.java deleted file mode 100644 index 83f0c0d4..00000000 --- a/prometeu-studio/src/test/java/p/studio/projectsessions/StudioProjectSessionTest.java +++ /dev/null @@ -1,105 +0,0 @@ -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; -import p.studio.lsp.messages.LspServerConfiguration; -import p.studio.projects.ProjectReference; -import p.studio.projectstate.ProjectLocalStudioSetup; -import p.studio.projectstate.ProjectLocalStudioState; -import p.studio.projectstate.ProjectLocalStudioStateService; - -import java.nio.file.Path; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertSame; - -final class StudioProjectSessionTest { - @Test - void closeSavesStateOnlyOnce() { - final RecordingProjectLocalStudioStateService stateService = new RecordingProjectLocalStudioStateService(); - final StudioProjectSession session = new StudioProjectSession( - projectReference(), - stateService, - ProjectLocalStudioSetup.defaults(), - new StudioExecutionSessionService(), - null, - ProjectLocalStudioState.defaults()); - - session.close(); - session.close(); - - assertEquals(1, stateService.saveCalls); - assertEquals(projectReference(), stateService.savedProjectReference); - } - - @Test - void replaceProjectLocalStudioStateUpdatesTheSavedSnapshot() { - final RecordingProjectLocalStudioStateService stateService = new RecordingProjectLocalStudioStateService(); - final StudioProjectSession session = new StudioProjectSession( - projectReference(), - stateService, - ProjectLocalStudioSetup.defaults(), - new StudioExecutionSessionService(), - null, - ProjectLocalStudioState.defaults()); - final ProjectLocalStudioState nextState = ProjectLocalStudioState.defaults() - .withOpenShellState(new ProjectLocalStudioState.OpenShellState("ASSETS")); - - session.replaceProjectLocalStudioState(nextState); - session.close(); - - assertSame(nextState, stateService.savedState); - } - - @Test - void closeShutsDownLspServerOnlyOnce() { - final RecordingProjectLocalStudioStateService stateService = new RecordingProjectLocalStudioStateService(); - final RecordingLspServerLifecycle lspServerLifecycle = new RecordingLspServerLifecycle(); - final StudioProjectSession session = new StudioProjectSession( - projectReference(), - stateService, - ProjectLocalStudioSetup.defaults(), - new StudioExecutionSessionService(), - lspServerLifecycle, - ProjectLocalStudioState.defaults()); - - session.close(); - session.close(); - - assertEquals(1, lspServerLifecycle.shutdownCalls); - } - - private ProjectReference projectReference() { - return new ProjectReference("Example", "1.0.0", "pbs", 1, AppMode.Game, Path.of("/tmp/example")); - } - - private static final class RecordingProjectLocalStudioStateService extends ProjectLocalStudioStateService { - private int saveCalls; - private ProjectReference savedProjectReference; - private ProjectLocalStudioState savedState; - - @Override - public void save(final ProjectReference projectReference, final ProjectLocalStudioState state) { - saveCalls++; - savedProjectReference = projectReference; - savedState = state; - } - } - - private static final class RecordingLspServerLifecycle implements LspServerLifecycle { - private int shutdownCalls; - - @Override - public void bootServer(LspServerConfiguration serverConfiguration, LspProjectContext context) { - throw new UnsupportedOperationException(); - } - - @Override - public void shutdownServer(final LspProjectContext project) { - shutdownCalls++; - } - } -} diff --git a/prometeu-studio/src/test/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionCoordinatorTest.java b/prometeu-studio/src/test/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionCoordinatorTest.java deleted file mode 100644 index bf27fbfd..00000000 --- a/prometeu-studio/src/test/java/p/studio/workspaces/assets/details/bank/AssetDetailsBankCompositionCoordinatorTest.java +++ /dev/null @@ -1,174 +0,0 @@ -package p.studio.workspaces.assets.details.bank; - -import org.junit.jupiter.api.Test; -import p.packer.dtos.PackerCodecConfigurationFieldDTO; -import p.packer.messages.AssetReference; -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.workspaces.assets.metadata.AssetStudioGlyphSpecialization; -import p.studio.workspaces.assets.messages.*; - -import java.nio.file.Path; -import java.util.List; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.*; - -final class AssetDetailsBankCompositionCoordinatorTest { - @Test - void tileFamilyBlocksSelectionAfterSlotCapacity() { - final AssetDetailsBankCompositionCoordinator coordinator = new AssetDetailsBankCompositionCoordinator(); - coordinator.replaceDetails(tileDetails("32x32", 65)); - coordinator.beginEdit(); - - coordinator.moveToSelected(coordinator.viewModel().availableFiles()); - - assertEquals(64, coordinator.viewModel().selectedFiles().size()); - assertTrue(coordinator.viewModel().capacityState().blocked()); - } - - @Test - void tileFamilyUsesAtlasCapacityFor8x8Tiles() { - final AssetDetailsBankCompositionCoordinator coordinator = new AssetDetailsBankCompositionCoordinator(); - coordinator.replaceDetails(tileDetails("8x8", 1_100)); - coordinator.beginEdit(); - - coordinator.moveToSelected(coordinator.viewModel().availableFiles()); - - assertEquals(1_024, coordinator.viewModel().selectedFiles().size()); - assertEquals("1024 / 1024", coordinator.viewModel().capacityState().labelText()); - assertTrue(coordinator.viewModel().capacityState().blocked()); - } - - @Test - void tileFamilyUsesAtlasCapacityFor16x16Tiles() { - final AssetDetailsBankCompositionCoordinator coordinator = new AssetDetailsBankCompositionCoordinator(); - coordinator.replaceDetails(tileDetails("16x16", 300)); - coordinator.beginEdit(); - - coordinator.moveToSelected(coordinator.viewModel().availableFiles()); - - assertEquals(256, coordinator.viewModel().selectedFiles().size()); - assertEquals("256 / 256", coordinator.viewModel().capacityState().labelText()); - assertTrue(coordinator.viewModel().capacityState().blocked()); - } - - @Test - void tileFamilyUsesAtlasCapacityFor32x32Tiles() { - final AssetDetailsBankCompositionCoordinator coordinator = new AssetDetailsBankCompositionCoordinator(); - coordinator.replaceDetails(tileDetails("32x32", 100)); - coordinator.beginEdit(); - - coordinator.moveToSelected(coordinator.viewModel().availableFiles()); - - assertEquals(64, coordinator.viewModel().selectedFiles().size()); - assertEquals("64 / 64", coordinator.viewModel().capacityState().labelText()); - assertTrue(coordinator.viewModel().capacityState().blocked()); - } - - @Test - void soundFamilyBlocksSelectionAfterByteCapacity() { - final AssetDetailsBankCompositionCoordinator coordinator = new AssetDetailsBankCompositionCoordinator(); - coordinator.replaceDetails(soundDetails(600_000L, 600_000L)); - coordinator.beginEdit(); - - coordinator.moveToSelected(coordinator.viewModel().availableFiles()); - - assertEquals(1, coordinator.viewModel().selectedFiles().size()); - assertTrue(coordinator.viewModel().capacityState().progress() > 0.5d); - } - - @Test - void resetAndCancelFollowStudioFormSessionLifecycle() { - final AssetDetailsBankCompositionCoordinator coordinator = new AssetDetailsBankCompositionCoordinator(); - coordinator.replaceDetails(tileDetails("16x16", 2)); - coordinator.beginEdit(); - - final var firstFile = coordinator.viewModel().availableFiles().subList(0, 1); - coordinator.moveToSelected(firstFile); - assertTrue(coordinator.viewModel().dirty()); - - coordinator.reset(); - assertFalse(coordinator.viewModel().dirty()); - - coordinator.moveToSelected(firstFile); - assertTrue(coordinator.viewModel().dirty()); - coordinator.cancel(); - assertFalse(coordinator.viewModel().editing()); - assertFalse(coordinator.viewModel().dirty()); - } - - private AssetWorkspaceAssetDetails tileDetails(String tileSize, int fileCount) { - return new AssetWorkspaceAssetDetails( - summary(AssetFamilyCatalog.GLYPH_BANK), - List.of(), - OutputFormatCatalog.GLYPH_INDEXED_V1, - OutputCodecCatalog.NONE, - List.of(OutputCodecCatalog.NONE), - Map.of(OutputCodecCatalog.NONE, List.of()), - List.of(new PackerCodecConfigurationFieldDTO("tile_size", "Tile Size", PackerCodecConfigurationFieldType.TEXT, tileSize, true, List.of())), - Map.of(), - new AssetWorkspaceBankCompositionDetails( - files("tile", fileCount, 1024L), - List.of(), - 0L), - List.of(), - null, - null, - AssetWorkspaceSceneBankValidation.NOT_APPLICABLE, - List.of()); - } - - private AssetWorkspaceAssetDetails soundDetails(long firstSize, long secondSize) { - return new AssetWorkspaceAssetDetails( - summary(AssetFamilyCatalog.SOUND_BANK), - List.of(), - OutputFormatCatalog.SOUND_V1, - OutputCodecCatalog.NONE, - List.of(OutputCodecCatalog.NONE), - Map.of(OutputCodecCatalog.NONE, List.of()), - List.of(), - Map.of("samples", Map.of( - "1", Map.of("offset", 0L, "length", firstSize), - "2", Map.of("offset", firstSize, "length", secondSize))), - new AssetWorkspaceBankCompositionDetails( - List.of( - new AssetWorkspaceBankCompositionFile("a.wav", "a.wav", firstSize, 1L, null, Map.of()), - new AssetWorkspaceBankCompositionFile("b.wav", "b.wav", secondSize, 1L, null, Map.of())), - List.of(), - 0L), - List.of(), - null, - null, - AssetWorkspaceSceneBankValidation.NOT_APPLICABLE, - List.of()); - } - - private List files(String prefix, int count, long size) { - return java.util.stream.IntStream.range(0, count) - .mapToObj(index -> new AssetWorkspaceBankCompositionFile( - prefix + "-" + index + ".png", - prefix + "-" + index + ".png", - size, - 1L, - null, - Map.of())) - .toList(); - } - - private AssetWorkspaceAssetSummary summary(AssetFamilyCatalog family) { - return new AssetWorkspaceAssetSummary( - AssetReference.forAssetId(1), - "bank", - AssetWorkspaceAssetState.REGISTERED, - AssetWorkspaceBuildParticipation.INCLUDED, - 1, - family, - AssetStudioGlyphSpecialization.NONE, - Path.of("/tmp/bank"), - false, - false); - } -} diff --git a/settings.gradle.kts b/settings.gradle.kts index 98adda19..e3a666c8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,7 +19,9 @@ include("prometeu-compiler:prometeu-deps") include("prometeu-compiler:prometeu-frontend-api") include("prometeu-compiler:prometeu-frontend-registry") -include("prometeu-studio") +include("prometeu-studio-api") +include("prometeu-studio-core") +include("prometeu-studio-ui-javafx") include("prometeu-app")