d1s 0.2.8 → 0.2.10

package/dist/app/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/app/api/update/route.js

@@ -1,11 +1,45 @@
 // app/api/update/route.js
 import { NextResponse } from 'next/server';
-import updateNotifier from 'update-notifier';
 import pkg from '../../../../package.json' assert { type: 'json' };
 
 export async function GET() {
-  // Check for updates (you might want to cache this result to avoid too many requests)
-  const notifier = updateNotifier({ pkg, updateCheckInterval: 1000 * 60 * 60 * 24 });
-  const update = notifier.update;
-  return NextResponse.json({ update });
-}
+  try {
+    // Get current version from package.json
+    const currentVersion = pkg.version;
+    
+    // Fetch the latest version from npm registry
+    const response = await fetch('https://registry.npmjs.org/d1s/latest', {
+      headers: {
+        'Accept': 'application/json',
+        'User-Agent': 'd1-studio'
+      },
+      // Add cache control to prevent excessive requests
+      cache: 'no-cache'
+    });
+    
+    if (!response.ok) {
+      throw new Error('Failed to check for updates');
+    }
+    
+    const data = await response.json();
+    const latestVersion = data.version;
+    
+    // Compare versions - only return update info if there's a newer version
+    if (latestVersion && currentVersion && latestVersion !== currentVersion) {
+      console.log(`Update available: ${currentVersion} → ${latestVersion}`);
+      return NextResponse.json({ 
+        update: {
+          latest: latestVersion,
+          current: currentVersion
+        }
+      });
+    }
+    
+    // No update available
+    return NextResponse.json({ update: null });
+  } catch (error) {
+    console.error('Error checking for updates:', error);
+    // Return null on error to prevent banner from showing
+    return NextResponse.json({ update: null });
+  }
+}

package/dist/app/app/page.jsx

@@ -7,7 +7,6 @@ import { SQLEditor } from '../components/sql-editor';
 import { TableView } from '../components/table-view';
 import UpdateBanner from '@/components/update-banner';
 
-
 export default function StudioPage() {
   const [currentView, setCurrentView] = useState('sql-editor');
   const [selectedTable, setSelectedTable] = useState(null);
@@ -18,23 +17,28 @@ export default function StudioPage() {
   };
 
   return (
-    <div className="min-h-screen bg-background">
-      {/* notification banner at the top of the page */}
+    <div className="flex flex-col min-h-screen bg-background">
+      {/* Banner */}
       <UpdateBanner />
-      {/* sidebar */}
-      <AppSidebar 
-        className="w-64 border-r" 
-        currentView={currentView}
-        onNavigate={setCurrentView}
-        onTableSelect={handleTableSelect}
-      />
-      {/* main content */}
-      <main className="ml-64 h-screen">
-        {currentView === 'sql-editor' && <SQLEditor />}
-        {currentView === 'table-view' && selectedTable && (
-          <TableView tableName={selectedTable} />
-        )}
-      </main>
+      
+      {/* Main layout with adjusted positioning for banner */}
+      <div className="flex flex-1 mt-[var(--banner-height,0px)]">
+        {/* Sidebar with adjusted height */}
+        <AppSidebar 
+          className="w-64 border-r fixed top-[var(--banner-height,0px)] h-[calc(100vh-var(--banner-height,0px))]"
+          currentView={currentView}
+          onNavigate={setCurrentView}
+          onTableSelect={handleTableSelect}
+        />
+        
+        {/* Main content with adjusted margin-top and height */}
+        <main className="ml-64 flex-1 h-[calc(100vh-var(--banner-height,0px))]">
+          {currentView === 'sql-editor' && <SQLEditor />}
+          {currentView === 'table-view' && selectedTable && (
+            <TableView tableName={selectedTable} />
+          )}
+        </main>
+      </div>
     </div>
   );
 }

package/dist/app/page.jsx

@@ -1,10 +1,11 @@
 // app/page.js
 'use client'
 
+import { useState } from 'react';
 import { AppSidebar } from '../components/sidebar';
 import { SQLEditor } from '../components/sql-editor';
 import { TableView } from '../components/table-view';
