d1s 0.2.6 → 0.2.9

package/dist/app/api/cloudflare/route.js

@@ -2,6 +2,7 @@
 
 import { NextResponse } from 'next/server';
 import { findWranglerConfig } from '@/lib/find-wrangler-config.js';
+import logger from '@/lib/logger';
 
 /**
  * Validates the provided Cloudflare credentials by fetching databases.
@@ -81,6 +82,7 @@ export async function POST(req) {
 
     // Check if the project directory is set.
     if (!projectDir) {
+      logger.error('Project directory not configured');
       return NextResponse.json(
         { error: 'Project directory not configured' },
         { status: 500 }
@@ -93,6 +95,7 @@ export async function POST(req) {
     // Retrieve the Wrangler configuration using the centralized helper.
     const wranglerResult = await findWranglerConfig(projectDir);
     if (!wranglerResult || !wranglerResult.config) {
+      logger.error('No Wrangler configuration file found in project directory');
       return NextResponse.json(
         { error: 'No Wrangler configuration file found in project directory' },
         { status: 404 }
@@ -130,7 +133,7 @@ export async function POST(req) {
     });
 
   } catch (error) {
-    console.error('Cloudflare API error:', error);
+    logger.error('Cloudflare API error:', error);
     return NextResponse.json(
       { error: error.message },
       { status: error.message.includes('Invalid credentials') ? 401 : 500 }
@@ -144,3 +147,4 @@ export async function POST(req) {
 export async function OPTIONS() {
   return new NextResponse(null, { status: 204 });
 }
+

package/dist/app/api/databases/route.js

@@ -2,21 +2,20 @@
 
 import { NextResponse } from 'next/server';
 import { findWranglerConfig } from '@/lib/find-wrangler-config.js';
+import logger from '@/lib/logger';
 
 export async function GET() {
   try {
     const projectDir = process.env.D1_PROJECT_DIR;
     
     if (!projectDir) {
-      console.error('D1_PROJECT_DIR environment variable is not set');
+      logger.error('D1_PROJECT_DIR environment variable is not set');
       return NextResponse.json(
         { error: 'Project directory not configured' },
         { status: 500 }
       );
     }
 
-    // console.log('Looking for Wrangler configuration in:', projectDir);
-    
     // Use findWranglerConfig helper
     const wranglerResult = await findWranglerConfig(projectDir);
     if (!wranglerResult || !wranglerResult.config) {
@@ -44,7 +43,7 @@ export async function GET() {
       }
     });
   } catch (error) {
-    console.error('Error reading database configuration:', error);
+    logger.error('Error reading database configuration:', error);
     
     return NextResponse.json(
       { 

package/dist/app/api/migrations/sync/route.js

@@ -5,14 +5,13 @@ import { findWranglerConfig } from '@/lib/find-wrangler-config.js';
 import { readFile } from 'fs/promises';
 import path from 'path';
 import {
-  initMigrationsTable,
   compareMigrations,
   trackMigration,
-  updateMigrationStatus,
   createChecksum
 } from '@/lib/migrations';
 import { promisify } from 'util';
 import { exec } from 'child_process';
+import logger from '@/lib/logger';
 
 const execAsync = promisify(exec);
 
@@ -21,11 +20,14 @@ const execAsync = promisify(exec);
  * Uses the centralized Wrangler configuration helper to determine the D1 database.
  */
 export async function POST(req) {
+  logger.logRequest('POST', '/api/migrations/sync');
+
   try {
     const { accountId, apiToken } = await req.json();
     const projectDir = process.env.D1_PROJECT_DIR;
 
     if (!projectDir) {
+      logger.error('Project directory not configured');
       return NextResponse.json(
         { error: 'Project directory not configured' },
         { status: 500 }
@@ -156,7 +158,7 @@ export async function POST(req) {
     });
 
   } catch (error) {
-    console.error('Migration sync error:', error);
+    logger.logError(error, 'migrations-sync-route');
     return NextResponse.json({
       success: false,
       error: {

package/dist/app/api/pull-data/confirm/route.js

@@ -0,0 +1,230 @@
+// api/pull-data/confirm/route.js
+
+import { NextResponse } from 'next/server';
+import { executeSQL } from '@/lib/sql-operations';
+import { getCurrentSchema } from '@/lib/schema-operations';
+import { findWranglerConfig } from '@/lib/find-wrangler-config.js';
+import logger from '@/lib/logger';
+import {
+  fetchRemoteTableData as fetchRemoteDataHelper,
+  generateBulkInsertSQL
+} from '@/lib/sql-operations';
+
+/**
+ * Helper to extract the ordering column (primary key) from a table's schema.
+ * Assumes that each table’s schema object contains a "columns" array with an "isPrimaryKey" flag.
+ *
+ * @param {object} tableSchema - Schema info for the table.
+ * @returns {string} The column name to use for ordering.
+ */
+function getOrderingColumn(tableSchema) {
+  const pkColumn = tableSchema.columns?.find(col => col.isPrimaryKey);
+  const orderingCol = pkColumn ? pkColumn.name : 'rowid';
+  logger.debug(`Determined ordering column for table ${tableSchema.name || 'unknown'}: ${orderingCol}`);
+  return orderingCol;
+}
+
+/**
+ * Computes an insertion order for tables based on their foreign key dependencies.
+ * The returned array is sorted so that if table A is referenced by table B,
+ * then A appears earlier in the list.
+ *
+ * @param {Array<object>} tableSchemas - Array of table schema objects.
+ * @returns {Array<string>} Ordered array of table names.
+ */
+function computeInsertionOrder(tableSchemas) {
+  // Build a dependency graph: key = table name, value = set of tables that this table depends on.
+  const graph = {};
+  tableSchemas.forEach(table => {
+    // Initialize graph for this table.
+    graph[table.name] = new Set();
+    // Use a regex to find FOREIGN KEY references in the table's SQL.
+    // This regex assumes the foreign key clause looks like:
+    // FOREIGN KEY (...) REFERENCES referencedTable(...)
+    const fkRegex = /FOREIGN KEY\s*\([^)]*\)\s+REFERENCES\s+(\w+)/gi;
+    let match;
+    while ((match = fkRegex.exec(table.sql)) !== null) {
+      const referencedTable = match[1];
+      graph[table.name].add(referencedTable);
+    }
+  });
+  logger.debug('Computed dependency graph:', graph);
+  
+  // Topological sort (depth-first search) to compute insertion order.
+  const sorted = [];
+  const visited = {}; // 'temp' = visiting, 'perm' = done
+
+  function visit(tableName) {
+    if (visited[tableName] === 'temp') {
+      throw new Error(`Cycle detected in dependencies at table ${tableName}`);
+    }
+    if (!visited[tableName]) {
+      visited[tableName] = 'temp';
+      // Visit all tables that this table depends on.
+      graph[tableName].forEach(dep => {
+        // Only visit if the dependency is in our graph (i.e. among our tables)
+        if (graph[dep]) {
+          visit(dep);
+        }
+      });
+      visited[tableName] = 'perm';
+      sorted.push(tableName);
+    }
+  }
+
+  Object.keys(graph).forEach(tableName => {
+    if (!visited[tableName]) {
+      visit(tableName);
+    }
+  });
+
+  logger.debug('Computed insertion order (parent tables first):', sorted);
+  return sorted;
+}
+
+/**
+ * Applies the data pull by:
+ * 1. Fetching the local schema to determine table names and primary keys.
+ * 2. Computing the insertion order so that parent tables are inserted before child tables.
+ * 3. For each table (in insertion order), fetching the latest 100 records from the remote database.
+ * 4. Generating a bulk insert statement and executing it.
+ *
+ * This function aborts the entire process if any insert fails.
+ *
+ * @param {string} projectDir
+ * @param {string} accountId
+ * @param {string} apiToken
+ * @param {string} databaseName
+ * @returns {object} Details of data pulled.
+ */
+async function applyDataPull(projectDir, accountId, apiToken, databaseName) {
+  logger.debug('Starting data pull process...');
+  const env = {
+    ...process.env,
+    CLOUDFLARE_API_TOKEN: apiToken,
+    CLOUDFLARE_ACCOUNT_ID: accountId
+  };
+
+  logger.debug('Fetching current schema for data pull...');
+  const currentSchema = await getCurrentSchema(projectDir, databaseName, env, false);
+  // Filter for table objects that have a name.
+  const tableSchemas = currentSchema.filter(obj => obj.type === 'table' && obj.name);
+  logger.debug('Local table schema for data pull:', tableSchemas.map(t => t.name));
+
+  // Compute insertion order based on foreign key dependencies.
+  const insertionOrder = computeInsertionOrder(tableSchemas);
+  logger.debug('Final computed insertion order:', insertionOrder);
+
+  // Process each table in the computed insertion order.
+  for (const tableName of insertionOrder) {
+    const table = tableSchemas.find(t => t.name === tableName);
+    if (!table) {
+      logger.debug(`Skipping table ${tableName} as it is not in the current schema list.`);
+      continue;
+    }
+    logger.debug(`Processing table: ${tableName}`);
+    const orderingColumn = getOrderingColumn(table);
+    logger.debug(`Fetching data for table: ${tableName} ordered by ${orderingColumn}`);
+
+    // Fetch remote data.
+    const rows = await fetchRemoteDataHelper(
+      projectDir,
+      databaseName,
+      tableName,
+      env,
+      75,
+      orderingColumn
+    );
+    logger.debug(`Fetched ${rows.length} records for table: ${tableName}`);
+
+    if (rows.length > 0) {
+      const insertSQL = generateBulkInsertSQL(tableName, rows);
+      logger.debug(`Generated bulk insert SQL for ${tableName}: ${insertSQL}`);
+
+      try {
+        // Execute the insert SQL directly.
+        await executeSQL(projectDir, databaseName, insertSQL, env, false);
+        logger.debug(`Bulk inserted ${rows.length} records into table: ${tableName}`);
+      } catch (insertError) {
+        logger.error(`Error inserting data into table ${tableName}:`, insertError);
+        // Abort the entire process to preserve data integrity.
+        throw new Error(`Data pull failed for table ${tableName}: ${insertError.message}`);
+      }
+    } else {
+      logger.debug(`No data fetched for table: ${tableName}`);
+    }
+  }
+  logger.debug('Data pull process completed successfully.');
+  return { message: 'All data pulled successfully.' };
+}
+
+export async function POST(req) {
+  try {
+    logger.debug('Received request for data pull.');
+    const { accountId, apiToken } = await req.json();
+    const projectDir = process.env.D1_PROJECT_DIR;
+    if (!projectDir) {
+      return NextResponse.json(
+        {
+          success: false,
+          error: {
+            type: 'VALIDATION_ERROR',
+            message: 'Project directory not configured'
+          }
+        },
+        { status: 500 }
+      );
+    }
+    const wranglerResult = await findWranglerConfig(projectDir);
+    if (!wranglerResult || !wranglerResult.config) {
+      return NextResponse.json(
+        {
+          success: false,
+          error: {
+            type: 'VALIDATION_ERROR',
+            message: 'Could not find Wrangler configuration'
+          }
+        },
+        { status: 400 }
+      );
+    }
+    const config = wranglerResult.config;
+    if (!config.d1_databases?.length) {
+      return NextResponse.json(
+        {
+          success: false,
+          error: {
+            type: 'VALIDATION_ERROR',
+            message: 'No D1 databases configured'
+          }
+        },
+        { status: 400 }
+      );
+    }
+    const databaseName = config.d1_databases[0].database_name;
+    logger.debug(`Initiating data pull for database: ${databaseName}`);
+    const result = await applyDataPull(projectDir, accountId, apiToken, databaseName);
+    logger.debug('Data pull result:', result);
+    return NextResponse.json({
+      success: true,
+      message: result.message,
+      details: result
+    });
+  } catch (error) {
+    logger.error('Pull data confirm error:', error);
+    return NextResponse.json(
+      {
+        success: false,
+        error: {
+          type: error.type || 'EXECUTION_ERROR',
+          message: error.message || 'Failed to apply data pull'
+        }
+      },
+      { status: 500 }
+    );
+  }
+}
+
+export async function OPTIONS() {
+  return new NextResponse(null, { status: 204 });
+}

package/dist/app/api/pull-remote/confirm/route.js

@@ -12,6 +12,7 @@ import {
 } from '@/lib/sql-operations';
 import { getCurrentSchema, analyzeDependencies } from '@/lib/schema-operations';
 import { initMigrationsTable, recordMigration, getRemoteMigrations } from '@/lib/migrations.js';
+import logger from '@/lib/logger';
 
 /**
  * Applies the pull migrations by:
@@ -52,33 +53,33 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
     await Promise.all(stagedFilesList.map(file => unlink(path.join(stagingDir, file))));
 
     // --- STEP 1: Fetch remote migration metadata ---
-    // console.log('Fetching remote migration metadata...');
+    logger.debug('Fetching remote migration metadata...');
     const remoteMigrations = await getRemoteMigrations(projectDir, databaseName, env);
-    // console.log('Remote migration metadata:', remoteMigrations);
+    logger.debug('Remote migration metadata:', remoteMigrations);
 
     // --- STEP 2: For each remote migration, fetch its file content ---
-    // console.log('Fetching migration file content from remote...');
+    logger.debug('Fetching migration file content from remote...');
     const stagedFiles = new Map();
     for (const migration of remoteMigrations) {
       try {
         const migrationFileName = migration.name; // Use the remote migration's name.
         const content = await getMigrationFileContent(projectDir, databaseName, migrationFileName, env);
         stagedFiles.set(migrationFileName, content);
-        // console.log(`Staged migration file: ${migrationFileName}`);
+        logger.debug(`Staged migration file: ${migrationFileName}`);
         await writeFile(path.join(stagingDir, migrationFileName), content, 'utf8');
       } catch (fileError) {
-        console.error(`Error fetching content for migration ${migration.name}:`, fileError);
+        logger.error(`Error fetching content for migration ${migration.name}:`, fileError);
         throw new Error(`Failed to fetch migration file content for ${migration.name}`);
       }
     }
 
     // --- STEP 3: Fetch local schema for destructive update ---
-    // console.log('Fetching local schema for destructive update...');
+    logger.debug('Fetching local schema for destructive update...');
     const currentSchema = await getCurrentSchema(projectDir, databaseName, env, false);
     const tableSchema = currentSchema.filter(obj =>
       obj.type === 'table' && obj.name && obj.name.toLowerCase() !== 'if'
     );
-    // console.log('Local table schema:', tableSchema);
+    logger.debug('Local table schema:', tableSchema);
     const dropOrder = tableSchema.length > 0
       ? analyzeDependencies(
           tableSchema.map(obj => ({
@@ -88,18 +89,18 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
           }))
         )
       : [];
-    // console.log('Computed drop order:', dropOrder);
+    logger.debug('Computed drop order:', dropOrder);
 
     // --- STEP 4: Destructive update (all-or-nothing) ---
-    // console.log('Beginning destructive update...');
+    logger.debug('Beginning destructive update...');
     try {
-      // console.log('Disabling foreign keys...');
+      logger.debug('Disabling foreign keys...');
       await executeSQL(projectDir, databaseName, 'PRAGMA foreign_keys=OFF;', env, false);
       
       // Drop triggers.
       const triggers = currentSchema.filter(obj => obj.type === 'trigger');
       for (const trigger of triggers) {
-        // console.log(`Dropping trigger: ${trigger.name}`);
+        logger.debug(`Dropping trigger: ${trigger.name}`);
         await executeSQL(
           projectDir,
           databaseName,
@@ -111,7 +112,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
       // Drop indexes.
       const indexes = currentSchema.filter(obj => obj.type === 'index');
       for (const index of indexes) {
-        // console.log(`Dropping index: ${index.name}`);
+        logger.debug(`Dropping index: ${index.name}`);
         await executeSQL(
           projectDir,
           databaseName,
@@ -122,7 +123,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
       }
       // Drop tables in reverse dependency order.
       for (const tableName of dropOrder.reverse()) {
-        // console.log(`Dropping table: ${tableName}`);
+        logger.debug(`Dropping table: ${tableName}`);
         await executeSQL(
           projectDir,
           databaseName,
@@ -131,7 +132,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
           false
         );
       }
-      // console.log('Re-enabling foreign keys...');
+      logger.debug('Re-enabling foreign keys...');
       await executeSQL(projectDir, databaseName, 'PRAGMA foreign_keys=ON;', env, false);
     } catch (dropError) {
       throw new Error(`Error dropping existing objects: ${dropError.message}`);
@@ -139,7 +140,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
 
     // --- STEP 5: Reset the local migrations table ---
     try {
-      // console.log('Resetting local migrations table...');
+      logger.debug('Resetting local migrations table...');
       await initMigrationsTable(projectDir, databaseName, 'local', true);
     } catch (initError) {
       throw new Error(`Error resetting migrations table: ${initError.message}`);
@@ -152,7 +153,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
     try {
       for (const [filename, content] of stagedFiles.entries()) {
         currentFilename = filename;
-        // console.log(`Applying migration: ${filename}`);
+        logger.debug(`Applying migration: ${filename}`);
         // Write the migration file to the main migrations folder.
         await writeFile(path.join(migrationsDir, filename), content, 'utf8');
 
@@ -162,7 +163,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
           .update(content)
           .digest('hex');
 
-        // console.log(`Recording migration: ${filename} with checksum ${checksum}`);
+        logger.debug(`Recording migration: ${filename} with checksum ${checksum}`);
         await recordMigration(
           projectDir,
           databaseName,
@@ -181,26 +182,26 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
     }
 
     // --- STEP 7: Replace main migrations folder with staged files ---
-    // console.log('Replacing main migrations folder with staged files...');
+    logger.debug('Replacing main migrations folder with staged files...');
     const mainFiles = await readdir(migrationsDir).catch(() => []);
     if (mainFiles.length) {
       for (const file of mainFiles) {
-        // console.log(`Deleting local migration file: ${file}`);
+        logger.debug(`Deleting local migration file: ${file}`);
         await unlink(path.join(migrationsDir, file));
       }
     }
     for (const [filename, content] of stagedFiles.entries()) {
-      // console.log(`Copying staged file ${filename} to main migrations folder`);
+      logger.debug(`Copying staged file ${filename} to main migrations folder`);
       await writeFile(path.join(migrationsDir, filename), content, 'utf8');
     }
 
-    // console.log('Pull migration applied successfully.');
+    logger.debug('Pull migration applied successfully.');
     return {
       appliedMigrations: Array.from(stagedFiles.keys()),
       details: appliedPreview
     };
   } catch (error) {
-    console.error('Pull migration error:', error);
+    logger.error('Pull migration error:', error);
     throw error;
   }
 }
@@ -251,7 +252,7 @@ export async function POST(req) {
       details: result
     });
   } catch (error) {
-    console.error('Pull remote confirm error:', error);
+    logger.error('Pull remote confirm error:', error);
     return NextResponse.json({
       success: false,
       error: {

package/dist/app/api/pull-remote/preview/route.js

@@ -2,9 +2,10 @@
 
 import { NextResponse } from 'next/server';
 import { findWranglerConfig } from '@/lib/find-wrangler-config.js';
-import { ErrorTypes,} from '@/lib/sql-operations';
+import { ErrorTypes } from '@/lib/sql-operations';
 import { getCurrentSchema, analyzeDependencies } from '@/lib/schema-operations';
 import { getRemoteMigrations } from '@/lib/migrations.js';
+import logger from '@/lib/logger';
 
 /**
  * Generates a preview for pulling remote migrations.
@@ -64,7 +65,7 @@ async function generatePullPreview(projectDir, accountId, apiToken, databaseName
 
     return preview;
   } catch (error) {
-    console.error('Pull preview generation error:', error);
+    logger.error('Pull preview generation error:', error);
     throw error;
   }
 }
@@ -123,7 +124,7 @@ export async function POST(req) {
       details: preview
     });
   } catch (error) {
-    console.error('Pull remote preview error:', error);
+    logger.error('Pull remote preview error:', error);
     return NextResponse.json({
       success: false,
       error: {

package/dist/app/api/push-remote/preview/route.js

@@ -6,6 +6,7 @@ import path from 'path';
 import { findWranglerConfig } from '@/lib/find-wrangler-config.js';
 import { executeSQL, ErrorTypes } from '@/lib/sql-operations';
 import { validateMigrationFile } from '@/lib/migrations.js';
+import logger from '@/lib/logger';
 
 /**
  * Pushes migration preview to remote.
@@ -100,7 +101,7 @@ async function pushToRemote(projectDir, accountId, apiToken, databaseName, previ
       }
     }
 
-    // console.log("Push Preview Result (server):", results);
+    logger.debug("Push Preview Result (server):", results);
     return { success: true, preview: true, applied: results.applied.length, skipped: results.skipped.length, details: results };
   } catch (error) {
     throw {
@@ -157,7 +158,7 @@ export async function POST(req) {
       details: result
     });
   } catch (error) {
-    console.error('Push to remote preview error:', error);
+    logger.error('Push to remote preview error:', error);
     return NextResponse.json({
       success: false,
       error: {

package/dist/app/api/query/route.js

@@ -11,15 +11,19 @@ import {
 import { handleSchemaChange } from '@/lib/migrations';
 import { isSchemaChange } from '@/lib/sql-operations';
 import { parseSQLError } from '@/lib/parse-sql-error';
+import logger from '@/lib/logger';
 
 /**
  * API POST handler to execute SQL queries against the configured D1 database.
  */
 export async function POST(req) {
+  logger.logRequest('POST', '/api/query');
+
   try {
     // Ensure that the project directory is set.
     const projectDir = process.env.D1_PROJECT_DIR;
     if (!projectDir) {
+      logger.error('Project directory not configured');
       return NextResponse.json(
         { error: 'Project directory not configured' },
         { status: 500 }
@@ -28,7 +32,10 @@ export async function POST(req) {
 
     // Extract the SQL query from the request body.
     const { query } = await req.json();
-    // console.log('Received query:', query);
+
+    if (logger.shouldLog('debug')) {
+      logger.debug('Received query:', query);
+    }
 
     if (!query?.trim()) {
       return NextResponse.json(
@@ -40,6 +47,7 @@ export async function POST(req) {
     // Retrieve the Wrangler configuration using the centralized helper.
     const wranglerResult = await findWranglerConfig(projectDir);
     if (!wranglerResult || !wranglerResult.config) {
+      logger.error('No Wrangler configuration file found');
       return NextResponse.json(
         { success: false, error: { message: 'No Wrangler configuration file found' } },
         { status: 404 }
@@ -94,7 +102,7 @@ export async function POST(req) {
       // Process schema changes and capture migrations.
       // The handleSchemaChange helper is responsible for executing the DDL statements.
       const migrations = await handleSchemaChange(projectDir, databaseName, statements);
-      console.log('Schema changes processed:', migrations);
+      // console.log('Schema changes processed:', migrations);
       
       result = {
         success: true,
@@ -127,7 +135,7 @@ export async function POST(req) {
     return NextResponse.json(result);
 
   } catch (error) {
-    console.error('Query execution error:', error);
+    logger.logError(error, 'query-route');
     const parsedError = parseSQLError(error);
     
     const statusCode = 

package/dist/app/api/tables/[name]/route.js

@@ -5,6 +5,7 @@ import { promisify } from 'util';
 import { exec } from 'child_process';
 import { findWranglerConfig } from '@/lib/find-wrangler-config.js';
 import { dbQueue } from '@/lib/database-queue';
+import logger from '@/lib/logger';
 
 const execAsync = promisify(exec);
 
@@ -35,7 +36,7 @@ async function executeD1Query(command, projectDir, databaseName) {
     const result = JSON.parse(stdout);
     return result[0]?.results || [];
   } catch (error) {
-    console.error('Query execution error:', error);
+    logger.error('Query execution error:', error);
     throw error;
   } finally {
     isProcessing = false;
@@ -145,7 +146,7 @@ export async function GET(request, context) {
       });
 
     } catch (error) {
-      console.error('Error handling request:', error);
+      logger.error('Error handling request:', error);
       return NextResponse.json({
         success: false,
         error: {