chore(core): Export all symbols into global namespace for typescript importing

christopherthielen · christopherthielen · commit f5fd57860c15 · 2016-03-26T17:58:32.000-05:00
chore(*): Remove /// &lt;ref path='...d.ts'&gt;
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -170,7 +170,7 @@ module.exports = function (grunt) {
 
   grunt.registerTask('docs', 'Generate documentation to _doc', function() { 
     promising(this, 
-      system('./node_modules/typedoc/bin/typedoc --experimentalDecorators --readme ./README.md --name "UI-Router" --theme ./typedoctheme --mode modules --module commonjs --target es5 --out _doc  src')
+      system('./node_modules/typedoc/bin/typedoc --experimentalDecorators --readme ./README.md --name "UI-Router" --theme ./typedoctheme --mode modules --module commonjs --target es5 --out _doc  src typings/es6-shim/es6-shim.d.ts typings/angularjs/angular.d.ts')
     );
   });
 
diff --git a/src/core.ts b/src/core.ts
@@ -1,15 +1,12 @@
-/// <reference path='../typings/angularjs/angular.d.ts' />
-/// <reference path='../typings/es6-shim/es6-shim.d.ts' />
 /** @module core */ /** */
 
-import * as common from "./common/module";
-import * as params from "./params/module";
-import * as path from "./path/module";
-import * as resolve from "./resolve/module";
-import * as state from "./state/module";
-import * as transition from "./transition/module";
-import * as url from "./url/module";
-import * as view from "./view/module";
+export * from "./common/module";
+export * from "./params/module";
+export * from "./path/module";
+export * from "./resolve/module";
+export * from "./state/module";
+export * from "./transition/module";
+export * from "./url/module";
+export * from "./view/module";
 
-export { common, params, path, resolve, state, transition, url, view };
 export { UIRouter } from "./router";
diff --git a/src/ng1.ts b/src/ng1.ts
@@ -1,5 +1,3 @@
-/// <reference path='../typings/angularjs/angular.d.ts' />
-/// <reference path='../typings/es6-shim/es6-shim.d.ts' />
 /**
  * Main entry point for angular 1.x build
  * @module ng1
diff --git a/src/ng1/services.ts b/src/ng1/services.ts
@@ -9,9 +9,6 @@
  * @preferred
  */
 
-/// <reference path='../../typings/angularjs/angular.d.ts' />
-/// <reference path='../../typings/es6-shim/es6-shim.d.ts' />
-
 /** for typedoc */
 import {UIRouter} from "../router";
 import {services} from "../common/coreservices";
diff --git a/src/ng1/stateDirectives.ts b/src/ng1/stateDirectives.ts
@@ -1,5 +1,4 @@
 /** @module state */ /** for typedoc */
-/// <reference path='../../typings/angularjs/angular.d.ts' />
 import {extend, forEach, toJson} from "../common/common";
 import {isString, isObject} from "../common/predicates";
 import {UIViewData} from "./viewDirective";
diff --git a/src/ng1/stateEvents.ts b/src/ng1/stateEvents.ts
@@ -19,8 +19,7 @@
 
 /** for typedoc */
 import {IServiceProviderFactory} from "angular";
-import {StateService, StateProvider} from "../state/interface";
-import {TargetState} from "../state/module";
+import {TargetState, StateService, StateProvider} from "../state/module";
 import {Transition} from "../transition/transition";
 
 /**
@@ -211,7 +210,7 @@ var $stateNotFound;
 
     if (e.defaultPrevented) {
       return false;
-    } else if (e.retry || $state.get(redirect.to)) {
+    } else if (e.retry || !!$state.get(redirect.to)) {
       return e.retry && isFunction(e.retry.then) ? e.retry.then(redirectFn) : redirectFn();
     }
   }
diff --git a/src/ng2.ts b/src/ng2.ts
@@ -1,4 +1,3 @@
-/// <reference path='../typings/es6-shim/es6-shim.d.ts' />
 /**
  * Main entry point for angular 2.x build
  * @module ng2
diff --git a/src/params/module.ts b/src/params/module.ts
@@ -6,6 +6,7 @@
  * @preferred doc
  */
 /** for typedoc */
+export * from "./interface";
 export * from "./param";
 export * from "./paramTypes";
 export * from "./stateParams";
diff --git a/src/path/node.ts b/src/path/node.ts
@@ -6,8 +6,7 @@ import {RawParams} from "../params/interface";
 import {Param} from "../params/module";
 import {Resolvable, ResolveContext, ResolveInjector} from "../resolve/module";
 import {ViewConfig} from "../view/interface";
-
-export type Resolvables = { [key: string]: Resolvable };
+import {Resolvables} from "../resolve/interface";
 
 export class Node {
   public paramSchema: Param[];
diff --git a/src/resolve/module.ts b/src/resolve/module.ts
@@ -1,4 +1,5 @@
 /** @module path */ /** for typedoc */
+export * from "./interface";
 export * from "./resolvable";
 export * from "./resolveContext";
 export * from "./resolveInjector";
diff --git a/src/state/hooks/transitionManager.ts b/src/state/hooks/transitionManager.ts
@@ -8,7 +8,8 @@ import {TreeChanges} from "../../transition/interface";
 import {Transition} from "../../transition/transition";
 import {TransitionRejection, RejectType} from "../../transition/rejectFactory";
 
-import {StateService, StateDeclaration} from "../interface";
+import {StateDeclaration} from "../interface";
+import {StateService} from "../stateService";
 import {TargetState} from "../targetState";
 import {ViewHooks} from "./viewHooks";
 import {EnterExitHooks} from "./enterExitHooks";
@@ -115,9 +116,10 @@ export class TransitionManager {
   }
 
   updateStateParams() {
-    let {transition, $urlRouter, $state, $stateParams} = this;
+    let transition = this.transition;
+    let {$urlRouter, $state, $stateParams} = this;
     let options = transition.options();
-    $state.params = transition.params();
+    copy(transition.params(), $state.params);
     copy($state.params, $stateParams);
 
     if (options.location && $state.$current.navigable) {
diff --git a/src/state/interface.ts b/src/state/interface.ts
@@ -318,43 +318,10 @@ export interface StateDeclaration {
   reloadOnSearch?: boolean;
 }
 
-export interface StateParams {
-  $digest: () => void;
-  $inherit: (newParams, $current: State, $to: State) => StateParams;
-  $set: (params, url) => boolean;
-  $sync: () => StateParams;
-  $off: () => StateParams;
-  $raw: () => any;
-  $localize: () => StateParams;
-  $observe: (key, fn) => () => void;
-}
-
 export interface HrefOptions {
   relative?:  StateOrName;
   lossy?:     boolean;
   inherit?:   boolean;
   absolute?:  boolean;
 }
 
-export interface StateProvider {
-  state(state: StateDeclaration): StateProvider;
-  state(name: string, state: StateDeclaration): StateProvider;
-  onInvalid(callback: Function): void;
-  decorator(name: string, func: Function);
-}
-
-export interface StateService {
-  params:       any; // TODO: StateParams
-  current:      StateDeclaration;
-  $current:     State;
-  transition:   Transition;
-  reload        (stateOrName: StateOrName): Promise<State>;
-  target        (identifier: StateOrName, params: ParamsOrArray, options: TransitionOptions): TargetState;
-  go            (to: StateOrName, params: RawParams, options: TransitionOptions): Promise<State>;
-  transitionTo  (to: StateOrName, toParams: ParamsOrArray, options: TransitionOptions): Promise<State>;
-  is            (stateOrName: StateOrName, params?: RawParams, options?: TransitionOptions): boolean;
-  includes      (stateOrName: StateOrName, params?: RawParams, options?: TransitionOptions): boolean;
-  href          (stateOrName: StateOrName, params?: RawParams, options?: HrefOptions): string;
-  get           (stateOrName: StateOrName, base?: StateOrName): (StateDeclaration|StateDeclaration[]);
-}
-
diff --git a/src/state/module.ts b/src/state/module.ts
@@ -1,4 +1,5 @@
 /** @module state */ /** for typedoc */
+export * from "./interface";
 export * from "./state";
 export * from "./stateBuilder";
 export * from "./hooks/transitionManager";
diff --git a/src/state/stateQueueManager.ts b/src/state/stateQueueManager.ts
@@ -4,7 +4,7 @@ import {isString} from "../common/predicates";
 import {StateDeclaration} from "./interface";
 import {State} from "./module";
 import {StateBuilder} from "./stateBuilder";
-import {StateService} from "./interface";
+import {StateService} from "./stateService";
 
 export class StateQueueManager {
   queue: State[];
diff --git a/src/state/stateService.ts b/src/state/stateService.ts
@@ -474,6 +474,7 @@ export class StateService {
    * @returns {Object|Array} State configuration object or array of all objects.
    */
   get(): StateDeclaration[];
+  get(stateOrName: StateOrName): StateDeclaration;
   get(stateOrName: StateOrName, base: StateOrName): StateDeclaration;
   get(stateOrName?: StateOrName, base?: StateOrName): any {
     if (arguments.length === 0) return this.stateRegistry.get();
diff --git a/src/transition/module.ts b/src/transition/module.ts
@@ -7,6 +7,7 @@
  * @preferred
  */
 /** for typedoc */
+export * from "./interface";
 export * from "./hookBuilder";
 export * from "./hookRegistry";
 export * from "./rejectFactory";
diff --git a/src/view/module.ts b/src/view/module.ts
@@ -1,3 +1,4 @@
 /** @module view */ /** for typedoc */
+export * from "./interface";
 export * from "./templateFactory";
 export * from "./view";
diff --git a/src/view/view.ts b/src/view/view.ts
@@ -44,7 +44,7 @@ export class ViewService {
    */
   deactivateViewConfig(viewConfig: ViewConfig) {
     trace.traceViewServiceEvent("<- Removing", viewConfig);
-    removeFrom(this.viewConfigs, viewConfig)
+    removeFrom(this.viewConfigs, viewConfig);
   };
 
   activateViewConfig(viewConfig: ViewConfig) {
diff --git a/test/commonSpec.js b/test/commonSpec.js
@@ -1,15 +1,14 @@
 var module = angular.mock.module;
 var uiRouter = require("angular-ui-router");
-var Glob = uiRouter.state.Glob;
-var common = uiRouter.common,
-  defaults = common.defaults,
-  filter = common.filter,
-  is = common.is,
-  eq = common.eq,
-  not = common.not,
-  pattern = common.pattern,
-  val = common.val,
-  isInjectable = common.isInjectable;
+var Glob = uiRouter.Glob,
+  defaults = uiRouter.defaults,
+  filter = uiRouter.filter,
+  is = uiRouter.is,
+  eq = uiRouter.eq,
+  not = uiRouter.not,
+  pattern = uiRouter.pattern,
+  val = uiRouter.val,
+  isInjectable = uiRouter.isInjectable;
 
 describe('common', function() {
   describe('filter', function() {
diff --git a/test/globSpec.js b/test/globSpec.js
@@ -1,5 +1,5 @@
 var uiRouter = require("angular-ui-router");
-var Glob = uiRouter.common.Glob;
+var Glob = uiRouter.Glob;
 
 describe('Glob', function() {
   it('should match glob strings', function() {
diff --git a/test/stateSpec.js b/test/stateSpec.js
@@ -1,15 +1,13 @@
 var module = angular.mock.module;
 var uiRouter = require("angular-ui-router");
-var common = uiRouter.common;
-var RejectType = uiRouter.transition.RejectType;
-var extend = common.extend;
-var forEach = common.forEach;
-var services = common.services;
-var state = uiRouter.state;
-var StateMatcher = state.StateMatcher;
-var StateBuilder = uiRouter.state.StateBuilder;
-var TargetState = state.TargetState;
-var UrlMatcher = uiRouter.url.UrlMatcher;
+var RejectType = uiRouter.RejectType;
+var extend = uiRouter.extend;
+var forEach = uiRouter.forEach;
+var services = uiRouter.services;
+var StateMatcher = uiRouter.StateMatcher;
+var StateBuilder = uiRouter.StateBuilder;
+var TargetState = uiRouter.TargetState;
+var UrlMatcher = uiRouter.UrlMatcher;
 
 describe('state helpers', function() {
 
diff --git a/test/urlMatcherFactorySpec.js b/test/urlMatcherFactorySpec.js
@@ -1,9 +1,10 @@
-var module    = angular.mock.module;
-var uiRouter  = require("angular-ui-router");
-var Param = uiRouter.params.Param;
-var UrlMatcher = uiRouter.url.UrlMatcher;
-var common = uiRouter.common;
-var prop = common.prop;
+var module      = angular.mock.module;
+var uiRouter    = require("angular-ui-router");
+var Param       = uiRouter.Param;
+var UrlMatcher  = uiRouter.UrlMatcher;
+var prop        = uiRouter.prop;
+var map         = uiRouter.map;
+var find        = uiRouter.find;
 
 beforeEach(function() {
   var app = angular.module('ui.router.router.test', []);
@@ -425,8 +426,8 @@ describe("UrlMatcher", function () {
 
       // Pass again through Param.value() for normalization (like transitionTo)
       var paramDefs = m.parameters();
-      var values = common.map(parsed, function(val, key) {
-        return common.find(paramDefs, function(def) { return def.id === key }).value(val);
+      var values = map(parsed, function(val, key) {
+        return find(paramDefs, function(def) { return def.id === key }).value(val);
       });
       expect(values).toEqualData(expected);
     }));
diff --git a/test/urlRouterSpec.js b/test/urlRouterSpec.js
@@ -1,7 +1,7 @@
 var module = angular.mock.module;
 var uiRouter = require("angular-ui-router");
-var UrlMatcher = uiRouter.url.UrlMatcher;
-var services = uiRouter.common.services;
+var UrlMatcher = uiRouter.UrlMatcher;
+var services = uiRouter.services;
 
 describe("UrlRouter", function () {
 
diff --git a/tsconfig-ng2.json b/tsconfig-ng2.json
@@ -14,6 +14,7 @@
   },
   "files": [
     "src/ng2.ts",
-    "src/justjs.ts"
+    "src/justjs.ts",
+    "typings/es6-shim/es6-shim.d.ts"
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-/// <reference path='../typings/angularjs/angular.d.ts' />`
`2`		`-/// <reference path='../typings/es6-shim/es6-shim.d.ts' />`
`3`	`1`	`/**`
`4`	`2`	`* Main entry point for angular 1.x build`
`5`	`3`	`* @module ng1`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`/** @module state / /* for typedoc */`
`2`		`-/// <reference path='../../typings/angularjs/angular.d.ts' />`
`3`	`2`	`import {extend, forEach, toJson} from "../common/common";`
`4`	`3`	`import {isString, isObject} from "../common/predicates";`
`5`	`4`	`import {UIViewData} from "./viewDirective";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/// <reference path='../typings/es6-shim/es6-shim.d.ts' />`
`2`	`1`	`/**`
`3`	`2`	`* Main entry point for angular 2.x build`
`4`	`3`	`* @module ng2`