fix(types,css): fix type parsing, and css headers

Author: avivkeller

src/generators/metadata/constants.mjs

@@ -6,8 +6,8 @@ import { remove } from 'unist-util-remove';
 import { selectAll } from 'unist-util-select';
 import { SKIP, visit } from 'unist-util-visit';
 
-import { createNodeSlugger } from './slugger.mjs';
 import createMetadata from '../../../metadata.mjs';
+import createNodeSlugger from '../../../utils/parser/slugger.mjs';
 import createQueries from '../../../utils/queries/index.mjs';
 import { getRemark } from '../../../utils/remark.mjs';
 

src/generators/metadata/utils/parse.mjs

@@ -29,7 +29,7 @@ main {
   }
 
   /* Change history positioning */
-  div:has(> h1, > h2, > h3, > h4) {
+  div:has(> h1, > h2, > h3, > h4, > h5, > h6) {
     display: flex;
     align-items: center;
     gap: 8px;

src/generators/metadata/utils/slugger.mjs

@@ -1,5 +1,15 @@
 'use strict';
 
+// These are string replacements specific to Node.js API docs for anchor IDs
+export const DOC_API_SLUGS_REPLACEMENTS = [
+  { from: /node.js/i, to: 'nodejs' }, // Replace Node.js
+  { from: /&/, to: '-and-' }, // Replace &
+  { from: /[/_,:;\\ ]/g, to: '-' }, // Replace /_,:;\. and whitespace
+  { from: /--+/g, to: '-' }, // Replace multiple hyphens with single
+  { from: /^-/, to: '' }, // Remove any leading hyphen
+  { from: /-$/, to: '' }, // Remove any trailing hyphen
+];
+
 // This is the base URL of the MDN Web documentation
 export const DOC_MDN_BASE_URL = 'https://developer.mozilla.org/en-US/docs/Web/';
 
@@ -94,6 +104,7 @@ export const DOC_TYPES_MAPPING_GLOBALS = {
       'WeakSet',
 
       'TypedArray',
+      'Float16Array',
       'Float32Array',
       'Float64Array',
       'Int8Array',
@@ -127,6 +138,7 @@ export const DOC_TYPES_MAPPING_NODE_MODULES = {
   AesGcmParams: 'webcrypto.html#class-aesgcmparams',
   AesKeyAlgorithm: 'webcrypto.html#class-aeskeyalgorithm',
   AesKeyGenParams: 'webcrypto.html#class-aeskeygenparams',
+  AesDerivedKeyParams: 'webcrypto.html#class-aesderivedkeyparams',
 
   Blob: 'buffer.html#class-blob',
   BroadcastChannel:
@@ -138,6 +150,8 @@ export const DOC_TYPES_MAPPING_NODE_MODULES = {
   Channel: 'diagnostics_channel.html#class-channel',
   ChildProcess: 'child_process.html#class-childprocess',
   Cipher: 'crypto.html#class-cipher',
+  Cipheriv: 'crypto.html#class-cipheriv',
+  Decipheriv: 'crypto.html#class-decipheriv',
   ClientHttp2Session: 'http2.html#class-clienthttp2session',
   ClientHttp2Stream: 'http2.html#class-clienthttp2stream',
 
@@ -191,6 +205,8 @@ export const DOC_TYPES_MAPPING_NODE_MODULES = {
   IntervalHistogram:
     'perf_hooks.html#class-intervalhistogram-extends-histogram',
 
+  LockManager: 'worker_threads.html#class-lockmanager',
+
   KeyAlgorithm: 'webcrypto.html#class-keyalgorithm',
   KeyObject: 'crypto.html#class-keyobject',
 
@@ -219,6 +235,10 @@ export const DOC_TYPES_MAPPING_NODE_MODULES = {
   ReadableStreamDefaultReader:
     'webstreams.html#class-readablestreamdefaultreader',
 
+  ModuleRequest: 'vm.html#type-modulerequest',
+
+  DatabaseSync: 'sqlite.html#class-databasesync',
+
   RecordableHistogram:
     'perf_hooks.html#class-recordablehistogram-extends-histogram',
 
@@ -233,6 +253,10 @@ export const DOC_TYPES_MAPPING_NODE_MODULES = {
 
   Sign: 'crypto.html#class-sign',
 
+  Disposable:
+    'https://tc39.es/proposal-explicit-resource-management/#sec-disposable-interface',
+
+  Session: 'sqlite.html#class-session',
   StatementSync: 'sqlite.html#class-statementsync',
 
   Stream: 'stream.html#stream',
@@ -273,71 +297,20 @@ export const DOC_TYPES_MAPPING_NODE_MODULES = {
 
   'brotli options': 'zlib.html#class-brotlioptions',
 
-  'cluster.Worker': 'cluster.html#class-worker',
-
-  'crypto.constants': 'crypto.html#cryptoconstants',
-
-  'dgram.Socket': 'dgram.html#class-dgramsocket',
-
-  'errors.Error': 'errors.html#class-error',
-
-  'fs.Dir': 'fs.html#class-fsdir',
-  'fs.Dirent': 'fs.html#class-fsdirent',
-  'fs.FSWatcher': 'fs.html#class-fsfswatcher',
-  'fs.ReadStream': 'fs.html#class-fsreadstream',
-  'fs.StatFs': 'fs.html#class-fsstatfs',
-  'fs.Stats': 'fs.html#class-fsstats',
-  'fs.StatWatcher': 'fs.html#class-fsstatwatcher',
-  'fs.WriteStream': 'fs.html#class-fswritestream',
-
-  'http.Agent': 'http.html#class-httpagent',
-  'http.ClientRequest': 'http.html#class-httpclientrequest',
-  'http.IncomingMessage': 'http.html#class-httpincomingmessage',
-  'http.OutgoingMessage': 'http.html#class-httpoutgoingmessage',
-  'http.Server': 'http.html#class-httpserver',
-  'http.ServerResponse': 'http.html#class-httpserverresponse',
-
-  'http2.Http2ServerRequest': 'http2.html#class-http2http2serverrequest',
-  'http2.Http2ServerResponse': 'http2.html#class-http2http2serverresponse',
-
   'import.meta': 'esm.html#importmeta',
 
-  'module.SourceMap': 'module.html#class-modulesourcemap',
-
-  'net.BlockList': 'net.html#class-netblocklist',
-  'net.Server': 'net.html#class-netserver',
-  'net.Socket': 'net.html#class-netsocket',
-  'net.SocketAddress': 'net.html#class-netsocketaddress',
-
   'os.constants.dlopen': 'os.html#dlopen-constants',
 
-  'readline.Interface': 'readline.html#class-readlineinterface',
-  'readline.InterfaceConstructor': 'readline.html#class-interfaceconstructor',
   'readlinePromises.Interface': 'readline.html#class-readlinepromisesinterface',
 
-  'repl.REPLServer': 'repl.html#class-replserver',
-
   require: 'modules.html#requireid',
-
-  'stream.Duplex': 'stream.html#class-streamduplex',
-  'stream.Readable': 'stream.html#class-streamreadable',
-  'stream.Transform': 'stream.html#class-streamtransform',
-  'stream.Writable': 'stream.html#class-streamwritable',
-
-  'tls.SecureContext': 'tls.html#tlscreatesecurecontextoptions',
-  'tls.Server': 'tls.html#class-tlsserver',
-  'tls.TLSSocket': 'tls.html#class-tlstlssocket',
-
-  'tty.ReadStream': 'tty.html#class-ttyreadstream',
-  'tty.WriteStream': 'tty.html#class-ttywritestream',
-
-  'vm.Module': 'vm.html#class-vmmodule',
-  'vm.Script': 'vm.html#class-vmscript',
-  'vm.SourceTextModule': 'vm.html#class-vmsourcetextmodule',
-  'vm.constants.USE_MAIN_CONTEXT_DEFAULT_LOADER':
-    'vm.html#vmconstantsuse_main_context_default_loader',
+  module: 'modules.html#the-module-object',
 
   'zlib options': 'zlib.html#class-options',
+  'zstd options': 'zlib.html#class-zstdoptions',
+
+  'HTTP/2 Headers Object': 'http2.html#headers-object',
+  'HTTP/2 Settings Object': 'http2.html#settings-object',
 };
 
 // This is a mapping for miscellaneous types within the Markdown content and their respective

src/generators/web/ui/index.css

@@ -12,6 +12,7 @@ import {
   DOC_TYPES_MAPPING_PRIMITIVES,
   DOC_MAN_BASE_URL,
 } from './constants.mjs';
+import { slug } from './slugger.mjs';
 import createQueries from '../queries/index.mjs';
 
 /**
@@ -103,6 +104,14 @@ export const transformTypeToReferenceLink = type => {
       return DOC_TYPES_MAPPING_NODE_MODULES[lookupPiece];
     }
 
+    // Transform Node.js types like 'vm.Something'.
+    if (lookupPiece.indexOf('.') >= 0) {
+      const [mod, ...pieces] = lookupPiece.split('.');
+      const isClass = pieces.at(-1).match(/^[A-Z][a-z]/);
+
+      return `${mod}.html#${isClass ? 'class-' : ''}${slug(lookupPiece)}`;
+    }
+
     return '';
   };
 

src/utils/parser/constants.mjs

@@ -0,0 +1,39 @@
+'use strict';
+
+import GitHubSlugger, { slug as defaultSlugFn } from 'github-slugger';
+
+import { DOC_API_SLUGS_REPLACEMENTS } from './constants.mjs';
+
+/**
+ * Creates a modified version of the GitHub Slugger
+ *
+ * @returns {InstanceType<typeof import('github-slugger').default>} The modified GitHub Slugger
+ */
+const createNodeSlugger = () => {
+  const slugger = new GitHubSlugger();
+  const slugFn = slugger.slug.bind(slugger);
+
+  return {
+    ...slugger,
+    /**
+     * Creates a new slug based on the provided string
+     *
+     * @param {string} title The title to be parsed into a slug
+     */
+    // Applies certain string replacements that are specific
+    // to the way how Node.js generates slugs/anchor IDs
+    slug: title => slug(title, slugFn),
+  };
+};
+
+/**
+ * @param {string} title
+ * @param {typeof defaultSlugFn} slugFn
+ */
+export const slug = (title, slugFn = defaultSlugFn) =>
+  DOC_API_SLUGS_REPLACEMENTS.reduce(
+    (piece, { from, to }) => piece.replace(from, to),
+    slugFn(title)
+  );
+
+export default createNodeSlugger;

src/utils/parser/index.mjs

@@ -197,11 +197,11 @@ createQueries.QUERIES = {
   // Fixes the references to Markdown pages into the API documentation
   markdownUrl: /^(?![+a-zA-Z]+:)([^#?]+)\.md(#.+)?$/,
   // ReGeX to match the {Type}<Type> (API type references)
-  // eslint-disable-next-line no-useless-escape
-  normalizeTypes: /(\{|<)(?! )[a-zA-Z0-9.| \[\]\\]+(?! )(\}|>)/g,
+
+  normalizeTypes: /(\{|<)(?! )[^<({})>]+(?! )(\}|>)/g,
   // ReGex to match the type API type references that got already parsed
   // so that they can be transformed into HTML links
-  linksWithTypes: /\[`<([a-zA-Z0-9.| \\[\]]+)>`\]\((\S+)\)/g,
+  linksWithTypes: /\[`<[^<({})>]>`\]\((\S+)\)/g,
   // ReGeX for handling Stability Indexes Metadata
   stabilityIndex: /^Stability: ([0-5](?:\.[0-3])?)(?:\s*-\s*)?(.*)$/s,
   // ReGeX for handling the Stability Index Prefix
@@ -291,17 +291,22 @@ createQueries.UNIST = {
       return true;
     }
 
-    // Check for direct type link pattern (starts with '<')
-    if (node.type === 'link' && node.children?.[0]?.value?.[0] === '<') {
+    // Check for direct type link pattern (starts with '<'), followed by a space
+    if (
+      node.type === 'link' &&
+      node.children?.[0]?.value?.[0] === '<' &&
+      node.children?.[1]?.value?.[0] === ''
+    ) {
       return true;
     }
 
-    // Check for inline code + space + type link pattern
+    // Check for inline code + space + type link + space pattern
     if (
       node.type === 'inlineCode' &&
       contentNodes[0]?.value.trim() === '' &&
       contentNodes[1]?.type === 'link' &&
-      contentNodes[1]?.children?.[0]?.value?.[0] === '<'
+      contentNodes[1]?.children?.[0]?.value?.[0] === '<' &&
+      contentNodes[2]?.value?.[0] === ' '
     ) {
       return true;
     }