zudoku 0.0.0-e4d0ea8 → 0.0.0-e5b3c9b

package/dist/config/loader.js

@@ -0,0 +1,157 @@
+import { readFile, stat } from "node:fs/promises";
+import path from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { tsImport } from "tsx/esm/api";
+import withZuplo from "../zuplo/with-zuplo.js";
+import { validateCommonConfig } from "./validators/common.js";
+import { validateConfig } from "./validators/validate.js";
+const zudokuConfigFiles = [
+    "zudoku.config.js",
+    "zudoku.config.jsx",
+    "zudoku.config.ts",
+    "zudoku.config.tsx",
+    "zudoku.config.mjs",
+];
+const devPortalConfigFile = "dev-portal.json";
+const fileExists = (path) => stat(path)
+    .then(() => true)
+    .catch(() => false);
+let configPath;
+let configType;
+export async function findConfigFilePath(rootDir) {
+    // Also check if file exists, so renaming the file will trigger a restart as well
+    if (configPath && configType && (await fileExists(configPath))) {
+        return { configPath, configType };
+    }
+    const devPortalConfigPath = path.join(rootDir, devPortalConfigFile);
+    if (await fileExists(devPortalConfigPath)) {
+        configPath = devPortalConfigPath;
+        configType = "dev-portal";
+        return { configPath, configType };
+    }
+    for (const fileName of zudokuConfigFiles) {
+        const filepath = path.join(rootDir, fileName);
+        if (await fileExists(filepath)) {
+            configPath = filepath;
+            configType = "zudoku";
+            return { configPath, configType };
+        }
+    }
+    configPath = undefined;
+    configType = undefined;
+    return { configPath, configType };
+}
+async function getConfigFilePath(rootDir) {
+    const result = await findConfigFilePath(rootDir);
+    if (result.configType) {
+        return result;
+    }
+    throw new Error(`No zudoku config file found in project root.`);
+}
+async function loadZudokuCodeConfig(rootDir, configPath, envVars) {
+    const configFilePath = pathToFileURL(configPath).href;
+    const dependencies = [];
+    const config = await tsImport(configFilePath, {
+        parentURL: import.meta.url,
+        onImport: (file) => {
+            const path = fileURLToPath(file.startsWith("file://") ? file : pathToFileURL(file).href);
+            if (path.startsWith(rootDir)) {
+                dependencies.push(path);
+            }
+        },
+    }).then((m) => m.default);
+    if (!config) {
+        throw new Error(`Failed to load config file: ${configPath}`);
+    }
+    return { dependencies, config };
+}
+async function loadDevPortalConfig(configPath, envVars) {
+    const json = await readFile(configPath, "utf-8");
+    let config;
+    try {
+        config = JSON.parse(json);
+    }
+    catch {
+        throw new Error("Failed to parse dev-portal.json. Check that the file is valid JSON.");
+    }
+    // 1. Validate the config
+    validateCommonConfig(config);
+    // 2. Replace $env() placeholders with actual environment
+    config = replaceEnvVariables(config, envVars);
+    // 3. Add Zuplo to the config
+    config = withZuplo(config);
+    return config;
+}
+/**
+ * Replaces the $env() placeholders in the config with the actual environment
+ */
+function replaceEnvVariables(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+obj, envVars) {
+    if (typeof obj === "string") {
+        const envVarMatch = obj.match(/^\$env\(([^)]+)\)$/);
+        if (envVarMatch) {
+            const envVarName = envVarMatch[1];
+            return envVars[envVarName];
+        }
+        return obj;
+    }
+    else if (Array.isArray(obj)) {
+        return obj.map((o) => replaceEnvVariables(o, envVars));
+    }
+    else if (typeof obj === "object" && obj !== null) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const newObj = {};
+        for (const key in obj) {
+            if (Object.hasOwn(obj, key)) {
+                newObj[key] = replaceEnvVariables(obj[key], envVars);
+            }
+        }
+        return newObj;
+    }
+    return obj;
+}
+// WARNING: If you change function signature, you must also change the
+// corresponding type in packages/config/src/index.d.ts
+export async function tryLoadZudokuConfig(rootDir, envVars, overrides) {
+    const { configPath, configType } = await getConfigFilePath(rootDir);
+    let config;
+    let dependencies;
+    if (configType === "dev-portal") {
+        config = await loadDevPortalConfig(configPath, envVars);
+        dependencies = [];
+    }
+    else {
+        const fn = overrides?.loadZudokuCodeConfig ?? loadZudokuCodeConfig;
+        ({ config, dependencies } = await fn(rootDir, configPath, envVars));
+        // This is here instead of in the load function so that
+        // it works even if we are overriding the load function
+        validateConfig(config);
+    }
+    const configWithMetadata = {
+        ...config,
+        __meta: {
+            dependencies,
+            path: configPath,
+            registerDependency: (...files) => {
+                const newFiles = files.filter((f) => !dependencies.includes(f));
+                dependencies.push(...newFiles);
+            },
+        },
+    };
+    return configWithMetadata;
+}
+const outputFileNames = ["dev-portal.js", "zudoku.config.js"];
+export function findOutputPathOfServerConfig(output) {
+    if (Array.isArray(output)) {
+        throw new Error("Expected a single output, but got an array");
+    }
+    if ("output" in output) {
+        const result = output.output.find((o) => "isEntry" in o && o.isEntry && outputFileNames.includes(o.fileName));
+        if (result) {
+            return result.fileName;
+        }
+    }
+    throw new Error("Could not find server config output file");
+}
+//# sourceMappingURL=loader.js.map

