@angular-wave/angular.ts 0.0.26 → 0.0.27

package/index.html

@@ -16,7 +16,7 @@
  
       <!-- <script src="dist/angular-ts.umd.js"></script> -->
       <!-- include spec files here... -->
-
+<!-- 
       <script type="module" src="test/directive/boolean.spec.js"></script>
       <script type="module" src="test/directive/form.spec.js"></script>
       <script type="module" src="test/directive/input.spec.js"></script> 
@@ -95,14 +95,14 @@
       <script type="module" src="test/shared/common.spec.js"></script>
       <script type="module" src="test/shared/hof.spec.js"></script>
       <script type="module" src="test/shared/strings.spec.js"></script>
-      <script type="module" src="test/shared/utils.spec.js"></script>
+      <script type="module" src="test/shared/utils.spec.js"></script> -->
       
       <!-- Router specs--> 
       <script type="module" src="test/router/glob.spec.js"></script>
       <script type="module" src="test/router/services.spec.js"></script>
       <script type="module" src="test/router/state-directives.spec.js"></script>
       <script type="module" src="test/router/state-filter.spec.js"></script>
-      <!-- <script type="module" src="test/router/state.spec.js"></script> -->
+      <script type="module" src="test/router/state.spec.js"></script>
       <script type="module" src="test/router/template-factory.spec.js"></script>
       <script type="module" src="test/router/url-matcher-factory.spec.js"></script>
       <script type="module" src="test/router/view-directive.spec.js"></script>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@angular-wave/angular.ts",
   "license": "MIT",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "type": "module",
   "main": "dist/angular-ts.esm.js",
   "browser": "dist/angular-ts.umd.js",

package/src/router/globals.js

@@ -31,9 +31,4 @@ export class UIRouterGlobals {
      */
     this.successfulTransitions = new Queue([], 1);
   }
-  dispose() {
-    this.transitionHistory.clear();
-    this.successfulTransitions.clear();
-    this.transition = null;
-  }
 }

package/src/router/params/param-types.js

@@ -54,9 +54,6 @@ export class ParamTypes {
       new ParamType(Object.assign({ name }, definition));
     this.types = inherit(map(this.defaultTypes, makeType), {});
   }
-  dispose() {
-    this.types = {};
-  }
   /**
    * Registers a parameter type
    *

package/src/router/router.js

@@ -5,8 +5,6 @@ import { ViewService } from "./view/view";
 import { StateRegistry } from "./state/state-registry";
 import { StateService } from "./state/state-service";
 import { UIRouterGlobals } from "./globals";
-import { removeFrom } from "../shared/common";
-import { isFunction } from "../shared/utils";
 import { UrlService } from "./url/url-service";
 import { trace } from "./common/trace";
 
@@ -26,18 +24,14 @@ export class UIRouter {
   /**
    * Creates a new `UIRouter` object
    *
-   * @param {import('./location-services').Ng1LocationServices} locationService
+   * @param {angular.ILocationProvider} $locationProvider
    */
