@rebasepro/server-core 0.7.0 → 0.8.0

package/dist/utils/sql.d.ts

@@ -0,0 +1,27 @@
+import { SQL } from "drizzle-orm";
+/**
+ * Returns a SQL chunk calling `auth.uid()` — the current user's ID.
+ * This is a Supabase-style helper function created in the `auth` schema
+ * that reads `app.user_id` set per-transaction by `withAuth()`.
+ *
+ * @example
+ * sql`${table.user_id} = ${authUid()}`
+ */
+export declare const authUid: () => SQL;
+/**
+ * Returns a SQL chunk calling `auth.roles()` — the current user's roles
+ * as a comma-separated string.
+ * Reads `app.user_roles` set per-transaction by `withAuth()`.
+ *
+ * @example
+ * sql`auth.roles() ~ 'admin'`
+ */
+export declare const authRoles: () => SQL;
+/**
+ * Returns a SQL chunk calling `auth.jwt()` — the full JWT claims as JSONB.
+ * Reads `app.jwt` set per-transaction by `withAuth()`.
+ *
+ * @example
+ * sql`auth.jwt()->>'sub'`
+ */
+export declare const authJwt: () => SQL;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/server-core",
   "type": "module",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Database-Agnostic Backend Core for Rebase",
   "funding": {
     "url": "https://github.com/sponsors/rebaseco"
@@ -30,13 +30,6 @@
     "backend",
     "database"
   ],
-  "scripts": {
-    "watch": "vite build --watch",
-    "build": "vite build && tsc --emitDeclarationOnly -p tsconfig.prod.json",
-    "test:lint": "eslint \"src/**\" --quiet",
-    "test": "cross-env NODE_OPTIONS=\"--experimental-vm-modules\" jest --passWithNoTests --forceExit",
-    "clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f"
-  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -51,10 +44,6 @@
     "@aws-sdk/s3-request-presigner": "^3.1068.0",
     "@hono/graphql-server": "0.7.0",
     "@hono/node-server": "2.0.4",
-    "@rebasepro/client": "workspace:*",
-    "@rebasepro/common": "workspace:*",
-    "@rebasepro/types": "workspace:*",
-    "@rebasepro/utils": "workspace:*",
     "drizzle-orm": "^0.45.2",
     "google-auth-library": "^10.7.0",
     "graphql": "^16.14.2",
@@ -64,7 +53,11 @@
     "sharp": "^0.35.1",
     "ts-morph": "28.0.0",
     "ws": "^8.21.0",
-    "zod": "^4.4.3"
+    "zod": "^4.4.3",
+    "@rebasepro/client": "0.8.0",
+    "@rebasepro/common": "0.8.0",
+    "@rebasepro/types": "0.8.0",
+    "@rebasepro/utils": "0.8.0"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",
@@ -81,8 +74,23 @@
     "typescript": "^6.0.3",
     "vite": "^8.0.16"
   },
+  "peerDependencies": {
+    "@google-cloud/storage": "^7.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@google-cloud/storage": {
+      "optional": true
+    }
+  },
   "gitHead": "d935eefa5aa8d1009a2398cfac2c1e4ee9aeb6b6",
   "publishConfig": {
     "access": "public"
+  },
+  "scripts": {
+    "watch": "vite build --watch",
+    "build": "vite build && tsc --emitDeclarationOnly -p tsconfig.prod.json",
+    "test:lint": "eslint \"src/**\" --quiet",
+    "test": "cross-env NODE_OPTIONS=\"--experimental-vm-modules\" jest --passWithNoTests --forceExit",
+    "clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f"
   }
-}
+}

package/src/api/graphql/graphql-schema-generator.ts

@@ -11,7 +11,7 @@ import {
     GraphQLInputObjectType,
     GraphQLInputFieldConfig
 } from "graphql";
