@jsenv/server 12.3.3 → 12.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "12.3.3",
+  "version": "12.4.0",
   "description": "Write your Node.js server using pure functions",
   "license": "MIT",
   "author": {

package/src/ressource_aliases/plugin_ressource_aliases.js

@@ -1,15 +1,21 @@
 import { urlToMeta, normalizeStructuredMetaMap } from "@jsenv/url-meta"
 
+import { escapeRegexpSpecialCharacters } from "./regex_escape.js"
+
 export const pluginRessourceAliases = (ressourceAliases) => {
-  const ressourceAliasMap = {}
+  const alias = {}
   Object.keys(ressourceAliases).forEach((key) => {
-    ressourceAliasMap[ressourceAliases[key]] = key
+    alias[key] = {
+      pattern: key,
+      replacement: ressourceAliases[key],
+    }
   })
   const structuredMetaMap = normalizeStructuredMetaMap(
-    { alias: ressourceAliasMap },
+    {
+      alias,
+    },
     "file:///",
   )
-
   const getRessourceAlias = (pathname) => {
     const { alias } = urlToMeta({
       url: `file://${pathname}`,
@@ -25,14 +31,35 @@ export const pluginRessourceAliases = (ressourceAliases) => {
         if (!ressourceAlias) {
           return
         }
-
-        const urlObjectAfterAlias = replaceUrlRessource(
-          request.url,
-          ressourceAlias,
-        )
-        const ressource = `${urlObjectAfterAlias.pathname}${urlObjectAfterAlias.search}`
+        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 ressource = replaceRessource(ressourceBeforeAlias, newValue)
         redirectRequest({
-          ressourceBeforeAlias: request.ressource,
+          ressourceBeforeAlias,
           ressource,
         })
       },
@@ -40,16 +67,13 @@ export const pluginRessourceAliases = (ressourceAliases) => {
   }
 }
 
-const replaceUrlRessource = (url, ressource) => {
-  const urlObject = new URL(url)
-
-  const searchSeparatorIndex = ressource.indexOf("?")
-  if (searchSeparatorIndex === -1) {
-    urlObject.pathname = ressource
-    return urlObject
+const replaceRessource = (ressourceBeforeAlias, newValue) => {
+  const urlObject = new URL(ressourceBeforeAlias, "file://")
+  const searchSeparatorIndex = newValue.indexOf("?")
+  if (searchSeparatorIndex > -1) {
+    return newValue // let new value override search params
   }
-
-  const pathname = ressource.slice(0, searchSeparatorIndex)
-  urlObject.pathname = pathname
-  return urlObject
+  urlObject.pathname = newValue
+  const ressource = `${urlObject.pathname}${urlObject.search}`
+  return ressource
 }

package/src/ressource_aliases/regex_escape.js

@@ -0,0 +1,34 @@
+// 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 = [
+  "/",
+  "^",
+  "\\",
+  "[",
+  "]",
+  "(",
+  ")",
+  "{",
+  "}",
+  "?",
+  "+",
+  "*",
+  ".",
+  "|",
+  "$",
+]