@rebasepro/admin 0.7.0 → 0.9.0

package/dist/types/components/EntityFormActionsProps.d.ts

@@ -1,10 +1,10 @@
 import { Entity } from "@rebasepro/types";
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 import { FormContext } from "../fields";
 import { FormexController } from "./formex";
 export interface EntityFormActionsProps {
     path: string;
-    collection: EntityCollection;
+    collection: CollectionConfig;
     entity?: Entity;
     layout: "bottom" | "side" | "responsive";
     savingError?: Error;

package/dist/types/components/EntityFormProps.d.ts

@@ -1,5 +1,5 @@
 import { Entity, EntityStatus } from "@rebasepro/types";
-import { EntityCollection, EntityCustomViewParams } from "@rebasepro/types";
+import { CollectionConfig, EntityCustomViewParams } from "@rebasepro/types";
 import { FormContext } from "../fields";
 import { FormexController } from "./formex";
 import { EntityFormActionsProps } from "./EntityFormActionsProps";
@@ -11,7 +11,7 @@ import { EntityFormActionsProps } from "./EntityFormActionsProps";
 export type EntityFormProps<M extends Record<string, unknown>> = {
     path: string;
     fullIdPath?: string;
-    collection: EntityCollection<M>;
+    collection: CollectionConfig<M>;
     entityId?: string | number;
     entity?: Entity<M>;
     databaseId?: string;
@@ -104,5 +104,5 @@ export type OnUpdateParams = {
     path: string;
     entityId?: string | number;
     selectedTab?: string;
-    collection: EntityCollection<Record<string, unknown>>;
+    collection: CollectionConfig<Record<string, unknown>>;
 };

package/dist/types/components/PropertyPreviewProps.d.ts

@@ -1,3 +1,4 @@
+import { InferPropertyType } from "@rebasepro/types";
 import { Property } from "@rebasepro/types";
 /**
  * @group Preview components
@@ -11,7 +12,7 @@ export interface PropertyPreviewProps<P extends Property | Property, CustomProps
      * Name of the property
      */
     propertyKey?: string;
-    value: any;
+    value: InferPropertyType<P> | any;
     /**
      * Property this display is related to, now strongly typed to P
      */

package/dist/types/fields.d.ts

@@ -1,8 +1,9 @@
+import { InferPropertyType } from "@rebasepro/types";
 import { Entity } from "@rebasepro/types";
 import { FormexController } from "./components/formex";
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 import { Property } from "@rebasepro/types";
-export type DefaultFieldConfig = "text_field" | "multiline" | "markdown" | "url" | "email" | "switch" | "select" | "multi_select" | "user_select" | "number_input" | "number_select" | "multi_number_select" | "file_upload" | "multi_file_upload" | "reference_as_string" | "reference" | "multi_references" | "relation" | "date_time" | "group" | "key_value" | "repeat" | "custom_array" | "block" | "vector_input";
+export type DefaultFieldConfig = "text_field" | "multiline" | "markdown" | "url" | "email" | "switch" | "select" | "multi_select" | "user_select" | "number_input" | "number_select" | "multi_number_select" | "file_upload" | "multi_file_upload" | "reference" | "multi_references" | "relation" | "date_time" | "group" | "key_value" | "repeat" | "custom_array" | "block" | "vector_input";
 /**
  * When building a custom field you need to create a React component that takes
  * this interface as props.
@@ -18,11 +19,8 @@ export interface FieldProps<P extends Property | Property = Property, CustomProp
     /**
      * Current value of this field, inferred from the property type P
      */
-    value: any;
-    /**
-     * Set value of field directly
-     */
-    setValue: (value: any | null, shouldValidate?: boolean) => void;
+    value: InferPropertyType<P> | any;
+    setValue: (value: InferPropertyType<P> | null | any, shouldValidate?: boolean) => void;
     /**
      * Set value of a different field directly
      * @param propertyKey
@@ -137,7 +135,7 @@ export interface FormContext<M extends Record<string, unknown> = Record<string,
     /**
      * Collection of the entity being modified
      */
-    collection?: EntityCollection<M>;
+    collection?: CollectionConfig<M>;
     /**
      * Entity id, it can be undefined if it's a new entity
      */

package/dist/util/dataControllerAdapter.d.ts

@@ -6,7 +6,7 @@
 import type { EntityTableController } from "@rebasepro/types";
 import type { CollectionDataController } from "@rebasepro/ui";
 /**
- * React hook that adapts an EntityTableController to a CollectionDataController.
+ * React hook that adapts a EntityTableController to a CollectionDataController.
  *
  * Usage:
  * ```tsx
@@ -16,10 +16,7 @@ import type { CollectionDataController } from "@rebasepro/ui";
  * <CollectionView dataController={dataController} ... />
  * ```
  */
-export declare function useCollectionDataController<M extends Record<string, unknown>>(tableController: EntityTableController<M>): CollectionDataController<M & {
-    id: string | number;
-    path: string;
-}>;
+export declare function useCollectionDataController<M extends Record<string, unknown>>(tableController: EntityTableController<M>): CollectionDataController<M>;
 /**
  * Non-hook version for cases where you already have the data
  * and just need to build a static controller.

package/dist/util/navigation_utils.d.ts

@@ -1,12 +1,12 @@
-import type { EntityCollection, UrlController, SideEntityController } from "@rebasepro/types";
+import type { CollectionConfig, UrlController, SidePanelController } from "@rebasepro/types";
 export { removeInitialAndTrailingSlashes, removeInitialSlash, removeTrailingSlash, addInitialSlash, getLastSegment, resolveCollectionPathIds, getCollectionBySlugWithin, getCollectionPathsCombinations } from "@rebasepro/common";
 /**
- * Navigate to an entity using either a side panel or full-screen mode.
+ * Navigate to a entity using either a side panel or full-screen mode.
  * This is an admin-specific UI concern and lives here (not in common).
  */
-export declare function navigateToEntity({ openEntityMode, collection, entityId, copy, path, selectedTab, defaultValues, sideEntityController, onClose, navigation, replace }: {
+export declare function navigateToEntity({ openEntityMode, collection, entityId, copy, path, selectedTab, defaultValues, sidePanelController, onClose, navigation, replace }: {
     openEntityMode?: "side_panel" | "full_screen" | "split" | "dialog";
-    collection?: EntityCollection;
+    collection?: CollectionConfig;
     entityId?: string | number;
     selectedTab?: string;
     copy?: boolean;
@@ -14,13 +14,13 @@ export declare function navigateToEntity({ openEntityMode, collection, entityId,
      * Pre-populate the new entity form with these values.
      * Only applied when entityId is not set (i.e. "new" mode).
      *
-     * Side panel: passed through EntitySidePanelProps → EntityEditView.
+     * Side panel: passed through SidePanelBindingProps → EditViewBinding.
      * Full screen: carried via React Router location.state so the route
      * component can read it on mount without polluting the URL.
      */
     defaultValues?: Record<string, unknown>;
     path: string;
-    sideEntityController: SideEntityController;
+    sidePanelController: SidePanelController;
     onClose?: () => void;
     navigation: UrlController;
     replace?: boolean;

package/dist/util/previews.d.ts

@@ -1,7 +1,7 @@
-import type { EntityCollection, PropertyConfig } from "@rebasepro/types";
+import type { CollectionConfig, PropertyConfig } from "@rebasepro/types";
 import { AuthController } from "@rebasepro/types";
-export declare function getEntityPreviewKeys(authController: AuthController, targetCollection: EntityCollection<any>, fields: Record<string, PropertyConfig>, previewProperties?: string[], limit?: number): string[];
-export declare function getEntityTitlePropertyKey<M extends Record<string, unknown>>(collection: EntityCollection<M>, propertyConfigs: Record<string, PropertyConfig>): string | undefined;
+export declare function getEntityPreviewKeys(authController: AuthController, targetCollection: CollectionConfig<any>, fields: Record<string, PropertyConfig>, previewProperties?: string[], limit?: number): string[];
+export declare function getEntityTitlePropertyKey<M extends Record<string, unknown>>(collection: CollectionConfig<M>, propertyConfigs: Record<string, PropertyConfig>): string | undefined;
 /**
  * Attempt to turn a title value (which might be a relation, reference, date, array, or other complex object)
  * into a renderable, human-readable string.

package/dist/util/property_utils.d.ts

@@ -1,5 +1,5 @@
 import type { Properties } from "@rebasepro/types";
-import type { EntityCollection, Property, PropertyConfig } from "@rebasepro/types";
+import type { CollectionConfig, Property, PropertyConfig } from "@rebasepro/types";
 import React from "react";
 import type { IconSize } from "@rebasepro/ui";
 export declare function isReferenceProperty(property: Property): boolean | null;
@@ -22,4 +22,4 @@ export declare function getBracketNotation(path: string): string;
  * @param propertiesOrder
  */
 export declare function getPropertiesWithPropertiesOrder(properties: Properties, propertiesOrder?: string[]): Properties;
-export declare function getDefaultPropertiesOrder(collection: EntityCollection): string[];
+export declare function getDefaultPropertiesOrder(collection: CollectionConfig): string[];

package/dist/util/{entity_view_constants.d.ts → view_constants.d.ts}

@@ -1,5 +1,5 @@
 /**
- * Shared tab value constants used by EntityEditView and EntityDetailView.
+ * Shared tab value constants used by EditViewBinding and DetailViewBinding.
  */
 export declare const MAIN_TAB_VALUE = "__main_##Q$SC^#S6";
 export declare const JSON_TAB_VALUE = "__json";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/admin",
   "type": "module",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "description": "Rebase CMS — content management views, forms, and routing",
   "funding": {
     "url": "https://github.com/sponsors/rebaseco"
@@ -31,14 +31,6 @@
     "headless cms",
     "content manager"
   ],
-  "scripts": {
-    "watch": "vite build --watch",
-    "build": "vite build && tsc --emitDeclarationOnly -p tsconfig.prod.json",
-    "test:lint": "eslint \"src/**\" --quiet",
-    "test": "jest --passWithNoTests",
-    "clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f",
-    "generateIcons": "ts-node --esm src/icons/generateIcons.ts"
-  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -63,13 +55,6 @@
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@floating-ui/dom": "^1.7.6",
-    "@rebasepro/common": "workspace:*",
-    "@rebasepro/core": "workspace:*",
-    "@rebasepro/formex": "workspace:*",
-    "@rebasepro/schema-inference": "workspace:*",
-    "@rebasepro/types": "workspace:*",
-    "@rebasepro/ui": "workspace:*",
-    "@rebasepro/utils": "workspace:*",
     "cmdk": "^1.1.1",
     "date-fns": "^4.4.0",
     "exceljs": "^4.4.0",
@@ -97,7 +82,14 @@
     "prosemirror-view": "^1.41.9",
     "react-dropzone": "^15.0.0",
     "react-use-measure": "^2.1.7",
-    "zod": "^4.4.3"
+    "zod": "^4.4.3",
+    "@rebasepro/common": "0.9.0",
+    "@rebasepro/schema-inference": "0.9.0",
+    "@rebasepro/core": "0.9.0",
+    "@rebasepro/formex": "0.9.0",
+    "@rebasepro/ui": "0.9.0",
+    "@rebasepro/types": "0.9.0",
+    "@rebasepro/utils": "0.9.0"
   },
   "peerDependencies": {
     "react": ">=19.0.0",
@@ -168,5 +160,13 @@
       "^@rebasepro/formex$": "<rootDir>/../formex/src/index.ts",
       "^@rebasepro/utils$": "<rootDir>/../utils/src/index.ts"
     }
+  },
+  "scripts": {
+    "watch": "vite build --watch",
+    "build": "vite build && tsc --emitDeclarationOnly -p tsconfig.prod.json",
+    "test:lint": "eslint \"src/**\" --quiet",
+    "test": "jest --passWithNoTests",
+    "clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f",
+    "generateIcons": "ts-node --esm src/icons/generateIcons.ts"
   }
-}
+}

package/src/collection_editor/ConfigControllerProvider.tsx

@@ -1,6 +1,6 @@
 import { useUrlController } from "./_cms_internals";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { Entity, EntityCollection, Property, TableMetadata, User } from "@rebasepro/types";
+import { Entity, CollectionConfig, Property, TableMetadata, User } from "@rebasepro/types";
 import { deepEqual as equal } from "fast-equals";
 
 import { CollectionsConfigController } from "./types/config_controller";
@@ -87,7 +87,7 @@ export const ConfigControllerProvider = React.memo(
 
         const [currentDialog, setCurrentDialog] = React.useState<{
             isNewCollection: boolean,
-            parentCollection?: EntityCollection,
+            parentCollection?: CollectionConfig,
             editedCollectionId?: string,
             path?: string,
             parentCollectionSlugs: string[], parentEntityIds: string[],
@@ -95,7 +95,7 @@ export const ConfigControllerProvider = React.memo(
                 path?: string,
                 name?: string
             },
-            copyFrom?: EntityCollection,
+            copyFrom?: CollectionConfig,
             redirect: boolean,
             existingEntities?: Entity[],
             pathSuggestions?: string[];
@@ -107,14 +107,14 @@ export const ConfigControllerProvider = React.memo(
             propertyKey?: string,
             property?: Property,
             namespace?: string,
-            parentCollection?: EntityCollection,
+            parentCollection?: CollectionConfig,
             currentPropertiesOrder?: string[],
             editedCollectionId: string,
             path?: string,
             parentCollectionSlugs: string[], parentEntityIds: string[],
 
             existingEntities?: Entity[];
-            collection?: EntityCollection;
+            collection?: CollectionConfig;
         }>();
 
 
@@ -130,7 +130,7 @@ export const ConfigControllerProvider = React.memo(
             id?: string,
             path?: string,
             parentCollectionSlugs: string[], parentEntityIds: string[],
-            parentCollection?: EntityCollection,
+            parentCollection?: CollectionConfig,
             existingEntities?: Entity[],
             initialView?: "general" | "display" | "properties",
             expandKanban?: boolean
@@ -169,7 +169,7 @@ parentEntityIds,
             currentPropertiesOrder?: string[],
             editedCollectionId: string,
             parentCollectionSlugs: string[], parentEntityIds: string[],
-            collection: EntityCollection,
+            collection: CollectionConfig,
             existingEntities?: Entity[]
         }) => {
             console.debug("Edit property", propertyKey, property, editedCollectionId, currentPropertiesOrder, parentCollectionSlugs, parentEntityIds, collection);
@@ -207,12 +207,12 @@ parentEntityIds,
             sourceClick
         }: {
             parentCollectionSlugs: string[], parentEntityIds: string[],
-            parentCollection?: EntityCollection
+            parentCollection?: CollectionConfig
             initialValues?: {
                 path?: string,
                 name?: string
             },
-            copyFrom?: EntityCollection,
+            copyFrom?: CollectionConfig,
             redirect: boolean,
             sourceClick?: string
         }) => {
@@ -262,7 +262,7 @@ parentEntityIds,
                 onAnalyticsEvent,
                 unmappedTables,
                 onFetchTableMetadata,
-                handleClose: (collection?: EntityCollection) => {
+                handleClose: (collection?: CollectionConfig) => {
                     if (currentDialog?.redirect) {
                         if (collection && currentDialog?.isNewCollection && !currentDialog.parentCollectionSlugs.length) {
                             const url = urlController.buildUrlCollectionPath(collection.slug);

package/src/collection_editor/_cms_internals.ts

@@ -8,18 +8,18 @@
 export { useCollectionRegistryController } from "../hooks/navigation/contexts/CollectionRegistryContext";
 export { useNavigationStateController } from "../hooks/navigation/contexts/NavigationStateContext";
 export { useUrlController } from "../hooks/navigation/contexts/UrlContext";
-export { useSideEntityController } from "../hooks/useSideEntityController";
+export { useSidePanel } from "../hooks/useSidePanel";
 export { useBreadcrumbsController } from "../hooks/useBreadcrumbsController";
 
 // Components
 export { FieldCaption } from "../components/FieldCaption";
 export { SearchIconsView } from "../components/SearchIconsView";
 export { PropertyConfigBadge } from "../components/PropertyConfigBadge";
-export { EntityCollectionTable } from "../components/EntityCollectionTable";
-export { VirtualTableInput } from "../components/EntityCollectionTable/fields/VirtualTableInput";
+export { CollectionTableBinding } from "../components/CollectionTableBinding";
+export { VirtualTableInput } from "@rebasepro/ui";
 export { ArrayContainer } from "../components/ArrayContainer";
 export type { ArrayEntryParams } from "../components/ArrayContainer";
-export { useSelectionController } from "../components/EntityCollectionView/useSelectionController";
+export { useSelectionController } from "../components/CollectionViewBinding/useSelectionController";
 
 // Data import
 export { ImportFileUpload } from "../data_import/components/ImportFileUpload";

package/src/collection_editor/api/generateCollectionApi.ts

@@ -1,14 +1,14 @@
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 
 export interface GenerateCollectionRequest {
     /** User's natural language description of what they want */
     prompt: string;
 
     /** Other collections in the project (for context/relationships). Limit to 30. */
-    existingCollections: Partial<EntityCollection>[];
+    existingCollections: Partial<CollectionConfig>[];
 
     /** Optional for generate, required for modifications. If provided, modifies this collection */
-    existingCollection?: Partial<EntityCollection>;
+    existingCollection?: Partial<CollectionConfig>;
 }
 
 /** Operation types for modifying a collection */
@@ -23,7 +23,7 @@ export interface CollectionOperation {
 
 /** Result from collection generation, including optional delta operations */
 export interface GenerateCollectionResult {
-    collection: EntityCollection;
+    collection: CollectionConfig;
     operations?: CollectionOperation[];
 }
 
@@ -55,8 +55,9 @@ export const DEFAULT_COLLECTION_GENERATION_ENDPOINT = "https://api.rebase.pro/co
  */
 export interface BuildCollectionGenerationCallbackProps {
     /**
-     * Function to get the auth token (e.g., from Firebase Auth)
-     * This is typically `authController.getAuthToken` from `@rebasepro/client-firebase`
+     * Function to get the auth token.
+     * This is typically `authController.getAuthToken` from `@rebasepro/client`
+     * (or `@rebasepro/client-firebase` if using Firebase).
      */
     getAuthToken: () => Promise<string>;
 

package/src/collection_editor/extensibility_types.ts

@@ -12,7 +12,7 @@
  */
 
 import type React from "react";
-import type { SerializableProperty, SerializableCollection } from "./serializable_types";
+import type { SerializableProperty, SerializableCollectionConfig } from "./serializable_types";
 
 // ═══════════════════════════════════════════════════════════════════════
 // PROPERTY TYPE PRESETS
@@ -90,7 +90,7 @@ export interface ExtraPropertyFieldsParams {
     /** The full current property being edited (serializable form). */
     property: SerializableProperty;
     /** The collection this property belongs to (serializable form). */
-    collection: SerializableCollection;
+    collection: SerializableCollectionConfig;
 }
 
 /**
@@ -102,7 +102,7 @@ export interface ExtraCollectionFieldsParams {
     /** Callback to update a single metadata key. Triggers dirty-state tracking. */
     onMetadataChange: (key: string, value: unknown) => void;
     /** The full current collection being edited (serializable form). */
-    collection: SerializableCollection;
+    collection: SerializableCollectionConfig;
 }
 
 // ═══════════════════════════════════════════════════════════════════════

package/src/collection_editor/index.ts

@@ -23,16 +23,16 @@ export {
 } from "./useJsonCollectionsConfigController";
 
 export {
-    toSerializableCollection,
+    toSerializableCollectionConfig,
     toSerializableProperty,
     toSerializableProperties,
-    fromSerializableCollection,
+    fromSerializableCollectionConfig,
     fromSerializableProperty,
     fromSerializableProperties,
 } from "./serializable_utils";
 
 export type {
-    SerializableCollection,
+    SerializableCollectionConfig,
     SerializableProperty,
     SerializableProperties,
     SerializableBaseProperty,

package/src/collection_editor/pgColumnToProperty.ts

@@ -1,4 +1,4 @@
-import { EntityCollection, Property, StringProperty, NumberProperty, ArrayProperty, TableColumnInfo, TableMetadata } from "@rebasepro/types";
+import { CollectionConfig, Property, StringProperty, NumberProperty, ArrayProperty, TableColumnInfo, TableMetadata, PostgresProperties } from "@rebasepro/types";
 import { prettifyIdentifier } from "@rebasepro/utils";
 
 /**
@@ -193,13 +193,13 @@ label: prettifyIdentifier(v) })),
 }
 
 /**
- * Builds a partial EntityCollection from PostgreSQL table metadata.
+ * Builds a partial CollectionConfig from PostgreSQL table metadata.
  * This is used when creating a new collection from an existing database table.
  */
 export function buildCollectionFromTableMetadata(
     tableName: string,
     metadata: TableMetadata
-): Partial<EntityCollection> {
+): Partial<CollectionConfig> {
     const properties: Record<string, Property> = {};
     const propertiesOrder: string[] = [];
     const relations: any[] = []; // In the builder/editor, target can be a string path before hydration
@@ -282,7 +282,7 @@ export function buildCollectionFromTableMetadata(
         name: prettifiedName,
         slug: tableName,
         table: tableName,
-        properties,
+        properties: properties as PostgresProperties,
         propertiesOrder,
         ...(relations.length > 0 ? { relations } : {}),
         ...(securityRules.length > 0 ? { securityRules } : {})

package/src/collection_editor/serializable_types.ts

@@ -5,40 +5,29 @@
  * class instances) from the original types in `@rebasepro/types`, making
  * them safe for `JSON.stringify()` / database storage.
  *
- * Use `toSerializableCollection` / `fromSerializableCollection` from
+ * Use `toSerializableCollectionConfig` / `fromSerializableCollectionConfig` from
  * `./serializable_utils` to convert between the original and serializable forms.
  *
  * @module
  */
 
 import type {
-    DataType,
-    EnumValues,
-    PropertyValidationSchema,
-    NumberPropertyValidationSchema,
     ArrayPropertyValidationSchema,
-    PropertyConditions,
-    ImageResize,
-    FileType,
-    ColorKey,
-    ColorScheme,
-} from "@rebasepro/types";
-
-import type {
-    ViewMode,
     CollectionSize,
-    SecurityRule,
-    FilterValues,
+    EnumValues,
+    FileType,
     FilterPreset,
-    WhereFilterOp,
+    FilterValues,
+    ImageResize,
+    JoinStep,
     KanbanConfig,
-    SecurityOperation,
     NavigationGroupMapping,
-} from "@rebasepro/types";
-
-import type {
+    NumberPropertyValidationSchema,
     OnAction,
-    JoinStep,
+    PropertyConditions,
+    PropertyValidationSchema,
+    SecurityRule,
+    ViewMode,
 } from "@rebasepro/types";
 
 // ═══════════════════════════════════════════════════════════════════════
@@ -109,6 +98,8 @@ export interface SerializableStorageConfig {
     includeBucketUrl?: boolean;
     storeUrl?: boolean;
     maxSize?: number;
+    /** Key of the named storage backend to use (see `StorageConfig.storageSource`). */
+    storageSource?: string;
     // processFile, postProcess, previewUrl are dropped (functions)
 }
 
@@ -200,13 +191,9 @@ export interface SerializableStringProperty extends SerializableBaseProperty {
     validation?: SerializableStringValidation;
     isId?: boolean | "manual" | "uuid" | "cuid" | string;
     enum?: EnumValues;
-    multiline?: boolean;
-    markdown?: boolean;
     storage?: SerializableStorageConfig;
     userSelect?: boolean;
-    url?: boolean | "image" | "video" | "audio" | "file";
     email?: boolean;
-    previewAsTag?: boolean;
     reference?: SerializableReferenceProperty;
 }
 
@@ -236,7 +223,6 @@ export interface SerializableDateProperty extends SerializableBaseProperty {
     mode?: "date" | "date_time";
     timezone?: string;
     autoValue?: "on_create" | "on_update";
-    clearable?: boolean;
 }
 
 /** JSON-serializable `GeopointProperty`. */
@@ -277,7 +263,7 @@ export interface SerializableReferenceProperty extends SerializableBaseProperty
 /**
  * JSON-serializable `RelationProperty`.
  * `target` is string-only (collection slug). The function variant
- * `() => EntityCollection` is not serializable.
+ * `() => CollectionConfig` is not serializable.
  */
 export interface SerializableRelationProperty extends SerializableBaseProperty {
     ui?: SerializableRelationUIConfig;
@@ -303,7 +289,7 @@ export interface SerializableRelationProperty extends SerializableBaseProperty {
     includeId?: boolean;
     includeEntityLink?: boolean;
     widget?: "select" | "dialog";
-    // overrides are dropped (can contain non-serializable EntityCollection fields)
+    // overrides are dropped (can contain non-serializable CollectionConfig fields)
     // relation (resolved Relation object) is dropped (runtime-only, contains function target)
 }
 
@@ -366,7 +352,7 @@ export type SerializableProperties = {
 // ═══════════════════════════════════════════════════════════════════════
 
 /**
- * JSON-serializable version of `EntityCollection` / `BaseEntityCollection`.
+ * JSON-serializable version of `CollectionConfig` / `BaseCollectionConfig`.
  *
  * Strips all non-serializable fields:
  * - Functions: `callbacks`, `childCollections`, `additionalFields`, `defaultSelectedView` (fn)
@@ -378,7 +364,7 @@ export type SerializableProperties = {
  *
  * Keeps all data-describing fields that the collection editor works with.
  */
-export interface SerializableCollection {
+export interface SerializableCollectionConfig {
     slug: string;
     name: string;
     singularName?: string;
@@ -391,7 +377,8 @@ export interface SerializableCollection {
     icon?: string;
 
     group?: string;
-    driver?: string;
+    engine?: string;
+    dataSource?: string;
     databaseId?: string;
 
     properties: SerializableProperties;
@@ -443,7 +430,7 @@ export interface SerializableCollection {
     // ── SQL / Postgres-specific ───────────────────────────────────────
     table?: string;
     schema?: string;
-    securityRules?: SecurityRule[];
+    securityRules?: readonly SecurityRule[];
 
     // ── Owner ─────────────────────────────────────────────────────────
     ownerId?: string;
@@ -465,10 +452,10 @@ export interface SerializableCollection {
  */
 export interface JsonCollectionStore {
     /** Load all persisted collections. */
-    load(): Promise<SerializableCollection[]>;
+    load(): Promise<SerializableCollectionConfig[]>;
 
     /** Save (create or update) a single collection by its slug. */
-    save(slug: string, data: SerializableCollection): Promise<void>;
+    save(slug: string, data: SerializableCollectionConfig): Promise<void>;
 
     /** Delete a collection by its slug. */
     delete(slug: string): Promise<void>;