@mintlify/cli 4.0.1739 → 4.0.1740

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -7,19 +7,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
7
7
  step((generator = generator.apply(thisArg, _arguments || [])).next());
8
8
  });
9
9
  };
10
+ var __rest = (this && this.__rest) || function (s, e) {
11
+ var t = {};
12
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
13
+ t[p] = s[p];
14
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
15
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
16
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
17
+ t[p[i]] = s[p[i]];
18
+ }
19
+ return t;
20
+ };
10
21
  import { jsx as _jsx } from "react/jsx-runtime";
11
- import { addLog, clearLogs, ErrorLog, SpinnerLog } from '@mintlify/previewing';
22
+ import { addLog, checkBuild, clearLogs, ErrorLog, SpinnerLog } from '@mintlify/previewing';
12
23
  import path from 'node:path';
13
- import { CMD_EXEC_PATH, terminate } from '../helpers.js';
14
- import { NoMatchingFilesError, resolveExplicitFiles } from '../resolveFiles.js';
15
- import { checkSite, selectRules, UsageError } from './engine.js';
16
- import { logDiagnostics } from './output.js';
24
+ import { CMD_EXEC_PATH, errorMessage, getVersions, terminate } from '../helpers.js';
25
+ import { resolveExplicitFiles } from '../resolveFiles.js';
26
+ import { sendPublishPrompt } from '../signup.js';
27
+ import { checkSite, runBuildChecks, selectRules } from './engine.js';
28
+ import { logReport } from './output.js';
29
+ import { toReport } from './report.js';
17
30
  export const EXIT = { passed: 0, failed: 1, crashed: 2 };
18
31
  export const splitList = (values) => values.flatMap((value) => value
19
32
  .split(',')
20
33
  .map((item) => item.trim())
21
34
  .filter(Boolean));
