plans

Author: pyramation

packages/core/package.json

@@ -44,6 +44,7 @@
   "dependencies": {
     "@launchql/migrate": "^2.3.0",
     "@launchql/server-utils": "^2.1.15",
+    "@launchql/sqitch-parser": "^2.0.0",
     "@launchql/templatizer": "^2.1.6",
     "@launchql/types": "^2.1.13",
     "@pgsql/types": "^17.6.1",

packages/core/src/extensions.ts

@@ -1,4 +1,5 @@
 import { readFileSync, writeFileSync } from 'fs';
+import { parsePlanFileSimple } from '@launchql/sqitch-parser';
 import { ModuleMap } from './modules';
 
 export interface ExtensionInfo {
@@ -48,16 +49,14 @@ export const getAvailableExtensions = (
  * Parse the sqitch.plan file to get the extension name.
  */
 export const getExtensionName = (packageDir: string): string => {
-  const plan = readFileSync(`${packageDir}/sqitch.plan`, 'utf-8')
-    .split('\n')
-    .map((line) => line.trim())
-    .filter((line) => /^%project=/.test(line));
-
-  if (!plan.length) {
+  const planPath = `${packageDir}/sqitch.plan`;
+  const plan = parsePlanFileSimple(planPath);
+  
+  if (!plan.project) {
     throw new Error('No project name found in sqitch.plan!');
   }
 
-  return plan[0].split('=')[1].trim();
+  return plan.project;
 };
 
 /**

packages/core/src/modules.ts

@@ -1,6 +1,7 @@
 import { readFileSync } from 'fs';
 import { sync as glob } from 'glob';
 import { basename, dirname, relative } from 'path';
+import { getLatestChange } from '@launchql/sqitch-parser';
 
 export interface Module {
   path: string;
@@ -65,12 +66,8 @@ export const latestChange = (
     throw new Error(`latestChange() ${sqlmodule} NOT FOUND!`);
   }
 
-  const plan = readFileSync(`${basePath}/${module.path}/sqitch.plan`, 'utf-8')
-    .split('\n')
-    .map((line) => line.trim())
-    .filter(Boolean);
-
-  return plan[plan.length - 1].split(' ')[0];
+  const planPath = `${basePath}/${module.path}/sqitch.plan`;
+  return getLatestChange(planPath);
 };
 
 /**
@@ -86,12 +83,8 @@ export const latestChangeAndVersion = (
     throw new Error(`latestChangeAndVersion() ${sqlmodule} NOT FOUND!`);
   }
 
-  const plan = readFileSync(`${basePath}/${module.path}/sqitch.plan`, 'utf-8')
-    .split('\n')
-    .map((line) => line.trim())
-    .filter(Boolean);
-
-  const change = plan[plan.length - 1].split(' ')[0];
+  const planPath = `${basePath}/${module.path}/sqitch.plan`;
+  const change = getLatestChange(planPath);
   const pkg = require(`${basePath}/${module.path}/package.json`);
 
   return { change, version: pkg.version };

packages/core/src/resolve.ts

@@ -1,4 +1,5 @@
 import { readFileSync } from 'fs';
+import { getChanges } from '@launchql/sqitch-parser';
 
 import { getDeps } from './deps';
 import { getExtensionName } from './extensions';
@@ -42,17 +43,9 @@ export const resolveWithPlan = (
   scriptType: 'deploy' | 'revert' = 'deploy'
 ): string => {
   const sqlfile: string[] = [];
-  const plan = readFileSync(`${pkgDir}/sqitch.plan`, 'utf-8');
-
-  let resolved = plan
-    .split('\n')
-    .filter(
-      (line) =>
-        line.trim().length > 0 && // Exclude empty lines
-        !line.trim().startsWith('%') && // Exclude initial project settings
-        !line.trim().startsWith('@') // Exclude tags
-    )
-    .map((line) => line.split(' ')[0]);
+  const planPath = `${pkgDir}/sqitch.plan`;
+  
+  let resolved = getChanges(planPath);
 
   if (scriptType === 'revert') {
     resolved = resolved.reverse();

packages/migrate/__tests__/plan-parser.test.ts

@@ -1,6 +1,6 @@
 import { join } from 'path';
 import {
-  parsePlanFileWithValidation,
+  parsePlanFile,
   resolveReference,
   ExtendedPlanFile
 } from '../src/parser/plan-parser';
@@ -11,7 +11,7 @@ describe('Plan Parser with Validation', () => {
   describe('Valid plan files', () => {
     it('should parse valid change names', () => {
       const planPath = join(fixturesDir, 'plan-valid', 'valid-change-names.plan');
-      const result = parsePlanFileWithValidation(planPath);
+      const result = parsePlanFile(planPath);
 
       expect(result.errors).toHaveLength(0);
       expect(result.plan).toBeDefined();
@@ -38,7 +38,7 @@ describe('Plan Parser with Validation', () => {
 
     it('should parse valid tag names', () => {
       const planPath = join(fixturesDir, 'plan-valid', 'valid-tag-names.plan');
-      const result = parsePlanFileWithValidation(planPath);
+      const result = parsePlanFile(planPath);
 
       expect(result.errors).toHaveLength(0);
       expect(result.plan).toBeDefined();
@@ -69,7 +69,7 @@ describe('Plan Parser with Validation', () => {
 
     it('should parse symbolic references', () => {
       const planPath = join(fixturesDir, 'plan-valid', 'symbolic-head-root.plan');
-      const result = parsePlanFileWithValidation(planPath);
+      const result = parsePlanFile(planPath);
 
       expect(result.errors).toHaveLength(0);
       expect(result.plan).toBeDefined();
@@ -87,7 +87,7 @@ describe('Plan Parser with Validation', () => {
 
     it('should parse relative references', () => {
       const planPath = join(fixturesDir, 'plan-valid', 'relative-head-root.plan');
-      const result = parsePlanFileWithValidation(planPath);
+      const result = parsePlanFile(planPath);
 
       expect(result.errors).toHaveLength(0);
       expect(result.plan).toBeDefined();
@@ -114,7 +114,7 @@ describe('Plan Parser with Validation', () => {
 
     it('should parse SHA1 references', () => {
       const planPath = join(fixturesDir, 'plan-valid', 'sha1-refs.plan');
-      const result = parsePlanFileWithValidation(planPath);
+      const result = parsePlanFile(planPath);
 
       expect(result.errors).toHaveLength(0);
       expect(result.plan).toBeDefined();
@@ -132,7 +132,7 @@ describe('Plan Parser with Validation', () => {
   describe('Invalid plan files', () => {
     it('should report errors for invalid change names', () => {
       const planPath = join(fixturesDir, 'plan-invalid', 'invalid-change-names.plan');
-      const result = parsePlanFileWithValidation(planPath);
+      const result = parsePlanFile(planPath);
 
       expect(result.errors.length).toBeGreaterThan(0);
 
@@ -146,7 +146,7 @@ describe('Plan Parser with Validation', () => {
 
     it('should report errors for invalid tag names', () => {
       const planPath = join(fixturesDir, 'plan-invalid', 'invalid-tag-names.plan');
-      const result = parsePlanFileWithValidation(planPath);
+      const result = parsePlanFile(planPath);
 
       expect(result.errors.length).toBeGreaterThan(0);
 
@@ -158,7 +158,7 @@ describe('Plan Parser with Validation', () => {
 
     it('should report errors for bad symbolic references', () => {
       const planPath = join(fixturesDir, 'plan-invalid', 'bad-symbolic-refs.plan');
-      const result = parsePlanFileWithValidation(planPath);
+      const result = parsePlanFile(planPath);
 
       expect(result.errors.length).toBeGreaterThan(0);
 

packages/migrate/package.json

@@ -35,6 +35,7 @@
   "dependencies": {
     "@launchql/logger": "^1.0.0",
     "@launchql/server-utils": "^2.1.15",
+    "@launchql/sqitch-parser": "^2.0.0",
     "@launchql/types": "^2.1.13",
     "@pgsql/types": "^17.6.1",
     "pg": "^8.11.3",

packages/migrate/src/client.ts

@@ -14,12 +14,18 @@ import {
   VerifyResult,
   StatusResult
 } from './types';
-import { parsePlanFile, getChangesInOrder } from './parser/plan';
+import { parsePlanFileSimple as parsePlanFile, Change } from '@launchql/sqitch-parser';
 import { hashFile } from './utils/hash';
 import { readScript, scriptExists } from './utils/fs';
 import { cleanSql } from './clean';
 import { withTransaction, executeQuery, TransactionContext } from './utils/transaction';
 
+// Helper function to get changes in order
+function getChangesInOrder(planPath: string, reverse: boolean = false): Change[] {
+  const plan = parsePlanFile(planPath);
+  return reverse ? [...plan.changes].reverse() : plan.changes;
+}
+
 const log = new Logger('migrate');
 
 export class LaunchQLMigrate {

packages/migrate/src/index.ts

@@ -1,24 +1,8 @@
 export { LaunchQLMigrate } from './client';
 export * from './types';
-export { parsePlanFile, getChangeNamesFromPlan, getChangesInOrder } from './parser/plan';
 export { hashFile, hashString } from './utils/hash';
 export { readScript, scriptExists } from './utils/fs';
 export { withTransaction, TransactionContext, TransactionOptions } from './utils/transaction';
 
-// Export new validation and parsing functionality
-export {
-  isValidChangeName,
-  isValidTagName,
-  parseReference,
-  isValidDependency,
-  ParsedReference
-} from './parser/validators';
-
-export {
-  parsePlanFileWithValidation,
-  resolveReference,
-  ExtendedPlanFile,
-  Tag,
-  ParseError,
-  ParseResult
-} from './parser/plan-parser';
+// Re-export parser functionality from sqitch-parser
+export * from '@launchql/sqitch-parser';

packages/migrate/src/parser/plan.ts

@@ -0,0 +1 @@
+export * from './parser';