@rebasepro/types 0.6.1 → 0.8.0

package/dist/types/properties.d.ts

@@ -44,6 +44,16 @@ export type FirebaseProperty = Exclude<Property, RelationProperty>;
 export type FirebaseProperties = {
     [key: string]: FirebaseProperty;
 };
+export type MongoProperty = Exclude<Property, RelationProperty>;
+export type MongoProperties = {
+    [key: string]: MongoProperty;
+};
+/**
+ * Union of all engine-specific property maps. Use this at engine-agnostic
+ * boundaries (collection editor, normalization) where the concrete engine is
+ * unknown but the narrowed property constraint must be satisfied.
+ */
+export type EngineProperties = PostgresProperties | FirebaseProperties | MongoProperties;
 /**
  * A helper type to infer the underlying data type from a Property definition.
  * This is the core of the type inference system.
@@ -140,10 +150,6 @@ export interface BaseProperty<CustomProps = unknown> {
      * Rules for validating this property
      */
     validation?: PropertyValidationSchema;
-    /**
-     * This value will be set by default for new entities.
-     */
-    defaultValue?: unknown;
     /**
      * Use this to define dynamic properties that change based on certain conditions
      * or on the entity's values. For example, you can make a field read-only if
@@ -167,20 +173,48 @@ export interface BaseProperty<CustomProps = unknown> {
      * Callbacks/Hooks for this property field to transform and sanitize data during its lifecycle.
      */
     callbacks?: PropertyCallbacks;
+    /**
+     * Arbitrary key-value metadata for external consumers.
+     * Not interpreted by Rebase — passed through serialization unchanged.
+     * Used by domain apps to store custom per-property config
+     * (e.g. CRM visibility flags, display hints).
+     */
+    metadata?: Record<string, unknown>;
 }
 /**
  * @group Entity properties
  */
 export interface StringUIConfig extends BaseUIConfig {
+    /**
+     * Is this string property long enough so it should be displayed in
+     * a multiple line field. Defaults to false. If set to true,
+     * the number of lines adapts to the content
+     */
     multiline?: boolean;
+    /**
+     * Should this string property be displayed as a markdown field. If true,
+     * the field is rendered as a text editor that supports markdown highlight
+     * syntax. It also includes a preview of the result.
+     */
     markdown?: boolean;
+    /**
+     * Should this string be rendered as a tag instead of just text.
+     */
     previewAsTag?: boolean;
     clearable?: boolean;
+    /**
+     * If the value of this property is a URL, you can set this flag to true
+     * to add a link, or one of the supported media types to render a preview
+     */
     url?: boolean | PreviewType;
 }
 export interface StringProperty extends BaseProperty {
     ui?: StringUIConfig;
     type: "string";
+    /**
+     * Default value for new entities. Must be a string.
+     */
+    defaultValue?: string;
     /**
      * Optional database column type. If not set, it defaults to `varchar` or `uuid` depending on `isId` configuration.
      * Use `text` for strings with unbound length, `char` for fixed-length strings, or `varchar` for variable-length strings with a limit.
@@ -215,18 +249,6 @@ export interface StringProperty extends BaseProperty {
      *
      */
     enum?: EnumValues;
-    /**
-     * Is this string property long enough so it should be displayed in
-     * a multiple line field. Defaults to false. If set to true,
-     * the number of lines adapts to the content
-     */
-    multiline?: boolean;
-    /**
-     * Should this string property be displayed as a markdown field. If true,
-     * the field is rendered as a text editors that supports markdown highlight
-     * syntax. It also includes a preview of the result.
-     */
-    markdown?: boolean;
     /**
      * You can specify a `Storage` configuration. It is used to
      * indicate that this string refers to a path in your storage provider.
@@ -236,31 +258,15 @@ export interface StringProperty extends BaseProperty {
      * This property is used to indicate that the string is a user ID, and
      * it will be rendered as a user picker.
      * Note that the user ID needs to be the one used in your authentication
-     * provider, e.g. Firebase Auth.
+     * provider (e.g. the ID in your `users` table).
      * You can also use a property builder to specify the user path dynamically
      * based on other values of the entity.
      */
     userSelect?: boolean;
-    /**
-     * If the value of this property is a URL, you can set this flag to true
-     * to add a link, or one of the supported media types to render a preview
-     */
-    url?: boolean | PreviewType;
     /**
      * Does this field include an email
      */
     email?: boolean;
-    /**
-     * Should this string be rendered as a tag instead of just text.
-     */
-    previewAsTag?: boolean;
-    /**
-     * You can use this property (a string) to behave as a reference to another
-     * collection. The stored value is the ID of the entity in the
-     * collection, and the `path` prop is used to
-     * define the collection this reference points to.
-     */
-    reference?: ReferenceProperty;
 }
 /**
  * @group Entity properties
@@ -271,6 +277,10 @@ export interface NumberUIConfig extends BaseUIConfig {
 export interface NumberProperty extends BaseProperty {
     ui?: NumberUIConfig;
     type: "number";
+    /**
+     * Default value for new entities. Must be a number.
+     */
+    defaultValue?: number;
     /**
      * Optional database column type. Allows specifying exact database numeric types.
      * If not provided, integer fields (where validation.integer is true or isId is true) default to `integer`, others to `numeric`.
@@ -304,6 +314,10 @@ export interface NumberProperty extends BaseProperty {
 export interface BooleanProperty extends BaseProperty {
     ui?: BaseUIConfig;
     type: "boolean";
+    /**
+     * Default value for new entities. Must be a boolean.
+     */
+    defaultValue?: boolean;
     /**
      * Rules for validating this property
      */
