From ff16c62e26678522b13f484a0ac83a6d6490f793 Mon Sep 17 00:00:00 2001
From: KoloMl <thekolomoets@hotmail.com>
Date: Sun, 2 Mar 2025 18:44:53 +0400
Subject: [PATCH 1/2] Added support for suffix-matching for groups

---
 src/components/features/GroupView.svelte          | 15 ++++++++++++++-
 src/lib/extension/CustomCategoriesResolver.ts     |  7 +++++++
 src/lib/extension/entities/TagGroup.ts            |  2 ++
 src/lib/extension/transporting/exporters.ts       |  1 +
 src/routes/features/groups/[id]/edit/+page.svelte |  8 ++++++++
 5 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/components/features/GroupView.svelte b/src/components/features/GroupView.svelte
index e2a0da4..3b6c698 100644
--- a/src/components/features/GroupView.svelte
+++ b/src/components/features/GroupView.svelte
@@ -9,7 +9,8 @@
   let { group }: GroupViewProps = $props();
 
   let sortedTagsList = $derived<string[]>(group.settings.tags.sort((a, b) => a.localeCompare(b))),
-    sortedPrefixes = $derived<string[]>(group.settings.prefixes.sort((a, b) => a.localeCompare(b)));
+    sortedPrefixes = $derived<string[]>(group.settings.prefixes.sort((a, b) => a.localeCompare(b))),
+    sortedSuffixes = $derived<string[]>(group.settings.suffixes.sort((a, b) => a.localeCompare(b)));
 
 </script>
 
@@ -41,6 +42,18 @@
     </TagsColorContainer>
   </div>
 {/if}
+{#if sortedSuffixes.length}
+  <div class="block">
+    <strong>Suffixes:</strong>
+    <TagsColorContainer targetCategory={group.settings.category}>
+      <div class="tags-list">
+        {#each sortedSuffixes as suffixName}
+          <span class="tag">*{suffixName}</span>
+        {/each}
+      </div>
+    </TagsColorContainer>
+  </div>
+{/if}
 
 <style lang="scss">
   .tags-list {
diff --git a/src/lib/extension/CustomCategoriesResolver.ts b/src/lib/extension/CustomCategoriesResolver.ts
index 169833d..ecce867 100644
--- a/src/lib/extension/CustomCategoriesResolver.ts
+++ b/src/lib/extension/CustomCategoriesResolver.ts
@@ -93,6 +93,13 @@ export default class CustomCategoriesResolver {
           categoryName
         );
       }
+
+      for (let tagSuffix of tagGroup.settings.suffixes) {
+        this.#compiledRegExps.set(
+          new RegExp(`${escapeRegExp(tagSuffix)}$`),
+          categoryName
+        );
+      }
     }
 
     this.#queueUpdatingTags();
diff --git a/src/lib/extension/entities/TagGroup.ts b/src/lib/extension/entities/TagGroup.ts
index 1f55523..fc39897 100644
--- a/src/lib/extension/entities/TagGroup.ts
+++ b/src/lib/extension/entities/TagGroup.ts
@@ -4,6 +4,7 @@ export interface TagGroupSettings {
   name: string;
   tags: string[];
   prefixes: string[];
+  suffixes: string[];
   category: string;
 }
 
@@ -13,6 +14,7 @@ export default class TagGroup extends StorageEntity<TagGroupSettings> {
       name: settings.name || '',
       tags: settings.tags || [],
       prefixes: settings.prefixes || [],
+      suffixes: settings.suffixes || [],
       category: settings.category || ''
     });
   }
diff --git a/src/lib/extension/transporting/exporters.ts b/src/lib/extension/transporting/exporters.ts
index c376c2a..c57b529 100644
--- a/src/lib/extension/transporting/exporters.ts
+++ b/src/lib/extension/transporting/exporters.ts
@@ -20,6 +20,7 @@ const entitiesExporters: ExportersMap = {
       name: entity.settings.name,
       tags: entity.settings.tags,
       prefixes: entity.settings.prefixes,
+      suffixes: entity.settings.suffixes,
     }
   }
 };
diff --git a/src/routes/features/groups/[id]/edit/+page.svelte b/src/routes/features/groups/[id]/edit/+page.svelte
index 3aac580..88d2764 100644
--- a/src/routes/features/groups/[id]/edit/+page.svelte
+++ b/src/routes/features/groups/[id]/edit/+page.svelte
@@ -25,6 +25,7 @@
   let groupName = $state<string>('');
   let tagsList = $state<string[]>([]);
   let prefixesList = $state<string[]>([]);
