consolidate weak and strict lockfile installing logic - fixes #86

Author: sebmck

src/cli/commands/check.js

@@ -32,7 +32,8 @@ export async function run(
   }
 
   let lockfile = await Lockfile.fromDirectory(config.cwd, reporter, {
-    silent: true
+    silent: true,
+    strict: true
   });
 
   let install = new Install("update", flags, args, config, reporter, lockfile, true);

src/cli/commands/install.js

@@ -159,49 +159,6 @@ export class Install {
     return [deps, patterns];
   }
 
-  async fetchResolve(params: FetchResolveParams): Promise<FetchResolveReturn> {
-    if (this.lockfile.strict) {
-      return this.fetchResolveStrict(params);
-    } else {
-      return this.fetchResolveWeak(params);
-    }
-  }
-
-  async fetchResolveStrict({
-    totalSteps,
-    patterns,
-    requests
-  }: FetchResolveParams): Promise<FetchResolveReturn> {
-    let totalStepsThis = totalSteps + 2;
-
-    this.reporter.step(1, totalStepsThis, "Rehydrating dependency graph", emoji.get("fast_forward"));
-    await this.resolver.init(requests);
-
-    this.reporter.step(2, totalStepsThis, "Fetching packages", emoji.get("package"));
-    await this.resolver.fetcher.init();
-
-    return {
-      patterns: await this.flatten(patterns),
-      total: totalStepsThis,
-      step: 2
-    };
-  }
-
-  async fetchResolveWeak(
-    { totalSteps, patterns, requests }: FetchResolveParams
-  ): Promise<FetchResolveReturn> {
-    let totalStepsThis = totalSteps + 1;
-
-    this.reporter.step(1, totalStepsThis, "Resolving and fetching packages", emoji.get("truck"));
-    await this.resolver.init(requests);
-
-    return {
-      patterns: await this.flatten(patterns),
-      total: totalStepsThis,
-      step: 1
-    };
-  }
-
   async init(): Promise<void> {
     let [depRequests, rawPatterns] = await this.fetchRequestFromCwd(this.args);
 
@@ -218,22 +175,20 @@ export class Install {
     }
 
     //
-    let { patterns, step, total } = await this.fetchResolve({
-      totalSteps: 3,
-      patterns: rawPatterns,
-      requests: depRequests
-    });
+    this.reporter.step(1, 4, "Resolving and fetching packages", emoji.get("truck"));
+    await this.resolver.init(depRequests);
+    let patterns = await this.flatten(rawPatterns);
 
     //
-    this.reporter.step(++step, total, "Checking package compatibility", emoji.get("white_check_mark"));
+    this.reporter.step(2, 4, "Checking package compatibility", emoji.get("white_check_mark"));
     await this.compatibility.init();
 
     //
-    this.reporter.step(++step, total, "Linking dependencies", emoji.get("link"));
+    this.reporter.step(3, 4, "Linking dependencies", emoji.get("link"));
     await this.linker.init(patterns);
 
     //
-    this.reporter.step(++step, total, "Running install scripts", emoji.get("page_with_curl"));
+    this.reporter.step(4, 4, "Running install scripts", emoji.get("page_with_curl"));
     await this.scripts.init();
 
     // fin!

src/package-request.js

@@ -258,47 +258,44 @@ export default class PackageRequest {
     // resolution to fetch the package so we can peek inside of it for a fbkpm.lock
     // only do this in strict lockfile mode as otherwise we can just use our root lockfile
     let subLockfile = null;
-    if (!this.resolver.lockfile.strict) {
-      // get possible mirror path
-      let offlineMirrorPath = this.config.getOfflineMirrorPath(ref.remote.registry, ref.remote.reference);
-
-      // while we're fetching the package we have some idle time to warm the cache with
-      // registry responses for known dependencies
-      if (!offlineMirrorPath) {
-        for (let name in info.dependencies) {
-          this.warmCacheIfRegistry(`${name}@${info.dependencies[name]}`);
-        }
-      }
 
-      //
-      let { package: newInfo, hash, dest } = await this.resolver.fetchingQueue.push(
-        info.name,
-        () => this.resolver.fetcher.fetch(ref)
-      );
-
-      // replace resolved remote URL with local path if lockfile is in save mode and we have a path
-      if (this.resolver.lockfile.save && offlineMirrorPath) {
-        if (await fs.exists(offlineMirrorPath)) {
-          remote.resolved = path.relative(
-            this.config.getOfflineMirrorPath(ref.remote.registry),
-            offlineMirrorPath
-          ) + `#${ref.remote.hash}`;
-        }
-      }
-      remote.hash = hash;
-      newInfo.reference = ref;
-      newInfo.remote = remote;
-      info = newInfo;
-
-      // find and load in fbkpm.lock from this module if it exists
-      let lockfileLoc = path.join(dest, constants.LOCKFILE_FILENAME);
-      if (await fs.exists(lockfileLoc)) {
-        let rawLockfile = await fs.readFile(lockfileLoc);
-        let lockfileObj = parseLock(rawLockfile);
-        subLockfile = new Lockfile(lockfileObj, false);
+    // get possible mirror path
+    let offlineMirrorPath = this.config.getOfflineMirrorPath(ref.remote.registry, ref.remote.reference);
+
+    // while we're fetching the package we have some idle time to warm the cache with
+    // registry responses for known dependencies
+    if (!offlineMirrorPath) {
+      for (let name in info.dependencies) {
+        this.warmCacheIfRegistry(`${name}@${info.dependencies[name]}`);
       }
     }
 
+    //
+    let { package: newInfo, hash, dest } = await this.resolver.fetchingQueue.push(
+      info.name,
+      () => this.resolver.fetcher.fetch(ref)
+    );
+
+    // replace resolved remote URL with local path if lockfile is in save mode and we have a path
+    if (this.resolver.lockfile.save && offlineMirrorPath && await fs.exists(offlineMirrorPath)) {
+      remote.resolved = path.relative(
+        this.config.getOfflineMirrorPath(ref.remote.registry),
+        offlineMirrorPath
+      ) + `#${ref.remote.hash}`;
+    }
+    remote.hash = hash;
+    newInfo.reference = ref;
+    newInfo.remote = remote;
+    info = newInfo;
+
+    // find and load in fbkpm.lock from this module if it exists
+    let lockfileLoc = path.join(dest, constants.LOCKFILE_FILENAME);
+    if (await fs.exists(lockfileLoc)) {
+      let rawLockfile = await fs.readFile(lockfileLoc);
+      let lockfileObj = parseLock(rawLockfile);
+      subLockfile = new Lockfile(lockfileObj, false);
+    }
+
     // start installation of dependencies
     let promises = [];
     let deps = [];