Merge branch 'master' of github.com:facebook/fbkpm

Author: sebmck

Makefile

@@ -7,7 +7,7 @@ watch:
 	./node_modules/.bin/gulp watch
 
 test-only:
-	./node_modules/.bin/nyc --check-coverage --lines 85 --branches 74 --functions 85 ./node_modules/.bin/ava --verbose test/
+	./node_modules/.bin/nyc --check-coverage --lines 85 --branches 74 --functions 85 ./node_modules/.bin/ava --verbose --concurrency 1 test/
 	./node_modules/.bin/nyc report --reporter=lcov
 
 lint:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fbkpm",
-  "version": "0.4.0",
+  "version": "0.4.6",
   "license": "BSD-3-Clause",
   "preferGlobal": true,
   "main": "./index.js",

src/cli/commands/install.js

@@ -12,7 +12,6 @@
 import type { RegistryNames } from "../../registries/index.js";
 import type { Reporter } from "kreporters";
 import type Config from "../../config.js";
-import type { DependencyRequestPatterns } from "../../types.js";
 import Lockfile from "../../lockfile/index.js";
 import lockStringify from "../../lockfile/stringify.js";
 import PackageInstallScripts from "../../package-install-scripts.js";
@@ -31,18 +30,6 @@ let invariant = require("invariant");
 let emoji     = require("node-emoji");
 let path      = require("path");
 
-type FetchResolveParams = {
-  totalSteps: number,
-  patterns: Array<string>,
-  requests: DependencyRequestPatterns
-};
-
-type FetchResolveReturn = {
-  patterns: Array<string>,
-  total: number,
-  step: number
-};
-
 type InstallActions = "install" | "update" | "uninstall";
 
 export class Install {

src/package-fetcher.js

@@ -31,10 +31,10 @@ export default class PackageFetcher {
   reporter: Reporter;
   config: Config;
 
-  async fetch(ref: PackageReference): Promise<FetchedManifest> {
-    let dest = this.config.generateHardModulePath(ref);
+  async fetch(reference: PackageReference, overwriteDestination: boolean): Promise<FetchedManifest> {
+    let dest = this.config.generateHardModulePath(reference);
 
-    if (await this.config.isValidModuleDest(dest)) {
+    if (!overwriteDestination && await this.config.isValidModuleDest(dest)) {
       let { hash, package: pkg } = await this.config.readPackageMetadata(dest);
       return {
         package: pkg,
@@ -46,7 +46,7 @@ export default class PackageFetcher {
     // remove as the module may be invalid
     await fs.unlink(dest);
 
-    let remote = ref.remote;
+    let remote = reference.remote;
     invariant(remote, "Missing remote");
 
     let Fetcher = fetchers[remote.type];
@@ -55,7 +55,7 @@ export default class PackageFetcher {
     await fs.mkdirp(dest);
 
     try {
-      let fetcher = new Fetcher(remote, this.config, ref.saveForOffline);
+      let fetcher = new Fetcher(remote, this.config, reference.saveForOffline);
       return await fetcher.fetch(dest);
     } catch (err) {
       try {
@@ -67,10 +67,10 @@ export default class PackageFetcher {
     }
   }
 
-  async maybeFetch(ref: PackageReference): Promise<?FetchedManifest> {
-    let promise = this.fetch(ref);
+  async maybeFetch(reference: PackageReference): Promise<?FetchedManifest> {
+    let promise = this.fetch(reference, false);
 
-    if (ref.optional) {
+    if (reference.optional) {
       // swallow the error
       promise = promise.catch((err) => {
         this.reporter.error(err.message);

src/package-linker.js

@@ -223,6 +223,10 @@ export default class PackageLinker {
 
   async copyModules(patterns: Array<string>): Promise<void> {
     let flatTree = await this.initCopyModules(patterns);
+    // sorted tree makes file creation and copying not to interfere with each other
+    flatTree = flatTree.sort((dep1, dep2) => {
+      return dep1[0].localeCompare(dep2[0]);
+    });
     let self = this;
 
     //

src/package-request.js

@@ -273,7 +273,7 @@ export default class PackageRequest {
     //
     let { package: newInfo, hash, dest } = await this.resolver.fetchingQueue.push(
       info.name,
-      () => this.resolver.fetcher.fetch(ref)
+      () => this.resolver.fetcher.fetch(ref, this.resolver.lockfile.save && !!offlineMirrorPath)
     );
 
     // replace resolved remote URL with local path if lockfile is in save mode and we have a path