pgflow 0.6.1 → 0.7.1

package/README.md

@@ -1,4 +1,4 @@
-# @pgflow/cli
+# pgflow CLI
 
 The Command Line Interface for pgflow - a PostgreSQL-native workflow engine.
 
@@ -7,7 +7,7 @@ The Command Line Interface for pgflow - a PostgreSQL-native workflow engine.
 
 ## Overview
 
-`@pgflow/cli` provides essential tools for setting up, managing, and deploying pgflow workflows in your Supabase environment. The CLI handles:
+This package provides essential tools for setting up, managing, and deploying pgflow workflows in your Supabase environment. The CLI handles:
 
 - Installing pgflow in your Supabase project
 - Compiling TypeScript workflow definitions into SQL migrations
@@ -70,7 +70,7 @@ npx pgflow@latest compile supabase/functions/_flows/my_flow.ts
 
 Options:
 
-- `--deno-json <path>` - Path to custom deno.json with import map
+- `--deno-json <path>` - Path to custom deno.json configuration file
 - `--supabase-path <path>` - Path to custom Supabase directory
 
 The compiler will:

package/dist/commands/compile/index.js

@@ -14,8 +14,8 @@ const __dirname = path.dirname(__filename);
 function formatCommand(command, args) {
     const cmd = chalk.cyan(command);
     const formattedArgs = args.map((arg) => {
-        // Highlight import map and file paths differently
-        if (arg.startsWith('--import-map=')) {
+        // Highlight config and file paths differently
+        if (arg.startsWith('--config=')) {
             const [flag, value] = arg.split('=');
             return `  ${chalk.yellow(flag)}=${chalk.green(value)}`;
         }
@@ -46,7 +46,7 @@ export default (program) => {
         .command('compile')
         .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('--deno-json <denoJsonPath>', 'Path to deno.json configuration file')
         .option('--supabase-path <supabasePath>', 'Path to the Supabase folder')
         .action(async (flowPath, options) => {
         intro('pgflow - Compile Flow to SQL');
@@ -162,9 +162,9 @@ async function runDenoCompilation(scriptPath, flowPath, denoJsonPath) {
         }
         // Build the command arguments array
         const args = ['run', '--allow-read', '--allow-net', '--allow-env'];
-        // Only add the import-map argument if denoJsonPath is provided and valid
+        // Only add the config argument if denoJsonPath is provided and valid
         if (denoJsonPath && typeof denoJsonPath === 'string') {
-            args.push(`--import-map=${denoJsonPath}`);
+            args.push(`--config=${denoJsonPath}`);
         }
         // Add the script path and flow path
         args.push(scriptPath, flowPath);

package/dist/commands/install/update-config-toml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-config-toml.d.ts","sourceRoot":"","sources":["../../../src/commands/install/update-config-toml.ts"],"names":[],"mappings":"AAqBA;;;;;;;;;;;;;GAaG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,YAAY,EACZ,WAAmB,GACpB,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,GAAG,OAAO,CAAC,OAAO,CAAC,CA8HnB"}
+{"version":3,"file":"update-config-toml.d.ts","sourceRoot":"","sources":["../../../src/commands/install/update-config-toml.ts"],"names":[],"mappings":"AAqBA;;;;;;;;;;;;;GAaG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,YAAY,EACZ,WAAmB,GACpB,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,GAAG,OAAO,CAAC,OAAO,CAAC,CAwHnB"}

package/dist/commands/install/update-config-toml.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { log, confirm, note } from '@clack/prompts';
-import * as TOML from 'toml-patch';
+import * as TOML from '@decimalturn/toml-patch';
 import chalk from 'chalk';
 /**
  * Updates the config.toml file with necessary configurations for EdgeWorker
@@ -27,7 +27,15 @@ export async function updateConfigToml({ supabasePath, autoConfirm = false, }) {
             throw new Error(`config.toml not found at ${configPath}`);
         }
         const configContent = fs.readFileSync(configPath, 'utf8');
-        const config = TOML.parse(configContent);
+        let config;
+        try {
+            config = TOML.parse(configContent);
+        }
+        catch (parseError) {
+            const errorMsg = parseError instanceof Error ? parseError.message : String(parseError);
+            log.error(`Invalid TOML syntax in ${configPath}: ${errorMsg}`);
+            throw new Error(`Invalid TOML syntax in ${configPath}: ${errorMsg}`);
+        }
         const currentSettings = {
             poolerEnabled: config.db?.pooler?.enabled ?? false,
             poolMode: config.db?.pooler?.pool_mode ?? 'none',
@@ -82,31 +90,25 @@ ${chalk.green('+ policy = "per_worker"')}`);
         updatedConfig.db.pooler.enabled = true;
         updatedConfig.db.pooler.pool_mode = 'transaction';
         updatedConfig.edge_runtime.policy = 'per_worker';
-        // Apply TOML patch
-        let updatedContent = TOML.patch(configContent, updatedConfig, {
-            trailingComma: false,
-        });
-        // Post-process to remove trailing commas from specific updated lines
-        // The toml-patch library sometimes adds unwanted trailing commas despite the trailingComma: false option.
-        // For example, it might transform:
-        //   [db.pooler]
-        //   enabled = false
-        // into:
-        //   [db.pooler]
-        //   enabled = true,  # <-- unwanted trailing comma
-        //
-        // These regex replacements target only the specific lines we're updating and remove any trailing commas
-        // while preserving any whitespace, comments, or newlines that follow.
-        updatedContent = updatedContent
-            // Fix db.pooler.enabled line - transforms "enabled = true," into "enabled = true"
-            .replace(/enabled = true,(\s*$|\s*#|\s*\n)/g, 'enabled = true$1')
-            .replace(
-        // Fix db.pooler.pool_mode line - transforms "pool_mode = "transaction"," into "pool_mode = "transaction""
-        /pool_mode = "transaction",(\s*$|\s*#|\s*\n)/g, 'pool_mode = "transaction"$1')
-            .replace(
-        // Fix edge_runtime.policy line - transforms "policy = "per_worker"," into "policy = "per_worker""
-        /policy = "per_worker",(\s*$|\s*#|\s*\n)/g, 'policy = "per_worker"$1');
-        fs.writeFileSync(configPath, updatedContent);
+        let updatedContent;
+        try {
+            updatedContent = TOML.patch(configContent, updatedConfig, {
+                trailingComma: false,
+            });
+        }
+        catch (stringifyError) {
+            const errorMsg = stringifyError instanceof Error ? stringifyError.message : String(stringifyError);
+            log.error(`Failed to generate TOML for ${configPath}: ${errorMsg}`);
+            throw new Error(`Failed to generate TOML for ${configPath}: ${errorMsg}`);
+        }
+        try {
+            fs.writeFileSync(configPath, updatedContent);
+        }
+        catch (writeError) {
+            const errorMsg = writeError instanceof Error ? writeError.message : String(writeError);
+            log.error(`Failed to write ${configPath}: ${errorMsg}`);
+            throw new Error(`Failed to write ${configPath}: ${errorMsg}`);
+        }
         log.success('Supabase configuration updated successfully');
         return true;
     }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgflow",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "type": "module",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
@@ -21,10 +21,10 @@
   "dependencies": {
     "@clack/prompts": "^0.10.1",
     "@commander-js/extra-typings": "^13.1.0",
+    "@decimalturn/toml-patch": "0.3.7",
     "@pgflow/core": "workspace:*",
     "chalk": "^5.4.1",
-    "commander": "^13.1.0",
-    "toml-patch": "^0.2.3"
+    "commander": "^13.1.0"
   },
   "publishConfig": {
     "access": "public"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgflow",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "type": "module",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
@@ -21,10 +21,10 @@
   "dependencies": {
     "@clack/prompts": "^0.10.1",
     "@commander-js/extra-typings": "^13.1.0",
+    "@decimalturn/toml-patch": "0.3.7",
     "chalk": "^5.4.1",
     "commander": "^13.1.0",
-    "toml-patch": "^0.2.3",
-    "@pgflow/core": "0.6.1"
+    "@pgflow/core": "0.7.1"
   },
   "publishConfig": {
     "access": "public"