fix fonts, signatures

Author: avivkeller

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

@@ -35,8 +35,11 @@ export const parseListIntoProperties = node => {
     if (children[0].type === 'inlineCode') {
       name = children.shift().value.trimEnd();
     } else if (children[0].value && children[0].value.startsWith('Returns')) {
-      children.shift();
       name = 'Returns';
+      children[0].value = children[0].value.replace(/^Returns:?\s*/i, '');
+      if (!children[0].value.trim()) {
+        children.shift();
+      }
     }
 
     if (children[0]?.value?.trim() === '') {
@@ -129,57 +132,28 @@ export const createPropertyTable = (node, withHeading = true) => {
 };
 
 /**
- * Generates all valid function signatures based on optional parameters
+ * Generates the function signature based on optional parameters
  * @param {string} functionName - Name of the function
  * @param {import('../../legacy-json/types.d.ts').MethodSignature} signature - Signature object
  * @param {string} prefix - `'new '` or `''`
  */
-export const generateSignatures = (functionName, signature, prefix = '') => {
-  const { params, return: returnType } = signature;
+export const generateSignature = (
+  functionName,
+  { params, return: returnType },
+  prefix = ''
+) => {
   const returnStr = returnType ? `: ${returnType.type}` : '';
-
-  // Handle case with no optional parameters
-  const optionalParams = params.filter(param => param.optional);
-  if (!optionalParams.length) {
-    const paramsStr = params.map(param => param.name).join(', ');
-    return [`${prefix}${functionName}(${paramsStr})${returnStr}`];
-  }
-
-  // Find indexes of optional parameters
-  const optionalIndexes = params
-    .map((param, index) => (param.optional ? index : -1))
-    .filter(index => index !== -1);
-
-  // Generate all possible combinations of optional parameters
-  const signatures = [];
-  const totalCombinations = 1 << optionalIndexes.length; // 2^n using bitshift
-
-  for (let i = 0; i < totalCombinations; i++) {
-    const includedParams = params.filter((param, index) => {
-      // Always include required parameters
-      if (!param.optional) {
-        return true;
+  const paramsStr = params
+    .map(param => {
+      let paramStr = param.name;
+      if (param.optional || param.default) {
+        paramStr += '?';
       }
+      return paramStr;
+    })
+    .join(', ');
 
-      // For optional parameters, check if this combination includes it
-      const optionalIndex = optionalIndexes.indexOf(index);
-      return ((i >> optionalIndex) & 1) === 1;
-    });
-
-    const paramsStr = includedParams
-      .map(param => {
-        let paramStr = param.name;
-        if (param.optional || param.default) {
-          paramStr += '?';
-        }
-        return paramStr;
-      })
-      .join(', ');
-
-    signatures.push(`${prefix}${functionName}(${paramsStr})${returnStr}`);
-  }
-
-  return signatures;
+  return `${prefix}${functionName}(${paramsStr})${returnStr}`;
 };
 
 /**
@@ -189,9 +163,8 @@ export const generateSignatures = (functionName, signature, prefix = '') => {
  * @param {string} prefix - `'new '` or `''`
  */
 export const createSignatureCodeBlock = (functionName, signature, prefix) => {
-  const signatures = generateSignatures(functionName, signature, prefix);
-  const codeContent = signatures.join('\n');
-  const highlighted = highlightToHast(codeContent, 'typescript');
+  const sig = generateSignature(functionName, signature, prefix);
+  const highlighted = highlightToHast(sig, 'typescript');
   return createElement('div', { class: 'signature' }, [highlighted]);
 };
 

src/generators/web/template.html

@@ -5,15 +5,16 @@
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>{{title}}</title>
-  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-  <link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono&family=Open+Sans&display=swap" rel="stylesheet">
   <link rel="stylesheet" href="styles.css" />
 
-  <!-- Apply theme before paint to avoid FOUC (Flash of Unstyled Content) -->
-  <script>
-    document.documentElement.setAttribute('data-theme', localStorage.getItem('theme') ||
-      (matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'));
-  </script>
+  <link rel="preconnect" href="https://fonts.googleapis.com" />
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+
+  <link rel="stylesheet"
+    href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono&family=Open+Sans:ital,wght@0,300..800;1,300..800" />
+
+  <!-- Apply theme before paint to avoid Flash of Unstyled Content -->
+  <script>document.documentElement.setAttribute("data-theme",localStorage.getItem("theme")||(matchMedia("(prefers-color-scheme: dark)").matches?"dark":"light"));</script>
 </head>
 
 <body>

src/utils/queries/index.mjs

@@ -261,8 +261,8 @@ createQueries.UNIST = {
       return false;
     }
 
-    // Check for "Returns:" or "Returns" pattern
-    if (node.value?.trim() === 'Returns:' || node.value?.trim() === 'Returns') {
+    // Check for "Returns"
+    if (node.value?.trimStart().startsWith('Returns')) {
       return true;
     }