@rebasepro/server-core 0.2.5 → 0.4.0

package/dist/server-core/src/api/rest/query-parser.d.ts

@@ -1,8 +1,10 @@
+import type { LogicalCondition, FilterCondition } from "@rebasepro/types";
 import { QueryOptions } from "../types";
 /**
  * Map PostgREST-style operators to Rebase WhereFilterOp
  */
 export declare function mapOperator(op: string): string | null;
+export declare function parseLogicalString(str: string): FilterCondition | LogicalCondition;
 /**
  * Parse query parameters into QueryOptions
  */

package/dist/server-core/src/api/types.d.ts

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

package/dist/server-core/src/email/types.d.ts

@@ -19,6 +19,7 @@ export interface SMTPConfig {
         user: string;
         pass: string;
     };
+    name?: string;
 }
 /**
  * Template function for password reset emails

package/dist/server-core/src/init.d.ts

@@ -1,4 +1,4 @@
-import { DataDriver, EntityCollection, BackendBootstrapper, BootstrappedAuth, RealtimeProvider, HealthCheckResult, BackendHooks, AuthAdapter, DatabaseAdapter } from "@rebasepro/types";
+import { AuthAdapter, BackendBootstrapper, BackendHooks, BootstrappedAuth, DatabaseAdapter, DataDriver, EntityCollection, HealthCheckResult, RealtimeProvider, SecurityRule } from "@rebasepro/types";
 import { BackendCollectionRegistry } from "./collections/BackendCollectionRegistry";
 import { DriverRegistry } from "./services/driver-registry";
 import { Server } from "http";
@@ -9,6 +9,22 @@ import { EmailConfig } from "./email";
 import type { OAuthProvider } from "./auth/interfaces";
 import type { AuthHooks } from "./auth/auth-hooks";
 export interface RebaseAuthConfig {
+    /**
+     * The collection that represents auth users.
+     *
+     * When provided, this collection's underlying database table is used
+     * for all auth operations (login, registration, password reset, etc.).
+     *
+     * Import the built-in default:
+     * ```ts
+     * import { defaultUsersCollection } from "@rebasepro/common";
+     * auth: { collection: defaultUsersCollection, jwtSecret: "..." }
+     * ```
+     *
+     * Or pass your own collection with the required auth fields
+     * (email, passwordHash, displayName, etc.).
+     */
+    collection?: EntityCollection;
     jwtSecret?: string;
     accessExpiresIn?: string;
     refreshExpiresIn?: string;
