d1s 0.2.9 → 0.2.11

package/dist/lib/sql-operations.js

@@ -112,26 +112,18 @@ export function parseStatement(sql) {
     // Extract the index name.
     const indexMatch = cleanSql.match(/INDEX\s+(?:IF\s+NOT\s+EXISTS\s+)?([\w$]+)/i);
     const indexName = indexMatch ? indexMatch[1] : '';
-    // Extract the columns from the ON clause.
-    const onMatch = cleanSql.match(/ON\s+[\w$]+\s*\(([^)]+)\)/i);
-    const columns = onMatch ? onMatch[1].trim() : '';
-    // Remove spaces and replace commas with hyphens.
-    const formattedColumns = columns.replace(/\s+/g, '').replace(/,/g, '-').toLowerCase();
     
-    // Build a description that uses the index name,
-    // and appends the columns if they are not already included.
-    let description = indexName;
-    if (formattedColumns && !description.toLowerCase().includes(formattedColumns)) {
-      description += `-${formattedColumns}`;
-    }
+    // For index migrations, simply use the index name as the description.
+    const description = indexName;
     
     return {
       type: Operations.CREATE_INDEX,
       tableName,
       sql: cleanSql,
-      description // e.g. "idx_movies_name" or "idx_movies_name-name"
+      description // now simply the index name, e.g. "idx_technology_timestamp"
     };
