@mochi-css/tsuki 2.0.0 → 2.1.0

package/dist/index.js

@@ -103,7 +103,7 @@ async function runInstall(title, command, args, packages) {
 		throw err;
 	}
 }
-async function installPackages(packages) {
+async function installPackages(packages, autoInstall = false) {
 	if (packages.length === 0) return;
 	const packageManager = await (0, package_manager_detector.detect)({ strategies: [
 		"packageManager-field",
@@ -117,10 +117,12 @@ async function installPackages(packages) {
 	const devPackages = packages.filter((pkg) => pkg.dev !== false).map((pkg) => pkg.name);
 	const prodPackages = packages.filter((pkg) => pkg.dev === false).map((pkg) => pkg.name);
 	const packageList = [...devPackages.map((name) => `${name} (dev)`), ...prodPackages.map((name) => name)].join(", ");
-	const confirmed = await __clack_prompts.confirm({ message: `Install the following packages: ${packageList}?` });
-	if (__clack_prompts.isCancel(confirmed) || !confirmed) {
-		__clack_prompts.log.info("Skipping package installation");
-		return;
+	if (!autoInstall) {
+		const confirmed = await __clack_prompts.confirm({ message: `Install the following packages: ${packageList}?` });
+		if (__clack_prompts.isCancel(confirmed) || !confirmed) {
+			__clack_prompts.log.info("Skipping package installation");
+			return;
+		}
 	}
 	if (devPackages.length > 0) {
 		const cmd = (0, package_manager_detector.resolveCommand)(agent, "add", [devFlag, ...devPackages]);
@@ -143,7 +145,8 @@ var ModuleRunner = class {
 		this.modules.push(module$1);
 		return this;
 	}
-	async run() {
+	async run(options = {}) {
+		const { nonInteractive = false, autoInstall = false, moduleOptions = {} } = options;
 		const ctx = {
 			requirePackage: (name, dev = true) => {
 				this.packages.push({
@@ -156,10 +159,12 @@ var ModuleRunner = class {
 					name: pkg.name,
 					dev: pkg.dev ?? true
 				});
-			}
+			},
+			nonInteractive,
+			moduleOptions
 		};
 		for (const module$1 of this.modules) await module$1.run(ctx);
-		if (this.packages.length > 0) await installPackages(this.packages);
+		if (this.packages.length > 0) await installPackages(this.packages, autoInstall);
 	}
 };
 
@@ -304,7 +309,10 @@ function createPostcssModule(options = {}) {
 		name: "PostCSS",
 		async run(ctx) {
 			let configPath;
-			if (options.auto) configPath = findPostcssConfig() ?? "postcss.config.mts";
+			const { postcss: cliOption } = ctx.moduleOptions;
+			if (cliOption !== void 0) configPath = typeof cliOption === "string" ? cliOption : findPostcssConfig() ?? "postcss.config.mts";
+			else if (options.auto) configPath = findPostcssConfig() ?? "postcss.config.mts";
+			else if (ctx.nonInteractive) return;
 			else {
 				const usePostcss = await __clack_prompts.confirm({ message: "Do you use PostCSS?" });
 				if (__clack_prompts.isCancel(usePostcss) || !usePostcss) return;
@@ -428,8 +436,12 @@ const viteModule = {
 	name: "Vite",
 	async run(ctx) {
 		const existingConfig = findViteConfig();
+		const { vite: cliOption } = ctx.moduleOptions;
 		let configPath;
-		if (!existingConfig) {
+		if (cliOption !== void 0) configPath = typeof cliOption === "string" ? cliOption : existingConfig ?? "vite.config.ts";
+		else if (existingConfig) configPath = existingConfig;
+		else if (ctx.nonInteractive) configPath = "vite.config.ts";
+		else {
 			const selected = await __clack_prompts.text({
 				message: "Path to Vite config",
 				placeholder: "vite.config.ts",
@@ -437,7 +449,7 @@ const viteModule = {
 			});
 			if (__clack_prompts.isCancel(selected)) return;
 			configPath = selected;
-		} else configPath = existingConfig;
+		}
 		if (!fs_extra.default.existsSync(configPath)) {
 			await fs_promises.default.writeFile(configPath, defaultViteConfig);
 			__clack_prompts.log.success("Created vite config with mochi plugin");
@@ -503,8 +515,12 @@ const nextModule = {
 	name: "Next.js",
 	async run(ctx) {
 		const existingConfig = findNextConfig();
+		const { next: cliOption } = ctx.moduleOptions;
 		let configPath;
-		if (!existingConfig) {
+		if (cliOption !== void 0) configPath = typeof cliOption === "string" ? cliOption : existingConfig ?? "next.config.ts";
+		else if (existingConfig) configPath = existingConfig;
+		else if (ctx.nonInteractive) configPath = "next.config.ts";
+		else {
 			const selected = await __clack_prompts.text({
 				message: "Path to Next.js config",
 				placeholder: "next.config.ts",
@@ -512,7 +528,7 @@ const nextModule = {
 			});
 			if (__clack_prompts.isCancel(selected)) return;
 			configPath = selected;
-		} else configPath = existingConfig;
+		}
 		if (!fs_extra.default.existsSync(configPath)) {
 			await fs_promises.default.writeFile(configPath, defaultNextConfig);
 			__clack_prompts.log.success("Created next config with mochi");
@@ -548,16 +564,21 @@ const presets = {
 
 //#endregion
 //#region src/index.ts
-commander.program.name("tsuki").description("Add mochi-css to your project").version("2.0.0").addOption(new commander.Option("-p, --preset <preset>", "Preset to use").choices([
+commander.program.name("tsuki").description("Add mochi-css to your project").version("2.1.0").addOption(new commander.Option("-p, --preset <preset>", "Preset to use").choices([
 	"vite",
 	"nextjs",
 	"lib"
-])).action(async (options) => {
+])).option("-n, --no-interactive", "Non-interactive mode: skip all prompts (treat as cancelled)").option("--install", "Auto-accept package installation without prompting").option("--postcss [path]", "Enable PostCSS module; optionally specify config path").option("--vite [path]", "Use the given Vite config path instead of prompting").option("--next [path]", "Use the given Next.js config path instead of prompting").action(async (options) => {
 	__clack_prompts.intro(picocolors.default.cyan("Installing Mochi-CSS..."));
 	try {
 		const runner = new ModuleRunner();
+		const nonInteractive = options.interactive === false;
 		let presetId = options.preset;
 		if (presetId === void 0) {
+			if (nonInteractive) {
+				__clack_prompts.outro(picocolors.default.red("Cancelled"));
+				return;
+			}
 			const selected = await __clack_prompts.select({
 				message: "Which framework are you using?",
 				options: Object.values(presets).map((preset$1) => ({
@@ -574,7 +595,16 @@ commander.program.name("tsuki").description("Add mochi-css to your project").ver
 		const preset = presets[presetId];
 		if (!preset) throw new Error(`Unknown preset: ${presetId}`);
 		preset.setup(runner);
-		await runner.run();
+		const moduleOptions = {};
+		if (options.postcss !== void 0) moduleOptions.postcss = options.postcss;
+		else if (presetId === "nextjs") moduleOptions.postcss = true;
+		if (options.vite !== void 0) moduleOptions.vite = options.vite;
+		if (options.next !== void 0) moduleOptions.next = options.next;
+		await runner.run({
+			nonInteractive,
+			autoInstall: options.install ?? false,
+			moduleOptions
+		});
 		__clack_prompts.outro(picocolors.default.green("Done!"));
 	} catch (e) {
 		if (e instanceof Error) __clack_prompts.outro(picocolors.default.red(e.message));

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@mochi-css/tsuki",
     "repository": "git@github.com:Niikelion/mochi-css.git",
-    "version": "2.0.0",
+    "version": "2.1.0",
     "license": "MIT",
     "bin": "./dist/index.js",
     "files": [
@@ -11,7 +11,6 @@
         "build": "tsc --noEmit && tsdown",
         "test": "vitest",
         "coverage": "vitest run --coverage",
-        "smoke": "jiti scripts/smoke.ts",
         "manual": "jiti scripts/manual.ts",
         "lint": "eslint src",
         "lint:fix": "eslint src --fix",