@rokkit/cli 1.3.15 → 1.4.1

package/src/skills.js

@@ -24,12 +24,26 @@ export function parseFrontmatter(md) {
 	// Keep these as literal regexes — do NOT collapse into a dynamic
 	// `new RegExp(`^${key}:...`)` helper: the keys are fixed, so the dynamic form
 	// adds nothing but trips the no-dynamic-regex lint, and the literals are
-	// plainly linear-time. The `?.[1]?.trim() ?? ''` chain returns '' for a
-	// missing block, a missing field, or a bare `key:` with no value.
-	const block = md.match(/^---\n([\s\S]*?)\n---/)?.[1] ?? ''
-	const name = block.match(/^name:\s*(.+)$/m)?.[1]?.trim() ?? ''
-	const description = block.match(/^description:\s*(.+)$/m)?.[1]?.trim() ?? ''
-	return { name, description }
+	// plainly linear-time.
+	//
+	// The block is captured UNTRIMMED on purpose: the field regexes are anchored
+	// with `^`, so indented frontmatter should miss, exactly as before.
+	const block = capture(md, /^---\n([\s\S]*?)\n---/)
+	return {
+		name: capture(block, /^name:\s*(.+)$/m).trim(),
+		description: capture(block, /^description:\s*(.+)$/m).trim()
+	}
+}
+
+/**
+ * First capture group of `re` in `text`, or `''` when there is no match — so a
+ * missing block, a missing field and a bare `key:` all collapse to `''`.
+ * @param {string} text
+ * @param {RegExp} re
+ * @returns {string}
+ */
+function capture(text, re) {
+	return text.match(re)?.[1] ?? ''
 }
 
 /**
@@ -72,7 +86,7 @@ export function installSkills(
  * Print the catalog, marking already-installed skills.
  * @param {{ skillsDir?: string, cwd?: string }} [opts]
  */
