@barodoc/theme-docs 1.0.0 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barodoc/theme-docs",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Documentation theme for Barodoc",
   "type": "module",
   "exports": {
@@ -30,7 +30,7 @@
     "lucide-react": "^0.563.0",
     "mermaid": "^11.12.2",
     "tailwind-merge": "^3.4.0",
-    "@barodoc/core": "1.0.0"
+    "@barodoc/core": "1.0.1"
   },
   "peerDependencies": {
     "astro": "^5.0.0",

package/src/components/CodeCopy.astro

@@ -99,6 +99,46 @@
     border-radius: 0 !important;
     background: transparent !important;
   }
+
+  /* Inside CodeGroup: no extra border/background, add padding so code has internal spacing */
+  .code-group .code-block-wrapper {
+    margin: 0;
+    border: none;
+    border-radius: 0;
+    background: transparent;
+    /* padding: 1rem 1.25rem; */
+  }
+
+  .code-group .code-block-wrapper pre {
+    padding: 0 !important;
+  }
+
+  /* pre not wrapped by CodeCopy (direct child of code-group-content) */
+  .code-group .code-group-content > pre {
+    padding: 1rem 1.25rem !important;
+  }
+
+  /* CodeItem: one code block per tab; only the code area is visible, no extra wrapper space */
+  .code-group .code-item {
+    margin: 0;
+    padding: 0;
+    display: block;
+  }
+
+  .code-group .code-item:not(:first-child) {
+    display: none; /* toggled by CodeGroup script */
+  }
+
+  /* .code-group .code-item .code-block-wrapper,
+  .code-group .code-item > pre {
+    margin: 0 !important;
+    border: none !important;
+    padding: 0.25rem 0rem !important;
+  } */
+
+  /* .code-group .code-item .code-block-wrapper pre {
+    padding: 0 !important;
+  } */
   
   .code-block-header {
     display: flex;

package/src/components/mdx/CodeGroup.astro

@@ -1,5 +1,7 @@
 ---
-// CodeGroup component for tabbed code blocks
+// CodeGroup component for tabbed code blocks.
+// When using CodeItem children, each CodeItem's title is used for the tab label.
+// Optional titles array is only used when not using CodeItem (direct pre children).
 interface Props {
   titles?: string[];
 }
@@ -7,9 +9,9 @@ interface Props {
 const { titles = [] } = Astro.props;
 ---
 
-<div class="not-prose my-4 code-group" data-titles={JSON.stringify(titles)}>
-  <div class="code-group-tabs flex border-b border-[var(--color-border)] bg-[var(--color-bg-secondary)] rounded-t-lg"></div>
-  <div class="code-group-content">
+<div class="code-group not-prose my-4 rounded-lg border border-[var(--color-border)] overflow-hidden" data-titles={JSON.stringify(titles)}>
+  <div class="code-group-tabs flex flex-wrap gap-0 border-b border-[var(--color-border)] bg-[var(--color-bg-tertiary)]"></div>
+  <div class="code-group-content bg-[var(--color-bg-secondary)]">
     <slot />
   </div>
 </div>
@@ -19,40 +21,50 @@ const { titles = [] } = Astro.props;
     document.querySelectorAll('.code-group').forEach((group) => {
       const tabsContainer = group.querySelector('.code-group-tabs');
       const contentContainer = group.querySelector('.code-group-content');
-      const titles = JSON.parse(group.getAttribute('data-titles') || '[]');
-      const codeBlocks = contentContainer?.querySelectorAll('pre');
+      const fallbackTitles = JSON.parse(group.getAttribute('data-titles') || '[]');
 
-      if (!tabsContainer || !contentContainer || !codeBlocks?.length) return;
+      const codeItems = contentContainer?.querySelectorAll(':scope > .code-item');
+      const directPres = contentContainer?.querySelectorAll(':scope > pre');
 
-      // Create tabs
-      codeBlocks.forEach((block, index) => {
+      // When CodeItem children exist: use them for tabs (titles from data-title), one tab per .code-item
+      const useCodeItems = (codeItems?.length ?? 0) > 0;
+      const tabPanels = useCodeItems
+        ? Array.from(codeItems!)
+        : Array.from(directPres || []);
+      const titles = useCodeItems && codeItems?.length
+        ? Array.from(codeItems!).map((el) => (el as HTMLElement).getAttribute('data-title') ?? '')
+        : fallbackTitles;
+      const numTabs = tabPanels.length;
+
+      if (!tabsContainer || !contentContainer || numTabs === 0) return;
+
+      // Create tabs from titles; show/hide tabPanels
+      tabPanels.forEach((_panel, index) => {
         const tab = document.createElement('button');
-        tab.className = 'px-4 py-2 text-sm font-medium transition-colors text-[var(--color-text-secondary)] hover:text-[var(--color-text)]';
-        tab.textContent = titles[index] || `Tab ${index + 1}`;
+        tab.className = 'shrink-0 px-4 py-2 text-sm font-medium transition-colors whitespace-nowrap text-[var(--color-text-muted)] hover:text-[var(--color-text)]';
+        tab.textContent = titles[index]?.trim() || `Tab ${index + 1}`;
+        const panel = tabPanels[index] as HTMLElement;
         tab.addEventListener('click', () => {
-          // Update tabs
           tabsContainer.querySelectorAll('button').forEach((t, i) => {
             if (i === index) {
-              t.classList.add('border-b-2', 'border-primary-600', 'text-primary-600');
-              t.classList.remove('text-[var(--color-text-secondary)]');
+              t.classList.add('border-b-2', 'border-primary-500', 'text-[var(--color-text)]', '-mb-px');
+              t.classList.remove('text-[var(--color-text-muted)]');
             } else {
-              t.classList.remove('border-b-2', 'border-primary-600', 'text-primary-600');
-              t.classList.add('text-[var(--color-text-secondary)]');
+              t.classList.remove('border-b-2', 'border-primary-500', 'text-[var(--color-text)]', '-mb-px');
+              t.classList.add('text-[var(--color-text-muted)]');
             }
           });
-          // Update content
-          codeBlocks.forEach((b, i) => {
-            (b as HTMLElement).style.display = i === index ? 'block' : 'none';
+          tabPanels.forEach((p, i) => {
+            (p as HTMLElement).style.display = i === index ? 'block' : 'none';
           });
         });
         tabsContainer.appendChild(tab);
 
-        // Hide all but first
         if (index === 0) {
-          tab.classList.add('border-b-2', 'border-primary-600', 'text-primary-600');
-          tab.classList.remove('text-[var(--color-text-secondary)]');
+          tab.classList.add('border-b-2', 'border-primary-500', 'text-[var(--color-text)]', '-mb-px');
+          tab.classList.remove('text-[var(--color-text-muted)]');
         } else {
-          (block as HTMLElement).style.display = 'none';
+          panel.style.display = 'none';
         }
       });
     });

package/src/components/mdx/CodeGroup.tsx

@@ -5,25 +5,91 @@ interface CodeGroupProps {
   titles?: string[];
 }
 
+function isCodeBlockLike(el: React.ReactElement): boolean {
+  if (el.type === "pre") return true;
+  const className =
+    typeof el.props?.className === "string" ? el.props.className : "";
+  if (
+    className.includes("language-") ||
+    className.includes("astro-code") ||
+    className.includes("code-block")
+  )
+    return true;
+  return false;
+}
+
+function collectCodeBlocks(node: React.ReactNode): React.ReactElement[] {
+  const result: React.ReactElement[] = [];
+  React.Children.forEach(node, (child) => {
+    if (!React.isValidElement(child)) return;
+    if (child.type === React.Fragment && child.props?.children != null) {
+      result.push(...collectCodeBlocks(child.props.children));
+      return;
+    }
+    if (child.type === "pre" || isCodeBlockLike(child)) {
+      result.push(child);
+      return;
+    }
+    if (child.props?.children != null) {
+      result.push(...collectCodeBlocks(child.props.children));
+    }
+  });
+  return result;
+}
+
 export function CodeGroup({ children, titles = [] }: CodeGroupProps) {
   const [activeIndex, setActiveIndex] = React.useState(0);
-  
-  // Extract code blocks from children
-  const codeBlocks = React.Children.toArray(children);
-  
+
+  const codeBlocks = React.useMemo(() => {
+    let blocks = collectCodeBlocks(children);
+    if (blocks.length > 0) return blocks;
+    const direct = React.Children.toArray(children).filter(
+      (c): c is React.ReactElement => React.isValidElement(c) && c.type != null
+    );
+    if (direct.length > 1) return direct;
+    if (
+      direct.length === 1 &&
+      direct[0].props?.children != null
+    ) {
+      const inner = React.Children.toArray(direct[0].props.children).filter(
+        (c): c is React.ReactElement =>
+          React.isValidElement(c) && c.type != null
+      );
+      if (inner.length > 0) return inner;
+    }
+    return direct;
+  }, [children]);
+
+  const tabTitles =
+    titles.length >= codeBlocks.length
+      ? titles.slice(0, codeBlocks.length)
+      : [
+          ...titles,
+          ...codeBlocks
+            .slice(titles.length)
+            .map((_, i) => `Tab ${titles.length + i + 1}`),
+        ];
+
+  if (codeBlocks.length === 0) {
+    return (
+      <div className="code-group not-prose my-4 rounded-lg border border-[var(--color-border)] overflow-hidden p-4 text-[var(--color-text-muted)] text-sm">
+        No code blocks found inside CodeGroup.
+      </div>
+    );
+  }
+
   return (
-    <div className="not-prose my-4 rounded-lg border border-[var(--color-border)] overflow-hidden">
+    <div className="code-group not-prose my-4 rounded-lg border border-[var(--color-border)] overflow-hidden">
       {/* Tabs */}
-      <div className="flex bg-[var(--color-bg-tertiary)] border-b border-[var(--color-border)]">
-        {codeBlocks.map((_, index) => {
+      <div className="flex flex-wrap gap-0 bg-[var(--color-bg-tertiary)] border-b border-[var(--color-border)]">
+        {tabTitles.map((title, index) => {
           const isActive = activeIndex === index;
-          const title = titles[index] || `Tab ${index + 1}`;
           return (
             <button
               key={index}
               type="button"
               onClick={() => setActiveIndex(index)}
-              className={`px-4 py-2 text-sm font-medium transition-colors ${
+              className={`shrink-0 px-4 py-2 text-sm font-medium transition-colors whitespace-nowrap ${
                 isActive
                   ? "bg-[var(--color-bg-secondary)] text-[var(--color-text)] border-b-2 border-primary-500 -mb-px"
                   : "text-[var(--color-text-muted)] hover:text-[var(--color-text)]"
@@ -34,7 +100,7 @@ export function CodeGroup({ children, titles = [] }: CodeGroupProps) {
           );
         })}
       </div>
-      
+
       {/* Content */}
       <div className="bg-[var(--color-bg-secondary)]">
         {codeBlocks.map((block, index) => (

package/src/components/mdx/CodeItem.astro

@@ -0,0 +1,13 @@
+---
+// Wraps a single code block inside CodeGroup. Use one CodeItem per tab.
+// Put one fenced code block (```lang ... ```) inside; MDX/Shiki handle syntax highlighting.
+interface Props {
+  title?: string;
+}
+
+const { title = "" } = Astro.props;
+---
+
+<div class="code-item" data-title={title}>
+  <slot />
+</div>

package/src/index.ts

@@ -1,5 +1,5 @@
 import type { AstroIntegration } from "astro";
-import type { ThemeExport } from "@barodoc/core";
+import type { ThemeExport, ResolvedBarodocConfig } from "@barodoc/core";
 import mdx from "@astrojs/mdx";
 import react from "@astrojs/react";
 import tailwindcss from "@tailwindcss/vite";
@@ -8,7 +8,60 @@ export interface DocsThemeOptions {
   customCss?: string[];
 }
 
-function createThemeIntegration(options?: DocsThemeOptions): AstroIntegration {
+/** HAST node with optional children and properties */
+interface HastNode {
+  type: string;
+  children?: HastNode[];
+  properties?: Record<string, unknown>;
+  tagName?: string;
+  value?: string;
+}
+
+function getTextContent(node: HastNode): string {
+  if (node.type === "text") return node.value ?? "";
+  if (node.children?.length) return node.children.map(getTextContent).join("");
+  return "";
+}
+
+function isEmptyLine(node: HastNode): boolean {
+  if (node.type !== "element" || node.tagName !== "span") return false;
+  const cls = node.properties?.className;
+  const isLine =
+    Array.isArray(cls) && cls.some((c) => c === "line" || (typeof c === "string" && c.includes("line")));
+  if (!isLine) return false;
+  return /^\s*$/.test(getTextContent(node));
+}
+
+/** Removes leading and trailing empty span.line so only the code area is visible. */
+function createTrimEmptyLinesTransformer() {
+  return {
+    name: "barodoc-trim-empty-lines",
+    code(node: HastNode) {
+      const lines = node.children;
+      if (!lines?.length) return;
+      let start = 0;
+      let end = lines.length;
+      while (start < end && isEmptyLine(lines[start])) start++;
+      while (end > start && isEmptyLine(lines[end - 1])) end--;
+      node.children = lines.slice(start, end);
+    },
+  };
+}
+
+function createLineNumbersTransformer() {
+  return {
+    name: "barodoc-line-numbers",
+    pre(node: { properties?: Record<string, unknown> }) {
+      (this as { addClassToHast: (node: unknown, cls: string) => void }).addClassToHast(node, "line-numbers");
+    },
+  };
+}
+
+function createThemeIntegration(
+  config: ResolvedBarodocConfig,
+  options?: DocsThemeOptions
+): AstroIntegration {
+  const lineNumbers = config?.lineNumbers === true;
   return {
     name: "@barodoc/theme-docs",
     hooks: {
@@ -41,6 +94,10 @@ function createThemeIntegration(options?: DocsThemeOptions): AstroIntegration {
                 light: "github-light",
                 dark: "github-dark",
               },
+              transformers: [
+                createTrimEmptyLinesTransformer(),
+                ...(lineNumbers ? [createLineNumbersTransformer()] : []),
+              ],
             },
           },
         });
@@ -54,7 +111,7 @@ function createThemeIntegration(options?: DocsThemeOptions): AstroIntegration {
 export default function docsTheme(options?: DocsThemeOptions): ThemeExport {
   return {
     name: "@barodoc/theme-docs",
-    integration: () => createThemeIntegration(options),
+    integration: (config) => createThemeIntegration(config, options),
     styles: options?.customCss || [],
   };
 }

package/src/styles/global.css

@@ -77,29 +77,29 @@
   }
 }
 
-/* Prose styling for MDX content - Mintlify style */
+/* Prose styling for MDX content -  */
 .prose {
   --tw-prose-body: var(--color-text);
   --tw-prose-headings: var(--color-text);
   --tw-prose-links: var(--color-primary-600);
   --tw-prose-code: var(--color-text);
   --tw-prose-pre-bg: var(--color-bg-secondary);
-  font-size: 0.875rem !important;
-  line-height: 1.6 !important;
+  /* font-size: 0.875rem !important; */
+  /* line-height: 1.6 !important; */
 }
 
 .dark .prose {
   --tw-prose-links: var(--color-primary-400);
 }
 
-/* Headings - Mintlify style */
+/* Headings -  */
 .prose :where(h1):not(:where([class~="not-prose"],[class~="not-prose"] *)) {
   font-size: 1.75rem !important;
   font-weight: 700 !important;
   letter-spacing: -0.025em !important;
   margin-top: 0 !important;
   margin-bottom: 0.375rem !important;
-  line-height: 1.25 !important;
+  /* line-height: 1.25 !important; */
 }
 
 .prose :where(h2):not(:where([class~="not-prose"],[class~="not-prose"] *)) {
@@ -143,14 +143,14 @@
   text-underline-offset: 2px !important;
 }
 
-/* Code block styling - Mintlify style */
+/* Code block styling -  */
 .prose :where(pre):not(:where([class~="not-prose"],[class~="not-prose"] *)) {
   background-color: var(--color-bg) !important;
   border: 1px solid var(--color-border) !important;
   border-radius: 0.5rem !important;
   padding: 0.75rem 1rem !important;
   font-size: 0.8125rem !important;
-  line-height: 1.5 !important;
+  line-height: 1.45 !important;
   overflow-x: auto !important;
   margin: 0.75rem 0 !important;
 }
@@ -185,7 +185,7 @@
   color: var(--color-text-muted) !important;
 }
 
-/* Blockquotes - Mintlify style */
+/* Blockquotes -  */
 .prose :where(blockquote):not(:where([class~="not-prose"],[class~="not-prose"] *)) {
   border-left: 3px solid var(--color-primary-500) !important;
   background-color: var(--color-bg-secondary) !important;
@@ -241,6 +241,20 @@
 .astro-code {
   background-color: var(--color-bg) !important;
   border-radius: 0.5rem;
+  line-height: 1.45;
+}
+
+.astro-code code {
+  display: flex;
+  flex-direction: column;
+}
+
+/* Tighter line spacing: Shiki outputs each line as span.line */
+.astro-code span.line {
+  display: block;
+  line-height: 1.45;
+  margin: 0;
+  padding: 0;
 }
 
 .dark .astro-code,
@@ -249,6 +263,28 @@
   background-color: var(--shiki-dark-bg) !important;
 }
 
+/* Line numbers: applied when barodoc.config.json has "lineNumbers": true */
+.astro-code.line-numbers {
+  counter-reset: line;
+}
+
+.astro-code.line-numbers span.line {
+  display: block;
+  counter-increment: line;
+}
+
+.astro-code.line-numbers span.line::before {
+  content: counter(line);
+  display: inline-block;
+  min-width: 2.5rem;
+  margin-right: 1rem;
+  padding-right: 0.5rem;
+  text-align: right;
+  color: var(--color-text-muted);
+  user-select: none;
+  border-right: 1px solid var(--color-border);
+}
+
 /* Pagefind search styling */
 .pagefind-ui {
   --pagefind-ui-scale: 1;