@rokkit/cli 1.0.0-next.148 → 1.0.0-next.150

package/dist/src/init.d.ts

@@ -1,16 +1,18 @@
-/**
- * Generate a Rokkit config object from user choices.
- * @param {{ palette: string, customColors?: Record<string, string>, icons: string, iconPath?: string, themes: string[], switcher: string }} opts
- * @returns {Record<string, unknown>}
- */
 export function generateConfig({ palette, customColors, icons, iconPath, themes, defaultTheme, switcher }: {
-    palette: string;
-    customColors?: Record<string, string>;
-    icons: string;
-    iconPath?: string;
-    themes: string[];
-    switcher: string;
-}): Record<string, unknown>;
+    palette: any;
+    customColors: any;
+    icons: any;
+    iconPath: any;
+    themes: any;
+    defaultTheme: any;
+    switcher: any;
+}): {
+    colors: Record<string, unknown>;
+    themes: any;
+    defaultTheme: any;
+    switcher: any;
+    storageKey: string;
+};
 /**
  * Generate the content for uno.config.js.
  * @returns {string}

package/dist/src/skin.d.ts

@@ -16,31 +16,8 @@ export function addSkinToConfig(config: Record<string, unknown>, name: string):
  * @returns {string}
  */
 export function serializeConfig(config: Record<string, unknown>): string;
-/**
- * List all skins defined in rokkit.config.js.
- * @param {{
- *   readConfig?: () => Record<string, unknown>,
- *   cwd?: string
- * }} adapters
- */
-export function runSkinList(adapters?: {
-    readConfig?: () => Record<string, unknown>;
-    cwd?: string;
-}): Promise<void>;
-/**
- * Create a new skin entry in rokkit.config.js.
- * @param {string} name
- * @param {{
- *   readConfig?: () => Record<string, unknown>,
- *   writeConfig?: (config: Record<string, unknown>) => void,
- *   cwd?: string
- * }} adapters
- */
-export function runSkinCreate(name: string, adapters?: {
-    readConfig?: () => Record<string, unknown>;
-    writeConfig?: (config: Record<string, unknown>) => void;
-    cwd?: string;
-}): Promise<void>;
+export function runSkinList(adapters?: {}): Promise<void>;
+export function runSkinCreate(name: any, adapters?: {}): Promise<void>;
 /**
  * CLI entry point for `rokkit skin` subcommands.
  * @param {string} sub — 'list' | 'create'

package/dist/src/theme.d.ts

@@ -5,35 +5,8 @@
  * @returns {string}
  */
 export function generateThemeStub(name: string): string;
-/**
- * List all theme styles defined in rokkit.config.js plus any custom CSS files in src/themes/.
- * @param {{
- *   readConfig?: () => Record<string, unknown>,
- *   listFiles?: (dir: string) => string[],
- *   cwd?: string
- * }} adapters
- */
-export function runThemeList(adapters?: {
-    readConfig?: () => Record<string, unknown>;
-    listFiles?: (dir: string) => string[];
-    cwd?: string;
-}): Promise<void>;
-/**
- * Create a new custom theme CSS stub at src/themes/<name>.css.
- * @param {string} name
- * @param {{
- *   writeFile?: (path: string, content: string) => void,
- *   exists?: (path: string) => boolean,
- *   mkdir?: (dir: string) => void,
- *   cwd?: string
- * }} adapters
- */
-export function runThemeCreate(name: string, adapters?: {
-    writeFile?: (path: string, content: string) => void;
-    exists?: (path: string) => boolean;
-    mkdir?: (dir: string) => void;
-    cwd?: string;
-}): Promise<void>;
+export function runThemeList(adapters?: {}): Promise<void>;
+export function runThemeCreate(name: any, adapters?: {}): void;
 /**
  * CLI entry point for `rokkit theme` subcommands.
  * @param {string} sub — 'list' | 'create'

package/dist/src/upgrade.d.ts

@@ -23,25 +23,7 @@ export function buildInstallCommand(pm: "bun" | "pnpm" | "yarn" | "npm", package
     bin: string;
     args: string[];
 };
-/**
- * Run upgrade check and optionally apply it.
- *
- * @param {{ apply?: boolean }} opts
- * @param {{
- *   readFile?: (p: string) => string,
- *   exists?: (p: string) => boolean,
- *   fetchVersion?: (name: string) => string | null,
- *   runInstall?: (bin: string, args: string[]) => void
- * }} adapters — injectable for testing
- */
-export function runUpgrade(opts?: {
-    apply?: boolean;
-}, adapters?: {
-    readFile?: (p: string) => string;
-    exists?: (p: string) => boolean;
-    fetchVersion?: (name: string) => string | null;
-    runInstall?: (bin: string, args: string[]) => void;
-}): void;
+export function runUpgrade(opts?: {}, adapters?: {}): void;
 /**
  * CLI entry point for `rokkit upgrade`
  * @param {{ apply?: boolean }} opts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rokkit/cli",
-  "version": "1.0.0-next.148",
+  "version": "1.0.0-next.150",
   "description": "Command line utilities for icon bundling and conversion.",
   "repository": {
     "type": "git",

package/src/init.js

@@ -36,14 +36,14 @@ const DEFAULT_COLORS = {
  * @param {{ palette: string, customColors?: Record<string, string>, icons: string, iconPath?: string, themes: string[], switcher: string }} opts
  * @returns {Record<string, unknown>}
  */
