@egdesk/next-api-plugin 1.0.0 → 1.2.0

package/dist/generate-api-wrapper.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Generate API wrapper for handling basePath in client-side fetch calls
+ *
+ * Creates src/lib/api.ts that automatically prepends NEXT_PUBLIC_EGDESK_BASE_PATH
+ * to relative URLs, solving the Next.js basePath limitation with client-side fetch.
+ */
+/**
+ * Generate src/lib/api.ts file for basePath-aware fetch wrapper
+ */
+export declare function generateApiWrapper(projectPath: string): void;

package/dist/generate-api-wrapper.js

@@ -0,0 +1,118 @@
+"use strict";
+/**
+ * Generate API wrapper for handling basePath in client-side fetch calls
+ *
+ * Creates src/lib/api.ts that automatically prepends NEXT_PUBLIC_EGDESK_BASE_PATH
+ * to relative URLs, solving the Next.js basePath limitation with client-side fetch.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateApiWrapper = generateApiWrapper;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const os = __importStar(require("os"));
+/**
+ * Detect if project uses src/ directory structure
+ */
+function usesSrcDirectory(projectPath) {
+    const srcPath = path.join(projectPath, 'src');
+    const srcAppPath = path.join(projectPath, 'src', 'app');
+    return fs.existsSync(srcPath) && fs.existsSync(srcAppPath);
+}
+/**
+ * Ensure lib directory exists
+ */
+function ensureLibDirectory(projectPath) {
+    const hasSrc = usesSrcDirectory(projectPath);
+    const libDir = hasSrc
+        ? path.join(projectPath, 'src', 'lib')
+        : path.join(projectPath, 'lib');
+    if (!fs.existsSync(libDir)) {
+        fs.mkdirSync(libDir, { recursive: true });
+        console.log(`📁 Created directory: ${libDir}`);
+    }
+    return libDir;
+}
+/**
+ * Generate src/lib/api.ts file for basePath-aware fetch wrapper
+ */
+function generateApiWrapper(projectPath) {
+    const libDir = ensureLibDirectory(projectPath);
+    const apiPath = path.join(libDir, 'api.ts');
+    console.log(`📝 Generating API wrapper at: ${apiPath}`);
+    // Check if api.ts already exists
+    if (fs.existsSync(apiPath)) {
+        console.log('⚠️  api.ts already exists - backing up to api.backup.ts');
+        const backupPath = path.join(libDir, 'api.backup.ts');
+        fs.copyFileSync(apiPath, backupPath);
+    }
+    const apiContent = `/**
+ * API Fetch Wrapper for EGDesk Tunneling
+ *
+ * This wrapper automatically prepends NEXT_PUBLIC_EGDESK_BASE_PATH to relative URLs.
+ * This is necessary because Next.js basePath does NOT automatically apply to
+ * client-side fetch() calls - it's a known limitation.
+ *
+ * Generated by @egdesk/next-api-plugin
+ */
+
+const basePath = process.env.NEXT_PUBLIC_EGDESK_BASE_PATH || '';
+
+/**
+ * Fetch wrapper that handles basePath for tunneled environments
+ *
+ * @example
+ * // ❌ Wrong - will return 404 in tunneled environment
+ * fetch('/api/transactions')
+ *
+ * @example
+ * // ✅ Correct - automatically prepends basePath
+ * apiFetch('/api/transactions')
+ *
+ * @param path - The API path (e.g., '/api/transactions')
+ * @param options - Standard fetch options
+ */
+export async function apiFetch(path: string, options?: RequestInit): Promise<Response> {
+  // Automatically prepend basePath to relative URLs
+  const url = path.startsWith('/') && !path.startsWith('//')
+    ? \`\${basePath}\${path}\`
+    : path;
+
+  return fetch(url, options);
+}
+`;
+    fs.writeFileSync(apiPath, apiContent.replace(/\r?\n/g, os.EOL), 'utf-8');
+    console.log(`✅ Generated ${apiPath}`);
+}

package/dist/generate-helpers.js

