@angular-wave/angular.ts 0.7.8 → 0.8.0

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

@@ -6,14 +6,14 @@ import {
   silentRejection,
 } from "../../shared/common.js";
 import { isDefined, isObject, isString, minErr } from "../../shared/utils.js";
-import { Queue } from "../common/queue.js";
+import { Queue } from "../../shared/queue.js";
 import { makeTargetState } from "../path/path-utils.js";
 import { PathNode } from "../path/path-node.js";
 import { defaultTransOpts } from "../transition/transition-service.js";
 import { Rejection, RejectType } from "../transition/reject-factory.js";
 import { TargetState } from "./target-state.js";
 import { Param } from "../params/param.js";
-import { Glob } from "../common/glob.js";
+import { Glob } from "../glob/glob.js";
 import { ResolveContext } from "../resolve/resolve-context.js";
 import { lazyLoadState } from "../hooks/lazy-load.js";
 import { val } from "../../shared/hof.js";
@@ -52,7 +52,10 @@ export class StateProvider {
     return this.globals.$current;
   }
 
-  static $inject = ["$routerGlobalsProvider", "$transitionsProvider"];
+  /* @ignore */ static $inject = [
+    "$routerGlobalsProvider",
+    "$transitionsProvider",
+  ];
 
   // Needs access to urlService, stateRegistry
   /**
@@ -131,9 +134,9 @@ export class StateProvider {
    * - **params** `{object}` - returns an array of state params that are ensured to
    *   be a super-set of parent's params.
    * - **views** `{object}` - returns a views object where each key is an absolute view
-   *   name (i.e. "viewName@stateName") and each value is the config object
+   *   name (i.e. "viewName@stateName") and each value is the urlConfig object
    *   (template, controller) for the view. Even when you don't use the views object
-   *   explicitly on a state config, one is still created for you internally.
+   *   explicitly on a state urlConfig, one is still created for you internally.
    *   So by decorating this builder function you have access to decorating template
    *   and controller properties.
    * - **ownParams** `{object}` - returns an array of params that belong to the state,
@@ -151,10 +154,10 @@ export class StateProvider {
    *   let result = {},
    *       views = parent(state);
    *
-   *   angular.forEach(views, function (config, name) {
+   *   angular.forEach(views, function (urlConfig, name) {
    *     let autoName = (state.name + '.' + name).replace('.', '/');
-   *     config.templateUrl = config.templateUrl || '/partials/' + autoName + '.html';
-   *     result[name] = config;
+   *     urlConfig.templateUrl = urlConfig.templateUrl || '/partials/' + autoName + '.html';
+   *     result[name] = urlConfig;
    *   });
    *   return result;
    * });
@@ -178,7 +181,7 @@ export class StateProvider {
    * @param {object} func A function that is responsible for decorating the original
    * builder function. The function receives two parameters:
    *
-   *   - `{object}` - state - The state config object.
+   *   - `{object}` - state - The state urlConfig object.
    *   - `{object}` - super - The original builder function.
    *
    * @return {object} $stateProvider - $stateProvider instance
@@ -411,7 +414,7 @@ export class StateProvider {
     const globals = this.globals;
     const latestSuccess = globals.successfulTransitions.peekTail();
     const rootPath = () => [new PathNode(this.stateRegistry.root())];
-    return latestSuccess ? latestSuccess.treeChanges().to : rootPath();
+    return latestSuccess ? latestSuccess._treeChanges.to : rootPath();
   }
   /**
    * Low-level method for transitioning to a new state.

package/src/router/state/state.spec.js

@@ -1,5 +1,5 @@
 import { dealoc } from "../../shared/dom.js";
-import { Angular } from "../../loader.js";
+import { Angular } from "../../angular.js";
 import { isFunction } from "../../shared/utils.js";
 import { wait } from "../../shared/test-utils.js";
 
@@ -101,8 +101,9 @@ describe("$state", () => {
       // some tests are polluting the cache
       window.angular = new Angular();
       module = window.angular.module("defaultModule", []);
-      module.config((_$stateProvider_, _$provide_) => {
+      module.config((_$stateProvider_, _$provide_, _$locationProvider_) => {
         $stateProvider = _$stateProvider_;
+        _$locationProvider_.html5ModeConf.enabled = false;
       });
       window.angular.bootstrap(document.getElementById("app"), [
         "defaultModule",
@@ -143,10 +144,10 @@ describe("$state", () => {
       dealoc(document.getElementById("app"));
       window.angular = new Angular();
       module = window.angular.module("defaultModule", []);
-      module.config((_$stateProvider_, _$provide_) => {
+      module.config((_$stateProvider_, _$provide_, _$locationProvider_) => {
         $stateProvider = _$stateProvider_;
         $provide = _$provide_;
-
+        _$locationProvider_.html5ModeConf.enabled = false;
         [A, B, C, D, DD, E, H, HH, HHH].forEach(function (state) {
           state.onEnter = callbackLogger(state, "onEnter");
           state.onExit = callbackLogger(state, "onExit");
@@ -457,7 +458,7 @@ describe("$state", () => {
         }).forEach(([k, v]) => {
           expect($stateParams[k]).toEqual(v);
         });
-        expect($location.url()).toEqual(
+        expect($location.getUrl()).toEqual(
           "/dynstate/p1/pd1?search=s1&searchDyn=sd1",
         );
       });
@@ -617,14 +618,14 @@ describe("$state", () => {
         });
 
         it("does not exit nor enter a state when only dynamic params change (triggered via url)", async () => {
-          $location.search({ search: "s1", searchDyn: "sd2" });
+          $location.setSearch({ search: "s1", searchDyn: "sd2" });
           $rootScope.$broadcast("$locationChangeSuccess");
           await wait(100);
           expect(dynlog).toBe("success;[searchDyn=sd2];");
         });
 
         it("exits and enters a state when any non-dynamic params change (triggered via url)", async () => {
-          $location.search({ search: "s2", searchDyn: "sd2" });
+          $location.setSearch({ search: "s2", searchDyn: "sd2" });
           $rootScope.$broadcast("$locationChangeSuccess");
           await wait(100);
           expect(dynlog).toBe("exit:dyn;enter:dyn;success;");
@@ -650,23 +651,23 @@ describe("$state", () => {
           });
         });
 
-        it("updates $stateParams and $location.search when only dynamic params change (triggered via url)", async () => {
-          $location.search({ search: "s1", searchDyn: "sd2" });
+        it("updates $stateParams and $location.setSearch when only dynamic params change (triggered via url)", async () => {
+          $location.setSearch({ search: "s1", searchDyn: "sd2" });
           $rootScope.$broadcast("$locationChangeSuccess");
           await wait(100);
           expect($stateParams.search).toBe("s1");
           expect($stateParams.searchDyn).toBe("sd2");
-          expect($location.search()).toEqual({
+          expect($location.getSearch()).toEqual({
             search: "s1",
             searchDyn: "sd2",
           });
         });
 
-        it("updates $stateParams and $location.search when only dynamic params change (triggered via $state transition)", async () => {
+        it("updates $stateParams and $location.setSearch when only dynamic params change (triggered via $state transition)", async () => {
           await $state.go(".", { searchDyn: "sd2" });
           expect($stateParams.search).toBe("s1");
           expect($stateParams.searchDyn).toBe("sd2");
-          expect($location.search()).toEqual({
+          expect($location.getSearch()).toEqual({
             search: "s1",
             searchDyn: "sd2",
           });
@@ -683,7 +684,7 @@ describe("$state", () => {
         //     observedParamValue = newval;
         //   });
         //   await wait(100);
-        //   $location.search({ search: "s1", searchDyn: "sd2" });
+        //   $location.setSearch({ search: "s1", searchDyn: "sd2" });
         //   $rootScope.$broadcast("$locationChangeSuccess");
 
         //   await wait(100);
@@ -806,7 +807,7 @@ describe("$state", () => {
         // this passes in isolation
         it("updates $stateParams", async () => {
           await initStateTo(RS);
-          $location.search({ term: "hello" });
+          $location.setSearch({ term: "hello" });
           $rootScope.$broadcast("$locationChangeSuccess");
           await wait(100);
           expect($stateParams.term).toEqual("hello");
@@ -814,10 +815,10 @@ describe("$state", () => {
         });
 
         it("doesn't re-enter state (triggered by url change)", async () => {
-          $location.search({ term: "hello" });
+          $location.setSearch({ term: "hello" });
           $rootScope.$broadcast("$locationChangeSuccess");
 
-          expect($location.search()).toEqual({ term: "hello" });
+          expect($location.getSearch()).toEqual({ term: "hello" });
           expect(entered).toBeFalsy();
         });
 
@@ -833,7 +834,7 @@ describe("$state", () => {
           expect($state.current).toBe(RS);
           expect(entered).toBeFalsy();
           expect(success).toBeTruthy();
-          expect($location.search()).toEqual({ term: "hello" });
+          expect($location.getSearch()).toEqual({ term: "hello" });
         });
 
         it("updates URL when (triggered by $state transition)", async () => {
@@ -841,7 +842,7 @@ describe("$state", () => {
           await $state.go(".", { term: "goodbye" });
 
           expect($stateParams.term).toEqual("goodbye");
-          expect($location.url()).toEqual("/search?term=goodbye");
+          expect($location.getUrl()).toEqual("/search?term=goodbye");
           expect(entered).toBeFalsy();
         });
       });
@@ -976,19 +977,19 @@ describe("$state", () => {
 
     it("updates the location #fragment", async () => {
       await $state.transitionTo("home.item", { id: "world", "#": "frag" });
-      expect($location.url()).toBe("/front/world#frag");
-      expect($location.hash()).toBe("frag");
+      expect($location.getUrl()).toBe("/front/world#frag");
+      expect($location.getHash()).toBe("frag");
     });
 
     // passes in isolation. on success callback being polluted
     it("runs a transition when the location #fragment is updated", async () => {
       $state.transitionTo("home.item", { id: "world", "#": "frag" });
       await wait(100);
-      expect($location.hash()).toBe("frag");
+      expect($location.getHash()).toBe("frag");
 
       $state.transitionTo("home.item", { id: "world", "#": "blarg" });
       await wait(100);
-      expect($location.hash()).toBe("blarg");
+      expect($location.getHash()).toBe("blarg");
     });
 
     it("injects $transition$ into resolves", async () => {

package/src/router/state/state.test.js

@@ -5,6 +5,7 @@ const TEST_URL = "src/router/state/state.html?random=false";
 test("unit tests contain no errors", async ({ page }) => {
   await page.goto(TEST_URL);
   await page.content();
+  await page.waitForTimeout(1000);
   await expect(page.locator(".jasmine-overall-result")).toHaveText(
     /0 failures/,
   );

package/src/router/state/views.js

@@ -64,7 +64,7 @@ export function ng1ViewsBuilder(state) {
     name = name || "$default";
     // Account for views: { header: "headerComponent" }
     if (isString(config)) config = { component: config };
-    // Make a shallow copy of the config object
+    // Make a shallow copy of the urlConfig object
     config = Object.assign({}, config);
     // Do not allow a view to mix props for component-style view with props for template/controller-style view
     if (hasAnyKey(compKeys, config) && hasAnyKey(nonCompKeys, config)) {

package/src/router/state-filter.spec.js

@@ -1,4 +1,4 @@
-import { Angular } from "../loader.js";
+import { Angular } from "../angular.js";
 import { dealoc } from "../shared/dom.js";
 
 describe("router filters", function () {

package/src/router/state-filters.js

@@ -1,3 +1,7 @@
+import { $injectTokens as $t } from "../injection-tokens.js";
+
+$IsStateFilter.$inject = [$t.$state];
+
 /**
  * `isState` Filter: truthy if the current state is the parameter
  *
@@ -7,18 +11,19 @@
  * ```html
  * <div ng-if="'stateName' | isState">show if state is 'stateName'</div>
  * ```
- */
-$IsStateFilter.$inject = ["$state"];
-/**
+ *
+ * @param {import('./state/state-service.js').StateProvider} $state
  * @returns {import('../interface.ts').FilterFn}
  */
 export function $IsStateFilter($state) {
-  const isFilter = function (state, params, options) {
-    return $state.is(state, params, options);
-  };
+  const isFilter = (state, params, options) =>
+    $state.is(state, params, options);
   isFilter.$stateful = true;
   return isFilter;
 }
