@jsenv/core 40.12.7 → 40.12.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "40.12.7",
+  "version": "40.12.9",
   "description": "Tool to develop, test and build js projects",
   "repository": {
     "type": "git",
@@ -75,14 +75,14 @@
   },
   "dependencies": {
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
-    "@jsenv/ast": "6.7.20",
-    "@jsenv/js-module-fallback": "1.4.28",
-    "@jsenv/plugin-bundling": "2.10.7",
+    "@jsenv/ast": "6.7.21",
+    "@jsenv/js-module-fallback": "1.4.29",
+    "@jsenv/plugin-bundling": "2.10.9",
     "@jsenv/plugin-minification": "1.7.3",
-    "@jsenv/plugin-supervisor": "1.7.14",
-    "@jsenv/plugin-transpilation": "1.5.69",
-    "@jsenv/server": "16.3.5",
-    "@jsenv/sourcemap": "1.3.16",
+    "@jsenv/plugin-supervisor": "1.7.15",
+    "@jsenv/plugin-transpilation": "1.5.70",
+    "@jsenv/server": "16.3.6",
+    "@jsenv/sourcemap": "1.3.17",
     "react-table": "7.8.0"
   },
   "devDependencies": {
@@ -121,7 +121,9 @@
     "@playwright/browser-webkit": "1.58.1",
     "babel-plugin-transform-async-to-promises": "0.8.18",
     "eslint": "9.39.2",
-    "globals": "17.3.0",
+    "eslint-plugin-import-x": "4.16.2",
+    "eslint-plugin-regexp": "3.1.0",
+    "globals": "17.4.0",
     "open": "11.0.0",
     "playwright": "1.58.1",
     "preact": "11.0.0-beta.0",
@@ -129,11 +131,11 @@
     "prettier-plugin-css-order": "git+https://github.com/dmail-fork/prettier-plugin-css-order.git",
     "prettier-plugin-embed": "0.5.1",
     "prettier-plugin-organize-imports": "4.3.0",
-    "prettier-plugin-packagejson": "3.0.0",
+    "prettier-plugin-packagejson": "3.0.2",
     "prettier-plugin-sql": "0.19.2",
-    "strip-ansi": "7.1.2"
+    "strip-ansi": "7.2.0"
   },
-  "packageManager": "npm@11.3.0",
+  "packageManager": "npm@11.6.2",
   "engines": {
     "node": ">=20.8.0"
   },

package/src/build/build.js