package/dist/config/loader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":"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"}

package/dist/config/validators/InputSidebarSchema.d.ts

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { IconNames } from "./icon-types.js";
 export declare const BaseInputSidebarItemCategoryLinkDocSchema: z.ZodObject<{
     type: z.ZodLiteral<"doc">;
     id: z.ZodString;
@@ -29,71 +30,91 @@ export declare const InputSidebarItemCategoryLinkDocSchema: z.ZodUnion<[z.ZodObj
 export declare const BaseInputSidebarItemDocSchema: z.ZodObject<{
     type: z.ZodLiteral<"doc">;
     id: z.ZodString;
-    icon: z.ZodOptional<z.ZodType<"default", z.ZodTypeDef, "default">>;
+    icon: z.ZodOptional<z.ZodType<IconNames, z.ZodTypeDef, IconNames>>;
     label: z.ZodOptional<z.ZodString>;
     badge: z.ZodOptional<z.ZodObject<{
         label: z.ZodString;
-        color: z.ZodEnum<["green", "blue", "yellow", "red", "purple", "indigo", "gray"]>;
+        color: z.ZodEnum<["green", "blue", "yellow", "red", "purple", "indigo", "gray", "outline"]>;
+        placement: z.ZodOptional<z.ZodEnum<["start", "end"]>>;
+        invert: z.ZodOptional<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
         label: string;
-        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray";
+        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray" | "outline";
+        placement?: "start" | "end" | undefined;
+        invert?: boolean | undefined;
     }, {
         label: string;
-        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray";
+        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray" | "outline";
+        placement?: "start" | "end" | undefined;
+        invert?: boolean | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     type: "doc";
     id: string;
-    label?: string | undefined;
-    icon?: "default" | undefined;
     badge?: {
         label: string;
-        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray";
+        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray" | "outline";
+        placement?: "start" | "end" | undefined;
+        invert?: boolean | undefined;
     } | undefined;
+    label?: string | undefined;
+    icon?: IconNames | undefined;
 }, {
     type: "doc";
     id: string;
-    label?: string | undefined;
-    icon?: "default" | undefined;
     badge?: {
         label: string;
-        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray";
+        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray" | "outline";
+        placement?: "start" | "end" | undefined;
+        invert?: boolean | undefined;
     } | undefined;
+    label?: string | undefined;
+    icon?: IconNames | undefined;
 }>;
 export type BaseInputSidebarItemDoc = z.infer<typeof BaseInputSidebarItemDocSchema>;
 export declare const InputSidebarItemDocSchema: z.ZodUnion<[z.ZodObject<{
     type: z.ZodLiteral<"doc">;
     id: z.ZodString;
-    icon: z.ZodOptional<z.ZodType<"default", z.ZodTypeDef, "default">>;
+    icon: z.ZodOptional<z.ZodType<IconNames, z.ZodTypeDef, IconNames>>;
     label: z.ZodOptional<z.ZodString>;
     badge: z.ZodOptional<z.ZodObject<{
         label: z.ZodString;
-        color: z.ZodEnum<["green", "blue", "yellow", "red", "purple", "indigo", "gray"]>;
+        color: z.ZodEnum<["green", "blue", "yellow", "red", "purple", "indigo", "gray", "outline"]>;
+        placement: z.ZodOptional<z.ZodEnum<["start", "end"]>>;
+        invert: z.ZodOptional<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
         label: string;
-        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray";
+        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray" | "outline";
+        placement?: "start" | "end" | undefined;
+        invert?: boolean | undefined;
     }, {
         label: string;
-        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray";
+        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray" | "outline";
+        placement?: "start" | "end" | undefined;
+        invert?: boolean | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     type: "doc";
     id: string;
-    label?: string | undefined;
-    icon?: "default" | undefined;
     badge?: {
         label: string;
-        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray";
+        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray" | "outline";
+        placement?: "start" | "end" | undefined;
+        invert?: boolean | undefined;
     } | undefined;
+    label?: string | undefined;
+    icon?: IconNames | undefined;
 }, {
     type: "doc";
     id: string;
-    label?: string | undefined;
-    icon?: "default" | undefined;
     badge?: {
         label: string;
-        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray";
+        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray" | "outline";
+        placement?: "start" | "end" | undefined;
+        invert?: boolean | undefined;
     } | undefined;
+    label?: string | undefined;
+    icon?: IconNames | undefined;
 }>, z.ZodString]>;
 export declare const InputSidebarItemLinkSchema: z.ZodObject<{
     type: z.ZodLiteral<"link">;
@@ -102,37 +123,47 @@ export declare const InputSidebarItemLinkSchema: z.ZodObject<{
     description: z.ZodOptional<z.ZodString>;
     badge: z.ZodOptional<z.ZodObject<{
         label: z.ZodString;
-        color: z.ZodEnum<["green", "blue", "yellow", "red", "purple", "indigo", "gray"]>;
+        color: z.ZodEnum<["green", "blue", "yellow", "red", "purple", "indigo", "gray", "outline"]>;
+        placement: z.ZodOptional<z.ZodEnum<["start", "end"]>>;
+        invert: z.ZodOptional<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
         label: string;
-        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray";
+        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray" | "outline";
+        placement?: "start" | "end" | undefined;
+        invert?: boolean | undefined;
     }, {
         label: string;
-        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray";
+        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray" | "outline";
+        placement?: "start" | "end" | undefined;
+        invert?: boolean | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     type: "link";
     label: string;
     href: string;
+    description?: string | undefined;
     badge?: {
         label: string;
-        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray";
+        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray" | "outline";
+        placement?: "start" | "end" | undefined;
+        invert?: boolean | undefined;
     } | undefined;
-    description?: string | undefined;
 }, {
     type: "link";
     label: string;
     href: string;
+    description?: string | undefined;
     badge?: {
         label: string;
-        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray";
+        color: "green" | "blue" | "yellow" | "red" | "purple" | "indigo" | "gray" | "outline";
+        placement?: "start" | "end" | undefined;
+        invert?: boolean | undefined;
     } | undefined;
-    description?: string | undefined;
 }>;
 export type InputSidebarItemLink = z.infer<typeof InputSidebarItemLinkSchema>;
 export declare const BaseInputSidebarItemCategorySchema: z.ZodObject<{
     type: z.ZodLiteral<"category">;
-    icon: z.ZodOptional<z.ZodType<"default", z.ZodTypeDef, "default">>;
+    icon: z.ZodOptional<z.ZodType<IconNames, z.ZodTypeDef, IconNames>>;
     label: z.ZodString;
     description: z.ZodOptional<z.ZodString>;
     collapsible: z.ZodOptional<z.ZodBoolean>;
@@ -153,25 +184,25 @@ export declare const BaseInputSidebarItemCategorySchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     type: "category";
     label: string;
-    icon?: "default" | undefined;
     link?: string | {
         type: "doc";
         id: string;
         label?: string | undefined;
     } | undefined;
     description?: string | undefined;
+    icon?: IconNames | undefined;
     collapsible?: boolean | undefined;
     collapsed?: boolean | undefined;
 }, {
     type: "category";
     label: string;
-    icon?: "default" | undefined;
     link?: string | {
         type: "doc";
         id: string;
         label?: string | undefined;
     } | undefined;
     description?: string | undefined;
+    icon?: IconNames | undefined;
     collapsible?: boolean | undefined;
     collapsed?: boolean | undefined;
 }>;

package/dist/config/validators/InputSidebarSchema.js

@@ -1,4 +1,19 @@
 import { z } from "zod";
+const BadgeSchema = z.object({
+    label: z.string(),
+    color: z.enum([
+        "green",
+        "blue",
+        "yellow",
+        "red",
+        "purple",
+        "indigo",
+        "gray",
+        "outline",
+    ]),
+    placement: z.enum(["start", "end"]).optional(),
+    invert: z.boolean().optional(),
+});
 export const BaseInputSidebarItemCategoryLinkDocSchema = z.object({
     type: z.literal("doc"),
     id: z.string(),
@@ -13,20 +28,7 @@ export const BaseInputSidebarItemDocSchema = z.object({
     id: z.string(),
     icon: z.custom().optional(),
     label: z.string().optional(),
-    badge: z
-        .object({
-        label: z.string(),
-        color: z.enum([
-            "green",
-            "blue",
-            "yellow",
-            "red",
-            "purple",
-            "indigo",
-            "gray",
-        ]),
-    })
-        .optional(),
+    badge: BadgeSchema.optional(),
 });
 export const InputSidebarItemDocSchema = z.union([
     BaseInputSidebarItemDocSchema,
@@ -37,20 +39,7 @@ export const InputSidebarItemLinkSchema = z.object({
     label: z.string(),
     href: z.string(),
     description: z.string().optional(),
-    badge: z
-        .object({
-        label: z.string(),
-        color: z.enum([
-            "green",
-            "blue",
-            "yellow",
-            "red",
-            "purple",
-            "indigo",
-            "gray",
-        ]),
-    })
-        .optional(),
+    badge: BadgeSchema.optional(),
 });
 export const BaseInputSidebarItemCategorySchema = z.object({
     type: z.literal("category"),

package/dist/config/validators/InputSidebarSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"InputSidebarSchema.js","sourceRoot":"","sources":["../../../src/config/validators/InputSidebarSchema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"InputSidebarSchema.js","sourceRoot":"","sources":["../../../src/config/validators/InputSidebarSchema.ts"],"names":[],"mappings":"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"}

package/dist/config/validators/SidebarSchema.d.ts

@@ -1,5 +1,6 @@
 import { type LucideIcon } from "lucide-react";
 import type { BaseInputSidebarItemCategoryLinkDoc, BaseInputSidebarItemDoc, InputSidebarItem, InputSidebarItemCategory, InputSidebarItemLink } from "./InputSidebarSchema.js";
+import type { ZudokuConfig } from "./validate.js";
 export type SidebarItemDoc = Omit<BaseInputSidebarItemDoc, "icon"> & {
     label: string;
     categoryLabel?: string;
@@ -18,6 +19,28 @@ export type SidebarItemCategory = Omit<InputSidebarItemCategory, "items" | "link
     icon?: LucideIcon | string;
 };
 export type SidebarItem = SidebarItemDoc | SidebarItemLink | SidebarItemCategory;
-export declare const resolveSidebar: (rootDir: string, sidebar: InputSidebarItem[]) => Promise<SidebarItem[]>;
+export declare class SidebarManager {
+    sidebars: SidebarClass[];
+    private switchQueue;
+    constructor(rootDir: string, sidebarConfig: ZudokuConfig["sidebar"]);
+    resolveSidebars(): Promise<{
+        [k: string]: SidebarItem[];
+    }>;
+    switchSidebar(from: string, to: string, item: SidebarItem): void;
+}
+export declare class SidebarClass {
+    private manager;
+    rootDir: string;
+    parent: string;
+    private items;
+    resolvedItems: SidebarItem[];
+    constructor(manager: SidebarManager, rootDir: string, parent: string, items: InputSidebarItem[]);
+    resolve(): Promise<void>;
+    private resolveDoc;
+    private resolveLink;
+    private resolveItemCategoryLinkDoc;
+    private resolveSidebarItemDoc;
+    private resolveItem;
+}
 export type Sidebar = SidebarItem[];
 export type SidebarConfig = Record<string, Sidebar>;

package/dist/config/validators/SidebarSchema.js

@@ -2,68 +2,109 @@ import { glob } from "glob";
 import matter from "gray-matter";
 import fs from "node:fs/promises";
 const extractTitleFromContent = (content) => content.match(/^\s*#\s(.*)$/m)?.at(1);
-export const resolveSidebar = async (rootDir, sidebar) => {
-    const resolveDoc = async (id, categoryLabel) => {
+const isSidebarItem = (item) => item !== undefined;
+export class SidebarManager {
+    sidebars;
+    switchQueue = [];
+    constructor(rootDir, sidebarConfig) {
+        this.sidebars = Object.entries(sidebarConfig ?? {}).map(([parent, items]) => new SidebarClass(this, rootDir, parent, items));
+    }
+    async resolveSidebars() {
+        await Promise.all(this.sidebars.map((sidebar) => sidebar.resolve()));
+        // switch all collected items
+        for (const { from, to, item } of this.switchQueue) {
+            const fromSidebar = this.sidebars.find((s) => s.parent === from);
+            const toSidebar = this.sidebars.find((s) => s.parent === to);
+            if (!fromSidebar || !toSidebar) {
+                throw new Error(`Sidebar ${from} or ${to} not found`);
+            }
+            fromSidebar.resolvedItems = fromSidebar.resolvedItems.filter((resolvedItem) => resolvedItem !== item);
+            toSidebar.resolvedItems.push(item);
+        }
+        return Object.fromEntries(this.sidebars.map((sidebar) => [sidebar.parent, sidebar.resolvedItems]));
+    }
+    switchSidebar(from, to, item) {
+        this.switchQueue.push({ from, to, item });
+    }
+}
+export class SidebarClass {
+    manager;
+    rootDir;
+    parent;
+    items;
+    resolvedItems = [];
+    constructor(manager, rootDir, parent, items) {
+        this.manager = manager;
+        this.rootDir = rootDir;
+        this.parent = parent;
+        this.items = items;
+    }
+    async resolve() {
+        const resolvedSidebar = (await Promise.all(this.items.map((item) => this.resolveItem(item)))).filter(isSidebarItem);
+        this.resolvedItems = resolvedSidebar;
+    }
+    async resolveDoc(id, categoryLabel) {
         const foundMatches = await glob(`/**/${id}.{md,mdx}`, {
             ignore: ["**/node_modules/**", "**/.git/**", "**/dist/**"],
-            root: rootDir,
+            root: this.rootDir,
         });
         if (foundMatches.length === 0) {
             throw new Error(`File not found for document '${id}'. Check your sidebar configuration.`);
         }
         const file = await fs.readFile(foundMatches.at(0));
         const { data, content } = matter(file);
-        const label = data.sidebar_label ?? data.title ?? extractTitleFromContent(content);
+        const label = data.sidebar_label ??
+            data.title ??
+            extractTitleFromContent(content) ??
+            id;
         const icon = data.sidebar_icon;
-        if (typeof label !== "string") {
-            throw new Error(`Error determining title for document '${id}'. Check that the document has a H1 header or title frontmatter.`);
-        }
-        return {
+        const doc = {
             type: "doc",
             id,
             label,
             icon,
             categoryLabel,
         };
-    };
-    const resolveLink = async (id) => {
-        const doc = await resolveDoc(id);
-        return {
-            type: "doc",
-            id: id,
-            label: doc.label,
-            icon: doc.icon,
-        };
-    };
-    const resolveSidebarItemCategoryLinkDoc = async (item) => {
+        if (data.sidebar && data.sidebar !== this.parent) {
+            this.manager.switchSidebar(this.parent, data.sidebar, doc);
+            return undefined;
+        }
+        return doc;
+    }
+    async resolveLink(id) {
+        const doc = await this.resolveDoc(id);
+        return doc
+            ? { type: "doc", id: id, label: doc.label, icon: doc.icon }
+            : undefined;
+    }
+    async resolveItemCategoryLinkDoc(item) {
         if (typeof item === "string") {
-            return resolveLink(item);
+            return this.resolveLink(item);
         }
-        const { label, icon } = await resolveDoc(item.id);
-        return { ...item, label, icon };
-    };
-    const resolveSidebarItemDoc = async (item, categoryLabel) => {
+        const doc = await this.resolveDoc(item.id);
+        return doc ? { ...item, label: doc.label, icon: doc.icon } : undefined;
+    }
+    async resolveSidebarItemDoc(item, categoryLabel) {
         if (typeof item === "string") {
-            return resolveDoc(item, categoryLabel);
+            return this.resolveDoc(item, categoryLabel);
         }
-        const doc = await resolveDoc(item.id, categoryLabel);
-        const label = item.label ?? doc.label;
-        return { ...item, label, categoryLabel };
-    };
-    const resolveSidebarItem = async (item, categoryLabel) => {
+        const doc = await this.resolveDoc(item.id, categoryLabel);
+        return doc ? { ...doc, ...item } : undefined;
+    }
+    async resolveItem(item, categoryLabel) {
         if (typeof item === "string") {
-            return resolveDoc(item, categoryLabel);
+            return this.resolveDoc(item, categoryLabel);
         }
         switch (item.type) {
             case "doc":
-                return resolveSidebarItemDoc(item, categoryLabel);
+                return this.resolveSidebarItemDoc(item, categoryLabel);
             case "link":
                 return item;
             case "category": {
                 const categoryItem = item;
-                const items = await Promise.all(categoryItem.items.map((subItem) => resolveSidebarItem(subItem, categoryItem.label)));
+                const items = (await Promise.all(categoryItem.items.map((subItem) => this.resolveItem(subItem, categoryItem.label)))).filter((item) => item !== undefined);
                 const resolvedLink = categoryItem.link
-                    ? await resolveSidebarItemCategoryLinkDoc(categoryItem.link)
+                    ? await this.resolveItemCategoryLinkDoc(categoryItem.link)
                     : undefined;
                 return {
                     ...categoryItem,
@@ -72,7 +113,6 @@ export const resolveSidebar = async (rootDir, sidebar) => {
                 };
             }
         }
-    };
-    return Promise.all(sidebar.map((item) => resolveSidebarItem(item)));
-};
+    }
+}
 //# sourceMappingURL=SidebarSchema.js.map