cleaner API

pyramation · pyramation · commit 661527fd7dc6 · 2025-07-04T16:25:50.000-07:00
diff --git a/.claude/settings.local.json b/.claude/settings.local.json
@@ -1,7 +1,8 @@
 {
   "permissions": {
     "allow": [
-      "Bash(rm:*)"
+      "Bash(rm:*)",
+      "Bash(mv:*)"
     ],
     "deny": []
   }
diff --git a/packages/cli/src/commands/deploy.ts b/packages/cli/src/commands/deploy.ts
@@ -1,17 +1,12 @@
 import { CLIOptions, Inquirerer, Question } from 'inquirerer';
 import { ParsedArgs } from 'minimist';
 
-import {
-  getEnvOptions,
-  LaunchQLOptions
-} from '@launchql/types';
-
 import {
   getPgEnvOptions,
   getSpawnEnvWithPg,
 } from 'pg-env';
 
-import { deploy, deployWithOptions } from '@launchql/core';
+import { deployModules } from '@launchql/core';
 import { Logger } from '@launchql/logger';
 import { execSync } from 'child_process';
 import { getTargetDatabase } from '../utils';
@@ -83,34 +78,17 @@ export default async (
     log.info(`Selected project: ${projectName}`);
   }
 
-  // Handle fast deploy using the unified deploy function
-  if (argv.fast && recursive) {
-    const options: LaunchQLOptions = getEnvOptions({
-      pg: {
-        database
-      }
-    });
-    
-    const { LaunchQLProject } = await import('@launchql/core');
-    const project = new LaunchQLProject(cwd);
-    const modules = project.getModuleMap();
-    const modulePath = modules[projectName!].path;
-    
-    await deploy(options, projectName!, database, modulePath, {
-      fast: true,
-      usePlan: true,
-      cache: false
-    });
-  } else {
-    await deployWithOptions({
-      database,
-      cwd,
-      recursive,
-      projectName,
-      useSqitch,
-      useTransaction: tx
-    });
-  }
+  await deployModules({
+    database,
+    cwd,
+    recursive,
+    projectName,
+    useSqitch,
+    useTransaction: tx,
+    fast: argv.fast,
+    usePlan: argv.usePlan ?? true,
+    cache: argv.cache ?? false
+  });
 
   log.success('Deployment complete.');
 
diff --git a/packages/cli/src/commands/revert.ts b/packages/cli/src/commands/revert.ts
@@ -1,6 +1,6 @@
 import { CLIOptions, Inquirerer, Question } from 'inquirerer';
 import { Logger } from '@launchql/logger';
-import { revertWithOptions } from '@launchql/core';
+import { revertModules } from '@launchql/core';
 import { getTargetDatabase } from '../utils';
 import { selectModule } from '../utils/module-utils';
 
@@ -48,7 +48,7 @@ export default async (
     log.info(`Selected project: ${projectName}`);
   }
 
-  await revertWithOptions({
+  await revertModules({
     database,
     cwd,
     recursive,
diff --git a/packages/cli/src/commands/verify.ts b/packages/cli/src/commands/verify.ts
@@ -1,6 +1,6 @@
 import { CLIOptions, Inquirerer, Question } from 'inquirerer';
 import { Logger } from '@launchql/logger';
-import { verifyWithOptions } from '@launchql/core';
+import { verifyModules } from '@launchql/core';
 import { getTargetDatabase } from '../utils';
 import { selectModule } from '../utils/module-utils';
 
@@ -27,7 +27,7 @@ export default async (
     log.info(`Selected project: ${projectName}`);
   }
 
-  await verifyWithOptions({
+  await verifyModules({
     database,
     cwd,
     recursive,
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -7,15 +7,15 @@ export * from './modules';
 export * from './package';
 export * from './paths';
 export * from './resolve';
-export * from './sqitch/deploy';
-export * from './sqitch/revert';
-export * from './sqitch/verify';
+export * from './projects/deploy-project';
+export * from './projects/revert-project';
+export * from './projects/verify-project';
 export * from './transform';
 export * from './utils';
 
 // New exports for migration API
-export * from './api/migration';
+export * from './migrate/migration';
 export { runSqitch } from './utils/sqitch-wrapper';
-export { deployCommand } from './migrate/deploy-command';
-export { revertCommand } from './migrate/revert-command';
-export { verifyCommand } from './migrate/verify-command';
+export { deployModule } from './migrate/deploy-module';
+export { revertModule } from './migrate/revert-module';
+export { verifyModule } from './migrate/verify-module';
diff --git a/packages/core/src/migrate/deploy-module.ts b/packages/core/src/migrate/deploy-module.ts
@@ -10,7 +10,7 @@ const log = new Logger('migrate-deploy');
  * Deploy command that mimics sqitch deploy behavior
  * This is designed to be a drop-in replacement for spawn('sqitch', ['deploy', 'db:pg:database'])
  */
-export async function deployCommand(
+export async function deployModule(
   config: Partial<MigrateConfig>,
   database: string,
   cwd: string,
diff --git a/packages/core/src/migrate/migration.ts b/packages/core/src/migrate/migration.ts
@@ -1,13 +1,13 @@
 import { LaunchQLProject } from '../class/launchql';
-import { deploy } from '../sqitch/deploy';
-import { revert } from '../sqitch/revert';
-import { verify } from '../sqitch/verify';
+import { deployProject } from '../projects/deploy-project';
+import { revertProject } from '../projects/revert-project';
+import { verifyProject } from '../projects/verify-project';
 import { getEnvOptions } from '@launchql/types';
 import { getPgEnvOptions } from 'pg-env';
 import { Logger } from '@launchql/logger';
-import { deployCommand } from '../migrate/deploy-command';
-import { revertCommand } from '../migrate/revert-command';
-import { verifyCommand } from '../migrate/verify-command';
+import { deployModule } from './deploy-module';
+import { revertModule } from './revert-module';
+import { verifyModule } from './verify-module';
 import { runSqitch } from '../utils/sqitch-wrapper';
 
 const log = new Logger('project-commands');
@@ -20,12 +20,16 @@ export interface MigrationOptions {
   useSqitch?: boolean;
   useTransaction?: boolean;
   toChange?: string;
+  // Options for fast deployment
+  fast?: boolean;
+  usePlan?: boolean;
+  cache?: boolean;
 }
 
 /**
  * Deploy a project - handles both recursive (multi-module) and non-recursive (single directory) deployments
  */
-export async function deployWithOptions(options: MigrationOptions): Promise<void> {
+export async function deployModules(options: MigrationOptions): Promise<void> {
   if (options.recursive) {
     if (!options.projectName) {
       throw new Error('projectName is required when recursive is true');
@@ -42,22 +46,25 @@ export async function deployWithOptions(options: MigrationOptions): Promise<void
     const modulePath = modules[options.projectName].path;
     log.info(`Deploying project ${options.projectName} from ${modulePath} to database ${options.database}...`);
     
-    await deploy(
+    await deployProject(
       getEnvOptions({ pg: { database: options.database } }), 
       options.projectName, 
       options.database, 
       modulePath, 
       { 
         useSqitch: options.useSqitch, 
-        useTransaction: options.useTransaction 
+        useTransaction: options.useTransaction,
+        fast: options.fast,
+        usePlan: options.usePlan,
+        cache: options.cache
       }
     );
   } else {
     // Direct execution on current directory
     if (options.useSqitch) {
       await runSqitch('deploy', options.database, options.cwd);
     } else {
-      await deployCommand(
+      await deployModule(
         getPgEnvOptions(), 
         options.database, 
         options.cwd, 
@@ -73,7 +80,7 @@ export async function deployWithOptions(options: MigrationOptions): Promise<void
 /**
  * Revert a project - handles both recursive (multi-module) and non-recursive (single directory) reverts
  */
-export async function revertWithOptions(options: MigrationOptions): Promise<void> {
+export async function revertModules(options: MigrationOptions): Promise<void> {
   if (options.recursive) {
     if (!options.projectName) {
       throw new Error('projectName is required when recursive is true');
@@ -89,7 +96,7 @@ export async function revertWithOptions(options: MigrationOptions): Promise<void
     
     log.info(`Reverting project ${options.projectName} on database ${options.database}...`);
     
-    await revert(
+    await revertProject(
       getEnvOptions({ pg: { database: options.database } }), 
       options.projectName, 
       options.database, 
@@ -104,7 +111,7 @@ export async function revertWithOptions(options: MigrationOptions): Promise<void
     if (options.useSqitch) {
       await runSqitch('revert', options.database, options.cwd);
     } else {
-      await revertCommand(
+      await revertModule(
         getPgEnvOptions(), 
         options.database, 
         options.cwd, 
@@ -120,7 +127,7 @@ export async function revertWithOptions(options: MigrationOptions): Promise<void
 /**
  * Verify a project - handles both recursive (multi-module) and non-recursive (single directory) verification
  */
-export async function verifyWithOptions(options: MigrationOptions): Promise<void> {
+export async function verifyModules(options: MigrationOptions): Promise<void> {
   if (options.recursive) {
     if (!options.projectName) {
       throw new Error('projectName is required when recursive is true');
@@ -136,7 +143,7 @@ export async function verifyWithOptions(options: MigrationOptions): Promise<void
     
     log.info(`Verifying project ${options.projectName} on database ${options.database}...`);
     
-    await verify(
+    await verifyProject(
       getEnvOptions({ pg: { database: options.database } }), 
       options.projectName, 
       options.database, 
@@ -148,7 +155,7 @@ export async function verifyWithOptions(options: MigrationOptions): Promise<void
     if (options.useSqitch) {
       await runSqitch('verify', options.database, options.cwd);
     } else {
-      await verifyCommand(
+      await verifyModule(
         getPgEnvOptions(), 
         options.database, 
         options.cwd
diff --git a/packages/core/src/migrate/revert-module.ts b/packages/core/src/migrate/revert-module.ts
@@ -10,7 +10,7 @@ const log = new Logger('migrate-revert');
  * Revert command that mimics sqitch revert behavior
  * This is designed to be a drop-in replacement for spawn('sqitch', ['revert', 'db:pg:database'])
  */
-export async function revertCommand(
+export async function revertModule(
   config: Partial<MigrateConfig>,
   database: string,
   cwd: string,
diff --git a/packages/core/src/migrate/verify-module.ts b/packages/core/src/migrate/verify-module.ts
@@ -10,7 +10,7 @@ const log = new Logger('migrate-verify');
  * Verify command that mimics sqitch verify behavior
  * This is designed to be a drop-in replacement for spawn('sqitch', ['verify', 'db:pg:database'])
  */
-export async function verifyCommand(
+export async function verifyModule(
   config: Partial<MigrateConfig>,
   database: string,
   cwd: string
diff --git a/packages/core/src/projects/deploy-project.ts b/packages/core/src/projects/deploy-project.ts
@@ -5,7 +5,7 @@ import { errors, LaunchQLOptions } from '@launchql/types';
 import { getSpawnEnvWithPg, PgConfig } from 'pg-env';
 import { Logger } from '@launchql/logger';
 import { getPgPool } from 'pg-cache';
-import { deployCommand } from '../migrate/deploy-command';
+import { deployModule } from '../migrate/deploy-module';
 import { LaunchQLProject } from '../class/launchql';
 import { packageModule } from '../package';
 
@@ -28,7 +28,7 @@ const getCacheKey = (
 
 const log = new Logger('deploy');
 
-export const deploy = async (
+export const deployProject = async (
   opts: LaunchQLOptions,
   name: string,
   database: string,
@@ -155,7 +155,7 @@ export const deploy = async (
           log.debug(`→ Command: launchql migrate deploy db:pg:${database}`);
           
           try {
-            await deployCommand(opts.pg, database, modulePath, { useTransaction: options?.useTransaction });
+            await deployModule(opts.pg, database, modulePath, { useTransaction: options?.useTransaction });
           } catch (deployError) {
             log.error(`❌ Deployment failed for module ${extension}`);
             throw errors.DEPLOYMENT_FAILED({ type: 'Deployment', module: extension });
diff --git a/packages/core/src/projects/revert-project.ts b/packages/core/src/projects/revert-project.ts
@@ -6,7 +6,7 @@ import { errors, LaunchQLOptions } from '@launchql/types';
 import { getSpawnEnvWithPg } from 'pg-env';
 import { Logger } from '@launchql/logger';
 import { getPgPool } from 'pg-cache';
-import { revertCommand } from '../migrate/revert-command';
+import { revertModule } from '../migrate/revert-module';
 
 interface Extensions {
   resolved: string[];
@@ -15,7 +15,7 @@ interface Extensions {
 
 const log = new Logger('revert');
 
-export const revert = async (
+export const revertProject = async (
   opts: LaunchQLOptions,
   name: string,
   database: string,
@@ -94,7 +94,7 @@ export const revert = async (
           log.debug(`→ Command: launchql migrate revert db:pg:${database}`);
           
           try {
-            await revertCommand(opts.pg, database, modulePath, { useTransaction: options?.useTransaction });
+            await revertModule(opts.pg, database, modulePath, { useTransaction: options?.useTransaction });
           } catch (revertError) {
             log.error(`❌ Revert failed for module ${extension}`);
             throw errors.DEPLOYMENT_FAILED({ type: 'Revert', module: extension });
diff --git a/packages/core/src/projects/utils.ts b/packages/core/src/projects/utils.ts
diff --git a/packages/core/src/projects/verify-project.ts b/packages/core/src/projects/verify-project.ts
@@ -6,7 +6,7 @@ import { getSpawnEnvWithPg } from 'pg-env';
 import { LaunchQLProject } from '../class/launchql';
 import { Logger } from '@launchql/logger';
 import { getPgPool } from 'pg-cache';
-import { verifyCommand } from '../migrate/verify-command';
+import { verifyModule } from '../migrate/verify-module';
 
 interface Extensions {
   resolved: string[];
@@ -15,7 +15,7 @@ interface Extensions {
 
 const log = new Logger('verify');
 
-export const verify = async (
+export const verifyProject = async (
   opts: LaunchQLOptions,
   name: string,
   database: string,
@@ -83,7 +83,7 @@ export const verify = async (
             });
           } else {
             // Use new migration system
-            await verifyCommand(opts.pg, database, modulePath);
+            await verifyModule(opts.pg, database, modulePath);
           }
         } catch (verifyError) {
           log.error(`❌ Verification failed for module ${extension}`);
diff --git a/packages/pgsql-test/src/seed/launchql.ts b/packages/pgsql-test/src/seed/launchql.ts
@@ -1,6 +1,6 @@
 import { SeedAdapter, SeedContext } from './types';
 import { getEnvOptions } from '@launchql/types';
-import { LaunchQLProject, deploy } from '@launchql/core';
+import { LaunchQLProject, deployProject } from '@launchql/core';
 
 export function launchql(cwd?: string, cache: boolean = false): SeedAdapter {
   return {
@@ -10,7 +10,7 @@ export function launchql(cwd?: string, cache: boolean = false): SeedAdapter {
 
       const opts = getEnvOptions({ pg: ctx.config });
 
-      await deploy(opts, proj.getModuleName(), ctx.config.database, proj.modulePath, {
+      await deployProject(opts, proj.getModuleName(), ctx.config.database, proj.modulePath, {
         fast: true,
         usePlan: true,
         cache
diff --git a/packages/pgsql-test/src/seed/sqitch.ts b/packages/pgsql-test/src/seed/sqitch.ts
@@ -1,14 +1,14 @@
 import { SeedAdapter, SeedContext } from './types';
 import { getEnvOptions } from '@launchql/types';
-import { LaunchQLProject, deploy } from '@launchql/core';
+import { LaunchQLProject, deployProject } from '@launchql/core';
 
 export function sqitch(cwd?: string): SeedAdapter {
   return {
     async seed(ctx: SeedContext) {
       const proj = new LaunchQLProject(cwd ?? ctx.connect.cwd);
       if (!proj.isInModule()) return;
       const opts = getEnvOptions({ pg: ctx.config });
-      await deploy(opts, proj.getModuleName(), ctx.config.database, proj.modulePath, {
+      await deployProject(opts, proj.getModuleName(), ctx.config.database, proj.modulePath, {
         useSqitch: true,
         fast: false
       });

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"permissions": {`
`3`	`3`	`"allow": [`
`4`		`- "Bash(rm:*)"`
	`4`	`+ "Bash(rm:*)",`
	`5`	`+ "Bash(mv:*)"`
`5`	`6`	`],`
`6`	`7`	`"deny": []`
`7`	`8`	`}`