@mui/internal-docs-infra 0.10.1-canary.1 → 0.10.1-canary.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-docs-infra",
-  "version": "0.10.1-canary.1",
+  "version": "0.10.1-canary.3",
   "author": "MUI Team",
   "description": "MUI Infra - internal documentation creation tools.",
   "license": "MIT",
@@ -643,5 +643,5 @@
   "bin": {
     "docs-infra": "./cli/index.mjs"
   },
-  "gitSha": "eb63c846936de0d8b339188c5191c2c524357cc7"
+  "gitSha": "cad4d117211040086fea5435a525d50f80a8cf34"
 }

package/pipeline/enhanceCodeEmphasis/enhanceCodeEmphasis.mjs

@@ -587,7 +587,11 @@ function calculateEmphasizedLines(directives, lineElements) {
         lineHighlight: directive.lineHighlight,
         focus: directive.focus,
         paddingFrameMaxSize: directive.paddingFrameMaxSize,
-        focusFramesMaxSize: directive.focusFramesMaxSize
+        focusFramesMaxSize: directive.focusFramesMaxSize,
+        // Treat a single `@highlight` as a containing highlight range of depth 1
+        // so that an outer multiline range wrapping this line is detected as
+        // nesting and promoted to `strong`.
+        containingRangeDepth: directive.lineHighlight ? 1 : undefined
       });
     } else if (directive.type === 'text') {
       // Text highlight - emphasize specific text(s) within the line.
@@ -640,7 +644,12 @@ function calculateEmphasizedLines(directives, lineElements) {
 
         // Determine position for this line in the current range
         let position;
-        if (line === startLine && line !== endLine) {
+        if (line === startLine && line === endLine) {
+          // A multiline range that resolves to a single content line (e.g.
+          // when comment-only lines are stripped) should be treated as a
+          // standalone single-line highlight.
+          position = 'single';
+        } else if (line === startLine && line !== endLine) {
           position = 'start';
         } else if (line === endLine && line !== startLine) {
           position = 'end';
@@ -651,13 +660,20 @@ function calculateEmphasizedLines(directives, lineElements) {
         // A focus range overlapping with a highlight is not nesting — it just
         // merges focus into the existing entry.
         const meta = existing ? {
-          // Nested highlight ranges are strong; focus+highlight overlap is not
-          strong: existing.lineHighlight && startDirective.lineHighlight && !existing.highlightTexts || existing.strong || strong,
+          // Nested highlight ranges are strong; focus+highlight overlap is not.
+          // Detect true nesting via `containingRangeDepth` rather than
+          // `existing.lineHighlight`. This works when the existing entry
+          // came from a `@highlight-text` directive on a line that's also
+          // wrapped in a highlight range — `existing.lineHighlight` is true
+          // after the first range merge, so a second wrapping range needs to
+          // see the depth to know nesting occurred.
+          strong: (existing.containingRangeDepth ?? 0) >= 1 && startDirective.lineHighlight || existing.strong || strong,
           description: existing.description ?? (line === startLine ? description : undefined),
           // Inner range position takes precedence, but 'single' from a standalone
           // @highlight-text should be replaced by the multiline range's position.
-          // Keep 'single' from regular @highlight (no highlightTexts).
-          position: existing.position && !(existing.position === 'single' && existing.highlightTexts) ? existing.position : position,
+          // Keep 'single' from a real @highlight (lineHighlight is set), even when
+          // the line also carries @highlight-text.
+          position: existing.position && !(existing.position === 'single' && existing.highlightTexts && !existing.lineHighlight) ? existing.position : position,
           highlightTexts: existing.highlightTexts,
           // Preserve text highlights from @highlight-text
           lineHighlight: existing.lineHighlight || startDirective.lineHighlight,
@@ -682,7 +698,10 @@ function calculateEmphasizedLines(directives, lineElements) {
           focus: startDirective.focus,
           paddingFrameMaxSize: startDirective.paddingFrameMaxSize,
           focusFramesMaxSize: startDirective.focusFramesMaxSize,
-          propagatedOverride: true
+          propagatedOverride: true,
+          // Track depth so a wrapping outer range can detect nesting
+          // (used by the `strong` calculation above).
+          containingRangeDepth: startDirective.lineHighlight ? 1 : undefined
         };
         emphasizedLines.set(line, meta);
       }

package/pipeline/loadServerTypesMeta/socketClient.d.mts

@@ -25,7 +25,9 @@ export declare function getLockPath(socketDir?: string): string;
 export declare function ensureSocketDir(socketDir?: string): Promise<void>;
 /**
  * Wait for the IPC endpoint to become available.
- * On Unix: Watches for the socket file to appear.
+ * On Unix: Polls the filesystem for the socket file to appear. We avoid
+ * `fs.watch` here because on macOS it does not reliably fire events when a
+ * unix domain socket file is created.
  * On Windows: Polls by attempting to connect to the named pipe.
  * @param socketDir - Optional custom directory for socket files (Unix only)
  * @param timeoutMs - Timeout in milliseconds (default: 5000)

package/pipeline/loadServerTypesMeta/socketClient.mjs

@@ -9,7 +9,6 @@
  */
 
 import { connect } from 'node:net';
-import { watch } from 'node:fs';
 import { mkdir, stat } from 'node:fs/promises';
 import { createHash } from 'node:crypto';
 import { tmpdir } from 'node:os';
@@ -128,57 +127,42 @@ function sleep(ms) {
 
 /**
  * Wait for the IPC endpoint to become available.
- * On Unix: Watches for the socket file to appear.
+ * On Unix: Polls the filesystem for the socket file to appear. We avoid
+ * `fs.watch` here because on macOS it does not reliably fire events when a
+ * unix domain socket file is created.
  * On Windows: Polls by attempting to connect to the named pipe.
  * @param socketDir - Optional custom directory for socket files (Unix only)
  * @param timeoutMs - Timeout in milliseconds (default: 5000)
  */
 export async function waitForSocketFile(socketDir, timeoutMs = 5000) {
   const socketPath = getSocketPath(socketDir);
+  const pollInterval = 50;
+  const startTime = Date.now();
   if (isWindows) {
-    // On Windows, named pipes don't create files - poll by trying to connect
-    const startTime = Date.now();
-    const pollInterval = 100; // ms
-
     while (Date.now() - startTime < timeoutMs) {
       // eslint-disable-next-line no-await-in-loop
       if (await tryConnectToPipe(socketPath)) {
         return;
       }
-
-      // Wait before next poll
       // eslint-disable-next-line no-await-in-loop
       await sleep(pollInterval);
     }
     throw new Error(`Named pipe did not become available within ${timeoutMs}ms`);
   }
 
-  // Unix: Check if socket file already exists
-  if (await fileExists(socketPath)) {
-    return;
-  }
-
-  // Ensure the directory exists before watching
-  const dir = getEffectiveSocketDir(socketDir);
-  await mkdir(dir, {
+  // Ensure the directory exists so the first stat doesn't fail spuriously
+  await mkdir(getEffectiveSocketDir(socketDir), {
     recursive: true
   });
-  await new Promise((resolve, reject) => {
-    let timer;
-
-    // Watch the directory for the socket file to appear
-    const watcher = watch(dir, (eventType, filename) => {
-      if (filename && (filename.includes('types.sock') || isWindows && filename.includes('types'))) {
-        clearTimeout(timer);
-        watcher.close();
-        resolve();
-      }
-    });
-    timer = setTimeout(() => {
-      watcher.close();
-      reject(new Error(`Socket file did not appear within ${timeoutMs}ms`));
-    }, timeoutMs);
-  });
+  while (Date.now() - startTime < timeoutMs) {
+    // eslint-disable-next-line no-await-in-loop
+    if (await fileExists(socketPath)) {
+      return;
+    }
+    // eslint-disable-next-line no-await-in-loop
+    await sleep(pollInterval);
+  }
+  throw new Error(`Socket file did not appear within ${timeoutMs}ms`);
 }
 
 // Store the release function globally so we can call it when needed