@nuasite/cli 0.17.1 → 0.18.0

package/dist/types/utils.d.ts

@@ -1,2 +1,23 @@
+export interface CommandOptions {
+    cwd?: string;
+    dryRun?: boolean;
+    yes?: boolean;
+}
 export declare function findAstroConfig(cwd?: string): string | null;
+/**
+ * Find the matching closing brace/bracket/paren, aware of string literals.
+ */
+export declare function findMatchingClose(text: string, start: number): number;
+/**
+ * Extract the text between the outermost { } of defineConfig({ ... })
+ */
+export declare function extractConfigBody(content: string): string;
+/**
+ * Remove a top-level property from an object literal body text.
+ */
+export declare function removeProperty(body: string, propName: string): string;
+/**
+ * Assemble a complete config file from import lines and a body string.
+ */
+export declare function assembleConfig(imports: string[], body: string): string;
 //# sourceMappingURL=utils.d.ts.map

package/dist/types/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAUA,wBAAgB,eAAe,CAAC,GAAG,GAAE,MAAsB,GAAG,MAAM,GAAG,IAAI,CAM1E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,cAAc;IAC9B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,OAAO,CAAA;CACb;AASD,wBAAgB,eAAe,CAAC,GAAG,GAAE,MAAsB,GAAG,MAAM,GAAG,IAAI,CAM1E;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CA+BrE;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CASzD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAgCrE;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAWtE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuasite/cli",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "license": "Apache-2.0",
   "type": "module",
   "files": [
@@ -23,7 +23,7 @@
     "prepack": "bun run ../../scripts/workspace-deps/resolve-deps.ts"
   },
   "dependencies": {
-    "@nuasite/agent-summary": "0.17.1",
+    "@nuasite/agent-summary": "0.18.0",
     "astro": "^6.0.2",
     "stacktracey": "2.1.8"
   },

package/src/clean.ts

