Revert "refactor(compiler): remove asset: urls"

This reverts commit 0c98f45105.

modules/@angular/compiler/test/output/js_emitter_spec.ts

@@ -13,8 +13,8 @@ import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_in
 
 import {SimpleJsImportGenerator} from './output_emitter_util';
 
-const someModuleUrl = 'somePackage/somePath';
-const anotherModuleUrl = 'somePackage/someOtherPath';
+const someModuleUrl = 'asset:somePackage/lib/somePath';
+const anotherModuleUrl = 'asset:somePackage/lib/someOtherPath';
 
 const sameModuleIdentifier =
     new CompileIdentifierMetadata({name: 'someLocalId', moduleUrl: someModuleUrl});

modules/@angular/compiler/test/output/output_emitter_util.ts

@@ -22,7 +22,7 @@ export class ExternalClass {
 
 const testDataIdentifier = new CompileIdentifierMetadata({
   name: 'ExternalClass',
-  moduleUrl: `@angular/compiler/test/output/output_emitter_util`,
+  moduleUrl: `asset:@angular/lib/compiler/test/output/output_emitter_util`,
   reference: ExternalClass
 });
 
@@ -253,5 +253,12 @@ function createOperatorFn(op: o.BinaryOperator) {
 }
 
 export class SimpleJsImportGenerator implements ImportGenerator {
-  getImportPath(moduleUrlStr: string, importedUrlStr: string): string { return importedUrlStr; }
+  getImportPath(moduleUrlStr: string, importedUrlStr: string): string {
+    const importedAssetUrl = ImportGenerator.parseAssetUrl(importedUrlStr);
+    if (importedAssetUrl) {
+      return `${importedAssetUrl.packageName}/${importedAssetUrl.modulePath}`;
+    } else {
+      return importedUrlStr;
+    }
+  }
 }

modules/@angular/compiler/test/output/ts_emitter_spec.ts

@@ -13,8 +13,8 @@ import {beforeEach, describe, expect, it} from '@angular/core/testing/testing_in
 
 import {SimpleJsImportGenerator} from './output_emitter_util';
 
-const someModuleUrl = 'somePackage/somePath';
-const anotherModuleUrl = 'somePackage/someOtherPath';
+const someModuleUrl = 'asset:somePackage/lib/somePath';
+const anotherModuleUrl = 'asset:somePackage/lib/someOtherPath';
 
 const sameModuleIdentifier =
     new CompileIdentifierMetadata({name: 'someLocalId', moduleUrl: someModuleUrl});

modules/@angular/compiler/test/style_url_resolver_spec.ts

@@ -91,6 +91,9 @@ export function main() {
     it('should resolve package: urls',
        () => { expect(isStyleUrlResolvable('package:someUrl.css')).toBe(true); });
 
+    it('should resolve asset: urls',
+       () => { expect(isStyleUrlResolvable('asset:someUrl.css')).toBe(true); });
+
     it('should not resolve empty urls', () => {
       expect(isStyleUrlResolvable(null)).toBe(false);
       expect(isStyleUrlResolvable('')).toBe(false);

modules/@angular/compiler/test/url_resolver_spec.ts

@@ -106,6 +106,16 @@ export function main() {
       });
     });
 
+    describe('asset urls', () => {
+      let resolver: UrlResolver;
+      beforeEach(() => { resolver = createOfflineCompileUrlResolver(); });
+
+      it('should resolve package: urls into asset: urls', () => {
+        expect(resolver.resolve(null, 'package:somePkg/somePath'))
+            .toEqual('asset:somePkg/lib/somePath');
+      });
+    });
+
     describe('corner and error cases', () => {
       it('should encode URLs before resolving',
          () => {