Verify that all explicitly-specified files and/or globs exist. Don't silently ignore missing files

Author: JamesMessinger

src/get-old-version.ts

@@ -53,6 +53,8 @@ async function readVersion(file: string, cwd: string): Promise<string | undefine
     }
   }
   catch (error) {
+    // Ignore errors (no such file, not valid JSON, etc.)
+    // Just try the next file instead.
     return undefined;
   }
 }

src/normalize-options.ts

@@ -97,10 +97,12 @@ export async function normalizeOptions(raw: VersionBumpOptions): Promise<Normali
 
   let files;
   if (Array.isArray(raw.files) && raw.files.length > 0) {
-    files = await globby(raw.files, { cwd });
+    files = await strictGlobMatches(raw.files, { cwd });
   }
   else {
-    files = ["package.json", "package-lock.json"];
+    // Try to find these files by default.
+    // If they don't exist, then they will NOT be included in the `files` array.
+    files = await globby(["package.json", "package-lock.json"], { cwd });
   }
 
   let ui: Interface;
@@ -130,3 +132,41 @@ export async function normalizeOptions(raw: VersionBumpOptions): Promise<Normali
 
   return { release, commit, tag, push, files, cwd, interface: ui };
 }
+
+/**
+ * Returns all files that match the given glob patterns.
+ * An error is thrown if any pattern matches zero files.
+ */
+async function strictGlobMatches(files: string[], options: object): Promise<string[]> {
+  // Match all glob patterns simultaneously
+  let matches = await Promise.all(files.map((file) => strictGlobMatch(file, options)));
+
+  // Get all the unique files
+  let matchedFiles = new Set<string>();
+  for (let match of matches) {
+    for (let file of match) {
+      matchedFiles.add(file);
+    }
+  }
+
+  return [...matchedFiles];
+}
+
+/**
+ * Returns all files that match the given glob pattern.
+ * An error is thrown if the pattern matches zero files.
+ */
+async function strictGlobMatch(file: string, options: object): Promise<string[]> {
+  let matches = await globby(file, options);
+
+  if (matches.length === 0) {
+    if (globby.hasMagic(file)) {
+      throw new Error(`Could not find any files matching "${file}".`);
+    }
+    else {
+      throw new Error(`Could not find file: ${file}.`);
+    }
+  }
+
+  return matches;
+}

src/update-files.ts

@@ -57,7 +57,6 @@ async function updateManifestFile(name: string, operation: Operation): Promise<b
   let { newVersion } = operation.state;
   let modified = false;
 
-  try {
     let file = await readJsonFile(name, cwd);
 
     if (isManifest(file.data) && file.data.version !== newVersion) {
@@ -66,11 +65,6 @@ async function updateManifestFile(name: string, operation: Operation): Promise<b
       modified = true;
     }
   }
-  catch (error) {
-    // Ignore nonexistent files
-    if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
-      throw error;
-    }
   }
 
   return modified;
@@ -86,7 +80,6 @@ async function updateTextFile(name: string, operation: Operation): Promise<boole
   let { oldVersion, newVersion } = operation.state;
   let modified = false;
 
-  try {
     let file = await readTextFile(name, cwd);
 
     // Only update the file if it contains at least one occurrence of the old version
@@ -104,12 +97,6 @@ async function updateTextFile(name: string, operation: Operation): Promise<boole
       return true;
     }
   }
-  catch (error) {
-    // Ignore nonexistent files
-    if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
-      throw error;
-    }
-  }
 
   return modified;
 }

test/specs/api.spec.js

@@ -155,8 +155,7 @@ describe("versionBup() API", () => {
     catch (error) {
       expect(error).to.be.an.instanceOf(Error);
       error.message.should.equal(
-        "Unable to determine the current version number. " +
-        "Checked package.json, package-lock.json."
+        "Unable to determine the current version number. Checked package.json."
       );
 
       // The CWD should not have changed