@angular-wave/angular.ts 0.4.3 → 0.4.4

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

@@ -20,8 +20,6 @@ describe("ngView", () => {
     app,
     $injector,
     $state,
-    $q,
-    $timeout,
     $ngViewScroll;
 
   const aState = {
@@ -167,11 +165,10 @@ describe("ngView", () => {
     ]);
 
     $injector.invoke(
-      (_$state_, _$q_, _$timeout_, $rootScope, _$compile_, _$ngViewScroll_) => {
+      (_$state_, _$timeout_, $rootScope, _$compile_, _$ngViewScroll_) => {
         scope = $rootScope.$new();
         $compile = _$compile_;
         $state = _$state_;
-        $q = _$q_;
         $timeout = _$timeout_;
         elem = JQLite("<div>");
         $ngViewScroll = _$ngViewScroll_;
@@ -390,7 +387,7 @@ describe("ngView", () => {
         name: "resolve",
         resolve: {
           user: function () {
-            return $timeout(() => {
+            return setTimeout(() => {
               return "joeschmoe";
             }, 100);
           },
@@ -528,22 +525,16 @@ describe("ngView", () => {
 
       // Turn on the div that holds the ng-view
       scope.someBoolean = true;
-      scope.$digest();
-
       // Verify that the ng-view is there and it has the correct content
       expect(elem.find("ng-view").text()).toBe(aState.template);
 
       // Turn off the ng-view
       scope.someBoolean = false;
-      scope.$digest();
-
       // Verify there is no ng-view in the DOM
       expect(elem.find("ng-view").length).toBe(0);
 
       // Turn on the div that holds the ng-view once again
       scope.someBoolean = true;
-      scope.$digest();
-
       // Verify that the ng-view is there and it has the correct content
       expect(elem.find("ng-view").text()).toBe(aState.template);
     });
@@ -561,13 +552,9 @@ describe("ngView", () => {
       expect(classes(elem.find("ng-view"))).not.toContain("someClass");
 
       scope.showClass = true;
-      scope.$digest();
-
       expect(classes(elem.find("ng-view"))).toContain("someClass");
 
       scope.showClass = false;
-      scope.$digest();
-
       expect(classes(elem.find("ng-view"))).not.toContain("someClass");
     });
 
@@ -584,23 +571,17 @@ describe("ngView", () => {
 
         // Lets add 3
         scope.views = ["view1", "view2", "view3"];
-        scope.$digest();
-
         // Should be 3 ng-views in the DOM
         expect(elem.find("ng-view").length).toBe(scope.views.length);
 
         // Lets add one more - yay two-way binding
         scope.views.push("view4");
-        scope.$digest();
-
         // Should have 4 ng-views
         expect(elem.find("ng-view").length).toBe(scope.views.length);
 
         // Lets remove 2 ng-views from the DOM
         scope.views.pop();
         scope.views.pop();
-        scope.$digest();
-
         // Should have 2 ng-views
         expect(elem.find("ng-view").length).toBe(scope.views.length);
       });
@@ -619,8 +600,6 @@ describe("ngView", () => {
 
         scope.views = ["view1", "view2"];
 
-        scope.$digest();
-
         let ngViews = elem.find("ng-view");
 
         expect(ngViews.eq(0).text()).toBe(lState.views.view1.template);
@@ -628,8 +607,6 @@ describe("ngView", () => {
         expect(ngViews.eq(2).length).toBe(0);
 
         scope.views.push("view3");
-        scope.$digest();
-
         ngViews = elem.find("ng-view");
 
         expect(ngViews.eq(0).text()).toBe(lState.views.view1.template);
@@ -653,8 +630,6 @@ describe("ngView", () => {
 
         scope.views = ["view1", "view2"];
 
-        scope.$digest();
-
         let ngViews = elem.find("ng-view");
 
         expect(ngViews.eq(0).text()).toBe(lState.views.view1.template);
@@ -662,8 +637,6 @@ describe("ngView", () => {
         expect(ngViews.eq(2).length).toBe(0);
 
         scope.views.push("view3");
-        scope.$digest();
-
         ngViews = elem.find("ng-view");
 
         expect(ngViews.eq(0).text()).toBe(lState.views.view1.template);
@@ -732,14 +705,14 @@ describe("ngView", () => {
   //     $animate.queue.shift();
 
   //     scope.classOn = true;
-  //     scope.$digest();
+  //     ;
 
   //     animation = $animate.queue.shift();
   //     expect(animation.event).toBe("addClass");
   //     expect(animation.element.text()).toBe(content);
 
   //     scope.classOn = false;
-  //     scope.$digest();
+  //     ;
 
   //     animation = $animate.queue.shift();
   //     expect(animation.event).toBe("removeClass");
@@ -763,7 +736,7 @@ describe("ngView", () => {
   //     expect($animate.queue.length).toBe(0);
 
   //     scope.shouldShow = true;
-  //     scope.$digest();
+  //     ;
 
   //     // $ViewDirective enter animation - Basically it's just the <!-- ngView --> comment
   //     animation = $animate.queue.shift();
@@ -776,7 +749,7 @@ describe("ngView", () => {
   //     expect(animation.element.text()).toBe(content);
 
   //     scope.shouldShow = false;
-  //     scope.$digest();
+  //     ;
 
   //     // ngView leave animation
   //     animation = $animate.queue.shift();
@@ -1048,8 +1021,6 @@ describe("ngView controllers or onEnter handlers", () => {
   it("should not go into an infinite loop when controller uses $state.go", async () => {
     el = JQLite("<div><ng-view></ng-view></div>");
     template = $compile(el)($rootScope);
-    $rootScope.$digest();
-
     await $state.transitionTo("aside");
     await wait(100);
     expect(template[0].querySelector(".aside")).toBeDefined();
@@ -1368,8 +1339,7 @@ describe("angular 1.5+ style .component()", () => {
       });
 
       const $state = svcs.$state,
-        $httpBackend = svcs.$httpBackend,
-        $q = svcs.$q;
+        $httpBackend = svcs.$httpBackend;
 
       $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
@@ -1415,8 +1385,7 @@ describe("angular 1.5+ style .component()", () => {
       });
 
       const $state = svcs.$state,
-        $httpBackend = svcs.$httpBackend,
-        $q = svcs.$q;
+        $httpBackend = svcs.$httpBackend;
 
       $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
@@ -1440,8 +1409,7 @@ describe("angular 1.5+ style .component()", () => {
       });
 
       const $state = svcs.$state,
-        $httpBackend = svcs.$httpBackend,
-        $q = svcs.$q;
+        $httpBackend = svcs.$httpBackend;
 
       $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
@@ -1462,8 +1430,7 @@ describe("angular 1.5+ style .component()", () => {
       });
 
       const $state = svcs.$state,
-        $httpBackend = svcs.$httpBackend,
-        $q = svcs.$q;
+        $httpBackend = svcs.$httpBackend;
 
       $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
@@ -1491,8 +1458,7 @@ describe("angular 1.5+ style .component()", () => {
       });
 
       const $state = svcs.$state,
-        $httpBackend = svcs.$httpBackend,
-        $q = svcs.$q;
+        $httpBackend = svcs.$httpBackend;
 
       $state.transitionTo("bindingtypes");
       await wait(100);
@@ -1547,8 +1513,7 @@ describe("angular 1.5+ style .component()", () => {
         component: "dataComponent",
       });
 
-      const $state = svcs.$state,
-        $q = svcs.$q;
+      const $state = svcs.$state;
       $state.transitionTo("data");
       await wait(100);
 
@@ -1563,8 +1528,7 @@ describe("angular 1.5+ style .component()", () => {
         resolve: { dataUser: () => "user" },
       });
 
-      const $state = svcs.$state,
-        $q = svcs.$q;
+      const $state = svcs.$state;
       $state.transitionTo("data");
       await wait(100);
 
@@ -1573,8 +1537,7 @@ describe("angular 1.5+ style .component()", () => {
 
     // Test for #3239
     it("should pass any bindings (wired from a parent component template via the ng-view) through to the child", async () => {
-      const $state = svcs.$state,
-        $q = svcs.$q;
+      const $state = svcs.$state;
 
       $stateProvider.state({
         name: "parent",
@@ -1598,8 +1561,7 @@ describe("angular 1.5+ style .component()", () => {
 
     // Test for #3239
     it("should prefer ng-view bindings over resolve data", async () => {
-      const $state = svcs.$state,
-        $q = svcs.$q;
+      const $state = svcs.$state;
 
       $stateProvider.state({
         name: "parent",
@@ -1628,8 +1590,7 @@ describe("angular 1.5+ style .component()", () => {
 
     // Test for #3239
     it("should prefer ng-view bindings over resolve data unless a bindings exists", async () => {
-      const $state = svcs.$state,
-        $q = svcs.$q;
+      const $state = svcs.$state;
 
       $stateProvider.state({
         name: "parent",
@@ -1659,8 +1620,7 @@ describe("angular 1.5+ style .component()", () => {
 
     // Test for #3239
     it("should pass & bindings (wired from a parent component via the ng-view) through to the child", async () => {
-      const $state = svcs.$state,
-        $q = svcs.$q;
+      const $state = svcs.$state;
       $rootScope.log = [];
 
       $stateProvider.state({
@@ -1693,9 +1653,8 @@ describe("angular 1.5+ style .component()", () => {
 
     // Test for #3111
     it("should bind & bindings to a resolve that returns a function", async () => {
-      const $state = svcs.$state,
-        $q = svcs.$q,
-        log = [];
+      const $state = svcs.$state;
+      log = [];
 
       $stateProvider.state({
         name: "resolve",
@@ -1717,9 +1676,8 @@ describe("angular 1.5+ style .component()", () => {
 
     // Test for #3111
     it("should bind & bindings to a resolve that returns an array-style function", async () => {
-      const $state = svcs.$state,
-        $q = svcs.$q,
-        log = [];
+      const $state = svcs.$state;
+      log = [];
 
       $stateProvider.state({
         name: "resolve",
@@ -1812,8 +1770,7 @@ describe("angular 1.5+ style .component()", () => {
       };
       $stateProvider.state(stateDef);
       const $state = svcs.$state,
-        $httpBackend = svcs.$httpBackend,
-        $q = svcs.$q;
+        $httpBackend = svcs.$httpBackend;
 
       $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
@@ -1884,8 +1841,7 @@ describe("angular 1.5+ style .component()", () => {
       });
 
       const $state = svcs.$state,
-        $httpBackend = svcs.$httpBackend,
-        $q = svcs.$q;
+        $httpBackend = svcs.$httpBackend;
 
       $templateCache.set(
         "/comp_tpl.html",
@@ -1914,8 +1870,7 @@ describe("angular 1.5+ style .component()", () => {
         ],
       });
 
-      const $state = svcs.$state,
-        $q = svcs.$q;
+      const $state = svcs.$state;
 
       $state.transitionTo("ng12-dynamic-directive", {
         type: "ng12DynamicDirective",
@@ -1997,8 +1952,7 @@ describe("angular 1.5+ style .component()", () => {
     });
 
     it("should work with componentProvider", async () => {
-      const $state = svcs.$state,
-        $q = svcs.$q;
+      const $state = svcs.$state;
       $state.go("dynamic2", { param: "abc" });
       await wait(100);
       $state.go("dynamic2", { param: "def" });

package/src/router/hooks/lazy-load.js

@@ -61,7 +61,7 @@ export function registerLazyLoadHook(
         .entering()
         .filter((state) => !!state.$$state().lazyLoad)
         .map((state) => lazyLoadState(transition, state, stateRegistry));
-      return services.$q.all(promises).then(retryTransition);
+      return Promise.all(promises).then(retryTransition);
     },
   );
 }
@@ -86,7 +86,7 @@ export function lazyLoadState(transition, state, stateRegistry) {
     };
     const error = (err) => {
       delete lazyLoadFn["_promise"];
-      return services.$q.reject(err);
+      return Promise.reject(err);
     };
     promise = lazyLoadFn["_promise"] = services.$q
       .resolve(lazyLoadFn(transition, state))

package/src/router/hooks/views.js

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

package/src/router/resolve/resolvable.js

@@ -1,5 +1,4 @@
 import { assert, isFunction, isObject } from "../../shared/utils";
-import { services } from "../common/coreservices";
 import { trace } from "../common/trace";
 import { stringify } from "../../shared/strings";
 import { isNullOrUndefined } from "../../shared/predicates";
@@ -34,7 +33,7 @@ export class Resolvable {
       this.deps = deps || [];
       this.data = data;
       this.resolved = data !== undefined;
-      this.promise = this.resolved ? services.$q.resolve(this.data) : undefined;
+      this.promise = this.resolved ? Promise.resolve(this.data) : undefined;
     } else if (
       isObject(arg1) &&
       arg1.token &&
@@ -67,10 +66,9 @@ export class Resolvable {
    * and update the Resolvable's state
    */
   resolve(resolveContext, trans) {
-    const $q = services.$q;
     // Gets all dependencies from ResolveContext and wait for them to be resolved
     const getResolvableDependencies = () =>
-      $q.all(
+      Promise.all(
         resolveContext
           .getDependencies(this)
           .map((resolvable) => resolvable.get(resolveContext, trans)),
@@ -91,8 +89,7 @@ export class Resolvable {
       return this.data;
     };
     // Sets the promise property first, then getsResolvableDependencies in the context of the promise chain. Always waits one tick.
-    return (this.promise = $q
-      .resolve()
+    return (this.promise = Promise.resolve()
       .then(getResolvableDependencies)
       .then(invokeResolveFn)
       .then(customAsyncPolicy)

package/src/router/resolve/resolve-context.js

@@ -119,7 +119,7 @@ export class ResolveContext {
    *
    * @param {string} when
    * @param trans
-   * @returns {import("../../core/q/q").QPromise<any>|any}
+   * @returns {Promise<any>|any}
    */
   resolvePath(when = "LAZY", trans) {
     // This option determines which 'when' policy Resolvables we are about to fetch.
@@ -153,7 +153,7 @@ export class ResolveContext {
       return acc.concat(wait.map(getResult));
     }, []);
     // Wait for all the "WAIT" resolvables
-    return services.$q.all(promises);
+    return Promise.all(promises);
   }
 
   injector() {

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

@@ -244,7 +244,7 @@ export class StateProvider {
       const nextCallback = callbackQueue.dequeue();
       if (nextCallback === undefined)
         return Rejection.invalid(toState.error()).toPromise();
-      const callbackResult = services.$q.resolve(
+      const callbackResult = Promise.resolve(
         nextCallback(toState, fromState, injector),
       );
       return callbackResult
@@ -459,7 +459,7 @@ export class StateProvider {
         if (error.type === RejectType.IGNORED) {
           isLatest && this.urlService.update();
           // Consider ignored `Transition.run()` as a successful `transitionTo`
-          return services.$q.resolve(this.globals.current);
+          return Promise.resolve(this.globals.current);
         }
         const detail = error.detail;
         if (
@@ -474,12 +474,12 @@ export class StateProvider {
         }
         if (error.type === RejectType.ABORTED) {
           isLatest && this.urlService.update();
-          return services.$q.reject(error);
+          return Promise.reject(error);
         }
       }
       const errorHandler = this.defaultErrorHandler();
       errorHandler(error);
-      return services.$q.reject(error);
+      return Promise.reject(error);
     };
     const transition = this.transitionService.create(currentPath, ref);
     const transitionToPromise = transition

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

@@ -12,8 +12,7 @@ describe("$state", () => {
   }
 
   async function initStateTo(state, params) {
-    const $state = $get("$state"),
-      $q = $get("$q");
+    const $state = $get("$state");
     return $state.transitionTo(state, params || {});
   }
 
@@ -241,7 +240,7 @@ describe("$state", () => {
             url: "/resolve-timeout/:foo",
             resolve: {
               value: function ($timeout) {
-                return $timeout(function () {
+                return setTimeout(function () {
                   log += "Success!";
                 }, 1);
               },
@@ -311,7 +310,6 @@ describe("$state", () => {
           _$state_,
           _$stateParams_,
           _$transitions_,
-          _$q_,
           _$location_,
           _$compile_,
           _$stateRegistry_,
@@ -320,7 +318,6 @@ describe("$state", () => {
           $state = _$state_;
           $stateParams = _$stateParams_;
           $transitions = _$transitions_;
-          $q = _$q_;
           $location = _$location_;
           $compile = _$compile_;
           $stateRegistry = _$stateRegistry_;

package/src/router/state/views.js

@@ -115,22 +115,19 @@ export class Ng1ViewConfig {
   }
 
   load() {
-    const $q = services.$q;
     const context = new ResolveContext(this.path);
     const params = this.path.reduce(
       (acc, node) => Object.assign(acc, node.paramValues),
       {},
     );
-    const promises = {
-      template: $q.resolve(
-        this.factory.fromConfig(this.viewDecl, params, context),
-      ),
-      controller: $q.resolve(this.getController(context)),
-    };
-    return $q.all(promises).then((results) => {
+    const promises = [
+      Promise.resolve(this.factory.fromConfig(this.viewDecl, params, context)),
+      Promise.resolve(this.getController(context)),
+    ];
+    return Promise.all(promises).then((results) => {
       trace.traceViewServiceEvent("Loaded", this);
-      this.controller = results.controller;
-      Object.assign(this, results.template); // Either { template: "tpl" } or { component: "cmpName" }
+      this.controller = results[0];
+      Object.assign(this, results[1]); // Either { template: "tpl" } or { component: "cmpName" }
       return this;
     });
   }

package/src/router/template-factory.js

@@ -24,21 +24,18 @@ export class TemplateFactoryProvider {
     "$http",
     "$templateCache",
     "$templateRequest",
-    "$q",
     "$injector",
     /**
      * @param {any} $http
      * @param {import("../core/cache/cache-factory").TemplateCache} $templateCache
      * @param {any} $templateRequest
-     * @param {any} $q
      * @param {import("../core/di/internal-injector").InjectorService} $injector
      * @returns
      */
-    ($http, $templateCache, $templateRequest, $q, $injector) => {
+    ($http, $templateCache, $templateRequest, $injector) => {
       this.$templateRequest = $templateRequest;
       this.$http = $http;
       this.$templateCache = $templateCache;
-      this.$q = $q;
       this.$injector = $injector;
       return this;
     },
@@ -69,9 +66,9 @@ export class TemplateFactoryProvider {
   fromConfig(config, params, context) {
     const defaultTemplate = "<ui-view></ui-view>";
     const asTemplate = (result) =>
-      this.$q.resolve(result).then((str) => ({ template: str }));
+      Promise.resolve(result).then((str) => ({ template: str }));
     const asComponent = (result) =>
-      this.$q.resolve(result).then((str) => ({ component: str }));
+      Promise.resolve(result).then((str) => ({ component: str }));
 
     const getConfigType = (config) => {
       if (isDefined(config.template)) return "template";

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

@@ -36,7 +36,6 @@ describe("templateFactory", () => {
   describe("should follow $sce policy and", () => {
     it("accepts relative URLs", async () => {
       let res = $templateFactory.fromUrl("mock/hello");
-      $scope.$digest();
       await wait(100);
       expect(res.$$state.status).toBe(1);
     });
@@ -128,7 +127,6 @@ describe("templateFactory", () => {
     it("should not prefix the components dom element with anything", async () => {
       $stateRegistry.register({ name: "cmp", component: "myComponent" });
       $stateService.go("cmp");
-      $scope.$digest();
       await wait(100);
       expect(el.html()).toMatch(/\<my-component/);
     });
@@ -139,14 +137,12 @@ describe("templateFactory", () => {
         component: "dataComponent",
       });
       $stateService.go("cmp");
-      $scope.$digest();
       expect(el.html()).toMatch(/\<x-data-component/);
     });
 
     it("should prefix the components dom element with x- for components named xFoo", () => {
       $stateRegistry.register({ name: "cmp", component: "xComponent" });
       $stateService.go("cmp");
-      $scope.$digest();
       expect(el.html()).toMatch(/\<x-x-component/);
     });
   });

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

@@ -37,7 +37,7 @@ export class TransitionHook {
     // Chain the next hook off the previous
     const createHookChainR = (prev, nextHook) =>
       prev.then(() => nextHook.invokeHook());
-    return hooks.reduce(createHookChainR, waitFor || services.$q.resolve());
+    return hooks.reduce(createHookChainR, waitFor || Promise.resolve());
   }
   /**
    * Invokes all the provided TransitionHooks, in order.

package/src/router/transition/transition.js

@@ -49,7 +49,7 @@ export class Transition {
   constructor(fromPath, targetState, transitionService, globals) {
     this.globals = globals;
     this.transitionService = transitionService;
-    this._deferred = services.$q.defer();
+    this._deferred = Promise.defer();
     /**
      * This promise is resolved or rejected based on the outcome of the Transition.
      *

package/src/router/view-hook.spec.js

@@ -129,7 +129,7 @@ describe("view hooks", () => {
       $state.defaultErrorHandler(function () {});
       ctrl.prototype.uiCanExit = function () {
         log += "canexit;";
-        return $timeout(() => {
+        return setTimeout(() => {
           log += "delay;";
           return false;
         }, 1);
@@ -145,7 +145,7 @@ describe("view hooks", () => {
     it("can wait for a promise and then allow the transition", async () => {
       ctrl.prototype.uiCanExit = function () {
         log += "canexit;";
-        return $timeout(() => {
+        return setTimeout(() => {
           log += "delay;";
         }, 1);
       };

package/src/router/view-scroll.js

@@ -9,22 +9,20 @@ export class ViewScrollProvider {
 
   $get = [
     "$anchorScroll",
-    "$timeout",
     /**
      * @param {import('../services/anchor-scroll').AnchorScrollObject} $anchorScroll
-     * @param {*} $timeout
      * @returns {import('../services/anchor-scroll').AnchorScrollObject|Function}
      */
-    ($anchorScroll, $timeout) => {
+    ($anchorScroll) => {
       if (this.enabled) {
         return $anchorScroll;
       }
       /**
        * @param {import('../shared/jqlite/jqlite').JQLite} $element
-       * @returns {import('../core/q/q').QPromise<any>}
+       * @returns {Promise<number>}
        */
-      return function ($element) {
-        return $timeout(
+      return async function ($element) {
+        return setTimeout(
           () => {
             $element[0].scrollIntoView();
           },