Merge pull request #87 from tetsuo/feature-js-nonrelative-camelcase

19h · 19h · commit 648d00752cd0 · 2014-12-13T18:45:39.000+01:00
Feature: camelCase
diff --git a/lib/builders/lookup.js b/lib/builders/lookup.js
@@ -36,8 +36,6 @@ function Lookup (file, opts) {
  */
 Lookup.prototype.exec = function* (target) {
   var ret;
-  target = target.toLowerCase();
-
   if (RELATIVE_PATH.exec(target)) {
     ret = this.relatives(target);
     if (ret != null) return ret
@@ -68,10 +66,10 @@ Lookup.prototype.relatives = function (target, file) {
 
     for (var j = 0; j < EXTENSIONS.length; j++) {
       // check by adding extensions
-      if (f.path.toLowerCase() === path_ + EXTENSIONS[j]) return name;
+      if (f.path === path_ + EXTENSIONS[j]) return name;
     }
     // check by removing extensions
-    if (f.path.replace(/\.\w+$/, '').toLowerCase() === path_) return name;
+    if (f.path.replace(/\.\w+$/, '') === path_) return name;
   };
 
   var message = 'ignore "' + target + '" , could not resolve from "' + file.branch.name + '"\'s file "' + file.path + '"';
@@ -263,7 +261,7 @@ Lookup.prototype.dependencies = function* (target) {
  */
 function tofrags (target) {
   var frags = target.split('/');
-  var head = frags[0];
+  var head = frags[0].toLowerCase();
   var tail = frags.length > 1
     ? frags.slice(1).join('/')
     : '';
diff --git a/test/fixtures/js-deps-camelcase/component.json b/test/fixtures/js-deps-camelcase/component.json
@@ -0,0 +1,9 @@
+{
+  "name": "js-deps-camelcase",
+  "scripts": [
+    "index.js"
+  ],
+  "dependencies": {
+    "bar/baz": "*"
+  }
+}
diff --git a/test/fixtures/js-deps-camelcase/foo/bar/baz/1.2.3/QuxQuux.js b/test/fixtures/js-deps-camelcase/foo/bar/baz/1.2.3/QuxQuux.js
@@ -0,0 +1 @@
+module.exports = 'Qu';
diff --git a/test/fixtures/js-deps-camelcase/foo/bar/baz/1.2.3/component.json b/test/fixtures/js-deps-camelcase/foo/bar/baz/1.2.3/component.json
@@ -0,0 +1,7 @@
+{
+  "name": "baz",
+  "version": "1.2.3",
+  "repository": "bar/baz",
+  "scripts": ["index.js", "QuxQuux.js", "qux/*.js"],
+  "main": "index.js"
+}
diff --git a/test/fixtures/js-deps-camelcase/foo/bar/baz/1.2.3/index.js b/test/fixtures/js-deps-camelcase/foo/bar/baz/1.2.3/index.js
@@ -0,0 +1,3 @@
+var qu = require('./QuxQuux');
+var fu = require('./qux/FooBar');
+module.exports = 'baz' + qu + fu;
diff --git a/test/fixtures/js-deps-camelcase/foo/bar/baz/1.2.3/qux/FooBar.js b/test/fixtures/js-deps-camelcase/foo/bar/baz/1.2.3/qux/FooBar.js
@@ -0,0 +1 @@
+module.exports = 'Foo';
diff --git a/test/fixtures/js-deps-camelcase/foo/bar/baz/1.2.3/qux/index.js b/test/fixtures/js-deps-camelcase/foo/bar/baz/1.2.3/qux/index.js
@@ -0,0 +1 @@
+module.exports = 'qux';
diff --git a/test/fixtures/js-deps-camelcase/foo/bar/baz/1.2.3/qux/quux.js b/test/fixtures/js-deps-camelcase/foo/bar/baz/1.2.3/qux/quux.js
@@ -0,0 +1 @@
+module.exports = 'quux';
diff --git a/test/fixtures/js-deps-camelcase/index.js b/test/fixtures/js-deps-camelcase/index.js
@@ -0,0 +1,5 @@
+this.baz = require('baz');
+this.qux = require('baz/qux');
+this.quux = require('baz/qux/quux');
+this.Foo = require('baz/qux/FooBar');
+this.Qu = require('baz/QuxQuux');
diff --git a/test/fixtures/js-locals-camelcase/SubComponents/SubComponent-1/Hello.js b/test/fixtures/js-locals-camelcase/SubComponents/SubComponent-1/Hello.js
@@ -0,0 +1 @@
+module.exports = 'WoRLd'
diff --git a/test/fixtures/js-locals-camelcase/SubComponents/SubComponent-1/component.json b/test/fixtures/js-locals-camelcase/SubComponents/SubComponent-1/component.json
@@ -0,0 +1,3 @@
+{
+  "scripts": ["index.js", "Hello.js"]
+}
diff --git a/test/fixtures/js-locals-camelcase/SubComponents/SubComponent-1/index.js b/test/fixtures/js-locals-camelcase/SubComponents/SubComponent-1/index.js
diff --git a/test/fixtures/js-locals-camelcase/component.json b/test/fixtures/js-locals-camelcase/component.json
@@ -0,0 +1,14 @@
+{
+  "name": "js-locals-camelcase",
+  "dependencies": {
+  },
+  "scripts": [
+    "index.js"
+  ],
+  "locals": [
+    "SubComponent-1"
+  ],
+  "paths": [
+    "SubComponents"
+  ]
+}
diff --git a/test/fixtures/js-locals-camelcase/index.js b/test/fixtures/js-locals-camelcase/index.js
@@ -0,0 +1,3 @@
+require('SubComponent-1');
+var hello = require('SubComponent-1/Hello');
+this.one = hello;
diff --git a/test/fixtures/js-locals/index.js b/test/fixtures/js-locals/index.js
@@ -1,3 +1,3 @@
 require('subcomponent-1');
-require('subcomponent-1/hello');
-this.one = true;
+var hello = require('subcomponent-1/hello');
+this.one = hello;
diff --git a/test/fixtures/js-locals/subcomponents/subcomponent-1/hello.js b/test/fixtures/js-locals/subcomponents/subcomponent-1/hello.js
@@ -1 +1 @@
-this.hello = true;
+module.exports = 'world'
diff --git a/test/fixtures/js-nested-locals-uppercase/component.json b/test/fixtures/js-nested-locals-uppercase/component.json
@@ -0,0 +1,9 @@
+{
+  "scripts": [ "index.js" ],
+  "paths": [
+    "lib"
+  ],
+  "locals": [
+    "nested/BOOT"
+  ]
+}
diff --git a/test/fixtures/js-nested-locals-uppercase/index.js b/test/fixtures/js-nested-locals-uppercase/index.js
@@ -0,0 +1,4 @@
+this.boot = require('nested/BOOT')
+this.insideBoot = require('nested/BOOT/SMTH.js')
+
+module.exports = {}
diff --git a/test/fixtures/js-nested-locals-uppercase/lib/index.js b/test/fixtures/js-nested-locals-uppercase/lib/index.js
diff --git a/test/fixtures/js-nested-locals-uppercase/lib/nested/BOOT/SMTH.js b/test/fixtures/js-nested-locals-uppercase/lib/nested/BOOT/SMTH.js
@@ -0,0 +1 @@
+module.exports = {inside: true};
diff --git a/test/fixtures/js-nested-locals-uppercase/lib/nested/BOOT/component.json b/test/fixtures/js-nested-locals-uppercase/lib/nested/BOOT/component.json
@@ -0,0 +1,3 @@
+{
+  "scripts": [ "index.js", "SMTH.js" ]
+}
diff --git a/test/fixtures/js-nested-locals-uppercase/lib/nested/BOOT/index.js b/test/fixtures/js-nested-locals-uppercase/lib/nested/BOOT/index.js
@@ -0,0 +1 @@
+module.exports = {main: true};
diff --git a/test/fixtures/js-require-uppercase/index.js b/test/fixtures/js-require-uppercase/index.js
@@ -1 +1,2 @@
-var emitter = require("COMPONENT~EMITTER")
+var emitter = require("COMPONENT~EMITTER")
+var emitter_ = require("COMPONENT-EMITTER")
diff --git a/test/scripts.js b/test/scripts.js
@@ -378,6 +378,7 @@ describe('js-require-uppercase', function () {
 
   it('should have resolved the require()', function () {
     js.should.include('var emitter = require("component~emitter@1.0.0"')
+    js.should.include('var emitter_ = require("component~emitter@1.0.0"')
   })
 })
 
@@ -532,6 +533,8 @@ describe('js-locals', function () {
   it('should execute', function () {
     var ctx = vm.createContext();
     vm.runInContext(js, ctx);
+    vm.runInContext('require("js-locals")', ctx)
+    ctx.one.should.equal('world');
   })
 })
 
@@ -665,3 +668,114 @@ describe('js-relative-extension-deps', function () {
     ctx.quux.should.equal('quux');
   })
 })
+
+describe('js-locals-camelcase', function () {
+  var tree;
+  var js = Builder.require;
+
+  it('should install', co(function* () {
+    tree = yield* resolve(fixture('js-locals-camelcase'), options);
+  }))
+
+  it('should build', co(function* () {
+    js += yield build(tree).end();
+  }))
+
+  it('should rewrite requires for files inside locals', function  () {
+    js.should.not.include("require('subcomponent-1')");
+    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.not.include("require('./subcomponents/subcomponent-1')");
+    js.should.not.include("require('./subcomponents/subcomponent-1/hello.js')");
+    js.should.not.include("require('SubComponent-1')");
+    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.js')");
+  })
+
+  it('should execute', function () {
+    var ctx = vm.createContext();
+    vm.runInContext(js, ctx);
+    vm.runInContext("require('js-locals-camelcase')", ctx);
+    ctx.one.should.equal('WoRLd');
+  })
+})
+
+describe('js-nested-locals-uppercase', function() {
+  var tree
+  var js = Builder.require
+
+  it('should install', co(function* () {
+    tree = yield* resolve(fixture('js-nested-locals-uppercase'), options)
+  }))
+
+  it('should build', co(function* () {
+    js += yield build(tree).end();
+  }))
+
+  it('should rewrite the component require correctly', function() {
+    js.should.not.include("require('nested/BOOT')")
+    js.should.not.include("require('./lib/nested/BOOT/BOOT')")
+    js.should.include("require('./lib/nested/BOOT')")
+  })
+
+  it('should rewrite requires inside of components correctly', function  () {
+    js.should.not.include("require('nested/BOOT/SMTH.js')")
+    js.should.include("require('./lib/nested/BOOT/SMTH.js')")
+  })
+
+  it('should execute', function () {
+    var ctx = vm.createContext()
+    vm.runInContext(js, ctx)
+    vm.runInContext('require("js-nested-locals-uppercase")', ctx)
+    ctx.boot.main.should.be.ok
+    ctx.insideBoot.inside.should.be.ok
+  })
+})
+
+describe('js-deps-camelcase', function () {
+  var tree
+  var js = Builder.require
+  var dir = fixture('js-deps-camelcase');
+
+  it('should install', co(function* () {
+    tree = yield* resolve(dir, { install: true, out: join(dir, 'foo') })
+  }))
+
+  it('should build', co(function* () {
+    js += yield build(tree).end();
+  }))
+
+  it('should rewrite requires', function  () {
+    js.should.include('require.register("bar~baz@1.2.3"')
+    js.should.include('require.register("bar~baz@1.2.3/qux/index.js"')
+    js.should.not.include('require.register("bar~baz@1.2.3/qux"')
+    js.should.include('require.register("bar~baz@1.2.3/qux/quux.js"')
+    js.should.include('require.register("bar~baz@1.2.3/QuxQuux.js"')
+    js.should.include('require.register("bar~baz@1.2.3/qux/FooBar.js"')
+    js.should.not.include('require.register("bar~baz@1.2.3/qux/quux"')
+    js.should.include("require('bar~baz@1.2.3')")
+    js.should.include("require('bar~baz@1.2.3/qux/index.js')")
+    js.should.include("require('bar~baz@1.2.3/qux/quux.js')")
+    js.should.include("require('bar~baz@1.2.3/QuxQuux.js')")
+    js.should.not.include("require('bar~baz@1.2.3/qux/quxquux')")
+    js.should.not.include("require('bar~baz@1.2.3/qux/quxquux.js')")
+    js.should.not.include("require('bar~baz@1.2.3/qux')")
+    js.should.not.include("require('bar~baz@1.2.3/qux/quux')")
+    js.should.not.include("require('bar~baz@1.2.3/qux/foobar')")
+  })
+
+  it('should execute', function () {
+    var ctx = vm.createContext()
+    vm.runInContext(js, ctx)
+    vm.runInContext('require("js-deps-camelcase")', ctx)
+    ctx.baz.should.equal('bazQuFoo');
+    ctx.qux.should.equal('qux');
+    ctx.quux.should.equal('quux');
+    ctx.Foo.should.equal('Foo');
+    ctx.Qu.should.equal('Qu');
+  })
+})

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+var qu = require('./QuxQuux');`
	`2`	`+var fu = require('./qux/FooBar');`
	`3`	`+module.exports = 'baz' + qu + fu;`