Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: allow projects in nested directories (#2175)
Kyle Mendell4133c48b366b
diff --git a/backend/internal/database/database_test.go b/backend/internal/database/database_test.goindex e139fddea..b72db6693 100644--- a/backend/internal/database/database_test.go+++ b/backend/internal/database/database_test.go@@ -209,7 +209,7 @@ func TestInitialize_CreatesQueryPerformanceIndexes(t *testing.T) {"idx_gitops_syncs_environment_last_sync_status","idx_gitops_syncs_environment_repository_id","idx_gitops_syncs_environment_project_id",- "idx_projects_path",+ "idx_projects_path_unique","idx_projects_dir_name_not_null","idx_compose_templates_lookup_name","idx_compose_templates_lookup_description",diff --git a/backend/internal/huma/handlers/projects.go b/backend/internal/huma/handlers/projects.goindex 4ad08f1e5..cd9adff16 100644--- a/backend/internal/huma/handlers/projects.go+++ b/backend/internal/huma/handlers/projects.go@@ -515,6 +515,7 @@ func (h *ProjectHandler) CreateProject(ctx context.Context, input *CreateProjectresponse.CreatedAt = proj.CreatedAt.Format(time.RFC3339)response.UpdatedAt = proj.UpdatedAt.Format(time.RFC3339)response.DirName = utils.DerefString(proj.DirName)+ response.RelativePath = h.projectService.GetProjectRelativePath(ctx, proj.Path)response.GitOpsManagedBy = proj.GitOpsManagedByreturn &CreateProjectOutput{diff --git a/backend/internal/models/project.go b/backend/internal/models/project.goindex b79052e15..4322d794b 100644--- a/backend/internal/models/project.go+++ b/backend/internal/models/project.go@@ -15,7 +15,7 @@ const (type Project struct {Name string `json:"name" sortable:"true"`DirName *string `json:"dir_name"`- Path string `json:"path"`+ Path string `json:"path" sortable:"true" gorm:"uniqueIndex"`Status ProjectStatus `json:"status" sortable:"true"`StatusReason *string `json:"status_reason"`ServiceCount int `json:"service_count" sortable:"true"`diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.goindex 452978f82..e0c65e952 100644--- a/backend/internal/services/project_service.go+++ b/backend/internal/services/project_service.go@@ -110,6 +110,44 @@ func (s *ProjectService) getPathMapper(ctx context.Context) (*projects.PathMappereturn pm, nil}+func (s *ProjectService) getProjectsDirectoryInternal(ctx context.Context) (string, error) {+ projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")+ projectsDir, err := projects.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))+ if err != nil {+ return "", err+ }++ return filepath.Clean(projectsDir), nil+}++func (s *ProjectService) GetProjectRelativePath(ctx context.Context, projectPath string) string {+ projectsDir, err := s.getProjectsDirectoryInternal(ctx)+ if err != nil {+ return ""+ }++ return s.getProjectRelativePathInternal(projectsDir, projectPath)+}++func (s *ProjectService) getProjectRelativePathInternal(projectsDir, projectPath string) string {+ if strings.TrimSpace(projectsDir) == "" {+ return ""+ }++ relativePath, err := filepath.Rel(projectsDir, filepath.Clean(projectPath))+ if err != nil {+ return ""+ }+ if relativePath == "." {+ return ""+ }+ if relativePath == ".." || strings.HasPrefix(relativePath, ".."+string(os.PathSeparator)) {+ return ""+ }++ return filepath.ToSlash(relativePath)+}+// Helperstype ProjectServiceInfo struct {@@ -560,6 +598,7 @@ func (s *ProjectService) GetProjectDetails(ctx context.Context, projectID stringif err != nil {return project.Details{}, err}+ projectsDir, _ := s.getProjectsDirectoryInternal(ctx)composeContent, _, _ := s.GetProjectContent(ctx, projectID)envState, err := projects.ReadProjectEnvState(proj.Path)@@ -583,6 +622,7 @@ func (s *ProjectService) GetProjectDetails(ctx context.Context, projectID stringresp.EnvContent = effectiveEnvContentresp.HasBuildDirective = falseresp.DirName = utils.DerefString(proj.DirName)+ resp.RelativePath = s.getProjectRelativePathInternal(projectsDir, proj.Path)resp.GitOpsManagedBy = proj.GitOpsManagedBymeta := s.getProjectMetadataFromPath(ctx, proj.Path)resp.IconURL = meta.ProjectIconURL@@ -798,39 +838,29 @@ func (s *ProjectService) enrichWithComposeServiceConfigs(ctx context.Context, pr}func (s *ProjectService) SyncProjectsFromFileSystem(ctx context.Context) error {- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")followProjectSymlinks := s.settingsService.GetBoolSetting(ctx, "followProjectSymlinks", false)- projectsDir, err := projects.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))+ projectsDir, err := s.getProjectsDirectoryInternal(ctx)if err != nil {slog.WarnContext(ctx, "unable to prepare projects directory", "error", err)return nil}- projectsDir = filepath.Clean(projectsDir)- entries, rerr := os.ReadDir(projectsDir)- if rerr != nil {- slog.WarnContext(ctx, "failed to read projects directory", "dir", projectsDir, "error", rerr)+ discoveredProjects, discoveryErr := projects.DiscoverProjectDirectories(projectsDir, followProjectSymlinks)+ if discoveryErr != nil {+ if os.IsNotExist(discoveryErr) {+ return nil+ }+ slog.WarnContext(ctx, "failed to discover projects directory contents", "dir", projectsDir, "error", discoveryErr)return nil}seen := map[string]struct{}{}- for _, e := range entries {- dirPath := filepath.Join(projectsDir, e.Name())- if !projects.IsProjectDirectoryEntry(e, dirPath, followProjectSymlinks) {- continue- }- dirName := e.Name()-- // Only consider folders that contain a compose file- if _, derr := projects.DetectComposeFile(dirPath); derr != nil {- continue- }-- if uerr := s.upsertProjectForDir(ctx, dirName, dirPath); uerr != nil {- slog.WarnContext(ctx, "failed to sync project from folder", "dir", dirPath, "error", uerr)+ for _, discoveredProject := range discoveredProjects {+ if uerr := s.upsertProjectForDir(ctx, discoveredProject.DirName, discoveredProject.Path); uerr != nil {+ slog.WarnContext(ctx, "failed to sync project from folder", "dir", discoveredProject.Path, "error", uerr)continue}- seen[dirPath] = struct{}{}+ seen[discoveredProject.Path] = struct{}{}}if cerr := s.cleanupDBProjects(ctx, seen, followProjectSymlinks); cerr != nil {@@ -843,7 +873,7 @@ func (s *ProjectService) SyncProjectsFromFileSystem(ctx context.Context) error {func (s *ProjectService) upsertProjectForDir(ctx context.Context, dirName, dirPath string) error {var existing models.Projecterr := s.db.WithContext(ctx).- Where("path = ? OR dir_name = ?", dirPath, dirName).+ Where("path = ?", dirPath).First(&existing).ErrorfilesystemProject := models.Project{@@ -978,13 +1008,11 @@ func formatDockerPorts(ports []container.PortSummary) []string {}func (s *ProjectService) countProjectFolders(ctx context.Context) (int, error) {- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")followProjectSymlinks := s.settingsService.GetBoolSetting(ctx, "followProjectSymlinks", false)- projectsDir, err := projects.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))+ projectsDir, err := s.getProjectsDirectoryInternal(ctx)if err != nil {return 0, fmt.Errorf("could not determine projects directory: %w", err)}- projectsDir = filepath.Clean(projectsDir)info, statErr := os.Stat(projectsDir)if os.IsNotExist(statErr) {@@ -998,22 +1026,12 @@ func (s *ProjectService) countProjectFolders(ctx context.Context) (int, error) {return 0, nil}- entries, readErr := os.ReadDir(projectsDir)- if readErr != nil {- return 0, fmt.Errorf("failed to read projects directory %s: %w", projectsDir, readErr)+ discoveredProjects, discoveryErr := projects.DiscoverProjectDirectories(projectsDir, followProjectSymlinks)+ if discoveryErr != nil {+ return 0, fmt.Errorf("failed to discover project directories in %s: %w", projectsDir, discoveryErr)}- count := 0- for _, e := range entries {- dirPath := filepath.Join(projectsDir, e.Name())- if !projects.IsProjectDirectoryEntry(e, dirPath, followProjectSymlinks) {- continue- }- if _, err := projects.DetectComposeFile(dirPath); err == nil {- count++- }- }- return count, nil+ return len(discoveredProjects), nil}func (s *ProjectService) incrementStatusCounts(status models.ProjectStatus, running, stopped *int) {@@ -2888,6 +2906,7 @@ func (s *ProjectService) listProjectsByStatus(SearchAccessors: []pagination.SearchAccessor[project.Details]{func(p project.Details) (string, error) { return p.Name, nil },func(p project.Details) (string, error) { return p.Path, nil },+ func(p project.Details) (string, error) { return p.RelativePath, nil },func(p project.Details) (string, error) { return p.Status, nil },func(p project.Details) (string, error) { return p.DirName, nil },},@@ -2916,6 +2935,12 @@ func (s *ProjectService) listProjectsByStatus(return 0},},+ {+ Key: "path",+ Fn: func(a, b project.Details) int {+ return strings.Compare(a.RelativePath, b.RelativePath)+ },+ },{Key: "createdAt",Fn: func(a, b project.Details) int {@@ -2953,6 +2978,11 @@ func (s *ProjectService) listProjectsByStatus(// fetchProjectStatusConcurrently fetches live Docker status for multiple projects in parallel// Optimized to use a single Docker API call instead of N calls + N file readsfunc (s *ProjectService) fetchProjectStatusConcurrently(ctx context.Context, projectsList []models.Project) []project.Details {+ projectsDir, err := s.getProjectsDirectoryInternal(ctx)+ if err != nil {+ slog.WarnContext(ctx, "failed to resolve projects directory for relative project paths", "error", err)+ }+// 1. Fetch all compose containers in one gocontainers, err := projects.ListGlobalComposeContainers(ctx)if err != nil {@@ -2961,6 +2991,14 @@ func (s *ProjectService) fetchProjectStatusConcurrently(ctx context.Context, proresults := make([]project.Details, len(projectsList))for i, p := range projectsList {_ = mapper.MapStruct(p, &results[i])+ results[i].CreatedAt = p.CreatedAt.Format(time.RFC3339)+ results[i].UpdatedAt = p.UpdatedAt.Format(time.RFC3339)+ results[i].DirName = utils.DerefString(p.DirName)+ results[i].RelativePath = s.getProjectRelativePathInternal(projectsDir, p.Path)+ results[i].GitOpsManagedBy = p.GitOpsManagedBy+ meta := s.getProjectMetadataFromPath(ctx, p.Path)+ results[i].IconURL = meta.ProjectIconURL+ results[i].URLs = meta.ProjectURLSresults[i].Status = string(models.ProjectStatusUnknown)}return results@@ -2978,19 +3016,20 @@ func (s *ProjectService) fetchProjectStatusConcurrently(ctx context.Context, pro// 3. Map to DTOsresults := make([]project.Details, len(projectsList))for i, p := range projectsList {- results[i] = s.mapProjectToDto(ctx, p, containersByProject)+ results[i] = s.mapProjectToDto(ctx, projectsDir, p, containersByProject)}return results}-func (s *ProjectService) mapProjectToDto(ctx context.Context, p models.Project, containersByProject map[string][]container.Summary) project.Details {+func (s *ProjectService) mapProjectToDto(ctx context.Context, projectsDir string, p models.Project, containersByProject map[string][]container.Summary) project.Details {var resp project.Details_ = mapper.MapStruct(p, &resp)resp.CreatedAt = p.CreatedAt.Format(time.RFC3339)resp.UpdatedAt = p.UpdatedAt.Format(time.RFC3339)resp.DirName = utils.DerefString(p.DirName)+ resp.RelativePath = s.getProjectRelativePathInternal(projectsDir, p.Path)resp.GitOpsManagedBy = p.GitOpsManagedBymeta := s.getProjectMetadataFromPath(ctx, p.Path)resp.IconURL = meta.ProjectIconURLdiff --git a/backend/internal/services/project_service_test.go b/backend/internal/services/project_service_test.goindex ad177c7d4..43a069cdd 100644--- a/backend/internal/services/project_service_test.go+++ b/backend/internal/services/project_service_test.go@@ -10,6 +10,7 @@ import ("time"composetypes "github.com/compose-spec/compose-go/v2/types"+ "github.com/getarcaneapp/arcane/backend/pkg/pagination""github.com/getarcaneapp/arcane/backend/pkg/projects"buildtypes "github.com/getarcaneapp/arcane/types/builds"imagetypes "github.com/getarcaneapp/arcane/types/image"@@ -1760,6 +1761,146 @@ func TestProjectService_CountProjectFolders_RespectsFollowProjectSymlinks(t *tesassert.Equal(t, 2, count)}+func TestProjectService_SyncProjectsFromFileSystem_DiscoversNestedProjectsAndRelativePaths(t *testing.T) {+ db := setupProjectTestDB(t)+ ctx := context.Background()++ settingsService, err := NewSettingsService(ctx, db)+ require.NoError(t, err)++ projectsRoot := t.TempDir()+ nestedPath := createComposeProjectDir(t, projectsRoot, filepath.Join("main-project", "sub-project1"))+ topLevelPath := createComposeProjectDir(t, projectsRoot, "project2")++ require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))++ svc := NewProjectService(db, settingsService, nil, nil, nil, nil)+ require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))++ items, page, err := svc.ListProjects(ctx, pagination.QueryParams{+ SortParams: pagination.SortParams{Sort: "path", Order: pagination.SortAsc},+ PaginationParams: pagination.PaginationParams{Limit: -1},+ })+ require.NoError(t, err)+ require.EqualValues(t, 2, page.TotalItems)+ require.Len(t, items, 2)++ assert.Equal(t, "main-project/sub-project1", items[0].RelativePath)+ assert.Equal(t, nestedPath, items[0].Path)+ assert.Equal(t, "sub-project1", items[0].DirName)++ assert.Equal(t, "project2", items[1].RelativePath)+ assert.Equal(t, topLevelPath, items[1].Path)+ assert.Equal(t, "project2", items[1].DirName)+}++func TestProjectService_CountProjectFolders_RecursivelyCountsNestedProjects(t *testing.T) {+ db := setupProjectTestDB(t)+ ctx := context.Background()++ settingsService, err := NewSettingsService(ctx, db)+ require.NoError(t, err)++ projectsRoot := t.TempDir()+ createComposeProjectDir(t, projectsRoot, filepath.Join("main-project", "sub-project1"))+ createComposeProjectDir(t, projectsRoot, filepath.Join("main-project", "sub-project2"))+ createComposeProjectDir(t, projectsRoot, "project2")++ require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))++ svc := NewProjectService(db, settingsService, nil, nil, nil, nil)++ count, err := svc.countProjectFolders(ctx)+ require.NoError(t, err)+ assert.Equal(t, 3, count)+}++func TestProjectService_SyncProjectsFromFileSystem_RemovesDeletedNestedProject(t *testing.T) {+ db := setupProjectTestDB(t)+ ctx := context.Background()++ settingsService, err := NewSettingsService(ctx, db)+ require.NoError(t, err)++ projectsRoot := t.TempDir()+ projectPath := createComposeProjectDir(t, projectsRoot, filepath.Join("main-project", "sub-project1"))++ require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))++ svc := NewProjectService(db, settingsService, nil, nil, nil, nil)+ require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))++ items, err := svc.ListAllProjects(ctx)+ require.NoError(t, err)+ require.Len(t, items, 1)++ require.NoError(t, os.Remove(filepath.Join(projectPath, "compose.yaml")))+ require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))++ items, err = svc.ListAllProjects(ctx)+ require.NoError(t, err)+ assert.Empty(t, items)+}++func TestProjectService_SyncProjectsFromFileSystem_AllowsDuplicateLeafDirectoriesInDifferentParents(t *testing.T) {+ db := setupProjectTestDB(t)+ ctx := context.Background()++ settingsService, err := NewSettingsService(ctx, db)+ require.NoError(t, err)++ projectsRoot := t.TempDir()+ firstPath := createComposeProjectDir(t, projectsRoot, filepath.Join("main-project1", "app"))+ secondPath := createComposeProjectDir(t, projectsRoot, filepath.Join("main-project2", "app"))++ require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))++ svc := NewProjectService(db, settingsService, nil, nil, nil, nil)+ require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))++ var items []models.Project+ require.NoError(t, db.WithContext(ctx).Order("path asc").Find(&items).Error)+ require.Len(t, items, 2)++ require.NotNil(t, items[0].DirName)+ require.NotNil(t, items[1].DirName)+ assert.Equal(t, "app", *items[0].DirName)+ assert.Equal(t, "app", *items[1].DirName)+ assert.Equal(t, firstPath, items[0].Path)+ assert.Equal(t, secondPath, items[1].Path)+}++func TestProjectService_SyncProjectsFromFileSystem_DetectsNestedSymlinkedProjectDirsWhenEnabled(t *testing.T) {+ db := setupProjectTestDB(t)+ ctx := context.Background()++ settingsService, err := NewSettingsService(ctx, db)+ require.NoError(t, err)++ projectsRoot := t.TempDir()+ targetRoot := t.TempDir()+ targetPath := createComposeProjectDir(t, targetRoot, filepath.Join("main-project", "sub-project1"))+ linkPath := filepath.Join(projectsRoot, "linked-root")+ require.NoError(t, os.Symlink(filepath.Join(targetRoot, "main-project"), linkPath))++ require.NoError(t, settingsService.SetStringSetting(ctx, "projectsDirectory", projectsRoot))+ require.NoError(t, settingsService.SetStringSetting(ctx, "followProjectSymlinks", "true"))++ svc := NewProjectService(db, settingsService, nil, nil, nil, nil)+ require.NoError(t, svc.SyncProjectsFromFileSystem(ctx))++ items, page, err := svc.ListProjects(ctx, pagination.QueryParams{+ SortParams: pagination.SortParams{Sort: "path", Order: pagination.SortAsc},+ PaginationParams: pagination.PaginationParams{Limit: -1},+ })+ require.NoError(t, err)+ require.EqualValues(t, 1, page.TotalItems)+ require.Len(t, items, 1)+ assert.Equal(t, filepath.Join(linkPath, "sub-project1"), items[0].Path)+ assert.Equal(t, "linked-root/sub-project1", items[0].RelativePath)+ assert.Equal(t, targetPath, filepath.Join(targetRoot, "main-project", "sub-project1"))+}+func TestProjectService_SyncProjectsFromFileSystem_RemovesSymlinkedProjectsWhenDisabled(t *testing.T) {db := setupProjectTestDB(t)ctx := context.Background()diff --git a/backend/pkg/fswatch/watcher.go b/backend/pkg/fswatch/watcher.goindex 96e71d637..0021eea48 100644--- a/backend/pkg/fswatch/watcher.go+++ b/backend/pkg/fswatch/watcher.go@@ -192,7 +192,7 @@ func (fw *Watcher) handleEvent(ctx context.Context, event fsnotify.Event) {if event.Has(fsnotify.Create) {if fw.isWatchableDirectory(event.Name) {if fw.shouldWatchDir(event.Name) {- if err := fw.watcher.Add(event.Name); err != nil {+ if err := fw.addExistingDirectories(event.Name); err != nil {slog.WarnContext(ctx, "Failed to add new directory to watcher","path", event.Name,"error", err)@@ -220,59 +220,53 @@ func (fw *Watcher) shouldHandleEvent(event fsnotify.Event) bool {}func (fw *Watcher) addExistingDirectories(root string) error {- if err := filepath.Walk(root, func(path string, info os.FileInfo, err error) error {- if err != nil {- slog.Warn("Error walking directory",- "path", path,- "error", err)- return err- }+ return fw.addExistingDirectoriesRecursiveInternal(root, map[string]struct{}{})+}- if info.IsDir() && path != root {- depth := fw.dirDepth(path)- if depth < 0 {- return filepath.SkipDir- }- if fw.maxDepth > 0 && depth > fw.maxDepth {- return filepath.SkipDir- }+func (fw *Watcher) addExistingDirectoriesRecursiveInternal(path string, ancestors map[string]struct{}) error {+ identity, err := projects.ResolveDirectoryIdentityInternal(path)+ if err != nil {+ return err+ }+ if _, seen := ancestors[identity]; seen {+ return nil+ }- if err := fw.watcher.Add(path); err != nil {- slog.Warn("Failed to add directory to watcher",- "path", path,- "error", err)- }+ ancestors[identity] = struct{}{}+ defer delete(ancestors, identity)- if fw.maxDepth > 0 && depth == fw.maxDepth {- return filepath.SkipDir- }+ if path != fw.watchedPath {+ depth := fw.dirDepth(path)+ if depth < 0 {+ return nil+ }+ if fw.maxDepth > 0 && depth > fw.maxDepth {+ return nil}- return nil- }); err != nil {- return err- }- if !fw.followSymlinks {- return nil+ if err := fw.watcher.Add(path); err != nil {+ slog.Warn("Failed to add directory to watcher",+ "path", path,+ "error", err)+ }++ if fw.maxDepth > 0 && depth == fw.maxDepth {+ return nil+ }}- entries, err := os.ReadDir(root)+ entries, err := os.ReadDir(path)if err != nil {return err}for _, entry := range entries {- path := filepath.Join(root, entry.Name())- if !projects.IsProjectDirectoryEntry(entry, path, fw.followSymlinks) || entry.IsDir() {- continue- }- if !fw.shouldWatchDir(path) {+ childPath := filepath.Join(path, entry.Name())+ if !projects.IsProjectDirectoryEntry(entry, childPath, fw.followSymlinks) {continue}- if err := fw.watcher.Add(path); err != nil {- slog.Warn("Failed to add symlink directory to watcher",- "path", path,- "error", err)+ if err := fw.addExistingDirectoriesRecursiveInternal(childPath, ancestors); err != nil {+ return err}}diff --git a/backend/pkg/fswatch/watcher_test.go b/backend/pkg/fswatch/watcher_test.goindex 512b028f8..3d8d99097 100644--- a/backend/pkg/fswatch/watcher_test.go+++ b/backend/pkg/fswatch/watcher_test.go@@ -154,6 +154,79 @@ func TestWatcher_StartSkipsExistingSymlinkDirectoriesWhenDisabled(t *testing.T)}}+func TestWatcher_StartTriggersOnNestedProjectFileBeyondDepthOne(t *testing.T) {+ root := t.TempDir()+ nestedDir := filepath.Join(root, "main-project", "sub-project1")+ require.NoError(t, os.MkdirAll(nestedDir, 0o755))++ changeCh := make(chan struct{}, 1)+ ctx := t.Context()++ watcher, err := NewWatcher(root, WatcherOptions{+ Debounce: 25 * time.Millisecond,+ MaxDepth: 0,+ OnChange: func(context.Context) {+ select {+ case changeCh <- struct{}{}:+ default:+ }+ },+ })+ require.NoError(t, err)+ require.NoError(t, watcher.Start(ctx))+ defer func() {+ require.NoError(t, watcher.Stop())+ }()++ require.NoError(t, os.WriteFile(filepath.Join(nestedDir, "compose.yaml"), []byte("services: {}\n"), 0o644))++ select {+ case <-changeCh:+ case <-time.After(2 * time.Second):+ t.Fatal("expected nested compose file change to trigger watcher callback")+ }+}++func TestWatcher_StartTriggersOnNestedDirectoryCreateAndRemove(t *testing.T) {+ root := t.TempDir()++ changeCh := make(chan struct{}, 4)+ ctx := t.Context()++ watcher, err := NewWatcher(root, WatcherOptions{+ Debounce: 25 * time.Millisecond,+ MaxDepth: 0,+ OnChange: func(context.Context) {+ select {+ case changeCh <- struct{}{}:+ default:+ }+ },+ })+ require.NoError(t, err)+ require.NoError(t, watcher.Start(ctx))+ defer func() {+ require.NoError(t, watcher.Stop())+ }()++ nestedDir := filepath.Join(root, "main-project", "sub-project1")+ require.NoError(t, os.MkdirAll(nestedDir, 0o755))++ select {+ case <-changeCh:+ case <-time.After(2 * time.Second):+ t.Fatal("expected nested directory create to trigger watcher callback")+ }++ require.NoError(t, os.RemoveAll(filepath.Join(root, "main-project")))++ select {+ case <-changeCh:+ case <-time.After(2 * time.Second):+ t.Fatal("expected nested directory removal to trigger watcher callback")+ }+}+func TestWatcher_Stop_IsIdempotentAfterStart(t *testing.T) {root := t.TempDir()ctx := t.Context()diff --git a/backend/pkg/projects/directory_identity.go b/backend/pkg/projects/directory_identity.gonew file mode 100644index 000000000..f8e171c9b--- /dev/null+++ b/backend/pkg/projects/directory_identity.go@@ -0,0 +1,23 @@+package projects++import (+ "os"+ "path/filepath"+)++func ResolveDirectoryIdentityInternal(path string) (string, error) {+ resolvedPath, err := filepath.EvalSymlinks(path)+ if err != nil {+ if os.IsNotExist(err) {+ return "", err+ }+ resolvedPath = path+ }++ absPath, err := filepath.Abs(resolvedPath)+ if err != nil {+ return "", err+ }++ return filepath.Clean(absPath), nil+}diff --git a/backend/pkg/projects/discovery.go b/backend/pkg/projects/discovery.goindex 940c3b88f..30963c4d8 100644--- a/backend/pkg/projects/discovery.go+++ b/backend/pkg/projects/discovery.go@@ -1,6 +1,17 @@package projects-import "os"+import (+ "fmt"+ "os"+ "path/filepath"+ "slices"+ "strings"+)++type DiscoveredProjectDir struct {+ DirName string+ Path string+}// IsProjectDirectoryEntry reports whether a directory entry should be treated as a project directory.// Regular directories are always accepted. Symlinked directories are accepted only when enabled.@@ -48,3 +59,66 @@ func IsProjectDirectoryPath(path string, followSymlinks bool) (bool, error) {return resolvedInfo.IsDir(), nil}++func DiscoverProjectDirectories(root string, followSymlinks bool) ([]DiscoveredProjectDir, error) {+ root = filepath.Clean(root)++ isDir, err := IsProjectDirectoryPath(root, followSymlinks)+ if err != nil {+ return nil, err+ }+ if !isDir {+ return nil, fmt.Errorf("project root is not a directory: %s", root)+ }++ discovered := make([]DiscoveredProjectDir, 0)+ ancestors := make(map[string]struct{})++ if err := walkProjectDirectoriesInternal(root, followSymlinks, ancestors, &discovered); err != nil {+ return nil, err+ }++ slices.SortStableFunc(discovered, func(a, b DiscoveredProjectDir) int {+ return strings.Compare(filepath.Clean(a.Path), filepath.Clean(b.Path))+ })++ return discovered, nil+}++func walkProjectDirectoriesInternal(path string, followSymlinks bool, ancestors map[string]struct{}, discovered *[]DiscoveredProjectDir) error {+ identity, err := ResolveDirectoryIdentityInternal(path)+ if err != nil {+ return err+ }+ if _, seen := ancestors[identity]; seen {+ return nil+ }++ ancestors[identity] = struct{}{}+ defer delete(ancestors, identity)++ if _, err := DetectComposeFile(path); err == nil {+ *discovered = append(*discovered, DiscoveredProjectDir{+ DirName: filepath.Base(path),+ Path: path,+ })+ }++ entries, err := os.ReadDir(path)+ if err != nil {+ return err+ }++ for _, entry := range entries {+ childPath := filepath.Join(path, entry.Name())+ if !IsProjectDirectoryEntry(entry, childPath, followSymlinks) {+ continue+ }++ if err := walkProjectDirectoriesInternal(childPath, followSymlinks, ancestors, discovered); err != nil {+ return err+ }+ }++ return nil+}diff --git a/backend/pkg/projects/env.go b/backend/pkg/projects/env.goindex dc6bd797d..68dd28707 100644--- a/backend/pkg/projects/env.go+++ b/backend/pkg/projects/env.go@@ -11,10 +11,8 @@ import ("path/filepath""sort""strings"- "time""github.com/compose-spec/compose-go/v2/dotenv"- pkgutils "github.com/getarcaneapp/arcane/backend/pkg/utils")const (@@ -22,11 +20,6 @@ const (EffectiveEnvFileName = ".env"GitSourceEnvFileName = ".env.git"OverrideEnvFileName = "project.env"- globalEnvHeader = `# Global Environment Variables-# These variables are available to all projects-# Created: %s--`)type EnvMap = map[string]string@@ -73,13 +66,11 @@ func (l *EnvLoader) LoadEnvironment(ctx context.Context) (envMap EnvMap, injectienvMap = l.loadProcessEnv()injectionVars = make(EnvMap)- globalEnvPath := filepath.Join(l.projectsDir, GlobalEnvFileName)- if err := l.ensureGlobalEnvFile(ctx, globalEnvPath); err != nil {- slog.WarnContext(ctx, "Failed to ensure global env file", "path", globalEnvPath, "error", err)- }-- if err := l.loadAndMergeGlobalEnv(ctx, globalEnvPath, envMap, injectionVars); err != nil {- slog.WarnContext(ctx, "Failed to load global env", "path", globalEnvPath, "error", err)+ if strings.TrimSpace(l.projectsDir) != "" {+ globalEnvPath := filepath.Join(l.projectsDir, GlobalEnvFileName)+ if err := l.loadAndMergeGlobalEnv(ctx, globalEnvPath, envMap, injectionVars); err != nil && !errors.Is(err, os.ErrNotExist) {+ slog.WarnContext(ctx, "Failed to load global env", "path", globalEnvPath, "error", err)+ }}projectEnvPath := filepath.Join(l.workdir, EffectiveEnvFileName)@@ -100,23 +91,6 @@ func (l *EnvLoader) loadProcessEnv() EnvMap {return envMap}-func (l *EnvLoader) ensureGlobalEnvFile(ctx context.Context, path string) error {- if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) {- header := fmt.Sprintf(globalEnvHeader, time.Now().Format(time.RFC3339))- dir := filepath.Dir(path)- if err := os.MkdirAll(dir, pkgutils.DirPerm); err != nil {- return fmt.Errorf("create dir: %w", err)- }- if err := os.WriteFile(path, []byte(header), pkgutils.FilePerm); err != nil {- return fmt.Errorf("write file: %w", err)- }- slog.InfoContext(ctx, "Created global env file", "path", path)- } else if err != nil {- slog.DebugContext(ctx, "Could not stat global env file", "path", path, "error", err)- }- return nil-}-func (l *EnvLoader) loadAndMergeGlobalEnv(ctx context.Context, path string, envMap, injectionVars EnvMap) error {slog.DebugContext(ctx, "Checking for global env file", "path", path)diff --git a/backend/pkg/projects/env_test.go b/backend/pkg/projects/env_test.goindex 0afadb11f..20ead0585 100644--- a/backend/pkg/projects/env_test.go+++ b/backend/pkg/projects/env_test.go@@ -69,6 +69,27 @@ func TestLoadEnvironment(t *testing.T) {})}+func TestLoadEnvironment_DoesNotCreateMissingGlobalEnvFile(t *testing.T) {+ tmpDir := t.TempDir()+ projectsDir := filepath.Join(tmpDir, "projects")+ workdir := filepath.Join(projectsDir, "myproject")++ require.NoError(t, os.MkdirAll(workdir, pkgutils.DirPerm))+ require.NoError(t, os.WriteFile(filepath.Join(workdir, ".env"), []byte("PROJECT_VAR=project_value\n"), pkgutils.FilePerm))++ loader := NewEnvLoader(projectsDir, workdir, false)+ ctx := context.Background()++ envMap, injectionVars, err := loader.LoadEnvironment(ctx)+ require.NoError(t, err)++ assert.Equal(t, "project_value", envMap["PROJECT_VAR"])+ assert.Empty(t, injectionVars)++ _, statErr := os.Stat(filepath.Join(projectsDir, GlobalEnvFileName))+ assert.ErrorIs(t, statErr, os.ErrNotExist)+}+func TestBuildEffectiveEnvContent(t *testing.T) {gitContent := "BASE_URL=https://example.com\nSHARED=git\n"overrideContent := "API_TOKEN=secret\nSHARED=override\n"diff --git a/backend/pkg/projects/load.go b/backend/pkg/projects/load.goindex a1218a87e..81d08a796 100644--- a/backend/pkg/projects/load.go+++ b/backend/pkg/projects/load.go@@ -78,12 +78,7 @@ func loadComposeProjectInternal(workdir := filepath.Dir(composeFile)- projectsDir := projectsDirectory- if projectsDir == "" {- projectsDir = filepath.Dir(workdir)- }-- envLoader := NewEnvLoader(projectsDir, workdir, autoInjectEnv)+ envLoader := NewEnvLoader(projectsDirectory, workdir, autoInjectEnv)// Load full environment (process + global + project .env) for service injectionfullEnvMap, injectionVars, err := envLoader.LoadEnvironment(ctx)@@ -177,10 +172,6 @@ func LoadComposeProjectFromDir(ctx context.Context, dir, projectName, projectsDireturn nil, "", err}- if projectsDirectory == "" {- projectsDirectory = filepath.Dir(dir)- }-proj, err := LoadComposeProject(ctx, composeFile, projectName, projectsDirectory, autoInjectEnv, pathMapper)if err != nil {return nil, "", errdiff --git a/backend/pkg/projects/load_test.go b/backend/pkg/projects/load_test.goindex 043f80650..5d2fd5359 100644--- a/backend/pkg/projects/load_test.go+++ b/backend/pkg/projects/load_test.go@@ -74,3 +74,21 @@ func TestLoadComposeProjectFromDir_SupportsPodmanComposeNames(t *testing.T) {})}}++func TestLoadComposeProjectFromDir_EmptyProjectsDirectoryDoesNotCreateParentGlobalEnv(t *testing.T) {+ t.Parallel()++ projectsRoot := t.TempDir()+ projectDir := filepath.Join(projectsRoot, "nested", "services")+ require.NoError(t, os.MkdirAll(projectDir, 0o755))+ require.NoError(t, os.WriteFile(filepath.Join(projectDir, "compose.yaml"), []byte("services:\n app:\n image: nginx:alpine\n"), 0o600))++ project, composePath, err := LoadComposeProjectFromDir(context.Background(), projectDir, "nested-services", "", false, nil)+ require.NoError(t, err)+ require.NotNil(t, project)++ assert.Equal(t, filepath.Join(projectDir, "compose.yaml"), composePath)++ _, statErr := os.Stat(filepath.Join(projectsRoot, "nested", GlobalEnvFileName))+ assert.ErrorIs(t, statErr, os.ErrNotExist)+}diff --git a/backend/pkg/scheduler/filesystem_watcher_job.go b/backend/pkg/scheduler/filesystem_watcher_job.goindex f5f95245f..ee9db8627 100644--- a/backend/pkg/scheduler/filesystem_watcher_job.go+++ b/backend/pkg/scheduler/filesystem_watcher_job.go@@ -3,6 +3,7 @@ package schedulerimport ("context""log/slog"+ "runtime""sync""time"@@ -55,11 +56,12 @@ func (j *FilesystemWatcherJob) Start(ctx context.Context) error {return err}followProjectSymlinks := settings.FollowProjectSymlinks.IsTrue()+ j.logRecursiveProjectsWatchLimitWarningInternal(ctx, projectsDirectory)sw, err := fswatch.NewWatcher(projectsDirectory, fswatch.WatcherOptions{Debounce: 3 * time.Second, // Wait 3 seconds after last change before syncingOnChange: j.handleFilesystemChange,- MaxDepth: 1,+ MaxDepth: 0,FollowSymlinkDirs: followProjectSymlinks,})if err != nil {@@ -188,12 +190,13 @@ func (j *FilesystemWatcherJob) RestartProjectsWatcher(ctx context.Context) errorreturn err}followProjectSymlinks := settings.FollowProjectSymlinks.IsTrue()+ j.logRecursiveProjectsWatchLimitWarningInternal(ctx, projectsDirectory)// Create a new watcher with the updated pathsw, err := fswatch.NewWatcher(projectsDirectory, fswatch.WatcherOptions{Debounce: 3 * time.Second,OnChange: j.handleFilesystemChange,- MaxDepth: 1,+ MaxDepth: 0,FollowSymlinkDirs: followProjectSymlinks,})if err != nil {@@ -218,3 +221,14 @@ func (j *FilesystemWatcherJob) RestartProjectsWatcher(ctx context.Context) errorreturn nil}++func (j *FilesystemWatcherJob) logRecursiveProjectsWatchLimitWarningInternal(ctx context.Context, projectsDirectory string) {+ if runtime.GOOS != "linux" {+ return+ }++ slog.WarnContext(ctx,+ "Projects filesystem watcher is monitoring directories recursively; very deep trees may require increasing fs.inotify.max_user_watches",+ "path", projectsDirectory,+ "sysctl", "fs.inotify.max_user_watches")+}diff --git a/backend/resources/migrations/postgres/044_allow_nested_project_paths.down.sql b/backend/resources/migrations/postgres/044_allow_nested_project_paths.down.sqlnew file mode 100644index 000000000..40c9ab00e--- /dev/null+++ b/backend/resources/migrations/postgres/044_allow_nested_project_paths.down.sql@@ -0,0 +1,19 @@+DROP INDEX IF EXISTS idx_projects_path_unique;+CREATE INDEX IF NOT EXISTS idx_projects_path ON projects(path);++-- Rollback is only safe when dir_name values remain unique.+DO $$+BEGIN+ IF EXISTS (+ SELECT 1+ FROM projects+ WHERE dir_name IS NOT NULL+ GROUP BY dir_name+ HAVING COUNT(*) > 1+ ) THEN+ RAISE EXCEPTION 'Cannot rollback migration 044: duplicate projects.dir_name values exist. Remove duplicates before running the down migration.';+ END IF;+END $$;++ALTER TABLE projects+ADD CONSTRAINT projects_dir_name_key UNIQUE (dir_name);diff --git a/backend/resources/migrations/postgres/044_allow_nested_project_paths.up.sql b/backend/resources/migrations/postgres/044_allow_nested_project_paths.up.sqlnew file mode 100644index 000000000..41fbe618b--- /dev/null+++ b/backend/resources/migrations/postgres/044_allow_nested_project_paths.up.sql@@ -0,0 +1,4 @@+ALTER TABLE projects DROP CONSTRAINT IF EXISTS projects_dir_name_key;++DROP INDEX IF EXISTS idx_projects_path;+CREATE UNIQUE INDEX IF NOT EXISTS idx_projects_path_unique ON projects(path);diff --git a/backend/resources/migrations/sqlite/044_allow_nested_project_paths.down.sql b/backend/resources/migrations/sqlite/044_allow_nested_project_paths.down.sqlnew file mode 100644index 000000000..955625440--- /dev/null+++ b/backend/resources/migrations/sqlite/044_allow_nested_project_paths.down.sql@@ -0,0 +1,58 @@+PRAGMA foreign_keys=OFF;++-- Rollback is only safe when dir_name values remain unique.+-- If nested projects introduced duplicate leaf directory names after the up migration,+-- recreating UNIQUE(dir_name) below will fail and the rollback must be handled manually.++ALTER TABLE projects RENAME TO projects_old;++CREATE TABLE projects (+ id TEXT PRIMARY KEY,+ name TEXT NOT NULL,+ dir_name TEXT UNIQUE,+ path TEXT NOT NULL,+ status TEXT NOT NULL,+ service_count INTEGER NOT NULL DEFAULT 0,+ running_count INTEGER NOT NULL DEFAULT 0,+ created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,+ updated_at DATETIME,+ status_reason TEXT,+ gitops_managed_by TEXT+);++INSERT INTO projects (+ id,+ name,+ dir_name,+ path,+ status,+ service_count,+ running_count,+ created_at,+ updated_at,+ status_reason,+ gitops_managed_by+)+SELECT+ id,+ name,+ dir_name,+ path,+ status,+ service_count,+ running_count,+ created_at,+ updated_at,+ status_reason,+ gitops_managed_by+FROM projects_old;++DROP TABLE projects_old;++CREATE INDEX IF NOT EXISTS idx_projects_status ON projects(status);+CREATE INDEX IF NOT EXISTS idx_projects_name ON projects(name);+CREATE INDEX IF NOT EXISTS idx_projects_gitops_managed_by ON projects(gitops_managed_by);+CREATE INDEX IF NOT EXISTS idx_projects_path ON projects(path);+CREATE INDEX IF NOT EXISTS idx_projects_dir_name_not_null ON projects(dir_name) WHERE dir_name IS NOT NULL;++PRAGMA foreign_keys=ON;diff --git a/backend/resources/migrations/sqlite/044_allow_nested_project_paths.up.sql b/backend/resources/migrations/sqlite/044_allow_nested_project_paths.up.sqlnew file mode 100644index 000000000..794939acb--- /dev/null+++ b/backend/resources/migrations/sqlite/044_allow_nested_project_paths.up.sql@@ -0,0 +1,54 @@+PRAGMA foreign_keys=OFF;++ALTER TABLE projects RENAME TO projects_old;++CREATE TABLE projects (+ id TEXT PRIMARY KEY,+ name TEXT NOT NULL,+ dir_name TEXT,+ path TEXT NOT NULL,+ status TEXT NOT NULL,+ service_count INTEGER NOT NULL DEFAULT 0,+ running_count INTEGER NOT NULL DEFAULT 0,+ created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,+ updated_at DATETIME,+ status_reason TEXT,+ gitops_managed_by TEXT+);++INSERT INTO projects (+ id,+ name,+ dir_name,+ path,+ status,+ service_count,+ running_count,+ created_at,+ updated_at,+ status_reason,+ gitops_managed_by+)+SELECT+ id,+ name,+ dir_name,+ path,+ status,+ service_count,+ running_count,+ created_at,+ updated_at,+ status_reason,+ gitops_managed_by+FROM projects_old;++DROP TABLE projects_old;++CREATE INDEX IF NOT EXISTS idx_projects_status ON projects(status);+CREATE INDEX IF NOT EXISTS idx_projects_name ON projects(name);+CREATE INDEX IF NOT EXISTS idx_projects_gitops_managed_by ON projects(gitops_managed_by);+CREATE INDEX IF NOT EXISTS idx_projects_dir_name_not_null ON projects(dir_name) WHERE dir_name IS NOT NULL;+CREATE UNIQUE INDEX IF NOT EXISTS idx_projects_path_unique ON projects(path);++PRAGMA foreign_keys=ON;diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 109fb138a..636f909c6 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -1045,6 +1045,7 @@"_comment_projects": "=== PROJECTS (COMPOSE) ===","projects_title": "Projects","projects_col_provider": "Provider",+ "projects_col_directory": "Directory","projects_provider_local": "Local","projects_provider_git": "Git","projects_status_partial": "Partially Running",diff --git a/frontend/package.json b/frontend/package.jsonindex ed1e3fe64..f7d1a6d0b 100644--- a/frontend/package.json+++ b/frontend/package.json@@ -20,7 +20,7 @@"dependencies": {"@codemirror/autocomplete": "^6.20.1","@codemirror/lang-yaml": "^6.1.3",- "@codemirror/language": "^6.12.2",+ "@codemirror/language": "^6.12.3","@codemirror/legacy-modes": "^6.5.2","@codemirror/lint": "^6.9.5","@codemirror/merge": "^6.12.1",diff --git a/frontend/src/lib/types/project.type.ts b/frontend/src/lib/types/project.type.tsindex 1533e2d68..88792e817 100644--- a/frontend/src/lib/types/project.type.ts+++ b/frontend/src/lib/types/project.type.ts@@ -67,6 +67,8 @@ export interface RuntimeService {export interface Project {id: string;name: string;+ dirName?: string;+ relativePath?: string;path: string;iconUrl?: string;urls?: string[];diff --git a/frontend/src/routes/(app)/projects/projects-table.svelte b/frontend/src/routes/(app)/projects/projects-table.svelteindex 67245527a..409de8d37 100644--- a/frontend/src/routes/(app)/projects/projects-table.svelte+++ b/frontend/src/routes/(app)/projects/projects-table.svelte@@ -75,6 +75,7 @@const columns = [{ accessorKey: 'id', title: m.common_id(), hidden: true },{ accessorKey: 'name', title: m.common_name(), sortable: true, cell: NameCell },+ { accessorKey: 'path', title: m.projects_col_directory(), sortable: true, cell: DirectoryCell },{ accessorKey: 'gitOpsManagedBy', title: m.projects_col_provider(), cell: ProviderCell },{ accessorKey: 'status', title: m.common_status(), sortable: true, cell: StatusCell },{ accessorKey: 'createdAt', title: m.common_created(), sortable: true, cell: CreatedCell },@@ -83,6 +84,7 @@const mobileFields = [{ id: 'id', label: m.common_id(), defaultVisible: false },+ { id: 'directory', label: m.projects_col_directory(), defaultVisible: true },{ id: 'provider', label: m.projects_col_provider(), defaultVisible: true },{ id: 'status', label: m.common_status(), defaultVisible: true },{ id: 'serviceCount', label: m.compose_services(), defaultVisible: true },@@ -127,6 +129,10 @@</div>{/snippet}+{#snippet DirectoryCell({ item }: { item: Project })}+ <span class="text-muted-foreground block max-w-[22rem] truncate">{item.relativePath ?? item.dirName ?? item.path}</span>+{/snippet}+{#snippet ProviderCell({ item }: { item: Project })}<div class="flex items-center gap-2">{#if item.gitOpsManagedBy}@@ -191,6 +197,13 @@: null]}fields={[+ {+ label: m.projects_col_directory(),+ getValue: (item: Project) => item.relativePath ?? item.dirName ?? item.path,+ icon: FolderOpenIcon,+ iconVariant: 'gray' as const,+ show: mobileFieldVisibility.directory ?? true+ },{label: m.projects_col_provider(),type: 'component',diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 54e3d459c..73f9a4ee2 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -78,8 +78,8 @@ importers:specifier: ^6.1.3version: 6.1.3'@codemirror/language':- specifier: ^6.12.2- version: 6.12.2+ specifier: ^6.12.3+ version: 6.12.3'@codemirror/legacy-modes':specifier: ^6.5.2version: 6.5.2@@ -112,7 +112,7 @@ importers:version: 8.21.3'@uiw/codemirror-themes':specifier: ^4.25.8- version: 4.25.8(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])+ version: 4.25.8(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])'@xterm/addon-fit':specifier: ^0.11.0version: 0.11.0@@ -355,9 +355,6 @@ packages:'@codemirror/[email protected]':resolution: {integrity: sha512-AZ8DJBuXGVHybpBQhmZtgew5//4hv3tdkXnr3vDmOUMJRuB6vn/uuwtmTOTlqEaQFg3hQSVeA90NmvIQyUV6FQ==}- '@codemirror/[email protected]':- resolution: {integrity: sha512-jEPmz2nGGDxhRTg3lTpzmIyGKxz3Gp3SJES4b0nAuE5SWQoKdT5GoQ69cwMmFd+wvFUhYirtDTr0/DRHpQAyWg==}-'@codemirror/[email protected]':resolution: {integrity: sha512-QwCZW6Tt1siP37Jet9Tb02Zs81TQt6qQrZR2H+eGMcFsL1zMrk2/b9CLC7/9ieP1fjIUMgviLWMmgiHoJrj+ZA==}@@ -4560,7 +4557,7 @@ snapshots:'@codemirror/[email protected]':dependencies:- '@codemirror/language': 6.12.2+ '@codemirror/language': 6.12.3'@codemirror/state': 6.6.0'@codemirror/view': 6.40.0'@lezer/common': 1.5.1@@ -4582,15 +4579,6 @@ snapshots:'@lezer/lr': 1.4.8'@lezer/yaml': 1.0.4- '@codemirror/[email protected]':- dependencies:- '@codemirror/state': 6.6.0- '@codemirror/view': 6.40.0- '@lezer/common': 1.5.1- '@lezer/highlight': 1.2.3- '@lezer/lr': 1.4.8- style-mod: 4.1.3-'@codemirror/[email protected]':dependencies:'@codemirror/state': 6.6.0@@ -4602,7 +4590,7 @@ snapshots:'@codemirror/[email protected]':dependencies:- '@codemirror/language': 6.12.2+ '@codemirror/language': 6.12.3'@codemirror/[email protected]':dependencies:@@ -4612,7 +4600,7 @@ snapshots:'@codemirror/[email protected]':dependencies:- '@codemirror/language': 6.12.2+ '@codemirror/language': 6.12.3'@codemirror/state': 6.6.0'@codemirror/view': 6.40.0'@lezer/highlight': 1.2.3@@ -6068,9 +6056,9 @@ snapshots:'@typescript/native-preview-win32-arm64': 7.0.0-dev.20260322.1'@typescript/native-preview-win32-x64': 7.0.0-dev.20260322.1- '@uiw/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])':+ '@uiw/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])':dependencies:- '@codemirror/language': 6.12.2+ '@codemirror/language': 6.12.3'@codemirror/state': 6.6.0'@codemirror/view': 6.40.0diff --git a/tests/tsconfig.json b/tests/tsconfig.jsonindex 9a1930154..8de3d2831 100644--- a/tests/tsconfig.json+++ b/tests/tsconfig.json@@ -3,7 +3,6 @@"paths": { "*": ["./*"] },"lib": ["ES2022"],"module": "ESNext",- "moduleResolution": "Node","target": "ES2022","esModuleInterop": true,"skipLibCheck": truediff --git a/types/coverage.txt b/types/coverage.txtdeleted file mode 100644index be3a59498..000000000--- a/types/coverage.txt+++ /dev/null@@ -1,281 +0,0 @@-mode: atomic-github.com/getarcaneapp/arcane/types/base/json.go:18.51,19.14 1 0-github.com/getarcaneapp/arcane/types/base/json.go:19.14,21.3 1 0-github.com/getarcaneapp/arcane/types/base/json.go:22.2,22.24 1 0-github.com/getarcaneapp/arcane/types/base/json.go:29.44,30.18 1 0-github.com/getarcaneapp/arcane/types/base/json.go:30.18,33.3 2 0-github.com/getarcaneapp/arcane/types/base/json.go:34.2,34.27 1 0-github.com/getarcaneapp/arcane/types/base/json.go:35.14,36.30 1 0-github.com/getarcaneapp/arcane/types/base/json.go:37.14,38.38 1 0-github.com/getarcaneapp/arcane/types/base/json.go:39.10,40.32 1 0-github.com/getarcaneapp/arcane/types/volume/volume.go:126.41,139.24 2 0-github.com/getarcaneapp/arcane/types/volume/volume.go:139.24,143.3 3 0-github.com/getarcaneapp/arcane/types/volume/volume.go:145.2,145.12 1 0-github.com/getarcaneapp/arcane/types/network/network.go:264.76,275.19 2 0-github.com/getarcaneapp/arcane/types/network/network.go:275.19,277.3 1 0-github.com/getarcaneapp/arcane/types/network/network.go:279.2,279.13 1 0-github.com/getarcaneapp/arcane/types/network/network.go:282.34,283.8 1 0-github.com/getarcaneapp/arcane/types/network/network.go:283.8,285.3 1 0-github.com/getarcaneapp/arcane/types/network/network.go:287.2,287.11 1 0-github.com/getarcaneapp/arcane/types/network/network.go:290.44,296.33 2 0-github.com/getarcaneapp/arcane/types/network/network.go:296.33,297.51 1 0-github.com/getarcaneapp/arcane/types/network/network.go:297.51,299.4 1 0-github.com/getarcaneapp/arcane/types/network/network.go:302.2,302.19 1 0-github.com/getarcaneapp/arcane/types/network/network.go:305.68,309.47 3 0-github.com/getarcaneapp/arcane/types/network/network.go:309.47,312.3 2 0-github.com/getarcaneapp/arcane/types/network/network.go:313.2,313.46 1 0-github.com/getarcaneapp/arcane/types/network/network.go:313.46,316.3 2 0-github.com/getarcaneapp/arcane/types/network/network.go:317.2,317.48 1 0-github.com/getarcaneapp/arcane/types/network/network.go:317.48,320.3 2 0-github.com/getarcaneapp/arcane/types/network/network.go:321.2,321.58 1 0-github.com/getarcaneapp/arcane/types/network/network.go:321.58,324.3 2 0-github.com/getarcaneapp/arcane/types/network/network.go:326.2,326.26 1 0-github.com/getarcaneapp/arcane/types/network/network.go:329.51,331.16 2 0-github.com/getarcaneapp/arcane/types/network/network.go:331.16,333.3 1 0-github.com/getarcaneapp/arcane/types/network/network.go:335.2,335.21 1 0-github.com/getarcaneapp/arcane/types/network/network.go:338.47,340.16 2 0-github.com/getarcaneapp/arcane/types/network/network.go:340.16,342.3 1 0-github.com/getarcaneapp/arcane/types/network/network.go:344.2,344.19 1 0-github.com/getarcaneapp/arcane/types/network/network.go:347.74,348.26 1 0-github.com/getarcaneapp/arcane/types/network/network.go:348.26,350.3 1 0-github.com/getarcaneapp/arcane/types/network/network.go:352.2,353.39 2 0-github.com/getarcaneapp/arcane/types/network/network.go:353.39,354.43 1 0-github.com/getarcaneapp/arcane/types/network/network.go:354.43,356.4 1 0-github.com/getarcaneapp/arcane/types/network/network.go:359.2,359.12 1 0-github.com/getarcaneapp/arcane/types/network/network.go:375.44,390.2 1 0-github.com/getarcaneapp/arcane/types/meta/job_metadata.go:194.55,197.2 2 0-github.com/getarcaneapp/arcane/types/meta/job_metadata.go:199.49,201.2 1 0-github.com/getarcaneapp/arcane/types/meta/job_metadata.go:203.155,218.2 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:364.122,383.45 2 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:383.45,384.50 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:384.50,389.25 3 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:390.26,391.30 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:392.22,393.26 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:394.24,395.28 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:396.21,397.25 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:398.25,399.29 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:400.12,401.29 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:403.4,403.26 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:407.2,407.15 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:410.70,423.22 2 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:423.22,425.36 2 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:425.36,426.28 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:426.28,429.5 2 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:430.4,430.28 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:430.28,433.5 2 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:435.3,435.43 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:435.43,437.4 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:441.2,441.28 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:441.28,442.71 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:442.71,444.4 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:446.2,446.31 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:446.31,447.74 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:447.74,449.4 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:452.2,452.13 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:455.39,456.11 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:457.18,458.26 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:459.14,460.22 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:461.16,462.24 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:463.13,464.21 1 0-github.com/getarcaneapp/arcane/types/vulnerability/vulnerability.go:465.10,466.25 1 0-github.com/getarcaneapp/arcane/types/container/container.go:742.46,744.31 2 0-github.com/getarcaneapp/arcane/types/container/container.go:744.31,746.3 1 0-github.com/getarcaneapp/arcane/types/container/container.go:748.2,749.28 2 0-github.com/getarcaneapp/arcane/types/container/container.go:749.28,756.3 1 0-github.com/getarcaneapp/arcane/types/container/container.go:758.2,759.29 2 0-github.com/getarcaneapp/arcane/types/container/container.go:759.29,770.3 1 0-github.com/getarcaneapp/arcane/types/container/container.go:772.2,773.67 2 0-github.com/getarcaneapp/arcane/types/container/container.go:773.67,774.51 1 0-github.com/getarcaneapp/arcane/types/container/container.go:774.51,776.4 1 0-github.com/getarcaneapp/arcane/types/container/container.go:779.2,797.3 1 0-github.com/getarcaneapp/arcane/types/container/container.go:801.55,803.64 2 0-github.com/getarcaneapp/arcane/types/container/container.go:803.64,804.52 1 0-github.com/getarcaneapp/arcane/types/container/container.go:804.52,809.26 3 0-github.com/getarcaneapp/arcane/types/container/container.go:809.26,814.13 2 0-github.com/getarcaneapp/arcane/types/container/container.go:816.4,816.31 1 0-github.com/getarcaneapp/arcane/types/container/container.go:816.31,824.5 2 0-github.com/getarcaneapp/arcane/types/container/container.go:828.2,829.29 2 0-github.com/getarcaneapp/arcane/types/container/container.go:829.29,840.3 1 0-github.com/getarcaneapp/arcane/types/container/container.go:842.2,843.67 2 0-github.com/getarcaneapp/arcane/types/container/container.go:843.67,844.51 1 0-github.com/getarcaneapp/arcane/types/container/container.go:844.51,846.4 1 0-github.com/getarcaneapp/arcane/types/container/container.go:849.2,850.25 2 0-github.com/getarcaneapp/arcane/types/container/container.go:850.25,858.3 1 0-github.com/getarcaneapp/arcane/types/container/container.go:860.2,863.21 4 0-github.com/getarcaneapp/arcane/types/container/container.go:863.21,872.29 3 0-github.com/getarcaneapp/arcane/types/container/container.go:872.29,874.4 1 0-github.com/getarcaneapp/arcane/types/container/container.go:877.2,880.20 3 0-github.com/getarcaneapp/arcane/types/container/container.go:880.20,888.3 1 0-github.com/getarcaneapp/arcane/types/container/container.go:890.2,905.3 1 0-github.com/getarcaneapp/arcane/types/container/container.go:908.71,909.14 1 0-github.com/getarcaneapp/arcane/types/container/container.go:909.14,911.3 1 0-github.com/getarcaneapp/arcane/types/container/container.go:913.2,914.25 2 0-github.com/getarcaneapp/arcane/types/container/container.go:914.25,916.3 1 0-github.com/getarcaneapp/arcane/types/container/container.go:918.2,919.25 2 0-github.com/getarcaneapp/arcane/types/container/container.go:919.25,921.3 1 0-github.com/getarcaneapp/arcane/types/container/container.go:923.2,924.27 2 0-github.com/getarcaneapp/arcane/types/container/container.go:924.27,926.3 1 0-github.com/getarcaneapp/arcane/types/container/container.go:928.2,929.29 2 0-github.com/getarcaneapp/arcane/types/container/container.go:929.29,931.3 1 0-github.com/getarcaneapp/arcane/types/container/container.go:933.2,934.35 2 0-github.com/getarcaneapp/arcane/types/container/container.go:934.35,936.3 1 0-github.com/getarcaneapp/arcane/types/container/container.go:938.2,954.3 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:48.59,50.58 2 3-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:50.58,52.3 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:54.2,57.16 3 3-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:57.16,59.3 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:60.2,62.12 2 3-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:72.52,74.58 2 5-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:74.58,76.3 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:78.2,81.28 3 5-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:81.28,84.3 2 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:86.2,87.42 2 5-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:87.42,89.17 2 5-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:89.17,91.4 1 1-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:92.3,92.21 1 4-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:92.21,93.12 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:95.3,95.40 1 4-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:97.2,99.12 2 4-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:105.90,107.63 2 8-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:107.63,109.3 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:111.2,112.61 2 8-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:112.61,114.3 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:116.2,117.16 2 8-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:117.16,119.3 1 1-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:121.2,122.16 2 7-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:122.16,124.3 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:126.2,127.66 2 7-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:127.66,129.3 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:131.2,131.22 1 7-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:136.57,140.2 3 16-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:148.79,149.37 1 32-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:149.37,151.3 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:153.2,153.41 1 32-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:153.41,154.19 1 4-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:154.19,156.4 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:157.3,157.29 1 4-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:160.2,160.31 1 32-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:160.31,162.3 1 10-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:164.2,164.25 1 22-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:165.22,166.53 1 13-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:167.36,168.52 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:169.19,170.50 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:175.58,176.20 1 9-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:179.2,179.19 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:184.80,186.9 2 13-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:186.9,188.3 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:190.2,191.32 2 13-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:191.32,193.3 1 32-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:195.2,195.43 1 13-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:195.43,197.26 2 801-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:197.26,198.12 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:201.3,201.22 1 801-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:201.22,203.18 2 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:203.18,205.5 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:206.4,207.10 2 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:207.10,209.5 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:210.4,210.12 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:213.3,214.10 2 801-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:214.10,215.12 1 28-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:218.3,219.14 2 773-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:219.14,220.12 1 749-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:223.3,224.17 2 24-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:224.17,226.4 1 1-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:227.3,227.42 1 23-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:230.2,230.24 1 12-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:235.79,237.9 2 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:237.9,239.3 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:241.2,242.29 2 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:242.29,244.17 2 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:244.17,246.4 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:247.3,247.33 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:250.2,250.24 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:255.77,256.45 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:256.45,258.3 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:260.2,261.9 2 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:261.9,263.3 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:265.2,266.31 2 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:266.31,268.17 2 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:268.17,270.4 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:271.3,271.35 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:274.2,274.24 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:284.54,285.27 1 10-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:286.19,287.43 1 2-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:287.43,289.4 1 2-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:291.3,292.17 2 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:292.17,294.4 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:295.3,295.47 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:295.47,297.4 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:298.3,298.32 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:300.14,302.17 2 8-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:302.17,304.4 1 1-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:305.3,305.21 1 7-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:307.15,308.29 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:308.29,310.4 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:311.3,311.23 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:313.11,314.23 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:315.12,316.23 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:317.13,318.23 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:319.13,320.23 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:321.13,322.16 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:323.12,324.32 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:324.32,326.4 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:327.3,327.23 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:328.13,329.23 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:330.14,331.23 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:332.14,333.23 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:334.14,335.24 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:335.24,337.4 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:338.3,338.23 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:339.10,340.20 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:346.62,348.16 2 801-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:348.16,350.3 1 28-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:352.2,352.15 1 773-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:352.15,354.3 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:356.2,357.16 2 773-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:357.16,359.3 1 0-github.com/getarcaneapp/arcane/types/project/marshal_utils.go:361.2,361.19 1 773-github.com/getarcaneapp/arcane/types/image/image.go:179.56,182.48 2 0-github.com/getarcaneapp/arcane/types/image/image.go:182.48,184.3 1 0-github.com/getarcaneapp/arcane/types/image/image.go:184.8,186.3 1 0-github.com/getarcaneapp/arcane/types/image/image.go:188.2,192.38 2 0-github.com/getarcaneapp/arcane/types/image/image.go:192.38,193.22 1 0-github.com/getarcaneapp/arcane/types/image/image.go:193.22,195.4 1 0-github.com/getarcaneapp/arcane/types/image/image.go:195.9,195.30 1 0-github.com/getarcaneapp/arcane/types/image/image.go:195.30,197.4 1 0-github.com/getarcaneapp/arcane/types/image/image.go:199.2,199.12 1 0-github.com/getarcaneapp/arcane/types/image/image.go:498.48,499.38 1 0-github.com/getarcaneapp/arcane/types/image/image.go:499.38,501.3 1 0-github.com/getarcaneapp/arcane/types/image/image.go:502.2,502.62 1 0-github.com/getarcaneapp/arcane/types/image/image.go:502.62,504.3 1 0-github.com/getarcaneapp/arcane/types/image/image.go:505.2,505.20 1 0-github.com/getarcaneapp/arcane/types/image/image.go:509.70,510.28 1 0-github.com/getarcaneapp/arcane/types/image/image.go:510.28,512.3 1 0-github.com/getarcaneapp/arcane/types/image/image.go:513.2,513.19 1 0-github.com/getarcaneapp/arcane/types/image/image.go:513.19,515.3 1 0-github.com/getarcaneapp/arcane/types/image/image.go:516.2,516.12 1 0-github.com/getarcaneapp/arcane/types/image/image.go:523.65,525.16 2 2-github.com/getarcaneapp/arcane/types/image/image.go:525.16,527.3 1 1-github.com/getarcaneapp/arcane/types/image/image.go:529.2,536.23 7 1-github.com/getarcaneapp/arcane/types/image/image.go:536.23,537.39 1 0-github.com/getarcaneapp/arcane/types/image/image.go:537.39,539.43 2 0-github.com/getarcaneapp/arcane/types/image/image.go:539.43,541.5 1 0-github.com/getarcaneapp/arcane/types/image/image.go:543.3,543.30 1 0-github.com/getarcaneapp/arcane/types/image/image.go:543.30,545.4 1 0-github.com/getarcaneapp/arcane/types/image/image.go:546.3,546.30 1 0-github.com/getarcaneapp/arcane/types/image/image.go:546.30,548.4 1 0-github.com/getarcaneapp/arcane/types/image/image.go:549.3,549.34 1 0-github.com/getarcaneapp/arcane/types/image/image.go:549.34,551.38 2 0-github.com/getarcaneapp/arcane/types/image/image.go:551.38,553.5 1 0-github.com/getarcaneapp/arcane/types/image/image.go:555.3,556.50 2 0-github.com/getarcaneapp/arcane/types/image/image.go:559.2,563.28 4 1-github.com/getarcaneapp/arcane/types/image/image.go:563.28,565.34 2 0-github.com/getarcaneapp/arcane/types/image/image.go:565.34,567.4 1 0-github.com/getarcaneapp/arcane/types/image/image.go:570.2,571.32 2 1-github.com/getarcaneapp/arcane/types/image/image.go:571.32,573.3 1 1-github.com/getarcaneapp/arcane/types/image/image.go:575.2,575.40 1 1-github.com/getarcaneapp/arcane/types/image/image.go:575.40,577.3 1 0-github.com/getarcaneapp/arcane/types/image/image.go:580.2,582.30 3 1-github.com/getarcaneapp/arcane/types/image/image.go:582.30,584.22 2 1-github.com/getarcaneapp/arcane/types/image/image.go:584.22,586.4 1 1-github.com/getarcaneapp/arcane/types/image/image.go:589.2,589.12 1 1diff --git a/types/project/project.go b/types/project/project.goindex a7d2ff210..738b1c4d0 100644--- a/types/project/project.go+++ b/types/project/project.go@@ -150,6 +150,11 @@ type CreateReponse struct {// Required: falseDirName string `json:"dirName,omitempty"`+ // RelativePath is the path to the project directory relative to the configured projects root.+ //+ // Required: false+ RelativePath string `json:"relativePath,omitempty"`+// Path is the file path to the project.//// Required: true@@ -208,6 +213,11 @@ type Details struct {// Required: falseDirName string `json:"dirName,omitempty"`+ // RelativePath is the path to the project directory relative to the configured projects root.+ //+ // Required: false+ RelativePath string `json:"relativePath,omitempty"`+// Path is the file path to the project.//// Required: true