simplify format logic

Author: tsnobip

scripts/rescript_format.js

@@ -68,20 +68,37 @@ async function readStdin() {
 }
 
 /**
- *
- * @param {string} file
- * @returns void
- */
-function printIncorrectlyFormattedFile(file) {
-  console.error("[format check]", file);
-}
-
-/**
- *
- * @param {number} incorrectlyFormattedFiles
- * @returns void
+ * @param {string[]} files
+ * @param {string} bsc_exe
+ * @param {(x: string) => boolean} isSupportedFile
+ * @param {boolean} checkFormatting
  */
-function printFormatCheckResult(incorrectlyFormattedFiles) {
+async function formatFiles(files, bsc_exe, isSupportedFile, checkFormatting) {
+  var incorrectlyFormattedFiles = 0;
+  try {
+    const _promises = await Promise.all(
+      files.map(async file => {
+        if (isSupportedFile(file)) {
+          // console.log(`processing ${arg}`);
+          const flags = checkFormatting
+            ? ["-format", file]
+            : ["-o", file, "-format", file];
+          const { stdout } = await asyncExecFile(bsc_exe, flags);
+          if (check.val) {
+            const original = await asyncFs.readFile(file, "utf-8");
+            if (original != stdout) {
+              console.error("[format check]", file);
+              incorrectlyFormattedFiles++;
+            }
+          }
+        }
+        return null;
+      })
+    );
+  } catch (err) {
+    console.error(err);
+    process.exit(2);
+  }
   if (incorrectlyFormattedFiles > 0) {
     console.error(
       `${incorrectlyFormattedFiles} file${
@@ -134,35 +151,7 @@ async function main(argv, rescript_exe, bsc_exe) {
         process.exit(2);
       }
       files = output.stdout.split("\n").map(x => x.trim());
-      var incorrectlyFormattedFiles = 0;
-      // it's ok that this processing is asynchronous
-      // given we only write one-liners during it
-      // so stdout should not get mixed (or can oneliners actually be mixed too?)
-      try {
-        const _promises = await Promise.all(
-          files.map(async file => {
-            if (isSupportedFile(file)) {
-              // console.log(`processing ${arg}`);
-              const flags = check.val
-                ? ["-format", file]
-                : ["-o", file, "-format", file];
-              const { stdout } = await asyncExecFile(bsc_exe, flags);
-              if (check.val) {
-                const original = await asyncFs.readFile(file, "utf-8");
-                if (original != stdout) {
-                  printIncorrectlyFormattedFile(file);
-                  incorrectlyFormattedFiles++;
-                }
-              }
-            }
-            return null;
-          })
-        );
-      } catch (err) {
-        console.error(err);
-        process.exit(2);
-      }
-      printFormatCheckResult(incorrectlyFormattedFiles);
+      await formatFiles(files, bsc_exe, isSupportedFile, check.val);
     } else if (use_stdin) {
       if (check.val) {
         console.error("format -stdin cannot be used with -check flag");
@@ -216,39 +205,7 @@ async function main(argv, rescript_exe, bsc_exe) {
           process.exit(2);
         }
       }
-      var hasError = false;
-      var incorrectlyFormattedFiles = 0;
-      files.forEach(file => {
-        var write = isSupportedFile(file) && !check.val;
-        var flags = write ? ["-o", file, "-format", file] : ["-format", file];
-        // we make this processing synchronous in order not to mix stdout
-        try {
-          const formatted = child_process.execFileSync(bsc_exe, flags);
-          if (!write) {
-            if (check.val) {
-              try {
-                const original = fs.readFileSync(file, "utf-8");
-                if (original != formatted) {
-                  printIncorrectlyFormattedFile(file);
-                  incorrectlyFormattedFiles++;
-                }
-              } catch (err) {
-                console.error(err);
-                hasError = true;
-              }
-            } else {
-              process.stdout.write(formatted);
-            }
-          }
-        } catch (err) {
-          console.error(err);
-          hasError = true;
-        }
-      });
-      printFormatCheckResult(incorrectlyFormattedFiles);
-      if (hasError) {
-        process.exit(2);
-      }
+      await formatFiles(files, bsc_exe, isSupportedFile, check.val);
     }
   } catch (e) {
     if (e instanceof arg.ArgError) {