feat(loader): Added support for non-relative paths

Author: brandonroberts

spec/index.spec.js

@@ -178,6 +178,23 @@ describe('Loader', function() {
     env.reset();
   });
 
+  it('should support non-relative paths', function() {
+    var result = [
+      'loadChildren: () => new Promise(function (resolve) {',
+      '  (require as any).ensure([], function (require: any) {',
+      '    resolve(require(\'path/to/file.module\')[\'FileModule\']);',
+      '  });',
+      '})'
+    ];
+
+    var loadedString = loader.call({
+      resourcePath: resourcePath,
+      query: ''
+    }, `loadChildren: '${modulePath.replace('./', '')}'`);
+
+    checkResult(loadedString, result);
+  });
+
   describe('AoT', function() {
     beforeEach(function() {
       query = '?aot=true&genDir=.'
@@ -268,5 +285,22 @@ describe('Loader', function() {
 
       checkResult(loadedString, result);
     });
+
+    it('should support non-relative paths', function() {
+      var result = [
+        'loadChildren: () => new Promise(function (resolve) {',
+        '  (require as any).ensure([], function (require: any) {',
+        '    resolve(require(\'path/to/file.module.ngfactory\')[\'FileModuleNgFactory\']);',
+        '  });',
+        '})'
+      ];
+
+      var loadedString = loader.call({
+        resourcePath: resourcePath,
+        query: query
+      }, `loadChildren: '${modulePath.replace('./', '')}'`);
+
+      checkResult(loadedString, result);
+    });
   });
 });

spec/utils.spec.js

@@ -69,11 +69,15 @@ describe('Utils', function() {
       });
 
       it('should replace backslashes with forward slashes', function() {
-          normalizeFilePath('./path').should.eql('.\\\\path');
+          normalizeFilePath('./path', true).should.eql('.\\\\path');
       });
 
-      it('should make a relative path if the path is not relative', function() {
-          normalizeFilePath('path').should.eql('.\\\\path');
+      it('should make a relative path if the path is not relative and the original path was relative', function() {
+          normalizeFilePath('path', true).should.eql('.\\\\path');
+      });
+
+      it('should not make a relative path if the original path was not relative', function() {
+          normalizeFilePath('path', false).should.eql('path');
       });
 
       afterEach(function() {
@@ -87,11 +91,15 @@ describe('Utils', function() {
       });
 
       it('should not replace backslashes', function() {
-          normalizeFilePath('./path').should.eql('./path');
+          normalizeFilePath('./path', true).should.eql('./path');
+      });
+
+      it('should make a relative path if the path is not relative and the original path was relative', function() {
+          normalizeFilePath('path', true).should.eql('./path');
       });
 
-      it('should make a relative path if the path is not relative', function() {
-          normalizeFilePath('path').should.eql('./path');
+      it('should not make a relative path if the original path was not relative', function() {
+          normalizeFilePath('path', false).should.eql('path');
       });
 
       afterEach(function() {

src/index.js

@@ -31,6 +31,7 @@ module.exports = function(source, sourcemap) {
     var hasQuery = queryIndex !== -1;
     var loadStringQuery = hasQuery ? loaderUtils.parseQuery(loadString.substr(queryIndex)) : {};
     var sync = !!loadStringQuery.sync;
+    var isRelativePath = loadString.startsWith('.');
 
     // get the module path string
     var pathString = hasQuery ? loadString.substr(0, queryIndex) : loadString;
@@ -45,15 +46,15 @@ module.exports = function(source, sourcemap) {
     moduleName += (aot ? factorySuffix : '');
 
     // update the file path for non-ngfactory files
-    if (aot && filename.substr(-9) !== moduleSuffix.substr(-9)) {
+    if (aot && filename.substr(-9) !== moduleSuffix.substr(-9) && isRelativePath) {
       // find the relative dir to file from the genDir
       var relativeDir = path.relative(path.dirname(resourcePath), path.resolve(genDir));
 
       // build the relative path from the genDir
       filePath = path.join(relativeDir, filePath);
     }
 
-    filePath = utils.normalizeFilePath(filePath);
+    filePath = utils.normalizeFilePath(filePath, isRelativePath);
 
     var replacement = match;
 

src/utils.js

@@ -48,10 +48,10 @@ module.exports.getFilename = function(resourcePath) {
   return path.basename(resourcePath, path.extname(filename));
 };
 
-module.exports.normalizeFilePath = function(filePath) {
+module.exports.normalizeFilePath = function(filePath, relativePathMatch) {
   var newPath = filePath;
 
-  if (!newPath.startsWith('./') && !newPath.startsWith('../')) {
+  if (relativePathMatch && !newPath.startsWith('./') && !newPath.startsWith('../')) {
     newPath = './' + newPath;
   }