@forinda/kickjs-cli 3.0.8 → 3.1.1

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 /**
- * @forinda/kickjs-cli v3.0.8
+ * @forinda/kickjs-cli v3.1.1
  *
  * Copyright (c) Felix Orinda
  *
@@ -577,11 +577,14 @@ export class HelloModule implements AppModule {
 `;
 }
 /** Generate kick.config.ts CLI configuration */
-function generateKickConfig(template, defaultRepo = "inmemory") {
+function generateKickConfig(template, defaultRepo = "inmemory", packageManager = "pnpm") {
 	return `import { defineConfig } from '@forinda/kickjs-cli'
 
 export default defineConfig({
   pattern: '${template}',
+  // Pinned so \`kick add\` and other dep-installing commands always use the
+  // project's intended package manager, regardless of which lockfile exists.
+  packageManager: '${packageManager}',
   modules: {
     dir: 'src/modules',
     repo: ${[
@@ -1482,7 +1485,7 @@ async function initProject(options) {
 	await writeFileSafe(join(dir, "src/modules/hello/hello.controller.ts"), generateHelloController());
 	await writeFileSafe(join(dir, "src/modules/hello/hello.module.ts"), generateHelloModule());
 	if (template === "graphql") await writeFileSafe(join(dir, "src/resolvers/.gitkeep"), "");
-	await writeFileSafe(join(dir, "kick.config.ts"), generateKickConfig(template, defaultRepo));
+	await writeFileSafe(join(dir, "kick.config.ts"), generateKickConfig(template, defaultRepo, packageManager));
 	await writeFileSafe(join(dir, "vitest.config.ts"), generateVitestConfig());
 	await writeFileSafe(join(dir, "README.md"), generateReadme(name, template, packageManager));
 	await writeFileSafe(join(dir, "CLAUDE.md"), generateClaude(name, template, packageManager));
@@ -1700,7 +1703,7 @@ const OPTIONAL_PACKAGES = [
 	}
 ];
 function registerInitCommand(program) {
-	program.command("new [name]").alias("init").description("Create a new KickJS project (use \".\" for current directory)").option("-d, --directory <dir>", "Target directory (defaults to project name)").option("--pm <manager>", "Package manager: pnpm | npm | yarn").option("--git", "Initialize git repository").option("--no-git", "Skip git initialization").option("--install", "Install dependencies after scaffolding").option("--no-install", "Skip dependency installation").option("-f, --force", "Remove existing files without prompting").option("-t, --template <type>", "Project template: rest | graphql | ddd | cqrs | minimal").option("-r, --repo <type>", "Default repository: prisma | drizzle | inmemory | custom").option("--packages <packages>", "Comma-separated packages to include (e.g. auth,swagger,otel)").action(async (name, opts) => {
+	program.command("new [name]").alias("init").description("Create a new KickJS project (use \".\" for current directory)").option("-d, --directory <dir>", "Target directory (defaults to project name)").option("--pm <manager>", "Package manager: pnpm | npm | yarn | bun").option("--git", "Initialize git repository").option("--no-git", "Skip git initialization").option("--install", "Install dependencies after scaffolding").option("--no-install", "Skip dependency installation").option("-f, --force", "Remove existing files without prompting").option("-t, --template <type>", "Project template: rest | graphql | ddd | cqrs | minimal").option("-r, --repo <type>", "Default repository: prisma | drizzle | inmemory | custom").option("--packages <packages>", "Comma-separated packages to include (e.g. auth,swagger,otel)").action(async (name, opts) => {
 		intro("KickJS — Create a new project");
 		if (!name) name = await text({
 			message: "Project name",
@@ -1781,6 +1784,10 @@ function registerInitCommand(program) {
 				{
 					value: "yarn",
 					label: "yarn"
+				},
+				{
+					value: "bun",
+					label: "bun"
 				}
 			]
 		});
@@ -3329,7 +3336,7 @@ export class Prisma${pascal}Repository implements I${pascal}Repository {
 //#region src/generators/patterns/minimal.ts
 async function generateMinimalFiles(ctx) {
 	const { pascal, kebab, plural, write } = ctx;
-	await write("index.ts", generateMinimalModuleIndex({
+	await write(`${kebab}.module.ts`, generateMinimalModuleIndex({
 		pascal,
 		kebab,
 		plural
@@ -3352,7 +3359,7 @@ export class ${pascal}Controller {
 //#region src/generators/patterns/rest.ts
 async function generateRestFiles(ctx) {
 	const { pascal, kebab, plural, pluralPascal, repo, noTests, prismaClientPath, write } = ctx;
-	await write("index.ts", generateRestModuleIndex({
+	await write(`${kebab}.module.ts`, generateRestModuleIndex({
 		pascal,
 		kebab,
 		plural,
@@ -3448,7 +3455,7 @@ async function generateRestFiles(ctx) {
 //#region src/generators/patterns/cqrs.ts
 async function generateCqrsFiles(ctx) {
 	const { pascal, kebab, plural, pluralPascal, repo, noTests, prismaClientPath, write } = ctx;
-	await write("index.ts", generateCqrsModuleIndex({
+	await write(`${kebab}.module.ts`, generateCqrsModuleIndex({
 		pascal,
 		kebab,
 		plural,
@@ -3557,7 +3564,7 @@ async function generateCqrsFiles(ctx) {
 //#region src/generators/patterns/ddd.ts
 async function generateDddFiles(ctx) {
 	const { pascal, kebab, plural, pluralPascal, repo, noEntity, noTests, prismaClientPath, write } = ctx;
-	await write("index.ts", generateModuleIndex({
+	await write(`${kebab}.module.ts`, generateModuleIndex({
 		pascal,
 		kebab,
 		plural,
@@ -3732,22 +3739,24 @@ async function generateModule(options) {
 			await generateDddFiles(ctx);
 			break;
 	}
-	if (!dryRun) await autoRegisterModule$1(modulesDir, pascal, plural);
+	if (!dryRun) await autoRegisterModule$1(modulesDir, pascal, plural, kebab);
 	return files;
 }
 /** Add the new module to src/modules/index.ts */
-async function autoRegisterModule$1(modulesDir, pascal, plural) {
+async function autoRegisterModule$1(modulesDir, pascal, plural, kebab) {
 	const indexPath = join(modulesDir, "index.ts");
-	if (!await fileExists(indexPath)) {
+	const exists = await fileExists(indexPath);
+	const importPath = `./${plural}/${kebab}.module`;
+	if (!exists) {
 		await writeFileSafe(indexPath, `import type { AppModuleClass } from '@forinda/kickjs'
-import { ${pascal}Module } from './${plural}'
+import { ${pascal}Module } from '${importPath}'
 
 export const modules: AppModuleClass[] = [${pascal}Module]
 `);
 		return;
 	}
 	let content = await readFile(indexPath, "utf-8");
-	const importLine = `import { ${pascal}Module } from './${plural}'`;
+	const importLine = `import { ${pascal}Module } from '${importPath}'`;
 	if (!content.includes(`${pascal}Module`)) {
 		const lastImportIdx = content.lastIndexOf("import ");
 		if (lastImportIdx !== -1) {
@@ -4810,7 +4819,7 @@ async function generateScaffold(options) {
 		await writeFileSafe(fullPath, content);
 		files.push(fullPath);
 	};
-	await write("index.ts", genModuleIndex(pascal, kebab, plural));
+	await write(`${kebab}.module.ts`, genModuleIndex(pascal, kebab, plural));
 	await write("constants.ts", genConstants(pascal, fields));
 	await write(`presentation/${kebab}.controller.ts`, genController(pascal, kebab, plural, pluralPascal));
 	await write(`application/dtos/create-${kebab}.dto.ts`, genCreateDTO(pascal, fields));
@@ -4825,7 +4834,7 @@ async function generateScaffold(options) {
 		await write(`domain/entities/${kebab}.entity.ts`, genEntity(pascal, kebab, fields));
 		await write(`domain/value-objects/${kebab}-id.vo.ts`, genValueObject(pascal));
 	}
-	await autoRegisterModule(modulesDir, pascal, plural);
+	await autoRegisterModule(modulesDir, pascal, plural, kebab);
 	return files;
 }
 function genCreateDTO(pascal, fields) {
@@ -5208,14 +5217,16 @@ export class Delete${pascal}UseCase {
 		}
 	];
 }
-async function autoRegisterModule(modulesDir, pascal, plural) {
+async function autoRegisterModule(modulesDir, pascal, plural, kebab) {
 	const indexPath = join(modulesDir, "index.ts");
-	if (!await fileExists(indexPath)) {
-		await writeFileSafe(indexPath, `import type { AppModuleClass } from '@forinda/kickjs'\nimport { ${pascal}Module } from './${plural}'\n\nexport const modules: AppModuleClass[] = [${pascal}Module]\n`);
+	const exists = await fileExists(indexPath);
+	const importPath = `./${plural}/${kebab}.module`;
+	if (!exists) {
+		await writeFileSafe(indexPath, `import type { AppModuleClass } from '@forinda/kickjs'\nimport { ${pascal}Module } from '${importPath}'\n\nexport const modules: AppModuleClass[] = [${pascal}Module]\n`);
 		return;
 	}
 	let content = await readFile(indexPath, "utf-8");
-	const importLine = `import { ${pascal}Module } from './${plural}'`;
+	const importLine = `import { ${pascal}Module } from '${importPath}'`;
 	if (!content.includes(`${pascal}Module`)) {
 		const lastImportIdx = content.lastIndexOf("import ");
 		if (lastImportIdx !== -1) {
@@ -5276,6 +5287,12 @@ describe('${pascal}', () => {
 }
 //#endregion
 //#region src/config.ts
+const PACKAGE_MANAGERS = [
+	"pnpm",
+	"npm",
+	"yarn",
+	"bun"
+];
 const BUILTIN_REPO_TYPES = [
 	"drizzle",
 	"inmemory",
@@ -5356,6 +5373,16 @@ const DEFAULT_EXCLUDES = [
 */
 const DECORATED_CLASS_REGEX = new RegExp(String.raw`@(${DECORATOR_NAMES.join("|")})\s*\([^)]*\)` + String.raw`(?:\s*@[A-Z]\w*(?:\s*\([^)]*\))?)*` + String.raw`\s*export\s+(default\s+)?(?:abstract\s+)?class\s+(\w+)`, "g");
 /**
+* Match an exported class declaration that implements `AppModule`.
+* KickJS modules are not decorated — they implement the `AppModule`
+* interface — so the decorated-class scanner never picks them up. This
+* regex captures them by name so `ModuleToken` can be populated.
+*
+* Tolerates an `extends BaseClass` clause before `implements`, multiple
+* implements clauses (`implements Foo, AppModule`), and `default` exports.
+*/
+const APP_MODULE_CLASS_REGEX = new RegExp(String.raw`export\s+(default\s+)?(?:abstract\s+)?class\s+(\w+)` + String.raw`(?:\s+extends\s+\w+(?:<[^>]*>)?)?` + String.raw`\s+implements\s+[^{]*\bAppModule\b`, "g");
+/**
 * Match a `createToken<T>('name')` call with optional `export const X =`
 * or `const X =` prefix. Tolerates whitespace and the type parameter
 * being absent (`createToken('name')`).
@@ -5369,52 +5396,89 @@ const BARE_CREATE_TOKEN_REGEX = /createToken\s*(?:<[^>]*>)?\s*\(\s*['"`]([^'"`]+
 /** Match `@Inject('literal')` — only literals; computed args are skipped */
 const INJECT_LITERAL_REGEX = /@Inject\s*\(\s*['"`]([^'"`]+)['"`]\s*\)/g;
 /**
-* Match a route decorator immediately followed by a method declaration.
-* Captures the HTTP verb, path literal (or empty), and method name.
-*
-* Tolerates:
-* - Optional second arg to the route decorator (`@Get('/path', { ... })`)
-* - Stacked decorators between the route and the method (`@Get('/') @Use(...)`)
-* - Path-less decorators (`@Get()` → defaults to `/`)
-* - `async` modifier on the method
-*
-* Run within a class body slice (see extractRoutesFromSource) so the
-* captured method name is unambiguously a method on that class.
+* Locate the start of a route decorator: `@Get(`, `@Post(`, etc.
+* Used by `extractRoutesFromSource`; the rest of the route declaration
+* (balanced parens, stacked decorators, method name) is parsed by walking
+* the source forward from this match. The previous all-in-one regex
+* couldn't handle nested parens in stacked decorator args (e.g.
+* `@ApiResponse(201, { schema: z.object({ id: z.string() }) })`) — see
+* forinda/kick-js#108.
 */
-const ROUTE_METHOD_REGEX = new RegExp(String.raw`@(${[
+const ROUTE_DECORATOR_START = new RegExp(String.raw`@(${[
 	"Get",
 	"Post",
 	"Put",
 	"Delete",
 	"Patch"
-].join("|")})\s*\(` + String.raw`(?:\s*['"\`]([^'"\`]*)['"\`])?[^)]*\)` + String.raw`(?:\s*@[A-Z]\w*(?:\s*\([^)]*\))?)*` + String.raw`\s*(?:public\s+|private\s+|protected\s+)?(?:async\s+)?` + String.raw`([a-zA-Z_]\w*)\s*\(`, "g");
-/** Extract `:placeholder` segments from an Express route path */
-function extractPathParams(path) {
-	return (path.match(/:([a-zA-Z_]\w*)/g) ?? []).map((m) => m.slice(1));
-}
+].join("|")})\s*\(`, "g");
 /**
-* Given the matched text of a route decorator + method declaration, return
-* the substring inside the route decorator's argument list (between the
-* outermost `(` and `)`). Returns `null` if no parens are found.
-*
-* Example input:
-*   `@Post('/', { body: createTaskSchema, name: 'CreateTask' }) async create(`
-* Returns:
-*   `'/', { body: createTaskSchema, name: 'CreateTask' }`
+* Find the index of the `)` that balances the `(` at `openPos`.
+* Returns -1 if no matching `)` exists. Counts balanced parens only;
+* does not understand string literals, so a `(` or `)` inside a string
+* inside the args will skew the depth counter (matches the limitation
+* of `extractRouteOptionsArg`).
 */
-function extractRouteOptionsArg(matchedText) {
-	const open = matchedText.indexOf("(");
-	if (open < 0) return null;
+function findBalancedClose(text, openPos) {
 	let depth = 1;
-	for (let i = open + 1; i < matchedText.length; i++) {
-		const ch = matchedText[i];
+	for (let i = openPos + 1; i < text.length; i++) {
+		const ch = text[i];
 		if (ch === "(") depth++;
 		else if (ch === ")") {
 			depth--;
-			if (depth === 0) return matchedText.slice(open + 1, i);
+			if (depth === 0) return i;
 		}
 	}
-	return null;
+	return -1;
+}
+/**
+* Walk forward from the end of a route decorator past any stacked
+* decorators (`@ApiOperation(...)`, `@ApiResponse(...)`, `@Middleware(fn)`,
+* etc.), then past optional `public`/`private`/`protected` and `async`,
+* and capture the method name + opening `(`.
+*
+* Returns the method name and the position immediately after the method's
+* opening `(`, or `null` if the source between the route decorator and
+* the method body doesn't fit the expected shape.
+*/
+function readMethodAfterDecorators(block, startPos) {
+	let pos = startPos;
+	while (pos < block.length) {
+		while (pos < block.length && /\s/.test(block[pos])) pos++;
+		if (block[pos] !== "@") break;
+		const decMatch = block.slice(pos).match(/^@([A-Z]\w*)/);
+		if (!decMatch) break;
+		pos += decMatch[0].length;
+		while (pos < block.length && /\s/.test(block[pos])) pos++;
+		if (block[pos] === "(") {
+			const close = findBalancedClose(block, pos);
+			if (close < 0) return null;
+			pos = close + 1;
+		}
+	}
+	while (pos < block.length && /\s/.test(block[pos])) pos++;
+	for (const mod of [
+		"public",
+		"private",
+		"protected"
+	]) if (block.slice(pos, pos + mod.length) === mod && /\s/.test(block.charAt(pos + mod.length))) {
+		pos += mod.length;
+		while (pos < block.length && /\s/.test(block[pos])) pos++;
+		break;
+	}
+	if (block.slice(pos, pos + 5) === "async" && /\s/.test(block.charAt(pos + 5))) {
+		pos += 5;
+		while (pos < block.length && /\s/.test(block[pos])) pos++;
+	}
+	const methodMatch = block.slice(pos).match(/^([a-zA-Z_]\w*)\s*\(/);
+	if (!methodMatch) return null;
+	return {
+		methodName: methodMatch[1],
+		endPos: pos + methodMatch[0].length
+	};
+}
+/** Extract `:placeholder` segments from an Express route path */
+function extractPathParams(path) {
+	return (path.match(/:([a-zA-Z_]\w*)/g) ?? []).map((m) => m.slice(1));
 }
 /**
 * Extract a bare identifier value from a single field in an object literal
@@ -5545,6 +5609,19 @@ function extractClassesFromSource(source, filePath, cwd) {
 			isDefault: Boolean(defaultMarker)
 		});
 	}
+	APP_MODULE_CLASS_REGEX.lastIndex = 0;
+	let modMatch;
+	while ((modMatch = APP_MODULE_CLASS_REGEX.exec(source)) !== null) {
+		const [, defaultMarker, className] = modMatch;
+		if (out.some((c) => c.className === className && c.filePath === filePath)) continue;
+		out.push({
+			className,
+			decorator: "Module",
+			filePath,
+			relativePath: relPath,
+			isDefault: Boolean(defaultMarker)
+		});
+	}
 	return out;
 }
 /** Extract `createToken('name')` definitions from a single source file */
@@ -5604,16 +5681,25 @@ function extractRoutesFromSource(source, filePath, cwd, classesInFile) {
 		const { cls, start } = positions[i];
 		const end = i + 1 < positions.length ? positions[i + 1].start : source.length;
 		const block = source.slice(start, end);
-		ROUTE_METHOD_REGEX.lastIndex = 0;
-		let match;
-		while ((match = ROUTE_METHOD_REGEX.exec(block)) !== null) {
-			const [matchedText, verb, pathLiteral, methodName] = match;
-			const path = pathLiteral && pathLiteral.length > 0 ? pathLiteral : "/";
-			const apiQp = extractApiQueryParams(matchedText, source);
-			const routeArgs = extractRouteOptionsArg(matchedText);
-			const bodyId = routeArgs ? extractObjectFieldIdentifier(routeArgs, "body") : null;
-			const queryId = routeArgs ? extractObjectFieldIdentifier(routeArgs, "query") : null;
-			const paramsId = routeArgs ? extractObjectFieldIdentifier(routeArgs, "params") : null;
+		ROUTE_DECORATOR_START.lastIndex = 0;
+		let startMatch;
+		while ((startMatch = ROUTE_DECORATOR_START.exec(block)) !== null) {
+			const verb = startMatch[1];
+			const decoratorStart = startMatch.index;
+			const openParen = ROUTE_DECORATOR_START.lastIndex - 1;
+			const closeParen = findBalancedClose(block, openParen);
+			if (closeParen < 0) continue;
+			const routeArgs = block.slice(openParen + 1, closeParen);
+			const pathLiteralMatch = routeArgs.match(/^\s*['"`]([^'"`]*)['"`]/);
+			const path = pathLiteralMatch && pathLiteralMatch[1].length > 0 ? pathLiteralMatch[1] : "/";
+			const methodInfo = readMethodAfterDecorators(block, closeParen + 1);
+			if (!methodInfo) continue;
+			const { methodName, endPos } = methodInfo;
+			ROUTE_DECORATOR_START.lastIndex = endPos;
+			const apiQp = extractApiQueryParams(block.slice(decoratorStart, endPos), source);
+			const bodyId = extractObjectFieldIdentifier(routeArgs, "body");
+			const queryId = extractObjectFieldIdentifier(routeArgs, "query");
+			const paramsId = extractObjectFieldIdentifier(routeArgs, "params");
 			out.push({
 				controller: cls.className,
 				method: methodName,
@@ -6289,7 +6375,7 @@ async function safeRun(opts, silent) {
 //#region src/commands/generate.ts
 /** Check if --dry-run was passed on the parent generate command */
 function isDryRun(cmd) {
-	return cmd.parent?.opts()?.dryRun ?? false;
+	return (cmd.parent?.opts())?.dryRun ?? false;
 }
 function printGenerated(files, dryRun = false) {
 	const cwd = process.cwd();
@@ -6377,39 +6463,55 @@ function printGeneratorList() {
 	for (const g of GENERATORS) console.log(`    kick g ${g.name.padEnd(maxName + 2)} ${g.description}`);
 	console.log();
 }
+/**
+* Generate one or more modules. Shared by `kick g module <names...>` and
+* the bare `kick g <names...>` shortcut.
+*/
+async function runModuleGeneration(names, opts, dryRun) {
+	const config = await loadKickConfig(process.cwd());
+	const mc = resolveModuleConfig(config);
+	const modulesDir = opts.modulesDir ?? mc.dir ?? "src/modules";
+	const repo = opts.repo ?? resolveRepoType(mc.repo);
+	const pattern = opts.pattern ?? config?.pattern ?? "ddd";
+	const shouldPluralize = opts.pluralize === false ? false : mc.pluralize ?? true;
+	const allFiles = [];
+	for (const name of names) {
+		const files = await generateModule({
+			name,
+			modulesDir: resolve(modulesDir),
+			noEntity: opts.entity === false,
+			noTests: opts.tests === false,
+			repo,
+			minimal: opts.minimal,
+			force: opts.force,
+			pattern,
+			dryRun,
+			pluralize: shouldPluralize,
+			prismaClientPath: mc.prismaClientPath
+		});
+		allFiles.push(...files);
+	}
+	printGenerated(allFiles, dryRun);
+	await runPostTypegen(dryRun);
+}
 function registerGenerateCommand(program) {
-	const gen = program.command("generate").alias("g").description("Generate code scaffolds").option("--list", "List all available generators").option("--dry-run", "Preview files that would be generated without writing them").action((opts) => {
-		if (opts.list) printGeneratorList();
-		else gen.help();
+	const gen = program.command("generate [names...]").alias("g").description("Generate code scaffolds — bare form `kick g <name>` is shorthand for `kick g module <name>`").option("--list", "List all available generators").option("--dry-run", "Preview files that would be generated without writing them").option("--no-entity", "Skip entity and value object generation (module shortcut)").option("--no-tests", "Skip test file generation (module shortcut)").option("--repo <type>", "Repository implementation: inmemory | drizzle | prisma").option("--pattern <pattern>", "Override project pattern: rest | ddd | cqrs | minimal").option("--minimal", "Shorthand for --pattern minimal").option("--modules-dir <dir>", "Modules directory").option("--no-pluralize", "Use singular names (skip auto-pluralization)").option("-f, --force", "Overwrite existing files without prompting").action(async (names, opts, cmd) => {
+		if (opts.list) {
+			printGeneratorList();
+			return;
+		}
+		if (!names || names.length === 0) {
+			gen.help();
+			return;
+		}
+		const dryRun = isDryRun(cmd);
+		setDryRun(dryRun);
+		await runModuleGeneration(names, opts, dryRun);
 	});
 	gen.command("module <names...>").description("Generate one or more modules (e.g. kick g module user task project)").option("--no-entity", "Skip entity and value object generation").option("--no-tests", "Skip test file generation").option("--repo <type>", "Repository implementation: inmemory | drizzle | prisma").option("--pattern <pattern>", "Override project pattern: rest | ddd | cqrs | minimal").option("--minimal", "Shorthand for --pattern minimal").option("--modules-dir <dir>", "Modules directory").option("--no-pluralize", "Use singular names (skip auto-pluralization)").option("-f, --force", "Overwrite existing files without prompting").action(async (names, opts, cmd) => {
 		const dryRun = isDryRun(cmd);
 		setDryRun(dryRun);
-		const config = await loadKickConfig(process.cwd());
-		const mc = resolveModuleConfig(config);
-		const modulesDir = opts.modulesDir ?? mc.dir ?? "src/modules";
-		const repo = opts.repo ?? resolveRepoType(mc.repo);
-		const pattern = opts.pattern ?? config?.pattern ?? "ddd";
-		const shouldPluralize = opts.pluralize === false ? false : mc.pluralize ?? true;
-		const allFiles = [];
-		for (const name of names) {
-			const files = await generateModule({
-				name,
-				modulesDir: resolve(modulesDir),
-				noEntity: opts.entity === false,
-				noTests: opts.tests === false,
-				repo,
-				minimal: opts.minimal,
-				force: opts.force,
-				pattern,
-				dryRun,
-				pluralize: shouldPluralize,
-				prismaClientPath: mc.prismaClientPath
-			});
-			allFiles.push(...files);
-		}
-		printGenerated(allFiles, dryRun);
-		await runPostTypegen(dryRun);
+		await runModuleGeneration(names, opts, dryRun);
 	});
 	gen.command("adapter <name>").description("Generate an AppAdapter with lifecycle hooks and middleware support").option("-o, --out <dir>", "Output directory", "src/adapters").action(async (name, opts, cmd) => {
 		const dryRun = isDryRun(cmd);
@@ -7092,8 +7194,36 @@ const PACKAGE_REGISTRY = {
 function detectPackageManager() {
 	if (existsSync(resolve("pnpm-lock.yaml"))) return "pnpm";
 	if (existsSync(resolve("yarn.lock"))) return "yarn";
+	if (existsSync(resolve("bun.lockb")) || existsSync(resolve("bun.lock"))) return "bun";
 	return "npm";
 }
+/** Read `packageManager` from package.json (corepack convention: "pnpm@10.0.0") */
+function packageManagerFromPackageJson() {
+	try {
+		const field = JSON.parse(readFileSync(resolve("package.json"), "utf-8")).packageManager;
+		if (typeof field !== "string") return null;
+		const name = field.split("@")[0];
+		return PACKAGE_MANAGERS.includes(name) ? name : null;
+	} catch {
+		return null;
+	}
+}
+/**
+* Resolve which package manager to use, in priority order:
+* 1. `--pm` CLI flag
+* 2. `packageManager` in kick.config
+* 3. `packageManager` in package.json (corepack)
+* 4. Lockfile detection
+* 5. `'npm'`
+*/
+async function resolvePackageManager(flagPm) {
+	if (flagPm && PACKAGE_MANAGERS.includes(flagPm)) return flagPm;
+	const config = await loadKickConfig(process.cwd());
+	if (config?.packageManager && PACKAGE_MANAGERS.includes(config.packageManager)) return config.packageManager;
+	const fromPkg = packageManagerFromPackageJson();
+	if (fromPkg) return fromPkg;
+	return detectPackageManager();
+}
 function printPackageList() {
 	console.log("\n  Available KickJS packages:\n");
 	const maxName = Math.max(...Object.keys(PACKAGE_REGISTRY).map((k) => k.length));
@@ -7117,7 +7247,7 @@ function registerAddCommand(program) {
 			printPackageList();
 			return;
 		}
-		const pm = opts.pm ?? detectPackageManager();
+		const pm = await resolvePackageManager(opts.pm);
 		const forceDevFlag = opts.dev;
 		const prodDeps = /* @__PURE__ */ new Set();
 		const devDeps = /* @__PURE__ */ new Set();
@@ -7911,7 +8041,7 @@ async function removeModule(options) {
 	if (await fileExists(indexPath)) {
 		let content = await readFile(indexPath, "utf-8");
 		const originalContent = content;
-		const importPattern = new RegExp(`^import\\s*\\{\\s*${pascal}Module\\s*\\}\\s*from\\s*['"][^'"]*${plural}['"].*\\n?`, "gm");
+		const importPattern = new RegExp(`^import\\s*\\{\\s*${pascal}Module\\s*\\}\\s*from\\s*['"][^'"]*${plural}(?:/[^'"]*)?['"].*\\n?`, "gm");
 		content = content.replace(importPattern, "");
 		content = content.replace(new RegExp(`\\s*,?\\s*${pascal}Module\\s*,?`, "g"), (match) => {
 			const startsWithComma = match.trimStart().startsWith(",");

package/dist/index.d.mts

@@ -20,6 +20,8 @@ interface KickCommandDefinition {
 }
 /** Project pattern — controls what generators produce and which deps are installed */
 type ProjectPattern = 'rest' | 'graphql' | 'ddd' | 'cqrs' | 'minimal';
+/** Package manager used for `kick add` and other dep-installing commands */
+type PackageManager = 'pnpm' | 'npm' | 'yarn' | 'bun';
 /** Built-in repository types with first-class code generation support */
 type BuiltinRepoType$1 = 'drizzle' | 'inmemory' | 'prisma';
 /** Custom repository type — generates a stub with TODO markers */
@@ -132,6 +134,22 @@ interface KickConfig {
    * }
    */
   modules?: ModuleConfig;
+  /**
+   * Package manager used by `kick add` (and any future dep-installing command)
+   * to install dependencies. When set, overrides lockfile auto-detection so
+   * commands always use the project's intended package manager.
+   *
+   * Priority (highest first):
+   * 1. `--pm` flag on the CLI
+   * 2. `packageManager` in kick.config
+   * 3. `packageManager` field in package.json (corepack convention)
+   * 4. Lockfile detection (pnpm-lock.yaml → pnpm, yarn.lock → yarn)
+   * 5. `'npm'`
+   *
+   * @example
+   * packageManager: 'pnpm'
+   */
+  packageManager?: PackageManager;
   /** @deprecated Use `modules.dir` instead */
   modulesDir?: string;
   /** @deprecated Use `modules.repo` instead */
@@ -281,7 +299,7 @@ type ProjectTemplate = 'rest' | 'graphql' | 'ddd' | 'cqrs' | 'minimal';
 interface InitProjectOptions {
   name: string;
   directory: string;
-  packageManager?: 'pnpm' | 'npm' | 'yarn';
+  packageManager?: 'pnpm' | 'npm' | 'yarn' | 'bun';
   initGit?: boolean;
   installDeps?: boolean;
   template?: ProjectTemplate;

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/config.ts","../src/generators/module.ts","../src/generators/adapter.ts","../src/generators/middleware.ts","../src/generators/guard.ts","../src/generators/service.ts","../src/generators/controller.ts","../src/generators/dto.ts","../src/generators/project.ts","../src/utils/naming.ts"],"mappings":"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"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/config.ts","../src/generators/module.ts","../src/generators/adapter.ts","../src/generators/middleware.ts","../src/generators/guard.ts","../src/generators/service.ts","../src/generators/controller.ts","../src/generators/dto.ts","../src/generators/project.ts","../src/utils/naming.ts"],"mappings":"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"}