@angular-wave/angular.ts 0.0.26 → 0.0.28

package/test/router/view-hook.spec.js

@@ -1,4 +1,4 @@
-import { dealoc } from "../../src/jqLite";
+import { dealoc, jqLite } from "../../src/jqLite";
 import { Angular } from "../../src/loader";
 import { publishExternalAPI } from "../../src/public";
 import { wait } from "../test-utils";
@@ -58,7 +58,7 @@ describe("view hooks", () => {
 
     const initial = async () => {
       $state.go("foo");
-      await wait(10);
+      await wait(100);
       expect(log).toBe("");
       expect($state.current.name).toBe("foo");
     };
@@ -83,7 +83,7 @@ describe("view hooks", () => {
       await initial();
 
       $state.go("bar");
-      await wait(10);
+      await wait(100);
       expect(log).toBe("canexit;");
       expect($state.current.name).toBe("bar");
     });
@@ -95,7 +95,7 @@ describe("view hooks", () => {
       await initial();
 
       $state.go("bar");
-      await wait(10);
+      await wait(100);
       expect(log).toBe("canexit;");
       expect($state.current.name).toBe("bar");
     });
@@ -103,12 +103,12 @@ describe("view hooks", () => {
     it("can redirect the transition", async () => {
       ctrl.prototype.uiCanExit = function (trans) {
         log += "canexit;";
-        return trans.router.stateService.target("baz");
+        return $state.target("baz");
       };
       await initial();
 
       $state.go("bar");
-      await wait(10);
+      await wait(100);
       expect(log).toBe("canexit;");
       expect($state.current.name).toBe("baz");
     });
@@ -122,7 +122,7 @@ describe("view hooks", () => {
 
       $state.defaultErrorHandler(function () {});
       $state.go("bar");
-      await wait(10);
+      await wait(100);
       expect(log).toBe("canexit;");
       expect($state.current.name).toBe("foo");
     });
@@ -139,7 +139,7 @@ describe("view hooks", () => {
       await initial();
 
       $state.go("bar");
-      await wait(10);
+      await wait(100);
       expect(log).toBe("canexit;delay;");
       expect($state.current.name).toBe("foo");
     });
@@ -154,7 +154,7 @@ describe("view hooks", () => {
       await initial();
 
       $state.go("bar");
-      await wait(10);
+      await wait(100);
       expect(log).toBe("canexit;delay;");
       expect($state.current.name).toBe("bar");
     });
@@ -166,7 +166,7 @@ describe("view hooks", () => {
       await initial();
 
       $state.go("bar");
-      await wait(10);
+      await wait(100);
       expect(log).toBe("DATA");
       expect($state.current.name).toBe("bar");
     });
@@ -181,7 +181,7 @@ describe("view hooks", () => {
       await initial();
 
       $state.go("bar");
-      await wait(10);
+      await wait(100);
       expect(log).toBe("canexit;");
       expect($state.current.name).toBe("bar");
     });
@@ -195,7 +195,7 @@ describe("view hooks", () => {
       await initial();
 
       $state.go("redirect");
-      await wait(10);
+      await wait(100);
       expect(log).toBe("canexit;");
       expect($state.current.name).toBe("baz");
     });
@@ -209,7 +209,7 @@ describe("view hooks", () => {
       await initial();
 
       $state.go("redirect");
-      await wait(10);
+      await wait(100);
       expect(log).toBe("canexit;");
       expect($state.current.name).toBe("bar");
     });

package/test/router/view-scroll.spec.js

@@ -1,4 +1,4 @@
-import { dealoc } from "../../src/jqLite";
+import { dealoc, jqLite } from "../../src/jqLite";
 import { Angular } from "../../src/loader";
 import { publishExternalAPI } from "../../src/public";
 import { wait } from "../test-utils";
@@ -29,14 +29,14 @@ describe("uiView", () => {
       $uiViewScroll(elem);
       expect(elem[0].scrollIntoView).not.toHaveBeenCalled();
 
-      await wait(10);
+      await wait(100);
       expect(elem[0].scrollIntoView).toHaveBeenCalled();
     });
 
     it("should return the promise from the timeout", async () => {
       const promise = $uiViewScroll(elem);
 
-      await wait(10);
+      await wait(100);
       expect(elem[0].scrollIntoView).toHaveBeenCalled();
       expect(promise).toBeDefined();
     });

package/test/router/view.spec.js

@@ -1,4 +1,4 @@
-import { dealoc } from "../../src/jqLite";
+import { dealoc, jqLite } from "../../src/jqLite";
 import { Angular } from "../../src/loader";
 import { publishExternalAPI } from "../../src/public";
 import { curry } from "../../src/shared/hof";
@@ -110,7 +110,7 @@ describe("view", () => {
 
       const view = tail(path).views[0];
       view.load();
-      await wait(10);
+      await wait(100);
       expect(ctrlExpression).toEqual("FooController as foo");
     });
   });

package/types/router/core/common/coreservices.d.ts

@@ -5,7 +5,6 @@
  * @packageDocumentation
  */
 import { IInjectable, Obj } from "./common";
-import { Disposable } from "../interface";
 import { UrlConfig, UrlService } from "../url";
 export declare const makeStub: <T>(service: string, methods: (keyof T)[]) => T;
 declare const services: CoreServices;
@@ -46,7 +45,7 @@ export interface CoreServices {
  * - [[HashLocationService]]
  * - [[MemoryLocationService]]
  */
-export interface LocationServices extends Disposable {
+export interface LocationServices {
   /** See: [[UrlService.url]] */ url: UrlService["url"];
   /** See: [[UrlService.path]] */ path: UrlService["path"];
   /** See: [[UrlService.search]] */ search: UrlService["search"];
@@ -67,7 +66,7 @@ export interface LocationServices extends Disposable {
  * - [[BrowserLocationConfig]]
  * - [[MemoryLocationConfig]]
  */
-export interface LocationConfig extends Disposable {
+export interface LocationConfig {
   /** See: [[UrlConfig.port]] */ port: UrlConfig["port"];
   /** See: [[UrlConfig.protocol]] */ protocol: UrlConfig["protocol"];
   /** See: [[UrlConfig.host]] */ host: UrlConfig["host"];

package/types/router/core/globals.d.ts

@@ -3,14 +3,12 @@ import { StateDeclaration } from "./state/interface";
 import { StateObject } from "./state/stateObject";
 import { Transition } from "./transition/transition";
 import { Queue } from "./common/queue";
-import { Disposable } from "./interface";
-/**
  * Global router state
  *
  * This is where we hold the global mutable state such as current state, current
  * params, current transition, etc.
  */
-export declare class UIRouterGlobals implements Disposable {
+export declare class UIRouterGlobals {
   /**
    * Current parameter values
    *
@@ -41,5 +39,4 @@ export declare class UIRouterGlobals implements Disposable {
   transitionHistory: Queue<Transition>;
   /** @internal */
   successfulTransitions: Queue<Transition>;
-  dispose(): void;
 }

package/types/router/core/interface.d.ts

@@ -89,16 +89,10 @@ export interface UIInjector {
   getNative(token: any): any;
   getNative<T>(token: any): T;
 }
-export interface UIRouterPlugin extends Disposable {
+export interface UIRouterPlugin {
   name: string;
 }
-export declare abstract class UIRouterPluginBase
-  implements UIRouterPlugin, Disposable
-{
+export declare abstract class UIRouterPluginBase implements UIRouterPlugin {
   abstract name: string;
   dispose(router: UIRouter): void;
 }
-export interface Disposable {
-  /** Instructs the Disposable to clean up any resources */
-  dispose(router?: UIRouter): any;
-}

package/types/router/core/params/paramTypes.d.ts

@@ -179,7 +179,6 @@ export declare class ParamTypes {
   typeQueue: any[];
   private defaultTypes;
   constructor();
-  dispose(): void;
   /**
    * Registers a parameter type
    *

package/types/router/core/router.d.ts

@@ -5,7 +5,7 @@ import { ViewService } from "./view/view";
 import { StateRegistry } from "./state/stateRegistry";
 import { StateService } from "./state/stateService";
 import { UIRouterGlobals } from "./globals";
-import { UIRouterPlugin, Disposable } from "./interface";
+import { UIRouterPlugin } from "./interface";
 import { UrlService } from "./url/urlService";
 import { LocationServices, LocationConfig } from "./common/coreservices";
 import { Trace } from "./common/trace";
@@ -46,8 +46,7 @@ export declare class UIRouter {
   stateService: StateService;
   /** @internal plugin instances are registered here */
   private _plugins;
-  /** Registers an object to be notified when the router is disposed */
-  disposable(disposable: Disposable): void;
+
   /**
    * Disposes this router instance
    *

package/types/router/core/state/stateQueueManager.d.ts

@@ -2,9 +2,8 @@ import { _StateDeclaration } from "./interface";
 import { StateObject } from "./stateObject";
 import { StateBuilder } from "./stateBuilder";
 import { StateRegistryListener } from "./stateRegistry";
-import { Disposable } from "../interface";
 import { UIRouter } from "../router";
-export declare class StateQueueManager implements Disposable {
+export declare class StateQueueManager {
   private router;
   states: {
     [key: string]: StateObject;
@@ -20,7 +19,6 @@ export declare class StateQueueManager implements Disposable {
     builder: StateBuilder,
     listeners: StateRegistryListener[],
   );
-  dispose(): void;
   register(stateDecl: _StateDeclaration): StateObject;
   flush(): {
     [key: string]: StateObject;

package/types/router/core/state/stateRegistry.d.ts

@@ -37,8 +37,6 @@ export declare class StateRegistry {
   constructor(router: UIRouter);
   /** @internal */
   private _registerRoot;
-  /** @internal */
-  dispose(): void;
   /**
    * Listen for a State Registry events
    *

package/types/router/core/state/stateService.d.ts

@@ -53,8 +53,7 @@ export declare class StateService {
   $current: StateObject;
   /** @internal */
   constructor(/** @internal */ router: UIRouter);
-  /** @internal */
-  dispose(): void;
+
   /**
    * Handler for when [[transitionTo]] is called with an invalid state.
    *

package/types/router/core/transition/interface.d.ts

@@ -327,7 +327,7 @@ export interface IHookRegistry {
    * ```js
    * // ng2
    * transitionService.onBefore({ to: 'home' }, (trans: Transition) =>
-   *     trans.router.stateService.target("home.dashboard"));
+   *     stateService.target("home.dashboard"));
    * ```
    *
    * #### Data Driven Default Substate
@@ -354,7 +354,7 @@ export interface IHookRegistry {
    *
    * $transitions.onBefore(criteria, function(trans: Transition) {
    *   var substate = trans.to().defaultSubstate;
-   *   return trans.router.stateService.target(substate);
+   *   return stateService.target(substate);
    * });
    * ```
    *
@@ -429,7 +429,7 @@ export interface IHookRegistry {
    * ```js
    * // ng1
    * $transitions.onStart( { to: 'auth.**' }, function(trans) {
-   *   var $state = trans.router.stateService;
+   *   var $state = stateService;
    *   var MyAuthService = trans.injector().get('MyAuthService');
    *
    *   // If the user is not authenticated

package/types/router/core/transition/transitionService.d.ts

@@ -20,7 +20,6 @@ import { ViewService } from "../view/view";
 import { UIRouter } from "../router";
 import { TransitionEventType } from "./transitionEventType";
 import { GetResultHandler, GetErrorHandler } from "./transitionHook";
-import { Disposable } from "../interface";
 /**
  * The default [[Transition]] options.
  *
@@ -82,7 +81,7 @@ export interface TransitionServicePluginAPI {
  *
  * This API is located at `router.transitionService` ([[UIRouter.transitionService]])
  */
-export declare class TransitionService implements IHookRegistry, Disposable {
+export declare class TransitionService implements IHookRegistry {
   /** @internal */
   _transitionCount: number;
   /** @internal */

package/types/router/core/url/urlConfig.d.ts

@@ -1,4 +1,3 @@
-import { Disposable } from "../interface";
 import { UIRouter } from "../router";
 import { ParamTypeDefinition, ParamTypes } from "../params";
 /**
@@ -14,7 +13,7 @@ import { ParamTypeDefinition, ParamTypes } from "../params";
  *
  * This API is found at `router.urlService.config` (see: [[UIRouter.urlService]], [[URLService.config]])
  */
-export declare class UrlConfig implements Disposable {
+export declare class UrlConfig {
   private router;
   /** @internal */ paramTypes: ParamTypes;
   /** @internal */ _decodeParams: boolean;

package/types/router/core/url/urlRules.d.ts

@@ -1,5 +1,4 @@
 import { UIRouter } from "../router";
-import { Disposable } from "../interface";
 import { UrlRule, UrlRuleHandlerFn } from "./interface";
 import { TargetState, TargetStateDef } from "../state";
 import { UrlMatcher } from "./urlMatcher";
@@ -14,7 +13,7 @@ import { UrlRuleFactory } from "./urlRule";
  *
  * This API is found at `router.urlService.rules` (see: [[UIRouter.urlService]], [[URLService.rules]])
  */
-export declare class UrlRules implements Disposable {
+export declare class UrlRules {
   private router;
   /** used to create [[UrlRule]] objects for common cases */
   urlRuleFactory: UrlRuleFactory;

package/types/router/core/url/urlService.d.ts

@@ -24,8 +24,7 @@ export declare class UrlService implements LocationServices, UrlSyncApi {
   config: UrlConfig;
   /** @internal */
   constructor(/** @internal */ router: UIRouter);
-  /** @internal */
-  dispose(): void;
+
   /**
    * Gets the current URL parts
    *

package/types/router/locationServices.d.ts

@@ -35,7 +35,6 @@ export declare class Ng1LocationServices
    * @param router
    */
   static monkeyPatchPathParameterType(router: UIRouter): void;
-  dispose(): void;
   constructor($locationProvider: ILocationProvider);
   onChange(callback: Function): () => Function[];
   html5Mode(): any;

package/src/router/location-services.js

@@ -1,67 +0,0 @@
-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"]);
-  }
-
-  dispose() {}
-
-  onChange(callback) {
-    this._urlListeners.push(callback);
-    return () => removeFrom(this._urlListeners)(callback);
-  }
-  html5Mode() {
-    let html5Mode = this.$locationProvider.html5Mode();
-    html5Mode = isObject(html5Mode) ? html5Mode.enabled : html5Mode;
-    return html5Mode && typeof history !== "undefined";
-  }
-  baseHref() {
-    return (
-      this._baseHref ||
-      (this._baseHref =
-        this.$browser.baseHref() || this.$window.location.pathname)
-    );
-  }
-  url(newUrl, replace = false, state) {
-    if (isDefined(newUrl)) this.$location.url(newUrl);
-    if (replace) this.$location.replace();
-    if (state) this.$location.state(state);
-    return this.$location.url();
-  }
-
-  _runtimeServices($rootScope, $location, $browser) {
-    /** @type {angular.ILocationService} */ this.$location = $location;
-    this.$browser = $browser;
-    this.$window = window;
-    // Bind $locationChangeSuccess to the listeners registered in LocationService.onChange
-    $rootScope.$on("$locationChangeSuccess", (evt) =>
-      this._urlListeners.forEach((fn) => fn(evt)),
-    );
-    const _loc = val($location);
-    // Bind these LocationService functions to $location
-    createProxyFunctions(_loc, this, _loc, [
-      "replace",
-      "path",
-      "search",
-      "hash",
-    ]);
-    // Bind these LocationConfig functions to $location
-    createProxyFunctions(_loc, this, _loc, ["port", "protocol", "host"]);
-  }
-}