-  }  
+  }
+    
 
   if (upperSql.startsWith('DROP INDEX')) {
     const tableName = extractTableNameFromIndex(cleanSql);
@@ -559,14 +551,14 @@ export function formatMigrationContent(sql) {
  * @returns {Promise<string>} The migration file content.
  */
 
- export async function getMigrationFileContent(projectDir, databaseName, migrationFile, env) {
+export async function getMigrationFileContent(projectDir, databaseName, migrationFile, env) {
   try {
     // Extract table name using improved helper
     const tableName = await extractTableNameFromMigration(migrationFile);
     let sql;
 
-    if (tableName) {
-      // Try getting SQL from sqlite_master for table
+    // For non-index migrations, try getting SQL from sqlite_master for table
+    if (tableName && !migrationFile.includes('create-index')) {
       const result = await executeSQL(
         projectDir,
         databaseName,
@@ -583,24 +575,38 @@ export function formatMigrationContent(sql) {
       }
     }
 
-    // If we couldn't get the SQL from table, try index
+    // If we couldn't get the SQL from table and it's an index migration, try fetching via index name.
     if (!sql && migrationFile.includes('create-index')) {
-      const indexMatch = migrationFile.match(/create-index[-_]([^_.]+)/);
+      const indexMatch = migrationFile.match(/create-index[_-](.+)\.sql$/i);
       if (indexMatch) {
-        const result = await executeSQL(
+        let indexName = indexMatch[1]; // e.g. "idx_technology_timestamp-technology-timestamp"
+        let result = await executeSQL(
           projectDir,
           databaseName,
-          `SELECT sql FROM sqlite_master WHERE type='index' AND name='${indexMatch[1]}';`,
+          `SELECT sql FROM sqlite_master WHERE type='index' AND name='${indexName}' COLLATE NOCASE;`,
           env,
           true
         );
-        const parsed = JSON.parse(result);
+        let parsed = JSON.parse(result);
         sql = parsed[0]?.results?.[0]?.sql;
+        // Fallback: if no result, try using only the part before the first hyphen.
+        if (!sql) {
+          const fallbackIndexName = indexName.split('-')[0]; // "idx_technology_timestamp"
+          result = await executeSQL(
+            projectDir,
+            databaseName,
+            `SELECT sql FROM sqlite_master WHERE type='index' AND name='${fallbackIndexName}' COLLATE NOCASE;`,
+            env,
+            true
+          );
+          parsed = JSON.parse(result);
+          sql = parsed[0]?.results?.[0]?.sql;
+        }
       }
-    }
+    }    
 
-    // If still no SQL, try fetching any object matching the name pattern
-    if (!sql && tableName) {
+    // If still no SQL and it's not an index migration, try a fallback query
+    if (!sql && tableName && !migrationFile.includes('create-index')) {
       const result = await executeSQL(
         projectDir,
         databaseName,

package/dist/lib/version-utils.js

@@ -0,0 +1,34 @@
+// lib/version-utils.js
+
+/**
+ * Compares semantic versions to determine if v2 is newer than v1
+ * @param {string} v1 - First version (e.g. "1.0.0")
+ * @param {string} v2 - Second version (e.g. "1.0.1")
+ * @returns {boolean} True if v2 is newer than v1
+ */
+export function isNewerVersion(v1, v2) {
+    if (!v1 || !v2) return false;
+    
+    // Split versions by dots
+    const v1Parts = v1.split('.').map(Number);
+    const v2Parts = v2.split('.').map(Number);
+    
+    // Compare major, minor, and patch versions
+    for (let i = 0; i < 3; i++) {
+      if (v2Parts[i] > v1Parts[i]) return true;
+      if (v2Parts[i] < v1Parts[i]) return false;
+    }
+    
+    // If we reach here, versions are equal
+    return false;
+  }
+  
+  /**
+   * Formats version strings for display by removing leading 'v' if present
+   * @param {string} version - The version string (e.g. "v1.0.0" or "1.0.0")
+   * @returns {string} Formatted version (e.g. "1.0.0")
+   */
+  export function formatVersion(version) {
+    if (!version) return '';
+    return version.startsWith('v') ? version.substring(1) : version;
+  }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "d1s",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "type": "module",
   "description": "D1 Studio – a native studio for managing Cloudflare D1 databases.",
   "main": "./dist/d1-studio.js",
@@ -97,4 +97,4 @@
     "tailwindcss": "^3.4.1",
     "wrangler": "^3.107.3"
   }
-}
+}

package/scripts/studio.js

@@ -3,10 +3,6 @@ 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';
@@ -22,139 +18,42 @@ if (hasDebugFlag) {
   logger.debug('Debug mode enabled');
 }
 
-const notifier = updateNotifier({ pkg, updateCheckInterval: 1000 * 60 * 60 * 24 });
-notifier.notify({ defer: false });
-
-// Compute the absolute path of this file and its directory
-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
-        };
-      }
+const notifier = updateNotifier({ 
+  pkg,
+  updateCheckInterval: 1000 * 60 * 60 * 24,
+});
 
-      // Check if subscription ends in next 7 days
-      const sevenDaysFromNow = new Date(now.getTime() + (7 * 24 * 60 * 60 * 1000));
-      const isExpiringSoon = endDate <= sevenDaysFromNow;
+// Check if update is available
+if (notifier.update) {
+  // Get current version and latest version
+  const currentVersion = pkg.version;
+  const latestVersion = notifier.update.latest;
+  
+  // Version-specific messages
+  const versionMessages = {
+    // Add specific version messages here
+    '0.2.11': 'Fixed table toolbar and table view horizontal/vertical scroll issues'
+    // Add more version messages as needed
+  };
 
-      return {
-        licenseData,
-        isValid: true,
-        isExpiringSoon
-      };
-    } catch (error) {
-      return null;
-    }
+  // Create custom message
+  let message = `Update available ${chalk.dim(currentVersion)} → ${chalk.green(latestVersion)}`;
+  
+  // Add version-specific message if available
+  if (versionMessages[latestVersion]) {
+    message += `\n${chalk.cyan('What\'s new:')} ${versionMessages[latestVersion]}`;
   }
+  
+  // Add installation instructions
+  message += `\nRun ${chalk.cyan('npm i -g d1s@latest')} to update`;
 
-  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');
+  // Display custom notification
+  notifier.notify({ message });
 }
 
-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'
-    );
-  }
-}
+// Compute the absolute path of this file and its directory
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
 async function startServer(port, projectDirectory) {
   return new Promise((resolvePromise, rejectPromise) => {
@@ -210,69 +109,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/src/app/api/update/route.js

@@ -1,31 +1,40 @@
 // 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() {
   try {
-    // Create notifier instance with package info
-    const notifier = updateNotifier({ 
-      pkg,
-      updateCheckInterval: 1000 * 60 * 60 * 24 // Check once per day
+    // 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 there's an update, notifier.update will contain the update info
-    if (notifier.update) {
-      const { latest, current } = notifier.update;
-      
-      // Only return update info if versions are different
-      if (latest !== current) {
-        return NextResponse.json({ 
-          update: {
-            latest,
-            current
-          }
-        });
-      }
+    
+    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) {

package/src/app/page.jsx

@@ -5,7 +5,6 @@ import { useState } from 'react';
 import { AppSidebar } from '../components/sidebar';
 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');
@@ -17,28 +16,19 @@ export default function StudioPage() {
   };
 
   return (
-    <div className="flex flex-col min-h-screen bg-background">
-      {/* Banner */}
-      <UpdateBanner />
-      
-      {/* Main layout */}
-      <div className="flex flex-1">
-        {/* Sidebar */}
-        <AppSidebar 
-          className="w-64 border-r fixed h-[calc(100vh-var(--banner-height,0px))]"
-          currentView={currentView}
-          onNavigate={setCurrentView}
-          onTableSelect={handleTableSelect}
-        />
-        
-        {/* Main content */}
-        <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 className="flex h-screen bg-background">
+      <AppSidebar 
+        className="w-64 border-r flex-shrink-0" 
+        currentView={currentView}
+        onNavigate={setCurrentView}
+        onTableSelect={handleTableSelect}
+      />
+      <main className="flex-1 overflow-hidden">
+        {currentView === 'sql-editor' && <SQLEditor />}
+        {currentView === 'table-view' && selectedTable && (
+          <TableView tableName={selectedTable} />
+        )}
+      </main>
     </div>
   );
 }

package/src/components/sidebar.jsx

@@ -133,7 +133,8 @@ export function AppSidebar({
 
   return (
     <>
-      <aside className={`${className} w-64 fixed top-0 left-0 h-full bg-neutral-50 p-4`}>
+      {/* The sidebar now has top position adjusted for the banner */}
+      <aside className={`${className} top-[var(--banner-height,0px)] left-0 h-[calc(100vh-var(--banner-height,0px))] bg-neutral-50 p-4`}>
         <div className="flex flex-col h-full font-sans">
           {/* Header */}
           <div className="flex items-center gap-2 mb-4">

package/src/components/table-view.jsx

@@ -684,7 +684,7 @@ export function TableView({ tableName }) {
       />
   
       <ResizableTable columns={schema} onColumnsResize={handleColumnResize}>
-        <div className="relative flex-1 overflow-hidden bg-background font-mono">
+        <div className="flex-1 overflow-hidden bg-background font-mono">
           <ScrollArea className="w-full h-screen">
             <div className="relative w-max min-w-fit pb-4">
               <Table>

package/src/components/update-banner.jsx

@@ -2,61 +2,92 @@
 'use client'
 
 import { useEffect, useState } from 'react';
-import { Download } from 'lucide-react';
+import { Info } from 'lucide-react';
 import axios from 'axios';
 
 export default function UpdateBanner() {
   const [updateInfo, setUpdateInfo] = useState(null);
-  const [visible, setVisible] = useState(true);
+  const [visible, setVisible] = useState(false);
+  const [loading, setLoading] = useState(true);
 
   useEffect(() => {
-    const dismissedVersion = localStorage.getItem('updateBannerDismissedVersion');
-    if (dismissedVersion) {
-      setVisible(false);
-    }
-  }, []);
-
-  useEffect(() => {
-    const timer = setTimeout(() => {
-      axios
-        .get('/api/update')
-        .then(({ data }) => {
-          if (data?.update) {
-            const dismissedVersion = localStorage.getItem('updateBannerDismissedVersion');
-            if (dismissedVersion !== data.update.latest) {
-              setUpdateInfo(data.update);
-              setVisible(true);
-            }
+    const checkForUpdates = async () => {
+      try {
+        setLoading(true);
+        
+        // Check if we've already dismissed this specific version update
+        const dismissedVersion = localStorage.getItem('dismissedVersion');
+        
+        const { data } = await axios.get('/api/update');
+        
+        if (data?.update) {
+          // Only show if the user hasn't dismissed this specific version
+          if (dismissedVersion !== data.update.latest) {
+            setUpdateInfo(data.update);
+            setVisible(true);
+          } else {
+            setVisible(false);
           }
-        })
-        .catch(console.error);
-    }, 1000);
+        } else {
+          setVisible(false);
+        }
+      } catch (error) {
+        console.error('Error checking for updates:', error);
+        setVisible(false);
+      } finally {
+        setLoading(false);
+      }
+    };
 
-    return () => clearTimeout(timer);
+    // Check immediately and then daily
+    checkForUpdates();
+    const interval = setInterval(checkForUpdates, 24 * 60 * 60 * 1000); // Check daily
+    
+    return () => clearInterval(interval);
   }, []);
 
-  if (!updateInfo || !visible) return null;
+  // If banner is dismissed or no update info, don't render and reset CSS variable
+  if (!updateInfo || !visible || loading) {
+    // Reset the banner height when hidden
+    if (typeof document !== 'undefined') {
+      document.documentElement.style.setProperty('--banner-height', '0px');
+    }
+    return null;
+  }
+
+  // Set the banner height CSS variable when visible
+  if (typeof document !== 'undefined') {
+    document.documentElement.style.setProperty('--banner-height', '37px'); // Adjust based on actual banner height
+  }
 
   const handleClose = () => {
-    localStorage.setItem('updateBannerDismissedVersion', updateInfo.latest);
+    // Store the dismissed version to avoid showing the same update again
+    if (updateInfo?.latest) {
+      localStorage.setItem('dismissedVersion', updateInfo.latest);
+    }
     setVisible(false);
   };
 
   return (
-    <div className="w-full bg-neutral-100 border-b px-3 py-2 flex items-center justify-between">
-      <div className="flex items-center gap-2 text-sm">
-        <Download className="h-4 w-4 text-blue-500" />
-        <span>
-          Version {updateInfo.latest} is available — npm install -g d1s@latest
-        </span>
+    <div className="fixed top-0 left-0 right-0 z-50 bg-yellow-200 border-b border-yellow-500 px-3 py-2 font-sans">
+      <div className="flex items-center justify-center relative">
+        {/* Info icon and text centered */}
+        <div className="flex items-center gap-2 mx-auto">
+          <Info className="h-4 w-4 text-neutral-900" />
+          <span className="text-sm font-medium">
+           Version {updateInfo.latest} is available — npm install -g d1s@latest
+          </span>
+        </div>
+        
+        {/* Close button positioned absolutely on the right */}
+        <button
+          onClick={handleClose}
+          className="absolute right-0 text-neutral-500 hover:text-neutral-700"
+          aria-label="Close update banner"
+        >
+          ×
+        </button>
       </div>
-      <button
-        onClick={handleClose}
-        className="text-neutral-500 hover:text-neutral-700"
-        aria-label="Close update banner"
-      >
-        ×
-      </button>
     </div>
   );
 }