@linabase/js 0.1.1 → 0.2.1

package/dist/index.js

@@ -19,9 +19,11 @@ var DatabaseClient = class {
   }
   // ─── Query Methods ──────────────────────────────────────
   /** Select columns. Supports nested joins: "*, comments(*)" and aliases: "full_name:name" */
-  select(columns) {
+  select(columns, options) {
     this.method = "GET";
     if (columns) this.params.set("select", columns);
+    if (options?.count) this.preferHeaders.push(`count=${options.count}`);
+    if (options?.head) this.method = "GET";
     return this;
   }
   insert(data) {
@@ -38,6 +40,9 @@ var DatabaseClient = class {
     this.preferHeaders.push(
       options?.ignoreDuplicates ? "resolution=ignore-duplicates" : "resolution=merge-duplicates"
     );
+    if (options?.onConflict) {
+      this.params.set("on_conflict", options.onConflict);
+    }
     return this;
   }
   update(data) {
@@ -84,9 +89,15 @@ var DatabaseClient = class {
     this.params.set(column, `ilike.${pattern}`);
     return this;
   }
-  /** Regex match (~) */
-  match(column, pattern) {
-    this.params.set(column, `match.${pattern}`);
+  /** Regex match (~) when called with (column, pattern). Object-based multi-column filter when called with ({ col: val }). */
+  match(columnOrFilter, pattern) {
+    if (typeof columnOrFilter === "object") {
+      for (const [key, value] of Object.entries(columnOrFilter)) {
+        this.eq(key, value);
+      }
+    } else if (pattern !== void 0) {
+      this.params.set(columnOrFilter, `match.${pattern}`);
+    }
     return this;
   }
   /** Case-insensitive regex match (~*) */
@@ -116,7 +127,8 @@ var DatabaseClient = class {
   }
   // ─── Null/Boolean ───────────────────────────────────────
   is(column, value) {
-    this.params.set(column, `is.${value}`);
+    const v = value === null ? "null" : String(value);
+    this.params.set(column, `is.${v}`);
     return this;
   }
   /** IS DISTINCT FROM */
@@ -308,8 +320,13 @@ var DatabaseClient = class {
       this.reset();
     }
   }
-  then(resolve, reject) {
-    return this.execute().then(resolve, reject);
+  /**
+   * Makes DatabaseClient thenable (await-able). Resolves to
+   * `{ data, error, count }` where data is permissively typed so
+   * callers can access properties without generated database types.
+   */
+  then(onfulfilled, onrejected) {
+    return this.execute().then(onfulfilled, onrejected);
   }
 };
 var RpcClient = class {
@@ -423,7 +440,7 @@ var BucketClient = class {
         `/storage/${this.bucket}/${path}`
       );
       if (!res.ok) {
-        const err = await res.json().catch(() => ({}));
+        const err = await res.json().catch(() => ({ message: `Request failed (${res.status})` }));
         return { data: null, error: err };
       }
       const blob = await res.blob();
@@ -432,30 +449,37 @@ var BucketClient = class {
       return { data: null, error: { message: err.message } };
     }
   }
-  async list() {
+  async list(prefix) {
     try {
-      const res = await this.request(
-        `/api/storage/objects?bucketName=${this.bucket}`
-      );
+      let url = `/api/storage/objects?bucketName=${this.bucket}`;
+      if (prefix) url += `&prefix=${encodeURIComponent(prefix)}`;
+      const res = await this.request(url);
       const data = await res.json();
       return { data: data.objects || [], error: null };
     } catch (err) {
       return { data: [], error: { message: err.message } };
     }
   }
-  async remove(path) {
+  async remove(pathOrPaths) {
+    const paths = Array.isArray(pathOrPaths) ? pathOrPaths : [pathOrPaths];
     try {
-      const res = await this.request(
-        `/storage/${this.bucket}/${path}`,
-        { method: "DELETE" }
+      const results = await Promise.all(
+        paths.map(async (p) => {
+          const res = await this.request(
+            `/storage/${this.bucket}/${p}`,
+            { method: "DELETE" }
+          );
+          if (!res.ok) {
+            const data = await res.json().catch(() => ({ message: `Request failed (${res.status})` }));
+            return { error: data };
+          }
+          return { error: null };
+        })
       );
-      if (!res.ok) {
-        const data = await res.json().catch(() => ({}));
-        return { error: data };
-      }
-      return { error: null };
+      const firstError = results.find((r) => r.error);
+      return { data: firstError ? null : paths, error: firstError?.error ?? null };
     } catch (err) {
-      return { error: { message: err.message } };
+      return { data: null, error: { message: err.message } };
     }
   }
   getPublicUrl(path, options) {
@@ -529,7 +553,7 @@ var BucketClient = class {
         body: JSON.stringify({ from: fromPath, to: toPath })
       });
       if (!res.ok) {
-        const data = await res.json().catch(() => ({}));
+        const data = await res.json().catch(() => ({ message: `Request failed (${res.status})` }));
         return { error: data };
       }
       return { error: null };
@@ -544,7 +568,7 @@ var BucketClient = class {
         body: JSON.stringify({ from: fromPath, to: toPath })
       });
       if (!res.ok) {
-        const data = await res.json().catch(() => ({}));
+        const data = await res.json().catch(() => ({ message: `Request failed (${res.status})` }));
         return { error: data };
       }
       return { error: null };
@@ -567,9 +591,15 @@ var AuthClient = class {
   constructor(request) {
     this.request = request;
   }
+  /**
+   * Set (or clear) the current session. Use this to restore a persisted
+   * session on app launch (e.g., from AsyncStorage / SecureStore).
+   * Emits INITIAL_SESSION to onAuthStateChange listeners.
+   */
   setSession(session) {
     this.currentSession = session;
     if (this.onSessionChange) this.onSessionChange(session);
+    this.emit("INITIAL_SESSION", session);
   }
   // ─── Email/Password ────────────────────────────────────────
   async signUp(params) {
@@ -608,6 +638,27 @@ var AuthClient = class {
   async signInWithPassword(params) {
     return this.signIn(params);
   }
+  // ─── ID Token (Mobile OAuth) ────────────────────────────────
+  async signInWithIdToken(params) {
+    try {
+      const res = await this.request("/auth/v1/token?grant_type=id_token", {
+        method: "POST",
+        body: JSON.stringify({
+          provider: params.provider,
+          id_token: params.token,
+          nonce: params.nonce
+        })
+      });
+      const data = await res.json();
+      if (!res.ok) return { data: null, error: data };
+      const session = this.parseAuthResponse(data);
+      this.setSession(session);
+      this.emit("SIGNED_IN", session);
+      return { data: session, error: null };
+    } catch (err) {
+      return { data: null, error: { message: err.message } };
+    }
+  }
   // ─── OAuth ─────────────────────────────────────────────────
   signInWithOAuth(params) {
     const queryParams = new URLSearchParams({ provider: params.provider });
@@ -804,7 +855,7 @@ var AuthClient = class {
             method: "DELETE"
           });
           if (!res.ok) {
-            const data = await res.json().catch(() => ({}));
+            const data = await res.json().catch(() => ({ message: `Request failed (${res.status})` }));
             return { error: data };
           }
           return { error: null };
@@ -862,7 +913,7 @@ var AuthClient = class {
             method: "DELETE"
           });
           if (!res.ok) {
-            const data = await res.json().catch(() => ({}));
+            const data = await res.json().catch(() => ({ message: `Request failed (${res.status})` }));
             return { error: data };
           }
           return { error: null };
@@ -897,17 +948,53 @@ var AuthClient = class {
     }
   }
   parseAuthResponse(data) {
+    const user = data.user || {};
     return {
       access_token: data.session?.access_token || data.access_token,
       refresh_token: data.session?.refresh_token || data.refresh_token,
       token_type: data.session?.token_type || data.token_type || "bearer",
       expires_in: data.session?.expires_in || data.expires_in || 3600,
       expires_at: data.session?.expires_at || data.expires_at || Math.floor(Date.now() / 1e3) + 3600,
-      user: data.user || {}
+      user: {
+        ...user,
+        // Supabase-compatible alias
+        user_metadata: user.raw_user_meta_data || user.user_metadata || {}
+      }
     };
   }
 };
 
+// src/functions.ts
+var FunctionsClient = class {
+  request;
+  constructor(request) {
+    this.request = request;
+  }
+  async invoke(name, options) {
+    try {
+      const method = options?.method || "POST";
+      const init = { method, headers: options?.headers };
+      if (options?.body && method !== "GET") {
+        init.body = JSON.stringify(options.body);
+      }
+      let path = `/functions/v1/${name}`;
+      if (options?.body && method === "GET") {
+        const params = new URLSearchParams();
+        for (const [k, v] of Object.entries(options.body)) {
+          if (v !== void 0 && v !== null) params.set(k, String(v));
+        }
+        path += `?${params}`;
+      }
+      const res = await this.request(path, init);
+      const data = await res.json();
+      if (!res.ok) return { data: null, error: data };
+      return { data, error: null };
+    } catch (err) {
+      return { data: null, error: { message: err.message } };
+    }
+  }
+};
+
 // src/client.ts
 function createClient(config) {
   const baseUrl = config.url.replace(/\/$/, "");
@@ -931,36 +1018,67 @@ function createClient(config) {
       headers: mergedHeaders
     });
   }
-  const rpcClient = new RpcClient(request);
   const authClient = new AuthClient(request);
   authClient.onSessionChange = (session) => {
     accessToken = session?.access_token || null;
   };
-  return {
-    from: (table) => new DatabaseClient(request, table),
-    schema: (schemaName) => ({
-      from: (table) => {
-        const client = new DatabaseClient(request, table);
-        client._schema = schemaName;
-        return client;
+  function buildClient(reqFn, branchSlug) {
+    const rc = new RpcClient(reqFn);
+    const ac = new AuthClient(reqFn);
+    ac.onSessionChange = (session) => {
+      accessToken = session?.access_token || null;
+    };
+    return {
+      from: (table) => new DatabaseClient(reqFn, table),
+      schema: (schemaName) => ({
+        from: (table) => {
+          const client = new DatabaseClient(reqFn, table);
+          client._schema = schemaName;
+          return client;
+        }
+      }),
+      rpc: (fn, args) => rc.call(fn, args),
+      storage: new StorageClient(reqFn, baseUrl),
+      auth: branchSlug ? authClient : ac,
+      functions: new FunctionsClient(reqFn),
+      /** Realtime channel (stub; not yet supported). Returns a chainable no-op. */
+      channel: (_name) => {
+        const noop = { on: () => noop, subscribe: () => noop, unsubscribe: () => {
+        } };
+        return noop;
+      },
+      /** Remove a realtime channel (stub; not yet supported). */
+      removeChannel: (_channel) => {
+      },
+      generateTypes: async () => {
+        const restUrl = baseUrl.replace(/:3100/, ":3107");
+        const headers = { Authorization: `Bearer ${apiKey}` };
+        if (branchSlug) headers["X-Branch"] = branchSlug;
+        const res = await fetch(`${restUrl}/rest/v1/types`, { headers });
+        return res.text();
+      },
+      branch: (slug) => {
+        if (branchSlug) throw new Error("Cannot nest branch() calls");
+        function branchRequest(path, options = {}) {
+          return reqFn(path, {
+            ...options,
+            headers: {
+              ...options.headers,
+              "X-Branch": slug
+            }
+          });
+        }
+        return buildClient(branchRequest, slug);
       }
-    }),
-    rpc: (fn, args) => rpcClient.call(fn, args),
-    storage: new StorageClient(request, baseUrl),
-    auth: authClient,
-    generateTypes: async () => {
-      const restUrl = baseUrl.replace(/:3100/, ":3107");
-      const res = await fetch(`${restUrl}/rest/v1/types`, {
-        headers: { Authorization: `Bearer ${apiKey}` }
-      });
-      return res.text();
-    }
-  };
+    };
+  }
+  return buildClient(request);
 }
 export {
   AuthClient,
   BucketClient,
   DatabaseClient,
+  FunctionsClient,
   RpcClient,
   StorageClient,
   createClient

package/package.json

@@ -1,14 +1,16 @@
 {
   "name": "@linabase/js",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "JavaScript/TypeScript client SDK for Linabase (database, storage, auth)",
   "license": "MIT",
   "type": "module",
-  "main": "./dist/index.js",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "import": "./dist/index.js",
+      "require": "./dist/index.cjs",
       "types": "./dist/index.d.ts"
     }
   },
@@ -47,6 +49,7 @@
     "@linabase/db": "workspace:*",
     "@linabase/rest-api": "workspace:*",
     "@types/pg": "^8.11.0",
+    "@vitest/coverage-v8": "^3.2.4",
     "pg": "^8.13.0",
     "tsup": "^8.3.0",
     "typescript": "^5.7.0",