@rebasepro/server-postgresql 0.0.1-canary.eae7889 → 0.0.1-canary.f81da60

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

@@ -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?: React.ComponentType<any>;
+    Preview?: React.ComponentType<any>;
+}
 export interface BaseProperty<CustomProps = unknown> {
+    ui?: BaseUIConfig<CustomProps>;
     /**
      * Property name (e.g. Product)
      */
@@ -105,28 +124,6 @@ export interface BaseProperty<CustomProps = unknown> {
      * overwritten by the current property config.
      */
     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)
-     */
-    disabled?: boolean | PropertyDisabledConfig;
     /**
      * Rules for validating this property
      */
@@ -135,16 +132,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 +155,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 +242,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 +253,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 +285,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 +300,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 +340,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 +350,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.
@@ -384,15 +375,9 @@ export interface ReferenceProperty extends BaseProperty {
     path?: string;
     /**
      * Allow selection of entities that pass the given filter only.
-     * e.g. `forceFilter: { age: [">=", 18] }`
-     */
-    forceFilter?: 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.
+     * e.g. `fixedFilter: { age: [">=", 18] }`
      */
-    previewProperties?: string[];
+    fixedFilter?: FilterValues<string>;
     /**
      * Should the reference include the ID of the entity. Defaults to `true`
      */
@@ -405,7 +390,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.
@@ -492,15 +482,9 @@ export interface RelationProperty extends BaseProperty {
     relation?: Relation;
     /**
      * Allow selection of entities that pass the given filter only.
-     * e.g. `forceFilter: { age: [">=", 18] }`
+     * e.g. `fixedFilter: { age: [">=", 18] }`
      */
-    forceFilter?: 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[];
+    fixedFilter?: FilterValues<string>;
     /**
      * Should the reference include the ID of the entity. Defaults to `true`
      */
@@ -518,7 +502,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 +562,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 +576,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 +616,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/slots.d.ts

@@ -100,7 +100,8 @@ export interface NavigationSlotProps {
 export interface CollectionToolbarProps {
     path: string;
     collection: EntityCollection;
-    parentCollectionIds: string[];
+    parentCollectionSlugs: string[];
+    parentEntityIds: string[];
     tableController: EntityTableController;
     selectionController: SelectionController;
 }
@@ -111,7 +112,8 @@ export interface CollectionToolbarProps {
 export interface CollectionEmptyStateProps {
     path: string;
     collection: EntityCollection;
-    parentCollectionIds: string[];
+    parentCollectionSlugs: string[];
+    parentEntityIds: string[];
     canCreate: boolean;
     onNewClick?: () => void;
 }
@@ -123,7 +125,8 @@ export interface CollectionHeaderActionProps {
     property: Property;
     propertyKey: string;
     path: string;
-    parentCollectionIds: string[];
+    parentCollectionSlugs: string[];
+    parentEntityIds: string[];
     onHover: boolean;
     collection: EntityCollection;
     tableController: EntityTableController;
@@ -134,7 +137,8 @@ export interface CollectionHeaderActionProps {
  */
 export interface CollectionAddColumnProps {
     path: string;
-    parentCollectionIds: string[];
+    parentCollectionSlugs: string[];
+    parentEntityIds: string[];
     collection: EntityCollection;
     tableController: EntityTableController;
 }
@@ -145,7 +149,8 @@ export interface CollectionAddColumnProps {
 export interface CollectionErrorProps {
     path: string;
     collection: EntityCollection;
-    parentCollectionIds?: string[];
+    parentCollectionSlugs?: string[];
+    parentEntityIds?: string[];
     error: Error;
 }
 /**
@@ -155,7 +160,8 @@ export interface CollectionErrorProps {
 export interface KanbanSetupProps {
     collection: EntityCollection;
     fullPath: string;
-    parentCollectionIds: string[];
+    parentCollectionSlugs: string[];
+    parentEntityIds: string[];
 }
 /**
  * Props for the `kanban.add-column` slot.
@@ -164,7 +170,8 @@ export interface KanbanSetupProps {
 export interface KanbanAddColumnProps {
     collection: EntityCollection;
     fullPath: string;
-    parentCollectionIds: string[];
+    parentCollectionSlugs: string[];
+    parentEntityIds: string[];
     columnProperty: string;
 }
 /**
@@ -177,7 +184,8 @@ export interface EntityRowActionsProps {
     entityId: string;
     path: string;
     collection: EntityCollection;
-    parentCollectionIds: string[];
+    parentCollectionSlugs: string[];
+    parentEntityIds: string[];
     selectionController: SelectionController;
     context: RebaseContext;
 }
@@ -202,7 +210,8 @@ export interface EntityFieldSlotProps {
 export interface CollectionFilterPanelProps {
     path: string;
     collection: EntityCollection;
-    parentCollectionIds: string[];
+    parentCollectionSlugs: string[];
+    parentEntityIds: string[];
     tableController: EntityTableController;
     context: RebaseContext;
 }
@@ -238,7 +247,8 @@ export interface ShellToolbarProps {
 export interface CollectionInsightsSlotProps {
     path: string;
     collection: EntityCollection;
-    parentCollectionIds: string[];
+    parentCollectionSlugs: string[];
+    parentEntityIds: string[];
 }
 /**
  * Props for `home.card.insight` slot.

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

@@ -461,6 +461,10 @@ export interface RebaseTranslations {
     reset_password_success?: string;
     reset_password_confirmation?: string;
     error_resetting_password?: string;
+    /** Permission-denied empty states */
+    no_permission_to_view_users?: string;
+    no_permission_to_view_roles?: string;
+    no_permission_description?: string;
     /** Editor table-bubble */
     add_row_before: string;
     add_row_after: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/server-postgresql",
   "type": "module",
-  "version": "0.0.1-canary.eae7889",
+  "version": "0.0.1-canary.f81da60",
   "description": "PostgreSQL data source backend implementation for Rebase with Drizzle ORM",
   "funding": {
     "url": "https://github.com/sponsors/rebaseco"
@@ -60,13 +60,14 @@
   "dependencies": {
     "arg": "^5.0.2",
     "chalk": "^4.1.2",
+    "chokidar": "5.0.0",
     "drizzle-orm": "^0.44.4",
     "execa": "^4.1.0",
     "pg": "^8.11.3",
-    "@rebasepro/common": "0.0.1-canary.eae7889",
-    "@rebasepro/server-core": "0.0.1-canary.eae7889",
-    "@rebasepro/utils": "0.0.1-canary.eae7889",
-    "@rebasepro/types": "0.0.1-canary.eae7889"
+    "@rebasepro/common": "0.0.1-canary.f81da60",
+    "@rebasepro/server-core": "0.0.1-canary.f81da60",
+    "@rebasepro/types": "0.0.1-canary.f81da60",
+    "@rebasepro/utils": "0.0.1-canary.f81da60"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",

package/src/PostgresBackendDriver.ts

@@ -101,6 +101,15 @@ export class PostgresBackendDriver implements DataDriver {
         };
     }
 
+    /**
+     * REST-optimised fetch service (include-aware eager-loading).
+     * Delegates to the underlying EntityFetchService which already
+     * implements the matching method signatures.
+     */
+    get restFetchService() {
+        return this.entityService.getFetchService();
+    }
+
 
     private resolveCollectionCallbacks<M extends Record<string, unknown>>(collection: EntityCollection<M> | undefined, path: string) {
         if (!collection && !path) return { collection: undefined,

package/src/cli.ts

@@ -408,9 +408,16 @@ async function runDrizzleKit(action: string, _rawArgs: string[]): Promise<void>
 
     const interactive = ["generate", "push"].includes(action);
 
+    // For push: always use --strict (prompts before destructive ops) and --verbose
+    // (shows all SQL). This ensures unmapped tables are never silently dropped.
+    const drizzleKitArgs = [action];
+    if (action === "push") {
+        drizzleKitArgs.push("--strict", "--verbose");
+    }
+
     try {
         if (interactive) {
-            await execa(drizzleKitBin, [action], {
+            await execa(drizzleKitBin, drizzleKitArgs, {
                 cwd: process.cwd(),
                 stdio: "inherit",
                 env
@@ -527,6 +534,57 @@ async function schemaCommand(subcommand: string, rawArgs: string[]): Promise<voi
             console.error(chalk.red(`✗ Failed to run schema generator: ${err instanceof Error ? err.message : String(err)}`));
             process.exit(1);
         }
+    } else if (subcommand === "introspect") {
+        const argsList = arg(
+            {
+                "--output": String,
+                "--force": Boolean,
+                "--schema": String,
+                "-o": "--output",
+                "-f": "--force"
+            },
+            {
+                argv: rawArgs.slice(2),
+                permissive: true
+            }
+        );
+
+        const introspectScript = path.join(__dirname, "schema", "introspect-db.ts");
+        if (!fs.existsSync(introspectScript)) {
+            console.error(chalk.red(`✗ Could not find introspect-db.ts at ${introspectScript}`));
+            process.exit(1);
+        }
+
+        const tsxBin = resolveLocalBin("tsx");
+        if (!tsxBin) {
+            console.error(chalk.red("✗ Could not find tsx binary."));
+            process.exit(1);
+        }
+
+        const outputPath = argsList["--output"] || path.join("..", "config", "collections");
+
+        console.log("");
+        console.log(chalk.bold("  🔍 Rebase Schema Introspector"));
+        console.log("");
+
+        const cmdParts = [
+            tsxBin,
+            introspectScript,
+            `--output=${outputPath}`,
+            ...(argsList["--force"] ? ["--force"] : []),
+            ...(argsList["--schema"] ? [`--schema=${argsList["--schema"]}`] : [])
+        ];
+
+        try {
+            await execa(cmdParts[0], cmdParts.slice(1), {
+                cwd: process.cwd(),
+                stdio: "inherit",
+                env: { ...process.env as Record<string, string> }
+            });
+        } catch (err: unknown) {
+            console.error(chalk.red(`✗ Failed to run schema introspector: ${err instanceof Error ? err.message : String(err)}`));
+            process.exit(1);
+        }
     } else {
         console.error(chalk.red("Unknown schema command."));
         process.exit(1);

package/src/schema/generate-drizzle-schema-logic.ts

@@ -682,31 +682,13 @@ export const generateSchema = async (collections: EntityCollection[], stripPolic
                     if (rel.cardinality === "one") {
                         if (rel.direction === "owning" && rel.localKey) {
                             tableRelations.push(`    "${relationKey}": one(${targetTableVar}, {\n        fields: [${tableVarName}.${rel.localKey}],\n        references: [${targetTableVar}.${getPrimaryKeyName(target)}],\n        relationName: \"${drizzleRelationName}\"\n    })`);
-                        } else if (rel.direction === "inverse" && rel.foreignKeyOnTarget) {
-                            const sourceIdField = getPrimaryKeyName(collection);
-                            tableRelations.push(`    "${relationKey}": one(${targetTableVar}, {\n        fields: [${tableVarName}.${sourceIdField}],\n        references: [${targetTableVar}.${rel.foreignKeyOnTarget}],\n        relationName: \"${drizzleRelationName}\"\n    })`);
-                        } else if (rel.direction === "inverse" && !rel.foreignKeyOnTarget) {
-                            // Handle inverse one-to-one relations where the FK is on the target table
-                            // but foreignKeyOnTarget is not explicitly specified
-                            // In this case, we need to find the corresponding owning relation on the target
-                            try {
-                                const targetCollection = rel.target();
-                                const targetResolvedRelations = resolveCollectionRelations(targetCollection);
-
-                                // Find the owning relation on the target that points back to this collection
-                                const correspondingRelation = Object.values(targetResolvedRelations).find(targetRel =>
-                                    targetRel.direction === "owning" &&
-                                    targetRel.cardinality === "one" &&
-                                    targetRel.target().slug === collection.slug
-                                );
-
-                                if (correspondingRelation && correspondingRelation.localKey) {
-                                    const sourceIdField = getPrimaryKeyName(collection);
-                                    tableRelations.push(`    "${relationKey}": one(${targetTableVar}, {\n        fields: [${tableVarName}.${sourceIdField}],\n        references: [${targetTableVar}.${correspondingRelation.localKey}],\n        relationName: \"${drizzleRelationName}\"\n    })`);
-                                }
-                            } catch (e) {
-                                console.warn(`Could not resolve inverse one-to-one relation '${relationKey}':`, e);
-                            }
+                        } else if (rel.direction === "inverse") {
+                            // Inverse one-to-one: the FK lives on the TARGET table, not here.
+                            // Drizzle pairs inverse relations via `relationName` alone — specifying
+                            // `fields`/`references` on the inverse side is invalid and causes
+                            // `normalizeRelation` to crash with "Cannot read properties of
+                            // undefined (reading 'referencedTable')".
+                            tableRelations.push(`    "${relationKey}": one(${targetTableVar}, {\n        relationName: \"${drizzleRelationName}\"\n    })`);
                         }
                     } else if (rel.cardinality === "many") {
                         if (rel.direction === "inverse" && rel.foreignKeyOnTarget) {