@angular-wave/angular.ts 0.0.16 → 0.0.17

package/src/router/{core/transition → transition}/transitionService.js

@@ -25,9 +25,9 @@ import { registerUpdateUrl } from "../hooks/url";
 import { registerLazyLoadHook } from "../hooks/lazyLoad";
 import { TransitionEventType } from "./transitionEventType";
 import { TransitionHook } from "./transitionHook";
-import { isDefined } from "../common/predicates";
-import { removeFrom, createProxyFunctions } from "../common/common";
-import { val } from "../common/hof";
+import { isDefined } from "../../shared/utils";
+import { removeFrom, createProxyFunctions } from "../../shared/common";
+import { val } from "../../shared/hof";
 import { registerIgnoredTransitionHook } from "../hooks/ignoredTransition";
 import { registerInvalidTransitionHook } from "../hooks/invalidTransition";
 /**
@@ -60,9 +60,10 @@ export let defaultTransOpts = {
  * This API is located at `router.transitionService` ([[UIRouter.transitionService]])
  */
 export class TransitionService {
-  /** @internal */
+  /**
+   * @param {import('../router').UIRouter} _router
+   */
   constructor(_router) {
-    /** @internal */
     this._transitionCount = 0;
     /** The transition hook types, such as `onEnter`, `onStart`, etc */
     this._eventTypes = [];
@@ -169,7 +170,7 @@ export class TransitionService {
   create(fromPath, targetState) {
     return new Transition(fromPath, targetState, this._router);
   }
-  /** @internal */
+
   _defineCoreEvents() {
     const Phase = TransitionHookPhase;
     const TH = TransitionHook;
@@ -214,7 +215,7 @@ export class TransitionService {
       SYNCHRONOUS,
     );
   }
-  /** @internal */
+
   _defineCorePaths() {
     const { STATE, TRANSITION } = TransitionHookScope;
     this._definePathType("to", TRANSITION);
@@ -223,7 +224,7 @@ export class TransitionService {
     this._definePathType("retained", STATE);
     this._definePathType("entering", STATE);
   }
-  /** @internal */
+
   _defineEvent(
     name,
     hookPhase,
@@ -247,7 +248,7 @@ export class TransitionService {
     this._eventTypes.push(eventType);
     makeEvent(this, this, eventType);
   }
-  /** @internal */
+
   _getEvents(phase) {
     const transitionHookTypes = isDefined(phase)
       ? this._eventTypes.filter((type) => type.hookPhase === phase)
@@ -273,16 +274,15 @@ export class TransitionService {
   _definePathType(name, hookScope) {
     this._criteriaPaths[name] = { name, scope: hookScope };
   }
-  /** @internal */
-  // tslint:disable-next-line
+
   _getPathTypes() {
     return this._criteriaPaths;
   }
-  /** @internal */
+
   getHooks(hookName) {
     return this._registeredHooks[hookName];
   }
-  /** @internal */
+
   _registerCoreTransitionHooks() {
     const fns = this._deregisterHookFns;
     fns.addCoreResolves = registerAddCoreResolvables(this);

package/src/router/{core/url → url}/urlConfig.js

@@ -1,5 +1,5 @@
-import { ParamTypes } from "../../core/params/paramTypes";
-import { isDefined, isString } from "../../../core/utils";
+import { ParamTypes } from "../params/paramTypes";
+import { isDefined, isString } from "../../shared/utils";
 /**
  * An API to customize the URL behavior and retrieve URL configuration
  *
@@ -14,21 +14,30 @@ import { isDefined, isString } from "../../../core/utils";
  * This API is found at `router.urlService.config` (see: [[UIRouter.urlService]], [[URLService.config]])
  */
 export class UrlConfig {
-  /** @internal */ constructor(/** @internal */ router) {
+  /**
+   * @param {import('../router').UIRouter} router
+   */
+  constructor(router) {
+    /** @type {import('../router').UIRouter} */
     this.router = router;
-    /** @internal */ this.paramTypes = new ParamTypes();
-    /** @internal */ this._decodeParams = true;
-    /** @internal */ this._isCaseInsensitive = false;
-    /** @internal */ this._isStrictMode = true;
-    /** @internal */ this._defaultSquashPolicy = false;
-    /** @internal */ this.dispose = () => this.paramTypes.dispose();
+    /** @type {ParamTypes} */
+    this.paramTypes = new ParamTypes();
+    /** @type {boolean} */
+    this._decodeParams = true;
+    /** @type {boolean} */
+    this._isCaseInsensitive = false;
+    /** @type {boolean} */
+    this._isStrictMode = true;
+    /** @type {boolean} */
+    this._defaultSquashPolicy = false;
+    this.dispose = () => this.paramTypes.dispose();
     // Delegate these calls to the current LocationConfig implementation
     /**
      * Gets the base Href, e.g., `http://localhost/approot/`
      *
      * @return the application's base href
      */
-    this.baseHref = () => this.router.locationConfig.baseHref();
+    this.baseHref = () => this.router.locationService.baseHref();
     /**
      * Gets or sets the hashPrefix
      *
@@ -39,31 +48,31 @@ export class UrlConfig {
      * @return the hash prefix
      */
     this.hashPrefix = (newprefix) =>
-      this.router.locationConfig.hashPrefix(newprefix);
+      this.router.locationService.$locationProvider.hashPrefix(newprefix);
     /**
      * Gets the host, e.g., `localhost`
      *
-     * @return the protocol
+     * @return {string} the protocol
      */
-    this.host = () => this.router.locationConfig.host();
+    this.host = () => this.router.locationService.$location.host();
     /**
      * Returns true when running in pushstate mode
      *
-     * @return true when running in html5 mode (pushstate mode).
+     * @return {boolean} true when running in html5 mode (pushstate mode).
      */
-    this.html5Mode = () => this.router.locationConfig.html5Mode();
+    this.html5Mode = () => this.router.locationService.html5Mode();
     /**
      * Gets the port, e.g., `80`
      *
-     * @return the port number
+     * @return {number} the port number
      */
-    this.port = () => this.router.locationConfig.port();
+    this.port = () => this.router.locationService.$location.port();
     /**
      * Gets the protocol, e.g., `http`
      *
-     * @return the protocol
+     * @return {string} the protocol
      */
-    this.protocol = () => this.router.locationConfig.protocol();
+    this.protocol = () => this.router.locationService.$location.protocol();
   }
   /**
    * Defines whether URL matching should be case sensitive (the default behavior), or not.

package/src/router/{core/url → url}/urlMatcher.js

@@ -9,11 +9,11 @@ import {
   unnestR,
   arrayTuples,
   defaults,
-} from "../common/common";
-import { prop, propEq } from "../common/hof";
-import { isArray, isString, isDefined } from "../common/predicates";
+} from "../../shared/common";
+import { prop, propEq } from "../../shared/hof";
+import { isDefined, isString } from "../../shared/utils";
 import { Param, DefType } from "../params/param";
-import { joinNeighborsR, splitOnDelim } from "../common/strings";
+import { joinNeighborsR, splitOnDelim } from "../../shared/strings";
 function quoteRegExp(str, param) {
   let surroundPattern = ["", ""],
     result = str.replace(/[\\\[\]\^$*+?.()|{}]/g, "\\$&");
@@ -94,7 +94,6 @@ const defaultConfig = {
  *
  */
 export class UrlMatcher {
-  /** @internal */
   static encodeDashes(str) {
     // Replace dashes with encoded "\-"
     return encodeURIComponent(str).replace(
@@ -185,15 +184,14 @@ export class UrlMatcher {
    * @param config  A [[UrlMatcherCompileConfig]] configuration object
    */
   constructor(pattern, paramTypes, paramFactory, config) {
-    /** @internal */
     this._cache = { path: [this] };
-    /** @internal */
+
     this._children = [];
-    /** @internal */
+
     this._params = [];
-    /** @internal */
+
     this._segments = [];
-    /** @internal */
+
     this._compiled = [];
     this.config = config = defaults(config, defaultConfig);
     this.pattern = pattern;
@@ -306,7 +304,7 @@ export class UrlMatcher {
     };
     return url;
   }
-  /** @internal */
+
   isRoot() {
     return this._cache.path[0] === this;
   }
@@ -317,7 +315,7 @@ export class UrlMatcher {
   _getDecodedParamValue(value, param) {
     if (isDefined(value)) {
       if (this.config.decodeParams && !param.type.raw) {
-        if (isArray(value)) {
+        if (Array.isArray(value)) {
           value = value.map((paramValue) => decodeURIComponent(paramValue));
         } else {
           value = decodeURIComponent(value);
@@ -449,7 +447,7 @@ export class UrlMatcher {
     params = params || {};
     // I'm not sure why this checks only the param keys passed in, and not all the params known to the matcher
     const paramSchema = this.parameters().filter((paramDef) =>
-      params.hasOwnProperty(paramDef.id),
+      Object.prototype.hasOwnProperty.call(params, paramDef.id),
     );
     return paramSchema
       .map((paramDef) => validParamVal(paramDef, params[paramDef.id]))
@@ -515,7 +513,7 @@ export class UrlMatcher {
       if (squash !== false) return acc; // ?
       if (encoded == null) return acc;
       // If this parameter value is an array, encode the value using encodeDashes
-      if (isArray(encoded))
+      if (Array.isArray(encoded))
         return acc + map(encoded, UrlMatcher.encodeDashes).join("-");
       // If the parameter type is "raw", then do not encodeURIComponent
       if (param.raw) return acc + encoded;
@@ -528,7 +526,7 @@ export class UrlMatcher {
       .map((paramDetails) => {
         let { param, squash, encoded, isDefaultValue } = paramDetails;
         if (encoded == null || (isDefaultValue && squash !== false)) return;
-        if (!isArray(encoded)) encoded = [encoded];
+        if (!Array.isArray(encoded)) encoded = [encoded];
         if (encoded.length === 0) return;
         if (!param.raw) encoded = map(encoded, encodeURIComponent);
         return encoded.map((val) => `${param.id}=${val}`);
@@ -544,5 +542,5 @@ export class UrlMatcher {
     );
   }
 }
-/** @internal */
+
 UrlMatcher.nameValidator = /^\w+([-.]+\w+)*(?:\[\])?$/;

package/src/router/{core/url → url}/urlMatcherFactory.js

@@ -1,8 +1,12 @@
-import { forEach, isDefined, isFunction, isObject } from "../../../core/utils";
+import { forEach, isDefined, isFunction, isObject } from "../../shared/utils";
 import { UrlMatcher } from "./urlMatcher";
 import { DefType, Param } from "../params/param";
 
 export class ParamFactory {
+  constructor(router) {
+    this.router = router;
+  }
+
   fromConfig(id, type, state) {
     return new Param(
       id,
@@ -30,9 +34,6 @@ export class ParamFactory {
       state,
     );
   }
-  constructor(router) {
-    this.router = router;
-  }
 }
 /**
  * Factory for [[UrlMatcher]] instances.
@@ -42,7 +43,7 @@ export class ParamFactory {
  */
 export class UrlMatcherFactory {
   // TODO: move implementations to UrlConfig (urlService.config)
-  constructor(/** @internal */ router) {
+  constructor(router) {
     this.router = router;
     /** Creates a new [[Param]] for a given location (DefType) */
     this.paramFactory = new ParamFactory(this.router);
@@ -107,7 +108,7 @@ export class UrlMatcherFactory {
     });
     return result;
   }
-  /** @internal */
+
   $get() {
     const urlConfig = this.router.urlService.config;
     urlConfig.paramTypes.enqueue = false;

package/src/router/{core/url → url}/urlRouter.js

@@ -1,4 +1,4 @@
-import { stripLastPathElement } from "../common/strings";
+import { stripLastPathElement } from "../../shared/strings";
 import { UrlRuleFactory } from "./urlRule";
 function appendBasePath(url, isHtml5, absolute, baseHref) {
   if (baseHref === "/") return url;
@@ -15,36 +15,12 @@ function appendBasePath(url, isHtml5, absolute, baseHref) {
  * For configuring URL rules, use the [[UrlRules]] which can be found as [[UrlService.rules]].
  */
 export class UrlRouter {
-  /** @internal */
-  constructor(/** @internal */ router) {
+  /**
+   *
+   * @param {import('../router').UIRouter} router
+   */
+  constructor(router) {
     this.router = router;
-    // Delegate these calls to [[UrlService]]
-    /** @deprecated use [[UrlService.sync]]*/
-    this.sync = (evt) => this.router.urlService.sync(evt);
-    /** @deprecated use [[UrlService.listen]]*/
-    this.listen = (enabled) => this.router.urlService.listen(enabled);
-    /** @deprecated use [[UrlService.deferIntercept]]*/
-    this.deferIntercept = (defer) =>
-      this.router.urlService.deferIntercept(defer);
-    /** @deprecated use [[UrlService.match]]*/
-    this.match = (urlParts) => this.router.urlService.match(urlParts);
-    // Delegate these calls to [[UrlRules]]
-    /** @deprecated use [[UrlRules.initial]]*/
-    this.initial = (handler) => this.router.urlService.rules.initial(handler);
-    /** @deprecated use [[UrlRules.otherwise]]*/
-    this.otherwise = (handler) =>
-      this.router.urlService.rules.otherwise(handler);
-    /** @deprecated use [[UrlRules.removeRule]]*/
-    this.removeRule = (rule) => this.router.urlService.rules.removeRule(rule);
-    /** @deprecated use [[UrlRules.rule]]*/
-    this.rule = (rule) => this.router.urlService.rules.rule(rule);
-    /** @deprecated use [[UrlRules.rules]]*/
-    this.rules = () => this.router.urlService.rules.rules();
-    /** @deprecated use [[UrlRules.sort]]*/
-    this.sort = (compareFn) => this.router.urlService.rules.sort(compareFn);
-    /** @deprecated use [[UrlRules.when]]*/
-    this.when = (matcher, handler, options) =>
-      this.router.urlService.rules.when(matcher, handler, options);
     this.urlRuleFactory = new UrlRuleFactory(router);
   }
   /** Internal API. */

package/src/router/{core/url → url}/urlRule.js

@@ -1,7 +1,7 @@
 import { UrlMatcher } from "./urlMatcher";
-import { isString, isDefined, isFunction } from "../common/predicates";
-import { identity } from "../common/common";
-import { is, or, pattern } from "../common/hof";
+import { isString, isFunction, isDefined } from "../../shared/utils";
+import { identity } from "../../shared/common";
+import { is, or, pattern } from "../../shared/hof";
 import { StateObject } from "../state/stateObject";
 /**
  * Creates a [[UrlRule]]

package/src/router/{core/url → url}/urlRules.js

@@ -1,8 +1,8 @@
 import { TargetState } from "../state/targetState";
 import { UrlMatcher } from "./urlMatcher";
-import { is, val } from "../common/hof";
-import { isDefined, isFunction, isString } from "../common/predicates";
-import { removeFrom } from "../common/common";
+import { is, val } from "../../shared/hof";
+import { isDefined, isFunction, isString } from "../../shared/utils";
+import { removeFrom } from "../../shared/common";
 import { UrlRuleFactory } from "./urlRule";
 const prioritySort = (a, b) => (b.priority || 0) - (a.priority || 0);
 const typeSort = (a, b) => {
@@ -65,15 +65,14 @@ function getHandlerFn(handler) {
  * This API is found at `router.urlService.rules` (see: [[UIRouter.urlService]], [[URLService.rules]])
  */
 export class UrlRules {
-  /** @internal */
-  constructor(/** @internal */ router) {
+  constructor(router) {
     this.router = router;
-    /** @internal */ this._sortFn = defaultRuleSortFn;
-    /** @internal */ this._rules = [];
-    /** @internal */ this._id = 0;
+    this._sortFn = defaultRuleSortFn;
+    this._rules = [];
+    this._id = 0;
     this.urlRuleFactory = new UrlRuleFactory(router);
   }
-  /** @internal */
+
   dispose(router) {
     this._rules = [];
     delete this._otherwiseFn;
@@ -266,11 +265,11 @@ export class UrlRules {
     this._rules = sorted;
     this._sorted = true;
   }
-  /** @internal */
+
   ensureSorted() {
     this._sorted || this.sort();
   }
-  /** @internal */
+
   stableSort(arr, compareFn) {
     const arrOfWrapper = arr.map((elem, idx) => ({ elem, idx }));
     arrOfWrapper.sort((wrapperA, wrapperB) => {

package/src/router/{core/url → url}/urlService.js

@@ -1,5 +1,5 @@
-import { isString } from "../../../core/utils";
-import { is, pattern } from "../common/hof";
+import { isString } from "../../shared/utils";
+import { is, pattern } from "../../shared/hof";
 import { UrlRules } from "./urlRules";
 import { UrlConfig } from "./urlConfig";
 import { TargetState } from "../state/targetState";
@@ -7,10 +7,16 @@ import { TargetState } from "../state/targetState";
  * API for URL management
  */
 export class UrlService {
-  /** @internal */
-  constructor(/** @internal */ router) {
+  /**
+   *
+   * @param {import('../router').UIRouter} router
+   */
+  constructor(router) {
+    /**
+     * @type {import('../router').UIRouter}
+     */
     this.router = router;
-    /** @internal */ this.interceptDeferred = false;
+    this.interceptDeferred = false;
     /**
      * The nested [[UrlRules]] API for managing URL rules and rewrites
      *
@@ -120,7 +126,7 @@ export class UrlService {
     this.onChange = (callback) =>
       this.router.locationService.onChange(callback);
   }
-  /** @internal */
+
   dispose() {
     this.listen(false);
     this.rules.dispose();

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

@@ -4,9 +4,9 @@ import {
   removeFrom,
   inArray,
   find,
-} from "../common/common";
-import { curry, prop } from "../common/hof";
-import { isString, isArray } from "../common/predicates";
+} from "../../shared/common";
+import { curry, prop } from "../../shared/hof";
+import { isString } from "../../shared/utils";
 import { trace } from "../common/trace";
 /**
  * The View service
@@ -25,6 +25,32 @@ import { trace } from "../common/trace";
  *
  */
 export class ViewService {
+  /**
+   * @param {import('../router').UIRouter} router
+   */
+  constructor(router) {
+    /**
+     * @type {import('../router').UIRouter}
+     */
+    this.router = router;
+    this._uiViews = [];
+    this._viewConfigs = [];
+    this._viewConfigFactories = {};
+    this._listeners = [];
+    this._pluginapi = {
+      _rootViewContext: this._rootViewContext.bind(this),
+      _viewConfigFactory: this._viewConfigFactory.bind(this),
+      _registeredUIView: (id) =>
+        find(this._uiViews, (view) => `${this.router.$id}.${view.id}` === id),
+      _registeredUIViews: () => this._uiViews,
+      _activeViewConfigs: () => this._viewConfigs,
+      _onSync: (listener) => {
+        this._listeners.push(listener);
+        return () => removeFrom(this._listeners, listener);
+      },
+    };
+  }
+
   /**
    * Normalizes a view's name from a state.views configuration block.
    *
@@ -69,32 +95,11 @@ export class ViewService {
     }
     return { uiViewName, uiViewContextAnchor };
   }
-  /** @internal */
-  constructor(/** @internal */ router) {
-    this.router = router;
-    /** @internal */ this._uiViews = [];
-    /** @internal */ this._viewConfigs = [];
-    /** @internal */ this._viewConfigFactories = {};
-    /** @internal */ this._listeners = [];
-    /** @internal */
-    this._pluginapi = {
-      _rootViewContext: this._rootViewContext.bind(this),
-      _viewConfigFactory: this._viewConfigFactory.bind(this),
-      _registeredUIView: (id) =>
-        find(this._uiViews, (view) => `${this.router.$id}.${view.id}` === id),
-      _registeredUIViews: () => this._uiViews,
-      _activeViewConfigs: () => this._viewConfigs,
-      _onSync: (listener) => {
-        this._listeners.push(listener);
-        return () => removeFrom(this._listeners, listener);
-      },
-    };
-  }
-  /** @internal */
+
   _rootViewContext(context) {
     return (this._rootContext = context || this._rootContext);
   }
-  /** @internal */
+
   _viewConfigFactory(viewType, factory) {
     this._viewConfigFactories[viewType] = factory;
   }
@@ -105,7 +110,7 @@ export class ViewService {
         "ViewService: No view config factory registered for type " + decl.$type,
       );
     const cfgs = cfgFactory(path, decl);
-    return isArray(cfgs) ? cfgs : [cfgs];
+    return Array.isArray(cfgs) ? cfgs : [cfgs];
   }
   /**
    * Deactivates a ViewConfig.

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

@@ -10,6 +10,9 @@ export function $ViewScrollProvider() {
       if (useAnchorScroll) {
         return $anchorScroll;
       }
+      /**
+       * @param {JQLite} $element
+       */
       return function ($element) {
         return $timeout(
           function () {

package/src/services/anchor-scroll.js

@@ -4,7 +4,7 @@ import {
   isNumber,
   isString,
   nodeName_,
-} from "../core/utils";
+} from "../shared/utils";
 
 export function AnchorScrollProvider() {
   let autoScrollingEnabled = true;

package/src/services/browser.js

@@ -1,6 +1,6 @@
 import { jqLite } from "../jqLite";
 import { urlResolve } from "../core/urlUtils";
-import { forEach, isUndefined, equals } from "../core/utils";
+import { forEach, isUndefined, equals } from "../shared/utils";
 
 // This variable should be used *only* inside the cacheState function.
 let lastCachedState = null;

package/src/services/cache-factory.js

@@ -1,4 +1,10 @@
-import { createMap, extend, forEach, isUndefined, minErr } from "../core/utils";
+import {
+  createMap,
+  extend,
+  forEach,
+  isUndefined,
+  minErr,
+} from "../shared/utils";
 
 /**
  * @ngdoc service

package/src/services/cookie-reader.js

@@ -1,4 +1,4 @@
-import { isUndefined } from "../core/utils";
+import { isUndefined } from "../shared/utils";
 
 /**
  * @name $$cookieReader

package/src/services/http-backend.js

@@ -1,5 +1,10 @@
 import { urlResolve } from "../core/urlUtils";
-import { forEach, isDefined, isPromiseLike, isUndefined } from "../core/utils";
+import {
+  forEach,
+  isDefined,
+  isPromiseLike,
+  isUndefined,
+} from "../shared/utils";
 
 /**
  * @ngdoc service

package/src/services/http.js

@@ -7,7 +7,6 @@ import {
   forEachSorted,
   isUndefined,
   isFunction,
-  isArray,
   forEach,
   encodeUriQuery,
   isString,
@@ -23,7 +22,7 @@ import {
   extend,
   uppercase,
   isPromiseLike,
-} from "../core/utils";
+} from "../shared/utils";
 
 const APPLICATION_JSON = "application/json";
 const CONTENT_TYPE_APPLICATION_JSON = {
@@ -67,7 +66,7 @@ export function $HttpParamSerializerProvider() {
       const parts = [];
       forEachSorted(params, (value, key) => {
         if (value === null || isUndefined(value) || isFunction(value)) return;
-        if (isArray(value)) {
+        if (Array.isArray(value)) {
           forEach(value, (v) => {
             parts.push(
               `${encodeUriQuery(key)}=${encodeUriQuery(serializeValue(v))}`,
@@ -138,7 +137,7 @@ export function $HttpParamSerializerJQLikeProvider() {
       return parts.join("&");
 
       function serialize(toSerialize, prefix, topLevel) {
-        if (isArray(toSerialize)) {
+        if (Array.isArray(toSerialize)) {
           forEach(toSerialize, (value, index) => {
             serialize(value, `${prefix}[${isObject(value) ? index : ""}]`);
           });
@@ -1380,7 +1379,7 @@ export function $HttpProvider() {
               );
             } else {
               // serving from cache
-              if (isArray(cachedResp)) {
+              if (Array.isArray(cachedResp)) {
                 resolvePromise(
                   cachedResp[1],
                   cachedResp[0],

package/src/services/log.js

@@ -1,4 +1,4 @@
-import { isError } from "../core/utils";
+import { isError } from "../shared/utils";
 
 /**
  * @ngdoc provider

package/src/services/template-request.js

@@ -1,5 +1,5 @@
 import { defaultHttpResponseTransform } from "./http";
-import { extend, isArray, isString, isUndefined, minErr } from "../core/utils";
+import { extend, isString, isUndefined, minErr } from "../shared/utils";
 
 var $templateRequestMinErr = minErr("$templateRequest");
 
@@ -88,7 +88,7 @@ export function TemplateRequestProvider() {
         var transformResponse =
           $http.defaults && $http.defaults.transformResponse;
 
-        if (isArray(transformResponse)) {
+        if (Array.isArray(transformResponse)) {
           transformResponse = transformResponse.filter(function (transformer) {
             return transformer !== defaultHttpResponseTransform;
           });