@docusaurus/plugin-content-docs 0.0.0-4721 → 0.0.0-4722

package/lib/markdown/linkify.js

@@ -11,6 +11,10 @@ const versions_1 = require("../versions");
 const utils_1 = require("@docusaurus/utils");
 function getVersion(filePath, options) {
     const versionFound = options.versionsMetadata.find((version) => (0, versions_1.getDocsDirPaths)(version).some((docsDirPath) => filePath.startsWith(docsDirPath)));
+    // At this point, this should never happen, because the MDX loaders' paths are
+    // literally using the version content paths; but if we allow sourcing content
+    // from outside the docs directory (through the `include` option, for example;
+    // is there a compelling use-case?), this would actually be testable
     if (!versionFound) {
         throw new Error(`Unexpected error: Markdown file at "${filePath}" does not belong to any docs version!`);
     }

package/lib/sidebars/postProcessor.js

@@ -39,22 +39,17 @@ function postProcessSidebarItem(item, params) {
             if (!category.link) {
                 throw new Error(`Sidebar category ${item.label} has neither any subitem nor a link. This makes this item not able to link to anything.`);
             }
-            switch (category.link.type) {
-                case 'doc':
-                    return {
-                        type: 'doc',
-                        label: category.label,
-                        id: category.link.id,
-                    };
-                case 'generated-index':
-                    return {
-                        type: 'link',
-                        label: category.label,
-                        href: category.link.permalink,
-                    };
-                default:
-                    throw new Error('Unexpected sidebar category link type');
-            }
+            return category.link.type === 'doc'
+                ? {
+                    type: 'doc',
+                    label: category.label,
+                    id: category.link.id,
+                }
+                : {
+                    type: 'link',
+                    label: category.label,
+                    href: category.link.permalink,
+                };
         }
         // A non-collapsible category can't be collapsed!
         if (category.collapsible === false) {

package/lib/sidebars/utils.js

@@ -236,21 +236,14 @@ function toNavigationLink(navigationItem, docsById) {
     if (!navigationItem) {
         return undefined;
     }
-    if (navigationItem.type === 'doc') {
-        return toDocNavigationLink(getDocById(navigationItem.id));
-    }
-    else if (navigationItem.type === 'category') {
-        if (navigationItem.link.type === 'doc') {
-            return toDocNavigationLink(getDocById(navigationItem.link.id));
-        }
-        else if (navigationItem.link.type === 'generated-index') {
-            return {
+    if (navigationItem.type === 'category') {
+        return navigationItem.link.type === 'doc'
+            ? toDocNavigationLink(getDocById(navigationItem.link.id))
+            : {
                 title: navigationItem.label,
                 permalink: navigationItem.link.permalink,
             };
-        }
-        throw new Error('unexpected category link type');
     }
-    throw new Error('unexpected navigation item');
+    return toDocNavigationLink(getDocById(navigationItem.id));
 }
 exports.toNavigationLink = toNavigationLink;

package/package.json

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

package/src/markdown/linkify.ts

@@ -15,6 +15,10 @@ function getVersion(filePath: string, options: DocsMarkdownOption) {
       filePath.startsWith(docsDirPath),
     ),
   );
+  // At this point, this should never happen, because the MDX loaders' paths are
+  // literally using the version content paths; but if we allow sourcing content
+  // from outside the docs directory (through the `include` option, for example;
+  // is there a compelling use-case?), this would actually be testable
   if (!versionFound) {
     throw new Error(
       `Unexpected error: Markdown file at "${filePath}" does not belong to any docs version!`,

package/src/sidebars/postProcessor.ts

@@ -58,22 +58,17 @@ function postProcessSidebarItem(
           `Sidebar category ${item.label} has neither any subitem nor a link. This makes this item not able to link to anything.`,
         );
       }
-      switch (category.link.type) {
-        case 'doc':
-          return {
+      return category.link.type === 'doc'
+        ? {
             type: 'doc',
             label: category.label,
             id: category.link.id,
-          };
-        case 'generated-index':
-          return {
+          }
+        : {
             type: 'link',
             label: category.label,
             href: category.link.permalink,
           };
-        default:
-          throw new Error('Unexpected sidebar category link type');
-      }
     }
     // A non-collapsible category can't be collapsed!
     if (category.collapsible === false) {

package/src/sidebars/utils.ts

@@ -376,18 +376,13 @@ export function toNavigationLink(
     return undefined;
   }
 
-  if (navigationItem.type === 'doc') {
-    return toDocNavigationLink(getDocById(navigationItem.id));
-  } else if (navigationItem.type === 'category') {
-    if (navigationItem.link.type === 'doc') {
-      return toDocNavigationLink(getDocById(navigationItem.link.id));
-    } else if (navigationItem.link.type === 'generated-index') {
-      return {
-        title: navigationItem.label,
-        permalink: navigationItem.link.permalink,
-      };
-    }
-    throw new Error('unexpected category link type');
+  if (navigationItem.type === 'category') {
+    return navigationItem.link.type === 'doc'
+      ? toDocNavigationLink(getDocById(navigationItem.link.id))
+      : {
+          title: navigationItem.label,
+          permalink: navigationItem.link.permalink,
+        };
   }
-  throw new Error('unexpected navigation item');
+  return toDocNavigationLink(getDocById(navigationItem.id));
 }