aurabase-js 0.1.0 → 0.2.1

package/src/QueryBuilder.ts

@@ -1,7 +1,6 @@
-import { AuraBaseApiError } from './errors';
 import { PostgrestResponse, AuraBaseError } from './types';
 
-type HttpMethod = 'GET' | 'POST' | 'PATCH' | 'PUT' | 'DELETE';
+type HttpMethod = 'GET' | 'POST' | 'PATCH' | 'DELETE';
 
 export class QueryBuilder<T> {
   private url: string;
@@ -12,6 +11,13 @@ export class QueryBuilder<T> {
   private headers: Record<string, string>;
   private isSingle: boolean = false;
 
+  // CUD state — stored so filters can be chained AFTER insert/update/delete
+  private _method: HttpMethod = 'GET';
+  private _body: unknown = undefined;
+  private _isUpsert: boolean = false;
+  private _onConflict: string | undefined = undefined;
+  private _idValue: unknown = undefined; // .eq('id', x) → URL path for PATCH/DELETE
+
   constructor(
     url: string,
     anonKey: string,
@@ -27,173 +33,167 @@ export class QueryBuilder<T> {
     this.headers = { ...headers };
   }
 
-  /**
-   * Select columns
-   * @example
-   * .select('id, name, email')
-   * .select('*')
-   */
+  // ── SELECT ────────────────────────────────────────────────────────────────
+  // .select('id, title') → ?select=id,title
   select(columns: string = '*'): this {
-    this.queryParams.set('select', columns);
+    if (columns !== '*') this.queryParams.set('select', columns.replace(/\s/g, ''));
     return this;
   }
 
-  /**
-   * Filter by column equality
-   * @example
-   * .eq('id', 1)
-   * .eq('status', 'active')
-   */
+  // ── FILTERS ───────────────────────────────────────────────────────────────
+  // .eq('id', 1) → ?eq=id:1  (id 컬럼이면 URL path용으로도 저장)
   eq(column: string, value: unknown): this {
-    this.queryParams.append(column, `eq.${value}`);
+    if (column === 'id') this._idValue = value;
+    this.queryParams.append('eq', `${column}:${value}`);
     return this;
   }
 
-  /**
-   * Filter by column inequality
-   */
   neq(column: string, value: unknown): this {
-    this.queryParams.append(column, `neq.${value}`);
+    this.queryParams.append('neq', `${column}:${value}`);
     return this;
   }
 
-  /**
-   * Filter by greater than
-   */
   gt(column: string, value: unknown): this {
-    this.queryParams.append(column, `gt.${value}`);
+    this.queryParams.append('gt', `${column}:${value}`);
     return this;
   }
 
-  /**
-   * Filter by greater than or equal
-   */
   gte(column: string, value: unknown): this {
-    this.queryParams.append(column, `gte.${value}`);
+    this.queryParams.append('gte', `${column}:${value}`);
     return this;
   }
 
-  /**
-   * Filter by less than
-   */
   lt(column: string, value: unknown): this {
-    this.queryParams.append(column, `lt.${value}`);
+    this.queryParams.append('lt', `${column}:${value}`);
     return this;
   }
 
-  /**
-   * Filter by less than or equal
-   */
   lte(column: string, value: unknown): this {
-    this.queryParams.append(column, `lte.${value}`);
+    this.queryParams.append('lte', `${column}:${value}`);
     return this;
   }
 
-  /**
-   * Filter by like pattern
-   */
   like(column: string, pattern: string): this {
-    this.queryParams.append(column, `like.${pattern}`);
+    this.queryParams.append('like', `${column}:${pattern}`);
     return this;
   }
 
-  /**
-   * Filter by case-insensitive like pattern
-   */
   ilike(column: string, pattern: string): this {
-    this.queryParams.append(column, `ilike.${pattern}`);
+    this.queryParams.append('ilike', `${column}:${pattern}`);
+    return this;
+  }
+
+  in(column: string, values: unknown[]): this {
+    this.queryParams.append('in', `${column}:${values.join(',')}`);
     return this;
   }
 
-  /**
-   * Filter by array contains
-   */
   contains(column: string, value: unknown[]): this {
-    this.queryParams.append(column, `cs.{${value.join(',')}}`);
+    this.queryParams.append('contains', `${column}:${JSON.stringify(value)}`);
     return this;
   }
 
-  /**
-   * Filter by value in array
-   */
-  in(column: string, values: unknown[]): this {
-    this.queryParams.append(column, `in.(${values.join(',')})`);
+  containedBy(column: string, value: unknown[]): this {
+    this.queryParams.append('contained_by', `${column}:${JSON.stringify(value)}`);
     return this;
   }
 
-  /**
-   * Filter for null values
-   */
   isNull(column: string): this {
-    this.queryParams.append(column, 'is.null');
+    this.queryParams.append('is_null', `${column}:true`);
     return this;
   }
 
-  /**
-   * Filter for non-null values
-   */
   isNotNull(column: string): this {
-    this.queryParams.append(column, 'is.not.null');
+    this.queryParams.append('is_null', `${column}:false`);
+    return this;
+  }
+
+  search(query: string): this {
+    this.queryParams.set('search', query);
+    return this;
+  }
+
+  not(operator: string, column: string, value: unknown): this {
+    this.queryParams.append('not', `${operator}:${column}:${value}`);
+    return this;
+  }
+
+  or(conditions: string): this {
+    this.queryParams.set('or', conditions);
     return this;
   }
 
-  /**
-   * Order results
-   * @example
-   * .order('created_at', { ascending: false })
-   */
+  // ── ORDER / PAGINATION ────────────────────────────────────────────────────
+  // .order('created_at', { ascending: false }) → ?order=created_at.desc
+  // 다중 호출 시 comma 연결 → ?order=price.desc,name.asc
   order(column: string, options: { ascending?: boolean; nullsFirst?: boolean } = {}): this {
     const { ascending = true, nullsFirst } = options;
-    let orderStr = column;
-    if (!ascending) orderStr += '.desc';
-    if (nullsFirst !== undefined) {
-      orderStr += nullsFirst ? '.nullsfirst' : '.nullslast';
-    }
-    this.queryParams.append('order', orderStr);
+    let str = ascending ? column : `${column}.desc`;
+    if (nullsFirst !== undefined) str += nullsFirst ? '.nullsfirst' : '.nullslast';
+    const existing = this.queryParams.get('order');
+    this.queryParams.set('order', existing ? `${existing},${str}` : str);
     return this;
   }
 
-  /**
-   * Limit results
-   */
   limit(count: number): this {
     this.queryParams.set('limit', String(count));
     return this;
   }
 
-  /**
-   * Offset results
-   */
   offset(count: number): this {
     this.queryParams.set('offset', String(count));
     return this;
   }
 
-  /**
-   * Range of results (offset + limit)
-   */
   range(from: number, to: number): this {
     this.queryParams.set('offset', String(from));
     this.queryParams.set('limit', String(to - from + 1));
     return this;
   }
 
-  /**
-   * Return single result
-   */
   single(): this {
     this.isSingle = true;
     return this;
   }
 
-  /**
-   * Return single result or null
-   */
   maybeSingle(): this {
     this.isSingle = true;
     return this;
   }
 
+  // ── CUD — Supabase 스타일: 모두 this 반환 → .eq() 체이닝 가능 ─────────────
+  // await client.from('todos').insert({ title: '할일' })
+  insert(row: Partial<T> | Partial<T>[]): this {
+    this._method = 'POST';
+    const rows = Array.isArray(row) ? row : [row];
+    this._body = rows.length === 1 ? rows[0] : rows;
+    return this;
+  }
+
+  // await client.from('todos').update({ completed: true }).eq('id', 1)
+  update(data: Partial<T>): this {
+    this._method = 'PATCH';
+    this._body = data;
+    return this;
+  }
+
+  // await client.from('todos').upsert({ id: 1, title: '수정됨' }, { onConflict: 'id' })
+  upsert(row: Partial<T> | Partial<T>[], options: { onConflict?: string } = {}): this {
+    this._method = 'POST';
+    this._isUpsert = true;
+    this._onConflict = options.onConflict;
+    const rows = Array.isArray(row) ? row : [row];
+    this._body = rows.length === 1 ? rows[0] : rows;
+    return this;
+  }
+
+  // await client.from('todos').delete().eq('id', 1)
+  delete(): this {
+    this._method = 'DELETE';
+    return this;
+  }
+
+  // ── INTERNALS ─────────────────────────────────────────────────────────────
   private getHeaders(): Record<string, string> {
     const token = this.accessToken || this.anonKey;
     return {
@@ -204,116 +204,77 @@ export class QueryBuilder<T> {
     };
   }
 
-  private async request<TResponse>(
-    method: HttpMethod,
-    body?: unknown
-  ): Promise<PostgrestResponse<TResponse>> {
-    const queryString = this.queryParams.toString();
-    const fullUrl = `${this.url}/rest/v1/${this.tableName}${queryString ? `?${queryString}` : ''}`;
+  private buildUrl(): string {
+    // upsert: POST /api/{table}/upsert?on_conflict=col
+    if (this._isUpsert) {
+      const qs = this._onConflict ? `?on_conflict=${this._onConflict}` : '';
+      return `${this.url}/api/${this.tableName}/upsert${qs}`;
+    }
 
-    const options: RequestInit = {
-      method,
-      headers: this.getHeaders(),
-    };
+    // PATCH/DELETE with id: /api/{table}/{id}/  (query params 제외)
+    if ((this._method === 'PATCH' || this._method === 'DELETE') && this._idValue !== undefined) {
+      return `${this.url}/api/${this.tableName}/${this._idValue}/`;
+    }
 
-    if (body && method !== 'GET') {
-      options.body = JSON.stringify(body);
-      (options.headers as Record<string, string>)['Prefer'] = 'return=representation';
+    // GET/POST: /api/{table}/?...params
+    const qs = this.queryParams.toString();
+    return `${this.url}/api/${this.tableName}/${qs ? `?${qs}` : ''}`;
+  }
+
+  private async execute(): Promise<PostgrestResponse<T>> {
+    const fullUrl = this.buildUrl();
+    const reqHeaders = this.getHeaders();
+    const options: RequestInit = { method: this._method, headers: reqHeaders };
+
+    if (this._body !== undefined && this._method !== 'GET') {
+      options.body = JSON.stringify(this._body);
+      (reqHeaders as Record<string, string>)['Prefer'] = 'return=representation';
     }
 
     try {
       const response = await fetch(fullUrl, options);
-
-      let data: TResponse | null = null;
-      let error: AuraBaseError | null = null;
-
       const text = await response.text();
+      let data: T | T[] | null = null;
+      let error: AuraBaseError | null = null;
 
       if (text) {
         try {
           const parsed = JSON.parse(text);
-
           if (!response.ok) {
             error = {
-              message: parsed.message || parsed.error || `HTTP ${response.status}`,
+              message: parsed.message || parsed.error || parsed.detail || `HTTP ${response.status}`,
               code: parsed.code,
               details: parsed.details,
             };
           } else {
-            data = this.isSingle && Array.isArray(parsed) ? parsed[0] ?? null : parsed;
+            data = this.isSingle && Array.isArray(parsed) ? (parsed[0] ?? null) : parsed;
           }
         } catch {
-          if (!response.ok) {
-            error = {
-              message: text || `HTTP ${response.status}`,
-            };
-          }
+          if (!response.ok) error = { message: text || `HTTP ${response.status}` };
         }
       }
 
-      return {
-        data,
-        error,
-        status: response.status,
-        statusText: response.statusText,
-      };
+      return { data, error, status: response.status, statusText: response.statusText };
     } catch (err) {
       return {
         data: null,
-        error: {
-          message: err instanceof Error ? err.message : 'Network error',
-        },
+        error: { message: err instanceof Error ? err.message : 'Network error' },
         status: 0,
         statusText: 'Network Error',
       };
     }
   }
 
-  /**
-   * Execute SELECT query
-   */
-  async then<TResult = T[]>(
-    resolve: (value: PostgrestResponse<TResult>) => void | PromiseLike<void>,
+  // then() — await 시 자동 실행
+  async then(
+    resolve: (value: PostgrestResponse<T>) => void | PromiseLike<void>,
     reject?: (reason: unknown) => void | PromiseLike<void>
   ): Promise<void> {
     try {
-      const result = await this.request<TResult>('GET');
+      const result = await this.execute();
       await resolve(result);
     } catch (err) {
-      if (reject) {
-        await reject(err);
-      }
+      if (reject) await reject(err);
     }
   }
-
-  /**
-   * Insert row(s)
-   */
-  async insert(row: Partial<T> | Partial<T>[]): Promise<PostgrestResponse<T>> {
-    const rows = Array.isArray(row) ? row : [row];
-    return this.request<T>('POST', rows.length === 1 ? rows[0] : rows);
-  }
-
-  /**
-   * Update row(s)
-   */
-  async update(data: Partial<T>): Promise<PostgrestResponse<T>> {
-    return this.request<T>('PATCH', data);
-  }
-
-  /**
-   * Upsert row(s)
-   */
-  async upsert(row: Partial<T> | Partial<T>[]): Promise<PostgrestResponse<T>> {
-    const rows = Array.isArray(row) ? row : [row];
-    this.headers['Prefer'] = 'resolution=merge-duplicates,return=representation';
-    return this.request<T>('POST', rows.length === 1 ? rows[0] : rows);
-  }
-
-  /**
-   * Delete row(s)
-   */
-  async delete(): Promise<PostgrestResponse<T>> {
-    return this.request<T>('DELETE');
-  }
 }

package/src/cli.ts

@@ -0,0 +1,149 @@
+#!/usr/bin/env node
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+const args = process.argv.slice(2);
+const command = args[0];
+
+const BOLD = '\x1b[1m';
+const GREEN = '\x1b[32m';
+const YELLOW = '\x1b[33m';
+const CYAN = '\x1b[36m';
+const RESET = '\x1b[0m';
+
+function log(msg: string) { console.log(msg); }
+function success(msg: string) { console.log(`${GREEN}✔${RESET} ${msg}`); }
+function warn(msg: string) { console.log(`${YELLOW}⚠${RESET}  ${msg}`); }
+function info(msg: string) { console.log(`${CYAN}ℹ${RESET}  ${msg}`); }
+
+// ─── 생성할 파일 내용 ──────────────────────────────────────────────────────────
+
+const CLIENT_TS = `import { createClient } from 'aurabase-js';
+
+export const client = createClient({
+  url: process.env.NEXT_PUBLIC_AURABASE_URL || '',
+  anonKey: process.env.NEXT_PUBLIC_AURABASE_ANON_KEY || '',
+});
+`;
+
+const SERVER_TS = `import { createClient } from 'aurabase-js';
+import { cookies } from 'next/headers';
+
+export async function server() {
+  const cookieStore = await cookies();
+  const accessToken = cookieStore.get('access_token')?.value;
+
+  const client = createClient({
+    url: process.env.NEXT_PUBLIC_AURABASE_URL || '',
+    anonKey: process.env.NEXT_PUBLIC_AURABASE_ANON_KEY || '',
+  });
+
+  if (accessToken) {
+    client.setAccessToken(accessToken);
+  }
+
+  return client;
+}
+`;
+
+const ADMIN_TS = `import { createClient } from 'aurabase-js';
+
+/**
+ * Admin client with service_role key
+ * ⚠️ ONLY use on server-side (API routes, server components)
+ * ⚠️ Bypasses all RLS policies - use with caution!
+ */
+export const admin = createClient({
+  url: process.env.NEXT_PUBLIC_AURABASE_URL || '',
+  anonKey: process.env.NEXT_PUBLIC_AURABASE_SERVICE_ROLE_KEY || '',
+});
+`;
+
+const ENV_EXAMPLE = `# AuraBase
+NEXT_PUBLIC_AURABASE_URL=https://your-project.cloudfront.net
+NEXT_PUBLIC_AURABASE_ANON_KEY=your-anon-key
+NEXT_PUBLIC_AURABASE_SERVICE_ROLE_KEY=your-service-role-key
+`;
+
+// ─── init 커맨드 ───────────────────────────────────────────────────────────────
+
+function init() {
+  const cwd = process.cwd();
+  const libDir = path.join(cwd, 'lib');
+
+  log('');
+  log(`${BOLD}aurabase-js init${RESET}`);
+  log('──────────────────────────────────');
+
+  // lib 폴더 생성
+  if (!fs.existsSync(libDir)) {
+    fs.mkdirSync(libDir, { recursive: true });
+    success(`lib/ 폴더 생성`);
+  } else {
+    info(`lib/ 폴더가 이미 존재합니다`);
+  }
+
+  // 파일 생성 (이미 있으면 건너뜀)
+  const files: [string, string][] = [
+    ['lib/client.ts', CLIENT_TS],
+    ['lib/server.ts', SERVER_TS],
+    ['lib/admin.ts',  ADMIN_TS],
+  ];
+
+  for (const [relPath, content] of files) {
+    const fullPath = path.join(cwd, relPath);
+    if (fs.existsSync(fullPath)) {
+      warn(`${relPath} 이미 존재 — 건너뜀`);
+    } else {
+      fs.writeFileSync(fullPath, content, 'utf8');
+      success(`${relPath} 생성`);
+    }
+  }
+
+  // .env.local 가이드
+  const envPath = path.join(cwd, '.env.local');
+  const envExists = fs.existsSync(envPath);
+
+  log('');
+  log(`${BOLD}📋 환경변수 설정${RESET}`);
+  log('──────────────────────────────────');
+
+  if (!envExists) {
+    fs.writeFileSync(envPath, ENV_EXAMPLE, 'utf8');
+    success(`.env.local 생성 — 아래 값을 채워주세요`);
+  } else {
+    info(`.env.local 이미 존재 — 아래 항목이 있는지 확인하세요`);
+  }
+
+  log('');
+  log(`  ${CYAN}NEXT_PUBLIC_AURABASE_URL${RESET}=https://your-project.cloudfront.net`);
+  log(`  ${CYAN}NEXT_PUBLIC_AURABASE_ANON_KEY${RESET}=your-anon-key`);
+  log(`  ${CYAN}NEXT_PUBLIC_AURABASE_SERVICE_ROLE_KEY${RESET}=your-service-role-key`);
+  log('');
+  log(`  → AuraBase 대시보드 ${BOLD}API Keys${RESET} 메뉴에서 확인하세요.`);
+  log('');
+  log(`${GREEN}✔ 완료!${RESET} 이제 아래처럼 사용할 수 있습니다:`);
+  log('');
+  log(`  ${CYAN}// 클라이언트 컴포넌트${RESET}`);
+  log(`  import { client } from '@/lib/client'`);
+  log(`  const { data } = await client.from('todos').select('*')`);
+  log('');
+  log(`  ${CYAN}// 서버 전용 (API Route, Server Component)${RESET}`);
+  log(`  import { admin } from '@/lib/admin'`);
+  log(`  const { data } = await admin.from('todos').select('*')`);
+  log('');
+}
+
+// ─── 진입점 ────────────────────────────────────────────────────────────────────
+
+if (command === 'init') {
+  init();
+} else {
+  log('');
+  log(`${BOLD}aurabase-js CLI${RESET}`);
+  log('');
+  log('사용법:');
+  log(`  ${CYAN}npx aurabase-js init${RESET}   lib/ 폴더 및 환경변수 파일 자동 생성`);
+  log('');
+}