d1s 0.2.8 → 0.2.10

package/dist/.next/types/app/api/update/route.ts

@@ -0,0 +1,347 @@
+// File: /Users/kona/Desktop/d1studio/src/app/api/update/route.js
+import * as entry from '../../../../../src/app/api/update/route.js'
+import type { NextRequest } from 'next/server.js'
+
+type TEntry = typeof import('../../../../../src/app/api/update/route.js')
+
+type SegmentParams<T extends Object = any> = T extends Record<string, any>
+  ? { [K in keyof T]: T[K] extends string ? string | string[] | undefined : never }
+  : T
+
+// Check that the entry is a valid entry
+checkFields<Diff<{
+  GET?: Function
+  HEAD?: Function
+  OPTIONS?: Function
+  POST?: Function
+  PUT?: Function
+  DELETE?: Function
+  PATCH?: Function
+  config?: {}
+  generateStaticParams?: Function
+  revalidate?: RevalidateRange<TEntry> | false
+  dynamic?: 'auto' | 'force-dynamic' | 'error' | 'force-static'
+  dynamicParams?: boolean
+  fetchCache?: 'auto' | 'force-no-store' | 'only-no-store' | 'default-no-store' | 'default-cache' | 'only-cache' | 'force-cache'
+  preferredRegion?: 'auto' | 'global' | 'home' | string | string[]
+  runtime?: 'nodejs' | 'experimental-edge' | 'edge'
+  maxDuration?: number
+  
+}, TEntry, ''>>()
+
+type RouteContext = { params: Promise<SegmentParams> }
+// Check the prop type of the entry function
+if ('GET' in entry) {
+  checkFields<
+    Diff<
+      ParamCheck<Request | NextRequest>,
+      {
+        __tag__: 'GET'
+        __param_position__: 'first'
+        __param_type__: FirstArg<MaybeField<TEntry, 'GET'>>
+      },
+      'GET'
+    >
+  >()
+  checkFields<
+    Diff<
+      ParamCheck<RouteContext>,
+      {
+        __tag__: 'GET'
+        __param_position__: 'second'
+        __param_type__: SecondArg<MaybeField<TEntry, 'GET'>>
+      },
+      'GET'
+    >
+  >()
+  
+  checkFields<
+    Diff<
+      {
+        __tag__: 'GET',
+        __return_type__: Response | void | never | Promise<Response | void | never>
+      },
+      {
+        __tag__: 'GET',
+        __return_type__: ReturnType<MaybeField<TEntry, 'GET'>>
+      },
+      'GET'
+    >
+  >()
+}
+// Check the prop type of the entry function
+if ('HEAD' in entry) {
+  checkFields<
+    Diff<
+      ParamCheck<Request | NextRequest>,
+      {
+        __tag__: 'HEAD'
+        __param_position__: 'first'
+        __param_type__: FirstArg<MaybeField<TEntry, 'HEAD'>>
+      },
+      'HEAD'
+    >
+  >()
+  checkFields<
+    Diff<
+      ParamCheck<RouteContext>,
+      {
+        __tag__: 'HEAD'
+        __param_position__: 'second'
+        __param_type__: SecondArg<MaybeField<TEntry, 'HEAD'>>
+      },
+      'HEAD'
+    >
+  >()
+  
+  checkFields<
+    Diff<
+      {
+        __tag__: 'HEAD',
+        __return_type__: Response | void | never | Promise<Response | void | never>
+      },
+      {
+        __tag__: 'HEAD',
+        __return_type__: ReturnType<MaybeField<TEntry, 'HEAD'>>
+      },
+      'HEAD'
+    >
+  >()
+}
+// Check the prop type of the entry function
+if ('OPTIONS' in entry) {
+  checkFields<
+    Diff<
+      ParamCheck<Request | NextRequest>,
+      {
+        __tag__: 'OPTIONS'
+        __param_position__: 'first'
+        __param_type__: FirstArg<MaybeField<TEntry, 'OPTIONS'>>
+      },
+      'OPTIONS'
+    >
+  >()
+  checkFields<
+    Diff<
+      ParamCheck<RouteContext>,
+      {
+        __tag__: 'OPTIONS'
+        __param_position__: 'second'
+        __param_type__: SecondArg<MaybeField<TEntry, 'OPTIONS'>>
+      },
+      'OPTIONS'
+    >
+  >()
+  
+  checkFields<
+    Diff<
+      {
+        __tag__: 'OPTIONS',
+        __return_type__: Response | void | never | Promise<Response | void | never>
+      },
+      {
+        __tag__: 'OPTIONS',
+        __return_type__: ReturnType<MaybeField<TEntry, 'OPTIONS'>>
+      },
+      'OPTIONS'
+    >
+  >()
+}
+// Check the prop type of the entry function
+if ('POST' in entry) {
+  checkFields<
+    Diff<
+      ParamCheck<Request | NextRequest>,
+      {
+        __tag__: 'POST'
+        __param_position__: 'first'
+        __param_type__: FirstArg<MaybeField<TEntry, 'POST'>>
+      },
+      'POST'
+    >
+  >()
+  checkFields<
+    Diff<
+      ParamCheck<RouteContext>,
+      {
+        __tag__: 'POST'
+        __param_position__: 'second'
+        __param_type__: SecondArg<MaybeField<TEntry, 'POST'>>
+      },
+      'POST'
+    >
+  >()
+  
+  checkFields<
+    Diff<
+      {
+        __tag__: 'POST',
+        __return_type__: Response | void | never | Promise<Response | void | never>
+      },
+      {
+        __tag__: 'POST',
+        __return_type__: ReturnType<MaybeField<TEntry, 'POST'>>
+      },
+      'POST'
+    >
+  >()
+}
+// Check the prop type of the entry function
+if ('PUT' in entry) {
+  checkFields<
+    Diff<
+      ParamCheck<Request | NextRequest>,
+      {
+        __tag__: 'PUT'
+        __param_position__: 'first'
+        __param_type__: FirstArg<MaybeField<TEntry, 'PUT'>>
+      },
+      'PUT'
+    >
+  >()
+  checkFields<
+    Diff<
+      ParamCheck<RouteContext>,
+      {
+        __tag__: 'PUT'
+        __param_position__: 'second'
+        __param_type__: SecondArg<MaybeField<TEntry, 'PUT'>>
+      },
+      'PUT'
+    >
+  >()
+  
+  checkFields<
+    Diff<
+      {
+        __tag__: 'PUT',
+        __return_type__: Response | void | never | Promise<Response | void | never>
+      },
+      {
+        __tag__: 'PUT',
+        __return_type__: ReturnType<MaybeField<TEntry, 'PUT'>>
+      },
+      'PUT'
+    >
+  >()
+}
+// Check the prop type of the entry function
+if ('DELETE' in entry) {
+  checkFields<
+    Diff<
+      ParamCheck<Request | NextRequest>,
+      {
+        __tag__: 'DELETE'
+        __param_position__: 'first'
+        __param_type__: FirstArg<MaybeField<TEntry, 'DELETE'>>
+      },
+      'DELETE'
+    >
+  >()
+  checkFields<
+    Diff<
+      ParamCheck<RouteContext>,
+      {
+        __tag__: 'DELETE'
+        __param_position__: 'second'
+        __param_type__: SecondArg<MaybeField<TEntry, 'DELETE'>>
+      },
+      'DELETE'
+    >
+  >()
+  
+  checkFields<
+    Diff<
+      {
+        __tag__: 'DELETE',
+        __return_type__: Response | void | never | Promise<Response | void | never>
+      },
+      {
+        __tag__: 'DELETE',
+        __return_type__: ReturnType<MaybeField<TEntry, 'DELETE'>>
+      },
+      'DELETE'
+    >
+  >()
+}
+// Check the prop type of the entry function
+if ('PATCH' in entry) {
+  checkFields<
+    Diff<
+      ParamCheck<Request | NextRequest>,
+      {
+        __tag__: 'PATCH'
+        __param_position__: 'first'
+        __param_type__: FirstArg<MaybeField<TEntry, 'PATCH'>>
+      },
+      'PATCH'
+    >
+  >()
+  checkFields<
+    Diff<
+      ParamCheck<RouteContext>,
+      {
+        __tag__: 'PATCH'
+        __param_position__: 'second'
+        __param_type__: SecondArg<MaybeField<TEntry, 'PATCH'>>
+      },
+      'PATCH'
+    >
+  >()
+  
+  checkFields<
+    Diff<
+      {
+        __tag__: 'PATCH',
+        __return_type__: Response | void | never | Promise<Response | void | never>
+      },
+      {
+        __tag__: 'PATCH',
+        __return_type__: ReturnType<MaybeField<TEntry, 'PATCH'>>
+      },
+      'PATCH'
+    >
+  >()
+}
+
+// Check the arguments and return type of the generateStaticParams function
+if ('generateStaticParams' in entry) {
+  checkFields<Diff<{ params: SegmentParams }, FirstArg<MaybeField<TEntry, 'generateStaticParams'>>, 'generateStaticParams'>>()
+  checkFields<Diff<{ __tag__: 'generateStaticParams', __return_type__: any[] | Promise<any[]> }, { __tag__: 'generateStaticParams', __return_type__: ReturnType<MaybeField<TEntry, 'generateStaticParams'>> }>>()
+}
+
+export interface PageProps {
+  params?: Promise<SegmentParams>
+  searchParams?: Promise<any>
+}
+export interface LayoutProps {
+  children?: React.ReactNode
+
+  params?: Promise<SegmentParams>
+}
+
+// =============
+// Utility types
+type RevalidateRange<T> = T extends { revalidate: any } ? NonNegative<T['revalidate']> : never
+
+// If T is unknown or any, it will be an empty {} type. Otherwise, it will be the same as Omit<T, keyof Base>.
+type OmitWithTag<T, K extends keyof any, _M> = Omit<T, K>
+type Diff<Base, T extends Base, Message extends string = ''> = 0 extends (1 & T) ? {} : OmitWithTag<T, keyof Base, Message>
+
+type FirstArg<T extends Function> = T extends (...args: [infer T, any]) => any ? unknown extends T ? any : T : never
+type SecondArg<T extends Function> = T extends (...args: [any, infer T]) => any ? unknown extends T ? any : T : never
+type MaybeField<T, K extends string> = T extends { [k in K]: infer G } ? G extends Function ? G : never : never
+
+type ParamCheck<T> = {
+  __tag__: string
+  __param_position__: string
+  __param_type__: T
+}
+
+function checkFields<_ extends { [k in keyof any]: never }>() {}
+
+// https://github.com/sindresorhus/type-fest
+type Numeric = number | bigint
+type Zero = 0 | 0n
+type Negative<T extends Numeric> = T extends Zero ? never : `${T}` extends `-${string}` ? T : never
+type NonNegative<T extends Numeric> = T extends Zero ? T : Negative<T> extends never ? T : '__invalid_negative_number__'

package/dist/.next/types/app/page.ts

@@ -1,4 +1,4 @@
-// File: /Users/karenredona/Desktop/d1studio/src/app/page.jsx
+// File: /Users/kona/Desktop/d1studio/src/app/page.jsx
 import * as entry from '../../../src/app/page.js'
 import type { ResolvingMetadata, ResolvingViewport } from 'next/dist/lib/metadata/types/metadata-interface.js'
 

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/update/route.js

@@ -0,0 +1,45 @@
+// app/api/update/route.js
+import { NextResponse } from 'next/server';
+import pkg from '../../../../package.json' assert { type: 'json' };
+
+export async function GET() {
+  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 });
+  }
+}