@jsenv/core 29.0.0 → 29.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "29.0.0",
+  "version": "29.1.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -73,7 +73,7 @@
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "3.3.0",
     "@jsenv/node-esm-resolution": "0.1.0",
-    "@jsenv/server": "14.1.3",
+    "@jsenv/server": "14.1.4",
     "@jsenv/sourcemap": "1.0.5",
     "@jsenv/uneval": "1.6.0",
     "@jsenv/url-meta": "7.0.0",

package/src/build/build.js

@@ -50,16 +50,16 @@ import {
   removeHtmlNode,
 } from "@jsenv/ast"
 
-import { sortByDependencies } from "../omega/url_graph/sort_by_dependencies.js"
-import { createUrlGraph } from "../omega/url_graph.js"
+import { sortByDependencies } from "../kitchen/url_graph/sort_by_dependencies.js"
+import { createUrlGraph } from "../kitchen/url_graph.js"
+import { createKitchen } from "../kitchen/kitchen.js"
+import { createUrlGraphLoader } from "../kitchen/url_graph/url_graph_loader.js"
+import { createUrlGraphSummary } from "../kitchen/url_graph/url_graph_report.js"
+import { isWebWorkerEntryPointReference } from "../kitchen/web_workers.js"
 import { jsenvPluginUrlAnalysis } from "../plugins/url_analysis/jsenv_plugin_url_analysis.js"
 import { jsenvPluginInline } from "../plugins/inline/jsenv_plugin_inline.js"
 import { jsenvPluginAsJsClassic } from "../plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic.js"
 import { getCorePlugins } from "../plugins/plugins.js"
-import { createKitchen } from "../omega/kitchen.js"
-import { createUrlGraphLoader } from "../omega/url_graph/url_graph_loader.js"
-import { createUrlGraphSummary } from "../omega/url_graph/url_graph_report.js"
-import { isWebWorkerEntryPointReference } from "../omega/web_workers.js"
 
 import { GRAPH } from "./graph_utils.js"
 import { createBuilUrlsGenerator } from "./build_urls_generator.js"

package/src/build/inject_global_version_mappings.js

@@ -8,7 +8,7 @@ import {
   stringifyHtmlAst,
 } from "@jsenv/ast"
 
