@angular-wave/angular.ts 0.4.2 → 0.4.4

package/src/animations/animate-queue.js

@@ -1,7 +1,6 @@
 import { getOrSetCacheData, JQLite } from "../shared/jqlite/jqlite";
 import {
   isUndefined,
-  forEach,
   isObject,
   isString,
   isElement,
@@ -183,7 +182,7 @@ export function AnimateQueueProvider($animateProvider) {
           if (postDigestCalled) {
             fn();
           } else {
-            $rootScope.$$postDigest(() => {
+            $rootScope.$postUpdate(() => {
               postDigestCalled = true;
               fn();
             });
@@ -195,29 +194,30 @@ export function AnimateQueueProvider($animateProvider) {
       // compiled. The $templateRequest.totalPendingRequests variable keeps track of
       // all of the remote templates being currently downloaded. If there are no
       // templates currently downloading then the watcher will still fire anyway.
-      $rootScope["$templateRequest"] = $templateRequest;
+      $rootScope["templateRequest"] = $templateRequest;
       const deregisterWatch = $rootScope.$watch(
         "$templateRequest.totalPendingRequests",
         (val) => {
-          if (val !== 0) return;
-          deregisterWatch();
-          $rootScope["$templateRequest"] = undefined;
-          // Now that all templates have been downloaded, $animate will wait until
-          // the post digest queue is empty before enabling animations. By having two
-          // calls to $postDigest calls we can ensure that the flag is enabled at the
-          // very end of the post digest queue. Since all of the animations in $animate
-          // use $postDigest, it's important that the code below executes at the end.
-          // This basically means that the page is fully downloaded and compiled before
-          // any animations are triggered.
-          $rootScope.$$postDigest(() => {
-            $rootScope.$$postDigest(() => {
-              // we check for null directly in the event that the application already called
-              // .enabled() with whatever arguments that it provided it with
-              if (animationsEnabled === null) {
-                animationsEnabled = true;
-              }
+          if (val === 0) {
+            deregisterWatch();
+            $rootScope["$templateRequest"] = undefined;
+            // Now that all templates have been downloaded, $animate will wait until
+            // the post digest queue is empty before enabling animations. By having two
+            // calls to $postDigest calls we can ensure that the flag is enabled at the
+            // very end of the post digest queue. Since all of the animations in $animate
+            // use $postDigest, it's important that the code below executes at the end.
+            // This basically means that the page is fully downloaded and compiled before
+            // any animations are triggered.
+            $rootScope.$postUpdate(() => {
+              $rootScope.$postUpdate(() => {
+                // we check for null directly in the event that the application already called
+                // .enabled() with whatever arguments that it provided it with
+                if (animationsEnabled === null) {
+                  animationsEnabled = true;
+                }
+              });
             });
-          });
+          }
         },
       );
 
@@ -598,7 +598,7 @@ export function AnimateQueueProvider($animateProvider) {
 
         markElementAnimationState(node, PRE_DIGEST_STATE, newAnimation);
 
-        $rootScope.$$postDigest(() => {
+        $rootScope.$postUpdate(() => {
           // It is possible that the DOM nodes inside `originalElement` have been replaced. This can
           // happen if the animated element is a transcluded clone and also has a `templateUrl`
           // directive on it. Therefore, we must recreate `element` in order to interact with the
@@ -718,7 +718,7 @@ export function AnimateQueueProvider($animateProvider) {
 
       function closeChildAnimations(node) {
         const children = node.querySelectorAll(`[${NG_ANIMATE_ATTR_NAME}]`);
-        forEach(children, (child) => {
+        children.forEach((child) => {
           const state = parseInt(child.getAttribute(NG_ANIMATE_ATTR_NAME), 10);
           const animationDetails = activeAnimationsLookup.get(child);
           if (animationDetails) {

package/src/animations/animate-runner.js

@@ -34,17 +34,13 @@ export function AnimateAsyncRunFactoryProvider() {
 const INITIAL_STATE = 0;
 const DONE_PENDING_STATE = 1;
 const DONE_COMPLETE_STATE = 2;
-let $q, $$animateAsyncRun, $timeout;
+let $$animateAsyncRun;
 
 export function AnimateRunnerFactoryProvider() {
   this.$get = [
-    "$q",
     "$$animateAsyncRun",
-    "$timeout",
-    function (q, animateAsyncRun, timeout) {
-      $q = q;
+    function (animateAsyncRun) {
       $$animateAsyncRun = animateAsyncRun;
-      $timeout = timeout;
       return AnimateRunner;
     },
   ];
@@ -94,7 +90,7 @@ export class AnimateRunner {
 
     const rafTick = $$animateAsyncRun();
     const timeoutTick = (fn) => {
-      $timeout(fn, 0, false);
+      setTimeout(fn, 0, false);
     };
 
     this._doneCallbacks = [];
@@ -125,7 +121,7 @@ export class AnimateRunner {
   getPromise() {
     if (!this.promise) {
       const self = this;
-      this.promise = $q((resolve, reject) => {
+      this.promise = new Promise((resolve, reject) => {
         self.done((status) => {
           if (status === false) {
             reject();

package/src/animations/animate.md

@@ -259,7 +259,7 @@
 - $animate.leave(kids[5]); //stagger index=0
 - $animate.leave(kids[6]); //stagger index=1
 -
-- $scope.$digest();
+- ;
 - });
 - ```
 

package/src/animations/animate.spec.js

@@ -82,7 +82,6 @@ describe("$animate", () => {
       $animate.enabled(false);
       expect(element[0].classList.contains("ng-hide")).toBeFalse();
       $animate.addClass(element, "ng-hide");
-      $rootScope.$digest();
       expect(element[0].classList.contains("ng-hide")).toBeTrue();
     });
 
@@ -117,10 +116,8 @@ describe("$animate", () => {
       $animate.enabled(false);
       expect(rect[0].classList.contains("ng-hide")).toBeFalse();
       $animate.addClass(rect, "ng-hide");
-      $rootScope.$digest();
       expect(rect[0].classList.contains("ng-hide")).toBeTrue();
       $animate.removeClass(rect, "ng-hide");
-      $rootScope.$digest();
       expect(rect[0].classList.contains("ng-hide")).toBeFalse();
     });
 
@@ -171,25 +168,21 @@ describe("$animate", () => {
       $animate.addClass(element, "on", {
         to: { color: "green" },
       });
-      $rootScope.$digest();
       assertColor("green");
 
       $animate.setClass(element, "off", "on", {
         to: { color: "black" },
       });
-      $rootScope.$digest();
       assertColor("black");
 
       $animate.removeClass(element, "off", {
         to: { color: "blue" },
       });
-      $rootScope.$digest();
       assertColor("blue");
 
       $animate.leave(element, {
         to: { color: "yellow" },
       });
-      $rootScope.$digest();
       assertColor("yellow");
 
       function assertColor(color) {
@@ -205,8 +198,6 @@ describe("$animate", () => {
         from: { color: "green" },
         to: { borderColor: "purple" },
       });
-      $rootScope.$digest();
-
       const { style } = element[0];
       expect(style.color).toBe("green");
       expect(style.borderColor).toBe("purple");
@@ -217,8 +208,6 @@ describe("$animate", () => {
 
       $animate.addClass(element, "ng-hide");
       $animate.removeClass(element, "ng-hide");
-      $rootScope.$digest();
-
       expect(element[0].classList.contains("ng-hide")).toBeFalse();
     });
 
@@ -227,8 +216,6 @@ describe("$animate", () => {
 
       $animate.removeClass(element, "ng-hide");
       $animate.addClass(element, "ng-hide");
-      $rootScope.$digest();
-
       expect(element[0].classList.contains("ng-hide")).toBeTrue();
     });
 
@@ -338,7 +325,6 @@ describe("$animate", () => {
 
         expect(() => {
           fn();
-          $rootScope.$digest();
         }).not.toThrow();
 
         const optionsArg = captureSpy.calls.mostRecent().args[2];
@@ -353,8 +339,6 @@ describe("$animate", () => {
 
       $animate.enter(element1, $rootElement, null, { addClass: " " });
       $animate.enter(element2, $rootElement, null, { addClass: "valid-name" });
-      $rootScope.$digest();
-
       expect(element2[0].classList.contains("valid-name")).toBeTruthy();
     });
 
@@ -375,7 +359,6 @@ describe("$animate", () => {
       const runner = $animate.enter(element, parent, null, copiedOptions);
       expect(copiedOptions).toEqual(initialOptions);
 
-      $rootScope.$digest();
       expect(copiedOptions).toEqual(initialOptions);
     });
 
@@ -418,7 +401,6 @@ describe("$animate", () => {
         $animate.removeClass(element, "test-class1");
         $animate.addClass(element, "test-class2");
         $animate.setClass(element, "test-class3", "test-class4");
-        $rootScope.$digest();
         expect(element[0].classList.contains("test-class1")).toBeFalse();
         expect(element[0].classList.contains("test-class2")).toBeTrue();
         expect(element[0].classList.contains("test-class3")).toBeTrue();
@@ -443,7 +425,6 @@ describe("$animate", () => {
         $animate.addClass(element, "test1");
         $animate.removeClass(element, "test2");
 
-        $rootScope.$digest();
         element = JQLite('<p class="test4">test</p>');
 
         $rootScope.$apply(() => {
@@ -486,8 +467,6 @@ describe("$animate", () => {
         $animate.addClass(target, "test-class2");
         $animate.setClass(target, "test-class3", "test-class4");
 
-        $rootScope.$digest();
-
         expect(target[0].classList.contains("test-class2")).toBeTrue();
         expect(target[0].classList.contains("test-class3")).toBeTrue();
       });

package/src/animations/animation.js

@@ -1,5 +1,5 @@
 import { JQLite } from "../shared/jqlite/jqlite";
-import { forEach, mergeClasses } from "../shared/utils";
+import { mergeClasses } from "../shared/utils";
 import {
   NG_ANIMATE_CLASSNAME,
   PREPARE_CLASS_SUFFIX,
@@ -203,7 +203,7 @@ export function AnimationProvider() {
         // were apart of the same postDigest flush call.
         if (animationQueue.length > 1) return runner;
 
-        $rootScope.$$postDigest(() => {
+        $rootScope.$postUpdate(() => {
           const animations = [];
           animationQueue.forEach((entry) => {
             // the element was destroyed early on which removed the runner
@@ -326,7 +326,7 @@ export function AnimationProvider() {
             ? [node]
             : node.querySelectorAll(SELECTOR);
           const anchors = [];
-          forEach(items, (node) => {
+          items.forEach((node) => {
             const attr = node.getAttribute(NG_ANIMATE_REF_ATTR);
             if (attr && attr.length) {
               anchors.push(node);
@@ -338,7 +338,7 @@ export function AnimationProvider() {
         function groupAnimations(animations) {
           const preparedAnimations = [];
           const refLookup = {};
-          forEach(animations, (animation, index) => {
+          animations.forEach((animation, index) => {
             const { element } = animation;
             const node = getDomNode(element);
             const { event } = animation;

package/src/animations/shared.js

@@ -1,4 +1,4 @@
-import { forEach, isString, minErr, extend } from "../shared/utils.js";
+import { isString, minErr, extend } from "../shared/utils.js";
 import { JQLite } from "../shared/jqlite/jqlite.js";
 import { ASTType } from "../core/parse/ast-type.js";
 
@@ -262,12 +262,12 @@ export function resolveElementClasses(existing, toAdd, toRemove) {
   existing = splitClassesToLookup(existing);
 
   toAdd = splitClassesToLookup(toAdd);
-  forEach(toAdd, (value, key) => {
+  Object.keys(toAdd).forEach((key) => {
     flags[key] = ADD_CLASS;
   });
 
   toRemove = splitClassesToLookup(toRemove);
-  forEach(toRemove, (value, key) => {
+  Object.keys(toRemove).forEach((key) => {
     flags[key] = flags[key] === ADD_CLASS ? null : REMOVE_CLASS;
   });
 
@@ -276,7 +276,7 @@ export function resolveElementClasses(existing, toAdd, toRemove) {
     removeClass: "",
   };
 
-  forEach(flags, function (val, klass) {
+  Object.entries(flags).forEach(([klass, val]) => {
     var prop, allow;
     if (val === ADD_CLASS) {
       prop = "addClass";
@@ -295,17 +295,19 @@ export function resolveElementClasses(existing, toAdd, toRemove) {
 
   function splitClassesToLookup(classes) {
     if (isString(classes)) {
-      classes = classes.split(" ");
+      classes = classes.trim().split(" ");
     }
 
     const obj = {};
-    forEach(classes, (klass) => {
-      // sometimes the split leaves empty string values
-      // incase extra spaces were applied to the options
-      if (klass.length) {
-        obj[klass] = true;
-      }
-    });
+    if (classes) {
+      classes.forEach((klass) => {
+        // sometimes the split leaves empty string values
+        // incase extra spaces were applied to the options
+        if (klass.length) {
+          obj[klass] = true;
+        }
+      });
+    }
     return obj;
   }
 

package/src/binding.spec.js

@@ -46,7 +46,6 @@ describe("binding", () => {
 
   it("BindUpdate", () => {
     $compile('<div ng-init="a=123"/>')($rootScope);
-    $rootScope.$digest();
     expect($rootScope.a).toBe(123);
   });
 

package/src/core/cache/cache.js

@@ -7,7 +7,7 @@
  *
  */
 
-export const EXPANDO = "ngId";
+export const EXPANDO = "ng";
 
 /**
  * Expando cache for adding properties to DOM nodes with JavaScript.
@@ -17,31 +17,4 @@ export const EXPANDO = "ngId";
  *
  * @type {Map<number, ExpandoStore>}
  */
-export const CACHE = new Proxy(new Map(), {
-  get(target, prop, receiver) {
-    if (prop === "size") {
-      return target.size;
-    }
-    if (typeof target[prop] === "function") {
-      return function (...args) {
-        return target[prop].apply(target, args);
-      };
-    }
-    return Reflect.get(target, prop, receiver);
-  },
-  set(target, prop, value, receiver) {
-    return Reflect.set(target, prop, value, receiver);
-  },
-  deleteProperty(target, prop) {
-    return Reflect.deleteProperty(target, prop);
-  },
-  has(target, prop) {
-    return Reflect.has(target, prop);
-  },
-  ownKeys(target) {
-    return Reflect.ownKeys(target);
-  },
-  getOwnPropertyDescriptor(target, prop) {
-    return Reflect.getOwnPropertyDescriptor(target, prop);
-  },
-});
+export const CACHE = new Map();

package/src/core/compile/attributes.js

@@ -1,6 +1,5 @@
 import { getBooleanAttrName } from "../../shared/jqlite/jqlite";
 import {
-  forEach,
   isString,
   snakeCase,
   isUndefined,
@@ -179,8 +178,8 @@ export class Attributes {
 
     // fire observers
     const { $$observers } = this;
-    if ($$observers) {
-      forEach($$observers[observer], (fn) => {
+    if ($$observers && $$observers[observer]) {
+      $$observers[observer].forEach((fn) => {
         try {
           fn(value);
         } catch (e) {