22
- const errorMessage = (error) => (error instanceof Error ? error.message : String(error));
23
35
  const resolveSelection = (baseDir, values) => __awaiter(void 0, void 0, void 0, function* () {
24
36
  const args = (values !== null && values !== void 0 ? values : []).map(String).filter(Boolean);
25
37
  if (args.length === 0)
@@ -27,7 +39,8 @@ const resolveSelection = (baseDir, values) => __awaiter(void 0, void 0, void 0,
27
39
  const files = yield resolveExplicitFiles(CMD_EXEC_PATH, args);
28
40
  return new Set(files.map((file) => path.relative(baseDir, path.resolve(CMD_EXEC_PATH, file)).split(path.sep).join('/')));
29
41
  });
30
- export const runLintStep = (argv_1, ...args_1) => __awaiter(void 0, [argv_1, ...args_1], void 0, function* (argv, baseDir = CMD_EXEC_PATH) {
42
+ /** mint validate: one pass over every selected rule, then the strict build when nothing failed. */
43
+ export const validateHandler = (argv_1, packageName_1, ...args_1) => __awaiter(void 0, [argv_1, packageName_1, ...args_1], void 0, function* (argv, packageName, baseDir = CMD_EXEC_PATH) {
31
44
  var _a;
32
45
  try {
33
46
  const rules = selectRules({
@@ -36,23 +49,41 @@ export const runLintStep = (argv_1, ...args_1) => __awaiter(void 0, [argv_1, ...
36
49
  });
37
50
  const selected = yield resolveSelection(baseDir, argv.files);
38
51
  addLog(_jsx(SpinnerLog, { message: "validating..." }));
39
- const { diagnostics } = yield checkSite(baseDir, rules, {
52
+ const _b = yield checkSite(baseDir, rules, {
40
53
  selected,
41
54
  localSchema: argv['local-schema'],
42
- });
43
- clearLogs();
44
- const failed = logDiagnostics(diagnostics);
45
- if (failed) {
46
- yield terminate(EXIT.failed);
47
- return false;
55
+ }), { site } = _b, checked = __rest(_b, ["site"]);
56
+ let { diagnostics } = checked;
57
+ const buildRules = rules.some(({ needsBuild }) => needsBuild);
58
+ let build;
59
+ if (!argv.build) {
60
+ build = { ran: false, reason: 'disabled' };
48
61
  }
49
- return true;
62
+ else if (!buildRules) {
63
+ build = { ran: false, reason: 'no build rules' };
64
+ }
65
+ else if (diagnostics.some(({ severity }) => severity === 'error')) {
66
+ build = { ran: false, reason: 'errors found' };
67
+ }
68
+ else {
69
+ addLog(_jsx(SpinnerLog, { message: "building..." }));
70
+ const { cli: cliVersion } = getVersions(packageName);
71
+ site.build = yield checkBuild(Object.assign(Object.assign({}, argv), { _: [], $0: packageName, packageName,
72
+ cliVersion, disableOpenapi: !rules.some(({ group }) => group === 'openapi') }));
73
+ diagnostics = yield runBuildChecks(site, rules, diagnostics);
74
+ build = { ran: true, passed: site.build.passed };
75
+ }
76
+ const report = toReport(diagnostics, build);
77
+ clearLogs();
78
+ logReport(report);
79
+ if (report.passed && build.ran && build.passed)
80
+ yield sendPublishPrompt();
81
+ yield terminate(report.passed ? EXIT.passed : EXIT.failed);
50
82
  }
51
83
  catch (error) {
52
- const usage = error instanceof UsageError || error instanceof NoMatchingFilesError;
84
+ // Bad arguments and crashes alike mean validate could not run
53
85
  clearLogs();
54
86
  addLog(_jsx(ErrorLog, { message: errorMessage(error) }));
55
- yield terminate(usage ? EXIT.failed : EXIT.crashed);
56
- return false;
87
+ yield terminate(EXIT.crashed);
57
88
  }
58
89
  });
@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
8
8
  });
9
9
  };
10
10
  import { checkFiles } from './files.js';
11
+ import { buildFindings } from './rules/build.js';
11
12
  import { RULES } from './rules/index.js';
12
13
  import { PARSE_ERROR } from './rules/parseError.js';
13
14
  import { loadSite } from './site.js';
@@ -52,6 +53,17 @@ const sortDiagnostics = (diagnostics) => diagnostics.sort((a, b) => {
52
53
  ((_c = a.column) !== null && _c !== void 0 ? _c : 0) - ((_d = b.column) !== null && _d !== void 0 ? _d : 0) ||
53
54
  ((_e = RULE_ORDER.get(a.rule)) !== null && _e !== void 0 ? _e : 0) - ((_f = RULE_ORDER.get(b.rule)) !== null && _f !== void 0 ? _f : 0);
54
55
  });
56
+ /** Adds findings for a rule unless a diagnostic of that rule already has the same key. */
57
+ const merge = (diagnostics, source, extra, key) => {
58
+ const reported = new Set(diagnostics.filter((item) => item.rule === source.id).map(key));
59
+ for (const finding of extra) {
60
+ if (reported.has(key(finding)))
61
+ continue;
62
+ reported.add(key(finding));
63
+ diagnostics.push(toDiagnostic(source, finding));
64
+ }
65
+ };
66
+ const addParseErrors = (site, diagnostics, extra) => merge(diagnostics, PARSE_ERROR, extra.filter(({ file }) => !site.selected || site.selected.has(file)), ({ file }) => file);
55
67
  /** Runs every selected rule that doesn't need the build. */
56
68
  export const runChecks = (site, rules) => __awaiter(void 0, void 0, void 0, function* () {
57
69
  const fileRules = rules.filter((rule) => rule.scope === 'file');
@@ -64,6 +76,18 @@ export const runChecks = (site, rules) => __awaiter(void 0, void 0, void 0, func
64
76
  }
65
77
  return sortDiagnostics(diagnostics);
66
78
  });
79
+ /** Adds the build's findings to a site whose build has run. */
80
+ export const runBuildChecks = (site, rules, diagnostics) => __awaiter(void 0, void 0, void 0, function* () {
81
+ for (const rule of rules) {
82
+ if (rule.scope !== 'site' || !rule.needsBuild)
83
+ continue;
84
+ for (const finding of yield rule.check(site))
85
+ diagnostics.push(toDiagnostic(rule, finding));
86
+ }
87
+ // The file pass already reported files it couldn't parse; the build adds the rest
88
+ addParseErrors(site, diagnostics, buildFindings(site, 'parse-error'));
89
+ return sortDiagnostics(diagnostics);
90
+ });
67
91
  /** Loads the site and runs the selected rules. */
68
92
  export const checkSite = (baseDir, rules, options) => __awaiter(void 0, void 0, void 0, function* () {
69
93
  const site = yield loadSite(baseDir, options);
@@ -1,5 +1,5 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
- import { addLog, ErrorLog } from '@mintlify/previewing';
2
+ import { addLog, ErrorLog, InfoLog, SuccessLog } from '@mintlify/previewing';
3
3
  import { Box, Text } from 'ink';
4
4
  const location = ({ line, column }) => line ? `${line}${column ? `:${column}` : ''}` : '';
5
5
  const DiagnosticLine = ({ diagnostic }) => {
@@ -7,22 +7,27 @@ const DiagnosticLine = ({ diagnostic }) => {
7
7
  return (_jsxs(Text, { children: [' ', diagnostic.severity === 'error' ? (_jsx(Text, { color: "red", children: "\u2717" })) : (_jsx(Text, { color: "yellow", children: "!" })), ' ', at && _jsxs(Text, { dimColor: true, children: [at, " "] }), _jsx(Text, { dimColor: true, children: diagnostic.rule }), " ", diagnostic.message, diagnostic.fix && _jsx(Text, { dimColor: true, children: " (fixable)" })] }));
8
8
  };
9
9
  const plural = (count, word) => `${count} ${word}${count === 1 ? '' : 's'}`;
10
- export const logDiagnostics = (all) => {
10
+ export const logReport = (report) => {
11
11
  var _a, _b;
12
12
  const byFile = new Map();
13
- for (const diagnostic of all) {
13
+ for (const diagnostic of report.diagnostics) {
14
14
  (_b = (_a = byFile.get(diagnostic.file)) === null || _a === void 0 ? void 0 : _a.push(diagnostic)) !== null && _b !== void 0 ? _b : byFile.set(diagnostic.file, [diagnostic]);
15
15
  }
16
16
  for (const [file, diagnostics] of byFile) {
17
17
  addLog(_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, children: file }), diagnostics.map((diagnostic, index) => (_jsx(DiagnosticLine, { diagnostic: diagnostic }, index)))] }));
18
18
  }
19
- const errors = all.filter(({ severity }) => severity === 'error').length;
20
- const warnings = all.length - errors;
21
- if (errors > 0) {
22
- addLog(_jsx(ErrorLog, { message: `${plural(errors, 'error')}${warnings > 0 ? `, ${plural(warnings, 'warning')}` : ''}` }));
23
- }
24
- else if (warnings > 0) {
25
- addLog(_jsx(Text, { dimColor: true, children: plural(warnings, 'warning') }));
26
- }
27
- return errors > 0;
19
+ const { build } = report;
20
+ if (build.ran && build.passed)
21
+ addLog(_jsx(SuccessLog, { message: "build passed" }));
22
+ else if (build.ran && report.passed)
23
+ addLog(_jsx(InfoLog, { message: "build failed only on disabled rules" }));
24
+ else if (build.ran)
25
+ addLog(_jsx(ErrorLog, { message: "build failed" }));
26
+ else if (build.reason === 'errors found')
27
+ addLog(_jsx(InfoLog, { message: "build skipped until the errors above are fixed" }));
28
+ const { errors, warnings } = report.summary;
29
+ const warned = plural(warnings, 'warning');
30
+ const passed = warnings > 0 ? `passed with ${warned}` : 'validation passed';
31
+ const failed = `${plural(errors, 'error')}${warnings > 0 ? `, ${warned}` : ''}`;
32
+ addLog(report.passed ? _jsx(SuccessLog, { message: passed }) : _jsx(ErrorLog, { message: failed }));
28
33
  };
@@ -0,0 +1,16 @@
1
+ export const toReport = (diagnostics, build) => {
2
+ var _a;
3
+ const byRule = {};
4
+ for (const { rule } of diagnostics)
5
+ byRule[rule] = ((_a = byRule[rule]) !== null && _a !== void 0 ? _a : 0) + 1;
6
+ const errors = diagnostics.filter(({ severity }) => severity === 'error').length;
7
+ return {
8
+ passed: errors === 0,
9
+ summary: { errors, warnings: diagnostics.length - errors, byRule },
10
+ diagnostics: diagnostics.map(({ rule, group, severity, file, line, column, message, fix }) => (Object.assign(Object.assign(Object.assign(Object.assign({ rule,
11
+ group,
12
+ severity,
13
+ file }, (line !== undefined && { line })), (column !== undefined && { column })), { message }), (fix && { fix })))),
14
+ build,
15
+ };
16
+ };
@@ -0,0 +1,94 @@
1
+ import { normalizeRelativePath, toPosixPath } from '@mintlify/common';
2
+ import { stripVTControlCharacters } from 'node:util';
3
+ const FILE = String.raw `[\w@.\\/-]+\.(?:mdx?|jsx?|tsx?|json|ya?ml)\b`;
4
+ const FILE_IN_MESSAGE = new RegExp(FILE);
5
+ const IMPORTERS = [
6
+ new RegExp(String.raw `\(in (${FILE}),`),
7
+ new RegExp(String.raw `(?:\bin|imported from) (${FILE})`),
8
+ ];
9
+ const IMPORT_TYPES = new Set([
10
+ 'missing-file',
11
+ 'invalid-import-path',
12
+ 'import-resolution-error',
13
+ 'default-import-no-default-export',
14
+ 'export-collision',
15
+ 'undeclared-package',
16
+ 'package-import-conflict',
17
+ ]);
18
+ const POSITION = /^:(\d+)(?::(\d+))?/;
19
+ const QUOTED = /"([^"]+)"/;
20
+ const toFinding = (site, { type, message }) => {
21
+ var _a;
22
+ const clean = stripVTControlCharacters(message).trim();
23
+ const importer = IMPORT_TYPES.has(type)
24
+ ? IMPORTERS.map((pattern) => { var _a; return (_a = pattern.exec(clean)) === null || _a === void 0 ? void 0 : _a[1]; }).find(Boolean)
25
+ : undefined;
26
+ // Missing nav pages are always about the config, even when the page looks like a file
27
+ const match = importer || type === 'missing-nav-page' ? null : FILE_IN_MESSAGE.exec(clean);
28
+ const found = importer !== null && importer !== void 0 ? importer : match === null || match === void 0 ? void 0 : match[0];
29
+ const file = found ? normalizeRelativePath(toPosixPath(found)) : site.configFile;
30
+ const position = match ? POSITION.exec(clean.slice(match.index + match[0].length)) : null;
31
+ // Config warnings quote the entry they're about, such as a navigation page
32
+ const quoted = file === site.configFile ? (_a = QUOTED.exec(clean)) === null || _a === void 0 ? void 0 : _a[0] : undefined;
33
+ return Object.assign(Object.assign(Object.assign({ file }, (position && Object.assign({ line: Number(position[1]) }, (position[2] && { column: Number(position[2]) })))), (quoted && site.locate(file, quoted))), { message: clean });
34
+ };
35
+ /** Warning types some rule turns into diagnostics, so a strict-build failure is explained. */
36
+ const COVERED_TYPES = new Set(['parse-error']);
37
+ const buildRule = (id, group, types, description) => {
38
+ for (const type of types)
39
+ COVERED_TYPES.add(type);
40
+ return {
41
+ id,
42
+ group,
43
+ severity: 'error',
44
+ needsBuild: true,
45
+ scope: 'site',
46
+ description,
47
+ check: (site) => {
48
+ var _a, _b;
49
+ return ((_b = (_a = site.build) === null || _a === void 0 ? void 0 : _a.warnings) !== null && _b !== void 0 ? _b : [])
50
+ .filter(({ type }) => types.includes(type))
51
+ .map((warning) => toFinding(site, warning));
52
+ },
53
+ };
54
+ };
55
+ export const BUILD_RULES = [
56
+ buildRule('missing-nav-page', 'nav', ['missing-nav-page'], 'pages in the navigation that have no file'),
57
+ buildRule('missing-file', 'content', ['missing-file'], "imported files that don't exist"),
58
+ buildRule('import-error', 'content', [
59
+ 'invalid-import-path',
60
+ 'import-resolution-error',
61
+ 'default-import-no-default-export',
62
+ 'export-collision',
63
+ ], "imports in pages and snippets that don't resolve"),
64
+ buildRule('package-import', 'config', ['undeclared-package', 'package-import-conflict'], 'npm package imports that are undeclared or conflict'),
65
+ buildRule('openapi-build', 'openapi', ['openapi'], 'OpenAPI pages the build could not generate'),
66
+ {
67
+ id: 'build-failed',
68
+ group: 'config',
69
+ severity: 'error',
70
+ needsBuild: true,
71
+ scope: 'site',
72
+ description: 'the strict build failed for a reason no rule reports',
73
+ check: (site) => {
74
+ if (!site.build || site.build.passed)
75
+ return [];
76
+ const unreported = (warning) => warning.type === 'parse-error' &&
77
+ site.selected !== undefined &&
78
+ !site.selected.has(toFinding(site, warning).file);
79
+ const uncovered = site.build.warnings.filter((warning) => !COVERED_TYPES.has(warning.type) || unreported(warning));
80
+ const findings = uncovered.map((warning) => toFinding(site, warning));
81
+ // Covered warnings are the selected rules' to report; disabled ones are meant to pass
82
+ return site.build.strict
83
+ ? findings
84
+ : [...findings, { file: site.configFile, message: site.build.error }];
85
+ },
86
+ },
87
+ ];
88
+ /** Build warnings of one type, which the engine merges into the static rule that covers them. */
89
+ export const buildFindings = (site, type) => {
90
+ var _a, _b;
91
+ return ((_b = (_a = site.build) === null || _a === void 0 ? void 0 : _a.warnings) !== null && _b !== void 0 ? _b : [])
92
+ .filter((warning) => warning.type === type)
93
+ .map((warning) => toFinding(site, warning));
94
+ };
@@ -1,3 +1,5 @@
1
+ import { BUILD_RULES } from './build.js';
1
2
  import { voidTags } from './content/voidTags.js';
3
+ import { openApiSpec } from './openapi.js';
2
4
  /** Every check mint validate runs, in report order. */
3
- export const RULES = [voidTags];
5
+ export const RULES = [voidTags, openApiSpec, ...BUILD_RULES];
@@ -0,0 +1,50 @@
1
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3
+ return new (P || (P = Promise))(function (resolve, reject) {
4
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
5
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
6
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
7
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
8
+ });
9
+ };
10
+ import fs from 'node:fs/promises';
11
+ import path from 'node:path';
12
+ import { errorMessage } from '../../helpers.js';
13
+ import { buildOverlayRegistryForCheck, checkOpenApiFile, getOpenApiFilenamesFromDocsConfig, } from '../../openApiCheck.js';
14
+ export const openApiSpec = {
15
+ id: 'openapi-spec',
16
+ group: 'openapi',
17
+ severity: 'error',
18
+ scope: 'site',
19
+ description: "OpenAPI specs in docs.json or mint.json that don't parse or validate, with overlays applied",
20
+ check: (site) => __awaiter(void 0, void 0, void 0, function* () {
21
+ let filenames = [];
22
+ try {
23
+ const config = JSON.parse(yield fs.readFile(path.join(site.baseDir, site.configFile), 'utf-8'));
24
+ // mint.json lists its specs under a top-level openapi key
25
+ filenames = getOpenApiFilenamesFromDocsConfig(site.configFile === 'mint.json' ? { api: { openapi: config.openapi } } : config);
26
+ }
27
+ catch (_a) {
28
+ // A missing or invalid config file is the build's to report
29
+ }
30
+ if (filenames.length === 0)
31
+ return [];
32
+ let overlayRegistry;
33
+ try {
34
+ overlayRegistry = yield buildOverlayRegistryForCheck(site.localSchema);
35
+ }
36
+ catch (error) {
37
+ return [{ file: site.configFile, message: `OpenAPI overlays: ${errorMessage(error)}` }];
38
+ }
39
+ const perFile = yield Promise.all(filenames.map((file) => __awaiter(void 0, void 0, void 0, function* () {
40
+ const messages = [];
41
+ yield checkOpenApiFile(file, site.localSchema, overlayRegistry, (message) => messages.push(message));
42
+ return messages.flatMap(({ level, message }) => level === 'error'
43
+ ? [{ file, message }]
44
+ : level === 'warning'
45
+ ? [{ file, message, severity: 'warning' }]
46
+ : []);
47
+ })));
48
+ return perFile.flat();
49
+ }),
50
+ };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mintlify/cli",
3
- "version": "4.0.1739",
3
+ "version": "4.0.1740",
4
4
  "description": "The Mintlify CLI",
