@angular-wave/angular.ts 0.0.28 → 0.0.30

package/types/router/core/transition/transition.d.ts

@@ -15,8 +15,8 @@ import { StateObject } from "../state/stateObject";
 import { TargetState } from "../state/targetState";
 import { Resolvable } from "../resolve/resolvable";
 import { ViewConfig } from "../view/interface";
-import { UIRouter } from "../router";
-import { UIInjector } from "../interface";
+import { Router } from "../router";
+import { NGInjector } from "../interface";
 import { ResolvableLiteral } from "../resolve/interface";
 import { Rejection } from "./rejectFactory";
 /**
@@ -37,11 +37,11 @@ export declare class Transition implements IHookRegistry {
    */
   $id: number;
   /**
-   * A reference to the [[UIRouter]] instance
+   * A reference to the [[Router]] instance
    *
    * This reference can be used to access the router services, such as the [[StateService]]
    */
-  router: UIRouter;
+  router: Router;
   /** @internal */
   private _deferred;
   /**
@@ -139,10 +139,10 @@ export declare class Transition implements IHookRegistry {
    * @param fromPath The path of [[PathNode]]s from which the transition is leaving.  The last node in the `fromPath`
    *        encapsulates the "from state".
    * @param targetState The target state and parameters being transitioned to (also, the transition options)
-   * @param router The [[UIRouter]] instance
+   * @param router The [[Router]] instance
    * @internal
    */
-  constructor(fromPath: PathNode[], targetState: TargetState, router: UIRouter);
+  constructor(fromPath: PathNode[], targetState: TargetState, router: Router);
   private applyViewConfigs;
   /**
    * @internal
@@ -283,12 +283,12 @@ export declare class Transition implements IHookRegistry {
   };
   paramsChanged<T>(): T;
   /**
-   * Creates a [[UIInjector]] Dependency Injector
+   * Creates a [[NGInjector]] Dependency Injector
    *
    * Returns a Dependency Injector for the Transition's target state (to state).
    * The injector provides resolve values which the target state has access to.
    *
-   * The `UIInjector` can also provide values from the native root/global injector (ng1/ng2).
+   * The `NGInjector` can also provide values from the native root/global injector (ng1/ng2).
    *
    * #### Example:
    * ```js
@@ -300,7 +300,7 @@ export declare class Transition implements IHookRegistry {
    * ```
    *
    * In some cases (such as `onBefore`), you may need access to some resolve data but it has not yet been fetched.
-   * You can use [[UIInjector.getAsync]] to get a promise for the data.
+   * You can use [[NGInjector.getAsync]] to get a promise for the data.
    * #### Example:
    * ```js
    * .onBefore({}, trans => {
@@ -335,9 +335,9 @@ export declare class Transition implements IHookRegistry {
    * @param state Limits the resolves provided to only the resolves the provided state has access to.
    * @param pathName Default: `'to'`: Chooses the path for which to create the injector. Use this to access resolves for `exiting` states.
    *
-   * @returns a [[UIInjector]]
+   * @returns a [[NGInjector]]
    */
