@jsenv/core 27.0.0-alpha.81 → 27.0.0-alpha.84

package/src/plugins/inject_globals/inject_globals.js

@@ -1,10 +1,10 @@
+import { createMagicSource } from "@jsenv/sourcemap"
 import {
   parseHtmlString,
   injectScriptAsEarlyAsPossible,
   createHtmlNode,
   stringifyHtmlAst,
-} from "@jsenv/utils/html_ast/html_ast.js"
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
+} from "@jsenv/utils/src/html_ast/html_ast.js"
 
 export const injectGlobals = (urlInfo, globals) => {
   if (urlInfo.type === "html") {

package/src/plugins/inline/jsenv_plugin_data_urls.js

@@ -1,5 +1,5 @@
 import { DATA_URL } from "@jsenv/urls"
-import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
 
 export const jsenvPluginDataUrls = () => {
   return {

package/src/plugins/inline/jsenv_plugin_html_inline_content.js

@@ -1,3 +1,4 @@
+import { generateInlineContentUrl } from "@jsenv/urls"
 import {
   parseHtmlString,
   stringifyHtmlAst,
@@ -7,9 +8,8 @@ import {
   parseScriptNode,
   setHtmlNodeGeneratedText,
   getHtmlNodeAttributeByName,
-} from "@jsenv/utils/html_ast/html_ast.js"
-import { generateInlineContentUrl } from "@jsenv/urls"
-import { CONTENT_TYPE } from "@jsenv/utils/content_type/content_type.js"
+} from "@jsenv/utils/src/html_ast/html_ast.js"
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
 
 export const jsenvPluginHtmlInlineContent = ({ analyzeConvertedScripts }) => {
   return {

package/src/plugins/inline/jsenv_plugin_js_inline_content.js

@@ -1,8 +1,8 @@
-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/urls"
+import { createMagicSource } from "@jsenv/sourcemap"
+import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js"
+import { JS_QUOTES } from "@jsenv/utils/src/string/js_quotes.js"
+import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
 
 export const jsenvPluginJsInlineContent = ({ allowEscapeForVersioning }) => {
   const parseAndTransformInlineContentCalls = async (urlInfo, context) => {

package/src/plugins/minification/css/minify_css.js

@@ -1,4 +1,4 @@
-import { minifyWithParcel } from "@jsenv/utils/css_ast/parcel_css.js"
+import { minifyWithParcel } from "@jsenv/utils/src/css_ast/parcel_css.js"
 
 export const minifyCss = ({ cssUrlInfo, context }) => {
   const { code, map } = minifyWithParcel(cssUrlInfo, context)

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

@@ -13,11 +13,9 @@
 
 import { urlToFilename, injectQueryParams } from "@jsenv/urls"
 import { readFileSync } from "@jsenv/filesystem"
-
+import { createMagicSource, composeTwoSourcemaps } from "@jsenv/sourcemap"
 import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
-import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
-import { composeTwoSourcemaps } from "@jsenv/utils/sourcemap/sourcemap_composition_v3.js"
+import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
 
 import { requireBabelPlugin } from "../babel/require_babel_plugin.js"
 import { babelPluginTransformImportMetaUrl } from "./helpers/babel_plugin_transform_import_meta_url.js"

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

@@ -1,3 +1,7 @@
+import {
+  generateInlineContentUrl,
+  injectQueryParamsIntoSpecifier,
+} from "@jsenv/urls"
 import {
   getHtmlNodeAttributeByName,
   getHtmlNodeTextNode,
@@ -10,11 +14,7 @@ import {
   setHtmlNodeGeneratedText,
   injectScriptAsEarlyAsPossible,
   createHtmlNode,
-} from "@jsenv/utils/html_ast/html_ast.js"
-import {
-  generateInlineContentUrl,
-  injectQueryParamsIntoSpecifier,
-} from "@jsenv/urls"
+} from "@jsenv/utils/src/html_ast/html_ast.js"
 
 export const jsenvPluginAsJsClassicHtml = ({
   systemJsInjection,

package/src/plugins/transpilation/babel/global_this/babel_plugin_global_this_as_jsenv_import.js

@@ -1,6 +1,6 @@
 import { pathToFileURL } from "node:url"
 
-import { injectImport } from "@jsenv/utils/js_ast/babel_utils.js"
+import { injectImport } from "@jsenv/utils/src/js_ast/babel_utils.js"
 
 export const babelPluginGlobalThisAsJsenvImport = (
   babel,

package/src/plugins/transpilation/babel/helpers/babel_plugin_babel_helpers_as_jsenv_imports.js

@@ -1,10 +1,9 @@
 import { pathToFileURL } from "node:url"
-
-import { injectImport } from "@jsenv/utils/js_ast/babel_utils.js"
+import { injectImport } from "@jsenv/utils/src/js_ast/babel_utils.js"
 import {
   getBabelHelperFileUrl,
   babelHelperNameFromUrl,
-} from "@jsenv/babel-plugins/main.js"
+} from "@jsenv/babel-plugins"
 
 // named import approach found here:
 // https://github.com/rollup/rollup-plugin-babel/blob/18e4232a450f320f44c651aa8c495f21c74d59ac/src/helperPlugin.js#L1

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

@@ -1,4 +1,4 @@
-import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
+import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
 
 import { RUNTIME_COMPAT } from "@jsenv/core/src/omega/compat/runtime_compat.js"
 import { getBaseBabelPluginStructure } from "./helpers/babel_plugin_structure.js"

package/src/plugins/transpilation/babel/new_stylesheet/babel_plugin_new_stylesheet_as_jsenv_import.js

@@ -1,6 +1,5 @@
 import { pathToFileURL } from "node:url"
-
-import { injectImport } from "@jsenv/utils/js_ast/babel_utils.js"
+import { injectImport } from "@jsenv/utils/src/js_ast/babel_utils.js"
 
 export const babelPluginNewStylesheetAsJsenvImport = (
   babel,

package/src/plugins/transpilation/babel/regenerator_runtime/babel_plugin_regenerator_runtime_as_jsenv_import.js

@@ -1,6 +1,5 @@
 import { pathToFileURL } from "node:url"
-
-import { injectImport } from "@jsenv/utils/js_ast/babel_utils.js"
+import { injectImport } from "@jsenv/utils/src/js_ast/babel_utils.js"
 
 export const babelPluginRegeneratorRuntimeAsJsenvImport = (
   babel,

package/src/plugins/transpilation/css_parcel/jsenv_plugin_css_parcel.js

@@ -1,4 +1,4 @@
-import { transpileWithParcel } from "@jsenv/utils/css_ast/parcel_css.js"
+import { transpileWithParcel } from "@jsenv/utils/src/css_ast/parcel_css.js"
 
 // https://github.com/parcel-bundler/parcel-css
 export const jsenvPluginCssParcel = () => {

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

@@ -12,7 +12,7 @@
 
 import { urlToFilename, injectQueryParams } from "@jsenv/urls"
 
-import { JS_QUOTES } from "@jsenv/utils/string/js_quotes.js"
+import { JS_QUOTES } from "@jsenv/utils/src/string/js_quotes.js"
 
 export const jsenvPluginImportAssertions = () => {
   const updateReference = (reference, searchParam) => {

package/src/plugins/transpilation/jsenv_plugin_top_level_await.js

@@ -1,4 +1,5 @@
-import { applyBabelPlugins } from "@jsenv/utils/js_ast/apply_babel_plugins.js"
+import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
+
 import { requireBabelPlugin } from "./babel/require_babel_plugin.js"
 
 export const jsenvPluginTopLevelAwait = () => {

package/src/plugins/url_analysis/css/css_urls.js

@@ -2,9 +2,9 @@
  * https://github.com/parcel-bundler/parcel/blob/v2/packages/transformers/css/src/CSSTransformer.js
  */
 
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
-import { applyPostCss } from "@jsenv/utils/css_ast/apply_post_css.js"
-import { postCssPluginUrlVisitor } from "@jsenv/utils/css_ast/postcss_plugin_url_visitor.js"
+import { createMagicSource } from "@jsenv/sourcemap"
+import { applyPostCss } from "@jsenv/utils/src/css_ast/apply_post_css.js"
+import { postCssPluginUrlVisitor } from "@jsenv/utils/src/css_ast/postcss_plugin_url_visitor.js"
 
 export const parseAndTransformCssUrls = async (urlInfo, context) => {
   const actions = []

package/src/plugins/url_analysis/html/html_urls.js

@@ -4,8 +4,8 @@ import {
   getHtmlNodeAttributeByName,
   htmlNodePosition,
   visitHtmlAst,
-} from "@jsenv/utils/html_ast/html_ast.js"
-import { htmlAttributeSrcSet } from "@jsenv/utils/html_ast/html_attribute_src_set.js"
+} from "@jsenv/utils/src/html_ast/html_ast.js"
+import { htmlAttributeSrcSet } from "@jsenv/utils/src/html_ast/html_attribute_src_set.js"
 
 export const parseAndTransformHtmlUrls = async (urlInfo, context) => {
   const url = urlInfo.originalUrl

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

@@ -1,5 +1,6 @@
-import { parseJsUrls } from "@jsenv/utils/js_ast/parse_js_urls.js"
-import { createMagicSource } from "@jsenv/utils/sourcemap/magic_source.js"
+import { createMagicSource } from "@jsenv/sourcemap"
+import { parseJsUrls } from "@jsenv/utils/src/js_ast/parse_js_urls.js"
+
 import { isWebWorkerUrlInfo } from "@jsenv/core/src/omega/web_workers.js"
 
 export const parseAndTransformJsUrls = async (urlInfo, context) => {

package/src/test/coverage/babel_plugin_instrument.js

@@ -0,0 +1,82 @@
+import { URL_META } from "@jsenv/url-meta"
+import { fileSystemPathToUrl } from "@jsenv/urls"
+
+import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
+
+// https://github.com/istanbuljs/babel-plugin-istanbul/blob/321740f7b25d803f881466ea819d870f7ed6a254/src/index.js
+
+export const babelPluginInstrument = (
+  api,
+  {
+    rootDirectoryUrl,
+    useInlineSourceMaps = false,
+    coverageConfig = { "./**/*": true },
+  },
+) => {
+  const { programVisitor } = requireFromJsenv("istanbul-lib-instrument")
+
+  const { types } = api
+
+  const associations = URL_META.resolveAssociations(
+    { cover: coverageConfig },
+    rootDirectoryUrl,
+  )
+  const shouldInstrument = (url) => {
+    return URL_META.applyAssociations({ url, associations }).cover
+  }
+
+  return {
+    name: "transform-instrument",
+    visitor: {
+      Program: {
+        enter(path) {
+          const { file } = this
+          const { opts } = file
+          if (!opts.sourceFileName) {
+            console.warn(
+              `cannot instrument file when "sourceFileName" option is not set`,
+            )
+            return
+          }
+          const fileUrl = fileSystemPathToUrl(opts.sourceFileName)
+          if (!shouldInstrument(fileUrl)) {
+            return
+          }
+
+          this.__dv__ = null
+
+          let inputSourceMap
+
+          if (useInlineSourceMaps) {
+            // https://github.com/istanbuljs/babel-plugin-istanbul/commit/a9e15643d249a2985e4387e4308022053b2cd0ad#diff-1fdf421c05c1140f6d71444ea2b27638R65
+            inputSourceMap =
+              opts.inputSourceMap || file.inputMap
+                ? file.inputMap.sourcemap
+                : null
+          } else {
+            inputSourceMap = opts.inputSourceMap
+          }
+
+          this.__dv__ = programVisitor(
+            types,
+            opts.filenameRelative || opts.filename,
+            {
+              coverageVariable: "__coverage__",
+              inputSourceMap,
+            },
+          )
+          this.__dv__.enter(path)
+        },
+
+        exit(path) {
+          if (!this.__dv__) {
+            return
+          }
+          const object = this.__dv__.exit(path)
+          // object got two properties: fileCoverage and sourceMappingURL
+          this.file.metadata.coverage = object.fileCoverage
+        },
+      },
+    },
+  }
+}

package/src/test/coverage/coverage_reporter_html_directory.js

@@ -0,0 +1,36 @@
+import { readFileSync } from "node:fs"
+import { resolveUrl, urlToFileSystemPath } from "@jsenv/urls"
+
+import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
+import { istanbulCoverageMapFromCoverage } from "./istanbul_coverage_map_from_coverage.js"
+
+export const generateCoverageHtmlDirectory = async (
+  coverage,
+  {
+    rootDirectoryUrl,
+    coverageHtmlDirectoryRelativeUrl,
+    coverageSkipEmpty,
+    coverageSkipFull,
+  },
+) => {
+  const libReport = requireFromJsenv("istanbul-lib-report")
+  const reports = requireFromJsenv("istanbul-reports")
+
+  const context = libReport.createContext({
+    dir: urlToFileSystemPath(rootDirectoryUrl),
+    coverageMap: istanbulCoverageMapFromCoverage(coverage),
+    sourceFinder: (path) => {
+      return readFileSync(
+        urlToFileSystemPath(resolveUrl(path, rootDirectoryUrl)),
+        "utf8",
+      )
+    },
+  })
+
+  const report = reports.create("html", {
+    skipEmpty: coverageSkipEmpty,
+    skipFull: coverageSkipFull,
+    subdir: coverageHtmlDirectoryRelativeUrl,
+  })
+  report.execute(context)
+}

package/src/test/coverage/coverage_reporter_json_file.js

@@ -0,0 +1,22 @@
+import { writeFile } from "@jsenv/filesystem"
+import { urlToFileSystemPath } from "@jsenv/urls"
+import { byteAsFileSize } from "@jsenv/log"
+
+export const generateCoverageJsonFile = async ({
+  coverage,
+  coverageJsonFileUrl,
+  coverageJsonFileLog,
+  logger,
+}) => {
+  const coverageAsText = JSON.stringify(coverage, null, "  ")
+
+  if (coverageJsonFileLog) {
+    logger.info(
+      `-> ${urlToFileSystemPath(coverageJsonFileUrl)} (${byteAsFileSize(
+        Buffer.byteLength(coverageAsText),
+      )})`,
+    )
+  }
+
+  await writeFile(coverageJsonFileUrl, coverageAsText)
+}

package/src/test/coverage/coverage_reporter_text_log.js

@@ -0,0 +1,19 @@
+import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
+import { istanbulCoverageMapFromCoverage } from "./istanbul_coverage_map_from_coverage.js"
+
+export const generateCoverageTextLog = (
+  coverage,
+  { coverageSkipEmpty, coverageSkipFull },
+) => {
+  const libReport = requireFromJsenv("istanbul-lib-report")
+  const reports = requireFromJsenv("istanbul-reports")
+
+  const context = libReport.createContext({
+    coverageMap: istanbulCoverageMapFromCoverage(coverage),
+  })
+  const report = reports.create("text", {
+    skipEmpty: coverageSkipEmpty,
+    skipFull: coverageSkipFull,
+  })
+  report.execute(context)
+}

package/src/test/coverage/empty_coverage_factory.js

@@ -0,0 +1,52 @@
+import { readFile } from "@jsenv/filesystem"
+import { resolveUrl } from "@jsenv/urls"
+import { Abort } from "@jsenv/abort"
+import { applyBabelPlugins } from "@jsenv/utils/src/js_ast/apply_babel_plugins.js"
+
+import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
+import { babelPluginInstrument } from "./babel_plugin_instrument.js"
+
+export const relativeUrlToEmptyCoverage = async (
+  relativeUrl,
+  { signal, rootDirectoryUrl },
+) => {
+  const operation = Abort.startOperation()
+  operation.addAbortSignal(signal)
+
+  try {
+    const fileUrl = resolveUrl(relativeUrl, rootDirectoryUrl)
+    const content = await readFile(fileUrl, { as: "string" })
+
+    operation.throwIfAborted()
+    const { metadata } = await applyBabelPlugins({
+      babelPlugins: [[babelPluginInstrument, { rootDirectoryUrl }]],
+      urlInfo: {
+        originalUrl: fileUrl,
+        content,
+      },
+    })
+    const { coverage } = metadata
+    if (!coverage) {
+      throw new Error(`missing coverage for file`)
+    }
+    // https://github.com/gotwarlost/istanbul/blob/bc84c315271a5dd4d39bcefc5925cfb61a3d174a/lib/command/common/run-with-cover.js#L229
+    Object.keys(coverage.s).forEach(function (key) {
+      coverage.s[key] = 0
+    })
+    return coverage
+  } catch (e) {
+    if (e && e.code === "PARSE_ERROR") {
+      // return an empty coverage for that file when
+      // it contains a syntax error
+      return createEmptyCoverage(relativeUrl)
+    }
+    throw e
+  } finally {
+    await operation.end()
+  }
+}
+
+const createEmptyCoverage = (relativeUrl) => {
+  const { createFileCoverage } = requireFromJsenv("istanbul-lib-coverage")
+  return createFileCoverage(relativeUrl).toJSON()
+}

package/src/test/coverage/file_by_file_coverage.js

@@ -0,0 +1,25 @@
+import {
+  urlToRelativeUrl,
+  fileSystemPathToUrl,
+  isFileSystemPath,
+} from "@jsenv/urls"
+
+export const normalizeFileByFileCoveragePaths = (
+  fileByFileCoverage,
+  rootDirectoryUrl,
+) => {
+  const fileByFileNormalized = {}
+  Object.keys(fileByFileCoverage).forEach((key) => {
+    const fileCoverage = fileByFileCoverage[key]
+    const { path } = fileCoverage
+    const url = isFileSystemPath(path)
+      ? fileSystemPathToUrl(path)
+      : new URL(path, rootDirectoryUrl).href
+    const relativeUrl = urlToRelativeUrl(url, rootDirectoryUrl)
+    fileByFileNormalized[`./${relativeUrl}`] = {
+      ...fileCoverage,
+      path: `./${relativeUrl}`,
+    }
+  })
+  return fileByFileNormalized
+}

package/src/test/coverage/istanbul_coverage_composition.js

@@ -0,0 +1,28 @@
+import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
+
+export const composeTwoFileByFileIstanbulCoverages = (
+  firstFileByFileIstanbulCoverage,
+  secondFileByFileIstanbulCoverage,
+) => {
+  const fileByFileIstanbulCoverage = {}
+  Object.keys(firstFileByFileIstanbulCoverage).forEach((key) => {
+    fileByFileIstanbulCoverage[key] = firstFileByFileIstanbulCoverage[key]
+  })
+  Object.keys(secondFileByFileIstanbulCoverage).forEach((key) => {
+    const firstCoverage = firstFileByFileIstanbulCoverage[key]
+    const secondCoverage = secondFileByFileIstanbulCoverage[key]
+    fileByFileIstanbulCoverage[key] = firstCoverage
+      ? merge(firstCoverage, secondCoverage)
+      : secondCoverage
+  })
+
+  return fileByFileIstanbulCoverage
+}
+
+const merge = (firstIstanbulCoverage, secondIstanbulCoverage) => {
+  const { createFileCoverage } = requireFromJsenv("istanbul-lib-coverage")
+  const istanbulFileCoverageObject = createFileCoverage(firstIstanbulCoverage)
+  istanbulFileCoverageObject.merge(secondIstanbulCoverage)
+  const istanbulCoverage = istanbulFileCoverageObject.toJSON()
+  return istanbulCoverage
+}

package/src/test/coverage/istanbul_coverage_map_from_coverage.js

@@ -0,0 +1,16 @@
+import { requireFromJsenv } from "@jsenv/core/src/require_from_jsenv.js"
+
+export const istanbulCoverageMapFromCoverage = (coverage) => {
+  const { createCoverageMap } = requireFromJsenv("istanbul-lib-coverage")
+
+  const coverageAdjusted = {}
+  Object.keys(coverage).forEach((key) => {
+    coverageAdjusted[key.slice(2)] = {
+      ...coverage[key],
+      path: key.slice(2),
+    }
+  })
+
+  const coverageMap = createCoverageMap(coverageAdjusted)
+  return coverageMap
+}

package/src/test/coverage/list_files_not_covered.js

@@ -0,0 +1,15 @@
+import { collectFiles } from "@jsenv/filesystem"
+
+export const listRelativeFileUrlToCover = async ({
+  signal,
+  rootDirectoryUrl,
+  coverageConfig,
+}) => {
+  const matchingFileResultArray = await collectFiles({
+    signal,
+    directoryUrl: rootDirectoryUrl,
+    associations: { cover: coverageConfig },
+    predicate: ({ cover }) => cover,
+  })
+  return matchingFileResultArray.map(({ relativeUrl }) => relativeUrl)
+}

package/src/test/coverage/missing_coverage.js

@@ -0,0 +1,41 @@
+import { Abort } from "@jsenv/abort"
+
+import { listRelativeFileUrlToCover } from "./list_files_not_covered.js"
+import { relativeUrlToEmptyCoverage } from "./empty_coverage_factory.js"
+
+export const getMissingFileByFileCoverage = async ({
+  signal,
+  rootDirectoryUrl,
+  coverageConfig,
+  fileByFileCoverage,
+}) => {
+  const relativeUrlsToCover = await listRelativeFileUrlToCover({
+    signal,
+    rootDirectoryUrl,
+    coverageConfig,
+  })
+  const relativeUrlsMissing = relativeUrlsToCover.filter((relativeUrlToCover) =>
+    Object.keys(fileByFileCoverage).every((key) => {
+      return key !== `./${relativeUrlToCover}`
+    }),
+  )
+
+  const operation = Abort.startOperation()
+  operation.addAbortSignal(signal)
+  const missingFileByFileCoverage = {}
+  await relativeUrlsMissing.reduce(async (previous, relativeUrlMissing) => {
+    operation.throwIfAborted()
+    await previous
+    await operation.withSignal(async (signal) => {
+      const emptyCoverage = await relativeUrlToEmptyCoverage(
+        relativeUrlMissing,
+        {
+          signal,
+          rootDirectoryUrl,
+        },
+      )
+      missingFileByFileCoverage[`./${relativeUrlMissing}`] = emptyCoverage
+    })
+  }, Promise.resolve())
+  return missingFileByFileCoverage
+}