-import { DataDriver, EntityCollection, FetchCollectionProps, Property, Entity } from "@rebasepro/types";
+import { DataDriver, EntityCollection, FetchCollectionProps, Property, Entity, getCollectionDataPath } from "@rebasepro/types";
 import { isOperationAllowed, type ApiKeyOperation } from "../../auth/api-keys/api-key-permission-guard";
 import type { ApiKeyMasked } from "../../auth/api-keys/api-key-types";
 
@@ -219,7 +219,7 @@ export class GraphQLSchemaGenerator {
                     const ds = ctx?.get?.("driver") as DataDriver | undefined ?? (ctx as Record<string, unknown> | undefined)?.driver as DataDriver | undefined;
                     if (!ds) throw new Error("Scoped driver not available");
                     const entity = await ds.fetchEntity({
-                        path: collection.slug,
+                        path: getCollectionDataPath(collection),
                         entityId: args.id,
                         collection
                     });
@@ -256,7 +256,7 @@ defaultValue: 0 },
                         }
                     }
                     const entities = await ds.fetchCollection({
-                        path: collection.slug,
+                        path: getCollectionDataPath(collection),
                         collection,
                         filter,
                         limit: args.limit,
@@ -321,7 +321,7 @@ defaultValue: 0 },
                     const ds = ctx?.get?.("driver") as DataDriver | undefined ?? (ctx as Record<string, unknown> | undefined)?.driver as DataDriver | undefined;
                     if (!ds) throw new Error("Scoped driver not available");
                     const entity = await ds.saveEntity({
-                        path: collection.slug,
+                        path: getCollectionDataPath(collection),
                         entityId: args.id,
                         values: args.input,
                         collection,
@@ -344,7 +344,7 @@ defaultValue: 0 },
                         const ds = ctx?.get?.("driver") as DataDriver | undefined ?? (ctx as Record<string, unknown> | undefined)?.driver as DataDriver | undefined;
                         if (!ds) throw new Error("Scoped driver not available");
                         const existingEntity = await ds.fetchEntity({
-                            path: collection.slug,
+                            path: getCollectionDataPath(collection),
                             entityId: args.id,
                             collection
                         });

package/src/api/openapi-generator.ts

@@ -491,9 +491,9 @@ function convertPropertyToSchema(property: Property): Record<string, unknown> {
             }
 
             if (sp.email) base.format = "email";
-            if (sp.url) base.format = "uri";
+            if (sp.ui?.url) base.format = "uri";
             if (sp.storage) base.format = "uri";
-            if (sp.markdown) base.description = (base.description || "") + " (Markdown)";
+            if (sp.ui?.markdown) base.description = (base.description || "") + " (Markdown)";
 
             return base;
         }

package/src/api/rest/api-generator.ts

@@ -1,11 +1,11 @@
 import { Hono } from "hono";
-import { AuthAdapter, DataDriver, Entity, EntityCollection, FetchCollectionProps, DataHooks, BackendHookContext, RestFetchService } from "@rebasepro/types";
+import { AuthAdapter, DataDriver, Entity, EntityCollection, RestFetchService, getCollectionDataPath } from "@rebasepro/types";
 import { QueryOptions, HonoEnv } from "../types";
 import { ApiError, isRebaseApiError } from "../errors";
 import { parseQueryOptions } from "./query-parser";
 import { httpMethodToOperation, isOperationAllowed } from "../../auth/api-keys/api-key-permission-guard";
 import type { ApiKeyMasked } from "../../auth/api-keys/api-key-types";
-import { logger } from "../../utils/logger";
+
 
 
 /**
@@ -16,31 +16,21 @@ export class RestApiGenerator {
     private collections: EntityCollection[];
     private router: Hono<HonoEnv>;
     private driver: DataDriver;
-    private dataHooks?: DataHooks;
+
     private authAdapter?: AuthAdapter;
 
     constructor(
         collections: EntityCollection[],
         driver: DataDriver,
-        dataHooks?: DataHooks,
         authAdapter?: AuthAdapter
     ) {
         this.collections = collections;
         this.driver = driver;
-        this.dataHooks = dataHooks;
         this.authAdapter = authAdapter;
         this.router = new Hono<HonoEnv>();
     }
 
-    /** Build a BackendHookContext from a Hono context */
-    private buildHookContext(c: { get: (key: string) => unknown }, method: BackendHookContext["method"]): BackendHookContext {
-        const user = c.get("user") as { userId: string; roles?: string[] } | undefined;
-        return {
-            requestUser: user ? { userId: user.userId,
-roles: user.roles ?? [] } : undefined,
-            method
-        };
-    }
+
 
     /**
      * Generate REST routes using existing DataDriver
@@ -124,7 +114,7 @@ roles: user.roles ?? [] } : undefined,
 
             const driver = this.getScopedDriver(c);
             const fetchService = this.getFetchService(driver);
-            const hookCtx = this.buildHookContext(c, "GET");
+
 
             // Use include-aware path when available
             if (fetchService) {
@@ -132,7 +122,7 @@ roles: user.roles ?? [] } : undefined,
                 let entities = await fetchService.fetchCollectionForRest(
                     collectionPath,
                     {
-                        filter: queryOptions.where as FetchCollectionProps["filter"],
+                        filter: queryOptions.where,
                         limit: queryOptions.limit,
                         offset: queryOptions.offset,
                         orderBy: queryOptions.orderBy?.[0]?.field,
@@ -143,7 +133,7 @@ roles: user.roles ?? [] } : undefined,
                     queryOptions.include
                 );
 
-                entities = await this.applyAfterReadBatch(collection.slug, entities, hookCtx);
+
 
                 const total = await this.countRawEntities(driver, resolvedCollection, queryOptions, searchString);
 
@@ -161,7 +151,7 @@ roles: user.roles ?? [] } : undefined,
             // Fallback path
             let entities = await this.fetchRawCollection(driver, resolvedCollection, queryOptions, searchString);
 
-            entities = await this.applyAfterReadBatch(collection.slug, entities, hookCtx);
+
 
             const total = await this.countRawEntities(driver, resolvedCollection, queryOptions, searchString);
 
@@ -184,7 +174,7 @@ roles: user.roles ?? [] } : undefined,
             const queryOptions = parseQueryOptions(queryDict);
             const driver = this.getScopedDriver(c);
             const fetchService = this.getFetchService(driver);
-            const hookCtx = this.buildHookContext(c, "GET");
+
 
             // Use include-aware path when available
             if (fetchService) {
@@ -199,10 +189,7 @@ roles: user.roles ?? [] } : undefined,
                     throw ApiError.notFound("Entity not found");
                 }
 
-                entity = await this.applyAfterRead(collection.slug, entity, hookCtx);
-                if (!entity) {
-                    throw ApiError.notFound("Entity not found");
-                }
+
 
                 return c.json(entity);
             }
@@ -214,10 +201,7 @@ roles: user.roles ?? [] } : undefined,
                 throw ApiError.notFound("Entity not found");
             }
 
-            entity = await this.applyAfterRead(collection.slug, entity, hookCtx);
-            if (!entity) {
-                throw ApiError.notFound("Entity not found");
-            }
+
 
             return c.json(entity);
         });
@@ -228,13 +212,11 @@ roles: user.roles ?? [] } : undefined,
                 this.enforceApiKeyPermission(c, collection.slug);
                 const driver = this.getScopedDriver(c);
                 const path = collection.slug;
-                const hookCtx = this.buildHookContext(c, "POST");
+
 
                 let body = await c.req.json().catch(() => ({}));
 
-                if (this.dataHooks?.beforeSave) {
-                    body = await this.dataHooks.beforeSave(path, body, undefined, hookCtx);
-                }
+
 
                 const isAuth = collection.auth;
                 const isAuthCollection = isAuth === true || (isAuth && typeof isAuth === "object" && isAuth.enabled === true);
@@ -263,11 +245,7 @@ values: entity.values as Record<string, unknown> },
 
                     const response = this.formatResponse(entity) as Record<string, unknown>;
 
-                    if (this.dataHooks?.afterSave) {
-                        Promise.resolve(this.dataHooks.afterSave(path, response, hookCtx)).catch(err => {
-                            logger.error("[BackendHooks] data.afterSave error", { error: err instanceof Error ? err.message : err });
-                        });
-                    }
+
 
                     return c.json({
                         ...response,
@@ -285,11 +263,7 @@ values: entity.values as Record<string, unknown> },
 
                 const response = this.formatResponse(entity);
 
-                if (this.dataHooks?.afterSave) {
-                    Promise.resolve(this.dataHooks.afterSave(path, response as Record<string, unknown>, hookCtx)).catch(err => {
-                        logger.error("[BackendHooks] data.afterSave error", { error: err instanceof Error ? err.message : err });
-                    });
-                }
+
 
                 return c.json(response, 201);
             } catch (error) {
@@ -315,10 +289,10 @@ values: entity.values as Record<string, unknown> },
                 this.enforceApiKeyPermission(c, collection.slug);
                 const id = c.req.param("id");
                 const driver = this.getScopedDriver(c);
-                const hookCtx = this.buildHookContext(c, "PUT");
+
 
                 const existingEntity = await driver.fetchEntity({
-                    path: collection.slug,
+                    path: getCollectionDataPath(collection),
                     entityId: String(id),
                     collection: resolvedCollection
                 });
@@ -329,12 +303,10 @@ values: entity.values as Record<string, unknown> },
 
                 let body = await c.req.json().catch(() => ({}));
 
-                if (this.dataHooks?.beforeSave) {
-                    body = await this.dataHooks.beforeSave(collection.slug, body, String(id), hookCtx);
-                }
+
 
                 const entity = await driver.saveEntity({
-                    path: collection.slug,
+                    path: getCollectionDataPath(collection),
                     entityId: String(id),
                     values: body,
                     collection: resolvedCollection,
@@ -343,11 +315,7 @@ values: entity.values as Record<string, unknown> },
 
                 const response = this.formatResponse(entity);
 
-                if (this.dataHooks?.afterSave) {
-                    Promise.resolve(this.dataHooks.afterSave(collection.slug, response as Record<string, unknown>, hookCtx)).catch(err => {
-                        logger.error("[BackendHooks] data.afterSave error", { error: err instanceof Error ? err.message : err });
-                    });
-                }
+
 
                 return c.json(response);
             } catch (error) {
@@ -371,10 +339,10 @@ values: entity.values as Record<string, unknown> },
             this.enforceApiKeyPermission(c, collection.slug);
             const id = c.req.param("id");
             const driver = this.getScopedDriver(c);
-            const hookCtx = this.buildHookContext(c, "DELETE");
+
 
             const existingEntity = await driver.fetchEntity({
-                path: collection.slug,
+                path: getCollectionDataPath(collection),
                 entityId: String(id),
                 collection: resolvedCollection
             });
@@ -383,20 +351,14 @@ values: entity.values as Record<string, unknown> },
                 throw ApiError.notFound("Entity not found");
             }
 
-            if (this.dataHooks?.beforeDelete) {
-                await this.dataHooks.beforeDelete(collection.slug, String(id), hookCtx);
-            }
+
 
             await driver.deleteEntity({
                 entity: existingEntity,
                 collection: resolvedCollection
             });
 
-            if (this.dataHooks?.afterDelete) {
-                Promise.resolve(this.dataHooks.afterDelete(collection.slug, String(id), hookCtx)).catch(err => {
-                    logger.error("[BackendHooks] data.afterDelete error", { error: err instanceof Error ? err.message : err });
-                });
-            }
+
 
             return new Response(null, { status: 204 });
         });
@@ -464,7 +426,7 @@ entityId };
 
             this.enforceApiKeyPermission(c, c.req.param("parent"));
 
-            const hookCtx = this.buildHookContext(c, "GET");
+
 
             if (parsed.entityId === "count") {
                 // GET /parent/:parentId/child/count — count child entities
@@ -474,7 +436,7 @@ entityId };
 
                 const total = driver.countEntities ? await driver.countEntities({
                     path: parsed.collectionPath,
-                    filter: queryOptions.where as FetchCollectionProps["filter"],
+                    filter: queryOptions.where,
                     searchString
                 }) : 0;
 
@@ -487,11 +449,7 @@ entityId };
                 });
                 if (!entity) throw ApiError.notFound("Entity not found");
 
-                const flatResult = this.flattenEntity(entity);
-                const hookResult = await this.applyAfterRead(c.req.param("parent"), flatResult, hookCtx);
-                if (!hookResult) throw ApiError.notFound("Entity not found");
-
-                return c.json(hookResult);
+                return c.json(this.flattenEntity(entity));
             } else {
                 // GET /parent/:parentId/child — list entities
                 const queryDict = c.req.queries();
@@ -499,19 +457,18 @@ entityId };
                 const searchString = Array.isArray(queryDict.searchString) ? queryDict.searchString[queryDict.searchString.length - 1] : undefined;
                 const entities = await driver.fetchCollection({
                     path: parsed.collectionPath,
-                    filter: queryOptions.where as FetchCollectionProps["filter"],
+                    filter: queryOptions.where,
                     limit: queryOptions.limit,
                     orderBy: queryOptions.orderBy?.[0]?.field,
                     order: queryOptions.orderBy?.[0]?.direction === "desc" ? "desc" : "asc",
                     searchString
                 });
 
-                let flatEntities = entities.map(e => this.flattenEntity(e));
-                flatEntities = await this.applyAfterReadBatch(c.req.param("parent"), flatEntities, hookCtx);
+                const flatEntities = entities.map(e => this.flattenEntity(e));
 
                 const total = driver.countEntities ? await driver.countEntities({
                     path: parsed.collectionPath,
-                    filter: queryOptions.where as FetchCollectionProps["filter"],
+                    filter: queryOptions.where,
                     searchString
                 }) : flatEntities.length;
 
@@ -536,14 +493,12 @@ entityId };
             if (!parsed || parsed.entityId) return next();
 
             const driver = this.getScopedDriver(c);
-            const hookCtx = this.buildHookContext(c, "POST");
+
 
             this.enforceApiKeyPermission(c, c.req.param("parent"));
             let body = await c.req.json().catch(() => ({}));
 
-            if (this.dataHooks?.beforeSave) {
-                body = await this.dataHooks.beforeSave(parsed.collectionPath, body, undefined, hookCtx);
-            }
+
 
             const entity = await driver.saveEntity({
                 path: parsed.collectionPath,
@@ -553,11 +508,7 @@ entityId };
 
             const response = this.formatResponse(entity);
 
-            if (this.dataHooks?.afterSave) {
-                Promise.resolve(this.dataHooks.afterSave(parsed.collectionPath, response as Record<string, unknown>, hookCtx)).catch(err => {
-                    logger.error("[BackendHooks] data.afterSave error", { error: err instanceof Error ? err.message : err });
-                });
-            }
+
 
             return c.json(response, 201);
         });
@@ -571,15 +522,13 @@ entityId };
             if (!parsed || !parsed.entityId) return next();
 
             const driver = this.getScopedDriver(c);
-            const hookCtx = this.buildHookContext(c, "PUT");
+
 
             this.enforceApiKeyPermission(c, c.req.param("parent"));
 
             let body = await c.req.json().catch(() => ({}));
 
-            if (this.dataHooks?.beforeSave) {
-                body = await this.dataHooks.beforeSave(parsed.collectionPath, body, parsed.entityId, hookCtx);
-            }
+
 
             const entity = await driver.saveEntity({
                 path: parsed.collectionPath,
@@ -590,11 +539,7 @@ entityId };
 
             const response = this.formatResponse(entity);
 
-            if (this.dataHooks?.afterSave) {
-                Promise.resolve(this.dataHooks.afterSave(parsed.collectionPath, response as Record<string, unknown>, hookCtx)).catch(err => {
-                    logger.error("[BackendHooks] data.afterSave error", { error: err instanceof Error ? err.message : err });
-                });
-            }
+
 
             return c.json(response);
         });
@@ -608,7 +553,7 @@ entityId };
             if (!parsed || !parsed.entityId) return next();
 
             const driver = this.getScopedDriver(c);
-            const hookCtx = this.buildHookContext(c, "DELETE");
+
 
             this.enforceApiKeyPermission(c, c.req.param("parent"));
 
@@ -619,17 +564,11 @@ entityId };
 
             if (!existingEntity) throw ApiError.notFound("Entity not found");
 
-            if (this.dataHooks?.beforeDelete) {
-                await this.dataHooks.beforeDelete(parsed.collectionPath, parsed.entityId, hookCtx);
-            }
+
 
             await driver.deleteEntity({ entity: existingEntity });
 
-            if (this.dataHooks?.afterDelete) {
-                Promise.resolve(this.dataHooks.afterDelete(parsed.collectionPath, parsed.entityId, hookCtx)).catch(err => {
-                    logger.error("[BackendHooks] data.afterDelete error", { error: err instanceof Error ? err.message : err });
-                });
-            }
+
 
             return new Response(null, { status: 204 });
         });
@@ -686,9 +625,9 @@ entityId };
      */
     private async fetchRawCollection(driver: DataDriver, collection: EntityCollection, queryOptions: QueryOptions, searchString?: string) {
         const entities = await driver.fetchCollection({
-            path: collection.slug,
+            path: getCollectionDataPath(collection),
             collection,
-            filter: queryOptions.where as FetchCollectionProps["filter"],
+            filter: queryOptions.where,
             limit: queryOptions.limit,
             orderBy: queryOptions.orderBy?.[0]?.field,
             order: queryOptions.orderBy?.[0]?.direction === "desc" ? "desc" : "asc",
@@ -705,9 +644,9 @@ entityId };
      */
     private async countRawEntities(driver: DataDriver, collection: EntityCollection, queryOptions: QueryOptions, searchString?: string): Promise<number> {
         return driver.countEntities ? await driver.countEntities({
-            path: collection.slug,
+            path: getCollectionDataPath(collection),
             collection,
-            filter: queryOptions.where as FetchCollectionProps["filter"],
+            filter: queryOptions.where,
             searchString
         }) : 0;
     }
@@ -717,7 +656,7 @@ entityId };
      */
     private async fetchRawEntity(driver: DataDriver, collection: EntityCollection, entityId: string) {
         const entity = await driver.fetchEntity({
-            path: collection.slug,
+            path: getCollectionDataPath(collection),
             entityId,
             collection
         });
@@ -725,23 +664,5 @@ entityId };
         return entity ? this.flattenEntity(entity) : null;
     }
 
-    /**
-     * Apply data.afterRead hook to a single entity.
-     * Returns the transformed entity, or null to filter it out.
-     */
-    private async applyAfterRead(slug: string, entity: Record<string, unknown>, ctx: BackendHookContext): Promise<Record<string, unknown> | null> {
-        if (!this.dataHooks?.afterRead) return entity;
-        return this.dataHooks.afterRead(slug, entity, ctx);
-    }
 
-    /**
-     * Apply data.afterRead hook to an array of entities, filtering out nulls.
-     */
-    private async applyAfterReadBatch(slug: string, entities: Record<string, unknown>[], ctx: BackendHookContext): Promise<Record<string, unknown>[]> {
-        if (!this.dataHooks?.afterRead) return entities;
-        const results = await Promise.all(
-            entities.map(e => this.applyAfterRead(slug, e, ctx))
-        );
-        return results.filter((e): e is Record<string, unknown> => e !== null);
-    }
 }

