@angular-wave/angular.ts 0.4.4 → 0.4.6

package/src/core/location/location.spec.js

@@ -785,7 +785,7 @@ describe("$location", () => {
   //         $browser,
   //         "url",
   //       ).and.callThrough();
-  //       ;
+  //       $rootScope.$digest();
   //       expect($browserUrl).not.toHaveBeenCalled();
   //     });
   //   });
@@ -815,7 +815,7 @@ describe("$location", () => {
   //         }
   //       });
   //       expect($browser.url()).toEqual("http://server/base/#!/home");
-  //       ;
+  //       $rootScope.$digest();
   //       expect(handlerCalled).toEqual(true);
   //       expect($browser.url()).toEqual("http://server/base/#!/");
   //     });
@@ -829,7 +829,7 @@ describe("$location", () => {
   //     });
   //     inject(($location, $browser, $rootScope) => {
   //       expect(() => {
-  //         ;
+  //         $rootScope.$digest();
   //       }).not.toThrow();
   //     });
   //   });
@@ -843,7 +843,7 @@ describe("$location", () => {
   //     });
   //     inject(($location, $browser, $rootScope) => {
   //       expect(() => {
-  //         ;
+  //         $rootScope.$digest();
   //       }).not.toThrow();
   //     });
   //   });
@@ -857,7 +857,7 @@ describe("$location", () => {
   //     });
   //     inject(($location, $browser, $rootScope) => {
   //       expect(() => {
-  //         ;
+  //         $rootScope.$digest();
   //       }).not.toThrow();
   //     });
   //   });
@@ -867,10 +867,10 @@ describe("$location", () => {
   //     initService({ html5Mode: true, supportHistory: true });
   //     mockUpBrowser({ initialUrl: "http://localhost:9876/", baseHref: "/" });
   //     inject(($location, $browser, $rootScope) => {
-  //       ;
+  //       $rootScope.$digest();
   //       $browser.url("http://localhost:9876/?q='");
   //       expect(() => {
-  //         ;
+  //         $rootScope.$digest();
   //       }).not.toThrow();
   //     });
   //   });
@@ -880,7 +880,7 @@ describe("$location", () => {
   //     initService({ html5Mode: true, supportHistory: true });
   //     mockUpBrowser({ initialUrl: "http://localhost:9876/", baseHref: "/" });
   //     inject(($window, $location, $browser, $rootScope) => {
-  //       ;
+  //       $rootScope.$digest();
   //       $window.location.href = "http://localhost:9876/?q='";
   //       expect(() => {
   //         JQLite($window).triggerHandler("popstate");
@@ -901,7 +901,7 @@ describe("$location", () => {
   //       $window,
   //     ) => {
   //       $location.url("baz");
-  //       ;
+  //       $rootScope.$digest();
 
   //       const originalUrl = $window.location.href;
 
@@ -931,7 +931,7 @@ describe("$location", () => {
   //       $window,
   //     ) => {
   //       $location.url("baz");
-  //       ;
+  //       $rootScope.$digest();
 
   //       $rootScope.$apply(() => {
   //         $rootScope.$evalAsync(() => {
@@ -969,7 +969,7 @@ describe("$location", () => {
 
   //         updatePathOnLocationChangeSuccessTo("/Home");
 
-  //         ;
+  //         $rootScope.$digest();
 
   //         expect($browser.url()).toEqual("http://server/app/#!/Home");
   //         expect($location.path()).toEqual("/Home");
@@ -991,7 +991,7 @@ describe("$location", () => {
 
   //         updatePathOnLocationChangeSuccessTo("/");
 
-  //         ;
+  //         $rootScope.$digest();
 
   //         expect($browser.url()).toEqual("http://server/app/#!/");
   //         expect($location.path()).toEqual("/");
@@ -1014,7 +1014,7 @@ describe("$location", () => {
   //         ).and.callThrough();
 
   //         updatePathOnLocationChangeSuccessTo("/Home");
-  //         ;
+  //         $rootScope.$digest();
 
   //         expect($browser.url()).toEqual("http://server/app/#!/Home");
   //         expect($location.path()).toEqual("/Home");
@@ -1037,7 +1037,7 @@ describe("$location", () => {
   //         ).and.callThrough();
 
   //         updatePathOnLocationChangeSuccessTo("/");
-  //         ;
+  //         $rootScope.$digest();
 
   //         expect($browser.url()).toEqual("http://server/app/#!/");
   //         expect($location.path()).toEqual("/");
@@ -1059,7 +1059,7 @@ describe("$location", () => {
   //         const $location = $injector.get("$location");
   //         updatePathOnLocationChangeSuccessTo("/Home");
 
-  //         ;
+  //         $rootScope.$digest();
 
   //         expect($browser.url()).toEqual("http://server/app/Home");
   //         expect($location.path()).toEqual("/Home");
@@ -1079,7 +1079,7 @@ describe("$location", () => {
   //         const $location = $injector.get("$location");
   //         updatePathOnLocationChangeSuccessTo("/");
 
-  //         ;
+  //         $rootScope.$digest();
 
   //         expect($browser.url()).toEqual("http://server/app/");
   //         expect($location.path()).toEqual("/");
@@ -1099,7 +1099,7 @@ describe("$location", () => {
   //         const $location = $injector.get("$location");
   //         updatePathOnLocationChangeSuccessTo("/Home");
 
-  //         ;
+  //         $rootScope.$digest();
 
   //         expect($browser.url()).toEqual("http://server/app/Home");
   //         expect($location.path()).toEqual("/Home");
@@ -1119,7 +1119,7 @@ describe("$location", () => {
   //         const $location = $injector.get("$location");
   //         updatePathOnLocationChangeSuccessTo("/");
 
-  //         ;
+  //         $rootScope.$digest();
 
   //         expect($browser.url()).toEqual("http://server/app/");
   //         expect($location.path()).toEqual("/");
@@ -1140,7 +1140,7 @@ describe("$location", () => {
   //         const $location = $injector.get("$location");
   //         updatePathOnLocationChangeSuccessTo("/", { q: "'" });
 
-  //         ;
+  //         $rootScope.$digest();
 
   //         expect($location.path()).toEqual("/");
   //         expect($location.search()).toEqual({ q: "'" });
@@ -1200,7 +1200,7 @@ describe("$location", () => {
   //         }
   //       });
 
-  //       ;
+  //       $rootScope.$digest();
   //       expect($location.absUrl()).toBe(NEW_URL);
   //     });
   //   });
@@ -1299,7 +1299,7 @@ describe("$location", () => {
   //         },
   //       );
 
-  //       ;
+  //       $rootScope.$digest();
   //       expect($browser.url()).toBe("http://new.com/a/b#!/changed");
   //     });
   //   });
@@ -1310,7 +1310,7 @@ describe("$location", () => {
   //     inject(($rootScope, $browser, $location) => {
   //       $location.hash("test");
 
-  //       ;
+  //       $rootScope.$digest();
   //       expect($browser.url()).toBe("http://new.com/a/b##test");
   //     });
   //   });
@@ -1334,7 +1334,7 @@ describe("$location", () => {
   //     mockUpBrowser({ initialUrl: "http://new.com/a/b/", baseHref: "/a/b/" });
   //     inject(($location, $rootScope, $window) => {
   //       $window.history.pushState({ b: 3 });
-  //       ;
+  //       $rootScope.$digest();
 
   //       expect($location.state()).toEqual({ b: 3 });
 
@@ -1343,7 +1343,7 @@ describe("$location", () => {
   //         null,
   //         `${$window.location.href}c?d=e#f`,
   //       );
-  //       ;
+  //       $rootScope.$digest();
 
   //       expect($location.path()).toBe("/c");
   //       expect($location.search()).toEqual({ d: "e" });
@@ -1358,10 +1358,10 @@ describe("$location", () => {
   //     mockUpBrowser({ initialUrl: "http://server/app/", baseHref: "/app/" });
   //     inject(($rootScope, $injector, $window) => {
   //       const $location = $injector.get("$location");
-  //       ; // allow $location initialization to finish
+  //       $rootScope.$digest(); // allow $location initialization to finish
 
   //       $window.history.pushState({}, null, "http://server/app/Home?q='");
-  //       ;
+  //       $rootScope.$digest();
 
   //       expect($location.absUrl()).toEqual("http://server/app/Home?q='");
   //       expect($location.path()).toEqual("/Home");
@@ -1375,7 +1375,7 @@ describe("$location", () => {
   //     mockUpBrowser({ initialUrl: "http://server/app/", baseHref: "/app/" });
   //     inject(($rootScope, $injector, $window) => {
   //       const $location = $injector.get("$location");
-  //       ; // allow $location initialization to finish
+  //       $rootScope.$digest(); // allow $location initialization to finish
 
   //       $window.location.href = "http://server/app/Home?q='";
   //       JQLite($window).triggerHandler("popstate");

package/src/core/on.spec.js

@@ -101,6 +101,7 @@ describe("ngOn* event binding", () => {
       $rootScope,
     );
     const cb = ($rootScope.cb = jasmine.createSpy("ng-on cb"));
+    $rootScope.$digest();
     element.triggerHandler("asdf");
     expect(cb).toHaveBeenCalled();
     expect(element.attr("asdf")).toBe("foo");
@@ -111,6 +112,7 @@ describe("ngOn* event binding", () => {
       $rootScope,
     );
     const cb = ($rootScope.cb = jasmine.createSpy("ng-on cb"));
+    $rootScope.$digest();
     element.triggerHandler("asdf");
     expect(cb).toHaveBeenCalled();
     expect(element.attr("asdf")).toBe("foo");
@@ -121,6 +123,7 @@ describe("ngOn* event binding", () => {
       $rootScope,
     );
     const cb = ($rootScope.cb = jasmine.createSpy("ng-on cb"));
+    $rootScope.$digest();
     element.triggerHandler("asdf");
     expect(cb).toHaveBeenCalled();
     expect(element[0].asdf).toBe(123);
@@ -194,6 +197,8 @@ describe("ngOn* event binding", () => {
   it("should correctly bind to kebab-cased event names", () => {
     const element = $compile('<span ng-on-foo-bar="cb()"></span>')($rootScope);
     const cb = ($rootScope.cb = jasmine.createSpy("ng-on cb"));
+    $rootScope.$digest();
+
     element.triggerHandler("foobar");
     element.triggerHandler("fooBar");
     expect(cb).not.toHaveBeenCalled();
@@ -205,6 +210,8 @@ describe("ngOn* event binding", () => {
   it("should correctly bind to camelCased event names", () => {
     const element = $compile('<span ng-on-foo_bar="cb()"></span>')($rootScope);
     const cb = ($rootScope.cb = jasmine.createSpy("ng-on cb"));
+    $rootScope.$digest();
+
     element.triggerHandler("foobar");
     element.triggerHandler("foo-bar");
     element.triggerHandler("foo-bar");

package/src/core/parse/interpreter.js

@@ -1,4 +1,4 @@
-import { isDefined, isFunction, isObject } from "../../shared/utils";
+import { isDefined } from "../../shared/utils";
 import { ASTType } from "./ast-type";
 
 export const PURITY_ABSOLUTE = 1;
@@ -66,7 +66,6 @@ export class ASTInterpreter {
     if (inputs) {
       fn.inputs = inputs;
     }
-    fn.decoratedNode = decoratedNode;
     return fn;
   }
 
@@ -135,10 +134,9 @@ export class ASTInterpreter {
           ? function (scope, locals, assign) {
               const values = [];
               for (let i = 0; i < args.length; ++i) {
-                const res = args[i](scope, locals, assign);
-                values.push(isFunction(res) ? res() : res);
+                values.push(args[i](scope, locals, assign));
               }
-              const value = () => right.apply(undefined, values);
+              const value = right.apply(undefined, values);
               return context
                 ? { context: undefined, name: undefined, value }
                 : value;
@@ -146,11 +144,10 @@ export class ASTInterpreter {
           : function (scope, locals, assign) {
               const rhs = right(scope, locals, assign);
               let value;
-              if (rhs.value != null && isFunction(rhs.value)) {
+              if (rhs.value != null) {
                 const values = [];
                 for (let i = 0; i < args.length; ++i) {
-                  const res = args[i](scope, locals, assign);
-                  values.push(isFunction(res) ? res() : res);
+                  values.push(args[i](scope, locals, assign));
                 }
                 value = rhs.value.apply(rhs.context, values);
               }
@@ -813,8 +810,8 @@ function assignableAST(ast) {
 }
 
 function plusFn(l, r) {
-  if (typeof l === "undefined" || isObject(l)) return r;
-  if (typeof r === "undefined" || isObject(r)) return l;
+  if (typeof l === "undefined") return r;
+  if (typeof r === "undefined") return l;
   return l + r;
 }
 

package/src/core/parse/parse.js

@@ -9,21 +9,11 @@ import { Parser } from "./parser/parser.js";
  * @property {boolean} constant - Indicates if the expression is constant.
  * @property {boolean} [isPure]
  * @property {boolean} oneTime
- * @property {import("./interpreter.js").DecoratedASTNode} decoratedNode
  * @property {function(import('../scope/scope').Scope, import('../scope/scope').WatchListener, boolean, CompiledExpression, string | ((scope:  import('../scope/scope').Scope) => any) | CompiledExpression): any} [$$watchDelegate]
  * @property {any[]|Function} inputs
  * @property {function(any, any): any} [assign] - Assigns a value to a context. If value is not provided,
  */
 
-/**
- * @typedef {Object} CompiledExpressionHandlerMap
- * @property {boolean} literal - Indicates if the expression is a literal.
- * @property {boolean} constant - Indicates if the expression is constant.
- * @property {boolean} [isPure]
- * @property {boolean} oneTime
- * @property {Map<string, Function>} keyMap - property keys to observe
- */
-
 /**
  * @typedef {Function} CompiledExpressionFunction
  * @param {import('../scope/scope').Scope} context - An object against which any expressions embedded in the strings are evaluated against (typically a scope object).
@@ -133,24 +123,14 @@ export function ParseProvider() {
           parsedExpression = parsedExpression.$$intercepted;
         }
 
-        let useInputs = false;
+        var useInputs = false;
 
-        const fn = function interceptedExpression(
-          scope,
-          locals,
-          assign,
-          inputs,
-        ) {
-          const value =
+        var fn = function interceptedExpression(scope, locals, assign, inputs) {
+          var value =
             useInputs && inputs
               ? inputs[0]
               : parsedExpression(scope, locals, assign, inputs);
-          // Do not invoke for getters
-          if (scope.getter) {
-            return;
-          }
-          const res = isFunction(value) ? value() : value;
-          return interceptorFn(res);
+          return interceptorFn(value);
         };
 
         // Maintain references to the interceptor/intercepted
@@ -161,7 +141,6 @@ export function ParseProvider() {
         fn.literal = parsedExpression.literal;
         fn.oneTime = parsedExpression.oneTime;
         fn.constant = parsedExpression.constant;
-        fn.decoratedNode = parsedExpression.decoratedNode;
 
         // Treat the interceptor like filters.
         // If it is not $stateful then only watch its inputs.
@@ -349,7 +328,7 @@ function oneTimeWatchDelegate(
     lastValue =
       useInputs && inputs ? inputs[0] : exp(scope, locals, assign, inputs);
     if (isDone(lastValue)) {
-      scope.$postUpdate(unwatchIfDone);
+      scope.$$postDigest(unwatchIfDone);
     }
     return post(lastValue);
   }