feat(UrlResolver): combine a base URL with an URL

vicb · vicb · commit ff406e65dca2 · 2015-02-26T09:04:00.000+01:00
diff --git a/modules/angular2/src/core/compiler/url_resolver.js b/modules/angular2/src/core/compiler/url_resolver.js
@@ -0,0 +1,36 @@
+import {isPresent, isBlank, RegExpWrapper} from 'angular2/src/facade/lang';
+import {DOM, Element} from 'angular2/src/facade/dom';
+
+export class UrlResolver {
+  static a: Element;
+
+  constructor() {
+    if (isBlank(UrlResolver.a)) {
+      UrlResolver.a = DOM.createElement('a');
+    }
+  }
+
+  resolve(baseUrl: string, url: string): string {
+    if (isBlank(baseUrl)) {
+      UrlResolver.a.href = url;
+      return UrlResolver.a.href;
+    }
+
+    if (isBlank(url) || url == '') return baseUrl;
+
+    if (url[0] == '/') {
+      throw new BaseException(`Could not resolve the url ${url} from ${baseUrl}`);
+    }
+
+    var m = RegExpWrapper.firstMatch(_schemeRe, url);
+
+    if (isPresent(m[1])) {
+      return url;
+    }
+
+    UrlResolver.a.href = baseUrl + '/../' + url;
+    return UrlResolver.a.href;
+  }
+}
+
+var _schemeRe = RegExpWrapper.create('^([^:/?#]+:)?');
diff --git a/modules/angular2/test/core/compiler/url_resolver_spec.js b/modules/angular2/test/core/compiler/url_resolver_spec.js
@@ -0,0 +1,42 @@
+import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib';
+import {UrlResolver} from 'angular2/src/core/compiler/url_resolver';
+
+export function main() {
+  describe('UrlResolver', () => {
+    var resolver = new UrlResolver();
+
+    it('should add a relative path to the base url', () => {
+      expect(resolver.resolve('http://www.foo.com', 'bar')).toEqual('http://www.foo.com/bar');
+      expect(resolver.resolve('http://www.foo.com/', 'bar')).toEqual('http://www.foo.com/bar');
+      expect(resolver.resolve('http://www.foo.com', './bar')).toEqual('http://www.foo.com/bar');
+      expect(resolver.resolve('http://www.foo.com/', './bar')).toEqual('http://www.foo.com/bar');
+    });
+
+    it('should replace the base path', () => {
+      expect(resolver.resolve('http://www.foo.com/baz', 'bar')).toEqual('http://www.foo.com/bar');
+      expect(resolver.resolve('http://www.foo.com/baz', './bar')).toEqual('http://www.foo.com/bar');
+    });
+
+    it('should append to the base path', () => {
+      expect(resolver.resolve('http://www.foo.com/baz/', 'bar')).toEqual('http://www.foo.com/baz/bar');
+      expect(resolver.resolve('http://www.foo.com/baz/', './bar')).toEqual('http://www.foo.com/baz/bar');
+    });
+
+    it('should support ".." in the path', () => {
+      expect(resolver.resolve('http://www.foo.com/baz/', '../bar')).toEqual('http://www.foo.com/bar');
+      expect(resolver.resolve('http://www.foo.com/1/2/3/', '../../bar')).toEqual('http://www.foo.com/1/bar');
+      expect(resolver.resolve('http://www.foo.com/1/2/3/', '../biz/bar')).toEqual('http://www.foo.com/1/2/biz/bar');
+      expect(resolver.resolve('http://www.foo.com/1/2/baz', '../../bar')).toEqual('http://www.foo.com/bar');
+    });
+
+    it('should ignore the base path when the url has a scheme', () => {
+      expect(resolver.resolve('http://www.foo.com', 'http://www.bar.com')).toEqual('http://www.bar.com');
+    })
+
+    it('should throw when the url start with "/"', () => {
+      expect(() => {
+        resolver.resolve('http://www.foo.com/1/2', '/test');
+      }).toThrowError();
+    });
+  });
+}
