npm - d1s - Versions diffs - 0.2.1 - Mend

d1s 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (408) hide show

package/dist/app/app/globals.css ADDED Viewed

@@ -0,0 +1,93 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+body {
+  font-family: Arial, Helvetica, sans-serif;
+}
+@layer base {
+  :root {
+    --background: 0 0% 100%;
+    --foreground: 240 10% 3.9%;
+    --card: 0 0% 100%;
+    --card-foreground: 240 10% 3.9%;
+    --popover: 0 0% 100%;
+    --popover-foreground: 240 10% 3.9%;
+    --primary: 240 5.9% 10%;
+    --primary-foreground: 0 0% 98%;
+    --secondary: 240 4.8% 95.9%;
+    --secondary-foreground: 240 5.9% 10%;
+    --muted: 240 4.8% 95.9%;
+    --muted-foreground: 240 3.8% 46.1%;
+    --accent: 240 4.8% 95.9%;
+    --accent-foreground: 240 5.9% 10%;
+    --destructive: 0 84.2% 60.2%;
+    --destructive-foreground: 0 0% 98%;
+    --border: 240 5.9% 90%;
+    --input: 240 5.9% 90%;
+    --ring: 240 10% 3.9%;
+    --chart-1: 12 76% 61%;
+    --chart-2: 173 58% 39%;
+    --chart-3: 197 37% 24%;
+    --chart-4: 43 74% 66%;
+    --chart-5: 27 87% 67%;
+    --radius: 0.5rem;
+    --sidebar-background: 0 0% 98%;
+    --sidebar-foreground: 240 5.3% 26.1%;
+    --sidebar-primary: 240 5.9% 10%;
+    --sidebar-primary-foreground: 0 0% 98%;
+    --sidebar-accent: 240 4.8% 95.9%;
+    --sidebar-accent-foreground: 240 5.9% 10%;
+    --sidebar-border: 220 13% 91%;
+    --sidebar-ring: 217.2 91.2% 59.8%;
+  }
+  .dark {
+    --background: 240 10% 3.9%;
+    --foreground: 0 0% 98%;
+    --card: 240 10% 3.9%;
+    --card-foreground: 0 0% 98%;
+    --popover: 240 10% 3.9%;
+    --popover-foreground: 0 0% 98%;
+    --primary: 0 0% 98%;
+    --primary-foreground: 240 5.9% 10%;
+    --secondary: 240 3.7% 15.9%;
+    --secondary-foreground: 0 0% 98%;
+    --muted: 240 3.7% 15.9%;
+    --muted-foreground: 240 5% 64.9%;
+    --accent: 240 3.7% 15.9%;
+    --accent-foreground: 0 0% 98%;
+    --destructive: 0 62.8% 30.6%;
+    --destructive-foreground: 0 0% 98%;
+    --border: 240 3.7% 15.9%;
+    --input: 240 3.7% 15.9%;
+    --ring: 240 4.9% 83.9%;
+    --chart-1: 220 70% 50%;
+    --chart-2: 160 60% 45%;
+    --chart-3: 30 80% 55%;
+    --chart-4: 280 65% 60%;
+    --chart-5: 340 75% 55%;
+    --sidebar-background: 240 5.9% 10%;
+    --sidebar-foreground: 240 4.8% 95.9%;
+    --sidebar-primary: 224.3 76.3% 48%;
+    --sidebar-primary-foreground: 0 0% 100%;
+    --sidebar-accent: 240 3.7% 15.9%;
+    --sidebar-accent-foreground: 240 4.8% 95.9%;
+    --sidebar-border: 240 3.7% 15.9%;
+    --sidebar-ring: 217.2 91.2% 59.8%;
+  }
+}
+@layer base {
+  * {
+    @apply border-border;
+  }
+  body {
+    @apply bg-background text-foreground;
+  }
+}
+.table-fixed {
+  table-layout: fixed;
+  width: 100%;
+}

package/dist/app/app/layout.jsx ADDED Viewed

