@shortwind/cli 0.1.0-beta.2 → 0.1.0-beta.5

package/dist/{bench-NKKDz3ld.js → bench-CUJJk5AC.js}

@@ -1,10 +1,10 @@
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { mkdir, open, readFile, rename, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { applyEdits, modify, parse } from "jsonc-parser";
 import { buildRegistry, isReservedRecipeName, parseRecipeFile, renderSkillMarkdown } from "@shortwind/core";
 import { createHash } from "node:crypto";
-import { fileURLToPath } from "node:url";
 import { glob } from "tinyglobby";
 import chokidar from "chokidar";
 import { Tiktoken } from "js-tiktoken/lite";
@@ -116,6 +116,56 @@ function createRegistrySource(origin) {
 	if (origin.startsWith("http://") || origin.startsWith("https://")) return httpSource(origin);
 	return fileSource(origin);
 }
+async function resolveSource(origin) {
+	if (origin && origin !== "bundled:@shortwind/catalog") return createRegistrySource(origin);
+	return defaultCatalogSource();
+}
+const CATALOG_PACKAGE = "@shortwind/catalog";
+const NPM_TIMEOUT_MS = 3e3;
+async function defaultCatalogSource() {
+	try {
+		const cdn = httpSource(`https://cdn.jsdelivr.net/npm/${CATALOG_PACKAGE}@${await resolveCatalogVersion()}/dist/registry`);
+		await cdn.loadPresets();
+		return cdn;
+	} catch {
+		return bundledSource();
+	}
+}
+async function resolveCatalogVersion() {
+	const res = await fetch(`https://registry.npmjs.org/${CATALOG_PACKAGE}`, {
+		signal: AbortSignal.timeout(NPM_TIMEOUT_MS),
+		headers: { accept: "application/vnd.npm.install-v1+json" }
+	});
+	if (!res.ok) throw new Error(`npm: ${res.status}`);
+	const tags = (await res.json())["dist-tags"] ?? {};
+	const version = tags["latest"] ?? tags["beta"];
+	if (!version) throw new Error("no published catalog version");
+	return version;
+}
+const BUNDLED_ORIGIN = "bundled:@shortwind/catalog";
+function bundledSource() {
+	let cache = null;
+	const load = () => {
+		cache ??= import("./catalog.generated-B_ds7MPV.js");
+		return cache;
+	};
+	return {
+		origin: BUNDLED_ORIGIN,
+		async loadPresets() {
+			return (await load()).CATALOG_PRESETS;
+		},
+		async loadFamily(family) {
+			assertValidFamilyName(family);
+			const { CATALOG_RECIPES } = await load();
+			const css = CATALOG_RECIPES[family];
+			if (css === void 0) throw new Error(`unknown family: ${family}`);
+			return css;
+		},
+		async listAllFamilies() {
+			return [...(await load()).CATALOG_FAMILIES];
+		}
+	};
+}
 function fileSource(origin) {
 	const root = origin.startsWith("file://") ? fileURLToPath(origin) : origin;
 	return {
@@ -423,17 +473,54 @@ function addImport(source, line) {
 	return source.slice(0, lastEnd) + `\n${line}` + source.slice(lastEnd);
 }
 //#endregion
+//#region src/agents-file.ts
+const MARKER = "skills/shortwind/SKILL.md";
+function line(skillRel) {
+	return `For UI, prefer Shortwind \`@recipe\` class names (e.g. \`@card\`, \`@btn-primary\`, \`@row\`) over raw Tailwind where a recipe fits — full catalog in \`${skillRel}\`.`;
+}
+const CANDIDATES = ["AGENTS.md", "CLAUDE.md"];
+async function wireAgentsInstructions(cwd, skillPath) {
+	const pointer = line(path.relative(cwd, skillPath).split(path.sep).join("/"));
+	let touched = null;
+	for (const name of CANDIDATES) {
+		const file = path.join(cwd, name);
+		if (!existsSync(file)) continue;
+		const current = await readFile(file, "utf8");
+		if (current.includes(MARKER)) {
+			touched ??= {
+				path: file,
+				action: "skipped"
+			};
+			continue;
+		}
+		await writeFile(file, current + (current.endsWith("\n\n") ? "" : current.endsWith("\n") ? "\n" : "\n\n") + pointer + "\n");
+		return {
+			path: file,
+			action: "appended"
+		};
+	}
+	if (touched) return touched;
+	const target = path.join(cwd, "AGENTS.md");
+	await writeFile(target, `# AGENTS.md\n\n${pointer}\n`);
+	return {
+		path: target,
+		action: "created"
+	};
+}
+//#endregion
 //#region src/init.ts
-const DEFAULT_REGISTRY = "https://shortwind.dev/registry";
+const DEFAULT_REGISTRY = BUNDLED_ORIGIN;
 async function init(options) {
 	const cwd = path.resolve(options.cwd);
-	const registry = options.registry ?? "https://shortwind.dev/registry";
-	const source = createRegistrySource(registry);
+	const registry = options.registry ?? DEFAULT_REGISTRY;
+	const source = await resolveSource(registry);
 	const shape = detectProject(cwd);
 	const families = await resolveFamilies(options.preset, source);
 	const pkgs = pickPackages(shape.bundler);
+	const version = cliVersion();
+	const specs = version ? pkgs.map((p) => `${p}@${version}`) : pkgs;
 	const installer = options.installPackages ?? defaultInstall;
-	if (pkgs.length > 0) await installer(shape.packageManager, pkgs, cwd);
+	if (specs.length > 0) await installer(shape.packageManager, specs, cwd);
 	const recipesDir = path.join(cwd, "recipes");
 	const { installed, skipped } = await copyRecipes(source, families, recipesDir);
 	await updateLockfile(recipesDir, registry, installed);
@@ -450,6 +537,7 @@ async function init(options) {
 	await writeSkillMd(skillPath, recipesDir, families);
 	const theme = await scaffoldTheme(cwd);
 	const bundlerConfig = await wireBundler(cwd, shape.bundler);
+	const agentsFile = await wireAgentsInstructions(cwd, skillPath);
 	return {
 		packageManager: shape.packageManager,
 		preset: options.preset,
@@ -466,13 +554,23 @@ async function init(options) {
 		themeAction: theme.action,
 		bundlerConfigPath: bundlerConfig.configPath,
 		bundlerConfigAction: bundlerConfig.action,
-		...bundlerConfig.snippet ? { bundlerConfigSnippet: bundlerConfig.snippet } : {}
+		...bundlerConfig.snippet ? { bundlerConfigSnippet: bundlerConfig.snippet } : {},
+		agentsFilePath: agentsFile.path,
+		agentsFileAction: agentsFile.action
 	};
 }
 async function resolveFamilies(preset, source) {
 	if (preset === "none") return [];
 	return resolvePresetFamilies(preset, await source.loadPresets(), await source.listAllFamilies());
 }
+function cliVersion() {
+	try {
+		const pkgUrl = new URL("../package.json", import.meta.url);
+		return JSON.parse(readFileSync(fileURLToPath(pkgUrl), "utf8")).version ?? null;
+	} catch {
+		return null;
+	}
+}
 function pickPackages(bundler) {
 	const base = ["@shortwind/tailwind"];
 	switch (bundler) {
@@ -698,7 +796,7 @@ async function add(options) {
 	const cwd = path.resolve(options.cwd);
 	const config = await readConfig(cwd);
 	const registry = options.registry ?? config.registry;
-	const source = createRegistrySource(registry);
+	const source = await resolveSource(registry);
 	const recipesDir = path.join(cwd, config.recipesDir);
 	await mkdir(recipesDir, { recursive: true });
 	const lock = await readLockfile(recipesDir);
@@ -854,11 +952,55 @@ async function newFamily(options) {
 	};
 }
 //#endregion
+//#region src/commands/reseal.ts
+async function reseal(options) {
+	const cwd = path.resolve(options.cwd);
+	const config = await readConfig(cwd);
+	const recipesDir = path.join(cwd, config.recipesDir);
+	const families = options.families && options.families.length > 0 ? options.families : installedFamilies(recipesDir);
+	const lock = await readLockfile(recipesDir);
+	const resealed = [];
+	const unchanged = [];
+	const notFound = [];
+	const noHeader = [];
+	for (const family of families) {
+		const file = path.join(recipesDir, `${family}.css`);
+		if (!existsSync(file)) {
+			notFound.push(family);
+			continue;
+		}
+		const source = readFileSync(file, "utf8");
+		const header = extractHeader(source);
+		if (!header) {
+			noHeader.push(family);
+			continue;
+		}
+		const sha = computeBodySha(source);
+		if (sha === header.sha && lock.families[family]?.sha === sha) {
+			unchanged.push(family);
+			continue;
+		}
+		await writeFile(file, rewriteHeaderSha(source, sha));
+		lock.families[family] = {
+			version: header.version,
+			sha
+		};
+		resealed.push(family);
+	}
+	await writeLockfile(recipesDir, lock);
+	return {
+		resealed,
+		unchanged,
+		notFound,
+		noHeader
+	};
+}
+//#endregion
 //#region src/commands/preset.ts
 async function preset(options) {
 	const cwd = path.resolve(options.cwd);
 	const config = await readConfig(cwd);
-	const source = createRegistrySource(options.registry ?? config.registry);
+	const source = await resolveSource(options.registry ?? config.registry);
 	if (options.name === "none") throw new Error("Use `shortwind remove` to uninstall families; preset 'none' is for `init` only.");
 	const presets = await source.loadPresets();
 	const all = await source.listAllFamilies();
@@ -887,7 +1029,7 @@ async function ls(options) {
 	});
 	let available = [];
 	if (!options.installedOnly) {
-		const source = createRegistrySource(options.registry ?? config.registry);
+		const source = await resolveSource(options.registry ?? config.registry);
 		try {
 			available = await source.listAllFamilies();
 		} catch {
@@ -1061,7 +1203,7 @@ async function upgrade(options) {
 	const cwd = path.resolve(options.cwd);
 	const config = await readConfig(cwd);
 	const registry = options.registry ?? config.registry;
-	const source = options.source ?? createRegistrySource(registry);
+	const source = options.source ?? await resolveSource(registry);
 	const recipesDir = path.join(cwd, config.recipesDir);
 	const installed = installedFamilies(recipesDir);
 	const targets = options.families && options.families.length > 0 ? options.families : installed;
@@ -1766,6 +1908,7 @@ function checkDynamicClass(file, dynamicTokens) {
 const CLASS_ATTR_STR_RE = /\b(?:class|className)\s*=\s*(["'])([^"']*)\1/g;
 const CLASS_ATTR_BRACE_RE = /\b(?:class|className)\s*=\s*\{/g;
 const STRING_LITERAL_RE = /(["'`])((?:\\.|(?!\1)[^\\])*)\1/g;
+const CALL_EXPANDER_RE = /\b(?:cva|tv)\s*\(/g;
 function extractClassUsages(source) {
 	const usages = [];
 	for (const m of source.matchAll(CLASS_ATTR_STR_RE)) {
@@ -1804,6 +1947,28 @@ function extractClassUsages(source) {
 			});
 		}
 	}
+	for (const m of source.matchAll(CALL_EXPANDER_RE)) {
+		const openParen = (m.index ?? 0) + m[0].length - 1;
+		const close = findMatchingDelimiter(source, openParen, "(", ")");
+		if (close === -1) continue;
+		const inner = source.slice(openParen + 1, close);
+		for (const sm of inner.matchAll(STRING_LITERAL_RE)) {
+			const value = sm[2] ?? "";
+			if (value.length === 0) continue;
+			const literalStart = openParen + 1 + (sm.index ?? 0);
+			const valueStart = literalStart + 1;
+			const { tokens, dynamicTokens } = tokenizeClassString(source, value, valueStart);
+			if (!tokens.some((t) => t.value.startsWith("@")) && dynamicTokens.length === 0) continue;
+			usages.push({
+				fileOffset: literalStart,
+				valueStart,
+				raw: value,
+				tokens,
+				dynamicTokens,
+				fixable: false
+			});
+		}
+	}
 	return usages;
 }
 function tokenizeClassString(source, value, valueStart) {
@@ -1838,6 +2003,9 @@ function tokenizeClassString(source, value, valueStart) {
 	};
 }
 function findMatchingBrace(source, openIdx) {
+	return findMatchingDelimiter(source, openIdx, "{", "}");
+}
+function findMatchingDelimiter(source, openIdx, open, close) {
 	let depth = 1;
 	let i = openIdx + 1;
 	while (i < source.length && depth > 0) {
@@ -1883,8 +2051,8 @@ function findMatchingBrace(source, openIdx) {
 			}
 			continue;
 		}
-		if (ch === "{") depth++;
-		else if (ch === "}") depth--;
+		if (ch === open) depth++;
+		else if (ch === close) depth--;
 		i++;
 	}
 	return depth === 0 ? i - 1 : -1;
@@ -2108,6 +2276,6 @@ function formatBenchTable(result) {
 	return lines.join("\n");
 }
 //#endregion
-export { extractHeader as A, readLockfile as C, detectProject as D, resolvePresetFamilies as E, rewriteHeaderSha as M, sealRecipeFile as N, buildHeaderLine as O, init as S, createRegistrySource as T, newFamily as _, formatFindingsText as a, renameFamilyInSource as b, UpgradeError as c, BuildError as d, build as f, NewFamilyError as g, preset as h, extractClassUsages as i, normalizeBody as j, computeBodySha as k, upgrade as l, ls as m, formatBenchTable as n, lint as o, formatLsText as p, ALL_RULES as r, verify as s, bench as t, dev as u, remove as v, writeLockfile as w, DEFAULT_REGISTRY as x, add as y };
+export { buildHeaderLine as A, cliVersion as C, createRegistrySource as D, writeLockfile as E, sealRecipeFile as F, extractHeader as M, normalizeBody as N, resolvePresetFamilies as O, rewriteHeaderSha as P, DEFAULT_REGISTRY as S, readLockfile as T, NewFamilyError as _, formatFindingsText as a, add as b, UpgradeError as c, BuildError as d, build as f, reseal as g, preset as h, extractClassUsages as i, computeBodySha as j, detectProject as k, upgrade as l, ls as m, formatBenchTable as n, lint as o, formatLsText as p, ALL_RULES as r, verify as s, bench as t, dev as u, newFamily as v, init as w, renameFamilyInSource as x, remove as y };
 
-//# sourceMappingURL=bench-NKKDz3ld.js.map
+//# sourceMappingURL=bench-CUJJk5AC.js.map