fix return in table, scrap dedupe for now

Author: avivkeller

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

@@ -164,7 +164,7 @@ const transformHeadingNode = (entry, node, index, parent) => {
   // Add method signatures for appropriate types
   createSignatureElements(
     parent,
-    node.data.entries || [entry],
+    node,
     index + (sourceLink ? 2 : 1),
     TYPES_WITH_METHOD_SIGNATURES.includes(node.data.type)
   );
@@ -217,51 +217,6 @@ const createDocumentLayout = (entries, sideBarProps, metaBarProps) => {
   ]);
 };
 
-/**
- * Identifies and removes duplicate headings that follow a heading with the same name
- * @param {Array<ApiDocMetadataEntry>} metadataEntries - API documentation metadata entries
- * @returns {Array<ApiDocMetadataEntry>} Processed entries with duplicates removed
- */
-const removeDuplicates = metadataEntries => {
-  const headingMap = new Map();
-  let lastSeenName = null;
-
-  // Process each entry in place
-  metadataEntries.forEach(entry => {
-    visit(
-      entry.content,
-      createQueries.UNIST.isHeading,
-      (node, index, parent) => {
-        // Early return if not a method signature type
-        if (!TYPES_WITH_METHOD_SIGNATURES.includes(node.data.type)) {
-          return;
-        }
-
-        const fullName = getFullName(node.data);
-
-        if (fullName === lastSeenName) {
-          // Remove duplicate heading
-          parent.children.splice(index, 1);
-          // Add entry to the original heading's entries list
-          headingMap.get(fullName).entries.push(entry);
-        } else {
-          // Update last seen name
-          lastSeenName = fullName;
-
-          // Store original heading
-          headingMap.set(fullName, {
-            node,
-            entries: [entry],
-          });
-        }
-      }
-    );
-  });
-
-  // Filter out entries with empty content or no children
-  return metadataEntries.filter(entry => entry.content?.children?.length > 0);
-};
-
 /**
  * @typedef {import('estree').Node & { data: ApiDocMetadataEntry }} JSXContent
  *
@@ -273,11 +228,10 @@ const removeDuplicates = metadataEntries => {
  * @returns {JSXContent} The processed MDX content
  */
 const buildContent = (metadataEntries, head, sideBarProps, remark) => {
-  const processedEntries = removeDuplicates(metadataEntries);
-  const metaBarProps = buildMetaBarProps(head, processedEntries);
+  const metaBarProps = buildMetaBarProps(head, metadataEntries);
 
   const root = createDocumentLayout(
-    processedEntries,
+    metadataEntries,
     sideBarProps,
     metaBarProps
   );

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

@@ -33,9 +33,9 @@ export const parseListIntoProperties = (node, prefix = '') => {
     const [{ children }, ...otherChildren] = item.children;
 
     if (children[0].type === 'inlineCode') {
-      name = prefix
-        ? `${prefix}.${children.shift().value}`
-        : children.shift().value;
+      name = (
+        prefix ? `${prefix}.${children.shift().value}` : children.shift().value
+      ).trimEnd();
     } else if (children[0].value && children[0].value.startsWith('Returns')) {
       children.shift();
       name = 'Returns';
@@ -68,7 +68,9 @@ export const parseListIntoProperties = (node, prefix = '') => {
 
     const sublist = otherChildren.find(createQueries.UNIST.isTypedList);
     if (sublist) {
-      properties.push(...parseListIntoProperties(sublist, name));
+      properties.push(
+        ...parseListIntoProperties(sublist, name === 'Returns' ? '_' : name)
+      );
     }
   }
 
@@ -223,34 +225,29 @@ export const getFullName = ({ name, text }, fallback = name) => {
 /**
  * Creates documentation from API metadata entries
  * @param {import('@types/mdast').Parent} parent - The parent node
- * @param {ApiDocMetadataEntry[]} entries - Array of API documentation metadata entries
+ * @param {import('@types/mdast').Heading} heading - The heading
  * @param {number} backupIndex - If there isn't a list, use this index
  * @param {boolean} addSignatureCodebox - Is this a method?
  */
-export default (parent, entries, backupIndex, addSignatureCodebox) => {
-  // Find the list index in the parent for later replacement
+export default (parent, heading, backupIndex, addSignatureCodebox) => {
+  // Find the list index in the parent
   const listIdx = parent.children.findIndex(createQueries.UNIST.isTypedList);
+  const list = parent.children[listIdx];
   const elements = [];
 
-  // Process all entries
-  for (const entry of entries) {
-    // Find the list in the container
-    const list = entry.content.children.find(createQueries.UNIST.isTypedList);
+  // Create a signature code box, if this is a method/ctor.
+  if (addSignatureCodebox) {
+    const params = list ? list.children.map(parseListItem) : [];
 
-    // Create a signature code box, if this is a method/ctor.
-    if (addSignatureCodebox) {
-      const params = list ? list.children.map(parseListItem) : [];
+    const signature = parseSignature(heading.data.text, params);
+    const displayName = getFullName(heading.data);
 
-      const signature = parseSignature(entry.heading.data.text, params);
-      const displayName = getFullName(entry.heading.data);
-
-      elements.push(createSignatureCodeBlock(displayName, signature));
-    }
+    elements.push(createSignatureCodeBlock(displayName, signature));
+  }
 
-    // Create property table if a list exists
-    if (list) {
-      elements.push(createPropertyTable(list));
-    }
+  // Create property table if a list exists
+  if (list) {
+    elements.push(createPropertyTable(list));
   }
 
   // Replace the list in the parent with all collected elements