+
+$IncludedByStateFilter.$inject = [$t.$state];
+
 /**
  * `includedByState` Filter: truthy if the current state includes the parameter
  *
@@ -28,9 +33,8 @@ export function $IsStateFilter($state) {
  * ```html
  * <div ng-if="'fullOrPartialStateName' | includedByState">show if state includes 'fullOrPartialStateName'</div>
  * ```
- */
-$IncludedByStateFilter.$inject = ["$state"];
-/**
+ *
+ * @param {import('./state/state-service.js').StateProvider} $state
  * @returns {import('../interface.ts').FilterFn}
  */
 export function $IncludedByStateFilter($state) {

package/src/router/template-factory.js

@@ -4,6 +4,7 @@ import { Resolvable } from "./resolve/resolvable.js";
 import { kebobString } from "../shared/strings.js";
 import { annotate } from "../core/di/injector.js";
 import { DirectiveSuffix } from "../core/compile/compile.js";
+import { $injectTokens as $t } from "../injection-tokens.js";
 
 /**
  * @typedef BindingTuple
@@ -21,10 +22,10 @@ export class TemplateFactoryProvider {
   }
 
   $get = [
-    "$http",
-    "$templateCache",
-    "$templateRequest",
-    "$injector",
+    $t.$http,
+    $t.$templateCache,
+    $t.$templateRequest,
+    $t.$injector,
     /**
      * @param {import("interface.ts").HttpService} $http
      * @param {import("../services/template-cache/interface.ts").TemplateCache} $templateCache

package/src/router/template-factory.spec.js

@@ -1,5 +1,5 @@
 import { dealoc } from "../shared/dom.js";
-import { Angular } from "../loader.js";
+import { Angular } from "../angular.js";
 import { wait } from "../shared/test-utils.js";
 
 describe("templateFactory", () => {

package/src/router/transition/hook-registry.js

@@ -1,6 +1,6 @@
 import { removeFrom, tail, map } from "../../shared/common.js";
 import { isString, isFunction } from "../../shared/utils.js";
-import { Glob } from "../common/glob.js";
+import { Glob } from "../glob/glob.js";
 import { TransitionHookScope } from "./interface.js";
 /**
  * Determines if the given state matches the matchCriteria

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

@@ -31,6 +31,7 @@ import { registerIgnoredTransitionHook } from "../hooks/ignored-transition.js";
 import { registerInvalidTransitionHook } from "../hooks/invalid-transition.js";
 import { registerRedirectToHook } from "../hooks/redirect-to.js";
 import { registerUpdateUrl } from "../hooks/url.js";
+import { $injectTokens as $t, provider } from "../../injection-tokens.js";
 /**
  * The default [[Transition]] options.
  *
@@ -61,7 +62,7 @@ export let defaultTransOpts = {
  * This API is located at `router.transitionService` ([[UIRouter.transitionService]])
  */
 export class TransitionProvider {
-  static $inject = ["$routerGlobalsProvider", "$viewProvider"];
+  /* @ignore */ static $inject = provider([$t.$routerGlobals, $t.$view]);
 
   /**
    * @param {import('../globals.js').RouterGlobals} globals
@@ -92,10 +93,10 @@ export class TransitionProvider {
   }
 
   $get = [
-    "$state",
-    "$urlService",
-    "$stateRegistry",
-    "$view",
+    $t.$state,
+    $t.$url,
+    $t.$stateRegistry,
+    $t.$view,
     (stateService, urlService, stateRegistry, viewService) => {
       // Lazy load state trees
       this._deregisterHookFns.lazyLoad = registerLazyLoadHook(

package/src/router/transition/transition.js

@@ -40,9 +40,9 @@ export class Transition {
    *
    * If the target state is not valid, an error is thrown.
    *
-   * @param fromPath The path of [[PathNode]]s from which the transition is leaving.  The last node in the `fromPath`
+   * @param {Array<import('../path/path-node.js').PathNode>} 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 {import('../state/target-state.js').TargetState} targetState The target state and parameters being transitioned to (also, the transition options)
    * @param {import('../transition/transition-service.js').TransitionProvider} transitionService The [[TransitionService]] instance
    * @param {import('../globals.js').RouterGlobals} globals
    */
@@ -586,8 +586,8 @@ export class Transition {
         ).length
       );
     };
