fix: Beta 13 - eliminate barrels so can build apps with AOT (#146)

closes #145

lib/CHANGELOG.md

@@ -1,22 +1,32 @@
 # Angular ngrx-data library ChangeLog
 
-<a name="1.0.0-beta.13"></a>
+<a name="6.0.0-beta.1"></a>
 
-# 1.0.0-beta.13 (COMING SOON)
+# 6.0.0-beta.1 (COMING SOON)
 
 **BREAKING CHANGE: Update to Angular/RxJS/NgRX v6**
 
 * Converted to RxJS v6.0.1 _without the compat library_
 * Converted to Angular v6.0.0
 * Converted to NgRX v6.0.0-beta.1
 
-<a name="1.0.0-beta.12"></a>
+<a name="1.0.0-beta.13"></a>
+
+# 1.0.0-beta.13 (2018-05-04)
+
+<a name="1.0.0-beta.13"></a>
+
+Fix AOT build error (#145) by removing all barrels.
+
+Beta 12 _did not work_. It only seemed to for the one use case (#135).
+Removing all barrels from the top level `lib/src/index.ts` seems to work.
+Removed all barrels everywhere to prevent future trouble.
 
 # 1.0.0-beta.12 (2018-05-04)
 
 ### Utils and Pluralizer
 
-Fix AOT build error (#135) by moving `export * from './utils';` to the top of `/lib/src/index.ts`.
+Fix AOT build error (#135) by moving `export * from './utils';` to the top of `/lib/src/index.ts`. (**Did not work; see Beta 13.**)
 
 These fixes should not break library consumers because they cannot reach into these folders.
 

lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngrx-data",
-  "version": "1.0.0-beta.12",
+  "version": "1.0.0-beta.13",
   "repository": "https://github.com/johnpapa/angular-ngrx-data.git",
   "license": "MIT",
   "peerDependencies": {

lib/src/actions/entity-action-guard.spec.ts

@@ -1,6 +1,6 @@
 import { EntityAction } from './entity-action';
 import { EntityActionGuard } from './entity-action-guard';
-import { IdSelector, Update } from '../utils';
+import { IdSelector, Update } from '../utils/ngrx-entity-models';
 
 describe('EntityActionGuard', () => {
   // TODO: write some tests

lib/src/dataservices/default-data.service.spec.ts

@@ -19,7 +19,7 @@ import {
   EntityHttpResourceUrls,
   HttpUrlGenerator
 } from './http-url-generator';
-import { Update } from '../utils';
+import { Update } from '../utils/ngrx-entity-models';
 
 class Hero {
   id: number;

lib/src/dataservices/entity-data.service.spec.ts

@@ -6,11 +6,13 @@ import { Observable } from 'rxjs/Observable';
 
 import {
   createEntityDefinition,
-  EntityDefinition,
+  EntityDefinition
+} from '../entity-metadata/entity-definition';
+import {
   EntityMetadata,
   EntityMetadataMap,
   ENTITY_METADATA_TOKEN
-} from '../entity-metadata';
+} from '../entity-metadata/entity-metadata';
 
 import {
   DefaultDataService,
@@ -21,7 +23,7 @@ import { HttpUrlGenerator, EntityHttpResourceUrls } from './http-url-generator';
 import { EntityDataService } from './entity-data.service';
 import { EntityCollectionDataService } from './entity-data.service';
 import { QueryParams } from './interfaces';
-import { Update } from '../utils';
+import { Update } from '../utils/ngrx-entity-models';
 
 // region Test Helpers
 ///// Test Helpers /////

lib/src/dispatchers/entity-dispatcher.spec.ts

@@ -1,22 +1,22 @@
-import { defaultSelectId } from '../utils';
-import { EntityAction, EntityActionFactory, EntityOp } from '../actions';
+import { defaultSelectId } from '../utils/utilities';
+import { EntityAction, EntityActionFactory } from '../actions/entity-action';
+import { EntityOp } from '../actions/entity-op';
 import { EntityDispatcher, EntityDispatcherBase } from './entity-dispatcher';
 import { EntityDispatcherFactory } from './entity-dispatcher-factory';
 import { EntityCommands } from './entity-commands';
 import { EntityDispatcherOptions } from './entity-dispatcher';
-import { Update } from '../utils';
+import { Update } from '../utils/ngrx-entity-models';
 
 class Hero {
   id: number;
   name: string;
   saying?: string;
 }
 
-const defaultDispatcherOptions =
-  new EntityDispatcherFactory(null, null).defaultDispatcherOptions;
+const defaultDispatcherOptions = new EntityDispatcherFactory(null, null)
+  .defaultDispatcherOptions;
 
 describe('EntityDispatcher', () => {
-
   commandDispatchTest(entityDispatcherTestSetup);
 
   function entityDispatcherTestSetup() {
@@ -25,7 +25,13 @@ describe('EntityDispatcher', () => {
 
     const selectId = defaultSelectId;
     const entityActionFactory = new EntityActionFactory();
-    const dispatcher = new EntityDispatcherBase<Hero>('Hero', entityActionFactory, testStore, selectId, defaultDispatcherOptions)
+    const dispatcher = new EntityDispatcherBase<Hero>(
+      'Hero',
+      entityActionFactory,
+      testStore,
+      selectId,
+      defaultDispatcherOptions
+    );
     return { dispatcher, testStore };
   }
 });
@@ -34,14 +40,13 @@ describe('EntityDispatcher', () => {
 
 /** Test that implementer of EntityCommands dispatches properly */
 export function commandDispatchTest(
-  setup: () => { dispatcher: EntityDispatcher<Hero>, testStore: any}
- ) {
-
+  setup: () => { dispatcher: EntityDispatcher<Hero>; testStore: any }
+) {
   let dispatcher: EntityDispatcher<Hero>;
   let testStore: { dispatch: jasmine.Spy };
 
   function dispatchedAction() {
-    return <EntityAction> testStore.dispatch.calls.argsFor(0)[0];
+    return <EntityAction>testStore.dispatch.calls.argsFor(0)[0];
   }
 
   beforeEach(() => {
@@ -51,17 +56,16 @@ export function commandDispatchTest(
   });
 
   it('#entityName is the expected name of the entity type', () => {
-    expect(dispatcher.entityName).toBe('Hero')
+    expect(dispatcher.entityName).toBe('Hero');
   });
 
   describe('Save actions', () => {
-
     // By default add and update are pessimistic and delete is optimistic.
     // Tests override in the dispatcher method calls as necessary.
 
     describe('(optimistic)', () => {
       it('#add(hero) dispatches SAVE_ADD_ONE_OPTIMISTIC', () => {
-        const hero: Hero = {id: 42, name: 'test'};
+        const hero: Hero = { id: 42, name: 'test' };
         dispatcher.add(hero, /* isOptimistic */ true);
 
         expect(dispatchedAction().op).toBe(EntityOp.SAVE_ADD_ONE_OPTIMISTIC);
@@ -77,7 +81,7 @@ export function commandDispatchTest(
 
       it('#delete(hero) dispatches SAVE_DELETE_ONE_OPTIMISTIC for the hero.id', () => {
         const id = 42;
-        const hero: Hero = {id, name: 'test'};
+        const hero: Hero = { id, name: 'test' };
 
         dispatcher.delete(hero); // optimistic by default
 
@@ -86,7 +90,7 @@ export function commandDispatchTest(
       });
 
       it('#update(hero) dispatches SAVE_UPDATE_ONE_OPTIMISTIC with an update payload', () => {
-        const hero: Hero = {id: 42, name: 'test'}
+        const hero: Hero = { id: 42, name: 'test' };
         const expectedUpdate: Update<Hero> = { id: 42, changes: hero };
 
         dispatcher.update(hero, /* isOptimistic */ true);
@@ -98,7 +102,7 @@ export function commandDispatchTest(
 
     describe('(pessimistic)', () => {
       it('#add(hero) dispatches SAVE_ADD', () => {
-        const hero: Hero = {id: 42, name: 'test'};
+        const hero: Hero = { id: 42, name: 'test' };
         dispatcher.add(hero); // pessimistic by default
 
         expect(dispatchedAction().op).toBe(EntityOp.SAVE_ADD_ONE);
@@ -114,7 +118,7 @@ export function commandDispatchTest(
 
       it('#delete(hero) dispatches SAVE_DELETE for the hero.id', () => {
         const id = 42;
-        const hero: Hero = {id, name: 'test'};
+        const hero: Hero = { id, name: 'test' };
 
         dispatcher.delete(hero, /* isOptimistic */ false); // optimistic by default
 
@@ -123,7 +127,7 @@ export function commandDispatchTest(
       });
 
       it('#update(hero) dispatches SAVE_UPDATE with an update payload', () => {
-        const hero: Hero = {id: 42, name: 'test'}
+        const hero: Hero = { id: 42, name: 'test' };
         const expectedUpdate: Update<Hero> = { id: 42, changes: hero };
 
         dispatcher.update(hero); // pessimistic by default
@@ -150,19 +154,19 @@ export function commandDispatchTest(
     });
 
     it('#getWithQuery(QueryParams) dispatches QUERY_MANY', () => {
-      dispatcher.getWithQuery({name: 'B'});
+      dispatcher.getWithQuery({ name: 'B' });
 
       expect(dispatchedAction().op).toBe(EntityOp.QUERY_MANY);
       expect(dispatchedAction().entityName).toBe('Hero');
-      expect(dispatchedAction().payload).toEqual({name: 'B'}, 'params')
+      expect(dispatchedAction().payload).toEqual({ name: 'B' }, 'params');
     });
 
     it('#getWithQuery(string) dispatches QUERY_MANY', () => {
       dispatcher.getWithQuery('name=B');
 
       expect(dispatchedAction().op).toBe(EntityOp.QUERY_MANY);
       expect(dispatchedAction().entityName).toBe('Hero');
-      expect(dispatchedAction().payload).toEqual('name=B', 'params')
+      expect(dispatchedAction().payload).toEqual('name=B', 'params');
     });
   });
 
@@ -215,7 +219,7 @@ export function commandDispatchTest(
 
     it('#removeOneFromCache(entity) dispatches REMOVE_ONE', () => {
       const id = 42;
-      const hero: Hero = {id, name: 'test'};
+      const hero: Hero = { id, name: 'test' };
       dispatcher.removeOneFromCache(hero);
 
       expect(dispatchedAction().op).toBe(EntityOp.REMOVE_ONE);

lib/src/effects/entity-effects.marbles.spec.ts

@@ -4,27 +4,28 @@ import { TestBed } from '@angular/core/testing';
 import { cold, hot } from 'jasmine-marbles';
 import { Observable } from 'rxjs/Observable';
 
-import {
-  EntityAction,
-  EntityActionFactory,
-  EntityActions,
-  EntityOp,
-  OP_ERROR
-} from '../actions';
+import { EntityAction, EntityActionFactory } from '../actions/entity-action';
+import { EntityActions } from '../actions/entity-actions';
+import { EntityOp, OP_ERROR } from '../actions/entity-op';
 
 import {
-  DataServiceError,
   EntityCollectionDataService,
-  EntityActionDataServiceError,
-  EntityDataService,
-  HttpMethods,
+  EntityDataService
+} from '../dataservices/entity-data.service';
+import {
+  DataServiceError,
+  EntityActionDataServiceError
+} from '../dataservices/data-service-error';
+import {
   PersistenceResultHandler,
   DefaultPersistenceResultHandler
-} from '../dataservices';
+} from '../dataservices/persistence-result-handler.service';
+import { HttpMethods } from '../dataservices/interfaces';
 
 import { EntityEffects } from './entity-effects';
 
-import { Logger, Update } from '../utils';
+import { Logger } from '../utils/interfaces';
+import { Update } from '../utils/ngrx-entity-models';
 
 export class TestEntityActions extends EntityActions {
   set stream(source: Observable<any>) {

lib/src/effects/entity-effects.spec.ts

@@ -6,27 +6,28 @@ import { ErrorObservable } from 'rxjs/observable/ErrorObservable';
 import { Observable } from 'rxjs/Observable';
 import { delay, first, merge } from 'rxjs/operators';
 
-import {
-  EntityAction,
-  EntityActionFactory,
-  EntityActions,
-  EntityOp,
-  OP_ERROR
-} from '../actions';
+import { EntityAction, EntityActionFactory } from '../actions/entity-action';
+import { EntityActions } from '../actions/entity-actions';
+import { EntityOp, OP_ERROR } from '../actions/entity-op';
 
 import {
-  DataServiceError,
   EntityCollectionDataService,
-  EntityDataService,
-  EntityActionDataServiceError,
-  HttpMethods,
+  EntityDataService
+} from '../dataservices/entity-data.service';
+import {
+  DataServiceError,
+  EntityActionDataServiceError
+} from '../dataservices/data-service-error';
+import {
   PersistenceResultHandler,
   DefaultPersistenceResultHandler
-} from '../dataservices';
+} from '../dataservices/persistence-result-handler.service';
+import { HttpMethods } from '../dataservices/interfaces';
 
 import { EntityEffects } from './entity-effects';
 
-import { Logger, Update } from '../utils';
+import { Logger } from '../utils/interfaces';
+import { Update } from '../utils/ngrx-entity-models';
 
 export class TestEntityActions extends EntityActions {
   set stream(source: Observable<any>) {

lib/src/entity-metadata/entity-definition.spec.ts

@@ -1,7 +1,7 @@
 import { EntityMetadata } from './entity-metadata';
 import { EntityFilterFn } from './entity-filters';
-import { IdSelector, Comparer } from '../utils';
-import { EntitySelectors } from '../selectors';
+import { IdSelector, Comparer } from '../utils/ngrx-entity-models';
+import { EntitySelectors } from '../selectors/entity-selectors';
 
 import { createEntityDefinition } from './entity-definition';
 

lib/src/entity-service/entity-service.spec.ts

@@ -4,13 +4,12 @@ import { Action, StoreModule, Store } from '@ngrx/store';
 
 import { Subject } from 'rxjs/Subject';
 
-import {
-  EntityAction,
-  EntityActions,
-  EntityActionFactory,
-  EntityOp
-} from '../actions';
-import { EntityCache, EntityCollection } from '../reducers';
+import { EntityAction, EntityActionFactory } from '../actions/entity-action';
+import { EntityActions } from '../actions/entity-actions';
+import { EntityOp } from '../actions/entity-op';
+
+import { EntityCache } from '../reducers/entity-cache';
+import { EntityCollection } from '../reducers/entity-collection';
 import { ENTITY_METADATA_TOKEN } from '../entity-metadata/entity-metadata';
 import {
   EntityService,