@jsenv/humanize 1.8.0 → 1.8.2

package/dist/node/jsenv_humanize_node.js

@@ -3072,7 +3072,9 @@ const toLocalDayKey = (date) => {
  * Coerces what `<Time>` accepts as a value — a Date, a ms timestamp, a
  * parseable string — into a Date, or null when it cannot. `parseString`
  * lets a caller claim the string forms it recognizes ("HH:MM" for a
- * time-of-day, "YYYY-MM" for a month…) before the generic ones apply.
+ * time-of-day, "YYYY-MM" for a month…) before the generic ones apply; the
+ * strings it does not claim (it answers null) still go through them, so a
+ * caller shaping one form never has to re-implement ISO parsing.
  */
 const toDate = (value, parseString) => {
   if (value instanceof Date) {
@@ -3083,7 +3085,10 @@ const toDate = (value, parseString) => {
   }
   if (typeof value === "string") {
     if (parseString) {
-      return parseString(value);
+      const parsed = parseString(value);
+      if (parsed) {
+        return parsed;
+      }
     }
     // "YYYY-MM-DD" — use local midnight to avoid UTC shift
     if (/^\d{4}-\d{2}-\d{2}$/.test(value)) {
@@ -3815,7 +3820,7 @@ const createDynamicLog = ({
   };
 
   let lastOutput = "";
-  let lastOutputFromOutside = "";
+  let wroteFromOutside = false;
   let clearAttemptResult;
   let writing = false;
 
@@ -3864,7 +3869,7 @@ const createDynamicLog = ({
     }
     let stringToWrite = string;
     if (lastOutput) {
-      if (lastOutputFromOutside) {
+      if (wroteFromOutside) {
         // We don't want to clear logs written by other code,
         // it makes output unreadable and might erase precious information
         // To detect this we put a spy on the stream.
@@ -3872,7 +3877,7 @@ const createDynamicLog = ({
         // something else than this code has written in the stream
         // so we just write without clearing (append instead of replacing)
         lastOutput = "";
-        lastOutputFromOutside = "";
+        wroteFromOutside = false;
       } else {
         stringToWrite = `${getErasePreviousOutput()}${string}`;
       }
@@ -3903,7 +3908,7 @@ const createDynamicLog = ({
     update(ouputAfterCallback);
   };
 
-  const writeFromOutsideEffect = (value) => {
+  const writeFromOutsideEffect = () => {
     if (!lastOutput) {
       // we don't care if the log never wrote anything
       // or if last update() wrote an empty string
@@ -3912,8 +3917,10 @@ const createDynamicLog = ({
     if (writing) {
       return;
     }
-    lastOutputFromOutside = value;
-    dynamicLog.onWriteFromOutside(value);
+    wroteFromOutside = true;
+    // the outside output is already in the stream: whoever reacts to this must
+    // leave it alone, only stop refreshing above it
+    dynamicLog.onWriteFromOutside();
   };
 
   let removeStreamSpy;
@@ -3940,7 +3947,7 @@ const createDynamicLog = ({
       removeStreamSpy();
       removeStreamSpy = null;
       lastOutput = "";
-      lastOutputFromOutside = "";
+      wroteFromOutside = false;
     }
   };
 
@@ -3958,27 +3965,20 @@ const createDynamicLog = ({
 // is that node.js will later throw error if stream gets closed
 // while something listening data on it
 const spyStreamOutput = (stream, callback) => {
-  let output = "";
   let installed = true;
   const originalWrite = stream.write;
   stream.write = function (...args /* chunk, encoding, callback */) {
-    output += args;
-    callback(output);
+    callback();
     return originalWrite.call(this, ...args);
   };
 
-  const uninstall = () => {
+  return () => {
     if (!installed) {
       return;
     }
     stream.write = originalWrite;
     installed = false;
   };
-
-  return () => {
-    uninstall();
-    return output;
-  };
 };
 
 const startSpinner = ({
@@ -4043,10 +4043,15 @@ const startSpinner = ({
   spinner.stop = stop;
 
   if (stopOnVerticalOverflow) {
-    dynamicLog.onVerticalOverflow = stop;
+    dynamicLog.onVerticalOverflow = () => {
+      stop();
+    };
   }
   if (stopOnWriteFromOutside) {
-    dynamicLog.onWriteFromOutside = stop;
+    // the spinner freezes on its current frame and the other output goes below
+    dynamicLog.onWriteFromOutside = () => {
+      stop();
+    };
   }
 
   return spinner;