fix: unit test, and small bug fixes found in unit test

Missing unit test, and fixed bug in entitiesSelected() of withEntitiesMultiSelection

libs/ngrx-traits/signals/src/lib/with-entities-filter/with-entities-remote-filter.ts

@@ -107,9 +107,9 @@ import {
 export function withEntitiesRemoteFilter<
   Entity extends { id: string | number },
   Filter extends Record<string, unknown>,
->(options: {
+>(config: {
   defaultFilter: Filter;
-  entity: Entity;
+  entity?: Entity;
 }): SignalStoreFeature<
   {
     state: EntityState<Entity>;
@@ -198,9 +198,9 @@ export function withEntitiesRemoteFilter<
   Entity extends { id: string | number },
   Collection extends string,
   Filter extends Record<string, unknown>,
->(options: {
+>(config: {
   defaultFilter: Filter;
-  entity: Entity;
+  entity?: Entity;
   collection?: Collection;
 }): SignalStoreFeature<
   {

libs/ngrx-traits/signals/src/lib/with-entities-selection/with-entities-multi-selection.spec.ts

@@ -0,0 +1,120 @@
+import { withEntitiesMultiSelection } from '@ngrx-traits/signals';
+import { patchState, signalStore, type } from '@ngrx/signals';
+import { setAllEntities, withEntities } from '@ngrx/signals/entities';
+
+import { mockProducts } from '../test.mocks';
+import { Product } from '../test.model';
+
+describe('withEntitiesMultiSelection', () => {
+  const entity = type<Product>();
+
+  describe('without collection', () => {
+    const Store = signalStore(
+      withEntities({ entity }),
+      withEntitiesMultiSelection({ entity }),
+    );
+    it('selectEntities should select the entity', () => {
+      const store = new Store();
+      patchState(store, setAllEntities(mockProducts));
+      store.selectEntities({ ids: [mockProducts[4].id, mockProducts[8].id] });
+      expect(store.entitiesSelected()).toEqual([
+        mockProducts[4],
+        mockProducts[8],
+      ]);
+    });
+
+    it('deselectEntities should deselect the entity', () => {
+      const store = new Store();
+      patchState(store, setAllEntities(mockProducts));
+      store.selectEntities({ ids: [mockProducts[4].id, mockProducts[8].id] });
+      store.deselectEntities({ ids: [mockProducts[4].id, mockProducts[8].id] });
+      expect(store.entitiesSelected()).toEqual([]);
+    });
+
+    it('toggleSelectEntities should toggle selection of the entity', () => {
+      const store = new Store();
+      patchState(store, setAllEntities(mockProducts));
+      store.toggleSelectEntities({ id: mockProducts[4].id });
+      expect(store.entitiesSelected()).toEqual([mockProducts[4]]);
+      store.toggleSelectEntities({ id: mockProducts[4].id });
+      expect(store.entitiesSelected()).toEqual([]);
+    });
+
+    it('toggleSelectAllEntities should toggle selection of the entity', () => {
+      const store = new Store();
+      patchState(store, setAllEntities(mockProducts));
+      store.toggleSelectAllEntities();
+      expect(store.entitiesSelected().length).toEqual(mockProducts.length);
+      store.toggleSelectAllEntities();
+      expect(store.entitiesSelected()).toEqual([]);
+    });
+
+    it('isAllEntitiesSelected should toggle selection of the entity', () => {
+      const store = new Store();
+      patchState(store, setAllEntities(mockProducts));
+      store.toggleSelectAllEntities();
+      expect(store.isAllEntitiesSelected()).toEqual('all');
+      store.toggleSelectAllEntities();
+      expect(store.isAllEntitiesSelected()).toEqual('none');
+      store.toggleSelectEntities({ ids: mockProducts.map((p) => p.id) });
+      expect(store.isAllEntitiesSelected()).toEqual('all');
+      store.toggleSelectEntities({ id: mockProducts[4].id });
+      expect(store.isAllEntitiesSelected()).toEqual('some');
+    });
+  });
+
+  describe('with collection', () => {
+    const collection = 'products';
+    const Store = signalStore(
+      withEntities({ entity, collection }),
+      withEntitiesMultiSelection({ entity, collection }),
+    );
+    it('select[Collection]Entities should select the entity', () => {
+      const store = new Store();
+      patchState(store, setAllEntities(mockProducts, { collection }));
+      store.selectProductsEntities({
+        ids: [mockProducts[4].id, mockProducts[8].id],
+      });
+      expect(store.productsSelectedEntities()).toEqual([
+        mockProducts[4],
+        mockProducts[8],
+      ]);
+    });
+
+    it('deselect[Collection]Entities should deselect the entity', () => {
+      const store = new Store();
+      patchState(store, setAllEntities(mockProducts, { collection }));
+      store.selectProductsEntities({
+        ids: [mockProducts[4].id, mockProducts[8].id],
+      });
+      store.deselectProductsEntities({
+        ids: [mockProducts[4].id, mockProducts[8].id],
+      });
+      expect(store.productsSelectedEntities()).toEqual([]);
+    });
+
+    it('toggle[Collection]Entities should toggle selection of the entity', () => {
+      const store = new Store();
+      patchState(store, setAllEntities(mockProducts, { collection }));
+      store.toggleSelectProductsEntities({ id: mockProducts[4].id });
+      expect(store.productsSelectedEntities()).toEqual([mockProducts[4]]);
+      store.toggleSelectProductsEntities({ id: mockProducts[4].id });
+      expect(store.productsSelectedEntities()).toEqual([]);
+    });
+
+    it('isAll[Collection]Selected should toggle selection of the entity', () => {
+      const store = new Store();
+      patchState(store, setAllEntities(mockProducts, { collection }));
+      store.toggleSelectAllProductsEntities();
+      expect(store.isAllProductsSelected()).toEqual('all');
+      store.toggleSelectAllProductsEntities();
+      expect(store.isAllProductsSelected()).toEqual('none');
+      store.toggleSelectProductsEntities({
+        ids: mockProducts.map((p) => p.id),
+      });
+      expect(store.isAllProductsSelected()).toEqual('all');
+      store.toggleSelectProductsEntities({ id: mockProducts[4].id });
+      expect(store.isAllProductsSelected()).toEqual('some');
+    });
+  });
+});

libs/ngrx-traits/signals/src/lib/with-entities-selection/with-entities-multi-selection.ts

@@ -194,7 +194,17 @@ export function withEntitiesMultiSelection<
       const selectedIdsMap = state[selectedIdsMapKey] as Signal<
         Record<string | number, boolean>
       >;
-      const selectedIdsArray = computed(() => Object.keys(selectedIdsMap()));
+      const selectedIdsArray = computed(() =>
+        Object.entries(selectedIdsMap()).reduce(
+          (aux, [id, selected]) => {
+            if (selected) {
+              aux.push(id);
+            }
+            return aux;
+          },
+          [] as (string | number)[],
+        ),
+      );
       return {
         [selectedEntitiesKey]: computed(() => {
           return selectedIdsArray().map((id) => entityMap()[id]);

libs/ngrx-traits/signals/src/lib/with-entities-selection/with-entities-single-selection.spec.ts

@@ -0,0 +1,71 @@
+import { withEntitiesSingleSelection } from '@ngrx-traits/signals';
+import { patchState, signalStore, type } from '@ngrx/signals';
+import { setAllEntities, withEntities } from '@ngrx/signals/entities';
+
+import { mockProducts } from '../test.mocks';
+import { Product } from '../test.model';
+
+describe('withEntitiesSingleSelection', () => {
+  const entity = type<Product>();
+
+  describe('without collection', () => {
+    const Store = signalStore(
+      withEntities({ entity }),
+      withEntitiesSingleSelection({ entity }),
+    );
+    it('selectEntity should select the entity', () => {
+      const store = new Store();
+      patchState(store, setAllEntities(mockProducts));
+      store.selectEntity({ id: mockProducts[4].id });
+      expect(store.entitiesSelectedEntity()).toEqual(mockProducts[4]);
+    });
+
+    it('deselectEntity should deselect the entity', () => {
+      const store = new Store();
+      patchState(store, setAllEntities(mockProducts));
+      store.selectEntity({ id: mockProducts[4].id });
+      store.deselectEntity({ id: mockProducts[4].id });
+      expect(store.entitiesSelectedEntity()).toEqual(undefined);
+    });
+
+    it('toggleEntity should toggle selection of the entity', () => {
+      const store = new Store();
+      patchState(store, setAllEntities(mockProducts));
+      store.toggleEntity({ id: mockProducts[4].id });
+      expect(store.entitiesSelectedEntity()).toEqual(mockProducts[4]);
+      store.toggleEntity({ id: mockProducts[4].id });
+      expect(store.entitiesSelectedEntity()).toEqual(undefined);
+    });
+  });
+
+  describe('with collection', () => {
+    const collection = 'products';
+    const Store = signalStore(
+      withEntities({ entity, collection }),
+      withEntitiesSingleSelection({ entity, collection }),
+    );
+    it('selectEntity should select the entity', () => {
+      const store = new Store();
+      patchState(store, setAllEntities(mockProducts, { collection }));
+      store.selectProductsEntity({ id: mockProducts[4].id });
+      expect(store.productsSelectedEntity()).toEqual(mockProducts[4]);
+    });
+
+    it('deselectEntity should deselect the entity', () => {
+      const store = new Store();
+      patchState(store, setAllEntities(mockProducts, { collection }));
+      store.selectProductsEntity({ id: mockProducts[4].id });
+      store.deselectProductsEntity({ id: mockProducts[4].id });
+      expect(store.productsSelectedEntity()).toEqual(undefined);
+    });
+
+    it('toggleEntity should toggle selection of the entity', () => {
+      const store = new Store();
+      patchState(store, setAllEntities(mockProducts, { collection }));
+      store.toggleProductsEntity({ id: mockProducts[4].id });
+      expect(store.productsSelectedEntity()).toEqual(mockProducts[4]);
+      store.toggleProductsEntity({ id: mockProducts[4].id });
+      expect(store.productsSelectedEntity()).toEqual(undefined);
+    });
+  });
+});

libs/ngrx-traits/signals/src/lib/with-entities-selection/with-entities-single-selection.ts

@@ -80,7 +80,7 @@ function getEntitiesSingleSelectionKeys(config?: { collection?: string }) {
 
 export function withEntitiesSingleSelection<
   Entity extends { id: string | number },
->(config: {
+>(config?: {
   entity?: Entity;
 }): SignalStoreFeature<
   {
@@ -127,7 +127,7 @@ export function withEntitiesSingleSelection<
 export function withEntitiesSingleSelection<
   Entity extends { id: string | number },
   Collection extends string,
->(config: {
+>(config?: {
   entity?: Entity;
   collection?: Collection;
 }): SignalStoreFeature<
@@ -147,7 +147,7 @@ export function withEntitiesSingleSelection<
 export function withEntitiesSingleSelection<
   Entity extends { id: string | number },
   Collection extends string,
->(config: {
+>(config?: {
   entity?: Entity;
   collection?: Collection;
 }): SignalStoreFeature<any, any> {