@continuous-excellence/ze-great-dashboard-aws 0.31.53 → 0.31.54

package/dist/lambda.mjs

@@ -74241,6 +74241,15 @@ var getPathNoStrict = (request) => {
   const result = getPath(request);
   return result.length > 1 && result.at(-1) === "/" ? result.slice(0, -1) : result;
 };
+var stripPathPrefix = (rawPath, decodedPath, prefixLength) => {
+  if (rawPath.at(-1) === "/" && decodedPath.at(-1) !== "/") rawPath = rawPath.slice(0, -1);
+  let index = 0;
+  for (let i6 = decodedPath.indexOf("/"); i6 !== -1 && i6 < prefixLength; i6 = decodedPath.indexOf("/", i6 + 1)) {
+    index = rawPath.indexOf("/", index + 1);
+    if (index === -1) return "/";
+  }
+  return rawPath.slice(index) || "/";
+};
 var mergePath = (base, sub, ...rest) => {
   if (rest.length) sub = mergePath(sub, ...rest);
   return `${base?.[0] === "/" ? "" : "/"}${base}${sub === "/" ? "" : `${base?.at(-1) === "/" ? "" : "/"}${sub?.[0] === "/" ? sub.slice(1) : sub}`}`;
@@ -74821,7 +74830,7 @@ var Context = class {
   * ```
   */
   header = (name, value, options) => {
-    if (this.finalized) this.#res = createResponseInstance(this.#res.body, this.#res);
+    if (this.finalized && !this.#res.bodyUsed) this.#res = createResponseInstance(this.#res.body, this.#res);
     const headers = this.#res ? this.#res.headers : this.#preparedHeaders ??= new Headers();
     if (value === void 0) headers.delete(name);
     else if (options?.append) headers.append(name, value);
@@ -75050,6 +75059,37 @@ var UnsupportedPathError = class extends Error {
 // node_modules/hono/dist/utils/constants.js
 var COMPOSED_HANDLER = "__COMPOSED_HANDLER";
 
+// node_modules/hono/dist/utils/mount.js
+var getPathPrefixLength = (c5, pathPrefix, routePath) => {
+  if (!/[:*]/.test(pathPrefix)) return pathPrefix.length;
+  const path = c5.req.path;
+  const matchResult = c5.req[GET_MATCH_RESULT];
+  const paramNames = /* @__PURE__ */ new Set();
+  let length = 0;
+  for (const part of splitRoutingPath(pathPrefix)) {
+    const pattern = getPattern(part);
+    if (pattern && pattern !== "*") {
+      const name = pattern[1];
+      if (paramNames.has(name)) throw new Error(`mount(): Duplicate path parameter "${name}" in "${routePath}".`);
+      paramNames.add(name);
+    }
+    if (pattern && pattern !== "*" && pattern[2] !== true) {
+      const value = matchResult.length === 2 ? matchResult[1][matchResult[0][c5.req.routeIndex][1][pattern[1]]] : matchResult[0][c5.req.routeIndex][1][pattern[1]];
+      length += value.length + 1;
+    } else if (pattern || part.endsWith("*")) {
+      const end2 = path.indexOf("/", length + 1);
+      length = end2 === -1 ? path.length : end2;
+    } else length += part.length + 1;
+  }
+  return length;
+};
+var createMountedRequest = (c5, pathPrefix, routePath) => {
+  if (/[^/]\*$/.test(routePath)) throw new Error(`mount(): Wildcard must follow "/" in "${routePath}".`);
+  const url2 = new URL(c5.req.raw.url);
+  url2.pathname = stripPathPrefix(url2.pathname, c5.req.path, getPathPrefixLength(c5, pathPrefix, routePath));
+  return new Request(url2, c5.req.raw);
+};
+
 // node_modules/hono/dist/hono-base.js
 var notFoundHandler = (c5) => {
   return c5.text("404 Not Found", 404);
@@ -75271,17 +75311,10 @@ var Hono = class Hono2 {
       }
       return [c5.env, executionContext];
     };
-    replaceRequest ||= (() => {
-      const mergedPath = mergePath(this._basePath, path);
-      const pathPrefixLength = mergedPath === "/" ? 0 : mergedPath.length;
-      return (request) => {
-        const url2 = new URL(request.url);
-        url2.pathname = this.getPath(request).slice(pathPrefixLength) || "/";
-        return new Request(url2, request);
-      };
-    })();
+    const mergedPath = mergePath(this._basePath, path);
+    const defaultReplaceRequest = (c5) => createMountedRequest(c5, mergedPath.replace(/\/$/, ""), mergePath(mergedPath, "*"));
     const handler2 = async (c5, next) => {
-      const res = await applicationHandler(replaceRequest(c5.req.raw), ...getOptions(c5));
+      const res = await applicationHandler(replaceRequest ? replaceRequest(c5.req.raw) : defaultReplaceRequest(c5), ...getOptions(c5));
       if (res) return res;
       await next();
     };
@@ -75413,14 +75446,15 @@ function match(method, path) {
 
 // node_modules/hono/dist/router/reg-exp-router/node.js
 var LABEL_REG_EXP_STR = "[^/]+";
-var TAIL_WILDCARD_REG_EXP_STR = "(?:|/.*)";
+var ONLY_WILDCARD_REG_EXP_STR = "[^]*";
+var TAIL_WILDCARD_REG_EXP_STR = "(?:|/[^]*)";
 var PATH_ERROR = /* @__PURE__ */ Symbol();
 var regExpMetaChars = /* @__PURE__ */ new Set(".\\+*[^]$()");
 function compareKey(a5, b5) {
   if (a5.length === 1) return b5.length === 1 ? a5 < b5 ? -1 : 1 : -1;
   if (b5.length === 1) return 1;
-  if (a5 === ".*" || a5 === "(?:|/.*)") return b5 === "(?:|/.*)" ? -1 : 1;
-  else if (b5 === ".*" || b5 === "(?:|/.*)") return -1;
+  if (a5 === "[^]*" || a5 === "(?:|/[^]*)") return b5 === "[^]*" ? -1 : 1;
+  else if (b5 === "[^]*" || b5 === "(?:|/[^]*)") return -1;
   if (a5 === "[^/]+") return 1;
   else if (b5 === "[^/]+") return -1;
   return a5.length === b5.length ? a5 < b5 ? -1 : 1 : b5.length - a5.length;
@@ -75429,14 +75463,14 @@ var Node = class Node2 {
   #index;
   #varIndex;
   #children = createNullObject();
-  insert(tokens, index, paramMap, context, isStatic) {
+  insert(tokens, index, paramMap, context, keys) {
     let node2 = this;
     for (let i6 = 0, len = tokens.length; i6 < len; i6++) {
       const token = tokens[i6];
       const pattern = token.length === 1 ? token === "*" ? i6 === len - 1 ? [
         "",
         "",
-        ".*"
+        ONLY_WILDCARD_REG_EXP_STR
       ] : [
         "",
         "",
@@ -75451,15 +75485,16 @@ var Node = class Node2 {
         const name = pattern[1];
         let regexpStr = pattern[2] || "[^/]+";
         if (name && pattern[2]) {
-          if (regexpStr === ".*") throw PATH_ERROR;
+          if (new RegExp(regexpStr).test("")) throw PATH_ERROR;
           regexpStr = regexpStr.replace(/^\((?!\?:)(?=[^)]+\)$)/, "(?:");
           if (/\((?!\?:)/.test(regexpStr)) throw PATH_ERROR;
           if (regexpStr.length === 1 && regExpMetaChars.has(regexpStr)) throw PATH_ERROR;
         }
+        keys.push(regexpStr);
         nextNode = node2.#children[regexpStr];
         if (!nextNode) {
-          if (regexpStr !== ".*" && regexpStr !== "(?:|/.*)") {
-            for (const k5 in node2.#children) if ((regexpStr.length > 1 || k5.length > 1) && k5 !== ".*" && k5 !== "(?:|/.*)") throw PATH_ERROR;
+          if (regexpStr !== "[^]*" && regexpStr !== "(?:|/[^]*)") {
+            for (const k5 in node2.#children) if ((regexpStr.length > 1 || k5.length > 1) && k5 !== "[^]*" && k5 !== "(?:|/[^]*)") throw PATH_ERROR;
           }
           nextNode = node2.#children[regexpStr] = new Node2();
         }
@@ -75468,16 +75503,17 @@ var Node = class Node2 {
           paramMap.push([name, nextNode.#varIndex]);
         }
       } else {
+        keys.push(token);
         nextNode = node2.#children[token];
         if (!nextNode) {
-          for (const k5 in node2.#children) if (k5.length > 1 && k5 !== ".*" && k5 !== "(?:|/.*)") throw PATH_ERROR;
+          for (const k5 in node2.#children) if (k5.length > 1 && k5 !== "[^]*" && k5 !== "(?:|/[^]*)") throw PATH_ERROR;
           nextNode = node2.#children[token] = new Node2();
         }
       }
       node2 = nextNode;
     }
     if (node2.#index !== void 0) throw PATH_ERROR;
-    node2.#index = isStatic ? -1 : index;
+    node2.#index = index;
   }
   buildRegExpStr() {
     const strList = Object.keys(this.#children).sort(compareKey).map((k5) => {
@@ -75499,8 +75535,14 @@ var Trie = class {
   #index = 0;
   paths = createNullObject();
   insert(path, isStatic) {
+    const keys = [];
     if (isStatic) {
-      this.#root.insert(path.split(""), 0, [], this.#context, true);
+      this.#root.insert(path.split(""), -1, [], this.#context, keys);
+      this.paths[path] = [
+        -1,
+        [],
+        keys
+      ];
       return;
     }
     const paramAssoc = [];
@@ -75508,7 +75550,7 @@ var Trie = class {
     let markedPath = path;
     for (let i6 = 0; ; ) {
       let replaced = false;
-      markedPath = markedPath.replace(/\{[^}]+\}/g, (m3) => {
+      markedPath = markedPath.replace(/\{(?:\{[\d,]+\}|[^}])+\}/g, (m3) => {
         const mark = `@\\${i6}`;
         groups[i6] = [mark, m3];
         i6++;
@@ -75517,7 +75559,7 @@ var Trie = class {
       });
       if (!replaced) break;
     }
-    const tokens = markedPath.match(/(?::[^\/]+)|(?:\/\*$)|./g) || [];
+    const tokens = markedPath.match(/(?::[^\/]+)|(?:\/\*$)|./gs) || [];
     for (let i6 = groups.length - 1; i6 >= 0; i6--) {
       const [mark] = groups[i6];
       for (let j5 = tokens.length - 1; j5 >= 0; j5--) if (tokens[j5].indexOf(mark) !== -1) {
@@ -75525,8 +75567,12 @@ var Trie = class {
         break;
       }
     }
-    this.#root.insert(tokens, this.#index, paramAssoc, this.#context, false);
-    this.paths[path] = [this.#index++, paramAssoc];
+    this.#root.insert(tokens, this.#index, paramAssoc, this.#context, keys);
+    this.paths[path] = [
+      this.#index++,
+      paramAssoc,
+      keys
+    ];
   }
   buildRegExp() {
     let regexp = this.#root.buildRegExpStr();
@@ -75558,21 +75604,21 @@ var Trie = class {
 };
 
 // node_modules/hono/dist/router/reg-exp-router/router.js
-var wildcardRegExpCache = createNullObject();
-function buildWildcardRegExp(path) {
-  return wildcardRegExpCache[path] ??= new RegExp(`^${path.replace(/\/:[^/{}]+(?:\{\[\^\/]\+})?(?=[/{]|$)|\/?\*$|([.\\+*[^\]$()?{}|])/g, (match2, metaChar) => metaChar ? `\\${metaChar}` : match2 === "/*" ? TAIL_WILDCARD_REG_EXP_STR : match2 === "*" ? ".*" : `/:${LABEL_REG_EXP_STR}`)}$`);
+function endsWithWildcard(keys) {
+  const tail = keys[keys.length - 1];
+  return tail === "[^]*" || tail === "(?:|/[^]*)";
 }
-function findMiddleware(middleware, path) {
-  for (const k5 of Object.keys(middleware).sort((a5, b5) => b5.length - a5.length)) if (buildWildcardRegExp(k5).test(path)) return [...middleware[k5]];
+function covers(wildcard, target) {
+  const last = wildcard.length - 1;
+  for (let i6 = 0; i6 < last; i6++) if (wildcard[i6] !== target[i6]) return false;
+  return wildcard[last] === "[^]*" || target.length === last || target[last] === "/";
 }
 var RegExpRouter = class {
   name = "RegExpRouter";
-  #middleware;
-  #routes;
+  #handlers;
   #tries;
   constructor() {
-    this.#middleware = { ["ALL"]: createNullObject() };
-    this.#routes = { ["ALL"]: createNullObject() };
+    this.#handlers = { ["ALL"]: [] };
     this.#tries = { ["ALL"]: new Trie() };
   }
   #insertPath(method, path) {
@@ -75583,65 +75629,53 @@ var RegExpRouter = class {
     }
   }
   add(method, path, handler2) {
-    const middleware = this.#middleware;
-    const routes = this.#routes;
-    if (!middleware) throw new Error(MESSAGE_MATCHER_IS_ALREADY_BUILT);
-    if (!middleware[method]) {
-      this.#tries[method] = new Trie();
-      for (const handlerMap of [middleware, routes]) {
-        handlerMap[method] = createNullObject();
-        for (const p3 in handlerMap["ALL"]) {
-          handlerMap[method][p3] = [...handlerMap["ALL"][p3]];
-          this.#insertPath(method, p3);
-        }
-      }
+    const handlers = this.#handlers;
+    if (!handlers) throw new Error(MESSAGE_MATCHER_IS_ALREADY_BUILT);
+    const tries = this.#tries;
+    if (!handlers[method]) {
+      tries[method] = new Trie();
+      handlers[method] = [...handlers["ALL"]];
+      for (const p3 in tries["ALL"].paths) this.#insertPath(method, p3);
     }
     if (path === "/*") path = "*";
-    const methods = method === "ALL" ? Object.keys(middleware) : [method];
-    if (/\*$/.test(path)) {
-      const re = buildWildcardRegExp(path);
-      for (const m3 of methods) if (!middleware[m3][path]) {
-        this.#insertPath(m3, path);
-        middleware[m3][path] = findMiddleware(middleware[m3], path) || findMiddleware(middleware["ALL"], path) || [];
-      }
-      for (const handlerMap of [middleware, routes]) for (const m3 of methods) for (const p3 in handlerMap[m3]) re.test(p3) && handlerMap[m3][p3].push([handler2, path]);
-      return;
-    }
+    const methods = method === "ALL" ? Object.keys(handlers) : [method];
     const paths = checkOptionalParameter(path) || [path];
     for (const path2 of paths) for (const m3 of methods) {
-      if (!routes[m3][path2]) {
-        this.#insertPath(m3, path2);
-        routes[m3][path2] = findMiddleware(middleware[m3], path2) || findMiddleware(middleware["ALL"], path2) || [];
-      }
-      routes[m3][path2].push([handler2, path2]);
+      if (!tries[m3].paths[path2]) this.#insertPath(m3, path2);
+      handlers[m3].push([handler2, path2]);
     }
   }
   match = match;
   buildAllMatchers() {
     const matchers = createNullObject();
-    for (const method of Object.keys(this.#routes)) matchers[method] = this.#buildMatcher(method);
-    this.#middleware = this.#routes = this.#tries = void 0;
-    wildcardRegExpCache = createNullObject();
+    for (const method of Object.keys(this.#handlers)) matchers[method] = this.#buildMatcher(method);
+    this.#handlers = this.#tries = void 0;
     return matchers;
   }
   #buildMatcher(method) {
-    const middleware = this.#middleware[method];
-    const routes = this.#routes[method];
+    const handlers = this.#handlers[method];
     const trie = this.#tries[method];
     const staticMap = createNullObject();
     const handlerData = [];
     const [regexp, indexReplacementMap, paramReplacementMap] = trie.buildRegExp();
-    for (const r5 of [middleware, routes]) for (const path in r5) {
-      const handlers = r5[path];
-      const pathData = trie.paths[path];
-      if (!pathData) {
-        staticMap[path] = [handlers.map(([h5]) => [h5, createNullObject()]), emptyParam];
-        continue;
-      }
-      handlerData[pathData[0]] = handlers.map(([h5, handlerPath]) => [h5, trie.paths[handlerPath][1].reduceRight((map4, [key], i6) => {
-        map4[key] = paramReplacementMap[pathData[1][i6][1]];
+    const own2 = createNullObject();
+    const entries = handlers.map(([h5, p3], i6) => {
+      (own2[p3] ??= []).push(i6);
+      return [h5, trie.paths[p3][1].reduceRight((map4, [key, varIndex]) => {
+        map4[key] = paramReplacementMap[varIndex];
         return map4;
-      }, createNullObject())]);
+      }, createNullObject())];
+    });
+    const wildcards = Object.keys(own2).filter((p3) => endsWithWildcard(trie.paths[p3][2]));
+    for (const path in trie.paths) {
+      const [index, , keys] = trie.paths[path];
+      const indexes = [...own2[path]];
+      for (const p3 of wildcards) if (p3 !== path && covers(trie.paths[p3][2], keys)) indexes.push(...own2[p3]);
+      const data = indexes.sort((a5, b5) => a5 - b5).map((i6) => entries[i6]);
+      if (index === -1) {
+        const last = Math.max(-1, ...data.flatMap(([, map4]) => Object.values(map4)));
+        staticMap[path] = [data, last === -1 ? emptyParam : path.match(regexp).slice(0, last + 1)];
+      } else handlerData[index] = data;
     }
     return [
       regexp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@continuous-excellence/ze-great-dashboard-aws",
-  "version": "0.31.53",
+  "version": "0.31.54",
   "type": "module",
   "description": "AWS server runtime and CloudFormation deployment tooling for Ze Great Dashboard.",
   "keywords": [