@jsenv/core 27.0.0-alpha.67 → 27.0.0-alpha.68

package/dist/main.js

@@ -1,8 +1,8 @@
 import { parentPort } from "node:worker_threads";
-import { urlToRelativeUrl, normalizeStructuredMetaMap, urlToMeta, registerFileLifecycle, urlIsInsideOf, urlToFilename, urlToExtension, readFileSync as readFileSync$1, fileSystemPathToUrl, urlToFileSystemPath, isFileSystemPath, bufferToEtag, writeFileSync, ensureWindowsDriveLetter, moveUrl, collectFiles, assertAndNormalizeDirectoryUrl, registerDirectoryLifecycle, resolveUrl, writeFile, ensureEmptyDirectory, writeDirectory, resolveDirectoryUrl, urlToBasename } from "@jsenv/filesystem";
+import { registerFileLifecycle, readFileSync as readFileSync$1, bufferToEtag, writeFileSync, ensureWindowsDriveLetter, collectFiles, assertAndNormalizeDirectoryUrl, registerDirectoryLifecycle, writeFile, ensureEmptyDirectory, writeDirectory } from "@jsenv/filesystem";
 import { createDetailedMessage, createLogger, loggerToLevels } from "@jsenv/logger";
 import { createTaskLog, ANSI, msAsDuration, msAsEllapsedTime, byteAsMemoryUsage, UNICODE, createLog, startSpinner, distributePercentages, byteAsFileSize } from "@jsenv/log";
-import { getCallerPosition } from "@jsenv/utils/src/caller_position.js";
+import { urlToRelativeUrl, URL_META, generateInlineContentUrl, ensurePathnameTrailingSlash, urlIsInsideOf, urlToFilename, urlToExtension, DataUrl, injectQueryParams, injectQueryParamsIntoSpecifier, fileSystemPathToUrl, urlToFileSystemPath, isFileSystemPath, normalizeUrl, stringifyUrlSite, setUrlFilename, moveUrl, getCallerPosition, resolveUrl, resolveDirectoryUrl, asUrlWithoutSearch, asUrlUntilPathname, urlToBasename } from "@jsenv/urls";
 import { initReloadableProcess } from "@jsenv/utils/process_reload/process_reload.js";
 import { parseHtmlString, stringifyHtmlAst, visitHtmlAst, getHtmlNodeAttributeByName, htmlNodePosition, findNode, getHtmlNodeTextNode, removeHtmlNode, setHtmlNodeGeneratedText, removeHtmlNodeAttributeByName, parseScriptNode, injectScriptAsEarlyAsPossible, createHtmlNode, removeHtmlNodeText, assignHtmlNodeAttributes, parseLinkNode } from "@jsenv/utils/html_ast/html_ast.js";
 import { htmlAttributeSrcSet } from "@jsenv/utils/html_ast/html_attribute_src_set.js";
@@ -11,15 +11,12 @@ import { applyPostCss } from "@jsenv/utils/css_ast/apply_post_css.js";
 import { postCssPluginUrlVisitor } from "@jsenv/utils/css_ast/postcss_plugin_url_visitor.js";
 import { parseJsUrls } from "@jsenv/utils/js_ast/parse_js_urls.js";
 import { resolveImport, normalizeImportMap, composeTwoImportMaps } from "@jsenv/importmap";
-import { generateInlineContentUrl } from "@jsenv/utils/urls/inline_content_url_generator.js";
 import { applyNodeEsmResolution, defaultLookupPackageScope, defaultReadPackageJson, readCustomConditionsFromProcessArgs, applyFileSystemMagicResolution } from "@jsenv/node-esm-resolution";
 import { statSync, realpathSync, readdirSync, readFileSync, existsSync } from "node:fs";
 import { pathToFileURL } from "node:url";
-import { ensurePathnameTrailingSlash, injectQueryParams, injectQueryParamsIntoSpecifier, normalizeUrl, setUrlFilename, asUrlWithoutSearch, asUrlUntilPathname } from "@jsenv/utils/urls/url_utils.js";
 import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js";
 import { JS_QUOTES } from "@jsenv/utils/string/js_quotes.js";
 import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js";
