work

Author: dmail

packages/tooling/snapshot/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/snapshot",
-  "version": "2.19.4",
+  "version": "2.19.5",
   "type": "module",
   "description": "Snapshot testing",
   "repository": {

packages/tooling/snapshot/src/side_effects/filesystem/spy_filesystem_calls.js

@@ -241,22 +241,26 @@ export const spyFilesystemCalls = (
     _internalFs,
     "close",
     (fileDescriptor) => {
+      // Resolved when close is called, while the descriptor still belongs to
+      // this file: an asynchronous close frees it in the threadpool before
+      // its callback runs, and a synchronous open happening in between reuses
+      // the same number, so a lookup at callback time finds that other file
+      // (or nothing) and this file's write goes unnoticed.
+      const filePath = fileDescriptorPathMap.get(fileDescriptor);
+      if (!filePath) {
+        return {};
+      }
+      fileDescriptorPathMap.delete(fileDescriptor);
+      const stateBefore = filesystemStateInfoMap.get(filePath);
+      if (!stateBefore) {
+        return {};
+      }
+      filesystemStateInfoMap.delete(filePath);
       return {
         return: (buffer) => {
-          const filePath = fileDescriptorPathMap.get(fileDescriptor);
-          if (!filePath) {
-            return;
-          }
-          const stateBefore = filesystemStateInfoMap.get(filePath);
-          if (!stateBefore) {
-            fileDescriptorPathMap.delete(fileDescriptor);
-            return;
-          }
           if (buffer) {
             onReadFile(filePath);
           }
-          fileDescriptorPathMap.delete(fileDescriptor);
-          filesystemStateInfoMap.delete(filePath);
           const stateAfter = getFileStateWithinHook(filePath);
           onWriteFileDone(stateBefore, stateAfter);
         },

src/kitchen/url_graph/url_info_transformations.js

@@ -275,8 +275,14 @@ export const createUrlInfoTransformer = ({
       writeFileSync(fileUrl, content, { force: true });
       return undefined;
     }
+    // keyed by the file on disk: two urls differing by their search params
+    // ("file.css.map" and "file.css.map?side_effect") land in the same file,
+    // and two writes racing on it would interleave their bytes
+    const filePath = isFileSystemPath(fileUrl)
+      ? fileUrl
+      : urlToFileSystemPath(fileUrl);
     const previousWritePromise =
-      pendingWritePromiseMap.get(fileUrl) || Promise.resolve();
+      pendingWritePromiseMap.get(filePath) || Promise.resolve();
     const writePromise = previousWritePromise.then(async () => {
       try {
         await writeFile(fileUrl, content);
@@ -289,10 +295,10 @@ export const createUrlInfoTransformer = ({
         }
       }
     });
-    pendingWritePromiseMap.set(fileUrl, writePromise);
+    pendingWritePromiseMap.set(filePath, writePromise);
     writePromise.then(() => {
-      if (pendingWritePromiseMap.get(fileUrl) === writePromise) {
-        pendingWritePromiseMap.delete(fileUrl);
+      if (pendingWritePromiseMap.get(filePath) === writePromise) {
+        pendingWritePromiseMap.delete(filePath);
       }
     });
     return writePromise;

tests/dev_and_build/js_module_syntax_error/_js_module_syntax_error_build.test.mjs/0_basic/0_basic.md

@@ -17,8 +17,8 @@ Unexpected token (4:15)
 base/client/main.html:9:27
 --- plugin name ---
 "jsenv:js_reference_analysis"
-    at async @jsenv/core/src/kitchen/kitchen.js:661:11
-    at async @jsenv/core/src/kitchen/kitchen.js:647:9
+    at async @jsenv/core/src/kitchen/kitchen.js:666:11
+    at async @jsenv/core/src/kitchen/kitchen.js:651:9
 ```
 
 ---