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

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
     }
   }
 
@@ -31,7 +22,14 @@ export const jsenvPluginUrlAnalysis = ({ rootDirectoryUrl, include }) => {
     name: "jsenv:url_analysis",
     appliesDuring: "*",
     redirectUrl: (reference) => {
-      if (reference.specifier[0] === "#") {
+      if (
+        reference.specifier[0] === "#" &&
+        // For Html, css and in general "#" refer to a ressource in the page
+        // so that urls must be kept intact
+        // However for js import specifiers they have a different meaning and we want
+        // to resolve them (https://nodejs.org/api/packages.html#imports for instance)
+        reference.type !== "js_import_export"
+      ) {
         reference.shouldHandle = false
         return
       }
@@ -68,12 +66,12 @@ export const jsenvPluginUrlAnalysis = ({ rootDirectoryUrl, include }) => {
           urlInfo.url,
           context.rootDirectoryUrl,
         )
-        JSON.parse(urlInfo.content).forEach((directoryEntry) => {
+        JSON.parse(urlInfo.content).forEach((directoryEntryName) => {
           context.referenceUtils.found({
             type: "filesystem",
             subtype: "directory_entry",
-            specifier: directoryEntry,
-            trace: `"${directoryRelativeUrl}${directoryEntry}" entry in directory referenced by ${originalDirectoryReference.trace}`,
+            specifier: directoryEntryName,
+            trace: `"${directoryRelativeUrl}${directoryEntryName}" entry in directory referenced by ${originalDirectoryReference.trace}`,
           })
         })
       },

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"
@@ -214,7 +212,7 @@ export const executePlan = async (
       // if there is an error during execution npm will mess up the output
       // (happens when npm runs several command in a workspace)
       // so we enable spinner only when !process.exitCode (no error so far)
-      !process.exitCode
+      process.exitCode !== 1
 
     const startMs = Date.now()
     const report = {}
@@ -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 = []