@angular-wave/angular.ts 0.0.30 → 0.0.31

package/test/router/view.spec.js

@@ -21,7 +21,7 @@ describe("view", () => {
     $injector,
     elem,
     $controllerProvider,
-    $urlMatcherFactoryProvider,
+    $urlServiceProvider,
     $view,
     $q;
   let root, states;
@@ -34,16 +34,12 @@ describe("view", () => {
     window.angular
       .module("defaultModule", ["ng.router"])
       .config(
-        function (
-          _$provide_,
-          _$controllerProvider_,
-          _$urlMatcherFactoryProvider_,
-        ) {
+        function (_$provide_, _$controllerProvider_, _$urlServiceProvider_) {
           _$provide_.factory("foo", () => {
             return "Foo";
           });
           $controllerProvider = _$controllerProvider_;
-          $urlMatcherFactoryProvider = _$urlMatcherFactoryProvider_;
+          $urlServiceProvider = _$urlServiceProvider_;
         },
       );
     $injector = window.angular.bootstrap(document.getElementById("dummy"), [
@@ -58,10 +54,7 @@ describe("view", () => {
 
       states = {};
       const matcher = new StateMatcher(states);
-      const stateBuilder = new StateBuilder(
-        matcher,
-        $urlMatcherFactoryProvider,
-      );
+      const stateBuilder = new StateBuilder(matcher, $urlServiceProvider);
       stateBuilder.builder("views", ng1ViewsBuilder);
       register = registerState(states, stateBuilder);
       root = register({ name: "" });

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

@@ -395,7 +395,7 @@ export interface Replace {
  * @example
  * ```
  *
- * $urlMatcherFactoryProvider.type('intarray', {
+ * $urlServiceProvider.type('intarray', {
  *   // Take an array of ints [1,2,3] and return a string "1-2-3"
  *   encode: (array) => array.join("-"),
  *
@@ -432,7 +432,7 @@ export interface Replace {
  *
  * var list = ['John', 'Paul', 'George', 'Ringo'];
  *
- * $urlMatcherFactoryProvider.type('listItem', {
+ * $urlServiceProvider.type('listItem', {
  *   encode: function(item) {
  *     // Represent the list item in the URL using its corresponding index
  *     return list.indexOf(item);

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

@@ -14,7 +14,7 @@ export declare class ParamFactory {
  * Factory for [[UrlMatcher]] instances.
  *
  * The factory is available to ng1 services as
- * `$urlMatcherFactory` or ng1 providers as `$urlMatcherFactoryProvider`.
+ * `$urlMatcherFactory` or ng1 providers as `$urlServiceProvider`.
  */
 export declare class UrlMatcherFactory {
   private router;

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

@@ -1,76 +0,0 @@
-import { forEach, isDefined, isFunction, isObject } from "../../shared/utils";
-import { UrlMatcher } from "./url-matcher";
-import { ParamFactory } from "../params/param-factory";
-
-/**
- * Factory for [[UrlMatcher]] instances.
- *
- * The factory is available to ng1 services as
- * `$urlMatcherFactory` or ng1 providers as `$urlMatcherFactoryProvider`.
- */
-export class UrlMatcherFactory {
-  // TODO: move implementations to UrlConfig (urlService.config)
-  constructor(urlServiceConfig) {
-    this.urlServiceConfig = urlServiceConfig;
-    /** Creates a new [[Param]] for a given location (DefType) */
-    this.paramFactory = new ParamFactory(urlServiceConfig);
-    /** @deprecated use [[UrlConfig.caseInsensitive]] */
-    this.caseInsensitive = (value) => urlServiceConfig.caseInsensitive(value);
-    /** @deprecated use [[UrlConfig.defaultSquashPolicy]] */
-    this.defaultSquashPolicy = (value) =>
-      urlServiceConfig.defaultSquashPolicy(value);
-    /** @deprecated use [[UrlConfig.strictMode]] */
-    this.strictMode = (value) => urlServiceConfig.strictMode(value);
-    /** @deprecated use [[UrlConfig.type]] */
-    this.type = (name, definition, definitionFn) => {
-      return urlServiceConfig.type(name, definition, definitionFn) || this;
-    };
-  }
-  /**
-   * Creates a [[UrlMatcher]] for the specified pattern.
-   *
-   * @param pattern  The URL pattern.
-   * @param config  The config object hash.
-   * @returns The UrlMatcher.
-   */
-  compile(pattern, config) {
-    const urlConfig = this.urlServiceConfig;
-    // backward-compatible support for config.params -> config.state.params
-    const params = config && !config.state && config.params;
-    config = params ? Object.assign({ state: { params } }, config) : config;
-    const globalConfig = {
-      strict: urlConfig._isStrictMode,
-      caseInsensitive: urlConfig._isCaseInsensitive,
-    };
-    return new UrlMatcher(
-      pattern,
-      urlConfig.paramTypes,
-      this.paramFactory,
-      Object.assign(globalConfig, config),
-    );
-  }
-  /**
-   * Returns true if the specified object is a [[UrlMatcher]], or false otherwise.
-   *
-   * @param object  The object to perform the type check against.
-   * @returns `true` if the object matches the `UrlMatcher` interface, by
-   *          implementing all the same methods.
-   */
-  isMatcher(object) {
-    // TODO: typeof?
-    if (!isObject(object)) return false;
-    let result = true;
-    forEach(UrlMatcher.prototype, (val, name) => {
-      if (isFunction(val))
-        result = result && isDefined(object[name]) && isFunction(object[name]);
-    });
-    return result;
-  }
-
-  $get() {
-    const urlConfig = this.urlServiceConfig;
-    urlConfig.paramTypes.enqueue = false;
-    urlConfig.paramTypes._flushTypeQueue();
-    return this;
-  }
-}

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

@@ -1,101 +0,0 @@
-import { EventBus } from "../../core/pubsub";
-import { stripLastPathElement } from "../../shared/strings";
-
-function appendBasePath(url, isHtml5, absolute, baseHref) {
-  if (baseHref === "/") return url;
-  if (isHtml5) return stripLastPathElement(baseHref) + url;
-  if (absolute) return baseHref.slice(1) + url;
-  return url;
-}
-/**
- * Updates URL and responds to URL changes
- *
- * ### Deprecation warning:
- * This class is now considered to be an internal API
- * Use the [[UrlService]] instead.
- * For configuring URL rules, use the [[UrlRules]] which can be found as [[UrlService.rules]].
- */
-export class UrlRouter {
-  /**
-   * @param {angular.UrlService} urlService
-   */
-  constructor(urlService, urlRuleFactory, $locationProvider) {
-    this.urlService = urlService;
-    this.urlRuleFactory = urlRuleFactory;
-    this.$locationProvider = $locationProvider;
-    EventBus.subscribe("$urlRouter:update", () => {
-      this.update();
-    });
-  }
-
-  update(read) {
-    const $url = this.urlService;
-    if (read) {
-      this.location = $url.url();
-      return;
-    }
-    if ($url.url() === this.location) return;
-    $url.url(this.location, true);
-  }
-  /**
-   * Pushes a new location to the browser history.
-   *
-   * @internal
-   * @param urlMatcher
-   * @param params
-   * @param options
-   */
-  push(urlMatcher, params, options) {
-    const replace = options && !!options.replace;
-    this.urlService.url(urlMatcher.format(params || {}), replace);
-  }
-  /**
-   * Builds and returns a URL with interpolated parameters
-   *
-   * #### Example:
-   * ```js
-   * matcher = $umf.compile("/about/:person");
-   * params = { person: "bob" };
-   * $bob = $urlRouter.href(matcher, params);
-   * // $bob == "/about/bob";
-   * ```
-   *
-   * @param urlMatcher The [[UrlMatcher]] object which is used as the template of the URL to generate.
-   * @param params An object of parameter values to fill the matcher's required parameters.
-   * @param options Options object. The options are:
-   *
-   * - **`absolute`** - {boolean=false},  If true will generate an absolute url, e.g. "http://www.example.com/fullurl".
-   *
-   * @returns Returns the fully compiled URL, or `null` if `params` fail validation against `urlMatcher`
-   */
-  href(urlMatcher, params, options) {
-    let url = urlMatcher.format(params);
-    if (url == null) return null;
-    options = options || { absolute: false };
-    const cfg = this.urlService.config;
-    const isHtml5 = this.urlService.html5Mode();
-    if (!isHtml5 && url !== null) {
-      url = "#" + this.$locationProvider.hashPrefix() + url;
-    }
-    url = appendBasePath(
-      url,
-      isHtml5,
-      options.absolute,
-      this.urlService.baseHref(),
-    );
-    if (!options.absolute || !url) {
-      return url;
-    }
-    const slash = !isHtml5 && url ? "/" : "";
-    const cfgPort = this.urlService.$location.port();
-    const port = cfgPort === 80 || cfgPort === 443 ? "" : ":" + cfgPort;
-    return [
-      cfg.protocol(),
-      "://",
-      this.urlService.$location.host(),
-      port,
-      slash,
-      url,
-    ].join("");
-  }
-}