@@ -0,0 +1,35 @@
+// app/layout.js
+import { Geist, Geist_Mono } from "next/font/google";
+import "./globals.css";
+import { DatabaseProvider } from '@/context/database-context';
+import { Toaster } from '@/components/ui/toaster'; // Change this import
+const geistSans = Geist({
+  variable: "--font-geist-sans",
+  subsets: ["latin"],
+});
+const geistMono = Geist_Mono({
+  variable: "--font-geist-mono",
+  subsets: ["latin"],
+});
+export const metadata = {
+  title: "d1-studio",
+  description: "Native D1 database studio.",
+};
+export default function RootLayout({ children }) {
+  return (
+    <html lang="en">
+      <body
+        className={`${geistSans.variable} ${geistMono.variable} antialiased`}
+      >
+        <DatabaseProvider>
+          {children}
+          <Toaster /> {/* Add this component */}
+        </DatabaseProvider>
+      </body>
+    </html>
+  );
+}

package/dist/app/app/page.jsx ADDED Viewed

@@ -0,0 +1,37 @@
+// app/page.js
+'use client'
+import { AppSidebar } from '../components/sidebar';
+import { SQLEditor } from '../components/sql-editor';
+import { TableView } from '../components/table-view';
+import { useState } from 'react';
+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">
+      <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/dist/app/globals.css ADDED Viewed

@@ -0,0 +1,93 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+body {
+  font-family: Arial, Helvetica, sans-serif;
+}
+@layer base {
+  :root {
+    --background: 0 0% 100%;
+    --foreground: 240 10% 3.9%;
+    --card: 0 0% 100%;
+    --card-foreground: 240 10% 3.9%;
+    --popover: 0 0% 100%;
+    --popover-foreground: 240 10% 3.9%;
+    --primary: 240 5.9% 10%;
+    --primary-foreground: 0 0% 98%;
+    --secondary: 240 4.8% 95.9%;
+    --secondary-foreground: 240 5.9% 10%;
+    --muted: 240 4.8% 95.9%;
+    --muted-foreground: 240 3.8% 46.1%;
+    --accent: 240 4.8% 95.9%;
+    --accent-foreground: 240 5.9% 10%;
+    --destructive: 0 84.2% 60.2%;
+    --destructive-foreground: 0 0% 98%;
+    --border: 240 5.9% 90%;
+    --input: 240 5.9% 90%;
+    --ring: 240 10% 3.9%;
+    --chart-1: 12 76% 61%;
+    --chart-2: 173 58% 39%;
+    --chart-3: 197 37% 24%;
+    --chart-4: 43 74% 66%;
+    --chart-5: 27 87% 67%;
+    --radius: 0.5rem;
+    --sidebar-background: 0 0% 98%;
+    --sidebar-foreground: 240 5.3% 26.1%;
+    --sidebar-primary: 240 5.9% 10%;
+    --sidebar-primary-foreground: 0 0% 98%;
+    --sidebar-accent: 240 4.8% 95.9%;
+    --sidebar-accent-foreground: 240 5.9% 10%;
+    --sidebar-border: 220 13% 91%;
+    --sidebar-ring: 217.2 91.2% 59.8%;
+  }
+  .dark {
+    --background: 240 10% 3.9%;
+    --foreground: 0 0% 98%;
+    --card: 240 10% 3.9%;
+    --card-foreground: 0 0% 98%;
+    --popover: 240 10% 3.9%;
+    --popover-foreground: 0 0% 98%;
+    --primary: 0 0% 98%;
+    --primary-foreground: 240 5.9% 10%;
+    --secondary: 240 3.7% 15.9%;
+    --secondary-foreground: 0 0% 98%;
+    --muted: 240 3.7% 15.9%;
+    --muted-foreground: 240 5% 64.9%;
+    --accent: 240 3.7% 15.9%;
+    --accent-foreground: 0 0% 98%;
+    --destructive: 0 62.8% 30.6%;
+    --destructive-foreground: 0 0% 98%;
+    --border: 240 3.7% 15.9%;
+    --input: 240 3.7% 15.9%;
+    --ring: 240 4.9% 83.9%;
+    --chart-1: 220 70% 50%;
+    --chart-2: 160 60% 45%;
+    --chart-3: 30 80% 55%;
+    --chart-4: 280 65% 60%;
+    --chart-5: 340 75% 55%;
+    --sidebar-background: 240 5.9% 10%;
+    --sidebar-foreground: 240 4.8% 95.9%;
+    --sidebar-primary: 224.3 76.3% 48%;
+    --sidebar-primary-foreground: 0 0% 100%;
+    --sidebar-accent: 240 3.7% 15.9%;
+    --sidebar-accent-foreground: 240 4.8% 95.9%;
+    --sidebar-border: 240 3.7% 15.9%;
+    --sidebar-ring: 217.2 91.2% 59.8%;
+  }
+}
+@layer base {
+  * {
+    @apply border-border;
+  }
+  body {
+    @apply bg-background text-foreground;
+  }
+}
+.table-fixed {
+  table-layout: fixed;
+  width: 100%;
+}

