@angular-wave/angular.ts 0.2.3 → 0.3.1

package/src/public.js

@@ -1,4 +1,4 @@
-import { $CompileProvider } from "./core/compile/compile";
+import { CompileProvider } from "./core/compile/compile";
 import {
   inputDirective,
   ngValueDirective,
@@ -59,31 +59,27 @@ import {
   AnimateAsyncRunFactoryProvider,
   AnimateRunnerFactoryProvider,
 } from "./animations/animate-runner";
+import { TemplateCacheProvider } from "./core/cache/cache-factory";
+import { ControllerProvider } from "./core/controller/controller";
+import { ExceptionHandlerProvider } from "./core/exception-handler";
+import { FilterProvider } from "./core/filter/filter";
+import { IntervalProvider } from "./core/interval/interval";
+import { InterpolateProvider } from "./core/interpolate/interpolate";
+import { $IntervalFactoryProvider } from "./core/interval/interval-factory";
 import {
-  CacheFactoryProvider,
-  TemplateCacheProvider,
-} from "./services/cache-factory";
-import { $ControllerProvider } from "./core/controller/controller";
-import { $ExceptionHandlerProvider } from "./core/exception-handler";
-import { $FilterProvider } from "./core/filter/filter";
-import { $IntervalProvider } from "./core/interval/interval";
-import { $InterpolateProvider } from "./core/interpolate/interpolate";
-import { $$IntervalFactoryProvider } from "./core/interval/interval-factory";
-import {
-  $HttpProvider,
-  $HttpParamSerializerProvider,
-  $HttpParamSerializerJQLikeProvider,
+  HttpProvider,
+  HttpParamSerializerProvider,
 } from "./services/http/http";
-import { $HttpBackendProvider } from "./services/http-backend/http-backend";
-import { $LocationProvider } from "./core/location/location";
-import { $LogProvider } from "./services/log";
-import { $ParseProvider } from "./core/parser/parse";
-import { $RootScopeProvider } from "./core/scope/scope";
+import { HttpBackendProvider } from "./services/http-backend/http-backend";
+import { LocationProvider } from "./core/location/location";
+import { LogProvider } from "./services/log";
+import { ParseProvider } from "./core/parser/parse";
+import { RootScopeProvider } from "./core/scope/scope";
 import { $QProvider, $$QProvider } from "./core/q/q";
-import { $SceProvider, $SceDelegateProvider } from "./core/sce/sce";
-import { $$TaskTrackerFactoryProvider } from "./core/task-tracker-factory";
+import { SceProvider, SceDelegateProvider } from "./core/sce/sce";
+import { TaskTrackerFactoryProvider } from "./core/task-tracker-factory";
 import { TemplateRequestProvider } from "./services/template-request";
-import { $TimeoutProvider } from "./core/timeout/timeout";
+import { TimeoutProvider } from "./core/timeout/timeout";
 import { SanitizeUriProvider } from "./core/sanitize/sanitize-uri";
 import {
   ngMessageDefaultDirective,
@@ -106,25 +102,25 @@ import {
   ngShowAriaDirective,
   ngValueAriaDirective,
 } from "./directive/aria/aria";
-import { $AnimateCssProvider } from "./animations/animate-css";
-import { $$AnimateQueueProvider } from "./animations/animate-queue";
-import { $$AnimateJsProvider } from "./animations/animate-js";
-import { $$AnimationProvider } from "./animations/animation";
+import { AnimateCssProvider } from "./animations/animate-css";
+import { AnimateQueueProvider } from "./animations/animate-queue";
+import { AnimateJsProvider } from "./animations/animate-js";
+import { AnimationProvider } from "./animations/animation";
 import { RafSchedulerProvider } from "./animations/raf-scheduler";
-import { $$AnimateCacheProvider } from "./animations/animate-cache";
-import { $$AnimateCssDriverProvider } from "./animations/animate-css-driver";
-import { $$AnimateJsDriverProvider } from "./animations/animate-js-driver";
+import { AnimateCacheProvider } from "./animations/animate-cache";
+import { AnimateCssDriverProvider } from "./animations/animate-css-driver";
+import { AnimateJsDriverProvider } from "./animations/animate-js-driver";
 import { ngAnimateSwapDirective } from "./animations/animate-swap";
 import { $$AnimateChildrenDirective } from "./animations/animate-children-directive";
 import { UrlConfigProvider } from "./router/url/url-config";
 import { UIRouterGlobals } from "./router/globals";
 import { ViewService } from "./router/view/view";
-import { TransitionService } from "./router/transition/transition-service";
+import { TransitionProvider } from "./router/transition/transition-service";
 import { StateService } from "./router/state/state-service";
 import { $ViewScrollProvider } from "./router/view-scroll";
-import { TemplateFactory } from "./router/template-factory";
+import { TemplateFactoryProvider } from "./router/template-factory";
 import { UrlService } from "./router/url/url-service";
-import { StateRegistry } from "./router/state/state-registry";
+import { StateRegistryProvider } from "./router/state/state-registry";
 import { trace } from "./router/common/trace";
 import {
   $StateRefActiveDirective,
@@ -156,7 +152,7 @@ export function publishExternalAPI(angular) {
             $$sanitizeUri: SanitizeUriProvider,
           });
           $provide
-            .provider("$compile", $CompileProvider)
+            .provider("$compile", CompileProvider)
             .directive({
               input: inputDirective,
               textarea: inputDirective,
@@ -237,49 +233,47 @@ export function publishExternalAPI(angular) {
             $aria: AriaProvider,
             $anchorScroll: AnchorScrollProvider,
             $animate: AnimateProvider,
-            $$animation: $$AnimationProvider,
-            $animateCss: $AnimateCssProvider,
-            $$animateCssDriver: $$AnimateCssDriverProvider,
-            $$animateJs: $$AnimateJsProvider,
-            $$animateJsDriver: $$AnimateJsDriverProvider,
-            $$animateCache: $$AnimateCacheProvider,
-            $$animateQueue: $$AnimateQueueProvider,
+            $$animation: AnimationProvider,
+            $animateCss: AnimateCssProvider,
+            $$animateCssDriver: AnimateCssDriverProvider,
+            $$animateJs: AnimateJsProvider,
+            $$animateJsDriver: AnimateJsDriverProvider,
+            $$animateCache: AnimateCacheProvider,
+            $$animateQueue: AnimateQueueProvider,
             $$AnimateRunner: AnimateRunnerFactoryProvider,
             $$animateAsyncRun: AnimateAsyncRunFactoryProvider,
             $browser: BrowserProvider,
-            $cacheFactory: CacheFactoryProvider,
-            $controller: $ControllerProvider,
-            $exceptionHandler: $ExceptionHandlerProvider,
-            $filter: $FilterProvider,
-            $interpolate: $InterpolateProvider,
-            $interval: $IntervalProvider,
-            $$intervalFactory: $$IntervalFactoryProvider,
-            $http: $HttpProvider,
-            $httpParamSerializer: $HttpParamSerializerProvider,
-            $httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider,
-            $httpBackend: $HttpBackendProvider,
-            $location: $LocationProvider,
-            $log: $LogProvider,
-            $parse: $ParseProvider,
+            $controller: ControllerProvider,
+            $exceptionHandler: ExceptionHandlerProvider,
+            $filter: FilterProvider,
+            $interpolate: InterpolateProvider,
+            $interval: IntervalProvider,
+            $$intervalFactory: $IntervalFactoryProvider,
+            $http: HttpProvider,
+            $httpParamSerializer: HttpParamSerializerProvider,
+            $httpBackend: HttpBackendProvider,
+            $location: LocationProvider,
+            $log: LogProvider,
+            $parse: ParseProvider,
             $$rAFScheduler: RafSchedulerProvider,
-            $rootScope: $RootScopeProvider,
+            $rootScope: RootScopeProvider,
             $routerGlobals: UIRouterGlobals,
             $q: $QProvider,
             $$q: $$QProvider,
-            $sce: $SceProvider,
-            $sceDelegate: $SceDelegateProvider,
-            $$taskTrackerFactory: $$TaskTrackerFactoryProvider,
+            $sce: SceProvider,
+            $sceDelegate: SceDelegateProvider,
+            $$taskTrackerFactory: TaskTrackerFactoryProvider,
             $templateCache: TemplateCacheProvider,
             $templateRequest: TemplateRequestProvider,
-            $timeout: $TimeoutProvider,
+            $timeout: TimeoutProvider,
             $urlConfig: UrlConfigProvider,
             $view: ViewService,
-            $transitions: TransitionService,
+            $transitions: TransitionProvider,
             $state: StateService,
             $ngViewScroll: $ViewScrollProvider,
-            $templateFactory: TemplateFactory,
+            $templateFactory: TemplateFactoryProvider,
             $urlService: UrlService,
-            $stateRegistry: StateRegistry,
+            $stateRegistry: StateRegistryProvider,
           });
         },
       ],

package/src/router/directives/view-directive.spec.js

@@ -1219,11 +1219,11 @@ describe("angular 1.5+ style .component()", () => {
     it("should work with directives which themselves have templateUrls", async () => {
       const $state = svcs.$state;
 
-      $templateCache.put(
+      $templateCache.set(
         "/state_tpl.html",
         'x<ng12-directive data="$resolve.data"></ng12-directive>x',
       );
-      $templateCache.put("/comp_tpl.html", "-{{ $ctrl.data }}-");
+      $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
 
       await $state.transitionTo("cmp_tpl");
 
@@ -1236,11 +1236,11 @@ describe("angular 1.5+ style .component()", () => {
     it("should work with bindToController directives", async () => {
       const $state = svcs.$state;
 
-      $templateCache.put(
+      $templateCache.set(
         "/state_tpl.html",
         'x<ng13-directive data="$resolve.data"></ng13-directive>x',
       );
-      $templateCache.put("/comp_tpl.html", "-{{ $ctrl.data }}-");
+      $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
 
       await $state.transitionTo("cmp_tpl");
       await wait(100);
@@ -1254,11 +1254,11 @@ describe("angular 1.5+ style .component()", () => {
     it("should work with .component()s", async () => {
       const $state = svcs.$state;
 
-      $templateCache.put(
+      $templateCache.set(
         "/state_tpl.html",
         'x<ng-component data="$resolve.data"></ng-component>x',
       );
-      $templateCache.put("/comp_tpl.html", "-{{ $ctrl.data }}-");
+      $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
 
       $state.transitionTo("cmp_tpl");
       await wait(100);
@@ -1345,7 +1345,7 @@ describe("angular 1.5+ style .component()", () => {
 
       const $state = svcs.$state;
 
-      $templateCache.put("/comp_tpl.html", "-{{ $ctrl.data }}-");
+      $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
       await wait(100);
 
@@ -1371,7 +1371,7 @@ describe("angular 1.5+ style .component()", () => {
         $httpBackend = svcs.$httpBackend,
         $q = svcs.$q;
 
-      $templateCache.put("/comp_tpl.html", "-{{ $ctrl.data }}-");
+      $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
       await wait(100);
 
@@ -1395,7 +1395,7 @@ describe("angular 1.5+ style .component()", () => {
 
       const $state = svcs.$state;
 
-      $templateCache.put("/comp_tpl.html", "-{{ $ctrl.data }}-");
+      $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
       await wait(100);
 
@@ -1418,7 +1418,7 @@ describe("angular 1.5+ style .component()", () => {
         $httpBackend = svcs.$httpBackend,
         $q = svcs.$q;
 
-      $templateCache.put("/comp_tpl.html", "-{{ $ctrl.data }}-");
+      $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
       await wait(100);
 
@@ -1443,7 +1443,7 @@ describe("angular 1.5+ style .component()", () => {
         $httpBackend = svcs.$httpBackend,
         $q = svcs.$q;
 
-      $templateCache.put("/comp_tpl.html", "-{{ $ctrl.data }}-");
+      $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
       await wait(100);
 
@@ -1465,7 +1465,7 @@ describe("angular 1.5+ style .component()", () => {
         $httpBackend = svcs.$httpBackend,
         $q = svcs.$q;
 
-      $templateCache.put("/comp_tpl.html", "-{{ $ctrl.data }}-");
+      $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
       await wait(100);
 
@@ -1785,7 +1785,7 @@ describe("angular 1.5+ style .component()", () => {
       $stateProvider.state(stateDef);
       const $state = svcs.$state;
 
-      $templateCache.put("/comp_tpl.html", "-{{ $ctrl.data }}-");
+      $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
       await wait(100);
 
@@ -1815,7 +1815,7 @@ describe("angular 1.5+ style .component()", () => {
         $httpBackend = svcs.$httpBackend,
         $q = svcs.$q;
 
-      $templateCache.put("/comp_tpl.html", "-{{ $ctrl.data }}-");
+      $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
       await wait(100);
 
@@ -1857,7 +1857,7 @@ describe("angular 1.5+ style .component()", () => {
 
       const $state = svcs.$state;
 
-      $templateCache.put("/comp_tpl.html", "-{{ $ctrl.data }}-");
+      $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
       await wait(100);
 
@@ -1887,7 +1887,7 @@ describe("angular 1.5+ style .component()", () => {
         $httpBackend = svcs.$httpBackend,
         $q = svcs.$q;
 
-      $templateCache.put(
+      $templateCache.set(
         "/comp_tpl.html",
         "-{{ $ctrl.data }}.{{ $ctrl.data2 }}-",
       );

package/src/router/params/param.js

@@ -1,5 +1,4 @@
 import { filter, map, allTrueR, find } from "../../shared/common";
-import { prop } from "../../shared/hof";
 import { isInjectable } from "../../shared/predicates";
 import { isDefined, isUndefined, isString } from "../../shared/utils";
 import { services } from "../common/coreservices";
@@ -79,7 +78,7 @@ function getReplace(config, arrayMode, isOptional, squash) {
   ];
   const replace = Array.isArray(config.replace) ? config.replace : [];
   if (isString(squash)) replace.push({ from: squash, to: undefined });
-  const configuredKeys = map(replace, prop("from"));
+  const configuredKeys = map(replace, (x) => x.from);
   return filter(
     defaultPolicy,
     (item) => configuredKeys.indexOf(item.from) === -1,

package/src/router/path/path-node.js

@@ -25,9 +25,11 @@ export class PathNode {
       this.resolvables = state.resolvables.map((res) => res.clone());
     }
   }
+
   clone() {
     return new PathNode(this);
   }
+
   /** Sets [[paramValues]] for the node, from the values of an object hash */
   applyRawParams(params) {
     const getParamVal = (paramDef) => [
@@ -40,10 +42,12 @@ export class PathNode {
     );
     return this;
   }
+
   /** Gets a specific [[Param]] metadata that belongs to the node */
   parameter(name) {
     return find(this.paramSchema, propEq("id", name));
   }
+
   /**
    * @returns true if the state and parameter values for another PathNode are
    * equal to the state and param values for this PathNode
@@ -52,6 +56,7 @@ export class PathNode {
     const diff = this.diff(node, paramsFn);
     return diff && diff.length === 0;
   }
+
   /**
    * Finds Params with different parameter values on another PathNode.
    *
@@ -70,8 +75,3 @@ export class PathNode {
     return Param.changed(params, this.paramValues, node.paramValues);
   }
 }
-/**
- * Returns a clone of the PathNode
- * @deprecated use instance method `node.clone()`
- */
-PathNode.clone = (node) => node.clone();

package/src/router/path/path-utils.js

@@ -1,29 +1,11 @@
-import {
-  find,
-  pick,
-  omit,
-  tail,
-  mergeR,
-  unnestR,
-  arrayTuples,
-} from "../../shared/common";
-import { prop, propEq } from "../../shared/hof";
+import { find, pick, omit, unnestR, arrayTuples } from "../../shared/common";
+import { propEq } from "../../shared/hof";
 import { TargetState } from "../state/target-state";
 import { PathNode } from "./path-node";
 /**
  * This class contains functions which convert TargetStates, Nodes and paths from one type to another.
  */
 export class PathUtils {
-  /** Given a PathNode[], create an TargetState */
-  static makeTargetState(registry, path) {
-    const state = tail(path).state;
-    return new TargetState(
-      registry,
-      state,
-      path.map(prop("paramValues")).reduce(mergeR, {}),
-      {},
-    );
-  }
   static buildPath(targetState) {
     const toParams = targetState.params();
     return targetState
@@ -81,7 +63,7 @@ export class PathUtils {
       .map((node) => node.paramSchema)
       .reduce(unnestR, [])
       .filter((param) => !param.inherit)
-      .map(prop("id"));
+      .map((x) => x.id);
     /**
      * Given an [[PathNode]] "toNode", return a new [[PathNode]] with param values inherited from the
      * matching node in fromPath.  Only inherit keys that aren't found in "toKeys" from the node in "fromPath""
@@ -202,3 +184,19 @@ export class PathUtils {
     return path.reduce((acc, node) => Object.assign(acc, node.paramValues), {});
   }
 }
+
+/** Given a PathNode[], create an TargetState
+ * @param {import("../state/state-registry.js").StateRegistryProvider} registry
+ * @param {Array<PathNode>} path
+ * @returns
+ */
+export function makeTargetState(registry, path) {
+  return new TargetState(
+    registry,
+    path.at(-1).state,
+    path
+      .map((x) => x.paramValues)
+      .reduce((acc, obj) => ({ ...acc, ...obj }), {}),
+    {},
+  );
+}

package/src/router/state/state-builder.js

@@ -8,7 +8,7 @@ import {
 } from "../../shared/common";
 import { isDefined, isFunction, isString } from "../../shared/utils";
 import { stringify } from "../../shared/strings";
-import { is, pattern, pipe, prop, val } from "../../shared/hof";
+import { is, pattern, pipe, val } from "../../shared/hof";
 import { Resolvable } from "../resolve/resolvable";
 import { services } from "../common/coreservices";
 import { annotate } from "../../core/di/injector";
@@ -73,12 +73,18 @@ function getNavigableBuilder(isRoot) {
 
 function getParamsBuilder(paramFactory) {
   return function (state) {
-    const makeConfigParam = (config, id) =>
+    const makeConfigParam = (_config, id) =>
       paramFactory.fromConfig(id, null, state.self);
     const urlParams =
       (state.url && state.url.parameters({ inherit: false })) || [];
     const nonUrlParams = Object.values(
-      map(omit(state.params || {}, urlParams.map(prop("id"))), makeConfigParam),
+      map(
+        omit(
+          state.params || {},
+          urlParams.map((x) => x.id),
+        ),
+        makeConfigParam,
+      ),
     );
     return urlParams
       .concat(nonUrlParams)
@@ -176,11 +182,11 @@ export function resolvablesBuilder(state) {
   // Given a literal resolve or provider object, returns a Resolvable
   const literal2Resolvable = pattern([
     [
-      prop("resolveFn"),
+      (x) => x.resolveFn,
       (p) => new Resolvable(getToken(p), p.resolveFn, p.deps, p.policy),
     ],
     [
-      prop("useFactory"),
+      (x) => x.useFactory,
       (p) =>
         new Resolvable(
           getToken(p),
@@ -190,27 +196,27 @@ export function resolvablesBuilder(state) {
         ),
     ],
     [
-      prop("useClass"),
+      (x) => x.useClass,
       (p) => new Resolvable(getToken(p), () => new p.useClass(), [], p.policy),
     ],
     [
-      prop("useValue"),
+      (x) => x.useValue,
       (p) =>
         new Resolvable(getToken(p), () => p.useValue, [], p.policy, p.useValue),
     ],
     [
-      prop("useExisting"),
+      (x) => x.useExisting,
       (p) => new Resolvable(getToken(p), (x) => x, [p.useExisting], p.policy),
     ],
   ]);
   const tuple2Resolvable = pattern([
     [
-      pipe(prop("val"), isString),
+      pipe((x) => x.val, isString),
       (tuple) =>
         new Resolvable(tuple.token, (x) => x, [tuple.val], tuple.policy),
     ],
     [
-      pipe(prop("val"), Array.isArray),
+      pipe((x) => x.val, Array.isArray),
       (tuple) =>
         new Resolvable(
           tuple.token,
@@ -220,7 +226,7 @@ export function resolvablesBuilder(state) {
         ),
     ],
     [
-      pipe(prop("val"), isFunction),
+      pipe((x) => x.val, isFunction),
       (tuple) =>
         new Resolvable(
           tuple.token,

package/src/router/state/state-queue-manager.js

@@ -1,30 +1,39 @@
-import { prop } from "../../shared/hof";
 import { isString } from "../../shared/utils";
 import { StateObject } from "./state-object";
 
 export class StateQueueManager {
+  /**
+   * @param {import("./state-registry.js").StateRegistryProvider} stateRegistry
+   * @param {*} urlServiceRules
+   * @param {*} states
+   * @param {*} builder
+   * @param {*} listeners
+   */
   constructor(stateRegistry, urlServiceRules, states, builder, listeners) {
     this.stateRegistry = stateRegistry;
     this.urlServiceRules = urlServiceRules;
     this.states = states;
     this.builder = builder;
     this.listeners = listeners;
+    /**
+     * @type {Array<StateObject>}
+     */
     this.queue = [];
   }
+
   register(stateDecl) {
-    const queue = this.queue;
     const state = new StateObject(stateDecl);
-    const name = state.name;
     if (!isString(name)) throw new Error("State must have a valid name");
     if (
-      Object.prototype.hasOwnProperty.call(this.states, name) ||
-      queue.map(prop("name")).includes(name)
+      Object.prototype.hasOwnProperty.call(this.states, state.name) ||
+      this.queue.map((x) => x.name).includes(state.name)
     )
-      throw new Error(`State '${name}' is already defined`);
-    queue.push(state);
+      throw new Error(`State '${state.name}' is already defined`);
+    this.queue.push(state);
     this.flush();
     return state;
   }
+
   flush() {
     const { queue, states, builder } = this;
     const registered = [], // states that got registered

package/src/router/state/state-registry.js

@@ -12,7 +12,7 @@ import { isString } from "../../shared/utils";
  *
  * This API is found at `$stateRegistry` ([[UIRouter.stateRegistry]])
  */
-export class StateRegistry {
+export class StateRegistryProvider {
   static $inject = [
     "$urlServiceProvider",
     "$stateProvider",
@@ -42,7 +42,8 @@ export class StateRegistry {
       this.builder,
       this.listeners,
     );
-    this._registerRoot();
+
+    this.registerRoot();
 
     viewService._pluginapi._rootViewContext(this.root());
     globals.$current = this.root();
@@ -90,7 +91,10 @@ export class StateRegistry {
     };
   }
 
-  _registerRoot() {
+  /**
+   * @private
+   */
+  registerRoot() {
     const rootStateDef = {
       name: "",
       url: "^",
@@ -100,8 +104,8 @@ export class StateRegistry {
       },
       abstract: true,
     };
-    const _root = (this._root = this.stateQueue.register(rootStateDef));
-    _root.navigable = null;
+    this._root = this.stateQueue.register(rootStateDef);
+    this._root.navigable = null;
   }
 
   /**

package/src/router/state/state-service.js

@@ -8,7 +8,7 @@ import {
 import { isDefined, isObject, isString, minErr } from "../../shared/utils";
 import { Queue } from "../common/queue";
 import { services } from "../common/coreservices";
-import { PathUtils } from "../path/path-utils";
+import { makeTargetState } from "../path/path-utils";
 import { PathNode } from "../path/path-node";
 import { defaultTransOpts } from "../transition/transition-service";
 import { Rejection, RejectType } from "../transition/reject-factory";
@@ -88,11 +88,7 @@ export class StateService {
     );
   }
 
-  $get = [
-    () => {
-      return this;
-    },
-  ];
+  $get = () => this;
 
   /**
    * Decorates states when they are registered
@@ -215,7 +211,7 @@ export class StateService {
    * @internal
    */
   _handleInvalidTargetState(fromPath, toState) {
-    const fromState = PathUtils.makeTargetState(this.stateRegistry, fromPath);
+    const fromState = makeTargetState(this.stateRegistry, fromPath);
     const globals = this.globals;
     const latestThing = () => globals.transitionHistory.peekTail();
     const latest = latestThing();
@@ -690,7 +686,7 @@ export class StateService {
     if (!state || !state.lazyLoad)
       throw new Error("Can not lazy load " + stateOrName);
     const currentPath = this.getCurrentPath();
-    const target = PathUtils.makeTargetState(this.stateRegistry, currentPath);
+    const target = makeTargetState(this.stateRegistry, currentPath);
     transition =
       transition || this.transitionService.create(currentPath, target);
     return lazyLoadState(transition, state);

package/src/router/template-factory.js

@@ -14,7 +14,7 @@ import { annotate } from "../core/di/injector";
 /**
  * Service which manages loading of templates from a ViewConfig.
  */
-export class TemplateFactory {
+export class TemplateFactoryProvider {
   constructor() {
     /** @type {boolean} */
     this._useHttp = false;
@@ -28,7 +28,7 @@ export class TemplateFactory {
     "$injector",
     /**
      * @param {any} $http
-     * @param {any} $templateCache
+     * @param {import("../core/cache/cache-factory").TemplateCache} $templateCache
      * @param {any} $templateRequest
      * @param {any} $q
      * @param {import("../core/di/internal-injector").InjectorService} $injector

package/src/router/transition/transition-service.js

@@ -60,7 +60,7 @@ export let defaultTransOpts = {
  *
  * This API is located at `router.transitionService` ([[UIRouter.transitionService]])
  */
-export class TransitionService {
+export class TransitionProvider {
   static $inject = ["$routerGlobalsProvider", "$viewProvider"];
 
   /**