resolve-authored-dep-version

Author: GiladShoham

src/dependency-builder/build-tree.js

@@ -96,6 +96,7 @@ export function resolveNodePackage(cwd: string, packageFullPath: string): Object
   if (packageJsonInfo) {
     // The +1 is for the / after the node_modules, we didn't enter it into the NODE_MODULES const because it makes problems on windows
     const packageRelativePath = packageFullPath.substring(packageFullPath.lastIndexOf(NODE_MODULES) + NODE_MODULES.length + 1, packageFullPath.length);
+    
     const packageName = resolvePackageNameByPath(packageRelativePath);
     const packageVersion = R.path(['dependencies', packageName], packageJsonInfo) ||
                            R.path(['devDependencies', packageName], packageJsonInfo) ||
@@ -105,9 +106,20 @@ export function resolveNodePackage(cwd: string, packageFullPath: string): Object
       return result;
     }
   }
-  // Get the package relative path to the node_modules dir
 
-  const packageInfo = PackageJson.findPackage(packageFullPath);
+  // Get the package relative path to the node_modules dir
+  let packageDir = packageFullPath;
+  // Check if the full path is path to the index file and not only to the directory
+  const stats = fs.statSync(packageFullPath);
+  if (stats.isFile()) {
+    packageDir = path.dirname(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:
+  // if you have 2 authored component which one dependet on the other
+  // we will look for the package.json on the dependency but won't find it
+  // if we propagate we will take the version from the root's package json which has nothing with the component version
+  const packageInfo = PackageJson.loadSync(packageDir, false);
   if (!packageInfo) return null; // when running 'bitjs get-dependencies' command, packageInfo is sometimes empty
   result[packageInfo.name] = packageInfo.version;
   return result;

src/package-json/package-json.js

@@ -121,11 +121,18 @@ export default class PackageJson {
 
   static async load(componentRootFolder: string, throwError: boolean = true): Promise<PackageJson> {
     const composedPath = composePath(componentRootFolder);
-    if(!PackageJson.hasExisting(componentRootFolder, throwError)) return null;
+    if (!PackageJson.hasExisting(componentRootFolder, throwError)) return null;
     const componentJsonObject = await fs.readJson(composedPath);
     return new PackageJson(componentRootFolder, componentJsonObject);
   }
 
+  static loadSync(componentRootFolder: string, throwError: boolean = true): PackageJson {
+    const composedPath = composePath(componentRootFolder);
+    if (!PackageJson.hasExisting(componentRootFolder, throwError)) return null;
+    const componentJsonObject = fs.readJsonSync(composedPath);
+    return new PackageJson(componentRootFolder, componentJsonObject);
+  }
+
   /**
    * Taken from this package (with some minor changes):
    * https://www.npmjs.com/package/find-package