@docusaurus/plugin-content-docs 0.0.0-4547 → 0.0.0-4551

package/lib/sidebars/validation.js

@@ -8,7 +8,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateCategoryMetadataFile = exports.validateSidebars = void 0;
 const utils_validation_1 = require("@docusaurus/utils-validation");
-const utils_1 = require("./utils");
 // NOTE: we don't add any default values during validation on purpose!
 // Config types are exposed to users for typechecking and we use the same type
 // in normalization
@@ -31,7 +30,7 @@ const sidebarItemDocSchema = sidebarItemBaseSchema.append({
 const sidebarItemHtmlSchema = sidebarItemBaseSchema.append({
     type: 'html',
     value: utils_validation_1.Joi.string().required(),
-    defaultStyle: utils_validation_1.Joi.boolean().default(false),
+    defaultStyle: utils_validation_1.Joi.boolean(),
 });
 const sidebarItemLinkSchema = sidebarItemBaseSchema.append({
     type: 'link',
@@ -65,23 +64,23 @@ const sidebarItemCategoryLinkSchema = utils_validation_1.Joi.object()
             }),
         },
         {
-            is: utils_validation_1.Joi.string().required(),
+            is: utils_validation_1.Joi.required(),
             then: utils_validation_1.Joi.forbidden().messages({
                 'any.unknown': 'Unknown sidebar category link type "{.type}".',
             }),
         },
     ],
