@mintlify/cli 4.0.1751 → 4.0.1753

package/bin/validate/rules/content/voidTags.js

@@ -1,18 +1,21 @@
+import { htmlVoidElements } from 'html-void-elements';
 import { maskNonMarkup } from '../../mdx.js';
-const VOID_TAG = /<(br|hr|img)(?=[\s/>])((?:"[^"]*"|'[^']*'|\{[^{}]*\}|[^<>"'{}])*?)(\/?)>/g;
+const VOID_TAG_NAMES = htmlVoidElements.filter((tag) => tag !== 'image');
+const ATTRIBUTE = String.raw `"[^"]*"|'[^']*'|\{[^{}]*\}|[^<>"'{}]`;
+const VOID_TAG = new RegExp(String.raw `<(${VOID_TAG_NAMES.join('|')})(?=[\s/>])(?:${ATTRIBUTE})*?(\/?)>`, 'g');
 export const voidTags = {
     id: 'void-tags',
     group: 'content',
     severity: 'error',
     scope: 'file',
-    description: "self-close void HTML tags (<br>, <hr>, <img>); MDX can't parse them unclosed",
+    description: "self-close void HTML tags (<br>, <img>, <source>, …); MDX can't parse them unclosed",
     raw: true,
     check: ({ content }) => {
         var _a, _b;
         const masked = maskNonMarkup(content);
         const issues = [];
         for (const match of masked.matchAll(VOID_TAG)) {
-            if (match[3])
+            if (match[2])
                 continue;
             const start = match.index;
             const end = start + match[0].length;

package/bin/vendor/converter.js

@@ -6085,7 +6085,25 @@ var DATABASE_ATTRS = [
     name: "view",
     type: "string",
     options: DATABASE_VIEW_OPTIONS,
-    description: "Table or board. Omitted means table."
+    description: "Table or board. Omitted or unknown means table."
+  },
+  {
+    name: "sort",
+    type: "string",
+    placeholder: "-Due, Name",
+    description: "Comma-separated property names. A leading - sorts descending."
+  },
+  {
+    name: "filter",
+    type: "string",
+    placeholder: 'Status != "Done" and Points > 3',
+    description: "Formula that keeps the rows it is true for."
+  },
+  {
+    name: "groupBy",
+    type: "string",
+    placeholder: "Status",
+    description: "Property name to group rows by."
   }
 ];
 var UPDATE_ATTRS = [
@@ -12746,10 +12764,11 @@ function handleTree(node) {
     attrs: Object.assign({ treeData: parseTreeChildren(node) }, extraTreeAttrs)
   };
 }
+var DATABASE_VIEW_PROPS = ["view", "sort", "filter", "groupBy"];
 function handleDatabase(node, ctx) {
   var _a;
   const parsed = parseMdxAttributes(node.attributes);
-  const isValid = ctx.databases === true && !!((_a = ctx.schema) !== null && _a !== void 0 ? _a : mintlifySchema).nodes[BLOCK_TYPES.database] && node.children.length === 0 && !(EXPRESSION_ATTRS_KEY in parsed) && !(NAMED_EXPRESSION_ATTRS_KEY in parsed) && isDatabaseId(parsed.id) && (parsed.view === void 0 || isDatabaseView(parsed.view));
+  const isValid = ctx.databases === true && !!((_a = ctx.schema) !== null && _a !== void 0 ? _a : mintlifySchema).nodes[BLOCK_TYPES.database] && node.children.length === 0 && !(EXPRESSION_ATTRS_KEY in parsed) && !(NAMED_EXPRESSION_ATTRS_KEY in parsed) && isDatabaseId(parsed.id) && DATABASE_VIEW_PROPS.every((key) => parsed[key] === void 0 || typeof parsed[key] === "string");
   if (!isValid)
     return { type: BLOCK_TYPES.unknownTag, attrs: { mdxJsxNode: node } };
   return { type: BLOCK_TYPES.database, attrs: partitionAttrs(parsed, DATABASE_ATTRS) };
@@ -14120,6 +14139,18 @@ var escapeAttributeValue = (value) => value.replace(/[&"<>\n\r`~]/g, (char) => {
   var _a;
   return (_a = ATTRIBUTE_VALUE_ESCAPES[char]) !== null && _a !== void 0 ? _a : char;
 });
+var READABLE_ESCAPES = Object.assign(Object.assign({}, ATTRIBUTE_VALUE_ESCAPES), { "'": "&#x27;", "*": "&#x2A;", "{": "&#x7B;", "}": "&#x7D;" });
+var READABLE_UNSAFE = /&(?=#?[A-Za-z0-9]+;)|<(?=[A-Za-z/!?])|(?<=\/)\*|\*(?=\/)|[\n\r`~{}]/g;
+function serializeReadableJsxAttribute(key, value) {
+  if (typeof value !== "string")
+    return null;
+  const quote = value.includes('"') ? "'" : '"';
+  const escaped = value.replace(new RegExp(`${READABLE_UNSAFE.source}|${quote}`, "g"), (char) => {
+    var _a;
+    return (_a = READABLE_ESCAPES[char]) !== null && _a !== void 0 ? _a : char;
+  });
+  return `${key}=${quote}${escaped}${quote}`;
+}
 function serializeLiteralJsxAttribute(attrs2, key, value) {
   return typeof value === "string" ? `${key}="${escapeAttributeValue(value)}"` : serializeJsxAttribute(attrs2, key, value);
 }
@@ -15715,7 +15746,10 @@ function writeTreeChild(state, child) {
   state.ensureNewLine();
 }
 function renderDatabase(state, node) {
-  const props = ["id", "view"].map((key) => serializeJsxAttribute(node.attrs, key, node.attrs[key])).filter(Boolean);
+  const props = [
+    serializeJsxAttribute(node.attrs, "id", node.attrs.id),
+    ...["view", "sort", "filter", "groupBy"].map((key) => serializeReadableJsxAttribute(key, node.attrs[key]))
+  ].filter(Boolean);
   const propString = props.length > 0 ? ` ${props.join(" ")}` : "";
   state.write(`<Database${propString}${extraAttrsPropString(node.attrs, serializeLiteralJsxAttribute)} />`);
   state.closeBlock();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintlify/cli",
-  "version": "4.0.1751",
+  "version": "4.0.1753",
   "description": "The Mintlify CLI",
   "engines": {
     "node": ">=18.0.0"
@@ -45,18 +45,19 @@
   },
   "dependencies": {
     "@inquirer/prompts": "7.9.0",
-    "@mintlify/common": "1.0.1312",
-    "@mintlify/link-rot": "3.0.1547",
+    "@mintlify/common": "1.0.1313",
+    "@mintlify/link-rot": "3.0.1548",
     "@mintlify/models": "0.0.379",
-    "@mintlify/og": "0.0.111",
-    "@mintlify/prebuild": "1.0.1482",
-    "@mintlify/previewing": "4.0.1565",
+    "@mintlify/og": "0.0.112",
+    "@mintlify/prebuild": "1.0.1483",
+    "@mintlify/previewing": "4.0.1566",
     "@mintlify/validation": "0.1.944",
     "adm-zip": "0.6.0",
     "chalk": "5.2.0",
     "color": "4.2.3",
     "detect-port": "1.5.1",
     "fs-extra": "11.2.0",
+    "html-void-elements": "3.0.0",
     "ink": "6.3.0",
     "inquirer": "12.3.0",
     "js-yaml": "4.3.1",
@@ -84,7 +85,7 @@
     "keytar": "7.9.0"
   },
   "devDependencies": {
-    "@mintlify/editor": "0.0.585",
+    "@mintlify/editor": "0.0.586",
     "@mintlify/ts-config": "2.0.2",
     "@tsconfig/recommended": "1.0.2",
     "@types/detect-port": "1.3.2",
@@ -103,5 +104,5 @@
     "vitest": "2.1.9",
     "vitest-mock-process": "1.0.4"
   },
-  "gitHead": "55c38544e0b8fb3fadabe8eeaec5aaa6c5312a1d"
+  "gitHead": "611b47d227dd5bf869576f8e8989f8a20f743b45"
 }

package/src/validate/rules/content/voidTags.ts

@@ -1,20 +1,28 @@
+import { htmlVoidElements } from 'html-void-elements';
+
 import { maskNonMarkup } from '../../mdx.js';
 import type { FileRule, FileFinding } from '../../types.js';
 
-const VOID_TAG = /<(br|hr|img)(?=[\s/>])((?:"[^"]*"|'[^']*'|\{[^{}]*\}|[^<>"'{}])*?)(\/?)>/g;
+const VOID_TAG_NAMES = htmlVoidElements.filter((tag) => tag !== 'image');
+const ATTRIBUTE = String.raw`"[^"]*"|'[^']*'|\{[^{}]*\}|[^<>"'{}]`;
+const VOID_TAG = new RegExp(
+  String.raw`<(${VOID_TAG_NAMES.join('|')})(?=[\s/>])(?:${ATTRIBUTE})*?(\/?)>`,
+  'g'
+);
 
 export const voidTags: FileRule = {
   id: 'void-tags',
   group: 'content',
   severity: 'error',
   scope: 'file',
-  description: "self-close void HTML tags (<br>, <hr>, <img>); MDX can't parse them unclosed",
+  description:
+    "self-close void HTML tags (<br>, <img>, <source>, …); MDX can't parse them unclosed",
   raw: true,
   check: ({ content }) => {
     const masked = maskNonMarkup(content);
     const issues: FileFinding[] = [];
     for (const match of masked.matchAll(VOID_TAG)) {
-      if (match[3]) continue;
+      if (match[2]) continue;
       const start = match.index;
       const end = start + match[0].length;
       if (new RegExp(`^\\s*</${match[1]}\\s*>`).test(masked.slice(end))) continue;