@@ -41,41 +41,67 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateHelpers = generateHelpers;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const os = __importStar(require("os"));
 /**
  * Generate egdesk-helpers.ts file
  */
 function generateHelpers(projectPath) {
     const helperPath = path.join(projectPath, 'egdesk-helpers.ts');
     const helperContent = `/**
- * EGDesk User Data Helper Functions for Next.js
+ * EGDesk Helper Functions for Next.js
  *
- * Type-safe helpers for accessing EGDesk user data.
+ * Type-safe helpers for accessing EGDesk user data and FinanceHub.
  * Works in both client and server components.
  *
  * Generated by @egdesk/next-api-plugin
  */
 
+import { EGDESK_CONFIG } from './egdesk.config';
+
 /**
  * Call EGDesk user-data MCP tool
  *
- * Uses a proxy endpoint to work in both local and tunneled environments.
- * The Next.js middleware intercepts these requests and forwards them to localhost:8080.
+ * - Server (API routes): Calls Egdesk API directly using EGDESK_CONFIG.apiUrl and
+ *   EGDESK_CONFIG.apiKey (from env NEXT_PUBLIC_EGDESK_API_URL / NEXT_PUBLIC_EGDESK_API_KEY)
+ *   so relative URLs and tunnel base path are not an issue.
+ * - Client (browser): Uses /__user_data_proxy so CORS and tunnel base path still work.
  */
 export async function callUserDataTool(
   toolName: string,
   args: Record<string, any> = {}
 ): Promise<any> {
+  const body = JSON.stringify({ tool: toolName, arguments: args });
   const headers: Record<string, string> = {
     'Content-Type': 'application/json'
   };
 
-  // Use proxy endpoint - works in both local and tunneled environments
-  // Absolute URL with leading slash to ensure correct resolution from any route
-  const response = await fetch('/__user_data_proxy', {
-    method: 'POST',
-    headers,
-    body: JSON.stringify({ tool: toolName, arguments: args })
-  });
+  const isServer = typeof window === 'undefined';
+
+  let response: Response;
+  if (isServer) {
+    // API routes: call Egdesk directly (relative URL is invalid in Node)
+    const apiUrl =
+      (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_EGDESK_API_URL) ||
+      EGDESK_CONFIG.apiUrl;
+    const apiKey =
+      (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_EGDESK_API_KEY) ||
+      EGDESK_CONFIG.apiKey;
+    if (apiKey) {
+      headers['X-Api-Key'] = apiKey;
+    }
+    response = await fetch(\`\${apiUrl}/user-data/tools/call\`, {
+      method: 'POST',
+      headers,
+      body
+    });
+  } else {
+    // Browser: use proxy for CORS and tunnel base path
+    response = await fetch('/__user_data_proxy', {
+      method: 'POST',
+      headers,
+      body
+    });
+  }
 
   if (!response.ok) {
     throw new Error(\`HTTP \${response.status}: \${response.statusText}\`);
@@ -147,7 +173,7 @@ export async function aggregateTable(
 }
 
 /**
- * Execute raw SQL query
+ * Execute raw SQL query (read-only, SELECT only)
  */
 export async function executeSQL(query: string) {
   return callUserDataTool('user_data_sql_query', { query });
@@ -166,7 +192,254 @@ export async function listTables() {
 export async function getTableSchema(tableName: string) {
   return callUserDataTool('user_data_get_schema', { tableName });
 }
+
+/**
+ * Create a new table
+ */
+export async function createTable(
+  displayName: string,
+  schema: Array<{
+    name: string;
+    type: 'TEXT' | 'INTEGER' | 'REAL' | 'DATE';
+    notNull?: boolean;
+    defaultValue?: any;
+  }>,
+  options?: {
+    description?: string;
+    tableName?: string;
+    uniqueKeyColumns?: string[];
+    duplicateAction?: 'skip' | 'update' | 'allow' | 'replace-date-range';
+  }
+) {
+  return callUserDataTool('user_data_create_table', {
+    displayName,
+    schema,
+    ...options
+  });
+}
+
+/**
+ * Insert rows into a table
+ */
+export async function insertRows(
+  tableName: string,
+  rows: Array<Record<string, any>>
+) {
+  return callUserDataTool('user_data_insert_rows', {
+    tableName,
+    rows
+  });
+}
+
+/**
+ * Update rows in a table
+ */
+export async function updateRows(
+  tableName: string,
+  updates: Record<string, any>,
+  options: {
+    ids?: number[];
+    filters?: Record<string, string>;
+  }
+) {
+  return callUserDataTool('user_data_update_rows', {
+    tableName,
+    updates,
+    ...options
+  });
+}
+
+/**
+ * Delete rows from a table
+ */
+export async function deleteRows(
+  tableName: string,
+  options: {
+    ids?: number[];
+    filters?: Record<string, string>;
+  }
+) {
+  return callUserDataTool('user_data_delete_rows', {
+    tableName,
+    ...options
+  });
+}
+
+/**
+ * Delete a table
+ */
+export async function deleteTable(tableName: string) {
+  return callUserDataTool('user_data_delete_table', { tableName });
+}
+
+/**
+ * Rename a table
+ */
+export async function renameTable(
+  tableName: string,
+  newTableName: string,
+  newDisplayName?: string
+) {
+  return callUserDataTool('user_data_rename_table', {
+    tableName,
+    newTableName,
+    newDisplayName
+  });
+}
+
+// ==========================================
+// FINANCEHUB HELPERS
+// ==========================================
+
+/**
+ * Call EGDesk FinanceHub MCP tool
+ */
+export async function callFinanceHubTool(
+  toolName: string,
+  args: Record<string, any> = {}
+): Promise<any> {
+  const body = JSON.stringify({ tool: toolName, args });
+  const headers: Record<string, string> = {
+    'Content-Type': 'application/json'
+  };
+
+  const isServer = typeof window === 'undefined';
+
+  let response: Response;
+  if (isServer) {
+    const apiUrl =
+      (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_EGDESK_API_URL) ||
+      EGDESK_CONFIG.apiUrl;
+    const apiKey =
+      (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_EGDESK_API_KEY) ||
+      EGDESK_CONFIG.apiKey;
+    if (apiKey) {
+      headers['X-Api-Key'] = apiKey;
+    }
+    response = await fetch(\`\${apiUrl}/financehub/tools/call\`, {
+      method: 'POST',
+      headers,
+      body
+    });
+  } else {
+    response = await fetch('/__financehub_proxy', {
+      method: 'POST',
+      headers,
+      body
+    });
+  }
+
+  if (!response.ok) {
+    throw new Error(\`HTTP \${response.status}: \${response.statusText}\`);
+  }
+
+  const result = await response.json();
+
+  if (!result.success) {
+    throw new Error(result.error || 'Tool call failed');
+  }
+
+  const content = result.result?.content?.[0]?.text;
+  return content ? JSON.parse(content) : null;
+}
+
+/**
+ * List all registered banks and card companies
+ */
+export async function listBanks() {
+  return callFinanceHubTool('financehub_list_banks', {});
+}
+
+/**
+ * List bank accounts with balances
+ */
+export async function listAccounts(options: {
+  bankId?: string;
+  isActive?: boolean;
+} = {}) {
+  return callFinanceHubTool('financehub_list_accounts', options);
+}
+
+/**
+ * Query bank transactions
+ */
+export async function queryBankTransactions(options: {
+  accountId?: string;
+  bankId?: string;
+  startDate?: string;
+  endDate?: string;
+  category?: string;
+  minAmount?: number;
+  maxAmount?: number;
+  searchText?: string;
+  limit?: number;
+  offset?: number;
+  orderBy?: 'date' | 'amount' | 'balance';
+  orderDir?: 'asc' | 'desc';
+} = {}) {
+  return callFinanceHubTool('financehub_query_transactions', options);
+}
+
+/**
+ * Query card transactions (NEW)
+ */
+export async function queryCardTransactions(options: {
+  accountId?: string;
+  cardCompanyId?: string;
+  cardNumber?: string;
+  merchantName?: string;
+  startDate?: string;
+  endDate?: string;
+  category?: string;
+  minAmount?: number;
+  maxAmount?: number;
+  includeCancelled?: boolean;
+  limit?: number;
+  offset?: number;
+  orderBy?: 'date' | 'amount';
+  orderDir?: 'asc' | 'desc';
+} = {}) {
+  return callFinanceHubTool('financehub_query_card_transactions', options);
+}
+
+/**
+ * Get transaction statistics
+ */
+export async function getTransactionStats(options: {
+  accountId?: string;
+  bankId?: string;
+  startDate?: string;
+  endDate?: string;
+} = {}) {
+  return callFinanceHubTool('financehub_get_statistics', options);
+}
+
+/**
+ * Get monthly breakdown of deposits/withdrawals
+ */
+export async function getMonthlySummary(options: {
+  accountId?: string;
+  bankId?: string;
+  year?: number;
+  months?: number;
+} = {}) {
+  return callFinanceHubTool('financehub_get_monthly_summary', options);
+}
+
+/**
+ * Get overall stats (banks, accounts, transactions, balances)
+ */
+export async function getOverallStats() {
+  return callFinanceHubTool('financehub_get_overall_stats', {});
+}
+
+/**
+ * Get sync operation history
+ */
+export async function getSyncHistory(limit: number = 50) {
+  return callFinanceHubTool('financehub_get_sync_history', { limit });
+}
 `;
-    fs.writeFileSync(helperPath, helperContent, 'utf-8');
+    fs.writeFileSync(helperPath, helperContent.replace(/\r?\n/g, os.EOL), 'utf-8');
     console.log(`✅ Generated ${helperPath}`);
 }