-  constructor(locationService) {
-    /**
-     * @type {import('./location-services').Ng1LocationServices}
-     */
-    this.locationService = locationService;
+  constructor($locationProvider) {
     /**  @type {number} */ this.$id = routerId++;
-    /**  @type {boolean} */ this._disposed = false;
-    this._disposables = [];
+
     /** Enable/disable tracing to the javascript console */
     this.trace = trace;
+    this.$locationProvider = $locationProvider;
     /** Provides services related to ui-view synchronization */
     this.viewService = new ViewService(this);
     /** @type {UIRouterGlobals} An object that contains global router state, such as the current state and params */
@@ -55,7 +49,7 @@ export class UIRouter {
      */
     this.urlRouter = new UrlRouter(this);
     /** Provides services related to the URL */
-    this.urlService = new UrlService(this);
+    this.urlService = new UrlService(this, $locationProvider);
     /** Provides a registry for states, and related registration services */
     this.stateRegistry = new StateRegistry(this);
     /** Provides services related to states */
@@ -65,47 +59,6 @@ export class UIRouter {
     this.viewService._pluginapi._rootViewContext(this.stateRegistry.root());
     this.globals.$current = this.stateRegistry.root();
     this.globals.current = this.globals.$current.self;
-    this.disposable(this.globals);
-    this.disposable(this.stateService);
-    this.disposable(this.stateRegistry);
-    this.disposable(this.transitionService);
-    this.disposable(this.urlService);
-    this.disposable(locationService);
-  }
-
-  /**
-   * Registers an object to be notified when the router is disposed
-   * @param {Disposable} disposable
-   * @returns {void}
-   */
-  disposable(disposable) {
-    this._disposables.push(disposable);
-  }
-  /**
-   * Disposes this router instance
-   *
-   * When called, clears resources retained by the router by calling `dispose(this)` on all
-   * registered [[disposable]] objects.
-   *
-   * Or, if a `disposable` object is provided, calls `dispose(this)` on that object only.
-   *
-   * @internal
-   * @param disposable (optional) the disposable to dispose
-   */
-  dispose(disposable) {
-    if (disposable && isFunction(disposable.dispose)) {
-      disposable.dispose(this);
-      return undefined;
-    }
-    this._disposed = true;
-    this._disposables.slice().forEach((d) => {
-      try {
-        typeof d.dispose === "function" && d.dispose(this);
-        removeFrom(this._disposables, d);
-      } catch (ignored) {
-        /* empty */
-      }
-    });
   }
 
   /**
@@ -167,7 +120,6 @@ export class UIRouter {
       throw new Error(
         "Required property `name` missing on plugin: " + pluginInstance,
       );
-    this._disposables.push(pluginInstance);
     return (this._plugins[pluginInstance.name] = pluginInstance);
   }
   getPlugin(pluginName) {

package/src/router/services.js

@@ -16,7 +16,6 @@ import { UIRouter } from "./router";
 import { ng1ViewsBuilder, getNg1ViewConfigFactory } from "./state/views";
 
 import { StateProvider } from "./state-provider";
-import { Ng1LocationServices } from "./location-services";
 import { ResolveContext } from "./resolve/resolve-context";
 
 /** @type {angular.UIRouter}} */
@@ -24,9 +23,8 @@ export let router = null;
 $routerProvider.$inject = ["$locationProvider"];
 /** This angular 1 provider instantiates a Router and exposes its services via the angular injector */
 export function $routerProvider($locationProvider) {
-  const ng1LocationService = new Ng1LocationServices($locationProvider);
   // Create a new instance of the Router when the $routerProvider is initialized
-  router = this.router = new UIRouter(ng1LocationService);
+  router = this.router = new UIRouter($locationProvider);
   router.stateProvider = new StateProvider(
     router.stateRegistry,
     router.stateService,
@@ -69,7 +67,7 @@ export function $routerProvider($locationProvider) {
   router["$get"] = $get;
   $get.$inject = ["$location", "$browser", "$rootScope"];
   function $get($location, $browser, $rootScope) {
-    ng1LocationService._runtimeServices($rootScope, $location, $browser);
+    router.urlService._runtimeServices($rootScope, $location, $browser);
     return router;
   }
   return router;

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

@@ -11,9 +11,6 @@ export class StateQueueManager {
     this.listeners = listeners;
     this.queue = [];
   }
-  dispose() {
-    this.queue = [];
-  }
   register(stateDecl) {
     const queue = this.queue;
     const state = StateObject.create(stateDecl);

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

@@ -39,11 +39,6 @@ export class StateRegistry {
     _root.navigable = null;
   }
 
-  dispose() {
-    this.stateQueue.dispose();
-    this.listeners = [];
-    this.get().forEach((state) => this.get(state) && this.deregister(state));
-  }
   /**
    * Listen for a State Registry events
    *

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

@@ -85,10 +85,6 @@ export class StateService {
     );
   }
 
-  dispose() {
-    this.defaultErrorHandler(() => {});
-    this.invalidCallbacks = [];
-  }
   /**
    * Handler for when [[transitionTo]] is called with an invalid state.
    *

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

@@ -142,16 +142,9 @@ export class TransitionHook {
   }
   /**
    * Return a Rejection promise if the transition is no longer current due
-   * to a stopped router (disposed), or a new transition has started and superseded this one.
+   * a new transition has started and superseded this one.
    */
   getNotCurrentRejection() {
-    const router = this.transition.router;
-    // The router is stopped
-    if (router._disposed) {
-      return Rejection.aborted(
-        `UIRouter instance #${router.$id} has been stopped (disposed)`,
-      ).toPromise();
-    }
     if (this.transition._aborted) {
       return Rejection.aborted().toPromise();
     }

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

@@ -110,18 +110,6 @@ export class TransitionService {
    * @returns a function which deregisters the hook.
    */
 
-  /**
-   * dispose
-   * @internal
-   */
-  dispose() {
-    Object.values(this._registeredHooks).forEach((hooksArray) =>
-      hooksArray.forEach((hook) => {
-        hook._deregistered = true;
-        removeFrom(hooksArray, hook);
-      }),
-    );
-  }
   /**
    * Creates a new [[Transition]] object
    *

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

@@ -30,14 +30,14 @@ export class UrlConfig {
     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.locationService.baseHref();
+    this.baseHref = () => this.router.urlService.baseHref();
     /**
      * Gets or sets the hashPrefix
      *
@@ -48,31 +48,31 @@ export class UrlConfig {
      * @return the hash prefix
      */
     this.hashPrefix = (newprefix) =>
-      this.router.locationService.$locationProvider.hashPrefix(newprefix);
+      this.router.$locationProvider.hashPrefix(newprefix);
     /**
      * Gets the host, e.g., `localhost`
      *
      * @return {string} the protocol
      */
-    this.host = () => this.router.locationService.$location.host();
+    this.host = () => this.router.urlService.$location.host();
     /**
      * Returns true when running in pushstate mode
      *
      * @return {boolean} true when running in html5 mode (pushstate mode).
      */
-    this.html5Mode = () => this.router.locationService.html5Mode();
+    this.html5Mode = () => this.router.urlService.html5Mode();
     /**
      * Gets the port, e.g., `80`
      *
      * @return {number} the port number
      */
-    this.port = () => this.router.locationService.$location.port();
+    this.port = () => this.router.urlService.$location.port();
     /**
      * Gets the protocol, e.g., `http`
      *
      * @return {string} the protocol
      */
-    this.protocol = () => this.router.locationService.$location.protocol();
+    this.protocol = () => this.router.urlService.$location.protocol();
   }
   /**
    * Defines whether URL matching should be case sensitive (the default behavior), or not.

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

@@ -25,7 +25,7 @@ export class UrlRouter {
   }
   /** Internal API. */
   update(read) {
-    const $url = this.router.locationService;
+    const $url = this.router.urlService;
     if (read) {
       this.location = $url.url();
       return;

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

@@ -72,10 +72,6 @@ export class UrlRules {
     this.urlRuleFactory = new UrlRuleFactory(router);
   }
 
-  dispose() {
-    this._rules = [];
-    delete this._otherwiseFn;
-  }
   /**
    * Defines the initial state, path, or behavior to use when the app starts.
    *

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

@@ -1,8 +1,9 @@
-import { isString } from "../../shared/utils";
+import { isDefined, isObject, isString } from "../../shared/utils";
 import { is, pattern } from "../../shared/hof";
 import { UrlRules } from "./url-rules";
 import { UrlConfig } from "./url-config";
 import { TargetState } from "../state/target-state";
+import { removeFrom } from "../../shared/common";
 /**
  * API for URL management
  */
@@ -10,13 +11,16 @@ export class UrlService {
   /**
    *
    * @param {import('../router').UIRouter} router
+   * @param {angular.ILocationProvider} $locationProvider
    */
-  constructor(router) {
+  constructor(router, $locationProvider) {
     /**
      * @type {import('../router').UIRouter}
      */
     this.router = router;
 
+    this.$locationProvider = $locationProvider;
+
     /** @type {boolean} */
     this.interceptDeferred = false;
     /**
@@ -33,61 +37,7 @@ export class UrlService {
      * @type {UrlConfig}
      */
     this.config = new UrlConfig(this.router);
-    // Delegate these calls to the current LocationServices implementation
-    /**
-     * Gets the current url, or updates the url
-     *
-     * ### Getting the current URL
-     *
-     * When no arguments are passed, returns the current URL.
-     * The URL is normalized using the internal [[path]]/[[search]]/[[hash]] values.
-     *
-     * For example, the URL may be stored in the hash ([[HashLocationServices]]) or
-     * have a base HREF prepended ([[PushStateLocationServices]]).
-     *
-     * The raw URL in the browser might be:
-     *
-     * ```
-     * http://mysite.com/somepath/index.html#/internal/path/123?param1=foo#anchor
-     * ```
-     *
-     * or
-     *
-     * ```
-     * http://mysite.com/basepath/internal/path/123?param1=foo#anchor
-     * ```
-     *
-     * then this method returns:
-     *
-     * ```
-     * /internal/path/123?param1=foo#anchor
-     * ```
-     *
-     *
-     * #### Example:
-     * ```js
-     * locationServices.url(); // "/some/path?query=value#anchor"
-     * ```
-     *
-     * ### Updating the URL
-     *
-     * When `newurl` arguments is provided, changes the URL to reflect `newurl`
-     *
-     * #### Example:
-     * ```js
-     * locationServices.url("/some/path?query=value#anchor", true);
-     * ```
-     *
-     * @param {string} newurl The new value for the URL.
-     *               This url should reflect only the new internal [[path]], [[search]], and [[hash]] values.
-     *               It should not include the protocol, site, port, or base path of an absolute HREF.
-     * @param {boolean} replace When true, replaces the current history entry (instead of appending it) with this new url
-     * @param {any} state The history's state object, i.e., pushState (if the LocationServices implementation supports it)
-     *
-     * @return the url (after potentially being processed)
-     */
-    this.url = (newurl, replace, state) =>
-      this.router.locationService.url(newurl, replace, state);
+
     /**
      * Gets the path part of the current url
      *
@@ -95,7 +45,7 @@ export class UrlService {
      *
      * @return the path portion of the url
      */
-    this.path = () => this.router.locationService.path();
+    this.path = () => this.$location.path();
     /**
      * Gets the search part of the current url as an object
      *
@@ -103,7 +53,7 @@ export class UrlService {
      *
      * @return the search (query) portion of the url, as an object
      */
-    this.search = () => this.router.locationService.search();
+    this.search = () => this.$location.search();
     /**
      * Gets the hash part of the current url
      *
@@ -111,30 +61,103 @@ export class UrlService {
      *
      * @return the hash (anchor) portion of the url
      */
-    this.hash = () => this.router.locationService.hash();
-    /**
-     * @internal
-     *
-     * Registers a low level url change handler
-     *
-     * Note: Because this is a low level handler, it's not recommended for general use.
-     *
-     * #### Example:
-     * ```js
-     * let deregisterFn = locationServices.onChange((evt) => console.log("url change", evt));
-     * ```
-     *
-     * @param callback a function that will be called when the url is changing
-     * @return a function that de-registers the callback
-     */
-    this.onChange = (callback) =>
-      this.router.locationService.onChange(callback);
+    this.hash = () => this.$location.hash();
+
+    this._urlListeners = [];
+  }
+
+  html5Mode() {
+    let html5Mode = this.$locationProvider.html5Mode();
+    html5Mode = isObject(html5Mode) ? html5Mode.enabled : html5Mode;
+    return html5Mode && typeof history !== "undefined";
   }
 
-  dispose() {
-    this.listen(false);
-    this.rules.dispose();
+  baseHref() {
+    return (
+      this._baseHref ||
+      (this._baseHref = this.$browser.baseHref() || window.location.pathname)
+    );
   }
+
+  /**
+   * Gets the current url, or updates the url
+   *
+   * ### Getting the current URL
+   *
+   * When no arguments are passed, returns the current URL.
+   * The URL is normalized using the internal [[path]]/[[search]]/[[hash]] values.
+   *
+   * For example, the URL may be stored in the hash ([[HashLocationServices]]) or
+   * have a base HREF prepended ([[PushStateLocationServices]]).
+   *
+   * The raw URL in the browser might be:
+   *
+   * ```
+   * http://mysite.com/somepath/index.html#/internal/path/123?param1=foo#anchor
+   * ```
+   *
+   * or
+   *
+   * ```
+   * http://mysite.com/basepath/internal/path/123?param1=foo#anchor
+   * ```
+   *
+   * then this method returns:
+   *
+   * ```
+   * /internal/path/123?param1=foo#anchor
+   * ```
+   *
+   *
+   * #### Example:
+   * ```js
+   * locationServices.url(); // "/some/path?query=value#anchor"
+   * ```
+   *
+   * ### Updating the URL
+   *
+   * When `newurl` arguments is provided, changes the URL to reflect `newurl`
+   *
+   * #### Example:
+   * ```js
+   * locationServices.url("/some/path?query=value#anchor", true);
+   * ```
+   *
+   * @param {string} newUrl The new value for the URL.
+   *               This url should reflect only the new internal [[path]], [[search]], and [[hash]] values.
+   *               It should not include the protocol, site, port, or base path of an absolute HREF.
+   * @param {boolean} replace When true, replaces the current history entry (instead of appending it) with this new url
+   * @param {any} state The history's state object, i.e., pushState (if the LocationServices implementation supports it)
+   *
+   * @return the url (after potentially being processed)
+   */
+  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();
+  }
+
+  /**
+   * @internal
+   *
+   * Registers a low level url change handler
+   *
+   * Note: Because this is a low level handler, it's not recommended for general use.
+   *
+   * #### Example:
+   * ```js
+   * let deregisterFn = locationServices.onChange((evt) => console.log("url change", evt));
+   * ```
+   *
+   * @param callback a function that will be called when the url is changing
+   * @return a function that de-registers the callback
+   */
+  onChange(callback) {
+    this._urlListeners.push(callback);
+    return () => removeFrom(this._urlListeners)(callback);
+  }
+
   /**
    * Gets the current URL parts
    *
@@ -275,4 +298,14 @@ export class UrlService {
     }
     return best;
   }
+
+  _runtimeServices($rootScope, $location, $browser) {
+    /** @type {angular.ILocationService} */
+    this.$location = $location;
+    this.$browser = $browser;
+    // Bind $locationChangeSuccess to the listeners registered in LocationService.onChange
+    $rootScope.$on("$locationChangeSuccess", (evt) =>
+      this._urlListeners.forEach((fn) => fn(evt)),
+    );
+  }
 }

package/test/core/interval.spec.js

@@ -71,7 +71,7 @@ describe("$interval", () => {
 
     $interval(notifySpy, 1, 1, false);
 
-    await wait(10);
+    await wait(100);
     expect(notifySpy).toHaveBeenCalled();
     expect(evalAsyncSpy).not.toHaveBeenCalled();
     expect(digestSpy).not.toHaveBeenCalled();