From 9340ae44fbce5a4b28d12161f61d612822ff4ea6 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Wed, 14 Dec 2016 10:05:34 -0800
Subject: [PATCH] packager: slightly more complete progress message.

Reviewed By: cpojer

Differential Revision: D4326391

fbshipit-source-id: 134e09f1db6e21165c4af78a9e1266d7f9d046c8
---
 react-packager/src/Server/index.js | 51 +++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/react-packager/src/Server/index.js b/react-packager/src/Server/index.js
index b6bd9d36..956986d2 100644
--- a/react-packager/src/Server/index.js
+++ b/react-packager/src/Server/index.js
@@ -696,22 +696,14 @@ class Server {
         entry_point: options.entryFile,
       })), ['bundle_url']);
 
-    let consoleProgress = () => {};
+    let updateTTYProgressMessage = () => {};
     if (process.stdout.isTTY && !this._opts.silent) {
-      const onProgress = (doneCount, totalCount) => {
-        const format = 'transformed %s/%s (%s%)';
-        const percent = Math.floor(100 * doneCount / totalCount);
-        terminal.status(format, doneCount, totalCount, percent);
-        if (doneCount === totalCount) {
-          terminal.persistStatus();
-        }
-      };
-      consoleProgress = throttle(onProgress, 200);
+      updateTTYProgressMessage = startTTYProgressMessage();
     }
 
     const mres = MultipartResponse.wrap(req, res);
     options.onProgress = (done, total) => {
-      consoleProgress(done, total);
+      updateTTYProgressMessage(done, total);
       mres.writeChunk({'Content-Type': 'application/json'}, JSON.stringify({done, total}));
     };
 
@@ -893,7 +885,7 @@ class Server {
     entryModuleOnly: boolean,
     generateSourceMaps: boolean,
     assetPlugins: Array<string>,
-    onProgress?: () => mixed,
+    onProgress?: (doneCont: number, totalCount: number) => mixed,
   } {
     // `true` to parse the query param as an object.
     const urlObj = url.parse(reqUrl, true);
@@ -958,6 +950,41 @@ class Server {
   }
 }
 
+function getProgressBar(ratio: number, length: number) {
+  const blockCount = Math.floor(ratio * length);
+  return (
+    '\u2593'.repeat(blockCount) +
+    '\u2591'.repeat(length - blockCount)
+  );
+}
+
+/**
+ * We use Math.pow(ratio, 2) to as a conservative measure of progress because we
+ * know the `totalCount` is going to progressively increase as well. We also
+ * prevent the ratio from going backwards.
+ */
+function startTTYProgressMessage(
+): (doneCount: number, totalCount: number) => void {
+  let currentRatio = 0;
+  const updateMessage = (doneCount, totalCount) => {
+    const isDone = doneCount === totalCount;
+    const conservativeRatio = Math.pow(doneCount / totalCount, 2);
+    currentRatio = Math.max(conservativeRatio, currentRatio);
+    terminal.status(
+      'Transforming files  %s%s% (%s/%s)%s',
+      isDone ? '' : getProgressBar(currentRatio, 20) + '  ',
+      (100 * currentRatio).toFixed(1),
+      doneCount,
+      totalCount,
+      isDone ? ', done.' : '...',
+    );
+    if (isDone) {
+      terminal.persistStatus();
+    }
+  };
+  return throttle(updateMessage, 200);
+}
+
 function contentsEqual(array: Array<mixed>, set: Set<mixed>): boolean {
   return array.length === set.size && array.every(set.has, set);
 }