@jsenv/core 28.3.2 → 28.3.5

package/dist/main.js

@@ -16810,9 +16810,18 @@ const jsenvPluginHmr = () => {
       return urlObject.href;
     },
     transformUrlSearchParams: (reference, context) => {
-      const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl);
+      if (reference.type === "package_json") {
+        // maybe the if above shoulb be .isImplicit but it's just a detail anyway
+        return null;
+      }
 
-      if (!parentUrlInfo || !parentUrlInfo.data.hmr) {
+      if (context.reference && !context.reference.data.hmr) {
+        // parent do not use hmr search param
+        return null;
+      }
+
+      if (!context.reference && !reference.data.hmr) {
+        // entry point do not use hmr search param
         return null;
       }
 
@@ -16998,28 +17007,38 @@ const jsenvPluginAutoreloadServer = ({
           url,
           event
         }) => {
-          const urlInfo = urlGraph.getUrlInfo(url); // file not part of dependency graph
+          const onUrlInfo = urlInfo => {
+            const relativeUrl = formatUrlForClient(urlInfo.url);
+            const hotUpdate = propagateUpdate(urlInfo);
 
-          if (!urlInfo) {
-            return;
-          }
+            if (hotUpdate.declined) {
+              notifyDeclined({
+                cause: `${relativeUrl} ${event}`,
+                reason: hotUpdate.reason,
+                declinedBy: hotUpdate.declinedBy
+              });
+            } else {
+              notifyAccepted({
+                cause: `${relativeUrl} ${event}`,
+                reason: hotUpdate.reason,
+                instructions: hotUpdate.instructions
+              });
+            }
+          };
 
-          const relativeUrl = formatUrlForClient(url);
-          const hotUpdate = propagateUpdate(urlInfo);
+          const exactUrlInfo = urlGraph.getUrlInfo(url);
 
-          if (hotUpdate.declined) {
-            notifyDeclined({
-              cause: `${relativeUrl} ${event}`,
-              reason: hotUpdate.reason,
-              declinedBy: hotUpdate.declinedBy
-            });
-          } else {
-            notifyAccepted({
-              cause: `${relativeUrl} ${event}`,
-              reason: hotUpdate.reason,
-              instructions: hotUpdate.instructions
-            });
+          if (exactUrlInfo) {
+            onUrlInfo(exactUrlInfo);
           }
+
+          urlGraph.urlInfoMap.forEach(urlInfo => {
+            if (urlInfo === exactUrlInfo) return;
+            const urlWithoutSearch = asUrlWithoutSearch(urlInfo.url);
+            if (urlWithoutSearch !== url) return;
+            if (exactUrlInfo && exactUrlInfo.dependents.has(urlInfo.url)) return;
+            onUrlInfo(urlInfo);
+          });
         });
         clientFilesPruneCallbackList.push((prunedUrlInfos, firstUrlInfo) => {
           const mainHotUpdate = propagateUpdate(firstUrlInfo);
@@ -25301,11 +25320,23 @@ const createFileService = ({
     clientFileChangeCallbackList.push(({
       url
     }) => {
-      const urlInfo = urlGraph.getUrlInfo(url);
-
-      if (urlInfo) {
+      const onUrlInfo = urlInfo => {
         urlGraph.considerModified(urlInfo);
+      };
+
+      const exactUrlInfo = urlGraph.getUrlInfo(url);
+
+      if (exactUrlInfo) {
+        onUrlInfo(exactUrlInfo);
       }
+
+      urlGraph.urlInfoMap.forEach(urlInfo => {
+        if (urlInfo === exactUrlInfo) return;
+        const urlWithoutSearch = asUrlWithoutSearch(urlInfo.url);
+        if (urlWithoutSearch !== url) return;
+        if (exactUrlInfo && exactUrlInfo.dependents.has(urlInfo.url)) return;
+        onUrlInfo(urlInfo);
+      });
     });
     const kitchen = createKitchen({
       signal,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "28.3.2",
+  "version": "28.3.5",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {

package/src/omega/server/file_service.js

@@ -5,7 +5,7 @@ import {
   composeTwoResponses,
 } from "@jsenv/server"
 import { registerDirectoryLifecycle, bufferToEtag } from "@jsenv/filesystem"
-import { urlIsInsideOf, moveUrl } from "@jsenv/urls"
+import { urlIsInsideOf, moveUrl, asUrlWithoutSearch } from "@jsenv/urls"
 import { URL_META } from "@jsenv/url-meta"
 
 import { getCorePlugins } from "@jsenv/core/src/plugins/plugins.js"
@@ -95,10 +95,20 @@ export const createFileService = ({
     )
     const urlGraph = createUrlGraph()
     clientFileChangeCallbackList.push(({ url }) => {
-      const urlInfo = urlGraph.getUrlInfo(url)
-      if (urlInfo) {
+      const onUrlInfo = (urlInfo) => {
         urlGraph.considerModified(urlInfo)
       }
+      const exactUrlInfo = urlGraph.getUrlInfo(url)
+      if (exactUrlInfo) {
+        onUrlInfo(exactUrlInfo)
+      }
+      urlGraph.urlInfoMap.forEach((urlInfo) => {
+        if (urlInfo === exactUrlInfo) return
+        const urlWithoutSearch = asUrlWithoutSearch(urlInfo.url)
+        if (urlWithoutSearch !== url) return
+        if (exactUrlInfo && exactUrlInfo.dependents.has(urlInfo.url)) return
+        onUrlInfo(urlInfo)
+      })
     })
     const kitchen = createKitchen({
       signal,

package/src/plugins/autoreload/jsenv_plugin_autoreload_server.js

@@ -1,4 +1,8 @@
-import { urlIsInsideOf, urlToRelativeUrl } from "@jsenv/urls"
+import {
+  urlIsInsideOf,
+  urlToRelativeUrl,
+  asUrlWithoutSearch,
+} from "@jsenv/urls"
 
 export const jsenvPluginAutoreloadServer = ({
   clientFileChangeCallbackList,
@@ -113,26 +117,34 @@ export const jsenvPluginAutoreloadServer = ({
           return iterate(firstUrlInfo, seen)
         }
         clientFileChangeCallbackList.push(({ url, event }) => {
-          const urlInfo = urlGraph.getUrlInfo(url)
-          // file not part of dependency graph
-          if (!urlInfo) {
-            return
+          const onUrlInfo = (urlInfo) => {
+            const relativeUrl = formatUrlForClient(urlInfo.url)
+            const hotUpdate = propagateUpdate(urlInfo)
+            if (hotUpdate.declined) {
+              notifyDeclined({
+                cause: `${relativeUrl} ${event}`,
+                reason: hotUpdate.reason,
+                declinedBy: hotUpdate.declinedBy,
+              })
+            } else {
+              notifyAccepted({
+                cause: `${relativeUrl} ${event}`,
+                reason: hotUpdate.reason,
+                instructions: hotUpdate.instructions,
+              })
+            }
           }
-          const relativeUrl = formatUrlForClient(url)
-          const hotUpdate = propagateUpdate(urlInfo)
-          if (hotUpdate.declined) {
-            notifyDeclined({
-              cause: `${relativeUrl} ${event}`,
-              reason: hotUpdate.reason,
-              declinedBy: hotUpdate.declinedBy,
-            })
-          } else {
-            notifyAccepted({
-              cause: `${relativeUrl} ${event}`,
-              reason: hotUpdate.reason,
-              instructions: hotUpdate.instructions,
-            })
+          const exactUrlInfo = urlGraph.getUrlInfo(url)
+          if (exactUrlInfo) {
+            onUrlInfo(exactUrlInfo)
           }
+          urlGraph.urlInfoMap.forEach((urlInfo) => {
+            if (urlInfo === exactUrlInfo) return
+            const urlWithoutSearch = asUrlWithoutSearch(urlInfo.url)
+            if (urlWithoutSearch !== url) return
+            if (exactUrlInfo && exactUrlInfo.dependents.has(urlInfo.url)) return
+            onUrlInfo(urlInfo)
+          })
         })
         clientFilesPruneCallbackList.push((prunedUrlInfos, firstUrlInfo) => {
           const mainHotUpdate = propagateUpdate(firstUrlInfo)

package/src/plugins/autoreload/jsenv_plugin_hmr.js

@@ -7,7 +7,6 @@ export const jsenvPluginHmr = () => {
         reference.data.hmr = false
         return null
       }
-
       reference.data.hmr = true
       const urlObject = new URL(reference.url)
       // "hmr" search param goal is to mark url as enabling hmr:
@@ -19,8 +18,16 @@ export const jsenvPluginHmr = () => {
       return urlObject.href
     },
     transformUrlSearchParams: (reference, context) => {
-      const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl)
-      if (!parentUrlInfo || !parentUrlInfo.data.hmr) {
+      if (reference.type === "package_json") {
+        // maybe the if above shoulb be .isImplicit but it's just a detail anyway
+        return null
+      }
+      if (context.reference && !context.reference.data.hmr) {
+        // parent do not use hmr search param
+        return null
+      }
+      if (!context.reference && !reference.data.hmr) {
+        // entry point do not use hmr search param
         return null
       }
       const urlInfo = context.urlGraph.getUrlInfo(reference.url)