@mintlify/common 1.0.1116 → 1.0.1118

package/dist/mdx/plugins/remark/remarkUnwrapJsxHeadings.d.ts

@@ -1,6 +1,6 @@
 import type { Root } from 'mdast';
 /**
- * Unwraps paragraph children inside JSX heading elements (h1–h6).
+ * Unwraps paragraph children inside JSX heading elements (h1–h6 and `Heading`).
  *
  * The custom-ID preprocessor emits headings like `<h2 id="x">\nText\n</h2>`,
  * and MDX parses the text on its own line as a paragraph block. This plugin

package/dist/mdx/plugins/remark/remarkUnwrapJsxHeadings.js

@@ -1,7 +1,8 @@
 import { visit } from 'unist-util-visit';
 import { ALL_HEADING_NAMES } from '../../preprocessCustomHeadingIds.js';
+const UNWRAPPED_HEADING_NAMES = new Set([...ALL_HEADING_NAMES, 'Heading']);
 /**
- * Unwraps paragraph children inside JSX heading elements (h1–h6).
+ * Unwraps paragraph children inside JSX heading elements (h1–h6 and `Heading`).
  *
  * The custom-ID preprocessor emits headings like `<h2 id="x">\nText\n</h2>`,
  * and MDX parses the text on its own line as a paragraph block. This plugin
@@ -10,7 +11,7 @@ import { ALL_HEADING_NAMES } from '../../preprocessCustomHeadingIds.js';
 export const remarkUnwrapJsxHeadings = () => (tree) => {
     visit(tree, 'mdxJsxFlowElement', (node) => {
         var _a;
-        if (!ALL_HEADING_NAMES.includes((_a = node.name) !== null && _a !== void 0 ? _a : ''))
+        if (!UNWRAPPED_HEADING_NAMES.has((_a = node.name) !== null && _a !== void 0 ? _a : ''))
             return;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         node.children = node.children.flatMap((child) => child.type === 'paragraph' && 'children' in child ? child.children : [child]);

package/dist/mdx/snippets/resolveImport/resolveComponentWithContent.js

@@ -7,6 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { Parser } from 'acorn';
+import acornJsx from 'acorn-jsx';
 import { jsx, toJs } from 'estree-util-to-js';
 import { walk } from 'estree-walker';
 import { visit } from 'unist-util-visit';
@@ -81,13 +83,23 @@ const replaceVariablesWithProps = (node, treeToInject, exportMap, snippetExportM
         return uniqueName;
     };
     /**
-     * Rename every free identifier in an expression's estree to its unique name and
-     * regenerate the expression source from the estree so the two never disagree.
-     * (Replacing the first textual occurrence only — the previous behaviour — corrupted any
-     * expression that referenced the same prop twice, e.g. `a === "x" ? 1 : a === "y" ? 2 : 3`.)
+     * Rename every free identifier in an expression to its unique name.
+     *
+     * The renames are spliced into the expression's own source text by position, so everything
+     * else — parentheses, indentation, an inline `style={{ … }}` object, the markdown inside an
+     * `<MDX>` fragment — stays byte-for-byte as the author wrote it. Regenerating the text from the
+     * estree instead pretty-prints nested objects across several lines at column 0, which turns into
+     * lazy lines inside a list once an `<MDX>` fragment is re-parsed as markdown. The source is
+     * re-parsed with acorn because the mdast estree carries document offsets while `value` has its
+     * per-line indent stripped, so the two no longer line up.
+     *
+     * The estree is renamed in place as well so it never disagrees with the text. Only when the text
+     * cannot be parsed on its own is it regenerated from the estree (the previous behaviour).
+     * Replacing the first textual occurrence only — the behaviour before that — corrupted any
+     * expression that referenced the same prop twice, e.g. `a === "x" ? 1 : a === "y" ? 2 : 3`.
      */
     const renamed = new WeakSet();
