@mintlify/cli 4.0.1432 → 4.0.1434

package/bin/vendor/converter.js

@@ -1033,6 +1033,7 @@ function getImageWidthFromStyle(style) {
 }
 
 // ../editor/dist/converter/parse/handlers/media.js
+var isAttributeRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 function parseImgNode(node, spreadAttrs = false) {
   const attributes = parseMdxAttributes(node.attributes);
   const className = attributes.className;
@@ -1042,7 +1043,7 @@ function parseImgNode(node, spreadAttrs = false) {
   }
   const style = attributes.style;
   let width;
-  if (style && typeof style === "object") {
+  if (isAttributeRecord(style)) {
     width = getImageWidthFromStyle(style);
   }
   return {
@@ -1050,8 +1051,18 @@ function parseImgNode(node, spreadAttrs = false) {
     attrs: { imgAttributes: spreadAttrs ? Object.assign({}, attributes) : attributes, align, width }
   };
 }
+function isVideoSourceElement(child) {
+  return (child.type === "mdxJsxTextElement" || child.type === "mdxJsxFlowElement") && child.name === "source";
+}
 function parseVideoNode(node) {
-  const sources = node.children.filter((child) => (child.type === "mdxJsxTextElement" || child.type === "mdxJsxFlowElement") && child.name === "source").map((child) => parseMdxAttributes(child.attributes));
+  const editable = node.children.every((child) => isVideoSourceElement(child) || child.type === "text" && child.value.trim() === "");
+  if (!editable) {
+    return {
+      type: node.type === "mdxJsxTextElement" ? BLOCK_TYPES.inlineUnknownTag : BLOCK_TYPES.unknownTag,
+      attrs: { mdxJsxNode: node }
+    };
+  }
+  const sources = node.children.filter(isVideoSourceElement).map((child) => parseMdxAttributes(child.attributes));
   return {
     type: BLOCK_TYPES.video,
     attrs: {
@@ -1061,9 +1072,15 @@ function parseVideoNode(node) {
   };
 }
 var DARK_ONLY_CLASSES = /* @__PURE__ */ new Set(["hidden", "dark:block"]);
+var LIGHT_ONLY_CLASSES = /* @__PURE__ */ new Set(["dark:hidden"]);
+function readImageAttributes(node) {
+  var _a;
+  const attributes = (_a = node.attrs) === null || _a === void 0 ? void 0 : _a.imgAttributes;
+  return isAttributeRecord(attributes) ? attributes : null;
+}
 function getImageClassName(node) {
-  var _a, _b;
-  const className = (_b = (_a = node.attrs) === null || _a === void 0 ? void 0 : _a.imgAttributes) === null || _b === void 0 ? void 0 : _b.className;
+  var _a;
+  const className = (_a = readImageAttributes(node)) === null || _a === void 0 ? void 0 : _a.className;
   return typeof className === "string" ? className : void 0;
 }
 function isDarkOnlyImage(node) {
@@ -1083,18 +1100,35 @@ function isLightOnlyImage(node) {
     return false;
   return className.split(/\s+/).includes("dark:hidden");
 }
-function stripThemeClasses(className) {
-  const cleaned = className.split(/\s+/).filter((c) => !DARK_ONLY_CLASSES.has(c) && c !== "dark:hidden").join(" ").trim();
+function stripThemeClasses(className, role) {
+  if (!className)
+    return void 0;
+  const themeClasses = role === "dark" ? DARK_ONLY_CLASSES : LIGHT_ONLY_CLASSES;
+  const cleaned = className.split(/\s+/).filter((c) => !themeClasses.has(c)).join(" ").trim();
   return cleaned || void 0;
 }
+function nonThemeAttributeEntries(attrs2) {
+  return Object.entries(attrs2).filter(([key]) => key !== "src" && key !== "className").sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
+}
+function canMergeAsThemePair(lightImgAttrs, darkImgAttrs, lightClassName, darkClassName) {
+  const lightBase = stripThemeClasses(lightClassName, "light");
+  const darkBase = stripThemeClasses(darkClassName, "dark");
+  const lightBaseWithoutBlock = (lightBase === null || lightBase === void 0 ? void 0 : lightBase.split(/\s+/).filter((c) => c !== "block").join(" ").trim()) || void 0;
+  if (darkBase !== lightBase && darkBase !== lightBaseWithoutBlock) {
+    return false;
+  }
+  const lightEntries = nonThemeAttributeEntries(lightImgAttrs);
+  const darkEntries = nonThemeAttributeEntries(darkImgAttrs);
+  return lightEntries.length === darkEntries.length && JSON.stringify(lightEntries) === JSON.stringify(darkEntries);
+}
 function mergeDarkLightImagePairs(nodes2) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+  var _a, _b, _c, _d, _e, _f;
   const result = [];
   let i = 0;
   while (i < nodes2.length) {
-    if (i + 1 < nodes2.length) {
-      const current = nodes2[i];
-      const next = nodes2[i + 1];
+    const current = nodes2[i];
+    const next = nodes2[i + 1];
+    if (current && next) {
       let darkNode;
       let lightNode;
       if (isDarkOnlyImage(current) && isLightOnlyImage(next)) {
@@ -1104,12 +1138,12 @@ function mergeDarkLightImagePairs(nodes2) {
         lightNode = current;
         darkNode = next;
       }
-      if (darkNode && lightNode) {
-        const darkImgAttrs = (_a = darkNode.attrs) === null || _a === void 0 ? void 0 : _a.imgAttributes;
-        const lightImgAttrs = (_b = lightNode.attrs) === null || _b === void 0 ? void 0 : _b.imgAttributes;
-        const darkSrc = darkImgAttrs.src;
-        const lightSrc = lightImgAttrs.src;
-        const baseClassName = stripThemeClasses((_d = (_c = getImageClassName(lightNode)) !== null && _c !== void 0 ? _c : getImageClassName(darkNode)) !== null && _d !== void 0 ? _d : "");
+      const darkImgAttrs = darkNode ? readImageAttributes(darkNode) : null;
+      const lightImgAttrs = lightNode ? readImageAttributes(lightNode) : null;
+      const darkSrc = darkImgAttrs === null || darkImgAttrs === void 0 ? void 0 : darkImgAttrs.src;
+      const lightSrc = lightImgAttrs === null || lightImgAttrs === void 0 ? void 0 : lightImgAttrs.src;
+      if (darkNode && lightNode && darkImgAttrs && lightImgAttrs && typeof darkSrc === "string" && typeof lightSrc === "string" && canMergeAsThemePair(lightImgAttrs, darkImgAttrs, getImageClassName(lightNode), getImageClassName(darkNode))) {
+        const baseClassName = stripThemeClasses(getImageClassName(lightNode), "light");
         const mergedImgAttrs = Object.assign({}, lightImgAttrs);
         delete mergedImgAttrs.src;
         if (baseClassName) {
@@ -1123,15 +1157,16 @@ function mergeDarkLightImagePairs(nodes2) {
             imgAttributes: mergedImgAttrs,
             lightSrc,
             darkSrc,
-            align: (_f = (_e = lightNode.attrs) === null || _e === void 0 ? void 0 : _e.align) !== null && _f !== void 0 ? _f : (_g = darkNode.attrs) === null || _g === void 0 ? void 0 : _g.align,
-            width: (_j = (_h = lightNode.attrs) === null || _h === void 0 ? void 0 : _h.width) !== null && _j !== void 0 ? _j : (_k = darkNode.attrs) === null || _k === void 0 ? void 0 : _k.width
+            align: (_b = (_a = lightNode.attrs) === null || _a === void 0 ? void 0 : _a.align) !== null && _b !== void 0 ? _b : (_c = darkNode.attrs) === null || _c === void 0 ? void 0 : _c.align,
+            width: (_e = (_d = lightNode.attrs) === null || _d === void 0 ? void 0 : _d.width) !== null && _e !== void 0 ? _e : (_f = darkNode.attrs) === null || _f === void 0 ? void 0 : _f.width
           }
         });
         i += 2;
         continue;
       }
     }
-    result.push(nodes2[i]);
+    if (current)
+      result.push(current);
     i++;
   }
   return result;
@@ -1158,7 +1193,7 @@ function convertToInlineImage(node) {
     let width = 100;
     if (attributes.width && typeof attributes.width === "number") {
       width = attributes.width;
-    } else if (attributes.style && typeof attributes.style === "object") {
+    } else if (isAttributeRecord(attributes.style)) {
       const styleWidth = getImageWidthFromStyle(attributes.style);
       if (styleWidth)
         width = styleWidth;
@@ -2654,29 +2689,54 @@ function isJSXContent(str) {
 function getTextContent(node) {
   return node.textContent;
 }
+var BARE_OBJECT_KEY = /^[A-Za-z_$][\w$]*$/;
 function serializePropValue(v) {
   if (v === null || v === void 0)
     return null;
   if (typeof v === "object") {
-    const value = JSON.stringify(v).replace(/"([^"]+)":/g, "$1:").replace(/: "([^"]+)"/g, ": '$1'").replace(/^{/g, "{ ").replace(/}$/g, " }");
-    return `{${value}}`;
+    const literal = Array.isArray(v) ? serializeJsValue(v) : serializeJsObjectLiteral(v, true);
+    return `{${literal}}`;
   }
   if (typeof v === "string") {
     if (v === "")
-      return null;
-    if (isJSXContent(v) || v.includes('"') && v.includes("'")) {
+      return '""';
+    if (isJSXContent(v)) {
       return `{${v}}`;
     }
-    if (v.includes('"') && !v.includes("'")) {
+    if (v.includes('"') && v.includes("'")) {
+      return `{${JSON.stringify(v)}}`;
+    }
+    if (v.includes('"')) {
       return `'${v}'`;
     }
-    return `"${v.replace(/"/g, '\\"')}"`;
+    return `"${v}"`;
   }
   if (typeof v === "number" || typeof v === "boolean") {
     return `{${v}}`;
   }
   return `{${JSON.stringify(v)}}`;
 }
+function serializeJsValue(value) {
+  var _a;
+  if (value === null || value === void 0)
+    return "null";
+  if (typeof value === "string")
+    return JSON.stringify(value);
+  if (typeof value === "number" || typeof value === "boolean")
+    return String(value);
+  if (Array.isArray(value))
+    return `[${value.map(serializeJsValue).join(",")}]`;
+  if (typeof value === "object")
+    return serializeJsObjectLiteral(value, false);
+  return (_a = JSON.stringify(value)) !== null && _a !== void 0 ? _a : "null";
+}
+function serializeJsObjectLiteral(value, outermost) {
+  const entries = Object.entries(value).filter(([, entry]) => entry !== void 0).map(([key, entry]) => {
+    const literalKey = BARE_OBJECT_KEY.test(key) ? key : JSON.stringify(key);
+    return `${literalKey}:${serializeJsValue(entry)}`;
+  });
+  return outermost ? `{ ${entries.join(",")} }` : `{${entries.join(",")}}`;
+}
 function serializeJsxAttribute(attrs2, key, value) {
   const rawExpression = getNamedExpressionAttr(attrs2, key);
   if (rawExpression !== void 0) {
@@ -2688,9 +2748,10 @@ function serializeJsxAttribute(attrs2, key, value) {
   const serialized = serializePropValue(value);
   return serialized ? `${key}=${serialized}` : null;
 }
+var isAttributeRecord2 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 function getNamedExpressionAttr(attrs2, key) {
   const raw = attrs2[NAMED_EXPRESSION_ATTRS_KEY];
-  if (!raw || typeof raw !== "object" || Array.isArray(raw))
+  if (!isAttributeRecord2(raw))
     return void 0;
   const value = raw[key];
   return typeof value === "string" ? value : void 0;
@@ -2783,7 +2844,7 @@ function renderImage(state, node) {
       return;
     }
     const hasExtraAttrs = Object.keys(imgAttributes).some((attr) => attr !== "src" && attr !== "alt" && attr !== "title");
-    if (hasExtraAttrs || width || align) {
+    if (hasExtraAttrs || width || align || !fitsMarkdownImageValues(Object.assign(Object.assign({}, imgAttributes), { src }))) {
       const finalAttrs = Object.assign(Object.assign({}, imgAttributes), { src });
       if (align) {
         finalAttrs["className"] = addAlignClass(finalAttrs["className"], align);
@@ -2843,11 +2904,27 @@ function writeMarkdownImage(state, imgAttributes, src) {
     state.write(`![${alt}](${escapedSrc})`);
   }
 }
+var MARKDOWN_UNSAFE_SRC = /[\s<>\u0000-\u001F]/;
+var MARKDOWN_UNSAFE_TEXT = /[\r\n]/;
+function fitsMarkdownImageValues(attrs2) {
+  const src = attrs2["src"];
+  if (typeof src !== "string" || !src || MARKDOWN_UNSAFE_SRC.test(src))
+    return false;
+  const alt = attrs2["alt"];
+  if (typeof alt === "string" && MARKDOWN_UNSAFE_TEXT.test(alt))
+    return false;
+  const title = attrs2["title"];
+  if (typeof title === "string" && MARKDOWN_UNSAFE_TEXT.test(title))
+    return false;
+  return true;
+}
 function fitsMarkdownImageSyntax(node, attrs2) {
   if (!node.marks.some((mark) => mark.type.name === "link"))
     return false;
   if (typeof attrs2["src"] !== "string" || !attrs2["src"])
     return false;
+  if (!fitsMarkdownImageValues(attrs2))
+    return false;
   return Object.entries(attrs2).every(([key, value]) => key === "src" || key === "alt" || key === "title" || value == null);
 }
 function renderInlineImage(state, node) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintlify/cli",
-  "version": "4.0.1432",
+  "version": "4.0.1434",
   "description": "The Mintlify CLI",
   "engines": {
     "node": ">=18.0.0"
@@ -82,7 +82,7 @@
     "keytar": "7.9.0"
   },
   "devDependencies": {
-    "@mintlify/editor": "0.0.325",
+    "@mintlify/editor": "0.0.327",
     "@mintlify/ts-config": "2.0.2",
     "@tsconfig/recommended": "1.0.2",
     "@types/detect-port": "1.3.2",
@@ -101,5 +101,5 @@
     "vitest": "2.1.9",
     "vitest-mock-process": "1.0.4"
   },
-  "gitHead": "c3a18ca2f7c1a365a15b6a5dc0d467d67a86d2bb"
+  "gitHead": "5cb92d6b0de80a8e282e3db6157961e56e1952a4"
 }