@jsenv/core 27.3.2 → 27.4.0

package/src/plugins/autoreload/dev_sse/jsenv_plugin_dev_sse_server.js

@@ -1,184 +1,180 @@
 import { urlToRelativeUrl } from "@jsenv/urls"
-import { createCallbackList } from "@jsenv/abort"
-
-import { createSSEService } from "@jsenv/core/src/helpers/event_source/sse_service.js"
 
 export const jsenvPluginDevSSEServer = ({
-  rootDirectoryUrl,
-  urlGraph,
   clientFileChangeCallbackList,
   clientFilesPruneCallbackList,
 }) => {
-  const serverEventCallbackList = createCallbackList()
-  const sseService = createSSEService({ serverEventCallbackList })
-
-  const notifyDeclined = ({ cause, reason, declinedBy }) => {
-    serverEventCallbackList.notify({
-      type: "reload",
-      data: JSON.stringify({
-        cause,
-        type: "full",
-        typeReason: reason,
-        declinedBy,
-      }),
-    })
-  }
-  const notifyAccepted = ({ cause, reason, instructions }) => {
-    serverEventCallbackList.notify({
-      type: "reload",
-      data: JSON.stringify({
-        cause,
-        type: "hot",
-        typeReason: reason,
-        hotInstructions: instructions,
-      }),
-    })
-  }
-  const propagateUpdate = (firstUrlInfo) => {
-    const urlInfos = urlGraph.urlInfos
-    const iterate = (urlInfo, trace) => {
-      if (urlInfo.data.hotAcceptSelf) {
-        return {
-          accepted: true,
-          reason:
-            urlInfo === firstUrlInfo
-              ? `file accepts hot reload`
-              : `a dependent file accepts hot reload`,
-          instructions: [
-            {
-              type: urlInfo.type,
-              boundary: urlToRelativeUrl(urlInfo.url, rootDirectoryUrl),
-              acceptedBy: urlToRelativeUrl(urlInfo.url, rootDirectoryUrl),
-            },
-          ],
-        }
+  return {
+    name: "jsenv:sse_server",
+    appliesDuring: { dev: true },
+    registerServerEvents: (
+      { sendServerEvent },
+      { rootDirectoryUrl, urlGraph },
+    ) => {
+      const notifyDeclined = ({ cause, reason, declinedBy }) => {
+        sendServerEvent({
+          type: "reload",
+          data: {
+            cause,
+            type: "full",
+            typeReason: reason,
+            declinedBy,
+          },
+        })
       }
-      const { dependents } = urlInfo
-      const instructions = []
-      for (const dependentUrl of dependents) {
-        const dependentUrlInfo = urlInfos[dependentUrl]
-        if (dependentUrlInfo.data.hotDecline) {
-          return {
-            declined: true,
-            reason: `a dependent file declines hot reload`,
-            declinedBy: dependentUrl,
+      const notifyAccepted = ({ cause, reason, instructions }) => {
+        sendServerEvent({
+          type: "reload",
+          data: {
+            cause,
+            type: "hot",
+            typeReason: reason,
+            hotInstructions: instructions,
+          },
+        })
+      }
+      const propagateUpdate = (firstUrlInfo) => {
+        const iterate = (urlInfo, seen) => {
+          if (urlInfo.data.hotAcceptSelf) {
+            return {
+              accepted: true,
+              reason:
+                urlInfo === firstUrlInfo
+                  ? `file accepts hot reload`
+                  : `a dependent file accepts hot reload`,
+              instructions: [
+                {
+                  type: urlInfo.type,
+                  boundary: urlToRelativeUrl(urlInfo.url, rootDirectoryUrl),
+                  acceptedBy: urlToRelativeUrl(urlInfo.url, rootDirectoryUrl),
+                },
+              ],
+            }
+          }
+          const { dependents } = urlInfo
+          const instructions = []
+          for (const dependentUrl of dependents) {
+            const dependentUrlInfo = urlGraph.getUrlInfo(dependentUrl)
+            if (dependentUrlInfo.data.hotDecline) {
+              return {
+                declined: true,
+                reason: `a dependent file declines hot reload`,
+                declinedBy: dependentUrl,
+              }
+            }
+            const { hotAcceptDependencies = [] } = dependentUrlInfo.data
+            if (hotAcceptDependencies.includes(urlInfo.url)) {
+              instructions.push({
+                type: dependentUrlInfo.type,
+                boundary: urlToRelativeUrl(dependentUrl, rootDirectoryUrl),
+                acceptedBy: urlToRelativeUrl(urlInfo.url, rootDirectoryUrl),
+              })
+              continue
+            }
+            if (seen.includes(dependentUrl)) {
+              return {
+                declined: true,
+                reason: "circular dependency",
+                declinedBy: urlToRelativeUrl(dependentUrl, rootDirectoryUrl),
+              }
+            }
+            const dependentPropagationResult = iterate(dependentUrlInfo, [
+              ...seen,
+              dependentUrl,
+            ])
+            if (dependentPropagationResult.accepted) {
+              instructions.push(...dependentPropagationResult.instructions)
+              continue
+            }
+            if (
+              // declined explicitely by an other file, it must decline the whole update
+              dependentPropagationResult.declinedBy
+            ) {
+              return dependentPropagationResult
+            }
+            // declined by absence of boundary, we can keep searching
+            continue
+          }
+          if (instructions.length === 0) {
+            return {
+              declined: true,
+              reason: `there is no file accepting hot reload while propagating update`,
+            }
           }
-        }
-        const { hotAcceptDependencies = [] } = dependentUrlInfo.data
-        if (hotAcceptDependencies.includes(urlInfo.url)) {
-          instructions.push({
-            type: dependentUrlInfo.type,
-            boundary: urlToRelativeUrl(dependentUrl, rootDirectoryUrl),
-            acceptedBy: urlToRelativeUrl(urlInfo.url, rootDirectoryUrl),
-          })
-          continue
-        }
-        if (trace.includes(dependentUrl)) {
           return {
-            declined: true,
-            reason: "circular dependency",
-            declinedBy: urlToRelativeUrl(dependentUrl, rootDirectoryUrl),
+            accepted: true,
+            reason: `${instructions.length} dependent file(s) accepts hot reload`,
+            instructions,
           }
         }
-        const dependentPropagationResult = iterate(dependentUrlInfo, [
-          ...trace,
-          dependentUrl,
-        ])
-        if (dependentPropagationResult.accepted) {
-          instructions.push(...dependentPropagationResult.instructions)
-          continue
-        }
-        if (
-          // declined explicitely by an other file, it must decline the whole update
-          dependentPropagationResult.declinedBy
-        ) {
-          return dependentPropagationResult
-        }
-        // declined by absence of boundary, we can keep searching
-        continue
+        const seen = []
+        return iterate(firstUrlInfo, seen)
       }
-      if (instructions.length === 0) {
-        return {
-          declined: true,
-          reason: `there is no file accepting hot reload while propagating update`,
+      clientFileChangeCallbackList.push(({ url, event }) => {
+        const urlInfo = urlGraph.getUrlInfo(url)
+        // file not part of dependency graph
+        if (!urlInfo) {
+          return
+        }
+        const relativeUrl = urlToRelativeUrl(url, rootDirectoryUrl)
+        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,
+          })
         }
-      }
-      return {
-        accepted: true,
-        reason: `${instructions.length} dependent file(s) accepts hot reload`,
-        instructions,
-      }
-    }
-    const trace = []
-    return iterate(firstUrlInfo, trace)
-  }
-  clientFileChangeCallbackList.push(({ url, event }) => {
-    const urlInfo = urlGraph.getUrlInfo(url)
-    // file not part of dependency graph
-    if (!urlInfo) {
-      return
-    }
-    const relativeUrl = urlToRelativeUrl(url, rootDirectoryUrl)
-    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,
-      })
-    }
-  })
-  clientFilesPruneCallbackList.push(({ prunedUrlInfos, firstUrlInfo }) => {
-    const mainHotUpdate = propagateUpdate(firstUrlInfo)
-    const cause = `following files are no longer referenced: ${prunedUrlInfos.map(
-      (prunedUrlInfo) => urlToRelativeUrl(prunedUrlInfo.url, rootDirectoryUrl),
-    )}`
-    // now check if we can hot update the main ressource
-    // then if we can hot update all dependencies
-    if (mainHotUpdate.declined) {
-      notifyDeclined({
-        cause,
-        reason: mainHotUpdate.reason,
-        declinedBy: mainHotUpdate.declinedBy,
       })
-      return
-    }
-    // main can hot update
-    let i = 0
-    const instructions = []
-    while (i < prunedUrlInfos.length) {
-      const prunedUrlInfo = prunedUrlInfos[i++]
-      if (prunedUrlInfo.data.hotDecline) {
-        notifyDeclined({
+      clientFilesPruneCallbackList.push(({ prunedUrlInfos, firstUrlInfo }) => {
+        const mainHotUpdate = propagateUpdate(firstUrlInfo)
+        const cause = `following files are no longer referenced: ${prunedUrlInfos.map(
+          (prunedUrlInfo) =>
+            urlToRelativeUrl(prunedUrlInfo.url, rootDirectoryUrl),
+        )}`
+        // now check if we can hot update the main ressource
+        // then if we can hot update all dependencies
+        if (mainHotUpdate.declined) {
+          notifyDeclined({
+            cause,
+            reason: mainHotUpdate.reason,
+            declinedBy: mainHotUpdate.declinedBy,
+          })
+          return
+        }
+        // main can hot update
+        let i = 0
+        const instructions = []
+        while (i < prunedUrlInfos.length) {
+          const prunedUrlInfo = prunedUrlInfos[i++]
+          if (prunedUrlInfo.data.hotDecline) {
+            notifyDeclined({
+              cause,
+              reason: `a pruned file declines hot reload`,
+              declinedBy: urlToRelativeUrl(prunedUrlInfo.url, rootDirectoryUrl),
+            })
+            return
+          }
+          instructions.push({
+            type: "prune",
+            boundary: urlToRelativeUrl(prunedUrlInfo.url, rootDirectoryUrl),
+            acceptedBy: urlToRelativeUrl(firstUrlInfo.url, rootDirectoryUrl),
+          })
+        }
+        notifyAccepted({
           cause,
-          reason: `a pruned file declines hot reload`,
-          declinedBy: urlToRelativeUrl(prunedUrlInfo.url, rootDirectoryUrl),
+          reason: mainHotUpdate.reason,
+          instructions,
         })
-        return
-      }
-      instructions.push({
-        type: "prune",
-        boundary: urlToRelativeUrl(prunedUrlInfo.url, rootDirectoryUrl),
-        acceptedBy: urlToRelativeUrl(firstUrlInfo.url, rootDirectoryUrl),
       })
-    }
-    notifyAccepted({
-      cause,
-      reason: mainHotUpdate.reason,
-      instructions,
-    })
-  })
-
-  return {
-    name: "jsenv:sse_server",
-    appliesDuring: { dev: true },
-    serve: (request) => {
+    },
+    serve: (request, { rootDirectoryUrl, urlGraph }) => {
       if (request.ressource === "/__graph__") {
         const graphJson = JSON.stringify(urlGraph.toJSON(rootDirectoryUrl))
         return {
@@ -190,15 +186,7 @@ export const jsenvPluginDevSSEServer = ({
           body: graphJson,
         }
       }
-      const { accept } = request.headers
-      if (accept && accept.includes("text/event-stream")) {
-        const room = sseService.getOrCreateSSERoom(request)
-        return room.join(request)
-      }
       return null
     },
-    destroy: () => {
-      sseService.destroy()
-    },
   }
 }

package/src/plugins/autoreload/jsenv_plugin_autoreload.js

@@ -3,8 +3,6 @@ import { jsenvPluginDevSSEClient } from "./dev_sse/jsenv_plugin_dev_sse_client.j
 import { jsenvPluginDevSSEServer } from "./dev_sse/jsenv_plugin_dev_sse_server.js"
 
 export const jsenvPluginAutoreload = ({
-  rootDirectoryUrl,
-  urlGraph,
   scenario,
   clientFileChangeCallbackList,
   clientFilesPruneCallbackList,
@@ -16,8 +14,6 @@ export const jsenvPluginAutoreload = ({
     jsenvPluginHmr(),
     jsenvPluginDevSSEClient(),
     jsenvPluginDevSSEServer({
-      rootDirectoryUrl,
-      urlGraph,
       clientFileChangeCallbackList,
       clientFilesPruneCallbackList,
     }),

package/src/plugins/bundling/js_module/bundle_js_module.js

@@ -125,7 +125,6 @@ const rollupPluginJsenv = ({
               usesImport:
                 rollupFileInfo.imports.length > 0 ||
                 rollupFileInfo.dynamicImports.length > 0,
-              usesExport: rollupFileInfo.exports.length > 0,
             },
             contentType: "text/javascript",
             content: rollupFileInfo.code,