-export function generateConfig({ palette, customColors, icons, iconPath, themes, defaultTheme, switcher }) {
-	const colors =
-		palette === 'custom'
-			? { ...DEFAULT_COLORS, ...customColors }
-			: { ...DEFAULT_COLORS, ...(SKIN_PRESETS[palette] || {}) }
+function resolveColors(palette, customColors) {
+	if (palette === 'custom') return { ...DEFAULT_COLORS, ...customColors }
+	return { ...DEFAULT_COLORS, ...(SKIN_PRESETS[palette] || {}) }
+}
 
+export function generateConfig({ palette, customColors, icons, iconPath, themes, defaultTheme, switcher }) {
 	const config = {
-		colors,
+		colors: resolveColors(palette, customColors),
 		themes,
 		defaultTheme: defaultTheme || themes[0],
 		switcher,

package/src/skin.js

@@ -53,13 +53,7 @@ export function serializeConfig(config) {
  *   cwd?: string
  * }} adapters
  */
-export async function runSkinList(adapters = {}) {
-	const config = await loadConfig(adapters)
-	if (!config) {
-		console.error('rokkit.config.js not found. Run `rokkit init` first.')
-		return
-	}
-	const skins = config.skins ?? {}
+function printSkinNames(skins) {
 	const names = Object.keys(skins)
 	if (names.length === 0) {
 		console.info('No skins defined in rokkit.config.js.')
@@ -75,6 +69,15 @@ export async function runSkinList(adapters = {}) {
 	}
 }
 
+export async function runSkinList(adapters = {}) {
+	const config = await loadConfig(adapters)
+	if (!config) {
+		console.error('rokkit.config.js not found. Run `rokkit init` first.')
+		return
+	}
+	printSkinNames(config.skins ?? {})
+}
+
 /**
  * Create a new skin entry in rokkit.config.js.
  * @param {string} name
@@ -84,25 +87,27 @@ export async function runSkinList(adapters = {}) {
  *   cwd?: string
  * }} adapters
  */
-export async function runSkinCreate(name, adapters = {}) {
-	if (!name) {
-		console.error('Usage: rokkit skin create --name <name>')
-		return
-	}
+function validateSkinCreate(name, config) {
+	if (!name) return 'Usage: rokkit skin create --name <name>'
+	if (!config) return 'rokkit.config.js not found. Run `rokkit init` first.'
+	if (config.skins?.[name]) return `Skin "${name}" already exists in rokkit.config.js.`
+	return null
+}
 
+export async function runSkinCreate(name, adapters = {}) {
 	const config = await loadConfig(adapters)
-	if (!config) {
-		console.error('rokkit.config.js not found. Run `rokkit init` first.')
-		return
-	}
-
-	if (config.skins?.[name]) {
-		console.warn(`Skin "${name}" already exists in rokkit.config.js.`)
+	const error = validateSkinCreate(name, config)
+	if (error) {
+		if (error.includes('already exists')) {
+			console.warn(error)
+		} else {
+			console.error(error)
+		}
 		return
 	}
 
 	const updated = addSkinToConfig(config, name)
-	await saveConfig(updated, adapters)
+	saveConfig(updated, adapters)
 
 	console.info(`Added skin "${name}" to rokkit.config.js`)
 	console.info(
@@ -116,7 +121,7 @@ export async function runSkinCreate(name, adapters = {}) {
  * @param {Record<string, unknown>} config
  * @param {{ writeConfig?: (config: Record<string, unknown>) => void, cwd?: string }} adapters
  */
-async function saveConfig(config, adapters) {
+function saveConfig(config, adapters) {
 	if (adapters.writeConfig) {
 		adapters.writeConfig(config)
 		return

package/src/theme.js

@@ -63,33 +63,38 @@ export function generateThemeStub(name) {
  *   cwd?: string
  * }} adapters
  */
-export async function runThemeList(adapters = {}) {
-	const config = await loadConfig(adapters)
-	const builtIn = config?.themes ?? []
-
+function getCustomThemes(adapters) {
 	const cwd = adapters.cwd ?? process.cwd()
 	const themesDir = resolve(cwd, 'src/themes')
 	const listFiles = adapters.listFiles ?? ((dir) => (existsSync(dir) ? readdirSync(dir) : []))
-	const custom = listFiles(themesDir)
+	return listFiles(themesDir)
 		.filter((f) => f.endsWith('.css'))
 		.map((f) => f.replace(/\.css$/, ''))
+}
 
-	console.info('Rokkit Themes\n')
+function printThemeSection(label, items) {
+	if (items.length === 0) return
+	console.info(label)
+	for (const t of items) console.info(`    ${t}`)
+}
 
-	if (builtIn.length > 0) {
-		console.info('  Built-in (from @rokkit/themes):')
-		for (const t of builtIn) console.info(`    ${t}`)
-	}
-	if (custom.length > 0) {
-		console.info('\n  Custom (src/themes/):')
-		for (const t of custom) console.info(`    ${t}`)
-	}
+function printThemeList(builtIn, custom) {
+	console.info('Rokkit Themes\n')
+	printThemeSection('  Built-in (from @rokkit/themes):', builtIn)
+	printThemeSection('\n  Custom (src/themes/):', custom)
 	if (builtIn.length === 0 && custom.length === 0) {
 		console.info('  No themes found.')
 		console.info('  Run `rokkit theme create --name <name>` to scaffold a custom theme.')
 	}
 }
 
+export async function runThemeList(adapters = {}) {
+	const config = await loadConfig(adapters)
+	const builtIn = config?.themes ?? []
+	const custom = getCustomThemes(adapters)
+	printThemeList(builtIn, custom)
+}
+
 /**
  * Create a new custom theme CSS stub at src/themes/<name>.css.
  * @param {string} name
@@ -100,17 +105,22 @@ export async function runThemeList(adapters = {}) {
  *   cwd?: string
  * }} adapters
  */
-export async function runThemeCreate(name, adapters = {}) {
+function resolveThemeAdapters(adapters) {
+	return {
+		cwd: adapters.cwd ?? process.cwd(),
+		writeFile: adapters.writeFile ?? writeFileSync,
+		exists: adapters.exists ?? existsSync,
+		mkdir: adapters.mkdir ?? ((dir) => mkdirSync(dir, { recursive: true }))
+	}
+}
+
+export function runThemeCreate(name, adapters = {}) {
 	if (!name) {
 		console.error('Usage: rokkit theme create --name <name>')
 		return
 	}
 
-	const cwd = adapters.cwd ?? process.cwd()
-	const writeFile = adapters.writeFile ?? writeFileSync
-	const exists = adapters.exists ?? existsSync
-	const mkdir = adapters.mkdir ?? ((dir) => mkdirSync(dir, { recursive: true }))
-
+	const { cwd, writeFile, exists, mkdir } = resolveThemeAdapters(adapters)
 	const themesDir = resolve(cwd, 'src/themes')
 	const filePath = join(themesDir, `${name}.css`)
 
@@ -136,7 +146,7 @@ export async function runThemeCreate(name, adapters = {}) {
  */
 export async function theme(sub, opts = {}) {
 	if (sub === 'create') {
-		await runThemeCreate(opts.name)
+		runThemeCreate(opts.name)
 	} else {
 		await runThemeList()
 	}

package/src/upgrade.js

@@ -51,69 +51,92 @@ export function buildInstallCommand(pm, packages) {
  *   runInstall?: (bin: string, args: string[]) => void
  * }} adapters — injectable for testing
  */
-export function runUpgrade(opts = {}, adapters = {}) {
-	const cwd = process.cwd()
-	const readFile = adapters.readFile ?? ((p) => readFileSync(p, 'utf-8'))
-	const exists = adapters.exists ?? ((p) => existsSync(p))
-	const fetchVersion =
-		adapters.fetchVersion ??
-		((name) => {
-			try {
-				return execFileSync('npm', ['view', name, 'version'], { encoding: 'utf-8' }).trim()
-			} catch {
-				return null
-			}
-		})
-	const runInstall =
-		adapters.runInstall ??
-		((bin, args) => execFileSync(bin, args, { stdio: 'inherit' }))
+function resolveUpgradeAdapters(adapters) {
+	return {
+		readFile: adapters.readFile ?? ((p) => readFileSync(p, 'utf-8')),
+		exists: adapters.exists ?? ((p) => existsSync(p)),
+		fetchVersion:
+			adapters.fetchVersion ??
+			((name) => {
+				try {
+					return execFileSync('npm', ['view', name, 'version'], { encoding: 'utf-8' }).trim()
+				} catch {
+					return null
+				}
+			}),
+		runInstall: adapters.runInstall ?? ((bin, args) => execFileSync(bin, args, { stdio: 'inherit' }))
+	}
+}
+
+function formatPackageStatus(pkg, latest) {
+	if (!latest) return `OK   ${pkg.name}  ${pkg.current}`
+	if (latest === pkg.current) return `OK   ${pkg.name}  ${pkg.current}`
+	return `OUT  ${pkg.name}  ${pkg.current} → ${latest}`
+}
+
+function checkPackageVersion(pkg, fetchVersion, upgrades) {
+	const latest = fetchVersion(pkg.name)
+	console.info(`  ${formatPackageStatus(pkg, latest)}`)
+	if (latest && latest !== pkg.current) upgrades.push(`${pkg.name}@${latest}`)
+}
+
+function checkUpgrades(packages, fetchVersion) {
+	const upgrades = []
+	for (const pkg of packages) {
+		checkPackageVersion(pkg, fetchVersion, upgrades)
+	}
+	return upgrades
+}
+
+function applyUpgrades(upgrades, pm, apply, runInstall) {
+	const { bin, args } = buildInstallCommand(pm, upgrades)
+	const cmdStr = `${bin} ${args.join(' ')}`
+	if (apply) {
+		console.info(`\nRunning: ${cmdStr}\n`)
+		runInstall(bin, args)
+		console.info('\nUpgrade complete.')
+	} else {
+		console.info(`\n${upgrades.length} package(s) can be upgraded.`)
+		console.info(`Run with --apply to install, or manually:\n  ${cmdStr}`)
+	}
+}
 
+function loadPackages(cwd, readFile, exists) {
 	const pkgPath = resolve(cwd, 'package.json')
 	if (!exists(pkgPath)) {
 		console.error('No package.json found in current directory.')
-		return
+		return null
 	}
-
-	const pkgJson = JSON.parse(readFile(pkgPath))
-	const packages = getRokkitPackages(pkgJson)
-
+	const packages = getRokkitPackages(JSON.parse(readFile(pkgPath)))
 	if (packages.length === 0) {
 		console.info('No @rokkit/* packages found in package.json.')
-		return
+		return null
 	}
+	return packages
+}
 
+function detectPm(cwd, exists) {
 	const LOCKFILES = ['bun.lock', 'bun.lockb', 'pnpm-lock.yaml', 'yarn.lock', 'package-lock.json']
-	const presentLockfiles = LOCKFILES.filter((f) => exists(resolve(cwd, f)))
-	const pm = detectPackageManager(presentLockfiles)
+	return detectPackageManager(LOCKFILES.filter((f) => exists(resolve(cwd, f))))
+}
 
-	console.info('Rokkit Upgrade\n')
+export function runUpgrade(opts = {}, adapters = {}) {
+	const cwd = process.cwd()
+	const { readFile, exists, fetchVersion, runInstall } = resolveUpgradeAdapters(adapters)
 
-	const upgrades = []
-	for (const pkg of packages) {
-		const latest = fetchVersion(pkg.name)
-		const upToDate = latest && latest === pkg.current
-		const status = !latest ? '?' : upToDate ? 'up-to-date' : 'outdated'
-		const arrow = latest ? `${pkg.current} → ${latest}` : pkg.current
-		console.info(`  ${status === 'outdated' ? 'OUT' : 'OK '}  ${pkg.name}  ${arrow}`)
-		if (!upToDate && latest) upgrades.push(`${pkg.name}@${latest}`)
-	}
+	const packages = loadPackages(cwd, readFile, exists)
+	if (!packages) return
 
+	const pm = detectPm(cwd, exists)
+	console.info('Rokkit Upgrade\n')
+
+	const upgrades = checkUpgrades(packages, fetchVersion)
 	if (upgrades.length === 0) {
 		console.info('\nAll packages are up to date.')
 		return
 	}
 
-	const { bin, args } = buildInstallCommand(pm, upgrades)
-	const cmdStr = `${bin} ${args.join(' ')}`
-
-	if (opts.apply) {
-		console.info(`\nRunning: ${cmdStr}\n`)
-		runInstall(bin, args)
-		console.info('\nUpgrade complete.')
-	} else {
-		console.info(`\n${upgrades.length} package(s) can be upgraded.`)
-		console.info(`Run with --apply to install, or manually:\n  ${cmdStr}`)
-	}
+	applyUpgrades(upgrades, pm, opts.apply, runInstall)
 }
 
 /**