-import { DataUrl } from "@jsenv/utils/urls/data_url.js";
 import { transpileWithParcel, minifyWithParcel } from "@jsenv/utils/css_ast/parcel_css.js";
 import { createRequire } from "node:module";
 import { composeTwoSourcemaps } from "@jsenv/utils/sourcemap/sourcemap_composition_v3.js";
@@ -31,7 +28,6 @@ import { applyRollupPlugins } from "@jsenv/utils/js_ast/apply_rollup_plugins.js"
 import { sourcemapConverter } from "@jsenv/utils/sourcemap/sourcemap_converter.js";
 import { createCallbackList, createCallbackListNotifiedOnce, Abort, raceCallbacks, raceProcessTeardownEvents } from "@jsenv/abort";
 import { createSSEService } from "@jsenv/utils/event_source/sse_service.js";
-import { stringifyUrlSite } from "@jsenv/utils/urls/url_trace.js";
 import { timeStart, fetchFileSystem, composeTwoResponses, serveDirectory, startServer, pluginCORS, jsenvAccessControlAllowedHeaders, pluginServerTiming, pluginRequestWaitingCheck, composeServices, findFreePort } from "@jsenv/server";
 import { SOURCEMAP, generateSourcemapUrl, sourcemapToBase64Url } from "@jsenv/utils/sourcemap/sourcemap_utils.js";
 import { validateResponseIntegrity } from "@jsenv/integrity";
