Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:recycle: Centralize file tree ID trimming https://github.com/siyuan-note/siyuan/issues/20374

Danielb93c6eca4eb6
diff --git a/kernel/apicontract/filetree_input.go b/kernel/apicontract/filetree_input.go
index 132586f5db..4e81e631a6 100644
--- a/kernel/apicontract/filetree_input.go
+++ b/kernel/apicontract/filetree_input.go
@@ -162,14 +162,10 @@ func init() {
if err != nil {
return r, err
}
- r.ID, err = legacyField[string](fields, "id", "String", true)
- if err == nil {
- r.ID = strings.TrimSpace(r.ID)
- if r.ID == "" {
- err = fmt.Errorf("Field [id] must not be empty")
- }
+ if _, err = legacyField[string](fields, "id", "String", true); err != nil {
+ return r, err
}
- return r, err
+ return fileTreeBind[FileTreeTrimIDRequest](fields)
}
}
RemoveDocByID.decodeRequest = trimIDDecoder(RemoveDocByID.definition.Path)
diff --git a/kernel/apicontract/filetree_test.go b/kernel/apicontract/filetree_test.go
index 359b94557f..fefa59fc0d 100644
--- a/kernel/apicontract/filetree_test.go
+++ b/kernel/apicontract/filetree_test.go
@@ -6,6 +6,36 @@ import (
"testing"
)
+func TestFileTreeTrimIDContract(t *testing.T) {
+ decoders := map[string]func(string) (FileTreeTrimIDRequest, error){
+ "getPathByID": func(body string) (FileTreeTrimIDRequest, error) {
+ return GetPathByID.Decode(strings.NewReader(body))
+ },
+ "removeDocByID": func(body string) (FileTreeTrimIDRequest, error) {
+ return RemoveDocByID.Decode(strings.NewReader(body))
+ },
+ }
+ for name, decode := range decoders {
+ t.Run(name, func(t *testing.T) {
+ request, err := decode(`{"id":" \t20260913000000-abcdefg\n "}`)
+ if err != nil || request.ID != "20260913000000-abcdefg" {
+ t.Fatalf("ID trimming changed: %+v %v", request, err)
+ }
+ for _, tc := range []struct{ body, message string }{
+ {`{}`, "Field [id] is required"},
+ {`{"id":null}`, "Field [id] is required"},
+ {`{"id":false}`, "Field [id] should be of type [String]"},
+ {`{"id":""}`, "Field [id] must not be empty"},
+ {`{"id":" \t\n "}`, "Field [id] must not be empty"},
+ } {
+ if _, err := decode(tc.body); err == nil || err.Error() != tc.message {
+ t.Fatalf("input %s: expected %q, got %v", tc.body, tc.message, err)
+ }
+ }
+ })
+ }
+}
+
func TestDuplicateDocTreeContract(t *testing.T) {
const id = "20260919020000-source1"
request, err := DuplicateDocTree.Decode(strings.NewReader(`{"id":"` + id + `"}`))