-export async function runSkillsList({ skillsDir, cwd = process.cwd() } = {}) {
+export function runSkillsList({ skillsDir, cwd = process.cwd() } = {}) {
 	const catalog = listSkills({ skillsDir })
 	if (catalog.length === 0) {
 		console.info('No skills available.')
@@ -98,35 +112,47 @@ export async function runSkillsAdd(
 	{ all = false, force = false, skillsDir, cwd = process.cwd() } = {}
 ) {
 	const catalog = listSkills({ skillsDir })
-	let selected = names
-	if (all) {
-		selected = catalog.map((s) => s.name)
-	} else if (selected.length === 0) {
-		const res = await prompts({
-			type: 'multiselect',
-			name: 'picked',
-			message: 'Select skills to add',
-			choices: catalog.map((s) => ({ title: s.name, value: s.name, description: s.description }))
-		})
-		selected = res.picked ?? []
-	}
+	const selected = await resolveSkillSelection(names, catalog, all)
 	if (selected.length === 0) {
 		console.info('No skills selected.')
 		return
 	}
 	const results = installSkills(selected, { cwd, force, skillsDir })
-	for (const r of results) {
-		if (r.status === 'added') console.info(`  added .claude/skills/${r.name}`)
-		else if (r.status === 'skipped')
-			console.info(`  skipped ${r.name} (exists — use --force to overwrite)`)
-		else console.error(`  unknown skill: ${r.name}`)
-	}
+	results.forEach(reportSkillResult)
 	if (results.some((r) => r.status === 'unknown')) {
 		console.error(`\nValid skills: ${catalog.map((s) => s.name).join(', ')}`)
 		process.exitCode = 1
 	}
 }
 
+/**
+ * Which skills to install: everything with `--all`, the named ones, or an
+ * interactive pick when neither was given.
+ * @param {string[]} names
+ * @param {Array<{ name: string, description: string }>} catalog
+ * @param {boolean} all
+ * @returns {Promise<string[]>}
+ */
+async function resolveSkillSelection(names, catalog, all) {
+	if (all) return catalog.map((s) => s.name)
+	if (names.length > 0) return names
+	const res = await prompts({
+		type: 'multiselect',
+		name: 'picked',
+		message: 'Select skills to add',
+		choices: catalog.map((s) => ({ title: s.name, value: s.name, description: s.description }))
+	})
+	return res.picked ?? []
+}
+
+/** Report one install outcome. Unknown names go to stderr — they're a user error. */
+function reportSkillResult(r) {
+	if (r.status === 'added') console.info(`  added .claude/skills/${r.name}`)
+	else if (r.status === 'skipped')
+		console.info(`  skipped ${r.name} (exists — use --force to overwrite)`)
+	else console.error(`  unknown skill: ${r.name}`)
+}
+
 /**
  * CLI entry for `rokkit skills` subcommands.
  * @param {'list' | 'add'} sub

package/src/validate.js

@@ -8,41 +8,48 @@
  * @param {Record<string, unknown> | null} config
  * @returns {Array<{ id: string, label: string, status: 'warn', fixable: false, fix: string }>}
  */
+/** True when the config still uses the back-compat `colors:` key instead of `skin:`. */
+function usesLegacyColorsAlias({ colors, skin }) {
+	return typeof colors === 'object' && colors !== null && !Array.isArray(colors) && !skin
+}
+
+/** True when oklch values are requested but no `palettes` block supplies them. */
+function oklchWithoutPalettes(config) {
+	return config.colorSpace === 'oklch' && Object.keys(config.palettes ?? {}).length === 0
+}
+
+/**
+ * The config-shape rules, in report order: a predicate plus the advisory it
+ * emits. Adding a rule is a new entry rather than another `if` block, and each
+ * predicate stays small enough to read on its own.
+ */
+const SHAPE_RULES = [
+	{
+		when: ({ colormap }) => !('ink' in colormap),
+		id: 'skin-ink-role',
+		label: 'skin defines an `ink` role',
+		fix: "Add `ink: '<palette>'` (reusing the surface palette is fine) — without it, ink-* text tokens fall back to the surface palette."
+	},
+	{
+		when: ({ config }) => oklchWithoutPalettes(config),
+		id: 'oklch-needs-palettes',
+		label: 'colorSpace `oklch` has a `palettes` block',
+		fix: 'oklch values need a `palettes` block of bare "L C H" components; Tailwind named colors are rgb.'
+	},
+	{
+		when: ({ config }) => usesLegacyColorsAlias(config),
+		id: 'colors-alias',
+		label: 'config uses `skin` (not the legacy `colors` alias)',
+		fix: 'Rename `colors:` to `skin:` — `colors` is a back-compat alias.'
+	}
+]
+
 export function validateConfigShape(config) {
 	if (!config) return []
-	const checks = []
-	const usesColorsAlias =
-		typeof config.colors === 'object' && config.colors !== null && !Array.isArray(config.colors) && !config.skin
 	const colormap = config.skins?.default ?? config.skin ?? config.colors ?? {}
-
-	if (!('ink' in colormap)) {
-		checks.push({
-			id: 'skin-ink-role',
-			label: 'skin defines an `ink` role',
-			status: 'warn',
-			fixable: false,
-			fix: "Add `ink: '<palette>'` (reusing the surface palette is fine) — without it, ink-* text tokens fall back to the surface palette."
-		})
-	}
-	if (config.colorSpace === 'oklch' && Object.keys(config.palettes ?? {}).length === 0) {
-		checks.push({
-			id: 'oklch-needs-palettes',
-			label: 'colorSpace `oklch` has a `palettes` block',
-			status: 'warn',
-			fixable: false,
-			fix: 'oklch values need a `palettes` block of bare "L C H" components; Tailwind named colors are rgb.'
-		})
-	}
-	if (usesColorsAlias) {
-		checks.push({
-			id: 'colors-alias',
-			label: 'config uses `skin` (not the legacy `colors` alias)',
-			status: 'warn',
-			fixable: false,
-			fix: 'Rename `colors:` to `skin:` — `colors` is a back-compat alias.'
-		})
-	}
-	return checks
+	return SHAPE_RULES.filter((rule) => rule.when({ config, colormap })).map(
+		({ id, label, fix }) => ({ id, label, status: 'warn', fixable: false, fix })
+	)
 }
 
 /**
@@ -62,19 +69,30 @@ const TEXT_MISUSE_PATTERNS = [
  * @param {{ list?: (dir: string) => string[], exists: (p: string) => boolean, read: (p: string) => string, resolve: (p: string) => string }} fs
  * @returns {Array<{ id: string, label: string, status: 'warn', fixable: false, fix: string }>}
  */
+/**
+ * `path:line` for every line of `source` that misuses a surface token as text
+ * colour. Paths are reported relative to the cwd when they sit under it.
+ * @param {string} file
+ * @param {string} source
+ * @param {string} cwd
+ * @returns {string[]}
+ */
+function misuseHits(file, source, cwd) {
+	const display = file.startsWith(cwd) ? file.slice(cwd.length).replace(/^\//, '') : file
+	return source
+		.split('\n')
+		.map((line, i) => (TEXT_MISUSE_PATTERNS.some((re) => re.test(line)) ? `${display}:${i + 1}` : null))
+		.filter(Boolean)
+}
+
 export function checkTextTokenUsage(fs) {
 	if (typeof fs.list !== 'function' || !fs.exists(fs.resolve('src'))) return []
 
 	const cwd = process.cwd()
-	const hits = []
-	for (const file of fs.list(fs.resolve('src'))) {
-		if (!file.endsWith('.css') && !file.endsWith('.svelte')) continue
-		const lines = fs.read(file).split('\n')
-		const display = file.startsWith(cwd) ? file.slice(cwd.length).replace(/^\//, '') : file
-		lines.forEach((line, i) => {
-			if (TEXT_MISUSE_PATTERNS.some((re) => re.test(line))) hits.push(`${display}:${i + 1}`)
-		})
-	}
+	const hits = fs
+		.list(fs.resolve('src'))
+		.filter((file) => file.endsWith('.css') || file.endsWith('.svelte'))
+		.flatMap((file) => misuseHits(file, fs.read(file), cwd))
 
 	if (hits.length === 0) return []
 	return [