-import { useState } from 'react';
+import UpdateBanner from '@/components/update-banner';
 
 export default function StudioPage() {
   const [currentView, setCurrentView] = useState('sql-editor');
@@ -16,19 +17,28 @@ export default function StudioPage() {
   };
 
   return (
-    <div className="min-h-screen bg-background">
-      <AppSidebar 
-        className="w-64 border-r" 
-        currentView={currentView}
-        onNavigate={setCurrentView}
-        onTableSelect={handleTableSelect}
-      />
-      <main className="ml-64 h-screen">
-        {currentView === 'sql-editor' && <SQLEditor />}
-        {currentView === 'table-view' && selectedTable && (
-          <TableView tableName={selectedTable} />
-        )}
-      </main>
+    <div className="flex flex-col min-h-screen bg-background">
+      {/* Banner */}
+      <UpdateBanner />
+      
+      {/* Main layout with adjusted positioning for banner */}
+      <div className="flex flex-1 mt-[var(--banner-height,0px)]">
+        {/* Sidebar with adjusted height */}
+        <AppSidebar 
+          className="w-64 border-r fixed top-[var(--banner-height,0px)] h-[calc(100vh-var(--banner-height,0px))]"
+          currentView={currentView}
+          onNavigate={setCurrentView}
+          onTableSelect={handleTableSelect}
+        />
+        
+        {/* Main content with adjusted margin-top and height */}
+        <main className="ml-64 flex-1 h-[calc(100vh-var(--banner-height,0px))]">
+          {currentView === 'sql-editor' && <SQLEditor />}
+          {currentView === 'table-view' && selectedTable && (
+            <TableView tableName={selectedTable} />
+          )}
+        </main>
+      </div>
     </div>
   );
 }

package/dist/d1-studio.js

@@ -3,17 +3,20 @@ import chalk from 'chalk';
 import open from 'open';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
-import { createHash } from 'crypto';
-import { homedir } from 'os';
-import os from 'os';
-import { readFile, writeFile, mkdir } from 'node:fs/promises';
 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';
 import updateNotifier from 'update-notifier';
-import pkg from '../package.json' assert { type: 'json' };
+import pkg from '../package.json' with { type: 'json' };
+
+// Check for debug flag
+const hasDebugFlag = process.argv.includes('--debug');
+if (hasDebugFlag) {
+  process.env.DEBUG = 'true';
+  logger.debug('Debug mode enabled');
+}
 
 const notifier = updateNotifier({ pkg, updateCheckInterval: 1000 * 60 * 60 * 24 });
 notifier.notify({ defer: false });
