spfn 0.2.0-beta.7 → 0.2.0-beta.8

package/dist/index.js

@@ -521,14 +521,27 @@ import { existsSync as existsSync6 } from "fs";
 import { join as join6 } from "path";
 import fse3 from "fs-extra";
 async function setupApiProxy(cwd, includeAuth) {
-  const appDir = existsSync6(join6(cwd, "src", "app")) ? join6(cwd, "src", "app") : join6(cwd, "app");
+  const srcAppDir = join6(cwd, "src", "app");
+  const rootAppDir = join6(cwd, "app");
+  let appDir;
+  if (existsSync6(srcAppDir)) {
+    appDir = srcAppDir;
+  } else if (existsSync6(rootAppDir)) {
+    appDir = rootAppDir;
+  } else {
+    logger.error("Next.js app directory not found. Expected src/app or app directory.");
+    process.exit(1);
+  }
   const rpcDir = join6(appDir, "api", "rpc", "[routeName]");
   const rpcRoutePath = join6(rpcDir, "route.ts");
-  if (!existsSync6(rpcRoutePath)) {
-    ensureDirSync3(rpcDir);
-    const authImport = includeAuth ? `import '@spfn/auth/nextjs/api';
+  if (existsSync6(rpcRoutePath)) {
+    logger.error(`RPC proxy route already exists: ${rpcRoutePath.replace(cwd + "/", "")}`);
+    process.exit(1);
+  }
+  ensureDirSync3(rpcDir);
+  const authImport = includeAuth ? `import '@spfn/auth/nextjs/api';
 ` : "";
-    const routeContent = `/**
+  const routeContent = `/**
  * SPFN RPC Proxy
  *
  * Resolves routeName to actual HTTP method and path from routeMap,
@@ -546,10 +559,9 @@ import { createRpcProxy } from '@spfn/core/nextjs/server';
 
 export const { GET, POST } = createRpcProxy({ routeMap });
 `;
-    writeFileSync2(rpcRoutePath, routeContent);
-    const relativePath = rpcRoutePath.replace(cwd + "/", "");
-    logger.success(`Created ${relativePath} (RPC proxy)`);
-  }
+  writeFileSync2(rpcRoutePath, routeContent);
+  const relativePath = rpcRoutePath.replace(cwd + "/", "");
+  logger.success(`Created ${relativePath} (RPC proxy)`);
 }
 var ensureDirSync3, writeFileSync2;
 var init_api_proxy = __esm({
@@ -743,7 +755,7 @@ var init_deployment_config = __esm({
 
 // src/utils/version.ts
 function getCliVersion() {
-  return "0.2.0-beta.7";
+  return "0.2.0-beta.8";
 }
 function getTagFromVersion(version) {
   const match = version.match(/-([a-z]+)\./i);

package/dist/templates/lib/api-client.ts

@@ -1,47 +1,80 @@
 /**
  * API Client Configuration
  *
- * Type-safe client for accessing server routes
- */
-
-import { createApi } from '@spfn/core/nextjs';
-import { errorRegistry } from "@spfn/core/errors";
-
-import type { AppRouter } from '@/server/router';
-
-/**
- * Pre-configured type-safe API client
- *
+ * Type-safe client for accessing server routes.
  * Core HTTP errors are automatically registered.
- * Add custom application errors via the errors field if needed.
  *
  * @example
  * ```typescript
  * import { api } from '@/lib/api-client';
  *
  * // Basic call
- * const user = await api.getUser
- *     .call({ id: '123' });
+ * const user = await api.getUser.call({ params: { id: '123' } });
  *
- * // Error handling with instanceof
- * try {
- *     await api.someRoute.call();
- * } catch (error) {
- *     if (error instanceof NotFoundError) {
- *         console.log('Resource not found');
- *     } else if (error instanceof ValidationError) {
- *         console.log('Validation failed:', error.fields);
- *     }
- * }
+ * // With options
+ * const data = await api.getData
+ *     .headers({ 'X-Custom': 'value' })
+ *     .fetchOptions({ next: { revalidate: 60 } })
+ *     .call({ query: { page: 1 } });
  * ```
- *
- * Works in:
- * - Server Components (no router import needed)
- * - Client Components (proxied through /api/actions)
- * - Server Actions
- * - Route Handlers
  */
+
+import { createApi } from '@spfn/core/nextjs';
+import type { AppRouter } from '@/server/router';
+
 export const api = createApi<AppRouter>({
-    errorRegistry: errorRegistry,
-    debug: true
+    /**
+     * Base URL for RPC endpoint
+     * @default '/api/rpc'
+     */
+    // baseUrl: '/api/rpc',
+
+    /**
+     * Default headers for all requests
+     */
+    // headers: { 'X-Client': 'web' },
+
+    /**
+     * Request timeout in milliseconds
+     * @default 30000
+     */
+    // timeout: 30000,
+
+    /**
+     * Custom error registry for deserialization
+     * Core HTTP errors are automatically included.
+     *
+     * @example
+     * import { authErrorRegistry } from '@myapp/auth/errors';
+     * errorRegistry: [authErrorRegistry, MyCustomError]
+     */
+    // errorRegistry: [],
+
+    /**
+     * Global request interceptor
+     *
+     * @example
+     * onRequest: async (url, init) => {
+     *     init.headers = { ...init.headers, 'X-Request-Id': crypto.randomUUID() };
+     *     return init;
+     * }
+     */
+    // onRequest: async (url, init) => init,
+
+    /**
+     * Global response interceptor
+     *
+     * @example
+     * onResponse: async (response, body) => {
+     *     if (response.status === 401) redirect('/login');
+     *     return { response, body };
+     * }
+     */
+    // onResponse: async (response, body) => ({ response, body }),
+
+    /**
+     * Enable debug logging
+     * @default false
+     */
+    debug: process.env.NODE_ENV === 'development',
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spfn",
-  "version": "0.2.0-beta.7",
+  "version": "0.2.0-beta.8",
   "description": "Superfunction CLI - Add SPFN to your Next.js project",
   "type": "module",
   "bin": {
@@ -67,7 +67,7 @@
     "postgres": "^3.4.0",
     "prompts": "^2.4.2",
     "tsup": "^8.5.0",
-    "@spfn/core": "0.2.0-beta.9"
+    "@spfn/core": "0.2.0-beta.12"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",