fixup!

Author: avivkeller

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

@@ -229,7 +229,7 @@ export const processEntry = (entry, remark) => {
   // Transform typed lists into property tables
   visit(
     content,
-    createQueries.UNIST.isTypedList,
+    createQueries.UNIST.isStronglyTypedList,
     (node, idx, parent) => (parent.children[idx] = createPropertyTable(node))
   );
 

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

@@ -124,7 +124,7 @@ export const parseListIntoProperties = node => {
 
     // Clean up leading whitespace in remaining description
     if (children[0]?.type === 'text') {
-      children[0].value = children[0].value.trimStart();
+      children[0].value = children[0].value.replace(/^[\s:]+/, '');
     }
 
     properties.push({
@@ -133,7 +133,7 @@ export const parseListIntoProperties = node => {
       // The remaining children are the description
       desc: children,
       // Is there a list within this list?
-      sublist: sublists.find(createQueries.UNIST.isTypedList),
+      sublist: sublists.find(createQueries.UNIST.isLooselyTypedList),
     });
   }
 

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

@@ -89,7 +89,7 @@ export const getFullName = ({ name, text }, fallback = name) => {
  */
 export default ({ children }, { data }, idx) => {
   // Try to locate the parameter list immediately following the heading
-  const listIdx = children.findIndex(createQueries.UNIST.isTypedList);
+  const listIdx = children.findIndex(createQueries.UNIST.isStronglyTypedList);
 
   // Parse parameters from the list, if found
   const params =

src/generators/legacy-json/utils/buildSection.mjs

@@ -53,7 +53,7 @@ export const createSectionBuilder = () => {
 
     meta.changes = changes;
 
-    if (n_api_version?.length) {
+    if (typeof n_api_version === 'number' || n_api_version?.length) {
       meta.napiVersion = enforceArray(n_api_version);
     }
 

src/generators/legacy-json/utils/parseList.mjs

@@ -47,7 +47,7 @@ export const extractPattern = (text, pattern, key, current) => {
 export function parseListItem(child) {
   const current = {};
 
-  const subList = child.children.find(createQueries.UNIST.isTypedList);
+  const subList = child.children.find(createQueries.UNIST.isLooselyTypedList);
 
   // Extract and clean raw text from the node, excluding nested lists
   current.textRaw = transformTypeReferences(
@@ -89,7 +89,7 @@ export function parseListItem(child) {
  * @param {import('@types/mdast').RootContent[]} nodes
  */
 export function parseList(section, nodes) {
-  const listIdx = nodes.findIndex(createQueries.UNIST.isTypedList);
+  const listIdx = nodes.findIndex(createQueries.UNIST.isStronglyTypedList);
   const list = nodes[listIdx];
 
   const values = list ? list.children.map(parseListItem) : [];

src/utils/parser/constants.mjs

@@ -50,7 +50,7 @@ export const DOC_API_HEADING_TYPES = [
       'i'
     ),
   },
-  { type: 'event', regex: /^Event: +`'?([^']+)'`$/i },
+  { type: 'event', regex: /^Event: +`'?([^`]*?)'?`$/i },
   {
     type: 'class',
     regex: new RegExp(

src/utils/queries/constants.mjs

@@ -4,4 +4,4 @@
 export const DOC_API_STABILITY_SECTION_REF_URL =
   'documentation.html#stability-index';
 
-export const VALID_JAVASCRIPT_PROPERTY = /^[.a-z0-9$_]+$/i;
+export const VALID_JAVASCRIPT_PROPERTY = /^[.a-z0-9$_'-]+$/i;

src/utils/queries/index.mjs

@@ -3,10 +3,7 @@
 import { u as createTree } from 'unist-builder';
 import { SKIP } from 'unist-util-visit';
 
-import {
-  DOC_API_STABILITY_SECTION_REF_URL,
-  VALID_JAVASCRIPT_PROPERTY,
-} from './constants.mjs';
+import { DOC_API_STABILITY_SECTION_REF_URL } from './constants.mjs';
 import {
   extractYamlContent,
   parseHeadingIntoMetadata,
@@ -16,6 +13,7 @@ import {
 } from '../parser/index.mjs';
 import { getRemark } from '../remark.mjs';
 import { transformNodesToString } from '../unist.mjs';
+import { isTypedList } from './utils.mjs';
 
 /**
  * Creates an instance of the Query Manager, which allows to do multiple sort
@@ -272,46 +270,28 @@ createQueries.UNIST = {
    * @param {import('@types/mdast').List} list
    * @returns {boolean}
    */
-  isTypedList: list => {
-    // Exit early if not a list node
-    if (list.type !== 'list') {
-      return false;
-    }
-
-    // Get the content nodes of the first list item's paragraph
-    const [node, ...contentNodes] =
-      list?.children?.[0]?.children?.[0]?.children ?? [];
-
-    // Exit if no node
-    if (!node) {
-      return false;
-    }
-
-    const possibleProperty = node?.value?.trimStart();
-
-    // Check for other starters
-    if (possibleProperty?.match(createQueries.QUERIES.typedListStarters)) {
-      return true;
-    }
+  isLooselyTypedList: list => Boolean(isTypedList(list)),
 
-    // Check for direct type link pattern (starts with '<')
-    if (node.type === 'link' && node.children?.[0]?.value?.[0] === '<') {
-      return true;
-    }
-
-    // Check for inline code + space + type link pattern
-    if (
-      node.type === 'inlineCode' &&
-      possibleProperty?.match(VALID_JAVASCRIPT_PROPERTY) &&
-      contentNodes[0]?.value?.trim() === '' &&
-      contentNodes[1]?.type === 'link' &&
-      contentNodes[1]?.children?.[0]?.value?.[0] === '<'
-    ) {
-      return true;
+  /**
+   * @param {import('@types/mdast').List} list
+   * @returns {boolean}
+   */
+  isStronglyTypedList: list => {
+    const confidence = isTypedList(list);
+
+    if (confidence === 1) {
+      // This is a loosely typed list, but we can still check if it is strongly typed.
+      const [, secondNode, thirdNode] =
+        list.children?.[0]?.children?.[0]?.children ?? [];
+
+      return (
+        secondNode?.value?.trim() === '' &&
+        thirdNode?.type === 'link' &&
+        thirdNode?.children?.[0]?.value?.[0] === '<'
+      );
     }
 
-    // Not a typed list
-    return false;
+    return Boolean(confidence);
   },
 };
 

src/utils/queries/utils.mjs

@@ -0,0 +1,48 @@
+import { VALID_JAVASCRIPT_PROPERTY } from './constants.mjs';
+import createQueries from './index.mjs';
+
+/**
+ * @param {import('@types/mdast').List} list
+ * @returns {0 | 1 | 2} confidence
+ *
+ * 0: This is not a typed list
+ * 1: This is a loosely typed list
+ * 2: This is a strongly typed list
+ */
+export const isTypedList = list => {
+  if (!list || list.type !== 'list') {
+    return 0;
+  }
+
+  const firstNode = list.children?.[0]?.children?.[0]?.children[0];
+
+  if (!firstNode) {
+    return 0;
+  }
+
+  const value = firstNode?.value?.trimStart();
+
+  // Typed list starters (strong signal)
+  if (value && createQueries.QUERIES.typedListStarters.test(value)) {
+    return 2;
+  }
+
+  // Direct type link: <Type>
+  if (
+    firstNode.type === 'link' &&
+    firstNode.children?.[0]?.value?.startsWith('<')
+  ) {
+    return 2;
+  }
+
+  // inlineCode + space (weaker signal)
+  if (
+    firstNode.type === 'inlineCode' &&
+    value &&
+    VALID_JAVASCRIPT_PROPERTY.test(value)
+  ) {
+    return 1;
+  }
+
+  return 0;
+};