@jsenv/snapshot 2.2.5 → 2.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/snapshot",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "description": "Snapshot testing",
   "license": "MIT",
   "author": {
@@ -35,9 +35,9 @@
   },
   "dependencies": {
     "@jsenv/assert": "4.1.5",
-    "@jsenv/ast": "6.2.5",
-    "@jsenv/filesystem": "4.9.1",
-    "@jsenv/urls": "2.3.1",
+    "@jsenv/ast": "6.2.6",
+    "@jsenv/filesystem": "4.9.2",
+    "@jsenv/urls": "2.3.2",
     "@jsenv/utils": "2.1.1",
     "pixelmatch": "6.0.0",
     "prettier": "3.3.3",

package/src/function_snapshot.js

@@ -4,10 +4,12 @@ import {
   removeFileSync,
   writeFileSync,
 } from "@jsenv/filesystem";
-import { urlToRelativeUrl } from "@jsenv/urls/src/url_to_relative_url.js";
+import { urlToFilename, urlToRelativeUrl } from "@jsenv/urls";
 import { takeDirectorySnapshot } from "./filesystem_snapshot.js";
 import { replaceFluctuatingValues } from "./replace_fluctuating_values.js";
 
+const consoleSpySymbol = Symbol.for("console_spy_for_jsenv_snapshot");
+
 export const snapshotFunctionSideEffects = (
   fn,
   fnFileUrl,
@@ -17,7 +19,7 @@ export const snapshotFunctionSideEffects = (
     captureConsole = true,
     filesystemEffects,
     filesystemEffectsInline,
-    restoreFilesystem,
+    restoreFilesystem = true,
   } = {},
 ) => {
   const sideEffectDirectoryUrl = new URL(
@@ -27,10 +29,8 @@ export const snapshotFunctionSideEffects = (
   const sideEffectDirectorySnapshot = takeDirectorySnapshot(
     sideEffectDirectoryUrl,
   );
-  const sideEffectFileUrl = new URL(
-    "./side_effect.txt",
-    sideEffectDirectoryUrl,
-  );
+  const sideEffectFilename = `${urlToFilename(sideEffectDirectoryUrl)}_side_effects.txt`;
+  const sideEffectFileUrl = new URL(sideEffectFilename, sideEffectDirectoryUrl);
   const sideEffects = [];
   const finallyCallbackSet = new Set();
   const onError = (e) => {
@@ -61,12 +61,17 @@ export const snapshotFunctionSideEffects = (
   if (captureConsole) {
     const installConsoleSpy = (methodName) => {
       const methodSpied = console[methodName];
-      console[methodName] = (message) => {
+      if (consoleSpySymbol in methodSpied) {
+        throw new Error("snapshotFunctionSideEffects already running");
+      }
+      const methodSpy = (message) => {
         sideEffects.push({
           type: `console.${methodName}`,
           value: message,
         });
       };
+      methodSpy[consoleSpySymbol] = true;
+      console[methodName] = methodSpy;
       finallyCallbackSet.add(() => {
         console[methodName] = methodSpied;
       });
@@ -141,8 +146,7 @@ export const snapshotFunctionSideEffects = (
   try {
     const returnValue = fn();
     if (returnValue && returnValue.then) {
-      returnedPromise = true;
-      returnValue.then(
+      returnedPromise = returnValue.then(
         (value) => {
           onResult(value);
           onFinally();
@@ -152,14 +156,16 @@ export const snapshotFunctionSideEffects = (
           onFinally();
         },
       );
-    } else {
-      onResult(returnValue);
+      return returnedPromise;
     }
+    onResult(returnValue);
+    return null;
   } catch (e) {
     onError(e);
+    return null;
   } finally {
     if (returnedPromise) {
-      return;
+      return returnedPromise;
     }
     onFinally();
   }