pgflow 0.1.9 → 0.1.11

package/dist/commands/compile/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/compile/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;kCAkChB,OAAO;AAAhC,wBA4EE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/compile/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,WAAW,CAAC;kCAkChB,OAAO;AAAhC,wBAoHE"}

package/dist/commands/compile/index.js

@@ -35,6 +35,7 @@ export default (program) => {
         .description('Compiles a TypeScript-defined flow into SQL migration')
         .argument('<flowPath>', 'Path to the flow TypeScript file')
         .option('--deno-json <denoJsonPath>', 'Path to deno.json with valid importMap')
+        .option('--supabase-path <supabasePath>', 'Path to the Supabase folder')
         .action(async (flowPath, options) => {
         intro('pgflow - Compile Flow to SQL');
         try {
@@ -55,17 +56,43 @@ export default (program) => {
                 log.error(`Flow file not found: ${resolvedFlowPath}`);
                 process.exit(1);
             }
+            // Validate Supabase path
+            let supabasePath;
+            if (options.supabasePath) {
+                supabasePath = path.resolve(process.cwd(), options.supabasePath);
+            }
+            else {
+                // Default to ./supabase/ if not provided
+                supabasePath = path.resolve(process.cwd(), 'supabase');
+            }
+            // Check if Supabase path exists
+            if (!fs.existsSync(supabasePath)) {
+                log.error(`Supabase directory not found: ${supabasePath}\n` +
+                    `Please provide a valid Supabase path using --supabase-path option or ensure ./supabase/ directory exists.`);
+                process.exit(1);
+            }
             // Find the internal_compile.js script
-            const internalCompileScript = path.resolve(__dirname, '../../../deno/internal_compile.js');
+            const internalCompileScript = path.resolve(__dirname, '../../deno/internal_compile.js');
             // Create migrations directory if it doesn't exist
-            const migrationsDir = path.resolve(process.cwd(), 'migrations');
+            const migrationsDir = path.resolve(supabasePath, 'migrations');
             if (!fs.existsSync(migrationsDir)) {
                 fs.mkdirSync(migrationsDir, { recursive: true });
                 log.info(`Created migrations directory: ${migrationsDir}`);
             }
-            // Generate timestamp for migration file
-            const timestamp = new Date().toISOString().replace(/[:.]/g, '_');
-            const migrationFileName = `pgflow_${timestamp}.sql`;
+            // Generate timestamp for migration file in format YYYYMMDDHHMMSS
+            const now = new Date();
+            const timestamp = [
+                now.getFullYear(),
+                String(now.getMonth() + 1).padStart(2, '0'),
+                String(now.getDate()).padStart(2, '0'),
+                String(now.getHours()).padStart(2, '0'),
+                String(now.getMinutes()).padStart(2, '0'),
+                String(now.getSeconds()).padStart(2, '0'),
+            ].join('');
+            // Extract the base filename without extension from the flow path
+            const flowBasename = path.basename(resolvedFlowPath, path.extname(resolvedFlowPath));
+            // Create migration filename in the format: <timestamp>_create_<flow_file_basename>_flow.sql
+            const migrationFileName = `${timestamp}_create_${flowBasename}_flow.sql`;
             const migrationFilePath = path.join(migrationsDir, migrationFileName);
             // Run the compilation
             const s = spinner();
@@ -74,7 +101,9 @@ export default (program) => {
             // Write the SQL to a migration file
             fs.writeFileSync(migrationFilePath, compiledSql);
             s.stop(`Successfully compiled flow to SQL`);
-            log.success(`Migration file created: ${migrationFilePath}`);
+            // Show the migration file path relative to the current directory
+            const relativeFilePath = path.relative(process.cwd(), migrationFilePath);
+            log.success(`Migration file created: ${relativeFilePath}`);
         }
         catch (error) {
             log.error(`Compilation failed: ${error instanceof Error ? error.message : String(error)}`);

package/dist/deno/internal_compile.js

@@ -6,6 +6,10 @@
  * and passes it to compileFlow() from the DSL package.
  */
 
+// Import the compileFlow function directly from @pgflow/dsl
+// The import map in deno.json will resolve this import
+import { compileFlow } from '@pgflow/dsl';
+
 // Get the flow file path from command line arguments
 const flowFilePath = Deno.args[0];
 
@@ -24,82 +28,28 @@ try {
     Deno.exit(1);
   }
 
-  // Import the DSL module
-  // The import map in deno.json will resolve this import
-  const dslModule = await import('npm:@pgflow/dsl');
-
-  // Debug available exports
-  console.error('Available exports from @pgflow/dsl:', Object.keys(dslModule));
-
   // Get the flow instance
   const flow = flowModule.default;
 
-  let compileFlow;
-  let sqlStatements;
-
-  // Try different ways to access the compileFlow function
-  if (typeof dslModule.compileFlow === 'function') {
-    // Direct export
-    compileFlow = dslModule.compileFlow;
-  } else if (
-    dslModule.default &&
-    typeof dslModule.default.compileFlow === 'function'
-  ) {
-    // Default export with compileFlow as a property
-    compileFlow = dslModule.default.compileFlow;
-  } else {
-    // Try to import the compile-flow module directly
-    try {
-      const compileFlowModule = await import(
-        'npm:@pgflow/dsl/dist/compile-flow.js'
-      );
-      if (typeof compileFlowModule.compileFlow === 'function') {
-        compileFlow = compileFlowModule.compileFlow;
-      } else if (
-        compileFlowModule.default &&
-        typeof compileFlowModule.default === 'function'
-      ) {
-        compileFlow = compileFlowModule.default;
-      }
-    } catch (importError) {
-      console.error(
-        'Failed to import compile-flow module:',
-        importError.message
-      );
-
-      // Try another path
-      try {
-        const altModule = await import('npm:@pgflow/dsl/src/compile-flow.js');
-        if (typeof altModule.compileFlow === 'function') {
-          compileFlow = altModule.compileFlow;
-        } else if (
-          altModule.default &&
-          typeof altModule.default === 'function'
-        ) {
-          compileFlow = altModule.default;
-        }
-      } catch (altError) {
-        console.error(
-          'Failed to import alternative compile-flow module:',
-          altError.message
-        );
-      }
-    }
-  }
-
-  // Check if we found a valid compileFlow function
-  if (typeof compileFlow !== 'function') {
-    console.error('Error: compileFlow function not found in @pgflow/dsl');
-    console.error('Available exports:', Object.keys(dslModule));
-    Deno.exit(1);
-  }
-
   // Compile the flow to SQL
-  sqlStatements = compileFlow(flow);
+  const sqlStatements = compileFlow(flow);
 
   // Output the SQL statements to stdout
   console.log(sqlStatements.join('\n'));
 } catch (error) {
   console.error(`Error compiling flow: ${error.message}`);
+
+  // If the error is related to importing compileFlow, provide more detailed error
+  if (error.message.includes('@pgflow/dsl')) {
+    console.error(
+      'Failed to import compileFlow from @pgflow/dsl. This might be due to:'
+    );
+    console.error(
+      '1. The function not being exported correctly from the package'
+    );
+    console.error('2. A version mismatch between the CLI and DSL packages');
+    console.error('3. Issues with the Deno import map configuration');
+  }
+
   Deno.exit(1);
 }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgflow",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "type": "module",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
@@ -27,8 +27,7 @@
     "toml-patch": "^0.2.3"
   },
   "publishConfig": {
-    "access": "public",
-    "directory": "."
+    "access": "public"
   },
   "files": [
     "dist"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgflow",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "type": "module",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
@@ -24,11 +24,10 @@
     "chalk": "^5.4.1",
     "commander": "^13.1.0",
     "toml-patch": "^0.2.3",
-    "@pgflow/core": "0.1.9"
+    "@pgflow/core": "0.1.11"
   },
   "publishConfig": {
-    "access": "public",
-    "directory": "."
+    "access": "public"
   },
   "files": [
     "dist"

package/dist/deno/internal_compile.ts

@@ -1,105 +0,0 @@
-/**
- * internal_compile.ts
- *
- * This script is executed by Deno to compile a Flow into SQL statements.
- * It takes a path to a flow file as an argument, imports the default export,
- * and passes it to compileFlow() from the DSL package.
- */
-
-// Get the flow file path from command line arguments
-const flowFilePath = Deno.args[0];
-
-if (!flowFilePath) {
-  console.error('Error: No flow file path provided');
-  Deno.exit(1);
-}
-
-try {
-  // Dynamically import the flow file
-  const flowModule = await import(`file://${flowFilePath}`);
-
-  // Check if there's a default export
-  if (!flowModule.default) {
-    console.error(`Error: No default export found in ${flowFilePath}`);
-    Deno.exit(1);
-  }
-
-  // Import the DSL module
-  // The import map in deno.json will resolve this import
-  const dslModule = await import('npm:@pgflow/dsl');
-
-  // Debug available exports
-  console.error('Available exports from @pgflow/dsl:', Object.keys(dslModule));
-
-  // Get the flow instance
-  const flow = flowModule.default;
-
-  let compileFlow;
-  const sqlStatements;
-
-  // Try different ways to access the compileFlow function
-  if (typeof dslModule.compileFlow === 'function') {
-    // Direct export
-    compileFlow = dslModule.compileFlow;
-  } else if (
-    dslModule.default &&
-    typeof dslModule.default.compileFlow === 'function'
-  ) {
-    // Default export with compileFlow as a property
-    compileFlow = dslModule.default.compileFlow;
-  } else {
-    // Try to import the compile-flow module directly
-    try {
-      const compileFlowModule = await import(
-        'npm:@pgflow/dsl/dist/compile-flow.js'
-      );
-      if (typeof compileFlowModule.compileFlow === 'function') {
-        compileFlow = compileFlowModule.compileFlow;
-      } else if (
-        compileFlowModule.default &&
-        typeof compileFlowModule.default === 'function'
-      ) {
-        compileFlow = compileFlowModule.default;
-      }
-    } catch (importError) {
-      console.error(
-        'Failed to import compile-flow module:',
-        importError.message
-      );
-
-      // Try another path
-      try {
-        const altModule = await import('npm:@pgflow/dsl/src/compile-flow.js');
-        if (typeof altModule.compileFlow === 'function') {
-          compileFlow = altModule.compileFlow;
-        } else if (
-          altModule.default &&
-          typeof altModule.default === 'function'
-        ) {
-          compileFlow = altModule.default;
-        }
-      } catch (altError) {
-        console.error(
-          'Failed to import alternative compile-flow module:',
-          altError.message
-        );
-      }
-    }
-  }
-
-  // Check if we found a valid compileFlow function
-  if (typeof compileFlow !== 'function') {
-    console.error('Error: compileFlow function not found in @pgflow/dsl');
-    console.error('Available exports:', Object.keys(dslModule));
-    Deno.exit(1);
-  }
-
-  // Compile the flow to SQL
-  sqlStatements = compileFlow(flow);
-
-  // Output the SQL statements to stdout
-  console.log(sqlStatements.join('\n'));
-} catch (error) {
-  console.error(`Error compiling flow: ${error.message}`);
-  Deno.exit(1);
-}