@jsenv/core 27.0.0-alpha.59 → 27.0.0-alpha.61

package/package.json

@@ -1,8 +1,13 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.59",
+  "version": "27.0.0-alpha.61",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
+  "author": {
+    "name": "dmail",
+    "email": "dmaillard06@gmail.com",
+    "url": "https://twitter.com/damienmaillard"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/jsenv/jsenv-core"
@@ -33,18 +38,18 @@
   ],
   "scripts": {
     "eslint": "npx eslint . --ext=.js,.mjs,.cjs,.html",
-    "dev": "node ./script/dev/dev.mjs",
-    "build": "node ./script/build/build.mjs",
-    "test": "node ./script/test/test.mjs",
+    "dev": "node ./scripts/dev/dev.mjs",
+    "build": "node ./scripts/build/build.mjs",
+    "test": "node ./scripts/test/test.mjs",
     "test-packages": "npm run test --workspaces --if-present",
-    "start_file_server": "node ./script/dev/start_file_server.mjs",
-    "workspace-versions": "node ./script/publish/workspace_versions.mjs",
-    "workspace-publish": "node ./script/publish/workspace_publish.mjs",
-    "performances": "node --expose-gc ./script/performance/generate_performance_report.mjs --log --once",
-    "file-size": "node ./script/file_size/file_size.mjs --log",
+    "start_file_server": "node ./scripts/dev/start_file_server.mjs",
+    "workspace-versions": "node ./scripts/publish/workspace_versions.mjs",
+    "workspace-publish": "node ./scripts/publish/workspace_publish.mjs",
+    "performances": "node --expose-gc ./scripts/performance/generate_performance_report.mjs --log --once",
+    "file-size": "node ./scripts/file_size/file_size.mjs --log",
     "prettier": "prettier --write .",
     "playwright-install": "npx playwright install-deps && npx playwright install",
-    "certificate-install": "node ./script/dev/install_certificate_authority.mjs",
+    "certificate-install": "node ./scripts/dev/install_certificate_authority.mjs",
     "test-with-coverage": "npm run test -- --coverage",
     "prepublishOnly": "npm run build"
   },
@@ -63,12 +68,12 @@
     "@jsenv/filesystem": "3.2.2",
     "@jsenv/importmap": "1.2.0",
     "@jsenv/integrity": "0.0.1",
-    "@jsenv/log": "1.5.2",
+    "@jsenv/log": "1.6.0",
     "@jsenv/logger": "4.0.1",
     "@jsenv/node-esm-resolution": "0.0.6",
     "@jsenv/server": "12.6.2",
     "@jsenv/uneval": "1.6.0",
-    "@jsenv/utils": "1.7.4",
+    "@jsenv/utils": "1.7.6",
     "construct-style-sheets-polyfill": "3.1.0",
     "cssnano": "5.1.7",
     "cssnano-preset-default": "5.2.7",

package/readme.md

@@ -263,8 +263,8 @@ The presence of a jsenv configuration file is **optional**.
 /*
  * This file exports configuration reused by other files such as
  *
- * script/test/test.mjs
- * script/build/build.mjs
+ * scripts/test/test.mjs
+ * scripts/build/build.mjs
  *
  * Read more at https://github.com/jsenv/jsenv-core#configuration
  */

package/src/build/build.js

@@ -17,9 +17,9 @@ import {
   registerDirectoryLifecycle,
 } from "@jsenv/filesystem"
 import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
-import { createLogger } from "@jsenv/logger"
+import { createLogger, loggerToLevels } from "@jsenv/logger"
 