5
5
  "engines": {
6
6
  "node": ">=18.0.0"
@@ -46,11 +46,11 @@
46
46
  "dependencies": {
47
47
  "@inquirer/prompts": "7.9.0",
48
48
  "@mintlify/common": "1.0.1307",
49
- "@mintlify/link-rot": "3.0.1536",
49
+ "@mintlify/link-rot": "3.0.1537",
50
50
  "@mintlify/models": "0.0.379",
51
51
  "@mintlify/og": "0.0.106",
52
- "@mintlify/prebuild": "1.0.1473",
53
- "@mintlify/previewing": "4.0.1554",
52
+ "@mintlify/prebuild": "1.0.1474",
53
+ "@mintlify/previewing": "4.0.1555",
54
54
  "@mintlify/validation": "0.1.944",
55
55
  "adm-zip": "0.6.0",
56
56
  "chalk": "5.2.0",
@@ -101,5 +101,5 @@
101
101
  "vitest": "2.1.9",
102
102
  "vitest-mock-process": "1.0.4"
103
103
  },
104
- "gitHead": "bc5883bc2e0ace9696ffa286bf8cb2b2c32c2c81"
104
+ "gitHead": "17769e5210e7861c4b9c751f8b0cbf5e7bdd3143"
105
105
  }
package/src/cli.tsx CHANGED
@@ -2,7 +2,6 @@ import {
2
2
  addLog,
3
3
  dev,
4
4
  exportSite,
5
- validateBuild,
6
5
  ErrorLog,
7
6
  SuccessLog,
8
7
  Logs,
@@ -10,8 +9,6 @@ import {
10
9
  } from '@mintlify/previewing';
11
10
  import { thumbnailOverrideSchema } from '@mintlify/validation';
12
11
  import { render, Text } from 'ink';
13
- import fs from 'node:fs/promises';
14
- import path from 'path';
15
12
  import yargs, { type Argv } from 'yargs';
16
13
  import { hideBin } from 'yargs/helpers';
17
14
 
@@ -30,7 +27,6 @@ import { DEPLOY_HELP, deploymentInstructions } from './deploy-instructions.js';
30
27
  import { formatDeployment, prepareAgentDeployment } from './deploy.js';
31
28
  import { formatHandler } from './format.js';
32
29
  import {
33
- CMD_EXEC_PATH,
34
30
  checkPort,
35
31
  checkNodeVersion,
36
32
  autoUpgradeIfNeeded,
@@ -46,17 +42,16 @@ import { logout } from './logout.js';
46
42
  import { mdxLinter } from './mdxLinter.js';
47
43
  import { createTelemetryMiddleware } from './middlewares/telemetryMiddleware.js';
48
44
  import { ogCommand } from './og.js';
49
- import {
50
- buildOverlayRegistryForCheck,
51
- checkOpenApiFile,
52
- getOpenApiFilenamesFromDocsConfig,
53
- } from './openApiCheck.js';
45
+ import { buildOverlayRegistryForCheck, checkOpenApiFile } from './openApiCheck.js';
54
46
  import { scoreHandler } from './score/index.js';
55
- import { sendPublishPrompt, signup } from './signup.js';
47
+ import { signup } from './signup.js';
56
48
  import { status, getCliSubdomains } from './status.js';
57
49
  import { trackTelemetryPreferenceChange } from './telemetry/track.js';
58
50
  import { update } from './update.js';
59
- import { runLintStep, splitList } from './validate/command.js';
51
+ import { splitList, validateHandler } from './validate/command.js';
52
+ import { RULES } from './validate/rules/index.js';
53
+ import { PARSE_ERROR } from './validate/rules/parseError.js';
54
+ import { GROUPS } from './validate/types.js';
60
55
  import { renderWelcome } from './welcome.js';
61
56
  import { workflowsBuilder } from './workflows/index.js';
62
57
 
@@ -362,7 +357,7 @@ export const cli = ({ packageName = 'mint' }: { packageName?: string }) => {
362
357
  )
363
358
  .command(
364
359
  'validate',
365
- 'Validate the documentation build (strict mode, exits on warnings or errors)',
360
+ 'Check the docs: content, OpenAPI specs, then a strict build. Exits 0 with no errors, 1 with errors, 2 when validate itself could not run',
366
361
  (yargs) =>
367
362
  yargs
368
363
  .option('local-schema', {
@@ -380,17 +375,18 @@ export const cli = ({ packageName = 'mint' }: { packageName?: string }) => {
380
375
  type: 'array',
381
376
  description: 'Mock user groups for validation',
382
377
  })
383
- .option('disable-openapi', {
384
- type: 'boolean',
385
- default: false,
386
- description: 'Disable OpenAPI file generation',
387
- })
388
378
  .option('files', {
389
379
  type: 'string',
390
380
  array: true,
391
381
  description:
392
382
  'Limit page checks to these files or globs; site-wide checks and the build still cover the whole site',
393
383
  })
384
+ .option('build', {
385
+ type: 'boolean',
386
+ default: true,
387
+ description:
388
+ 'Run the strict build after the other checks pass; --no-build skips it, so no client download is needed. Remote OpenAPI specs are still fetched unless openapi rules are disabled',
389
+ })
394
390
  .option('enable', {
395
391
  type: 'string',
396
392
  array: true,
@@ -405,50 +401,22 @@ export const cli = ({ packageName = 'mint' }: { packageName?: string }) => {
405
401
  description:
406
402
  'Turn off rules or groups (comma-separated), or all; parse errors are still reported',
407
403
  })
408
- .usage('usage: mintlify validate [options]')
409
- .example('mintlify validate', 'validate the build'),
410
- async (argv) => {
411
- const lintPassed = await runLintStep(argv);
412
- if (!lintPassed) return;
413
-
414
- if (!argv['disable-openapi']) {
415
- let openApiFilenames: string[] = [];
416
-
417
- try {
418
- const docsJson = await fs.readFile(path.join(CMD_EXEC_PATH, 'docs.json'), 'utf-8');
419
- openApiFilenames = getOpenApiFilenamesFromDocsConfig(JSON.parse(docsJson));
420
- } catch {}
421
-
422
- let overlayRegistry;
423
- try {
424
- overlayRegistry = await buildOverlayRegistryForCheck(argv['local-schema']);
425
- } catch (error) {
426
- addLog(<ErrorLog message={error instanceof Error ? error.message : String(error)} />);
427
- await terminate(1);
428
- return;
429
- }
430
- const results = await Promise.all(
431
- openApiFilenames.map((file) =>
432
- checkOpenApiFile(file, argv['local-schema'], overlayRegistry)
433
- )
434
- );
435
-
436
- if (results.some((valid) => !valid)) {
437
- await terminate(1);
438
- return;
439
- }
440
- }
441
-
442
- const { cli: cliVersion } = getVersions(packageName);
443
- await validateBuild(
444
- {
445
- ...argv,
446
- packageName,
447
- cliVersion,
448
- },
449
- sendPublishPrompt
450
- );
451
- }
404
+ .usage('usage: mint validate [options]')
405
+ .epilogue(
406
+ [
407
+ `Groups: ${GROUPS.join(', ')}. Rules:`,
408
+ ...RULES.map(({ id, description }) => ` ${id} — ${description}`),
409
+ ` parse-error — ${PARSE_ERROR.description} (always runs)`,
410
+ ].join('\n')
411
+ )
412
+ .example('mint validate', 'run every check and the build')
413
+ .example('mint validate --files "guides/**/*.mdx"', 'check some pages')
414
+ .example(
415
+ 'mint validate --disable all --enable content',
416
+ 'run the content rules only; missing-file and import-error still run the build'
417
+ )
418
+ .strict(),
419
+ (argv) => validateHandler(argv, packageName)
452
420
  )
453
421
  .command(
454
422
  'export',
package/src/helpers.tsx CHANGED
@@ -248,6 +248,9 @@ export const readLocalOpenApiFile = async (
248
248
  return document;
249
249
  };
250
250
 
251
+ export const errorMessage = (error: unknown) =>
252
+ error instanceof Error ? error.message : String(error);
253
+
251
254
  export const terminate = async (code: number) => {
252
255
  // Wait for the logs to be fully rendered before exiting
253
256
  await new Promise((resolve) => setTimeout(resolve, 50));
@@ -1,16 +1,19 @@
1
- import { addLog, clearLogs, ErrorLog, SpinnerLog } from '@mintlify/previewing';
1
+ import { addLog, checkBuild, clearLogs, ErrorLog, SpinnerLog } from '@mintlify/previewing';
2
2
  import path from 'node:path';
3
3
 
4
- import { CMD_EXEC_PATH, terminate } from '../helpers.js';
5
- import { NoMatchingFilesError, resolveExplicitFiles } from '../resolveFiles.js';
6
- import { checkSite, selectRules, UsageError } from './engine.js';
7
- import { logDiagnostics } from './output.js';
4
+ import { CMD_EXEC_PATH, errorMessage, getVersions, terminate } from '../helpers.js';
5
+ import { resolveExplicitFiles } from '../resolveFiles.js';
6
+ import { sendPublishPrompt } from '../signup.js';
7
+ import { checkSite, runBuildChecks, selectRules } from './engine.js';
8
+ import { logReport } from './output.js';
9
+ import { toReport, type BuildStatus } from './report.js';
8
10
 
9
11
  export type ValidateArgs = {
10
12
  'local-schema': boolean;
11
13
  'client-version'?: string;
12
14
  groups?: (string | number)[];
13
15
  files?: (string | number)[];
16
+ build: boolean;
14
17
  enable?: string[];
15
18
  disable?: string[];
16
19
  };
@@ -25,8 +28,6 @@ export const splitList = (values: string[]) =>
25
28
  .filter(Boolean)
26
29
  );
27
30
 
28
- const errorMessage = (error: unknown) => (error instanceof Error ? error.message : String(error));
29
-
30
31
  const resolveSelection = async (baseDir: string, values: (string | number)[] | undefined) => {
31
32
  const args = (values ?? []).map(String).filter(Boolean);
32
33
  if (args.length === 0) return undefined;
@@ -38,10 +39,12 @@ const resolveSelection = async (baseDir: string, values: (string | number)[] | u
38
39
  );
39
40
  };
40
41
 
41
- export const runLintStep = async (
42
+ /** mint validate: one pass over every selected rule, then the strict build when nothing failed. */
43
+ export const validateHandler = async (
42
44
  argv: ValidateArgs,
45
+ packageName: string,
43
46
  baseDir = CMD_EXEC_PATH
44
- ): Promise<boolean> => {
47
+ ) => {
45
48
  try {
46
49
  const rules = selectRules({
47
50
  enable: argv.enable,
@@ -50,22 +53,44 @@ export const runLintStep = async (
50
53
  const selected = await resolveSelection(baseDir, argv.files);
51
54
  addLog(<SpinnerLog message="validating..." />);
52
55
 
53
- const { diagnostics } = await checkSite(baseDir, rules, {
56
+ const { site, ...checked } = await checkSite(baseDir, rules, {
54
57
  selected,
55
58
  localSchema: argv['local-schema'],
56
59
  });
57
- clearLogs();
58
- const failed = logDiagnostics(diagnostics);
59
- if (failed) {
60
- await terminate(EXIT.failed);
61
- return false;
60
+ let { diagnostics } = checked;
61
+
62
+ const buildRules = rules.some(({ needsBuild }) => needsBuild);
63
+ let build: BuildStatus;
64
+ if (!argv.build) {
65
+ build = { ran: false, reason: 'disabled' };
66
+ } else if (!buildRules) {
67
+ build = { ran: false, reason: 'no build rules' };
68
+ } else if (diagnostics.some(({ severity }) => severity === 'error')) {
69
+ build = { ran: false, reason: 'errors found' };
70
+ } else {
71
+ addLog(<SpinnerLog message="building..." />);
72
+ const { cli: cliVersion } = getVersions(packageName);
73
+ site.build = await checkBuild({
74
+ ...argv,
75
+ _: [],
76
+ $0: packageName,
77
+ packageName,
78
+ cliVersion,
79
+ disableOpenapi: !rules.some(({ group }) => group === 'openapi'),
80
+ });
81
+ diagnostics = await runBuildChecks(site, rules, diagnostics);
82
+ build = { ran: true, passed: site.build.passed };
62
83
  }
63
- return true;
84
+
85
+ const report = toReport(diagnostics, build);
86
+ clearLogs();
87
+ logReport(report);
88
+ if (report.passed && build.ran && build.passed) await sendPublishPrompt();
89
+ await terminate(report.passed ? EXIT.passed : EXIT.failed);
64
90
  } catch (error) {
65
- const usage = error instanceof UsageError || error instanceof NoMatchingFilesError;
91
+ // Bad arguments and crashes alike mean validate could not run
66
92
  clearLogs();
67
93
  addLog(<ErrorLog message={errorMessage(error)} />);
68
- await terminate(usage ? EXIT.failed : EXIT.crashed);
69
- return false;
94
+ await terminate(EXIT.crashed);
70
95
  }
71
96
  };