Fix combineTags to respect tag order

ComponentDriven · Apr 5, 2024 · ba37fd5 · ba37fd5
1 parent f469755
commit ba37fd5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/index.test.ts b/src/index.test.ts
@@ -106,6 +106,7 @@ describe('combineTags', () => {
       ['a', 'b'],
     ],
     [['a', 'b', '!b'], ['a']],
+    [['b', '!b', 'b'], ['b']],
   ])('combineTags(%o) -> %o', (tags, expected) => {
     expect(combineTags(...tags)).toEqual(expected);
   });

diff --git a/src/index.ts b/src/index.ts
@@ -87,14 +87,15 @@ export const parseKind = (kind: string, { rootSeparator, groupSeparator }: Separ
  * Combine a set of project / meta / story tags, removing duplicates and handling negations.
  */
 export const combineTags = (...tags: string[]): string[] => {
-  const set = new Set<string>(tags);
-  return Array.from(set).reduce((acc, tag) => {
-    if (tag.startsWith('!')) return acc;
-    if (!set.has(`!${tag}`)) {
-      acc.push(tag);
+  const result = tags.reduce((acc, tag) => {
+    if (tag.startsWith('!')) {
+      acc.delete(tag.slice(1));
+    } else {
+      acc.add(tag);
     }
     return acc;
-  }, [] as string[]);
+  }, new Set<string>());
+  return Array.from(result);
 };
 
 export { includeConditionalArg } from './includeConditionalArg';