Merge pull request #41 from mhelleboid/exclude_tag

basic implementation for exclude filter
joplin · Aug 14, 2023 · 6a29f55 · 6a29f55
2 parents 0e4098d + 3eff8c7
commit 6a29f55
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 23 deletions.
diff --git a/src/board.ts b/src/board.ts
@@ -189,7 +189,7 @@ export default class Board {
     );
     if (matchesBaseFilters) {
       const foundCol = this.nonBacklogColumns.find(({ rules }) =>
-        rules.some(({ filterNote }) => filterNote(note))
+        rules.every(({ filterNote }) => filterNote(note))
       );
       if (foundCol) return foundCol.name;
       if (this.backlogColumn) return this.backlogColumn.name;

diff --git a/src/rules.ts b/src/rules.ts
@@ -18,26 +18,52 @@ type RuleFactory = (
  */
 const rules: Record<string, RuleFactory> = {
   async tag(arg: string | string[]) {
-    const tagName = Array.isArray(arg) ? arg[0] : arg;
-    const tagID = (await getTagId(tagName)) || (await createTag(tagName));
-    return {
-      name: "tag",
-      filterNote: (note: NoteData) => note.tags.includes(tagName),
-      set: (noteId: string) => [
-        {
-          type: "post",
-          path: ["tags", tagID, "notes"],
-          body: { id: noteId },
-        },
-      ],
-      unset: (noteId: string) => [
-        {
-          type: "delete",
-          path: ["tags", tagID, "notes", noteId],
-        },
-      ],
-      editorType: "text",
-    };
+    const tagArg = Array.isArray(arg) ? arg[0] : arg;
+    if (tagArg.startsWith('-')) {
+      const tagName = tagArg.substring(1)
+      console.info('replace ', tagArg, ' with ', tagName)
+      const tagID = (await getTagId(tagName)) || (await createTag(tagName));
+      return {
+        name: "tag",
+        filterNote: (note: NoteData) => !note.tags.includes(tagName),
+        set: (noteId: string) => [
+          {
+            type: "delete",
+            path: ["tags", tagID, "notes", noteId],
+          },
+        ],
+        unset: (noteId: string) => [
+          {
+            type: "post",
+            path: ["tags", tagID, "notes"],
+            body: { id: noteId },
+          },
+        ],
+        editorType: "text",
+      };
+    }
+    else {
+      const tagName = tagArg
+      const tagID = (await getTagId(tagName)) || (await createTag(tagName));
+      return {
+        name: "tag",
+        filterNote: (note: NoteData) => note.tags.includes(tagName),
+        set: (noteId: string) => [
+          {
+            type: "post",
+            path: ["tags", tagID, "notes"],
+            body: { id: noteId },
+          },
+        ],
+        unset: (noteId: string) => [
+          {
+            type: "delete",
+            path: ["tags", tagID, "notes", noteId],
+          },
+        ],
+        editorType: "text",
+      };
+    }
   },
 
   async tags(tagNames: string | string[], rootNbPath: string, config: Config) {
@@ -55,6 +81,21 @@ const rules: Record<string, RuleFactory> = {
     };
   },
 
+  async alltags(tagNames: string | string[], rootNbPath: string, config: Config) {
+    if (!Array.isArray(tagNames)) tagNames = [tagNames];
+    const tagRules = await Promise.all(
+      tagNames.map((t) => rules.tag(t, rootNbPath, config))
+    );
+    return {
+      name: "alltags",
+      filterNote: (note: NoteData) =>
+        tagRules.every(({ filterNote }) => filterNote(note)),
+      set: (noteId: string) => tagRules.flatMap(({ set }) => set(noteId)),
+      unset: (noteId: string) => tagRules.flatMap(({ unset }) => unset(noteId)),
+      editorType: "text",
+    };
+  },
+
   async notebookPath(path: string | string[], rootNotebookPath: string) {
     if (Array.isArray(path)) path = path[0];
 

diff --git a/tests/board.test.ts b/tests/board.test.ts
@@ -237,11 +237,11 @@ describe("Board", () => {
           parent_id: parentNb,
         })) as Board;
 
-        const col1 = board.sortNoteIntoColumn(note({ tags: ["task", "done"] }));
+        const col1 = board.sortNoteIntoColumn(note({ tags: ["task", "done"], isTodo: true, isCompleted: true }));
         expect(col1).toBe("Done");
 
         const col2 = board.sortNoteIntoColumn(
-          note({ tags: ["task", "completed"] })
+          note({ tags: ["task", "completed"], isTodo: true, isCompleted: true })
         );
         expect(col2).toBe("Done");
       });
@@ -276,6 +276,7 @@ describe("Board", () => {
 
         const col1 = board.sortNoteIntoColumn(
           note({
+            tags: ["task", "completed"],
             isCompleted: true,
             isTodo: true,
           })