@geekmidas/cli 0.53.0 → 1.0.0

package/src/index.ts

@@ -6,6 +6,12 @@ import { loginCommand, logoutCommand, whoamiCommand } from './auth';
 import { buildCommand } from './build/index';
 import { type DeployProvider, deployCommand } from './deploy/index';
 import { deployInitCommand, deployListCommand } from './deploy/init';
+import {
+	stateDiffCommand,
+	statePullCommand,
+	statePushCommand,
+	stateShowCommand,
+} from './deploy/state-commands';
 import { devCommand, execCommand } from './dev/index';
 import { type DockerOptions, dockerCommand } from './docker/index';
 import { type InitOptions, initCommand } from './init/index';
@@ -710,4 +716,86 @@ program
 		}
 	});
 
+// State management commands
+program
+	.command('state:pull')
+	.description('Pull deployment state from remote to local')
+	.requiredOption(
+		'--stage <stage>',
+		'Deployment stage (e.g., production, staging)',
+	)
+	.action(async (options: { stage: string }) => {
+		try {
+			const globalOptions = program.opts();
+			if (globalOptions.cwd) {
+				process.chdir(globalOptions.cwd);
+			}
+			await statePullCommand(options);
+		} catch (error) {
+			console.error(error instanceof Error ? error.message : 'Command failed');
+			process.exit(1);
+		}
+	});
+
+program
+	.command('state:push')
+	.description('Push deployment state from local to remote')
+	.requiredOption(
+		'--stage <stage>',
+		'Deployment stage (e.g., production, staging)',
+	)
+	.action(async (options: { stage: string }) => {
+		try {
+			const globalOptions = program.opts();
+			if (globalOptions.cwd) {
+				process.chdir(globalOptions.cwd);
+			}
+			await statePushCommand(options);
+		} catch (error) {
+			console.error(error instanceof Error ? error.message : 'Command failed');
+			process.exit(1);
+		}
+	});
+
+program
+	.command('state:show')
+	.description('Show deployment state for a stage')
+	.requiredOption(
+		'--stage <stage>',
+		'Deployment stage (e.g., production, staging)',
+	)
+	.option('--json', 'Output as JSON')
+	.action(async (options: { stage: string; json?: boolean }) => {
+		try {
+			const globalOptions = program.opts();
+			if (globalOptions.cwd) {
+				process.chdir(globalOptions.cwd);
+			}
+			await stateShowCommand(options);
+		} catch (error) {
+			console.error(error instanceof Error ? error.message : 'Command failed');
+			process.exit(1);
+		}
+	});
+
+program
+	.command('state:diff')
+	.description('Compare local and remote deployment state')
+	.requiredOption(
+		'--stage <stage>',
+		'Deployment stage (e.g., production, staging)',
+	)
+	.action(async (options: { stage: string }) => {
+		try {
+			const globalOptions = program.opts();
+			if (globalOptions.cwd) {
+				process.chdir(globalOptions.cwd);
+			}
+			await stateDiffCommand(options);
+		} catch (error) {
+			console.error(error instanceof Error ? error.message : 'Command failed');
+			process.exit(1);
+		}
+	});
+
 program.parse();

package/src/init/__tests__/generators.spec.ts

@@ -5,6 +5,7 @@ import { generateEnvFiles } from '../generators/env.js';
 import { generateModelsPackage } from '../generators/models.js';
 import { generateMonorepoFiles } from '../generators/monorepo.js';
 import { generatePackageJson } from '../generators/package.js';
+import { generateUiPackageFiles } from '../generators/ui.js';
 import type { TemplateOptions } from '../templates/index.js';
 import { minimalTemplate } from '../templates/minimal.js';
 import { serverlessTemplate } from '../templates/serverless.js';
@@ -372,3 +373,275 @@ describe('generateModelsPackage', () => {
 		expect(config.extends).toBe('../../tsconfig.json');
 	});
 });
