@docusaurus/plugin-content-docs 2.0.0-beta.16 → 2.0.0-beta.17

package/lib/categoryGeneratedIndex.js

@@ -10,13 +10,12 @@ exports.getCategoryGeneratedIndexMetadataList = void 0;
 const utils_1 = require("./sidebars/utils");
 const docs_1 = require("./docs");
 function getCategoryGeneratedIndexMetadata({ category, sidebarsUtils, docsById, }) {
-    var _a;
     const { sidebarName, previous, next } = sidebarsUtils.getCategoryGeneratedIndexNavigation(category.link.permalink);
     if (!sidebarName) {
         throw new Error('unexpected');
     }
     return {
-        title: (_a = category.link.title) !== null && _a !== void 0 ? _a : category.label,
+        title: category.link.title ?? category.label,
         description: category.link.description,
         image: category.link.image,
         keywords: category.link.keywords,

package/lib/cli.js

@@ -9,11 +9,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.cliDocsVersionCommand = void 0;
 const tslib_1 = require("tslib");
 const versions_1 = require("./versions");
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const sidebars_1 = require("./sidebars");
 const utils_1 = require("@docusaurus/utils");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 async function createVersionedSidebarFile({ siteDir, pluginId, sidebarPath, version, }) {
     // 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

package/lib/client/docsClientUtils.js

@@ -53,7 +53,7 @@ const getActiveVersion = (data, pathname) => {
 exports.getActiveVersion = getActiveVersion;
 const getActiveDocContext = (data, pathname) => {
     const activeVersion = (0, exports.getActiveVersion)(data, pathname);
-    const activeDoc = activeVersion === null || activeVersion === void 0 ? void 0 : activeVersion.docs.find((doc) => !!(0, router_1.matchPath)(pathname, {
+    const activeDoc = activeVersion?.docs.find((doc) => !!(0, router_1.matchPath)(pathname, {
         path: doc.path,
         exact: true,
         strict: false,
@@ -82,7 +82,7 @@ exports.getActiveDocContext = getActiveDocContext;
 const getDocVersionSuggestions = (data, pathname) => {
     const latestVersion = (0, exports.getLatestVersion)(data);
     const activeDocContext = (0, exports.getActiveDocContext)(data, pathname);
-    const latestDocSuggestion = activeDocContext === null || activeDocContext === void 0 ? void 0 : activeDocContext.alternateDocVersions[latestVersion.name];
+    const latestDocSuggestion = activeDocContext?.alternateDocVersions[latestVersion.name];
     return { latestDocSuggestion, latestVersionSuggestion: latestVersion };
 };
 exports.getDocVersionSuggestions = getDocVersionSuggestions;

package/lib/client/index.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useDocVersionSuggestions = exports.useActiveDocContext = exports.useActiveVersion = exports.useLatestVersion = exports.useVersions = exports.useActivePluginAndVersion = exports.useActivePlugin = exports.useDocsData = exports.useAllDocsData = void 0;
 const tslib_1 = require("tslib");
 const router_1 = require("@docusaurus/router");
-const useGlobalData_1 = (0, tslib_1.__importStar)(require("@docusaurus/useGlobalData"));
+const useGlobalData_1 = tslib_1.__importStar(require("@docusaurus/useGlobalData"));
 const docsClientUtils_1 = require("./docsClientUtils");
 // Important to use a constant object to avoid React useEffect executions etc.
 // see https://github.com/facebook/docusaurus/issues/5089
@@ -17,7 +17,7 @@ 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
-const useAllDocsData = () => { var _a; return (_a = (0, useGlobalData_1.default)()['docusaurus-plugin-content-docs']) !== null && _a !== void 0 ? _a : StableEmptyObject; };
+const useAllDocsData = () => (0, useGlobalData_1.default)()['docusaurus-plugin-content-docs'] ?? StableEmptyObject;
 exports.useAllDocsData = useAllDocsData;
 const useDocsData = (pluginId) => (0, useGlobalData_1.usePluginData)('docusaurus-plugin-content-docs', pluginId);
 exports.useDocsData = useDocsData;

package/lib/docs.js

@@ -8,12 +8,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDocsByIdIndex = exports.getDocIds = exports.splitPath = exports.toCategoryIndexMatcherParam = exports.isCategoryIndex = exports.getMainDocId = exports.addDocNavigation = exports.processDocMetadata = exports.readVersionDocs = exports.readDocFile = void 0;
 const tslib_1 = require("tslib");
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
 const lastUpdate_1 = require("./lastUpdate");
-const slug_1 = (0, tslib_1.__importDefault)(require("./slug"));
+const slug_1 = tslib_1.__importDefault(require("./slug"));
 const constants_1 = require("./constants");
 const versions_1 = require("./versions");
 const numberPrefix_1 = require("./numberPrefix");
@@ -58,7 +58,6 @@ async function readVersionDocs(versionMetadata, options) {
 }
 exports.readVersionDocs = readVersionDocs;
 function doProcessDocMetadata({ docFile, versionMetadata, context, options, }) {
-    var _a, _b, _c, _d, _e, _f;
     const { source, content, lastUpdate, contentPath, filePath } = docFile;
     const { siteDir, i18n } = context;
     const { frontMatter: unsafeFrontMatter, contentTitle, excerpt, } = (0, utils_1.parseMarkdownString)(content);
@@ -77,13 +76,13 @@ function doProcessDocMetadata({ docFile, versionMetadata, context, options, }) {
     const { filename: unprefixedFileName, numberPrefix } = parseNumberPrefixes
         ? options.numberPrefixParser(sourceFileNameWithoutExtension)
         : { filename: sourceFileNameWithoutExtension, numberPrefix: undefined };
-    const baseID = (_a = frontMatter.id) !== null && _a !== void 0 ? _a : unprefixedFileName;
+    const baseID = frontMatter.id ?? unprefixedFileName;
     if (baseID.includes('/')) {
         throw new Error(`Document id "${baseID}" cannot include slash.`);
     }
     // For autogenerated sidebars, sidebar position can come from filename number
     // prefix or front matter
-    const sidebarPosition = (_b = frontMatter.sidebar_position) !== null && _b !== void 0 ? _b : numberPrefix;
+    const sidebarPosition = frontMatter.sidebar_position ?? numberPrefix;
     // TODO legacy retrocompatibility
     // The same doc in 2 distinct version could keep the same id,
     // we just need to namespace the data by version
@@ -118,8 +117,8 @@ function doProcessDocMetadata({ docFile, versionMetadata, context, options, }) {
     // Note: the title is used by default for page title, sidebar label,
     // pagination buttons... frontMatter.title should be used in priority over
     // contentTitle (because it can contain markdown/JSX syntax)
-    const title = (_d = (_c = frontMatter.title) !== null && _c !== void 0 ? _c : contentTitle) !== null && _d !== void 0 ? _d : baseID;
-    const description = (_f = (_e = frontMatter.description) !== null && _e !== void 0 ? _e : excerpt) !== null && _f !== void 0 ? _f : '';
+    const title = frontMatter.title ?? contentTitle ?? baseID;
+    const description = frontMatter.description ?? excerpt ?? '';
     const permalink = (0, utils_1.normalizeUrl)([versionMetadata.versionPath, docSlug]);
     function getDocEditUrl() {
         const relativeFilePath = path_1.default.relative(contentPath, filePath);
@@ -241,11 +240,10 @@ exports.getMainDocId = getMainDocId;
 // - Slugs do not end with a weird "/index" suffix
 // - Auto-generated sidebar categories link to them as intro
 const isCategoryIndex = ({ fileName, directories, }) => {
-    var _a;
     const eligibleDocIndexNames = [
         'index',
         'readme',
-        (_a = directories[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase(),
+        directories[0]?.toLowerCase(),
     ];
     return eligibleDocIndexNames.includes(fileName.toLowerCase());
 };

package/lib/globalData.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toGlobalDataVersion = exports.toGlobalSidebars = exports.toGlobalDataGeneratedIndex = exports.toGlobalDataDoc = void 0;
 const tslib_1 = require("tslib");
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const utils_1 = require("@docusaurus/utils");
 const utils_2 = require("./sidebars/utils");
 function toGlobalDataDoc(doc) {

package/lib/index.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = void 0;
 const tslib_1 = require("tslib");
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const utils_1 = require("@docusaurus/utils");
 const sidebars_1 = require("./sidebars");
 const generator_1 = require("./sidebars/generator");
@@ -19,16 +19,15 @@ const constants_1 = require("./constants");
 const globalData_1 = require("./globalData");
 const props_1 = require("./props");
 const translations_1 = require("./translations");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const tags_1 = require("./tags");
 const routes_1 = require("./routes");
 const utils_2 = require("./sidebars/utils");
 const categoryGeneratedIndex_1 = require("./categoryGeneratedIndex");
 async function pluginContentDocs(context, options) {
-    var _a;
     const { siteDir, generatedFilesDir, baseUrl, siteConfig } = context;
     const versionsMetadata = await (0, versions_1.readVersionsMetadata)({ context, options });
-    const pluginId = (_a = options.id) !== null && _a !== void 0 ? _a : utils_1.DEFAULT_PLUGIN_ID;
+    const pluginId = options.id ?? utils_1.DEFAULT_PLUGIN_ID;
     const pluginDataDirRoot = path_1.default.join(generatedFilesDir, 'docusaurus-plugin-content-docs');
     const dataDir = path_1.default.join(pluginDataDirRoot, pluginId);
     const aliasedSource = (source) => `~docs/${(0, utils_1.posixPath)(path_1.default.relative(pluginDataDirRoot, source))}`;

package/lib/lastUpdate.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFileLastUpdate = void 0;
 const tslib_1 = require("tslib");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
 let showedGitRequirementError = false;
 async function getFileLastUpdate(filePath) {

package/lib/numberPrefix.js

@@ -23,13 +23,12 @@ const NumberPrefixRegex = /^(?<numberPrefix>\d+)(?<separator>\s*[-_.]+\s*)(?<suf
 // 0-myDoc => {filename: myDoc, numberPrefix: 0}
 // 003 - myDoc => {filename: myDoc, numberPrefix: 3}
 const DefaultNumberPrefixParser = (filename) => {
-    var _a, _b, _c;
     if (IgnoredPrefixPatterns.exec(filename)) {
         return { filename, numberPrefix: undefined };
     }
     const match = NumberPrefixRegex.exec(filename);
-    const cleanFileName = (_b = (_a = match === null || match === void 0 ? void 0 : match.groups) === null || _a === void 0 ? void 0 : _a.suffix) !== null && _b !== void 0 ? _b : filename;
-    const numberPrefixString = (_c = match === null || match === void 0 ? void 0 : match.groups) === null || _c === void 0 ? void 0 : _c.numberPrefix;
+    const cleanFileName = match?.groups?.suffix ?? filename;
+    const numberPrefixString = match?.groups?.numberPrefix;
     const numberPrefix = numberPrefixString
         ? parseInt(numberPrefixString, 10)
         : undefined;

package/lib/options.js

@@ -10,8 +10,8 @@ exports.validateOptions = exports.OptionsSchema = exports.DEFAULT_OPTIONS = void
 const tslib_1 = require("tslib");
 const utils_validation_1 = require("@docusaurus/utils-validation");
 const utils_1 = require("@docusaurus/utils");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const remark_admonitions_1 = (0, tslib_1.__importDefault)(require("remark-admonitions"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const remark_admonitions_1 = tslib_1.__importDefault(require("remark-admonitions"));
 const generator_1 = require("./sidebars/generator");
 const numberPrefix_1 = require("./numberPrefix");
 exports.DEFAULT_OPTIONS = {

package/lib/props.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toTagDocListProp = exports.toVersionMetadataProp = exports.toSidebarsProp = void 0;
 const tslib_1 = require("tslib");
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const docs_1 = require("./docs");
 function toSidebarsProp(loadedVersion) {
     const docsById = (0, docs_1.createDocsByIdIndex)(loadedVersion.docs);
@@ -22,7 +22,6 @@ Available document ids are:
         return docMetadata;
     }
     const convertDocLink = (item) => {
-        var _a;
         const docMetadata = getDocById(item.id);
         const { title, permalink, frontMatter: { sidebar_label: sidebarLabel }, } = docMetadata;
         return {
@@ -30,12 +29,12 @@ Available document ids are:
             label: sidebarLabel || item.label || title,
             href: permalink,
             className: item.className,
-            customProps: (_a = item.customProps) !== null && _a !== void 0 ? _a : docMetadata.frontMatter.sidebar_custom_props,
+            customProps: item.customProps ?? docMetadata.frontMatter.sidebar_custom_props,
             docId: docMetadata.unversionedId,
         };
     };
     function getCategoryLinkHref(link) {
-        switch (link === null || link === void 0 ? void 0 : link.type) {
+        switch (link?.type) {
             case 'doc':
                 return getDocById(link.id).permalink;
             case 'generated-index':

package/lib/routes.js

@@ -10,7 +10,7 @@ exports.createVersionRoutes = exports.createDocRoutes = exports.createCategoryGe
 const tslib_1 = require("tslib");
 const utils_1 = require("@docusaurus/utils");
 const props_1 = require("./props");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 async function createCategoryGeneratedIndexRoutes({ version, actions, docCategoryGeneratedIndexComponent, aliasedSource, }) {
     const slugs = (0, utils_1.createSlugger)();
     async function createCategoryGeneratedIndexRoute(categoryGeneratedIndex) {

package/lib/sidebars/generator.js

@@ -8,14 +8,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultSidebarItemsGenerator = exports.CategoryMetadataFilenamePattern = exports.CategoryMetadataFilenameBase = void 0;
 const tslib_1 = require("tslib");
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const utils_1 = require("@docusaurus/utils");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const docs_1 = require("../docs");
 const BreadcrumbSeparator = '/';
-// To avoid possible name clashes with a folder of the same name as the ID
-const docIdPrefix = '$doc$/';
 // Just an alias to the make code more explicit
 function getLocalDocId(docId) {
     return lodash_1.default.last(docId.split('/'));
@@ -72,14 +70,16 @@ const DefaultSidebarItemsGenerator = async ({ numberPrefixParser, isCategoryInde
         const treeRoot = {};
         docs.forEach((doc) => {
             const breadcrumb = getRelativeBreadcrumb(doc);
-            let currentDir = treeRoot; // We walk down the file's path to generate the fs structure
+            // We walk down the file's path to generate the fs structure
+            let currentDir = treeRoot;
             breadcrumb.forEach((dir) => {
                 if (typeof currentDir[dir] === 'undefined') {
                     currentDir[dir] = {}; // Create new folder.
                 }
                 currentDir = currentDir[dir]; // Go into the subdirectory.
             });
-            currentDir[`${docIdPrefix}${doc.id}`] = null; // We've walked through the file path. Register the file in this directory.
+            // We've walked through the path. Register the file in this directory.
+            currentDir[path_1.default.basename(doc.source)] = doc.id;
         });
         return treeRoot;
     }
@@ -88,24 +88,24 @@ const DefaultSidebarItemsGenerator = async ({ numberPrefixParser, isCategoryInde
      * (From a record to an array of items, akin to normalizing shorthand)
      */
     function generateSidebar(fsModel) {
-        function createDocItem(id) {
+        function createDocItem(id, fullPath, fileName) {
             const { sidebarPosition: position, frontMatter: { sidebar_label: label, sidebar_class_name: className }, } = getDoc(id);
             return {
                 type: 'doc',
                 id,
                 position,
+                source: fileName,
                 // We don't want these fields to magically appear in the generated
                 // sidebar
                 ...(label !== undefined && { label }),
                 ...(className !== undefined && { className }),
             };
         }
-        async function createCategoryItem(dir, fullPath, folderName) {
-            var _a, _b;
+        function createCategoryItem(dir, fullPath, folderName) {
             const categoryMetadata = categoriesMetadata[(0, utils_1.posixPath)(path_1.default.join(autogenDir, fullPath))];
-            const className = categoryMetadata === null || categoryMetadata === void 0 ? void 0 : categoryMetadata.className;
+            const className = categoryMetadata?.className;
             const { filename, numberPrefix } = numberPrefixParser(folderName);
-            const allItems = await Promise.all(Object.entries(dir).map(([key, content]) => dirToItem(content, key, `${fullPath}/${key}`)));
+            const allItems = Object.entries(dir).map(([key, content]) => dirToItem(content, key, `${fullPath}/${key}`));
             // Try to match a doc inside the category folder,
             // using the "local id" (myDoc) or "qualified id" (dirName/myDoc)
             function findDocByLocalId(localId) {
@@ -121,18 +121,17 @@ const DefaultSidebarItemsGenerator = async ({ numberPrefixParser, isCategoryInde
                 });
             }
             function getCategoryLinkedDocId() {
-                var _a, _b;
-                const link = categoryMetadata === null || categoryMetadata === void 0 ? void 0 : categoryMetadata.link;
+                const link = categoryMetadata?.link;
                 if (link !== undefined) {
                     if (link && link.type === 'doc') {
-                        return ((_a = findDocByLocalId(link.id)) === null || _a === void 0 ? void 0 : _a.id) || getDoc(link.id).id;
+                        return findDocByLocalId(link.id)?.id || getDoc(link.id).id;
                     }
                     // If a link is explicitly specified, we won't apply conventions
                     return undefined;
                 }
                 // Apply default convention to pick index.md, README.md or
                 // <categoryName>.md as the category doc
-                return (_b = findConventionalCategoryDocLink()) === null || _b === void 0 ? void 0 : _b.id;
+                return findConventionalCategoryDocLink()?.id;
             }
             const categoryLinkedDocId = getCategoryLinkedDocId();
             const link = categoryLinkedDocId
@@ -140,28 +139,29 @@ const DefaultSidebarItemsGenerator = async ({ numberPrefixParser, isCategoryInde
                     type: 'doc',
                     id: categoryLinkedDocId, // We "remap" a potentially "local id" to a "qualified id"
                 }
-                : categoryMetadata === null || categoryMetadata === void 0 ? void 0 : categoryMetadata.link;
+                : categoryMetadata?.link;
             // If a doc is linked, remove it from the category subItems
             const items = allItems.filter((item) => !(item.type === 'doc' && item.id === categoryLinkedDocId));
             return {
                 type: 'category',
-                label: (_a = categoryMetadata === null || categoryMetadata === void 0 ? void 0 : categoryMetadata.label) !== null && _a !== void 0 ? _a : filename,
-                collapsible: categoryMetadata === null || categoryMetadata === void 0 ? void 0 : categoryMetadata.collapsible,
-                collapsed: categoryMetadata === null || categoryMetadata === void 0 ? void 0 : categoryMetadata.collapsed,
-                position: (_b = categoryMetadata === null || categoryMetadata === void 0 ? void 0 : categoryMetadata.position) !== null && _b !== void 0 ? _b : numberPrefix,
+                label: categoryMetadata?.label ?? filename,
+                collapsible: categoryMetadata?.collapsible,
+                collapsed: categoryMetadata?.collapsed,
+                position: categoryMetadata?.position ?? numberPrefix,
+                source: folderName,
                 ...(className !== undefined && { className }),
                 items,
                 ...(link && { link }),
             };
         }
-        async function dirToItem(dir, // The directory item to be transformed.
-        itemKey, // For docs, it's the doc ID; for categories, it's used to generate the next `relativePath`.
+        function dirToItem(dir, // The directory item to be transformed.
+        itemKey, // File/folder name; for categories, it's used to generate the next `relativePath`.
         fullPath) {
-            return dir
+            return typeof dir === 'object'
                 ? createCategoryItem(dir, fullPath, itemKey)
-                : createDocItem(itemKey.substring(docIdPrefix.length));
+                : createDocItem(dir, fullPath, itemKey);
         }
-        return Promise.all(Object.entries(fsModel).map(([key, content]) => dirToItem(content, key, key)));
+        return Object.entries(fsModel).map(([key, content]) => dirToItem(content, key, key));
     }
     /**
      * Step 4. Recursively sort the categories/docs + remove the "position"
@@ -177,13 +177,16 @@ const DefaultSidebarItemsGenerator = async ({ numberPrefixParser, isCategoryInde
             }
             return item;
         });
-        const sortedSidebarItems = lodash_1.default.sortBy(processedSidebarItems, (item) => item.position);
-        return sortedSidebarItems.map(({ position, ...item }) => item);
+        const sortedSidebarItems = lodash_1.default.sortBy(processedSidebarItems, [
+            'position',
+            'source',
+        ]);
+        return sortedSidebarItems.map(({ position, source, ...item }) => item);
     }
     // TODO: the whole code is designed for pipeline operator
     const docs = getAutogenDocs();
     const fsModel = treeify(docs);
-    const sidebarWithPosition = await generateSidebar(fsModel);
+    const sidebarWithPosition = generateSidebar(fsModel);
     const sortedSidebar = sortItems(sidebarWithPosition);
     return sortedSidebar;
 };

package/lib/sidebars/index.js

@@ -8,18 +8,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadSidebars = exports.loadSidebarsFileUnsafe = exports.resolveSidebarPathOption = exports.DisabledSidebars = exports.DefaultSidebars = void 0;
 const tslib_1 = require("tslib");
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const import_fresh_1 = (0, tslib_1.__importDefault)(require("import-fresh"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const import_fresh_1 = tslib_1.__importDefault(require("import-fresh"));
 const validation_1 = require("./validation");
 const normalization_1 = require("./normalization");
 const processor_1 = require("./processor");
 const postProcessor_1 = require("./postProcessor");
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const utils_1 = require("@docusaurus/utils");
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
-const js_yaml_1 = (0, tslib_1.__importDefault)(require("js-yaml"));
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
-const combine_promises_1 = (0, tslib_1.__importDefault)(require("combine-promises"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const combine_promises_1 = tslib_1.__importDefault(require("combine-promises"));
 exports.DefaultSidebars = {
     defaultSidebar: [
         {

package/lib/sidebars/normalization.js

@@ -9,8 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSidebars = exports.normalizeItem = void 0;
 const tslib_1 = require("tslib");
 const utils_1 = require("./utils");
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
-const logger_1 = (0, tslib_1.__importDefault)(require("@docusaurus/logger"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 function normalizeCategoriesShorthand(sidebar) {
     return Object.entries(sidebar).map(([label, items]) => ({
         type: 'category',

package/lib/sidebars/postProcessor.js

@@ -9,13 +9,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.postProcessSidebars = void 0;
 const tslib_1 = require("tslib");
 const utils_1 = require("@docusaurus/utils");
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 function normalizeCategoryLink(category, params) {
-    var _a, _b;
-    if (((_a = category.link) === null || _a === void 0 ? void 0 : _a.type) === 'generated-index') {
+    if (category.link?.type === 'generated-index') {
         // default slug logic can be improved
         const getDefaultSlug = () => `/category/${params.categoryLabelSlugger.slug(category.label)}`;
-        const slug = (_b = category.link.slug) !== null && _b !== void 0 ? _b : getDefaultSlug();
+        const slug = category.link.slug ?? getDefaultSlug();
         const permalink = (0, utils_1.normalizeUrl)([params.version.versionPath, slug]);
         return {
             ...category.link,
@@ -26,12 +25,11 @@ function normalizeCategoryLink(category, params) {
     return category.link;
 }
 function postProcessSidebarItem(item, params) {
-    var _a, _b;
     if (item.type === 'category') {
         const category = {
             ...item,
-            collapsed: (_a = item.collapsed) !== null && _a !== void 0 ? _a : params.sidebarOptions.sidebarCollapsed,
-            collapsible: (_b = item.collapsible) !== null && _b !== void 0 ? _b : params.sidebarOptions.sidebarCollapsible,
+            collapsed: item.collapsed ?? params.sidebarOptions.sidebarCollapsed,
+            collapsible: item.collapsible ?? params.sidebarOptions.sidebarCollapsible,
             link: normalizeCategoryLink(item, params),
             items: item.items.map((subItem) => postProcessSidebarItem(subItem, params)),
         };

package/lib/sidebars/processor.js

@@ -10,8 +10,8 @@ exports.processSidebars = void 0;
 const tslib_1 = require("tslib");
 const generator_1 = require("./generator");
 const validation_1 = require("./validation");
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
-const combine_promises_1 = (0, tslib_1.__importDefault)(require("combine-promises"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const combine_promises_1 = tslib_1.__importDefault(require("combine-promises"));
 const docs_1 = require("../docs");
 function toSidebarItemsGeneratorDoc(doc) {
     return lodash_1.default.pick(doc, [

package/lib/sidebars/utils.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toNavigationLink = exports.toDocNavigationLink = exports.createSidebarsUtils = exports.collectSidebarsNavigations = exports.collectSidebarsDocIds = exports.collectSidebarNavigation = exports.collectSidebarDocIds = exports.collectSidebarLinks = exports.collectSidebarCategories = exports.collectSidebarDocItems = exports.transformSidebarItems = exports.isCategoriesShorthand = void 0;
 const tslib_1 = require("tslib");
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const utils_1 = require("@docusaurus/utils");
 function isCategoriesShorthand(item) {
     return typeof item === 'object' && !item.type;
@@ -58,9 +58,8 @@ exports.collectSidebarLinks = collectSidebarLinks;
 // /!\ docId order matters for navigation!
 function collectSidebarDocIds(sidebar) {
     return flattenSidebarItems(sidebar).flatMap((item) => {
-        var _a;
         if (item.type === 'category') {
-            return ((_a = item.link) === null || _a === void 0 ? void 0 : _a.type) === 'doc' ? [item.link.id] : [];
+            return item.link?.type === 'doc' ? [item.link.id] : [];
         }
         if (item.type === 'doc') {
             return [item.id];
@@ -95,8 +94,7 @@ function createSidebarsUtils(sidebars) {
     // Reverse mapping
     const docIdToSidebarName = Object.fromEntries(Object.entries(sidebarNameToDocIds).flatMap(([sidebarName, docIds]) => docIds.map((docId) => [docId, sidebarName])));
     function getFirstDocIdOfFirstSidebar() {
-        var _a;
-        return (_a = Object.values(sidebarNameToDocIds)[0]) === null || _a === void 0 ? void 0 : _a[0];
+        return Object.values(sidebarNameToDocIds)[0]?.[0];
     }
     function getSidebarNameByDocId(docId) {
         return docIdToSidebarName[docId];
@@ -155,14 +153,12 @@ function createSidebarsUtils(sidebars) {
      * unique). More reliable than using object identity
      */
     function getCategoryGeneratedIndexNavigation(categoryGeneratedIndexPermalink) {
-        var _a;
         function isCurrentCategoryGeneratedIndexItem(item) {
-            var _a;
             return (item.type === 'category' &&
-                ((_a = item.link) === null || _a === void 0 ? void 0 : _a.type) === 'generated-index' &&
+                item.link?.type === 'generated-index' &&
                 item.link.permalink === categoryGeneratedIndexPermalink);
         }
-        const sidebarName = (_a = Object.entries(sidebarNameToNavigationItems).find(([, navigationItems]) => navigationItems.find(isCurrentCategoryGeneratedIndexItem))) === null || _a === void 0 ? void 0 : _a[0];
+        const sidebarName = Object.entries(sidebarNameToNavigationItems).find(([, navigationItems]) => navigationItems.find(isCurrentCategoryGeneratedIndexItem))?.[0];
         if (!sidebarName) {
             return emptySidebarNavigation();
         }
@@ -184,24 +180,23 @@ Available document ids are:
         }
     }
     function getFirstLink(sidebar) {
-        var _a, _b, _c;
         for (const item of sidebar) {
             if (item.type === 'doc') {
                 return {
                     type: 'doc',
                     id: item.id,
-                    label: (_a = item.label) !== null && _a !== void 0 ? _a : item.id,
+                    label: item.label ?? item.id,
                 };
             }
             else if (item.type === 'category') {
-                if (((_b = item.link) === null || _b === void 0 ? void 0 : _b.type) === 'doc') {
+                if (item.link?.type === 'doc') {
                     return {
                         type: 'doc',
                         id: item.link.id,
                         label: item.label,
                     };
                 }
-                else if (((_c = item.link) === null || _c === void 0 ? void 0 : _c.type) === 'generated-index') {
+                else if (item.link?.type === 'generated-index') {
                     return {
                         type: 'generated-index',
                         slug: item.link.slug,
@@ -229,9 +224,8 @@ Available document ids are:
 }
 exports.createSidebarsUtils = createSidebarsUtils;
 function toDocNavigationLink(doc) {
-    var _a;
     const { title, permalink, frontMatter: { pagination_label: paginationLabel, sidebar_label: sidebarLabel, }, } = doc;
-    return { title: (_a = paginationLabel !== null && paginationLabel !== void 0 ? paginationLabel : sidebarLabel) !== null && _a !== void 0 ? _a : title, permalink };
+    return { title: paginationLabel ?? sidebarLabel ?? title, permalink };
 }
 exports.toDocNavigationLink = toDocNavigationLink;
 function toNavigationLink(navigationItem, docsById) {

package/lib/slug.js

@@ -20,7 +20,7 @@ function getSlug({ baseID, frontMatterSlug, source, sourceDirName, stripDirNumbe
         return resolveDirname;
     }
     function computeSlug() {
-        if (frontMatterSlug === null || frontMatterSlug === void 0 ? void 0 : frontMatterSlug.startsWith('/')) {
+        if (frontMatterSlug?.startsWith('/')) {
             return frontMatterSlug;
         }
         const dirNameSlug = getDirNameSlug();

package/lib/tags.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVersionTags = void 0;
 const tslib_1 = require("tslib");
 const utils_1 = require("@docusaurus/utils");
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 function getVersionTags(docs) {
     const groups = (0, utils_1.groupTaggedItems)(docs, (doc) => doc.tags);
     return lodash_1.default.mapValues(groups, (group) => ({

package/lib/translations.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.translateLoadedContent = exports.getLoadedContentTranslationFiles = void 0;
 const tslib_1 = require("tslib");
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const utils_1 = require("./sidebars/utils");
 const utils_2 = require("@docusaurus/utils");
 const constants_1 = require("./constants");
@@ -120,13 +120,12 @@ function getSidebarTranslationFileContent(sidebar, sidebarName) {
 }
 function translateSidebar({ sidebar, sidebarName, sidebarsTranslations, }) {
     function transformSidebarCategoryLink(category) {
-        var _a, _b, _c, _d;
         if (!category.link) {
             return undefined;
         }
         if (category.link.type === 'generated-index') {
-            const title = (_b = (_a = sidebarsTranslations[`sidebar.${sidebarName}.category.${category.label}.link.generated-index.title`]) === null || _a === void 0 ? void 0 : _a.message) !== null && _b !== void 0 ? _b : category.link.title;
-            const description = (_d = (_c = sidebarsTranslations[`sidebar.${sidebarName}.category.${category.label}.link.generated-index.description`]) === null || _c === void 0 ? void 0 : _c.message) !== null && _d !== void 0 ? _d : category.link.description;
+            const title = sidebarsTranslations[`sidebar.${sidebarName}.category.${category.label}.link.generated-index.title`]?.message ?? category.link.title;
+            const description = sidebarsTranslations[`sidebar.${sidebarName}.category.${category.label}.link.generated-index.description`]?.message ?? category.link.description;
             return {
                 ...category.link,
                 title,
@@ -136,19 +135,20 @@ function translateSidebar({ sidebar, sidebarName, sidebarsTranslations, }) {
         return category.link;
     }
     return (0, utils_1.transformSidebarItems)(sidebar, (item) => {
-        var _a, _b, _c, _d;
         if (item.type === 'category') {
             const link = transformSidebarCategoryLink(item);
             return {
                 ...item,
-                label: (_b = (_a = sidebarsTranslations[`sidebar.${sidebarName}.category.${item.label}`]) === null || _a === void 0 ? void 0 : _a.message) !== null && _b !== void 0 ? _b : item.label,
+                label: sidebarsTranslations[`sidebar.${sidebarName}.category.${item.label}`]
+                    ?.message ?? item.label,
                 ...(link && { link }),
             };
         }
         if (item.type === 'link') {
             return {
                 ...item,
-                label: (_d = (_c = sidebarsTranslations[`sidebar.${sidebarName}.link.${item.label}`]) === null || _c === void 0 ? void 0 : _c.message) !== null && _d !== void 0 ? _d : item.label,
+                label: sidebarsTranslations[`sidebar.${sidebarName}.link.${item.label}`]
+                    ?.message ?? item.label,
             };
         }
         return item;
@@ -195,11 +195,10 @@ function getVersionTranslationFiles(version) {
     ];
 }
 function translateVersion(version, translationFiles) {
-    var _a;
     const versionTranslations = translationFiles[getVersionFileName(version.versionName)].content;
     return {
         ...version,
-        versionLabel: (_a = versionTranslations['version.label']) === null || _a === void 0 ? void 0 : _a.message,
+        versionLabel: versionTranslations['version.label']?.message,
         sidebars: translateSidebars(version, versionTranslations),
         // docs: translateDocs(version.docs, versionTranslations),
     };

package/lib/versions.js

@@ -8,11 +8,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDocsDirPaths = exports.readVersionsMetadata = exports.filterVersions = exports.getVersionBadge = exports.getVersionBanner = exports.getDefaultVersionBanner = exports.readVersionNames = exports.readVersionsFile = exports.getVersionsFilePath = exports.getVersionedSidebarsDirPath = exports.getVersionedDocsDirPath = void 0;
 const tslib_1 = require("tslib");
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const constants_1 = require("./constants");
 const utils_1 = require("@docusaurus/utils");
-const lodash_1 = (0, tslib_1.__importDefault)(require("lodash"));
+const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const sidebars_1 = require("./sidebars");
 // retro-compatibility: no prefix for the default plugin id
 function addPluginIdPrefix(fileOrDir, pluginId) {
@@ -62,7 +62,7 @@ async function readVersionNames(siteDir, options) {
     if (!versionFileContent && options.disableVersioning) {
         throw new Error(`Docs: using "disableVersioning: ${options.disableVersioning}" option on a non-versioned site does not make sense.`);
     }
-    const versions = options.disableVersioning ? [] : versionFileContent !== null && versionFileContent !== void 0 ? versionFileContent : [];
+    const versions = options.disableVersioning ? [] : versionFileContent ?? [];
     // We add the current version at the beginning, unless:
     // - user don't want to; or
     // - it's already been explicitly added to versions.json
@@ -154,8 +154,7 @@ function getDefaultVersionBanner({ versionName, versionNames, lastVersionName, }
 }
 exports.getDefaultVersionBanner = getDefaultVersionBanner;
 function getVersionBanner({ versionName, versionNames, lastVersionName, options, }) {
-    var _a;
-    const versionBannerOption = (_a = options.versions[versionName]) === null || _a === void 0 ? void 0 : _a.banner;
+    const versionBannerOption = options.versions[versionName]?.banner;
     if (versionBannerOption) {
         return versionBannerOption === 'none' ? null : versionBannerOption;
     }
@@ -167,23 +166,20 @@ function getVersionBanner({ versionName, versionNames, lastVersionName, options,
 }
 exports.getVersionBanner = getVersionBanner;
 function getVersionBadge({ versionName, versionNames, options, }) {
-    var _a;
-    const versionBadgeOption = (_a = options.versions[versionName]) === null || _a === void 0 ? void 0 : _a.badge;
+    const versionBadgeOption = options.versions[versionName]?.badge;
     // If site is not versioned or only one version is included
     // we don't show the version badge by default
     // See https://github.com/facebook/docusaurus/issues/3362
     const versionBadgeDefault = versionNames.length !== 1;
-    return versionBadgeOption !== null && versionBadgeOption !== void 0 ? versionBadgeOption : versionBadgeDefault;
+    return versionBadgeOption ?? versionBadgeDefault;
 }
 exports.getVersionBadge = getVersionBadge;
 function getVersionClassName({ versionName, options, }) {
-    var _a;
-    const versionClassNameOption = (_a = options.versions[versionName]) === null || _a === void 0 ? void 0 : _a.className;
+    const versionClassNameOption = options.versions[versionName]?.className;
     const versionClassNameDefault = `docs-version-${versionName}`;
-    return versionClassNameOption !== null && versionClassNameOption !== void 0 ? versionClassNameOption : versionClassNameDefault;
+    return versionClassNameOption ?? versionClassNameDefault;
 }
 function createVersionMetadata({ versionName, versionNames, lastVersionName, context, options, }) {
-    var _a, _b, _c;
     const { sidebarFilePath, contentPath, contentPathLocalized } = getVersionMetadataPaths({ versionName, context, options });
     const isLast = versionName === lastVersionName;
     // retro-compatible values
@@ -195,9 +191,9 @@ function createVersionMetadata({ versionName, versionNames, lastVersionName, con
         return versionName === constants_1.CURRENT_VERSION_NAME ? 'next' : versionName;
     }
     const defaultVersionPathPart = getDefaultVersionPathPart();
-    const versionOptions = (_a = options.versions[versionName]) !== null && _a !== void 0 ? _a : {};
-    const versionLabel = (_b = versionOptions.label) !== null && _b !== void 0 ? _b : defaultVersionLabel;
-    const versionPathPart = (_c = versionOptions.path) !== null && _c !== void 0 ? _c : defaultVersionPathPart;
+    const versionOptions = options.versions[versionName] ?? {};
+    const versionLabel = versionOptions.label ?? defaultVersionLabel;
+    const versionPathPart = versionOptions.path ?? defaultVersionPathPart;
     const versionPath = (0, utils_1.normalizeUrl)([
         context.baseUrl,
         options.routeBasePath,
@@ -219,8 +215,8 @@ function createVersionMetadata({ versionName, versionNames, lastVersionName, con
         versionLabel,
         versionPath,
         tagsPath,
-        versionEditUrl: versionEditUrls === null || versionEditUrls === void 0 ? void 0 : versionEditUrls.versionEditUrl,
-        versionEditUrlLocalized: versionEditUrls === null || versionEditUrls === void 0 ? void 0 : versionEditUrls.versionEditUrlLocalized,
+        versionEditUrl: versionEditUrls?.versionEditUrl,
+        versionEditUrlLocalized: versionEditUrls?.versionEditUrlLocalized,
         versionBanner: getVersionBanner({
             versionName,
             versionNames,
@@ -304,11 +300,10 @@ function filterVersions(versionNamesUnfiltered, options) {
 }
 exports.filterVersions = filterVersions;
 async function readVersionsMetadata({ context, options, }) {
-    var _a;
     const versionNamesUnfiltered = await readVersionNames(context.siteDir, options);
     checkVersionsOptions(versionNamesUnfiltered, options);
     const versionNames = filterVersions(versionNamesUnfiltered, options);
-    const lastVersionName = (_a = options.lastVersion) !== null && _a !== void 0 ? _a : getDefaultLastVersionName(versionNames);
+    const lastVersionName = options.lastVersion ?? getDefaultLastVersionName(versionNames);
     const versionsMetadata = versionNames.map((versionName) => createVersionMetadata({
         versionName,
         versionNames,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-docs",
-  "version": "2.0.0-beta.16",
+  "version": "2.0.0-beta.17",
   "description": "Docs plugin for Docusaurus.",
   "main": "lib/index.js",
   "exports": {
@@ -23,11 +23,11 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.16",
-    "@docusaurus/logger": "2.0.0-beta.16",
-    "@docusaurus/mdx-loader": "2.0.0-beta.16",
-    "@docusaurus/utils": "2.0.0-beta.16",
-    "@docusaurus/utils-validation": "2.0.0-beta.16",
+    "@docusaurus/core": "2.0.0-beta.17",
+    "@docusaurus/logger": "2.0.0-beta.17",
+    "@docusaurus/mdx-loader": "2.0.0-beta.17",
+    "@docusaurus/utils": "2.0.0-beta.17",
+    "@docusaurus/utils-validation": "2.0.0-beta.17",
     "combine-promises": "^1.1.0",
     "fs-extra": "^10.0.1",
     "import-fresh": "^3.3.0",
@@ -39,8 +39,8 @@
     "webpack": "^5.69.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.16",
-    "@docusaurus/types": "2.0.0-beta.16",
+    "@docusaurus/module-type-aliases": "2.0.0-beta.17",
+    "@docusaurus/types": "2.0.0-beta.17",
     "@types/js-yaml": "^4.0.5",
     "@types/picomatch": "^2.3.0",
     "commander": "^5.1.0",
@@ -56,5 +56,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "eb43c4d4f95a4fb97dc9bb9dc615413e0dc2e1e7"
+  "gitHead": "0032c0b0480083227af2e1b4da2d3ee6ce992403"
 }

package/src/sidebars/generator.ts

@@ -20,8 +20,6 @@ import path from 'path';
 import {createDocsByIdIndex, toCategoryIndexMatcherParam} from '../docs';
 
 const BreadcrumbSeparator = '/';
-// To avoid possible name clashes with a folder of the same name as the ID
-const docIdPrefix = '$doc$/';
 
 // Just an alias to the make code more explicit
 function getLocalDocId(docId: string): string {
@@ -31,16 +29,20 @@ function getLocalDocId(docId: string): string {
 export const CategoryMetadataFilenameBase = '_category_';
 export const CategoryMetadataFilenamePattern = '_category_.{json,yml,yaml}';
 
-type WithPosition<T> = T & {position?: number};
+type WithPosition<T> = T & {
+  position?: number;
+  /** The source is the file/folder name */
+  source?: string;
+};
 
 /**
  * A representation of the fs structure. For each object entry:
  * If it's a folder, the key is the directory name, and value is the directory
- * content; If it's a doc file, the key is the doc id prefixed with '$doc$/',
- * and value is null
+ * content; If it's a doc file, the key is the doc's source file name, and value
+ * is the doc ID
  */
 type Dir = {
-  [item: string]: Dir | null;
+  [item: string]: Dir | string;
 };
 
 // Comment for this feature: https://github.com/facebook/docusaurus/issues/3464#issuecomment-818670449
@@ -108,14 +110,16 @@ export const DefaultSidebarItemsGenerator: SidebarItemsGenerator = async ({
     const treeRoot: Dir = {};
     docs.forEach((doc) => {
       const breadcrumb = getRelativeBreadcrumb(doc);
-      let currentDir = treeRoot; // We walk down the file's path to generate the fs structure
+      // We walk down the file's path to generate the fs structure
+      let currentDir = treeRoot;
       breadcrumb.forEach((dir) => {
         if (typeof currentDir[dir] === 'undefined') {
           currentDir[dir] = {}; // Create new folder.
         }
-        currentDir = currentDir[dir]!; // Go into the subdirectory.
+        currentDir = currentDir[dir] as Dir; // Go into the subdirectory.
       });
-      currentDir[`${docIdPrefix}${doc.id}`] = null; // We've walked through the file path. Register the file in this directory.
+      // We've walked through the path. Register the file in this directory.
+      currentDir[path.basename(doc.source)] = doc.id;
     });
     return treeRoot;
   }
@@ -126,8 +130,12 @@ export const DefaultSidebarItemsGenerator: SidebarItemsGenerator = async ({
    */
   function generateSidebar(
     fsModel: Dir,
-  ): Promise<WithPosition<NormalizedSidebarItem>[]> {
-    function createDocItem(id: string): WithPosition<SidebarItemDoc> {
+  ): WithPosition<NormalizedSidebarItem>[] {
+    function createDocItem(
+      id: string,
+      fullPath: string,
+      fileName: string,
+    ): WithPosition<SidebarItemDoc> {
       const {
         sidebarPosition: position,
         frontMatter: {sidebar_label: label, sidebar_class_name: className},
@@ -136,25 +144,24 @@ export const DefaultSidebarItemsGenerator: SidebarItemsGenerator = async ({
         type: 'doc',
         id,
         position,
+        source: fileName,
         // We don't want these fields to magically appear in the generated
         // sidebar
         ...(label !== undefined && {label}),
         ...(className !== undefined && {className}),
       };
     }
-    async function createCategoryItem(
+    function createCategoryItem(
       dir: Dir,
       fullPath: string,
       folderName: string,
-    ): Promise<WithPosition<NormalizedSidebarItemCategory>> {
+    ): WithPosition<NormalizedSidebarItemCategory> {
       const categoryMetadata =
         categoriesMetadata[posixPath(path.join(autogenDir, fullPath))];
       const className = categoryMetadata?.className;
       const {filename, numberPrefix} = numberPrefixParser(folderName);
-      const allItems = await Promise.all(
-        Object.entries(dir).map(([key, content]) =>
-          dirToItem(content, key, `${fullPath}/${key}`),
-        ),
+      const allItems = Object.entries(dir).map(([key, content]) =>
+        dirToItem(content, key, `${fullPath}/${key}`),
       );
 
       // Try to match a doc inside the category folder,
@@ -211,24 +218,23 @@ export const DefaultSidebarItemsGenerator: SidebarItemsGenerator = async ({
         collapsible: categoryMetadata?.collapsible,
         collapsed: categoryMetadata?.collapsed,
         position: categoryMetadata?.position ?? numberPrefix,
+        source: folderName,
         ...(className !== undefined && {className}),
         items,
         ...(link && {link}),
       };
     }
-    async function dirToItem(
-      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`.
+    function dirToItem(
+      dir: Dir | string, // The directory item to be transformed.
+      itemKey: string, // File/folder name; for categories, it's used to generate the next `relativePath`.
       fullPath: string, // `dir`'s full path relative to the autogen dir.
-    ): Promise<WithPosition<NormalizedSidebarItem>> {
-      return dir
+    ): WithPosition<NormalizedSidebarItem> {
+      return typeof dir === 'object'
         ? createCategoryItem(dir, fullPath, itemKey)
-        : createDocItem(itemKey.substring(docIdPrefix.length));
+        : createDocItem(dir, fullPath, itemKey);
     }
-    return Promise.all(
-      Object.entries(fsModel).map(([key, content]) =>
-        dirToItem(content, key, key),
-      ),
+    return Object.entries(fsModel).map(([key, content]) =>
+      dirToItem(content, key, key),
     );
   }
 
@@ -248,16 +254,16 @@ export const DefaultSidebarItemsGenerator: SidebarItemsGenerator = async ({
       }
       return item;
     });
-    const sortedSidebarItems = _.sortBy(
-      processedSidebarItems,
-      (item) => item.position,
-    );
-    return sortedSidebarItems.map(({position, ...item}) => item);
+    const sortedSidebarItems = _.sortBy(processedSidebarItems, [
+      'position',
+      'source',
+    ]);
+    return sortedSidebarItems.map(({position, source, ...item}) => item);
   }
   // TODO: the whole code is designed for pipeline operator
   const docs = getAutogenDocs();
   const fsModel = treeify(docs);
-  const sidebarWithPosition = await generateSidebar(fsModel);
+  const sidebarWithPosition = generateSidebar(fsModel);
   const sortedSidebar = sortItems(sidebarWithPosition);
   return sortedSidebar;
 };