@angular-wave/angular.ts 0.7.0-beta.0 → 0.7.1

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

@@ -6,7 +6,7 @@ import {
   copy,
   map,
 } from "../../shared/common.js";
-import { isDefined, isFunction, isString } from "../../shared/utils.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 { Resolvable } from "../resolve/resolvable.js";
@@ -263,6 +263,10 @@ export function resolvablesBuilder(state) {
  * using the [[builder]] method.
  */
 export class StateBuilder {
+  /**
+   * @param {import('./state-matcher.js').StateMatcher} matcher
+   * @param urlService
+   */
   constructor(matcher, urlService) {
     this.matcher = matcher;
     this.$injector = undefined;
@@ -318,7 +322,7 @@ export class StateBuilder {
       return null;
     }
     for (const key in builders) {
-      if (!Object.prototype.hasOwnProperty.call(builders, key)) continue;
+      if (!hasOwn(builders, key)) continue;
       const chain = builders[key].reduce(
         (parentFn, step) => (_state) => step(_state, parentFn),
         () => {},

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

@@ -1,22 +1,28 @@
 import { StateBuilder } from "./state-builder.js";
+import { Angular } from "../../loader.js";
 
 // TODO refactor this to url service as it is using the provider right now
-xdescribe("StateBuilder", function () {
+describe("StateBuilder", function () {
   const parent = { name: "" };
-  let builder,
-    matcher,
-    urlMatcherFactoryProvider = {
-      compile: function () {},
-      isMatcher: function () {},
-    };
+  let builder;
+  let $stateRegistry;
 
   beforeEach(function () {
-    matcher = new StateBuilder({});
-    builder = new StateBuilder(matcher, urlMatcherFactoryProvider);
-    builder.builder("views", ng1ViewsBuilder);
+    window.angular = new Angular();
+    window.angular.module("default", []);
+    let $injector = window.angular.bootstrap(document.getElementById("app"), [
+      "default",
+    ]);
+    $stateRegistry = $injector.get("$stateRegistry");
+    builder = $stateRegistry.builder;
+  });
+
+  it("expect it to be configured by state registry", () => {
+    expect($stateRegistry).toBeDefined();
+    expect($stateRegistry.builder).toBeDefined();
   });
 
-  xit("should use the state object to build a default view, when no `views` property is found", function () {
+  it("should use the state object to build a default view, when no `views` property is found", function () {
     const config = {
       url: "/foo",
       templateUrl: "/foo.html",
@@ -27,7 +33,7 @@ xdescribe("StateBuilder", function () {
 
     expect(built.$default).not.toEqual(config);
     expect(built.$default).toEqual(
-      expect.objectContaining({
+      jasmine.objectContaining({
         templateUrl: "/foo.html",
         controller: "FooController",
         resolveAs: "$resolve",
@@ -35,7 +41,7 @@ xdescribe("StateBuilder", function () {
     );
   });
 
-  xit("It should use the views object to build views, when defined", function () {
+  it("It should use the views object to build views, when defined", function () {
     const config = { a: { foo: "bar", controller: "FooController" } };
     const builtViews = builder.builder("views")({
       parent: parent,
@@ -45,7 +51,7 @@ xdescribe("StateBuilder", function () {
     expect(builtViews.a.controller).toEqual(config.a.controller);
   });
 
-  xit("should not allow a view config with both component and template keys", function () {
+  it("should not allow a view config with both component and template keys", function () {
     const config = {
       name: "foo",
       url: "/foo",
@@ -69,7 +75,7 @@ xdescribe("StateBuilder", function () {
     ).toThrow();
   });
 
-  xit("should replace a resolve: string value with a function that injects the service of the same name", function () {
+  it("should replace a resolve: string value with a function that injects the service of the same name", function () {
     const config = { resolve: { foo: "bar" } };
     expect(builder.builder("resolvables")).toBeDefined();
     const built = builder.builder("resolvables")(config);

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

@@ -1,7 +1,10 @@
 import { defaults, find } from "../../shared/common.js";
 import { propEq } from "../../shared/hof.js";
 import { Glob } from "../common/glob.js";
-import { isFunction, isObject } from "../../shared/utils.js";
+import { hasOwn, isFunction, isObject } from "../../shared/utils.js";
+
+/** @typedef {import('./interface.js').StateDeclaration} StateDeclaration */
+
 /**
  * Internal representation of a ng-router state.
  *
@@ -11,6 +14,7 @@ import { isFunction, isObject } from "../../shared/utils.js";
  *
  * This class prototypally inherits from the corresponding [[StateDeclaration]].
  * Each of its own properties (i.e., `hasOwnProperty`) are built using builders from the [[StateBuilder]].
+ * @implements {StateDeclaration}
  */
 export class StateObject {
   name = undefined;
@@ -19,11 +23,23 @@ export class StateObject {
   parent = undefined;
   params = undefined;
   url = undefined;
+  includes = undefined;
 
+  /**
+   * @param {import('./interface.js').StateDeclaration} config
+   */
   constructor(config) {
     Object.assign(this, config);
-    this.$$state = () => this;
+    this.$$state = () => {
+      return this;
+    };
+    /**
+     * @type {import('./interface.js').StateDeclaration}
+     */
     this.self = config;
+    /**
+     * @type {?Glob}
+     */
     const nameGlob = this.name ? Glob.fromString(this.name) : null;
     this.__stateObjectCache = { nameGlob };
   }
@@ -75,9 +91,7 @@ export class StateObject {
     return inherited
       .concat(Object.values(this.params))
       .filter(
-        (param) =>
-          !opts.matchingKeys ||
-          Object.prototype.hasOwnProperty.call(opts.matchingKeys, param.id),
+        (param) => !opts.matchingKeys || hasOwn(opts.matchingKeys, param.id),
       );
   }
   /**

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

@@ -1,4 +1,4 @@
-import { isString } from "../../shared/utils.js";
+import { hasOwn, isString } from "../../shared/utils.js";
 import { StateObject } from "./state-object.js";
 
 export class StateQueueManager {
@@ -25,7 +25,7 @@ export class StateQueueManager {
     const state = new StateObject(stateDecl);
     if (!isString(name)) throw new Error("State must have a valid name");
     if (
-      Object.prototype.hasOwnProperty.call(this.states, state.name) ||
+      hasOwn(this.states, state.name) ||
       this.queue.map((x) => x.name).includes(state.name)
     )
       throw new Error(`State '${state.name}' is already defined`);
@@ -39,9 +39,7 @@ export class StateQueueManager {
     const registered = [], // states that got registered
       orphans = [], // states that don't yet have a parent registered
       previousQueueLength = {}; // keep track of how long the queue when an orphan was first encountered
-    const getState = (name) =>
-      Object.prototype.hasOwnProperty.call(this.states, name) &&
-      this.states[name];
+    const getState = (name) => hasOwn(this.states, name) && this.states[name];
     const notifyListeners = () => {
       if (registered.length) {
         this.listeners.forEach((listener) =>

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

@@ -6,19 +6,30 @@ import { propEq } from "../../shared/hof.js";
 import { ResolveContext } from "../resolve/resolve-context.js";
 import { ng1ViewsBuilder } from "./views.js";
 import { isString } from "../../shared/utils.js";
+import { $injectTokens, provider } from "../../injection-tokens.js";
 
+/** @typedef {import('../../interface.ts').ServiceProvider} ServiceProvider } */
 /**
  * A registry for all of the application's [[StateDeclaration]]s
  *
  * This API is found at `$stateRegistry` ([[UIRouter.stateRegistry]])
+ *
+ * @implements {ServiceProvider}
  */
 export class StateRegistryProvider {
-  static $inject = [
-    "$urlServiceProvider",
-    "$stateProvider",
-    "$routerGlobalsProvider",
-    "$viewProvider",
-  ];
+  static $inject = provider([
+    $injectTokens.$urlService,
+    $injectTokens.$state,
+    $injectTokens.$routerGlobals,
+    $injectTokens.$view,
+  ]);
+
+  /**
+   * @param urlService
+   * @param stateService
+   * @param {import('../globals.js').RouterGlobals} globals
+   * @param viewService
+   */
   constructor(urlService, stateService, globals, viewService) {
     this.states = {};
     stateService.stateRegistry = this; // <- circular wiring
@@ -45,17 +56,18 @@ export class StateRegistryProvider {
 
     this.registerRoot();
 
-    viewService._pluginapi._rootViewContext(this.root());
+    viewService.rootViewContext(this.root());
     globals.$current = this.root();
     globals.current = globals.$current.self;
   }
 
+  /** @type {import('../../interface.ts').AnnotatedFactory} */
   $get = [
     "$injector",
     /**
      *
      * @param {import("../../core/di/internal-injector").InjectorService} $injector
-     * @returns
+     * @returns {StateRegistryProvider}
      */
     ($injector) => {
       this.$injector = $injector;
@@ -66,7 +78,7 @@ export class StateRegistryProvider {
 
   /**
    * This is a [[StateBuilder.builder]] function for angular1 `onEnter`, `onExit`,
-   * `onRetain` callback hooks on a [[Ng1StateDeclaration]].
+   * `onRetain` callback hooks on a [[StateDeclaration]].
    *
    * When the [[StateBuilder]] builds a [[StateObject]] object from a raw [[StateDeclaration]], this builder
    * ensures that those hooks are injectable for @uirouter/angularjs (ng1).

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

@@ -30,7 +30,7 @@ export class StateProvider {
   /**
    * The latest successful state parameters
    *
-   * @deprecated This is a passthrough through to [[UIRouterGlobals.params]]
+   * @deprecated This is a passthrough through to [[RouterGlobals.params]]
    */
   get params() {
     return this.globals.params;
@@ -38,7 +38,7 @@ export class StateProvider {
   /**
    * The current [[StateDeclaration]]
    *
-   * @deprecated This is a passthrough through to [[UIRouterGlobals.current]]
+   * @deprecated This is a passthrough through to [[RouterGlobals.current]]
    */
   get current() {
     return this.globals.current;
@@ -46,7 +46,7 @@ export class StateProvider {
   /**
    * The current [[StateObject]] (an internal API)
    *
-   * @deprecated This is a passthrough through to [[UIRouterGlobals.$current]]
+   * @deprecated This is a passthrough through to [[RouterGlobals.$current]]
    */
   get $current() {
     return this.globals.$current;
@@ -55,6 +55,11 @@ export class StateProvider {
   static $inject = ["$routerGlobalsProvider", "$transitionsProvider"];
 
   // Needs access to urlService, stateRegistry
+  /**
+   *
+   * @param {import('../globals.js').RouterGlobals} globals
+   * @param {*} transitionService
+   */
   constructor(globals, transitionService) {
     this.stateRegistry = undefined;
     this.urlService = undefined;
@@ -184,7 +189,7 @@ export class StateProvider {
 
   /**
    *
-   * @param {any} definition
+   * @param {import("./interface.js").StateDeclaration} definition
    */
   state(definition) {
     if (!definition.name) {
@@ -214,6 +219,7 @@ export class StateProvider {
     const globals = this.globals;
     const latestThing = () => globals.transitionHistory.peekTail();
     const latest = latestThing();
+    /** @type {Queue<Function>} */
     const callbackQueue = new Queue(this.invalidCallbacks.slice());
     const injector = new ResolveContext(fromPath).injector();
     const checkForRedirect = (result) => {
@@ -581,10 +587,10 @@ export class StateProvider {
       stateOrName = this.$current.name;
     }
     const state = this.stateRegistry.matcher.find(
-        stateOrName,
-        options.relative,
-      ),
-      include = this.$current.includes;
+      stateOrName,
+      options.relative,
+    );
+    const include = this.$current.includes;
     if (!isDefined(state)) return undefined;
     if (!isDefined(include[state.name])) return false;
     if (!params) return true;

package/src/router/state/views.js

@@ -6,12 +6,12 @@ import { ResolveContext } from "../resolve/resolve-context.js";
 import { Resolvable } from "../resolve/resolvable.js";
 import { annotate } from "../../core/di/injector.js";
 
-export function getNg1ViewConfigFactory() {
+export function getViewConfigFactory() {
   let templateFactory = null;
   return (path, view) => {
     templateFactory =
       templateFactory || window["angular"].$injector.get("$templateFactory"); // TODO: remove static injector
-    return [new Ng1ViewConfig(path, view, templateFactory)];
+    return new ViewConfig(path, view, templateFactory);
   };
 }
 
@@ -75,7 +75,7 @@ export function ng1ViewsBuilder(state) {
     config.resolveAs = config.resolveAs || "$resolve";
     config.$context = state;
     config.$name = name;
-    const normalized = Ng1ViewConfig.normalizeUIViewTarget(
+    const normalized = ViewConfig.normalizeUIViewTarget(
       config.$context,
       config.$name,
     );
@@ -91,7 +91,12 @@ export function ng1ViewsBuilder(state) {
  */
 let id = 0;
 
-export class Ng1ViewConfig {
+export class ViewConfig {
+  /**
+   * @param {Array<import('../path/path-node.js').PathNode>} path
+   * @param viewDecl
+   * @param {import('../template-factory.js').TemplateFactoryProvider} factory
+   */
   constructor(path, viewDecl, factory) {
     this.path = path;
     this.viewDecl = viewDecl;

package/src/router/state-filters.js

@@ -9,6 +9,9 @@
  * ```
  */
 $IsStateFilter.$inject = ["$state"];
+/**
+ * @returns {import('../interface.ts').FilterFn}
+ */
 export function $IsStateFilter($state) {
   const isFilter = function (state, params, options) {
     return $state.is(state, params, options);
@@ -27,6 +30,9 @@ export function $IsStateFilter($state) {
  * ```
  */
 $IncludedByStateFilter.$inject = ["$state"];
+/**
+ * @returns {import('../interface.ts').FilterFn}
+ */
 export function $IncludedByStateFilter($state) {
   const includesFilter = function (state, params, options) {
     return $state.includes(state, params, options);

package/src/router/template-factory.js

@@ -139,7 +139,7 @@ export class TemplateFactoryProvider {
   /**
    * Creates a template by invoking an injectable provider function.
    *
-   * @param {import('../types.js').Injectable<any>} provider Function to invoke via `locals`
+   * @param {import('../interface.ts').Injectable} 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
@@ -154,7 +154,7 @@ export class TemplateFactoryProvider {
   /**
    * Creates a component's template by invoking an injectable provider function.
    *
-   * @param {import('../types.js').Injectable<any>} provider Function to invoke via `locals`
+   * @param {import('../interface.ts').Injectable} 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

@@ -10,19 +10,26 @@ describe("templateFactory", () => {
     $scope,
     $compile,
     $stateRegistry,
-    $stateService;
+    $stateService,
+    error;
 
   beforeEach(() => {
     window.angular = new Angular();
-    window.angular.module("defaultModule", []);
+    window.angular
+      .module("defaultModule", [])
+      .decorator("$exceptionHandler", () => {
+        return (exception) => {
+          error = exception.message;
+        };
+      });
     $injector = window.angular.bootstrap(document.getElementById("app"), [
       "defaultModule",
     ]);
     $injector.invoke(
       (_$templateFactory_, _$httpBackend_, _$sce_, $rootScope) => {
-        ($templateFactory = _$templateFactory_),
-          ($httpBackend = _$httpBackend_),
-          ($sce = _$sce_);
+        $templateFactory = _$templateFactory_;
+        $httpBackend = _$httpBackend_;
+        $sce = _$sce_;
         $scope = $rootScope;
       },
     );
@@ -39,13 +46,12 @@ describe("templateFactory", () => {
       expect(await res).toEqual("Hello");
     });
 
-    xit("rejects untrusted URLs", async () => {
+    it("rejects untrusted URLs", async () => {
       let error = "No error thrown";
       try {
-        $templateFactory.fromUrl("http://evil.com/views/view.html");
-        await wait();
+        await $templateFactory.fromUrl("http://evil.com/views/view.html");
       } catch (e) {
-        error = e.message;
+        error = e;
       }
       expect(error).toMatch(/sce:insecurl/);
     });