@baseplate-dev/project-builder-cli 0.2.5 → 0.3.0

package/dist/commands/diff.js

@@ -9,7 +9,7 @@ import { logger } from '../services/logger.js';
 export function addDiffCommand(program) {
     program
         .command('diff [directory]')
-        .description('Shows diff between generated output and current working directory')
+        .description('Show diff between generated output and current working directory')
         .option('--compact', 'Show compact diff format instead of unified diff')
         .option('--app <apps...>', 'Filter by specific app names')
         .option('--glob <patterns...>', 'Filter files by glob patterns')

package/dist/commands/snapshot.d.ts

@@ -0,0 +1,6 @@
+import type { Command } from 'commander';
+/**
+ * Adds snapshot management commands to the program.
+ * @param program - The program to add the command to.
+ */
+export declare function addSnapshotCommand(program: Command): void;

package/dist/commands/snapshot.js

@@ -0,0 +1,121 @@
+import { confirm } from '@inquirer/prompts';
+import { createSchemaParserContext } from '#src/services/schema-parser-context.js';
+import { getUserConfig } from '#src/services/user-config.js';
+import { expandPathWithTilde } from '#src/utils/path.js';
+import { logger } from '../services/logger.js';
+/**
+ * Adds snapshot management commands to the program.
+ * @param program - The program to add the command to.
+ */
+export function addSnapshotCommand(program) {
+    const snapshotCommand = program
+        .command('snapshot')
+        .description('Manage project snapshots for persistent differences');
+    // snapshot add command
+    snapshotCommand
+        .command('add <project-directory> <app> <files...>')
+        .description('Add files to snapshot (use --deleted for intentionally deleted files)')
+        .option('--deleted', 'Mark files as intentionally deleted in snapshot')
+        .option('--snapshot-dir <directory>', 'Snapshot directory', '.baseplate-snapshot')
+        .action(async (projectDirectory, app, files, options) => {
+        try {
+            const { addFilesToSnapshot } = await import('@baseplate-dev/project-builder-server');
+            const resolvedDirectory = expandPathWithTilde(projectDirectory);
+            const context = await createSchemaParserContext(resolvedDirectory);
+            await addFilesToSnapshot(files, !!options.deleted, {
+                projectDirectory: resolvedDirectory,
+                snapshotDirectory: options.snapshotDir,
+                appName: app,
+                context,
+                logger,
+            });
+        }
+        catch (error) {
+            logger.error('Failed to add files to snapshot:', error);
+            throw error;
+        }
+    });
+    // snapshot remove command
+    snapshotCommand
+        .command('remove <project-directory> <app> <files...>')
+        .description('Remove files from snapshot tracking')
+        .option('--snapshot-dir <directory>', 'Snapshot directory', '.baseplate-snapshot')
+        .action(async (projectDirectory, app, files, options) => {
+        try {
+            const { removeFilesFromSnapshot } = await import('@baseplate-dev/project-builder-server');
+            const resolvedDirectory = expandPathWithTilde(projectDirectory);
+            const context = await createSchemaParserContext(resolvedDirectory);
+            await removeFilesFromSnapshot(files, {
+                projectDirectory: resolvedDirectory,
+                snapshotDirectory: options.snapshotDir,
+                appName: app,
+                context,
+                logger,
+            });
+        }
+        catch (error) {
+            logger.error('Failed to remove files from snapshot:', error);
+            throw error;
+        }
+    });
+    // snapshot save command
+    snapshotCommand
+        .command('save <project-directory> <app>')
+        .description('Save snapshot of current differences (overwrites existing snapshot)')
+        .option('--snapshot-dir <directory>', 'Snapshot directory', '.baseplate-snapshot')
+        .action(async (projectDirectory, app, options) => {
+        try {
+            const { createSnapshotForProject } = await import('@baseplate-dev/project-builder-server');
+            const resolvedDirectory = expandPathWithTilde(projectDirectory);
+            const context = await createSchemaParserContext(resolvedDirectory);
+            const userConfig = await getUserConfig();
+            // Confirm with user before overwriting existing snapshot
+            console.warn('⚠️  This will overwrite any existing snapshot for this app.');
+            console.info('Use granular commands (snapshot add/remove) for safer updates.');
+            const proceed = await confirm({
+                message: 'Are you sure you want to overwrite the existing snapshot?',
+                default: false,
+            });
+            if (!proceed) {
+                logger.info('Aborted snapshot save.');
+                return;
+            }
+            await createSnapshotForProject({
+                projectDirectory: resolvedDirectory,
+                app,
+                logger,
+                context,
+                userConfig,
+                snapshotDir: options.snapshotDir,
+            });
+            logger.info('✅ Snapshot saved successfully');
+        }
+        catch (error) {
+            logger.error('Failed to save snapshot:', error);
+            throw error;
+        }
+    });
+    // snapshot show command
+    snapshotCommand
+        .command('show <project-directory> <app>')
+        .description('Show current snapshot contents')
+        .option('--snapshot-dir <directory>', 'Snapshot directory', '.baseplate-snapshot')
+        .action(async (projectDirectory, app, options) => {
+        try {
+            const { listSnapshotContents } = await import('@baseplate-dev/project-builder-server');
+            const resolvedDirectory = expandPathWithTilde(projectDirectory);
+            const context = await createSchemaParserContext(resolvedDirectory);
+            await listSnapshotContents({
+                projectDirectory: resolvedDirectory,
+                appName: app,
+                snapshotDirectory: options.snapshotDir,
+                context,
+                logger,
+            });
+        }
+        catch (error) {
+            logger.error('Failed to show snapshot contents:', error);
+            throw error;
+        }
+    });
+}

package/dist/commands/sync.js

@@ -10,12 +10,19 @@ export function addSyncCommand(program) {
     program
         .command('sync [directory]')
         .description('Syncs project from project-definition.json in baseplate/ directory')
-        .option('--force-overwrite', 'Force overwrite existing files without merge conflict detection')
+        .option('--overwrite', 'Force overwrite existing files and apply snapshots automatically')
+        .option('--snapshot <directory>', 'Apply diffs from snapshot directory (requires --overwrite)')
         .action(async (directory, options) => {
         const { syncProject, SyncMetadataController } = await import('@baseplate-dev/project-builder-server');
         const resolvedDirectory = directory
             ? expandPathWithTilde(directory)
             : '.';
+        // Validate that --snapshot requires --overwrite
+        if (options.snapshot && !options.overwrite) {
+            logger.error('Error: --snapshot option requires --overwrite flag');
+            logger.error('Snapshots are only applied when overwriting files, not during normal merging.');
+            throw new Error('--snapshot option requires --overwrite flag');
+        }
         const context = await createSchemaParserContext(resolvedDirectory);
         const userConfig = await getUserConfig();
         const syncMetadataController = new SyncMetadataController(resolvedDirectory, logger);
@@ -27,7 +34,8 @@ export function addSyncCommand(program) {
                 userConfig,
                 cliFilePath: process.argv[1],
                 syncMetadataController,
-                forceOverwrite: options.forceOverwrite ?? false,
+                overwrite: options.overwrite ?? false,
+                snapshotDirectory: options.overwrite ? options.snapshot : undefined,
             });
         }
         catch (error) {

package/dist/index.js

@@ -2,6 +2,7 @@ import { program } from 'commander';
 import { addConfigCommand } from './commands/config.js';
 import { addDiffCommand } from './commands/diff.js';
 import { addServeCommand } from './commands/server.js';
+import { addSnapshotCommand } from './commands/snapshot.js';
 import { addSyncCommand } from './commands/sync.js';
 import { addTemplatesCommand } from './commands/templates.js';
 import { getEnabledFeatureFlags } from './services/feature-flags.js';
@@ -16,6 +17,7 @@ export async function runCli() {
     program.version(version, '-v, --version');
     if (enabledFlags.includes('TEMPLATE_EXTRACTOR')) {
         addTemplatesCommand(program);
+        addSnapshotCommand(program);
     }
     addSyncCommand(program);
     addDiffCommand(program);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baseplate-dev/project-builder-cli",
-  "version": "0.2.5",
+  "version": "0.3.0",
   "description": "Full-stack CLI builder using Baseplate generators",
   "keywords": [
     "cli",
@@ -40,28 +40,28 @@
     "bin/**/*"
   ],
   "dependencies": {
+    "@inquirer/prompts": "7.2.1",
     "commander": "^12.1.0",
     "pino": "9.5.0",
     "pino-pretty": "13.0.0",
     "pkg-dir": "^8.0.0",
     "zod": "3.24.1",
-    "@baseplate-dev/project-builder-common": "0.2.5",
-    "@baseplate-dev/project-builder-lib": "0.2.5",
-    "@baseplate-dev/project-builder-server": "0.2.5",
-    "@baseplate-dev/project-builder-web": "0.2.5",
-    "@baseplate-dev/utils": "0.2.5"
+    "@baseplate-dev/project-builder-common": "0.3.0",
+    "@baseplate-dev/project-builder-lib": "0.3.0",
+    "@baseplate-dev/project-builder-server": "0.3.0",
+    "@baseplate-dev/project-builder-web": "0.3.0",
+    "@baseplate-dev/utils": "0.3.0"
   },
   "devDependencies": {
     "@playwright/test": "1.51.0",
     "@types/node": "^22.0.0",
-    "dotenv": "^16.0.3",
-    "eslint": "9.26.0",
+    "eslint": "9.32.0",
     "fastify": "5.3.2",
-    "prettier": "3.5.3",
+    "prettier": "3.6.2",
     "tsx": "4.19.3",
     "typescript": "5.7.3",
-    "vitest": "3.0.7",
-    "@baseplate-dev/tools": "0.2.5"
+    "vitest": "3.2.4",
+    "@baseplate-dev/tools": "0.3.0"
   },
   "engines": {
     "node": "^22.0.0"
@@ -76,13 +76,13 @@
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
     "clean": "rm -rf ./dist",
-    "dev": "tsx watch --tsconfig ./tsconfig.app.json --exclude /**/node_modules/** -r dotenv/config -C development ./src/cli.ts",
+    "dev": "tsx watch --tsconfig ./tsconfig.app.json --exclude /**/node_modules/** --env-file-if-exists=.env -C development ./src/cli.ts",
     "dev:serve": "pnpm dev serve",
     "lint": "eslint .",
     "prettier:check": "prettier --check .",
     "prettier:write": "prettier -w .",
     "project:generate": "pnpm start generate",
-    "start": "tsx --tsconfig ./tsconfig.app.json -r dotenv/config -C development ./src/cli.ts",
+    "start": "tsx --tsconfig ./tsconfig.app.json --env-file-if-exists=.env -C development ./src/cli.ts",
     "templates:extract": "pnpm start templates extract",
     "templates:generate": "pnpm start templates generate",
     "test": "vitest",