@angular-wave/angular.ts 0.3.0 → 0.4.0

package/src/router/path/path-utils.js

@@ -1,29 +1,11 @@
-import {
-  find,
-  pick,
-  omit,
-  tail,
-  mergeR,
-  unnestR,
-  arrayTuples,
-} from "../../shared/common";
-import { prop, propEq } from "../../shared/hof";
+import { find, pick, omit, unnestR, arrayTuples } from "../../shared/common";
+import { propEq } from "../../shared/hof";
 import { TargetState } from "../state/target-state";
 import { PathNode } from "./path-node";
 /**
  * This class contains functions which convert TargetStates, Nodes and paths from one type to another.
  */
 export class PathUtils {
-  /** Given a PathNode[], create an TargetState */
-  static makeTargetState(registry, path) {
-    const state = tail(path).state;
-    return new TargetState(
-      registry,
-      state,
-      path.map(prop("paramValues")).reduce(mergeR, {}),
-      {},
-    );
-  }
   static buildPath(targetState) {
     const toParams = targetState.params();
     return targetState
@@ -81,7 +63,7 @@ export class PathUtils {
       .map((node) => node.paramSchema)
       .reduce(unnestR, [])
       .filter((param) => !param.inherit)
-      .map(prop("id"));
+      .map((x) => x.id);
     /**
      * Given an [[PathNode]] "toNode", return a new [[PathNode]] with param values inherited from the
      * matching node in fromPath.  Only inherit keys that aren't found in "toKeys" from the node in "fromPath""
@@ -202,3 +184,19 @@ export class PathUtils {
     return path.reduce((acc, node) => Object.assign(acc, node.paramValues), {});
   }
 }
+
+/** Given a PathNode[], create an TargetState
+ * @param {import("../state/state-registry.js").StateRegistryProvider} registry
+ * @param {Array<PathNode>} path
+ * @returns
+ */
+export function makeTargetState(registry, path) {
+  return new TargetState(
+    registry,
+    path.at(-1).state,
+    path
+      .map((x) => x.paramValues)
+      .reduce((acc, obj) => ({ ...acc, ...obj }), {}),
+    {},
+  );
+}

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

@@ -8,7 +8,7 @@ import {
 } from "../../shared/common";
 import { isDefined, isFunction, isString } from "../../shared/utils";
 import { stringify } from "../../shared/strings";
-import { is, pattern, pipe, prop, val } from "../../shared/hof";
+import { is, pattern, pipe, val } from "../../shared/hof";
 import { Resolvable } from "../resolve/resolvable";
 import { services } from "../common/coreservices";
 import { annotate } from "../../core/di/injector";
@@ -73,12 +73,18 @@ function getNavigableBuilder(isRoot) {
 
 function getParamsBuilder(paramFactory) {
   return function (state) {
-    const makeConfigParam = (config, id) =>
+    const makeConfigParam = (_config, id) =>
       paramFactory.fromConfig(id, null, state.self);
     const urlParams =
       (state.url && state.url.parameters({ inherit: false })) || [];
     const nonUrlParams = Object.values(
-      map(omit(state.params || {}, urlParams.map(prop("id"))), makeConfigParam),
+      map(
+        omit(
+          state.params || {},
+          urlParams.map((x) => x.id),
+        ),
+        makeConfigParam,
+      ),
     );
     return urlParams
       .concat(nonUrlParams)
@@ -176,11 +182,11 @@ export function resolvablesBuilder(state) {
   // Given a literal resolve or provider object, returns a Resolvable
   const literal2Resolvable = pattern([
     [
-      prop("resolveFn"),
+      (x) => x.resolveFn,
       (p) => new Resolvable(getToken(p), p.resolveFn, p.deps, p.policy),
     ],
     [
-      prop("useFactory"),
+      (x) => x.useFactory,
       (p) =>
         new Resolvable(
           getToken(p),
@@ -190,27 +196,27 @@ export function resolvablesBuilder(state) {
         ),
     ],
     [
-      prop("useClass"),
+      (x) => x.useClass,
       (p) => new Resolvable(getToken(p), () => new p.useClass(), [], p.policy),
     ],
     [
-      prop("useValue"),
+      (x) => x.useValue,
       (p) =>
         new Resolvable(getToken(p), () => p.useValue, [], p.policy, p.useValue),
     ],
     [
-      prop("useExisting"),
+      (x) => x.useExisting,
       (p) => new Resolvable(getToken(p), (x) => x, [p.useExisting], p.policy),
     ],
   ]);
   const tuple2Resolvable = pattern([
     [
-      pipe(prop("val"), isString),
+      pipe((x) => x.val, isString),
       (tuple) =>
         new Resolvable(tuple.token, (x) => x, [tuple.val], tuple.policy),
     ],
     [
-      pipe(prop("val"), Array.isArray),
+      pipe((x) => x.val, Array.isArray),
       (tuple) =>
         new Resolvable(
           tuple.token,
@@ -220,7 +226,7 @@ export function resolvablesBuilder(state) {
         ),
     ],
     [
-      pipe(prop("val"), isFunction),
+      pipe((x) => x.val, isFunction),
       (tuple) =>
         new Resolvable(
           tuple.token,

package/src/router/state/state-queue-manager.js

@@ -1,30 +1,39 @@
-import { prop } from "../../shared/hof";
 import { isString } from "../../shared/utils";
 import { StateObject } from "./state-object";
 
 export class StateQueueManager {
+  /**
+   * @param {import("./state-registry.js").StateRegistryProvider} stateRegistry
+   * @param {*} urlServiceRules
+   * @param {*} states
+   * @param {*} builder
+   * @param {*} listeners
+   */
   constructor(stateRegistry, urlServiceRules, states, builder, listeners) {
     this.stateRegistry = stateRegistry;
     this.urlServiceRules = urlServiceRules;
     this.states = states;
     this.builder = builder;
     this.listeners = listeners;
+    /**
+     * @type {Array<StateObject>}
+     */
     this.queue = [];
   }
+
   register(stateDecl) {
-    const queue = this.queue;
     const state = new StateObject(stateDecl);
-    const name = state.name;
     if (!isString(name)) throw new Error("State must have a valid name");
     if (
-      Object.prototype.hasOwnProperty.call(this.states, name) ||
-      queue.map(prop("name")).includes(name)
+      Object.prototype.hasOwnProperty.call(this.states, state.name) ||
+      this.queue.map((x) => x.name).includes(state.name)
     )
-      throw new Error(`State '${name}' is already defined`);
-    queue.push(state);
+      throw new Error(`State '${state.name}' is already defined`);
+    this.queue.push(state);
     this.flush();
     return state;
   }
+
   flush() {
     const { queue, states, builder } = this;
     const registered = [], // states that got registered

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

@@ -12,7 +12,7 @@ import { isString } from "../../shared/utils";
  *
  * This API is found at `$stateRegistry` ([[UIRouter.stateRegistry]])
  */
-export class StateRegistry {
+export class StateRegistryProvider {
   static $inject = [
     "$urlServiceProvider",
     "$stateProvider",
@@ -42,7 +42,8 @@ export class StateRegistry {
       this.builder,
       this.listeners,
     );
-    this._registerRoot();
+
+    this.registerRoot();
 
     viewService._pluginapi._rootViewContext(this.root());
     globals.$current = this.root();
@@ -90,7 +91,10 @@ export class StateRegistry {
     };
   }
 
-  _registerRoot() {
+  /**
+   * @private
+   */
+  registerRoot() {
     const rootStateDef = {
       name: "",
       url: "^",
@@ -100,8 +104,8 @@ export class StateRegistry {
       },
       abstract: true,
     };
-    const _root = (this._root = this.stateQueue.register(rootStateDef));
-    _root.navigable = null;
+    this._root = this.stateQueue.register(rootStateDef);
+    this._root.navigable = null;
   }
 
   /**

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

@@ -8,7 +8,7 @@ import {
 import { isDefined, isObject, isString, minErr } from "../../shared/utils";
 import { Queue } from "../common/queue";
 import { services } from "../common/coreservices";
-import { PathUtils } from "../path/path-utils";
+import { makeTargetState } from "../path/path-utils";
 import { PathNode } from "../path/path-node";
 import { defaultTransOpts } from "../transition/transition-service";
 import { Rejection, RejectType } from "../transition/reject-factory";
@@ -27,7 +27,7 @@ const err = minErr("$stateProvider");
  *
  * This API is located at `router.stateService` ([[UIRouter.stateService]])
  */
-export class StateService {
+export class StateProvider {
   /**
    * The latest successful state parameters
    *
@@ -73,11 +73,11 @@ export class StateService {
       }
     };
     const getters = ["current", "$current", "params", "transition"];
-    const boundFns = Object.keys(StateService.prototype).filter(
+    const boundFns = Object.keys(StateProvider.prototype).filter(
       (x) => !getters.includes(x),
     );
     createProxyFunctions(
-      val(StateService.prototype),
+      val(StateProvider.prototype),
       this,
       val(this),
       boundFns,
@@ -88,11 +88,7 @@ export class StateService {
     );
   }
 
-  $get = [
-    () => {
-      return this;
-    },
-  ];
+  $get = () => this;
 
   /**
    * Decorates states when they are registered
@@ -215,7 +211,7 @@ export class StateService {
    * @internal
    */
   _handleInvalidTargetState(fromPath, toState) {
-    const fromState = PathUtils.makeTargetState(this.stateRegistry, fromPath);
+    const fromState = makeTargetState(this.stateRegistry, fromPath);
     const globals = this.globals;
     const latestThing = () => globals.transitionHistory.peekTail();
     const latest = latestThing();
@@ -690,7 +686,7 @@ export class StateService {
     if (!state || !state.lazyLoad)
       throw new Error("Can not lazy load " + stateOrName);
     const currentPath = this.getCurrentPath();
-    const target = PathUtils.makeTargetState(this.stateRegistry, currentPath);
+    const target = makeTargetState(this.stateRegistry, currentPath);
     transition =
       transition || this.transitionService.create(currentPath, target);
     return lazyLoadState(transition, state);

package/src/router/template-factory.js

@@ -14,7 +14,7 @@ import { annotate } from "../core/di/injector";
 /**
  * Service which manages loading of templates from a ViewConfig.
  */
-export class TemplateFactory {
+export class TemplateFactoryProvider {
   constructor() {
     /** @type {boolean} */
     this._useHttp = false;
@@ -28,7 +28,7 @@ export class TemplateFactory {
     "$injector",
     /**
      * @param {any} $http
-     * @param {any} $templateCache
+     * @param {import("../core/cache/cache-factory").TemplateCache} $templateCache
      * @param {any} $templateRequest
      * @param {any} $q
      * @param {import("../core/di/internal-injector").InjectorService} $injector

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

@@ -60,7 +60,7 @@ export let defaultTransOpts = {
  *
  * This API is located at `router.transitionService` ([[UIRouter.transitionService]])
  */
-export class TransitionService {
+export class TransitionProvider {
   static $inject = ["$routerGlobalsProvider", "$viewProvider"];
 
   /**

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/router/view-scroll.js

@@ -1,9 +1,13 @@
-export function $ViewScrollProvider() {
-  let useAnchorScroll = false;
-  this.useAnchorScroll = function () {
-    useAnchorScroll = true;
-  };
-  this.$get = [
+export class ViewScrollProvider {
+  constructor() {
+    this.enabled = false;
+  }
+
+  useAnchorScroll() {
+    this.enabled = true;
+  }
+
+  $get = [
     "$anchorScroll",
     "$timeout",
     /**
@@ -12,15 +16,16 @@ export function $ViewScrollProvider() {
      * @returns {import('../services/anchor-scroll').AnchorScrollObject|Function}
      */
     ($anchorScroll, $timeout) => {
-      if (useAnchorScroll) {
+      if (this.enabled) {
         return $anchorScroll;
       }
       /**
        * @param {import('../shared/jqlite/jqlite').JQLite} $element
+       * @returns {import('../core/q/q').QPromise<any>}
        */
       return function ($element) {
         return $timeout(
-          function () {
+          () => {
             $element[0].scrollIntoView();
           },
           0,

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.
    *