rebase

Author: avivkeller

src/generators/jsx-ast/utils/__tests__/buildBarProps.test.mjs

@@ -22,10 +22,15 @@ describe('buildBarProps utilities', () => {
       const result = buildMetaBarProps(SAMPLE, [SAMPLE]);
 
       assert.equal(result.addedIn, 'v1.0.0');
-      assert.deepEqual(result.viewAs, [['JSON', 'sample-api.json']]);
+      assert.deepEqual(result.viewAs, [
+        ['JSON', 'sample-api.json'],
+        ['MD', 'sample-api.md'],
+      ]);
       assert.ok(result.readingTime.startsWith('1 min'));
       assert.ok(result.editThisPage.endsWith('sample-api.md'));
-      assert.deepEqual(result.headings, [{ depth: 2, value: 'SampleFunc' }]);
+      assert.deepEqual(result.headings, [
+        { depth: 2, value: 'SampleFunc', slug: 'sample-func' },
+      ]);
     });
   });
 });

src/generators/jsx-ast/utils/__tests__/buildContent.test.mjs

@@ -1,26 +1,27 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
 
-import remarkParse from 'remark-parse';
-import remarkStringify from 'remark-stringify';
-import { unified } from 'unified';
-
 import { SAMPLE } from './utils.mjs';
-import { AST_NODE_TYPES } from '../../constants.mjs';
+import { JSX_IMPORTS } from '../../../web/constants.mjs';
 import buildContent from '../buildContent.mjs';
 
 describe('buildContent', () => {
   it('should process entries and include JSX wrapper elements', () => {
-    const processor = unified().use(remarkParse).use(remarkStringify);
-    const tree = buildContent([SAMPLE], SAMPLE, {}, processor);
-
-    const article = tree.children.find(
-      child => child.name === AST_NODE_TYPES.JSX.ARTICLE
+    const tree = buildContent(
+      [SAMPLE],
+      SAMPLE,
+      {},
+      {
+        runSync: x => ({
+          body: [{ expression: x }],
+        }),
+      }
     );
-    assert.ok(article);
-    assert.ok(
-      article.children.some(c => c.name === AST_NODE_TYPES.JSX.SIDE_BAR)
+
+    assert.deepStrictEqual(
+      tree.children.map(child => child.name),
+      [JSX_IMPORTS.NavBar.name, JSX_IMPORTS.Article.name]
     );
-    assert.ok(article.children.some(c => c.name === AST_NODE_TYPES.JSX.FOOTER));
+    assert.equal(tree.data, SAMPLE);
   });
 });

src/generators/jsx-ast/utils/buildBarProps.mjs

@@ -42,7 +42,7 @@ export const buildMetaBarProps = (head, entries) => {
     .map(entry => ({
       depth: entry.heading.depth,
       value: entry.heading.data.name,
-      data: { id: entry.heading.data.slug },
+      slug: entry.heading.data.slug,
     }));
 
   return {

src/generators/web/client/components/MetaBar.jsx

@@ -11,7 +11,12 @@ const iconMap = {
 export default ({ headings, addedIn, readingTime, viewAs, editThisPage }) => (
   <MetaBar
     heading="Table of Contents"
-    headings={{ items: headings }}
+    headings={{
+      items: headings.map(({ slug, ...heading }) => ({
+        ...heading,
+        data: { id: slug },
+      })),
+    }}
     items={{
       'Added In': addedIn,
       'Reading Time': readingTime,