verstak/verstak-desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Вложенные Дела, folder metadata, плагин workspace-folders

Browse Source 
- Nested workspace model: маркеры .verstak/workspace.json на любой глубине
- Folder metadata API: иконка, цвет, порядок (.verstak/folder-metadata/)
- MoveWorkspace, GetFolderMetadata, SetFolderMetadata Wails биндинги
- Contribution point workspaceTree — singleton в registry
- Sidebar.svelte монтирует PluginBundleHost при наличии workspaceTree
- VerstakPluginAPI: workspaces.* и folders.* методы
- WorkspaceTree.svelte: рекурсивное дерево, выбор родительской папки
- i18n: строки EN+RU, release notes v0.1.0-alpha.8
This commit is contained in:
mirivlad
2026-07-18 18:54:42 +08:00
parent 1ca759cc2e
commit b10f243e34
12 changed files with 1681 additions and 1010 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/core/contribution/registry.go
+22
View File
@@ -24,6 +24,13 @@ type Registry struct {
statusBarItems []ContributionStatusBarItem
openProviders []ContributionOpenProvider
workspaceItems []ContributionWorkspaceItem
workspaceTree *ContributionWorkspaceTree
}
// ContributionWorkspaceTree is a singleton contribution for replacing the Deal tree.
type ContributionWorkspaceTree struct {
PluginID string `json:"pluginId"`
Component string `json:"component"`
}
// ContributionPointType defines the type of contribution point.
@@ -42,6 +49,7 @@ const (
PointStatusBar ContributionPointType = "statusBarItems"
PointOpenProviders ContributionPointType = "openProviders"
PointWorkspaceItems ContributionPointType = "workspaceItems"
PointWorkspaceTree ContributionPointType = "workspaceTree"
)
// ListByPoint returns all contributions for a given point type.
@@ -184,6 +192,7 @@ func (r *Registry) Register(pluginID string, c *plugin.Contributions) {
r.statusBarItems = removeStatusBarItems(r.statusBarItems, pluginID)
r.openProviders = removeOpenProviders(r.openProviders, pluginID)
r.workspaceItems = removeWorkspaceItems(r.workspaceItems, pluginID)
r.workspaceTree = nil
for _, item := range c.Views {
r.views = append(r.views, ContributionView{PluginID: pluginID, Item: item})
@@ -221,6 +230,9 @@ func (r *Registry) Register(pluginID string, c *plugin.Contributions) {
for _, item := range c.WorkspaceItems {
r.workspaceItems = append(r.workspaceItems, ContributionWorkspaceItem{PluginID: pluginID, Item: item})
}
if c.WorkspaceTree != nil && r.workspaceTree == nil {
r.workspaceTree = &ContributionWorkspaceTree{PluginID: pluginID, Component: c.WorkspaceTree.Component}
}
}
// Unregister removes all contributions from a plugin.
@@ -240,6 +252,9 @@ func (r *Registry) Unregister(pluginID string) {
r.statusBarItems = removeStatusBarItems(r.statusBarItems, pluginID)
r.openProviders = removeOpenProviders(r.openProviders, pluginID)
r.workspaceItems = removeWorkspaceItems(r.workspaceItems, pluginID)
if r.workspaceTree != nil && r.workspaceTree.PluginID == pluginID {
r.workspaceTree = nil
}
}
// Getters — sorted for deterministic display.
@@ -367,6 +382,13 @@ func (r *Registry) WorkspaceItems() []ContributionWorkspaceItem {
return result
}
// WorkspaceTree returns the singleton workspaceTree contribution, or nil.
func (r *Registry) WorkspaceTree() *ContributionWorkspaceTree {
r.mu.RLock()
defer r.mu.RUnlock()
return r.workspaceTree
}
// ─── Remove helpers ─────────────────────────────────────────
func removeViews(items []ContributionView, pluginID string) []ContributionView {
internal/core/plugin/plugin.go
+6
View File
@@ -77,6 +77,12 @@ type Contributions struct {
StatusBarItems []ContributionStatusBarItem `json:"statusBarItems,omitempty"`
OpenProviders []ContributionOpenProvider `json:"openProviders,omitempty"`
WorkspaceItems []ContributionWorkspaceItem `json:"workspaceItems,omitempty"`
WorkspaceTree *ContributionWorkspaceTree `json:"workspaceTree,omitempty"`
}
// ContributionWorkspaceTree represents a singleton workspaceTree contribution.
type ContributionWorkspaceTree struct {
Component string `json:"component"`
}
// ContributionView represents a view contribution.
internal/core/workspace/manager.go
+1110 -763
View File
File diff suppressed because it is too large Load Diff
internal/core/workspace/manager_test.go
+101 -18
View File
@@ -14,7 +14,9 @@ import (
func TestListWorkspacesReadsTopLevelPhysicalFolders(t *testing.T) {
vaultDir := newVaultDir(t)
mustMkdir(t, filepath.Join(vaultDir, "Project"))
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Project"))
mustMkdir(t, filepath.Join(vaultDir, "Test"))
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Test"))
mustMkdir(t, filepath.Join(vaultDir, ".verstak"))
mustMkdir(t, filepath.Join(vaultDir, ".git"))
mustWrite(t, filepath.Join(vaultDir, "readme.md"), "not a workspace")
@@ -36,6 +38,61 @@ func TestListWorkspacesReadsTopLevelPhysicalFolders(t *testing.T) {
}
}
func TestListWorkspacesIncludesNestedWorkspaces(t *testing.T) {
vaultDir := newVaultDir(t)
mustMkdir(t, filepath.Join(vaultDir, "Clients"))
mustMkdir(t, filepath.Join(vaultDir, "Clients", "Romashka"))
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Clients", "Romashka"))
mustMkdir(t, filepath.Join(vaultDir, "Clients", "Alpha"))
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Clients", "Alpha"))
mustMkdir(t, filepath.Join(vaultDir, "Personal"))
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Personal"))
m := NewManager(vaultDir)
if err := m.Load(); err != nil {
t.Fatalf("Load: %v", err)
}
workspaces, err := m.ListWorkspaces()
if err != nil {
t.Fatalf("ListWorkspaces: %v", err)
}
if len(workspaces) != 3 {
t.Fatalf("workspaces = %d, want 3", len(workspaces))
}
paths := make([]string, len(workspaces))
for i, ws := range workspaces {
paths[i] = ws.Path
}
wantPaths := []string{"Clients/Alpha", "Clients/Romashka", "Personal"}
if strings.Join(paths, ",") != strings.Join(wantPaths, ",") {
t.Fatalf("paths = %v, want %v", paths, wantPaths)
}
}
func TestCreateWorkspaceNested(t *testing.T) {
vaultDir := newVaultDir(t)
m := NewManager(vaultDir)
// Create parent folder first
mustMkdir(t, filepath.Join(vaultDir, "Clients"))
ws, err := m.CreateWorkspace("Clients/Project", "")
if err != nil {
t.Fatalf("CreateWorkspace nested: %v", err)
}
if ws.Path != "Clients/Project" {
t.Fatalf("workspace path = %q, want Clients/Project", ws.Path)
}
if _, err := os.Stat(filepath.Join(vaultDir, "Clients", "Project")); err != nil {
t.Fatalf("workspace folder missing: %v", err)
}
// Verify marker
if _, err := os.Stat(filepath.Join(vaultDir, "Clients", "Project", ".verstak", "workspace.json")); err != nil {
t.Fatalf("marker missing: %v", err)
}
}
func TestListWorkspacesExcludesTopLevelSymlink(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("symlink creation needs extra privileges on Windows")
@@ -556,23 +613,24 @@ func TestCreateAndRenameConflictsAreExplicit(t *testing.T) {
}
}
func TestInvalidWorkspaceNamesRejected(t *testing.T) {
func TestInvalidWorkspacePathsRejected(t *testing.T) {
vaultDir := newVaultDir(t)
m := NewManager(vaultDir)
names := []string{"", " ", "A/B", `A\B`, "/abs", `C:\abs`, "..", "a..b", "bad\x00name", ".verstak", ".Verstak", ".git"}
for _, name := range names {
if _, err := m.CreateWorkspace(name, ""); err == nil {
t.Fatalf("CreateWorkspace(%q) succeeded, want invalid name error", name)
paths := []string{"", " ", `A\B`, "/abs", `C:\abs`, "..", "a/../b", "bad\x00name", ".verstak", ".Verstak", ".git"}
for _, path := range paths {
if _, err := m.CreateWorkspace(path, ""); err == nil {
t.Fatalf("CreateWorkspace(%q) succeeded, want invalid path error", path)
}
}
}
func TestCompatibilityTreeIsDerivedFromTopLevelFolders(t *testing.T) {
func TestCompatibilityTreeIncludesFoldersAndNestedWorkspaces(t *testing.T) {
vaultDir := newVaultDir(t)
mustMkdir(t, filepath.Join(vaultDir, "Project"))
mustMkdir(t, filepath.Join(vaultDir, "Project", "Nested"))
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Project"))
mustMkdir(t, filepath.Join(vaultDir, "Test"))
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Test"))
m := NewManager(vaultDir)
if err := m.Load(); err != nil {
@@ -582,34 +640,43 @@ func TestCompatibilityTreeIsDerivedFromTopLevelFolders(t *testing.T) {
if len(tree.Nodes) != 2 {
t.Fatalf("nodes = %+v, want 2 top-level workspaces", tree.Nodes)
}
if tree.Nodes[0].ID != "Project" || tree.Nodes[0].Title != "Project" || tree.Nodes[0].Path != "" {
t.Fatalf("first compatibility node = %+v, want derived workspace without persisted path mapping", tree.Nodes[0])
if tree.Nodes[0].ID != "Project" || tree.Nodes[0].Title != "Project" {
t.Fatalf("first compatibility node = %+v, want workspace node", tree.Nodes[0])
}
for _, node := range tree.Nodes {
if node.ParentID != "" {
t.Fatalf("compatibility tree should be flat, got child node %+v", node)
}
if node.ID == "Nested" || node.Title == "Nested" {
t.Fatalf("nested folders must not become workspace nodes: %+v", tree.Nodes)
t.Fatalf("nested folders without markers must not become workspace nodes: %+v", tree.Nodes)
}
}
// Workspace nodes should NOT have ParentID for root-level ones
for _, node := range tree.Nodes {
if node.Type == TypeSpace && node.ID == "Project" && node.ParentID != "" {
t.Fatalf("root workspace should have empty ParentID: %+v", node)
}
}
}
func TestMoveNodeCompatibilityDoesNotCreateNestedWorkspaceModel(t *testing.T) {
func TestMoveNodeCreatesNestedWorkspaceModel(t *testing.T) {
vaultDir := newVaultDir(t)
mustMkdir(t, filepath.Join(vaultDir, "Project"))
mustWriteWorkspaceMarker(t, filepath.Join(vaultDir, "Project"))
mustMkdir(t, filepath.Join(vaultDir, "Test"))
m := NewManager(vaultDir)
if err := m.Load(); err != nil {
t.Fatalf("Load: %v", err)
}
// Move workspace into Test folder (which is a plain folder without marker)
err := m.MoveNode("Project", "Test")
if err == nil || !strings.Contains(err.Error(), "top-level only") {
t.Fatalf("MoveNode error = %v, want top-level only", err)
if err != nil {
t.Fatalf("MoveNode error = %v, want success", err)
}
if _, statErr := os.Stat(filepath.Join(vaultDir, "Test", "Project")); !os.IsNotExist(statErr) {
t.Fatalf("MoveNode created nested mapped workspace, stat err=%v", statErr)
if _, statErr := os.Stat(filepath.Join(vaultDir, "Test", "Project")); statErr != nil {
t.Fatalf("MoveNode did not create nested folder, stat err=%v", statErr)
}
// Verify marker moved
if _, statErr := os.Stat(filepath.Join(vaultDir, "Test", "Project", ".verstak", "workspace.json")); statErr != nil {
t.Fatalf("marker not in new location: %v", statErr)
}
}
@@ -636,6 +703,22 @@ func TestMetadataFileShape(t *testing.T) {
}
}
func mustWriteWorkspaceMarker(t *testing.T, dir string) {
t.Helper()
markerPath := filepath.Join(dir, ".verstak", "workspace.json")
if err := os.MkdirAll(filepath.Dir(markerPath), 0o755); err != nil {
t.Fatalf("MkdirAll(%s): %v", filepath.Dir(markerPath), err)
}
marker := workspaceIdentityMarker{WorkspaceID: uuid.NewString()}
data, err := json.Marshal(marker)
if err != nil {
t.Fatalf("marshal marker: %v", err)
}
if err := os.WriteFile(markerPath, data, 0o644); err != nil {
t.Fatalf("WriteFile(%s): %v", markerPath, err)
}
}
func newVaultDir(t *testing.T) string {
t.Helper()
vaultDir := filepath.Join(t.TempDir(), "vault")