-    const newTC = this.treeChanges();
-    const pendTC = pending && pending.treeChanges();
+    const newTC = this._treeChanges;
+    const pendTC = pending && pending._treeChanges;
     if (
       pendTC &&
       same(pendTC.to, newTC.to) &&

package/src/router/url/url-matcher.js

@@ -334,9 +334,9 @@ export class UrlMatcher {
    * // returns { id: 'bob', q: 'hello', r: null }
    * ```
    *
-   * @param path    The URL path to match, e.g. `$location.path()`.
-   * @param search  URL search parameters, e.g. `$location.search()`.
-   * @param hash    URL hash e.g. `$location.hash()`.
+   * @param path    The URL path to match, e.g. `$location.getPath()`.
+   * @param search  URL search parameters, e.g. `$location.getSearch()`.
+   * @param hash    URL hash e.g. `$location.getHash()`.
    *
    * @returns The captured parameter values.
    */

package/src/router/url/url-rule.js

@@ -211,6 +211,7 @@ export class BaseUrlRule {
     this.$id = -1;
     this._group = undefined;
     this.handler = handler || ((x) => x);
+    this.priority = undefined;
   }
 
   /**

package/src/router/url/url-rules.js

@@ -5,7 +5,9 @@ import { isDefined, isFunction, isString } from "../../shared/utils.js";
 import { removeFrom } from "../../shared/common.js";
 import { UrlRuleFactory } from "./url-rule.js";
 
-const prioritySort = (a, b) => (b.priority || 0) - (a.priority || 0);
+function prioritySort(a, b) {
+  return (b.priority || 0) - (a.priority || 0);
+}
 
 const typeSort = (a, b) => {
   const weights = { STATE: 4, URLMATCHER: 4, REGEXP: 3, RAW: 2, OTHER: 1 };
@@ -36,8 +38,7 @@ const idSort = (a, b) => {
  *   - Equally sorted State and UrlMatcher rules will each match the URL.
  *     Then, the *best* match is chosen based on how many parameter values were matched.
  */
-let defaultRuleSortFn;
-defaultRuleSortFn = (a, b) => {
+function defaultRuleSortFn(a, b) {
   let cmp = prioritySort(a, b);
   if (cmp !== 0) return cmp;
   cmp = typeSort(a, b);
@@ -45,7 +46,8 @@ defaultRuleSortFn = (a, b) => {
   cmp = urlMatcherSort(a, b);
   if (cmp !== 0) return cmp;
   return idSort(a, b);
-};
+}
+
 function getHandlerFn(handler) {
   if (
     !isFunction(handler) &&
@@ -67,9 +69,10 @@ function getHandlerFn(handler) {
  *
  * The most commonly used methods are [[otherwise]] and [[when]].
  *
- * This API is found at `$urlService.rules` (see: [[UIRouter.urlService]], [[URLService.rules]])
+ * This API is found at `$url.rules` (see: [[UIRouter.urlService]], [[URLService.rules]])
  */
 export class UrlRules {
+  /** @param {UrlRuleFactory} urlRuleFactory */
   constructor(urlRuleFactory) {
     this._sortFn = defaultRuleSortFn;
     this._rules = [];