@angular-wave/angular.ts 0.4.2 → 0.4.3

package/src/directive/repeat/repeat.spec.js

@@ -1,7 +1,6 @@
 import { Angular } from "../../loader";
-import { createInjector } from "../../core/di/injector";
 import { dealoc, JQLite } from "../../shared/jqlite/jqlite";
-import { forEach, valueFn } from "../../shared/utils";
+import { valueFn } from "../../shared/utils";
 
 describe("ngRepeat", () => {
   let element;
@@ -263,10 +262,10 @@ describe("ngRepeat", () => {
     it("should track using provided function when a filter is present", () => {
       scope.newArray = function (items) {
         const newArray = [];
-        forEach(items, (item) => {
+        Object.entries(items).forEach(([id, name]) => {
           newArray.push({
-            id: item.id,
-            name: item.name,
+            id: id,
+            name: name,
           });
         });
         return newArray;
@@ -519,22 +518,17 @@ describe("ngRepeat", () => {
         { name: "orange" },
         { name: "blonde" },
       ];
-      forEach(
-        ["null2", "qthis", "qthisq", "fundefined", "$$parent"],
-        (name) => {
-          const expr = `item in items | filter:x as ${name} track by $index`;
-          element = $compile(`<div><div ng-repeat="${expr}"></div></div>`)(
-            scope,
-          );
-          scope.$digest();
-          expect(scope[name]).toEqual([
-            { name: "blue" },
-            { name: "black" },
-            { name: "blonde" },
-          ]);
-          dealoc(element);
-        },
-      );
+      ["null2", "qthis", "qthisq", "fundefined", "$$parent"].forEach((name) => {
+        const expr = `item in items | filter:x as ${name} track by $index`;
+        element = $compile(`<div><div ng-repeat="${expr}"></div></div>`)(scope);
+        scope.$digest();
+        expect(scope[name]).toEqual([
+          { name: "blue" },
+          { name: "black" },
+          { name: "blonde" },
+        ]);
+        dealoc(element);
+      });
     });
 
     it("should throw if alias identifier is not a simple identifier", () => {
@@ -548,42 +542,39 @@ describe("ngRepeat", () => {
         { name: "blonde" },
       ];
 
-      forEach(
-        [
-          "null",
-          "this",
-          "undefined",
-          "$parent",
-          "$root",
-          "$id",
-          "$index",
-          "$first",
-          "$middle",
-          "$last",
-          "$even",
-          "$odd",
-          "obj[key]",
-          'obj["key"]',
-          "obj['key']",
-          "obj.property",
-          "foo=6",
-        ],
-        (expr) => {
-          const expression =
-            `item in items | filter:x as ${expr} track by $index`.replace(
-              /"/g,
-              "&quot;",
-            );
-          element = $compile(
-            `<div>` +
-              `  <div ng-repeat="${expression}">{{item}}</div>` +
-              `</div>`,
-          )(scope);
-          expect(logs.shift().message).toMatch(/must be a valid JS identifier/);
-
-          dealoc(element);
-        },
-      );
+      [
+        "null",
+        "this",
+        "undefined",
+        "$parent",
+        "$root",
+        "$id",
+        "$index",
+        "$first",
+        "$middle",
+        "$last",
+        "$even",
+        "$odd",
+        "obj[key]",
+        'obj["key"]',
+        "obj['key']",
+        "obj.property",
+        "foo=6",
+      ].forEach((expr) => {
+        const expression =
+          `item in items | filter:x as ${expr} track by $index`.replace(
+            /"/g,
+            "&quot;",
+          );
+        element = $compile(
+          `<div>` +
+            `  <div ng-repeat="${expression}">{{item}}</div>` +
+            `</div>`,
+        )(scope);
+        expect(logs.shift().message).toMatch(/must be a valid JS identifier/);
+
+        dealoc(element);
+      });
     });
 
     it("should allow expressions over multiple lines", () => {

package/src/directive/select/select.spec.js

@@ -1,7 +1,6 @@
 import { Angular } from "../../loader";
-import { createInjector } from "../../core/di/injector";
 import { dealoc, JQLite } from "../../shared/jqlite/jqlite";
-import { forEach, hashKey, equals, isNumberNaN } from "../../shared/utils";
+import { hashKey, equals, isNumberNaN } from "../../shared/utils";
 import { browserTrigger } from "../../shared/test-utils";
 
 describe("select", () => {
@@ -118,8 +117,9 @@ describe("select", () => {
             const actualValues = {};
             let optionGroup;
             let optionValue;
-
-            forEach(actual.find("option"), (option) => {
+            let options = actual.find("option");
+            for (let i = 0; i < options.length; i++) {
+              let option = options[i];
               optionGroup = option.parentNode.label || "";
               actualValues[optionGroup] = actualValues[optionGroup] || [];
               // IE9 doesn't populate the label property from the text property like other browsers
@@ -127,7 +127,7 @@ describe("select", () => {
               actualValues[optionGroup].push(
                 option.selected ? [optionValue] : optionValue,
               );
-            });
+            }
 
             const message = function () {
               return `Expected ${toJson(actualValues)} to equal ${toJson(expected)}.`;
@@ -1781,12 +1781,11 @@ describe("select", () => {
           // reset
           scope.selected = [];
           scope.$digest();
+          let elems = element.find("option");
 
-          forEach(element.find("option"), (option) => {
-            // browserTrigger can't produce click + ctrl, so set selection manually
-            JQLite(option)[0].selected = true;
-          });
-
+          for (var i = 0; i < elems.length; i++) {
+            JQLite(elems[i])[0].selected = true;
+          }
           browserTrigger(element, "change");
 
           const arrayVal = ["a"];

package/src/directive/switch/switch.js

@@ -1,4 +1,3 @@
-import { forEach } from "../../shared/utils";
 import { getBlockNodes } from "../../shared/jqlite/jqlite";
 
 export const ngSwitchDirective = [
@@ -53,7 +52,7 @@ export const ngSwitchDirective = [
             ngSwitchController.cases[`!${value}`] ||
             ngSwitchController.cases["?"])
         ) {
-          forEach(selectedTranscludes, (selectedTransclude) => {
+          Object.values(selectedTranscludes).forEach((selectedTransclude) => {
             selectedTransclude.transclude((caseElement, selectedScope) => {
               selectedScopes.push(selectedScope);
               const anchor = selectedTransclude.element;

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

@@ -1,4 +1,4 @@
-import { forEach, tail, unnestR, uniqR, removeFrom } from "../../shared/common";
+import { tail, unnestR, uniqR, removeFrom } from "../../shared/common";
 import { isString, isObject } from "../../shared/utils";
 
 import { parse } from "../../shared/hof";
@@ -303,22 +303,24 @@ export function $StateRefActiveDirective(
       function setStatesFromDefinitionObject(statesDefinition) {
         if (isObject(statesDefinition)) {
           states = [];
-          forEach(statesDefinition, function (stateOrName, activeClass) {
-            // Helper function to abstract adding state.
-            const addStateForClass = function (stateOrName, activeClass) {
-              const ref = parseStateRef(stateOrName);
-              addState(ref.state, $scope.$eval(ref.paramExpr), activeClass);
-            };
-            if (isString(stateOrName)) {
-              // If state is string, just add it.
-              addStateForClass(stateOrName, activeClass);
-            } else if (Array.isArray(stateOrName)) {
-              // If state is an array, iterate over it and add each array item individually.
-              forEach(stateOrName, function (stateOrName) {
+          Object.entries(statesDefinition).forEach(
+            ([activeClass, stateOrName]) => {
+              // Helper function to abstract adding state.
+              const addStateForClass = function (stateOrName, activeClass) {
+                const ref = parseStateRef(stateOrName);
+                addState(ref.state, $scope.$eval(ref.paramExpr), activeClass);
+              };
+              if (isString(stateOrName)) {
+                // If state is string, just add it.
                 addStateForClass(stateOrName, activeClass);
-              });
-            }
-          });
+              } else if (Array.isArray(stateOrName)) {
+                // If state is an array, iterate over it and add each array item individually.
+                stateOrName.forEach((stateOrName) => {
+                  addStateForClass(stateOrName, activeClass);
+                });
+              }
+            },
+          );
         }
       }
       function addState(stateName, stateParams, activeClass) {

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

@@ -158,7 +158,7 @@ export let ngView = [
     };
     const directive = {
       count: 0,
-      restrict: "ECA",
+      restrict: "EA",
       terminal: true,
       priority: 400,
       transclude: "element",
@@ -304,7 +304,7 @@ export function $ViewDirectiveFill(
   const getControllerAs = parse("viewDecl.controllerAs");
   const getResolveAs = parse("viewDecl.resolveAs");
   return {
-    restrict: "ECA",
+    restrict: "EA",
     priority: -400,
     compile: function (tElement) {
       const initial = tElement.html();

package/src/router/state/views.js

@@ -1,4 +1,4 @@
-import { pick, forEach, tail } from "../../shared/common";
+import { pick, tail } from "../../shared/common";
 import { isDefined, isString } from "../../shared/utils";
 import { isInjectable } from "../../shared/predicates";
 import { services } from "../common/coreservices";
@@ -60,7 +60,7 @@ export function ng1ViewsBuilder(state) {
   }
   const views = {},
     viewsObject = state.views || { $default: pick(state, allViewKeys) };
-  forEach(viewsObject, function (config, name) {
+  Object.entries(viewsObject).forEach(([name, config]) => {
     // Account for views: { "": { template... } }
     name = name || "$default";
     // Account for views: { header: "headerComponent" }

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

@@ -1,10 +1,4 @@
-import {
-  forEach,
-  isFunction,
-  isDefined,
-  isObject,
-  isString,
-} from "../../shared/utils";
+import { isFunction, isDefined, isObject, isString } from "../../shared/utils";
 import { is, pattern } from "../../shared/hof";
 import { UrlRules } from "./url-rules";
 import { TargetState } from "../state/target-state";
@@ -454,7 +448,7 @@ export class UrlService {
     // TODO: typeof?
     if (!isObject(object)) return false;
     let result = true;
-    forEach(UrlMatcher.prototype, (val, name) => {
+    Object.entries(UrlMatcher.prototype).forEach(([name, val]) => {
       if (isFunction(val))
         result = result && isDefined(object[name]) && isFunction(object[name]);
     });

package/src/router/url/url-service.spec.js

@@ -1,7 +1,6 @@
 import { dealoc } from "../../shared/jqlite/jqlite";
 import { Angular } from "../../loader";
 import { map, find } from "../../shared/common";
-import { forEach } from "../../shared/utils";
 
 describe("UrlMatcher", () => {
   let $url;
@@ -244,7 +243,7 @@ describe("UrlMatcher", () => {
           "/url/someword/child/childParam",
       };
 
-      forEach(shouldPass, function (url, route) {
+      Object.entries(shouldPass).forEach(function ([route, url]) {
         expect($url.compile(route).exec(url, {})).toEqual({
           childParam: "childParam",
           matchedParam: "someword",
@@ -260,7 +259,7 @@ describe("UrlMatcher", () => {
           "/url/someword/child/childParam",
       };
 
-      forEach(shouldThrow, function (url, route) {
+      Object.entries(shouldThrow).forEach(function ([route, url]) {
         expect(() => {
           $url.compile(route).exec(url, {});
         }).toThrowError("Unbalanced capture group in route '" + route + "'");
@@ -273,7 +272,7 @@ describe("UrlMatcher", () => {
           "/url/someword/child/childParam",
       };
 
-      forEach(shouldPass, function (url, route) {
+      Object.entries(shouldPass).forEach(function ([route, url]) {
         expect(() => {
           $url.compile(route).exec(url, {});
         }).not.toThrow();

package/src/services/http/http.js

@@ -7,7 +7,6 @@ import {
   toJson,
   isUndefined,
   isFunction,
-  forEach,
   encodeUriQuery,
   isString,
   fromJson,
@@ -147,7 +146,7 @@ function parseHeaders(headers) {
       },
     );
   } else if (isObject(headers)) {
-    forEach(headers, (headerVal, headerKey) => {
+    Object.entries(headers).forEach(([headerKey, headerVal]) => {
       fillInParsed(lowercase(headerKey), trim(headerVal));
     });
   }
@@ -472,7 +471,7 @@ export function HttpProvider() {
         let promise = $q.resolve(config);
 
         // apply interceptors
-        forEach(reversedInterceptors, (interceptor) => {
+        reversedInterceptors.forEach((interceptor) => {
           if (interceptor.request || interceptor.requestError) {
             requestInterceptors.unshift(
               interceptor.request,
@@ -515,7 +514,7 @@ export function HttpProvider() {
           let headerContent;
           const processedHeaders = {};
 
-          forEach(headers, (headerFn, header) => {
+          Object.entries(headers).forEach(([header, headerFn]) => {
             if (isFunction(headerFn)) {
               headerContent = headerFn(config);
               if (headerContent != null) {
@@ -560,7 +559,7 @@ export function HttpProvider() {
 
           // strip content-type if data is undefined
           if (isUndefined(reqData)) {
-            forEach(headers, (value, header) => {
+            Object.keys(headers).forEach((header) => {
               if (lowercase(header) === "content-type") {
                 delete headers[header];
               }
@@ -821,7 +820,7 @@ export function HttpProvider() {
         function createApplyHandlers(eventHandlers) {
           if (eventHandlers) {
             const applyHandlers = {};
-            forEach(eventHandlers, (eventHandler, key) => {
+            Object.entries(eventHandlers).forEach(([key, eventHandler]) => {
               applyHandlers[key] = function (event) {
                 if (useApplyAsync) {
                   $rootScope.$applyAsync(callEventHandler);

package/src/services/http-backend/http-backend.js

@@ -1,10 +1,5 @@
 import { urlResolve } from "../../core/url-utils/url-utils";
-import {
-  forEach,
-  isDefined,
-  isPromiseLike,
-  isUndefined,
-} from "../../shared/utils";
+import { isDefined, isPromiseLike, isUndefined } from "../../shared/utils";
 
 /**
  * HTTP backend used by the {@link ng.$http service} that delegates to
@@ -51,11 +46,13 @@ export function createHttpBackend($browser) {
     let abortedByTimeout = false;
 
     xhr.open(method, url, true);
-    forEach(headers, (value, key) => {
-      if (isDefined(value)) {
-        xhr.setRequestHeader(key, value);
-      }
-    });
+    if (headers) {
+      Object.entries(headers).forEach(([key, value]) => {
+        if (isDefined(value)) {
+          xhr.setRequestHeader(key, value);
+        }
+      });
+    }
 
     xhr.onload = function () {
       const statusText = xhr.statusText || "";
@@ -105,13 +102,18 @@ export function createHttpBackend($browser) {
       );
     };
 
-    forEach(eventHandlers, (value, key) => {
-      xhr.addEventListener(key, value);
-    });
+    if (eventHandlers) {
+      eventHandlers &&
+        Object.entries(eventHandlers).forEach(([key, value]) => {
+          xhr.addEventListener(key, value);
+        });
+    }
 
-    forEach(uploadEventHandlers, (value, key) => {
-      xhr.upload.addEventListener(key, value);
-    });
+    if (uploadEventHandlers) {
+      Object.entries(uploadEventHandlers).forEach(([key, value]) => {
+        xhr.upload.addEventListener(key, value);
+      });
+    }
 
     if (withCredentials) {
       xhr.withCredentials = true;

package/src/shared/common.js

@@ -2,11 +2,6 @@ import { isDate, isFunction, isRegExp, isString } from "./utils";
 import { all, curry } from "./hof";
 import { services } from "../router/common/coreservices";
 
-export function forEach(obj, cb, thisArg) {
-  if (Array.isArray(obj)) return obj.forEach(cb, thisArg);
-  Object.keys(obj).forEach((key) => cb(obj[key], key));
-}
-
 export function equals(o1, o2) {
   if (o1 === o2) return true;
   if (o1 === null || o2 === null) return false;
@@ -219,7 +214,7 @@ export function filter(collection, callback) {
   const arr = Array.isArray(collection),
     result = arr ? [] : {};
   const accept = arr ? (x) => result.push(x) : (x, key) => (result[key] = x);
-  forEach(collection, function (item, i) {
+  Object.entries(collection).forEach(([i, item]) => {
     if (callback(item, i)) accept(item, i);
   });
   return result;
@@ -228,7 +223,7 @@ export function filter(collection, callback) {
 /** Finds an object from an array, or a property of an object, that matches a predicate */
 export function find(collection, callback) {
   let result;
-  forEach(collection, function (item, i) {
+  Object.entries(collection).forEach(([i, item]) => {
     if (result) return;
     if (callback(item, i)) result = item;
   });
@@ -238,7 +233,9 @@ export function find(collection, callback) {
 /** Maps an array or object properties using a callback function */
 export function map(collection, callback, target) {
   target = target || (Array.isArray(collection) ? [] : {});
-  forEach(collection, (item, i) => (target[i] = callback(item, i)));
+  Object.entries(collection).forEach(
+    ([i, item]) => (target[i] = callback(item, i)),
+  );
   return target;
 }
 

package/src/shared/jqlite/jqlite.js

@@ -3,7 +3,6 @@ import {
   arrayRemove,
   concat,
   extend,
-  forEach,
   isDefined,
   isFunction,
   isObject,
@@ -103,9 +102,9 @@ export function JQLite(element) {
 JQLite.prototype = {
   toString() {
     const value = [];
-    forEach(this, (e) => {
-      value.push(`${e}`);
-    });
+    for (var i = 0; i < this.length; i++) {
+      value.push(`${this[i]}`);
+    }
     return `[${value.join(", ")}]`;
   },
 
@@ -276,7 +275,7 @@ JQLite.prototype.off = function (type, fn) {
         }
       };
 
-      forEach(type.split(" "), (type) => {
+      type.split(" ").forEach((type) => {
         removeHandler(type);
         if (MOUSE_EVENT_MAP[type]) {
           removeHandler(MOUSE_EVENT_MAP[type]);
@@ -379,7 +378,7 @@ JQLite.prototype.val = function (value) {
       // read
       if (element.multiple && getNodeName(element) === "select") {
         const result = [];
-        forEach(element.options, (option) => {
+        Array.from(element.options).forEach((option) => {
           if (option.selected) {
             result.push(option.value || option.text);
           }
@@ -482,14 +481,16 @@ JQLite.prototype.replaceWith = function (arg1) {
     let index;
     const parent = element.parentNode;
     dealoc(element);
-    forEach(new JQLite(replaceNode), (node) => {
+    const nodes = new JQLite(replaceNode);
+    for (let i = 0; i < nodes.length; i++) {
+      const node = nodes[i];
       if (index) {
         parent.insertBefore(node, index.nextSibling);
       } else {
         parent.replaceChild(node, element);
       }
       index = node;
-    });
+    }
   };
   for (let i = 0; i < this.length; i++) {
     addNodes(value, fn(this[i], arg1));
@@ -542,9 +543,10 @@ JQLite.prototype.prepend = function (node) {
     const element = this[i];
     if (element.nodeType === Node.ELEMENT_NODE) {
       const index = element.firstChild;
-      forEach(new JQLite(node), (child) => {
-        element.insertBefore(child, index);
-      });
+      const el = new JQLite(node);
+      for (let i = 0; i < el.length; i++) {
+        element.insertBefore(el[i], index);
+      }
     }
   }
   return this;
@@ -683,7 +685,7 @@ JQLite.prototype.triggerHandler = function (event, extraParameters) {
         ? [dummyEvent].concat(extraParameters)
         : [dummyEvent];
 
-      forEach(eventFnsCopy, (fn) => {
+      eventFnsCopy.forEach((fn) => {
         if (!dummyEvent.isImmediatePropagationStopped()) {
           fn.apply(element, handlerArgs);
         }

package/src/shared/jqlite/jqlite.spec.js

@@ -8,7 +8,7 @@ import {
 } from "./jqlite";
 import { Angular } from "../../loader";
 import { createInjector } from "../../core/di/injector";
-import { equals, forEach } from "../utils";
+import { equals } from "../utils";
 import { browserTrigger } from "../test-utils";
 import { CACHE, EXPANDO } from "../../core/cache/cache";
 
@@ -902,7 +902,7 @@ describe("jqLite", () => {
     });
 
     it("should not fail on elements without the getAttribute method", () => {
-      forEach([window, document], (node) => {
+      [window, document].forEach((node) => {
         expect(() => {
           const elem = JQLite(node);
           elem.attr("foo");