package/dist/generate-middleware.js

@@ -42,6 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateMiddleware = generateMiddleware;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const os = __importStar(require("os"));
 /**
  * Detect if project uses src/ directory structure
  */
@@ -132,6 +133,6 @@ export const config = {
   ],
 };
 `;
-    fs.writeFileSync(middlewarePath, middlewareContent, 'utf-8');
+    fs.writeFileSync(middlewarePath, middlewareContent.replace(/\r?\n/g, os.EOL), 'utf-8');
     console.log(`✅ Generated ${middlewarePath}`);
 }

package/dist/generate-proxy.js

@@ -44,6 +44,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateProxy = generateProxy;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const os = __importStar(require("os"));
 /**
  * Detect if project uses src/ directory structure
  */
@@ -131,6 +132,6 @@ export const config = {
   ],
 };
 `;
-    fs.writeFileSync(proxyPath, proxyContent, 'utf-8');
+    fs.writeFileSync(proxyPath, proxyContent.replace(/\r?\n/g, os.EOL), 'utf-8');
     console.log(`✅ Generated ${proxyPath}`);
 }

package/dist/index.d.ts

@@ -24,3 +24,4 @@ export { discoverTables } from './setup-userdata';
 export { generateMiddleware } from './generate-middleware';
 export { generateProxy } from './generate-proxy';
 export { generateHelpers } from './generate-helpers';