package/src/api/rest/query-parser.ts

@@ -1,25 +1,8 @@
-import type { VectorSearchParams, LogicalCondition, FilterCondition } from "@rebasepro/types";
+import type { VectorSearchParams, LogicalCondition, FilterCondition, WhereFilterOp } from "@rebasepro/types";
+import { toCanonicalOp } from "@rebasepro/types";
+export const mapOperator = (op: string) => toCanonicalOp(op) ?? null;
 import { QueryOptions } from "../types";
 
-/**
- * Map PostgREST-style operators to Rebase WhereFilterOp
- */
-export function mapOperator(op: string): string | null {
-    switch (op) {
-        case "eq": return "==";
-        case "neq": return "!=";
-        case "gt": return ">";
-        case "gte": return ">=";
-        case "lt": return "<";
-        case "lte": return "<=";
-        case "in": return "in";
-        case "nin": return "not-in";
-        case "cs": return "array-contains";
-        case "csa": return "array-contains-any";
-        default: return null;
-    }
-}
-
 function getLastValue(val: unknown): unknown {
     if (Array.isArray(val)) {
         return val[val.length - 1];
@@ -60,7 +43,7 @@ value: true };
         valStr = rest;
     }
 
-    const rebaseOp = (mapOperator(op) || "==") as FilterCondition["operator"];
+    const rebaseOp = (toCanonicalOp(op) ?? "==") as FilterCondition["operator"];
     let parsedVal: unknown = valStr;
     if (valStr === "true") parsedVal = true;
     else if (valStr === "false") parsedVal = false;
