@geekmidas/cli 0.18.0 → 0.20.0

package/src/init/templates/api.ts

@@ -1,3 +1,4 @@
+import { GEEKMIDAS_VERSIONS } from '../versions.js';
 import type {
 	GeneratedFile,
 	TemplateConfig,
@@ -9,19 +10,19 @@ export const apiTemplate: TemplateConfig = {
 	description: 'Full API with auth, database, services',
 
 	dependencies: {
-		'@geekmidas/constructs': 'workspace:*',
-		'@geekmidas/envkit': 'workspace:*',
-		'@geekmidas/logger': 'workspace:*',
-		'@geekmidas/services': 'workspace:*',
-		'@geekmidas/errors': 'workspace:*',
-		'@geekmidas/auth': 'workspace:*',
+		'@geekmidas/constructs': GEEKMIDAS_VERSIONS['@geekmidas/constructs'],
+		'@geekmidas/envkit': GEEKMIDAS_VERSIONS['@geekmidas/envkit'],
+		'@geekmidas/logger': GEEKMIDAS_VERSIONS['@geekmidas/logger'],
+		'@geekmidas/services': GEEKMIDAS_VERSIONS['@geekmidas/services'],
+		'@geekmidas/errors': GEEKMIDAS_VERSIONS['@geekmidas/errors'],
+		'@geekmidas/auth': GEEKMIDAS_VERSIONS['@geekmidas/auth'],
 		hono: '~4.8.2',
 		pino: '~9.6.0',
 	},
 
 	devDependencies: {
-		'@biomejs/biome': '~1.9.4',
-		'@geekmidas/cli': 'workspace:*',
+		'@biomejs/biome': '~2.3.0',
+		'@geekmidas/cli': GEEKMIDAS_VERSIONS['@geekmidas/cli'],
 		'@types/node': '~22.0.0',
 		tsx: '~4.20.0',
 		turbo: '~2.3.0',
@@ -69,22 +70,17 @@ export const logger = createLogger();
 			// src/config/env.ts
 			{
 				path: 'src/config/env.ts',
-				content: `import { EnvironmentParser } from '@geekmidas/envkit';
+				content: `import { Credentials } from '@geekmidas/envkit/credentials';
+import { EnvironmentParser } from '@geekmidas/envkit';
 
-export const envParser = new EnvironmentParser(process.env);
+export const envParser = new EnvironmentParser({ ...process.env, ...Credentials });
 
+// Global config - only minimal shared values
+// Service-specific config should be parsed in each service
 export const config = envParser
   .create((get) => ({
-    port: get('PORT').string().transform(Number).default(3000),
-    nodeEnv: get('NODE_ENV').string().default('development'),
-    jwtSecret: get('JWT_SECRET').string().default('change-me-in-production'),${
-			options.database
-				? `
-    database: {
-      url: get('DATABASE_URL').string().default('postgresql://localhost:5432/mydb'),
-    },`
-				: ''
-		}
+    nodeEnv: get('NODE_ENV').enum(['development', 'test', 'production']).default('development'),
+    stage: get('STAGE').enum(['development', 'staging', 'production']).default('development'),
   }))
   .parse();
 `,
@@ -101,7 +97,7 @@ export const config = envParser
 				path: getRoutePath('health.ts'),
 				content: `import { e } from '@geekmidas/constructs/endpoints';
 
-export default e
+export const healthEndpoint = e
   .get('/health')
   .handle(async () => ({
     status: 'ok',
@@ -115,7 +111,7 @@ export default e
 				path: getRoutePath('users/list.ts'),
 				content: `import { e } from '@geekmidas/constructs/endpoints';
 
-export default e
+export const listUsersEndpoint = e
   .get('/users')
   .handle(async () => ({
     users: [
@@ -130,7 +126,7 @@ export default e
 				content: `import { e } from '@geekmidas/constructs/endpoints';
 import { z } from 'zod';
 
-export default e
+export const getUserEndpoint = e
   .get('/users/:id')
   .params(z.object({ id: z.string() }))
   .handle(async ({ params }) => ({
@@ -146,7 +142,7 @@ export default e
 		if (options.database) {
 			files.push({
 				path: 'src/services/database.ts',
-				content: `import type { Service } from '@geekmidas/services';
+				content: `import type { Service, ServiceRegisterOptions } from '@geekmidas/services';
 import { Kysely, PostgresDialect } from 'kysely';
 import pg from 'pg';
 
@@ -162,18 +158,24 @@ export interface Database {
 
 export const databaseService = {
   serviceName: 'database' as const,
-  async register(envParser) {
+  async register({ envParser, context }: ServiceRegisterOptions) {
+    const logger = context.getLogger();
+    logger.info('Connecting to database');
+
     const config = envParser
       .create((get) => ({
         url: get('DATABASE_URL').string(),
       }))
       .parse();
 
-    return new Kysely<Database>({
+    const db = new Kysely<Database>({
       dialect: new PostgresDialect({
         pool: new pg.Pool({ connectionString: config.url }),
       }),
     });
+
+    logger.info('Database connection established');
+    return db;
   },
 } satisfies Service<'database', Kysely<Database>>;
 `,
@@ -202,13 +204,20 @@ export const telescope = new Telescope({
 				content: `import { Direction, InMemoryMonitoringStorage, Studio } from '@geekmidas/studio';
 import { Kysely, PostgresDialect } from 'kysely';
 import pg from 'pg';
-import type { Database } from '../services/database';
-import { config } from './env';
+import type { Database } from '../services/database.js';
+import { envParser } from './env.js';
+
+// Parse database config for Studio
+const studioConfig = envParser
+  .create((get) => ({
+    databaseUrl: get('DATABASE_URL').string(),
+  }))
+  .parse();
 
 // Create a Kysely instance for Studio
 const db = new Kysely<Database>({
   dialect: new PostgresDialect({
-    pool: new pg.Pool({ connectionString: config.database.url }),
+    pool: new pg.Pool({ connectionString: studioConfig.databaseUrl }),
   }),
 });
 

package/src/init/templates/index.ts

@@ -21,6 +21,25 @@ export type RoutesStructure =
 	| 'centralized-routes'
 	| 'domain-based';
 
+/**
+ * Package manager type
+ */
+export type PackageManager = 'pnpm' | 'npm' | 'yarn' | 'bun';
+
+/**
+ * Deploy target type
+ */
+export type DeployTarget = 'dokploy' | 'none';
+
+/**
+ * Services selection
+ */
+export interface ServicesSelection {
+	db: boolean;
+	cache: boolean;
+	mail: boolean;
+}
+
 /**
  * Options collected from user prompts
  */
@@ -35,6 +54,12 @@ export interface TemplateOptions {
 	monorepo: boolean;
 	/** Path for the API app in monorepo (e.g., 'apps/api') */
 	apiPath: string;
+	/** Selected package manager */
+	packageManager: PackageManager;
+	/** Deploy target */
+	deployTarget: DeployTarget;
+	/** Services selection */
+	services: ServicesSelection;
 }
 
 /**
@@ -57,12 +82,20 @@ export interface TemplateConfig {
 	files: (options: TemplateOptions) => GeneratedFile[];
 }
 
-export type TemplateName = 'minimal' | 'api' | 'serverless' | 'worker';
+export type TemplateName =
+	| 'minimal'
+	| 'api'
+	| 'serverless'
+	| 'worker'
+	| 'fullstack';
 
 /**
  * All available templates
  */
-export const templates: Record<TemplateName, TemplateConfig> = {
+export const templates: Record<
+	Exclude<TemplateName, 'fullstack'>,
+	TemplateConfig
+> = {
 	minimal: minimalTemplate,
 	api: apiTemplate,
 	serverless: serverlessTemplate,
@@ -70,9 +103,25 @@ export const templates: Record<TemplateName, TemplateConfig> = {
 };
 
 /**
- * Template choices for prompts
+ * Template choices for prompts (Story 1.11 simplified to api + fullstack)
  */
 export const templateChoices = [
+	{
+		title: 'API',
+		value: 'api' as TemplateName,
+		description: 'Single backend API with endpoints',
+	},
+	{
+		title: 'Fullstack',
+		value: 'fullstack' as TemplateName,
+		description: 'Monorepo with API + Next.js + shared models',
+	},
+];
+
+/**
+ * All template choices (includes advanced options)
+ */
+export const allTemplateChoices = [
 	{
 		title: 'Minimal',
 		value: 'minimal' as TemplateName,
@@ -83,6 +132,11 @@ export const templateChoices = [
 		value: 'api' as TemplateName,
 		description: 'Full API with auth, database, services',
 	},
+	{
+		title: 'Fullstack',
+		value: 'fullstack' as TemplateName,
+		description: 'Monorepo with API + Next.js + shared models',
+	},
 	{
 		title: 'Serverless',
 		value: 'serverless' as TemplateName,
@@ -132,13 +186,87 @@ export const routesStructureChoices = [
 	},
 ];
 
+/**
+ * Package manager choices for prompts
+ */
+export const packageManagerChoices = [
+	{
+		title: 'pnpm',
+		value: 'pnpm' as PackageManager,
+		description: 'Fast, disk space efficient (recommended)',
+	},
+	{
+		title: 'npm',
+		value: 'npm' as PackageManager,
+		description: 'Node.js default package manager',
+	},
+	{
+		title: 'yarn',
+		value: 'yarn' as PackageManager,
+		description: 'Yarn package manager',
+	},
+	{
+		title: 'bun',
+		value: 'bun' as PackageManager,
+		description: 'Fast JavaScript runtime and package manager',
+	},
+];
+
+/**
+ * Deploy target choices for prompts
+ */
+export const deployTargetChoices = [
+	{
+		title: 'Dokploy',
+		value: 'dokploy' as DeployTarget,
+		description: 'Deploy to Dokploy (Docker-based hosting)',
+	},
+	{
+		title: 'Configure later',
+		value: 'none' as DeployTarget,
+		description: 'Skip deployment setup for now',
+	},
+];
+
+/**
+ * Services choices for multi-select prompt
+ */
+export const servicesChoices = [
+	{
+		title: 'PostgreSQL',
+		value: 'db',
+		description: 'PostgreSQL database',
+	},
+	{
+		title: 'Redis',
+		value: 'cache',
+		description: 'Redis cache',
+	},
+	{
+		title: 'Mailpit',
+		value: 'mail',
+		description: 'Email testing service (dev only)',
+	},
+];
+
 /**
  * Get a template by name
  */
-export function getTemplate(name: TemplateName): TemplateConfig {
+export function getTemplate(name: TemplateName): TemplateConfig | null {
+	if (name === 'fullstack') {
+		// Fullstack template is handled specially, uses api template as base
+		return templates.api;
+	}
 	const template = templates[name];
 	if (!template) {
 		throw new Error(`Unknown template: ${name}`);
 	}
 	return template;
 }
+
+/**
+ * Check if a template is the fullstack monorepo template
+ */
+export function isFullstackTemplate(name: TemplateName): boolean {
+	return name === 'fullstack';
+}

package/src/init/templates/minimal.ts

@@ -1,3 +1,4 @@
+import { GEEKMIDAS_VERSIONS } from '../versions.js';
 import type {
 	GeneratedFile,
 	TemplateConfig,
@@ -9,16 +10,16 @@ export const minimalTemplate: TemplateConfig = {
 	description: 'Basic health endpoint',
 
 	dependencies: {
-		'@geekmidas/constructs': 'workspace:*',
-		'@geekmidas/envkit': 'workspace:*',
-		'@geekmidas/logger': 'workspace:*',
+		'@geekmidas/constructs': GEEKMIDAS_VERSIONS['@geekmidas/constructs'],
+		'@geekmidas/envkit': GEEKMIDAS_VERSIONS['@geekmidas/envkit'],
+		'@geekmidas/logger': GEEKMIDAS_VERSIONS['@geekmidas/logger'],
 		hono: '~4.8.2',
 		pino: '~9.6.0',
 	},
 
 	devDependencies: {
-		'@biomejs/biome': '~1.9.4',
-		'@geekmidas/cli': 'workspace:*',
+		'@biomejs/biome': '~2.3.0',
+		'@geekmidas/cli': GEEKMIDAS_VERSIONS['@geekmidas/cli'],
 		'@types/node': '~22.0.0',
 		tsx: '~4.20.0',
 		turbo: '~2.3.0',
@@ -61,14 +62,17 @@ export const logger = createLogger();
 			// src/config/env.ts
 			{
 				path: 'src/config/env.ts',
-				content: `import { EnvironmentParser } from '@geekmidas/envkit';
+				content: `import { Credentials } from '@geekmidas/envkit/credentials';
+import { EnvironmentParser } from '@geekmidas/envkit';
 
-export const envParser = new EnvironmentParser(process.env);
+export const envParser = new EnvironmentParser({ ...process.env, ...Credentials });
 
+// Global config - only minimal shared values
+// Service-specific config should be parsed in each service
 export const config = envParser
   .create((get) => ({
-    port: get('PORT').string().transform(Number).default(3000),
-    nodeEnv: get('NODE_ENV').string().default('development'),
+    nodeEnv: get('NODE_ENV').enum(['development', 'test', 'production']).default('development'),
+    stage: get('STAGE').enum(['development', 'staging', 'production']).default('development'),
   }))
   .parse();
 `,
@@ -85,7 +89,7 @@ export const config = envParser
 				path: getRoutePath('health.ts'),
 				content: `import { e } from '@geekmidas/constructs/endpoints';
 
-export default e
+export const healthEndpoint = e
   .get('/health')
   .handle(async () => ({
     status: 'ok',
@@ -97,28 +101,9 @@ export default e
 
 		// Add database service if enabled
 		if (options.database) {
-			// Update env.ts to include database config
-			files[0] = {
-				path: 'src/config/env.ts',
-				content: `import { EnvironmentParser } from '@geekmidas/envkit';
-
-export const envParser = new EnvironmentParser(process.env);
-
-export const config = envParser
-  .create((get) => ({
-    port: get('PORT').string().transform(Number).default(3000),
-    nodeEnv: get('NODE_ENV').string().default('development'),
-    database: {
-      url: get('DATABASE_URL').string().default('postgresql://localhost:5432/mydb'),
-    },
-  }))
-  .parse();
-`,
-			};
-
 			files.push({
 				path: 'src/services/database.ts',
-				content: `import type { Service } from '@geekmidas/services';
+				content: `import type { Service, ServiceRegisterOptions } from '@geekmidas/services';
 import { Kysely, PostgresDialect } from 'kysely';
 import pg from 'pg';
 
@@ -129,18 +114,24 @@ export interface Database {
 
 export const databaseService = {
   serviceName: 'database' as const,
-  async register(envParser) {
+  async register({ envParser, context }: ServiceRegisterOptions) {
+    const logger = context.getLogger();
+    logger.info('Connecting to database');
+
     const config = envParser
       .create((get) => ({
         url: get('DATABASE_URL').string(),
       }))
       .parse();
 
-    return new Kysely<Database>({
+    const db = new Kysely<Database>({
       dialect: new PostgresDialect({
         pool: new pg.Pool({ connectionString: config.url }),
       }),
     });
+
+    logger.info('Database connection established');
+    return db;
   },
 } satisfies Service<'database', Kysely<Database>>;
 `,
@@ -169,13 +160,20 @@ export const telescope = new Telescope({
 				content: `import { Direction, InMemoryMonitoringStorage, Studio } from '@geekmidas/studio';
 import { Kysely, PostgresDialect } from 'kysely';
 import pg from 'pg';
-import type { Database } from '../services/database';
-import { config } from './env';
+import type { Database } from '../services/database.js';
+import { envParser } from './env.js';
+
+// Parse database config for Studio
+const studioConfig = envParser
+  .create((get) => ({
+    databaseUrl: get('DATABASE_URL').string(),
+  }))
+  .parse();
 
 // Create a Kysely instance for Studio
 const db = new Kysely<Database>({
   dialect: new PostgresDialect({
-    pool: new pg.Pool({ connectionString: config.database.url }),
+    pool: new pg.Pool({ connectionString: studioConfig.databaseUrl }),
   }),
 });
 

package/src/init/templates/serverless.ts

@@ -1,3 +1,4 @@
+import { GEEKMIDAS_VERSIONS } from '../versions.js';
 import type {
 	GeneratedFile,
 	TemplateConfig,
@@ -9,17 +10,17 @@ export const serverlessTemplate: TemplateConfig = {
 	description: 'AWS Lambda handlers',
 
 	dependencies: {
-		'@geekmidas/constructs': 'workspace:*',
-		'@geekmidas/envkit': 'workspace:*',
-		'@geekmidas/logger': 'workspace:*',
-		'@geekmidas/cloud': 'workspace:*',
+		'@geekmidas/constructs': GEEKMIDAS_VERSIONS['@geekmidas/constructs'],
+		'@geekmidas/envkit': GEEKMIDAS_VERSIONS['@geekmidas/envkit'],
+		'@geekmidas/logger': GEEKMIDAS_VERSIONS['@geekmidas/logger'],
+		'@geekmidas/cloud': GEEKMIDAS_VERSIONS['@geekmidas/cloud'],
 		hono: '~4.8.2',
 		pino: '~9.6.0',
 	},
 
 	devDependencies: {
-		'@biomejs/biome': '~1.9.4',
-		'@geekmidas/cli': 'workspace:*',
+		'@biomejs/biome': '~2.3.0',
+		'@geekmidas/cli': GEEKMIDAS_VERSIONS['@geekmidas/cli'],
 		'@types/aws-lambda': '~8.10.92',
 		'@types/node': '~22.0.0',
 		tsx: '~4.20.0',
@@ -63,21 +64,17 @@ export const logger = createLogger();
 			// src/config/env.ts
 			{
 				path: 'src/config/env.ts',
-				content: `import { EnvironmentParser } from '@geekmidas/envkit';
+				content: `import { Credentials } from '@geekmidas/envkit/credentials';
+import { EnvironmentParser } from '@geekmidas/envkit';
 
-export const envParser = new EnvironmentParser(process.env);
+export const envParser = new EnvironmentParser({ ...process.env, ...Credentials });
 
+// Global config - only minimal shared values
+// Service-specific config should be parsed in each service
 export const config = envParser
   .create((get) => ({
-    stage: get('STAGE').string().default('dev'),
-    region: get('AWS_REGION').string().default('us-east-1'),${
-			options.database
-				? `
-    database: {
-      url: get('DATABASE_URL').string(),
-    },`
-				: ''
-		}
+    nodeEnv: get('NODE_ENV').enum(['development', 'test', 'production']).default('development'),
+    stage: get('STAGE').enum(['dev', 'staging', 'prod']).default('dev'),
   }))
   .parse();
 `,
@@ -94,7 +91,7 @@ export const config = envParser
 				path: getRoutePath('health.ts'),
 				content: `import { e } from '@geekmidas/constructs/endpoints';
 
-export default e
+export const healthEndpoint = e
   .get('/health')
   .handle(async () => ({
     status: 'ok',
@@ -110,7 +107,7 @@ export default e
 				content: `import { f } from '@geekmidas/constructs/functions';
 import { z } from 'zod';
 
-export default f
+export const helloFunction = f
   .input(z.object({ name: z.string() }))
   .output(z.object({ message: z.string() }))
   .handle(async ({ input }) => ({

package/src/init/templates/worker.ts

@@ -1,3 +1,4 @@
+import { GEEKMIDAS_VERSIONS } from '../versions.js';
 import type {
 	GeneratedFile,
 	TemplateConfig,
@@ -9,17 +10,17 @@ export const workerTemplate: TemplateConfig = {
 	description: 'Background job processing',
 
 	dependencies: {
-		'@geekmidas/constructs': 'workspace:*',
-		'@geekmidas/envkit': 'workspace:*',
-		'@geekmidas/logger': 'workspace:*',
-		'@geekmidas/events': 'workspace:*',
+		'@geekmidas/constructs': GEEKMIDAS_VERSIONS['@geekmidas/constructs'],
+		'@geekmidas/envkit': GEEKMIDAS_VERSIONS['@geekmidas/envkit'],
+		'@geekmidas/logger': GEEKMIDAS_VERSIONS['@geekmidas/logger'],
+		'@geekmidas/events': GEEKMIDAS_VERSIONS['@geekmidas/events'],
 		hono: '~4.8.2',
 		pino: '~9.6.0',
 	},
 
 	devDependencies: {
-		'@biomejs/biome': '~1.9.4',
-		'@geekmidas/cli': 'workspace:*',
+		'@biomejs/biome': '~2.3.0',
+		'@geekmidas/cli': GEEKMIDAS_VERSIONS['@geekmidas/cli'],
 		'@types/node': '~22.0.0',
 		tsx: '~4.20.0',
 		turbo: '~2.3.0',
@@ -62,24 +63,17 @@ export const logger = createLogger();
 			// src/config/env.ts
 			{
 				path: 'src/config/env.ts',
-				content: `import { EnvironmentParser } from '@geekmidas/envkit';
+				content: `import { Credentials } from '@geekmidas/envkit/credentials';
+import { EnvironmentParser } from '@geekmidas/envkit';
 
-export const envParser = new EnvironmentParser(process.env);
+export const envParser = new EnvironmentParser({ ...process.env, ...Credentials });
 
+// Global config - only minimal shared values
+// Service-specific config should be parsed in each service
 export const config = envParser
   .create((get) => ({
-    port: get('PORT').string().transform(Number).default(3000),
-    nodeEnv: get('NODE_ENV').string().default('development'),
-    rabbitmq: {
-      url: get('RABBITMQ_URL').string().default('amqp://localhost:5672'),
-    },${
-			options.database
-				? `
-    database: {
-      url: get('DATABASE_URL').string().default('postgresql://localhost:5432/mydb'),
-    },`
-				: ''
-		}
+    nodeEnv: get('NODE_ENV').enum(['development', 'test', 'production']).default('development'),
+    stage: get('STAGE').enum(['development', 'staging', 'production']).default('development'),
   }))
   .parse();
 `,
@@ -96,7 +90,7 @@ export const config = envParser
 				path: getRoutePath('health.ts'),
 				content: `import { e } from '@geekmidas/constructs/endpoints';
 
-export default e
+export const healthEndpoint = e
   .get('/health')
   .handle(async () => ({
     status: 'ok',
@@ -118,14 +112,45 @@ export type AppEvents =
 `,
 			},
 
+			// src/events/publisher.ts
+			{
+				path: 'src/events/publisher.ts',
+				content: `import type { Service, ServiceRegisterOptions } from '@geekmidas/services';
+import { Publisher, type EventPublisher } from '@geekmidas/events';
+import type { AppEvents } from './types.js';
+
+export const eventsPublisherService = {
+  serviceName: 'events' as const,
+  async register({ envParser, context }: ServiceRegisterOptions) {
+    const logger = context.getLogger();
+    logger.info('Connecting to message broker');
+
+    const config = envParser
+      .create((get) => ({
+        url: get('RABBITMQ_URL').string().default('amqp://localhost:5672'),
+      }))
+      .parse();
+
+    const publisher = await Publisher.fromConnectionString<AppEvents>(
+      \`rabbitmq://\${config.url.replace('amqp://', '')}?exchange=events\`
+    );
+
+    logger.info('Message broker connection established');
+    return publisher;
+  },
+} satisfies Service<'events', EventPublisher<AppEvents>>;
+`,
+			},
+
 			// src/subscribers/user-events.ts
 			{
 				path: 'src/subscribers/user-events.ts',
 				content: `import { s } from '@geekmidas/constructs/subscribers';
-import type { AppEvents } from '../events/types.js';
+import { eventsPublisherService } from '../events/publisher.js';
 
-export default s<AppEvents>()
-  .events(['user.created', 'user.updated'])
+export const userEventsSubscriber = s
+  .publisher(eventsPublisherService)
+  .subscribe(['user.created', 'user.updated'])
   .handle(async ({ event, logger }) => {
     logger.info({ type: event.type, payload: event.payload }, 'Processing user event');
 
@@ -149,7 +174,7 @@ export default s<AppEvents>()
 				content: `import { cron } from '@geekmidas/constructs/crons';
 
 // Run every day at midnight
-export default cron('0 0 * * *')
+export const cleanupCron = cron('0 0 * * *')
   .handle(async ({ logger }) => {
     logger.info('Running cleanup job');