@angular-wave/angular.ts 0.0.15 → 0.0.17

package/src/router/{adapter/directives → directives}/viewDirective.js

@@ -1,13 +1,13 @@
-import { filter, tail, unnestR } from "../../core/common/common";
-import { isDefined, isFunction, isString } from "../../core/common/predicates";
-import { kebobString } from "../../core/common/strings";
-import { noop } from "../../core/common/common";
-import { parse } from "../../core/common/hof";
-import { ResolveContext } from "../../core/resolve/resolveContext";
-import { trace } from "../../core/common/trace";
+import { filter, tail, unnestR } from "../../shared/common";
+import { isDefined, isFunction, isString } from "../../shared/utils";
+import { kebobString } from "../../shared/strings";
+import { noop } from "../../shared/common";
+import { parse } from "../../shared/hof";
+import { ResolveContext } from "../resolve/resolveContext";
+import { trace } from "../common/trace";
 import { getLocals } from "../services";
-import { Ng1ViewConfig } from "../statebuilders/views";
-import { jqLite } from "../../../jqLite";
+import { Ng1ViewConfig } from "../state/views";
+import { jqLite } from "../../jqLite";
 /**
  * `ui-view`: A viewport directive which is filled in by a view from the active state.
  *

package/src/router/{core/globals.js → globals.js}

@@ -12,13 +12,23 @@ export class UIRouterGlobals {
      * Current parameter values
      *
      * The parameter values from the latest successful transition
+     * @type {StateParams}
      */
     this.params = new StateParams();
-    /** @internal */
+
+    /**
+     * @type {Number}
+     */
     this.lastStartedTransitionId = -1;
-    /** @internal */
+
+    /**
+     * @type {Queue}
+     */
     this.transitionHistory = new Queue([], 1);
-    /** @internal */
+
+    /**
+     * @type {Queue}
+     */
     this.successfulTransitions = new Queue([], 1);
   }
   dispose() {

package/src/router/{core/hooks → hooks}/coreResolvables.js

@@ -1,7 +1,7 @@
 import { Transition } from "../transition/transition";
 import { UIRouter } from "../router";
 import { Resolvable } from "../resolve/resolvable";
-import { inArray, uniqR, unnestR } from "../common/common";
+import { inArray, uniqR, unnestR } from "../../shared/common";
 function addCoreResolvables(trans) {
   trans.addResolvable(Resolvable.fromData(UIRouter, trans.router), "");
   trans.addResolvable(Resolvable.fromData(Transition, trans), "");
@@ -11,15 +11,17 @@ function addCoreResolvables(trans) {
     trans.addResolvable(Resolvable.fromData("$state$", state), state);
   });
 }
-export const registerAddCoreResolvables = (transitionService) =>
+export function registerAddCoreResolvables(transitionService) {
   transitionService.onCreate({}, addCoreResolvables);
+}
+
 const TRANSITION_TOKENS = ["$transition$", Transition];
 const isTransition = inArray(TRANSITION_TOKENS);
 // References to Transition in the treeChanges pathnodes makes all
 // previous Transitions reachable in memory, causing a memory leak
 // This function removes resolves for '$transition$' and `Transition` from the treeChanges.
 // Do not use this on current transitions, only on old ones.
