chore(tslint): no-shadowed-variable

Author: christopherthielen

src/directives/stateDirectives.ts

@@ -254,8 +254,8 @@ function bindEvents(element: IAugmentedJQuery, scope: IScope, hookFn: (e: JQuery
  * - Unlike the parameter values expression, the state name is not `$watch`ed (for performance reasons).
  * If you need to dynamically update the state being linked to, use the fully dynamic [[uiState]] directive.
  */
-let uiSref: ng1_directive;
-uiSref = ['$uiRouter', '$timeout',
+let uiSrefDirective: ng1_directive;
+uiSrefDirective = ['$uiRouter', '$timeout',
   function $StateRefDirective($uiRouter: UIRouter, $timeout: ITimeoutService) {
     let $state = $uiRouter.stateService;
 
@@ -386,8 +386,8 @@ uiSref = ['$uiRouter', '$timeout',
  * - A middle-click, right-click, or ctrl-click is handled (natively) by the browser to open the href in a new window, for example.
  * ```
  */
-let uiState: ng1_directive;
-uiState = ['$uiRouter', '$timeout',
+let uiStateDirective: ng1_directive;
+uiStateDirective = ['$uiRouter', '$timeout',
   function $StateRefDynamicDirective($uiRouter: UIRouter, $timeout: ITimeoutService) {
     let $state = $uiRouter.stateService;
 
@@ -519,8 +519,8 @@ uiState = ['$uiRouter', '$timeout',
  *
  * - Multiple classes may be specified in a space-separated format: `ui-sref-active='class1 class2 class3'`
  */
-let uiSrefActive: ng1_directive;
-uiSrefActive = ['$state', '$stateParams', '$interpolate', '$uiRouter',
+let uiSrefActiveDirective: ng1_directive;
+uiSrefActiveDirective = ['$state', '$stateParams', '$interpolate', '$uiRouter',
   function $StateRefActiveDirective($state: StateService, $stateParams: Obj, $interpolate: IInterpolateService, $uiRouter: UIRouter) {
     return {
       restrict: "A",
@@ -621,7 +621,7 @@ interface Def { uiState: string; href: string; uiStateParams: Obj; uiStateOpts:
 interface StateData { state: StateDeclaration; params: RawParams; activeClass: string; }
 
 angular.module('ui.router.state')
-    .directive('uiSref', uiSref)
-    .directive('uiSrefActive', uiSrefActive)
-    .directive('uiSrefActiveEq', uiSrefActive)
-    .directive('uiState', uiState);
+    .directive('uiSref', uiSrefDirective)
+    .directive('uiSrefActive', uiSrefActiveDirective)
+    .directive('uiSrefActiveEq', uiSrefActiveDirective)
+    .directive('uiState', uiStateDirective);

src/locationServices.ts

@@ -41,11 +41,11 @@ export class Ng1LocationServices implements LocationConfig, LocationServices {
   static monkeyPatchPathParameterType(router: UIRouter) {
     let pathType: ParamType = router.urlMatcherFactory.type('path');
 
-    pathType.encode = (val: any) =>
-        val != null ? val.toString().replace(/(~|\/)/g, m => ({ '~': '~~', '/': '~2F' }[m])) : val;
+    pathType.encode = (x: any) =>
+        x != null ? x.toString().replace(/(~|\/)/g, m => ({ '~': '~~', '/': '~2F' }[m])) : x;
 
-    pathType.decode = (val: string) =>
-        val != null ? val.toString().replace(/(~~|~2F)/g, m => ({ '~~': '~', '~2F': '/' }[m])) : val;
+    pathType.decode = (x: string) =>
+        x != null ? x.toString().replace(/(~~|~2F)/g, m => ({ '~~': '~', '~2F': '/' }[m])) : x;
 
   }
 

src/services.ts

@@ -35,7 +35,7 @@ let mod_main  = angular.module('ui.router',        ['ui.router.init', 'ui.router
 let mod_cmpt  = angular.module('ui.router.compat', ['ui.router']); // tslint:disable-line
 
 declare module '@uirouter/core/lib/router' {
-  interface UIRouter {
+  interface UIRouter { // tslint:disable-line:no-shadowed-variable
     /** @hidden */
     stateProvider: StateProvider;
     /** @hidden */
@@ -45,9 +45,9 @@ declare module '@uirouter/core/lib/router' {
 
 let router: UIRouter = null;
 
-$uiRouter.$inject = ['$locationProvider'];
+$uiRouterProvider.$inject = ['$locationProvider'];
 /** This angular 1 provider instantiates a Router and exposes its services via the angular injector */
-function $uiRouter($locationProvider: ILocationProvider) {
+function $uiRouterProvider($locationProvider: ILocationProvider) {
 
   // Create a new instance of the Router when the $uiRouterProvider is initialized
   router = this.router = new UIRouter();
@@ -113,7 +113,7 @@ export function watchDigests($rootScope: IRootScopeService) {
   $rootScope.$watch(function() { trace.approximateDigests++; });
 }
 
-mod_init .provider("$uiRouter",          <any> $uiRouter);
+mod_init .provider("$uiRouter",          <any> $uiRouterProvider);
 mod_rtr  .provider('$urlRouter',         ['$uiRouterProvider', getUrlRouterProvider]);
 mod_util .provider('$urlService',        getProviderFor('urlService'));
 mod_util .provider('$urlMatcherFactory', ['$uiRouterProvider', () => router.urlMatcherFactory]);

src/statebuilders/onEnterExitRetain.ts

@@ -13,8 +13,8 @@ import { Ng1StateDeclaration } from '../interface';
  * ensures that those hooks are injectable for @uirouter/angularjs (ng1).
  */
 export const getStateHookBuilder = (hookName: "onEnter"|"onExit"|"onRetain") =>
-function stateHookBuilder(state: StateObject, parentFn: BuilderFunction): TransitionStateHookFn {
-  const hook = state[hookName];
+function stateHookBuilder(stateObject: StateObject, parentFn: BuilderFunction): TransitionStateHookFn {
+  const hook = stateObject[hookName];
   const pathname = hookName === 'onExit' ? 'from' : 'to';
 
   function decoratedNg1Hook(trans: Transition, state: Ng1StateDeclaration): HookResult {