Merge pull request #64 from bestander/issue-62-react-native

Fixed flattening algorithm

Author: sebmck

src/package-linker.js

@@ -169,14 +169,16 @@ export default class PackageLinker {
 
     //
     let tickCopyModule = this.reporter.progress(flatTree.length);
-    await promise.queue(flatTree, async function ([dest, { loc: src, pkg }]) {
+    await promise.queue(flatTree, async function ([dest, { pkg }]) {
       pkg.reference.setLocation(dest);
-
       await fs.mkdirp(dest);
-      await fs.copy(src, dest);
+    }, 4);
 
+    // TODO concurrent copies can interfere when copying master and a sub dependency in parallel
+    await promise.queue(flatTree, async function ([dest, { loc: src }]) {
+      await fs.copy(src, dest);
       tickCopyModule(dest);
-    }, 4);
+    }, 1);
 
     //
     let tickBin = this.reporter.progress(flatTree.length);
@@ -257,7 +259,6 @@ export default class PackageLinker {
 
     //
     let src = this.config.generateHardModulePath(ref);
-
     // link bins
     if (!_.isEmpty(resolved.bin)) {
       let binLoc = path.join(this.config.cwd, await ref.getFolder(), ".bin");

test/commands/install.js

@@ -100,7 +100,7 @@ test("install with --save and offline mirror", () => {
 
     let rawLockfile = await fs.readFile(path.join(cwd, constants.LOCKFILE_FILENAME));
     let lockfile = parse(rawLockfile);
-    assert(lockfile["is-array@1.0.1"]["resolved"] ===
+    assert.equal(lockfile["is-array@1.0.1"]["resolved"],
       "is-array-1.0.1.tgz#e9850cc2cc860c3bc0977e84ccf0dd464584279a");
 
     await fs.unlink(path.join(cwd, mirrorPath));
@@ -121,7 +121,7 @@ test("install with --save and without offline mirror", () => {
 
     let rawLockfile = await fs.readFile(path.join(cwd, constants.LOCKFILE_FILENAME));
     let lockfile = parse(rawLockfile);
-    assert(lockfile["is-array@1.0.1"]["resolved"] ===
+    assert.equal(lockfile["is-array@1.0.1"]["resolved"],
       "https://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz#e9850cc2cc860c3bc0977e84ccf0dd464584279a");
 
     await fs.unlink(path.join(cwd, mirrorPath));
@@ -142,3 +142,26 @@ test("install from offline mirror", () => {
     return allFiles;
   });
 });
+
+test("install should not flatten dependencies if there are collisions", () => {
+  // A@2.0.1 -> B@2.0.0
+  // B@1.0.0
+  // should result in B@2.0.0 not flattened
+  return run({}, [], "install-dont-flatten-when-conflict", async (cwd) => {
+    let rawDepBPackage = await fs.readFile(path.join(cwd, "node_modules/dep-b/package.json"));
+    assert.equal(JSON.parse(rawDepBPackage).version, "1.0.0");
+    rawDepBPackage = await fs.readFile(path.join(cwd, "node_modules/dep-a/node_modules/dep-b/package.json"));
+    assert.equal(JSON.parse(rawDepBPackage).version, "2.0.0");
+  });
+});
+
+test("install should flatten dependencies at the most top level without collisions", () => {
+  // A@2.0.1 -> B@2.0.0
+  // should result in B@2.0.0 flattened
+  return run({}, [], "install-flatten-when-no-conflict", async (cwd) => {
+    let rawDepBPackage = await fs.readFile(path.join(cwd, "node_modules/dep-b/package.json"));
+    assert.equal(JSON.parse(rawDepBPackage).version, "2.0.0");
+    rawDepBPackage = await fs.readFile(path.join(cwd, "node_modules/dep-a/package.json"));
+    assert.equal(JSON.parse(rawDepBPackage).version, "2.0.1");
+  });
+});

test/fixtures/install/install-dont-flatten-when-conflict/.npmrc

@@ -0,0 +1 @@
+kpm-offline-mirror=./mirror-for-offline

test/fixtures/install/install-dont-flatten-when-conflict/fbkpm.lock

@@ -0,0 +1,14 @@
+dep-a@2.0.1:
+  name dep-a
+  version "2.0.1"
+  resolved dep-a-2.0.1.tgz#9651b29dbff798e65ddd0f9941eefcd139466e2e
+  dependencies:
+    dep-b "2.0.0"
+dep-b@1.0.0:
+  name dep-b
+  version "1.0.0"
+  resolved dep-b-1.0.0.tgz#20e1c32691d41bf8a8a02550bbf41faa7c3db5b7
+dep-b@^2.0.0:
+  name dep-b
+  version "2.0.0"
+  resolved dep-b-2.0.0.tgz#70d81646e122375676f615834e73cd9737341844

test/fixtures/install/install-dont-flatten-when-conflict/mirror-for-offline/dep-a-2.0.1.tgz

@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "dep-a": "2.0.1",
+    "dep-b": "1.0.0"
+  }
+}

test/fixtures/install/install-dont-flatten-when-conflict/mirror-for-offline/dep-b-1.0.0.tgz

@@ -0,0 +1 @@
+kpm-offline-mirror=./mirror-for-offline

test/fixtures/install/install-dont-flatten-when-conflict/mirror-for-offline/dep-b-2.0.0.tgz

@@ -0,0 +1,10 @@
+dep-a@2.0.1:
+  name dep-a
+  version "2.0.1"
+  resolved dep-a-2.0.1.tgz#9651b29dbff798e65ddd0f9941eefcd139466e2e
+  dependencies:
+    dep-b "2.0.0"
+dep-b@^2.0.0:
+  name dep-b
+  version "2.0.0"
+  resolved dep-b-2.0.0.tgz#70d81646e122375676f615834e73cd9737341844