@angular-wave/angular.ts 0.9.2 → 0.9.4

package/src/router/directives/view-directive.spec.js

@@ -1121,27 +1121,18 @@ describe("angular 1.5+ style .component()", () => {
       "defaultModule",
     ]);
 
-    $injector.invoke(
-      (
-        _$rootScope_,
-        _$httpBackend_,
-        _$compile_,
-        _$state_,
-        _$templateCache_,
-      ) => {
-        svcs = {
-          $httpBackend: _$httpBackend_,
-          $compile: _$compile_,
-          $state: _$state_,
-        };
-        $rootScope = _$rootScope_;
-        scope = $rootScope.$new();
-        log = "";
-        el.innerHTML = "<div><ng-view></ng-view></div>";
-        svcs.$compile(el)(scope);
-        $templateCache = _$templateCache_;
-      },
-    );
+    $injector.invoke((_$rootScope_, _$compile_, _$state_, _$templateCache_) => {
+      svcs = {
+        $compile: _$compile_,
+        $state: _$state_,
+      };
+      $rootScope = _$rootScope_;
+      scope = $rootScope.$new();
+      log = "";
+      el.innerHTML = "<div><ng-view></ng-view></div>";
+      svcs.$compile(el)(scope);
+      $templateCache = _$templateCache_;
+    });
   });
 
   describe("routing using component templates", () => {
@@ -1311,8 +1302,7 @@ describe("angular 1.5+ style .component()", () => {
         },
       });
 
-      const $state = svcs.$state,
-        $httpBackend = svcs.$httpBackend;
+      const $state = svcs.$state;
 
       $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
@@ -1358,8 +1348,7 @@ describe("angular 1.5+ style .component()", () => {
         },
       });
 
-      const $state = svcs.$state,
-        $httpBackend = svcs.$httpBackend;
+      const $state = svcs.$state;
 
       $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
@@ -1382,8 +1371,7 @@ describe("angular 1.5+ style .component()", () => {
         },
       });
 
-      const $state = svcs.$state,
-        $httpBackend = svcs.$httpBackend;
+      const $state = svcs.$state;
 
       $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
@@ -1403,8 +1391,7 @@ describe("angular 1.5+ style .component()", () => {
         },
       });
 
-      const $state = svcs.$state,
-        $httpBackend = svcs.$httpBackend;
+      const $state = svcs.$state;
 
       $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
@@ -1431,8 +1418,7 @@ describe("angular 1.5+ style .component()", () => {
         bindings: { attr: "attribute" },
       });
 
-      const $state = svcs.$state,
-        $httpBackend = svcs.$httpBackend;
+      const $state = svcs.$state;
 
       $state.transitionTo("bindingtypes");
       await wait(100);
@@ -1742,8 +1728,7 @@ describe("angular 1.5+ style .component()", () => {
         },
       };
       $stateProvider.state(stateDef);
-      const $state = svcs.$state,
-        $httpBackend = svcs.$httpBackend;
+      const $state = svcs.$state;
 
       $templateCache.set("/comp_tpl.html", "-{{ $ctrl.data }}-");
       $state.transitionTo("route2cmp");
@@ -1813,8 +1798,7 @@ describe("angular 1.5+ style .component()", () => {
         },
       });
 
-      const $state = svcs.$state,
-        $httpBackend = svcs.$httpBackend;
+      const $state = svcs.$state;
 
       $templateCache.set(
         "/comp_tpl.html",

package/src/router/state/interface.ts

@@ -189,7 +189,7 @@ export interface ViewDeclaration {
    * }
    * ```
    */
-  componentProvider?: Injectable;
+  componentProvider?: Injectable<any>;
 
   /**
    * The view's controller function or name
@@ -204,7 +204,7 @@ export interface ViewDeclaration {
    *
    * See: [[Ng1Controller]] for information about component-level router hooks.
    */
-  controller?: Injectable | string;
+  controller?: Injectable<any> | string;
 
   /**
    * A controller alias name.
@@ -240,7 +240,7 @@ export interface ViewDeclaration {
    * }
    * ```
    */
-  controllerProvider?: Injectable;
+  controllerProvider?: Injectable<any>;
 
   /**
    * The scope variable name to use for resolve data.
@@ -319,7 +319,7 @@ export interface ViewDeclaration {
    * }
    * ```
    */
-  templateProvider?: Injectable;
+  templateProvider?: Injectable<any>;
 }
 
 /**
@@ -534,7 +534,7 @@ export interface StateDeclaration {
    * }
    * ```
    */
