support scoped packages when resolving package.json directory of a package (#95)

Author: David First

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [unreleased]
 
+## [2.0.4-dev.1] - 2019-03-01
+
+- support scoped packages when resolving package.json directory of a package
+
 ## [2.0.3] - 2019-02-24
 
 - upgrade to babel 7

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bit-javascript",
-  "version": "2.0.3",
+  "version": "2.0.4-dev.1",
   "scripts": {
     "flow": "flow; test $? -eq 0 -o $? -eq 2",
     "lint": "eslint src && flow check || true",

src/dependency-builder/build-tree.js

@@ -74,9 +74,7 @@ export function resolveNodePackage(cwd: string, packageFullPath: string): Object
   }
 
   // Get the package relative path to the node_modules dir
-  const indexOfLastNodeModules = packageFullPath.lastIndexOf(NODE_MODULES) + NODE_MODULES.length + 1;
-  const indexOfPackageFolderEnd = packageFullPath.indexOf(path.sep, indexOfLastNodeModules);
-  const packageDir = packageFullPath.substring(0, indexOfPackageFolderEnd);
+  const packageDir = resolvePackageDirFromFilePath(packageFullPath);
 
   // don't propagate here since loading a package.json of another folder and taking the version from it will result wrong version
   // This for example happen in the following case:
@@ -92,6 +90,27 @@ export function resolveNodePackage(cwd: string, packageFullPath: string): Object
   return result;
 }
 
+/**
+ * given the full path of a package file, returns the root dir of the package, so then we could
+ * find the package.json in that directory.
+ *
+ * example of a normal package:
+ * absolutePackageFilePath: /user/workspace/node_modules/lodash.isboolean/index.js
+ * returns: /user/workspace/node_modules/lodash.isboolean
+ *
+ * example of a scoped package:
+ * absolutePackageFilePath: /user/workspace/node_modules/@babel/core/lib/index.js
+ * returns: /user/workspace/node_modules/@babel/core
+ */
+function resolvePackageDirFromFilePath(absolutePackageFilePath: string): string {
+  const NODE_MODULES = 'node_modules';
+  const indexOfLastNodeModules = absolutePackageFilePath.lastIndexOf(NODE_MODULES) + NODE_MODULES.length + 1;
+  const pathInsideNodeModules = absolutePackageFilePath.substring(indexOfLastNodeModules);
+  const packageName = resolvePackageNameByPath(pathInsideNodeModules);
+  const pathUntilNodeModules = absolutePackageFilePath.substring(0, indexOfLastNodeModules);
+  return pathUntilNodeModules + packageName;
+}
+
 /**
  * Gets a list of dependencies and group them by types (files, bits, packages)
  * It's also transform the node package dependencies from array of paths to object in this format: