cleanup

app/packages/state/src/recoil/sidebar/index.ts

@@ -70,6 +70,7 @@ import {
   unsupportedMatcher,
 } from "../utils";
 import * as viewAtoms from "../view";
+import { mergeGroups } from "./sidebar-utils";
 
 export enum EntryKind {
   EMPTY = "EMPTY",

app/packages/state/src/recoil/sidebar/sidebar-utils.test.ts

@@ -3,9 +3,13 @@ import { describe, expect, it, vi } from "vitest";
 vi.mock("recoil");
 vi.mock("recoil-relay");
 
-import { mergeGroups } from "./sidebar-utils";
+import { merge, mergeGroups } from "./sidebar-utils";
 
 describe("test sidebar groups resolution", () => {
+  it("test list merge", () => {
+    expect(merge([], ["one", "two"])).toStrictEqual(["one", "two"]);
+  });
+
   it("merges current and config groups", () => {
     expect(
       mergeGroups(

app/packages/state/src/recoil/sidebar/sidebar-utils.ts

@@ -34,19 +34,25 @@ const insertFromNeighbor = (sink: string[], source: string[], key: string) => {
   return;
 };
 
-const merge = (sink: string[], source: string[]) => {
+export const merge = (sink: string[], source: string[]) => {
   const missing = new Set(source.filter((key) => !sink.includes(key)));
 
   while (missing.size) {
-    const force = ![...missing].some((name) => hasNeighbor(sink, source, name));
+    const force = [...missing].every(
+      (name) => !hasNeighbor(sink, source, name)
+    );
     for (const name of missing) {
       if (!force && !hasNeighbor(sink, source, name)) {
         continue;
       }
+
       insertFromNeighbor(sink, source, name);
+
       missing.delete(name);
     }
   }
+
+  return sink;
 };
 
 export const mergeGroups = (
@@ -70,7 +76,8 @@ export const mergeGroups = (
       continue;
     }
 
-    merge(mapping[name].paths || [], source[i].paths);
+    mapping[name].paths = mapping[name].paths ?? [];
+    merge(mapping[name].paths, source[i].paths);
   }
 
   return resolved;