openbase-js 0.1.2 → 0.1.4

package/index.cjs

@@ -0,0 +1,251 @@
+// ─── Query Builder ────────────────────────────────────────────────────────────
+
+class QueryBuilder {
+  constructor(baseUrl, apiKey, dbName, table) {
+    this._baseUrl = baseUrl;
+    this._apiKey = apiKey;
+    this._dbName = dbName;
+    this._table = table;
+    this._filters = [];         // changed: was {} now array of {col, op, val}
+    this._columns = '*';
+    this._limitVal = null;
+    this._offsetVal = null;     // new
+    this._orderCol = null;      // new
+    this._orderAsc = true;      // new
+    this._single = false;
+    this._operation = 'select';
+    this._insertData = null;
+    this._updateData = null;
+  }
+
+  select(columns = '*') {
+    this._columns = columns;
+    this._operation = 'select';
+    return this;
+  }
+
+  // ─── Filter operators ──────────────────────────────────────────────────────
+
+  eq(column, value) {
+    this._filters.push({ col: column, op: 'eq', val: value });
+    return this;
+  }
+
+  gt(column, value) {
+    this._filters.push({ col: column, op: 'gt', val: value });
+    return this;
+  }
+
+  lt(column, value) {
+    this._filters.push({ col: column, op: 'lt', val: value });
+    return this;
+  }
+
+  gte(column, value) {
+    this._filters.push({ col: column, op: 'gte', val: value });
+    return this;
+  }
+
+  lte(column, value) {
+    this._filters.push({ col: column, op: 'lte', val: value });
+    return this;
+  }
+
+  like(column, pattern) {
+    this._filters.push({ col: column, op: 'like', val: pattern });
+    return this;
+  }
+
+  ilike(column, pattern) {
+    this._filters.push({ col: column, op: 'ilike', val: pattern });
+    return this;
+  }
+
+  in(column, values) {
+    this._filters.push({ col: column, op: 'in', val: values });
+    return this;
+  }
+
+  is(column, value) {
+    // value should be null, true, or false
+    this._filters.push({ col: column, op: 'is', val: value });
+    return this;
+  }
+
+  // ─── Modifiers ─────────────────────────────────────────────────────────────
+
+  order(column, { ascending = true } = {}) {
+    this._orderCol = column;
+    this._orderAsc = ascending;
+    return this;
+  }
+
+  limit(n) {
+    this._limitVal = n;
+    return this;
+  }
+
+  range(from, to) {
+    // e.g. range(0, 9) => LIMIT 10 OFFSET 0
+    this._limitVal = to - from + 1;
+    this._offsetVal = from;
+    return this;
+  }
+
+  single() {
+    this._single = true;
+    this._limitVal = 1;
+    return this;
+  }
+
+  // ─── Mutation operators ────────────────────────────────────────────────────
+
+  insert(data) {
+    this._operation = 'insert';
+    this._insertData = data;
+    return this;
+  }
+
+  update(data) {
+    this._operation = 'update';
+    this._updateData = data;
+    return this;
+  }
+
+  delete() {
+    this._operation = 'delete';
+    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}'`;
+    }
+  }
+
+  _buildSQL() {
+    let sql = '';
+
+    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}`;
+      }
+      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 *`;
+    }
+
+    return sql;
+  }
+
+  // ─── Executor ──────────────────────────────────────────────────────────────
+
+  async _buildAndRun() {
+    const sql = this._buildSQL();
+    try {
+      const res = await fetch(`${this._baseUrl}/query`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': `Bearer ${this._apiKey}`,
+        },
+        body: JSON.stringify({ sql, db_name: this._dbName }),
+      });
+
+      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 };
+    }
+  }
+
+  then(resolve, reject) {
+    return this._buildAndRun().then(resolve, reject);
+  }
+}
+
+// ─── Client ───────────────────────────────────────────────────────────────────
+
+class OpenbaseClient {
+  constructor(baseUrl, apiKey, dbName) {
+    this._baseUrl = baseUrl.replace(/\/$/, '');
+    this._apiKey = apiKey;
+    this._dbName = dbName;
+  }
+
+  from(table) {
+    return new QueryBuilder(this._baseUrl, this._apiKey, this._dbName, table);
+  }
+}
+
+// ─── Factory ──────────────────────────────────────────────────────────────────
+
+function createClient(baseUrl, apiKey, dbName) {
+  if (!baseUrl) throw new Error('[openbase] Missing baseUrl. Pass your backend URL as the first argument.');
+  if (!apiKey) throw new Error('[openbase] Missing apiKey. Pass your anon or service key as the second argument.');
+  if (!dbName) throw new Error('[openbase] Missing dbName. Pass your database name as the third argument.');
+  return new OpenbaseClient(baseUrl, apiKey, dbName);
+}
+
+if (typeof module !== 'undefined') {
+  module.exports = { createClient };
+}
+
+if (typeof window !== 'undefined') {
+  window.openbase = { createClient };
+}
+module.exports = { createClient };

package/index.d.ts

