d1s 0.2.3 → 0.2.5

package/scripts/studio.js

@@ -11,6 +11,7 @@ import express from 'express';
 import { createServer } from 'http';
 import next from 'next';
 import { findWranglerConfig } from '../src/lib/find-wrangler-config.js';
+import logger from '../src/lib/logger.js';
 
 // Compute the absolute path of this file and its directory.
 const __filename = fileURLToPath(import.meta.url);
@@ -46,14 +47,8 @@ async function validateLicenseRemote(licenseKey, email, hardwareId) {
   try {
     const response = await fetch(`${baseUrl}/api/validate-license`, {
       method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        licenseKey,
-        email,
-        hardwareId,
-      }),
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ licenseKey, email, hardwareId }),
     });
 
     const result = await response.json();
@@ -65,7 +60,6 @@ async function validateLicenseRemote(licenseKey, email, hardwareId) {
       );
     }
 
-    // Check for subscription expiration if end_date is provided.
     if (result.end_date && new Date(result.end_date) < new Date()) {
       throw new LicenseError(
         'Your subscription has expired. Please renew your license to continue using D1 Studio.',
@@ -78,7 +72,6 @@ async function validateLicenseRemote(licenseKey, email, hardwareId) {
     if (error instanceof LicenseError) {
       throw error;
     }
-
     if (error.name === 'TypeError' && error.message.includes('fetch')) {
       throw new LicenseError(
         process.env.NODE_ENV === 'development'
@@ -87,7 +80,6 @@ async function validateLicenseRemote(licenseKey, email, hardwareId) {
         'CONNECTION_ERROR'
       );
     }
-
     throw new LicenseError(
       'An unexpected error occurred during license validation',
       'VALIDATION_ERROR'
@@ -106,7 +98,6 @@ async function checkLicenseFile() {
     if (licenseData.hardwareId !== hardwareId) {
       return null;
     }
-
     return licenseData;
   } catch (error) {
     return null;
@@ -127,22 +118,19 @@ async function saveLicenseFile(licenseData) {
 
 async function startServer(port, projectDirectory) {
   return new Promise((resolvePromise, rejectPromise) => {
-    const dev = process.env.NODE_ENV === 'development';
-
-    // Determine the directory where Next.js build is located:
-    // In production (published package), __dirname is in the 'dist' folder so we use it directly.
-    // In development, we assume the structure is different and go one level up.
+    // Determine Next.js app directory based on environment:
+    // In production (published package) __dirname is used.
+    // In development (npm link), assume the build is in the parent folder.
     const isProduction = process.env.NODE_ENV !== 'development';
     const nextAppDir = isProduction ? __dirname : join(__dirname, '..');
 
+    const dev = process.env.NODE_ENV === 'development';
     const app = next({ 
       dev,
       dir: nextAppDir,
       conf: {
         distDir: '.next',
-        experimental: {
-          appDir: true
-        }
+        experimental: { appDir: true }
       }
     });
     const handle = app.getRequestHandler();
@@ -150,41 +138,29 @@ async function startServer(port, projectDirectory) {
     app.prepare()
       .then(() => {
         const server = express();
-        
-        // Set environment variables
         process.env.PORT = port.toString();
         process.env.D1_PROJECT_DIR = projectDirectory;
+        const httpServer = createServer((req, res) => handle(req, res));
 
-        // Create HTTP server
-        const httpServer = createServer((req, res) => {
-          handle(req, res);
-        });
-
-        // Handle all requests through Next.js
-        server.all('*', (req, res) => {
-          return handle(req, res);
-        });
+        server.all('*', (req, res) => handle(req, res));
 
-        // Start listening
         httpServer.listen(port, (err) => {
           if (err) {
-            console.error(chalk.red('Failed to start server:'), err);
+            logger.error(chalk.red(`Failed to start server: ${err}`));
             rejectPromise(err);
             return;
           }
-
-          console.log(chalk.green(`Server started on port ${port}`));
+          logger.info(chalk.green(`Server started on port ${port}`));
           resolvePromise(httpServer);
         });
 
-        // Handle server errors
         httpServer.on('error', (err) => {
-          console.error(chalk.red('Server error:'), err);
+          logger.error(chalk.red(`Server error: ${err}`));
           rejectPromise(err);
         });
       })
       .catch((err) => {
-        console.error(chalk.red('Failed to prepare Next.js app:'), err);
+        logger.error(chalk.red(`Failed to prepare Next.js app: ${err}`));
         rejectPromise(err);
       });
   });
@@ -192,17 +168,15 @@ async function startServer(port, projectDirectory) {
 
 async function startStudio() {
   try {
-    console.log(chalk.green('Initializing D1 Studio...'));
+    logger.info(chalk.green('Initializing D1 Studio...'));
 
     // Validate license
     let licenseData = await checkLicenseFile();
-    console.log(chalk.blue('License data found:'), licenseData);
+    logger.debug(chalk.blue(`License data found: ${JSON.stringify(licenseData)}`));
 
     const TWELVE_HOURS_MS = 43200000; // 12 hours
     let shouldRevalidate = true;
-
     if (licenseData) {
-      // Use lastValidatedAt if available; otherwise, fall back to activatedAt.
       const lastCheck = new Date(licenseData.lastValidatedAt || licenseData.activatedAt);
       if (Date.now() - lastCheck.getTime() < TWELVE_HOURS_MS) {
         shouldRevalidate = false;
@@ -211,7 +185,7 @@ async function startStudio() {
 
     if (!licenseData || shouldRevalidate) {
       const { default: inquirer } = await import('inquirer');
-      console.log(chalk.blue('\nPlease enter your D1 Studio license information:'));
+      logger.info(chalk.yellow('\nPlease enter your D1 Studio license information:'));
 
       const answers = await inquirer.prompt([
         {
@@ -231,10 +205,9 @@ async function startStudio() {
         },
       ]);
 
-      console.log(chalk.blue('Entered license information:'), answers);
+      logger.debug(chalk.blue(`Entered license information: ${JSON.stringify(answers)}`));
 
       const hardwareId = await generateHardwareId();
-
       try {
         const validation = await validateLicenseRemote(
           answers.licenseKey,
@@ -242,51 +215,42 @@ async function startStudio() {
           hardwareId
         );
 
-        // Optionally, you can store the returned end_date for future checks.
         licenseData = {
           licenseKey: answers.licenseKey,
           email: answers.email,
-          hardwareId,
-          licenseType: validation.licenseType,
           activatedAt: new Date().toISOString(),
-          lastValidatedAt: new Date().toISOString(),
           endDate: validation.end_date || null
         };
 
         await saveLicenseFile(licenseData);
-        console.log(chalk.green('\nLicense activated successfully!'));
+        logger.info(chalk.green('\nLicense activated successfully!'));
       } catch (error) {
-        console.error(chalk.red('\nLicense validation failed:'), error.message);
+        logger.error(chalk.red(`\nLicense validation failed: ${error.message}`));
         process.exit(1);
       }
-    } else {
-      console.log(chalk.blue('Using cached license data.'));
     }
 
     // Get wrangler configuration
     try {
       const userProjectPath = process.cwd();
-    
       if (!userProjectPath) {
-        console.error(chalk.red('Error: Could not determine project directory'));
+        logger.error(chalk.red('Error: Could not determine project directory'));
         process.exit(1);
       }
-    
+
       const wranglerResult = await findWranglerConfig(userProjectPath);
-    
       if (!wranglerResult || !wranglerResult.config) {
-        console.error(chalk.red('\nError: No wrangler.toml found in current directory'));
-        console.log(chalk.yellow('Make sure you are in a Cloudflare Workers project directory'));
-        console.log(chalk.yellow('with a valid wrangler.toml file.'));
+        logger.error(chalk.red('\nError: No wrangler.toml found in current directory'));
+        logger.info(chalk.yellow('Make sure you are in a Cloudflare Workers project directory'));
+        logger.info(chalk.yellow('with a valid wrangler.toml file.'));
         process.exit(1);
       }
-    
+
       const { config, projectPath } = wranglerResult;
-    
       if (!config.d1_databases?.length) {
-        console.error(chalk.red('\nError: No D1 databases configured in wrangler.toml'));
-        console.log(chalk.yellow('\nAdd D1 configuration to your wrangler.toml:'));
-        console.log(chalk.gray(`
+        logger.error(chalk.red('\nError: No D1 databases configured in wrangler.toml'));
+        logger.info(chalk.yellow('\nAdd D1 configuration to your wrangler.toml:'));
+        logger.info(chalk.gray(`
     [[d1_databases]]
     binding = "DB"
     database_name = "my-database"
@@ -294,11 +258,10 @@ async function startStudio() {
         `));
         process.exit(1);
       }
-    
-      // Display found databases
-      console.log(chalk.green('\nFound D1 databases:'));
+
+      logger.info(chalk.green('\nFound D1 databases:'));
       config.d1_databases.forEach((db) => {
-        console.log(chalk.blue(`  - ${db.database_name} (${db.binding})`));
+        logger.info(chalk.blue(`  - ${db.database_name} (${db.binding})`));
       });
 
       const port = 4000;
@@ -306,7 +269,7 @@ async function startStudio() {
 
       await startServer(port, projectPath);
 
-      console.log(chalk.green(`
+      logger.info(chalk.green(`
     ┌─────────────────────────────────────────┐
     │                                         │
     │   D1 Studio is running on port ${port}    │
@@ -316,50 +279,42 @@ async function startStudio() {
     └─────────────────────────────────────────┘
       `));
 
-      // Add delay before opening browser
       await new Promise(resolve => setTimeout(resolve, 2000));
 
       try {
         await open(url, {
           wait: false,
           url: true,
-          app: {
-            name: open.apps.chrome
-          }
+          app: { name: open.apps.chrome }
         }).catch(() => {
-          return open(url, {
-            wait: false,
-            url: true
-          });
+          return open(url, { wait: false, url: true });
         });
       } catch (browserError) {
-        console.log(chalk.yellow('\nCould not automatically open browser.'));
-        console.log(chalk.blue('Please open your browser and navigate to:'), url);
+        logger.info(chalk.yellow('\nCould not automatically open browser.'));
+        logger.info(chalk.blue(`Please open your browser and navigate to: ${url}`));
       }
-
     } catch (configError) {
-      console.error(chalk.red('\nConfiguration error:'), configError.message);
+      logger.error(chalk.red(`\nConfiguration error: ${configError.message}`));
       process.exit(1);
     }
-
   } catch (error) {
-    console.error(chalk.red('\nFailed to start D1 Studio:'), error);
+    logger.error(chalk.red(`\nFailed to start D1 Studio: ${error}`));
     process.exit(1);
   }
 }
 
 // Handle termination
 process.on('SIGINT', () => {
-  console.log(chalk.yellow('\nShutting down D1 Studio...'));
+  logger.info(chalk.yellow('\nShutting down D1 Studio...'));
   process.exit(0);
 });
 
 process.on('SIGTERM', () => {
-  console.log(chalk.yellow('\nShutting down D1 Studio...'));
+  logger.info(chalk.yellow('\nShutting down D1 Studio...'));
   process.exit(0);
 });
 
 startStudio().catch((error) => {
-  console.error(chalk.red('\nFailed to start D1 Studio:'), error);
+  logger.error(chalk.red(`\nFailed to start D1 Studio: ${error}`));
   process.exit(1);
 });

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

@@ -15,7 +15,7 @@ export async function GET() {
       );
     }
 
-    console.log('Looking for Wrangler configuration in:', projectDir);
+    // console.log('Looking for Wrangler configuration in:', projectDir);
     
     // Use findWranglerConfig helper
     const wranglerResult = await findWranglerConfig(projectDir);

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

@@ -52,19 +52,19 @@ 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...');
+    // console.log('Fetching remote migration metadata...');
     const remoteMigrations = await getRemoteMigrations(projectDir, databaseName, env);
-    console.log('Remote migration metadata:', remoteMigrations);
+    // console.log('Remote migration metadata:', remoteMigrations);
 
     // --- STEP 2: For each remote migration, fetch its file content ---
-    console.log('Fetching migration file content from remote...');
+    // console.log('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}`);
+        // console.log(`Staged migration file: ${migrationFileName}`);
         await writeFile(path.join(stagingDir, migrationFileName), content, 'utf8');
       } catch (fileError) {
         console.error(`Error fetching content for migration ${migration.name}:`, fileError);
@@ -73,12 +73,12 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
     }
 
     // --- STEP 3: Fetch local schema for destructive update ---
-    console.log('Fetching local schema for destructive update...');
+    // console.log('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);
+    // console.log('Local table schema:', tableSchema);
     const dropOrder = tableSchema.length > 0
       ? analyzeDependencies(
           tableSchema.map(obj => ({
@@ -88,18 +88,18 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
           }))
         )
       : [];
-    console.log('Computed drop order:', dropOrder);
+    // console.log('Computed drop order:', dropOrder);
 
     // --- STEP 4: Destructive update (all-or-nothing) ---
-    console.log('Beginning destructive update...');
+    // console.log('Beginning destructive update...');
     try {
-      console.log('Disabling foreign keys...');
+      // console.log('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}`);
+        // console.log(`Dropping trigger: ${trigger.name}`);
         await executeSQL(
           projectDir,
           databaseName,
@@ -111,7 +111,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}`);
+        // console.log(`Dropping index: ${index.name}`);
         await executeSQL(
           projectDir,
           databaseName,
@@ -122,7 +122,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}`);
+        // console.log(`Dropping table: ${tableName}`);
         await executeSQL(
           projectDir,
           databaseName,
@@ -131,7 +131,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
           false
         );
       }
-      console.log('Re-enabling foreign keys...');
+      // console.log('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 +139,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
 
     // --- STEP 5: Reset the local migrations table ---
     try {
-      console.log('Resetting local migrations table...');
+      // console.log('Resetting local migrations table...');
       await initMigrationsTable(projectDir, databaseName, 'local', true);
     } catch (initError) {
       throw new Error(`Error resetting migrations table: ${initError.message}`);
@@ -152,7 +152,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
     try {
       for (const [filename, content] of stagedFiles.entries()) {
         currentFilename = filename;
-        console.log(`Applying migration: ${filename}`);
+        // console.log(`Applying migration: ${filename}`);
         // Write the migration file to the main migrations folder.
         await writeFile(path.join(migrationsDir, filename), content, 'utf8');
 
@@ -162,7 +162,7 @@ async function applyPullMigrations(projectDir, accountId, apiToken, databaseName
           .update(content)
           .digest('hex');
 
-        console.log(`Recording migration: ${filename} with checksum ${checksum}`);
+        // console.log(`Recording migration: ${filename} with checksum ${checksum}`);
         await recordMigration(
           projectDir,
           databaseName,
@@ -181,20 +181,20 @@ 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...');
+    // console.log('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}`);
+        // console.log(`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`);
+      // console.log(`Copying staged file ${filename} to main migrations folder`);
       await writeFile(path.join(migrationsDir, filename), content, 'utf8');
     }
 
-    console.log('Pull migration applied successfully.');
+    // console.log('Pull migration applied successfully.');
     return {
       appliedMigrations: Array.from(stagedFiles.keys()),
       details: appliedPreview

package/src/app/api/push-remote/confirm/route.js

@@ -133,7 +133,7 @@ for (const migrationFile of migrationFiles) {
         results.preview.push(previewRecord);
       }
     }
-    console.log("Push Confirm Result (server):", results);
+    // console.log("Push Confirm Result (server):", results);
     return { success: true, preview: false, applied: results.applied.length, skipped: results.skipped.length, details: results };
   } catch (error) {
     throw {

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

@@ -100,7 +100,7 @@ async function pushToRemote(projectDir, accountId, apiToken, databaseName, previ
       }
     }
 
-    console.log("Push Preview Result (server):", results);
+    // console.log("Push Preview Result (server):", results);
     return { success: true, preview: true, applied: results.applied.length, skipped: results.skipped.length, details: results };
   } catch (error) {
     throw {

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

@@ -28,7 +28,7 @@ export async function POST(req) {
 
     // Extract the SQL query from the request body.
     const { query } = await req.json();
-    console.log('Received query:', query);
+    // console.log('Received query:', query);
 
     if (!query?.trim()) {
       return NextResponse.json(
@@ -57,11 +57,11 @@ export async function POST(req) {
 
     // Use the first configured database.
     const databaseName = config.d1_databases[0].database_name;
-    console.log('Using database:', databaseName);
+    // console.log('Using database:', databaseName);
 
     // Parse the query into individual SQL statements.
     let statements = parseQuery(query);
-    console.log('Parsed statements:', statements);
+    // console.log('Parsed statements:', statements);
 
     if (!statements.length) {
       return NextResponse.json(
@@ -72,7 +72,7 @@ export async function POST(req) {
 
     // Validate each parsed statement.
     statements = statements.map(validateStatement);
-    console.log('Validated statements:', statements);
+    // console.log('Validated statements:', statements);
 
     // Initialize the migrations table (if it doesn't already exist).
     const createMigrationsTable = `
@@ -87,7 +87,7 @@ export async function POST(req) {
 
     // Determine whether the query involves any schema changes.
     const hasSchemaChanges = statements.some(isSchemaChange);
-    console.log('Has schema changes:', hasSchemaChanges);
+    // console.log('Has schema changes:', hasSchemaChanges);
 
     let result;
     if (hasSchemaChanges) {
@@ -105,7 +105,7 @@ export async function POST(req) {
       // For data modification queries, execute the statements.
       const results = [];
       for (const stmt of statements) {
-        console.log('Executing data modification:', stmt.sql);
+        // console.log('Executing data modification:', stmt.sql);
         const output = await executeSQL(projectDir, databaseName, stmt.sql);
         
         try {
@@ -113,7 +113,7 @@ export async function POST(req) {
           const queryResults = parsed[0]?.results || [];
           results.push(...queryResults);
         } catch (parseError) {
-          console.log('Non-JSON output:', output);
+          // console.log('Non-JSON output:', output);
           continue;
         }
       }

package/src/app/page.jsx

@@ -10,23 +10,20 @@ export default function StudioPage() {
   const [currentView, setCurrentView] = useState('sql-editor');
   const [selectedTable, setSelectedTable] = useState(null);
 
-  // We don't need to handle push errors here anymore since we're using toasts
-  // The error handling is now managed by the useEnvironmentController hook
-
   const handleTableSelect = (tableName) => {
     setSelectedTable(tableName);
     setCurrentView('table-view');
   };
 
   return (
-    <div className="flex h-screen bg-background">
+    <div className="min-h-screen bg-background">
       <AppSidebar 
-        className="w-64 border-r flex-shrink-0" 
+        className="w-64 border-r" 
         currentView={currentView}
         onNavigate={setCurrentView}
         onTableSelect={handleTableSelect}
       />
-      <main className="flex-1 overflow-hidden">
+      <main className="ml-64 h-screen">
         {currentView === 'sql-editor' && <SQLEditor />}
         {currentView === 'table-view' && selectedTable && (
           <TableView tableName={selectedTable} />