-import { createTaskLog } from "@jsenv/utils/logs/task_log.js"
+import { createTaskLog } from "@jsenv/log"
 import {
   injectQueryParams,
   setUrlFilename,
@@ -109,8 +109,9 @@ export const build = async ({
   cooldownBetweenFileEvents,
   watch = false,
 
-  writeOnFileSystem = true,
   buildDirectoryClean = true,
+  writeOnFileSystem = true,
+  writeGeneratedFiles = false,
   baseUrl = "/",
   assetManifest = true,
   assetManifestFileRelativeUrl = "asset-manifest.json",
@@ -140,6 +141,7 @@ export const build = async ({
   const runBuild = async ({ signal, logLevel }) => {
     const logger = createLogger({ logLevel })
     const buildOperation = Abort.startOperation()
+    const infoLogsAreDisabled = !loggerToLevels(logger).info
     buildOperation.addAbortSignal(signal)
     const entryPointKeys = Object.keys(entryPoints)
     if (entryPointKeys.length === 1) {
@@ -151,7 +153,9 @@ build ${entryPointKeys.length} entry points`)
     }
 
     const rawGraph = createUrlGraph()
-    const prebuildTask = createTaskLog(logger, "prebuild")
+    const prebuildTask = createTaskLog("prebuild", {
+      disabled: infoLogsAreDisabled,
+    })
     let urlCount = 0
     const rawGraphKitchen = createKitchen({
       signal,
@@ -161,6 +165,7 @@ build ${entryPointKeys.length} entry points`)
       scenario: "build",
       sourcemaps,
       runtimeCompat,
+      writeGeneratedFiles,
       plugins: [
         ...plugins,
         {
@@ -316,7 +321,9 @@ build ${entryPointKeys.length} entry points`)
       if (urlInfosToBundle.length === 0) {
         return
       }
-      const bundleTask = createTaskLog(logger, `bundle "${type}"`)
+      const bundleTask = createTaskLog(`bundle "${type}"`, {
+        disabled: infoLogsAreDisabled,
+      })
       try {
         const bundlerGeneratedUrlInfos =
           await rawGraphKitchen.pluginController.callAsyncHook(
@@ -378,6 +385,7 @@ build ${entryPointKeys.length} entry points`)
       sourcemaps,
       sourcemapsRelativeSources: !versioning,
       runtimeCompat,
+      writeGeneratedFiles,
       plugins: [
         jsenvPluginUrlAnalysis(),
         jsenvPluginAsJsClassic({
@@ -636,7 +644,7 @@ build ${entryPointKeys.length} entry points`)
         },
       ],
     })
-    const buildTask = createTaskLog(logger, "build")
+    const buildTask = createTaskLog("build", { disabled: infoLogsAreDisabled })
     const postBuildEntryUrls = []
     try {
       await loadUrlGraph({
@@ -670,6 +678,7 @@ ${Object.keys(finalGraph.urlInfos).join("\n")}`,
       await applyUrlVersioning({
         buildOperation,
         logger,
+        infoLogsAreDisabled,
         buildDirectoryUrl,
         rawUrls,
         buildUrls,
@@ -677,6 +686,7 @@ ${Object.keys(finalGraph.urlInfos).join("\n")}`,
         postBuildEntryUrls,
         sourcemaps,
         runtimeCompat,
+        writeGeneratedFiles,
         rawGraph,
         finalGraph,
         finalGraphKitchen,
@@ -802,11 +812,10 @@ ${Object.keys(finalGraph.urlInfos).join("\n")}`,
     resolveFirstBuild = resolve
     rejectFirstBuild = reject
   })
-  const watchLogger = createLogger({ logLevel: "info" })
   let buildAbortController
   let watchFilesTask
   const startBuild = async () => {
-    const buildTask = createTaskLog(watchLogger, "build")
+    const buildTask = createTaskLog("build")
     buildAbortController = new AbortController()
     try {
       const result = await runBuild({
@@ -815,14 +824,14 @@ ${Object.keys(finalGraph.urlInfos).join("\n")}`,
       })
       buildTask.done()
       resolveFirstBuild(result)
-      watchFilesTask = createTaskLog(watchLogger, "watch files")
+      watchFilesTask = createTaskLog("watch files")
     } catch (e) {
       if (Abort.isAbortError(e)) {
         buildTask.fail(`build aborted`)
       } else if (e.code === "PARSE_ERROR") {
         buildTask.fail()
-        watchLogger.error(e.stack)
-        watchFilesTask = createTaskLog(watchLogger, "watch files")
+        console.error(e.stack)
+        watchFilesTask = createTaskLog("watch files")
       } else {
         buildTask.fail()
         rejectFirstBuild(e)
@@ -871,6 +880,7 @@ ${Object.keys(finalGraph.urlInfos).join("\n")}`,
 const applyUrlVersioning = async ({
   buildOperation,
   logger,
+  infoLogsAreDisabled,
   buildDirectoryUrl,
   rawUrls,
   buildUrls,
@@ -878,13 +888,16 @@ const applyUrlVersioning = async ({
   postBuildEntryUrls,
   sourcemaps,
   runtimeCompat,
+  writeGeneratedFiles,
   rawGraph,
   finalGraph,
   finalGraphKitchen,
   lineBreakNormalization,
   versioningMethod,
 }) => {
-  const versioningTask = createTaskLog(logger, "inject version in urls")
+  const versioningTask = createTaskLog("inject version in urls", {
+    disabled: infoLogsAreDisabled,
+  })
   try {
     const urlsSorted = sortByDependencies(finalGraph.urlInfos)
     urlsSorted.forEach((url) => {
@@ -980,6 +993,7 @@ const applyUrlVersioning = async ({
       sourcemaps,
       sourcemapsRelativeSources: true,
       runtimeCompat,
+      writeGeneratedFiles,
       plugins: [
         jsenvPluginUrlAnalysis(),
         jsenvPluginInline({

package/src/build/start_build_server.js

@@ -25,10 +25,10 @@ import {
   assertAndNormalizeDirectoryUrl,
   registerDirectoryLifecycle,
 } from "@jsenv/filesystem"
-import { createLogger } from "@jsenv/logger"
+import { createLogger, loggerToLevels } from "@jsenv/logger"
 
+import { createTaskLog } from "@jsenv/log"
 import { initReloadableProcess } from "@jsenv/utils/process_reload/process_reload.js"
-import { createTaskLog } from "@jsenv/utils/logs/task_log.js"
 
 export const startBuildServer = async ({
   signal = new AbortController().signal,
@@ -114,7 +114,9 @@ export const startBuildServer = async ({
   }
   signal = reloadableProcess.signal
 
-  const startServerTask = createTaskLog(logger, "start build server")
+  const startBuildServerTask = createTaskLog("start build server", {
+    disabled: !loggerToLevels(logger).info,
+  })
   const server = await startServer({
     signal,
     stopOnExit: false,
@@ -174,7 +176,7 @@ export const startBuildServer = async ({
       )
     },
   })
-  startServerTask.done()
+  startBuildServerTask.done()
   logger.info(``)
   Object.keys(server.origins).forEach((key) => {
     logger.info(`- ${server.origins[key]}`)

package/src/dev/start_dev_server.js

@@ -2,10 +2,10 @@ import {
   assertAndNormalizeDirectoryUrl,
   registerDirectoryLifecycle,
 } from "@jsenv/filesystem"
-import { createLogger } from "@jsenv/logger"
+import { createLogger, loggerToLevels } from "@jsenv/logger"
 
+import { createTaskLog } from "@jsenv/log"
 import { initReloadableProcess } from "@jsenv/utils/process_reload/process_reload.js"
-import { createTaskLog } from "@jsenv/utils/logs/task_log.js"
 import { getCorePlugins } from "@jsenv/core/src/plugins/plugins.js"
 import { createUrlGraph } from "@jsenv/core/src/omega/url_graph.js"
 import { createKitchen } from "@jsenv/core/src/omega/kitchen.js"
@@ -61,6 +61,7 @@ export const startDevServer = async ({
     },
   },
   toolbar = false,
+  writeGeneratedFiles = true,
 }) => {
   const logger = createLogger({ logLevel })
   rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl)
@@ -118,7 +119,9 @@ export const startDevServer = async ({
     }
   }
 
-  const startServerTask = createTaskLog(logger, "start server")
+  const startDevServerTask = createTaskLog("start dev server", {
+    disabled: !loggerToLevels(logger).info,
+  })
 
   const clientFileChangeCallbackList = []
   const clientFilesPruneCallbackList = []
@@ -154,6 +157,7 @@ export const startDevServer = async ({
     urlGraph,
     scenario: "dev",
     sourcemaps,
+    writeGeneratedFiles,
     plugins: [
       ...plugins,
       ...getCorePlugins({
@@ -190,7 +194,7 @@ export const startDevServer = async ({
     kitchen,
     scenario: "dev",
   })
-  startServerTask.done()
+  startDevServerTask.done()
   logger.info(``)
   Object.keys(server.origins).forEach((key) => {
     logger.info(`- ${server.origins[key]}`)

package/src/execute/execute.js

@@ -35,6 +35,7 @@ export const execute = async ({
   injectedGlobals,
   transpilation,
   htmlSupervisor = true,
+  writeGeneratedFiles = false,
 
   port,
   protocol,
@@ -74,6 +75,7 @@ export const execute = async ({
       urlGraph,
       scenario,
       sourcemaps,
+      writeGeneratedFiles,
       plugins: [
         ...plugins,
         ...getCorePlugins({

package/src/omega/kitchen.js

@@ -47,7 +47,7 @@ export const createKitchen = ({
   }[scenario],
   sourcemapsRelativeSources,
   runtimeCompat = defaultRuntimeCompat,
-  writeOnFileSystem = true,
+  writeGeneratedFiles,
 }) => {
   const pluginController = createPluginController({
     plugins,
@@ -613,7 +613,7 @@ export const createKitchen = ({
     outDirectoryUrl = outDirectoryUrl ? String(outDirectoryUrl) : undefined
 
     const writeFiles = ({ gotError }) => {
-      if (!writeOnFileSystem || !outDirectoryUrl) {
+      if (!writeGeneratedFiles || !outDirectoryUrl) {
         return
       }
       const { generatedUrl } = urlInfo

package/src/omega/server/file_service.js

@@ -83,7 +83,10 @@ export const createFileService = ({
       await kitchen.cook({
         reference: referenceFromGraph || reference,
         urlInfo,
-        outDirectoryUrl: `${rootDirectoryUrl}.jsenv/${scenario}/${runtimeName}@${runtimeVersion}/`,
+        outDirectoryUrl:
+          scenario === "dev"
+            ? `${rootDirectoryUrl}.jsenv/${runtimeName}@${runtimeVersion}/`
+            : `${rootDirectoryUrl}.jsenv/${scenario}/${runtimeName}@${runtimeVersion}/`,
         clientRuntimeCompat: {
           [runtimeName]: runtimeVersion,
         },

package/src/omega/url_graph/url_graph_report.js

@@ -1,36 +1,32 @@
-import { ANSI } from "@jsenv/log"
-
-import { byteAsFileSize } from "@jsenv/utils/logs/size_log.js"
+import { ANSI, byteAsFileSize, distributePercentages } from "@jsenv/log"
 
 export const createUrlGraphSummary = (
   urlGraph,
   { title = "graph summary" } = {},
 ) => {
   const graphReport = createUrlGraphReport(urlGraph)
-  const totalLabel = `Total`
   return `--- ${title} ---  
 ${createRepartitionMessage(graphReport)}
-${ANSI.color(totalLabel, ANSI.GREY)} ${
-    graphReport.total.count
-  } (${byteAsFileSize(graphReport.total.size)})
 --------------------`
 }
 
 const createUrlGraphReport = (urlGraph) => {
   const { urlInfos } = urlGraph
   const countGroups = {
+    sourcemaps: 0,
     html: 0,
     css: 0,
     js: 0,
+    json: 0,
     other: 0,
-    sourcemaps: 0,
     total: 0,
   }
   const sizeGroups = {
+    sourcemaps: 0,
     html: 0,
     css: 0,
     js: 0,
-    sourcemaps: 0,
+    json: 0,
     other: 0,
     total: 0,
   }
@@ -81,17 +77,63 @@ const createUrlGraphReport = (urlGraph) => {
       sizeGroups.js += urlContentSize
       return
     }
+    if (category === "json") {
+      countGroups.json++
+      sizeGroups.json += urlContentSize
+      return
+    }
     countGroups.other++
     sizeGroups.other += urlContentSize
     return
   })
+
+  const sizesToDistribute = {}
+  Object.keys(sizeGroups).forEach((groupName) => {
+    if (groupName !== "sourcemaps" && groupName !== "total") {
+      sizesToDistribute[groupName] = sizeGroups[groupName]
+    }
+  })
+  const percentageGroups = distributePercentages(sizesToDistribute)
+
   return {
-    html: { count: countGroups.html, size: sizeGroups.html },
-    css: { count: countGroups.css, size: sizeGroups.css },
-    js: { count: countGroups.js, size: sizeGroups.js },
-    sourcemaps: { count: countGroups.sourcemaps, size: sizeGroups.sourcemaps },
-    other: { count: countGroups.other, size: sizeGroups.other },
-    total: { count: countGroups.total, size: sizeGroups.total },
+    // sourcemaps are special, there size are ignored
+    // so there is no "percentage" associated
+    sourcemaps: {
+      count: countGroups.sourcemaps,
+      size: sizeGroups.sourcemaps,
+      percentage: undefined,
+    },
+
+    html: {
+      count: countGroups.html,
+      size: sizeGroups.html,
+      percentage: percentageGroups.html,
+    },
+    css: {
+      count: countGroups.css,
+      size: sizeGroups.css,
+      percentage: percentageGroups.css,
+    },
+    js: {
+      count: countGroups.js,
+      size: sizeGroups.js,
+      percentage: percentageGroups.js,
+    },
+    json: {
+      count: countGroups.json,
+      size: sizeGroups.json,
+      percentage: percentageGroups.json,
+    },
+    other: {
+      count: countGroups.other,
+      size: sizeGroups.other,
+      percentage: percentageGroups.other,
+    },
+    total: {
+      count: countGroups.total,
+      size: sizeGroups.total,
+      percentage: 100,
+    },
   }
 }
 
@@ -108,32 +150,22 @@ const determineCategory = (urlInfo) => {
   if (urlInfo.type === "js_module" || urlInfo.type === "js_classic") {
     return "js"
   }
+  if (urlInfo.type === "json") {
+    return "json"
+  }
   return "other"
 }
 
-const createRepartitionMessage = ({ html, css, js, other }) => {
-  const parts = []
-  if (html.count) {
-    parts.push(
-      `${ANSI.color(`html:`, ANSI.GREY)} ${html.count} (${byteAsFileSize(
-        html.size,
-      )})`,
-    )
-  }
-  if (css.count) {
+const createRepartitionMessage = ({ html, css, js, json, other, total }) => {
+  const addPart = (name, { count, size, percentage }) => {
     parts.push(
-      `${ANSI.color(`css:`, ANSI.GREY)} ${css.count} (${byteAsFileSize(
-        css.size,
-      )})`,
-    )
-  }
-  if (js.count) {
-    parts.push(
-      `${ANSI.color(`js:`, ANSI.GREY)} ${js.count} (${byteAsFileSize(
-        js.size,
-      )})`,
+      `${ANSI.color(`${name}:`, ANSI.GREY)} ${count} (${byteAsFileSize(
+        size,
+      )} / ${percentage} %)`,
     )
   }
+
+  const parts = []
   // if (sourcemaps.count) {
   //   parts.push(
   //     `${ANSI.color(`sourcemaps:`, ANSI.GREY)} ${
@@ -141,13 +173,22 @@ const createRepartitionMessage = ({ html, css, js, other }) => {
   //     } (${byteAsFileSize(sourcemaps.size)})`,
   //   )
   // }
+  if (html.count) {
+    addPart("html ", html)
+  }
+  if (css.count) {
+    addPart("css  ", css)
+  }
+  if (js.count) {
+    addPart("js   ", js)
+  }
+  if (json.count) {
+    addPart("json ", json)
+  }
   if (other.count) {
-    parts.push(
-      `${ANSI.color(`other:`, ANSI.GREY)} ${other.count} (${byteAsFileSize(
-        other.size,
-      )})`,
-    )
+    addPart("other", other)
   }
+  addPart("total", total)
   return `- ${parts.join(`
 - `)}`
 }

package/src/plugins/autoreload/dev_sse/client/event_source_client.js

@@ -26,13 +26,16 @@ const dequeue = async () => {
   const callbacks = pendingCallbacks.slice()
   pendingCallbacks = []
   running = true
-  await callbacks.reduce(async (previous, callback) => {
-    await previous
-    await callback()
-  }, Promise.resolve())
-  running = false
-  if (pendingCallbacks.length) {
-    dequeue()
+  try {
+    await callbacks.reduce(async (previous, callback) => {
+      await previous
+      await callback()
+    }, Promise.resolve())
+  } finally {
+    running = false
+    if (pendingCallbacks.length) {
+      dequeue()
+    }
   }
 }
 

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

@@ -113,7 +113,7 @@ export const jsenvPluginDevSSEServer = ({
     return iterate(firstUrlInfo, trace)
   }
   clientFileChangeCallbackList.push(({ url, event }) => {
-    const urlInfo = urlGraph.urlInfos[url]
+    const urlInfo = urlGraph.getUrlInfo(url)
     // file not part of dependency graph
     if (!urlInfo) {
       return

package/src/plugins/cache_control/jsenv_plugin_cache_control.js

@@ -6,7 +6,7 @@ export const jsenvPluginCacheControl = () => {
       test: true,
     },
     augmentResponse: ({ reference }, context) => {
-      if (context.scenario === "dev") {
+      if (context.scenario === "test") {
         // During dev, all files are put into browser cache for 1 hour because:
         // 1: Browser cache is a temporary directory created by playwright
         // 2: We assume source files won't be modified while tests are running

package/src/plugins/import_meta_hot/html_hot_dependencies.js

@@ -103,7 +103,7 @@ export const collectHotDataFromHtmlAst = (htmlAst) => {
   }
   iterate(htmlAst, {})
 
-  return { hotReferences }
+  return hotReferences
 }
 
 const nodeNamesWithHref = ["link", "a", "image", "use"]
@@ -125,7 +125,7 @@ const getNodeContext = (node) => {
 
 const htmlNodeCanHotReload = (node) => {
   if (node.nodeName === "link") {
-    const { isStylesheet, isRessourceHint } = parseLinkNode(node)
+    const { isStylesheet, isRessourceHint, rel } = parseLinkNode(node)
     if (isStylesheet) {
       // stylesheets can be hot replaced by default
       return true
@@ -135,6 +135,9 @@ const htmlNodeCanHotReload = (node) => {
       // but we won't do anything (if the ressource is deleted we should?)
       return true
     }
+    if (rel === "icon") {
+      return true
+    }
     return false
   }
   return [

package/src/plugins/import_meta_hot/jsenv_plugin_import_meta_hot.js

@@ -25,7 +25,7 @@ export const jsenvPluginImportMetaHot = ({ rootDirectoryUrl }) => {
           return
         }
         const htmlAst = parseHtmlString(htmlUrlInfo.content)
-        const { hotReferences } = collectHotDataFromHtmlAst(htmlAst)
+        const hotReferences = collectHotDataFromHtmlAst(htmlAst)
         htmlUrlInfo.data.hotDecline = false
         htmlUrlInfo.data.hotAcceptSelf = false
         htmlUrlInfo.data.hotAcceptDependencies = hotReferences.map(

package/src/test/execute_plan.js

@@ -65,6 +65,7 @@ export const executePlan = async (
     nodeEsmResolution,
     fileSystemMagicResolution,
     transpilation,
+    writeGeneratedFiles,
 
     protocol,
     privateKey,
@@ -134,7 +135,7 @@ export const executePlan = async (
         urlGraph,
         scenario,
         sourcemaps,
-        writeOnFileSystem: false,
+        writeGeneratedFiles,
         plugins: [
           ...plugins,
           ...getCorePlugins({

package/src/test/execute_test_plan.js

@@ -87,6 +87,7 @@ export const executeTestPlan = async ({
   injectedGlobals,
   nodeEsmResolution,
   fileSystemMagicResolution,
+  writeGeneratedFiles = false,
 
   protocol,
   privateKey,
@@ -173,6 +174,7 @@ export const executeTestPlan = async ({
     injectedGlobals,
     nodeEsmResolution,
     fileSystemMagicResolution,
+    writeGeneratedFiles,
 
     protocol,
     privateKey,

package/src/test/logs_file_execution.js

@@ -1,7 +1,4 @@
-import { ANSI, UNICODE } from "@jsenv/log"
-
-import { msAsDuration } from "@jsenv/utils/logs/duration_log.js"
-import { byteAsMemoryUsage } from "@jsenv/utils/logs/size_log.js"
+import { ANSI, UNICODE, msAsDuration, byteAsMemoryUsage } from "@jsenv/log"
 
 import { EXECUTION_COLORS } from "./execution_colors.js"