openbase-js 0.1.8 → 0.1.9

package/index.cjs

@@ -1,12 +1,13 @@
 // ─── Query Builder ────────────────────────────────────────────────────────────
 
 class QueryBuilder {
-  constructor(baseUrl, apiKey, dbName, table, anonKey) {
+  constructor(baseUrl, apiKey, dbName, table, anonKey, sessionToken = null) {
     this._baseUrl = baseUrl;
     this._apiKey = apiKey;
     this._dbName = dbName;
     this._table = table;
     this._anonKey = anonKey;
+    this._sessionToken = sessionToken;
     this._filters = [];
     this._columns = '*';
     this._limitVal = null;
@@ -135,122 +136,154 @@ class QueryBuilder {
     return this;
   }
 
-  // ─── SQL Builder ───────────────────────────────────────────────────────────
-
-  _filterToSQL(f) {
-    const col = `"${f.col}"`;
-    switch (f.op) {
-      case 'eq': return typeof f.val === 'string' ? `${col} = '${f.val}'` : `${col} = ${f.val}`;
-      case 'gt': return `${col} > ${f.val}`;
-      case 'lt': return `${col} < ${f.val}`;
-      case 'gte': return `${col} >= ${f.val}`;
-      case 'lte': return `${col} <= ${f.val}`;
-      case 'like': return `${col} LIKE '${f.val}'`;
-      case 'ilike': return `${col} ILIKE '${f.val}'`;
-      case 'in': {
-        const list = f.val.map(v => typeof v === 'string' ? `'${v}'` : v).join(', ');
-        return `${col} IN (${list})`;
-      }
-      case 'is': {
-        if (f.val === null) return `${col} IS NULL`;
-        if (f.val === true) return `${col} IS TRUE`;
-        if (f.val === false) return `${col} IS FALSE`;
-        return `${col} IS NULL`;
-      }
-      default: return `${col} = '${f.val}'`;
-    }
+  upsert(data, onConflict = 'id') {
+    this._operation = 'upsert';
+    this._insertData = data;
+    this._upsertOnConflict = onConflict;
+    return this;
   }
 
-  _buildSQL() {
-    let sql = '';
+  // ─── Executor ──────────────────────────────────────────────────────────────
 
-    if (this._operation === 'select') {
-      sql = `SELECT ${this._columns} FROM "${this._table}"`;
-      if (this._filters.length) {
-        const where = this._filters.map(f => this._filterToSQL(f)).join(' AND ');
-        sql += ` WHERE ${where}`;
-      }
-      if (this._orderCol) {
-        sql += ` ORDER BY "${this._orderCol}" ${this._orderAsc ? 'ASC' : 'DESC'}`;
-      }
-      if (this._limitVal) sql += ` LIMIT ${this._limitVal}`;
-      if (this._offsetVal) sql += ` OFFSET ${this._offsetVal}`;
-
-    } else if (this._operation === 'insert') {
-      const cols = Object.keys(this._insertData).map(c => `"${c}"`).join(', ');
-      const vals = Object.values(this._insertData).map(v =>
-        typeof v === 'string' ? `'${v.replace(/'/g, "''")}'` : v
-      ).join(', ');
-      sql = `INSERT INTO "${this._table}" (${cols}) VALUES (${vals}) RETURNING *`;
-
-    } else if (this._operation === 'update') {
-      const setClauses = Object.entries(this._updateData).map(([col, val]) =>
-        typeof val === 'string' ? `"${col}" = '${val.replace(/'/g, "''")}'` : `"${col}" = ${val}`
-      ).join(', ');
-      sql = `UPDATE "${this._table}" SET ${setClauses}`;
-      if (this._filters.length) {
-        const where = this._filters.map(f => this._filterToSQL(f)).join(' AND ');
-        sql += ` WHERE ${where}`;
+  async _buildAndRun() {
+    try {
+      const headers = {
+        'Content-Type': 'application/json',
+        'Authorization': `Bearer ${this._apiKey}`,
+        'X-Anon-Key': this._anonKey,
+      };
+
+      // If we have an active end-user session, use its token instead of the anon key
+      if (this._sessionToken) {
+        headers['Authorization'] = `Bearer ${this._sessionToken}`;
       }
-      sql += ` RETURNING *`;
 
-    } else if (this._operation === 'delete') {
-      sql = `DELETE FROM "${this._table}"`;
-      if (this._filters.length) {
-        const where = this._filters.map(f => this._filterToSQL(f)).join(' AND ');
-        sql += ` WHERE ${where}`;
-      }
-      sql += ` RETURNING *`;
+      const body = {
+        db_name: this._dbName,
+        table: this._table,
+        operation: this._operation,
+        columns: this._columns,
+        filters: this._filters,
+        limit: this._limitVal,
+        offset: this._offsetVal,
+        order_col: this._orderCol,
+        order_asc: this._orderAsc,
+        data: (this._operation === 'insert' || this._operation === 'upsert') ? this._insertData : this._updateData,
+        upsert_on_conflict: this._upsertOnConflict
+      };
+
+      const res = await fetch(`${this._baseUrl}/sdk/query`, {
+        method: 'POST',
+        headers,
+        body: JSON.stringify(body),
+      });
+
+      const json = await res.json();
+      const { data, error } = json;
+      if (error) return { data: null, error };
+      if (this._single) return { data: data[0] || null, error: null };
+      return { data, error: null };
+    } catch (err) {
+      return { data: null, error: err.message };
     }
+  }
 
-    return sql;
+  then(resolve, reject) {
+    return this._buildAndRun().then(resolve, reject);
   }
+}
 
-  // ─── Executor ──────────────────────────────────────────────────────────────
+// ─── Auth Client ───────────────────────────────────────────────────────────────
 
-  async _buildAndRun() {
-    const sql = this._buildSQL();
+class AuthClient {
+  constructor(client) {
+    this._client = client;
+  }
+
+  async signUp(email, password) {
     try {
-      const res = await fetch(`${this._baseUrl}/query`, {
+      const res = await fetch(`${this._client._baseUrl}/sdk/auth/signup`, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
-          'Authorization': `Bearer ${this._apiKey}`,
-          'X-Anon-Key': this._anonKey,
+          'Authorization': `Bearer ${this._client._apiKey}`
         },
-        body: JSON.stringify({ sql, db_name: this._dbName }),
+        body: JSON.stringify({
+          db_name: this._client._dbName,
+          email,
+          password
+        }),
       });
+      const json = await res.json();
+      if (json.data && json.data.session) {
+        this._client._session = json.data.session;
+      }
+      return json;
+    } catch (err) {
+      return { data: null, error: err.message };
+    }
+  }
 
+  async signIn(email, password) {
+    try {
+      const res = await fetch(`${this._client._baseUrl}/sdk/auth/signin`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': `Bearer ${this._client._apiKey}`
+        },
+        body: JSON.stringify({
+          db_name: this._client._dbName,
+          email,
+          password
+        }),
+      });
       const json = await res.json();
-      const { data, error } = json;
-      if (error) return { data: null, error };
-      if (this._single) return { data: data[0] || null, error: null };
-      return { data, error: null };
+      if (json.data && json.data.session) {
+        this._client._session = json.data.session;
+      }
+      return json;
     } catch (err) {
       return { data: null, error: err.message };
     }
   }
 
-  then(resolve, reject) {
-    return this._buildAndRun().then(resolve, reject);
+  async getSession() {
+    if (!this._client._session) return { data: null, error: null };
+    try {
+      const res = await fetch(`${this._client._baseUrl}/sdk/auth/session`, {
+        headers: {
+          'Authorization': `Bearer ${this._client._session.access_token}`
+        }
+      });
+      return await res.json();
+    } catch (err) {
+      return { data: null, error: err.message };
+    }
+  }
+
+  signOut() {
+    this._client._session = null;
+    return { data: { ok: true }, error: null };
   }
 }
 
 // ─── Storage Client ───────────────────────────────────────────────────────────
 
 class StorageClient {
-  constructor(baseUrl, apiKey, dbName, anonKey) {
-    this._baseUrl = baseUrl;
-    this._apiKey = apiKey;
-    this._dbName = dbName;
-    this._anonKey = anonKey;
+  constructor(client) {
+    this._client = client;
   }
 
   _headers() {
-    return { 
-      'Authorization': `Bearer ${this._apiKey}`,
-      'X-Anon-Key': this._anonKey
+    const headers = { 
+      'Authorization': `Bearer ${this._client._apiKey}`,
+      'X-Anon-Key': this._client._anonKey
     };
+    if (this._client._session) {
+      headers['Authorization'] = `Bearer ${this._client._session.access_token}`;
+    }
+    return headers;
   }
 
   // Detect if we're running in Node.js
@@ -403,12 +436,21 @@ class OpenbaseClient {
     this._baseUrl = baseUrl.replace(/\/$/, '');
     this._apiKey = apiKey;
     this._dbName = dbName;
-    this._anonKey = options.anonKey || apiKey;
-    this.storage = new StorageClient(this._baseUrl, this._apiKey, this._dbName, this._anonKey);
+    this._anonKey = options.anonKey || apiKey; // Default to apiKey if anonKey not provided
+    this._session = null;
+    this.storage = new StorageClient(this);
+    this.auth = new AuthClient(this);
   }
 
   from(table) {
-    return new QueryBuilder(this._baseUrl, this._apiKey, this._dbName, table, this._anonKey);
+    return new QueryBuilder(
+      this._baseUrl, 
+      this._apiKey, 
+      this._dbName, 
+      table, 
+      this._anonKey,
+      this._session ? this._session.access_token : null
+    );
   }
 }
 
@@ -428,4 +470,3 @@ if (typeof module !== 'undefined') {
 if (typeof window !== 'undefined') {
   window.openbase = { createClient };
 }
-module.exports = { createClient };

package/index.d.ts

@@ -14,6 +14,23 @@ export interface OpenbaseClientOptions {
   anonKey?: string;
 }
 
+export interface User {
+  id: string;
+  email: string;
+  created_at: string;
+}
+
+export interface Session {
+  access_token: string;
+}
+
+export declare class AuthClient {
+  signUp(email: string, password: string): Promise<OpenbaseResponse<{ user: User, session: Session }>>;
+  signIn(email: string, password: string): Promise<OpenbaseResponse<{ user: User, session: Session }>>;
+  getSession(): Promise<OpenbaseResponse<{ user: User }>>;
+  signOut(): OpenbaseResponse<{ ok: boolean }>;
+}
+
 export declare class QueryBuilder<T = Record<string, unknown>> {
   // Column selection
   select(columns?: string): this;
@@ -39,6 +56,7 @@ export declare class QueryBuilder<T = Record<string, unknown>> {
   insert(data: Partial<T>): this;
   update(data: Partial<T>): this;
   delete(): this;
+  upsert(data: Partial<T>, onConflict?: string): this;
 
   then<R>(
     resolve: (value: OpenbaseResponse<T[]>) => R,
@@ -99,6 +117,9 @@ export declare class OpenbaseClient {
   /** Storage client for file upload, listing, URLs, and deletion */
   storage: StorageClient;
 
+  /** Auth client for user registration, login, and session management */
+  auth: AuthClient;
+
   /** Query builder for database operations */
   from<T = Record<string, unknown>>(table: string): QueryBuilder<T>;
 }

package/index.js

@@ -1,12 +1,13 @@
 // ─── Query Builder ────────────────────────────────────────────────────────────
 
 class QueryBuilder {
-  constructor(baseUrl, apiKey, dbName, table, anonKey) {
+  constructor(baseUrl, apiKey, dbName, table, anonKey, sessionToken = null) {
     this._baseUrl = baseUrl;
     this._apiKey = apiKey;
     this._dbName = dbName;
     this._table = table;
     this._anonKey = anonKey;
+    this._sessionToken = sessionToken;
     this._filters = [];
     this._columns = '*';
     this._limitVal = null;
@@ -135,122 +136,154 @@ class QueryBuilder {
     return this;
   }
 
-  // ─── SQL Builder ───────────────────────────────────────────────────────────
-
-  _filterToSQL(f) {
-    const col = `"${f.col}"`;
-    switch (f.op) {
-      case 'eq': return typeof f.val === 'string' ? `${col} = '${f.val}'` : `${col} = ${f.val}`;
-      case 'gt': return `${col} > ${f.val}`;
-      case 'lt': return `${col} < ${f.val}`;
-      case 'gte': return `${col} >= ${f.val}`;
-      case 'lte': return `${col} <= ${f.val}`;
-      case 'like': return `${col} LIKE '${f.val}'`;
-      case 'ilike': return `${col} ILIKE '${f.val}'`;
-      case 'in': {
-        const list = f.val.map(v => typeof v === 'string' ? `'${v}'` : v).join(', ');
-        return `${col} IN (${list})`;
-      }
-      case 'is': {
-        if (f.val === null) return `${col} IS NULL`;
-        if (f.val === true) return `${col} IS TRUE`;
-        if (f.val === false) return `${col} IS FALSE`;
-        return `${col} IS NULL`;
-      }
-      default: return `${col} = '${f.val}'`;
-    }
+  upsert(data, onConflict = 'id') {
+    this._operation = 'upsert';
+    this._insertData = data;
+    this._upsertOnConflict = onConflict;
+    return this;
   }
 
-  _buildSQL() {
-    let sql = '';
+  // ─── Executor ──────────────────────────────────────────────────────────────
 
-    if (this._operation === 'select') {
-      sql = `SELECT ${this._columns} FROM "${this._table}"`;
-      if (this._filters.length) {
-        const where = this._filters.map(f => this._filterToSQL(f)).join(' AND ');
-        sql += ` WHERE ${where}`;
-      }
-      if (this._orderCol) {
-        sql += ` ORDER BY "${this._orderCol}" ${this._orderAsc ? 'ASC' : 'DESC'}`;
-      }
-      if (this._limitVal) sql += ` LIMIT ${this._limitVal}`;
-      if (this._offsetVal) sql += ` OFFSET ${this._offsetVal}`;
-
-    } else if (this._operation === 'insert') {
-      const cols = Object.keys(this._insertData).map(c => `"${c}"`).join(', ');
-      const vals = Object.values(this._insertData).map(v =>
-        typeof v === 'string' ? `'${v.replace(/'/g, "''")}'` : v
-      ).join(', ');
-      sql = `INSERT INTO "${this._table}" (${cols}) VALUES (${vals}) RETURNING *`;
-
-    } else if (this._operation === 'update') {
-      const setClauses = Object.entries(this._updateData).map(([col, val]) =>
-        typeof val === 'string' ? `"${col}" = '${val.replace(/'/g, "''")}'` : `"${col}" = ${val}`
-      ).join(', ');
-      sql = `UPDATE "${this._table}" SET ${setClauses}`;
-      if (this._filters.length) {
-        const where = this._filters.map(f => this._filterToSQL(f)).join(' AND ');
-        sql += ` WHERE ${where}`;
+  async _buildAndRun() {
+    try {
+      const headers = {
+        'Content-Type': 'application/json',
+        'Authorization': `Bearer ${this._apiKey}`,
+        'X-Anon-Key': this._anonKey,
+      };
+
+      // If we have an active end-user session, use its token instead of the anon key
+      if (this._sessionToken) {
+        headers['Authorization'] = `Bearer ${this._sessionToken}`;
       }
-      sql += ` RETURNING *`;
 
-    } else if (this._operation === 'delete') {
-      sql = `DELETE FROM "${this._table}"`;
-      if (this._filters.length) {
-        const where = this._filters.map(f => this._filters.map(f => this._filterToSQL(f)).join(' AND '));
-        sql += ` WHERE ${where}`;
-      }
-      sql += ` RETURNING *`;
+      const body = {
+        db_name: this._dbName,
+        table: this._table,
+        operation: this._operation,
+        columns: this._columns,
+        filters: this._filters,
+        limit: this._limitVal,
+        offset: this._offsetVal,
+        order_col: this._orderCol,
+        order_asc: this._orderAsc,
+        data: (this._operation === 'insert' || this._operation === 'upsert') ? this._insertData : this._updateData,
+        upsert_on_conflict: this._upsertOnConflict
+      };
+
+      const res = await fetch(`${this._baseUrl}/sdk/query`, {
+        method: 'POST',
+        headers,
+        body: JSON.stringify(body),
+      });
+
+      const json = await res.json();
+      const { data, error } = json;
+      if (error) return { data: null, error };
+      if (this._single) return { data: data[0] || null, error: null };
+      return { data, error: null };
+    } catch (err) {
+      return { data: null, error: err.message };
     }
+  }
 
-    return sql;
+  then(resolve, reject) {
+    return this._buildAndRun().then(resolve, reject);
   }
+}
 
-  // ─── Executor ──────────────────────────────────────────────────────────────
+// ─── Auth Client ───────────────────────────────────────────────────────────────
 
-  async _buildAndRun() {
-    const sql = this._buildSQL();
+class AuthClient {
+  constructor(client) {
+    this._client = client;
+  }
+
+  async signUp(email, password) {
     try {
-      const res = await fetch(`${this._baseUrl}/query`, {
+      const res = await fetch(`${this._client._baseUrl}/sdk/auth/signup`, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
-          'Authorization': `Bearer ${this._apiKey}`,
-          'X-Anon-Key': this._anonKey,
+          'Authorization': `Bearer ${this._client._apiKey}`
         },
-        body: JSON.stringify({ sql, db_name: this._dbName }),
+        body: JSON.stringify({
+          db_name: this._client._dbName,
+          email,
+          password
+        }),
       });
+      const json = await res.json();
+      if (json.data && json.data.session) {
+        this._client._session = json.data.session;
+      }
+      return json;
+    } catch (err) {
+      return { data: null, error: err.message };
+    }
+  }
 
+  async signIn(email, password) {
+    try {
+      const res = await fetch(`${this._client._baseUrl}/sdk/auth/signin`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': `Bearer ${this._client._apiKey}`
+        },
+        body: JSON.stringify({
+          db_name: this._client._dbName,
+          email,
+          password
+        }),
+      });
       const json = await res.json();
-      const { data, error } = json;
-      if (error) return { data: null, error };
-      if (this._single) return { data: data[0] || null, error: null };
-      return { data, error: null };
+      if (json.data && json.data.session) {
+        this._client._session = json.data.session;
+      }
+      return json;
     } catch (err) {
       return { data: null, error: err.message };
     }
   }
 
-  then(resolve, reject) {
-    return this._buildAndRun().then(resolve, reject);
+  async getSession() {
+    if (!this._client._session) return { data: null, error: null };
+    try {
+      const res = await fetch(`${this._client._baseUrl}/sdk/auth/session`, {
+        headers: {
+          'Authorization': `Bearer ${this._client._session.access_token}`
+        }
+      });
+      return await res.json();
+    } catch (err) {
+      return { data: null, error: err.message };
+    }
+  }
+
+  signOut() {
+    this._client._session = null;
+    return { data: { ok: true }, error: null };
   }
 }
 
 // ─── Storage Client ───────────────────────────────────────────────────────────
 
 class StorageClient {
-  constructor(baseUrl, apiKey, dbName, anonKey) {
-    this._baseUrl = baseUrl;
-    this._apiKey = apiKey;
-    this._dbName = dbName;
-    this._anonKey = anonKey;
+  constructor(client) {
+    this._client = client;
   }
 
   _headers() {
-    return { 
-      'Authorization': `Bearer ${this._apiKey}`,
-      'X-Anon-Key': this._anonKey
+    const headers = { 
+      'Authorization': `Bearer ${this._client._apiKey}`,
+      'X-Anon-Key': this._client._anonKey
     };
+    if (this._client._session) {
+      headers['Authorization'] = `Bearer ${this._client._session.access_token}`;
+    }
+    return headers;
   }
 
   // Detect if we're running in Node.js
@@ -404,11 +437,20 @@ class OpenbaseClient {
     this._apiKey = apiKey;
     this._dbName = dbName;
     this._anonKey = options.anonKey || apiKey; // Default to apiKey if anonKey not provided
-    this.storage = new StorageClient(this._baseUrl, this._apiKey, this._dbName, this._anonKey);
+    this._session = null;
+    this.storage = new StorageClient(this);
+    this.auth = new AuthClient(this);
   }
 
   from(table) {
-    return new QueryBuilder(this._baseUrl, this._apiKey, this._dbName, table, this._anonKey);
+    return new QueryBuilder(
+      this._baseUrl, 
+      this._apiKey, 
+      this._dbName, 
+      table, 
+      this._anonKey,
+      this._session ? this._session.access_token : null
+    );
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openbase-js",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "JavaScript client for Openbase — a self-hosted Supabase alternative",
   "main": "index.js",
   "types": "index.d.ts",

package/test.js

@@ -9,11 +9,11 @@ const { createClient } = require('./index');
 const client = createClient(
   'http://localhost:3003',
   // In production, this would be your secret JWT
-  'eHUJV8pFtbCh76xiUALc1YMWslyN8QxZgYG5RKySsgE', 
+  'umNrqtUU87S-e94PqVZm39Gdyu6FWOul1sPIw0DYKVE', 
   'mydb',
   { 
     // This identifies your project to the backend
-    anonKey: 'Yur7U6O5DHzC7Sjtyx_tI7EYM6lpMBO_I9vWWrN4YdQ' 
+    anonKey: 'umNrqtUU87S-e94PqVZm39Gdyu6FWOul1sPIw0DYKVE' 
   }
 );
 
@@ -110,6 +110,58 @@ async function testOperators() {
   console.log('chained:', chained?.map(r => `${r.firstname} (${r.salary})`));
 }
 
+async function testUpsert() {
+  console.log('\n── UPSERT ──────────────────────────');
+  // First, ensure record 999 is gone
+  await client.from('employees').delete().eq('employeeid', 999);
+
+  console.log('1. Upserting new record...');
+  const { data: upserted1 } = await client.from('employees').upsert({
+    employeeid: 999,
+    firstname: 'Upsert',
+    lastname: 'Test',
+    salary: 77777,
+  }, 'employeeid');
+  console.log('upserted1:', upserted1);
+
+  console.log('2. Upserting same record with new salary...');
+  const { data: upserted2 } = await client.from('employees').upsert({
+    employeeid: 999,
+    firstname: 'Upsert',
+    lastname: 'Test',
+    salary: 88888,
+  }, 'employeeid');
+  console.log('upserted2 (should be 88888):', upserted2);
+
+  // Clean up
+  await client.from('employees').delete().eq('employeeid', 999);
+}
+
+async function testAuth() {
+  console.log('\n── AUTH ────────────────────────────');
+  const email = `test_${Math.random().toString(36).substring(7)}@example.com`;
+  const password = 'password123';
+
+  console.log('1. Signing up...');
+  const { data: signup, error: err1 } = await client.auth.signUp(email, password);
+  console.log('signup:', signup?.user?.email, err1);
+
+  console.log('2. Signing in...');
+  const { data: signin, error: err2 } = await client.auth.signIn(email, password);
+  console.log('signin:', signin?.session ? 'SUCCESS' : 'FAILED', err2);
+
+  console.log('3. Getting session...');
+  const { data: session, error: err3 } = await client.auth.getSession();
+  console.log('session user:', session?.user?.email, err3);
+
+  console.log('4. Signing out...');
+  client.auth.signOut();
+  const { data: sessionAfter } = await client.auth.getSession();
+  console.log('session after signout:', sessionAfter);
+}
+
 test()
   .then(() => testOperators())
+  .then(() => testUpsert())
+  .then(() => testAuth())
   .catch(console.error);