fixed resolving issues cause when aliases were included

Author: stackfull

lib/index.js

@@ -119,23 +119,36 @@ AngularPlugin.prototype = {
       // just a prefix.
       // prefer the segments to be directories and prefer the full name to be
       // used.
-      var pairs = [];
-      for( var j = 0; j > (0-split.length); j-- ){
-        var cropped = split.slice(0, j || undefined);
-        for( var i = 0; i < cropped.length; i++ ){
-          pairs.push({ front: cropped.slice(0, i), back: cropped.slice(i) });
+      var namespaced = [], ns, mod;
+      for( var j = 0; j < split.length; j++ ){
+        ns = split.slice(0, -j);
+        mod = split.slice(-j);
+        namespaced.push({
+          namespace: ns,
+          module: mod.join('.')
+        });
+      }
+      for( var k = 0; k < split.length; k++ ){
+        ns = split.slice(0, -k);
+        mod = split.slice(-k);
+        for( var i = 1; i < mod.length; i++ ){
+          namespaced.push({
+            namespace: ns,
+            module: mod.slice(0, -i).join('.')
+          });
         }
       }
-      pairs.shift();
-      var requests = pairs.map(function(p){
-        return {
-          path: path.join.apply(path, [request.path].concat(p.front)),
-          request: p.back.join('.'),
+      namespaced.shift();
+
+      return resolver.forEachBail(namespaced, function(nsmod, cb){
+        callback.log("resolve module " + nsmod.module +
+                     " in namespace " + JSON.stringify(nsmod.namespace));
+        var req = {
+          path: request.path,
+          request: path.join.apply(path, nsmod.namespace.concat(nsmod.module)),
           query: request.query
         };
-      });
-
-      return resolver.forEachBail(requests, function(req, cb){
+        callback.log(JSON.stringify(req));
         return resolver.doResolve("module", req, cb, true);
       }, function(err, resolved){
         if( err || !resolved ){

test/scenarios/alias-namespace/in/alib/src/one.js

@@ -0,0 +1,2 @@
+
+angular.module('myLibrary.one', []);

test/scenarios/alias-namespace/in/alib/src/two.js

@@ -0,0 +1,2 @@
+
+angular.module('myLibrary.two.something', []);

test/scenarios/alias-namespace/in/main.js

@@ -0,0 +1,2 @@
+// deps with dots
+angular.module('main', ['myLibrary.one', 'myLibrary.two.something']);

test/scenarios/alias-namespace/out/bundle.js

@@ -0,0 +1,23 @@
+([
+  function(module, exports, __webpack_require__) {
+  __webpack_require__(2);
+  __webpack_require__(1);
+  (function(angular) {
+    (module.exports['main'] = angular.module('main', ['myLibrary.one', 'myLibrary.two.something']));
+  }.call(exports, __webpack_require__(3)))
+},
+function(module, exports, __webpack_require__) {
+  (function(angular) {
+    (module.exports['myLibrary.one'] = angular.module('myLibrary.one', []));
+    }.call(exports, __webpack_require__(3)))
+},
+function(module, exports, __webpack_require__) {
+  (function(angular) {
+    (module.exports['myLibrary.two.something'] = angular.module('myLibrary.two.something', []));
+    }.call(exports, __webpack_require__(3)))
+},
+function(module, exports, __webpack_require__) {
+  module.exports = window.angular
+}
+])
+

test/scenarios/alias-namespace/webpack.conf.js

@@ -0,0 +1,13 @@
+var path = require('path');
+var AngularPlugin = require('../../../lib');
+
+module.exports = {
+  entry: "main",
+  resolve: {
+    root: path.resolve(__dirname, 'in'),
+    alias: {
+      myLibrary: 'alib/src'
+    }
+  },
+  plugins: [new AngularPlugin()]
+};

test/scenarios/basic-module-dependency/out/bundle.js

@@ -16,5 +16,6 @@ function(module, exports, __webpack_require__) {
 },
 function(module, exports, __webpack_require__) {
   // stub
+  module.exports = window.angular
 }
 ])

test/scenarios/basic-module/out/bundle.js

@@ -7,5 +7,6 @@
 },
 function(module, exports, require) {
   // angular.js stub
+  module.exports = window.angular
 }
 ])

test/scenarios/dots-for-path-separator/out/bundle.js

@@ -14,6 +14,7 @@ function(module, exports, __webpack_require__) {
 },
 function(module, exports, __webpack_require__) {
   // stub
+  module.exports = window.angular
 }
 ])
 

test/scenarios/local-module/out/bundle.js

@@ -6,5 +6,6 @@
   }.call(exports, __webpack_require__(1)))
 },
 function(module, exports, __webpack_require__) {
+  module.exports = window.angular
 }
 ])

test/scenarios/module-dir-and-file/out/bundle.js

@@ -17,5 +17,6 @@ function(module, exports, __webpack_require__) {
     }.call(exports, __webpack_require__(3)))
 },
 function(module, exports, __webpack_require__) {
+  module.exports = window.angular
 }
 ])

test/scenarios/multi-module-files/out/bundle.js

@@ -15,5 +15,6 @@ function(module, exports, __webpack_require__) {
   }.call(exports, __webpack_require__(2)))
 },
 function(module, exports, __webpack_require__) {
+  module.exports = window.angular
 }
 ])

test/scenarios/multi-modules/out/bundle.js

@@ -17,5 +17,6 @@
   }.call(exports, __webpack_require__(1)))
 },
 function(module, exports, __webpack_require__) {
+  module.exports = window.angular
 }
 ])