@jsenv/core 39.13.0 → 39.13.2

package/dist/js/directory_listing.js

@@ -8,7 +8,7 @@ var f=0;function u(e,t,n,o,i,u){t||(t={});var a,c,p=t;if("ref"in p)for(c in p={}
 
 const directoryIconUrl = new URL("../other/dir.png", import.meta.url).href;
 const fileIconUrl = new URL("../other/file.png", import.meta.url).href;
-const homeIconUrl = new URL("../other/home.svg", import.meta.url).href;
+const homeIconUrl = new URL("../other/home.svg#root", import.meta.url).href;
 let {
   navItems,
   mainFilePath,

package/dist/jsenv_core.js

@@ -2717,12 +2717,18 @@ const applyMatching = (pattern, string) => {
     }
   };
   const matchOne = () => {
-    // pattern consumed and string consumed
-    if (remainingPattern === "" && remainingString === "") {
-      return true; // string fully matched pattern
-    }
-    // pattern consumed, string not consumed
-    if (remainingPattern === "" && remainingString !== "") {
+    // pattern consumed
+    if (remainingPattern === "") {
+      if (remainingString === "") {
+        return true; // string fully matched pattern
+      }
+      if (remainingString[0] === "?") {
+        // match search params
+        consumeRemainingString();
+
+        return true;
+      }
+      // if remainingString
       return false; // fails because string longer than expect
     }
     // -- from this point pattern is not consumed --
@@ -13158,7 +13164,6 @@ const createReference = ({
   specifierColumn,
   baseUrl,
   isOriginalPosition,
-  isDirectRequest = false,
   isEntryPoint = false,
   isResourceHint = false,
   // implicit references are not real references
@@ -13233,7 +13238,6 @@ const createReference = ({
     specifierColumn,
     isOriginalPosition,
     baseUrl,
-    isDirectRequest,
     isEntryPoint,
     isResourceHint,
     isImplicit,
@@ -15012,25 +15016,6 @@ ${ANSI.color(reference.url, ANSI.YELLOW)}
 `);
         }
       }
-      const request = kitchen.context.request;
-      if (request) {
-        let requestResource = request.resource;
-        let requestedUrl;
-        if (requestResource.startsWith("/@fs/")) {
-          const fsRootRelativeUrl = requestResource.slice("/@fs/".length);
-          requestedUrl = `file:///${fsRootRelativeUrl}`;
-        } else {
-          const requestedUrlObject = new URL(
-            requestResource === "/" ? mainFilePath : requestResource.slice(1),
-            rootDirectoryUrl,
-          );
-          requestedUrlObject.searchParams.delete("hot");
-          requestedUrl = requestedUrlObject.href;
-        }
-        if (requestedUrl === reference.url) {
-          reference.isDirectRequest = true;
-        }
-      }
       redirect: {
         if (reference.isImplicit && reference.isWeak) {
           // not needed for implicit references that are not rendered anywhere
@@ -17857,7 +17842,7 @@ const jsenvPluginInlineContentFetcher = () => {
       if (!urlInfo.isInline) {
         return null;
       }
-      const { isDirectRequest } = urlInfo.lastReference;
+      const isDirectRequest = urlInfo.context.requestedUrl === urlInfo.url;
       /*
        * We want to find inline content but it's not straightforward
        *
@@ -19430,6 +19415,11 @@ return {
 /*
  * NICE TO HAVE:
  * 
+ * - when clicking the server root directory from the root directory 
+ * we should see "/..." in the url bar
+ * instead we ses "@fs/"
+ * everything still works but that would be cleaner
+ * 
  * - when visiting urls outside server root directory the UI is messed up
  * 
  * Let's say I visit file outside the server root directory that is in 404
@@ -19453,9 +19443,9 @@ const htmlFileUrlForDirectory = new URL(
 );
 
 const jsenvPluginDirectoryListing = ({
-  directoryContentMagicName,
-  directoryListingUrlMocks,
+  urlMocks = false,
   autoreload = true,
+  directoryContentMagicName,
 }) => {
   return {
     name: "jsenv:directory_listing",
@@ -19473,10 +19463,10 @@ const jsenvPluginDirectoryListing = ({
         fsStat = readEntryStatSync(url, { nullIfNotFound: true });
         reference.fsStat = fsStat;
       }
-      const { request } = reference.ownerUrlInfo.context;
+      const { request, requestedUrl } = reference.ownerUrlInfo.context;
       if (!fsStat) {
         if (
-          reference.isDirectRequest &&
+          requestedUrl === url &&
           request &&
           request.headers["sec-fetch-dest"] === "document"
         ) {
@@ -19526,7 +19516,7 @@ const jsenvPluginDirectoryListing = ({
             ...generateDirectoryListingInjection(requestedUrl, {
               autoreload,
               request,
-              directoryListingUrlMocks,
+              urlMocks,
               directoryContentMagicName,
               rootDirectoryUrl,
               mainFilePath,
@@ -19605,7 +19595,7 @@ const generateDirectoryListingInjection = (
     rootDirectoryUrl,
     mainFilePath,
     request,
-    directoryListingUrlMocks,
+    urlMocks,
     directoryContentMagicName,
     autoreload,
     enoent,
@@ -19744,7 +19734,7 @@ const generateDirectoryListingInjection = (
     __DIRECTORY_LISTING__: {
       enoentDetails,
       navItems,
-      directoryListingUrlMocks,
+      urlMocks,
       directoryContentMagicName,
       directoryUrl: firstExistingDirectoryUrl,
       serverRootDirectoryUrl,
@@ -19946,11 +19936,10 @@ const resolveSymlink = (fileUrl) => {
 const directoryContentMagicName = "...";
 
 const jsenvPluginProtocolFile = ({
-  supervisorEnabled,
   magicExtensions,
   magicDirectoryIndex,
   preserveSymlinks,
-  directoryListingUrlMocks,
+  directoryListing,
 }) => {
   return [
     jsenvPluginFsRedirection({
@@ -20006,11 +19995,14 @@ const jsenvPluginProtocolFile = ({
         );
       },
     },
-    jsenvPluginDirectoryListing({
-      supervisorEnabled,
-      directoryContentMagicName,
-      directoryListingUrlMocks,
-    }),
+    ...(directoryListing
+      ? [
+          jsenvPluginDirectoryListing({
+            ...directoryListing,
+            directoryContentMagicName,
+          }),
+        ]
+      : []),
     {
       name: "jsenv:directory_as_json",
       appliesDuring: "*",
@@ -21446,7 +21438,7 @@ const getCorePlugins = ({
   nodeEsmResolution = {},
   magicExtensions,
   magicDirectoryIndex,
-  directoryListingUrlMocks,
+  directoryListing = true,
   directoryReferenceEffect,
   supervisor,
   injections,
@@ -21474,6 +21466,9 @@ const getCorePlugins = ({
   if (http === false) {
     http = { include: false };
   }
+  if (directoryListing === true) {
+    directoryListing = {};
+  }
 
   return [
     jsenvPluginReferenceAnalysis(referenceAnalysis),
@@ -21492,7 +21487,7 @@ const getCorePlugins = ({
     jsenvPluginProtocolFile({
       magicExtensions,
       magicDirectoryIndex,
-      directoryListingUrlMocks,
+      directoryListing,
     }),
     {
       name: "jsenv:resolve_root_as_main",
@@ -21653,7 +21648,6 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       integer++;
       nameCandidate = `${basename}${integer}${extension}`;
     }
-    hash = "";
     const buildUrl = `${buildDirectoryUrl}${directoryPath}${nameCandidate}${search}${hash}`;
     associateBuildUrl(url, buildUrl);
     return buildUrl;
@@ -24151,7 +24145,7 @@ const startDevServer = async ({
   supervisor = true,
   magicExtensions,
   magicDirectoryIndex,
-  directoryListingUrlMocks,
+  directoryListing,
   injections,
   transpilation,
   cacheControl = true,
@@ -24350,7 +24344,7 @@ const startDevServer = async ({
             nodeEsmResolution,
             magicExtensions,
             magicDirectoryIndex,
-            directoryListingUrlMocks,
+            directoryListing,
             supervisor,
             injections,
             transpilation,
@@ -24424,6 +24418,11 @@ const startDevServer = async ({
               // - 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 (!implicitUrlInfo.isValid()) {
@@ -24466,6 +24465,20 @@ const startDevServer = async ({
         if (responseFromPlugin) {
           return responseFromPlugin;
         }
+        const { rootDirectoryUrl, mainFilePath } = kitchen.context;
+        let requestResource = request.resource;
+        let requestedUrl;
+        if (requestResource.startsWith("/@fs/")) {
+          const fsRootRelativeUrl = requestResource.slice("/@fs/".length);
+          requestedUrl = `file:///${fsRootRelativeUrl}`;
+        } else {
+          const requestedUrlObject = new URL(
+            requestResource === "/" ? mainFilePath : requestResource.slice(1),
+            rootDirectoryUrl,
+          );
+          requestedUrlObject.searchParams.delete("hot");
+          requestedUrl = requestedUrlObject.href;
+        }
         const { referer } = request.headers;
         const parentUrl = referer
           ? WEB_URL_CONVERTER.asFileUrl(referer, {
@@ -24477,15 +24490,20 @@ const startDevServer = async ({
           request.resource,
           parentUrl,
         );
-        if (!reference) {
+        if (reference) {
+          reference.urlInfo.context.request = request;
+          reference.urlInfo.context.requestedUrl = requestedUrl;
+        } else {
           const rootUrlInfo = kitchen.graph.rootUrlInfo;
           rootUrlInfo.context.request = request;
+          rootUrlInfo.context.requestedUrl = requestedUrl;
           reference = rootUrlInfo.dependencies.createResolveAndFinalize({
             trace: { message: parentUrl },
             type: "http_request",
             specifier: request.resource,
           });
           rootUrlInfo.context.request = null;
+          rootUrlInfo.context.requestedUrl = null;
         }
         const urlInfo = reference.urlInfo;
         const ifNoneMatch = request.headers["if-none-match"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "39.13.0",
+  "version": "39.13.2",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -70,20 +70,20 @@
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.3.0",
     "@jsenv/ast": "6.5.0",
-    "@jsenv/filesystem": "4.13.2",
+    "@jsenv/filesystem": "4.13.3",
     "@jsenv/humanize": "1.2.8",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.2",
     "@jsenv/js-module-fallback": "1.3.57",
     "@jsenv/node-esm-resolution": "1.0.6",
-    "@jsenv/plugin-bundling": "2.7.24",
+    "@jsenv/plugin-bundling": "2.7.25",
     "@jsenv/plugin-minification": "1.5.13",
     "@jsenv/plugin-supervisor": "1.6.4",
     "@jsenv/plugin-transpilation": "1.4.93",
     "@jsenv/runtime-compat": "1.3.1",
-    "@jsenv/server": "15.5.0",
+    "@jsenv/server": "15.5.1",
     "@jsenv/sourcemap": "1.2.30",
-    "@jsenv/url-meta": "8.5.2",
+    "@jsenv/url-meta": "8.5.3",
     "@jsenv/urls": "2.6.0",
     "@jsenv/utils": "2.1.2",
     "string-width": "7.2.0"

package/src/build/build_urls_generator.js

@@ -77,7 +77,6 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       integer++;
       nameCandidate = `${basename}${integer}${extension}`;
     }
-    hash = "";
     const buildUrl = `${buildDirectoryUrl}${directoryPath}${nameCandidate}${search}${hash}`;
     associateBuildUrl(url, buildUrl);
     return buildUrl;

package/src/dev/start_dev_server.js

@@ -69,7 +69,7 @@ export const startDevServer = async ({
   supervisor = true,
   magicExtensions,
   magicDirectoryIndex,
-  directoryListingUrlMocks,
+  directoryListing,
   injections,
   transpilation,
   cacheControl = true,
@@ -269,7 +269,7 @@ export const startDevServer = async ({
             nodeEsmResolution,
             magicExtensions,
             magicDirectoryIndex,
-            directoryListingUrlMocks,
+            directoryListing,
             supervisor,
             injections,
             transpilation,
@@ -343,6 +343,11 @@ export const startDevServer = async ({
               // - 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 (!implicitUrlInfo.isValid()) {
@@ -385,6 +390,20 @@ export const startDevServer = async ({
         if (responseFromPlugin) {
           return responseFromPlugin;
         }
+        const { rootDirectoryUrl, mainFilePath } = kitchen.context;
+        let requestResource = request.resource;
+        let requestedUrl;
+        if (requestResource.startsWith("/@fs/")) {
+          const fsRootRelativeUrl = requestResource.slice("/@fs/".length);
+          requestedUrl = `file:///${fsRootRelativeUrl}`;
+        } else {
+          const requestedUrlObject = new URL(
+            requestResource === "/" ? mainFilePath : requestResource.slice(1),
+            rootDirectoryUrl,
+          );
+          requestedUrlObject.searchParams.delete("hot");
+          requestedUrl = requestedUrlObject.href;
+        }
         const { referer } = request.headers;
         const parentUrl = referer
           ? WEB_URL_CONVERTER.asFileUrl(referer, {
@@ -396,15 +415,20 @@ export const startDevServer = async ({
           request.resource,
           parentUrl,
         );
-        if (!reference) {
+        if (reference) {
+          reference.urlInfo.context.request = request;
+          reference.urlInfo.context.requestedUrl = requestedUrl;
+        } else {
           const rootUrlInfo = kitchen.graph.rootUrlInfo;
           rootUrlInfo.context.request = request;
+          rootUrlInfo.context.requestedUrl = requestedUrl;
           reference = rootUrlInfo.dependencies.createResolveAndFinalize({
             trace: { message: parentUrl },
             type: "http_request",
             specifier: request.resource,
           });
           rootUrlInfo.context.request = null;
+          rootUrlInfo.context.requestedUrl = null;
         }
         const urlInfo = reference.urlInfo;
         const ifNoneMatch = request.headers["if-none-match"];

package/src/kitchen/kitchen.js

@@ -198,25 +198,6 @@ ${ANSI.color(reference.url, ANSI.YELLOW)}
 `);
         }
       }
-      const request = kitchen.context.request;
-      if (request) {
-        let requestResource = request.resource;
-        let requestedUrl;
-        if (requestResource.startsWith("/@fs/")) {
-          const fsRootRelativeUrl = requestResource.slice("/@fs/".length);
-          requestedUrl = `file:///${fsRootRelativeUrl}`;
-        } else {
-          const requestedUrlObject = new URL(
-            requestResource === "/" ? mainFilePath : requestResource.slice(1),
-            rootDirectoryUrl,
-          );
-          requestedUrlObject.searchParams.delete("hot");
-          requestedUrl = requestedUrlObject.href;
-        }
-        if (requestedUrl === reference.url) {
-          reference.isDirectRequest = true;
-        }
-      }
       redirect: {
         if (reference.isImplicit && reference.isWeak) {
           // not needed for implicit references that are not rendered anywhere

package/src/kitchen/url_graph/references.js

@@ -274,7 +274,6 @@ const createReference = ({
   specifierColumn,
   baseUrl,
   isOriginalPosition,
-  isDirectRequest = false,
   isEntryPoint = false,
   isResourceHint = false,
   // implicit references are not real references
@@ -349,7 +348,6 @@ const createReference = ({
     specifierColumn,
     isOriginalPosition,
     baseUrl,
-    isDirectRequest,
     isEntryPoint,
     isResourceHint,
     isImplicit,

package/src/plugins/plugins.js

@@ -32,7 +32,7 @@ export const getCorePlugins = ({
   nodeEsmResolution = {},
   magicExtensions,
   magicDirectoryIndex,
-  directoryListingUrlMocks,
+  directoryListing = true,
   directoryReferenceEffect,
   supervisor,
   injections,
@@ -60,6 +60,9 @@ export const getCorePlugins = ({
   if (http === false) {
     http = { include: false };
   }
+  if (directoryListing === true) {
+    directoryListing = {};
+  }
 
   return [
     jsenvPluginReferenceAnalysis(referenceAnalysis),
@@ -78,7 +81,7 @@ export const getCorePlugins = ({
     jsenvPluginProtocolFile({
       magicExtensions,
       magicDirectoryIndex,
-      directoryListingUrlMocks,
+      directoryListing,
     }),
     {
       name: "jsenv:resolve_root_as_main",

package/src/plugins/protocol_file/jsenv_plugin_directory_listing.js

@@ -1,6 +1,11 @@
 /*
  * NICE TO HAVE:
  * 
+ * - when clicking the server root directory from the root directory 
+ * we should see "/..." in the url bar
+ * instead we ses "@fs/"
+ * everything still works but that would be cleaner
+ * 
  * - when visiting urls outside server root directory the UI is messed up
  * 
  * Let's say I visit file outside the server root directory that is in 404
@@ -41,9 +46,9 @@ const htmlFileUrlForDirectory = new URL(
 );
 
 export const jsenvPluginDirectoryListing = ({
-  directoryContentMagicName,
-  directoryListingUrlMocks,
+  urlMocks = false,
   autoreload = true,
+  directoryContentMagicName,
 }) => {
   return {
     name: "jsenv:directory_listing",
@@ -61,10 +66,10 @@ export const jsenvPluginDirectoryListing = ({
         fsStat = readEntryStatSync(url, { nullIfNotFound: true });
         reference.fsStat = fsStat;
       }
-      const { request } = reference.ownerUrlInfo.context;
+      const { request, requestedUrl } = reference.ownerUrlInfo.context;
       if (!fsStat) {
         if (
-          reference.isDirectRequest &&
+          requestedUrl === url &&
           request &&
           request.headers["sec-fetch-dest"] === "document"
         ) {
@@ -114,7 +119,7 @@ export const jsenvPluginDirectoryListing = ({
             ...generateDirectoryListingInjection(requestedUrl, {
               autoreload,
               request,
-              directoryListingUrlMocks,
+              urlMocks,
               directoryContentMagicName,
               rootDirectoryUrl,
               mainFilePath,
@@ -193,7 +198,7 @@ const generateDirectoryListingInjection = (
     rootDirectoryUrl,
     mainFilePath,
     request,
-    directoryListingUrlMocks,
+    urlMocks,
     directoryContentMagicName,
     autoreload,
     enoent,
@@ -332,7 +337,7 @@ const generateDirectoryListingInjection = (
     __DIRECTORY_LISTING__: {
       enoentDetails,
       navItems,
-      directoryListingUrlMocks,
+      urlMocks,
       directoryContentMagicName,
       directoryUrl: firstExistingDirectoryUrl,
       serverRootDirectoryUrl,

package/src/plugins/protocol_file/jsenv_plugin_protocol_file.js

@@ -9,11 +9,10 @@ import { jsenvPluginFsRedirection } from "./jsenv_plugin_fs_redirection.js";
 const directoryContentMagicName = "...";
 
 export const jsenvPluginProtocolFile = ({
-  supervisorEnabled,
   magicExtensions,
   magicDirectoryIndex,
   preserveSymlinks,
-  directoryListingUrlMocks,
+  directoryListing,
 }) => {
   return [
     jsenvPluginFsRedirection({
@@ -69,11 +68,14 @@ export const jsenvPluginProtocolFile = ({
         );
       },
     },
-    jsenvPluginDirectoryListing({
-      supervisorEnabled,
-      directoryContentMagicName,
-      directoryListingUrlMocks,
-    }),
+    ...(directoryListing
+      ? [
+          jsenvPluginDirectoryListing({
+            ...directoryListing,
+            directoryContentMagicName,
+          }),
+        ]
+      : []),
     {
       name: "jsenv:directory_as_json",
       appliesDuring: "*",

package/src/plugins/reference_analysis/jsenv_plugin_reference_analysis.js

@@ -41,7 +41,7 @@ const jsenvPluginInlineContentFetcher = () => {
       if (!urlInfo.isInline) {
         return null;
       }
-      const { isDirectRequest } = urlInfo.lastReference;
+      const isDirectRequest = urlInfo.context.requestedUrl === urlInfo.url;
       /*
        * We want to find inline content but it's not straightforward
        *