@jsenv/server 12.4.1 → 12.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "12.4.1",
+  "version": "12.4.2",
   "description": "Write your Node.js server using pure functions",
   "license": "MIT",
   "author": {
@@ -16,7 +16,8 @@
     "node": ">=16.13.0"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
   },
   "type": "module",
   "exports": {
@@ -44,27 +45,27 @@
   "dependencies": {
     "@jsenv/abort": "4.1.2",
     "@jsenv/logger": "4.0.1",
-    "@jsenv/url-meta": "6.0.3",
+    "@jsenv/url-meta": "6.2.0",
     "node-fetch": "2.6.7",
     "path-to-regexp": "6.2.0"
   },
   "devDependencies": {
-    "@jsenv/assert": "2.4.1",
-    "@jsenv/core": "25.3.0",
+    "@jsenv/assert": "2.5.2",
+    "@jsenv/core": "25.4.9",
     "@jsenv/eslint-config": "16.0.9",
     "@jsenv/filesystem": "2.7.1",
-    "@jsenv/github-release-package": "1.3.0",
-    "@jsenv/https-local": "1.0.3",
+    "@jsenv/github-release-package": "1.3.4",
+    "@jsenv/https-local": "1.0.7",
     "@jsenv/importmap-eslint-resolver": "5.2.5",
     "@jsenv/importmap-node-module": "5.1.3",
-    "@jsenv/package-publish": "1.7.0",
-    "@jsenv/performance-impact": "2.2.1",
+    "@jsenv/package-publish": "1.7.2",
+    "@jsenv/performance-impact": "2.2.7",
     "eslint": "8.7.0",
     "eslint-plugin-import": "2.25.4",
     "eventsource": "1.1.0",
     "fastify": "3.27.0",
     "fastify-static": "4.5.0",
-    "playwright": "1.18.0",
+    "playwright": "1.18.1",
     "prettier": "2.5.1"
   }
-}
+}

package/src/ressource_aliases/plugin_ressource_aliases.js

@@ -1,63 +1,26 @@
-import { urlToMeta, normalizeStructuredMetaMap } from "@jsenv/url-meta"
-
-import { escapeRegexpSpecialCharacters } from "./regex_escape.js"
+import { applyAliases } from "@jsenv/url-meta"
 
 export const pluginRessourceAliases = (ressourceAliases) => {
-  const alias = {}
+  const aliases = {}
   Object.keys(ressourceAliases).forEach((key) => {
-    alias[key] = {
-      pattern: key,
-      replacement: ressourceAliases[key],
-    }
+    aliases[asFileUrl(key)] = asFileUrl(ressourceAliases[key])
   })
-  const structuredMetaMap = normalizeStructuredMetaMap(
-    {
-      alias,
-    },
-    "file:///",
-  )
-  const getRessourceAlias = (pathname) => {
-    const { alias } = urlToMeta({
-      url: `file://${pathname}`,
-      structuredMetaMap,
-    })
-    return alias
-  }
-
   return {
     ressource_aliases: {
       onRequest: (request, { redirectRequest }) => {
-        const ressourceAlias = getRessourceAlias(request.pathname)
-        if (!ressourceAlias) {
-          return
-        }
-        const { pattern, replacement } = ressourceAlias
-        let newValue
         const ressourceBeforeAlias = request.ressource
-        if (replacement.includes("*")) {
-          let regexsource = ""
-          let i = 0
-          while (i < pattern.length) {
-            const char = pattern[i]
-            i++
-            if (char === "*") {
-              regexsource += "(.+)"
-            } else {
-              regexsource += escapeRegexpSpecialCharacters(char)
-            }
-          }
-          const regex = new RegExp(regexsource)
-          const matchResult = ressourceBeforeAlias.match(regex)
-          const parts = replacement.split("*")
-          newValue = parts.reduce((previous, value, index) => {
-            return `${previous}${value}${
-              index === parts.length - 1 ? "" : matchResult[index + 1]
-            }`
-          }, "")
-        } else {
-          newValue = replacement
+        const urlAfterAliasing = applyAliases({
+          url: asFileUrl(request.pathname),
+          aliases,
+        })
+        const ressourceAfterAlias = urlAfterAliasing.slice("file://".length)
+        if (ressourceBeforeAlias === ressourceAfterAlias) {
+          return
         }
-        const ressource = replaceRessource(ressourceBeforeAlias, newValue)
+        const ressource = replaceRessource(
+          ressourceBeforeAlias,
+          ressourceAfterAlias,
+        )
         redirectRequest({
           ressourceBeforeAlias,
           ressource,
@@ -67,6 +30,8 @@ export const pluginRessourceAliases = (ressourceAliases) => {
   }
 }
 
+const asFileUrl = (specifier) => new URL(specifier, "file:///").href
+
 const replaceRessource = (ressourceBeforeAlias, newValue) => {
   const urlObject = new URL(ressourceBeforeAlias, "file://")
   const searchSeparatorIndex = newValue.indexOf("?")

package/src/ressource_aliases/regex_escape.js

@@ -1,34 +0,0 @@
-// https://github.com/benjamingr/RegExp.escape/blob/master/polyfill.js
-
-export const escapeRegexpSpecialCharacters = (string) => {
-  string = String(string)
-  let i = 0
-  let escapedString = ""
-
-  while (i < string.length) {
-    const char = string[i]
-    i++
-    escapedString += isRegExpSpecialChar(char) ? `\\${char}` : char
-  }
-  return escapedString
-}
-
-const isRegExpSpecialChar = (char) => regexpSpecialChars.indexOf(char) > -1
-
-const regexpSpecialChars = [
-  "/",
-  "^",
-  "\\",
-  "[",
-  "]",
-  "(",
-  ")",
-  "{",
-  "}",
-  "?",
-  "+",
-  "*",
-  ".",
-  "|",
-  "$",
-]