-  resolve?: ResolveTypes[] | { [key: string]: Injectable };
+  resolve?: ResolveTypes[] | { [key: string]: Injectable<any> };
 
   /**
    * Sets the resolve policy defaults for all resolves on this state
@@ -759,7 +759,7 @@ export interface StateDeclaration {
    * });
    * ```
    */
-  onEnter?: TransitionStateHookFn | Injectable;
+  onEnter?: TransitionStateHookFn | Injectable<any>;
   /**
    * A state hook invoked when a state is being retained.
    *
@@ -786,7 +786,7 @@ export interface StateDeclaration {
    * });
    * ```
    */
-  onRetain?: TransitionStateHookFn | Injectable;
+  onRetain?: TransitionStateHookFn | Injectable<any>;
   /**
    * A state hook invoked when a state is being exited.
    *
@@ -813,7 +813,7 @@ export interface StateDeclaration {
    * });
    * ```
    */
-  onExit?: TransitionStateHookFn | Injectable;
+  onExit?: TransitionStateHookFn | Injectable<any>;
 
   /**
    * A function used to lazy load code

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

@@ -8,7 +8,7 @@ import {
 } from "../../shared/common.js";
 import { hasOwn, isDefined, isFunction, isString } from "../../shared/utils.js";
 import { stringify } from "../../shared/strings.js";
-import { is, pattern, pipe, val } from "../../shared/hof.js";
+import { is, pattern, val } from "../../shared/hof.js";
 import { Resolvable } from "../resolve/resolvable.js";
 import { annotate } from "../../core/di/injector.js";
 
@@ -209,12 +209,12 @@ export function resolvablesBuilder(state) {
   ]);
   const tuple2Resolvable = pattern([
     [
-      pipe((x) => x.val, isString),
+      (x) => isString(x.val),
       (tuple) =>
         new Resolvable(tuple.token, (x) => x, [tuple.val], tuple.policy),
     ],
     [
-      pipe((x) => x.val, Array.isArray),
+      (x) => Array.isArray(x.val),
       (tuple) =>
         new Resolvable(
           tuple.token,
@@ -224,7 +224,7 @@ export function resolvablesBuilder(state) {
         ),
     ],
     [
-      pipe((x) => x.val, isFunction),
+      (x) => isFunction(x.val),
       (tuple) =>
         new Resolvable(
           tuple.token,

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

@@ -16,7 +16,12 @@ import { $injectTokens as $t, provider } from "../../injection-tokens.js";
  *
  */
 export class StateRegistryProvider {
-  static $inject = provider([$t.$url, $t.$state, $t.$router, $t.$view]);
+  /* @ignore */ static $inject = provider([
+    $t.$url,
+    $t.$state,
+    $t.$router,
+    $t.$view,
+  ]);
 
   /**
    * @param urlService
@@ -145,7 +150,7 @@ export class StateRegistryProvider {
   onStatesChanged(listener) {
     this.listeners.push(listener);
     return function deregisterListener() {
-      removeFrom(this.listeners)(listener);
+      removeFrom(this.listeners, listener);
     }.bind(this);
   }
   /**

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

@@ -1,5 +1,4 @@
 import {
-  createProxyFunctions,
   defaults,
   removeFrom,
   silenceUncaughtInPromise,
@@ -15,7 +14,6 @@ import { TargetState } from "./target-state.js";
 import { Param } from "../params/param.js";
 import { Glob } from "../glob/glob.js";
 import { lazyLoadState } from "../hooks/lazy-load.js";
-import { val } from "../../shared/hof.js";
 import { EventBus } from "../../services/pubsub/pubsub.js";
 
 const err = minErr("$stateProvider");
@@ -51,7 +49,7 @@ export class StateProvider {
     return this.globals.$current;
   }
 
-  static $inject = ["$routerProvider", "$transitionsProvider"];
+  /* @ignore */ static $inject = ["$routerProvider", "$transitionsProvider"];
 
   /**
    *
@@ -76,16 +74,6 @@ export class StateProvider {
         throw new Error($error$);
       }
     };
-    const getters = ["current", "$current", "params", "transition"];
-    const boundFns = Object.keys(StateProvider.prototype).filter(
-      (x) => !getters.includes(x),
-    );
-    createProxyFunctions(
-      val(StateProvider.prototype),
-      this,
-      val(this),
-      boundFns,
-    );
 
     EventBus.subscribe("$stateService:defaultErrorHandler", (err) =>
       this.defaultErrorHandler()(err),
@@ -285,7 +273,7 @@ export class StateProvider {
   onInvalid(callback) {
     this.invalidCallbacks.push(callback);
     return function deregisterListener() {
-      removeFrom(this.invalidCallbacks)(callback);
+      removeFrom(this.invalidCallbacks, callback);
     }.bind(this);
   }
   /**

package/src/router/state-filters.js

@@ -13,7 +13,7 @@ $IsStateFilter.$inject = [$t.$state];
  * ```
  *
  * @param {import('./state/state-service.js').StateProvider} $state
- * @returns {import('../interface.ts').FilterFn}
+ * @returns {ng.FilterFn}
  */
 export function $IsStateFilter($state) {
   const isFilter = (state, params, options) =>
@@ -35,7 +35,7 @@ $IncludedByStateFilter.$inject = [$t.$state];
  * ```
  *
  * @param {import('./state/state-service.js').StateProvider} $state
- * @returns {import('../interface.ts').FilterFn}
+ * @returns {ng.FilterFn}
  */
 export function $IncludedByStateFilter($state) {
   const includesFilter = function (state, params, options) {

package/src/router/template-factory.js

@@ -28,7 +28,7 @@ export class TemplateFactoryProvider {
     $t.$injector,
     /**
      * @param {import("interface.ts").HttpService} $http
-     * @param {import("../services/template-cache/interface.ts").TemplateCache} $templateCache
+     * @param {ng.TemplateCacheService} $templateCache
      * @param {any} $templateRequest
      * @param {import("../core/di/internal-injector.js").InjectorService} $injector
      * @returns
@@ -140,7 +140,7 @@ export class TemplateFactoryProvider {
   /**
    * Creates a template by invoking an injectable provider function.
    *
-   * @param {import('../interface.ts').Injectable} provider Function to invoke via `locals`
+   * @param {import('../interface.ts').Injectable<any>} provider Function to invoke via `locals`
    * @param {Function} params a function used to invoke the template provider
    * @param {import("./resolve/resolve-context.js").ResolveContext} context
    * @return {string|Promise.<string>} The template html as a string, or a promise
@@ -155,7 +155,7 @@ export class TemplateFactoryProvider {
   /**
    * Creates a component's template by invoking an injectable provider function.
    *
-   * @param {import('../interface.ts').Injectable} provider Function to invoke via `locals`
+   * @param {import('../interface.ts').Injectable<any>} provider Function to invoke via `locals`
    * @return {Promise<any>} The template html as a string: "<component-name input1='::$resolve.foo'></component-name>".
    */
   fromComponentProvider(provider, context) {

package/src/router/template-factory.spec.js

@@ -5,7 +5,6 @@ import { wait } from "../shared/test-utils.js";
 describe("templateFactory", () => {
   let $injector,
     $templateFactory,
-    $httpBackend,
     $sce,
     $scope,
     $compile,
@@ -26,14 +25,11 @@ describe("templateFactory", () => {
     $injector = window.angular.bootstrap(document.getElementById("app"), [
       "defaultModule",
     ]);
-    $injector.invoke(
-      (_$templateFactory_, _$httpBackend_, _$sce_, $rootScope) => {
-        $templateFactory = _$templateFactory_;
-        $httpBackend = _$httpBackend_;
-        $sce = _$sce_;
-        $scope = $rootScope;
-      },
-    );
+    $injector.invoke((_$templateFactory_, _$sce_, $rootScope) => {
+      $templateFactory = _$templateFactory_;
+      $sce = _$sce_;
+      $scope = $rootScope;
+    });
   });
 
   it("exists", () => {
@@ -73,14 +69,11 @@ describe("templateFactory", () => {
       $injector = window.angular.bootstrap(document.getElementById("app"), [
         "defaultModule",
       ]);
-      $injector.invoke(
-        (_$templateFactory_, _$httpBackend_, _$sce_, $rootScope) => {
-          $templateFactory = _$templateFactory_;
-          $httpBackend = _$httpBackend_;
-          $sce = _$sce_;
-          $scope = $rootScope;
-        },
-      );
+      $injector.invoke((_$templateFactory_, _$sce_, $rootScope) => {
+        $templateFactory = _$templateFactory_;
+        $sce = _$sce_;
+        $scope = $rootScope;
+      });
     });
 
     it("does not restrict URL loading", function () {
@@ -109,7 +102,6 @@ describe("templateFactory", () => {
       $injector.invoke(
         (
           _$templateFactory_,
-          _$httpBackend_,
           _$sce_,
           $rootScope,
           _$stateRegistry_,
@@ -117,7 +109,6 @@ describe("templateFactory", () => {
           _$compile_,
         ) => {
           $templateFactory = _$templateFactory_;
-          $httpBackend = _$httpBackend_;
           $sce = _$sce_;
           $scope = $rootScope;
           $stateRegistry = _$stateRegistry_;

package/src/router/transition/hook-builder.js

@@ -1,6 +1,7 @@
 import { assertPredicate, unnestR } from "../../shared/common.js";
 import { TransitionHookPhase, TransitionHookScope } from "./interface.js";
 import { TransitionHook } from "./transition-hook.js";
+
 /**
  * This class returns applicable TransitionHooks for a specific Transition instance.
  *
@@ -15,6 +16,9 @@ import { TransitionHook } from "./transition-hook.js";
  * in the Transition class, so we must also provide the Transition's _treeChanges)
  */
 export class HookBuilder {
+  /**
+   * @param {import("./transition.js").Transition} transition
+   */
   constructor(transition) {
     this.transition = transition;
   }
@@ -24,7 +28,7 @@ export class HookBuilder {
    * @returns
    */
   buildHooksForPhase(phase) {
-    return this.transition.transitionService._pluginapi
+    return this.transition.transitionService
       ._getEvents(phase)
       .map((type) => this.buildHooks(type))
       .reduce(unnestR, [])

package/src/router/transition/hook-registry.js

@@ -37,6 +37,14 @@ export function matchState(state, criterion, transition) {
  * The registration data for a registered transition hook
  */
 export class RegisteredHook {
+  /**
+   * @param {import("./transition-service.js").TransitionProvider} tranSvc
+   * @param eventType
+   * @param callback
+   * @param matchCriteria
+   * @param removeHookFromRegistry
+   * @param options
+   */
   constructor(
     tranSvc,
     eventType,
@@ -45,6 +53,7 @@ export class RegisteredHook {
     removeHookFromRegistry,
     options = {},
   ) {
+    /** @type {import("./transition-service.js").TransitionProvider} */
     this.tranSvc = tranSvc;
     this.eventType = eventType;
     this.callback = callback;
@@ -93,7 +102,7 @@ export class RegisteredHook {
    * }
    */
   _getDefaultMatchCriteria() {
-    return map(this.tranSvc._pluginapi._getPathTypes(), () => true);
+    return map(this.tranSvc._getPathTypes(), () => true);
   }
   /**
    * Gets matching nodes as [[IMatchingNodes]]
@@ -115,7 +124,7 @@ export class RegisteredHook {
       this._getDefaultMatchCriteria(),
       this.matchCriteria,
     );
-    const paths = Object.values(this.tranSvc._pluginapi._getPathTypes());
+    const paths = Object.values(this.tranSvc._getPathTypes());
     return paths.reduce((mn, pathtype) => {
       // STATE scope criteria matches against every node in the path.
       // TRANSITION scope criteria matches against only the last node in the path
@@ -153,7 +162,7 @@ export function makeEvent(registry, transitionService, eventType) {
   const _registeredHooks = (registry._registeredHooks =
     registry._registeredHooks || {});
   const hooks = (_registeredHooks[eventType.name] = []);
-  const removeHookFn = removeFrom(hooks);
+  const removeHookFn = (x) => removeFrom(hooks, x);
   // Create hook registration function on the IHookRegistry for the event
   registry[eventType.name] = hookRegistrationFn;
   function hookRegistrationFn(matchObject, callback, options = {}) {

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

@@ -25,8 +25,6 @@ import { registerLazyLoadHook } from "../hooks/lazy-load.js";
 import { TransitionEventType } from "./transition-event-type.js";
 import { TransitionHook } from "./transition-hook.js";
 import { isDefined } from "../../shared/utils.js";
-import { createProxyFunctions } from "../../shared/common.js";
-import { val } from "../../shared/hof.js";
 import { registerIgnoredTransitionHook } from "../hooks/ignored-transition.js";
 import { registerInvalidTransitionHook } from "../hooks/invalid-transition.js";
 import { registerRedirectToHook } from "../hooks/redirect-to.js";
@@ -79,13 +77,6 @@ export class TransitionProvider {
     this.globals = globals;
     this.$view = viewService;
     this._deregisterHookFns = {};
-    this._pluginapi = createProxyFunctions(val(this), {}, val(this), [
-      "_definePathType",
-      "_defineEvent",
-      "_getPathTypes",
-      "_getEvents",
-      "getHooks",
-    ]);
     this._defineCorePaths();
     this._defineCoreEvents();
     this._registerCoreTransitionHooks();
@@ -243,6 +234,10 @@ export class TransitionProvider {
     makeEvent(this, this, eventType);
   }
 
+  /**
+   * @param {TransitionHookPhase} [phase]
+   * @return {any[]}
+   */
   _getEvents(phase) {
     const transitionHookTypes = isDefined(phase)
       ? this._eventTypes.filter((type) => type.hookPhase === phase)

package/src/router/transition/transition.js

@@ -101,7 +101,7 @@ export class Transition {
    * (which can then be used to register hooks)
    */
   createTransitionHookRegFns() {
-    this.transitionService._pluginapi
+    this.transitionService
       ._getEvents()
       .filter((type) => type.hookPhase !== TransitionHookPhase.CREATE)
       .forEach((type) => makeEvent(this, this.transitionService, type));
@@ -516,6 +516,7 @@ export class Transition {
     )
       return "SameAsCurrent";
   }
+
   /**
    * Runs the transition
    *
@@ -523,7 +524,7 @@ export class Transition {
    *
    * @internal
    *
-   * @returns a promise for a successful transition.
+   * @returns {Promise} a promise for a successful transition.
    */
   run() {
     // Gets transition hooks array for the given phase

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

@@ -19,7 +19,7 @@ import { $injectTokens as $t, provider } from "../../injection-tokens.js";
  * API for URL management
  */
 export class UrlService {
-  static $inject = provider([
+  /* @ignore */ static $inject = provider([
     $t.$location,
     $t.$state,
     $t.$router,
@@ -200,7 +200,7 @@ export class UrlService {
    */
   onChange(callback) {
     this._urlListeners.push(callback);
-    return () => removeFrom(this._urlListeners)(callback);
+    return () => removeFrom(this._urlListeners, callback);
   }
 
   /**

package/src/router/view/view.js

@@ -1,4 +1,4 @@
-import { applyPairs, equals, find, removeFrom } from "../../shared/common.js";
+import { applyPairs, equals, removeFrom } from "../../shared/common.js";
 import { curry } from "../../shared/hof.js";
 import { trace } from "../common/trace.js";
 import { getViewConfigFactory } from "../state/views.js";
@@ -23,23 +23,11 @@ export class ViewService {
   constructor() {
     this._ngViews = [];
     this._viewConfigs = [];
-    this._viewConfigFactories = {};
     this._listeners = [];
-    this._pluginapi = {
-      _registeredUIView: (id) => {
-        return find(this._ngViews, (view) => view.id === id);
-      },
-      _registeredUIViews: () => this._ngViews,
-      _activeViewConfigs: () => this._viewConfigs,
-      _onSync: (listener) => {
-        this._listeners.push(listener);
-        return () => removeFrom(this._listeners, listener);
-      },
-    };
     this.viewConfigFactory(getViewConfigFactory());
   }
 
-  $get = [() => this];
+  $get = () => this;
 
   /**
    * @param {?import('../state/state-object.js').StateObject} context
@@ -177,7 +165,7 @@ export class ViewService {
         return;
       }
       trace.traceViewServiceUIViewEvent("<- Deregistering", ngView);
-      removeFrom(ngViews)(ngView);
+      removeFrom(ngViews, ngView);
     };
   }
   /**

package/src/router/view-scroll.js

@@ -12,8 +12,8 @@ export class ViewScrollProvider {
   $get = [
     $t.$anchorScroll,
     /**
-     * @param {import('../services/anchor-scroll.js').AnchorScrollObject} $anchorScroll
-     * @returns {import('../services/anchor-scroll.js').AnchorScrollObject|Function}
+     * @param {import('../services/anchor-scroll/anchor-scroll.js').AnchorScrollObject} $anchorScroll
+     * @returns {import('../services/anchor-scroll/anchor-scroll.js').AnchorScrollObject|Function}
      */
     ($anchorScroll) => {
       if (this.enabled) {

package/src/services/{anchor-scroll.js → anchor-scroll/anchor-scroll.js}

@@ -4,8 +4,8 @@ import {
   isNumber,
   isString,
   getNodeName,
-} from "../shared/utils.js";
-import { $injectTokens as $t } from "../injection-tokens.js";
+} from "../../shared/utils.js";
+import { $injectTokens as $t } from "../../injection-tokens.js";
 
 /**
  * @typedef {Object} AnchorScrollObject
@@ -30,8 +30,8 @@ export class AnchorScrollProvider {
     $t.$rootScope,
     /**
      *
-     * @param {import('../services/location/location.js').Location} $location
-     * @param {import('../core/scope/scope.js').Scope} $rootScope
+     * @param {import('../../services/location/location.js').Location} $location
+     * @param {import('../../core/scope/scope.js').Scope} $rootScope
      * @returns
      */
     function ($location, $rootScope) {

package/src/services/exception/exception-handler.js

@@ -44,7 +44,7 @@
 
 /** @typedef {import('../log/interface.ts').LogService} LogService */
 
-/** @typedef {import("./interface.ts").Interface}  ErrorHandler */
+/** @typedef {import("./interface.ts").ErrorHandler}  ErrorHandler */
 
 /**
  * Provider for `$exceptionHandler` service. Delegates uncaught exceptions to `$log.error()` by default.

package/src/services/exception/interface.ts

@@ -4,4 +4,4 @@
  * @param exception - The exception associated with the error.
  * @param [cause] - Optional information about the context in which the error was thrown.
  */
-export type Interface = (exception: Error, cause?: string) => void;
+export type ErrorHandler = (exception: Error, cause?: string) => void;