-export const treeChangesCleanup = (trans) => {
+export function treeChangesCleanup(trans) {
   const nodes = Object.values(trans.treeChanges())
     .reduce(unnestR, [])
     .reduce(uniqR, []);
@@ -30,4 +32,4 @@ export const treeChangesCleanup = (trans) => {
   nodes.forEach((node) => {
     node.resolvables = node.resolvables.map(replaceTransitionWithNull);
   });
-};
+}

package/src/router/{core/hooks → hooks}/lazyLoad.js

@@ -57,11 +57,14 @@ const lazyLoadHook = (transition) => {
     .map((state) => lazyLoadState(transition, state));
   return services.$q.all(promises).then(retryTransition);
 };
-export const registerLazyLoadHook = (transitionService) =>
-  transitionService.onBefore(
+
+export function registerLazyLoadHook(transitionService) {
+  return transitionService.onBefore(
     { entering: (state) => !!state.lazyLoad },
     lazyLoadHook,
   );
+}
+
 /**
  * Invokes a state's lazy load function
  *

package/src/router/{core/hooks → hooks}/redirectTo.js

@@ -1,4 +1,4 @@
-import { isString, isFunction } from "../common/predicates";
+import { isString, isFunction } from "../../shared/utils";
 import { services } from "../common/coreservices";
 import { TargetState } from "../state/targetState";
 /**

package/src/router/{core/hooks → hooks}/resolve.js

@@ -1,6 +1,6 @@
-import { noop } from "../common/common";
+import { noop } from "../../shared/common";
 import { ResolveContext } from "../resolve/resolveContext";
-import { val } from "../common/hof";
+import { val } from "../../shared/hof";
 export const RESOLVE_HOOK_PRIORITY = 1000;
 /**
  * A [[TransitionHookFn]] which resolves all EAGER Resolvables in the To Path

package/src/router/{core/hooks → hooks}/updateGlobals.js

@@ -1,4 +1,4 @@
-import { copy } from "../common/common";
+import { copy } from "../../shared/common";
 /**
  * A [[TransitionHookFn]] which updates global UI-Router state
  *

package/src/router/{core/hooks → hooks}/views.js

@@ -1,4 +1,4 @@
-import { noop } from "../common/common";
+import { noop } from "../../shared/common";
 import { services } from "../common/coreservices";
 /**
  * A [[TransitionHookFn]] which waits for the views to load

package/src/router/index.js

@@ -0,0 +1,60 @@
+import {
+  $routerProvider,
+  getProviderFor,
+  getStateProvider,
+  router,
+  runBlock,
+  watchDigests,
+} from "./services";
+import { TemplateFactory } from "./templateFactory";
+import { trace } from "./common/trace";
+import { $ViewScrollProvider } from "./viewScroll";
+import { $IsStateFilter, $IncludedByStateFilter } from "./stateFilters";
+import {
+  uiSrefActiveDirective,
+  uiStateDirective,
+  uiSrefDirective,
+} from "./directives/stateDirectives";
+import { uiView, $ViewDirectiveFill } from "./directives/viewDirective";
+
+export function initRouter() {
+  window.angular
+    .module("ui.router", ["ng"])
+    .provider("$router", $routerProvider)
+    .provider("$urlService", getProviderFor("urlService"))
+    .provider("$urlMatcherFactory", [
+      "$routerProvider",
+      function RouterProvide() {
+        return router.urlMatcherFactory;
+      },
+    ])
+    .provider("$templateFactory", function () {
+      return new TemplateFactory();
+    })
+    .provider("$stateRegistry", getProviderFor("stateRegistry"))
+    .provider("$routerGlobals", getProviderFor("globals"))
+    .provider("$transitions", getProviderFor("transitionService"))
+    .provider("$state", ["$routerProvider", getStateProvider])
+    .provider("$uiViewScroll", $ViewScrollProvider)
+    .factory("$stateParams", [
+      "$router",
+      function StateParamse($router) {
+        return $router.globals.params;
+      },
+    ])
+    .factory("$view", function () {
+      return router.viewService;
+    })
+    .value("$trace", trace)
+    .filter("isState", $IsStateFilter)
+    .filter("includedByState", $IncludedByStateFilter)
+    .directive("uiSref", uiSrefDirective)
+    .directive("uiSrefActive", uiSrefActiveDirective)
+    .directive("uiSrefActiveEq", uiSrefActiveDirective)
+    .directive("uiState", uiStateDirective)
+    .directive("uiView", uiView)
+    .directive("uiView", $ViewDirectiveFill)
+
+    .run(watchDigests)
+    .run(runBlock);
+}

package/src/router/{adapter/injectables.js → injectables.js}

@@ -17,14 +17,14 @@
  * Because of these confusing details, this service is deprecated.
  *
  * ### Instead of using the global `$stateParams` service object,
- * inject [[$uiRouterGlobals]] and use [[UIRouterGlobals.params]]
+ * inject [[$routerGlobals]] and use [[UIRouterGlobals.params]]
  *
  * ```js
- * MyService.$inject = ['$uiRouterGlobals'];
- * function MyService($uiRouterGlobals) {
+ * MyService.$inject = ['$routerGlobals'];
+ * function MyService($routerGlobals) {
  *   return {
  *     paramValues: function () {
- *       return $uiRouterGlobals.params;
+ *       return $routerGlobals.params;
  *     }
  *   }
  * }
@@ -67,7 +67,7 @@ let $stateParams;
  *
  * This object contains globals such as the current state and current parameter values.
  */
-let $uiRouterGlobals;
+let $routerGlobals;
 /**
  * The UI-Router instance
  *
@@ -76,9 +76,9 @@ let $uiRouterGlobals;
  * This object is the UI-Router singleton instance, created by angular dependency injection during application bootstrap.
  * It has references to the other UI-Router services
  *
- * #### Note: This object is also exposed as [[$uiRouterProvider]] for injection during angular config time.
+ * #### Note: This object is also exposed as [[$routerProvider]] for injection during angular config time.
  */
-let $uiRouter;
+let $router;
 /**
  * The UI-Router instance
  *
@@ -87,9 +87,9 @@ let $uiRouter;
  * This object is the UI-Router singleton instance, created by angular dependency injection during application bootstrap.
  * It has references to the other UI-Router services
  *
- * #### Note: This object is also exposed as [[$uiRouter]] for injection during runtime.
+ * #### Note: This object is also exposed as [[$router]] for injection during runtime.
  */
-let $uiRouterProvider;
+let $routerProvider;
 /**
  * Transition debug/tracing
  *

package/src/router/{adapter/locationServices.js → locationServices.js}

@@ -1,12 +1,24 @@
-/** @publicapi @module ng1 */ /** */
-import { isDefined, isObject } from "../../core/utils";
-import { val } from "../core/common/hof";
-import { createProxyFunctions, removeFrom } from "../core/common/common";
+import { isDefined, isObject } from "../shared/utils";
+import { val } from "../shared/hof";
+import { createProxyFunctions, removeFrom } from "../shared/common";
+
 /**
  * Implements UI-Router LocationServices and LocationConfig using Angular 1's $location service
  * @internalapi
  */
 export class Ng1LocationServices {
+  /**
+   *
+   * @param {angular.ILocationProvider} $locationProvider
+   */
+  constructor($locationProvider) {
+    // .onChange() registry
+    this._urlListeners = [];
+    /** @type {angular.ILocationProvider} */ this.$locationProvider =
+      $locationProvider;
+    const _lp = val($locationProvider);
+    createProxyFunctions(_lp, this, _lp, ["hashPrefix"]);
+  }
   /**
    * Applys ng1-specific path parameter encoding
    *
@@ -33,13 +45,7 @@ export class Ng1LocationServices {
         : x;
   }
   dispose() {}
-  constructor($locationProvider) {
-    // .onChange() registry
-    this._urlListeners = [];
-    this.$locationProvider = $locationProvider;
-    const _lp = val($locationProvider);
-    createProxyFunctions(_lp, this, _lp, ["hashPrefix"]);
-  }
+
   onChange(callback) {
     this._urlListeners.push(callback);
     return () => removeFrom(this._urlListeners)(callback);
@@ -62,8 +68,9 @@ export class Ng1LocationServices {
     if (state) this.$location.state(state);
     return this.$location.url();
   }
+
   _runtimeServices($rootScope, $location, $browser) {
-    this.$location = $location;
+    /** @type {angular.ILocationService} */ this.$location = $location;
     this.$browser = $browser;
     this.$window = window;
     // Bind $locationChangeSuccess to the listeners registered in LocationService.onChange

package/src/router/{core/params → params}/param.js

@@ -1,12 +1,7 @@
-import { filter, map, allTrueR, find } from "../common/common";
-import { prop } from "../common/hof";
-import {
-  isInjectable,
-  isDefined,
-  isString,
-  isArray,
-  isUndefined,
-} from "../common/predicates";
+import { filter, map, allTrueR, find } from "../../shared/common";
+import { prop } from "../../shared/hof";
+import { isInjectable } from "../../shared/predicates";
+import { isDefined, isUndefined, isString } from "../../shared/utils";
 import { services } from "../common/coreservices";
 import { ParamType } from "./paramType";
 const hasOwn = Object.prototype.hasOwnProperty;
@@ -79,7 +74,7 @@ function getReplace(config, arrayMode, isOptional, squash) {
     { from: "", to: isOptional || arrayMode ? undefined : "" },
     { from: null, to: isOptional || arrayMode ? undefined : "" },
   ];
-  const replace = isArray(config.replace) ? config.replace : [];
+  const replace = Array.isArray(config.replace) ? config.replace : [];
   if (isString(squash)) replace.push({ from: squash, to: undefined });
   const configuredKeys = map(replace, prop("from"));
   return filter(

package/src/router/{core/params → params}/paramType.js

@@ -1,5 +1,5 @@
-import { filter, map } from "../common/common";
-import { isArray, isDefined } from "../common/predicates";
+import { filter, map } from "../../shared/common";
+import { isDefined } from "../../shared/utils";
 /**
  * An internal class which implements [[ParamTypeDefinition]].
  *
@@ -86,7 +86,7 @@ export class ParamType {
 function ArrayType(type, mode) {
   // Wrap non-array value as array
   function arrayWrap(val) {
-    return isArray(val) ? val : isDefined(val) ? [val] : [];
+    return Array.isArray(val) ? val : isDefined(val) ? [val] : [];
   }
   // Unwrap array value for "auto" mode. Return undefined for empty array.
   function arrayUnwrap(val) {
@@ -102,7 +102,7 @@ function ArrayType(type, mode) {
   // Wraps type (.is/.encode/.decode) functions to operate on each value of an array
   function arrayHandler(callback, allTruthyMode) {
     return function handleArray(val) {
-      if (isArray(val) && val.length === 0) return val;
+      if (Array.isArray(val) && val.length === 0) return val;
       const arr = arrayWrap(val);
       const result = map(arr, callback);
       return allTruthyMode === true

package/src/router/{core/params → params}/paramTypes.js

@@ -6,9 +6,10 @@ import {
   inherit,
   map,
   pick,
-} from "../common/common";
-import { isDefined, isNullOrUndefined } from "../common/predicates";
-import { is } from "../common/hof";
+} from "../../shared/common";
+import { isNullOrUndefined } from "../../shared/predicates";
+import { isDefined } from "../../shared/utils";
+import { is } from "../../shared/hof";
 import { services } from "../common/coreservices";
 import { ParamType } from "./paramType";
 /**

package/src/router/{core/params → params}/stateParams.js

@@ -1,4 +1,4 @@
-import { ancestors } from "../common/common";
+import { ancestors } from "../../shared/common";
 export class StateParams {
   constructor(params = {}) {
     Object.assign(this, params);

package/src/router/{core/path → path}/pathNode.js

@@ -1,5 +1,5 @@
-import { applyPairs, find } from "../common/common";
-import { propEq } from "../common/hof";
+import { applyPairs, find } from "../../shared/common";
+import { propEq } from "../../shared/hof";
 import { Param } from "../params/param";
 /**
  * A node in a [[TreeChanges]] path

package/src/router/{core/path → path}/pathUtils.js

@@ -7,8 +7,8 @@ import {
   unnestR,
   inArray,
   arrayTuples,
-} from "../common/common";
-import { prop, propEq } from "../common/hof";
+} from "../../shared/common";
+import { prop, propEq } from "../../shared/hof";
 import { TargetState } from "../state/targetState";
 import { PathNode } from "./pathNode";
 /**
@@ -190,9 +190,15 @@ export class PathUtils {
     const elementIdx = path.indexOf(node);
     return elementIdx === -1 ? undefined : path.slice(0, elementIdx + 1);
   }
+
+  static nonDynamicParams(node) {
+    return node.state
+      .parameters({ inherit: false })
+      .filter((param) => !param.dynamic);
+  }
+
+  /** Gets the raw parameter values from a path */
+  static paramValues(path) {
+    return path.reduce((acc, node) => Object.assign(acc, node.paramValues), {});
+  }
 }
-PathUtils.nonDynamicParams = (node) =>
-  node.state.parameters({ inherit: false }).filter((param) => !param.dynamic);
-/** Gets the raw parameter values from a path */
-PathUtils.paramValues = (path) =>
-  path.reduce((acc, node) => Object.assign(acc, node.paramValues), {});

package/src/router/{core/resolve → resolve}/resolvable.js

@@ -1,9 +1,8 @@
-import { identity } from "../../../core/utils";
+import { identity, isFunction, isObject } from "../../shared/utils";
 import { services } from "../common/coreservices";
 import { trace } from "../common/trace";
-import { stringify } from "../common/strings";
-import { isFunction, isObject } from "../common/predicates";
-import { isNullOrUndefined } from "../common/predicates";
+import { stringify } from "../../shared/strings";
+import { isNullOrUndefined } from "../../shared/predicates";
 // TODO: explicitly make this user configurable
 export let defaultResolvePolicy = {
   when: "LAZY",
@@ -44,7 +43,8 @@ export class Resolvable {
     } else if (
       isObject(arg1) &&
       arg1.token &&
-      (arg1.hasOwnProperty("resolveFn") || arg1.hasOwnProperty("data"))
+      (Object.prototype.hasOwnProperty.call(arg1, "resolveFn") ||
+        Object.prototype.hasOwnProperty.call(arg1, "data"))
     ) {
       const literal = arg1;
       return new Resolvable(

package/src/router/{core/resolve → resolve}/resolveContext.js

@@ -1,12 +1,22 @@
-import { find, tail, uniqR, unnestR, inArray } from "../common/common";
-import { propEq, not } from "../common/hof";
+import { find, tail, uniqR, unnestR, inArray } from "../../shared/common";
+import { propEq, not } from "../../shared/hof";
 import { trace } from "../common/trace";
 import { services } from "../common/coreservices";
-import { resolvePolicies } from "./interface";
 import { Resolvable } from "./resolvable";
 import { PathUtils } from "../path/pathUtils";
-import { stringify } from "../common/strings";
-import { isUndefined } from "../../../core/utils";
+import { stringify } from "../../shared/strings";
+import { isUndefined } from "../../shared/utils";
+
+export let resolvePolicies = {
+  when: {
+    LAZY: "LAZY",
+    EAGER: "EAGER",
+  },
+  async: {
+    WAIT: "WAIT",
+    NOWAIT: "NOWAIT",
+  },
+};
 
 const whens = resolvePolicies.when;
 const ALL_WHENS = [whens.EAGER, whens.LAZY];
@@ -179,7 +189,7 @@ export class ResolveContext {
     return resolvable.deps.map(getDependency);
   }
 }
-/** @internal */
+
 class UIInjectorImpl {
   constructor(context) {
     this.context = context;