@angular-wave/angular.ts 0.2.3 → 0.3.1

package/src/router/transition/transition.js

@@ -4,7 +4,6 @@ import { stringify } from "../../shared/strings";
 import {
   map,
   find,
-  mergeR,
   tail,
   omit,
   arrayTuples,
@@ -14,7 +13,7 @@ import {
   uniqR,
 } from "../../shared/common";
 import { isUndefined, isObject, assert } from "../../shared/utils";
-import { prop, propEq, val, is } from "../../shared/hof";
+import { propEq, val, is } from "../../shared/hof";
 import { TransitionHookPhase } from "./interface"; // has or is using
 import { TransitionHook } from "./transition-hook";
 import { matchState, makeEvent } from "./hook-registry";
@@ -25,7 +24,6 @@ import { Resolvable } from "../resolve/resolvable";
 import { ResolveContext } from "../resolve/resolve-context";
 import { Rejection } from "./reject-factory";
 
-const stateSelf = prop("self");
 /**
  * Represents a transition between two states.
  *
@@ -45,7 +43,7 @@ export class Transition {
    * @param fromPath The path of [[PathNode]]s from which the transition is leaving.  The last node in the `fromPath`
    *        encapsulates the "from state".
    * @param targetState The target state and parameters being transitioned to (also, the transition options)
-   * @param {import('../transition/transition-service').TransitionService} transitionService The [[TransitionService]] instance
+   * @param {import('../transition/transition-service').TransitionProvider} transitionService The [[TransitionService]] instance
    * @internal
    */
   constructor(fromPath, targetState, transitionService, globals) {
@@ -172,7 +170,9 @@ export class Transition {
   }
   params(pathname = "to") {
     return Object.freeze(
-      this._treeChanges[pathname].map(prop("paramValues")).reduce(mergeR, {}),
+      this._treeChanges[pathname]
+        .map((x) => x.paramValues)
+        .reduce((acc, obj) => ({ ...acc, ...obj }), {}),
     );
   }
   paramsChanged() {
@@ -403,7 +403,7 @@ export class Transition {
    * @returns an array of states that will be entered during this transition.
    */
   entering() {
-    return map(this._treeChanges.entering, prop("state")).map(stateSelf);
+    return map(this._treeChanges.entering, (x) => x.state).map((x) => x.self);
   }
   /**
    * Gets the states being exited.
@@ -411,8 +411,8 @@ export class Transition {
    * @returns an array of states that will be exited during this transition.
    */
   exiting() {
-    return map(this._treeChanges.exiting, prop("state"))
-      .map(stateSelf)
+    return map(this._treeChanges.exiting, (x) => x.state)
+      .map((x) => x.self)
       .reverse();
   }
   /**
@@ -422,7 +422,7 @@ export class Transition {
    *    exited during this Transition
    */
   retained() {
-    return map(this._treeChanges.retained, prop("state")).map(stateSelf);
+    return map(this._treeChanges.retained, (x) => x.state).map((x) => x.self);
   }
   /**
    * Get the [[ViewConfig]]s associated with this Transition
@@ -439,7 +439,7 @@ export class Transition {
   views(pathname = "entering", state) {
     let path = this._treeChanges[pathname];
     path = !state ? path : path.filter(propEq("state", state));
-    return path.map(prop("views")).reduce(unnestR, []);
+    return path.map((x) => x.views).reduce(unnestR, []);
   }
   treeChanges(pathname) {
     return pathname ? this._treeChanges[pathname] : this._treeChanges;
@@ -702,7 +702,9 @@ export class Transition {
       from = isObject(fromStateOrName) ? fromStateOrName.name : fromStateOrName,
       fromParams = stringify(
         avoidEmptyHash(
-          this._treeChanges.from.map(prop("paramValues")).reduce(mergeR, {}),
+          this._treeChanges.from
+            .map((x) => x.paramValues)
+            .reduce((acc, obj) => ({ ...acc, ...obj }), {}),
         ),
       ),
       toValid = this.valid() ? "" : "(X) ",

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

@@ -9,7 +9,7 @@ import {
   arrayTuples,
   defaults,
 } from "../../shared/common";
-import { prop, propEq } from "../../shared/hof";
+import { propEq } from "../../shared/hof";
 import { isDefined, isString } from "../../shared/utils";
 import { Param, DefType } from "../params/param";
 import { joinNeighborsR, splitOnDelim } from "../../shared/strings";
@@ -344,7 +344,7 @@ export class UrlMatcher {
       return new RegExp(
         [
           "^",
-          unnest(this._cache.path.map(prop("_compiled"))).join(""),
+          unnest(this._cache.path.map((x) => x._compiled)).join(""),
           this.config.strict === false ? "/?" : "",
           "$",
         ].join(""),

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

@@ -26,7 +26,7 @@ export class UrlService {
   ];
 
   /**
-   * @param {import("../../core/location/location").$LocationProvider} $locationProvider
+   * @param {import("../../core/location/location").LocationProvider} $locationProvider
    */
   constructor($locationProvider, stateService, globals, urlConfigProvider) {
     this.stateService = stateService;

package/src/router/view/view.js

@@ -1,5 +1,5 @@
 import { equals, applyPairs, removeFrom, find } from "../../shared/common";
-import { curry, prop } from "../../shared/hof";
+import { curry } from "../../shared/hof";
 import { trace } from "../common/trace";
 import { getNg1ViewConfigFactory } from "../state/views";
 /**
@@ -177,7 +177,7 @@ export class ViewService {
    * @return {Array} Returns an array of fully-qualified view names.
    */
   available() {
-    return this._ngViews.map(prop("fqn"));
+    return this._ngViews.map((x) => x.fqn);
   }
   /**
    * Returns the list of views on the page containing loaded content.
@@ -185,7 +185,7 @@ export class ViewService {
    * @return {Array} Returns an array of fully-qualified view names.
    */
   active() {
-    return this._ngViews.filter(prop("$config")).map(prop("name"));
+    return this._ngViews.filter((x) => x.$config).map((x) => x.name);
   }
 }
 /**

package/src/services/http/http.js

@@ -54,7 +54,7 @@ function serializeValue(v) {
  *
  * Note that serializer will sort the request parameters alphabetically.
  */
-export function $HttpParamSerializerProvider() {
+export function HttpParamSerializerProvider() {
   this.$get = function () {
     return function ngParamSerializer(params) {
       if (!params) return "";
@@ -82,86 +82,6 @@ export function $HttpParamSerializerProvider() {
   };
 }
 
-/**
- *
- * Alternative {@link $http `$http`} params serializer that follows
- * jQuery's [`param()`](http://api.jquery.com/jquery.param/) method logic.
- * The serializer will also sort the params alphabetically.
- *
- * To use it for serializing `$http` request parameters, set it as the `paramSerializer` property:
- *
- * ```js
- * $http({
- *   url: myUrl,
- *   method: 'GET',
- *   params: myParams,
- *   paramSerializer: '$httpParamSerializerJQLike'
- * });
- * ```
- *
- * It is also possible to set it as the default `paramSerializer` in the
- * {@link $httpProvider#defaults `$httpProvider`}.
- *
- * Additionally, you can inject the serializer and use it explicitly, for example to serialize
- * form data for submission:
- *
- * ```js
- * .controller(function($http, $httpParamSerializerJQLike) {
- *   //...
- *
- *   $http({
- *     url: myUrl,
- *     method: 'POST',
- *     data: $httpParamSerializerJQLike(myData),
- *     headers: {
- *       'Content-Type': 'application/x-www-form-urlencoded'
- *     }
- *   });
- *
- * });
- * ```
- *
- */
-export function $HttpParamSerializerJQLikeProvider() {
-  this.$get = function () {
-    return function jQueryLikeParamSerializer(params) {
-      if (!params) return "";
-      const parts = [];
-      serialize(params, "", true);
-      return parts.join("&");
-
-      function serialize(toSerialize, prefix, topLevel) {
-        if (Array.isArray(toSerialize)) {
-          forEach(toSerialize, (value, index) => {
-            serialize(value, `${prefix}[${isObject(value) ? index : ""}]`);
-          });
-        } else if (isObject(toSerialize) && !isDate(toSerialize)) {
-          Object.keys(toSerialize)
-            .sort()
-            .forEach((key) => {
-              const value = toSerialize[key];
-              serialize(
-                value,
-                prefix + (topLevel ? "" : "[") + key + (topLevel ? "" : "]"),
-              );
-            });
-        } else {
-          if (isFunction(toSerialize)) {
-            toSerialize = toSerialize();
-          }
-          parts.push(
-            `${encodeUriQuery(prefix)}=${
-              toSerialize == null
-                ? ""
-                : encodeUriQuery(serializeValue(toSerialize))
-            }`,
-          );
-        }
-      }
-    };
-  };
-}
-
 export function defaultHttpResponseTransform(data, headers) {
   if (isString(data)) {
     // Strip json vulnerability protection prefix and trim whitespace
@@ -297,7 +217,7 @@ function isSuccess(status) {
 /**
  * Use `$httpProvider` to change the default behavior of the {@link ng.$http $http} service.
  */
-export function $HttpProvider() {
+export function HttpProvider() {
   /**
    * Object containing default values for all {@link ng.$http $http} requests.
    *
@@ -461,7 +381,6 @@ export function $HttpProvider() {
   this.$get = [
     "$browser",
     "$httpBackend",
-    "$cacheFactory",
     "$rootScope",
     "$q",
     "$injector",
@@ -470,23 +389,17 @@ export function $HttpProvider() {
      *
      * @param {*} $browser
      * @param {*} $httpBackend
-     * @param {*} $cacheFactory
      * @param {*} $rootScope
      * @param {*} $q
      * @param {import("../../core/di/internal-injector").InjectorService} $injector
      * @param {*} $sce
      * @returns
      */
-    function (
-      $browser,
-      $httpBackend,
-      $cacheFactory,
-      $rootScope,
-      $q,
-      $injector,
-      $sce,
-    ) {
-      const defaultCache = $cacheFactory("$http");
+    function ($browser, $httpBackend, $rootScope, $q, $injector, $sce) {
+      /**
+       * @type {Map<string, string>}
+       */
+      const defaultCache = new Map();
 
       /**
        * Make sure that default param serializer is exposed as a function
@@ -874,7 +787,7 @@ export function $HttpProvider() {
             }
           } else {
             // put the promise for the non-transformed response into cache as a placeholder
-            cache.put(url, promise);
+            cache.set(url, promise);
           }
         }
 
@@ -936,7 +849,7 @@ export function $HttpProvider() {
         function done(status, response, headersString, statusText, xhrStatus) {
           if (cache) {
             if (isSuccess(status)) {
-              cache.put(url, [
+              cache.set(url, [
                 status,
                 response,
                 parseHeaders(headersString),
@@ -945,7 +858,7 @@ export function $HttpProvider() {
               ]);
             } else {
               // remove promise from the cache
-              cache.remove(url);
+              cache.delete(url);
             }
           }
 

package/src/services/http/http.spec.js

@@ -1065,124 +1065,6 @@ describe("$http", function () {
     expect(res.config.method).toBe("GET");
   });
 
-  describe("JQ-like param serialization", function () {
-    it("is possible", async function () {
-      await $http({
-        url: "/mock/hello",
-        params: {
-          a: 42,
-          b: 43,
-        },
-        paramSerializer: "$httpParamSerializerJQLike",
-      }).then(function (r) {
-        response = r;
-      });
-      $rootScope.$apply();
-
-      expect(
-        response.config
-          .paramSerializer(response.config.params)
-          .endsWith("a=42&b=43"),
-      ).toBeTrue();
-    });
-
-    it("serializes null and undefined elements as empty", async function () {
-      await $http({
-        url: "/mock/hello",
-        params: {
-          a: null,
-          b: undefined,
-        },
-        paramSerializer: "$httpParamSerializerJQLike",
-      }).then(function (r) {
-        response = r;
-      });
-      $rootScope.$apply();
-
-      expect(
-        response.config
-          .paramSerializer(response.config.params)
-          .endsWith("a=&b="),
-      ).toBeTrue();
-    });
-
-    it("uses square brackets in arrays", async function () {
-      await $http({
-        url: "/mock/hello",
-        params: {
-          a: [42, 43],
-        },
-        paramSerializer: "$httpParamSerializerJQLike",
-      }).then(function (r) {
-        response = r;
-      });
-      $rootScope.$apply();
-
-      expect(
-        response.config
-          .paramSerializer(response.config.params)
-          .endsWith("a%5B%5D=42&a%5B%5D=43"),
-      ).toBeTrue();
-    });
-
-    it("uses square brackets in objects", async function () {
-      await $http({
-        url: "/mock/hello",
-        params: {
-          a: { b: 42, c: 43 },
-        },
-        paramSerializer: "$httpParamSerializerJQLike",
-      }).then(function (r) {
-        response = r;
-      });
-      $rootScope.$apply();
-
-      expect(
-        response.config
-          .paramSerializer(response.config.params)
-          .endsWith("a%5Bb%5D=42&a%5Bc%5D=43"),
-      ).toBeTrue();
-    });
-
-    it("supports nesting in objects", async function () {
-      await $http({
-        url: "/mock/hello",
-        params: {
-          a: { b: { c: 42 } },
-        },
-        paramSerializer: "$httpParamSerializerJQLike",
-      }).then(function (r) {
-        response = r;
-      });
-      $rootScope.$apply();
-
-      expect(
-        response.config
-          .paramSerializer(response.config.params)
-          .endsWith("a%5Bb%5D%5Bc%5D=42"),
-      ).toBeTrue();
-    });
-
-    it("appends array indexes when items are objects", async function () {
-      await $http({
-        url: "/mock/hello",
-        params: {
-          a: [{ b: 42 }],
-        },
-        paramSerializer: "$httpParamSerializerJQLike",
-      }).then(function (r) {
-        response = r;
-      });
-      $rootScope.$apply();
-
-      expect(
-        response.config
-          .paramSerializer(response.config.params)
-          .endsWith("a%5B0%5D%5Bb%5D=42"),
-      ).toBeTrue();
-    });
-  });
-
   it("allows aborting a request with a Promise", async function () {
     const timeout = $q.defer();
     $http

package/src/services/http/template-request.spec.js

@@ -79,21 +79,19 @@ describe("$templateRequest", () => {
           },
         ]);
 
-        createInjector(["test"]).invoke(
-          ($templateRequest, $http, $cacheFactory) => {
-            spyOn($http, "get").and.callThrough();
+        createInjector(["test"]).invoke(($templateRequest, $http) => {
+          spyOn($http, "get").and.callThrough();
 
-            const customCache = $cacheFactory("customCache");
-            httpOptions.cache = customCache;
+          const customCache = new Map();
+          httpOptions.cache = customCache;
 
-            $templateRequest("tpl.html");
+          $templateRequest("tpl.html");
 
-            expect($http.get).toHaveBeenCalledOnceWith("tpl.html", {
-              cache: customCache,
-              transformResponse: [],
-            });
-          },
-        );
+          expect($http.get).toHaveBeenCalledOnceWith("tpl.html", {
+            cache: customCache,
+            transformResponse: [],
+          });
+        });
       });
     });
   });
@@ -125,8 +123,7 @@ describe("$templateRequest", () => {
   });
 
   it("should return the cached value on the first request", async () => {
-    spyOn($templateCache, "put").and.returnValue("_matias");
-
+    $templateCache.set("tpl.html", "_matias");
     const content = [];
     function tplRequestCb(html) {
       content.push(html);
@@ -164,26 +161,12 @@ describe("$templateRequest", () => {
       $rootScope.$digest();
     }).toThrow();
 
-    $templateCache.put("tpl.html"); // is a no-op, so $sce check as well.
-    expect(() => {
-      $templateRequest("tpl.html");
-      $rootScope.$digest();
-    }).toThrow();
-    $templateCache.removeAll();
-
-    $templateCache.put("tpl.html", null); // makes no sense, but it's been added, so trust it.
-    expect(() => {
-      $templateRequest("tpl.html");
-      $rootScope.$digest();
-    }).not.toThrow();
-    $templateCache.removeAll();
-
-    $templateCache.put("tpl.html", ""); // should work (empty template)
+    $templateCache.set("tpl.html", ""); // should work (empty template)
     expect(() => {
       $templateRequest("tpl.html");
       $rootScope.$digest();
     }).not.toThrow();
-    $templateCache.removeAll();
+    $templateCache = new Map();
   });
 
   it("should keep track of how many requests are going on", async () => {

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

@@ -14,7 +14,7 @@ import {
  * {@link ng.$http $http}.
  *
  */
-export function $HttpBackendProvider() {
+export function HttpBackendProvider() {
   this.$get = [
     "$browser",
     /**

package/src/services/log.js

@@ -40,7 +40,7 @@ export let LogService = {
  * @type {LogProvider}
  * Use the `$logProvider` to configure how the application logs messages
  */
-export class $LogProvider {
+export class LogProvider {
   constructor() {
     this.debug = true;
   }

package/src/services/template-request.js

@@ -1,5 +1,5 @@
 import { defaultHttpResponseTransform } from "./http/http";
-import { extend, isString, isUndefined, minErr } from "../shared/utils";
+import { extend, isString, minErr } from "../shared/utils";
 
 var $templateRequestMinErr = minErr("$templateRequest");
 
@@ -62,7 +62,7 @@ export function TemplateRequestProvider() {
     /**
      *
      * @param {import('../core/exception-handler').ErrorHandler} $exceptionHandler
-     * @param {*} $templateCache
+     * @param {import('../core/cache/cache-factory').TemplateCache} $templateCache
      * @param {*} $http
      * @param {*} $q
      * @param {*} $sce
@@ -77,7 +77,7 @@ export function TemplateRequestProvider() {
         // resources for keys that already are included in there. This also makes
         // AngularJS accept any script directive, no matter its name. However, we
         // still need to unwrap trusted types.
-        if (!isString(tpl) || isUndefined($templateCache.get(tpl))) {
+        if (!isString(tpl) || !$templateCache.has(tpl)) {
           tpl = $sce.getTrustedResourceUrl(tpl);
         }
 
@@ -107,7 +107,8 @@ export function TemplateRequestProvider() {
             handleRequestFn.totalPendingRequests--;
           })
           .then(function (response) {
-            return $templateCache.put(tpl, response.data);
+            $templateCache.set(tpl, response.data);
+            return response.data;
           }, handleError);
 
         function handleError(resp) {

package/src/shared/common.js

@@ -1,5 +1,5 @@
 import { isDate, isFunction, isRegExp, isString } from "./utils";
-import { all, prop, curry } from "./hof";
+import { all, curry } from "./hof";
 import { services } from "../router/common/coreservices";
 
 export function forEach(obj, cb, thisArg) {
@@ -160,8 +160,7 @@ export function defaults(opts, ...defaultsList) {
   const defaultVals = Object.assign({}, ...defaultsList.reverse());
   return Object.assign(defaultVals, pick(opts || {}, Object.keys(defaultVals)));
 }
-/** Reduce function that merges each element of the list into a single object, using extend */
-export const mergeR = (memo, item) => Object.assign(memo, item);
+
 /**
  * Finds the common ancestor path between two states.
  *
@@ -214,12 +213,7 @@ export function omit(obj, propNames) {
     .filter((x) => !propNames.includes(x))
     .reduce((acc, key) => ((acc[key] = obj[key]), acc), {});
 }
-/**
- * Maps an array, or object to a property (by name)
- */
-export function pluck(collection, propName) {
-  return map(collection, prop(propName));
-}
+
 /** Filters an Array or an Object's properties based on a predicate */
 export function filter(collection, callback) {
   const arr = Array.isArray(collection),

package/src/shared/hof.js

@@ -73,13 +73,7 @@ export function compose() {
 export function pipe() {
   return compose.apply(null, [].slice.call(arguments).reverse());
 }
-/**
- * Given a property name, returns a function that returns that property from an object
- * let obj = { foo: 1, name: "blarg" };
- * let getName = prop("name");
- * getName(obj) === "blarg"
- */
-export const prop = (name) => (obj) => obj && obj[name];
+
 /**
  * Given a property name and a value, returns a function that returns a boolean based on whether
  * the passed object has a property that matches the value
@@ -96,7 +90,11 @@ export const propEq = curry((name, _val, obj) => obj && obj[name] === _val);
  * let propNotFound = prop("this.property.doesnt.exist");
  * propNotFound(obj) === undefined
  */
-export const parse = (name) => pipe.apply(null, name.split(".").map(prop));
+export const parse = (name) =>
+  pipe.apply(
+    null,
+    name.split(".").map((name) => (obj) => obj && obj[name]),
+  );
 
 /**
  * Given two functions that return truthy or falsey values, returns a function that returns truthy

package/src/types.js

@@ -150,20 +150,6 @@
  * - An object where keys are string identifiers and values are {@link Controller}
  */
 
-/**
- * @template [S=import('./core/scope/scope').Scope]
- * @template {TScope} S - The type of the directive's scope.
- *
- * @template [T=import('./shared/jqlite/jqlite').JQLite]
- * @template {TElement} T - The type of the directive's element.
- *
- * @template [A=Attributes]
- * @template {TAttributes} A - The type of the directive's attributes.
- *
- * @template [C=Controller]
- * @template {TController} C - The type of the directive's controller.
- */
-
 /**
  * Compile function for an AngularJS directive.
  *