+  let suffixesList = $state<string[]>([]);
   let tagCategory = $state<string>('');
 
   $effect(() => {
@@ -40,6 +41,7 @@
     groupName = targetGroup.settings.name;
     tagsList = [...targetGroup.settings.tags].sort((a, b) => a.localeCompare(b));
     prefixesList = [...targetGroup.settings.prefixes].sort((a, b) => a.localeCompare(b));
+    suffixesList = [...targetGroup.settings.suffixes].sort((a, b) => a.localeCompare(b));
     tagCategory = targetGroup.settings.category;
   });
 
@@ -52,6 +54,7 @@
     targetGroup.settings.name = groupName;
     targetGroup.settings.tags = [...tagsList];
     targetGroup.settings.prefixes = [...prefixesList];
+    targetGroup.settings.suffixes = [...suffixesList];
     targetGroup.settings.category = tagCategory;
 
     await targetGroup.save();
@@ -80,6 +83,11 @@
       <TagsEditor bind:tags={prefixesList}/>
     </FormControl>
   </TagsColorContainer>
+  <TagsColorContainer targetCategory={tagCategory}>
+    <FormControl label="Tag Suffixes">
+      <TagsEditor bind:tags={suffixesList}/>
+    </FormControl>
+  </TagsColorContainer>
 </FormContainer>
 <Menu>
   <hr>

From ea791838bf0929a524b7ba5e80e15568eba67239 Mon Sep 17 00:00:00 2001
From: KoloMl <thekolomoets@hotmail.com>
Date: Sun, 2 Mar 2025 18:55:51 +0400
Subject: [PATCH 2/2] Display stars in the tag editor for prefixes/suffixes

---
 src/components/tags/TagsEditor.svelte             |  6 ++++--
 src/routes/features/groups/[id]/edit/+page.svelte | 12 ++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/components/tags/TagsEditor.svelte b/src/components/tags/TagsEditor.svelte
index 83a433f..07ced57 100644
--- a/src/components/tags/TagsEditor.svelte
+++ b/src/components/tags/TagsEditor.svelte
@@ -4,10 +4,12 @@
   interface TagEditorProps {
     // List of tags to edit. Any duplicated tags present in the array will be removed on the first edit.
     tags?: string[];
+    mapTagNames?: (tagName: string) => string;
   }
 
   let {
-    tags = $bindable([])
+    tags = $bindable([]),
+    mapTagNames,
   }: TagEditorProps = $props();
 
   let uniqueTags = $state<Set<string>>(new Set());
@@ -87,7 +89,7 @@
 <div class="tags-editor">
   {#each uniqueTags.values() as tagName}
     <div class="tag">
-      {tagName}
+      {mapTagNames?.(tagName) ?? tagName}
       <span class="remove" onclick={createTagRemoveHandler(tagName)}
             onkeydown={createTagRemoveHandler(tagName)}
             role="button" tabindex="0">x</span>
diff --git a/src/routes/features/groups/[id]/edit/+page.svelte b/src/routes/features/groups/[id]/edit/+page.svelte
index 88d2764..8d68f71 100644
--- a/src/routes/features/groups/[id]/edit/+page.svelte
+++ b/src/routes/features/groups/[id]/edit/+page.svelte
@@ -60,6 +60,14 @@
     await targetGroup.save();
     await goto(`/features/groups/${targetGroup.id}`);
   }
+
+  function mapPrefixNames(tagName: string): string {
+    return `${tagName}*`;
+  }
+
+  function mapSuffixNames(tagName: string): string {
+    return `*${tagName}`;
+  }
 </script>
 
 <Menu>
@@ -80,12 +88,12 @@
   </TagsColorContainer>
   <TagsColorContainer targetCategory={tagCategory}>
     <FormControl label="Tag Prefixes">
-      <TagsEditor bind:tags={prefixesList}/>
+      <TagsEditor bind:tags={prefixesList} mapTagNames={mapPrefixNames}/>
     </FormControl>
   </TagsColorContainer>
   <TagsColorContainer targetCategory={tagCategory}>
     <FormControl label="Tag Suffixes">
-      <TagsEditor bind:tags={suffixesList}/>
+      <TagsEditor bind:tags={suffixesList} mapTagNames={mapSuffixNames}/>
     </FormControl>
   </TagsColorContainer>
 </FormContainer>