-})
-    .id('sidebarCategoryLinkSchema');
+});
 const sidebarItemCategorySchema = sidebarItemBaseSchema.append({
     type: 'category',
     label: utils_validation_1.Joi.string()
         .required()
         .messages({ 'any.unknown': '"label" must be a string' }),
-    // TODO: Joi doesn't allow mutual recursion. See https://github.com/sideway/joi/issues/2611
     items: utils_validation_1.Joi.array()
         .required()
         .messages({ 'any.unknown': '"items" must be an array' }),
+    // TODO: Joi doesn't allow mutual recursion. See https://github.com/sideway/joi/issues/2611
+    // .items(Joi.link('#sidebarItemSchema')),
     link: sidebarItemCategoryLinkSchema,
     collapsed: utils_validation_1.Joi.boolean().messages({
         'any.unknown': '"collapsed" must be a boolean',
@@ -90,8 +89,7 @@ const sidebarItemCategorySchema = sidebarItemBaseSchema.append({
         'any.unknown': '"collapsible" must be a boolean',
     }),
 });
-const sidebarItemSchema = utils_validation_1.Joi.object()
-    .when('.type', {
+const sidebarItemSchema = utils_validation_1.Joi.object().when('.type', {
     switch: [
         { is: 'link', then: sidebarItemLinkSchema },
         {
@@ -108,33 +106,20 @@ const sidebarItemSchema = utils_validation_1.Joi.object()
             }),
         },
     ],
-})
-    .id('sidebarItemSchema');
+});
+// .id('sidebarItemSchema');
 function validateSidebarItem(item) {
-    if (typeof item === 'string') {
-        return;
-    }
     // TODO: remove once with proper Joi support
     // Because we can't use Joi to validate nested items (see above), we do it
     // manually
-    if ((0, utils_1.isCategoriesShorthand)(item)) {
-        Object.values(item).forEach((category) => category.forEach(validateSidebarItem));
-    }
-    else {
-        utils_validation_1.Joi.assert(item, sidebarItemSchema);
-        if (item.type === 'category') {
-            item.items.forEach(validateSidebarItem);
-        }
+    utils_validation_1.Joi.assert(item, sidebarItemSchema);
+    if (item.type === 'category') {
+        item.items.forEach(validateSidebarItem);
     }
 }
 function validateSidebars(sidebars) {
     Object.values(sidebars).forEach((sidebar) => {
-        if (Array.isArray(sidebar)) {
-            sidebar.forEach(validateSidebarItem);
-        }
-        else {
-            validateSidebarItem(sidebar);
-        }
+        sidebar.forEach(validateSidebarItem);
     });
 }
 exports.validateSidebars = validateSidebars;

package/lib/types.d.ts

@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { Sidebars } from './sidebars/types';
-import type { Tag, FrontMatterTag, Slugger } from '@docusaurus/utils';
+import type { Tag, FrontMatterTag } from '@docusaurus/utils';
 import type { BrokenMarkdownLink as IBrokenMarkdownLink, ContentPaths } from '@docusaurus/utils/lib/markdownLinks';
-import type { VersionBanner, SidebarOptions } from '@docusaurus/plugin-content-docs';
+import type { VersionBanner } from '@docusaurus/plugin-content-docs';
 export declare type DocFile = {
     contentPath: string;
     filePath: string;
@@ -29,10 +29,6 @@ export declare type VersionMetadata = ContentPaths & {
     sidebarFilePath: string | false | undefined;
     routePriority: number | undefined;
 };
-export declare type NormalizeSidebarsParams = SidebarOptions & {
-    version: VersionMetadata;
-    categoryLabelSlugger: Slugger;
-};
 export declare type LastUpdateData = {
     lastUpdatedAt?: number;
     formattedLastUpdatedAt?: string;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@docusaurus/plugin-content-docs",
-  "version": "0.0.0-4547",
+  "version": "0.0.0-4551",
   "description": "Docs plugin for Docusaurus.",
   "main": "lib/index.js",
   "exports": {
     "./client": "./lib/client/index.js",
-    "./server": "./lib/server/index.js",
+    "./server": "./lib/server-export.js",
     ".": "./lib/index.js"
   },
   "types": "src/plugin-content-docs.d.ts",
@@ -23,11 +23,11 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "0.0.0-4547",
-    "@docusaurus/logger": "0.0.0-4547",
-    "@docusaurus/mdx-loader": "0.0.0-4547",
-    "@docusaurus/utils": "0.0.0-4547",
-    "@docusaurus/utils-validation": "0.0.0-4547",
+    "@docusaurus/core": "0.0.0-4551",
+    "@docusaurus/logger": "0.0.0-4551",
+    "@docusaurus/mdx-loader": "0.0.0-4551",
+    "@docusaurus/utils": "0.0.0-4551",
+    "@docusaurus/utils-validation": "0.0.0-4551",
     "combine-promises": "^1.1.0",
     "fs-extra": "^10.0.0",
     "import-fresh": "^3.2.2",
@@ -40,8 +40,8 @@
     "webpack": "^5.68.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4547",
-    "@docusaurus/types": "0.0.0-4547",
+    "@docusaurus/module-type-aliases": "0.0.0-4551",
+    "@docusaurus/types": "0.0.0-4551",
     "@types/js-yaml": "^4.0.0",
     "@types/picomatch": "^2.2.1",
     "commander": "^5.1.0",
@@ -57,5 +57,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "17925a2f808cffa695698b1fe049d25524a48982"
+  "gitHead": "a948920b43d31d651edbe5d642ccd9fb88b09ecd"
 }

package/src/cli.ts

@@ -16,7 +16,7 @@ import type {
   PathOptions,
   SidebarOptions,
 } from '@docusaurus/plugin-content-docs';
-import {loadSidebarsFile, resolveSidebarPathOption} from './sidebars';
+import {loadSidebarsFileUnsafe, resolveSidebarPathOption} from './sidebars';
 import {DEFAULT_PLUGIN_ID} from '@docusaurus/utils';
 import logger from '@docusaurus/logger';
 
@@ -34,7 +34,8 @@ async function createVersionedSidebarFile({
   // Load current sidebar and create a new versioned sidebars file (if needed).
   // Note: we don't need the sidebars file to be normalized: it's ok to let
   // plugin option changes to impact older, versioned sidebars
-  const sidebars = await loadSidebarsFile(sidebarPath);
+  // We don't validate here, assuming the user has already built the version
+  const sidebars = await loadSidebarsFileUnsafe(sidebarPath);
 
   // Do not create a useless versioned sidebars file if sidebars file is empty
   // or sidebars are disabled/false)

package/src/client/index.ts

@@ -5,4 +5,100 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-export * from './globalDataHooks';
+import {useLocation} from '@docusaurus/router';
+import useGlobalData, {usePluginData} from '@docusaurus/useGlobalData';
+
+import {
+  getActivePlugin,
+  getLatestVersion,
+  getActiveVersion,
+  getActiveDocContext,
+  getDocVersionSuggestions,
+} from './docsClientUtils';
+import type {
+  GlobalPluginData,
+  GlobalVersion,
+  ActivePlugin,
+  ActiveDocContext,
+  DocVersionSuggestions,
+  GetActivePluginOptions,
+} from '@docusaurus/plugin-content-docs/client';
+
+// Important to use a constant object to avoid React useEffect executions etc.
+// see https://github.com/facebook/docusaurus/issues/5089
+const StableEmptyObject = {};
+
+// Not using useAllPluginInstancesData() because in blog-only mode, docs hooks
+// are still used by the theme. We need a fail-safe fallback when the docs
+// plugin is not in use
+export const useAllDocsData = (): Record<string, GlobalPluginData> =>
+  useGlobalData()['docusaurus-plugin-content-docs'] ?? StableEmptyObject;
+
+export const useDocsData = (pluginId: string | undefined): GlobalPluginData =>
+  usePluginData('docusaurus-plugin-content-docs', pluginId) as GlobalPluginData;
+
+// TODO this feature should be provided by docusaurus core
+export const useActivePlugin = (
+  options: GetActivePluginOptions = {},
+): ActivePlugin | undefined => {
+  const data = useAllDocsData();
+  const {pathname} = useLocation();
+  return getActivePlugin(data, pathname, options);
+};
+
+export const useActivePluginAndVersion = (
+  options: GetActivePluginOptions = {},
+):
+  | undefined
+  | {activePlugin: ActivePlugin; activeVersion: GlobalVersion | undefined} => {
+  const activePlugin = useActivePlugin(options);
+  const {pathname} = useLocation();
+  if (activePlugin) {
+    const activeVersion = getActiveVersion(activePlugin.pluginData, pathname);
+    return {
+      activePlugin,
+      activeVersion,
+    };
+  }
+  return undefined;
+};
+
+// versions are returned ordered (most recent first)
+export const useVersions = (pluginId: string | undefined): GlobalVersion[] => {
+  const data = useDocsData(pluginId);
+  return data.versions;
+};
+
+export const useLatestVersion = (
+  pluginId: string | undefined,
+): GlobalVersion => {
+  const data = useDocsData(pluginId);
+  return getLatestVersion(data);
+};
+
+// Note: return undefined on doc-unrelated pages,
+// because there's no version currently considered as active
+export const useActiveVersion = (
+  pluginId: string | undefined,
+): GlobalVersion | undefined => {
+  const data = useDocsData(pluginId);
+  const {pathname} = useLocation();
+  return getActiveVersion(data, pathname);
+};
+
+export const useActiveDocContext = (
+  pluginId: string | undefined,
+): ActiveDocContext => {
+  const data = useDocsData(pluginId);
+  const {pathname} = useLocation();
+  return getActiveDocContext(data, pathname);
+};
+
+// Useful to say "hey, you are not on the latest docs version, please switch"
+export const useDocVersionSuggestions = (
+  pluginId: string | undefined,
+): DocVersionSuggestions => {
+  const data = useDocsData(pluginId);
+  const {pathname} = useLocation();
+  return getDocVersionSuggestions(data, pathname);
+};

package/src/{server/index.ts → server-export.ts}

@@ -6,7 +6,12 @@
  */
 
 // APIs available to Node.js
-export * from '../constants';
+export {
+  CURRENT_VERSION_NAME,
+  VERSIONED_DOCS_DIR,
+  VERSIONED_SIDEBARS_DIR,
+  VERSIONS_JSON_FILE,
+} from './constants';
 
 export {
   filterVersions,
@@ -16,4 +21,4 @@ export {
   getVersionsFilePath,
   readVersionsFile,
   readVersionNames,
-} from '../versions';
+} from './versions';

package/src/sidebars/README.md

@@ -0,0 +1,9 @@
+# Sidebars
+
+This part is very complicated and hard to navigate. Sidebars are loaded through the following steps:
+
+1. **Loading**. The sidebars file is read. Returns `SidebarsConfig`.
+2. **Normalization**. The shorthands are expanded. This step is very lenient about the sidebars' shapes. Returns `NormalizedSidebars`.
+3. **Validation**. The normalized sidebars are validated. This step happens after normalization, because the normalized sidebars are easier to validate, and allows us to repeatedly validate & generate in the future.
+4. **Generation**. This step is done through the "processor" (naming is hard). The `autogenerated` items are unwrapped. In the future, steps 3 and 4 may be repeatedly done until all autogenerated items are unwrapped. Returns `ProcessedSidebars`.
+5. **Post-processing**. Defaults are applied (collapsed states), category links are resolved, empty categories are flattened. Returns `Sidebars`.

package/src/sidebars/generator.ts

@@ -6,12 +6,12 @@
  */
 
 import type {
-  SidebarItem,
   SidebarItemDoc,
-  SidebarItemCategory,
   SidebarItemsGenerator,
   SidebarItemsGeneratorDoc,
-  SidebarItemCategoryLink,
+  NormalizedSidebarItemCategory,
+  NormalizedSidebarItem,
+  SidebarItemCategoryLinkConfig,
 } from './types';
 import {sortBy, last} from 'lodash';
 import {addTrailingSlash, posixPath} from '@docusaurus/utils';
@@ -48,7 +48,6 @@ export const DefaultSidebarItemsGenerator: SidebarItemsGenerator = async ({
   numberPrefixParser,
   isCategoryIndex,
   docs: allDocs,
-  options,
   item: {dirName: autogenDir},
   categoriesMetadata,
 }) => {
@@ -125,7 +124,9 @@ export const DefaultSidebarItemsGenerator: SidebarItemsGenerator = async ({
    * Step 3. Recursively transform the tree-like structure to sidebar items.
    * (From a record to an array of items, akin to normalizing shorthand)
    */
-  function generateSidebar(fsModel: Dir): Promise<WithPosition<SidebarItem>[]> {
+  function generateSidebar(
+    fsModel: Dir,
+  ): Promise<WithPosition<NormalizedSidebarItem>[]> {
     function createDocItem(id: string): WithPosition<SidebarItemDoc> {
       const {
         sidebarPosition: position,
@@ -145,7 +146,7 @@ export const DefaultSidebarItemsGenerator: SidebarItemsGenerator = async ({
       dir: Dir,
       fullPath: string,
       folderName: string,
-    ): Promise<WithPosition<SidebarItemCategory>> {
+    ): Promise<WithPosition<NormalizedSidebarItemCategory>> {
       const categoryMetadata =
         categoriesMetadata[posixPath(path.join(autogenDir, fullPath))];
       const className = categoryMetadata?.className;
@@ -160,18 +161,19 @@ export const DefaultSidebarItemsGenerator: SidebarItemsGenerator = async ({
       // using the "local id" (myDoc) or "qualified id" (dirName/myDoc)
       function findDocByLocalId(localId: string): SidebarItemDoc | undefined {
         return allItems.find(
-          (item) => item.type === 'doc' && getLocalDocId(item.id) === localId,
-        ) as SidebarItemDoc | undefined;
+          (item): item is SidebarItemDoc =>
+            item.type === 'doc' && getLocalDocId(item.id) === localId,
+        );
       }
 
       function findConventionalCategoryDocLink(): SidebarItemDoc | undefined {
-        return allItems.find((item) => {
+        return allItems.find((item): item is SidebarItemDoc => {
           if (item.type !== 'doc') {
             return false;
           }
           const doc = getDoc(item.id);
           return isCategoryIndex(toCategoryIndexMatcherParam(doc));
-        }) as SidebarItemDoc | undefined;
+        });
       }
 
       function getCategoryLinkedDocId(): string | undefined {
@@ -190,13 +192,13 @@ export const DefaultSidebarItemsGenerator: SidebarItemsGenerator = async ({
 
       const categoryLinkedDocId = getCategoryLinkedDocId();
 
-      const link: SidebarItemCategoryLink | undefined = categoryLinkedDocId
-        ? {
-            type: 'doc',
-            id: categoryLinkedDocId, // We "remap" a potentially "local id" to a "qualified id"
-          }
-        : // TODO typing issue
-          (categoryMetadata?.link as SidebarItemCategoryLink | undefined);
+      const link: SidebarItemCategoryLinkConfig | null | undefined =
+        categoryLinkedDocId
+          ? {
+              type: 'doc',
+              id: categoryLinkedDocId, // We "remap" a potentially "local id" to a "qualified id"
+            }
+          : categoryMetadata?.link;
 
       // If a doc is linked, remove it from the category subItems
       const items = allItems.filter(
@@ -206,9 +208,8 @@ export const DefaultSidebarItemsGenerator: SidebarItemsGenerator = async ({
       return {
         type: 'category',
         label: categoryMetadata?.label ?? filename,
-        collapsible:
-          categoryMetadata?.collapsible ?? options.sidebarCollapsible,
-        collapsed: categoryMetadata?.collapsed ?? options.sidebarCollapsed,
+        collapsible: categoryMetadata?.collapsible,
+        collapsed: categoryMetadata?.collapsed,
         position: categoryMetadata?.position ?? numberPrefix,
         ...(className !== undefined && {className}),
         items,
@@ -219,7 +220,7 @@ export const DefaultSidebarItemsGenerator: SidebarItemsGenerator = async ({
       dir: Dir | null, // The directory item to be transformed.
       itemKey: string, // For docs, it's the doc ID; for categories, it's used to generate the next `relativePath`.
       fullPath: string, // `dir`'s full path relative to the autogen dir.
-    ): Promise<WithPosition<SidebarItem>> {
+    ): Promise<WithPosition<NormalizedSidebarItem>> {
       return dir
         ? createCategoryItem(dir, fullPath, itemKey)
         : createDocItem(itemKey.substring(docIdPrefix.length));
@@ -238,7 +239,9 @@ export const DefaultSidebarItemsGenerator: SidebarItemsGenerator = async ({
    * consecutive sidebar slices (i.e. a whole category composed of multiple
    * autogenerated items)
    */
-  function sortItems(sidebarItems: WithPosition<SidebarItem>[]): SidebarItem[] {
+  function sortItems(
+    sidebarItems: WithPosition<NormalizedSidebarItem>[],
+  ): NormalizedSidebarItem[] {
     const processedSidebarItems = sidebarItems.map((item) => {
       if (item.type === 'category') {
         return {...item, items: sortItems(item.items)};

package/src/sidebars/index.ts

@@ -7,13 +7,13 @@
 
 import fs from 'fs-extra';
 import importFresh from 'import-fresh';
-import type {SidebarsConfig, Sidebars, NormalizedSidebars} from './types';
-import type {NormalizeSidebarsParams} from '../types';
+import type {SidebarsConfig, Sidebars, SidebarProcessorParams} from './types';
 import {validateSidebars, validateCategoryMetadataFile} from './validation';
 import {normalizeSidebars} from './normalization';
-import {processSidebars, type SidebarProcessorParams} from './processor';
+import {processSidebars} from './processor';
+import {postProcessSidebars} from './postProcessor';
 import path from 'path';
-import {createSlugger, Globby} from '@docusaurus/utils';
+import {Globby} from '@docusaurus/utils';
 import logger from '@docusaurus/logger';
 import type {PluginOptions} from '@docusaurus/plugin-content-docs';
 import Yaml from 'js-yaml';
@@ -69,7 +69,7 @@ async function readCategoriesMetadata(contentPath: string) {
   );
 }
 
-async function loadSidebarsFileUnsafe(
+export async function loadSidebarsFileUnsafe(
   sidebarFilePath: string | false | undefined,
 ): Promise<SidebarsConfig> {
   // false => no sidebars
@@ -93,37 +93,21 @@ async function loadSidebarsFileUnsafe(
   return importFresh(sidebarFilePath);
 }
 
-export async function loadSidebarsFile(
-  sidebarFilePath: string | false | undefined,
-): Promise<SidebarsConfig> {
-  const sidebarsConfig = await loadSidebarsFileUnsafe(sidebarFilePath);
-  validateSidebars(sidebarsConfig);
-  return sidebarsConfig;
-}
-
-export async function loadNormalizedSidebars(
-  sidebarFilePath: string | false | undefined,
-  params: NormalizeSidebarsParams,
-): Promise<NormalizedSidebars> {
-  return normalizeSidebars(await loadSidebarsFile(sidebarFilePath), params);
-}
-
 // Note: sidebarFilePath must be absolute, use resolveSidebarPathOption
 export async function loadSidebars(
   sidebarFilePath: string | false | undefined,
-  options: Omit<SidebarProcessorParams, 'categoriesMetadata'>,
+  options: SidebarProcessorParams,
 ): Promise<Sidebars> {
-  const normalizeSidebarsParams: NormalizeSidebarsParams = {
-    ...options.sidebarOptions,
-    version: options.version,
-    categoryLabelSlugger: createSlugger(),
-  };
-  const normalizedSidebars = await loadNormalizedSidebars(
-    sidebarFilePath,
-    normalizeSidebarsParams,
-  );
+  const sidebarsConfig = await loadSidebarsFileUnsafe(sidebarFilePath);
+  const normalizedSidebars = normalizeSidebars(sidebarsConfig);
+  validateSidebars(normalizedSidebars);
   const categoriesMetadata = await readCategoriesMetadata(
     options.version.contentPath,
   );
-  return processSidebars(normalizedSidebars, {...options, categoriesMetadata});
+  const processedSidebars = await processSidebars(
+    normalizedSidebars,
+    categoriesMetadata,
+    options,
+  );
+  return postProcessSidebars(processedSidebars, options);
 }

package/src/sidebars/normalization.ts

@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {NormalizeSidebarsParams} from '../types';
 import type {
   NormalizedSidebarItem,
   NormalizedSidebar,
@@ -15,41 +14,16 @@ import type {
   SidebarItemConfig,
   SidebarConfig,
   SidebarsConfig,
-  SidebarItemCategoryLink,
   NormalizedSidebarItemCategory,
 } from './types';
 import {isCategoriesShorthand} from './utils';
 import {mapValues} from 'lodash';
-import {normalizeUrl} from '@docusaurus/utils';
-import type {SidebarOptions} from '@docusaurus/plugin-content-docs';
-
-function normalizeCategoryLink(
-  category: SidebarItemCategoryConfig,
-  params: NormalizeSidebarsParams,
-): SidebarItemCategoryLink | undefined {
-  if (category.link?.type === 'generated-index') {
-    // default slug logic can be improved
-    const getDefaultSlug = () =>
-      `/category/${params.categoryLabelSlugger.slug(category.label)}`;
-    const slug = category.link.slug ?? getDefaultSlug();
-    const permalink = normalizeUrl([params.version.versionPath, slug]);
-    return {
-      ...category.link,
-      slug,
-      permalink,
-    };
-  }
-  return category.link;
-}
 
 function normalizeCategoriesShorthand(
   sidebar: SidebarCategoriesShorthand,
-  options: SidebarOptions,
 ): SidebarItemCategoryConfig[] {
   return Object.entries(sidebar).map(([label, items]) => ({
     type: 'category',
-    collapsed: options.sidebarCollapsed,
-    collapsible: options.sidebarCollapsible,
     label,
     items,
   }));
@@ -61,7 +35,6 @@ function normalizeCategoriesShorthand(
  */
 export function normalizeItem(
   item: SidebarItemConfig,
-  options: NormalizeSidebarsParams,
 ): NormalizedSidebarItem[] {
   if (typeof item === 'string') {
     return [
@@ -72,42 +45,41 @@ export function normalizeItem(
     ];
   }
   if (isCategoriesShorthand(item)) {
-    return normalizeCategoriesShorthand(item, options).flatMap((subItem) =>
-      normalizeItem(subItem, options),
+    return normalizeCategoriesShorthand(item).flatMap((subItem) =>
+      normalizeItem(subItem),
     );
   }
   if (item.type === 'category') {
-    const link = normalizeCategoryLink(item, options);
+    if (typeof item.items !== 'undefined' && typeof item.items !== 'object') {
+      throw new Error(
+        `Invalid category ${JSON.stringify(
+          item,
+        )}: items must be an array of sidebar items or a category shorthand`,
+      );
+    }
     const normalizedCategory: NormalizedSidebarItemCategory = {
       ...item,
-      link,
-      items: (item.items ?? []).flatMap((subItem) =>
-        normalizeItem(subItem, options),
-      ),
-      collapsible: item.collapsible ?? options.sidebarCollapsible,
-      collapsed: item.collapsed ?? options.sidebarCollapsed,
+      items: Array.isArray(item.items)
+        ? item.items.flatMap((subItem) => normalizeItem(subItem))
+        : normalizeCategoriesShorthand(item.items).flatMap((subItem) =>
+            normalizeItem(subItem),
+          ),
     };
     return [normalizedCategory];
   }
   return [item];
 }
 
-function normalizeSidebar(
-  sidebar: SidebarConfig,
-  options: NormalizeSidebarsParams,
-): NormalizedSidebar {
+function normalizeSidebar(sidebar: SidebarConfig): NormalizedSidebar {
   const normalizedSidebar = Array.isArray(sidebar)
     ? sidebar
-    : normalizeCategoriesShorthand(sidebar, options);
+    : normalizeCategoriesShorthand(sidebar);
 
-  return normalizedSidebar.flatMap((subItem) =>
-    normalizeItem(subItem, options),
-  );
+  return normalizedSidebar.flatMap((subItem) => normalizeItem(subItem));
 }
 
 export function normalizeSidebars(
   sidebars: SidebarsConfig,
-  params: NormalizeSidebarsParams,
 ): NormalizedSidebars {
-  return mapValues(sidebars, (items) => normalizeSidebar(items, params));
+  return mapValues(sidebars, normalizeSidebar);
 }