+export { generateApiWrapper } from './generate-api-wrapper';

package/dist/index.js

@@ -6,12 +6,13 @@
  * Provides middleware-based database access for Next.js applications.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateHelpers = exports.generateProxy = exports.generateMiddleware = exports.discoverTables = void 0;
+exports.generateApiWrapper = exports.generateHelpers = exports.generateProxy = exports.generateMiddleware = exports.discoverTables = void 0;
 exports.setupNextApiPlugin = setupNextApiPlugin;
 const setup_userdata_1 = require("./setup-userdata");
 const generate_middleware_1 = require("./generate-middleware");
 const generate_proxy_1 = require("./generate-proxy");
 const generate_helpers_1 = require("./generate-helpers");
+const generate_api_wrapper_1 = require("./generate-api-wrapper");
 /**
  * Main setup function for Next.js projects
  *
@@ -57,6 +58,7 @@ async function setupNextApiPlugin(projectPath, options = {}) {
         }
         (0, setup_userdata_1.generateConfigFile)(projectPath, config);
         (0, generate_helpers_1.generateHelpers)(projectPath);
+        (0, generate_api_wrapper_1.generateApiWrapper)(projectPath);
         (0, setup_userdata_1.updateEnvLocal)(projectPath, config);
         const proxyFile = useProxy ? 'proxy.ts' : 'middleware.ts';
         console.log('');
@@ -64,6 +66,7 @@ async function setupNextApiPlugin(projectPath, options = {}) {
         console.log(`   - ${proxyFile} (database proxy)`);
         console.log('   - egdesk.config.ts (type-safe config)');
         console.log('   - egdesk-helpers.ts (helper functions)');
+        console.log('   - src/lib/api.ts (basePath-aware fetch wrapper)');
         console.log('   - .env.local (environment variables)');
         console.log('');
         console.log('📝 Next steps:');
@@ -72,9 +75,14 @@ async function setupNextApiPlugin(projectPath, options = {}) {
         console.log('   3. Import and use helpers in your components:');
         console.log('      import { queryTable } from "./egdesk-helpers"');
         console.log('      import { TABLES } from "./egdesk.config"');
+        console.log('      import { apiFetch } from "@/lib/api"');
         console.log('');
-        console.log('Example usage in a component:');
+        console.log('Example usage:');
+        console.log('   // Database queries');
         console.log('   const data = await queryTable(TABLES.table1.name, { limit: 10 });');
+        console.log('   ');
+        console.log('   // API routes (use apiFetch for basePath support)');
+        console.log('   const response = await apiFetch("/api/transactions");');
     }
     catch (error) {
         console.error('❌ Setup failed:', error);
@@ -89,3 +97,5 @@ var generate_proxy_2 = require("./generate-proxy");
 Object.defineProperty(exports, "generateProxy", { enumerable: true, get: function () { return generate_proxy_2.generateProxy; } });
 var generate_helpers_2 = require("./generate-helpers");
 Object.defineProperty(exports, "generateHelpers", { enumerable: true, get: function () { return generate_helpers_2.generateHelpers; } });
+var generate_api_wrapper_2 = require("./generate-api-wrapper");
+Object.defineProperty(exports, "generateApiWrapper", { enumerable: true, get: function () { return generate_api_wrapper_2.generateApiWrapper; } });

package/dist/setup-userdata.js

@@ -45,6 +45,7 @@ exports.updateEnvLocal = updateEnvLocal;
 exports.generateConfigFile = generateConfigFile;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const os = __importStar(require("os"));
 /**
  * Fetch available tables from EGDesk
  */
