d1s 0.3.10 → 0.3.11

package/dist/app/api/schema/route.js

@@ -8,9 +8,9 @@ import { findWranglerConfig } from '@/lib/find-wrangler-config.js';
 
 const execAsync = promisify(exec);
 
-async function runPragma(databaseName, query, projectDir) {
+async function runPragma(databaseName, query, projectDir, source = 'local') {
   const { stdout } = await execAsync(
-    `wrangler d1 execute ${databaseName} --local --command="${query.replace(/"/g, '\\"')}" --json`,
+    `wrangler d1 execute ${databaseName} --${source} --command="${query.replace(/"/g, '\\"')}" --json`,
     { cwd: projectDir }
   );
   const result = JSON.parse(stdout);
@@ -21,10 +21,19 @@ export async function GET(request) {
   try {
     const { searchParams } = new URL(request.url);
     const dbParam = searchParams.get('db');
+    const sourceParam = searchParams.get('source');
+    const source = sourceParam === 'remote' ? 'remote' : 'local';
 
     const projectDir = process.env.D1_PROJECT_DIR;
     if (!projectDir) throw new Error('Project directory not configured');
 
+    if (source === 'remote' && process.env.D1_IS_PRO !== 'true') {
+      return NextResponse.json(
+        { success: false, error: 'Pro license required. Run: d1s --license YOUR-KEY' },
+        { status: 402 }
+      );
+    }
+
     const wranglerResult = await findWranglerConfig(projectDir);
     if (!wranglerResult?.config) throw new Error('No Wrangler configuration found');
     const config = wranglerResult.config;
@@ -40,19 +49,20 @@ export async function GET(request) {
     const tableRows = await runPragma(
       databaseName,
       `SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' AND name NOT LIKE '_cf_%' ORDER BY name;`,
-      projectDir
+      projectDir,
+      source
     );
     const tableNames = tableRows.map(r => r.name);
 
     // Run sequentially to avoid SQLITE_BUSY (database locked) errors
     const tables = [];
     for (const name of tableNames) {
-      const columns = await runPragma(databaseName, `PRAGMA table_info(${name});`, projectDir);
-      const foreignKeys = await runPragma(databaseName, `PRAGMA foreign_key_list(${name});`, projectDir);
+      const columns = await runPragma(databaseName, `PRAGMA table_info(${name});`, projectDir, source);
+      const foreignKeys = await runPragma(databaseName, `PRAGMA foreign_key_list(${name});`, projectDir, source);
       tables.push({ name, columns, foreignKeys });
     }
 
-    return NextResponse.json({ success: true, tables });
+    return NextResponse.json({ success: true, tables, source });
   } catch (error) {
     return NextResponse.json({ success: false, error: error.message }, { status: 500 });
   }

package/dist/app/api/tables/[name]/route.js

@@ -22,12 +22,14 @@ let isProcessing = false;
 /**
  * Executes a D1 SQL query, preferring direct SQLite access over the wrangler CLI.
  */
-async function executeD1Query(sql, projectDir, dbConfig) {
-  // Try direct SQLite access first (fast path)
-  const localOutput = executeLocalSQL(projectDir, dbConfig, sql);
-  if (localOutput !== null) {
-    const parsed = JSON.parse(localOutput);
-    return parsed[0]?.results || [];
+async function executeD1Query(sql, projectDir, dbConfig, source = 'local') {
+  if (source === 'local') {
+    // Try direct SQLite access first (fast path)
+    const localOutput = executeLocalSQL(projectDir, dbConfig, sql);
+    if (localOutput !== null) {
+      const parsed = JSON.parse(localOutput);
+      return parsed[0]?.results || [];
+    }
   }
 
   // Fall back to wrangler CLI
@@ -38,7 +40,7 @@ async function executeD1Query(sql, projectDir, dbConfig) {
     }
     isProcessing = true;
     const { stdout } = await execAsync(
-      `wrangler d1 execute ${databaseName} --local --command="${sql.replace(/"/g, '\\"')}" --json`,
+      `wrangler d1 execute ${databaseName} --${source} --command="${sql.replace(/"/g, '\\"')}" --json`,
       { cwd: projectDir }
     );
     const result = JSON.parse(stdout);
@@ -89,12 +91,21 @@ export async function GET(request, context) {
       const offset = (page - 1) * limit;
       const isExport = searchParams.get('export') === 'true';
       const dbParam = searchParams.get('db');
+      const sourceParam = searchParams.get('source');
+      const source = sourceParam === 'remote' ? 'remote' : 'local';
 
       const projectDir = process.env.D1_PROJECT_DIR;
       if (!projectDir) {
         throw new Error('Project directory not configured');
       }
 
+      if (source === 'remote' && process.env.D1_IS_PRO !== 'true') {
+        return NextResponse.json(
+          { success: false, error: { message: 'Pro license required. Run: d1s --license YOUR-KEY' } },
+          { status: 402 }
+        );
+      }
+
       // Use the centralized helper to find Wrangler configuration
       const wranglerResult = await findWranglerConfig(projectDir);
       if (!wranglerResult || !wranglerResult.config) {
@@ -116,11 +127,11 @@ export async function GET(request, context) {
       
       // Get table schema using PRAGMA query (PRAGMA is safe from injection when table name is sanitized)
       const schemaQuery = `PRAGMA table_info(${sanitizedTableName});`;
-      const schema = await executeD1Query(schemaQuery, projectDir, dbConfig);
+      const schema = await executeD1Query(schemaQuery, projectDir, dbConfig, source);
 
       // Get the CREATE TABLE statement from sqlite_master
       const createTableQuerySafe = `SELECT sql FROM sqlite_master WHERE type='table' AND name='${name.replace(/'/g, "''")}';`;
-      const tableDefinition = await executeD1Query(createTableQuerySafe, projectDir, dbConfig);
+      const tableDefinition = await executeD1Query(createTableQuerySafe, projectDir, dbConfig, source);
       const createTableSQL = tableDefinition[0]?.sql || '';
 
       // Extract CHECK constraints from the CREATE TABLE statement
@@ -134,7 +145,7 @@ export async function GET(request, context) {
 
       // Get total row count for the table (using sanitized table name)
       const countQuery = `SELECT COUNT(*) as total FROM ${sanitizedTableName};`;
-      const countResult = await executeD1Query(countQuery, projectDir, dbConfig);
+      const countResult = await executeD1Query(countQuery, projectDir, dbConfig, source);
       const totalRows = countResult[0]?.total || 0;
 
       // Fetch paginated data using the primary key column for ordering
@@ -152,7 +163,7 @@ export async function GET(request, context) {
         ORDER BY ${sanitizedPrimaryKey} DESC
         LIMIT ${safeLimitNum} OFFSET ${safeOffsetNum};
       `;
-      const data = await executeD1Query(dataQuery, projectDir, dbConfig);
+      const data = await executeD1Query(dataQuery, projectDir, dbConfig, source);
 
       if (isExport) trackEvent('export');
       return NextResponse.json({
@@ -160,6 +171,7 @@ export async function GET(request, context) {
         schema: enhancedSchema,
         data,
         meta: {
+          source,
           tableName: name,
           total: totalRows,
           page,
@@ -194,4 +206,3 @@ export async function OPTIONS() {
     },
   });
 }
-

package/dist/app/api/tables/route.js

@@ -82,6 +82,8 @@ export async function GET(request) {
   try {
     const { searchParams } = new URL(request.url);
     const dbParam = searchParams.get('db');
+    const sourceParam = searchParams.get('source');
+    const source = sourceParam === 'remote' ? 'remote' : 'local';
 
     const projectDir = process.env.D1_PROJECT_DIR;
 
@@ -93,6 +95,13 @@ export async function GET(request) {
       );
     }
 
+    if (source === 'remote' && process.env.D1_IS_PRO !== 'true') {
+      return NextResponse.json(
+        { error: 'Pro license required. Run: d1s --license YOUR-KEY' },
+        { status: 402 }
+      );
+    }
+
     // Use the centralized helper to get Wrangler configuration
     const wranglerResult = await findWranglerConfig(projectDir);
     if (!wranglerResult || !wranglerResult.config) {
@@ -127,16 +136,21 @@ export async function GET(request) {
       ORDER BY name;
     `;
 
-    // Try direct SQLite access first (fast), fall back to wrangler CLI
+    // For local mode, try direct SQLite access first (fast), then wrangler --local.
+    // For remote mode, always use wrangler --remote.
     let result;
-    const localOutput = executeLocalSQL(projectDir, dbConfig, query.trim());
-    if (localOutput !== null) {
-      result = JSON.parse(localOutput);
-    } else {
+    if (source === 'local') {
+      const localOutput = executeLocalSQL(projectDir, dbConfig, query.trim());
+      if (localOutput !== null) {
+        result = JSON.parse(localOutput);
+      }
+    }
+
+    if (!result) {
       const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx';
       const { stdout } = await retryWithTimeout(async () => {
         return execAsync(
-          `${npxCmd} wrangler d1 execute ${databaseName} --local --json --command="${query.trim().replace(/\n\s*/g, ' ')}"`,
+          `${npxCmd} wrangler d1 execute ${databaseName} --${source} --json --command="${query.trim().replace(/\n\s*/g, ' ')}"`,
           { cwd: projectDir, timeout: 10000 }
         );
       });
@@ -148,6 +162,7 @@ export async function GET(request) {
     return NextResponse.json({
       success: true,
       tables,
+      source,
       debug: {
         projectDir,
         tableCount: tables.length

package/dist/d1-studio.js

@@ -92,6 +92,7 @@ if (notifier.update) {
   const versionMessages = {
     '0.2.11': 'Fixed table toolbar and table view horizontal/vertical scroll issues',
     '0.3.0': 'Per-db migrations_dir, seed exclusion from push, sidebar UX improvements',
+    '0.3.11': 'Global Local/Remote source mode, remote table/schema browsing, and safer read-only remote editing UX',
   };
 
   // Create custom message

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "d1s",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "license": "UNLICENSED",
   "type": "module",
   "description": "The first native studio for Cloudflare D1. Zero setup. No extra dependencies.",
@@ -20,6 +20,10 @@
     "test": "node scripts/test.js",
     "test:api": "node tests/run-tests.mjs",
     "test:cli": "d1-studio --version",
+    "link:test:setup": "bash scripts/link-test.sh setup",
+    "link:test:run": "bash scripts/link-test.sh run",
+    "link:test:doctor": "bash scripts/link-test.sh doctor",
+    "link:test:clean": "bash scripts/link-test.sh clean",
     "test:all": "npm run test && npm run test:cli",
     "build:all": "npm run build:cli",
     "prepublishOnly": "npm run build:all"

package/dist/.next/static/chunks/823-5f8f96173644e0cc.js

@@ -1 +0,0 @@
-"use strict";(self.webpackChunk_N_E=self.webpackChunk_N_E||[]).push([[823],{1374:(e,t,a)=>{a.d(t,{dj:()=>d});var r=a(2115);let o=0,c=new Map,s=e=>{if(c.has(e))return;let t=setTimeout(()=>{c.delete(e),i({type:"REMOVE_TOAST",toastId:e})},1e6);c.set(e,t)},n=[],l={toasts:[]};function i(e){l=((e,t)=>{switch(t.type){case"ADD_TOAST":return{...e,toasts:[t.toast,...e.toasts].slice(0,1)};case"UPDATE_TOAST":return{...e,toasts:e.toasts.map(e=>e.id===t.toast.id?{...e,...t.toast}:e)};case"DISMISS_TOAST":{let{toastId:a}=t;return a?s(a):e.toasts.forEach(e=>{s(e.id)}),{...e,toasts:e.toasts.map(e=>e.id===a||void 0===a?{...e,open:!1}:e)}}case"REMOVE_TOAST":if(void 0===t.toastId)return{...e,toasts:[]};return{...e,toasts:e.toasts.filter(e=>e.id!==t.toastId)}}})(l,e),n.forEach(e=>{e(l)})}function u(e){let{...t}=e,a=(o=(o+1)%Number.MAX_SAFE_INTEGER).toString(),r=()=>i({type:"DISMISS_TOAST",toastId:a});return i({type:"ADD_TOAST",toast:{...t,id:a,open:!0,onOpenChange:e=>{e||r()}}}),{id:a,dismiss:r,update:e=>i({type:"UPDATE_TOAST",toast:{...e,id:a}})}}function d(){let[e,t]=r.useState(l);return r.useEffect(()=>(n.push(t),()=>{let e=n.indexOf(t);e>-1&&n.splice(e,1)}),[e]),{...e,toast:u,dismiss:e=>i({type:"DISMISS_TOAST",toastId:e})}}},3190:(e,t,a)=>{a.d(t,{DatabaseProvider:()=>u,t:()=>d});var r=a(5155),o=a(2115);let c=new Map;function s(e,t){let a=arguments.length>2&&void 0!==arguments[2]?arguments[2]:2e3,r=c.get(e);if(r&&Date.now()-r.timestamp<a)return r.promise;let o=t();return c.set(e,{promise:o,timestamp:Date.now()}),o.finally(()=>{setTimeout(()=>{c.delete(e)},a)}),o}let n=(0,o.createContext)(void 0);class l{get(e){let t=this.cache.get(e);return t||null}set(e,t,a,r){this.cache.set(e,{data:t,schema:a,meta:r,timestamp:Date.now()})}update(e,t,a,r){let o=this.cache.get(e);o&&this.cache.set(e,{data:t||o.data,schema:a||o.schema,meta:r||o.meta,timestamp:Date.now()})}invalidate(e){this.cache.delete(e)}clear(){this.cache.clear()}constructor(){this.cache=new Map}}class i{async add(e){return new Promise((t,a)=>{this.queue.push({operation:e,resolve:t,reject:a}),this.process()})}async process(){if(this.processing||0===this.queue.length)return;this.processing=!0;let{operation:e,resolve:t,reject:a}=this.queue.shift();try{let a=await e();t(a)}catch(e){a(e)}finally{this.processing=!1,this.process()}}constructor(){this.queue=[],this.processing=!1}}function u(e){let{children:t}=e,[a,c]=(0,o.useState)([]),[u,d]=(0,o.useState)(!0),[h,f]=(0,o.useState)(null),[g,p]=(0,o.useState)([]),[m,w]=(0,o.useState)(null);(0,o.useRef)(new i);let[y,b]=(0,o.useState)(null),S=(0,o.useRef)(new l).current,E=(0,o.useRef)(null),[v,T]=(0,o.useState)(null),C=(0,o.useCallback)(function(e,t){let a=arguments.length>2&&void 0!==arguments[2]?arguments[2]:null;T({type:e,message:t,detail:a,ts:new Date})},[]),[k,O]=(0,o.useState)(()=>localStorage.getItem("d1_last_sync")||null),_=(0,o.useCallback)(e=>{let t=e instanceof Date?e.toISOString():new Date().toISOString();localStorage.setItem("d1_last_sync",t),O(t)},[]),I=(0,o.useCallback)(function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:1,a=arguments.length>2&&void 0!==arguments[2]?arguments[2]:50,r="table-".concat(e,"-").concat(t,"-").concat(a);return S.get(r)},[]),P=(0,o.useCallback)(e=>{S.cache.forEach((t,a)=>{a.startsWith("table-".concat(e,"-"))&&S.invalidate(a)})},[]),D=(0,o.useCallback)(function(e,t,a,r){let o=arguments.length>4&&void 0!==arguments[4]?arguments[4]:1,c=arguments.length>5&&void 0!==arguments[5]?arguments[5]:50,s="table-".concat(e,"-").concat(o,"-").concat(c);S.update(s,t,a,r)},[]),A=(0,o.useCallback)(async e=>{let t=/^\s*(SELECT|PRAGMA|EXPLAIN)/i.test(e),a="query-".concat(e),r=async()=>{C("loading","Executing query…");try{var t,a;let r=null==(t=E.current)?void 0:t.database_name,o=await fetch("/api/query",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({query:e,...r&&{db:r}})});if(!o.ok){let e="Failed to execute query";try{let t=await o.json();e=(null==t||null==(a=t.error)?void 0:a.message)||e}catch(e){}throw Error(e)}let c=await o.json();if(!c.success)throw Error(c.error||"Query execution failed");return C("success","Query executed"),c}catch(e){throw C("error",e.message||"Query failed"),e||Error("An unknown error occurred")}};return t?s(a,r,1e3):r()},[C]),j=(0,o.useCallback)(async e=>{try{let t=await fetch("/api/tables/".concat(e)),a=await t.json();if(!t.ok||!a.success)throw Error(a.error||"Failed to fetch table schema");return a.schema||[]}catch(e){throw console.error("Schema fetch error:",e),e}},[]),F=(0,o.useCallback)(async function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},{forceFetch:a=!1,page:r=1,limit:o=50}=t,c="table-".concat(e,"-").concat(r,"-").concat(o);if(!a){let e=S.get(c);if(e)return e}return s("table-".concat(e,"-").concat(r,"-").concat(o),async()=>{C("loading","Loading ".concat(e,"…"));try{var t,a;let s=null==(t=E.current)?void 0:t.database_name,n=s?"&db=".concat(encodeURIComponent(s)):"",l=await fetch("/api/tables/".concat(e,"?page=").concat(r,"&limit=").concat(o).concat(n),{headers:{"Cache-Control":"no-cache",Pragma:"no-cache"}});if(!l.ok)throw Error("Failed to fetch table data");let i=await l.json();if(!i.success)throw Error(i.error||"Failed to fetch table data");S.set(c,i.data,i.schema,i.meta);let u=(null==(a=i.data)?void 0:a.length)||0;return C("success","Loaded ".concat(u," row").concat(1!==u?"s":""," \xb7 ").concat(e)),i}catch(t){throw console.error("Error fetching table data:",t),C("error",t.message,"Failed loading ".concat(e)),t}},1e3)},[C]),M=(0,o.useCallback)(async e=>{C("loading","Refreshing ".concat(e,"…"));try{return S.cache.forEach((t,a)=>{a.startsWith("table-".concat(e,"-"))&&S.invalidate(a)}),await F(e,{forceFetch:!0})}catch(t){throw console.error("Error updating table data:",t),C("error",t.message,"Failed refreshing ".concat(e)),t}},[F,C]),N=(0,o.useCallback)(async function(e){let t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return b(e),await F(e,t)},[F]),R=(0,o.useCallback)(async()=>{var e;let t=(null==(e=E.current)?void 0:e.database_name)||"default";return s("refresh-tables-".concat(t),async()=>{C("loading","Loading tables…"),d(!0),f(null);try{var e;let t=null==(e=E.current)?void 0:e.database_name,a=t?"?db=".concat(encodeURIComponent(t)):"",r=await fetch("/api/tables".concat(a));if(!r.ok)throw Error("Failed to fetch tables");let o=await r.json();if(o.error)throw Error(o.error);let s=o.tables||[];return c(s),C("success","".concat(s.length," table").concat(1!==s.length?"s":""," loaded")),s}catch(e){throw f(e.message),C("error",e.message,"Failed loading tables"),e}finally{d(!1)}},2e3)},[C]),q=(0,o.useCallback)(async e=>{C("loading","Creating table…");try{await A(e),S.clear(),await R(),C("success","Table created")}catch(e){throw C("error",e.message,"Create table failed"),Error("Failed to create table: ".concat(e.message))}},[A,R,C]),x=(0,o.useCallback)(async e=>{C("loading",'Dropping "'.concat(e,'"…'));try{await A("DROP TABLE ".concat(e,";")),S.invalidate(e),await R(),C("success",'Table "'.concat(e,'" dropped'))}catch(t){throw C("error",t.message,'Drop "'.concat(e,'" failed')),Error("Failed to drop table: ".concat(t.message))}},[A,R,C]),L=(0,o.useCallback)(async e=>{C("loading","Syncing migrations…");try{let a=await fetch("/api/migrations/sync",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify(e)});if(!a.ok){var t;let e=await a.json();throw Error((null==(t=e.error)?void 0:t.message)||"Failed to sync migrations")}let r=await a.json();return C("success","Migrations synced"),r}catch(e){throw console.error("Error syncing migrations:",e),C("error",e.message,"Migration sync failed"),e}},[C]),J=(0,o.useCallback)(async()=>{C("loading","Pulling from remote…");try{var e,t,a,r;let o=localStorage.getItem("cf_credentials");if(!o)throw Error("No Cloudflare credentials found. Please connect to Cloudflare first.");let c=JSON.parse(o);if(!c.accountId||!c.apiToken)throw Error("Invalid credentials stored. Please reconnect to Cloudflare.");let s=await fetch("/api/pull-remote/confirm",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({accountId:c.accountId,apiToken:c.apiToken})}),n=await s.json();if(!s.ok||!n.success)throw Error((null==(a=n.error)?void 0:a.message)||"Failed to pull from remote");S.clear(),await R();let l=null!=(r=null==(t=n.details)||null==(e=t.appliedMigrations)?void 0:e.length)?r:0;return C("success","Pull complete — ".concat(l," migration").concat(1!==l?"s":""," applied")),n}catch(e){throw console.error("Error pulling from remote:",e),C("error",e.message,"Pull from remote failed"),e}},[R,C]),Q=(0,o.useCallback)(async e=>{C("loading","Pushing to remote…");try{var t,a;let r=await fetch("/api/push-remote/confirm",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify(e)}),o=await r.json();if(!r.ok)throw Error((null==(t=o.error)?void 0:t.message)||"Failed to push to remote");let c=null!=(a=o.applied)?a:0;return C("success","Push complete — ".concat(c," migration").concat(1!==c?"s":""," applied")),o}catch(e){throw console.error("Error pushing to remote:",e),C("error",e.message,"Push to remote failed"),e}},[C]),U=(0,o.useCallback)(async e=>{let t=g.find(t=>t.database_name===e);t&&(E.current=t,w(t),S.clear(),c([]),b(null),await R())},[g,R]);(0,o.useEffect)(()=>((async()=>{try{let e=await fetch("/api/databases");if(e.ok){let t=(await e.json()).databases||[];p(t),t.length>0&&!E.current&&(E.current=t[0],w(t[0]))}}catch(e){}R()})(),()=>{S.clear()}),[R]);let G=(0,o.useMemo)(()=>({tables:a,databases:g,currentDatabase:m,switchDatabase:U,isLoading:u,error:h,activeTable:y,lastStatus:v,setOperationStatus:C,lastSyncTime:k,setLastSyncTime:_,refreshTables:R,executeQuery:A,fetchTableSchema:j,fetchTableData:F,updateTableData:M,createTable:q,dropTable:x,syncMigrations:L,pullFromRemote:J,pushToRemote:Q,getCachedTable:I,updateTableCache:D,invalidateTable:P,switchTable:N}),[a,g,m,U,u,h,y,v,C,k,_,R,A,j,F,M,q,x,L,J,Q,I,D,P,N]);return(0,r.jsx)(n.Provider,{value:G,children:t})}function d(){let e=(0,o.useContext)(n);if(!e)throw Error("useDatabase must be used within a DatabaseProvider");return e}},3537:(e,t,a)=>{a.d(t,{cn:()=>c});var r=a(2821),o=a(5889);function c(){for(var e=arguments.length,t=Array(e),a=0;a<e;a++)t[a]=arguments[a];return(0,o.QP)((0,r.$)(t))}}}]);