@rebasepro/server-postgresql 0.0.1-canary.c53f5db → 0.0.1-canary.cbdd980

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

@@ -1,4 +1,4 @@
-import React from "react";
+import type { ComponentRef } from "./component_ref";
 import type { EntityReference, EntityRelation, EntityValues, GeoPoint, Entity } from "./entities";
 import type { Relation, JoinStep, OnAction } from "./relations";
 import type { EntityCollection, FilterValues } from "./collections";
@@ -36,6 +36,14 @@ export type Property = StringProperty | NumberProperty | BooleanProperty | DateP
 export type Properties = {
     [key: string]: Property;
 };
+export type PostgresProperty = Exclude<Property, ReferenceProperty>;
+export type PostgresProperties = {
+    [key: string]: PostgresProperty;
+};
+export type FirebaseProperty = Exclude<Property, RelationProperty>;
+export type FirebaseProperties = {
+    [key: string]: FirebaseProperty;
+};
 /**
  * A helper type to infer the underlying data type from a Property definition.
  * This is the core of the type inference system.
@@ -89,7 +97,18 @@ export type InferEntityType<P extends Properties> = {
  * Interface including all common properties of a CMS property.
  * @group Entity properties
  */
+export interface BaseUIConfig<CustomProps = unknown> {
+    columnWidth?: number;
+    hideFromCollection?: boolean;
+    readOnly?: boolean;
+    disabled?: boolean | PropertyDisabledConfig;
+    widthPercentage?: number;
+    customProps?: CustomProps;
+    Field?: ComponentRef<any>;
+    Preview?: ComponentRef<any>;
+}
 export interface BaseProperty<CustomProps = unknown> {
+    ui?: BaseUIConfig<CustomProps>;
     /**
      * Property name (e.g. Product)
      */
@@ -106,27 +125,17 @@ export interface BaseProperty<CustomProps = unknown> {
      */
     propertyConfig?: string;
     /**
-     * Width in pixels of this column in the collection view. If not set
-     * the width is inferred based on the other configurations
-     */
-    columnWidth?: number;
-    /**
-     * Do not show this property in the collection view
-     */
-    hideFromCollection?: boolean;
-    /**
-     * Is this a read only property. When set to true, it gets rendered as a
-     * preview.
-     */
-    readOnly?: boolean;
-    /**
-     * Is this field disabled.
-     * When set to true, it gets rendered as a
-     * disabled field. You can also specify a configuration for defining the
-     * behaviour of disabled properties (including custom messages, clear value on
-     * disabled or hide the field completely)
+     * Explicit database column name. When set, this value is used as-is
+     * for the SQL column name, bypassing any snake_case conversion of
+     * the property key.
+     *
+     * This is automatically populated by `rebase schema introspect`
+     * to guarantee an exact match with the live database schema.
+     *
+     * For manually-authored collections you can omit this — the framework
+     * will derive the column name from the property key via `toSnakeCase()`.
      */
-    disabled?: boolean | PropertyDisabledConfig;
+    columnName?: string;
     /**
      * Rules for validating this property
      */
@@ -135,16 +144,6 @@ export interface BaseProperty<CustomProps = unknown> {
      * This value will be set by default for new entities.
      */
     defaultValue?: unknown;
-    /**
-     * A number between 0 and 100 that indicates the width of the field in the form view.
-     * It defaults to 100, but you can set it to 50 to have two fields in the same row.
-     */
-    widthPercentage?: number;
-    /**
-     * Additional props that are passed to the components defined in `field`
-     * or in `preview`.
-     */
-    customProps?: CustomProps;
     /**
      * 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
@@ -168,21 +167,19 @@ export interface BaseProperty<CustomProps = unknown> {
      * Callbacks/Hooks for this property field to transform and sanitize data during its lifecycle.
      */
     callbacks?: PropertyCallbacks;
-    /**
-     * Custom field component to render this property in forms.
-     * Used by the CMS layer.
-     */
-    Field?: React.ComponentType<any>;
-    /**
-     * Custom preview component to render this property in previews/tables.
-     * Used by the CMS layer.
-     */
-    Preview?: React.ComponentType<any>;
 }
 /**
  * @group Entity properties
  */
+export interface StringUIConfig extends BaseUIConfig {
+    multiline?: boolean;
+    markdown?: boolean;
+    previewAsTag?: boolean;
+    clearable?: boolean;
+    url?: boolean | PreviewType;
+}
 export interface StringProperty extends BaseProperty {
+    ui?: StringUIConfig;
     type: "string";
     /**
      * Optional database column type. If not set, it defaults to `varchar` or `uuid` depending on `isId` configuration.
@@ -257,10 +254,6 @@ export interface StringProperty extends BaseProperty {
      * Should this string be rendered as a tag instead of just text.
      */
     previewAsTag?: boolean;
-    /**
-     * Add an icon to clear the value and set it to `null`. Defaults to `false`
-     */
-    clearable?: 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
@@ -272,7 +265,11 @@ export interface StringProperty extends BaseProperty {
 /**
  * @group Entity properties
  */
+export interface NumberUIConfig extends BaseUIConfig {
+    clearable?: boolean;
+}
 export interface NumberProperty extends BaseProperty {
+    ui?: NumberUIConfig;
     type: "number";
     /**
      * Optional database column type. Allows specifying exact database numeric types.
@@ -300,15 +297,12 @@ export interface NumberProperty extends BaseProperty {
      * displayed in the dropdown.
      */
     enum?: EnumValues;
-    /**
-     * Add an icon to clear the value and set it to `null`. Defaults to `false`
-     */
-    clearable?: boolean;
 }
 /**
  * @group Entity properties
  */
 export interface BooleanProperty extends BaseProperty {
+    ui?: BaseUIConfig;
     type: "boolean";
     /**
      * Rules for validating this property
@@ -318,7 +312,11 @@ export interface BooleanProperty extends BaseProperty {
 /**
  * @group Entity properties
  */
+export interface DateUIConfig extends BaseUIConfig {
+    clearable?: boolean;
+}
 export interface DateProperty extends BaseProperty {
+    ui?: DateUIConfig;
     type: "date";
     /**
      * Optional database column type. If not set, defaults to `timestamp` with timezone.
@@ -354,6 +352,7 @@ export interface DateProperty extends BaseProperty {
  * @group Entity properties
  */
 export interface GeopointProperty extends BaseProperty {
+    ui?: BaseUIConfig;
     type: "geopoint";
     /**
      * Rules for validating this property
@@ -363,7 +362,11 @@ export interface GeopointProperty extends BaseProperty {
 /**
  * @group Entity properties
  */
+export interface ReferenceUIConfig extends BaseUIConfig {
+    previewProperties?: string[];
+}
 export interface ReferenceProperty extends BaseProperty {
+    ui?: ReferenceUIConfig;
     type: "reference";
     /**
      * Marks this field as a Primary Key / Unique Identifier.
@@ -387,12 +390,6 @@ export interface ReferenceProperty extends BaseProperty {
      * e.g. `fixedFilter: { age: [">=", 18] }`
      */
     fixedFilter?: FilterValues<string>;
-    /**
-     * Properties that need to be rendered when displaying a preview of this
-     * reference. If not specified the first 3 are used. Only the first 3
-     * specified values are considered.
-     */
-    previewProperties?: string[];
     /**
      * Should the reference include the ID of the entity. Defaults to `true`
      */
@@ -405,7 +402,12 @@ export interface ReferenceProperty extends BaseProperty {
 /**
  * @group Entity properties
  */
+export interface RelationUIConfig extends BaseUIConfig {
+    previewProperties?: string[];
+    widget?: "select" | "dialog";
+}
 export interface RelationProperty extends BaseProperty {
+    ui?: RelationUIConfig;
     type: "relation";
     /**
      * Marks this field as a Primary Key / Unique Identifier.
@@ -495,12 +497,6 @@ export interface RelationProperty extends BaseProperty {
      * e.g. `fixedFilter: { age: [">=", 18] }`
      */
     fixedFilter?: FilterValues<string>;
-    /**
-     * Properties that need to be rendered when displaying a preview of this
-     * reference. If not specified the first 3 are used. Only the first 3
-     * specified values are considered.
-     */
-    previewProperties?: string[];
     /**
      * Should the reference include the ID of the entity. Defaults to `true`
      */
@@ -518,7 +514,12 @@ export interface RelationProperty extends BaseProperty {
 /**
  * @group Entity properties
  */
+export interface ArrayUIConfig extends BaseUIConfig {
+    expanded?: boolean;
+    minimalistView?: boolean;
+}
 export interface ArrayProperty extends BaseProperty {
+    ui?: ArrayUIConfig;
     type: "array";
     /**
      * Optional database column type. Defaults to `jsonb`.
@@ -573,15 +574,6 @@ export interface ArrayProperty extends BaseProperty {
      * Rules for validating this property
      */
     validation?: ArrayPropertyValidationSchema;
-    /**
-     * Should the field be initially expanded. Defaults to `true`
-     */
-    expanded?: boolean;
-    /**
-     * Display the child properties directly, without being wrapped in an
-     * extendable panel.
-     */
-    minimalistView?: boolean;
     /**
      * Can the elements in this array be reordered. Defaults to `true`.
      * This prop has no effect if `disabled` is set to true.
@@ -596,7 +588,13 @@ export interface ArrayProperty extends BaseProperty {
 /**
  * @group Entity properties
  */
+export interface MapUIConfig extends BaseUIConfig {
+    expanded?: boolean;
+    minimalistView?: boolean;
+    spreadChildren?: boolean;
+}
 export interface MapProperty extends BaseProperty {
+    ui?: MapUIConfig;
     type: "map";
     /**
      * Optional database column type. Defaults to `jsonb`.
@@ -630,20 +628,6 @@ export interface MapProperty extends BaseProperty {
      * needed
      */
     pickOnlySomeKeys?: boolean;
-    /**
-     * Display the child properties as independent columns in the collection
-     * view
-     */
-    spreadChildren?: boolean;
-    /**
-     * Display the child properties directly, without being wrapped in an
-     * extendable panel. Note that this will also hide the title of this property.
-     */
-    minimalistView?: boolean;
-    /**
-     * Should the field be initially expanded. Defaults to `true`
-     */
-    expanded?: boolean;
     /**
      * Render this map as a key-value table that allows to use
      * arbitrary keys. You don't need to define the properties in this case.

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

@@ -51,6 +51,8 @@ export interface RebaseTranslations {
     all_entries_loaded: string;
     create_your_first_entry: string;
     no_results_filter_sort: string;
+    /** Shown when a text search yields no results. Supports `{{search}}` interpolation. */
+    no_results_search?: string;
     add: string;
     remove: string;
     copy_id: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/server-postgresql",
   "type": "module",
-  "version": "0.0.1-canary.c53f5db",
+  "version": "0.0.1-canary.cbdd980",
   "description": "PostgreSQL data source backend implementation for Rebase with Drizzle ORM",
   "funding": {
     "url": "https://github.com/sponsors/rebaseco"
@@ -64,10 +64,10 @@
     "drizzle-orm": "^0.44.4",
     "execa": "^4.1.0",
     "pg": "^8.11.3",
-    "@rebasepro/server-core": "0.0.1-canary.c53f5db",
-    "@rebasepro/types": "0.0.1-canary.c53f5db",
-    "@rebasepro/common": "0.0.1-canary.c53f5db",
-    "@rebasepro/utils": "0.0.1-canary.c53f5db"
+    "@rebasepro/common": "0.0.1-canary.cbdd980",
+    "@rebasepro/server-core": "0.0.1-canary.cbdd980",
+    "@rebasepro/utils": "0.0.1-canary.cbdd980",
+    "@rebasepro/types": "0.0.1-canary.cbdd980"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",

package/src/PostgresBackendDriver.ts

@@ -4,9 +4,9 @@ import { BranchService } from "./services/BranchService";
 import { RealtimeService } from "./services/realtimeService";
 import { DatabasePoolManager } from "./databasePoolManager";
 import { DrizzleClient } from "./interfaces";
-import { User } from "@rebasepro/types";
+import { User, RebaseClient } from "@rebasepro/types";
 import { sql as drizzleSql } from "drizzle-orm";
-import { buildPropertyCallbacks } from "@rebasepro/common";
+import { buildPropertyCallbacks, updateDateAutoValues } from "@rebasepro/common";
 import { PostgresCollectionRegistry } from "./collections/PostgresCollectionRegistry";
 import {
     DataDriver,
@@ -44,6 +44,7 @@ export class PostgresBackendDriver implements DataDriver {
     public branchService?: BranchService;
     public user?: User;
     public data: RebaseData;
+    public client?: RebaseClient;
 
     /**
      * When true, realtime notifications are deferred until after the
@@ -163,7 +164,8 @@ propertyCallbacks: undefined };
             const contextForCallback = {
                 user: this.user,
                 driver: this,
-                data: this.data
+                data: this.data,
+                client: this.client
             } as unknown as RebaseCallContext; // Backend context
             return Promise.all(entities.map(async (entity) => {
                 let fetched = entity;
@@ -272,7 +274,8 @@ propertyCallbacks: undefined };
             const contextForCallback = {
                 user: this.user,
                 driver: this,
-                data: this.data
+                data: this.data,
+                client: this.client
             } as unknown as RebaseCallContext; // Backend context
             if (callbacks?.afterRead) {
                 entity = await callbacks.afterRead({
@@ -354,7 +357,8 @@ propertyCallbacks: undefined };
         const contextForCallback = {
             user: this.user,
             driver: this,
-            data: this.data
+            data: this.data,
+            client: this.client
         } as unknown as RebaseCallContext;
 
         // Fetch previous values for callbacks AND history recording
@@ -395,6 +399,17 @@ propertyCallbacks: undefined };
 
         }
 
+        // Apply autoValue timestamps (on_create / on_update) at the application layer.
+        // This handles updated_at fields for all writes that flow through the Rebase backend.
+        if (resolvedCollection?.properties) {
+            updatedValues = updateDateAutoValues({
+                inputValues: updatedValues,
+                properties: resolvedCollection.properties,
+                status: status ?? "new",
+                timestampNowValue: new Date()
+            });
+        }
+
         try {
             let savedEntity = await this.entityService.saveEntity<M>(
                 path,
@@ -517,7 +532,8 @@ propertyCallbacks: undefined };
         const contextForCallback = {
             user: this.user,
             driver: this,
-            data: this.data
+            data: this.data,
+            client: this.client
         } as unknown as RebaseCallContext;
 
         if (callbacks?.beforeDelete || propertyCallbacks?.beforeDelete) {
@@ -940,6 +956,7 @@ roles: userRoles })}, true)
             txDelegate.entityService = txEntityService;
             txDelegate._deferNotifications = true;
             txDelegate._pendingNotifications = pendingNotifications;
+            txDelegate.client = this.delegate.client;
 
             return await operation(txDelegate);
         });

package/src/cli.ts

@@ -43,7 +43,7 @@ export async function runPluginCommand(args: string[]) {
 }
 
 async function dbCommand(subcommand: string, rawArgs: string[]): Promise<void> {
-    const VALID_ACTIONS = ["push", "pull", "generate", "migrate", "studio", "branch"];
+    const VALID_ACTIONS = ["push", "generate", "migrate", "studio", "branch"];
     if (!subcommand || !VALID_ACTIONS.includes(subcommand)) {
         console.error(chalk.red(`Unknown db command. Valid: ${VALID_ACTIONS.join(", ")}`));
         process.exit(1);
@@ -68,6 +68,12 @@ async function dbCommand(subcommand: string, rawArgs: string[]): Promise<void> {
         console.log("");
         console.log(`  You can now run ${chalk.bold.green("rebase db migrate")} to apply the migrations to your database.`);
         console.log("");
+    } else if (subcommand === "pull") {
+        console.log("");
+        console.log(chalk.yellow("  ⚠ \"rebase db pull\" has been removed."));
+        console.log(chalk.gray("  Use \"rebase schema introspect\" instead."));
+        console.log("");
+        process.exit(1);
     } else {
         console.log("");
         console.log(chalk.bold(`  🗄️  Rebase DB ${subcommand.charAt(0).toUpperCase() + subcommand.slice(1)}`));
@@ -538,9 +544,11 @@ async function schemaCommand(subcommand: string, rawArgs: string[]): Promise<voi
         const argsList = arg(
             {
                 "--output": String,
+                "--collections": String,
                 "--force": Boolean,
                 "--schema": String,
                 "-o": "--output",
+                "-c": "--collections",
                 "-f": "--force"
             },
             {
@@ -561,7 +569,7 @@ async function schemaCommand(subcommand: string, rawArgs: string[]): Promise<voi
             process.exit(1);
         }
 
-        const outputPath = argsList["--output"] || path.join("config", "collections");
+        const outputPath = argsList["--output"] || argsList["--collections"] || path.join("..", "config", "collections");
 
         console.log("");
         console.log(chalk.bold("  🔍 Rebase Schema Introspector"));

package/src/data-transformer.ts

@@ -258,7 +258,26 @@ export function serializePropertyToServer(value: unknown, property: Property): u
             }
             return value;
 
+        case "string":
+            if (typeof value === "string") {
+                if (value.startsWith("data:application/octet-stream;base64,")) {
+                    const base64Data = value.split(",")[1];
+                    if (base64Data) {
+                        return Buffer.from(base64Data, "base64");
+                    }
+                }
+            }
+            return value;
+
         default:
+            if (typeof value === "string") {
+                if (value.startsWith("data:application/octet-stream;base64,")) {
+                    const base64Data = value.split(",")[1];
+                    if (base64Data) {
+                        return Buffer.from(base64Data, "base64");
+                    }
+                }
+            }
             return value;
     }
 }
@@ -447,6 +466,45 @@ export function parsePropertyFromServer(value: unknown, property: Property, coll
     }
 
     switch (property.type) {
+        case "string": {
+            if (typeof value === "string") return value;
+            
+            // Handle Buffer objects (e.g. from PostgreSQL bytea columns)
+            let isBuffer = false;
+            let buf: Buffer | null = null;
+            
+            if (Buffer.isBuffer(value)) {
+                isBuffer = true;
+                buf = value;
+            } else if (typeof value === "object" && value !== null && (value as any).type === "Buffer" && Array.isArray((value as any).data)) {
+                isBuffer = true;
+                buf = Buffer.from((value as any).data);
+            }
+            
+            if (isBuffer && buf) {
+                // Heuristic: if all bytes are printable ASCII, return utf8, else base64
+                let isPrintable = true;
+                for (let i = 0; i < buf.length; i++) {
+                    const b = buf[i];
+                    // Allow standard printable ASCII + common whitespace (\r, \n, \t)
+                    if ((b < 32 || b > 126) && b !== 9 && b !== 10 && b !== 13) {
+                        isPrintable = false;
+                        break;
+                    }
+                }
+                return isPrintable ? buf.toString("utf8") : `data:application/octet-stream;base64,${buf.toString("base64")}`;
+            }
+            
+            if (typeof value === "object" && value !== null) {
+                try {
+                    return JSON.stringify(value);
+                } catch {
+                    return String(value);
+                }
+            }
+            return String(value);
+        }
+
         case "relation":
             // Transform ID back to relation object with type information
             if (typeof value === "string" || typeof value === "number") {
@@ -538,8 +596,33 @@ export function parsePropertyFromServer(value: unknown, property: Property, coll
             return null;
         }
 
-        default:
+        default: {
+            // Fallback for buffers in case they are mapped to something other than string
+            let isBuffer = false;
+            let buf: Buffer | null = null;
+            
+            if (Buffer.isBuffer(value)) {
+                isBuffer = true;
+                buf = value;
+            } else if (typeof value === "object" && value !== null && (value as any).type === "Buffer" && Array.isArray((value as any).data)) {
+                isBuffer = true;
+                buf = Buffer.from((value as any).data);
+            }
+            
+            if (isBuffer && buf) {
+                let isPrintable = true;
+                for (let i = 0; i < buf.length; i++) {
+                    const b = buf[i];
+                    if ((b < 32 || b > 126) && b !== 9 && b !== 10 && b !== 13) {
+                        isPrintable = false;
+                        break;
+                    }
+                }
+                return isPrintable ? buf.toString("utf8") : `data:application/octet-stream;base64,${buf.toString("base64")}`;
+            }
+            
             return value;
+        }
     }
 }
 

package/src/schema/doctor.ts

@@ -17,6 +17,18 @@ import { generateSchema } from "./generate-drizzle-schema-logic";
 import { getTableName, resolveCollectionRelations, findRelation } from "@rebasepro/common";
 import { toSnakeCase } from "@rebasepro/utils";
 
+/**
+ * Resolve the SQL column name for a property.
+ * Uses the explicit `columnName` when set (e.g. from introspection),
+ * falling back to `toSnakeCase(propName)` for manually-authored collections.
+ */
+const resolveColumnName = (propName: string, prop?: Property | null): string => {
+    if (prop && "columnName" in prop && typeof prop.columnName === "string") {
+        return prop.columnName;
+    }
+    return toSnakeCase(propName);
+};
+
 // ── Types ────────────────────────────────────────────────────────────────
 
 export type IssueSeverity = "error" | "warning" | "info";
@@ -316,7 +328,7 @@ export async function checkCollectionsVsDatabase(
                     const resolvedRelations = resolveCollectionRelations(collection);
                     const relation = findRelation(resolvedRelations, (prop as RelationProperty).relationName ?? propName);
                     if (relation?.direction === "owning" && relation.cardinality === "one" && relation.localKey) {
-                        const fkColName = toSnakeCase(relation.localKey);
+                        const fkColName = relation.localKey;
                         if (!dbColumnMap.has(fkColName)) {
                             issues.push({
                                 severity: "error",
@@ -349,7 +361,7 @@ export async function checkCollectionsVsDatabase(
                     continue;
                 }
 
-                const colName = toSnakeCase(propName);
+                const colName = resolveColumnName(propName, prop);
 
                 // Skip system columns — they're handled automatically
                 if (systemColumns.has(colName)) continue;