Merge pull request #81 from anyroadcom/hotfix/local-dep-lookup-bug

Local dependencies in different paths with matching prefixes bug in new dependency lookup

lib/builders/scripts.js

@@ -406,10 +406,10 @@ Scripts.prototype.lookupDependency = function (file, target) {
   for (var i = 0; i < localDeps.length; i++) {
     // Find a local dependency that matches as a prefix of the target
     // or the whole target, and return the canonical path.
-    var re = new RegExp("^("+localDeps[i]+")(.*)$");
+    var re = new RegExp("^("+localDeps[i]+")(/.*)?$");
     if (m = re.exec(target)) {
       var dep = m[1];
-      var tail = m[2];
+      var tail = m[2] || '';
       return branch.locals[dep].canonical + tail;
     }
   }

test/fixtures/js-matching-prefixes/component.json

@@ -0,0 +1,11 @@
+{
+  "scripts": [ "index.js" ],
+  "paths": [
+    "lib1",
+    "lib2"
+  ],
+  "locals": [
+    "test",
+    "test_again"
+  ]
+}

test/fixtures/js-matching-prefixes/index.js

@@ -0,0 +1,7 @@
+var test = require('test')
+  , test_again = require('test_again');
+
+module.exports = {
+  test_name: test.name,
+  test_again_name: test_again.name
+}

test/fixtures/js-matching-prefixes/lib1/test/component.json

@@ -0,0 +1,4 @@
+{
+  "name": "test",
+  "scripts": [ "index.js" ]
+}

test/fixtures/js-matching-prefixes/lib1/test/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  name: 'test'
+};

test/fixtures/js-matching-prefixes/lib2/test_again/component.json

@@ -0,0 +1,4 @@
+{
+  "name": "test_again",
+  "scripts": [ "index.js" ]
+}

test/fixtures/js-matching-prefixes/lib2/test_again/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  name: 'test_again'
+};

test/scripts.js

@@ -90,6 +90,36 @@ describe('js-nested-locals', function() {
   })
 })
 
+describe('js-matching-prefixes', function() {
+  var tree
+  var js = Builder.require
+
+  it('should install', co(function* () {
+    tree = yield* resolve(fixture('js-matching-prefixes'), options)
+  }))
+
+  it('should build', co(function* () {
+    js += yield build(tree).end();
+  }))
+
+
+  it('should rewrite the component require correctly', function() {
+    js.should.not.include("require('test')")
+    js.should.not.include("require('test_again')")
+
+    js.should.include("require('./lib1/test')")
+    js.should.include("require('./lib2/test_again')")
+  })
+
+  it('should execute', function () {
+    var ctx = vm.createContext()
+    vm.runInContext(js, ctx)
+    vm.runInContext('this.test = require("js-matching-prefixes")', ctx)
+    ctx.test.test_name.should.equal('test')
+    ctx.test.test_again_name.should.equal('test_again')
+  })
+})
+
 describe('js-scripts -dev', function () {
   var tree
   var js = Builder.require
@@ -495,7 +525,7 @@ describe('js-locals', function () {
     js.should.not.include('require("subcomponent-1")');
     js.should.not.include("require('subcomponent-1/hello')");
     js.should.not.include('require("subcomponent-1/hello")');
-    
+
     js.should.include("require('./subcomponents/subcomponent-1')");
     js.should.include("require('./subcomponents/subcomponent-1/hello')");
   })
@@ -533,4 +563,4 @@ describe('js-asset-path', function () {
     js.should.not.include('/* component:file */ "../assets/foo.txt"');
     js.should.include('"js-asset-path/assets/foo.txt"');
   });
-})
+})