package/dist/app/layout.jsx ADDED Viewed

@@ -0,0 +1,35 @@
+// app/layout.js
+import { Geist, Geist_Mono } from "next/font/google";
+import "./globals.css";
+import { DatabaseProvider } from '@/context/database-context';
+import { Toaster } from '@/components/ui/toaster'; // Change this import
+const geistSans = Geist({
+  variable: "--font-geist-sans",
+  subsets: ["latin"],
+});
+const geistMono = Geist_Mono({
+  variable: "--font-geist-mono",
+  subsets: ["latin"],
+});
+export const metadata = {
+  title: "d1-studio",
+  description: "Native D1 database studio.",
+};
+export default function RootLayout({ children }) {
+  return (
+    <html lang="en">
+      <body
+        className={`${geistSans.variable} ${geistMono.variable} antialiased`}
+      >
+        <DatabaseProvider>
+          {children}
+          <Toaster /> {/* Add this component */}
+        </DatabaseProvider>
+      </body>
+    </html>
+  );
+}

package/dist/app/page.jsx ADDED Viewed

@@ -0,0 +1,37 @@
+// app/page.js
+'use client'
+import { AppSidebar } from '../components/sidebar';
+import { SQLEditor } from '../components/sql-editor';
+import { TableView } from '../components/table-view';
+import { useState } from 'react';
+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">
+      <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/dist/d1-studio.js ADDED Viewed