+
+describe('generateUiPackageFiles', () => {
+	const fullstackOptions: TemplateOptions = {
+		...baseOptions,
+		template: 'fullstack',
+		monorepo: true,
+		apiPath: 'apps/api',
+	};
+
+	it('should return empty array for non-monorepo', () => {
+		const files = generateUiPackageFiles(baseOptions);
+		expect(files).toHaveLength(0);
+	});
+
+	it('should return empty array for non-fullstack template', () => {
+		const options: TemplateOptions = {
+			...baseOptions,
+			template: 'minimal',
+			monorepo: true,
+			apiPath: 'apps/api',
+		};
+		const files = generateUiPackageFiles(options);
+		expect(files).toHaveLength(0);
+	});
+
+	it('should generate UI package files for fullstack template', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const paths = files.map((f) => f.path);
+		expect(paths).toContain('packages/ui/package.json');
+		expect(paths).toContain('packages/ui/tsconfig.json');
+		expect(paths).toContain('packages/ui/components.json');
+		expect(paths).toContain('packages/ui/.storybook/main.ts');
+		expect(paths).toContain('packages/ui/.storybook/preview.ts');
+		expect(paths).toContain('packages/ui/src/styles/globals.css');
+		expect(paths).toContain('packages/ui/src/lib/utils.ts');
+		expect(paths).toContain('packages/ui/src/index.ts');
+	});
+
+	it('should use correct package name', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const pkgJson = files.find((f) => f.path === 'packages/ui/package.json');
+		expect(pkgJson).toBeDefined();
+		const pkg = JSON.parse(pkgJson!.content);
+		expect(pkg.name).toBe('@test-project/ui');
+	});
+
+	it('should have typescript source exports (not dist)', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const pkgJson = files.find((f) => f.path === 'packages/ui/package.json');
+		expect(pkgJson).toBeDefined();
+		const pkg = JSON.parse(pkgJson!.content);
+		expect(pkg.exports['.']).toBe('./src/index.ts');
+		expect(pkg.exports['./components']).toBe('./src/components/index.ts');
+		expect(pkg.exports['./lib/utils']).toBe('./src/lib/utils.ts');
+		expect(pkg.exports['./styles']).toBe('./src/styles/globals.css');
+	});
+
+	it('should not have build script (private packages are not built)', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const pkgJson = files.find((f) => f.path === 'packages/ui/package.json');
+		expect(pkgJson).toBeDefined();
+		const pkg = JSON.parse(pkgJson!.content);
+		expect(pkg.scripts.build).toBeUndefined();
+		expect(pkg.scripts.storybook).toBeDefined();
+		expect(pkg.scripts['build:storybook']).toBeDefined();
+	});
+
+	it('should include Radix UI dependencies', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const pkgJson = files.find((f) => f.path === 'packages/ui/package.json');
+		expect(pkgJson).toBeDefined();
+		const pkg = JSON.parse(pkgJson!.content);
+		expect(pkg.dependencies['@radix-ui/react-slot']).toBeDefined();
+		expect(pkg.dependencies['@radix-ui/react-dialog']).toBeDefined();
+		expect(pkg.dependencies['@radix-ui/react-label']).toBeDefined();
+		expect(pkg.dependencies['@radix-ui/react-separator']).toBeDefined();
+		expect(pkg.dependencies['@radix-ui/react-tabs']).toBeDefined();
+		expect(pkg.dependencies['@radix-ui/react-tooltip']).toBeDefined();
+	});
+
+	it('should include Storybook dependencies', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const pkgJson = files.find((f) => f.path === 'packages/ui/package.json');
+		expect(pkgJson).toBeDefined();
+		const pkg = JSON.parse(pkgJson!.content);
+		expect(pkg.devDependencies['@storybook/react']).toBeDefined();
+		expect(pkg.devDependencies['@storybook/react-vite']).toBeDefined();
+		expect(pkg.devDependencies['@storybook/addon-essentials']).toBeDefined();
+		expect(pkg.devDependencies.storybook).toBeDefined();
+	});
+
+	it('should include Tailwind CSS dependencies', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const pkgJson = files.find((f) => f.path === 'packages/ui/package.json');
+		expect(pkgJson).toBeDefined();
+		const pkg = JSON.parse(pkgJson!.content);
+		expect(pkg.devDependencies.tailwindcss).toBeDefined();
+		expect(pkg.devDependencies['@tailwindcss/vite']).toBeDefined();
+		expect(pkg.peerDependencies.tailwindcss).toBeDefined();
+	});
+
+	it('should extend root tsconfig with noEmit', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const tsConfig = files.find((f) => f.path === 'packages/ui/tsconfig.json');
+		expect(tsConfig).toBeDefined();
+		const config = JSON.parse(tsConfig!.content);
+		expect(config.extends).toBe('../../tsconfig.json');
+		expect(config.compilerOptions.noEmit).toBe(true);
+		expect(config.compilerOptions.jsx).toBe('react-jsx');
+	});
+
+	it('should not include tsdown.config.ts', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const paths = files.map((f) => f.path);
+		expect(paths).not.toContain('packages/ui/tsdown.config.ts');
+	});
+
+	it('should generate all component files in folder structure', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const paths = files.map((f) => f.path);
+
+		// Button
+		expect(paths).toContain('packages/ui/src/components/ui/button/index.tsx');
+		expect(paths).toContain(
+			'packages/ui/src/components/ui/button/button.stories.tsx',
+		);
+
+		// Input
+		expect(paths).toContain('packages/ui/src/components/ui/input/index.tsx');
+		expect(paths).toContain(
+			'packages/ui/src/components/ui/input/input.stories.tsx',
+		);
+
+		// Card
+		expect(paths).toContain('packages/ui/src/components/ui/card/index.tsx');
+		expect(paths).toContain(
+			'packages/ui/src/components/ui/card/card.stories.tsx',
+		);
+
+		// Label
+		expect(paths).toContain('packages/ui/src/components/ui/label/index.tsx');
+		expect(paths).toContain(
+			'packages/ui/src/components/ui/label/label.stories.tsx',
+		);
+
+		// Badge
+		expect(paths).toContain('packages/ui/src/components/ui/badge/index.tsx');
+		expect(paths).toContain(
+			'packages/ui/src/components/ui/badge/badge.stories.tsx',
+		);
+
+		// Separator
+		expect(paths).toContain(
+			'packages/ui/src/components/ui/separator/index.tsx',
+		);
+		expect(paths).toContain(
+			'packages/ui/src/components/ui/separator/separator.stories.tsx',
+		);
+
+		// Tabs
+		expect(paths).toContain('packages/ui/src/components/ui/tabs/index.tsx');
+		expect(paths).toContain(
+			'packages/ui/src/components/ui/tabs/tabs.stories.tsx',
+		);
+
+		// Tooltip
+		expect(paths).toContain('packages/ui/src/components/ui/tooltip/index.tsx');
+		expect(paths).toContain(
+			'packages/ui/src/components/ui/tooltip/tooltip.stories.tsx',
+		);
+
+		// Dialog
+		expect(paths).toContain('packages/ui/src/components/ui/dialog/index.tsx');
+		expect(paths).toContain(
+			'packages/ui/src/components/ui/dialog/dialog.stories.tsx',
+		);
+	});
+
+	it('should export all components from index', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const indexFile = files.find(
+			(f) => f.path === 'packages/ui/src/components/ui/index.ts',
+		);
+		expect(indexFile).toBeDefined();
+		expect(indexFile!.content).toContain("from './button'");
+		expect(indexFile!.content).toContain("from './input'");
+		expect(indexFile!.content).toContain("from './card'");
+		expect(indexFile!.content).toContain("from './label'");
+		expect(indexFile!.content).toContain("from './badge'");
+		expect(indexFile!.content).toContain("from './separator'");
+		expect(indexFile!.content).toContain("from './tabs'");
+		expect(indexFile!.content).toContain("from './tooltip'");
+		expect(indexFile!.content).toContain("from './dialog'");
+	});
+
+	it('should include cn utility function', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const utilsFile = files.find(
+			(f) => f.path === 'packages/ui/src/lib/utils.ts',
+		);
+		expect(utilsFile).toBeDefined();
+		expect(utilsFile!.content).toContain('export function cn');
+		expect(utilsFile!.content).toContain('clsx');
+		expect(utilsFile!.content).toContain('twMerge');
+	});
+
+	it('should include Tailwind v4 CSS with theme variables', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const globalsCss = files.find(
+			(f) => f.path === 'packages/ui/src/styles/globals.css',
+		);
+		expect(globalsCss).toBeDefined();
+		expect(globalsCss!.content).toContain('@import "tailwindcss"');
+		expect(globalsCss!.content).toContain('@theme');
+		expect(globalsCss!.content).toContain('--color-background');
+		expect(globalsCss!.content).toContain('--color-primary');
+		expect(globalsCss!.content).toContain('.dark');
+	});
+
+	it('should configure Storybook with Tailwind v4 plugin', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const storybookMain = files.find(
+			(f) => f.path === 'packages/ui/.storybook/main.ts',
+		);
+		expect(storybookMain).toBeDefined();
+		expect(storybookMain!.content).toContain('@storybook/react-vite');
+		expect(storybookMain!.content).toContain('@tailwindcss/vite');
+		expect(storybookMain!.content).toContain('viteFinal');
+	});
+
+	it('should import globals.css in Storybook preview', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const storybookPreview = files.find(
+			(f) => f.path === 'packages/ui/.storybook/preview.ts',
+		);
+		expect(storybookPreview).toBeDefined();
+		expect(storybookPreview!.content).toContain(
+			"import '../src/styles/globals.css'",
+		);
+	});
+
+	it('should include shadcn components.json config', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const componentsJson = files.find(
+			(f) => f.path === 'packages/ui/components.json',
+		);
+		expect(componentsJson).toBeDefined();
+		const config = JSON.parse(componentsJson!.content);
+		expect(config.$schema).toContain('ui.shadcn.com');
+		expect(config.style).toBe('new-york');
+		expect(config.tailwind.cssVariables).toBe(true);
+		expect(config.aliases.components).toBe('~/components');
+		expect(config.aliases.utils).toBe('~/lib/utils');
+	});
+
+	it('should use ~/* path alias in components', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const buttonFile = files.find(
+			(f) => f.path === 'packages/ui/src/components/ui/button/index.tsx',
+		);
+		expect(buttonFile).toBeDefined();
+		expect(buttonFile!.content).toContain("from '~/lib/utils'");
+	});
+
+	it('should configure ~/* path in tsconfig', () => {
+		const files = generateUiPackageFiles(fullstackOptions);
+		const tsConfig = files.find((f) => f.path === 'packages/ui/tsconfig.json');
+		expect(tsConfig).toBeDefined();
+		const config = JSON.parse(tsConfig!.content);
+		expect(config.compilerOptions.paths['~/*']).toEqual(['./src/*']);
+	});
+});