-import { isWebWorkerUrlInfo } from "@jsenv/core/src/omega/web_workers.js"
+import { isWebWorkerUrlInfo } from "@jsenv/core/src/kitchen/web_workers.js"
 
 export const injectVersionMappings = async ({
   urlInfo,

package/src/{omega/server → dev}/file_service.js

@@ -8,9 +8,9 @@ import { registerDirectoryLifecycle, bufferToEtag } from "@jsenv/filesystem"
 import { urlIsInsideOf, moveUrl, asUrlWithoutSearch } from "@jsenv/urls"
 import { URL_META } from "@jsenv/url-meta"
 
+import { createUrlGraph } from "@jsenv/core/src/kitchen/url_graph.js"
+import { createKitchen } from "@jsenv/core/src/kitchen/kitchen.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"
 import { jsenvPluginServerEventsClientInjection } from "@jsenv/core/src/plugins/server_events/jsenv_plugin_server_events_client_injection.js"
 import { parseUserAgentHeader } from "./user_agent.js"
 

package/src/dev/start_dev_server.js

@@ -6,16 +6,23 @@ import {
 import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
 import { createLogger, createTaskLog } from "@jsenv/log"
 import { getCallerPosition } from "@jsenv/urls"
+import {
+  jsenvAccessControlAllowedHeaders,
+  startServer,
+  jsenvServiceCORS,
+  jsenvServiceErrorHandler,
+} from "@jsenv/server"
+import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js"
 
+import { createServerEventsDispatcher } from "@jsenv/core/src/plugins/server_events/server_events_dispatcher.js"
 import { defaultRuntimeCompat } from "@jsenv/core/src/build/build.js"
 import { createReloadableWorker } from "@jsenv/core/src/helpers/worker_reload.js"
-import { startOmegaServer } from "@jsenv/core/src/omega/omega_server.js"
+import { createFileService } from "./file_service.js"
 
 export const startDevServer = async ({
   signal = new AbortController().signal,
   handleSIGINT = true,
   logLevel = "info",
-  omegaServerLogLevel = "warn",
   protocol = "http",
   // it's better to use http1 by default because it allows to get statusText in devtools
   // which gives valuable information when there is errors
@@ -26,7 +33,8 @@ export const startDevServer = async ({
   port = 3456,
   acceptAnyIp,
   keepProcessAlive = true,
-  services,
+  services = [],
+  onStop = () => {},
 
   rootDirectoryUrl,
   clientFiles = {
@@ -134,39 +142,130 @@ export const startDevServer = async ({
     disabled: !logger.levels.info,
   })
 
-  const server = await startOmegaServer({
-    logLevel: omegaServerLogLevel,
+  const serverStopCallbacks = []
+  const serverEventsDispatcher = createServerEventsDispatcher()
+  serverStopCallbacks.push(() => {
+    serverEventsDispatcher.destroy()
+  })
+  const server = await startServer({
+    signal,
+    stopOnExit: false,
+    stopOnSIGINT: handleSIGINT,
+    stopOnInternalError: false,
     keepProcessAlive,
-    acceptAnyIp,
+    logLevel,
+    startLog: false,
+
     protocol,
     http2,
     certificate,
     privateKey,
+    acceptAnyIp,
     hostname,
     port,
-    services,
+    requestWaitingMs: 60_000,
+    services: [
+      jsenvServiceCORS({
+        accessControlAllowRequestOrigin: true,
+        accessControlAllowRequestMethod: true,
+        accessControlAllowRequestHeaders: true,
+        accessControlAllowedRequestHeaders: [
+          ...jsenvAccessControlAllowedHeaders,
+          "x-jsenv-execution-id",
+        ],
+        accessControlAllowCredentials: true,
+        timingAllowOrigin: true,
+      }),
+      ...services,
+      {
+        name: "jsenv:omega_file_service",
+        handleRequest: createFileService({
+          signal,
+          logLevel,
+          serverStopCallbacks,
+          serverEventsDispatcher,
 
-    rootDirectoryUrl,
-    scenarios: { dev: true },
-    runtimeCompat,
+          rootDirectoryUrl,
+          scenarios: { dev: true },
+          runtimeCompat,
 
-    plugins,
-    urlAnalysis,
-    urlResolution,
-    fileSystemMagicRedirection,
-    supervisor,
-    transpilation,
-    clientFiles,
-    clientMainFileUrl,
-    clientAutoreload,
-    cooldownBetweenFileEvents,
-    explorer,
-    sourcemaps,
-    sourcemapsSourcesProtocol,
-    sourcemapsSourcesContent,
-    writeGeneratedFiles,
+          plugins,
+          urlAnalysis,
+          urlResolution,
+          fileSystemMagicRedirection,
+          supervisor,
+          transpilation,
+          clientAutoreload,
+          clientFiles,
+          clientMainFileUrl,
+          cooldownBetweenFileEvents,
+          explorer,
+          sourcemaps,
+          sourcemapsSourcesProtocol,
+          sourcemapsSourcesContent,
+          writeGeneratedFiles,
+        }),
+        handleWebsocket: (websocket, { request }) => {
+          if (request.headers["sec-websocket-protocol"] === "jsenv") {
+            serverEventsDispatcher.addWebsocket(websocket, request)
+          }
+        },
+      },
+      {
+        name: "jsenv:omega_error_handler",
+        handleError: (error) => {
+          const getResponseForError = () => {
+            if (error && error.asResponse) {
+              return error.asResponse()
+            }
+            if (
+              error &&
+              error.statusText === "Unexpected directory operation"
+            ) {
+              return {
+                status: 403,
+              }
+            }
+            return convertFileSystemErrorToResponseProperties(error)
+          }
+          const response = getResponseForError()
+          if (!response) {
+            return null
+          }
+          const body = JSON.stringify({
+            status: response.status,
+            statusText: response.statusText,
+            headers: response.headers,
+            body: response.body,
+          })
+          return {
+            status: 200,
+            headers: {
+              "content-type": "application/json",
+              "content-length": Buffer.byteLength(body),
+            },
+            body,
+          }
+        },
+      },
+      // default error handling
+      jsenvServiceErrorHandler({
+        sendErrorDetails: true,
+      }),
+    ],
+    onStop: (reason) => {
+      onStop()
+      serverStopCallbacks.forEach((serverStopCallback) => {
+        serverStopCallback(reason)
+      })
+      serverStopCallbacks.length = 0
+    },
   })
   startDevServerTask.done()
+  if (hostname) {
+    delete server.origins.localip
+    delete server.origins.externalip
+  }
   logger.info(``)
   Object.keys(server.origins).forEach((key) => {
     logger.info(`- ${server.origins[key]}`)

package/src/{omega → kitchen}/errors.js

@@ -104,7 +104,7 @@ export const createTransformUrlContentError = ({
   }) => {
     const transformError = new Error(
       createDetailedMessage(
-        `Failed to transform url content of "${urlInfo.type}"`,
+        `"transformUrlContent" error on "${urlInfo.type}"`,
         {
           reason,
           ...details,
@@ -148,7 +148,7 @@ export const createTransformUrlContentError = ({
     return transformError
   }
   return createFailedToTransformError({
-    reason: `An error occured during "transformUrlContent"`,
+    reason: `"transformUrlContent" error on "${urlInfo.type}"`,
     ...detailsFromValueThrown(error),
   })
 }
@@ -160,8 +160,7 @@ export const createFinalizeUrlContentError = ({
   error,
 }) => {
   const finalizeError = new Error(
-    createDetailedMessage(`Failed to finalize ${urlInfo.type} url content`, {
-      "reason": `An error occured during "finalizeUrlContent"`,
+    createDetailedMessage(`"finalizeUrlContent" error on "${urlInfo.type}"`, {
       ...detailsFromValueThrown(error),
       "url": urlInfo.url,
       "url reference trace": reference.trace.message,
@@ -172,7 +171,7 @@ export const createFinalizeUrlContentError = ({
     finalizeError.cause = error
   }
   finalizeError.name = "FINALIZE_URL_CONTENT_ERROR"
-  finalizeError.reason = `An error occured during "finalizeUrlContent"`
+  finalizeError.reason = `"finalizeUrlContent" error on "${urlInfo.type}"`
   return finalizeError
 }
 

package/src/plugins/bundling/css/bundle_css.js

@@ -9,7 +9,7 @@
 import { createMagicSource } from "@jsenv/sourcemap"
 import { applyPostCss, postCssPluginUrlVisitor } from "@jsenv/ast"
 
-import { sortByDependencies } from "@jsenv/core/src/omega/url_graph/sort_by_dependencies.js"
+import { sortByDependencies } from "@jsenv/core/src/kitchen/url_graph/sort_by_dependencies.js"
 
 // Do not use until https://github.com/parcel-bundler/parcel-css/issues/181
 export const bundleCss = async ({ cssUrlInfos, context }) => {

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

@@ -6,7 +6,7 @@ import { createDetailedMessage } from "@jsenv/log"
 import { babelHelperNameFromUrl } from "@jsenv/babel-plugins"
 import { sourcemapConverter } from "@jsenv/sourcemap"
 
-import { fileUrlConverter } from "@jsenv/core/src/omega/file_url_converter.js"
+import { fileUrlConverter } from "@jsenv/core/src/kitchen/file_url_converter.js"
 
 const globalThisClientFileUrl = new URL(
   "../../transpilation/babel/global_this/client/global_this.js",

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic_library.js

@@ -1,4 +1,4 @@
-import { createUrlGraphLoader } from "@jsenv/core/src/omega/url_graph/url_graph_loader.js"
+import { createUrlGraphLoader } from "@jsenv/core/src/kitchen/url_graph/url_graph_loader.js"
 import { bundleJsModules } from "@jsenv/core/src/plugins/bundling/js_module/bundle_js_modules.js"
 
 import { convertJsModuleToJsClassic } from "./convert_js_module_to_js_classic.js"

package/src/plugins/transpilation/babel/jsenv_plugin_babel.js

@@ -2,7 +2,7 @@ import { applyBabelPlugins } from "@jsenv/ast"
 import { URL_META } from "@jsenv/url-meta"
 
 import { babelPluginInstrument } from "@jsenv/core/src/test/coverage/babel_plugin_instrument.js"
-import { RUNTIME_COMPAT } from "@jsenv/core/src/omega/compat/runtime_compat.js"
+import { RUNTIME_COMPAT } from "@jsenv/core/src/kitchen/compat/runtime_compat.js"
 import { getBaseBabelPluginStructure } from "./helpers/babel_plugin_structure.js"
 import { babelPluginBabelHelpersAsJsenvImports } from "./helpers/babel_plugin_babel_helpers_as_jsenv_imports.js"
 import { babelPluginNewStylesheetAsJsenvImport } from "./new_stylesheet/babel_plugin_new_stylesheet_as_jsenv_import.js"

package/src/plugins/url_analysis/js/js_urls.js

@@ -1,7 +1,7 @@
 import { createMagicSource } from "@jsenv/sourcemap"
 import { parseJsUrls } from "@jsenv/ast"
 
-import { isWebWorkerUrlInfo } from "@jsenv/core/src/omega/web_workers.js"
+import { isWebWorkerUrlInfo } from "@jsenv/core/src/kitchen/web_workers.js"
 
 export const parseAndTransformJsUrls = async (urlInfo, context) => {
   const jsMentions = await parseJsUrls({

package/src/plugins/url_resolution/jsenv_plugin_url_resolution.js

@@ -37,17 +37,19 @@ export const jsenvPluginUrlResolution = ({
   const resolveUrlUsingWebResolution = (reference) => {
     return new URL(
       reference.specifier,
+      // baseUrl happens second argument to new URL() is different from
+      // import.meta.url or document.currentScript.src
       reference.baseUrl || reference.parentUrl,
     ).href
   }
 
   const resolvers = {}
-  Object.keys(urlResolution).forEach((referenceType) => {
-    const resolver = urlResolution[referenceType]
+  Object.keys(urlResolution).forEach((urlType) => {
+    const resolver = urlResolution[urlType]
     if (typeof resolver !== "object") {
       throw new Error(
         `Unexpected urlResolution configuration:
-"${referenceType}" resolution value must be an object, got ${resolver}`,
+"${urlType}" resolution value must be an object, got ${resolver}`,
       )
     }
     let { web, node_esm, ...rest } = resolver
@@ -55,13 +57,13 @@ export const jsenvPluginUrlResolution = ({
     if (unexpectedKey) {
       throw new Error(
         `Unexpected urlResolution configuration:
-"${referenceType}" resolution key must be "web" or "node_esm", found "${
+"${urlType}" resolution key must be "web" or "node_esm", found "${
           Object.keys(rest)[0]
         }"`,
       )
     }
     if (node_esm === undefined) {
-      node_esm = referenceType === "js_import_export"
+      node_esm = urlType === "js_module"
     }
     if (web === undefined) {
       web = true
@@ -69,17 +71,17 @@ export const jsenvPluginUrlResolution = ({
     if (node_esm) {
       if (node_esm === true) node_esm = {}
       const { packageConditions } = node_esm
-      resolvers[referenceType] = createNodeEsmResolver({
+      resolvers[urlType] = createNodeEsmResolver({
         runtimeCompat,
         packageConditions,
       })
     } else if (web) {
-      resolvers[referenceType] = resolveUrlUsingWebResolution
+      resolvers[urlType] = resolveUrlUsingWebResolution
     }
   })
 
-  if (!resolvers["js_import_export"]) {
-    resolvers.js_import_export = createNodeEsmResolver({ runtimeCompat })
+  if (!resolvers.js_module) {
+    resolvers.js_module = createNodeEsmResolver({ runtimeCompat })
   }
   if (!resolvers["*"]) {
     resolvers["*"] = resolveUrlUsingWebResolution
@@ -96,7 +98,9 @@ export const jsenvPluginUrlResolution = ({
         return new URL(reference.specifier.slice(1), context.rootDirectoryUrl)
           .href
       }
-      const resolver = resolvers[reference.type] || resolvers["*"]
+      const parentUrlInfo = context.urlGraph.getUrlInfo(reference.parentUrl)
+      const urlType = parentUrlInfo ? parentUrlInfo.type : "entry_point"
+      const resolver = resolvers[urlType] || resolvers["*"]
       return resolver(reference, context)
     },
     // when specifier is prefixed by "file:///@ignore/"

package/src/plugins/url_resolution/node_esm_resolver.js

@@ -26,11 +26,17 @@ export const createNodeEsmResolver = ({ runtimeCompat, packageConditions }) => {
   ]
 
   return (reference, context) => {
-    const { parentUrl, specifier } = reference
+    if (reference.type === "package_json") {
+      return reference.specifier
+    }
+    const parentUrl = reference.baseUrl || reference.parentUrl
+    if (!parentUrl.startsWith("file:")) {
+      return new URL(reference.specifier, parentUrl).href
+    }
     const { url, type, packageUrl } = applyNodeEsmResolution({
       conditions: packageConditions,
       parentUrl,
-      specifier,
+      specifier: reference.specifier,
     })
     if (context.scenarios.dev) {
       const dependsOnPackageJson =

package/src/omega/omega_server.js

@@ -1,167 +0,0 @@
-import {
-  jsenvAccessControlAllowedHeaders,
-  startServer,
-  jsenvServiceCORS,
-  jsenvServiceErrorHandler,
-} from "@jsenv/server"
-import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js"
-import { createServerEventsDispatcher } from "@jsenv/core/src/plugins/server_events/server_events_dispatcher.js"
-
-import { createFileService } from "./server/file_service.js"
-
-export const startOmegaServer = async ({
-  signal,
-  handleSIGINT,
-  logLevel,
-  protocol = "http",
-  http2 = protocol === "https",
-  privateKey,
-  certificate,
-  acceptAnyIp,
-  hostname,
-  port = 0,
-  keepProcessAlive = false,
-  onStop = () => {},
-  services = [],
-
-  rootDirectoryUrl,
-  scenarios,
-  runtimeCompat,
-
-  plugins,
-  urlAnalysis,
-  urlResolution,
-  fileSystemMagicRedirection,
-  supervisor,
-  transpilation,
-  clientAutoreload,
-  clientFiles,
-  clientMainFileUrl,
-  cooldownBetweenFileEvents,
-  explorer,
-  sourcemaps,
-  sourcemapsSourcesProtocol,
-  sourcemapsSourcesContent,
-  writeGeneratedFiles,
-}) => {
-  const serverStopCallbacks = []
-  const serverEventsDispatcher = createServerEventsDispatcher()
-  serverStopCallbacks.push(() => {
-    serverEventsDispatcher.destroy()
-  })
-  const server = await startServer({
-    signal,
-    stopOnExit: false,
-    stopOnSIGINT: handleSIGINT,
-    stopOnInternalError: false,
-    keepProcessAlive,
-    logLevel,
-    startLog: false,
-
-    protocol,
-    http2,
-    certificate,
-    privateKey,
-    acceptAnyIp,
-    hostname,
-    port,
-    requestWaitingMs: 60_1000,
-    services: [
-      jsenvServiceCORS({
-        accessControlAllowRequestOrigin: true,
-        accessControlAllowRequestMethod: true,
-        accessControlAllowRequestHeaders: true,
-        accessControlAllowedRequestHeaders: [
-          ...jsenvAccessControlAllowedHeaders,
-          "x-jsenv-execution-id",
-        ],
-        accessControlAllowCredentials: true,
-        timingAllowOrigin: true,
-      }),
-      ...services,
-      {
-        name: "jsenv:omega_file_service",
-        handleRequest: createFileService({
-          signal,
-          logLevel,
-          serverStopCallbacks,
-          serverEventsDispatcher,
-
-          rootDirectoryUrl,
-          scenarios,
-          runtimeCompat,
-
-          plugins,
-          urlAnalysis,
-          urlResolution,
-          fileSystemMagicRedirection,
-          supervisor,
-          transpilation,
-          clientAutoreload,
-          clientFiles,
-          clientMainFileUrl,
-          cooldownBetweenFileEvents,
-          explorer,
-          sourcemaps,
-          sourcemapsSourcesProtocol,
-          sourcemapsSourcesContent,
-          writeGeneratedFiles,
-        }),
-        handleWebsocket: (websocket, { request }) => {
-          if (request.headers["sec-websocket-protocol"] === "jsenv") {
-            serverEventsDispatcher.addWebsocket(websocket, request)
-          }
-        },
-      },
-      {
-        name: "jsenv:omega_error_handler",
-        handleError: (error) => {
-          const getResponseForError = () => {
-            if (error && error.asResponse) {
-              return error.asResponse()
-            }
-            if (
-              error &&
-              error.statusText === "Unexpected directory operation"
-            ) {
-              return {
-                status: 403,
-              }
-            }
-            return convertFileSystemErrorToResponseProperties(error)
-          }
-          const response = getResponseForError()
-          if (!response) {
-            return null
-          }
-          const body = JSON.stringify({
-            status: response.status,
-            statusText: response.statusText,
-            headers: response.headers,
-            body: response.body,
-          })
-          return {
-            status: 200,
-            headers: {
-              "content-type": "application/json",
-              "content-length": Buffer.byteLength(body),
-            },
-            body,
-          }
-        },
-      },
-      // default error handling
-      jsenvServiceErrorHandler({
-        sendErrorDetails: true,
-      }),
-    ],
-    onStop: (reason) => {
-      onStop()
-      serverStopCallbacks.forEach((serverStopCallback) => {
-        serverStopCallback(reason)
-      })
-      serverStopCallbacks.length = 0
-    },
-  })
-  return server
-}