feat(history-service): reduce public API surface (#258)

feature-hub · Jan 11, 2019 · 5f8b8ec · 5f8b8ec
1 parent 9e8be1e
commit 5f8b8ec
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 22 deletions.
diff --git a/packages/history-service/src/__tests__/define-history-service.node.test.ts b/packages/history-service/src/__tests__/define-history-service.node.test.ts
@@ -14,7 +14,6 @@ import {History} from 'history';
 import {
   HistoryServiceV1,
   RootLocationTransformer,
-  SharedHistoryService,
   defineHistoryService
 } from '..';
 import {testRootLocationTransformer} from '../internal/test-root-location-transformer';
@@ -46,9 +45,11 @@ describe('HistoryService#create (on Node.js)', () => {
 
       const sharedHistoryService = defineHistoryService(
         testRootLocationTransformer
-      ).create(mockEnv) as SharedHistoryService;
+      ).create(mockEnv);
 
-      return sharedHistoryService['1.1'];
+      return sharedHistoryService['1.1'] as FeatureServiceBinder<
+        HistoryServiceV1
+      >;
     };
   });
 

diff --git a/packages/history-service/src/__tests__/define-history-service.test.ts b/packages/history-service/src/__tests__/define-history-service.test.ts
@@ -7,7 +7,7 @@ import {
   FeatureServiceEnvironment
 } from '@feature-hub/core';
 import {History} from 'history';
-import {HistoryServiceV1, SharedHistoryService, defineHistoryService} from '..';
+import {HistoryServiceV1, defineHistoryService} from '..';
 import {testRootLocationTransformer} from '../internal/test-root-location-transformer';
 
 const simulateOnPopState = (state: unknown, url: string) => {
@@ -71,9 +71,11 @@ describe('defineHistoryService', () => {
       createHistoryServiceBinder = () => {
         const sharedHistoryService = defineHistoryService(
           testRootLocationTransformer
-        ).create(mockEnv) as SharedHistoryService;
+        ).create(mockEnv);
 
-        return sharedHistoryService['1.1'];
+        return sharedHistoryService['1.1'] as FeatureServiceBinder<
+          HistoryServiceV1
+        >;
       };
     });
 

diff --git a/packages/history-service/src/define-history-service.ts b/packages/history-service/src/define-history-service.ts
@@ -4,14 +4,19 @@ import {
   FeatureServiceProviderDefinition,
   SharedFeatureService
 } from '@feature-hub/core';
+import * as history from 'history';
 import {RootLocationTransformer} from './create-root-location-transformer';
-import {
-  HistoryServiceV1,
-  createHistoryServiceV1Binder
-} from './history-service-v1';
 import {createHistoryMultiplexers} from './internal/create-history-multiplexers';
+import {createHistoryServiceV1Binder} from './internal/create-history-service-v1-binder';
+
+export interface HistoryServiceV1 {
+  staticRootLocation: history.Location;
+
+  createBrowserHistory(): history.History;
+  createStaticHistory(): history.History;
+}
 
-export interface SharedHistoryService extends SharedFeatureService {
+interface SharedHistoryService extends SharedFeatureService {
   readonly '1.1': FeatureServiceBinder<HistoryServiceV1>;
 }
 

diff --git a/packages/history-service/src/index.ts b/packages/history-service/src/index.ts
@@ -1,3 +1,2 @@
 export * from './define-history-service';
-export {HistoryServiceV1} from './history-service-v1';
 export * from './create-root-location-transformer';
diff --git a/...history-service/src/history-service-v1.ts → ...ernal/create-history-service-v1-binder.ts b/...history-service/src/history-service-v1.ts → ...ernal/create-history-service-v1-binder.ts
@@ -1,15 +1,9 @@
 import {FeatureServiceBinder, FeatureServiceBinding} from '@feature-hub/core';
 import * as history from 'history';
-import {BrowserConsumerHistory} from './internal/browser-consumer-history';
-import {HistoryMultiplexers} from './internal/create-history-multiplexers';
-import {StaticConsumerHistory} from './internal/static-consumer-history';
-
-export interface HistoryServiceV1 {
-  staticRootLocation: history.Location;
-
-  createBrowserHistory(): history.History;
-  createStaticHistory(): history.History;
-}
+import {HistoryServiceV1} from '../define-history-service';
+import {BrowserConsumerHistory} from './browser-consumer-history';
+import {HistoryMultiplexers} from './create-history-multiplexers';
+import {StaticConsumerHistory} from './static-consumer-history';
 
 export function createHistoryServiceV1Binder(
   historyMultiplexers: HistoryMultiplexers