-    const scopeIdentifiers = (estree) => {
+    const renameIdentifiers = (estree, edits) => {
         walk(estree, {
             enter(jsNode, parent) {
                 if (jsNode.type !== 'Identifier')
@@ -102,20 +114,29 @@ const replaceVariablesWithProps = (node, treeToInject, exportMap, snippetExportM
                 // `obj.prop` and `{ key: value }` — the property name is not a variable reference
                 if ((parent === null || parent === void 0 ? void 0 : parent.type) === 'MemberExpression' && parent.property === jsNode && !parent.computed)
                     return;
+                if ((parent === null || parent === void 0 ? void 0 : parent.type) === 'Property' && parent.shorthand && parent.value === jsNode)
+                    return;
                 if ((parent === null || parent === void 0 ? void 0 : parent.type) === 'Property' && parent.key === jsNode && !parent.computed) {
                     if (!parent.shorthand)
                         return;
                     // `{ prop }` → `{ prop: prop_0 }`
+                    const uniqueName = getUniqueName(jsNode.name);
+                    edits === null || edits === void 0 ? void 0 : edits.push(Object.assign(Object.assign({}, positionOf(jsNode)), { text: `${jsNode.name}: ${uniqueName}` }));
                     parent.shorthand = false;
-                    const value = Object.assign(Object.assign({}, jsNode), { name: getUniqueName(jsNode.name) });
+                    const value = Object.assign(Object.assign({}, jsNode), { name: uniqueName });
                     renamed.add(value);
                     parent.value = value;
                     return;
                 }
-                jsNode.name = getUniqueName(jsNode.name);
+                const uniqueName = getUniqueName(jsNode.name);
+                edits === null || edits === void 0 ? void 0 : edits.push(Object.assign(Object.assign({}, positionOf(jsNode)), { text: uniqueName }));
+                jsNode.name = uniqueName;
                 renamed.add(jsNode);
             },
         });
+    };
+    const scopeIdentifiers = (estree) => {
+        renameIdentifiers(estree);
         return generate(estree);
     };
     const scopeSpreadAttribute = (estree) => {
@@ -123,24 +144,39 @@ const replaceVariablesWithProps = (node, treeToInject, exportMap, snippetExportM
         const spread = getSpreadElement(estree);
         return spread ? `...${generate(toProgram(spread.argument))}` : generate(estree);
     };
+    /** `{value}` of an expression or attribute; `...rest` of a spread attribute when `spread`. */
+    const scopeSource = (source, estree, spread = false) => {
+        const text = spread ? `{${source}}` : source;
+        const parsed = parseExpression(text);
+        if (!parsed)
+            return spread ? scopeSpreadAttribute(estree) : scopeIdentifiers(estree);
+        const edits = [];
+        renameIdentifiers(parsed, edits);
+        renameIdentifiers(estree);
+        let result = text;
+        for (const edit of edits.sort((a, b) => b.start - a.start)) {
+            result = result.slice(0, edit.start) + edit.text + result.slice(edit.end);
+        }
+        return spread ? result.slice(1, -1) : result;
+    };
     visit(treeToInject, (node) => {
         var _a, _b, _c;
         if ((node.type === 'mdxTextExpression' || node.type === 'mdxFlowExpression') &&
             ((_a = node.data) === null || _a === void 0 ? void 0 : _a.estree)) {
-            node.value = scopeIdentifiers(node.data.estree);
+            node.value = scopeSource(node.value, node.data.estree);
             return;
         }
         // props referenced inside JSX attributes of the snippet, e.g. `<Card title={variant === "x" ? "a" : "b"}>`
         if (node.type === 'mdxJsxFlowElement' || node.type === 'mdxJsxTextElement') {
             for (const attribute of node.attributes) {
                 if (attribute.type === 'mdxJsxExpressionAttribute' && ((_b = attribute.data) === null || _b === void 0 ? void 0 : _b.estree)) {
-                    attribute.value = scopeSpreadAttribute(attribute.data.estree);
+                    attribute.value = scopeSource(attribute.value, attribute.data.estree, true);
                 }
                 else if (attribute.type === 'mdxJsxAttribute' &&
                     attribute.value &&
                     typeof attribute.value === 'object' &&
                     ((_c = attribute.value.data) === null || _c === void 0 ? void 0 : _c.estree)) {
-                    attribute.value.value = scopeIdentifiers(attribute.value.data.estree);
+                    attribute.value.value = scopeSource(attribute.value.value, attribute.value.data.estree);
                 }
             }
         }
@@ -170,6 +206,30 @@ const replaceVariablesWithProps = (node, treeToInject, exportMap, snippetExportM
     };
 };
 const generate = (estree) => toJs(estree, { handlers: jsx }).value.replace(/;\s*$/, '');
+const JSXParser = Parser.extend(acornJsx());
+/**
+ * Parse `text` as a single expression; undefined when it is not one on its own. `preserveParens`
+ * so `( … )` around the whole expression — common when a snippet wraps a ternary in `{( … )}` —
+ * yields a node spanning the entire text; without it acorn returns the inner expression, whose
+ * `end` stops before the closing `)`, and the text would wrongly be treated as unparseable.
+ */
+const parseExpression = (text) => {
+    try {
+        const expression = JSXParser.parseExpressionAt(text, 0, {
+            ecmaVersion: 'latest',
+            sourceType: 'module',
+            preserveParens: true,
+        });
+        return text.slice(expression.end).trim() === '' ? expression : undefined;
+    }
+    catch (_a) {
+        return undefined;
+    }
+};
+const positionOf = (node) => {
+    const { start, end } = node;
+    return { start, end };
+};
 const toProgram = (expression) => ({
     type: 'Program',
     sourceType: 'module',