@@ -165,7 +166,7 @@ function updateEnvLocal(projectPath, config) {
         ...config.tables.map((table, index) => `# ${index + 1}. ${table.displayName} (${table.tableName}) - ${table.rowCount} rows, ${table.columnCount} columns`),
         ''
     ].join('\n');
-    fs.writeFileSync(envPath, envContent, 'utf-8');
+    fs.writeFileSync(envPath, envContent.replace(/\r?\n/g, os.EOL), 'utf-8');
     console.log(`✅ Updated ${envPath}`);
 }
 /**
@@ -220,6 +221,6 @@ export const TABLE_NAMES = {
 ${config.tables.map((table, index) => `  table${index + 1}: '${table.tableName}'`).join(',\n')}
 } as const;
 `;
-    fs.writeFileSync(configPath, configContent, 'utf-8');
+    fs.writeFileSync(configPath, configContent.replace(/\r?\n/g, os.EOL), 'utf-8');
     console.log(`✅ Generated ${configPath}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@egdesk/next-api-plugin",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Next.js plugin for EGDesk database proxy integration",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/generate-api-wrapper.ts

@@ -0,0 +1,92 @@
+/**
+ * Generate API wrapper for handling basePath in client-side fetch calls
+ *
+ * Creates src/lib/api.ts that automatically prepends NEXT_PUBLIC_EGDESK_BASE_PATH
+ * to relative URLs, solving the Next.js basePath limitation with client-side fetch.
+ */
+
+import * as fs from 'fs';
+import * as path from 'path';
+import * as os from 'os';
+
+/**
+ * Detect if project uses src/ directory structure
+ */
+function usesSrcDirectory(projectPath: string): boolean {
+  const srcPath = path.join(projectPath, 'src');
+  const srcAppPath = path.join(projectPath, 'src', 'app');
+  return fs.existsSync(srcPath) && fs.existsSync(srcAppPath);
+}
+
+/**
+ * Ensure lib directory exists
+ */
+function ensureLibDirectory(projectPath: string): string {
+  const hasSrc = usesSrcDirectory(projectPath);
+  const libDir = hasSrc
+    ? path.join(projectPath, 'src', 'lib')
+    : path.join(projectPath, 'lib');
+
+  if (!fs.existsSync(libDir)) {
+    fs.mkdirSync(libDir, { recursive: true });
+    console.log(`📁 Created directory: ${libDir}`);
+  }
+
+  return libDir;
+}
+
+/**
+ * Generate src/lib/api.ts file for basePath-aware fetch wrapper
+ */
+export function generateApiWrapper(projectPath: string): void {
+  const libDir = ensureLibDirectory(projectPath);
+  const apiPath = path.join(libDir, 'api.ts');
+
+  console.log(`📝 Generating API wrapper at: ${apiPath}`);
+
+  // Check if api.ts already exists
+  if (fs.existsSync(apiPath)) {
+    console.log('⚠️  api.ts already exists - backing up to api.backup.ts');
+    const backupPath = path.join(libDir, 'api.backup.ts');
+    fs.copyFileSync(apiPath, backupPath);
+  }
+
+  const apiContent = `/**
+ * API Fetch Wrapper for EGDesk Tunneling
+ *
+ * This wrapper automatically prepends NEXT_PUBLIC_EGDESK_BASE_PATH to relative URLs.
+ * This is necessary because Next.js basePath does NOT automatically apply to
+ * client-side fetch() calls - it's a known limitation.
+ *
+ * Generated by @egdesk/next-api-plugin
+ */
+
+const basePath = process.env.NEXT_PUBLIC_EGDESK_BASE_PATH || '';
+
+/**
+ * Fetch wrapper that handles basePath for tunneled environments
+ *
+ * @example
+ * // ❌ Wrong - will return 404 in tunneled environment
+ * fetch('/api/transactions')
+ *
+ * @example
+ * // ✅ Correct - automatically prepends basePath
+ * apiFetch('/api/transactions')
+ *
+ * @param path - The API path (e.g., '/api/transactions')
+ * @param options - Standard fetch options
+ */
+export async function apiFetch(path: string, options?: RequestInit): Promise<Response> {
+  // Automatically prepend basePath to relative URLs
+  const url = path.startsWith('/') && !path.startsWith('//')
+    ? \`\${basePath}\${path}\`
+    : path;
+
+  return fetch(url, options);
+}
+`;
+
+  fs.writeFileSync(apiPath, apiContent.replace(/\r?\n/g, os.EOL), 'utf-8');
+  console.log(`✅ Generated ${apiPath}`);
+}