@@ -24,7 +24,6 @@ import {
   compareFileUrls,
   createLookupPackageDirectory,
   ensureEmptyDirectory,
-  lookupPackageDirectory,
   readPackageAtOrNull,
   updateJsonFileSync,
   writeFileSync,
@@ -62,6 +61,7 @@ import { memoryUsage as processMemoryUsage } from "node:process";
 import { watchSourceFiles } from "../helpers/watch_source_files.js";
 import { jsenvCoreDirectoryUrl } from "../jsenv_core_directory_url.js";
 import { createKitchen } from "../kitchen/kitchen.js";
+import { createPackageDirectory } from "../kitchen/package_directory.js";
 import { GRAPH_VISITOR } from "../kitchen/url_graph/url_graph_visitor.js";
 import { jsenvPluginDirectoryReferenceEffect } from "../plugins/directory_reference_effect/jsenv_plugin_directory_reference_effect.js";
 import { jsenvPluginInlining } from "../plugins/inlining/jsenv_plugin_inlining.js";
@@ -562,20 +562,19 @@ export const build = async ({
     return compareFileUrls(a.sourceUrl, b.sourceUrl);
   });
 
-  const lookupPackageDirectoryUrl = createLookupPackageDirectory();
+  const lookupPackageDirectory = createLookupPackageDirectory();
+  const packageDirectory = createPackageDirectory({
+    sourceDirectoryUrl,
+    lookupPackageDirectory,
+  });
   const packageDirectoryCache = new Map();
-  const readPackageDirectory = (url) => {
+  packageDirectory.read = (url) => {
     const fromCache = packageDirectoryCache.get(url);
     if (fromCache !== undefined) {
       return fromCache;
     }
     return readPackageAtOrNull(url);
   };
-  const packageDirectory = {
-    url: lookupPackageDirectory(sourceDirectoryUrl),
-    find: lookupPackageDirectoryUrl,
-    read: readPackageDirectory,
-  };
 
   if (outDirectoryUrl === undefined) {
     if (
@@ -772,7 +771,7 @@ export const build = async ({
             sideEffects: sideEffectRelativeUrlArray,
           });
         };
-        const sideEffects = readPackageDirectory(
+        const sideEffects = packageDirectory.read(
           packageDirectory.url,
         )?.sideEffects;
         if (sideEffects === false) {

package/src/dev/start_dev_server.js

@@ -2,7 +2,6 @@ import {
   assertAndNormalizeDirectoryUrl,
   bufferToEtag,
   lookupPackageDirectory,
-  readPackageAtOrNull,
 } from "@jsenv/filesystem";
 import { createLogger, createTaskLog, formatError } from "@jsenv/humanize";
 import {
@@ -23,6 +22,7 @@ import { watchSourceFiles } from "../helpers/watch_source_files.js";
 import { WEB_URL_CONVERTER } from "../helpers/web_url_converter.js";
 import { jsenvCoreDirectoryUrl } from "../jsenv_core_directory_url.js";
 import { createKitchen } from "../kitchen/kitchen.js";
+import { createPackageDirectory } from "../kitchen/package_directory.js";
 import {
   createPluginController,
   createPluginStore,
@@ -97,9 +97,11 @@ export const startDevServer = async ({
   transpilation,
   cacheControl = true,
   ribbon = true,
+  dropToOpen = true,
   // toolbar = false,
   onKitchenCreated = () => {},
   spa,
+  packageBundle,
 
   sourcemaps = "inline",
   sourcemapsSourcesContent,
@@ -245,11 +247,9 @@ export const startDevServer = async ({
     );
     serverStopCallbackSet.add(stopWatchingSourceFiles);
 
-    const packageDirectory = {
-      url: lookupPackageDirectory(sourceDirectoryUrl),
-      find: lookupPackageDirectory,
-      read: readPackageAtOrNull,
-    };
+    const packageDirectory = createPackageDirectory({
+      sourceDirectoryUrl,
+    });
 
     const devServerPluginStore = await createPluginStore([
       jsenvPluginServerEvents({ clientAutoreload }),
@@ -272,11 +272,13 @@ export const startDevServer = async ({
         injections,
         transpilation,
         spa,
+        packageBundle,
 
         clientAutoreload,
         clientAutoreloadOnServerRestart,
         cacheControl,
         ribbon,
+        dropToOpen,
       }),
     ]);
     const getOrCreateKitchen = async (request) => {
@@ -331,66 +333,74 @@ export const startDevServer = async ({
         urlInfoCreated.isWatched = watch;
         // when an url depends on many others, we check all these (like package.json)
         urlInfoCreated.isValid = () => {
-          if (!urlInfoCreated.url.startsWith("file:")) {
-            return false;
-          }
-          if (urlInfoCreated.content === undefined) {
-            // urlInfo content is undefined when:
-            // - url info content never fetched
-            // - it is considered as modified because undelying file is watched and got saved
-            // - it is considered as modified because underlying file content
-            //   was compared using etag and it has changed
-            return false;
-          }
-          if (!watch) {
-            // file is not watched, check the filesystem
-            let fileContentAsBuffer;
-            try {
-              fileContentAsBuffer = readFileSync(new URL(urlInfoCreated.url));
-            } catch (e) {
-              if (e.code === "ENOENT") {
-                urlInfoCreated.onModified();
-                return false;
-              }
-              return false;
+          const seenSet = new Set();
+          const checkValidity = (urlInfo) => {
+            if (seenSet.has(urlInfo)) {
+              return true;
             }
-            const fileContentEtag = bufferToEtag(fileContentAsBuffer);
-            if (fileContentEtag !== urlInfoCreated.originalContentEtag) {
-              urlInfoCreated.onModified();
-              // restore content to be able to compare it again later
-              urlInfoCreated.kitchen.urlInfoTransformer.setContent(
-                urlInfoCreated,
-                String(fileContentAsBuffer),
-                {
-                  contentEtag: fileContentEtag,
-                },
-              );
+            seenSet.add(urlInfo);
+            if (!urlInfo.url.startsWith("file:")) {
               return false;
             }
-          }
-          for (const implicitUrl of urlInfoCreated.implicitUrlSet) {
-            const implicitUrlInfo =
-              urlInfoCreated.graph.getUrlInfo(implicitUrl);
-            if (!implicitUrlInfo) {
-              continue;
+            if (urlInfo.content === undefined) {
+              // urlInfo content is undefined when:
+              // - url info content never fetched
+              // - it is considered as modified because undelying file is watched and got saved
+              // - it is considered as modified because underlying file content
+              //   was compared using etag and it has changed
+              return false;
             }
-            if (implicitUrlInfo.content === undefined) {
-              // happens when we explicitely load an url with a search param
-              // - it creates an implicit url info to the url without params
-              // - we never explicitely request the url without search param so it has no content
-              // in that case the underlying urlInfo cannot be invalidate by the implicit
-              // we use modifiedTimestamp to detect if the url was loaded once
-              // or is just here to be used later
-              if (implicitUrlInfo.modifiedTimestamp) {
+            if (!urlInfo.isWatched) {
+              // file is not watched, check the filesystem
+              let fileContentAsBuffer;
+              try {
+                fileContentAsBuffer = readFileSync(new URL(urlInfo.url));
+              } catch (e) {
+                if (e.code === "ENOENT") {
+                  urlInfo.onModified();
+                  return false;
+                }
+                return false;
+              }
+              const fileContentEtag = bufferToEtag(fileContentAsBuffer);
+              if (fileContentEtag !== urlInfo.originalContentEtag) {
+                urlInfo.onModified();
+                // restore content to be able to compare it again later
+                urlInfo.kitchen.urlInfoTransformer.setContent(
+                  urlInfo,
+                  String(fileContentAsBuffer),
+                  {
+                    contentEtag: fileContentEtag,
+                  },
+                );
                 return false;
               }
-              continue;
             }
-            if (!implicitUrlInfo.isValid()) {
-              return false;
+            for (const implicitUrl of urlInfo.implicitUrlSet) {
+              const implicitUrlInfo = urlInfo.graph.getUrlInfo(implicitUrl);
+              if (!implicitUrlInfo) {
+                continue;
+              }
+              if (implicitUrlInfo.content === undefined) {
+                // happens when we explicitely load an url with a search param
+                // - it creates an implicit url info to the url without params
+                // - we never explicitely request the url without search param so it has no content
+                // in that case the underlying urlInfo cannot be invalidate by the implicit
+                // we use modifiedTimestamp to detect if the url was loaded once
+                // or is just here to be used later
+                if (implicitUrlInfo.modifiedTimestamp) {
+                  return false;
+                }
+                continue;
+              }
+              if (!checkValidity(implicitUrlInfo)) {
+                return false;
+              }
             }
-          }
-          return true;
+            return true;
+          };
+          const valid = checkValidity(urlInfoCreated);
+          return valid;
         };
       });
       kitchen.graph.urlInfoDereferencedEventEmitter.on(

package/src/kitchen/errors.js

@@ -338,6 +338,14 @@ const detailsFromPluginController = (pluginController) => {
 
 const detailsFromValueThrown = (valueThrownByPlugin) => {
   if (valueThrownByPlugin && valueThrownByPlugin instanceof Error) {
+    // if (
+    //   valueThrownByPlugin.message.includes("Maximum call stack size exceeded")
+    // ) {
+    //   return {
+    //     "error message": valueThrownByPlugin.message,
+    //     "error stack": valueThrownByPlugin.stack,
+    //   };
+    // }
     if (
       valueThrownByPlugin.code === "PARSE_ERROR" ||
       valueThrownByPlugin.code === "MODULE_NOT_FOUND" ||

package/src/kitchen/package_directory.js

@@ -0,0 +1,22 @@
+import {
+  lookupPackageDirectory as lookupPackageDirectoryDefault,
+  readPackageAtOrNull,
+} from "@jsenv/filesystem";
+
+export const createPackageDirectory = ({
+  sourceDirectoryUrl,
+  lookupPackageDirectory = lookupPackageDirectoryDefault,
+}) => {
+  const packageDirectory = {
+    url: lookupPackageDirectory(sourceDirectoryUrl),
+    find: (url) => {
+      const urlString = typeof url === "string" ? url : url?.href;
+      if (!urlString.startsWith("file:")) {
+        return null;
+      }
+      return lookupPackageDirectory(url);
+    },
+    read: readPackageAtOrNull,
+  };
+  return packageDirectory;
+};

package/src/kitchen/url_graph/url_graph.js

@@ -324,26 +324,13 @@ const createUrlInfo = (url, context) => {
     }
     return false;
   };
-  urlInfo.getWithoutSearchParam = (searchParam, { expectedType } = {}) => {
-    // The search param can be
-    // 1. injected by a plugin during "redirectReference"
-    //    - import assertions
-    //    - js module fallback to systemjs
-    // 2. already inside source files
-    //    - turn js module into js classic for convenience ?as_js_classic
-    //    - turn js classic to js module for to make it importable
-    if (!urlInfo.searchParams.has(searchParam)) {
-      return null;
-    }
+  const getNextUrlInfo = (newProps) => {
     const reference = urlInfo.firstReference;
-    const newSpecifier = injectQueryParamsIntoSpecifier(reference.specifier, {
-      [searchParam]: undefined,
-    });
-    const referenceWithoutSearchParam = reference.addImplicit({
+    const nextReference = reference.addImplicit({
       type: reference.type,
       subtype: reference.subtype,
       expectedContentType: reference.expectedContentType,
-      expectedType: expectedType || reference.expectedType,
+      expectedType: reference.expectedType,
       expectedSubtype: reference.expectedSubtype,
       integrity: reference.integrity,
       crossorigin: reference.crossorigin,
@@ -367,7 +354,6 @@ const createUrlInfo = (url, context) => {
       astInfo: reference.astInfo,
       mutation: reference.mutation,
       data: { ...reference.data },
-      specifier: newSpecifier,
       isWeak: true,
       isInline: reference.isInline,
       original: reference.original || reference,
@@ -377,9 +363,37 @@ const createUrlInfo = (url, context) => {
       // generatedUrl: null,
       // generatedSpecifier: null,
       // filename: null,
+      ...newProps,
+    });
+    reference.next = nextReference;
+    return nextReference.urlInfo;
+  };
+
+  urlInfo.redirect = (props) => {
+    return getNextUrlInfo(props);
+  };
+  urlInfo.getWithoutSearchParam = (searchParam, props) => {
+    // The search param can be
+    // 1. injected by a plugin during "redirectReference"
+    //    - import assertions
+    //    - js module fallback to systemjs
+    // 2. already inside source files
+    //    - turn js module into js classic for convenience ?as_js_classic
+    //    - turn js classic to js module for to make it importable
+    if (!urlInfo.searchParams.has(searchParam)) {
+      return null;
+    }
+    const reference = urlInfo.firstReference;
+    const specifierWithoutSearchParam = injectQueryParamsIntoSpecifier(
+      reference.specifier,
+      {
+        [searchParam]: undefined,
+      },
+    );
+    return urlInfo.redirect({
+      specifier: specifierWithoutSearchParam,
+      ...props,
     });
-    reference.next = referenceWithoutSearchParam;
-    return referenceWithoutSearchParam.urlInfo;
   };
   urlInfo.onRemoved = () => {
     urlInfo.kitchen.urlInfoTransformer.resetContent(urlInfo);

package/src/plugins/plugins.js

@@ -28,6 +28,7 @@ import { jsenvPluginCleanHTML } from "./clean_html/jsenv_plugin_clean_html.js";
 import { jsenvPluginChromeDevtoolsJson } from "./chrome_devtools_json/jsenv_plugin_chrome_devtools_json.js";
 import { jsenvPluginAutoreloadOnServerRestart } from "./autoreload_on_server_restart/jsenv_plugin_autoreload_on_server_restart.js";
 import { jsenvPluginPackageSideEffects } from "./package_side_effects/jsenv_plugin_package_side_effects.js";
+import { jsenvPluginWorkspaceBundle } from "./workspace_bundle/jsenv_plugin_workspace_bundle.js";
 
 export const getCorePlugins = ({
   rootDirectoryUrl,
@@ -50,12 +51,14 @@ export const getCorePlugins = ({
   inlining = true,
   http = false,
   spa,
+  packageBundle,
 
   clientAutoreload,
   clientAutoreloadOnServerRestart,
   cacheControl,
   scenarioPlaceholders = true,
   ribbon = true,
+  dropToOpen = true,
   packageSideEffects = false,
 } = {}) => {
   if (cacheControl === true) {
@@ -78,6 +81,9 @@ export const getCorePlugins = ({
   }
 
   return [
+    ...(packageBundle
+      ? [jsenvPluginWorkspaceBundle({ packageDirectory })]
+      : []),
     jsenvPluginReferenceAnalysis(referenceAnalysis),
     jsenvPluginInjections(injections),
     jsenvPluginTranspilation(transpilation),
@@ -116,11 +122,12 @@ export const getCorePlugins = ({
     },
     ...(nodeEsmResolution
       ? [
-          jsenvPluginNodeEsmResolution(
-            nodeEsmResolution,
+          jsenvPluginNodeEsmResolution({
+            packageDirectory,
+            resolutionConfig: nodeEsmResolution,
             packageConditions,
             packageConditionsConfig,
-          ),
+          }),
         ]
       : []),
     jsenvPluginWebResolution(),
@@ -147,7 +154,7 @@ export const getCorePlugins = ({
       : []),
     ...(cacheControl ? [jsenvPluginCacheControl(cacheControl)] : []),
     ...(ribbon ? [jsenvPluginRibbon({ rootDirectoryUrl, ...ribbon })] : []),
-    jsenvPluginDropToOpen(),
+    ...(dropToOpen ? [jsenvPluginDropToOpen()] : []),
     jsenvPluginCleanHTML(),
     jsenvPluginChromeDevtoolsJson(),
     ...(packageSideEffects

package/src/plugins/resolution_node_esm/jsenv_plugin_node_esm_resolution.js

@@ -1,10 +1,11 @@
 import { createNodeEsmResolver } from "./node_esm_resolver.js";
 
-export const jsenvPluginNodeEsmResolution = (
+export const jsenvPluginNodeEsmResolution = ({
+  packageDirectory,
   resolutionConfig = {},
   packageConditions,
   packageConditionsConfig = {},
-) => {
+}) => {
   let nodeEsmResolverDefault;
   const resolverMap = new Map();
   let anyTypeResolver;
@@ -22,6 +23,7 @@ export const jsenvPluginNodeEsmResolution = (
       );
     }
     return createNodeEsmResolver({
+      packageDirectory,
       runtimeCompat: kitchenContext.runtimeCompat,
       rootDirectoryUrl: kitchenContext.rootDirectoryUrl,
       packageConditions,
@@ -38,9 +40,10 @@ export const jsenvPluginNodeEsmResolution = (
     appliesDuring: "*",
     init: (kitchenContext) => {
       nodeEsmResolverDefault = createNodeEsmResolver({
+        packageDirectory,
         runtimeCompat: kitchenContext.runtimeCompat,
         rootDirectoryUrl: kitchenContext.rootDirectoryUrl,
-        preservesSymlink: true,
+        // preservesSymlink: true,
         packageConditions,
         packageConditionsConfig: {
           ...kitchenContext.packageConditionsConfig,