refactor(types): move from service to types

orchestratora · Feb 26, 2019 · a9600a3 · a9600a3
1 parent b406c06
commit a9600a3
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 33 deletions.
diff --git a/projects/dynamic-menu/src/lib/dynamic-menu.service.spec.ts b/projects/dynamic-menu/src/lib/dynamic-menu.service.spec.ts
@@ -7,12 +7,9 @@ import { takeUntil } from 'rxjs/operators';
 
 import { provideDynamicMenuExtras } from './dynamic-menu-extras';
 import { provideDynamicMenuRoutes } from './dynamic-menu-routes';
-import {
-  DynamicMenuRouteConfig,
-  DynamicMenuService,
-} from './dynamic-menu.service';
+import { DynamicMenuService } from './dynamic-menu.service';
 import { provideSubMenuMap } from './sub-menu-map-provider';
-import { RoutesWithMenu } from './types';
+import { DynamicMenuRouteConfig, RoutesWithMenu } from './types';
 
 @Component({ selector: 'ndm-test', template: '' })
 class TestComponent {}

diff --git a/projects/dynamic-menu/src/lib/dynamic-menu.service.ts b/projects/dynamic-menu/src/lib/dynamic-menu.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, Injector, Type } from '@angular/core';
+import { Injectable, Injector } from '@angular/core';
 import { Route, RouteConfigLoadEnd, Router } from '@angular/router';
 import { EMPTY, zip } from 'rxjs';
 import {
@@ -13,26 +13,12 @@ import {
 import { DynamicMenuExtrasToken } from './dynamic-menu-extras';
 import { DYNAMIC_MENU_ROUTES_TOKEN } from './dynamic-menu-routes';
 import { SUB_MENU_MAP_TOKEN, SubMenuMap } from './sub-menu-map-provider';
-import { DataWithMenu, MenuItem, RoutesWithMenu, RouteWithMenu } from './types';
-
-export interface DynamicMenuItem extends MenuItem {
-  children: DynamicMenuRouteConfig[];
-}
-
-export interface DynamicDataWithMenu extends DataWithMenu {
-  menu: DynamicMenuItem;
-}
-
-export interface DynamicMenuRouteConfig extends RouteWithMenu {
-  data: DynamicDataWithMenu;
-  fullUrl: string[];
-  subMenuComponent?: Type<any> | string;
-}
-
-export type DynamicMenuConfigFn = (
-  config: DynamicMenuRouteConfig,
-  parentConfig?: DynamicMenuRouteConfig,
-) => DynamicMenuRouteConfig;
+import {
+  DynamicMenuConfigFn,
+  DynamicMenuRouteConfig,
+  RoutesWithMenu,
+  RouteWithMenu,
+} from './types';
 
 @Injectable({
   providedIn: 'root',

diff --git a/projects/dynamic-menu/src/lib/dynamic-menu/context-item.ts b/projects/dynamic-menu/src/lib/dynamic-menu/context-item.ts
@@ -1,6 +1,6 @@
 import { TemplateRef } from '@angular/core';
 
-import { DynamicMenuRouteConfig } from '../dynamic-menu.service';
+import { DynamicMenuRouteConfig } from '../types';
 import { DynamicMenuTemplateContext } from './context-template';
 
 export class DynamicMenuItemContext extends DynamicMenuTemplateContext {

diff --git a/projects/dynamic-menu/src/lib/dynamic-menu/context-toggle.ts b/projects/dynamic-menu/src/lib/dynamic-menu/context-toggle.ts
@@ -1,6 +1,6 @@
 import { TemplateRef } from '@angular/core';
 
-import { DynamicMenuRouteConfig } from '../dynamic-menu.service';
+import { DynamicMenuRouteConfig } from '../types';
 import { DynamicMenuItemContext } from './context-item';
 
 export class DynamicMenuToggleContext extends DynamicMenuItemContext {

diff --git a/projects/dynamic-menu/src/lib/dynamic-menu/context-wrapper.ts b/projects/dynamic-menu/src/lib/dynamic-menu/context-wrapper.ts
@@ -1,6 +1,6 @@
 import { TemplateRef } from '@angular/core';
 
-import { DynamicMenuRouteConfig } from '../dynamic-menu.service';
+import { DynamicMenuRouteConfig } from '../types';
 import { DynamicMenuTemplateContext } from './context-template';
 
 export class DynamicMenuWrapperContext extends DynamicMenuTemplateContext {

diff --git a/projects/dynamic-menu/src/lib/dynamic-menu/dynamic-menu.component.ts b/projects/dynamic-menu/src/lib/dynamic-menu/dynamic-menu.component.ts
@@ -9,10 +9,8 @@ import {
 import { EMPTY, Observable, Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
-import {
-  DynamicMenuRouteConfig,
-  DynamicMenuService,
-} from '../dynamic-menu.service';
+import { DynamicMenuService } from '../dynamic-menu.service';
+import { DynamicMenuRouteConfig } from '../types';
 import { DynamicMenuItemContext } from './context-item';
 import { DynamicMenuToggleContext } from './context-toggle';
 import { DynamicMenuWrapperContext } from './context-wrapper';
@@ -53,6 +51,7 @@ export class DynamicMenuComponent implements OnInit, OnDestroy {
 
   ngOnDestroy(): void {
     this.destroyed$.next();
+    this.ctxCache.clear();
   }
 
   getWrapperCtx(configs: DynamicMenuRouteConfig[], tpl: TemplateRef<any>) {

diff --git a/projects/dynamic-menu/src/lib/types.ts b/projects/dynamic-menu/src/lib/types.ts
@@ -44,3 +44,22 @@ export interface RouteWithMenu extends Route {
 }
 
 export interface RoutesWithMenu extends Array<RouteWithMenu> {}
+
+export interface DynamicMenuItem extends MenuItem {
+  children: DynamicMenuRouteConfig[];
+}
+
+export interface DynamicDataWithMenu extends DataWithMenu {
+  menu: DynamicMenuItem;
+}
+
+export interface DynamicMenuRouteConfig extends RouteWithMenu {
+  data: DynamicDataWithMenu;
+  fullUrl: string[];
+  subMenuComponent?: Type<any> | string;
+}
+
+export type DynamicMenuConfigFn = (
+  config: DynamicMenuRouteConfig,
+  parentConfig?: DynamicMenuRouteConfig,
+) => DynamicMenuRouteConfig;