Mirror cached issue 80 (#92)

* wip

* Feature: --save to mirror now works when cache in .fbkpm exists

* nits var names

* nit: var names

Author: bestander

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-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

test/commands/install.js

@@ -883,34 +883,36 @@ test("[network] install --save should ignore cache", () => {
   let mirrorPath = "mirror-for-offline";
 
   let fixture = "install-save-to-mirror-when-cached";
-  return run({}, ["left-pad@1.1.0"], fixture, async (config) => {
+  return run({}, ["left-pad@1.1.0"], fixture, async (config, reporter) => {
     assert.equal(
       await getPackageVersion(config, "left-pad"),
       "1.1.0"
     );
 
-    return run({save: true}, ["left-pad@1.1.0"], fixture, async (config) => {
-      assert.equal(
-        await getPackageVersion(config, "left-pad"),
-        "1.1.0"
-      );
-      assert.deepEqual(
-        JSON.parse(await fs.readFile(path.join(config.cwd, "package.json"))).dependencies,
-        {"left-pad": "1.1.0"}
-      );
+    let lockfile = await createLockfile(config.cwd, false, true);
+    let install = new Install("install", {save: true}, ["left-pad@1.1.0"], config, reporter, lockfile);
+    await install.init();
+    assert.equal(
+      await getPackageVersion(config, "left-pad"),
+      "1.1.0"
+    );
+    assert.deepEqual(
+      JSON.parse(await fs.readFile(path.join(config.cwd, "package.json"))).dependencies,
+      {"left-pad": "1.1.0"}
+    );
 
-      let lockFileWritten = await fs.readFile(path.join(config.cwd, "fbkpm.lock"));
-      let lockFileLines = lockFileWritten.split("\n").filter((line) => !!line);
-      assert.equal(lockFileLines[0], "left-pad@1.1.0:");
-      assert.equal(lockFileLines.length, 4);
-      assert.notEqual(lockFileLines[3].indexOf("resolved left-pad-1.1.0.tgz"), -1);
+    let mirror = await fs.walk(path.join(config.cwd, mirrorPath));
+    assert.equal(mirror.length, 1);
+    assert.equal(mirror[0].relative, "left-pad-1.1.0.tgz");
 
-      let mirror = await fs.walk(path.join(config.cwd, mirrorPath));
-      assert.equal(mirror.length, 1);
-      assert.equal(mirror[0].relative, "left-pad-1.1.0.tgz");
-      await fs.unlink(path.join(config.cwd, mirrorPath));
-      await fs.unlink(path.join(config.cwd, "package.json"));
+    let lockFileWritten = await fs.readFile(path.join(config.cwd, "fbkpm.lock"));
+    let lockFileLines = lockFileWritten.split("\n").filter((line) => !!line);
+    assert.equal(lockFileLines[0], "left-pad@1.1.0:");
+    assert.equal(lockFileLines.length, 4);
+    assert.notEqual(lockFileLines[3].indexOf("resolved left-pad-1.1.0.tgz"), -1);
+
+    await fs.unlink(path.join(config.cwd, mirrorPath));
+    await fs.unlink(path.join(config.cwd, "package.json"));
 
-    });
   });
 });