@mintlify/common 1.0.1089 → 1.0.1091

package/dist/navigation/filterDivisions.js

@@ -47,6 +47,8 @@ export const filterDivisions = ({ currentPath, currentVersion, currentLanguage,
     };
     const firstHrefInVersion = new Map();
     const firstHrefInLanguage = new Map();
+    let activeVersionsOwner;
+    let activeLanguagesOwner;
     function findPageInNavigation({ currentPath, entry, parentGroups, isPreview = false, ancestorDivisionNames = [], }) {
         if (typeof entry !== 'object') {
             return { page: undefined, groupsOrPages: undefined };
@@ -144,6 +146,10 @@ export const filterDivisions = ({ currentPath, currentVersion, currentLanguage,
                     ancestorDivisionNames: newAncestorNames,
                 });
                 if (page) {
+                    if (key === 'versions' && !activeVersionsOwner)
+                        activeVersionsOwner = entry;
+                    if (key === 'languages' && !activeLanguagesOwner)
+                        activeLanguagesOwner = entry;
                     const isSameDivision = createDivisionMatcher(subDivisions);
                     const filteredSubDivisions = subDivisions
                         .filter((division) => isDivisionAccessible(division, userGroups, isPreview))
@@ -212,6 +218,7 @@ export const filterDivisions = ({ currentPath, currentVersion, currentLanguage,
             firstHrefInDivision: firstHrefInVersion,
             navigationDivisions,
             isHiddenPage: page === undefined,
+            activeDivisionOwner: activeVersionsOwner,
         });
     }
     if (navigationDivisions.languages.length) {
@@ -228,6 +235,7 @@ export const filterDivisions = ({ currentPath, currentVersion, currentLanguage,
             firstHrefInDivision: firstHrefInLanguage,
             navigationDivisions,
             isHiddenPage: page === undefined,
+            activeDivisionOwner: activeLanguagesOwner,
         });
     }
     if (decoratedNav && 'global' in decoratedNav && decoratedNav.global) {

package/dist/navigation/firstHrefDivisionScoping.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/navigation/firstHrefDivisionScoping.test.js

@@ -0,0 +1,147 @@
+import { filterDivisions } from './filterDivisions.js';
+const baseArgs = {
+    userGroups: new Set(),
+    currentVersion: undefined,
+    currentLanguage: undefined,
+    shouldUseDivisionMatch: true,
+    cache: { dropdownCache: new Map() },
+};
+const dropdownsWithIdenticalVersionSets = {
+    dropdowns: [
+        {
+            dropdown: 'Market Risk',
+            versions: [
+                {
+                    version: '6.0 (latest)',
+                    groups: [
+                        {
+                            group: 'Guides',
+                            pages: [{ title: 'MR Intro', href: '/solutions/market-risk/6.0/intro' }],
+                        },
+                    ],
+                },
+                {
+                    version: 'Previous versions',
+                    pages: [{ title: 'MR Previous', href: '/solutions/market-risk/previous-versions' }],
+                },
+            ],
+        },
+        {
+            dropdown: 'FRTB',
+            versions: [
+                {
+                    version: '6.0 (latest)',
+                    groups: [
+                        {
+                            group: 'Cube',
+                            pages: [
+                                { title: 'LH', href: '/solutions/frtb/6.0/cube/lh' },
+                                { title: 'Omega', href: '/solutions/frtb/6.0/cube/omega' },
+                            ],
+                        },
+                    ],
+                },
+                {
+                    version: 'Previous versions',
+                    pages: [{ title: 'FRTB Previous', href: '/solutions/frtb/previous-versions' }],
+                },
+            ],
+        },
+    ],
+};
+const productsWithSharedPage = {
+    products: [
+        {
+            product: 'Java SDK',
+            versions: [
+                {
+                    version: '6.1',
+                    pages: [
+                        { title: 'Java Intro', href: '/java-sdk/6.1/intro' },
+                        { title: 'Billing', href: '/shared/billing' },
+                    ],
+                },
+                {
+                    version: 'Previous versions',
+                    pages: [{ title: 'Java Old', href: '/java-sdk/previous/intro' }],
+                },
+            ],
+        },
+        {
+            product: 'Solutions',
+            versions: [
+                {
+                    version: '6.1',
+                    pages: [
+                        { title: 'Sol Intro', href: '/solutions/6.1/intro' },
+                        { title: 'Billing', href: '/shared/billing' },
+                    ],
+                },
+                {
+                    version: 'Previous versions',
+                    pages: [{ title: 'Sol Old', href: '/solutions/previous/intro' }],
+                },
+            ],
+        },
+    ],
+};
+const dropdownsWithIdenticalLanguageSets = {
+    dropdowns: [
+        {
+            dropdown: 'Alpha',
+            languages: [
+                {
+                    language: 'en',
+                    pages: [{ title: 'Alpha Overview', href: '/alpha/en/overview' }],
+                },
+                {
+                    language: 'es',
+                    pages: [{ title: 'Alpha Resumen', href: '/alpha/es/overview' }],
+                },
+            ],
+        },
+        {
+            dropdown: 'Beta',
+            languages: [
+                {
+                    language: 'en',
+                    pages: [{ title: 'Beta Overview', href: '/beta/en/overview' }],
+                },
+                {
+                    language: 'es',
+                    pages: [{ title: 'Beta Resumen', href: '/beta/es/overview' }],
+                },
+            ],
+        },
+    ],
+};
+describe('firstHrefInDivision scoping with colliding division labels', () => {
+    it('resolves a sibling version inside the active dropdown, not the first label match', () => {
+        var _a, _b;
+        const result = filterDivisions(Object.assign(Object.assign({}, baseArgs), { currentPath: '/solutions/frtb/6.0/cube/lh', currentVersion: '6.0 (latest)', decoratedNav: dropdownsWithIdenticalVersionSets }));
+        expect((_a = result.firstHrefInVersion.get('6.0 (latest)')) === null || _a === void 0 ? void 0 : _a.href).toBe('/solutions/frtb/6.0/cube/lh');
+        expect((_b = result.firstHrefInVersion.get('Previous versions')) === null || _b === void 0 ? void 0 : _b.href).toBe('/solutions/frtb/previous-versions');
+    });
+    it('resolves a sibling version inside the first dropdown when the reader is there', () => {
+        var _a;
+        const result = filterDivisions(Object.assign(Object.assign({}, baseArgs), { currentPath: '/solutions/market-risk/6.0/intro', currentVersion: '6.0 (latest)', decoratedNav: dropdownsWithIdenticalVersionSets }));
+        expect((_a = result.firstHrefInVersion.get('Previous versions')) === null || _a === void 0 ? void 0 : _a.href).toBe('/solutions/market-risk/previous-versions');
+    });
+    it('resolves a sibling version for a shared page using the current product', () => {
+        var _a;
+        const result = filterDivisions(Object.assign(Object.assign({}, baseArgs), { currentPath: '/shared/billing', currentVersion: '6.1', currentProduct: 'Solutions', decoratedNav: productsWithSharedPage }));
+        const activeProduct = result.products.find((p) => 'isActive' in p && p.isActive);
+        expect(activeProduct === null || activeProduct === void 0 ? void 0 : activeProduct.product).toBe('Solutions');
+        expect((_a = result.firstHrefInVersion.get('Previous versions')) === null || _a === void 0 ? void 0 : _a.href).toBe('/solutions/previous/intro');
+    });
+    it('resolves a sibling language inside the active dropdown', () => {
+        var _a;
+        const result = filterDivisions(Object.assign(Object.assign({}, baseArgs), { currentPath: '/beta/en/overview', currentLanguage: 'en', decoratedNav: dropdownsWithIdenticalLanguageSets }));
+        expect((_a = result.firstHrefInLanguage.get('es')) === null || _a === void 0 ? void 0 : _a.href).toBe('/beta/es/overview');
+    });
+    it('keeps hidden-page behavior unchanged', () => {
+        var _a;
+        const result = filterDivisions(Object.assign(Object.assign({}, baseArgs), { currentPath: '/not-in-nav', currentVersion: '6.0 (latest)', decoratedNav: dropdownsWithIdenticalVersionSets }));
+        expect((_a = result.firstHrefInVersion.get('6.0 (latest)')) === null || _a === void 0 ? void 0 : _a.href).toBe('/not-in-nav');
+    });
+});

package/dist/navigation/updateFirstHrefInDivision.d.ts

@@ -12,7 +12,7 @@ export type DivisionMatch = {
     href: string;
     matchLevel: DivisionMatchLevel;
 };
-export declare function updateFirstHrefInDivision({ type, currentPath, entry, parentGroups, nearestDivisionValue, isActiveGroup, inActiveDivision, currentDivisionValue, allDivisionValues, firstHrefInDivision, navigationDivisions, isHiddenPage, activeGroupNames, }: {
+export declare function updateFirstHrefInDivision({ type, currentPath, entry, parentGroups, nearestDivisionValue, isActiveGroup, inActiveDivision, currentDivisionValue, allDivisionValues, firstHrefInDivision, navigationDivisions, isHiddenPage, activeGroupNames, activeDivisionOwner, }: {
     type: 'version' | 'language';
     currentPath: string;
     entry: DecoratedNavigationConfig | DecoratedPageOrGroupConfig;
@@ -26,5 +26,6 @@ export declare function updateFirstHrefInDivision({ type, currentPath, entry, pa
     navigationDivisions: NavigationDivisions;
     isHiddenPage: boolean;
     activeGroupNames?: Set<string>;
+    activeDivisionOwner?: object;
 }): void;
 export declare function pathsDifferByOneSegment(a: string, b: string, type: 'version' | 'language'): boolean;

package/dist/navigation/updateFirstHrefInDivision.js

@@ -13,7 +13,7 @@ export var DivisionMatchLevel;
     DivisionMatchLevel[DivisionMatchLevel["UNVERSIONED"] = 5] = "UNVERSIONED";
 })(DivisionMatchLevel || (DivisionMatchLevel = {}));
 const ACCEPTED_BASE_PATHS = ['docs', 'doc', 'documentation', 'help'];
-export function updateFirstHrefInDivision({ type, currentPath, entry, parentGroups, nearestDivisionValue, isActiveGroup, inActiveDivision, currentDivisionValue, allDivisionValues, firstHrefInDivision, navigationDivisions, isHiddenPage, activeGroupNames, }) {
+export function updateFirstHrefInDivision({ type, currentPath, entry, parentGroups, nearestDivisionValue, isActiveGroup, inActiveDivision, currentDivisionValue, allDivisionValues, firstHrefInDivision, navigationDivisions, isHiddenPage, activeGroupNames, activeDivisionOwner, }) {
     if (typeof entry !== 'object')
         return;
     if (isPage(entry)) {
@@ -44,6 +44,7 @@ export function updateFirstHrefInDivision({ type, currentPath, entry, parentGrou
                 navigationDivisions,
                 isHiddenPage,
                 activeGroupNames,
+                activeDivisionOwner,
             });
         }
         for (const page of entry.pages) {
@@ -62,6 +63,7 @@ export function updateFirstHrefInDivision({ type, currentPath, entry, parentGrou
                     navigationDivisions,
                     isHiddenPage,
                     activeGroupNames,
+                    activeDivisionOwner,
                 });
             }
         }
@@ -91,6 +93,7 @@ export function updateFirstHrefInDivision({ type, currentPath, entry, parentGrou
                 navigationDivisions,
                 isHiddenPage,
                 activeGroupNames,
+                activeDivisionOwner,
             });
         }
     }
@@ -99,7 +102,11 @@ export function updateFirstHrefInDivision({ type, currentPath, entry, parentGrou
         if (!subDivisions)
             continue;
         let inActiveDivision = false;
-        if (allDivisionValues && allDivisionValues.length) {
+        const isMatchingDivisionKey = (type === 'version' && key === 'versions') || (type === 'language' && key === 'languages');
+        if (isMatchingDivisionKey && activeDivisionOwner !== undefined) {
+            inActiveDivision = entry === activeDivisionOwner;
+        }
+        else if (allDivisionValues && allDivisionValues.length) {
             if (type === 'version' && key === 'versions') {
                 const localDivisionValueCount = navigationDivisions.versions.filter((version) => !version.isGlobal).length;
                 inActiveDivision =
@@ -161,6 +168,7 @@ export function updateFirstHrefInDivision({ type, currentPath, entry, parentGrou
                 navigationDivisions,
                 isHiddenPage,
                 activeGroupNames: activeGroupsInVersionContext,
+                activeDivisionOwner,
             });
         }
     }