@jsenv/test 3.7.44 → 3.7.46

package/dist/jsenv_test.js

@@ -1611,7 +1611,7 @@ const createDynamicLog = ({
   };
 
   let lastOutput = "";
-  let lastOutputFromOutside = "";
+  let wroteFromOutside = false;
   let clearAttemptResult;
   let writing = false;
 
@@ -1660,7 +1660,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.
@@ -1668,7 +1668,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}`;
       }
@@ -1699,7 +1699,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
@@ -1708,8 +1708,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;
@@ -1736,7 +1738,7 @@ const createDynamicLog = ({
       removeStreamSpy();
       removeStreamSpy = null;
       lastOutput = "";
-      lastOutputFromOutside = "";
+      wroteFromOutside = false;
     }
   };
 
@@ -1754,27 +1756,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 pathnameToExtension = (pathname) => {
@@ -2171,7 +2166,25 @@ const assertAndNormalizeFileUrl = (
   return value;
 };
 
-const comparePathnames = (leftPathame, rightPathname) => {
+/*
+ * Which of two pathnames comes first: directories before what is under them,
+ * deeper before shallower, then the names themselves.
+ *
+ * How a leading number reads is the caller's call, because the two readings are
+ * both right somewhere:
+ * - numeric (the default), where the number is a quantity: "9_x" then "10_x" —
+ *   what a generated list wants, so a story numbered by hand stays in the order
+ *   it happens;
+ * - { numeric: false }, where the number is part of the name: "10_x" right
+ *   after "1_x" — the order the filesystem itself gives, and the one every file
+ *   explorer above it shows, so a human reading a directory finds it in the
+ *   order their editor already shows.
+ */
+const comparePathnames = (
+  leftPathame,
+  rightPathname,
+  { numeric = true } = {},
+) => {
   const leftPartArray = leftPathame.split("/");
   const rightPartArray = rightPathname.split("/");
 
@@ -2207,7 +2220,7 @@ const comparePathnames = (leftPathame, rightPathname) => {
     i++;
     // local comparison comes first
     const comparison = leftPart.localeCompare(rightPart, undefined, {
-      numeric: true,
+      numeric,
       sensitivity: "base",
     });
     if (comparison !== 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/test",
-  "version": "3.7.44",
+  "version": "3.7.46",
   "type": "module",
   "repository": {
     "type": "git",
@@ -31,9 +31,9 @@
   },
   "dependencies": {
     "@c88/v8-coverage": "0.1.1",
-    "@jsenv/ast": "6.10.2",
-    "@jsenv/plugin-supervisor": "1.8.21",
-    "@jsenv/sourcemap": "1.4.7",
+    "@jsenv/ast": "6.10.4",
+    "@jsenv/plugin-supervisor": "1.8.23",
+    "@jsenv/sourcemap": "1.4.9",
     "he": "1.2.0",
     "istanbul-lib-coverage": "3.2.2",
     "istanbul-lib-instrument": "6.0.3",