@forinda/kickjs-cli 3.1.0 → 3.1.2

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 /**
- * @forinda/kickjs-cli v3.1.0
+ * @forinda/kickjs-cli v3.1.2
  *
  * Copyright (c) Felix Orinda
  *
@@ -1703,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",
@@ -1784,6 +1784,10 @@ function registerInitCommand(program) {
 				{
 					value: "yarn",
 					label: "yarn"
+				},
+				{
+					value: "bun",
+					label: "bun"
 				}
 			]
 		});
@@ -3332,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
@@ -3355,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,
@@ -3451,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,
@@ -3560,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,
@@ -3735,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) {
@@ -4813,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));
@@ -4828,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) {
@@ -5211,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) {
@@ -6367,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();
@@ -6455,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);
@@ -8017,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

@@ -299,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.mjs

@@ -1,5 +1,5 @@
 /**
- * @forinda/kickjs-cli v3.1.0
+ * @forinda/kickjs-cli v3.1.2
  *
  * Copyright (c) Felix Orinda
  *
@@ -1879,7 +1879,7 @@ export default defineConfig({
 //#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
@@ -1902,7 +1902,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,
@@ -1998,7 +1998,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,
@@ -2107,7 +2107,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,
@@ -2276,22 +2276,24 @@ async function generateModule(options) {
 			await generateDddFiles(ctx);
 			break;
 	}
-	if (!dryRun) await autoRegisterModule(modulesDir, pascal, plural);
+	if (!dryRun) await autoRegisterModule(modulesDir, pascal, plural, kebab);
 	return files;
 }
 /** Add the new module to src/modules/index.ts */
-async function autoRegisterModule(modulesDir, pascal, plural) {
+async function autoRegisterModule(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) {
@@ -3770,7 +3772,7 @@ async function initProject(options) {
 		}
 	}
 	try {
-		const { runTypegen } = await import("./typegen-C3Nf74nD.mjs");
+		const { runTypegen } = await import("./typegen-D-the-Kw.mjs");
 		await runTypegen({
 			cwd: dir,
 			allowDuplicates: true,