Merge pull request salesforce#9 from datorama/fix/set

fix(crud): set now can accept the complete state object
hoisel · Jul 9, 2018 · f2fc223 · f2fc223
2 parents d0331fe + a2c93c6
commit f2fc223
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 21 deletions.
diff --git a/akita/__tests__/crud.spec.ts b/akita/__tests__/crud.spec.ts
@@ -179,16 +179,6 @@ describe('CRUD', () => {
       expect(store.entities[201].title).toEqual('201');
     });
 
-    it('should throw if entities are invalid', () => {
-      const state = {
-        entities: null,
-        ids: [200, 201]
-      };
-      expect(function() {
-        crud._set(store, state.entities, null, ID_KEY);
-      }).toThrow(new AkitaInvalidEntityState() as any);
-    });
-
     it('should set ids when passing entities', () => {
       let store = {
         entities: {},

diff --git a/akita/src/api/entity-store.ts b/akita/src/api/entity-store.ts
@@ -1,5 +1,5 @@
 import { _crud } from '../internal/crud';
-import { ActiveState, EntityState, HashMap, ID, Newable } from './types';
+import { ActiveState, Entities, EntityState, HashMap, ID, Newable } from './types';
 import { coerceArray, entityExists, isFunction, toBoolean } from '../internal/utils';
 import { Store } from './store';
 import { assertActive, assertEntityExists } from '../internal/error';
@@ -56,7 +56,7 @@ export class EntityStore<S extends EntityState<E>, E> extends Store<S> {
    * this.store.set([{id: 1}, {id: 2}], Product);
    *
    */
-  set(entities: E[] | HashMap<E>, entityClass?: Newable<E>) {
+  set(entities: E[] | HashMap<E> | Entities<E>, entityClass?: Newable<E>) {
     applyTransaction(() => {
       this.setState(state => _crud._set(state, entities, entityClass, this.idKey));
       this.setDirty();

diff --git a/akita/src/api/types.ts b/akita/src/api/types.ts
@@ -26,6 +26,11 @@ export interface EntityState<T = any> {
   [key: string]: any;
 }
 
+export interface Entities<E> {
+  entities?: HashMap<E>;
+  ids?: ID[];
+}
+
 /**
  * Interface for stores that needs an active indication
  */

diff --git a/akita/src/internal/crud.ts b/akita/src/internal/crud.ts
@@ -1,19 +1,26 @@
-import { EntityState, HashMap, ID, Newable } from '../api/types';
+import { Entities, EntityState, HashMap, ID, Newable } from '../api/types';
 import { entityExists, isPlainObject } from './utils';
 import { assertEntityExists, assertEntityState } from './error';
 
 export class CRUD {
-  _set<S, E>(state: S, entities: E[] | HashMap<E>, entityClass: Newable<E>, idKey): S {
-    const isArray = Array.isArray(entities);
-    let normalized = entities;
+  _set<S, E>(state: S, entities: E[] | HashMap<E> | Entities<E>, entityClass: Newable<E>, idKey): S {
+    let ids, normalized;
 
-    if (isArray) {
-      normalized = this.keyBy(entities as E[], entityClass, idKey) as E[];
+    if ((entities as Entities<E>).ids && (entities as Entities<E>).entities) {
+      ids = (entities as Entities<E>).ids;
+      normalized = (entities as Entities<E>).entities;
     } else {
-      assertEntityState(entities);
-    }
+      const isArray = Array.isArray(entities);
+      normalized = entities;
 
-    const ids = isArray ? (entities as E[]).map(entity => entity[idKey]) : Object.keys(normalized as HashMap<E>).map(id => entities[id][idKey]);
+      if (isArray) {
+        normalized = this.keyBy(entities as E[], entityClass, idKey) as E[];
+      } else {
+        assertEntityState(entities);
+      }
+
+      ids = isArray ? (entities as E[]).map(entity => entity[idKey]) : Object.keys(normalized as HashMap<E>).map(id => entities[id][idKey]);
+    }
 
     return {
       ...(state as any),