@@ -6,6 +6,16 @@ export interface OpenbaseResponse<T> {
 export declare class QueryBuilder<T = Record<string, unknown>> {
   select(columns?: string): this;
   eq(column: string, value: unknown): this;
+  gt(column: string, value: number): this;
+  lt(column: string, value: number): this;
+  gte(column: string, value: number): this;
+  lte(column: string, value: number): this;
+  like(column: string, pattern: string): this;
+  ilike(column: string, pattern: string): this;
+  in(column: string, values: unknown[]): this;
+  is(column: string, value: null | boolean): this;
+  order(column: string, options?: { ascending?: boolean }): this;
+  range(from: number, to: number): this;
   limit(n: number): this;
   single(): this;
   insert(data: Partial<T>): this;

package/index.js

@@ -6,9 +6,12 @@ class QueryBuilder {
     this._apiKey = apiKey;
     this._dbName = dbName;
     this._table = table;
-    this._filters = {};
+    this._filters = [];         // changed: was {} now array of {col, op, val}
     this._columns = '*';
     this._limitVal = null;
+    this._offsetVal = null;     // new
+    this._orderCol = null;      // new
+    this._orderAsc = true;      // new
     this._single = false;
     this._operation = 'select';
     this._insertData = null;
@@ -21,8 +24,59 @@ class QueryBuilder {
     return this;
   }
 
+  // ─── Filter operators ──────────────────────────────────────────────────────
+
   eq(column, value) {
-    this._filters[column] = value;
+    this._filters.push({ col: column, op: 'eq', val: value });
+    return this;
+  }
+
+  gt(column, value) {
+    this._filters.push({ col: column, op: 'gt', val: value });
+    return this;
+  }
+
+  lt(column, value) {
+    this._filters.push({ col: column, op: 'lt', val: value });
+    return this;
+  }
+
+  gte(column, value) {
+    this._filters.push({ col: column, op: 'gte', val: value });
+    return this;
+  }
+
+  lte(column, value) {
+    this._filters.push({ col: column, op: 'lte', val: value });
+    return this;
+  }
+
+  like(column, pattern) {
+    this._filters.push({ col: column, op: 'like', val: pattern });
+    return this;
+  }
+
+  ilike(column, pattern) {
+    this._filters.push({ col: column, op: 'ilike', val: pattern });
+    return this;
+  }
+
+  in(column, values) {
+    this._filters.push({ col: column, op: 'in', val: values });
+    return this;
+  }
+
+  is(column, value) {
+    // value should be null, true, or false
+    this._filters.push({ col: column, op: 'is', val: value });
+    return this;
+  }
+
+  // ─── Modifiers ─────────────────────────────────────────────────────────────
+
+  order(column, { ascending = true } = {}) {
+    this._orderCol = column;
+    this._orderAsc = ascending;
     return this;
   }
 
@@ -31,12 +85,21 @@ class QueryBuilder {
     return this;
   }
 
+  range(from, to) {
+    // e.g. range(0, 9) => LIMIT 10 OFFSET 0
+    this._limitVal = to - from + 1;
+    this._offsetVal = from;
+    return this;
+  }
+
   single() {
     this._single = true;
     this._limitVal = 1;
     return this;
   }
 
+  // ─── Mutation operators ────────────────────────────────────────────────────
+
   insert(data) {
     this._operation = 'insert';
     this._insertData = data;
@@ -54,16 +117,47 @@ 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}'`;
+    }
+  }
+
   _buildSQL() {
     let sql = '';
 
     if (this._operation === 'select') {
       sql = `SELECT ${this._columns} FROM "${this._table}"`;
-      const whereParts = Object.entries(this._filters).map(([col, val]) =>
-        typeof val === 'string' ? `"${col}" = '${val}'` : `"${col}" = ${val}`
-      );
-      if (whereParts.length) sql += ` WHERE ${whereParts.join(' AND ')}`;
+
+      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(', ');
@@ -76,25 +170,27 @@ class QueryBuilder {
       const setClauses = Object.entries(this._updateData).map(([col, val]) =>
         typeof val === 'string' ? `"${col}" = '${val.replace(/'/g, "''")}'` : `"${col}" = ${val}`
       ).join(', ');
-      const whereParts = Object.entries(this._filters).map(([col, val]) =>
-        typeof val === 'string' ? `"${col}" = '${val}'` : `"${col}" = ${val}`
-      );
       sql = `UPDATE "${this._table}" SET ${setClauses}`;
-      if (whereParts.length) sql += ` WHERE ${whereParts.join(' AND ')}`;
+      if (this._filters.length) {
+        const where = this._filters.map(f => this._filterToSQL(f)).join(' AND ');
+        sql += ` WHERE ${where}`;
+      }
       sql += ` RETURNING *`;
 
     } else if (this._operation === 'delete') {
-      const whereParts = Object.entries(this._filters).map(([col, val]) =>
-        typeof val === 'string' ? `"${col}" = '${val}'` : `"${col}" = ${val}`
-      );
       sql = `DELETE FROM "${this._table}"`;
-      if (whereParts.length) sql += ` WHERE ${whereParts.join(' AND ')}`;
+      if (this._filters.length) {
+        const where = this._filters.map(f => this._filterToSQL(f)).join(' AND ');
+        sql += ` WHERE ${where}`;
+      }
       sql += ` RETURNING *`;
     }
 
     return sql;
   }
 
+  // ─── Executor ──────────────────────────────────────────────────────────────
+
   async _buildAndRun() {
     const sql = this._buildSQL();
     try {
@@ -139,6 +235,9 @@ class OpenbaseClient {
 // ─── Factory ──────────────────────────────────────────────────────────────────
 
 function createClient(baseUrl, apiKey, dbName) {
+  if (!baseUrl) throw new Error('[openbase] Missing baseUrl. Pass your backend URL as the first argument.');
+  if (!apiKey) throw new Error('[openbase] Missing apiKey. Pass your anon or service key as the second argument.');
+  if (!dbName) throw new Error('[openbase] Missing dbName. Pass your database name as the third argument.');
   return new OpenbaseClient(baseUrl, apiKey, dbName);
 }
 

package/package.json

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