@angular-wave/angular.ts 0.0.21 → 0.0.23

package/src/router/directives/stateDirectives.js

@@ -8,7 +8,6 @@
 import {
   forEach,
   tail,
-  noop,
   unnestR,
   identity,
   uniqR,
@@ -63,16 +62,15 @@ function clickHook(el, $state, $timeout, type, getDef) {
   return function (e) {
     const button = e.which || e.button,
       target = getDef();
-    if (
-      !(
-        button > 1 ||
-        e.ctrlKey ||
-        e.metaKey ||
-        e.shiftKey ||
-        e.altKey ||
-        el.attr("target")
-      )
-    ) {
+
+    let res =
+      button > 1 ||
+      e.ctrlKey ||
+      e.metaKey ||
+      e.shiftKey ||
+      e.altKey ||
+      el.attr("target");
+    if (!res) {
       // HACK: This is to allow ng-clicks to be processed before the transition is initiated:
       const transition = $timeout(function () {
         if (!el.attr("disabled")) {
@@ -85,6 +83,10 @@ function clickHook(el, $state, $timeout, type, getDef) {
       e.preventDefault = function () {
         if (ignorePreventDefaultCount-- <= 0) $timeout.cancel(transition);
       };
+    } else {
+      // ignored
+      e.preventDefault();
+      e.stopImmediatePropagation();
     }
   };
 }
@@ -257,7 +259,7 @@ export let uiSrefDirective = [
     return {
       restrict: "A",
       require: ["?^uiSrefActive", "?^uiSrefActiveEq"],
-      link: function (scope, element, attrs, uiSrefActive) {
+      link: (scope, element, attrs, uiSrefActive) => {
         const type = getTypeInfo(element);
         const active = uiSrefActive[1] || uiSrefActive[0];
         let unlinkInfoFn = null;
@@ -400,7 +402,7 @@ export let uiStateDirective = [
         const getDef = () => processedDef($state, element, rawDef);
         const inputAttrs = ["uiState", "uiStateParams", "uiStateOpts"];
         const watchDeregFns = inputAttrs.reduce(
-          (acc, attr) => ((acc[attr] = noop), acc),
+          (acc, attr) => ((acc[attr] = () => {}), acc),
           {},
         );
         function update() {
@@ -579,7 +581,7 @@ export let uiSrefActiveDirective = [
             return deregister;
           };
           function updateAfterTransition(trans) {
-            trans.promise.then(update, noop);
+            trans.promise.then(update, () => {});
           }
           $scope.$on("$destroy", setupEventListeners());
           if ($router.globals.transition) {

package/src/router/directives/viewDirective.js

@@ -1,7 +1,7 @@
 import { filter, tail, unnestR } from "../../shared/common";
 import { isDefined, isFunction, isString } from "../../shared/utils";
 import { kebobString } from "../../shared/strings";
-import { noop } from "../../shared/common";
+
 import { parse } from "../../shared/hof";
 import { ResolveContext } from "../resolve/resolveContext";
 import { trace } from "../common/trace";
@@ -143,18 +143,10 @@ export let uiView = [
     function getRenderer() {
       return {
         enter: function (element, target, cb) {
-          // if (angular.version.minor > 2) {
-          //$animate.enter(element, null, target).then(cb);
-          // } else {
-          $animate.enter(element, null, target, cb);
-          // }
+          $animate.enter(element, null, target).then(cb);
         },
         leave: function (element, cb) {
-          // if (angular.version.minor > 2) {
-          //$animate.leave(element).then(cb);
-          // } else {
-          $animate.leave(element, cb);
-          // }
+          $animate.leave(element).then(cb);
         },
       };
     }
@@ -273,7 +265,7 @@ export let uiView = [
             const cloned = $transclude(newScope, function (clone) {
               clone.data("$uiViewAnim", $uiViewAnim);
               clone.data("$uiView", $uiViewData);
-              renderer.enter(clone, $element, function onUIViewEnter() {
+              renderer.enter(clone, $element, function () {
                 animEnter.resolve();
                 if (currentScope)
                   currentScope.$emit("$viewContentAnimationEnded");
@@ -338,7 +330,7 @@ export function $ViewDirectiveFill(
           );
           return;
         }
-        const cfg = data.$cfg || { viewDecl: {}, getTemplate: noop };
+        const cfg = data.$cfg || { viewDecl: {}, getTemplate: () => {} };
         const resolveCtx = cfg.path && new ResolveContext(cfg.path);
         $element.html(cfg.getTemplate($element, resolveCtx) || initial);
         trace.traceUIViewFill(data.$uiView, $element.html());

package/src/router/hooks/resolve.js

@@ -1,4 +1,3 @@
-import { noop } from "../../shared/common";
 import { ResolveContext } from "../resolve/resolveContext";
 import { val } from "../../shared/hof";
 export const RESOLVE_HOOK_PRIORITY = 1000;
@@ -14,7 +13,7 @@ export const RESOLVE_HOOK_PRIORITY = 1000;
 const eagerResolvePath = (trans) =>
   new ResolveContext(trans.treeChanges().to)
     .resolvePath("EAGER", trans)
-    .then(noop);
+    .then(() => {});
 export const registerEagerResolvePath = (transitionService) =>
   transitionService.onStart({}, eagerResolvePath, {
     priority: RESOLVE_HOOK_PRIORITY,
@@ -32,7 +31,7 @@ const lazyResolveState = (trans, state) =>
   new ResolveContext(trans.treeChanges().to)
     .subContext(state.$$state())
     .resolvePath("LAZY", trans)
-    .then(noop);
+    .then(() => {});
 export const registerLazyResolveState = (transitionService) =>
   transitionService.onEnter({ entering: val(true) }, lazyResolveState, {
     priority: RESOLVE_HOOK_PRIORITY,
@@ -50,7 +49,7 @@ export const registerLazyResolveState = (transitionService) =>
 const resolveRemaining = (trans) =>
   new ResolveContext(trans.treeChanges().to)
     .resolvePath("LAZY", trans)
-    .then(noop);
+    .then(() => {});
 export const registerResolveRemaining = (transitionService) =>
   transitionService.onFinish({}, resolveRemaining, {
     priority: RESOLVE_HOOK_PRIORITY,

package/src/router/hooks/views.js

@@ -1,4 +1,3 @@
-import { noop } from "../../shared/common";
 import { services } from "../common/coreservices";
 /**
  * A [[TransitionHookFn]] which waits for the views to load
@@ -12,7 +11,9 @@ const loadEnteringViews = (transition) => {
   const $q = services.$q;
   const enteringViews = transition.views("entering");
   if (!enteringViews.length) return;
-  return $q.all(enteringViews.map((view) => $q.when(view.load()))).then(noop);
+  return $q
+    .all(enteringViews.map((view) => $q.when(view.load())))
+    .then(() => {});
 };
 export const registerLoadEnteringViews = (transitionService) =>
   transitionService.onFinish({}, loadEnteringViews);

package/src/router/state/stateService.js

@@ -2,7 +2,6 @@ import {
   createProxyFunctions,
   defaults,
   inArray,
-  noop,
   removeFrom,
   silenceUncaughtInPromise,
   silentRejection,
@@ -86,7 +85,7 @@ export class StateService {
   }
 
   dispose() {
-    this.defaultErrorHandler(noop);
+    this.defaultErrorHandler(() => {});
     this.invalidCallbacks = [];
   }
   /**

package/src/router/stateProvider.js

@@ -5,14 +5,20 @@ import { createProxyFunctions } from "../shared/common";
 import { minErr } from "../shared/utils";
 
 const err = minErr("$stateProvider");
+// Right now this is a collection of all the properties we encounter in tests
 const validKeys = [
   "$$state",
   "__stateObjectCache",
+  "abstract",
+  "bindings",
   "controller",
+  "controllerAs",
   "controllerProvider",
   "component",
+  "componentProvider",
   "data",
   "includes",
+  "lazyLoad",
   "name",
   "navigable",
   "onEnter",
@@ -21,8 +27,10 @@ const validKeys = [
   "params",
   "parent",
   "path",
+  "redirectTo",
   "reloadOnSearch",
   "resolve",
+  "resolveAs",
   "resolvables",
   "self",
   "template",

package/src/router/templateFactory.js

@@ -10,15 +10,13 @@ import { kebobString } from "../shared/strings";
  */
 export class TemplateFactory {
   constructor() {
-    /** @hidden */ this.$get = [
+    this._useHttp = false;
+    this.$get = [
       "$http",
       "$templateCache",
-      "$injector",
-      ($http, $templateCache, $injector) => {
-        this.$templateRequest =
-          $injector.has &&
-          $injector.has("$templateRequest") &&
-          $injector.get("$templateRequest");
+      "$templateRequest",
+      ($http, $templateCache, $templateRequest) => {
+        this.$templateRequest = $templateRequest;
         this.$http = $http;
         this.$templateCache = $templateCache;
         return this;
@@ -26,6 +24,14 @@ export class TemplateFactory {
     ];
   }
 
+  /**
+   * Forces the provider to use $http service directly
+   * @param {boolean} value
+   */
+  useHttpService(value) {
+    this._useHttp = value;
+  }
+
   /**
    * Creates a template from a configuration object.
    *

package/src/router/transition/interface.js

@@ -1,14 +1,14 @@
-var TransitionHookPhase;
-(function (TransitionHookPhase) {
-  TransitionHookPhase[(TransitionHookPhase["CREATE"] = 0)] = "CREATE";
-  TransitionHookPhase[(TransitionHookPhase["BEFORE"] = 1)] = "BEFORE";
-  TransitionHookPhase[(TransitionHookPhase["RUN"] = 2)] = "RUN";
-  TransitionHookPhase[(TransitionHookPhase["SUCCESS"] = 3)] = "SUCCESS";
-  TransitionHookPhase[(TransitionHookPhase["ERROR"] = 4)] = "ERROR";
-})(TransitionHookPhase || (TransitionHookPhase = {}));
-var TransitionHookScope;
-(function (TransitionHookScope) {
-  TransitionHookScope[(TransitionHookScope["TRANSITION"] = 0)] = "TRANSITION";
-  TransitionHookScope[(TransitionHookScope["STATE"] = 1)] = "STATE";
-})(TransitionHookScope || (TransitionHookScope = {}));
-export { TransitionHookPhase, TransitionHookScope };
+/** An object for Transition Hook Phases */
+export const TransitionHookPhase = {
+  CREATE: 0,
+  BEFORE: 1,
+  RUN: 2,
+  SUCCESS: 3,
+  ERROR: 4,
+};
+
+/** An object for Transition Hook Scopes */
+export const TransitionHookScope = {
+  TRANSITION: 0,
+  STATE: 1,
+};

package/src/router/transition/rejectFactory.js

@@ -1,47 +1,56 @@
 import { silentRejection } from "../../shared/common";
 import { stringify } from "../../shared/strings";
 import { is } from "../../shared/hof";
-/** An enum for Transition Rejection reasons */
-var RejectType;
-(function (RejectType) {
+
+/**
+ * An object for Transition Rejection reasons.
+ * @enum {number}
+ */
+export const RejectType = {
   /**
    * A new transition superseded this one.
    *
    * While this transition was running, a new transition started.
-   * This transition is cancelled because it was superseded by new transition.
+   * This transition is cancelled because it was superseded by a new transition.
+   * @type {number}
    */
-  RejectType[(RejectType["SUPERSEDED"] = 2)] = "SUPERSEDED";
+  SUPERSEDED: 2,
+
   /**
-   * The transition was aborted
+   * The transition was aborted.
    *
-   * The transition was aborted by a hook which returned `false`
+   * The transition was aborted by a hook which returned `false`.
+   * @type {number}
    */
-  RejectType[(RejectType["ABORTED"] = 3)] = "ABORTED";
+  ABORTED: 3,
+
   /**
-   * The transition was invalid
+   * The transition was invalid.
    *
-   * The transition was never started because it was invalid
+   * The transition was never started because it was invalid.
+   * @type {number}
    */
-  RejectType[(RejectType["INVALID"] = 4)] = "INVALID";
+  INVALID: 4,
+
   /**
-   * The transition was ignored
+   * The transition was ignored.
    *
    * The transition was ignored because it would have no effect.
-   *
    * Either:
-   *
-   * - The transition is targeting the current state and parameter values
+   * - The transition is targeting the current state and parameter values.
    * - The transition is targeting the same state and parameter values as the currently running transition.
+   * @type {number}
    */
-  RejectType[(RejectType["IGNORED"] = 5)] = "IGNORED";
+  IGNORED: 5,
+
   /**
    * The transition errored.
    *
-   * This generally means a hook threw an error or returned a rejected promise
+   * This generally means a hook threw an error or returned a rejected promise.
+   * @type {number}
    */
-  RejectType[(RejectType["ERROR"] = 6)] = "ERROR";
-})(RejectType || (RejectType = {}));
-export { RejectType };
+  ERROR: 6,
+};
 
 let id = 0;
 export class Rejection {

package/src/router/transition/transition.js

@@ -358,7 +358,11 @@ export class Transition {
       : new Resolvable(resolvable);
     const stateName = typeof state === "string" ? state : state.name;
     const topath = this._treeChanges.to;
-    const targetNode = find(topath, (node) => node.state.name === stateName);
+    const targetNode = find(topath, (node) => {
+      return node.state.name === stateName;
+    });
+    console.assert(targetNode, `targetNode not found ${stateName}`);
+
     const resolveContext = new ResolveContext(topath);
     resolveContext.addResolvables([resolvable], targetNode.state);
   }

package/src/router/transition/transitionHook.js

@@ -1,5 +1,5 @@
 import { TransitionHookPhase } from "./interface";
-import { defaults, noop, silentRejection } from "../../shared/common";
+import { defaults, silentRejection } from "../../shared/common";
 import { fnToString, maxLength } from "../../shared/strings";
 import { isPromise } from "../../shared/predicates";
 import { is, parse } from "../../shared/hof";
@@ -8,7 +8,7 @@ import { services } from "../common/coreservices";
 import { Rejection } from "./rejectFactory";
 import { TargetState } from "../state/targetState";
 const defaultOptions = {
-  current: noop,
+  current: () => {},
   transition: null,
   traceData: {},
   bind: null,
@@ -127,7 +127,7 @@ export class TransitionHook {
       // Wait for the promise, then reprocess with the resulting value
       return result.then((val) => this.handleHookResult(val));
     }
-    trace.traceHookResult(result, this.transition, this.options);
+    trace.traceHookResult(result, this.transition);
     // Hook returned false
     if (result === false) {
       // Abort this Transition
@@ -193,7 +193,7 @@ TransitionHook.LOG_REJECTED_RESULT = (hook) => (result) => {
  * Each HookType chooses a GetErrorHandler (See: [[TransitionService._defineCoreEvents]])
  */
 TransitionHook.LOG_ERROR = (hook) => (error) => hook.logError(error);
-TransitionHook.REJECT_ERROR = (hook) => (error) => silentRejection(error);
-TransitionHook.THROW_ERROR = (hook) => (error) => {
+TransitionHook.REJECT_ERROR = () => (error) => silentRejection(error);
+TransitionHook.THROW_ERROR = () => (error) => {
   throw error;
 };

package/src/router/url/urlMatcher.js

@@ -347,11 +347,10 @@ export class UrlMatcher {
    * @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 options
    *
    * @returns The captured parameter values.
    */
-  exec(path, search = {}, hash, options = {}) {
+  exec(path, search = {}, hash) {
     const match = memoizeTo(this._cache, "pattern", () => {
       return new RegExp(
         [

package/src/router/url/urlRule.js

@@ -20,6 +20,13 @@ export class UrlRuleFactory {
   compile(str) {
     return this.router.urlMatcherFactory.compile(str);
   }
+
+  /**
+   *
+   * @param {*} what
+   * @param {*} handler
+   * @returns {BaseUrlRule}
+   */
   create(what, handler) {
     const { isState, isStateDeclaration } = StateObject;
     const makeRule = pattern([
@@ -193,13 +200,14 @@ UrlRuleFactory.isUrlRule = (obj) =>
  * A base rule which calls `match`
  *
  * The value from the `match` function is passed through to the `handler`.
- * @internal
+ * @type {angular.BaseUrlRule}
  */
 export class BaseUrlRule {
   constructor(match, handler) {
     this.match = match;
     this.type = "RAW";
-    this.matchPriority = (match) => 0 - this.$id;
+    this.$id = -1;
+    this.matchPriority = () => 0 - this.$id;
     this.handler = handler || identity;
   }
 }

package/src/router/url/urlRules.js

@@ -73,7 +73,7 @@ export class UrlRules {
     this.urlRuleFactory = new UrlRuleFactory(router);
   }
 
-  dispose(router) {
+  dispose() {
     this._rules = [];
     delete this._otherwiseFn;
   }

package/src/services/browser.js

@@ -5,18 +5,11 @@ import { forEach, isUndefined, equals } from "../shared/utils";
 // This variable should be used *only* inside the cacheState function.
 let lastCachedState = null;
 
-export function getHash(url) {
-  const index = url.indexOf("#");
-  return index === -1 ? "" : url.substr(index);
-}
-
 export function trimEmptyHash(url) {
   return url.replace(/#$/, "");
 }
 
 /**
- *
- *
  * @name $browser
  * @requires $log
  * @description
@@ -32,8 +25,6 @@ export function trimEmptyHash(url) {
  */
 export function Browser($log, $$taskTrackerFactory) {
   const self = this;
-  let { location } = window;
-  let { history } = window;
   const { setTimeout } = window;
   const { clearTimeout } = window;
   const pendingDeferIds = {};
@@ -56,10 +47,8 @@ export function Browser($log, $$taskTrackerFactory) {
 
   let cachedState;
   let lastHistoryState;
-  let lastBrowserUrl = location.href;
-  const baseElement = jqLite(
-    Array.from(window.document.getElementsByTagName("base")),
-  );
+  let lastBrowserUrl = window.location.href;
+  const baseElement = jqLite(Array.from(document.getElementsByTagName("base")));
   let pendingLocation = null;
   const getCurrentState = function getCurrentState() {
     return history.state;
@@ -96,10 +85,6 @@ export function Browser($log, $$taskTrackerFactory) {
       state = null;
     }
 
-    // Android Browser BFCache causes location, history reference to become stale.
-    if (location !== window.location) location = window.location;
-    if (history !== window.history) history = window.history;
-
     // setter
     if (url) {
       const sameState = lastHistoryState === state;
@@ -129,7 +114,7 @@ export function Browser($log, $$taskTrackerFactory) {
     // - pendingLocation is needed as browsers don't allow to read out
     //   the new location.href if a reload happened or if there is a bug like in iOS 9 (see
     //   https://openradar.appspot.com/22186109).
-    return trimEmptyHash(pendingLocation || location.href);
+    return trimEmptyHash(pendingLocation || window.location.href);
   };
 
   /**

package/src/shared/common.js

@@ -20,7 +20,6 @@ export const equals = _equals;
 export function identity(x) {
   return x;
 }
-export function noop() {}
 /**
  * Builds proxy functions on the `to` object which pass through to the `from` object.
  *

package/test/module-test.html

@@ -6,21 +6,53 @@
     <script>
       document.addEventListener("DOMContentLoaded", () => {
         var myApp = window.angular.module("test", ["ui.router"]);
-        myApp.config(function ($stateProvider) {
-          var helloState = {
-            name: "hello",
-            url: "/",
-            template: "<h3>hello world!</h3>",
-          };
-
-          $stateProvider.state(helloState);
-        });
+        myApp
+          .config(function ($stateProvider) {
+            $stateProvider
+              .state({ name: "top", url: "" })
+              .state({ name: "other", url: "/other/:id", template: "other" })
+              .state({
+                name: "other.detail",
+                url: "/detail",
+                template: "detail",
+              })
+              .state({
+                name: "contacts",
+                url: "/contacts",
+                template:
+                  '<a ui-sref=".item({ id: 5 })" class="item">Person</a> <ui-view></ui-view>',
+              })
+              .state({
+                name: "contacts.item",
+                url: "/{id:int}",
+                template:
+                  '<a ui-sref=".detail" class="item-detail">Detail</a> | <a ui-sref="^" class="item-parent">Parent</a> | <ui-view></ui-view>',
+              })
+              .state({
+                name: "contacts.item.detail",
+                url: "/{id}",
+                template:
+                  '<div class="title">Detail</div> | <a ui-sref="^" class="item-parent2">Item</a>',
+              });
+          })
+          .controller(
+            "TestController",
+            class {
+              constructor($q) {
+                const defer = $q.defer();
+                this.contact = defer.promise;
+                this.test = 1;
+                defer.resolve({ id: 6 });
+              }
+            },
+          );
       });
     </script>
   </head>
   <body ng-app="test">
-    {{ 2 + 2 }}
-    <a ui-sref="hello" ui-sref-active="active">Hello</a>
-    <ui-view></ui-view>
+    <div ng-controller="TestController as $ctrl">
+      {{$ctrl.test}}
+      <a ui-sref="contacts.item.detail({ id: contact.id })">Details</a>
+    </div>
   </body>
 </html>