@@ -512,16 +508,18 @@ const jsenvPluginUrlAnalysis = ({
   let getIncludeInfo = () => undefined;
 
   if (include) {
-    const includeMetaMap = normalizeStructuredMetaMap({
+    const associations = URL_META.resolveAssociations({
       include
     }, rootDirectoryUrl);
 
     getIncludeInfo = url => {
-      const meta = urlToMeta({
+      const {
+        include
+      } = URL_META.applyAssociations({
         url,
-        structuredMetaMap: includeMetaMap
+        associations
       });
-      return meta.include;
+      return include;
     };
   }
 
@@ -4858,14 +4856,14 @@ const rollupPluginJsenv = ({
   let importCanBeBundled = () => true;
 
   if (include) {
-    const bundleIncludeConfig = normalizeStructuredMetaMap({
+    const associations = URL_META.resolveAssociations({
       bundle: include
     }, rootDirectoryUrl);
 
     importCanBeBundled = url => {
-      return urlToMeta({
+      return URL_META.applyAssociations({
         url,
-        structuredMetaMap: bundleIncludeConfig
+        associations
       }).bundle;
     };
   }
@@ -8336,19 +8334,18 @@ const jsenvPluginExplorer = ({
         return null;
       }
 
-      const structuredMetaMapRelativeForExplorable = {};
+      const associationsForExplorable = {};
       Object.keys(groups).forEach(groupName => {
         const groupConfig = groups[groupName];
-        structuredMetaMapRelativeForExplorable[groupName] = {
+        associationsForExplorable[groupName] = {
           "**/.jsenv/": false,
           // avoid visting .jsenv directory in jsenv itself
           ...groupConfig
         };
       });
-      const structuredMetaMapForExplorable = normalizeStructuredMetaMap(structuredMetaMapRelativeForExplorable, rootDirectoryUrl);
       const matchingFileResultArray = await collectFiles({
         directoryUrl: rootDirectoryUrl,
-        structuredMetaMap: structuredMetaMapForExplorable,
+        associations: associationsForExplorable,
         predicate: meta => Object.keys(meta).some(group => Boolean(meta[group]))
       });
       const files = matchingFileResultArray.map(({
@@ -8825,13 +8822,12 @@ const generateExecutionSteps = async (plan, {
   signal,
   rootDirectoryUrl
 }) => {
-  const structuredMetaMap = {
-    filePlan: plan
-  };
   const fileResultArray = await collectFiles({
     signal,
     directoryUrl: rootDirectoryUrl,
-    structuredMetaMap,
+    associations: {
+      filePlan: plan
+    },
     predicate: ({
       filePlan
     }) => filePlan
@@ -9306,15 +9302,18 @@ const executePlan = async (plan, {
     const coverageTempDirectoryUrl = new URL(coverageTempDirectoryRelativeUrl, rootDirectoryUrl).href;
 
     if (coverage) {
-      const structuredMetaMapForCover = normalizeStructuredMetaMap({
+      const associations = URL_META.resolveAssociations({
         cover: coverageConfig
       }, rootDirectoryUrl);
 
       const urlShouldBeCovered = url => {
-        return urlToMeta({
+        const {
+          cover
+        } = URL_META.applyAssociations({
           url: new URL(url, rootDirectoryUrl).href,
-          structuredMetaMap: structuredMetaMapForCover
-        }).cover;
+          associations
+        });
+        return cover;
       };
 
       runtimeParams.urlShouldBeCovered = urlShouldBeCovered; // in case runned multiple times, we don't want to keep writing lot of files in this directory
@@ -9777,17 +9776,20 @@ const executeTestPlan = async ({
     }
 
     if (!coverageAndExecutionAllowed) {
-      const structuredMetaMapForExecute = normalizeStructuredMetaMap({
+      const associationsForExecute = URL_META.resolveAssociations({
         execute: testPlan
       }, "file:///");
-      const structuredMetaMapForCover = normalizeStructuredMetaMap({
+      const associationsForCover = URL_META.resolveAssociations({
         cover: coverageConfig
       }, "file:///");
-      const patternsMatchingCoverAndExecute = Object.keys(structuredMetaMapForExecute.execute).filter(testPlanPattern => {
-        return urlToMeta({
+      const patternsMatchingCoverAndExecute = Object.keys(associationsForExecute.execute).filter(testPlanPattern => {
+        const {
+          cover
+        } = URL_META.applyAssociations({
           url: testPlanPattern,
-          structuredMetaMap: structuredMetaMapForCover
-        }).cover;
+          associations: associationsForCover
+        });
+        return cover;
       });
 
       if (patternsMatchingCoverAndExecute.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.67",
+  "version": "27.0.0-alpha.68",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -45,7 +45,7 @@
     "dev": "node --conditions=development ./scripts/dev/dev.mjs",
     "build": "node --conditions=development ./scripts/build/build.mjs",
     "test": "node --conditions=development ./scripts/test/test.mjs",
-    "test-packages": "npm run test --workspaces --if-present",
+    "test-packages": "npm run test --workspaces --if-present -- --workspace",
     "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",
@@ -69,7 +69,7 @@
     "@financial-times/polyfill-useragent-normaliser": "2.0.1",
     "@jsenv/abort": "4.1.2",
     "@jsenv/babel-plugins": "1.0.2",
-    "@jsenv/filesystem": "3.2.2",
+    "@jsenv/filesystem": "4.0.1",
     "@jsenv/importmap": "1.2.0",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "1.6.3",
@@ -77,7 +77,8 @@
     "@jsenv/node-esm-resolution": "0.0.10",
     "@jsenv/server": "12.6.3",
     "@jsenv/uneval": "1.6.0",
-    "@jsenv/utils": "1.8.3",
+    "@jsenv/utils": "1.8.4",
+    "@jsenv/urls": "1.1.1",
     "construct-style-sheets-polyfill": "3.1.0",
     "cssnano": "5.1.7",
     "cssnano-preset-default": "5.2.7",
@@ -104,7 +105,7 @@
     "@jsenv/file-size-impact": "12.1.13",
     "@jsenv/https-local": "1.0.11",
     "@jsenv/importmap-node-module": "5.1.3",
-    "@jsenv/package-workspace": "0.2.0",
+    "@jsenv/package-workspace": "0.2.1",
     "@jsenv/performance-impact": "2.2.11",
     "@jsenv/pwa": "5.0.0",
     "eslint": "8.13.0",

package/src/build/build.js

@@ -7,12 +7,20 @@
  */
 
 import {
-  assertAndNormalizeDirectoryUrl,
-  ensureEmptyDirectory,
+  injectQueryParams,
+  setUrlFilename,
+  asUrlUntilPathname,
+  normalizeUrl,
+  asUrlWithoutSearch,
+  ensurePathnameTrailingSlash,
   urlIsInsideOf,
   urlToBasename,
   urlToExtension,
   urlToRelativeUrl,
+} from "@jsenv/urls"
+import {
+  assertAndNormalizeDirectoryUrl,
+  ensureEmptyDirectory,
   writeFile,
   registerDirectoryLifecycle,
 } from "@jsenv/filesystem"
@@ -20,14 +28,6 @@ import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
 import { createLogger, loggerToLevels } from "@jsenv/logger"
 
 import { createTaskLog } from "@jsenv/log"
-import {
-  injectQueryParams,
-  setUrlFilename,
-  asUrlUntilPathname,
-  normalizeUrl,
-  asUrlWithoutSearch,
-  ensurePathnameTrailingSlash,
-} from "@jsenv/utils/urls/url_utils.js"
 import { createVersionGenerator } from "@jsenv/utils/versioning/version_generator.js"
 import { generateSourcemapUrl } from "@jsenv/utils/sourcemap/sourcemap_utils.js"
 import {

package/src/build/build_urls_generator.js

@@ -1,4 +1,4 @@
-import { urlToFilename, urlToRelativeUrl } from "@jsenv/filesystem"
+import { urlToFilename, urlToRelativeUrl } from "@jsenv/urls"
 
 import { memoizeByFirstArgument } from "@jsenv/utils/memoize/memoize_by_first_argument.js"
 

package/src/build/start_build_server.js

@@ -30,7 +30,7 @@ import {
 import { createLogger, loggerToLevels } from "@jsenv/logger"
 
 import { createTaskLog } from "@jsenv/log"
-import { getCallerPosition } from "@jsenv/utils/src/caller_position.js"
+import { getCallerPosition } from "@jsenv/urls"
 import { initReloadableProcess } from "@jsenv/utils/process_reload/process_reload.js"
 
 export const startBuildServer = async ({

package/src/dev/plugins/explorer/jsenv_plugin_explorer.js

@@ -1,7 +1,7 @@
 import { readFileSync } from "node:fs"
-import { collectFiles, normalizeStructuredMetaMap } from "@jsenv/filesystem"
+import { DataUrl } from "@jsenv/urls"
+import { collectFiles } from "@jsenv/filesystem"
 
-import { DataUrl } from "@jsenv/utils/urls/data_url.js"
 import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
 
 export const jsenvPluginExplorer = ({ groups }) => {
@@ -17,21 +17,17 @@ export const jsenvPluginExplorer = ({ groups }) => {
       if (request.ressource !== "/") {
         return null
       }
-      const structuredMetaMapRelativeForExplorable = {}
+      const associationsForExplorable = {}
       Object.keys(groups).forEach((groupName) => {
         const groupConfig = groups[groupName]
-        structuredMetaMapRelativeForExplorable[groupName] = {
+        associationsForExplorable[groupName] = {
           "**/.jsenv/": false, // avoid visting .jsenv directory in jsenv itself
           ...groupConfig,
         }
       })
-      const structuredMetaMapForExplorable = normalizeStructuredMetaMap(
-        structuredMetaMapRelativeForExplorable,
-        rootDirectoryUrl,
-      )
       const matchingFileResultArray = await collectFiles({
         directoryUrl: rootDirectoryUrl,
-        structuredMetaMap: structuredMetaMapForExplorable,
+        associations: associationsForExplorable,
         predicate: (meta) =>
           Object.keys(meta).some((group) => Boolean(meta[group])),
       })

package/src/dev/start_dev_server.js

@@ -6,7 +6,7 @@ import {
 import { createLogger, loggerToLevels } from "@jsenv/logger"
 
 import { createTaskLog } from "@jsenv/log"
-import { getCallerPosition } from "@jsenv/utils/src/caller_position.js"
+import { getCallerPosition } from "@jsenv/urls"
 import { initReloadableProcess } from "@jsenv/utils/process_reload/process_reload.js"
 import { getCorePlugins } from "@jsenv/core/src/plugins/plugins.js"
 import { createUrlGraph } from "@jsenv/core/src/omega/url_graph.js"

package/src/execute/run.js

@@ -1,6 +1,7 @@
 import cuid from "cuid"
 import { Abort, raceCallbacks } from "@jsenv/abort"
-import { resolveUrl, writeFile } from "@jsenv/filesystem"
+import { resolveUrl } from "@jsenv/urls"
+import { writeFile } from "@jsenv/filesystem"
 
 export const run = async ({
   signal = new AbortController().signal,

package/src/execute/runtimes/browsers/from_playwright.js

@@ -6,7 +6,7 @@ import {
   raceProcessTeardownEvents,
   raceCallbacks,
 } from "@jsenv/abort"
-import { moveUrl } from "@jsenv/filesystem"
+import { moveUrl } from "@jsenv/urls"
 
 import { memoize } from "@jsenv/utils/memoize/memoize.js"
 import { filterV8Coverage } from "@jsenv/utils/coverage/v8_coverage_from_directory.js"

package/src/execute/runtimes/node/node_process.js

@@ -1,5 +1,5 @@
 import { fork } from "node:child_process"
-import { urlToFileSystemPath } from "@jsenv/filesystem"
+import { urlToFileSystemPath } from "@jsenv/urls"
 import { createDetailedMessage } from "@jsenv/logger"
 import {
   Abort,

package/src/omega/file_url_converter.js

@@ -1,4 +1,4 @@
-import { fileSystemPathToUrl, urlToFileSystemPath } from "@jsenv/filesystem"
+import { fileSystemPathToUrl, urlToFileSystemPath } from "@jsenv/urls"
 
 export const fileUrlConverter = {
   asFilePath: (fileUrl) => {

package/src/omega/kitchen.js

@@ -1,15 +1,15 @@
 import {
   urlIsInsideOf,
-  writeFileSync,
   moveUrl,
-  ensureWindowsDriveLetter,
-} from "@jsenv/filesystem"
+  getCallerPosition,
+  stringifyUrlSite,
+  normalizeUrl,
+  setUrlFilename,
+} from "@jsenv/urls"
+import { writeFileSync, ensureWindowsDriveLetter } from "@jsenv/filesystem"
 import { createDetailedMessage } from "@jsenv/logger"
 
-import { getCallerPosition } from "@jsenv/utils/src/caller_position.js"
-import { stringifyUrlSite } from "@jsenv/utils/urls/url_trace.js"
 import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
-import { normalizeUrl, setUrlFilename } from "@jsenv/utils/urls/url_utils.js"
 
 import { createPluginController } from "../plugins/plugin_controller.js"
 import { urlSpecifierEncoding } from "./url_specifier_encoding.js"

package/src/omega/server/file_service.js

@@ -3,7 +3,7 @@ import {
   serveDirectory,
   composeTwoResponses,
 } from "@jsenv/server"
-import { urlIsInsideOf, moveUrl } from "@jsenv/filesystem"
+import { urlIsInsideOf, moveUrl } from "@jsenv/urls"
 
 import { parseUserAgentHeader } from "./user_agent.js"
 

package/src/omega/url_graph/url_info_transformations.js

@@ -1,4 +1,5 @@
-import { bufferToEtag, urlToRelativeUrl } from "@jsenv/filesystem"
+import { bufferToEtag } from "@jsenv/filesystem"
+import { urlToRelativeUrl } from "@jsenv/urls"
 
 import { composeTwoSourcemaps } from "@jsenv/utils/sourcemap/sourcemap_composition_v3.js"
 import {

package/src/omega/url_graph.js

@@ -1,4 +1,4 @@
-import { urlToRelativeUrl } from "@jsenv/filesystem"
+import { urlToRelativeUrl } from "@jsenv/urls"
 import { urlSpecifierEncoding } from "./url_specifier_encoding.js"
 
 export const createUrlGraph = ({

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

@@ -1,4 +1,4 @@
-import { urlToRelativeUrl } from "@jsenv/filesystem"
+import { urlToRelativeUrl } from "@jsenv/urls"
 import { createCallbackList } from "@jsenv/abort"
 
 import { createSSEService } from "@jsenv/utils/event_source/sse_service.js"

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

@@ -1,9 +1,5 @@
 import { pathToFileURL } from "node:url"
-import {
-  isFileSystemPath,
-  normalizeStructuredMetaMap,
-  urlToMeta,
-} from "@jsenv/filesystem"
+import { isFileSystemPath, URL_META } from "@jsenv/urls"
 import { createDetailedMessage } from "@jsenv/logger"
 
 import { babelHelperNameFromUrl } from "@jsenv/babel-plugins"
@@ -145,17 +141,12 @@ const rollupPluginJsenv = ({
   }
   let importCanBeBundled = () => true
   if (include) {
-    const bundleIncludeConfig = normalizeStructuredMetaMap(
-      {
-        bundle: include,
-      },
+    const associations = URL_META.resolveAssociations(
+      { bundle: include },
       rootDirectoryUrl,
     )
     importCanBeBundled = (url) => {
-      return urlToMeta({
-        url,
-        structuredMetaMap: bundleIncludeConfig,
-      }).bundle
+      return URL_META.applyAssociations({ url, associations }).bundle
     }
   }
   const urlImporters = {}

package/src/plugins/file_urls/jsenv_plugin_file_urls.js

@@ -5,10 +5,10 @@ import {
   urlToRelativeUrl,
   urlToExtension,
   urlToFilename,
-} from "@jsenv/filesystem"
+  ensurePathnameTrailingSlash,
+} from "@jsenv/urls"
 
 import { applyFileSystemMagicResolution } from "@jsenv/node-esm-resolution"
-import { ensurePathnameTrailingSlash } from "@jsenv/utils/urls/url_utils.js"
 import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
 
 export const jsenvPluginFileUrls = ({

package/src/plugins/html_supervisor/jsenv_plugin_html_supervisor.js

@@ -18,7 +18,7 @@ import {
   removeHtmlNodeText,
   setHtmlNodeGeneratedText,
 } from "@jsenv/utils/html_ast/html_ast.js"
-import { generateInlineContentUrl } from "@jsenv/utils/urls/inline_content_url_generator.js"
+import { generateInlineContentUrl } from "@jsenv/urls"
 
 export const jsenvPluginHtmlSupervisor = ({
   logs = false,

package/src/plugins/importmap/jsenv_plugin_importmap.js

@@ -34,7 +34,7 @@ import {
   getHtmlNodeTextNode,
   removeHtmlNode,
 } from "@jsenv/utils/html_ast/html_ast.js"
-import { generateInlineContentUrl } from "@jsenv/utils/urls/inline_content_url_generator.js"
+import { generateInlineContentUrl } from "@jsenv/urls"
 
 export const jsenvPluginImportmap = () => {
   let finalImportmap = null

package/src/plugins/inline/jsenv_plugin_data_urls.js

@@ -1,4 +1,4 @@
-import { DataUrl } from "@jsenv/utils/urls/data_url.js"
+import { DataUrl } from "@jsenv/urls"
 import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
 
 export const jsenvPluginDataUrls = () => {

package/src/plugins/inline/jsenv_plugin_html_inline_content.js

@@ -8,7 +8,7 @@ import {
   setHtmlNodeGeneratedText,
   getHtmlNodeAttributeByName,
 } from "@jsenv/utils/html_ast/html_ast.js"
-import { generateInlineContentUrl } from "@jsenv/utils/urls/inline_content_url_generator.js"
+import { generateInlineContentUrl } from "@jsenv/urls"
 import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
 
 export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {

package/src/plugins/inline/jsenv_plugin_inline_query_param.js

@@ -1,4 +1,4 @@
-import { DataUrl } from "@jsenv/utils/urls/data_url.js"
+import { DataUrl } from "@jsenv/urls"
 
 export const jsenvPluginInlineQueryParam = () => {
   return {

package/src/plugins/inline/jsenv_plugin_js_inline_content.js

@@ -2,7 +2,7 @@ import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
 import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
 import { JS_QUOTES } from "@jsenv/utils/string/js_quotes.js"
 import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
-import { generateInlineContentUrl } from "@jsenv/utils/urls/inline_content_url_generator.js"
+import { generateInlineContentUrl } from "@jsenv/urls"
 
 export const jsenvPluginJsInlineContent = ({ allowEscapeForVersioning }) => {
   const parseAndTransformInlineContentCalls = async (urlInfo, context) => {

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

@@ -12,11 +12,11 @@
  */
 
 import { createRequire } from "node:module"
-import { readFileSync, urlToFilename } from "@jsenv/filesystem"
+import { urlToFilename, injectQueryParams } from "@jsenv/urls"
+import { readFileSync } from "@jsenv/filesystem"
 
 import { requireBabelPlugin } from "@jsenv/babel-plugins"
 import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
-import { injectQueryParams } from "@jsenv/utils/urls/url_utils.js"
 import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
 import { composeTwoSourcemaps } from "@jsenv/utils/sourcemap/sourcemap_composition_v3.js"
 

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

@@ -11,8 +11,10 @@ import {
   injectScriptAsEarlyAsPossible,
   createHtmlNode,
 } from "@jsenv/utils/html_ast/html_ast.js"
-import { generateInlineContentUrl } from "@jsenv/utils/urls/inline_content_url_generator.js"
-import { injectQueryParamsIntoSpecifier } from "@jsenv/utils/urls/url_utils.js"
+import {
+  generateInlineContentUrl,
+  injectQueryParamsIntoSpecifier,
+} from "@jsenv/urls"
 
 export const jsenvPluginAsJsClassicHtml = ({
   systemJsInjection,

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

@@ -1,4 +1,4 @@
-import { injectQueryParams } from "@jsenv/utils/urls/url_utils.js"
+import { injectQueryParams } from "@jsenv/urls"
 
 export const jsenvPluginAsJsClassicWorkers = ({
   generateJsClassicFilename,

package/src/plugins/transpilation/import_assertions/jsenv_plugin_import_assertions.js

@@ -10,9 +10,8 @@
  * But for now (as it is simpler) we let the browser throw the error
  */
 
-import { urlToFilename } from "@jsenv/filesystem"
+import { urlToFilename, injectQueryParams } from "@jsenv/urls"
 
-import { injectQueryParams } from "@jsenv/utils/urls/url_utils.js"
 import { JS_QUOTES } from "@jsenv/utils/string/js_quotes.js"
 
 export const jsenvPluginImportAssertions = () => {

package/src/plugins/url_analysis/jsenv_plugin_url_analysis.js

@@ -1,8 +1,4 @@
-import {
-  normalizeStructuredMetaMap,
-  urlToMeta,
-  urlToRelativeUrl,
-} from "@jsenv/filesystem"
+import { urlToRelativeUrl, URL_META } from "@jsenv/urls"
 
 import { parseAndTransformHtmlUrls } from "./html/html_urls.js"
 import { parseAndTransformCssUrls } from "./css/css_urls.js"
@@ -12,18 +8,13 @@ import { parseAndTransformWebmanifestUrls } from "./webmanifest/webmanifest_urls
 export const jsenvPluginUrlAnalysis = ({ rootDirectoryUrl, include }) => {
   let getIncludeInfo = () => undefined
   if (include) {
-    const includeMetaMap = normalizeStructuredMetaMap(
-      {
-        include,
-      },
+    const associations = URL_META.resolveAssociations(
+      { include },
       rootDirectoryUrl,
     )
     getIncludeInfo = (url) => {
-      const meta = urlToMeta({
-        url,
-        structuredMetaMap: includeMetaMap,
-      })
-      return meta.include
+      const { include } = URL_META.applyAssociations({ url, associations })
+      return include
     }
   }
 

package/src/test/execute_plan.js

@@ -3,17 +3,15 @@ import { memoryUsage } from "node:process"
 import wrapAnsi from "wrap-ansi"
 import stripAnsi from "strip-ansi"
 import cuid from "cuid"
+import { URL_META, urlToFileSystemPath } from "@jsenv/urls"
+import { createDetailedMessage, loggerToLevels } from "@jsenv/logger"
+import { createLog, startSpinner } from "@jsenv/log"
+import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
 import {
-  urlToFileSystemPath,
   writeDirectory,
   ensureEmptyDirectory,
-  normalizeStructuredMetaMap,
-  urlToMeta,
   writeFileSync,
 } from "@jsenv/filesystem"
-import { createDetailedMessage, loggerToLevels } from "@jsenv/logger"
-import { createLog, startSpinner } from "@jsenv/log"
-import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
 
 import { babelPluginInstrument } from "@jsenv/utils/coverage/babel_plugin_instrument.js"
 import { reportToCoverage } from "@jsenv/utils/coverage/report_to_coverage.js"
@@ -231,17 +229,16 @@ export const executePlan = async (
     ).href
 
     if (coverage) {
-      const structuredMetaMapForCover = normalizeStructuredMetaMap(
-        {
-          cover: coverageConfig,
-        },
+      const associations = URL_META.resolveAssociations(
+        { cover: coverageConfig },
         rootDirectoryUrl,
       )
       const urlShouldBeCovered = (url) => {
-        return urlToMeta({
+        const { cover } = URL_META.applyAssociations({
           url: new URL(url, rootDirectoryUrl).href,
-          structuredMetaMap: structuredMetaMapForCover,
-        }).cover
+          associations,
+        })
+        return cover
       }
       runtimeParams.urlShouldBeCovered = urlShouldBeCovered
 

package/src/test/execute_test_plan.js

@@ -1,9 +1,6 @@
+import { urlToFileSystemPath, resolveDirectoryUrl, URL_META } from "@jsenv/urls"
 import {
-  normalizeStructuredMetaMap,
-  urlToFileSystemPath,
   ensureEmptyDirectory,
-  resolveDirectoryUrl,
-  urlToMeta,
   assertAndNormalizeDirectoryUrl,
 } from "@jsenv/filesystem"
 import { createLogger, createDetailedMessage } from "@jsenv/logger"
@@ -113,25 +110,22 @@ export const executeTestPlan = async ({
       )
     }
     if (!coverageAndExecutionAllowed) {
-      const structuredMetaMapForExecute = normalizeStructuredMetaMap(
-        {
-          execute: testPlan,
-        },
+      const associationsForExecute = URL_META.resolveAssociations(
+        { execute: testPlan },
         "file:///",
       )
-      const structuredMetaMapForCover = normalizeStructuredMetaMap(
-        {
-          cover: coverageConfig,
-        },
+      const associationsForCover = URL_META.resolveAssociations(
+        { cover: coverageConfig },
         "file:///",
       )
       const patternsMatchingCoverAndExecute = Object.keys(
-        structuredMetaMapForExecute.execute,
+        associationsForExecute.execute,
       ).filter((testPlanPattern) => {
-        return urlToMeta({
+        const { cover } = URL_META.applyAssociations({
           url: testPlanPattern,
-          structuredMetaMap: structuredMetaMapForCover,
-        }).cover
+          associations: associationsForCover,
+        })
+        return cover
       })
       if (patternsMatchingCoverAndExecute.length) {
         // It would be strange, for a given file to be both covered and executed

package/src/test/execution_steps.js

@@ -5,13 +5,10 @@ export const generateExecutionSteps = async (
   plan,
   { signal, rootDirectoryUrl },
 ) => {
-  const structuredMetaMap = {
-    filePlan: plan,
-  }
   const fileResultArray = await collectFiles({
     signal,
     directoryUrl: rootDirectoryUrl,
-    structuredMetaMap,
+    associations: { filePlan: plan },
     predicate: ({ filePlan }) => filePlan,
   })
   const executionSteps = []