Fix article API perf: refactor resolvePath to use findPage, remove liquidOnly (#60496)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: heiskr

src/article-api/lib/get-all-toc-items.ts

@@ -1,6 +1,5 @@
 import type { Context, Page } from '@/types'
 import type { LinkData } from '@/article-api/transformers/types'
-import { renderLiquid } from '@/content-render/liquid/index'
 import { resolvePath } from './resolve-path'
 
 interface PageWithChildren extends Page {
@@ -29,16 +28,12 @@ export async function getAllTocItems(
   options: {
     recurse?: boolean
     renderIntros?: boolean
-    /** Use Liquid-only rendering for titles and intros instead of the full
-     *  Markdown/unified pipeline. Resolves {% data %} variables without
-     *  the cost of Markdown parsing, unified processing, and Cheerio unwrap. */
-    liquidOnly?: boolean
     /** Only recurse into children whose resolved path starts with this prefix.
      *  Prevents cross-product traversal (e.g. /en/rest listing /enterprise-admin). */
     basePath?: string
   } = {},
 ): Promise<TocItem[]> {
-  const { recurse = true, renderIntros = true, liquidOnly = false } = options
+  const { recurse = true, renderIntros = true } = options
   const pageWithChildren = page as PageWithChildren
   const languageCode = page.languageCode || 'en'
 
@@ -75,32 +70,11 @@ export async function getAllTocItems(
       )
       const href = childPermalink ? childPermalink.href : childHref
 
-      let title: string
-      if (liquidOnly) {
-        const raw = childPage.shortTitle || childPage.title
-        try {
-          title = await renderLiquid(raw, context)
-        } catch {
-          // Fall back to raw frontmatter string if Liquid rendering fails
-          // (e.g. translation errors in non-English pages)
-          title = raw
-        }
-      } else {
-        title = await childPage.renderTitle(context, { unwrap: true })
-      }
+      const title = await childPage.renderTitle(context, { unwrap: true })
 
       let intro = ''
       if (renderIntros && childPage.intro) {
-        if (liquidOnly) {
-          const rawIntro = childPage.rawIntro || childPage.intro
-          try {
-            intro = await renderLiquid(rawIntro, context)
-          } catch {
-            intro = rawIntro
-          }
-        } else {
-          intro = await childPage.renderProp('intro', context, { textOnly: true })
-        }
+        intro = await childPage.renderProp('intro', context, { textOnly: true })
       }
 
       const category = childPage.category || []

src/article-api/lib/resolve-path.ts

@@ -1,107 +1,62 @@
+import findPage from '@/frame/lib/find-page'
+import { allVersionKeys } from '@/versions/lib/all-versions'
 import type { Context, Page } from '@/types'
 
 /**
- * Resolves an href to a Page object from the context
+ * Resolves an href to a Page object from the context.
  *
- * This function handles various href formats:
- * - External URLs (http/https) - returns undefined
- * - Language-prefixed absolute paths (/en/copilot/...) - direct lookup
- * - Absolute paths without language (/copilot/...) - adds language prefix
- * - Relative paths (get-started) - resolved relative to pathname
- *
- * The function searches through context.pages using multiple strategies:
- * 1. Direct key lookup with language prefix
- * 2. Relative path joining with current pathname
- * 3. endsWith matching for versioned keys (e.g., /en/enterprise-cloud@latest/...)
- *
- * @param href - The href to resolve
- * @param languageCode - The language code (e.g., 'en')
- * @param pathname - The current page's pathname (e.g., '/en/copilot')
- * @param context - The rendering context containing all pages
- * @returns The resolved Page object, or undefined if not found
- *
- * @example
- * ```typescript
- * // Absolute path with language
- * resolvePath('/en/copilot/quickstart', 'en', '/en/copilot', context)
- *
- * // Absolute path without language (adds /en/)
- * resolvePath('/copilot/quickstart', 'en', '/en/copilot', context)
- *
- * // Relative path (resolves to /en/copilot/quickstart)
- * resolvePath('quickstart', 'en', '/en/copilot', context)
- *
- * // Relative path with leading slash (resolves relative to pathname)
- * resolvePath('/quickstart', 'en', '/en/copilot', context) // -> /en/copilot/quickstart
- * ```
+ * Normalizes various href formats (relative, absolute, with/without language
+ * prefix) to canonical paths, then delegates to findPage for lookup with
+ * redirect support and English fallback.
  */
 export function resolvePath(
   href: string,
   languageCode: string,
   pathname: string,
   context: Context,
 ): Page | undefined {
-  // External URLs cannot be resolved
-  if (href.startsWith('http://') || href.startsWith('https://')) {
-    return undefined
-  }
-
-  if (!context.pages) {
-    return undefined
-  }
+  if (href.startsWith('http://') || href.startsWith('https://')) return undefined
+  if (!context.pages) return undefined
 
-  // Normalize href to start with /
-  const normalizedHref = href.startsWith('/') ? href : `/${href}`
+  const { pages, redirects } = context
 
-  // Build full path with language prefix if needed
-  let fullPath: string
-  if (normalizedHref.startsWith(`/${languageCode}/`)) {
-    // Already has language prefix
-    fullPath = normalizedHref
-  } else if (href.startsWith('/') && !href.startsWith(`/${languageCode}/`)) {
-    // Path with leading slash but no language prefix - treat as relative to pathname
-    // e.g., pathname='/en/copilot', href='/get-started' -> '/en/copilot/get-started'
-    fullPath = pathname + href
-  } else {
-    // Relative path - add language prefix
-    // e.g., href='quickstart' -> '/en/quickstart'
-    fullPath = `/${languageCode}${normalizedHref}`
+  for (const candidate of candidates(href, languageCode, pathname)) {
+    const page =
+      findPage(candidate, pages, redirects) ||
+      findPage(candidate.replace(/\/?$/, '/'), pages, redirects)
+    if (page) return page
   }
 
-  // Clean up trailing slashes
-  const cleanPath = fullPath.replace(/\/$/, '')
-
-  // Strategy 1: Direct lookup
-  if (context.pages[cleanPath]) {
-    return context.pages[cleanPath]
-  }
-
-  // Strategy 2: Try relative to current pathname
-  const currentPath = pathname.replace(/\/$/, '')
-  const relativeHref = href.startsWith('/') ? href.slice(1) : href
-  const joinedPath = `${currentPath}/${relativeHref}`
-
-  if (context.pages[joinedPath]) {
-    return context.pages[joinedPath]
-  }
+  return undefined
+}
 
-  // Strategy 3: Search for keys that end with the path (handles versioned keys)
-  // e.g., key='/en/enterprise-cloud@latest/copilot' should match path='/en/copilot'
-  for (const [key, page] of Object.entries(context.pages)) {
-    if (key.endsWith(cleanPath) || key.endsWith(`${cleanPath}/`)) {
-      return page
-    }
+// Lazily yields candidate paths in priority order, stopping at first match.
+function* candidates(href: string, lang: string, pathname: string) {
+  const langPrefix = `/${lang}/`
+  const cleanPathname = pathname.replace(/\/$/, '')
+
+  if (href.startsWith(langPrefix)) {
+    // Already has language prefix — use as-is
+    yield href
+  } else if (href.startsWith('/')) {
+    // Leading slash without lang prefix — try relative to pathname first,
+    // then as a direct path with lang prefix
+    yield `${cleanPathname}${href}`
+    yield `${langPrefix.slice(0, -1)}${href}`
+  } else {
+    // Relative path — try relative to pathname, then with lang prefix
+    yield `${cleanPathname}/${href}`
+    yield `${langPrefix}${href}`
   }
 
-  // Strategy 4: If href started with /, try endsWith matching on that too
-  if (href.startsWith('/')) {
-    const hrefClean = href.replace(/\/$/, '')
-    for (const [key, page] of Object.entries(context.pages)) {
-      if (key.endsWith(hrefClean) || key.endsWith(`${hrefClean}/`)) {
-        return page
-      }
+  // Versioned fallback: try inserting each version slug for
+  // enterprise-only pages that don't exist on FPT.
+  const suffix = href.startsWith(langPrefix)
+    ? href.slice(langPrefix.length).replace(/\/$/, '')
+    : href.replace(/^\//, '').replace(/\/$/, '')
+  if (suffix) {
+    for (const version of allVersionKeys) {
+      yield `${langPrefix}${version}/${suffix}`
     }
   }
-
-  return undefined
 }

src/article-api/transformers/discovery-landing-transformer.ts

@@ -130,16 +130,13 @@ export class DiscoveryLandingTransformer implements PageTransformer {
     }
 
     // Articles section: recursively gather descendant articles within
-    // this product section. Uses Liquid-only rendering for titles and intros
-    // instead of the full Markdown/unified pipeline, which would take 30s+
-    // for large sections like /rest (297 descendants × 2 renderContent calls).
-    // The basePath guard prevents cross-product recursion (e.g. /rest listing
-    // /enterprise-admin children that point outside the /rest hierarchy).
+    // this product section. The basePath guard prevents cross-product
+    // recursion (e.g. /rest listing /enterprise-admin children that
+    // point outside the /rest hierarchy).
     if (discoveryPage.children && discoveryPage.children.length > 0) {
       const tocItems = await getAllTocItems(page, context, {
         recurse: true,
         renderIntros: true,
-        liquidOnly: true,
       })
 
       // Flatten to get all leaf articles (excludeParents: true means only get articles, not category pages)