@angular-wave/angular.ts 0.0.16 → 0.0.17

package/src/router/{core/state → state}/stateBuilder.js

@@ -3,14 +3,13 @@ import {
   identity,
   inherit,
   mapObj,
-  noop,
   omit,
   tail,
   copy,
-} from "../common/common";
-import { isArray, isDefined, isFunction, isString } from "../common/predicates";
-import { stringify } from "../common/strings";
-import { is, pattern, pipe, prop, val } from "../common/hof";
+} 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 { Resolvable } from "../resolve/resolvable";
 import { services } from "../common/coreservices";
 const parseUrl = (url) => {
@@ -85,7 +84,11 @@ const getParamsBuilder = (paramFactory) =>
       .reduce(applyPairs, {});
   };
 function pathBuilder(state) {
-  return state.parent ? state.parent.path.concat(state) : /*root*/ [state];
+  if (state.parent && !state.abstract) {
+    return state.parent.path.concat(state);
+  } else {
+    return [state];
+  }
 }
 function includesBuilder(state) {
   const includes = state.parent ? Object.assign({}, state.parent.includes) : {};
@@ -167,7 +170,7 @@ export function resolvablesBuilder(state) {
     !!(
       obj &&
       obj.val &&
-      (isString(obj.val) || isArray(obj.val) || isFunction(obj.val))
+      (isString(obj.val) || Array.isArray(obj.val) || isFunction(obj.val))
     );
   /** extracts the token from a Provider or provide literal */
   const getToken = (p) => p.provide || p.token;
@@ -204,7 +207,7 @@ export function resolvablesBuilder(state) {
   // prettier-ignore
   const tuple2Resolvable = pattern([
         [pipe(prop('val'), isString), (tuple) => new Resolvable(tuple.token, identity, [tuple.val], tuple.policy)],
-        [pipe(prop('val'), isArray), (tuple) => new Resolvable(tuple.token, tail(tuple.val), tuple.val.slice(0, -1), tuple.policy)],
+        [pipe(prop('val'), Array.isArray), (tuple) => new Resolvable(tuple.token, tail(tuple.val), tuple.val.slice(0, -1), tuple.policy)],
         [pipe(prop('val'), isFunction), (tuple) => new Resolvable(tuple.token, tuple.val, annotate(tuple.val), tuple.policy)],
     ]);
   // prettier-ignore
@@ -218,7 +221,7 @@ export function resolvablesBuilder(state) {
   // If resolveBlock is already an array, use it as-is.
   // Otherwise, assume it's an object and convert to an Array of tuples
   const decl = state.resolve;
-  const items = isArray(decl)
+  const items = Array.isArray(decl)
     ? decl
     : objects2Tuples(decl, state.resolvePolicy || {});
   return items.map(item2Resolvable);
@@ -293,12 +296,13 @@ export class StateBuilder {
       if (!Object.prototype.hasOwnProperty.call(builders, key)) continue;
       const chain = builders[key].reduce(
         (parentFn, step) => (_state) => step(_state, parentFn),
-        noop,
+        () => {},
       );
       state[key] = chain(state);
     }
     return state;
   }
+
   parentName(state) {
     // name = 'foo.bar.baz.**'
     const name = state.name || "";

package/src/router/{core/state → state}/stateMatcher.js

@@ -1,5 +1,4 @@
-import { isString } from "../common/predicates";
-import { safeConsole } from "../common/safeConsole";
+import { isString } from "../../shared/utils";
 export class StateMatcher {
   constructor(_states) {
     this._states = _states;
@@ -28,7 +27,7 @@ export class StateMatcher {
           _state.__stateObjectCache.nameGlob.matches(name),
       );
       if (matches.length > 1) {
-        safeConsole.error(
+        console.error(
           `stateMatcher.find: Found multiple matches for ${name} using glob: `,
           matches.map((match) => match.name),
         );

package/src/router/{core/state → state}/stateObject.js

@@ -1,7 +1,7 @@
-import { defaults, find } from "../common/common";
-import { propEq } from "../common/hof";
+import { defaults, find } from "../../shared/common";
+import { propEq } from "../../shared/hof";
 import { Glob } from "../common/glob";
-import { isObject, isFunction } from "../common/predicates";
+import { isFunction, isObject } from "../../shared/utils";
 /**
  * Internal representation of a UI-Router state.
  *
@@ -22,10 +22,12 @@ export class StateObject {
    * @returns {StateObject} an internal State object
    */
   static create(stateDecl) {
-    stateDecl = StateObject.isStateClass(stateDecl)
+    const state = StateObject.isStateClass(stateDecl)
       ? new stateDecl()
-      : stateDecl;
-    const state = Object.setPrototypeOf(stateDecl, StateObject.prototype);
+      : Object.setPrototypeOf(
+          Object.assign({}, stateDecl),
+          StateObject.prototype,
+        );
     stateDecl.$$state = () => state;
     state.self = stateDecl;
     state.__stateObjectCache = {

package/src/router/{core/state → state}/stateQueueManager.js

@@ -1,6 +1,6 @@
-import { inArray } from "../common/common";
-import { prop } from "../common/hof";
-import { isString } from "../common/predicates";
+import { inArray } from "../../shared/common";
+import { prop } from "../../shared/hof";
+import { isString } from "../../shared/utils";
 import { StateObject } from "./stateObject";
 export class StateQueueManager {
   constructor(router, states, builder, listeners) {

package/src/router/{core/state → state}/stateRegistry.js

@@ -1,19 +1,18 @@
 import { StateMatcher } from "./stateMatcher";
 import { StateBuilder } from "./stateBuilder";
 import { StateQueueManager } from "./stateQueueManager";
-import { removeFrom } from "../common/common";
-import { propEq } from "../common/hof";
+import { removeFrom } from "../../shared/common";
+import { propEq } from "../../shared/hof";
 /**
  * A registry for all of the application's [[StateDeclaration]]s
  *
  * This API is found at `router.stateRegistry` ([[UIRouter.stateRegistry]])
  */
 export class StateRegistry {
-  /** @internal */
   constructor(router) {
     this.router = router;
     this.states = {};
-    /** @internal */
+
     this.listeners = [];
     this.matcher = new StateMatcher(this.states);
     this.builder = new StateBuilder(this.matcher, router.urlMatcherFactory);
@@ -25,7 +24,7 @@ export class StateRegistry {
     );
     this._registerRoot();
   }
-  /** @internal */
+
   _registerRoot() {
     const rootStateDef = {
       name: "",
@@ -39,7 +38,7 @@ export class StateRegistry {
     const _root = (this._root = this.stateQueue.register(rootStateDef));
     _root.navigable = null;
   }
-  /** @internal */
+
   dispose() {
     this.stateQueue.dispose();
     this.listeners = [];
@@ -108,7 +107,7 @@ export class StateRegistry {
   register(stateDefinition) {
     return this.stateQueue.register(stateDefinition);
   }
-  /** @internal */
+
   _deregisterTree(state) {
     const all = this.get().map((s) => s.$$state());
     const getChildren = (states) => {

package/src/router/{core/state → state}/stateService.js

@@ -6,8 +6,8 @@ import {
   removeFrom,
   silenceUncaughtInPromise,
   silentRejection,
-} from "../common/common";
-import { isDefined, isObject, isString } from "../common/predicates";
+} from "../../shared/common";
+import { isDefined, isObject, isString } from "../../shared/utils";
 import { Queue } from "../common/queue";
 import { services } from "../common/coreservices";
 import { PathUtils } from "../path/pathUtils";
@@ -19,7 +19,7 @@ import { Param } from "../params/param";
 import { Glob } from "../common/glob";
 import { ResolveContext } from "../resolve/resolveContext";
 import { lazyLoadState } from "../hooks/lazyLoad";
-import { not, val } from "../common/hof";
+import { not, val } from "../../shared/hof";
 /**
  * Provides services related to ui-router states.
  *
@@ -58,22 +58,19 @@ export class StateService {
   get $current() {
     return this.router.globals.$current;
   }
-  /** @internal */
-  constructor(/** @internal */ router) {
+
+  constructor(router) {
     this.router = router;
-    /** @internal */
+
     this.invalidCallbacks = [];
-    /** @internal */
+
     this._defaultErrorHandler = function $defaultErrorHandler($error$) {
       if ($error$ instanceof Error && $error$.stack) {
-        console.error($error$);
-        console.error($error$.stack);
+        throw $error$;
       } else if ($error$ instanceof Rejection) {
-        console.error($error$.toString());
-        if ($error$.detail && $error$.detail.stack)
-          console.error($error$.detail.stack);
+        throw new Error($error$.toString());
       } else {
-        console.error($error$);
+        throw new Error($error$);
       }
     };
     const getters = ["current", "$current", "params", "transition"];
@@ -87,7 +84,7 @@ export class StateService {
       boundFns,
     );
   }
-  /** @internal */
+
   dispose() {
     this.defaultErrorHandler(noop);
     this.invalidCallbacks = [];
@@ -302,7 +299,7 @@ export class StateService {
       options,
     );
   }
-  /** @internal */
+
   getCurrentPath() {
     const globals = this.router.globals;
     const latestSuccess = globals.successfulTransitions.peekTail();

package/src/router/{core/state → state}/targetState.js

@@ -1,5 +1,5 @@
-import { isObject, isString } from "../common/predicates";
-import { stringify } from "../common/strings";
+import { isObject, isString } from "../../shared/utils";
+import { stringify } from "../../shared/strings";
 /**
  * Encapsulate the target (destination) state/params/options of a [[Transition]].
  *

package/src/router/{adapter/statebuilders → state}/views.js

@@ -1,13 +1,12 @@
-import { pick, forEach, tail } from "../../core/common/common";
-import { isArray, isDefined, isString } from "../../../core/utils";
-import { isInjectable } from "../../core/common/predicates";
-import { services } from "../../core/common/coreservices";
-import { trace } from "../../core/common/trace";
-import { ViewService } from "../../core/view/view";
-import { ResolveContext } from "../../core/resolve/resolveContext";
-import { Resolvable } from "../../core/resolve/resolvable";
+import { pick, forEach, tail } from "../../shared/common";
+import { isDefined, isString } from "../../shared/utils";
+import { isInjectable } from "../../shared/predicates";
+import { services } from "../common/coreservices";
+import { trace } from "../common/trace";
+import { ViewService } from "../view/view";
+import { ResolveContext } from "../resolve/resolveContext";
+import { Resolvable } from "../resolve/resolvable";
 
-/** @internalapi */
 export function getNg1ViewConfigFactory() {
   let templateFactory = null;
   return (path, view) => {
@@ -16,7 +15,7 @@ export function getNg1ViewConfigFactory() {
     return [new Ng1ViewConfig(path, view, templateFactory)];
   };
 }
-/** @internalapi */
+
 const hasAnyKey = (keys, obj) =>
   keys.reduce((acc, key) => acc || isDefined(obj[key]), false);
 /**
@@ -28,7 +27,6 @@ const hasAnyKey = (keys, obj) =>
  * If no `views: {}` property exists on the [[StateDeclaration]], then it creates the `views` object
  * and applies the state-level configuration to a view named `$default`.
  *
- * @internalapi
  */
 export function ng1ViewsBuilder(state) {
   // Do not process root state
@@ -89,15 +87,19 @@ export function ng1ViewsBuilder(state) {
   });
   return views;
 }
-/** @hidden */
+
+/**
+ * @type {Number}
+ */
 let id = 0;
-/** @internalapi */
+
 export class Ng1ViewConfig {
   constructor(path, viewDecl, factory) {
     this.path = path;
     this.viewDecl = viewDecl;
     this.factory = factory;
-    this.$id = id++;
+
+    /** @type {Number} */ this.$id = id++;
     this.loaded = false;
     this.getTemplate = (uiView, context) =>
       this.component
@@ -138,7 +140,7 @@ export class Ng1ViewConfig {
     const provider = this.viewDecl.controllerProvider;
     if (!isInjectable(provider)) return this.viewDecl.controller;
     const deps = services.$injector.annotate(provider);
-    const providerFn = isArray(provider) ? tail(provider) : provider;
+    const providerFn = Array.isArray(provider) ? tail(provider) : provider;
     const resolvable = new Resolvable("", providerFn, deps);
     return resolvable.get(context);
   }

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

@@ -1,8 +1,36 @@
 /** @publicapi @module ng1 */ /** */
 
-import { val } from "../core/common/hof";
-import { createProxyFunctions } from "../core/common/common";
-import { isObject } from "../../core/utils";
+import { val } from "../shared/hof";
+import { createProxyFunctions } from "../shared/common";
+import { minErr } from "../shared/utils";
+
+const err = minErr("$stateProvider");
+const validKeys = [
+  "$$state",
+  "__stateObjectCache",
+  "controller",
+  "controllerProvider",
+  "data",
+  "includes",
+  "name",
+  "navigable",
+  "onEnter",
+  "onExit",
+  "onRetain",
+  "params",
+  "parent",
+  "path",
+  "reloadOnSearch",
+  "resolve",
+  "resolvables",
+  "self",
+  "template",
+  "templateProvider",
+  "templateUrl",
+  "url",
+  "views",
+];
+
 /**
  * The Angular 1 `StateProvider`
  *
@@ -117,13 +145,28 @@ export class StateProvider {
   decorator(name, func) {
     return this.stateRegistry.decorator(name, func) || this;
   }
-  state(name, definition) {
-    if (isObject(name)) {
-      definition = name;
-    } else {
-      definition.name = name;
+
+  /**
+   *
+   * @param {angular.Ng1StateDeclaration} definition
+   * @returns {StateProvider}
+   */
+  state(definition) {
+    if (!definition.name) {
+      throw err("stateinvalid", `'name' required`);
+    }
+
+    const hasInvalidKeys = Object.keys(definition).filter(
+      (key) => !validKeys.includes(key),
+    );
+    if (hasInvalidKeys.length) {
+      throw err("stateinvalid", `Invalid key(s): ${hasInvalidKeys.join(", ")}`);
+    }
+    try {
+      this.stateRegistry.register(definition);
+    } catch (e) {
+      throw err("stateinvalid", e.message);
     }
-    this.stateRegistry.register(definition);
     return this;
   }
   /**

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

@@ -1,21 +1,15 @@
 /** @publicapi @module view */ /** */
-import {
-  isArray,
-  isDefined,
-  isFunction,
-  isObject,
-} from "../core/common/predicates";
-import { services } from "../core/common/coreservices";
-import { tail, unnestR } from "../core/common/common";
-import { Resolvable } from "../core/resolve/resolvable";
-import { kebobString } from "../core/common/strings";
+import { isDefined, isFunction, isObject } from "../shared/utils";
+import { services } from "./common/coreservices";
+import { tail, unnestR } from "../shared/common";
+import { Resolvable } from "./resolve/resolvable";
+import { kebobString } from "../shared/strings";
 
 /**
  * Service which manages loading of templates from a ViewConfig.
  */
 export class TemplateFactory {
   constructor() {
-    /** @hidden */ this._useHttp = true; // TODO investigate
     /** @hidden */ this.$get = [
       "$http",
       "$templateCache",
@@ -31,10 +25,7 @@ export class TemplateFactory {
       },
     ];
   }
-  /** @hidden */
-  useHttpService(value) {
-    this._useHttp = value;
-  }
+
   /**
    * Creates a template from a configuration object.
    *
@@ -120,7 +111,7 @@ export class TemplateFactory {
    */
   fromProvider(provider, params, context) {
     const deps = services.$injector.annotate(provider);
-    const providerFn = isArray(provider) ? tail(provider) : provider;
+    const providerFn = Array.isArray(provider) ? tail(provider) : provider;
     const resolvable = new Resolvable("", providerFn, deps);
     return resolvable.get(context);
   }
@@ -133,7 +124,7 @@ export class TemplateFactory {
    */
   fromComponentProvider(provider, params, context) {
     const deps = services.$injector.annotate(provider);
-    const providerFn = isArray(provider) ? tail(provider) : provider;
+    const providerFn = Array.isArray(provider) ? tail(provider) : provider;
     const resolvable = new Resolvable("", providerFn, deps);
     return resolvable.get(context);
   }
@@ -181,7 +172,7 @@ export class TemplateFactory {
         const fn = res && res.data;
         const args = (fn && services.$injector.annotate(fn)) || [];
         // account for array style injection, i.e., ['foo', function(foo) {}]
-        const arrayIdxStr = isArray(fn) ? `[${fn.length - 1}]` : "";
+        const arrayIdxStr = Array.isArray(fn) ? `[${fn.length - 1}]` : "";
         return `${attrName}='$resolve.${resolveName}${arrayIdxStr}(${args.join(",")})'`;
       }
       // some-attr="::$resolve.someResolveName"
@@ -213,6 +204,6 @@ const scopeBindings = (bindingsObj) =>
     // [ 'input', [ '=foo', '=', 'foo' ] ]
     .map((key) => [key, /^([=<@&])[?]?(.*)/.exec(bindingsObj[key])])
     // skip malformed values
-    .filter((tuple) => isDefined(tuple) && isArray(tuple[1]))
+    .filter((tuple) => isDefined(tuple) && Array.isArray(tuple[1]))
     // { name: ('foo' || 'input'), type: '=' }
     .map((tuple) => ({ name: tuple[1][2] || tuple[0], type: tuple[1][1] }));

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

@@ -1,5 +1,4 @@
-import { assertPredicate, unnestR, identity } from "../common/common";
-import { isArray } from "../common/predicates";
+import { assertPredicate, unnestR, identity } from "../../shared/common";
 import { TransitionHookPhase, TransitionHookScope } from "./interface";
 import { TransitionHook } from "./transitionHook";
 /**
@@ -103,7 +102,9 @@ export class HookBuilder {
       : [this.transition, $transitions];
     return registries
       .map((reg) => reg.getHooks(hookType.name)) // Get named hooks from registries
-      .filter(assertPredicate(isArray, `broken event named: ${hookType.name}`)) // Sanity check
+      .filter(
+        assertPredicate(Array.isArray, `broken event named: ${hookType.name}`),
+      ) // Sanity check
       .reduce(unnestR, []) // Un-nest RegisteredHook[][] to RegisteredHook[] array
       .filter((hook) => hook.matches(treeChanges, transition)); // Only those satisfying matchCriteria
   }

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

@@ -1,10 +1,7 @@
-import { removeFrom, tail, identity, mapObj } from "../common/common";
-import { isString, isFunction } from "../common/predicates";
+import { removeFrom, tail, identity, mapObj } from "../../shared/common";
+import { isString, isFunction } from "../../shared/utils";
 import { Glob } from "../common/glob";
-import {
-  // has or is using
-  TransitionHookScope,
-} from "./interface";
+import { TransitionHookScope } from "./interface";
 /**
  * Determines if the given state matches the matchCriteria
  *

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

@@ -1,6 +1,6 @@
-import { silentRejection } from "../common/common";
-import { stringify } from "../common/strings";
-import { is } from "../common/hof";
+import { silentRejection } from "../../shared/common";
+import { stringify } from "../../shared/strings";
+import { is } from "../../shared/hof";
 /** An enum for Transition Rejection reasons */
 var RejectType;
 (function (RejectType) {
@@ -42,7 +42,7 @@ var RejectType;
   RejectType[(RejectType["ERROR"] = 6)] = "ERROR";
 })(RejectType || (RejectType = {}));
 export { RejectType };
-/** @internal */
+
 let id = 0;
 export class Rejection {
   /** Returns true if the obj is a rejected promise created from the `asPromise` factory */
@@ -100,7 +100,6 @@ export class Rejection {
     return is(Rejection)(detail) ? detail : Rejection.errored(detail);
   }
   constructor(type, message, detail) {
-    /** @internal */
     this.$id = id++;
     this.type = type;
     this.message = message;

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

@@ -1,6 +1,6 @@
 import { trace } from "../common/trace";
 import { services } from "../common/coreservices";
-import { stringify } from "../common/strings";
+import { stringify } from "../../shared/strings";
 import {
   map,
   find,
@@ -13,9 +13,9 @@ import {
   anyTrueR,
   flattenR,
   uniqR,
-} from "../common/common";
-import { isObject, isUndefined } from "../common/predicates";
-import { prop, propEq, val, not, is } from "../common/hof";
+} from "../../shared/common";
+import { isUndefined, isObject } from "../../shared/utils";
+import { prop, propEq, val, not, is } from "../../shared/hof";
 import { TransitionHookPhase } from "./interface"; // has or is using
 import { TransitionHook } from "./transitionHook";
 import { matchState, makeEvent } from "./hookRegistry";
@@ -25,7 +25,7 @@ import { Param } from "../params/param";
 import { Resolvable } from "../resolve/resolvable";
 import { ResolveContext } from "../resolve/resolveContext";
 import { Rejection } from "./rejectFactory";
-/** @internal */
+
 const stateSelf = prop("self");
 /**
  * Represents a transition between two states.
@@ -36,7 +36,6 @@ const stateSelf = prop("self");
  * It has information about all states being entered and exited as a result of the transition.
  */
 export class Transition {
-  /** @internal */
   onBefore(criteria, callback, options) {
     return;
   }
@@ -78,7 +77,7 @@ export class Transition {
       .filter((type) => type.hookPhase !== TransitionHookPhase.CREATE)
       .forEach((type) => makeEvent(this, this.router.transitionService, type));
   }
-  /** @internal */
+
   getHooks(hookName) {
     return this._registeredHooks[hookName];
   }
@@ -92,11 +91,10 @@ 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 router The [[UIRouter]] instance
+   * @param {import('../router').UIRouter} router The [[UIRouter]] instance
    * @internal
    */
   constructor(fromPath, targetState, router) {
-    /** @internal */
     this._deferred = services.$q.defer();
     /**
      * This promise is resolved or rejected based on the outcome of the Transition.
@@ -107,7 +105,7 @@ export class Transition {
     this.promise = this._deferred.promise;
     /** @internal Holds the hook registration functions such as those passed to Transition.onStart() */
     this._registeredHooks = {};
-    /** @internal */
+
     this._hookBuilder = new HookBuilder(this);
     /** Checks if this transition is currently active/running. */
     this.isActive = () => this.router.globals.transition === this;
@@ -585,7 +583,7 @@ export class Transition {
   ignored() {
     return !!this._ignoredReason();
   }
-  /** @internal */
+
   _ignoredReason() {
     const pending = this.router.globals.transition;
     const reloadState = this._options.reloadState;
@@ -737,5 +735,5 @@ export class Transition {
     return `Transition#${id}( '${from}'${fromParams} -> ${toValid}'${to}'${toParams} )`;
   }
 }
-/** @internal */
+
 Transition.diToken = Transition;

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

@@ -1,8 +1,8 @@
 import { TransitionHookPhase } from "./interface";
-import { defaults, noop, silentRejection } from "../common/common";
-import { fnToString, maxLength } from "../common/strings";
-import { isPromise } from "../common/predicates";
-import { is, parse } from "../common/hof";
+import { defaults, noop, silentRejection } from "../../shared/common";
+import { fnToString, maxLength } from "../../shared/strings";
+import { isPromise } from "../../shared/predicates";
+import { is, parse } from "../../shared/hof";
 import { trace } from "../common/trace";
 import { services } from "../common/coreservices";
 import { Rejection } from "./rejectFactory";