-  injector(state?: StateOrName, pathName?: string): UIInjector;
+  injector(state?: StateOrName, pathName?: string): NGInjector;
   /**
    * Gets all available resolve tokens (keys)
    *
@@ -376,7 +376,7 @@ export declare class Transition implements IHookRegistry {
    *
    * Allows a transition hook to dynamically add a Resolvable to this Transition.
    *
-   * Use the [[Transition.injector]] to retrieve the resolved data in subsequent hooks ([[UIInjector.get]]).
+   * Use the [[Transition.injector]] to retrieve the resolved data in subsequent hooks ([[NGInjector.get]]).
    *
    * If a `state` argument is provided, the Resolvable is processed when that state is being entered.
    * If no `state` is provided then the root state is used.

package/types/router/core/transition/transitionService.d.ts

@@ -17,7 +17,7 @@ import { RegisteredHook } from "./hookRegistry";
 import { TargetState } from "../state/targetState";
 import { PathNode } from "../path/pathNode";
 import { ViewService } from "../view/view";
-import { UIRouter } from "../router";
+import { Router } from "../router";
 import { TransitionEventType } from "./transitionEventType";
 import { GetResultHandler, GetErrorHandler } from "./transitionHook";
 /**
@@ -77,9 +77,9 @@ export interface TransitionServicePluginAPI {
  * - It allows the default transition error handler to be set.
  * - It also has a factory function for creating new [[Transition]] objects, (used internally by the [[StateService]]).
  *
- * At bootstrap, [[UIRouter]] creates a single instance (singleton) of this class.
+ * At bootstrap, [[Router]] creates a single instance (singleton) of this class.
  *
- * This API is located at `router.transitionService` ([[UIRouter.transitionService]])
+ * This API is located at `router.transitionService` ([[Router.transitionService]])
  */
 export declare class TransitionService implements IHookRegistry {
   /** @internal */
@@ -119,7 +119,7 @@ export declare class TransitionService implements IHookRegistry {
     lazyLoad: Function;
   };
   /** @internal */
-  constructor(_router: UIRouter);
+  constructor(_router: Router);
   /**
    * Registers a [[TransitionHookFn]], called *while a transition is being constructed*.
    *
@@ -200,7 +200,7 @@ export declare class TransitionService implements IHookRegistry {
    * dispose
    * @internal
    */
-  dispose(router: UIRouter): void;
+  dispose(router: Router): void;
   /**
    * Creates a new [[Transition]] object
    *

package/types/router/core/url/interface.d.ts

@@ -9,7 +9,7 @@
  * @preferred
  */
 import { LocationConfig } from "../common";
-import { UIRouter } from "../router";
+import { Router } from "../router";
 import {
   StateDeclaration,
   StateObject,
@@ -83,7 +83,7 @@ export interface MatchResult {
  * @return the matched value, either truthy or falsey
  */
 export interface UrlRuleMatchFn {
-  (url?: UrlParts, router?: UIRouter): any;
+  (url?: UrlParts, router?: Router): any;
 }
 /**
  * Handler invoked when a rule is matched
@@ -98,7 +98,7 @@ export interface UrlRuleHandlerFn {
   (
     matchValue?: any,
     url?: UrlParts,
-    router?: UIRouter,
+    router?: Router,
   ): string | TargetState | TargetStateDef | void;
 }
 /** @internal */

package/types/router/core/url/urlConfig.d.ts

@@ -1,4 +1,4 @@
-import { UIRouter } from "../router";
+import { Router } from "../router";
 import { ParamTypeDefinition, ParamTypes } from "../params";
 /**
  * An API to customize the URL behavior and retrieve URL configuration
@@ -11,7 +11,7 @@ import { ParamTypeDefinition, ParamTypes } from "../params";
  * This information can be used to build absolute URLs, such as
  * `https://example.com:443/basepath/state/substate?param1=a#hashvalue`;
  *
- * This API is found at `router.urlService.config` (see: [[UIRouter.urlService]], [[URLService.config]])
+ * This API is found at `router.urlService.config` (see: [[Router.urlService]], [[URLService.config]])
  */
 export declare class UrlConfig {
   private router;
@@ -20,7 +20,7 @@ export declare class UrlConfig {
   /** @internal */ _isCaseInsensitive: boolean;
   /** @internal */ _isStrictMode: boolean;
   /** @internal */ _defaultSquashPolicy: boolean | string;
-  /** @internal */ constructor(/** @internal */ router: UIRouter);
+  /** @internal */ constructor(/** @internal */ router: Router);
   /** @internal */ dispose: () => void;
   /**
    * Gets the base Href, e.g., `http://localhost/approot/`

package/types/router/core/url/urlMatcherFactory.d.ts

@@ -2,13 +2,13 @@ import { UrlMatcher } from "./urlMatcher";
 import { Param, ParamType, ParamTypeDefinition } from "../params";
 import { UrlMatcherCompileConfig } from "./interface";
 import { StateDeclaration } from "../state";
-import { UIRouter } from "../router";
+import { Router } from "../router";
 export declare class ParamFactory {
   private router;
   fromConfig(id: string, type: ParamType, state: StateDeclaration): Param;
   fromPath(id: string, type: ParamType, state: StateDeclaration): Param;
   fromSearch(id: string, type: ParamType, state: StateDeclaration): Param;
-  constructor(router: UIRouter);
+  constructor(router: Router);
 }
 /**
  * Factory for [[UrlMatcher]] instances.
@@ -22,7 +22,7 @@ export declare class UrlMatcherFactory {
   paramFactory: ParamFactory;
   UrlMatcher: typeof UrlMatcher;
   Param: typeof Param;
-  constructor(/** @internal */ router: UIRouter);
+  constructor(/** @internal */ router: Router);
   /**
    * Creates a [[UrlMatcher]] for the specified pattern.
    *

package/types/router/core/url/urlRouter.d.ts

@@ -1,6 +1,6 @@
 import { UrlMatcher } from "./urlMatcher";
 import { RawParams } from "../params";
-import { UIRouter } from "../router";
+import { Router } from "../router";
 import { UrlRuleFactory } from "./urlRule";
 import { MatchResult, UrlParts, UrlRule, UrlRuleHandlerFn } from "./interface";
 import { TargetState, TargetStateDef } from "../state";
@@ -18,7 +18,7 @@ export declare class UrlRouter {
   urlRuleFactory: UrlRuleFactory;
   /** @internal */ private location;
   /** @internal */
-  constructor(/** @internal */ router: UIRouter);
+  constructor(/** @internal */ router: Router);
   /** Internal API. */
   update(read?: boolean): void;
   /**

package/types/router/core/url/urlRule.d.ts

@@ -1,6 +1,6 @@
 import { StateDeclaration } from "../state";
 import { UrlMatcher } from "./urlMatcher";
-import { UIRouter } from "../router";
+import { Router } from "../router";
 import { StateObject } from "../state/stateObject";
 import {
   UrlRule,
@@ -22,9 +22,9 @@ import {
  * - [[StateObject]]
  */
 export declare class UrlRuleFactory {
-  router: UIRouter;
+  router: Router;
   static isUrlRule: (obj: any) => boolean;
-  constructor(router: UIRouter);
+  constructor(router: Router);
   compile(str: string): UrlMatcher;
   create(
     what:
@@ -47,7 +47,7 @@ export declare class UrlRuleFactory {
    *
    * - matched parameter values ([[RawParams]] from [[UrlMatcher.exec]])
    * - url: the current Url ([[UrlParts]])
-   * - router: the router object ([[UIRouter]])
+   * - router: the router object ([[Router]])
    *
    * #### Example:
    * ```js
@@ -89,7 +89,7 @@ export declare class UrlRuleFactory {
    */
   fromState(
     stateOrDecl: StateObject | StateDeclaration,
-    router: UIRouter,
+    router: Router,
   ): StateRule;
   /**
    * A UrlRule which matches based on a regular expression
@@ -102,7 +102,7 @@ export declare class UrlRuleFactory {
    *
    * - regexp match array (from `regexp`)
    * - url: the current Url ([[UrlParts]])
-   * - router: the router object ([[UIRouter]])
+   * - router: the router object ([[Router]])
    *
    * #### Example:
    * ```js

package/types/router/core/url/urlRules.d.ts

@@ -1,4 +1,4 @@
-import { UIRouter } from "../router";
+import { Router } from "../router";
 import { UrlRule, UrlRuleHandlerFn } from "./interface";
 import { TargetState, TargetStateDef } from "../state";
 import { UrlMatcher } from "./urlMatcher";
@@ -11,7 +11,7 @@ import { UrlRuleFactory } from "./urlRule";
  *
  * The most commonly used methods are [[otherwise]] and [[when]].
  *
- * This API is found at `router.urlService.rules` (see: [[UIRouter.urlService]], [[URLService.rules]])
+ * This API is found at `router.urlService.rules` (see: [[Router.urlService]], [[URLService.rules]])
  */
 export declare class UrlRules {
   private router;
@@ -23,9 +23,9 @@ export declare class UrlRules {
   /** @internal */ private _rules;
   /** @internal */ private _id;
   /** @internal */
-  constructor(/** @internal */ router: UIRouter);
+  constructor(/** @internal */ router: Router);
   /** @internal */
-  dispose(router?: UIRouter): void;
+  dispose(router?: Router): void;
   /**
    * Defines the initial state, path, or behavior to use when the app starts.
    *
@@ -86,7 +86,7 @@ export declare class UrlRules {
    * .otherwise({ state: 'home', params: { dashboard: 'default' } });
    * ```
    *
-   * - If `handler` is a function, the function receives the current url ([[UrlParts]]) and the [[UIRouter]] object.
+   * - If `handler` is a function, the function receives the current url ([[UrlParts]]) and the [[Router]] object.
    *   The function can perform actions, and/or return a value.
    *
    * #### Example:
@@ -220,7 +220,7 @@ export declare class UrlRules {
    *
    * ---
    *
-   * When the handler is a function, it receives the matched value, the current URL, and the `UIRouter` object (See [[UrlRuleHandlerFn]]).
+   * When the handler is a function, it receives the matched value, the current URL, and the `Router` object (See [[UrlRuleHandlerFn]]).
    * The "matched value" differs based on the `matcher`.
    * For [[UrlMatcher]]s, it will be the matched state params.
    * For `RegExp`, it will be the match array from `regexp.exec()`.

package/types/router/core/url/urlService.d.ts

@@ -1,4 +1,4 @@
-import { UIRouter } from "../router";
+import { Router } from "../router";
 import { LocationServices } from "../common";
 import { MatchResult, UrlParts, UrlSyncApi } from "./interface";
 import { UrlRules } from "./urlRules";
@@ -23,7 +23,7 @@ export declare class UrlService implements LocationServices, UrlSyncApi {
    */
   config: UrlConfig;
   /** @internal */
-  constructor(/** @internal */ router: UIRouter);
+  constructor(/** @internal */ router: Router);
 
   /**
    * Gets the current URL parts
@@ -56,9 +56,9 @@ export declare class UrlService implements LocationServices, UrlSyncApi {
    * Starts or stops listening for URL changes
    *
    * Call this sometime after calling [[deferIntercept]] to start monitoring the url.
-   * This causes UI-Router to start listening for changes to the URL, if it wasn't already listening.
+   * This causes Router to start listening for changes to the URL, if it wasn't already listening.
    *
-   * If called with `false`, UI-Router will stop listening (call listen(true) to start listening again).
+   * If called with `false`, Router will stop listening (call listen(true) to start listening again).
    *
    * #### Example:
    * ```js
@@ -78,15 +78,15 @@ export declare class UrlService implements LocationServices, UrlSyncApi {
   /**
    * Disables monitoring of the URL.
    *
-   * Call this method before UI-Router has bootstrapped.
-   * It will stop UI-Router from performing the initial url sync.
+   * Call this method before Router has bootstrapped.
+   * It will stop Router from performing the initial url sync.
    *
    * This can be useful to perform some asynchronous initialization before the router starts.
-   * Once the initialization is complete, call [[listen]] to tell UI-Router to start watching and synchronizing the URL.
+   * Once the initialization is complete, call [[listen]] to tell Router to start watching and synchronizing the URL.
    *
    * #### Example:
    * ```js
-   * // Prevent UI-Router from automatically intercepting URL changes when it starts;
+   * // Prevent Router from automatically intercepting URL changes when it starts;
    * urlService.deferIntercept();
    *
    * fetch('/states.json').then(resp => resp.json()).then(data => {

package/types/router/core/view/interface.d.ts

@@ -5,7 +5,7 @@ export interface ViewContext {
   name: string;
   parent: ViewContext;
 }
-export interface ActiveUIView {
+export interface ActiveNGView {
   /** type of framework, e.g., "ng1" or "ng2" */
   $type: string;
   /** An auto-incremented id */
@@ -31,8 +31,8 @@ export interface ActiveUIView {
  * with the `ViewConfig`.  The `ui-view` then loads itself using the information found in the `ViewConfig`.
  *
  * A `ViewConfig` if matched with a `ui-view` by finding all `ui-view`s which were created in the
- * context named by the `uiViewContextAnchor`, and finding the `ui-view` or child `ui-view` that matches
- * the `uiViewName` address.
+ * context named by the `ngViewContextAnchor`, and finding the `ui-view` or child `ui-view` that matches
+ * the `ngViewName` address.
  */
 export interface ViewConfig {
   $id: number;

package/types/router/core/view/view.d.ts

@@ -1,8 +1,8 @@
 import { TypedMap } from "../common/common";
 import { PathNode } from "../path/pathNode";
-import { ActiveUIView, ViewContext, ViewConfig } from "./interface";
+import { ActiveNGView, ViewContext, ViewConfig } from "./interface";
 import { _ViewDeclaration } from "../state/interface";
-import { UIRouter } from "../router";
+import { Router } from "../router";
 export declare type ViewConfigFactory = (
   path: PathNode[],
   decl: _ViewDeclaration,
@@ -10,14 +10,14 @@ export declare type ViewConfigFactory = (
 export interface ViewServicePluginAPI {
   _rootViewContext(context?: ViewContext): ViewContext;
   _viewConfigFactory(viewType: string, factory: ViewConfigFactory): any;
-  /** @param id router.$id + "." + uiView.id */
-  _registeredUIView(id: string): ActiveUIView;
-  _registeredUIViews(): ActiveUIView[];
+  /** @param id router.$id + "." + ngView.id */
+  _registeredNGView(id: string): ActiveNGView;
+  _registeredNGViews(): ActiveNGView[];
   _activeViewConfigs(): ViewConfig[];
   _onSync(listener: ViewSyncListener): Function;
 }
 export interface ViewTuple {
-  uiView: ActiveUIView;
+  ngView: ActiveNGView;
   viewConfig: ViewConfig;
 }
 export interface ViewSyncListener {
@@ -33,15 +33,15 @@ export interface ViewSyncListener {
  *   The views from exited states are deactivated via [[deactivateViewConfig]].
  *   (See: the [[registerActivateViews]] Transition Hook)
  *
- * - As `ui-view` components pop in and out of existence, they register themselves using [[registerUIView]].
+ * - As `ui-view` components pop in and out of existence, they register themselves using [[registerNGView]].
  *
- * - When the [[sync]] function is called, the registered `ui-view`(s) ([[ActiveUIView]])
+ * - When the [[sync]] function is called, the registered `ui-view`(s) ([[ActiveNGView]])
  * are configured with the matching [[ViewConfig]](s)
  *
  */
 export declare class ViewService {
   private router;
-  /** @internal */ private _uiViews;
+  /** @internal */ private _ngViews;
   /** @internal */ private _viewConfigs;
   /** @internal */ private _rootContext;
   /** @internal */ private _viewConfigFactories;
@@ -81,7 +81,7 @@ export declare class ViewService {
    *   </ui-view>
    * </ui-view>
    *
-   * uiViews: [
+   * ngViews: [
    *  { fqn: "$default",                  creationContext: { name: "" } },
    *  { fqn: "$default.foo",              creationContext: { name: "A" } },
    *  { fqn: "$default.foo.$default",     creationContext: { name: "A.B" } }
@@ -90,10 +90,10 @@ export declare class ViewService {
    *
    * These four view configs all match the ui-view with the fqn: "$default.foo.$default.bar":
    *
-   * - ViewConfig1: { uiViewName: "bar",                       uiViewContextAnchor: "A.B.C" }
-   * - ViewConfig2: { uiViewName: "$default.bar",              uiViewContextAnchor: "A.B" }
-   * - ViewConfig3: { uiViewName: "foo.$default.bar",          uiViewContextAnchor: "A" }
-   * - ViewConfig4: { uiViewName: "$default.foo.$default.bar", uiViewContextAnchor: "" }
+   * - ViewConfig1: { ngViewName: "bar",                       ngViewContextAnchor: "A.B.C" }
+   * - ViewConfig2: { ngViewName: "$default.bar",              ngViewContextAnchor: "A.B" }
+   * - ViewConfig3: { ngViewName: "foo.$default.bar",          ngViewContextAnchor: "A" }
+   * - ViewConfig4: { ngViewName: "$default.foo.$default.bar", ngViewContextAnchor: "" }
    *
    * Using ViewConfig3 as an example, it matches the ui-view with fqn "$default.foo.$default.bar" because:
    * - The ViewConfig's segmented target name is: [ "foo", "$default", "bar" ]
@@ -106,29 +106,29 @@ export declare class ViewService {
    * @internal
    */
   static matches: (
-    uiViewsByFqn: TypedMap<ActiveUIView>,
-    uiView: ActiveUIView,
+    ngViewsByFqn: TypedMap<ActiveNGView>,
+    ngView: ActiveNGView,
   ) => (viewConfig: ViewConfig) => boolean;
   /**
    * Normalizes a view's name from a state.views configuration block.
    *
    * This should be used by a framework implementation to calculate the values for
-   * [[_ViewDeclaration.$uiViewName]] and [[_ViewDeclaration.$uiViewContextAnchor]].
+   * [[_ViewDeclaration.$ngViewName]] and [[_ViewDeclaration.$ngViewContextAnchor]].
    *
    * @param context the context object (state declaration) that the view belongs to
    * @param rawViewName the name of the view, as declared in the [[StateDeclaration.views]]
    *
-   * @returns the normalized uiViewName and uiViewContextAnchor that the view targets
+   * @returns the normalized ngViewName and ngViewContextAnchor that the view targets
    */
-  static normalizeUIViewTarget(
+  static normalizeNGViewTarget(
     context: ViewContext,
     rawViewName?: string,
   ): {
-    uiViewName: string;
-    uiViewContextAnchor: string;
+    ngViewName: string;
+    ngViewContextAnchor: string;
   };
   /** @internal */
-  constructor(/** @internal */ router: UIRouter);
+  constructor(/** @internal */ router: Router);
   /** @internal */
   private _rootViewContext;
   /** @internal */
@@ -154,13 +154,13 @@ export declare class ViewService {
    * Note: the `ui-view` component uses the `ViewConfig` to determine what view should be loaded inside the `ui-view`,
    * and what the view's state context is.
    *
-   * Note: There is no corresponding `deregisterUIView`.
-   *       A `ui-view` should hang on to the return value of `registerUIView` and invoke it to deregister itself.
+   * Note: There is no corresponding `deregisterNGView`.
+   *       A `ui-view` should hang on to the return value of `registerNGView` and invoke it to deregister itself.
    *
-   * @param uiView The metadata for a UIView
+   * @param ngView The metadata for a NGView
    * @return a de-registration function used when the view is destroyed.
    */
-  registerUIView(uiView: ActiveUIView): () => void;
+  registerNGView(ngView: ActiveNGView): () => void;
   /**
    * Returns the list of views currently available on the page, by fully-qualified name.
    *

package/types/router/directives/viewDirective.d.ts

@@ -1,15 +1,15 @@
 /** @publicapi @module directives */ /** */
 import { IDirective } from "../..";
-import { ActiveUIView } from "../core";
+import { ActiveNGView } from "../core";
 import { Ng1ViewConfig } from "../statebuilders/views";
 
 /** @hidden */
-export declare type UIViewData = {
+export declare type NGViewData = {
   $cfg: Ng1ViewConfig;
-  $uiView: ActiveUIView;
+  $ngView: ActiveNGView;
 };
 /** @hidden */
-export declare type UIViewAnimData = {
+export declare type NGViewAnimData = {
   $animEnter: Promise<any>;
   $animLeave: Promise<any>;
   $$animLeave: {
@@ -27,7 +27,7 @@ export declare type UIViewAnimData = {
  *   The ui-view can be targeted in a View using the name ([[Ng1StateDeclaration.views]]).
  *
  * - `autoscroll`: an expression. When it evaluates to true, the `ui-view` will be scrolled into view when it is activated.
- *   Uses [[$uiViewScroll]] to do the scrolling.
+ *   Uses [[$ngViewScroll]] to do the scrolling.
  *
  * - `onload`: Expression to evaluate whenever the view updates.
  *
@@ -141,4 +141,4 @@ export declare type UIViewAnimData = {
  * });
  * ```
  */
-export declare let uiView: IDirective;
+export declare let ngView: IDirective;

package/types/router/interface.d.ts

@@ -251,7 +251,7 @@ export interface Ng1ViewDeclaration extends _ViewDeclaration {
    * A property of [[Ng1StateDeclaration]] or [[Ng1ViewDeclaration]]:
    *
    * The controller function, or the name of a registered controller.  The controller function will be used
-   * to control the contents of the [[directives.uiView]] directive.
+   * to control the contents of the [[directives.ngView]] directive.
    *
    * If specified as a string, controllerAs can be declared here, i.e., "FooController as foo" instead of in
    * a separate [[controllerAs]] property.
@@ -310,7 +310,7 @@ export interface Ng1ViewDeclaration extends _ViewDeclaration {
    * A property of [[Ng1StateDeclaration]] or [[Ng1ViewDeclaration]]:
    *
    * HTML template as a string, or a function which returns an html template as a string.
-   * This template will be used to render the corresponding [[directives.uiView]] directive.
+   * This template will be used to render the corresponding [[directives.ngView]] directive.
    *
    * This property takes precedence over templateUrl.
    *
@@ -335,7 +335,7 @@ export interface Ng1ViewDeclaration extends _ViewDeclaration {
    * A property of [[Ng1StateDeclaration]] or [[Ng1ViewDeclaration]]:
    *
    * A path or a function that returns a path to an html template.
-   * The template will be fetched and used to render the corresponding [[directives.uiView]] directive.
+   * The template will be fetched and used to render the corresponding [[directives.ngView]] directive.
    *
    * If `templateUrl` is a function, it will be called with the Transition parameters as the first argument.
    *
@@ -358,7 +358,7 @@ export interface Ng1ViewDeclaration extends _ViewDeclaration {
    * A property of [[Ng1StateDeclaration]] or [[Ng1ViewDeclaration]]:
    *
    * Injected function which returns the HTML template.
-   * The template will be used to render the corresponding [[directives.uiView]] directive.
+   * The template will be used to render the corresponding [[directives.ngView]] directive.
    *
    * #### Example:
    * ```js
@@ -372,14 +372,14 @@ export interface Ng1ViewDeclaration extends _ViewDeclaration {
 /**
  * The shape of a controller for a view (and/or component), defining the controller callbacks.
  *
- * A view in UI-Router is comprised of either a `component` ([[Ng1ViewDeclaration.component]]) or a combination of a
+ * A view in Router is comprised of either a `component` ([[Ng1ViewDeclaration.component]]) or a combination of a
  * `template` (or `templateProvider`) and a `controller` (or `controllerProvider`).
  *
  * The `controller` object (or the `component`'s controller object) can define component-level controller callbacks,
- * which UI-Router will call at the appropriate times.  These callbacks are similar to Transition Hooks
+ * which Router will call at the appropriate times.  These callbacks are similar to Transition Hooks
  * ([[IHookRegistry]]), but are only called if the view is currently active.
  *
- * This interface defines the UI-Router component callbacks.
+ * This interface defines the Router component callbacks.
  *
  */
 export interface Ng1Controller {
@@ -468,7 +468,7 @@ export interface TemplateFactoryProvider {
   /**
    * Forces $templateFactory to use $http instead of $templateRequest.
    *
-   * UI-Router uses `$templateRequest` by default on angular 1.3+.
+   * Router uses `$templateRequest` by default on angular 1.3+.
    * Use this method to choose to use `$http` instead.
    *
    * ---

package/types/router/locationServices.d.ts

@@ -1,8 +1,8 @@
 /** @publicapi @module ng1 */ /** */
-import { LocationConfig, LocationServices, UIRouter } from "./core";
+import { LocationConfig, LocationServices, Router } from "./core";
 import { ILocationService, ILocationProvider, IWindowService } from "../index";
 /**
- * Implements UI-Router LocationServices and LocationConfig using Angular 1's $location service
+ * Implements Router LocationServices and LocationConfig using Angular 1's $location service
  * @internalapi
  */
 export declare class Ng1LocationServices
@@ -34,7 +34,7 @@ export declare class Ng1LocationServices
    *
    * @param router
    */
-  static monkeyPatchPathParameterType(router: UIRouter): void;
+  static monkeyPatchPathParameterType(router: Router): void;
   constructor($locationProvider: ILocationProvider);
   onChange(callback: Function): () => Function[];
   html5Mode(): any;

package/types/router/services.d.ts

@@ -2,7 +2,7 @@ import { IRootScopeService } from "../";
 import { ResolveContext, TypedMap } from "./core";
 import { StateProvider } from "./stateProvider";
 declare module "./core/lib/router" {
-  interface UIRouter {
+  interface Router {
     /** @hidden */
     stateProvider: StateProvider;
   }