@@ -0,0 +1,344 @@
+#!/usr/bin/env node
+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';
+// Compute the absolute path of this file and its directory.
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+// console.log(chalk.blue('Resolved __filename:'), __filename);
+// console.log(chalk.blue('Resolved __dirname:'), __dirname);
+// License validation utilities
+class LicenseError extends Error {
+  constructor(message, type = 'VALIDATION_ERROR') {
+    super(message);
+    this.name = 'LicenseError';
+    this.type = type;
+  }
+}
+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 checkLicenseFile() {
+  const licenseDir = join(homedir(), '.d1studio');
+  const licensePath = join(licenseDir, 'license.json');
+  try {
+    const licenseData = JSON.parse(await readFile(licensePath, 'utf8'));
+    const hardwareId = await generateHardwareId();
+    if (licenseData.hardwareId !== hardwareId) {
+      return null;
+    }
+    return licenseData;
+  } catch (error) {
+    return null;
+  }
+}
+async function saveLicenseFile(licenseData) {
+  const licenseDir = join(homedir(), '.d1studio');
+  const licensePath = join(licenseDir, 'license.json');
+  try {
+    await mkdir(licenseDir, { recursive: true });
+    await writeFile(licensePath, JSON.stringify(licenseData, null, 2));
+  } catch (error) {
+    throw new LicenseError('Failed to save license information', 'SAVE_ERROR');
+  }
+}
+async function startServer(port, projectDirectory) {
+  return new Promise((resolvePromise, rejectPromise) => {
+    const dev = process.env.NODE_ENV === 'development';
+    // Point to the parent directory that contains both app and .next
+    const dir = join(__dirname, '..');
+    const app = next({
+      dev,
+      dir,
+      conf: {
+        distDir: '.next',
+        // Ensure app directory is correctly set for routing
+        experimental: {
+          appDir: true
+        }
+      }
+    });
+    const handle = app.getRequestHandler();
+    app.prepare()
+      .then(() => {
+        const server = express();
+        // Set environment variables
+        process.env.PORT = port.toString();
+        process.env.D1_PROJECT_DIR = projectDirectory;
+        // 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);
+        });
+        // Start listening
+        httpServer.listen(port, (err) => {
+          if (err) {
+            console.error(chalk.red('Failed to start server:'), err);
+            rejectPromise(err);
+            return;
+          }
+          console.log(chalk.green(`Server started on port ${port}`));
+          resolvePromise(httpServer);
+        });
+        // Handle server errors
+        httpServer.on('error', (err) => {
+          console.error(chalk.red('Server error:'), err);
+          rejectPromise(err);
+        });
+      })
+      .catch((err) => {
+        console.error(chalk.red('Failed to prepare Next.js app:'), err);
+        rejectPromise(err);
+      });
+  });
+}
+async function startStudio() {
+  try {
+    console.log(chalk.green('Initializing D1 Studio...'));
+    // Validate license
+    let licenseData = await checkLicenseFile();
+    console.log(chalk.blue('License data found:'), licenseData);
+    if (!licenseData) {
+      const { default: inquirer } = await import('inquirer');
+      console.log(chalk.blue('\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';
+          },
+        },
+      ]);
+      console.log(chalk.blue('Entered license information:'), answers);
+      const hardwareId = await generateHardwareId();
+      // console.log(chalk.blue('Generated hardware ID:'), hardwareId);
+      try {
+        const validation = await validateLicenseRemote(
+          answers.licenseKey,
+          answers.email,
+          hardwareId
+        );
+        licenseData = {
+          licenseKey: answers.licenseKey,
+          email: answers.email,
+          hardwareId,
+          licenseType: validation.licenseType,
+          activatedAt: new Date().toISOString(),
+        };
+        await saveLicenseFile(licenseData);
+        console.log(chalk.green('\nLicense activated successfully!'));
+      } catch (error) {
+        console.error(chalk.red('\nLicense validation failed:'), error.message);
+        process.exit(1);
+      }
+    }
+    // Get wrangler configuration
+    try {
+      const userProjectPath = process.cwd();
+      // console.log(chalk.blue('Current working directory:'), userProjectPath);
+      if (!userProjectPath) {
+        console.error(chalk.red('Error: Could not determine project directory'));
+        process.exit(1);
+      }
+      const wranglerResult = await findWranglerConfig(userProjectPath);
+      // console.log(chalk.blue('Wrangler config result:'), wranglerResult);
+      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.'));
+        process.exit(1);
+      }
+      const { config, projectPath } = wranglerResult;
+      // console.log(chalk.blue('Resolved wrangler.toml project path:'), projectPath);
+      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(`
+    [[d1_databases]]
+    binding = "DB"
+    database_name = "my-database"
+    database_id = "<your-database-id>"
+        `));
+        process.exit(1);
+      }
+      // Display found databases
+      console.log(chalk.green('\nFound D1 databases:'));
+      config.d1_databases.forEach((db) => {
+        console.log(chalk.blue(`  - ${db.database_name} (${db.binding})`));
+      });
+      const port = 4000;
+      const url = `http://localhost:${port}`;
+      await startServer(port, projectPath);
+      console.log(chalk.green(`
+    ┌─────────────────────────────────────────┐
+    │                                         │
+    │   D1 Studio is running on port ${port}    │
+    │                                         │
+    │   Local:  ${url}        │
+    │                                         │
+    └─────────────────────────────────────────┘
+      `));
+      // 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
+          }
+        }).catch(() => {
+          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);
+      }
+    } catch (configError) {
+      console.error(chalk.red('\nConfiguration error:'), configError.message);
+      process.exit(1);
+    }
+  } catch (error) {
+    console.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...'));
+  process.exit(0);
+});
+process.on('SIGTERM', () => {
+  console.log(chalk.yellow('\nShutting down D1 Studio...'));
+  process.exit(0);
+});
+startStudio().catch((error) => {
+  console.error(chalk.red('\nFailed to start D1 Studio:'), error);
+  process.exit(1);
+});