@baseplate-dev/project-builder-cli 0.3.7 → 0.4.0

package/dist/commands/diff.js

@@ -12,12 +12,16 @@ export function addDiffCommand(program) {
         .option('--compact', 'Show compact diff format instead of unified diff')
         .option('--package <packages...>', 'Filter by specific package names')
         .option('--include <patterns...>', 'Filter files by glob patterns')
+        .option('--fail-on-differences', 'Fail the command if differences are found')
         .action(async (project, options) => {
         const resolvedProject = await resolveProject(project);
         const context = await createServiceActionContext(resolvedProject);
-        await invokeServiceActionAsCli(diffProjectAction, {
+        const result = await invokeServiceActionAsCli(diffProjectAction, {
             project: resolvedProject.name,
             ...options,
         }, context);
+        if (result.hasDifferences && options.failOnDifferences) {
+            throw new Error('Differences found between generated output and project');
+        }
     });
 }

package/dist/commands/projects.js

@@ -32,9 +32,7 @@ async function handleListProjects(options) {
             const projects = [...projectMap.values()].map((project) => ({
                 name: project.name,
                 path: project.path,
-                isExample: project.isExample,
-                description: project.packageJson.description ?? null,
-                version: project.packageJson.version ?? null,
+                isInternalExample: project.isInternalExample,
             }));
             console.info(JSON.stringify(projects, null, 2));
         }
@@ -44,7 +42,7 @@ async function handleListProjects(options) {
             const examples = [];
             const regular = [];
             for (const project of projectMap.values()) {
-                if (project.isExample) {
+                if (project.isInternalExample) {
                     examples.push(project);
                 }
                 else {
@@ -56,9 +54,6 @@ async function handleListProjects(options) {
                 console.info('📦 Projects:');
                 for (const project of regular) {
                     console.info(`   ${project.name}`);
-                    if (typeof project.packageJson.description === 'string') {
-                        console.info(`     ${project.packageJson.description}`);
-                    }
                     console.info(`     Path: ${project.path}`);
                     console.info();
                 }
@@ -68,9 +63,6 @@ async function handleListProjects(options) {
                 console.info('📚 Examples:');
                 for (const project of examples) {
                     console.info(`   ${project.name}`);
-                    if (typeof project.packageJson.description === 'string') {
-                        console.info(`     ${project.packageJson.description}`);
-                    }
                     console.info(`     Path: ${project.path}`);
                     console.info();
                 }

package/dist/commands/snapshot.js

@@ -1,8 +1,6 @@
+import { invokeServiceActionAsCli, snapshotAddAction, snapshotRemoveAction, snapshotSaveAction, snapshotShowAction, } from '@baseplate-dev/project-builder-server/actions';
 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 { resolveProject } from '#src/utils/project-resolver.js';
+import { createServiceActionContext } from '#src/utils/create-service-action-context.js';
 import { logger } from '../services/logger.js';
 /**
  * Adds snapshot management commands to the program.
@@ -20,26 +18,13 @@ export function addSnapshotCommand(program) {
         .option('--snapshot-dir <directory>', 'Snapshot directory', '.baseplate-snapshot')
         .action(async (project, app, files, options) => {
         try {
-            const { addFilesToSnapshot } = await import('@baseplate-dev/project-builder-server');
-            let resolvedDirectory;
-            if (project.includes('/') || project.includes('\\')) {
-                // It's a path, expand it
-                resolvedDirectory = expandPathWithTilde(project);
-            }
-            else {
-                // It's a project name, resolve it
-                const projectInfo = await resolveProject(project);
-                resolvedDirectory = projectInfo.path;
-                logger.info(`Running snapshot add for project: ${projectInfo.name}`);
-            }
-            const context = await createSchemaParserContext(resolvedDirectory);
-            await addFilesToSnapshot(files, !!options.deleted, {
-                projectDirectory: resolvedDirectory,
-                snapshotDirectory: options.snapshotDir,
-                appName: app,
-                context,
-                logger,
-            });
+            const context = await createServiceActionContext();
+            await invokeServiceActionAsCli(snapshotAddAction, {
+                project,
+                app,
+                files,
+                deleted: options.deleted,
+            }, context);
         }
         catch (error) {
             logger.error('Failed to add files to snapshot:', error);
@@ -53,26 +38,13 @@ export function addSnapshotCommand(program) {
         .option('--snapshot-dir <directory>', 'Snapshot directory', '.baseplate-snapshot')
         .action(async (project, app, files, options) => {
         try {
-            const { removeFilesFromSnapshot } = await import('@baseplate-dev/project-builder-server');
-            let resolvedDirectory;
-            if (project.includes('/') || project.includes('\\')) {
-                // It's a path, expand it
-                resolvedDirectory = expandPathWithTilde(project);
-            }
-            else {
-                // It's a project name, resolve it
-                const projectInfo = await resolveProject(project);
-                resolvedDirectory = projectInfo.path;
-                logger.info(`Running snapshot remove for project: ${projectInfo.name}`);
-            }
-            const context = await createSchemaParserContext(resolvedDirectory);
-            await removeFilesFromSnapshot(files, {
-                projectDirectory: resolvedDirectory,
+            const context = await createServiceActionContext();
+            await invokeServiceActionAsCli(snapshotRemoveAction, {
+                project,
+                app,
+                files,
                 snapshotDirectory: options.snapshotDir,
-                appName: app,
-                context,
-                logger,
-            });
+            }, context);
         }
         catch (error) {
             logger.error('Failed to remove files from snapshot:', error);
@@ -85,46 +57,23 @@ export function addSnapshotCommand(program) {
         .description('Save snapshot of current differences (overwrites existing snapshot)')
         .option('--snapshot-dir <directory>', 'Snapshot directory', '.baseplate-snapshot')
         .action(async (project, app, options) => {
-        try {
-            const { createSnapshotForProject } = await import('@baseplate-dev/project-builder-server');
-            let resolvedDirectory;
-            if (project.includes('/') || project.includes('\\')) {
-                // It's a path, expand it
-                resolvedDirectory = expandPathWithTilde(project);
-            }
-            else {
-                // It's a project name, resolve it
-                const projectInfo = await resolveProject(project);
-                resolvedDirectory = projectInfo.path;
-                logger.info(`Running snapshot save for project: ${projectInfo.name}`);
-            }
-            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;
+        // 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;
         }
+        const context = await createServiceActionContext();
+        await invokeServiceActionAsCli(snapshotSaveAction, {
+            project,
+            app,
+            snapshotDirectory: options.snapshotDir,
+        }, context);
     });
     // snapshot show command
     snapshotCommand
@@ -132,31 +81,11 @@ export function addSnapshotCommand(program) {
         .description('Show current snapshot contents')
         .option('--snapshot-dir <directory>', 'Snapshot directory', '.baseplate-snapshot')
         .action(async (project, app, options) => {
-        try {
-            const { listSnapshotContents } = await import('@baseplate-dev/project-builder-server');
-            let resolvedDirectory;
-            if (project.includes('/') || project.includes('\\')) {
-                // It's a path, expand it
-                resolvedDirectory = expandPathWithTilde(project);
-            }
-            else {
-                // It's a project name, resolve it
-                const projectInfo = await resolveProject(project);
-                resolvedDirectory = projectInfo.path;
-                logger.info(`Running snapshot show for project: ${projectInfo.name}`);
-            }
-            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;
-        }
+        const context = await createServiceActionContext();
+        await invokeServiceActionAsCli(snapshotShowAction, {
+            project,
+            app,
+            snapshotDirectory: options.snapshotDir,
+        }, context);
     });
 }

package/dist/utils/create-service-action-context.d.ts

@@ -1,2 +1,3 @@
-import type { ServiceActionContext, ServiceActionProject } from '@baseplate-dev/project-builder-server/actions';
-export declare function createServiceActionContext(project?: ServiceActionProject): Promise<ServiceActionContext>;
+import type { ProjectInfo } from '@baseplate-dev/project-builder-lib';
+import type { ServiceActionContext } from '@baseplate-dev/project-builder-server/actions';
+export declare function createServiceActionContext(project?: ProjectInfo): Promise<ServiceActionContext>;

package/dist/utils/create-service-action-context.js

@@ -2,14 +2,17 @@ import { getDefaultPlugins } from '@baseplate-dev/project-builder-common';
 import { logger } from '#src/services/logger.js';
 import { getUserConfig } from '#src/services/user-config.js';
 import { listProjects } from './list-projects.js';
+import { getPackageVersion } from './version.js';
 export async function createServiceActionContext(project) {
     const projects = project ? [project] : await listProjects({});
     const plugins = await getDefaultPlugins(logger);
     const userConfig = await getUserConfig();
+    const cliVersion = await getPackageVersion();
     return {
         projects,
         logger,
         userConfig,
         plugins,
+        cliVersion,
     };
 }

package/dist/utils/list-projects.d.ts

@@ -1,4 +1,4 @@
-import type { ServiceActionProject } from '@baseplate-dev/project-builder-server/actions';
+import type { ProjectInfo } from '@baseplate-dev/project-builder-lib';
 /**
  * Lists all available projects by searching through configured directories.
  *
@@ -25,7 +25,7 @@ import type { ServiceActionProject } from '@baseplate-dev/project-builder-server
  */
 export declare function listProjects({ additionalDirectories, }: {
     additionalDirectories?: string[];
-}): Promise<ServiceActionProject[]>;
+}): Promise<ProjectInfo[]>;
 /**
  * Resolves a project by name or directory path.
  *
@@ -55,7 +55,7 @@ export declare function listProjects({ additionalDirectories, }: {
  * const project = await resolveProject('~/projects/my-project');
  * ```
  */
-export declare function resolveProject(projectNameOrDirectory?: string | undefined): Promise<ServiceActionProject>;
+export declare function resolveProject(projectNameOrDirectory?: string | undefined): Promise<ProjectInfo>;
 /**
  * Lists all example projects by searching through example directories only.
  *
@@ -70,4 +70,4 @@ export declare function resolveProject(projectNameOrDirectory?: string | undefin
  * const exampleProjects = await getExampleProjects();
  * ```
  */
-export declare function getExampleProjects(): Promise<ServiceActionProject[]>;
+export declare function getExampleProjects(): Promise<ProjectInfo[]>;

package/dist/utils/project-resolver.d.ts

@@ -1,15 +1,13 @@
 /**
  * Information about a discovered project
  */
-export interface ProjectInfo {
+export interface DiscoveredProjectInfo {
     /** Project name from package.json */
     name: string;
     /** Absolute path to the project directory */
     path: string;
-    /** Parsed package.json content */
-    packageJson: Record<string, unknown>;
-    /** Whether this project is from the examples directory */
-    isExample: boolean;
+    /** Whether this project is an internal example project */
+    isInternalExample: boolean;
 }
 /**
  * Options for resolving projects
@@ -26,10 +24,10 @@ interface ResolveProjectsOptions {
  * Resolves all available projects based on the provided options.
  *
  * @param options - Configuration for project resolution
- * @returns Map of project name to ProjectInfo
+ * @returns Map of project name to DiscoveredProjectInfo
  * @throws Error if duplicate project names are found or if project loading fails
  */
-export declare function resolveProjects(options?: ResolveProjectsOptions): Promise<Map<string, ProjectInfo>>;
+export declare function resolveProjects(options?: ResolveProjectsOptions): Promise<Map<string, DiscoveredProjectInfo>>;
 /**
  * Resolves a single project by name or path.
  *
@@ -37,19 +35,19 @@ export declare function resolveProjects(options?: ResolveProjectsOptions): Promi
  * @returns ProjectInfo for the resolved project
  * @throws Error if project cannot be resolved or loaded
  */
-export declare function resolveProject(nameOrPath: string): Promise<ProjectInfo>;
+export declare function resolveProject(nameOrPath: string): Promise<DiscoveredProjectInfo>;
 /**
  * Gets project directories from resolved projects.
  *
  * @param projectMap - Map of resolved projects
  * @returns Array of absolute directory paths
  */
-export declare function getProjectDirectories(projectMap: Map<string, ProjectInfo>): string[];
+export declare function getProjectDirectories(projectMap: Map<string, DiscoveredProjectInfo>): string[];
 /**
  * Gets project names from resolved projects.
  *
  * @param projectMap - Map of resolved projects
  * @returns Array of project names
  */
-export declare function getProjectNames(projectMap: Map<string, ProjectInfo>): string[];
+export declare function getProjectNames(projectMap: Map<string, DiscoveredProjectInfo>): string[];
 export {};

package/dist/utils/project-resolver.js

@@ -1,12 +1,14 @@
-import fs from 'node:fs/promises';
+import { isExampleProject } from '@baseplate-dev/project-builder-server/actions';
+import { readJsonWithSchema } from '@baseplate-dev/utils/node';
 import path from 'node:path';
+import z from 'zod';
 import { findExamplesDirectories } from './find-examples-directories.js';
 import { expandPathWithTilde } from './path.js';
 /**
  * Resolves all available projects based on the provided options.
  *
  * @param options - Configuration for project resolution
- * @returns Map of project name to ProjectInfo
+ * @returns Map of project name to DiscoveredProjectInfo
  * @throws Error if duplicate project names are found or if project loading fails
  */
 export async function resolveProjects(options = {}) {
@@ -93,21 +95,24 @@ export async function resolveProject(nameOrPath) {
  * @throws Error if directory doesn't exist or package.json is invalid
  */
 async function loadProjectInfo(directory) {
-    const packageJsonPath = path.join(directory, 'package.json');
+    const definitionPath = path.join(directory, 'baseplate', 'project-definition.json');
     try {
-        const packageJsonContent = await fs.readFile(packageJsonPath, 'utf-8');
-        const packageJson = JSON.parse(packageJsonContent);
-        const name = packageJson.name;
-        if (!name || typeof name !== 'string') {
-            throw new Error('package.json must have a valid "name" field');
+        const definition = await readJsonWithSchema(definitionPath, z.object({
+            settings: z.object({
+                general: z.object({
+                    name: z.string(),
+                }),
+            }),
+        }));
+        const { name } = definition.settings.general;
+        if (!name) {
+            throw new Error('Project definition must have a valid name in settings.general.name');
         }
-        // Determine if this is an example project by checking if it's in examples directory
-        const isExample = directory.includes('/examples/') || directory.includes('\\examples\\');
+        const isInternalExample = await isExampleProject(directory);
         return {
             name,
             path: directory,
-            packageJson,
-            isExample,
+            isInternalExample,
         };
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baseplate-dev/project-builder-cli",
-  "version": "0.3.7",
+  "version": "0.4.0",
   "description": "Full-stack CLI builder using Baseplate generators",
   "keywords": [
     "cli",
@@ -46,23 +46,23 @@
     "pino-pretty": "13.0.0",
     "pkg-dir": "^8.0.0",
     "zod": "3.25.76",
-    "@baseplate-dev/project-builder-common": "0.3.7",
-    "@baseplate-dev/project-builder-lib": "0.3.7",
-    "@baseplate-dev/project-builder-server": "0.3.7",
-    "@baseplate-dev/project-builder-web": "0.3.7",
-    "@baseplate-dev/utils": "0.3.7"
+    "@baseplate-dev/project-builder-common": "0.4.0",
+    "@baseplate-dev/project-builder-lib": "0.4.0",
+    "@baseplate-dev/project-builder-server": "0.4.0",
+    "@baseplate-dev/project-builder-web": "0.4.0",
+    "@baseplate-dev/utils": "0.4.0"
   },
   "devDependencies": {
-    "@playwright/test": "1.51.0",
+    "@playwright/test": "1.56.1",
     "@types/node": "^22.17.2",
     "eslint": "9.32.0",
     "fastify": "5.3.2",
     "memfs": "4.15.1",
     "prettier": "3.6.2",
-    "tsx": "4.19.3",
+    "tsx": "4.20.6",
     "typescript": "5.8.3",
     "vitest": "3.2.4",
-    "@baseplate-dev/tools": "0.3.7"
+    "@baseplate-dev/tools": "0.4.0"
   },
   "engines": {
     "node": "^22.0.0"

package/dist/services/schema-parser-context.d.ts

@@ -1,7 +0,0 @@
-import type { SchemaParserContext } from '@baseplate-dev/project-builder-lib';
-/**
- * Creates a schema parser context for the given directory.
- * @param directory - The directory to create the schema parser context for.
- * @returns A promise that resolves to the schema parser context.
- */
-export declare function createSchemaParserContext(directory: string): Promise<SchemaParserContext>;

package/dist/services/schema-parser-context.js

@@ -1,13 +0,0 @@
-import { getDefaultPlugins } from '@baseplate-dev/project-builder-common';
-import { logger } from './logger.js';
-/**
- * Creates a schema parser context for the given directory.
- * @param directory - The directory to create the schema parser context for.
- * @returns A promise that resolves to the schema parser context.
- */
-export async function createSchemaParserContext(directory) {
-    // dynamically import to avoid loading the server package unnecessarily
-    const { createNodeSchemaParserContext } = await import('@baseplate-dev/project-builder-server/plugins');
-    const builtInPlugins = await getDefaultPlugins(logger);
-    return createNodeSchemaParserContext(directory, logger, builtInPlugins);
-}