refactor(*): create directives and statebuilders folders for ng1 and ng2

christopherthielen · christopherthielen · commit b8e791229919 · 2016-06-06T17:27:19.000-05:00
diff --git a/packages/ng1-bower/tsconfig.json b/packages/ng1-bower/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": { "rootDir": ".", "outDir": "../commonjs" },
   "files": [ 
     "ng1.ts", 
-    "ng1/stateEvents.ts", 
+    "ng1/legacy/stateEvents.ts", 
     "../typings/es6-shim/es6-shim.d.ts" ,
     "../typings/angularjs/angular.d.ts" 
   ]
diff --git a/packages/ng1-bower/webpack.config.js b/packages/ng1-bower/webpack.config.js
@@ -12,8 +12,8 @@ module.exports = {
   entry: {
     "angular-ui-router": "./ng1.ts",
     "angular-ui-router.min": "./ng1.ts",
-    "stateEvents": "./ng1/stateEvents.ts",
-    "stateEvents.min": "./ng1/stateEvents.ts"
+    "stateEvents": "./ng1/legacy/stateEvents.ts",
+    "stateEvents.min": "./ng1/legacy/stateEvents.ts"
   },
 
   output: {
diff --git a/packages/ng1/tsconfig.json b/packages/ng1/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": { "rootDir": ".", "outDir": "../commonjs" },
   "files": [ 
     "ng1.ts", 
-    "ng1/stateEvents.ts", 
+    "ng1/legacy/stateEvents.ts", 
     "../typings/es6-shim/es6-shim.d.ts" ,
     "../typings/angularjs/angular.d.ts" 
   ]
diff --git a/packages/ng1/webpack.config.js b/packages/ng1/webpack.config.js
@@ -12,8 +12,8 @@ module.exports = {
   entry: {
     "angular-ui-router": "./ng1.ts",
     "angular-ui-router.min": "./ng1.ts",
-    "stateEvents": "./ng1/stateEvents.ts",
-    "stateEvents.min": "./ng1/stateEvents.ts"
+    "stateEvents": "./ng1/legacy/stateEvents.ts",
+    "stateEvents.min": "./ng1/legacy/stateEvents.ts"
   },
 
   output: {
diff --git a/src/common/interface.ts b/src/common/interface.ts
@@ -0,0 +1,31 @@
+/**
+ * An interface for getting values from dependency injection.
+ */
+export interface UIRInjector {
+  /**
+   * Gets a value from the injector
+   *
+   * @example
+   * ```js
+   *
+   * // ng1
+   * injector.get('$state').go('home');
+   * ```
+   *
+   * @example
+   * ```js
+   *
+   * // ng2
+   * import {StateService} from "ui-router-ng2";
+   * injector.get(StateService).go('home');
+   * ```
+   *
+   * Note:
+   * The code that implements this interface may be Angular 1 `$injector`, Angular 2 `Injector`,
+   * a [[ResolveContext]], or a `ResolveContext` that delegates to the ng1/ng2 injector if keys are missing.
+   *
+   * @param key the key for the value to get.  May be a string or arbitrary object.
+   * @return the Dependency Injection value that matches the key
+   */
+  get(key: any): any;
+}
diff --git a/src/ng1.ts b/src/ng1.ts
@@ -10,9 +10,9 @@ export * from "./ng1/services";
 export * from "./ng1/statebuilders/views";
 export * from "./ng1/statebuilders/resolve";
 
-import "./ng1/stateDirectives";
+import "./ng1/directives/stateDirectives";
 import "./ng1/stateFilters";
-import "./ng1/viewDirective";
+import "./ng1/directives/viewDirective";
 import "./ng1/viewScroll";
 
 export default "ui.router";
diff --git a/src/ng1/directives/stateDirectives.ts b/src/ng1/directives/stateDirectives.ts
@@ -5,10 +5,10 @@
  *
  * @preferred @module ng1_directives
  */ /** for typedoc */
-import {extend, forEach, toJson} from "../common/common";
-import {isString, isObject} from "../common/predicates";
+import {extend, forEach, toJson} from "../../common/common";
+import {isString, isObject} from "../../common/predicates";
 import {UIViewData} from "./viewDirective";
-import {parse} from "../common/hof";
+import {parse} from "../../common/hof";
 
 /** @hidden */
 function parseStateRef(ref, current) {
diff --git a/src/ng1/directives/viewDirective.ts b/src/ng1/directives/viewDirective.ts
@@ -1,19 +1,19 @@
 /** @module ng1_directives */ /** for typedoc */
 "use strict";
-import {extend, map, unnestR, filter} from "../common/common";
-import {isDefined, isFunction, isString} from "../common/predicates";
-import {trace} from "../common/trace";
-import {ActiveUIView} from "../view/interface";
-import {Ng1ViewConfig} from "./statebuilders/views";
-import {TransitionService} from "../transition/transitionService";
-import {parse} from "../common/hof";
-import {ResolveContext} from "../resolve/resolveContext";
-import {Transition} from "../transition/transition";
-import {Node} from "../path/node";
-import {Param} from "../params/param";
-import {kebobString} from "../common/strings";
-import {HookRegOptions} from "../transition/interface";
-import {Ng1Controller} from "./interface";
+import {extend, map, unnestR, filter} from "../../common/common";
+import {isDefined, isFunction, isString} from "../../common/predicates";
+import {trace} from "../../common/trace";
+import {ActiveUIView} from "../../view/interface";
+import {Ng1ViewConfig} from "../statebuilders/views";
+import {TransitionService} from "../../transition/transitionService";
+import {parse} from "../../common/hof";
+import {ResolveContext} from "../../resolve/resolveContext";
+import {Transition} from "../../transition/transition";
+import {Node} from "../../path/node";
+import {Param} from "../../params/param";
+import {kebobString} from "../../common/strings";
+import {HookRegOptions} from "../../transition/interface";
+import {Ng1Controller} from "../interface";
 
 /** @hidden */
 export type UIViewData = {
diff --git a/src/ng1/statebuilders/onEnterExitRetain.ts b/src/ng1/statebuilders/onEnterExitRetain.ts
@@ -15,9 +15,9 @@ import {services} from "../../common/coreservices";
 export const getStateHookBuilder = (hookName) =>
 function stateHookBuilder(state: State, parentFn): TransitionStateHookFn {
   let hook = state[hookName];
-  if (!hook) return;
-  
-  return function decoratedNg1Hook(trans: Transition, inj: IInjectorService): HookResult {
-    services.$injector.invoke(hook, this, trans.resolves());
+  function decoratedNg1Hook(trans: Transition, inj: IInjectorService): HookResult {
+    return services.$injector.invoke(hook, this, trans.resolves());
   }
+
+  return hook ? decoratedNg1Hook : undefined;
 };
diff --git a/src/ng2.ts b/src/ng2.ts
@@ -10,7 +10,7 @@ import "./justjs";
 export * from "./ng2/interface";
 export * from "./ng2/providers";
 export * from "./ng2/location";
-export * from "./ng2/directives";
-export * from "./ng2/viewsBuilder";
+export * from "./ng2/directives/directives";
+export * from "./ng2/statebuilders/views";
 export * from "./ng2/uiRouterConfig";
 
diff --git a/src/ng2/componentUtil.ts b/src/ng2/componentUtil.ts
diff --git a/src/ng2/directives/directives.ts b/src/ng2/directives/directives.ts
@@ -7,9 +7,9 @@
  *
  * @preferred @module ng2_directives
  */ /** */
-import {UiSref, AnchorUiSref} from "../ng2/uiSref";
-import {UiSrefActive} from "../ng2/uiSrefActive";
-import {UiView} from "../ng2/uiView";
+import {UiSref, AnchorUiSref} from "./uiSref";
+import {UiSrefActive} from "./uiSrefActive";
+import {UiView} from "./uiView";
 import {UiSrefStatus} from "./uiSrefStatus";
 
 export * from "./uiView";
diff --git a/src/ng2/directives/uiSref.ts b/src/ng2/directives/uiSref.ts
@@ -1,11 +1,11 @@
 /** @module ng2_directives */ /** */
-import {UIRouter} from "../router";
+import {UIRouter} from "../../router";
 import {Directive, Inject, Input} from "@angular/core";
 import {Optional} from "@angular/core";
 import {ElementRef} from "@angular/core";
 import {Renderer} from "@angular/core";
 import {UiView, ParentUiViewInject} from "./uiView";
-import {extend} from "../common/common";
+import {extend} from "../../common/common";
 
 /** @hidden */
 @Directive({ selector: 'a[uiSref]' })
diff --git a/src/ng2/directives/uiSrefActive.ts b/src/ng2/directives/uiSrefActive.ts
diff --git a/src/ng2/directives/uiSrefStatus.ts b/src/ng2/directives/uiSrefStatus.ts
@@ -1,17 +1,17 @@
 /** @module ng2_directives */ /** */
 import {Directive, Output, EventEmitter} from "@angular/core";
-import {StateService} from "../state/stateService";
+import {StateService} from "../../state/stateService";
 import {UiSref} from "./uiSref";
-import {Node} from "../path/node";
-import {TransitionService} from "../transition/transitionService";
-import {Transition} from "../transition/transition";
-import {TargetState} from "../state/targetState";
-import {TreeChanges} from "../transition/interface";
-import {State} from "../state/stateObject";
-import {anyTrueR, tail, unnestR} from "../common/common";
-import {UIRouterGlobals} from "../globals";
-import {Param} from "../params/param";
-import {PathFactory} from "../path/pathFactory";
+import {Node} from "../../path/node";
+import {TransitionService} from "../../transition/transitionService";
+import {Transition} from "../../transition/transition";
+import {TargetState} from "../../state/targetState";
+import {TreeChanges} from "../../transition/interface";
+import {State} from "../../state/stateObject";
+import {anyTrueR, tail, unnestR} from "../../common/common";
+import {UIRouterGlobals} from "../../globals";
+import {Param} from "../../params/param";
+import {PathFactory} from "../../path/pathFactory";
 
 /**
  * uiSref status booleans 
diff --git a/src/ng2/directives/uiView.ts b/src/ng2/directives/uiView.ts
@@ -1,20 +1,19 @@
 /** @module ng2_directives */ /** */
 import {
     Component, ComponentResolver, ComponentFactory,
-    ViewContainerRef, ReflectiveInjector
+    ViewContainerRef, ReflectiveInjector, InputMetadata, ComponentMetadata
 } from '@angular/core';
 import {provide} from "@angular/core";
 import {Input} from "@angular/core";
 import {ComponentRef} from "@angular/core";
 import {Type} from "@angular/core";
 
-import {UIRouter} from "../router";
-import {trace} from "../common/trace";
+import {UIRouter} from "../../router";
+import {trace} from "../../common/trace";
 import {Inject} from "@angular/core";
-import {ViewContext, ViewConfig} from "../view/interface";
-import {Ng2ViewDeclaration} from "./interface";
-import {ng2ComponentInputs} from "./componentUtil";
-import {Ng2ViewConfig} from "./viewsBuilder";
+import {ViewContext, ViewConfig} from "../../view/interface";
+import {Ng2ViewDeclaration} from "../interface";
+import {Ng2ViewConfig} from "../statebuilders/views";
 
 /** @hidden */
 let id = 0;
@@ -25,6 +24,34 @@ export interface ParentUiViewInject {
   fqn: string;
 }
 
+
+/** @hidden */
+const ng2ComponentInputs = (ng2CompClass) => {
+  /** Get "@Input('foo') _foo" inputs */
+  let props = Reflect['getMetadata']('propMetadata', ng2CompClass);
+  let _props = Object.keys(props || {})
+  // -> { string, anno[] } tuples
+      .map(key => ({ key, annoArr: props[key] }))
+      // -> to { string, anno } tuples
+      .reduce((acc, tuple) => acc.concat(tuple.annoArr.map(anno => ({ key: tuple.key, anno }))), [])
+      // Only Inputs
+      .filter(tuple => tuple.anno instanceof InputMetadata)
+      // If they have a bindingPropertyName, i.e. "@Input('foo') _foo", then foo, else _foo
+      .map(tuple => ({ resolve: tuple.anno.bindingPropertyName || tuple.key, prop: tuple.key }));
+
+  /** Get "inputs: ['foo']" inputs */
+  let inputs = Reflect['getMetadata']('annotations', ng2CompClass)
+  // Find the ComponentMetadata class annotation
+      .filter(x => x instanceof ComponentMetadata && !!x.inputs)
+      // Get the .inputs string array
+      .map(x => x.inputs)
+      // Flatten
+      .reduce((acc, arr) => acc.concat(arr), [])
+      .map(input => ({ resolve: input, prop: input }));
+
+  return _props.concat(inputs);
+};
+
 /**
  * A UI-Router viewport directive, which is filled in by a view (component) on a state.
  *
diff --git a/src/ng2/providers.ts b/src/ng2/providers.ts
@@ -55,8 +55,8 @@ import {TransitionService} from "../transition/transitionService";
 import {UrlMatcherFactory} from "../url/urlMatcherFactory";
 import {UrlRouter} from "../url/urlRouter";
 import {ViewService} from "../view/view";
-import {UiView} from "./uiView";
-import {ng2ViewsBuilder, Ng2ViewConfig} from "./viewsBuilder";
+import {UiView} from "./directives/uiView";
+import {ng2ViewsBuilder, Ng2ViewConfig} from "./statebuilders/views";
 import {Ng2ViewDeclaration} from "./interface";
 import {UIRouterConfig} from "./uiRouterConfig";
 import {UIRouterGlobals} from "../globals";
diff --git a/src/ng2/statebuilders/views.ts b/src/ng2/statebuilders/views.ts
@@ -1,11 +1,11 @@
 /** @module ng2 */ /** */
-import {State} from "../state/stateObject";
-import {Node} from "../path/node";
-import {pick, forEach} from "../common/common";
-import {ViewConfig} from "../view/interface";
-import {Ng2ViewDeclaration} from "./interface";
-import {services} from "../common/coreservices";
-import {ViewService} from "../view/view";
+import {State} from "../../state/stateObject";
+import {Node} from "../../path/node";
+import {pick, forEach} from "../../common/common";
+import {ViewConfig} from "../../view/interface";
+import {Ng2ViewDeclaration} from "../interface";
+import {services} from "../../common/coreservices";
+import {ViewService} from "../../view/view";
 
 /**
  * This is a [[StateBuilder.builder]] function for angular2 `views`.
diff --git a/src/state/hooks/enterExitHooks.ts b/src/state/hooks/enterExitHooks.ts
@@ -1,5 +1,6 @@
 /** @module state */ /** for typedoc */
 import {Transition} from "../../transition/transition";
+import {HookFn} from "../../transition/interface";
 
 export class EnterExitHooks {
   private transition: Transition;
@@ -15,20 +16,20 @@ export class EnterExitHooks {
   }
 
   registerOnEnterHooks() {
-    this.transition.entering().map(x => x.$$state()).filter(state => !!state.onEnter)
+    this.transition.entering().map(x => x.$$state()).filter(state => !!state['onEnter'])
         .forEach(state =>
-            this.transition.onEnter({entering: state.name}, state.onEnter));
+            this.transition.onEnter({entering: state.name}, state['onEnter']));
   }
 
   registerOnRetainHooks() {
-    this.transition.retained().map(x => x.$$state()).filter(state => !!state.onRetain)
+    this.transition.retained().map(x => x.$$state()).filter(state => !!state['onRetain'])
         .forEach(state =>
-            this.transition.onRetain({retained: state.name}, state.onRetain));
+            this.transition.onRetain({retained: state.name}, state['onRetain']));
   }
 
   registerOnExitHooks() {
-    this.transition.exiting().map(x => x.$$state()).filter(state => !!state.onExit)
+    this.transition.exiting().map(x => x.$$state()).filter(state => !!state['onExit'])
         .forEach(state =>
-            this.transition.onExit({exiting: state.name}, state.onExit));
+            this.transition.onExit({exiting: state.name}, state['onExit']));
   }
 }
diff --git a/src/transition/hookRegistry.ts b/src/transition/hookRegistry.ts
@@ -1,11 +1,11 @@
 /** @module transition */ /** for typedoc */
-import {IInjectable, extend, removeFrom, anyTrueR, allTrueR, tail} from "../common/common";
+import {extend, removeFrom, allTrueR, tail} from "../common/common";
 import {isString, isFunction} from "../common/predicates";
-import {val} from "../common/hof";
 import {Node} from "../path/node";
+import {TransitionStateHookFn, TransitionHookFn} from "./interface";
 
 import {
-    HookRegOptions, HookMatchCriteria, IStateMatch, IEventHook, IHookRegistry, IHookRegistration, TreeChanges,
+    HookRegOptions, HookMatchCriteria, IEventHook, IHookRegistry, IHookRegistration, TreeChanges,
     HookMatchCriterion, IMatchingNodes, HookFn
 } from "./interface";
 import {Glob} from "../common/glob";
diff --git a/src/transition/interface.ts b/src/transition/interface.ts

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"compilerOptions": { "rootDir": ".", "outDir": "../commonjs" },`
`3`	`3`	`"files": [`
`4`	`4`	`"ng1.ts",`
`5`		`- "ng1/stateEvents.ts",`
	`5`	`+ "ng1/legacy/stateEvents.ts",`
`6`	`6`	`"../typings/es6-shim/es6-shim.d.ts" ,`
`7`	`7`	`"../typings/angularjs/angular.d.ts"`
`8`	`8`	`]`