@mintlify/cli 4.0.1448 → 4.0.1450

package/bin/vendor/converter.js

@@ -997,6 +997,109 @@ function partitionAttrs(parsed, known, consumed = []) {
   return result;
 }
 
+// ../editor/dist/converter/parse/parse-utils.js
+import { parse as parseYaml } from "yaml";
+function extractFrontmatter(mdast) {
+  const yamlNode = mdast.children.find((n) => n.type === "yaml");
+  if (!yamlNode || !("value" in yamlNode))
+    return {};
+  try {
+    const parsed = parseYaml(yamlNode.value);
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+      return parsed;
+    }
+  } catch (_a) {
+  }
+  return {};
+}
+function createTextNode(value, marks2 = []) {
+  if (!value)
+    return { type: "text", text: "" };
+  return Object.assign({ type: "text", text: value }, marks2.length > 0 && { marks: marks2 });
+}
+function extractTextFromNode(node) {
+  if (!node)
+    return { text: "", marks: [] };
+  if (node.type === "text" || node.type === "inlineCode") {
+    return { text: ("value" in node ? node.value : "") || "", marks: getMarks(node) };
+  }
+  if ("children" in node && Array.isArray(node.children)) {
+    let text = "";
+    const marks2 = getMarks(node);
+    for (const child of node.children) {
+      const { text: childText, marks: childMarks } = extractTextFromNode(child);
+      text += childText;
+      marks2.push(...childMarks);
+    }
+    return { text, marks: marks2 };
+  }
+  return { text: "", marks: [] };
+}
+function getMarks(node) {
+  const marks2 = [];
+  if (!node)
+    return marks2;
+  switch (node.type) {
+    case "link":
+      marks2.push({
+        type: "link",
+        attrs: {
+          href: node.url,
+          title: node.title || void 0
+        }
+      });
+      break;
+    case "inlineCode":
+      marks2.push({ type: "code" });
+      break;
+    case "emphasis":
+      marks2.push({ type: "italic" });
+      break;
+    case "strong":
+      marks2.push({ type: "bold" });
+      break;
+    case "delete":
+      marks2.push({ type: "strike" });
+      break;
+    case "mdxJsxTextElement":
+      if (node.name === "u")
+        marks2.push({ type: "underline" });
+      else if (node.name === "sub")
+        marks2.push({ type: "subscript" });
+      else if (node.name === "sup")
+        marks2.push({ type: "superscript" });
+      break;
+  }
+  return marks2;
+}
+function isInlineNode(node, schema2) {
+  var _a;
+  return ((_a = schema2.nodes[node.type]) === null || _a === void 0 ? void 0 : _a.isInline) === true;
+}
+function normalizeBlockContent(nodes2, schema2) {
+  const normalized = [];
+  let pendingInlineContent = [];
+  const flushPendingInlineContent = () => {
+    if (pendingInlineContent.length === 0)
+      return;
+    normalized.push({
+      type: "paragraph",
+      content: pendingInlineContent
+    });
+    pendingInlineContent = [];
+  };
+  for (const node of nodes2) {
+    if (isInlineNode(node, schema2)) {
+      pendingInlineContent.push(node);
+      continue;
+    }
+    flushPendingInlineContent();
+    normalized.push(node);
+  }
+  flushPendingInlineContent();
+  return normalized;
+}
+
 // ../editor/dist/converter/parse/handlers/callout.js
 var CALLOUT_NON_TYPE_ATTRS = CALLOUT_ATTRS.filter((d) => d.name !== "type");
 function canonicalCalloutType(value) {
@@ -1240,109 +1343,6 @@ function mdxToMdast(mdx, options = {
   return parser().parse(preprocessCustomHeadingIds(sanitized, { preserveOriginal: true }));
 }
 
-// ../editor/dist/converter/parse/parse-utils.js
-import { parse as parseYaml } from "yaml";
-function extractFrontmatter(mdast) {
-  const yamlNode = mdast.children.find((n) => n.type === "yaml");
-  if (!yamlNode || !("value" in yamlNode))
-    return {};
-  try {
-    const parsed = parseYaml(yamlNode.value);
-    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-      return parsed;
-    }
-  } catch (_a) {
-  }
-  return {};
-}
-function createTextNode(value, marks2 = []) {
-  if (!value)
-    return { type: "text", text: "" };
-  return Object.assign({ type: "text", text: value }, marks2.length > 0 && { marks: marks2 });
-}
-function extractTextFromNode(node) {
-  if (!node)
-    return { text: "", marks: [] };
-  if (node.type === "text" || node.type === "inlineCode") {
-    return { text: ("value" in node ? node.value : "") || "", marks: getMarks(node) };
-  }
-  if ("children" in node && Array.isArray(node.children)) {
-    let text = "";
-    const marks2 = getMarks(node);
-    for (const child of node.children) {
-      const { text: childText, marks: childMarks } = extractTextFromNode(child);
-      text += childText;
-      marks2.push(...childMarks);
-    }
-    return { text, marks: marks2 };
-  }
-  return { text: "", marks: [] };
-}
-function getMarks(node) {
-  const marks2 = [];
-  if (!node)
-    return marks2;
-  switch (node.type) {
-    case "link":
-      marks2.push({
-        type: "link",
-        attrs: {
-          href: node.url,
-          title: node.title || void 0
-        }
-      });
-      break;
-    case "inlineCode":
-      marks2.push({ type: "code" });
-      break;
-    case "emphasis":
-      marks2.push({ type: "italic" });
-      break;
-    case "strong":
-      marks2.push({ type: "bold" });
-      break;
-    case "delete":
-      marks2.push({ type: "strike" });
-      break;
-    case "mdxJsxTextElement":
-      if (node.name === "u")
-        marks2.push({ type: "underline" });
-      else if (node.name === "sub")
-        marks2.push({ type: "subscript" });
-      else if (node.name === "sup")
-        marks2.push({ type: "superscript" });
-      break;
-  }
-  return marks2;
-}
-function isInlineNode(node, schema2) {
-  var _a;
-  return ((_a = schema2.nodes[node.type]) === null || _a === void 0 ? void 0 : _a.isInline) === true;
-}
-function normalizeBlockContent(nodes2, schema2) {
-  const normalized = [];
-  let pendingInlineContent = [];
-  const flushPendingInlineContent = () => {
-    if (pendingInlineContent.length === 0)
-      return;
-    normalized.push({
-      type: "paragraph",
-      content: pendingInlineContent
-    });
-    pendingInlineContent = [];
-  };
-  for (const node of nodes2) {
-    if (isInlineNode(node, schema2)) {
-      pendingInlineContent.push(node);
-      continue;
-    }
-    flushPendingInlineContent();
-    normalized.push(node);
-  }
-  flushPendingInlineContent();
-  return normalized;
-}
-
 // ../editor/dist/converter/parse/handlers/prompt.js
 function handlePrompt(node, ctx, transformNode2) {
   var _a;
@@ -1596,7 +1596,7 @@ function handleFlowJsxInner(node, ctx, transformNode2, mapJsxChildren2) {
   if (node.name === BLOCK_TYPES.tree) {
     return handleTree(node);
   }
-  if (isCallout || Object.values(BLOCK_TYPES).includes(node.name)) {
+  if (isCallout || node.name !== BLOCK_TYPES.step && Object.values(BLOCK_TYPES).includes(node.name)) {
     const targetType = isCallout ? BLOCK_TYPES.callout : node.name;
     const parsedAttrs = parseMdxAttributes(node.attributes);
     return {
@@ -1888,15 +1888,6 @@ function handleHtmlTable(node, ctx, transformNode2, mapJsxChildren2) {
   });
   return { type: "table", content: tableContent };
 }
-var TABLE_BLOCK_NODE_TYPES = /* @__PURE__ */ new Set([
-  "paragraph",
-  "heading",
-  "bulletList",
-  "orderedList",
-  "blockquote",
-  BLOCK_TYPES.codeBlock,
-  "table"
-]);
 function flattenPmContent(content) {
   return Array.isArray(content) ? content.filter(Boolean) : [content];
 }
@@ -1925,14 +1916,7 @@ function convertHtmlTableCellChildren(cell, ctx, transformNode2, mapJsxChildren2
   const result = [];
   for (const child of cell.children) {
     if (child.type !== "mdxJsxFlowElement" && child.type !== "mdxJsxTextElement") {
-      const items = flattenPmContent(transformNode2(child, ctx));
-      if (items.length > 0) {
-        if (items.length === 1 && ((_a = items[0]) === null || _a === void 0 ? void 0 : _a.type) && TABLE_BLOCK_NODE_TYPES.has(items[0].type)) {
-          result.push(items[0]);
-        } else {
-          result.push({ type: "paragraph", content: items });
-        }
-      }
+      result.push(...flattenPmContent(transformNode2(child, ctx)));
       continue;
     }
     if (child.name === "p") {
@@ -1943,11 +1927,11 @@ function convertHtmlTableCellChildren(cell, ctx, transformNode2, mapJsxChildren2
       continue;
     }
     if (child.name && /^h[1-6]$/.test(child.name)) {
-      const level = parseInt((_b = child.name[1]) !== null && _b !== void 0 ? _b : "1", 10);
+      const level = parseInt((_a = child.name[1]) !== null && _a !== void 0 ? _a : "1", 10);
       const headingAttrs = parseMdxAttributes(child.attributes);
       result.push({
         type: "heading",
-        attrs: { level, id: (_c = headingAttrs.id) !== null && _c !== void 0 ? _c : null },
+        attrs: { level, id: (_b = headingAttrs.id) !== null && _b !== void 0 ? _b : null },
         content: mapTableJsxElementChildren(child, ctx, transformNode2, mapJsxChildren2)
       });
       continue;
@@ -1972,7 +1956,7 @@ function convertHtmlTableCellChildren(cell, ctx, transformNode2, mapJsxChildren2
     }
     result.push(...flattenPmContent(transformNode2(child, ctx)));
   }
-  return result;
+  return normalizeBlockContent(result, (_c = ctx.schema) !== null && _c !== void 0 ? _c : mintlifySchema);
 }
 function mapTableJsxElementChildren(node, ctx, transformNode2, mapJsxChildren2) {
   if (node.type === "mdxJsxFlowElement") {
@@ -1986,7 +1970,7 @@ function mapTableJsxElementChildren(node, ctx, transformNode2, mapJsxChildren2)
 
 // ../editor/dist/converter/parse/handlers/inline-jsx.js
 function handleInlineJsx(node, ctx, mapChildren2) {
-  var _a;
+  var _a, _b;
   if (node.name === "Tooltip") {
     const attrs2 = partitionAttrs(parseMdxAttributes(node.attributes), TOOLTIP_ATTRS);
     const content = mapChildren2(node, ctx);
@@ -2049,14 +2033,17 @@ function handleInlineJsx(node, ctx, mapChildren2) {
     };
   }
   if (node.name && HTML_ELEMENTS.has(node.name)) {
+    const schema2 = (_b = ctx.schema) !== null && _b !== void 0 ? _b : mintlifySchema;
+    const children = mapChildren2(node, ctx);
+    const hasBlock = children.some((child) => !isInlineNode(child, schema2));
     return {
-      type: BLOCK_TYPES.inlineStaticHTML,
+      type: hasBlock ? BLOCK_TYPES.staticHTML : BLOCK_TYPES.inlineStaticHTML,
       attrs: {
         tagName: node.name,
         attributes: parseMdxAttributes(node.attributes),
         mdxJsxNode: node
       },
-      content: mapChildren2(node, ctx)
+      content: hasBlock ? normalizeBlockContent(children, schema2) : children
     };
   }
   if (node.name) {
@@ -2384,14 +2371,14 @@ function buildMarkdownTableCellContent(children, ctx, transformNode2) {
   return children.flatMap((child) => flattenNodeContent(transformNode2(child, ctx)));
 }
 function handleParagraph(node, ctx, transformNode2, mapChildren2) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   if (node.children.length === 1 && ((_a = node.children[0]) === null || _a === void 0 ? void 0 : _a.type) === "mdxJsxTextElement" && ((_b = node.children[0]) === null || _b === void 0 ? void 0 : _b.name)) {
     const result = transformNode2(node.children[0], ctx);
     const nodes2 = flattenNodeContent(result);
-    const schema2 = (_c = ctx.schema) !== null && _c !== void 0 ? _c : mintlifySchema;
+    const schema3 = (_c = ctx.schema) !== null && _c !== void 0 ? _c : mintlifySchema;
     const allInline = nodes2.length > 0 && nodes2.every((child) => {
       var _a2;
-      return ((_a2 = schema2.nodes[child.type]) === null || _a2 === void 0 ? void 0 : _a2.isInline) === true;
+      return ((_a2 = schema3.nodes[child.type]) === null || _a2 === void 0 ? void 0 : _a2.isInline) === true;
     });
     if (allInline) {
       return { type: "paragraph", content: nodes2 };
@@ -2402,22 +2389,22 @@ function handleParagraph(node, ctx, transformNode2, mapChildren2) {
   if (hasImages) {
     const hasTextContent = node.children.some((child) => child.type === "text" || child.type === "emphasis" || child.type === "strong" || child.type === "link" || child.type === "inlineCode" || child.type === "delete" || child.type === "mdxJsxTextElement" && child.name !== "img");
     if (hasTextContent) {
-      const content = [];
+      const content2 = [];
       for (const child of node.children) {
         if (child.type === "image" || child.type === "mdxJsxTextElement" && child.name === "img") {
           const inlineImg = convertToInlineImage(child);
           if (inlineImg)
-            content.push(inlineImg);
+            content2.push(inlineImg);
         } else {
           const result = transformNode2(child, ctx);
           if (Array.isArray(result)) {
-            content.push(...result);
+            content2.push(...result);
           } else {
-            content.push(result);
+            content2.push(result);
           }
         }
       }
-      return { type: "paragraph", content: content.filter(Boolean) };
+      return { type: "paragraph", content: content2.filter(Boolean) };
     }
     const blocks = [];
     for (const child of node.children) {
@@ -2431,10 +2418,32 @@ function handleParagraph(node, ctx, transformNode2, mapChildren2) {
     }
     return blocks.length > 0 ? blocks : [];
   }
-  return {
-    type: "paragraph",
-    content: mapChildren2(node, ctx)
-  };
+  const content = mapChildren2(node, ctx);
+  const schema2 = (_d = ctx.schema) !== null && _d !== void 0 ? _d : mintlifySchema;
+  if (content.every((child) => isInlineNode(child, schema2))) {
+    return { type: "paragraph", content };
+  }
+  return splitParagraphAroundBlocks(content, schema2);
+}
+function splitParagraphAroundBlocks(content, schema2) {
+  return normalizeBlockContent(mergeDarkLightImagePairs(content), schema2).map((block) => block.type === "paragraph" ? trimParagraph(block) : block).filter((block) => {
+    var _a, _b;
+    return block.type !== "paragraph" || ((_b = (_a = block.content) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0;
+  });
+}
+function trimParagraph(paragraph) {
+  var _a;
+  const content = [...(_a = paragraph.content) !== null && _a !== void 0 ? _a : []];
+  const first = content[0];
+  if ((first === null || first === void 0 ? void 0 : first.type) === "text" && first.text) {
+    content[0] = Object.assign(Object.assign({}, first), { text: first.text.replace(/^\s+/, "") });
+  }
+  const lastIndex = content.length - 1;
+  const last = content[lastIndex];
+  if ((last === null || last === void 0 ? void 0 : last.type) === "text" && last.text) {
+    content[lastIndex] = Object.assign(Object.assign({}, last), { text: last.text.replace(/\s+$/, "") });
+  }
+  return Object.assign(Object.assign({}, paragraph), { content: content.filter((n) => n.type !== "text" || n.text !== "") });
 }
 function handleTable(node, ctx, transformNode2) {
   const rows = node.children;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintlify/cli",
-  "version": "4.0.1448",
+  "version": "4.0.1450",
   "description": "The Mintlify CLI",
   "engines": {
     "node": ">=18.0.0"
@@ -86,7 +86,7 @@
     "keytar": "7.9.0"
   },
   "devDependencies": {
-    "@mintlify/editor": "0.0.338",
+    "@mintlify/editor": "0.0.340",
     "@mintlify/ts-config": "2.0.2",
     "@tsconfig/recommended": "1.0.2",
     "@types/detect-port": "1.3.2",
@@ -105,5 +105,5 @@
     "vitest": "2.1.9",
     "vitest-mock-process": "1.0.4"
   },
-  "gitHead": "93b07887740dc79844de4434f86b7f994f9b06b2"
+  "gitHead": "49b924242ed529fabeb05bbbee126dfcf7a644eb"
 }