@@ -158,7 +141,7 @@ export function parseQueryOptions(query: Record<string, unknown>): QueryOptions
         if (reservedQueryKeys.includes(key)) continue;
 
         const rawValues = Array.isArray(rawValue) ? rawValue : [rawValue];
-        const conditions: [string, unknown][] = [];
+        const conditions: [WhereFilterOp, unknown][] = [];
 
         for (const value of rawValues) {
             if (typeof value === "string") {
@@ -166,7 +149,7 @@ export function parseQueryOptions(query: Record<string, unknown>): QueryOptions
                 if (parts.length >= 2) {
                     const op = parts[0];
                     const val = parts.slice(1).join(".");
-                    const rebaseOp = mapOperator(op);
+                    const rebaseOp = toCanonicalOp(op);
 
                     if (rebaseOp) {
                         let parsedVal: string | number | boolean | null | (string | number | boolean | null)[] = val;

package/src/api/types.ts

@@ -1,4 +1,4 @@
-import { EntityCollection, VectorSearchParams, LogicalCondition } from "@rebasepro/types";
+import { EntityCollection, VectorSearchParams, LogicalCondition, FilterValues } from "@rebasepro/types";
 import { AuthResult } from "../auth/middleware";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { DataDriver } from "@rebasepro/types";
@@ -84,7 +84,7 @@ export interface ApiResponse<T = unknown> {
 export interface QueryOptions {
     limit?: number;
     offset?: number;
-    where?: Record<string, unknown>;
+    where?: FilterValues<string>;
     logical?: LogicalCondition;
     orderBy?: Array<{ field: string; direction: "asc" | "desc" }>;
     include?: string[];

package/src/auth/auth-hooks.ts

@@ -190,7 +190,7 @@ export interface AuthHooks {
      * response and returns a (potentially enriched) response.
      *
      * Use cases:
-     * - Inject tokens from external auth systems (Firebase Custom Tokens, etc.)
+     * - Inject tokens from external auth systems (custom provider tokens, etc.)
      * - Add project-specific metadata to the response
      * - Enrich the user object with data from external sources
      *

package/src/auth/builtin-auth-adapter.ts

@@ -56,8 +56,7 @@ export interface BuiltinAuthAdapterConfig {
     /** Default role to assign to new users. */
     defaultRole?: string;
     /** OAuth providers to register. */
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    oauthProviders?: OAuthProvider<any>[];
+    oauthProviders?: OAuthProvider<unknown>[];
     /** Static service key for server-to-server auth. */
     serviceKey?: string;
     /** Auth hooks for customizing password, credentials, lifecycle, etc. */