@dereekb/dbx-components-mcp 13.18.0 → 13.20.0

package/dbx-components-mcp.js

@@ -10,7 +10,7 @@ var __export = (target, all) => {
 // packages/dbx-components-mcp/package.json
 var package_default = {
   name: "@dereekb/dbx-components-mcp",
-  version: "13.18.0",
+  version: "13.20.0",
   type: "module",
   bin: {
     "dbx-components-mcp": "dbx-components-mcp.js"
@@ -21,8 +21,8 @@ var package_default = {
     "ts-morph": "^21.0.0"
   },
   peerDependencies: {
-    "@dereekb/dbx-cli": "13.18.0",
-    "@dereekb/util": "13.18.0"
+    "@dereekb/dbx-cli": "13.20.0",
+    "@dereekb/util": "13.20.0"
   }
 };
 
@@ -15658,6 +15658,153 @@ function collectRelativeImports(sourceFile, fileName) {
   return out;
 }
 
+// packages/dbx-cli/src/lib/route/url-match.ts
+function normalizePathname(pathname) {
+  let result;
+  if (pathname.length === 0) {
+    result = "/";
+  } else if (pathname.length > 1 && pathname.endsWith("/")) {
+    result = pathname.slice(0, -1);
+  } else {
+    result = pathname;
+  }
+  return result;
+}
+function stripUrlQueryAndHash(url) {
+  const hashStripped = url.split("#", 1)[0];
+  return hashStripped.split("?", 1)[0];
+}
+function splitSegments(path) {
+  const normalized = path.startsWith("/") ? path.slice(1) : path;
+  return normalized.length === 0 ? [] : normalized.split("/");
+}
+function hasParamSegment(path) {
+  return path.includes(":") || path.includes("{");
+}
+function tryMatchSegments(route, input) {
+  if (route.length !== input.length) {
+    return void 0;
+  }
+  const params = {};
+  let result = params;
+  for (const [i, r] of route.entries()) {
+    const v = input[i];
+    if (r.startsWith(":")) {
+      const key = r.slice(1);
+      params[key] = decodeURIComponent(v);
+    } else if (r.startsWith("{") && r.endsWith("}")) {
+      const inner = r.slice(1, -1);
+      const colonIdx = inner.indexOf(":");
+      const key = colonIdx >= 0 ? inner.slice(0, colonIdx) : inner;
+      params[key] = decodeURIComponent(v);
+    } else if (r !== v) {
+      result = void 0;
+      break;
+    }
+  }
+  return result;
+}
+function extractUrlParamKeys(fullUrl) {
+  if (fullUrl === void 0 || fullUrl.length === 0) {
+    return [];
+  }
+  const seen = /* @__PURE__ */ new Set();
+  const keys = [];
+  for (const segment of fullUrl.split("/")) {
+    const key = extractParamKeyFromSegment(segment);
+    if (key !== void 0 && !seen.has(key)) {
+      seen.add(key);
+      keys.push(key);
+    }
+  }
+  return keys;
+}
+function extractParamKeyFromSegment(rawSegment) {
+  const segment = stripUrlQueryAndHash(rawSegment);
+  if (segment.startsWith(":")) {
+    const key = segment.slice(1);
+    return key.length > 0 ? key : void 0;
+  }
+  if (segment.startsWith("{") && segment.endsWith("}")) {
+    const inner = segment.slice(1, -1);
+    const colonIdx = inner.indexOf(":");
+    const rawKey = colonIdx >= 0 ? inner.slice(0, colonIdx) : inner;
+    const key = rawKey.trim();
+    return key.length > 0 ? key : void 0;
+  }
+  return void 0;
+}
+function matchUrlAgainstEntries(input) {
+  const pathname = normalizePathname(input.pathname);
+  const literal = matchLiteral(input.entries, pathname);
+  let result;
+  if (literal.length === 1) {
+    result = { kind: "match", via: "literal", value: literal[0].value, matchedFullUrl: normalizePathname(literal[0].fullUrl ?? pathname), params: {} };
+  } else if (literal.length > 1) {
+    result = { kind: "ambiguous", values: literal.map((e) => e.value) };
+  } else {
+    result = matchParamOrNone(input.entries, pathname);
+  }
+  return result;
+}
+function matchLiteral(entries, pathname) {
+  const out = [];
+  for (const entry of entries) {
+    if (entry.fullUrl !== void 0 && normalizePathname(entry.fullUrl) === pathname) {
+      out.push(entry);
+    }
+  }
+  return out;
+}
+function matchParamOrNone(entries, pathname) {
+  const inputSegments = splitSegments(pathname);
+  const hits = [];
+  for (const entry of entries) {
+    if (entry.fullUrl === void 0 || !hasParamSegment(entry.fullUrl)) {
+      continue;
+    }
+    const params = tryMatchSegments(splitSegments(entry.fullUrl), inputSegments);
+    if (params) {
+      hits.push({ entry, params });
+    }
+  }
+  let result;
+  if (hits.length === 1) {
+    result = { kind: "match", via: "param", value: hits[0].entry.value, matchedFullUrl: normalizePathname(hits[0].entry.fullUrl ?? pathname), params: hits[0].params };
+  } else if (hits.length > 1) {
+    result = { kind: "ambiguous", values: hits.map((h) => h.entry.value) };
+  } else {
+    result = { kind: "none", candidates: scoreCandidates(entries, pathname) };
+  }
+  return result;
+}
+function scoreCandidates(entries, pathname) {
+  const segments = splitSegments(normalizePathname(pathname));
+  const scored = [];
+  for (const entry of entries) {
+    if (entry.fullUrl === void 0) {
+      continue;
+    }
+    const candidateSegments = splitSegments(entry.fullUrl);
+    let score = 0;
+    const maxIndex = Math.min(segments.length, candidateSegments.length);
+    for (let i = 0; i < maxIndex; i += 1) {
+      if (segments[i] === candidateSegments[i]) {
+        score += 2;
+      } else if (candidateSegments[i].startsWith(":") || candidateSegments[i].startsWith("{")) {
+        score += 1;
+      } else {
+        break;
+      }
+    }
+    if (score > 0) {
+      scored.push({ value: entry.value, score });
+    }
+  }
+  scored.sort((a, b) => b.score - a.score);
+  return scored.slice(0, 5).map((s) => s.value);
+}
+
 // packages/dbx-cli/src/lib/route/route-build-tree.ts
 // @__NO_SIDE_EFFECTS__
 function buildRouteTree(nodes, extractIssues) {
@@ -15817,7 +15964,7 @@ function composeFullUrl(node) {
     return void 0;
   }
   const joined = segments.join("");
-  const collapsed = joined.replaceAll(/\/{2,}/g, "/");
+  const collapsed = stripUrlQueryAndHash(joined).replaceAll(/\/{2,}/g, "/");
   return collapsed.length === 0 ? "/" : collapsed;
 }
 function compareByName(a, b) {
@@ -15873,148 +16020,6 @@ function loadRouteTree(args) {
   return result;
 }
 
-// packages/dbx-cli/src/lib/route/url-match.ts
-function normalizePathname(pathname) {
-  let result;
-  if (pathname.length === 0) {
-    result = "/";
-  } else if (pathname.length > 1 && pathname.endsWith("/")) {
-    result = pathname.slice(0, -1);
-  } else {
-    result = pathname;
-  }
-  return result;
-}
-function splitSegments(path) {
-  const normalized = path.startsWith("/") ? path.slice(1) : path;
-  return normalized.length === 0 ? [] : normalized.split("/");
-}
-function hasParamSegment(path) {
-  return path.includes(":") || path.includes("{");
-}
-function tryMatchSegments(route, input) {
-  if (route.length !== input.length) {
-    return void 0;
-  }
-  const params = {};
-  let result = params;
-  for (const [i, r] of route.entries()) {
-    const v = input[i];
-    if (r.startsWith(":")) {
-      const key = r.slice(1);
-      params[key] = decodeURIComponent(v);
-    } else if (r.startsWith("{") && r.endsWith("}")) {
-      const inner = r.slice(1, -1);
-      const colonIdx = inner.indexOf(":");
-      const key = colonIdx >= 0 ? inner.slice(0, colonIdx) : inner;
-      params[key] = decodeURIComponent(v);
-    } else if (r !== v) {
-      result = void 0;
-      break;
-    }
-  }
-  return result;
-}
-function extractUrlParamKeys(fullUrl) {
-  if (fullUrl === void 0 || fullUrl.length === 0) {
-    return [];
-  }
-  const seen = /* @__PURE__ */ new Set();
-  const keys = [];
-  for (const segment of fullUrl.split("/")) {
-    const key = extractParamKeyFromSegment(segment);
-    if (key !== void 0 && !seen.has(key)) {
-      seen.add(key);
-      keys.push(key);
-    }
-  }
-  return keys;
-}
-function extractParamKeyFromSegment(segment) {
-  if (segment.startsWith(":")) {
-    const key = segment.slice(1);
-    return key.length > 0 ? key : void 0;
-  }
-  if (segment.startsWith("{") && segment.endsWith("}")) {
-    const inner = segment.slice(1, -1);
-    const colonIdx = inner.indexOf(":");
-    const rawKey = colonIdx >= 0 ? inner.slice(0, colonIdx) : inner;
-    const key = rawKey.trim();
-    return key.length > 0 ? key : void 0;
-  }
-  return void 0;
-}
-function matchUrlAgainstEntries(input) {
-  const pathname = normalizePathname(input.pathname);
-  const literal = matchLiteral(input.entries, pathname);
-  let result;
-  if (literal.length === 1) {
-    result = { kind: "match", via: "literal", value: literal[0].value, matchedFullUrl: normalizePathname(literal[0].fullUrl ?? pathname), params: {} };
-  } else if (literal.length > 1) {
-    result = { kind: "ambiguous", values: literal.map((e) => e.value) };
-  } else {
-    result = matchParamOrNone(input.entries, pathname);
-  }
-  return result;
-}
-function matchLiteral(entries, pathname) {
-  const out = [];
-  for (const entry of entries) {
-    if (entry.fullUrl !== void 0 && normalizePathname(entry.fullUrl) === pathname) {
-      out.push(entry);
-    }
-  }
-  return out;
-}
-function matchParamOrNone(entries, pathname) {
-  const inputSegments = splitSegments(pathname);
-  const hits = [];
-  for (const entry of entries) {
-    if (entry.fullUrl === void 0 || !hasParamSegment(entry.fullUrl)) {
-      continue;
-    }
-    const params = tryMatchSegments(splitSegments(entry.fullUrl), inputSegments);
-    if (params) {
-      hits.push({ entry, params });
-    }
-  }
-  let result;
-  if (hits.length === 1) {
-    result = { kind: "match", via: "param", value: hits[0].entry.value, matchedFullUrl: normalizePathname(hits[0].entry.fullUrl ?? pathname), params: hits[0].params };
-  } else if (hits.length > 1) {
-    result = { kind: "ambiguous", values: hits.map((h) => h.entry.value) };
-  } else {
-    result = { kind: "none", candidates: scoreCandidates(entries, pathname) };
-  }
-  return result;
-}
-function scoreCandidates(entries, pathname) {
-  const segments = splitSegments(normalizePathname(pathname));
-  const scored = [];
-  for (const entry of entries) {
-    if (entry.fullUrl === void 0) {
-      continue;
-    }
-    const candidateSegments = splitSegments(entry.fullUrl);
-    let score = 0;
-    const maxIndex = Math.min(segments.length, candidateSegments.length);
-    for (let i = 0; i < maxIndex; i += 1) {
-      if (segments[i] === candidateSegments[i]) {
-        score += 2;
-      } else if (candidateSegments[i].startsWith(":") || candidateSegments[i].startsWith("{")) {
-        score += 1;
-      } else {
-        break;
-      }
-    }
-    if (score > 0) {
-      scored.push({ value: entry.value, score });
-    }
-  }
-  scored.sort((a, b) => b.score - a.score);
-  return scored.slice(0, 5).map((s) => s.value);
-}
-
 // packages/dbx-cli/src/lib/route/component-resolve.ts
 import { dirname as dirname15, join as join5, normalize } from "node:path/posix";
 var TRY_EXTENSIONS = [".ts", ".tsx", "/index.ts", "/index.tsx"];
@@ -16089,6 +16094,8 @@ function containsImportedSymbol(importStatement, symbol) {
 var MODEL_TYPE_RE = /^[a-zA-Z][a-zA-Z0-9]*$/u;
 var LITERAL_SEGMENT_RE = /^[a-zA-Z0-9][a-zA-Z0-9_-]*$/u;
 var AUTH_UID_PLACEHOLDER = "{authUid}";
+var CONST_TOKEN_RE = /^\{const:([a-zA-Z0-9][a-zA-Z0-9_-]*)\}$/u;
+var FLAT_KEY_TOKEN_RE = /^\{flatKey:([a-zA-Z_][a-zA-Z0-9_]*)\}$/u;
 var ROUTE_MODEL_TAG = "dbxRouteModel";
 var ROUTE_MODEL_LIST_TAG = "dbxRouteModelList";
 function parseRouteModelTag(tag) {
@@ -16124,7 +16131,7 @@ function parseModelTag(tokens, description) {
   } else if (MODEL_TYPE_RE.test(tokens[0])) {
     const parsedKey = parseKeyTemplate(tokens[1]);
     if (parsedKey.ok) {
-      result = { ok: true, model: { modelType: tokens[0], kind: parsedKey.kind, keyTemplate: tokens[1], description, routeParams: parsedKey.routeParams } };
+      result = { ok: true, model: { modelType: tokens[0], kind: parsedKey.kind, keyTemplate: parsedKey.keyTemplate, description, routeParams: parsedKey.routeParams } };
     } else {
       result = { ok: false, message: parsedKey.message };
     }
@@ -16146,17 +16153,21 @@ function parseKeyTemplate(keyTemplate) {
   return result;
 }
 function parseSingleSegmentKey(segment, keyTemplate) {
+  const flatKeyParam = flatKeyTokenParam(segment);
   const placeholder = placeholderParam(segment);
   let result;
-  if (placeholder === void 0) {
-    result = { ok: false, message: `Single-segment key template \`${keyTemplate}\` must be a placeholder (\`:param\` or \`${AUTH_UID_PLACEHOLDER}\`).` };
+  if (flatKeyParam !== void 0) {
+    result = { ok: true, kind: "flatKey", keyTemplate, routeParams: [flatKeyParam] };
+  } else if (placeholder === void 0) {
+    result = { ok: false, message: `Single-segment key template \`${keyTemplate}\` must be a placeholder (\`:param\` or \`${AUTH_UID_PLACEHOLDER}\`) or a flattened-key token (\`{flatKey:<param>}\`).` };
   } else {
-    result = { ok: true, kind: "id", routeParams: placeholder.routeParam === void 0 ? [] : [placeholder.routeParam] };
+    result = { ok: true, kind: "id", keyTemplate, routeParams: placeholder.routeParam === void 0 ? [] : [placeholder.routeParam] };
   }
   return result;
 }
 function parseAlternatingKey(segments, keyTemplate) {
   const routeParams = [];
+  const normalizedSegments = [];
   let message;
   for (const [i, segment] of segments.entries()) {
     if (i % 2 === 0) {
@@ -16164,18 +16175,24 @@ function parseAlternatingKey(segments, keyTemplate) {
         message = `Key template \`${keyTemplate}\` segment \`${segment}\` must be a literal collection name.`;
         break;
       }
+      normalizedSegments.push(segment);
     } else {
       const placeholder = placeholderParam(segment);
-      if (placeholder === void 0) {
-        message = `Key template \`${keyTemplate}\` segment \`${segment}\` must be a placeholder (\`:param\` or \`${AUTH_UID_PLACEHOLDER}\`).`;
+      const constId = constTokenId(segment);
+      if (placeholder !== void 0) {
+        if (placeholder.routeParam !== void 0) {
+          routeParams.push(placeholder.routeParam);
+        }
+        normalizedSegments.push(segment);
+      } else if (constId === void 0) {
+        message = `Key template \`${keyTemplate}\` segment \`${segment}\` must be a placeholder (\`:param\` or \`${AUTH_UID_PLACEHOLDER}\`) or a fixed id (\`{const:<id>}\`).`;
         break;
-      }
-      if (placeholder.routeParam !== void 0) {
-        routeParams.push(placeholder.routeParam);
+      } else {
+        normalizedSegments.push(constId);
       }
     }
   }
-  return message === void 0 ? { ok: true, kind: "key", routeParams } : { ok: false, message };
+  return message === void 0 ? { ok: true, kind: "key", keyTemplate: normalizedSegments.join("/"), routeParams } : { ok: false, message };
 }
 function placeholderParam(segment) {
   let result;
@@ -16188,6 +16205,14 @@ function placeholderParam(segment) {
   }
   return result;
 }
+function constTokenId(segment) {
+  const match = CONST_TOKEN_RE.exec(segment);
+  return match === null ? void 0 : match[1];
+}
+function flatKeyTokenParam(segment) {
+  const match = FLAT_KEY_TOKEN_RE.exec(segment);
+  return match === null ? void 0 : match[1];
+}
 
 // packages/dbx-cli/src/lib/route/route-models-extract.ts
 function extractComponentRouteModelTags(sourceFile, component) {
@@ -16209,7 +16234,7 @@ function collectRouteModelTags2(jsDocs) {
 
 // packages/dbx-cli/src/lib/route/route-manifest.ts
 import { Project as Project5 } from "ts-morph";
-var ROUTE_MANIFEST_VERSION = 1;
+var ROUTE_MANIFEST_VERSION = 2;
 function buildRouteManifest(input, now = /* @__PURE__ */ new Date()) {
   const warnings = [];
   const tree = loadRouteTree({ sources: input.sources });