@@ -147,6 +163,20 @@ export interface RebaseBackendConfig {
      */
     storage?: BackendStorageConfig | StorageController | Record<string, BackendStorageConfig | StorageController>;
     history?: unknown;
+    /**
+     * Default security rules applied to any collection that does not define
+     * its own `securityRules`. Opt-in — if not set, collections without
+     * explicit rules remain unrestricted (beyond `requireAuth`).
+     *
+     * @example
+     * ```ts
+     * defaultSecurityRules: [
+     *     { operation: "select", access: "public" },
+     *     { operations: ["insert", "update", "delete"], roles: ["admin"] }
+     * ]
+     * ```
+     */
+    defaultSecurityRules?: SecurityRule[];
     enableSwagger?: boolean;
     functionsDir?: string;
     cronsDir?: string;

package/dist/types/src/controllers/data.d.ts

@@ -16,7 +16,17 @@ import { Entity, EntityValues } from "../types/entities";
  *
  * @group Data
  */
-export type WhereFieldValue = string | number | boolean | null | [WhereFilterOpShort, any];
+export type WhereFieldValue = string | number | boolean | null | [WhereFilterOpShort, any] | [WhereFilterOpShort, any][];
+export type WhereValue<T> = T | T[] | null;
+export interface LogicalCondition {
+    type: "and" | "or";
+    conditions: (FilterCondition | LogicalCondition)[];
+}
+export interface FilterCondition {
+    column: string;
+    operator: FilterOperator;
+    value: unknown;
+}
 /** Short operator strings accepted in the tuple syntax. */
 export type WhereFilterOpShort = "==" | "!=" | ">" | ">=" | "<" | "<=" | "eq" | "neq" | "gt" | "gte" | "lt" | "lte" | "in" | "nin" | "not-in" | "array-contains" | "array-contains-any" | "cs" | "csa";
 export interface FindParams {
@@ -51,6 +61,8 @@ export interface FindParams {
      * ```
      */
     where?: Record<string, WhereFieldValue>;
+    /** Logical grouping conditions (AND/OR) */
+    logical?: LogicalCondition;
     /**
      * Sort order. Format: "field:direction".
      * @example "created_at:desc", "name:asc"
@@ -82,7 +94,8 @@ export type FilterOperator = WhereFilterOpShort;
  * @group Data
  */
 export interface QueryBuilderInterface<M extends Record<string, unknown> = Record<string, unknown>> {
-    where(column: keyof M & string, operator: FilterOperator, value: unknown): this;
+    where<K extends keyof M & string>(column: K, operator: FilterOperator, value: WhereValue<M[K]>): this;
+    where(logicalCondition: LogicalCondition): this;
     orderBy(column: keyof M & string, ascending?: "asc" | "desc"): this;
     limit(count: number): this;
     offset(count: number): this;
@@ -143,7 +156,8 @@ export interface CollectionAccessor<M extends Record<string, unknown> = Record<s
      * Count the number of records matching the given filter.
      */
     count?(params?: FindParams): Promise<number>;
-    where(column: keyof M & string, operator: FilterOperator, value: unknown): QueryBuilderInterface<M>;
+    where<K extends keyof M & string>(column: K, operator: FilterOperator, value: WhereValue<M[K]>): QueryBuilderInterface<M>;
+    where(logicalCondition: LogicalCondition): QueryBuilderInterface<M>;
     orderBy(column: keyof M & string, ascending?: "asc" | "desc"): QueryBuilderInterface<M>;
     limit(count: number): QueryBuilderInterface<M>;
     offset(count: number): QueryBuilderInterface<M>;

package/dist/types/src/controllers/email.d.ts

@@ -31,4 +31,6 @@ export interface EmailService {
     send(options: EmailSendOptions): Promise<void>;
     /** Returns `true` when the service has valid credentials / is ready to send. */
     isConfigured(): boolean;
+    /** Verify connection/credentials with the email provider. */
+    verifyConnection?(): Promise<boolean>;
 }

package/dist/types/src/types/collections.d.ts

@@ -7,7 +7,7 @@ import type { EntityOverrides } from "./entity_overrides";
 import type { User } from "../users";
 import type { RebaseContext } from "../rebase_context";
 import type { Relation } from "./relations";
-import type { EntityCustomView, EntityDetailViewConfig } from "./entity_views";
+import type { EntityCustomView, FormViewConfig } from "./entity_views";
 import type { EntityAction } from "./entity_actions";
 import type { ComponentRef } from "./component_ref";
 /**
@@ -124,10 +124,14 @@ export interface BaseEntityCollection<M extends Record<string, unknown> = Record
      */
     defaultEntityAction?: "view" | "edit";
     /**
-     * Customization options for the read-only detail view.
-     * Only used when `defaultEntityAction` is `"view"`.
+     * Replace the default entity form with a custom component.
+     * The Builder receives the same props as entity view tabs
+     * (entity, formContext, collection, etc.) and has full control over the UI.
+     *
+     * Works in both edit mode and read-only mode (when `defaultEntityAction`
+     * is `"view"`). In read-only mode, `formContext.readOnly` will be `true`.
      */
-    detailView?: EntityDetailViewConfig;
+    formView?: FormViewConfig;
     /**
      * Prevent default actions from being displayed or executed on this collection.
      */
@@ -566,7 +570,7 @@ export type WhereFilterOp = "<" | "<=" | "==" | "!=" | ">=" | ">" | "array-conta
  *
  * @group Models
  */
-export type FilterValues<Key extends string> = Partial<Record<Key, [WhereFilterOp, unknown]>>;
+export type FilterValues<Key extends string> = Partial<Record<Key, [WhereFilterOp, unknown] | [WhereFilterOp, unknown][]>>;
 /**
  * A pre-defined filter preset for quick access in the collection toolbar.
  * Users can select a preset to instantly apply a set of filters and

package/dist/types/src/types/entity_views.d.ts

@@ -56,41 +56,32 @@ export type EntityCustomView<M extends Record<string, unknown> = Record<string,
     Builder?: ComponentRef<EntityCustomViewParams<M>>;
     position?: "start" | "end";
 };
-export interface EntityCustomViewParams<M extends Record<string, unknown> = Record<string, unknown>> {
-    collection: EntityCollection<M>;
-    entity?: Entity<M>;
-    modifiedValues?: EntityValues<M>;
-    formContext: FormContext<M>;
-    parentCollectionSlugs?: string[];
-    parentEntityIds?: string[];
-}
 /**
- * Configuration for customizing the read-only detail view of an entity.
- * Only used when `defaultEntityAction` is set to `"view"` on the collection.
+ * Configuration to replace the default entity form with a custom component.
+ * The Builder receives the same props as entity view tabs (entity, formContext, etc.)
+ * and has full control over the UI.
+ *
+ * The form tab still appears in the tab bar but renders your Builder
+ * instead of the auto-generated field form.
+ *
  * @group Models
  */
-export type EntityDetailViewConfig<M extends Record<string, unknown> = Record<string, unknown>> = {
-    /**
-     * Custom component rendered above the property display in the detail view.
-     */
-    Header?: ComponentRef<EntityDetailViewParams<M>>;
+export type FormViewConfig<M extends Record<string, unknown> = Record<string, unknown>> = {
     /**
-     * Custom component rendered below the property display in the detail view.
+     * Custom component that replaces the default form.
      */
-    Footer?: ComponentRef<EntityDetailViewParams<M>>;
+    Builder: ComponentRef<EntityCustomViewParams<M>>;
     /**
-     * Completely replace the default detail view with a custom component.
-     * When set, Header and Footer are ignored.
+     * If true, the save/delete action bar is rendered alongside the custom view.
+     * Defaults to true.
      */
-    Builder?: ComponentRef<EntityDetailViewParams<M>>;
+    includeActions?: boolean;
 };
-/**
- * Props passed to detail view customization components (Header, Footer, Builder).
- * @group Models
- */
-export interface EntityDetailViewParams<M extends Record<string, unknown> = Record<string, unknown>> {
+export interface EntityCustomViewParams<M extends Record<string, unknown> = Record<string, unknown>> {
     collection: EntityCollection<M>;
-    entity: Entity<M>;
-    path: string;
-    onEditClick: () => void;
+    entity?: Entity<M>;
+    modifiedValues?: EntityValues<M>;
+    formContext: FormContext<M>;
+    parentCollectionSlugs?: string[];
+    parentEntityIds?: string[];
 }

package/dist/types/src/types/properties.d.ts

@@ -104,8 +104,8 @@ export interface BaseUIConfig<CustomProps = unknown> {
     disabled?: boolean | PropertyDisabledConfig;
     widthPercentage?: number;
     customProps?: CustomProps;
-    Field?: ComponentRef;
-    Preview?: ComponentRef;
+    Field?: ComponentRef<any>;
+    Preview?: ComponentRef<any>;
 }
 export interface BaseProperty<CustomProps = unknown> {
     ui?: BaseUIConfig<CustomProps>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/server-core",
   "type": "module",
-  "version": "0.2.5",
+  "version": "0.4.0",
   "description": "Database-Agnostic Backend Core for Rebase",
   "funding": {
     "url": "https://github.com/sponsors/rebaseco"
@@ -54,10 +54,10 @@
     "ts-morph": "27.0.2",
     "ws": "^8.20.1",
     "zod": "^3.25.76",
-    "@rebasepro/client": "0.2.5",
-    "@rebasepro/common": "0.2.5",
-    "@rebasepro/utils": "0.2.5",
-    "@rebasepro/types": "0.2.5"
+    "@rebasepro/client": "0.4.0",
+    "@rebasepro/common": "0.4.0",
+    "@rebasepro/utils": "0.4.0",
+    "@rebasepro/types": "0.4.0"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",

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

@@ -87,9 +87,9 @@ export class RestApiGenerator {
         // GET /collection/count - Count entities (with optional filters)
         this.router.get(`${basePath}/count`, async (c) => {
             this.enforceApiKeyPermission(c, collection.slug);
-            const queryDict = c.req.query();
+            const queryDict = c.req.queries();
             const queryOptions = parseQueryOptions(queryDict);
-            const searchString = queryDict.searchString as string | undefined;
+            const searchString = Array.isArray(queryDict.searchString) ? queryDict.searchString[queryDict.searchString.length - 1] : undefined;
             const driver = c.get("driver") || this.driver;
 
             const total = await this.countRawEntities(driver, resolvedCollection, queryOptions, searchString);
@@ -99,9 +99,9 @@ export class RestApiGenerator {
         // GET /collection - List entities
         this.router.get(basePath, async (c) => {
             this.enforceApiKeyPermission(c, collection.slug);
-            const queryDict = c.req.query();
+            const queryDict = c.req.queries();
             const queryOptions = parseQueryOptions(queryDict);
-            const searchString = queryDict.searchString as string | undefined;
+            const searchString = Array.isArray(queryDict.searchString) ? queryDict.searchString[queryDict.searchString.length - 1] : undefined;
 
             const driver = c.get("driver") || this.driver;
             const fetchService = this.getFetchService(driver);
@@ -161,7 +161,7 @@ export class RestApiGenerator {
         this.router.get(`${basePath}/:id`, async (c) => {
             this.enforceApiKeyPermission(c, collection.slug);
             const id = c.req.param("id");
-            const queryDict = c.req.query();
+            const queryDict = c.req.queries();
             const queryOptions = parseQueryOptions(queryDict);
             const driver = c.get("driver") || this.driver;
             const fetchService = this.getFetchService(driver);
@@ -388,13 +388,14 @@ entityId };
 
             if (parsed.entityId === "count") {
                 // GET /parent/:parentId/child/count — count child entities
-                const queryDict = c.req.query();
+                const queryDict = c.req.queries();
                 const queryOptions = parseQueryOptions(queryDict);
+                const searchString = Array.isArray(queryDict.searchString) ? queryDict.searchString[queryDict.searchString.length - 1] : undefined;
                 
                 const total = driver.countEntities ? await driver.countEntities({
                     path: parsed.collectionPath,
                     filter: queryOptions.where as FetchCollectionProps["filter"],
-                    searchString: queryDict.searchString as string | undefined
+                    searchString
                 }) : 0;
                 
                 return c.json({ count: total });
@@ -408,15 +409,16 @@ entityId };
                 return c.json(this.flattenEntity(entity));
             } else {
                 // GET /parent/:parentId/child — list entities
-                const queryDict = c.req.query();
+                const queryDict = c.req.queries();
                 const queryOptions = parseQueryOptions(queryDict);
+                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"],
                     limit: queryOptions.limit,
                     orderBy: queryOptions.orderBy?.[0]?.field,
                     order: queryOptions.orderBy?.[0]?.direction === "desc" ? "desc" : "asc",
-                    searchString: queryDict.searchString as string | undefined
+                    searchString
                 });
                 return c.json({
                     data: entities.map(e => this.flattenEntity(e)),