@@ -1,12 +1,9 @@
 import { existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs'
 import { basename, join } from 'node:path'
-import { findAstroConfig } from './utils'
+import { assembleConfig, extractConfigBody, findAstroConfig, removeProperty } from './utils'
+import type { CommandOptions } from './utils'
 
-export interface CleanOptions {
-	cwd?: string
-	dryRun?: boolean
-	yes?: boolean
-}
+export type CleanOptions = CommandOptions
 
 export type FeatureKey = 'cms' | 'pageMarkdown' | 'mdx' | 'sitemap' | 'tailwindcss' | 'checks'
 const FEATURE_KEYS: FeatureKey[] = ['cms', 'pageMarkdown', 'mdx', 'sitemap', 'tailwindcss', 'checks']
@@ -43,93 +40,6 @@ export function detectDisabledFeatures(content: string): Set<FeatureKey> {
 	return disabled
 }
 
-/**
- * Find the matching closing brace/bracket/paren, aware of string literals.
- */
-function findMatchingClose(text: string, start: number): number {
-	const open = text[start]!
-	const close = open === '{' ? '}' : open === '[' ? ']' : ')'
-	let depth = 0
-	let inString: string | false = false
-
-	for (let i = start; i < text.length; i++) {
-		const ch = text[i]
-
-		if (inString) {
-			if (ch === '\\') {
-				i++
-				continue
-			}
-			if (ch === inString) inString = false
-			continue
-		}
-
-		if (ch === "'" || ch === '"' || ch === '`') {
-			inString = ch
-			continue
-		}
-
-		if (ch === open) depth++
-		if (ch === close) {
-			depth--
-			if (depth === 0) return i
-		}
-	}
-
-	return -1
-}
-
-/**
- * Extract the text between the outermost { } of defineConfig({ ... })
- */
-export function extractConfigBody(content: string): string {
-	const match = content.match(/defineConfig\s*\(\s*\{/)
-	if (!match || match.index === undefined) return ''
-
-	const openBrace = content.indexOf('{', match.index + 'defineConfig'.length)
-	const closeBrace = findMatchingClose(content, openBrace)
-	if (closeBrace === -1) return ''
-
-	return content.slice(openBrace + 1, closeBrace)
-}
-
-/**
- * Remove a top-level property from an object literal body text.
- */
-export function removeProperty(body: string, propName: string): string {
-	const regex = new RegExp(`(\\n[ \\t]*)${propName}\\s*:\\s*`)
-	const match = regex.exec(body)
-	if (!match || match.index === undefined) return body
-
-	const propLineStart = match.index + 1 // skip the leading \n
-	const afterMatch = match.index + match[0].length
-
-	// Skip whitespace (not newlines) before the value
-	let i = afterMatch
-	while (i < body.length && (body[i] === ' ' || body[i] === '\t')) i++
-
-	let valueEnd: number
-
-	if (body[i] === '{' || body[i] === '[') {
-		valueEnd = findMatchingClose(body, i)
-		if (valueEnd === -1) return body
-		valueEnd++ // include closing brace/bracket
-	} else {
-		// Simple value (false, true, number, string, variable)
-		while (i < body.length && body[i] !== ',' && body[i] !== '\n') i++
-		valueEnd = i
-	}
-
-	// Skip trailing comma and whitespace up to newline
-	let end = valueEnd
-	while (end < body.length && (body[end] === ' ' || body[end] === '\t')) end++
-	if (end < body.length && body[end] === ',') end++
-	while (end < body.length && (body[end] === ' ' || body[end] === '\t')) end++
-	if (end < body.length && body[end] === '\n') end++
-
-	return body.slice(0, propLineStart) + body.slice(end)
-}
-
 /**
  * Prepend items into an existing array property (e.g. `integrations: [` or `plugins: [`).
  * Mutates `lines` in place. Returns true if a merge happened.
@@ -205,14 +115,7 @@ export function transformConfig(content: string, disabled: Set<FeatureKey>): str
 
 	const allLines = [...bodyLines, ...newPropLines]
 
-	let result = imports.join('\n') + '\n\n'
-	result += 'export default defineConfig({\n'
-	if (allLines.length > 0) {
-		result += allLines.join('\n') + '\n'
-	}
-	result += '})\n'
-
-	return result
+	return assembleConfig(imports, allLines.join('\n'))
 }
 
 export function transformPackageJson(

package/src/index.ts

@@ -38,6 +38,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('  init     Convert a standard Astro project to use Nua')
 	console.log('  clean    Eject to a standard Astro project (remove @nuasite/* deps)')
 	console.log('  help     Show this message')
 	console.log('\nAll Astro CLI options are supported.\n')
@@ -86,6 +87,15 @@ if (canProxyDirectly && command && ['build', 'dev', 'preview'].includes(command)
 			})
 			break
 		}
+		case 'init': {
+			const { init } = await import('./init')
+			await init({
+				cwd: process.cwd(),
+				dryRun: args.includes('--dry-run'),
+				yes: args.includes('--yes') || args.includes('-y'),
+			})
+			break
+		}
 		case 'clean': {
 			const { clean } = await import('./clean')
 			await clean({

package/src/init.ts

@@ -0,0 +1,260 @@
+import { existsSync, readFileSync, writeFileSync } from 'node:fs'
+import { basename, join } from 'node:path'
+import { assembleConfig, extractConfigBody, findAstroConfig, findMatchingClose } from './utils'
+import type { CommandOptions } from './utils'
+
+export type InitOptions = CommandOptions
+
+const NUA_PROVIDED_PACKAGES = [
+	'@astrojs/mdx',
+	'@astrojs/sitemap',
+	'@tailwindcss/vite',
+	'tailwindcss',
+]
+
+const NUA_MANAGED_PACKAGES = [
+	'@astrojs/mdx',
+	'@astrojs/sitemap',
+	'@tailwindcss/vite',
+]
+
+/**
+ * Detect which Nua-managed packages are explicitly imported in the config.
+ * Returns a map of package specifier → local import name.
+ */
+export function detectNuaManagedImports(content: string): Map<string, string> {
+	const managed = new Map<string, string>()
+	for (const pkg of NUA_MANAGED_PACKAGES) {
+		const regex = new RegExp(`import\\s+(\\w+)\\s+from\\s+['"]${pkg.replace('/', '\\/')}['"]`)
+		const match = regex.exec(content)
+		if (match) {
+			managed.set(pkg, match[1]!)
+		}
+	}
+	return managed
+}
+
+/**
+ * Remove a function call (e.g. `mdx()` or `sitemap({ ... })`) from an array property.
+ */
+export function removeCallFromArray(body: string, arrayProp: string, callName: string): string {
+	const propRegex = new RegExp(`\\b${arrayProp}\\s*:\\s*\\[`)
+	const propMatch = propRegex.exec(body)
+	if (!propMatch || propMatch.index === undefined) return body
+
+	const arrayStart = body.indexOf('[', propMatch.index)
+	const arrayEnd = findMatchingClose(body, arrayStart)
+	if (arrayEnd === -1) return body
+
+	const arrayContent = body.slice(arrayStart + 1, arrayEnd)
+
+	const callRegex = new RegExp(`\\b${callName}\\s*\\(`)
+	const callMatch = callRegex.exec(arrayContent)
+	if (!callMatch || callMatch.index === undefined) return body
+
+	const parenStart = arrayContent.indexOf('(', callMatch.index)
+	const parenEnd = findMatchingClose(arrayContent, parenStart)
+	if (parenEnd === -1) return body
+
+	let removeStart = callMatch.index
+	let removeEnd = parenEnd + 1
+
+	let after = removeEnd
+	while (after < arrayContent.length && (arrayContent[after] === ' ' || arrayContent[after] === '\t' || arrayContent[after] === '\n')) {
+		after++
+	}
+	if (after < arrayContent.length && arrayContent[after] === ',') {
+		removeEnd = after + 1
+		while (
+			removeEnd < arrayContent.length
+			&& (arrayContent[removeEnd] === ' ' || arrayContent[removeEnd] === '\t' || arrayContent[removeEnd] === '\n')
+		) removeEnd++
+	}
+
+	if (removeEnd === parenEnd + 1) {
+		let before = removeStart - 1
+		while (before >= 0 && (arrayContent[before] === ' ' || arrayContent[before] === '\t' || arrayContent[before] === '\n')) before--
+		if (before >= 0 && arrayContent[before] === ',') {
+			removeStart = before
+		}
+	}
+
+	const newArrayContent = arrayContent.slice(0, removeStart) + arrayContent.slice(removeEnd)
+	return body.slice(0, arrayStart + 1) + newArrayContent + body.slice(arrayEnd)
+}
+
+/**
+ * Clean up empty structures left after removing managed integrations/plugins.
+ * Removes empty arrays/objects and the Nua-default `sourcemap: true`.
+ */
+export function cleanEmptyStructures(body: string): string {
+	body = body.replace(/\n[ \t]*sourcemap\s*:\s*true\s*,?[ \t]*/g, '\n')
+	body = body.replace(/\n[ \t]*build\s*:\s*\{[\s,]*\}\s*,?[ \t]*/g, '\n')
+	body = body.replace(/\n[ \t]*plugins\s*:\s*\[[\s,]*\]\s*,?[ \t]*/g, '\n')
+	body = body.replace(/\n[ \t]*integrations\s*:\s*\[[\s,]*\]\s*,?[ \t]*/g, '\n')
+	body = body.replace(/\n[ \t]*vite\s*:\s*\{[\s,]*\}\s*,?[ \t]*/g, '\n')
+
+	return body
+}
+
+export function transformConfig(content: string, managedImports: Map<string, string>): string {
+	const lines = content.split('\n')
+	const newImports: string[] = []
+
+	for (const line of lines) {
+		if (!/^\s*import\s/.test(line)) continue
+
+		if (line.includes('astro/config') && line.includes('defineConfig')) {
+			newImports.push(`import { defineConfig } from '@nuasite/nua/config'`)
+			continue
+		}
+
+		const isManagedImport = [...managedImports.keys()].some(pkg => line.includes(pkg))
+		if (isManagedImport) continue
+
+		newImports.push(line)
+	}
+
+	let body = extractConfigBody(content)
+
+	for (const [pkg, localName] of managedImports) {
+		if (pkg === '@tailwindcss/vite') {
+			body = removeCallFromArray(body, 'plugins', localName)
+		} else {
+			body = removeCallFromArray(body, 'integrations', localName)
+		}
+	}
+
+	body = cleanEmptyStructures(body)
+
+	return assembleConfig(newImports, body)
+}
+
+function resolveNuaVersion(): string {
+	try {
+		const cliPkgPath = new URL('../../package.json', import.meta.url)
+		const cliPkg = JSON.parse(readFileSync(cliPkgPath, 'utf-8'))
+		const version: string = cliPkg.version
+		const [major, minor] = version.split('.')
+		return `^${major}.${minor}.0`
+	} catch {
+		return '^0.17.0'
+	}
+}
+
+export function transformPackageJson(pkg: Record<string, any>, nuaVersion: string): Record<string, any> {
+	const result = structuredClone(pkg)
+
+	if (result.scripts) {
+		for (const [key, value] of Object.entries(result.scripts)) {
+			if (typeof value === 'string') {
+				result.scripts[key] = value
+					.replace(/\bastro build\b/g, 'nua build')
+					.replace(/\bastro dev\b/g, 'nua dev')
+					.replace(/\bastro preview\b/g, 'nua preview')
+			}
+		}
+	}
+
+	for (const field of ['dependencies', 'devDependencies'] as const) {
+		if (!result[field]) continue
+		for (const name of NUA_PROVIDED_PACKAGES) {
+			delete result[field][name]
+		}
+		if (Object.keys(result[field]).length === 0) {
+			delete result[field]
+		}
+	}
+
+	if (!result.dependencies) result.dependencies = {}
+	if (!result.dependencies['@nuasite/nua']) {
+		result.dependencies['@nuasite/nua'] = nuaVersion
+	}
+
+	result.dependencies = Object.fromEntries(
+		Object.entries(result.dependencies).sort(([a], [b]) => a.localeCompare(b)),
+	)
+
+	return result
+}
+
+export async function init({ cwd = process.cwd(), dryRun = false, yes = false }: InitOptions = {}) {
+	const configPath = findAstroConfig(cwd)
+	if (!configPath) {
+		console.error('No Astro config file found.')
+		process.exit(1)
+	}
+
+	const configContent = readFileSync(configPath, 'utf-8')
+
+	if (configContent.includes('@nuasite/nua')) {
+		console.log('This project already uses @nuasite/nua. Nothing to do.')
+		return
+	}
+
+	if (!configContent.includes('defineConfig')) {
+		console.error('Could not find defineConfig in Astro config.')
+		process.exit(1)
+	}
+
+	const pkgPath = join(cwd, 'package.json')
+	if (!existsSync(pkgPath)) {
+		console.error('No package.json found.')
+		process.exit(1)
+	}
+	const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'))
+
+	const managedImports = detectNuaManagedImports(configContent)
+	const nuaVersion = resolveNuaVersion()
+	const configName = basename(configPath)
+
+	console.log('')
+	console.log('nua init \u2014 adopt the Nua toolchain')
+	console.log('')
+	console.log(`  ${configName}`)
+	console.log('    - Replace astro/config with @nuasite/nua/config')
+	if (managedImports.size > 0) {
+		console.log(`    - Remove Nua-managed imports: ${[...managedImports.keys()].join(', ')}`)
+		console.log('    - Remove managed integration/plugin calls')
+	}
+	console.log('    - Clean up empty config structures')
+	console.log('')
+	console.log('  package.json')
+	const removable = NUA_PROVIDED_PACKAGES.filter(name => pkg.dependencies?.[name] || pkg.devDependencies?.[name])
+	if (removable.length > 0) {
+		console.log(`    - Remove Nua-provided deps: ${removable.join(', ')}`)
+	}
+	console.log(`    - Add @nuasite/nua ${nuaVersion}`)
+	console.log('    - Update scripts: astro \u2192 nua')
+
+	if (dryRun) {
+		console.log('')
+		console.log('  (--dry-run: no changes made)')
+		console.log('')
+		return
+	}
+
+	if (!yes) {
+		console.log('')
+		const answer = prompt('Proceed? [y/N] ')
+		if (answer?.toLowerCase() !== 'y') {
+			console.log('Cancelled.')
+			return
+		}
+	}
+
+	const newConfig = transformConfig(configContent, managedImports)
+	writeFileSync(configPath, newConfig)
+	console.log(`  Updated ${configName}`)
+
+	const newPkg = transformPackageJson(pkg, nuaVersion)
+	writeFileSync(pkgPath, JSON.stringify(newPkg, null, '\t') + '\n')
+	console.log('  Updated package.json')
+
+	console.log('')
+	console.log('Next steps:')
+	console.log('  1. bun install')
+	console.log('  2. Review the updated config')
+	console.log('  3. nua dev')
+	console.log('')
+}

package/src/utils.ts

@@ -1,6 +1,12 @@
 import { existsSync } from 'node:fs'
 import { join } from 'node:path'
 
+export interface CommandOptions {
+	cwd?: string
+	dryRun?: boolean
+	yes?: boolean
+}
+
 const CONFIG_NAMES = [
 	'astro.config.ts',
 	'astro.config.mts',
@@ -15,3 +21,106 @@ export function findAstroConfig(cwd: string = process.cwd()): string | null {
 	}
 	return null
 }
+
+/**
+ * Find the matching closing brace/bracket/paren, aware of string literals.
+ */
+export function findMatchingClose(text: string, start: number): number {
+	const open = text[start]!
+	const close = open === '{' ? '}' : open === '[' ? ']' : ')'
+	let depth = 0
+	let inString: string | false = false
+
+	for (let i = start; i < text.length; i++) {
+		const ch = text[i]
+
+		if (inString) {
+			if (ch === '\\') {
+				i++
+				continue
+			}
+			if (ch === inString) inString = false
+			continue
+		}
+
+		if (ch === "'" || ch === '"' || ch === '`') {
+			inString = ch
+			continue
+		}
+
+		if (ch === open) depth++
+		if (ch === close) {
+			depth--
+			if (depth === 0) return i
+		}
+	}
+
+	return -1
+}
+
+/**
+ * Extract the text between the outermost { } of defineConfig({ ... })
+ */
+export function extractConfigBody(content: string): string {
+	const match = content.match(/defineConfig\s*\(\s*\{/)
+	if (!match || match.index === undefined) return ''
+
+	const openBrace = content.indexOf('{', match.index + 'defineConfig'.length)
+	const closeBrace = findMatchingClose(content, openBrace)
+	if (closeBrace === -1) return ''
+
+	return content.slice(openBrace + 1, closeBrace)
+}
+
+/**
+ * Remove a top-level property from an object literal body text.
+ */
+export function removeProperty(body: string, propName: string): string {
+	const regex = new RegExp(`(\\n[ \\t]*)${propName}\\s*:\\s*`)
+	const match = regex.exec(body)
+	if (!match || match.index === undefined) return body
+
+	const propLineStart = match.index + 1 // skip the leading \n
+	const afterMatch = match.index + match[0].length
+
+	// Skip whitespace (not newlines) before the value
+	let i = afterMatch
+	while (i < body.length && (body[i] === ' ' || body[i] === '\t')) i++
+
+	let valueEnd: number
+
+	if (body[i] === '{' || body[i] === '[') {
+		valueEnd = findMatchingClose(body, i)
+		if (valueEnd === -1) return body
+		valueEnd++ // include closing brace/bracket
+	} else {
+		// Simple value (false, true, number, string, variable)
+		while (i < body.length && body[i] !== ',' && body[i] !== '\n') i++
+		valueEnd = i
+	}
+
+	// Skip trailing comma and whitespace up to newline
+	let end = valueEnd
+	while (end < body.length && (body[end] === ' ' || body[end] === '\t')) end++
+	if (end < body.length && body[end] === ',') end++
+	while (end < body.length && (body[end] === ' ' || body[end] === '\t')) end++
+	if (end < body.length && body[end] === '\n') end++
+
+	return body.slice(0, propLineStart) + body.slice(end)
+}
+
+/**
+ * Assemble a complete config file from import lines and a body string.
+ */
+export function assembleConfig(imports: string[], body: string): string {
+	const bodyLines = body.split('\n').filter(line => line.trim() !== '')
+
+	let result = imports.join('\n') + '\n\n'
+	result += 'export default defineConfig({\n'
+	if (bodyLines.length > 0) {
+		result += bodyLines.join('\n') + '\n'
+	}
+	result += '})\n'
+
+	return result
+}