package/src/init/__tests__/init.spec.ts

@@ -176,9 +176,9 @@ describe('initCommand', () => {
 			expect(
 				existsSync(join(projectDir, 'packages/models/tsconfig.json')),
 			).toBe(true);
-			expect(existsSync(join(projectDir, 'packages/models/src/common.ts'))).toBe(
-				true,
-			);
+			expect(
+				existsSync(join(projectDir, 'packages/models/src/common.ts')),
+			).toBe(true);
 			expect(existsSync(join(projectDir, 'packages/models/src/user.ts'))).toBe(
 				true,
 			);

package/src/init/generators/auth.ts

@@ -55,6 +55,7 @@ export function generateAuthAppFiles(
 			noEmit: true,
 			baseUrl: '.',
 			paths: {
+				'~/*': ['./src/*'],
 				[`@${options.name}/*`]: ['../../packages/*/src'],
 			},
 		},

package/src/init/generators/config.ts

@@ -93,6 +93,7 @@ export default defineConfig({
 					noEmit: true,
 					baseUrl: '.',
 					paths: {
+						'~/*': ['./src/*'],
 						[`@${options.name}/*`]: ['../../packages/*/src'],
 					},
 				},
@@ -256,6 +257,7 @@ function generateSingleAppConfigFiles(
 			noEmit: true,
 			baseUrl: '.',
 			paths: {
+				'~/*': ['./src/*'],
 				[`@${options.name}/*`]: ['../../packages/*/src'],
 			},
 		},

package/src/init/generators/models.ts

@@ -51,7 +51,11 @@ export function generateModelsPackage(
 // Common Schemas
 // ============================================
 
-export const IdSchema = z.string().uuid();
+export const IdSchema = z.uuid();
+
+export const IdParamsSchema = z.object({
+  id: IdSchema,
+});
 
 export const TimestampsSchema = z.object({
   createdAt: z.coerce.date(),
@@ -77,6 +81,7 @@ export const PaginatedResponseSchema = <T extends z.ZodTypeAny>(itemSchema: T) =
 // ============================================
 
 export type Id = z.infer<typeof IdSchema>;
+export type IdParams = z.infer<typeof IdParamsSchema>;
 export type Timestamps = z.infer<typeof TimestampsSchema>;
 export type Pagination = z.infer<typeof PaginationSchema>;
 `;

package/src/init/generators/monorepo.ts

@@ -34,6 +34,9 @@ export function generateMonorepoFiles(
 			lint: 'biome lint .',
 			fmt: 'biome format . --write',
 			'fmt:check': 'biome format .',
+			...(isFullstack
+				? { storybook: 'pnpm --filter ./packages/ui storybook' }
+				: {}),
 			...(options.deployTarget === 'dokploy'
 				? { deploy: 'gkm deploy --provider dokploy --stage production' }
 				: {}),