@@ -318,6 +332,10 @@ export interface VectorUIConfig extends BaseUIConfig {
 export interface VectorProperty extends BaseProperty {
     ui?: VectorUIConfig;
     type: "vector";
+    /**
+     * Default value for new entities.
+     */
+    defaultValue?: Vector;
     dimensions: number;
     validation?: PropertyValidationSchema;
 }
@@ -326,17 +344,28 @@ export interface VectorProperty extends BaseProperty {
  */
 export interface BinaryProperty extends BaseProperty {
     type: "binary";
+    /**
+     * Default value for new entities. Must be a base64-encoded string.
+     */
+    defaultValue?: string;
     validation?: PropertyValidationSchema;
 }
 /**
  * @group Entity properties
  */
 export interface DateUIConfig extends BaseUIConfig {
+    /**
+     * Add an icon to clear the value and set it to `null`. Defaults to `false`
+     */
     clearable?: boolean;
 }
 export interface DateProperty extends BaseProperty {
     ui?: DateUIConfig;
     type: "date";
+    /**
+     * Default value for new entities. Must be a Date.
+     */
+    defaultValue?: Date;
     /**
      * Optional database column type. If not set, defaults to `timestamp` with timezone.
      */
@@ -362,10 +391,6 @@ export interface DateProperty extends BaseProperty {
      * `updated_on` fields
      */
     autoValue?: "on_create" | "on_update";
-    /**
-     * Add an icon to clear the value and set it to `null`. Defaults to `false`
-     */
-    clearable?: boolean;
 }
 /**
  * @group Entity properties
@@ -373,6 +398,10 @@ export interface DateProperty extends BaseProperty {
 export interface GeopointProperty extends BaseProperty {
     ui?: BaseUIConfig;
     type: "geopoint";
+    /**
+     * Default value for new entities. Must be a GeoPoint.
+     */
+    defaultValue?: GeoPoint;
     /**
      * Rules for validating this property
      */
@@ -384,9 +413,29 @@ export interface GeopointProperty extends BaseProperty {
 export interface ReferenceUIConfig extends BaseUIConfig {
     previewProperties?: string[];
 }
+/**
+ * A pointer to an entity, stored **as a value** on the row (id + path, and
+ * optionally a `driver`/`databaseId` for cross-datasource pointers).
+ *
+ * This is the native primitive of **document databases** — it maps 1:1 to a
+ * Firestore `DocumentReference`, and is persisted by the MongoDB driver as a
+ * tagged sub-document. It carries no schema-level relationship (no foreign key,
+ * no join, no cascade) and is resolved on demand.
+ *
+ * **Which to use:**
+ * - Firestore / MongoDB collection → use `reference`.
+ * - Postgres collection → use {@link RelationProperty} (`type: "relation"`),
+ *   which models a real foreign key / join with prefetch and cascade.
+ *
+ * @group Entity properties
+ */
 export interface ReferenceProperty extends BaseProperty {
     ui?: ReferenceUIConfig;
     type: "reference";
+    /**
+     * Default value for new entities. Must be an EntityReference.
+     */
+    defaultValue?: EntityReference;
     /**
      * Marks this field as a Primary Key / Unique Identifier.
      * Framework behavior: Auto-maps to `collection.primaryKeys` internally if not explicitly set.
@@ -425,9 +474,29 @@ export interface RelationUIConfig extends BaseUIConfig {
     previewProperties?: string[];
     widget?: "select" | "dialog";
 }
+/**
+ * A schema-level relationship between collections **within a single
+ * datasource** — backed by a foreign key, junction table, or explicit join
+ * path. The resolved value (an `EntityRelation`) can carry a prefetched entity
+ * payload to eliminate N+1 queries, and supports `onUpdate`/`onDelete` cascade.
+ *
+ * This is the native primitive of **relational databases** (Postgres). It is
+ * the SQL counterpart to {@link ReferenceProperty}.
+ *
+ * **Which to use:**
+ * - Postgres collection → use `relation`.
+ * - Firestore / MongoDB collection → use {@link ReferenceProperty}
+ *   (`type: "reference"`), a stored pointer with no join engine.
+ *
+ * @group Entity properties
+ */
 export interface RelationProperty extends BaseProperty {
     ui?: RelationUIConfig;
     type: "relation";
+    /**
+     * Default value for new entities. Must be an EntityRelation or array of EntityRelation.
+     */
+    defaultValue?: EntityRelation | EntityRelation[];
     /**
      * Marks this field as a Primary Key / Unique Identifier.
      * Framework behavior: Auto-maps to `collection.primaryKeys` internally if not explicitly set.
@@ -540,6 +609,10 @@ export interface ArrayUIConfig extends BaseUIConfig {
 export interface ArrayProperty extends BaseProperty {
     ui?: ArrayUIConfig;
     type: "array";
+    /**
+     * Default value for new entities. Must be an array.
+     */
+    defaultValue?: unknown[];
     /**
      * Optional database column type. By default, maps to a native Postgres array
      * (e.g. `text[]`, `integer[]`/`numeric[]`, `boolean[]`) if the element type
@@ -617,6 +690,10 @@ export interface MapUIConfig extends BaseUIConfig {
 export interface MapProperty extends BaseProperty {
     ui?: MapUIConfig;
     type: "map";
+    /**
+     * Default value for new entities. Must be a record/object.
+     */
+    defaultValue?: Record<string, unknown>;
     /**
      * Optional database column type. Defaults to `jsonb`.
      */
@@ -794,6 +871,14 @@ export interface ArrayPropertyValidationSchema extends PropertyValidationSchema
  * @group Entity properties
  */
 export type StorageConfig = {
+    /**
+     * Key referencing a named storage backend from the StorageRegistry.
+     * Must match a `StorageSourceDefinition.key` or a key registered
+     * in `initializeRebaseBackend({ storage: { ... } })`.
+     *
+     * When omitted, the default storage source is used.
+     */
+    storageSource?: string;
     /**
      * File MIME types that can be uploaded to this reference. Don't specify for
      * all.

package/dist/types/property_config.d.ts

@@ -70,5 +70,5 @@ export type PropertyConfig = {
      */
     description?: string;
 };
-export type PropertyConfigId = "text_field" | "multiline" | "markdown" | "url" | "email" | "user_select" | "select" | "multi_select" | "number_input" | "number_select" | "multi_number_select" | "file_upload" | "multi_file_upload" | "group" | "key_value" | "reference" | "reference_as_string" | "multi_references" | "relation" | "switch" | "date_time" | "repeat" | "custom_array" | "block" | "vector_input";
+export type PropertyConfigId = "text_field" | "multiline" | "markdown" | "url" | "email" | "user_select" | "select" | "multi_select" | "number_input" | "number_select" | "multi_number_select" | "file_upload" | "multi_file_upload" | "group" | "key_value" | "reference" | "multi_references" | "relation" | "switch" | "date_time" | "repeat" | "custom_array" | "block" | "vector_input";
 export {};

package/dist/types/storage_source.d.ts

@@ -0,0 +1,83 @@
+/**
+ * Describes a named storage backend — a place files live.
+ *
+ * Declared once and shared front + back: the frontend uses it to decide
+ * transport (HTTP proxy vs direct SDK), the backend uses the same `key`
+ * to resolve a StorageController, and collection properties reference
+ * a definition by its `key` via `StorageConfig.storageSource`.
+ *
+ * This mirrors the {@link DataSourceDefinition} pattern used for databases.
+ *
+ * @group Models
+ */
+/**
+ * The default storage source key, used when a property does not specify
+ * a `storageSource`. Shared by the frontend and backend registries so
+ * both agree on "the default storage backend".
+ * @group Models
+ */
+export declare const DEFAULT_STORAGE_SOURCE_KEY = "(default)";
+/**
+ * How the *frontend* reaches a storage backend.
+ *
+ * - `"server"` — through the Rebase backend REST API (`/api/storage`).
+ *   The backend holds the actual `StorageController` and routes by
+ *   storage-source key. This is the default and covers Local, S3, GCS,
+ *   and any other server-mediated engine.
+ * - `"direct"` — straight from the client to the external backend via
+ *   its own SDK (e.g. Firebase Storage via `@firebase/storage`).
+ *   The Rebase backend is **not** in the upload/download path.
+ *
+ * @group Models
+ */
+export type StorageSourceTransport = "server" | "direct";
+/**
+ * Declarative definition of a storage source — a named place files live.
+ *
+ * Declared once and shared front and back: the frontend uses it to decide
+ * transport (client HTTP proxy vs direct provider SDK), the backend uses
+ * the same `key` to resolve a `StorageController`, and collection
+ * properties reference a definition by its `key` via
+ * `StorageConfig.storageSource`.
+ *
+ * @group Models
+ */
+export interface StorageSourceDefinition {
+    /**
+     * Unique identifier for this storage source. Collection properties
+     * point at it via `StorageConfig.storageSource`.
+     * Defaults to {@link DEFAULT_STORAGE_SOURCE_KEY}.
+     */
+    key: string;
+    /**
+     * The engine backing this storage source (e.g. `"local"`, `"s3"`,
+     * `"gcs"`, `"firebase"`, `"azure"`, or a custom id).
+     */
+    engine: string;
+    /**
+     * How the frontend reaches this storage. Defaults to `"server"`.
+     *
+     * When `"direct"`, the client uses a provider-specific SDK
+     * (e.g. `@firebase/storage`) and the backend does not proxy
+     * upload/download traffic for this source.
+     */
+    transport: StorageSourceTransport;
+    /** Human-readable label for the UI (e.g. "Firebase Storage", "S3 Media"). */
+    label?: string;
+}
+/**
+ * A resolved storage source: the single source of truth that the frontend
+ * router and backend registry both derive from.
+ *
+ * @group Models
+ */
+export interface ResolvedStorageSource {
+    /** Storage source key (routing key, shared front + back). */
+    key: string;
+    /** Engine backing the source. */
+    engine: string;
+    /** Frontend transport. */
+    transport: StorageSourceTransport;
+    /** Human-readable label. */
+    label?: string;
+}

package/dist/types/translations.d.ts

@@ -39,6 +39,12 @@ export interface RebaseTranslations {
     unsaved_changes_body: string;
     discard_changes: string;
     keep_editing: string;
+    /** Dialog title when clearing a new/copy form */
+    clear_form?: string;
+    /** Confirmation body when discarding changes on an existing entity */
+    discard_changes_confirmation?: string;
+    /** Confirmation body when clearing a new/copy form */
+    clear_form_confirmation?: string;
     search: string;
     find_by_id: string;
     find_entity_by_id: string;
@@ -153,6 +159,8 @@ export interface RebaseTranslations {
     form_modified: string;
     /** Tooltip when the form is in sync with the database */
     form_in_sync: string;
+    /** Tooltip/alert shown when form has validation errors */
+    fix_errors_before_saving?: string;
     admin: string;
     home: string;
     this_form_has_errors: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/types",
   "type": "module",
-  "version": "0.6.1",
+  "version": "0.8.0",
   "description": "Rebase type definitions — shared interfaces and controller types",
   "funding": {
     "url": "https://github.com/sponsors/rebaseco"

package/src/controllers/client.ts

@@ -3,6 +3,9 @@ import type { RebaseData } from "./data";
 import type { EmailService } from "./email";
 import type { StorageSource } from "./storage";
 import type { CronJobStatus, CronJobLogEntry } from "../types/cron";
+import type { ApiKeysAPI } from "../types/api_keys";
+import type { StorageSourceDefinition } from "../types/storage_source";
+
 
 /**
  * Event type for authentication state changes
@@ -86,6 +89,8 @@ export interface AdminAPI {
     createUser(data: { email: string; displayName?: string; password?: string; roles?: string[]; metadata?: Record<string, any> }): Promise<{ user: AdminUser }>;
     updateUser(userId: string, data: { email?: string; displayName?: string; password?: string; roles?: string[]; metadata?: Record<string, any> }): Promise<{ user: AdminUser }>;
     deleteUser(userId: string): Promise<{ success: boolean }>;
+    resetPassword(userId: string, options?: { password?: string }): Promise<{ user: AdminUser; temporaryPassword?: string; invitationSent?: boolean }>;
+    listRoles(): Promise<{ roles: Array<{ id: string; name: string }> }>;
     bootstrap(): Promise<{ success: boolean; message: string; user: { uid: string; roles: string[] } }>;
 }
 
@@ -153,9 +158,30 @@ export interface RebaseClient<DB = unknown> {
     /** Unified Authentication layer */
     auth: AuthClient;
 
-    /** Unified Storage layer */
+    /** Unified Storage layer (default storage source, backward-compatible) */
     storage?: StorageSource;
 
+    /** Registry of all named storage sources for multi-backend support */
+    storageRegistry?: StorageSourceRegistry;
+
+    /**
+     * Build a server-backed {@link StorageSource} for a named storage source.
+     * The returned source forwards `storageId` to the backend so requests are
+     * routed to the matching `StorageController`. Used to lazily wire
+     * `transport: "server"` sources on the frontend.
+     */
+    createStorageSource?(storageId: string): StorageSource;
+
+    /**
+     * Discover the storage sources declared on the backend via
+     * `GET /api/storage/sources`. Server-transport sources are auto-registered
+     * into {@link storageRegistry}; `direct` sources are returned so the app
+     * can supply the live {@link StorageSource} instance. The result is cached
+     * (a failed call is retryable). This makes the backend the single source of
+     * truth for storage-source configuration.
+     */
+    fetchStorageSources?(): Promise<StorageSourceDefinition[]>;
+
     /**
      * Server-side email service.
      * Available when SMTP or a custom `sendEmail` function is configured.
@@ -171,6 +197,10 @@ export interface RebaseClient<DB = unknown> {
     /** Custom backend functions API */
     functions?: FunctionsAPI;
 
+    /** Service API keys management API */
+    apiKeys?: ApiKeysAPI;
+
+
     /** Base HTTP URL of the backend server */
     baseUrl?: string;
 
@@ -199,3 +229,41 @@ export interface RebaseClient<DB = unknown> {
     sql?(query: string, options?: { database?: string; role?: string }): Promise<Record<string, unknown>[]>;
 }
 
+/**
+ * Client-side registry for managing multiple storage sources.
+ *
+ * Mirrors the server-side `StorageRegistry` pattern. Allows collection
+ * properties to reference a named storage backend via
+ * `StorageConfig.storageSource`.
+ *
+ * @group Models
+ */
+export interface StorageSourceRegistry {
+    /**
+     * Get a storage source by key.
+     * @param key - Storage source key, or undefined/null for default
+     * @returns The StorageSource, or undefined if not found
+     */
+    get(key: string | undefined | null): StorageSource | undefined;
+
+    /**
+     * Get the default storage source (key = "(default)").
+     * @throws Error if no default storage is registered
+     */
+    getDefault(): StorageSource;
+
+    /**
+     * Get a storage source by key, with fallback to default.
+     * @param key - Storage source key, or undefined/null for default
+     * @returns The StorageSource (falls back to default if key not found)
+     * @throws Error if neither the specified nor default storage exists
+     */
+    getOrDefault(key: string | undefined | null): StorageSource;
+
+    /** Check if a storage source with the given key exists */
+    has(key: string): boolean;
+
+    /** List all registered storage source keys */
+    list(): string[];
+}
+

package/src/controllers/data.ts

@@ -1,29 +1,5 @@
 import { Entity, EntityValues } from "../types/entities";
-
-/**
- * Parameters for querying a collection.
- * Uses PostgREST-style filter syntax for consistency between
- * the SDK (HTTP) and framework (in-process) contexts.
- *
- * @group Data
- */
-/**
- * A where-clause value for a single field.
- *
- * Supports three syntaxes:
- *  1. **Equality shorthand**: raw JS values — `null`, `"active"`, `42`, `true`
- *  2. **Tuple syntax**: `[operator, value]` — `[">", 18]`, `["in", ["a","b"]]`
- *  3. **PostgREST string**: `"eq.published"`, `"gte.18"`, `"in.(a,b)"`
- *
- * @group Data
- */
-export type WhereFieldValue =
-    | string
-    | number
-    | boolean
-    | null
-    | [WhereFilterOpShort, any]
-    | [WhereFilterOpShort, any][];
+import { WhereFilterOp, FilterValues } from "../types/filter-operators";
 
 export type WhereValue<T> = T | T[] | null;
 
@@ -34,17 +10,15 @@ export interface LogicalCondition {
 
 export interface FilterCondition {
     column: string;
-    operator: FilterOperator;
+    operator: WhereFilterOp;
     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";
-
+/**
+ * Parameters for querying a collection.
+ *
+ * @group Data
+ */
 export interface FindParams {
     /** Maximum number of items to return (default: 20) */
     limit?: number;
@@ -53,30 +27,17 @@ export interface FindParams {
     /** Page number (1-indexed), alternative to offset */
     page?: number;
     /**
-     * Filter object. Supports multiple syntaxes per field:
-     *
-     * **Equality shorthand** — raw JS values (null, string, number, boolean):
-     * ```ts
-     * { company_profile_id: null }
-     * { status: "active" }
-     * { age: 18 }
-     * ```
+     * Filter conditions keyed by field name.
+     * Each value is a `[WhereFilterOp, value]` tuple or an array of tuples
+     * for multiple conditions on the same field.
      *
-     * **Tuple syntax** — `[operator, value]`:
-     * ```ts
+     * @example
+     * { status: ["==", "active"] }
      * { age: [">=", 18] }
      * { role: ["in", ["admin", "editor"]] }
-     * { deleted_at: ["!=", null] }
-     * ```
-     *
-     * **PostgREST string syntax** (original format):
-     * ```ts
-     * { status: "eq.published" }
-     * { age: "gte.18" }
-     * { role: "in.(admin,editor)" }
-     * ```
+     * { age: [[">=", 18], ["<", 65]] }
      */
-    where?: Record<string, WhereFieldValue>;
+    where?: FilterValues<string>;
     /** Logical grouping conditions (AND/OR) */
     logical?: LogicalCondition;
     /**
@@ -106,16 +67,16 @@ export interface FindResponse<M extends Record<string, unknown> = Record<string,
     };
 }
 
-export type FilterOperator = WhereFilterOpShort;
+
 
 /**
  * Fluent Query Builder Interface supported on both client and server accessors.
  * @group Data
  */
 export interface QueryBuilderInterface<M extends Record<string, unknown> = Record<string, unknown>> {
-    where<K extends keyof M & string>(column: K, operator: FilterOperator, value: WhereValue<M[K]>): this;
+    where<K extends keyof M & string>(column: K, operator: WhereFilterOp, value: WhereValue<M[K]>): this;
     where(logicalCondition: LogicalCondition): this;
-    orderBy(column: keyof M & string, ascending?: "asc" | "desc"): this;
+    orderBy(column: keyof M & string, direction?: "asc" | "desc"): this;
     limit(count: number): this;
     offset(count: number): this;
     search(searchString: string): this;
@@ -186,9 +147,9 @@ export interface CollectionAccessor<M extends Record<string, unknown> = Record<s
     count?(params?: FindParams): Promise<number>;
 
     // Fluent Query Builder
-    where<K extends keyof M & string>(column: K, operator: FilterOperator, value: WhereValue<M[K]>): QueryBuilderInterface<M>;
+    where<K extends keyof M & string>(column: K, operator: WhereFilterOp, value: WhereValue<M[K]>): QueryBuilderInterface<M>;
     where(logicalCondition: LogicalCondition): QueryBuilderInterface<M>;
-    orderBy(column: keyof M & string, ascending?: "asc" | "desc"): QueryBuilderInterface<M>;
+    orderBy(column: keyof M & string, direction?: "asc" | "desc"): QueryBuilderInterface<M>;
     limit(count: number): QueryBuilderInterface<M>;
     offset(count: number): QueryBuilderInterface<M>;
     search(searchString: string): QueryBuilderInterface<M>;
@@ -226,7 +187,7 @@ export interface RebaseData {
      * const accessor = data.collection("products");
      * await accessor.find({ limit: 10 });
      */
-    collection(slug: string): CollectionAccessor;
+    collection<M extends Record<string, unknown> = Record<string, unknown>>(slug: string): CollectionAccessor<M>;
 
     /**
      * Dynamic collection accessor.