Fix scoped modules (#1013)

src/Resolver.js

@@ -130,7 +130,7 @@ class Resolver {
  return {path: builtins[filename]};
  }
 
- let parts = filename.split(path.sep);
+ let parts = this.getModuleParts(filename);
  let root = path.parse(dir).root;
 
  while (dir !== root) {
@@ -298,7 +298,7 @@ class Resolver {
  alias = aliases[filename];
  if (alias == null) {
  // If it didn't match, try only the module name.
- let parts = filename.split(path.sep);
+ let parts = this.getModuleParts(filename);
  alias = aliases[parts[0]];
  if (typeof alias === 'string') {
  // Append the filename back onto the aliased module.
@@ -346,6 +346,16 @@ class Resolver {
  let pkg = await this.findPackage(dir);
  return this.resolveAliases(filename, pkg);
  }
+
+ getModuleParts(name) {
+ let parts = path.normalize(name).split(path.sep);
+ if (parts[0].charAt(0) === '@') {
+ // Scoped module (e.g. @scope/module). Merge the first two parts back together.
+ parts.splice(0, 2, `${parts[0]}/${parts[1]}`);
+ }
+
+ return parts;
+ }
 }
 
 module.exports = Resolver;

test/resolver.js

@@ -198,6 +198,30 @@ describe('resolver', function() {
  );
  assert.equal(resolved.pkg.name, 'foo');
  });
+
+ it('should resolve a scoped module', async function() {
+ let resolved = await resolver.resolve(
+ '@scope/pkg',
+ path.join(rootDir, 'foo.js')
+ );
+ assert.equal(
+ resolved.path,
+ path.resolve(rootDir, 'node_modules/@scope/pkg/index.js')
+ );
+ assert.equal(resolved.pkg.name, 'scope-pkg');
+ });
+
+ it('should resolve a file inside a scoped module', async function() {
+ let resolved = await resolver.resolve(
+ '@scope/pkg/foo/bar',
+ path.join(rootDir, 'foo.js')
+ );
+ assert.equal(
+ resolved.path,
+ path.resolve(rootDir, 'node_modules/@scope/pkg/foo/bar.js')
+ );
+ assert.equal(resolved.pkg.name, 'scope-pkg');
+ });
  });
 
  describe('aliases', function() {