@jsenv/core 27.0.0-alpha.5 → 27.0.0-alpha.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.0.0-alpha.5",
+  "version": "27.0.0-alpha.6",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "repository": {
@@ -11,8 +11,7 @@
     "node": ">=16.13.0"
   },
   "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
+    "access": "public"
   },
   "type": "module",
   "imports": {},
@@ -107,4 +106,4 @@
     "redux": "4.1.2",
     "rollup": "2.70.1"
   }
-}
+}

package/src/build/build.js

@@ -70,6 +70,8 @@ export const build = async ({
   writeOnFileSystem = true,
   buildDirectoryClean = true,
   baseUrl = "/",
+  assetManifest = true,
+  assetManifestFileRelativeUrl = "asset-manifest.json",
 }) => {
   const logger = createLogger({ logLevel })
   rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl)
@@ -84,7 +86,7 @@ export const build = async ({
   const entryPointKeys = Object.keys(entryPoints)
   if (entryPointKeys.length === 1) {
     logger.info(`
-build ${entryPointKeys[0]}`)
+build "${entryPointKeys[0]}"`)
   } else {
     logger.info(`
 build ${entryPointKeys.length} entry points`)
@@ -119,22 +121,23 @@ build ${entryPointKeys.length} entry points`)
     scenario: "build",
     sourcemaps,
   })
-  const loadEntryFiles = (cookEntryFile) => {
-    Object.keys(entryPoints).forEach((key) => {
-      cookEntryFile({
-        trace: `"${key}" in entryPoints parameter`,
-        type: "entry_point",
-        specifier: key,
-      })
-    })
-  }
+  const entryUrls = []
   try {
     await loadUrlGraph({
       urlGraph: rawGraph,
       kitchen: rawGraphKitchen,
       outDirectoryUrl: new URL(`.jsenv/build/`, rootDirectoryUrl),
       runtimeSupport,
-      startLoading: loadEntryFiles,
+      startLoading: (cookEntryFile) => {
+        Object.keys(entryPoints).forEach((key) => {
+          const [, entryUrlInfo] = cookEntryFile({
+            trace: `"${key}" in entryPoints parameter`,
+            type: "entry_point",
+            specifier: key,
+          })
+          entryUrls.push(entryUrlInfo.url)
+        })
+      },
     })
   } catch (e) {
     prebuildTask.fail()
@@ -447,13 +450,23 @@ ${Object.keys(rawGraph.urlInfos).join("\n")}`,
     sourcemaps,
   })
   const buildTask = createTaskLog(logger, "build")
+  const postBuildEntryUrls = []
   try {
     await loadUrlGraph({
       urlGraph: finalGraph,
       kitchen: finalGraphKitchen,
       outDirectoryUrl: new URL(".jsenv/postbuild/", rootDirectoryUrl),
       runtimeSupport,
-      startLoading: loadEntryFiles,
+      startLoading: (cookEntryFile) => {
+        entryUrls.forEach((entryUrl) => {
+          const [, postBuildEntryUrlInfo] = cookEntryFile({
+            trace: `entryPoint`,
+            type: "entry_point",
+            specifier: entryUrl,
+          })
+          postBuildEntryUrls.push(postBuildEntryUrlInfo.url)
+        })
+      },
     })
   } catch (e) {
     buildTask.fail()
@@ -540,12 +553,12 @@ ${Object.keys(finalGraph.urlInfos).join("\n")}`,
           {
             name: "jsenv:versioning",
             appliesDuring: { build: true },
-            resolve: ({ parentUrl, specifier }) => {
-              const buildUrl = buildUrls[specifier]
+            resolve: (reference) => {
+              const buildUrl = buildUrls[reference.specifier]
               if (buildUrl) {
                 return buildUrl
               }
-              const url = new URL(specifier, parentUrl).href
+              const url = new URL(reference.specifier, reference.parentUrl).href
               return url
             },
             formatReferencedUrl: (reference) => {
@@ -616,7 +629,15 @@ ${Object.keys(finalGraph.urlInfos).join("\n")}`,
         urlGraph: finalGraph,
         kitchen: versioningKitchen,
         runtimeSupport,
-        startLoading: loadEntryFiles,
+        startLoading: (cookEntryFile) => {
+          postBuildEntryUrls.forEach((postBuildEntryUrl) => {
+            cookEntryFile({
+              trace: `entryPoint`,
+              type: "entry_point",
+              specifier: postBuildEntryUrl,
+            })
+          })
+        },
       })
       if (usedVersionMappings.length) {
         const versionMappingsNeeded = {}
@@ -689,6 +710,16 @@ ${Object.keys(finalGraph.urlInfos).join("\n")}`,
         )
       }),
     )
+    if (
+      versioning !== "none" &&
+      assetManifest &&
+      Object.keys(buildManifest).length
+    ) {
+      await writeFile(
+        new URL(assetManifestFileRelativeUrl, buildDirectoryUrl),
+        JSON.stringify(buildManifest, null, "  "),
+      )
+    }
   }
   logger.info(createUrlGraphSummary(finalGraph, { title: "build files" }))
   return {

package/src/build/build_urls_generator.js

@@ -6,6 +6,12 @@ export const createBuilUrlsGenerator = ({ buildDirectoryUrl }) => {
   const cache = {}
   const generate = memoizeByUrl((url, urlInfo, parentUrlInfo) => {
     const directoryPath = determineDirectoryPath(urlInfo, parentUrlInfo)
+    let names = cache[directoryPath]
+    if (!names) {
+      names = []
+      cache[directoryPath] = names
+    }
+
     let name = urlToFilename(url)
     const { searchParams } = new URL(url)
     if (
@@ -15,12 +21,7 @@ export const createBuilUrlsGenerator = ({ buildDirectoryUrl }) => {
     ) {
       name = `${name}.js`
     }
-    let names = cache[directoryPath]
-    if (!names) {
-      names = []
-      cache[directoryPath] = names
-    }
-
+    const [basename, extension] = splitFileExtension(name)
     let nameCandidate = name
     let integer = 1
     // eslint-disable-next-line no-constant-condition
@@ -30,7 +31,7 @@ export const createBuilUrlsGenerator = ({ buildDirectoryUrl }) => {
         break
       }
       integer++
-      nameCandidate = `${name}${integer}`
+      nameCandidate = `${basename}${integer}${extension}`
     }
     return `${buildDirectoryUrl}${directoryPath}${nameCandidate}`
   })
@@ -40,6 +41,14 @@ export const createBuilUrlsGenerator = ({ buildDirectoryUrl }) => {
   }
 }
 
+const splitFileExtension = (filename) => {
+  const dotLastIndex = filename.lastIndexOf(".")
+  if (dotLastIndex === -1) {
+    return [filename, ""]
+  }
+  return [filename.slice(0, dotLastIndex), filename.slice(dotLastIndex)]
+}
+
 const determineDirectoryPath = (urlInfo, parentUrlInfo) => {
   if (urlInfo.isInline) {
     const parentDirectoryPath = determineDirectoryPath(parentUrlInfo)

package/src/omega/url_graph/url_graph_load.js

@@ -52,6 +52,7 @@ export const loadUrlGraph = async ({
         reference: entryReference,
         urlInfo: entryUrlInfo,
       })
+      return [entryReference, entryUrlInfo]
     },
   )