@mintlify/common 1.0.1218 → 1.0.1220

package/dist/mdx/snippets/findAndRemoveImports.js

@@ -12,6 +12,7 @@ import { remove } from 'unist-util-remove';
 import { removePosition } from 'unist-util-remove-position';
 import { MdxImportSpecifier } from '../../types/mdx/index.js';
 import { isMdxJsEsm, estreeIsProgram, isImportDeclaration } from '../utils.js';
+import { importedExportName } from './importedExportName.js';
 /**
   An import like "import {Chart} from './chart.mdx'" looks like this in the AST:
   {
@@ -52,11 +53,11 @@ export const findAndRemoveImports = (tree) => __awaiter(void 0, void 0, void 0,
                     const importDeclaration = {
                         source: bodyChild.source.value,
                         specifiers: bodyChild.specifiers.map((specifier) => {
-                            const isRenamedImportSpecifier = specifier.type === 'ImportSpecifier' &&
-                                specifier.imported.name != specifier.local.name;
+                            const imported = specifier.type === 'ImportSpecifier' ? importedExportName(specifier) : undefined;
+                            const isRenamedImportSpecifier = imported !== undefined && imported != specifier.local.name;
                             return Object.assign({ type: isRenamedImportSpecifier
                                     ? MdxImportSpecifier.RenamedImportSpecifier
-                                    : specifier.type, name: isRenamedImportSpecifier ? specifier.imported.name : specifier.local.name }, (isRenamedImportSpecifier && {
+                                    : specifier.type, name: isRenamedImportSpecifier ? imported : specifier.local.name }, (isRenamedImportSpecifier && {
                                 renamedName: specifier.local.name,
                             }));
                         }),

package/dist/mdx/snippets/getExportMap.js

@@ -1,5 +1,6 @@
 import { jsx, toJs } from 'estree-util-to-js';
 import { visit } from 'unist-util-visit';
+import { moduleExportName } from './importedExportName.js';
 import { nodeIncludesExport } from './nodeIncludesExport.js';
 import { addExportPrefix } from './resolveImport/addExportPrefix.js';
 /**
@@ -37,7 +38,7 @@ export const getExportMapFromTree = (tree) => {
             if (bodyChild.type === 'ExportNamedDeclaration' && bodyChild.specifiers.length > 0) {
                 for (const specifier of bodyChild.specifiers) {
                     const localName = specifier.local.name;
-                    const exportedName = specifier.exported.name;
+                    const exportedName = moduleExportName(specifier.exported);
                     // Find the original declaration
                     const originalDeclaration = findDeclarationInTree(localName, node);
                     if (originalDeclaration) {

package/dist/mdx/snippets/importedExportName.d.ts

@@ -0,0 +1,4 @@
+import type { Identifier, ImportSpecifier, Literal } from 'estree-jsx';
+export declare const moduleExportName: (node: Identifier | Literal) => string;
+export declare const isIdentifierName: (name: string) => boolean;
+export declare const importedExportName: (specifier: ImportSpecifier) => string;

package/dist/mdx/snippets/importedExportName.js

@@ -0,0 +1,3 @@
+export const moduleExportName = (node) => node.type === 'Identifier' ? node.name : String(node.value);
+export const isIdentifierName = (name) => /^[\p{ID_Start}$_][\p{ID_Continue}$\u200C\u200D]*$/u.test(name);
+export const importedExportName = (specifier) => moduleExportName(specifier.imported);

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

@@ -1,5 +1,7 @@
 import { jsx, toJs } from 'estree-util-to-js';
+import { walk } from 'estree-walker';
 import { visit, EXIT } from 'unist-util-visit';
+import { isIdentifierName, moduleExportName } from '../importedExportName.js';
 import { nodeIncludesExport } from '../nodeIncludesExport.js';
 import { addExportPrefix } from './addExportPrefix.js';
 /**
@@ -29,13 +31,17 @@ export const findExport = (exportName, tree, renamedExportName) => {
             // handle `export { name }`
             if (bodyChild.type === 'ExportNamedDeclaration' && bodyChild.specifiers.length > 0) {
                 for (const specifier of bodyChild.specifiers) {
-                    if (specifier.exported.name === exportName) {
+                    if (moduleExportName(specifier.exported) === exportName) {
                         const localName = specifier.local.name;
                         const originalDeclaration = findDeclarationInTree(localName, node);
                         if (originalDeclaration) {
                             const isolatedExport = structuredClone(originalDeclaration);
-                            if (renamedExportName) {
-                                renameInDeclaration(isolatedExport, localName, renamedExportName);
+                            const declaredName = renamedExportName !== null && renamedExportName !== void 0 ? renamedExportName : (isIdentifierName(exportName) &&
+                                isSafeToRename(isolatedExport, localName, exportName)
+                                ? exportName
+                                : localName);
+                            if (declaredName !== localName) {
+                                renameInDeclaration(isolatedExport, localName, declaredName);
                             }
                             const wrappedNode = structuredClone(node);
                             wrappedNode.data.estree.body = [isolatedExport];
@@ -120,3 +126,24 @@ function renameInDeclaration(declaration, oldName, newName) {
         declaration.id.name = newName;
     }
 }
+// Renaming only the declared id is safe only when nothing else in the statement mentions either name.
+function isSafeToRename(declaration, from, to) {
+    var _a;
+    if (declaration.type === 'VariableDeclaration' &&
+        (declaration.declarations.length !== 1 || ((_a = declaration.declarations[0]) === null || _a === void 0 ? void 0 : _a.id.type) !== 'Identifier')) {
+        return false;
+    }
+    let fromCount = 0;
+    let toCount = 0;
+    walk(declaration, {
+        enter(node) {
+            if (node.type === 'Identifier' || node.type === 'JSXIdentifier') {
+                if (node.name === from)
+                    fromCount += 1;
+                if (node.name === to)
+                    toCount += 1;
+            }
+        },
+    });
+    return fromCount === 1 && toCount === 0;
+}