Merge pull request #23 from vegarringdal/new_loader

chore(loader) clean up module path checking

Author: vegarringdal

dist/commonjs/fuse-box-aurelia-loader.js

@@ -259,14 +259,10 @@ var FuseBoxAureliaLoader = (function (_super) {
                         var moduleId = Object.keys(FuseBox.packages)
                             .find(function (name) { return path.startsWith(name + "/"); });
                         if (moduleId) {
-                            var resources = Object.keys(FuseBox.packages[moduleId].f);
-                            var resourceName_1 = path.replace(moduleId + "/", '');
-                            var resourceEntry = resources.find(function (r) { return r.endsWith(resourceName_1 + '.js'); });
-                            var resourceEntryCheck = resources.find(function (r) { return r.endsWith('/' + resourceName_1 + '.js'); });
-                            if (resourceEntry !== resourceEntryCheck) {
-                                resourceEntry = resourceEntryCheck;
-                            }
-                            retunValue = moduleId + "/" + resourceEntry;
+                            var parentEntry = FuseBox.packages[moduleId].s.entry;
+                            var resourceName = path.replace(moduleId, '');
+                            var entry = parentEntry.replace(/\/([^\/]+)\/?$/, resourceName);
+                            return moduleId + "/" + entry;
                         }
                         if (!this.fuseBoxExist(retunValue)) {
                             debugPrint('error', 'findFuseBoxPath() failed to find', arguments);

src/fuse-box-aurelia-loader.ts

@@ -122,7 +122,7 @@ export class FuseBoxAureliaLoader extends Loader {
       }
     });
 
-    
+
 
   }
 
@@ -345,17 +345,10 @@ export class FuseBoxAureliaLoader extends Loader {
               .find(name => path.startsWith(`${name}/`));
 
             if (moduleId) {
-              let resources = Object.keys(FuseBox.packages[moduleId].f);
-              let resourceName = path.replace(`${moduleId}/`, '');
-              let resourceEntry = resources.find(r => r.endsWith(resourceName + '.js'));
-
-              // fix for if resources is ending the same... this will fail if many sub folders and same file name
-              // todo: improve, get root of package commonjs file to be sure.
-              let resourceEntryCheck = resources.find(r => r.endsWith('/' + resourceName + '.js'));
-              if (resourceEntry !== resourceEntryCheck) {
-                resourceEntry = resourceEntryCheck;
-              }
-              retunValue = `${moduleId}/${resourceEntry}`;
+              let parentEntry = FuseBox.packages[moduleId].s.entry;
+              let resourceName = path.replace(moduleId, '');
+              let entry = parentEntry.replace(/\/([^\/]+)\/?$/, resourceName);
+              return `${moduleId}/${entry}`;
             }
 
             if (!this.fuseBoxExist(retunValue)) {