@nuasite/cli 0.53.0 → 0.55.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuasite/cli",
-  "version": "0.53.0",
+  "version": "0.55.0",
   "license": "Apache-2.0",
   "type": "module",
   "files": [
@@ -25,8 +25,8 @@
   "dependencies": {
     "@astrojs/compiler": "^3.0.1",
     "@jridgewell/trace-mapping": "^0.3.31",
-    "@nuasite/cms": "0.53.0",
-    "@nuasite/cms-core": "0.53.0"
+    "@nuasite/cms": "0.55.0",
+    "@nuasite/cms-core": "0.55.0"
   },
   "devDependencies": {
     "@types/bun": "1.3.11"

package/src/check.ts

@@ -1,7 +1,8 @@
-import { checkContent, type CheckReport, createNodeFs, formatCheckReport } from '@nuasite/cms-core'
+import { checkContent, type CheckReport, createNodeFs, formatCheckReport, type LiveSchemas } from '@nuasite/cms-core'
 import { existsSync, readdirSync } from 'node:fs'
 import path from 'node:path'
 import { checkCode } from './check-code'
+import { loadLiveSchemas } from './live-schema'
 
 export interface CheckOptions {
 	cwd: string
@@ -10,6 +11,26 @@ export interface CheckOptions {
 	strict: boolean
 	/** Skip the code syntax pass — content only. */
 	contentOnly: boolean
+	/** Validate against the project's real schemas, which means importing and running its content config. */
+	live: boolean
+}
+
+/**
+ * `nua check`'s argv, as options.
+ *
+ * Pure and exported so the flag combinations are testable: `index.ts` is a top-level-await
+ * script that reads `process.argv` and calls `process.exit`, so a test cannot import it.
+ */
+export function parseCheckArgs(args: string[], cwd: string): CheckOptions {
+	const contentOnly = args.includes('--content-only')
+	return {
+		cwd,
+		json: args.includes('--json'),
+		strict: args.includes('--strict'),
+		contentOnly,
+		// Loading the real schemas executes the project's content config — the least content-only thing this command does.
+		live: !contentOnly && !args.includes('--no-live'),
+	}
 }
 
 const ASTRO_CONFIG_NAMES = ['astro.config.ts', 'astro.config.mts', 'astro.config.mjs', 'astro.config.js']
@@ -47,6 +68,25 @@ function prefixed(report: CheckReport, root: string): CheckReport {
 	}
 }
 
+/** The project's real schemas, or the sentence saying why the rules needing them did not run. */
+type LiveResult = { schemas: LiveSchemas } | { skipped: string }
+
+async function liveSchemasFor(options: CheckOptions, roots: string[]): Promise<LiveResult> {
+	if (options.contentOnly) {
+		return { skipped: "--content-only was passed, and reading the real schemas means executing the project's content config." }
+	}
+	if (!options.live) return { skipped: '--no-live was passed.' }
+
+	const first = roots[0]
+	// The `astro:content` stub is process-global and re-exports one project's zod, so a second
+	// project would be judged by the first project's schemas — quietly wrong is worse than skipped.
+	if (roots.length !== 1 || first === undefined) {
+		const where = roots.join(', ')
+		return { skipped: `They need exactly one Astro project; this run covers ${roots.length} (${where}). Check each one from its own directory.` }
+	}
+	return loadLiveSchemas(path.join(options.cwd, first))
+}
+
 /** Validate the content collections and return the process exit code. */
 export async function check(options: CheckOptions): Promise<number> {
 	const roots = astroRoots(options.cwd)
@@ -56,9 +96,12 @@ export async function check(options: CheckOptions): Promise<number> {
 		return 1
 	}
 
+	const live = await liveSchemasFor(options, roots)
+	const schemas = 'schemas' in live ? live.schemas : undefined
+
 	const reports = await Promise.all(roots.map(async root => {
 		const absolute = path.join(options.cwd, root)
-		const content = prefixed(await checkContent(createNodeFs(absolute)), root)
+		const content = prefixed(await checkContent(createNodeFs(absolute), schemas ? { schemas } : {}), root)
 		if (options.contentOnly) return { ...content, files: 0 }
 		const code = await checkCode(absolute)
 		return {
@@ -79,7 +122,8 @@ export async function check(options: CheckOptions): Promise<number> {
 	const warnings = report.findings.length - errors
 
 	if (options.json) {
-		console.log(JSON.stringify({ ...report, roots }, null, 2))
+		// The reason belongs inside the payload: a stray line would break anything parsing this.
+		console.log(JSON.stringify({ ...report, roots, liveSchemas: 'schemas' in live ? 'ran' : live.skipped }, null, 2))
 	} else {
 		const formatted = formatCheckReport(report)
 		if (formatted) console.log(formatted + '\n')
@@ -87,6 +131,8 @@ export async function check(options: CheckOptions): Promise<number> {
 		const code = options.contentOnly ? '' : `, ${sourceFiles} source file(s)`
 		const counts = `${report.collections} collection(s), ${report.entries} entries${code}${where}`
 		console.log(errors === 0 && warnings === 0 ? `${counts} — no problems found` : `${counts} — ${errors} error(s), ${warnings} warning(s)`)
+		// A check that did not run must not read as a pass.
+		if ('skipped' in live) console.log(`Live schema rules did not run: ${live.skipped}`)
 	}
 
 	return errors > 0 || (options.strict && warnings > 0) ? 1 : 0

package/src/index.ts

@@ -25,7 +25,7 @@ function printUsage() {
 	console.log('  build              Run astro build with the Nua defaults')
 	console.log('  dev                Run astro dev with the Nua defaults')
 	console.log('  preview            Run astro preview with the Nua defaults')
-	console.log('  check              Validate collections and parse the source (no build). --json, --strict, --content-only')
+	console.log('  check              Validate collections and parse the source (no build). --json, --strict, --content-only, --no-live')
 	console.log('  init               Convert a standard Astro project to use Nua')
 	console.log('  clean              Eject to a standard Astro project (remove @nuasite/* deps)')
 	console.log('  migrate <target>   Run a content migration. Targets: astro-image')
@@ -38,15 +38,8 @@ if (command && ['build', 'dev', 'preview'].includes(command)) {
 } else {
 	switch (command) {
 		case 'check': {
-			const { check } = await import('./check')
-			process.exit(
-				await check({
-					cwd: process.cwd(),
-					json: args.includes('--json'),
-					strict: args.includes('--strict'),
-					contentOnly: args.includes('--content-only'),
-				}),
-			)
+			const { check, parseCheckArgs } = await import('./check')
+			process.exit(await check(parseCheckArgs(args, process.cwd())))
 			break
 		}
 		case 'init': {