package/src/generate-helpers.ts

@@ -6,6 +6,7 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
+import * as os from 'os';
 
 /**
  * Generate egdesk-helpers.ts file
@@ -14,35 +15,60 @@ export function generateHelpers(projectPath: string): void {
   const helperPath = path.join(projectPath, 'egdesk-helpers.ts');
 
   const helperContent = `/**
- * EGDesk User Data Helper Functions for Next.js
+ * EGDesk Helper Functions for Next.js
  *
- * Type-safe helpers for accessing EGDesk user data.
+ * Type-safe helpers for accessing EGDesk user data and FinanceHub.
  * Works in both client and server components.
  *
  * Generated by @egdesk/next-api-plugin
  */
 
+import { EGDESK_CONFIG } from './egdesk.config';
+
 /**
  * Call EGDesk user-data MCP tool
  *
- * Uses a proxy endpoint to work in both local and tunneled environments.
- * The Next.js middleware intercepts these requests and forwards them to localhost:8080.
+ * - Server (API routes): Calls Egdesk API directly using EGDESK_CONFIG.apiUrl and
+ *   EGDESK_CONFIG.apiKey (from env NEXT_PUBLIC_EGDESK_API_URL / NEXT_PUBLIC_EGDESK_API_KEY)
+ *   so relative URLs and tunnel base path are not an issue.
+ * - Client (browser): Uses /__user_data_proxy so CORS and tunnel base path still work.
  */
 export async function callUserDataTool(
   toolName: string,
   args: Record<string, any> = {}
 ): Promise<any> {
+  const body = JSON.stringify({ tool: toolName, arguments: args });
   const headers: Record<string, string> = {
     'Content-Type': 'application/json'
   };
 
-  // Use proxy endpoint - works in both local and tunneled environments
-  // Absolute URL with leading slash to ensure correct resolution from any route
-  const response = await fetch('/__user_data_proxy', {
-    method: 'POST',
-    headers,
-    body: JSON.stringify({ tool: toolName, arguments: args })
-  });
+  const isServer = typeof window === 'undefined';
+
+  let response: Response;
+  if (isServer) {
+    // API routes: call Egdesk directly (relative URL is invalid in Node)
+    const apiUrl =
+      (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_EGDESK_API_URL) ||
+      EGDESK_CONFIG.apiUrl;
+    const apiKey =
+      (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_EGDESK_API_KEY) ||
+      EGDESK_CONFIG.apiKey;
+    if (apiKey) {
+      headers['X-Api-Key'] = apiKey;
+    }
+    response = await fetch(\`\${apiUrl}/user-data/tools/call\`, {
+      method: 'POST',
+      headers,
+      body
+    });
+  } else {
+    // Browser: use proxy for CORS and tunnel base path
+    response = await fetch('/__user_data_proxy', {
+      method: 'POST',
+      headers,
+      body
+    });
+  }
 
   if (!response.ok) {
     throw new Error(\`HTTP \${response.status}: \${response.statusText}\`);
@@ -114,7 +140,7 @@ export async function aggregateTable(
 }
 
 /**
- * Execute raw SQL query
+ * Execute raw SQL query (read-only, SELECT only)
  */
 export async function executeSQL(query: string) {
   return callUserDataTool('user_data_sql_query', { query });
@@ -133,8 +159,255 @@ export async function listTables() {
 export async function getTableSchema(tableName: string) {
   return callUserDataTool('user_data_get_schema', { tableName });
 }
+
+/**
+ * Create a new table
+ */
+export async function createTable(
+  displayName: string,
+  schema: Array<{
+    name: string;
+    type: 'TEXT' | 'INTEGER' | 'REAL' | 'DATE';
+    notNull?: boolean;
+    defaultValue?: any;
+  }>,
+  options?: {
+    description?: string;
+    tableName?: string;
+    uniqueKeyColumns?: string[];
+    duplicateAction?: 'skip' | 'update' | 'allow' | 'replace-date-range';
+  }
+) {
+  return callUserDataTool('user_data_create_table', {
+    displayName,
+    schema,
+    ...options
+  });
+}
+
+/**
+ * Insert rows into a table
+ */
+export async function insertRows(
+  tableName: string,
+  rows: Array<Record<string, any>>
+) {
+  return callUserDataTool('user_data_insert_rows', {
+    tableName,
+    rows
+  });
+}
+
+/**
+ * Update rows in a table
+ */
+export async function updateRows(
+  tableName: string,
+  updates: Record<string, any>,
+  options: {
+    ids?: number[];
+    filters?: Record<string, string>;
+  }
+) {
+  return callUserDataTool('user_data_update_rows', {
+    tableName,
+    updates,
+    ...options
+  });
+}
+
+/**
+ * Delete rows from a table
+ */
+export async function deleteRows(
+  tableName: string,
+  options: {
+    ids?: number[];
+    filters?: Record<string, string>;
+  }
+) {
+  return callUserDataTool('user_data_delete_rows', {
+    tableName,
+    ...options
+  });
+}
+
+/**
+ * Delete a table
+ */
+export async function deleteTable(tableName: string) {
+  return callUserDataTool('user_data_delete_table', { tableName });
+}
+
+/**
+ * Rename a table
+ */
+export async function renameTable(
+  tableName: string,
+  newTableName: string,
+  newDisplayName?: string
+) {
+  return callUserDataTool('user_data_rename_table', {
+    tableName,
+    newTableName,
+    newDisplayName
+  });
+}
+
+// ==========================================
+// FINANCEHUB HELPERS
+// ==========================================
+
+/**
+ * Call EGDesk FinanceHub MCP tool
+ */
+export async function callFinanceHubTool(
+  toolName: string,
+  args: Record<string, any> = {}
+): Promise<any> {
+  const body = JSON.stringify({ tool: toolName, args });
+  const headers: Record<string, string> = {
+    'Content-Type': 'application/json'
+  };
+
+  const isServer = typeof window === 'undefined';
+
+  let response: Response;
+  if (isServer) {
+    const apiUrl =
+      (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_EGDESK_API_URL) ||
+      EGDESK_CONFIG.apiUrl;
+    const apiKey =
+      (typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_EGDESK_API_KEY) ||
+      EGDESK_CONFIG.apiKey;
+    if (apiKey) {
+      headers['X-Api-Key'] = apiKey;
+    }
+    response = await fetch(\`\${apiUrl}/financehub/tools/call\`, {
+      method: 'POST',
+      headers,
+      body
+    });
+  } else {
+    response = await fetch('/__financehub_proxy', {
+      method: 'POST',
+      headers,
+      body
+    });
+  }
+
+  if (!response.ok) {
+    throw new Error(\`HTTP \${response.status}: \${response.statusText}\`);
+  }
+
+  const result = await response.json();
+
+  if (!result.success) {
+    throw new Error(result.error || 'Tool call failed');
+  }
+
+  const content = result.result?.content?.[0]?.text;
+  return content ? JSON.parse(content) : null;
+}
+
+/**
+ * List all registered banks and card companies
+ */
+export async function listBanks() {
+  return callFinanceHubTool('financehub_list_banks', {});
+}
+
+/**
+ * List bank accounts with balances
+ */
+export async function listAccounts(options: {
+  bankId?: string;
+  isActive?: boolean;
+} = {}) {
+  return callFinanceHubTool('financehub_list_accounts', options);
+}
+
+/**
+ * Query bank transactions
+ */
+export async function queryBankTransactions(options: {
+  accountId?: string;
+  bankId?: string;
+  startDate?: string;
+  endDate?: string;
+  category?: string;
+  minAmount?: number;
+  maxAmount?: number;
+  searchText?: string;
+  limit?: number;
+  offset?: number;
+  orderBy?: 'date' | 'amount' | 'balance';
+  orderDir?: 'asc' | 'desc';
+} = {}) {
+  return callFinanceHubTool('financehub_query_transactions', options);
+}
+
+/**
+ * Query card transactions (NEW)
+ */
+export async function queryCardTransactions(options: {
+  accountId?: string;
+  cardCompanyId?: string;
+  cardNumber?: string;
+  merchantName?: string;
+  startDate?: string;
+  endDate?: string;
+  category?: string;
+  minAmount?: number;
+  maxAmount?: number;
+  includeCancelled?: boolean;
+  limit?: number;
+  offset?: number;
+  orderBy?: 'date' | 'amount';
+  orderDir?: 'asc' | 'desc';
+} = {}) {
+  return callFinanceHubTool('financehub_query_card_transactions', options);
+}
+
+/**
+ * Get transaction statistics
+ */
+export async function getTransactionStats(options: {
+  accountId?: string;
+  bankId?: string;
+  startDate?: string;
+  endDate?: string;
+} = {}) {
+  return callFinanceHubTool('financehub_get_statistics', options);
+}
+
+/**
+ * Get monthly breakdown of deposits/withdrawals
+ */
+export async function getMonthlySummary(options: {
+  accountId?: string;
+  bankId?: string;
+  year?: number;
+  months?: number;
+} = {}) {
+  return callFinanceHubTool('financehub_get_monthly_summary', options);
+}
+
+/**
+ * Get overall stats (banks, accounts, transactions, balances)
+ */
+export async function getOverallStats() {
+  return callFinanceHubTool('financehub_get_overall_stats', {});
+}
+
+/**
+ * Get sync operation history
+ */
+export async function getSyncHistory(limit: number = 50) {
+  return callFinanceHubTool('financehub_get_sync_history', { limit });
+}
 `;
 
-  fs.writeFileSync(helperPath, helperContent, 'utf-8');
+  fs.writeFileSync(helperPath, helperContent.replace(/\r?\n/g, os.EOL), 'utf-8');
   console.log(`✅ Generated ${helperPath}`);
 }

package/src/generate-middleware.ts

@@ -7,6 +7,7 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
+import * as os from 'os';
 
 /**
  * Detect if project uses src/ directory structure
@@ -103,6 +104,6 @@ export const config = {
 };
 `;
 
-  fs.writeFileSync(middlewarePath, middlewareContent, 'utf-8');
+  fs.writeFileSync(middlewarePath, middlewareContent.replace(/\r?\n/g, os.EOL), 'utf-8');
   console.log(`✅ Generated ${middlewarePath}`);
 }

package/src/generate-proxy.ts

@@ -9,6 +9,7 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
+import * as os from 'os';
 
 /**
  * Detect if project uses src/ directory structure
@@ -102,6 +103,6 @@ export const config = {
 };
 `;
 
-  fs.writeFileSync(proxyPath, proxyContent, 'utf-8');
+  fs.writeFileSync(proxyPath, proxyContent.replace(/\r?\n/g, os.EOL), 'utf-8');
   console.log(`✅ Generated ${proxyPath}`);
 }

package/src/index.ts

@@ -15,6 +15,7 @@ import {
 import { generateMiddleware } from './generate-middleware';
 import { generateProxy } from './generate-proxy';
 import { generateHelpers } from './generate-helpers';
+import { generateApiWrapper } from './generate-api-wrapper';
 
 export interface SetupOptions {
   egdeskUrl?: string;
@@ -75,6 +76,7 @@ export async function setupNextApiPlugin(
 
     generateConfigFile(projectPath, config);
     generateHelpers(projectPath);
+    generateApiWrapper(projectPath);
     updateEnvLocal(projectPath, config);
 
     const proxyFile = useProxy ? 'proxy.ts' : 'middleware.ts';
@@ -84,6 +86,7 @@ export async function setupNextApiPlugin(
     console.log(`   - ${proxyFile} (database proxy)`);
     console.log('   - egdesk.config.ts (type-safe config)');
     console.log('   - egdesk-helpers.ts (helper functions)');
+    console.log('   - src/lib/api.ts (basePath-aware fetch wrapper)');
     console.log('   - .env.local (environment variables)');
     console.log('');
     console.log('📝 Next steps:');
@@ -92,9 +95,14 @@ export async function setupNextApiPlugin(
     console.log('   3. Import and use helpers in your components:');
     console.log('      import { queryTable } from "./egdesk-helpers"');
     console.log('      import { TABLES } from "./egdesk.config"');
+    console.log('      import { apiFetch } from "@/lib/api"');
     console.log('');
-    console.log('Example usage in a component:');
+    console.log('Example usage:');
+    console.log('   // Database queries');
     console.log('   const data = await queryTable(TABLES.table1.name, { limit: 10 });');
+    console.log('   ');
+    console.log('   // API routes (use apiFetch for basePath support)');
+    console.log('   const response = await apiFetch("/api/transactions");');
   } catch (error) {
     console.error('❌ Setup failed:', error);
     throw error;
@@ -107,3 +115,4 @@ export { discoverTables } from './setup-userdata';
 export { generateMiddleware } from './generate-middleware';
 export { generateProxy } from './generate-proxy';
 export { generateHelpers } from './generate-helpers';
+export { generateApiWrapper } from './generate-api-wrapper';

package/src/setup-userdata.ts

@@ -7,6 +7,7 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
+import * as os from 'os';
 
 export interface UserDataTable {
   id: string;
@@ -172,7 +173,7 @@ export function updateEnvLocal(
     ''
   ].join('\n');
 
-  fs.writeFileSync(envPath, envContent, 'utf-8');
+  fs.writeFileSync(envPath, envContent.replace(/\r?\n/g, os.EOL), 'utf-8');
   console.log(`✅ Updated ${envPath}`);
 }
 
@@ -233,6 +234,6 @@ ${config.tables.map((table, index) => `  table${index + 1}: '${table.tableName}'
 } as const;
 `;
 
-  fs.writeFileSync(configPath, configContent, 'utf-8');
+  fs.writeFileSync(configPath, configContent.replace(/\r?\n/g, os.EOL), 'utf-8');
   console.log(`✅ Generated ${configPath}`);
 }