@angular-wave/angular.ts 0.4.2 → 0.4.4

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

@@ -50,10 +50,8 @@ describe("ngStateRef", () => {
     $injector = window.angular.bootstrap(document.getElementById("dummy"), [
       "defaultModule",
     ]);
-    $q = $injector.get("$q");
     $rootScope = $injector.get("$rootScope");
     $compile = $injector.get("$compile");
-    $timeout = $injector.get("$timeout");
     $state = $injector.get("$state");
     $stateParams = $injector.get("$stateParams");
     $urlService = $injector.get("$urlService");
@@ -74,7 +72,6 @@ describe("ngStateRef", () => {
       defer.resolve({ id: 6 });
       el = $compile(el)($rootScope);
 
-      $rootScope.$digest();
       expect(el.attr("href")).toBe("#/contacts/6");
     });
   });
@@ -91,7 +88,6 @@ describe("ngStateRef", () => {
 
     $compile(el)(scope);
     $compile(el2)(scope);
-    scope.$digest();
   }
 
   describe("links", () => {
@@ -118,7 +114,6 @@ describe("ngStateRef", () => {
       $rootScope.$apply();
 
       $compile(el)($rootScope);
-      $rootScope.$digest();
       expect(el.attr("href")).toBe("#/contacts/3");
     });
 
@@ -194,12 +189,8 @@ describe("ngStateRef", () => {
     it("should allow passing params to current state", async () => {
       $state.go("other", { id: "abc" });
       $rootScope.$index = "def";
-      $rootScope.$digest();
-
       el = JQLite('<a ng-sref="{id: $index}">Details</a>');
       $compile(el)($rootScope);
-      $rootScope.$digest();
-
       expect($state.current.name).toBe("other");
       expect($state.params.id).toEqual("abc");
       expect(el.attr("href")).toBe("#/other/def");
@@ -211,8 +202,6 @@ describe("ngStateRef", () => {
 
       $rootScope.$index = "ghi";
       $state.go("other.detail");
-      $rootScope.$digest();
-
       expect($state.current.name).toBe("other.detail");
       expect($state.params.id).toEqual("def");
 
@@ -226,14 +215,11 @@ describe("ngStateRef", () => {
 
     it("should allow multi-line attribute values when passing params to current state", async () => {
       $state.go("contacts.item.detail", { id: "123" });
-      $rootScope.$digest();
-
       el = JQLite('<a ng-sref="{\n\tid: $index\n}">Details</a>');
       $rootScope.$index = 3;
       $rootScope.$apply();
 
       $compile(el)($rootScope);
-      $rootScope.$digest();
       expect(el.attr("href")).toBe("#/contacts/3");
     });
 
@@ -244,13 +230,11 @@ describe("ngStateRef", () => {
       template = $compile(el)($rootScope);
 
       $rootScope.urlParams = { id: 1 };
-      $rootScope.$digest();
       expect(JQLite(template[0].querySelector("a")).attr("href")).toBe(
         "#/contacts/1",
       );
 
       $rootScope.urlParams.id = 2;
-      $rootScope.$digest();
       expect(JQLite(template[0].querySelector("a")).attr("href")).toBe(
         "#/contacts/2",
       );
@@ -300,7 +284,6 @@ describe("ngStateRef", () => {
       scope = $rootScope;
       Object.assign(scope, { state: "contacts", params: {} });
       template = $compile(el)(scope);
-      scope.$digest();
     });
 
     it("sets the correct initial href", () => {
@@ -312,11 +295,9 @@ describe("ngStateRef", () => {
 
       scope.state = "contacts.item";
       scope.params = { id: 5 };
-      scope.$digest();
       expect(JQLite(template[0]).attr("href")).toBe("#/contacts/5");
 
       scope.params.id = 25;
-      scope.$digest();
       expect(JQLite(template[0]).attr("href")).toBe("#/contacts/25");
     });
 
@@ -325,31 +306,26 @@ describe("ngStateRef", () => {
       expect(template[0].className).not.toContain("activeeq");
 
       $state.go("contacts");
-      scope.$digest();
       await wait(100);
       expect(template[0].className).toContain("active activeeq");
 
       scope.state = "contacts.item";
       scope.params = { id: 5 };
-      scope.$digest();
       await wait(100);
       expect(template[0].className).not.toContain("active");
       expect(template[0].className).not.toContain("activeeq");
 
       $state.go("contacts.item", { id: -5 });
-      scope.$digest();
       await wait(100);
       expect(template[0].className).not.toContain("active");
       expect(template[0].className).not.toContain("activeeq");
 
       $state.go("contacts.item", { id: 5 });
-      scope.$digest();
       await wait(100);
       expect(template[0].className).toContain("active activeeq");
 
       scope.state = "contacts";
       scope.params = {};
-      scope.$digest();
       await wait(100);
       expect(template[0].className).toContain("active");
       expect(template[0].className).not.toContain("activeeq");
@@ -359,15 +335,12 @@ describe("ngStateRef", () => {
       expect(JQLite(template[0]).attr("href")).toBe("#/contacts");
       scope.state = "other";
       scope.params = { id: "123" };
-      scope.$digest();
       expect(JQLite(template[0]).attr("href")).toBe("#/other/123");
     });
 
     it("should allow passing params to current state using empty ng-state", async () => {
       await $state.go("other", { id: "abc" });
       $rootScope.$index = "def";
-      $rootScope.$digest();
-
       el = JQLite('<a ng-state="" ng-state-params="{id: $index}">Details</a>');
       $compile(el)($rootScope);
 
@@ -383,8 +356,6 @@ describe("ngStateRef", () => {
 
       $rootScope.$index = "ghi";
       await $state.go("other.detail");
-      $rootScope.$digest();
-
       expect($state.current.name).toBe("other.detail");
       expect($state.params.id).toEqual("def");
 
@@ -400,25 +371,21 @@ describe("ngStateRef", () => {
     it("retains the old href if the new points to a non-state", () => {
       expect(JQLite(template[0]).attr("href")).toBe("#/contacts");
       scope.state = "nostate";
-      scope.$digest();
       expect(JQLite(template[0]).attr("href")).toBe("#/contacts");
     });
 
     it("accepts param overrides", () => {
       scope.state = "contacts.item";
       scope.params = { id: 10 };
-      scope.$digest();
       expect(JQLite(template[0]).attr("href")).toBe("#/contacts/10");
     });
 
     it("accepts param overrides", () => {
       scope.state = "contacts.item";
       scope.params = { id: 10 };
-      scope.$digest();
       expect(JQLite(template[0]).attr("href")).toBe("#/contacts/10");
 
       scope.params.id = 22;
-      scope.$digest();
       expect(JQLite(template[0]).attr("href")).toBe("#/contacts/22");
     });
 
@@ -432,11 +399,9 @@ describe("ngStateRef", () => {
       scope.state1 = "contacts.item";
       scope.state2 = "other";
       scope.params = { id: 10 };
-      scope.$digest();
       expect(JQLite(template[0]).attr("href")).toBe("#/contacts/10");
 
       scope.exprvar = "state2";
-      scope.$digest();
       expect(JQLite(template[0]).attr("href")).toBe("#/other/10");
     });
 
@@ -446,13 +411,11 @@ describe("ngStateRef", () => {
       scope.state = "contacts.item";
       scope.params = { id: 10 };
       template = $compile(el)(scope);
-      scope.$digest();
       expect(JQLite(template[0]).attr("href")).toBe("#/contacts/10");
 
       scope.state = "other";
       scope.params = { id: 22 };
 
-      scope.$digest();
       expect(JQLite(template[0]).attr("href")).toBe("#/contacts/10");
     });
 
@@ -463,8 +426,6 @@ describe("ngStateRef", () => {
       scope.state = "contacts";
       scope.opts = { reload: true };
       template = $compile(el)(scope);
-      scope.$digest();
-
       spyOn($state, "go").and.callFake(function (state, params, options) {
         transitionOptions = options;
       });
@@ -496,8 +457,6 @@ describe("ngStateRef", () => {
 
         scope.state = "contacts";
         $compile(el)(scope);
-        scope.$digest();
-
         browserTrigger(el, "change");
         await wait(100);
 
@@ -511,15 +470,11 @@ describe("ngStateRef", () => {
 
         scope.state = "contacts";
         $compile(el)(scope);
-        scope.$digest();
-
         browserTrigger(el, "change");
         await wait(100);
         expect($state.current.name).toEqual("contacts");
 
         $state.go("top");
-        scope.$digest();
-
         expect($state.current.name).toEqual("top");
 
         browserTrigger(el, "blur");
@@ -535,15 +490,11 @@ describe("ngStateRef", () => {
 
         scope.state = "contacts";
         $compile(el)(scope);
-        scope.$digest();
-
         browserTrigger(el, "mouseover");
         await wait(100);
         expect($state.current.name).toEqual("contacts");
 
         $state.go("top");
-        scope.$digest();
-
         expect($state.current.name).toEqual("top");
 
         browserTrigger(el, "mousedown");
@@ -565,7 +516,6 @@ describe("ngStateRef", () => {
       scope.$apply();
 
       $compile(el)(scope);
-      scope.$digest();
     });
 
     it("should generate the correct action", () => {
@@ -637,7 +587,6 @@ describe("ngStateRef", () => {
     it("should bind click event by default", async () => {
       el = JQLite('<a ng-sref="contacts"></a>');
       $compile(el)($rootScope);
-      $rootScope.$digest();
       expect($state.current.name).toEqual("top");
 
       browserTrigger(el, "click");
@@ -651,7 +600,6 @@ describe("ngStateRef", () => {
         '<input type="text" ng-sref="contacts" ng-sref-opts="{ events: [\'change\'] }">',
       );
       $compile(el)($rootScope);
-      $rootScope.$digest();
       expect($state.current.name).toEqual("top");
 
       browserTrigger(el, "change");
@@ -665,7 +613,6 @@ describe("ngStateRef", () => {
         '<input type="text" ng-sref="contacts" ng-sref-opts="{ events: [\'change\', \'blur\'] }">',
       );
       $compile(el)($rootScope);
-      $rootScope.$digest();
       expect($state.current.name).toEqual("top");
 
       browserTrigger(el, "change");
@@ -673,8 +620,6 @@ describe("ngStateRef", () => {
       expect($state.current.name).toEqual("contacts");
 
       await $state.go("top");
-      $rootScope.$digest();
-
       expect($state.current.name).toEqual("top");
 
       browserTrigger(el, "blur");
@@ -687,7 +632,6 @@ describe("ngStateRef", () => {
         "<a ng-sref=\"contacts\" ng-sref-opts=\"{ events: ['mouseover', 'mousedown'] }\">",
       );
       $compile(el)($rootScope);
-      $rootScope.$digest();
       expect($state.current.name).toEqual("top");
 
       browserTrigger(el, "mouseover");
@@ -695,8 +639,6 @@ describe("ngStateRef", () => {
       expect($state.current.name).toEqual("contacts");
 
       await $state.go("top");
-      $rootScope.$digest();
-
       expect($state.current.name).toEqual("top");
 
       browserTrigger(el, "mousedown");
@@ -759,10 +701,8 @@ describe("ngSrefActive", () => {
     $injector = window.angular.bootstrap(document.getElementById("dummy"), [
       "defaultModule",
     ]);
-    $q = $injector.get("$q");
     $rootScope = $injector.get("$rootScope");
     $compile = $injector.get("$compile");
-    $timeout = $injector.get("$timeout");
     $state = $injector.get("$state");
     $stateParams = $injector.get("$stateParams");
   });
@@ -772,8 +712,6 @@ describe("ngSrefActive", () => {
       '<div><a ng-sref="contacts.item({ id: 1 })" ng-sref-active="active">Contacts</a><a ng-sref="contacts.item({ id: 2 })" ng-sref-active="active">Contacts</a></div>',
     );
     template = $compile(el)($rootScope);
-    $rootScope.$digest();
-
     expect(JQLite(template[0].querySelector("a")).attr("class")).toBeFalsy();
     $state.transitionTo("contacts.item", { id: 1 });
     await wait(100);
@@ -789,8 +727,6 @@ describe("ngSrefActive", () => {
       '<div><a ng-sref="contacts.item.detail({ foo: \'bar\' })" ng-sref-active="active">Contacts</a></div>',
     );
     template = $compile(el)($rootScope);
-    $rootScope.$digest();
-
     expect(JQLite(template[0].querySelector("a")).attr("class")).toBeFalsy();
     $state.transitionTo("contacts.item.detail", { id: 5, foo: "bar" });
     await wait(100);
@@ -807,8 +743,6 @@ describe("ngSrefActive", () => {
       '<div><a ng-sref="arrayparam({ foo: [1,2,3] })" ng-sref-active="active">foo 123</a></div>',
     );
     template = $compile(el)($rootScope);
-    $rootScope.$digest();
-
     expect(JQLite(template[0].querySelector("a")).attr("class")).toBeFalsy();
 
     $state.transitionTo("arrayparam", { foo: [1, 2, 3] });
@@ -830,8 +764,6 @@ describe("ngSrefActive", () => {
       '<div><a ng-sref="arrayparam({ foo: [1,2,3] })" ng-sref-active-eq="active">foo 123</a></div>',
     );
     template = $compile(el)($rootScope);
-    $rootScope.$digest();
-
     expect(JQLite(template[0].querySelector("a")).attr("class")).toBeFalsy();
 
     $state.transitionTo("arrayparam", { foo: [1, 2, 3] });
@@ -853,15 +785,12 @@ describe("ngSrefActive", () => {
     );
     template = $compile(el)($rootScope);
     $rootScope.fooId = "bar";
-    $rootScope.$digest();
-
     expect(JQLite(template[0].querySelector("a")).attr("class")).toBeFalsy();
     $state.transitionTo("contacts.item.detail", { id: 5, foo: "bar" });
     await wait(100);
     expect(JQLite(template[0].querySelector("a")).attr("class")).toBe("active");
 
     $rootScope.fooId = "baz";
-    $rootScope.$digest();
     await wait(100);
     expect(JQLite(template[0].querySelector("a")).attr("class")).toBeFalsy();
   });
@@ -870,7 +799,6 @@ describe("ngSrefActive", () => {
     template = $compile(
       '<div><a ng-sref="contacts.item({ id: 1 })" ng-sref-active="active">Contacts</a></div>',
     )($rootScope);
-    $rootScope.$digest();
     const a = JQLite(template[0].getElementsByTagName("a")[0]);
 
     $state.transitionTo("contacts.item.edit", { id: 1 });
@@ -888,7 +816,6 @@ describe("ngSrefActive", () => {
     template = $compile(
       '<div><a ng-sref="contacts.item({ id: 1 })" ng-sref-active-eq="active">Contacts</a></div>',
     )($rootScope);
-    $rootScope.$digest();
     const a = JQLite(template[0].getElementsByTagName("a")[0]);
 
     $state.transitionTo("contacts.item", { id: 1 });
@@ -904,7 +831,6 @@ describe("ngSrefActive", () => {
     template = $compile(
       '<div><a ng-sref="contacts.item({ id: 1 })" ng-sref-active="active" ng-sref-active-eq="active-eq">Contacts</a></div>',
     )($rootScope);
-    $rootScope.$digest();
     const a = JQLite(template[0].getElementsByTagName("a")[0]);
 
     $state.transitionTo("contacts.item", { id: 1 });
@@ -921,8 +847,6 @@ describe("ngSrefActive", () => {
   it("should resolve relative state refs", async () => {
     el = JQLite("<section><div ng-view></div></section>");
     template = $compile(el)($rootScope);
-    $rootScope.$digest();
-
     $state.transitionTo("contacts");
     await wait(100);
     expect(
@@ -943,8 +867,6 @@ describe("ngSrefActive", () => {
       '<div ng-sref-active="active"><a ng-sref="contacts.item({ id: 1 })">Contacts</a><a ng-sref="contacts.item({ id: 2 })">Contacts</a></div>',
     );
     template = $compile(el)($rootScope);
-    $rootScope.$digest();
-
     expect(JQLite(template[0]).attr("class")).toBeUndefined();
 
     $state.transitionTo("contacts.item", { id: 1 });
@@ -1006,7 +928,6 @@ describe("ngSrefActive", () => {
     template = $compile(
       '<div><a ng-sref="contacts.item({ id: 1 })" ng-sref-active="active also-active">Contacts</a></div>',
     )($rootScope);
-    $rootScope.$digest();
     const a = JQLite(template[0].getElementsByTagName("a")[0]);
 
     $state.transitionTo("contacts.item.edit", { id: 1 });
@@ -1031,7 +952,6 @@ describe("ngSrefActive", () => {
     template = $compile(
       '<div ng-sref-active="active"><a ng-sref="contacts.lazy.s1">Lazy</a></div><div ng-sref-active="active"><a ng-sref="contacts.lazy.s2"></a></div>',
     )($rootScope);
-    $rootScope.$digest();
     $state.transitionTo("contacts.lazy.s1");
     await wait(100);
 
@@ -1094,7 +1014,6 @@ describe("ngSrefActive", () => {
       el = $compile("<div ng-sref-active=\"{active: 'admin.roles'}\"/>")(
         $rootScope,
       );
-      $rootScope.$digest();
       timeoutFlush();
       expect(el.hasClass("active")).toBeTruthy();
     });
@@ -1115,7 +1034,6 @@ describe("ngSrefActive", () => {
       template = $compile(
         '<div ng-sref-active="{ active: \'contacts.lazy.s1\' }"><a ng-sref="contacts.lazy.s1">Lazy</a></div><div ng-sref-active="{ active: \'contacts.lazy.s2\' }"></div>',
       )($rootScope);
-      $rootScope.$digest();
       $state.transitionTo("contacts.lazy.s1");
       await wait(100);
       expect(template.eq(0).hasClass("active")).toBeTruthy();
@@ -1165,7 +1083,6 @@ describe("ngSrefActive", () => {
       el = $compile(
         "<div ng-sref-active=\"{active: ['admin.roles', 'admin.someOtherState']}\"/>",
       )($rootScope);
-      $rootScope.$digest();
       timeoutFlush();
       expect(el.hasClass("active")).toBeTruthy();
     });

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

@@ -137,8 +137,7 @@ export let ngView = [
   "$animate",
   "$ngViewScroll",
   "$interpolate",
-  "$q",
-  function $ViewDirective($view, $animate, $ngViewScroll, $interpolate, $q) {
+  function $ViewDirective($view, $animate, $ngViewScroll, $interpolate) {
     function getRenderer() {
       return {
         enter: function (element, target, cb) {
@@ -158,7 +157,7 @@ export let ngView = [
     };
     const directive = {
       count: 0,
-      restrict: "ECA",
+      restrict: "EA",
       terminal: true,
       priority: 400,
       transclude: "element",
@@ -237,6 +236,7 @@ export let ngView = [
           }
           function updateView(config) {
             const newScope = scope.$new();
+
             const animEnter = $q.defer(),
               animLeave = $q.defer();
             const $ngViewData = {
@@ -292,19 +292,12 @@ $ViewDirectiveFill.$inject = [
   "$controller",
   "$transitions",
   "$view",
-  "$q",
 ];
-export function $ViewDirectiveFill(
-  $compile,
-  $controller,
-  $transitions,
-  $view,
-  $q,
-) {
+export function $ViewDirectiveFill($compile, $controller, $transitions, $view) {
   const getControllerAs = parse("viewDecl.controllerAs");
   const getResolveAs = parse("viewDecl.resolveAs");
   return {
-    restrict: "ECA",
+    restrict: "EA",
     priority: -400,
     compile: function (tElement) {
       const initial = tElement.html();
@@ -373,7 +366,6 @@ export function $ViewDirectiveFill(
             function (ctrlInstance) {
               if (!ctrlInstance) return;
               registerControllerCallbacks(
-                $q,
                 $transitions,
                 ctrlInstance,
                 scope,
@@ -393,7 +385,6 @@ export function $ViewDirectiveFill(
 let _uiCanExitId = 0;
 /** @ignore TODO: move these callbacks to $view and/or `/hooks/components.ts` or something */
 function registerControllerCallbacks(
-  $q,
   $transitions,
   controllerInstance,
   $scope,
@@ -470,7 +461,7 @@ function registerControllerCallbacks(
       let promise;
       const ids = (trans[cacheProp] = trans[cacheProp] || {});
       if (!prevTruthyAnswer(trans)) {
-        promise = $q.resolve(controllerInstance.uiCanExit(trans));
+        promise = Promise.resolve(controllerInstance.uiCanExit(trans));
         promise.then((val) => (ids[id] = val !== false));
       }
       return promise;