@@ -22,133 +25,6 @@ notifier.notify({ defer: false });
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-// License validation utilities
-class LicenseError extends Error {
-  constructor(message, type = 'VALIDATION_ERROR') {
-    super(message);
-    this.name = 'LicenseError';
-    this.type = type;
-  }
-}
-
-class StudioLicenseManager {
-  constructor() {
-    this.licenseDir = join(homedir(), '.d1studio');
-    this.licensePath = join(this.licenseDir, 'license.json');
-  }
-
-  async checkLicenseFile() {
-    try {
-      const licenseData = JSON.parse(await readFile(this.licensePath, 'utf8'));
-      
-      // If no end_date or subscription_status, the license is valid (perpetual license)
-      if (!licenseData.end_date || !licenseData.subscription_status) {
-        return {
-          licenseData,
-          isValid: true,
-          isExpiringSoon: false
-        };
-      }
-
-      // Check subscription status first
-      if (licenseData.subscription_status !== 'active') {
-        return {
-          licenseData,
-          isValid: false,
-          isExpiringSoon: false
-        };
-      }
-
-      const endDate = new Date(licenseData.end_date);
-      const now = new Date();
-      
-      // Check if subscription has ended
-      if (endDate < now) {
-        return {
-          licenseData,
-          isValid: false,
-          isExpiringSoon: false
-        };
-      }
-
-      // Check if subscription ends in next 7 days
-      const sevenDaysFromNow = new Date(now.getTime() + (7 * 24 * 60 * 60 * 1000));
-      const isExpiringSoon = endDate <= sevenDaysFromNow;
-
-      return {
-        licenseData,
-        isValid: true,
-        isExpiringSoon
-      };
-    } catch (error) {
-      return null;
-    }
-  }
-
-  async saveLicenseFile(licenseData) {
-    try {
-      await mkdir(this.licenseDir, { recursive: true });
-      await writeFile(this.licensePath, JSON.stringify(licenseData, null, 2));
-    } catch (error) {
-      throw new LicenseError('Failed to save license information', 'SAVE_ERROR');
-    }
-  }
-}
-
-async function generateHardwareId() {
-  const osInfo = {
-    platform: process.platform,
-    arch: process.arch,
-    cpus: os.cpus().length,
-    hostname: os.hostname(),
-    username: os.userInfo().username,
-  };
-  const systemString = JSON.stringify(osInfo);
-  return createHash('sha256').update(systemString).digest('hex');
-}
-
-async function validateLicenseRemote(licenseKey, email, hardwareId) {
-  const baseUrl =
-    process.env.NODE_ENV === 'development'
-      ? 'http://localhost:4000'
-      : 'https://d1-studio.com';
-
-  try {
-    const response = await fetch(`${baseUrl}/api/validate-license`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ licenseKey, email, hardwareId }),
-    });
-
-    const result = await response.json();
-
-    if (!response.ok) {
-      throw new LicenseError(
-        result.message || 'License validation failed',
-        result.type || 'VALIDATION_ERROR'
-      );
-    }
-
-    return result;
-  } catch (error) {
-    if (error instanceof LicenseError) {
-      throw error;
-    }
-    if (error.name === 'TypeError' && error.message.includes('fetch')) {
-      throw new LicenseError(
-        process.env.NODE_ENV === 'development'
-          ? 'Unable to connect to local license validation service. Make sure the development server is running.'
-          : 'Unable to connect to license server. Please check your internet connection.',
-        'CONNECTION_ERROR'
-      );
-    }
-    throw new LicenseError(
-      'An unexpected error occurred during license validation',
-      'VALIDATION_ERROR'
-    );
-  }
-}
-
 async function startServer(port, projectDirectory) {
   return new Promise((resolvePromise, rejectPromise) => {
     // Determine Next.js app directory based on environment:
@@ -203,69 +79,6 @@ async function startStudio() {
   try {
     logger.info(chalk.green('Initializing D1 Studio...'));
 
-    const licenseManager = new StudioLicenseManager();
-
-    // Check existing license
-    const licenseCheck = await licenseManager.checkLicenseFile();
-    
-    // Handle license validation
-    if (!licenseCheck || !licenseCheck.isValid) {
-      // Prompt for license information if needed
-      const { default: inquirer } = await import('inquirer');
-      logger.info(chalk.yellow('\nPlease enter your D1 Studio license information:'));
-
-      const answers = await inquirer.prompt([
-        {
-          type: 'input',
-          name: 'licenseKey',
-          message: 'License Key:',
-          validate: (input) => input.length > 0 || 'License key is required',
-        },
-        {
-          type: 'input',
-          name: 'email',
-          message: 'Email:',
-          validate: (input) => {
-            const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-            return emailRegex.test(input) || 'Please enter a valid email';
-          },
-        },
-      ]);
-
-      const hardwareId = await generateHardwareId();
-
-      try {
-        const validation = await validateLicenseRemote(
-          answers.licenseKey,
-          answers.email,
-          hardwareId
-        );
-
-        // Save the complete validation response
-        await licenseManager.saveLicenseFile({
-          licenseKey: answers.licenseKey,
-          email: answers.email,
-          hardwareId,
-          end_date: validation.end_date,
-          subscription_status: validation.subscription_status,
-          type: validation.licenseType,
-          activatedAt: new Date().toISOString()
-        });
-
-        logger.info(chalk.green('\nLicense activated successfully!'));
-      } catch (error) {
-        logger.error(chalk.red(`\nLicense validation failed: ${error.message}`));
-        process.exit(1);
-      }
-    } else if (licenseCheck.isExpiringSoon) {
-      // Show warning about expiring subscription
-      const endDate = new Date(licenseCheck.licenseData.end_date).toLocaleDateString();
-      logger.warn(chalk.yellow(`
-        ⚠️  Your subscription will expire on ${endDate}
-        Please renew your subscription at https://d1-studio.com to continue using D1 Studio.
-      `));
-    }
-
     // Get wrangler configuration
     try {
       const userProjectPath = process.cwd();

package/dist/lib/logger.js

@@ -4,14 +4,21 @@ const { combine, timestamp, printf, colorize } = winston.format;
 
 const isDevelopment = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === undefined;
 const isProduction = process.env.NODE_ENV === 'production';
+// Check for DEBUG env var which is set by --debug flag
 const isDebug = process.env.DEBUG === 'true';
 
-const logFormat = printf(({ level, message, timestamp }) => {
-  return `${timestamp} ${level}: ${message}`;
+const logFormat = printf(({ level, message, timestamp, ...metadata }) => {
+  let msg = `${timestamp} ${level}: ${message}`;
+  // Add metadata if present
+  if (Object.keys(metadata).length > 0) {
+    msg += ` ${JSON.stringify(metadata)}`;
+  }
+  return msg;
 });
 
 const logger = winston.createLogger({
-  level: isProduction ? 'warn' : (isDebug ? 'debug' : 'info'),
+  // Set log level based on environment and debug flag
+  level: isDebug ? 'debug' : (isProduction ? 'warn' : 'info'),
   format: combine(
     timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
     colorize(),
@@ -19,10 +26,33 @@ const logger = winston.createLogger({
   ),
   transports: [
     new winston.transports.Console({
-      level: isProduction ? 'warn' : (isDebug ? 'debug' : 'info'),
+      level: isDebug ? 'debug' : (isProduction ? 'warn' : 'info'),
       silent: process.env.NODE_ENV === 'test'
     })
   ]
 });
 
-export default logger;
+// Add helper methods
+logger.logRequest = (method, path, params = {}) => {
+  logger.debug(`Request: ${method} ${path}`, params);
+};
+
+logger.logError = (error, source = 'unknown') => {
+  logger.error(`Error in ${source}: ${error.message}`, {
+    error: error.stack || error.message,
+    source
+  });
+};
+
+logger.shouldLog = (level) => {
+  const currentLevel = logger.level;
+  const levels = {
+    error: 0,
+    warn: 1,
+    info: 2,
+    debug: 3
+  };
+  return levels[level] <= levels[currentLevel];
+};
+
+export default logger;