@rebasepro/studio 0.8.0 → 0.9.0

package/dist/utils/pgColumnToProperty.d.ts

@@ -1,6 +1,6 @@
-import type { EntityCollection, TableMetadata } from "@rebasepro/types";
+import type { CollectionConfig, TableMetadata } from "@rebasepro/types";
 /**
- * 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 declare function buildCollectionFromTableMetadata(tableName: string, metadata: TableMetadata): Partial<EntityCollection>;
+export declare function buildCollectionFromTableMetadata(tableName: string, metadata: TableMetadata): Partial<CollectionConfig>;

package/dist/utils/sql_utils.d.ts

@@ -1,5 +1,5 @@
 import { TableInfo } from "../components/SQLEditor/SQLEditor";
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 /**
  * A table extracted from a SQL query's FROM/JOIN clauses.
  */
@@ -16,7 +16,7 @@ export interface ResolvedQueryCollection {
     /** SQL alias if present (e.g. "bp") */
     tableAlias?: string;
     /** The matched collection */
-    collection: EntityCollection;
+    collection: CollectionConfig;
     /** Columns from this table that are present in the result set */
     columns: string[];
     /** The result column name that holds the primary key for this table (e.g. "id", "author_id") */
@@ -37,7 +37,7 @@ export declare function extractTablesFromQuery(sqlString: string): ExtractedTabl
  * For each matched collection, determines which result columns
  * belong to that table using the database schema information.
  */
-export declare function resolveQueryCollections(sqlString: string, schemas: Record<string, TableInfo[]>, collections: EntityCollection[], resultColumns?: string[]): ResolvedQueryCollection[];
+export declare function resolveQueryCollections(sqlString: string, schemas: Record<string, TableInfo[]>, collections: CollectionConfig[], resultColumns?: string[]): ResolvedQueryCollection[];
 export interface PKMapping {
     /** The actual column name in the database table */
     dbColumn: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/studio",
   "type": "module",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "main": "./dist/index.umd.js",
   "module": "./dist/index.es.js",
   "types": "./dist/index.d.ts",
@@ -15,19 +15,19 @@
     "pgsql-ast-parser": "12.0.2",
     "prism-react-renderer": "^2.4.1",
     "react-dropzone": "^15.0.0",
-    "@rebasepro/common": "0.8.0",
-    "@rebasepro/types": "0.8.0",
-    "@rebasepro/core": "0.8.0",
-    "@rebasepro/ui": "0.8.0",
-    "@rebasepro/client": "0.8.0",
-    "@rebasepro/utils": "0.8.0"
+    "@rebasepro/client": "0.9.0",
+    "@rebasepro/common": "0.9.0",
+    "@rebasepro/core": "0.9.0",
+    "@rebasepro/utils": "0.9.0",
+    "@rebasepro/ui": "0.9.0",
+    "@rebasepro/types": "0.9.0"
   },
   "peerDependencies": {
     "react": ">=19.0.0",
     "react-dom": ">=19.0.0",
     "react-router": "^7.0.0",
     "react-router-dom": "^7.0.0",
-    "@rebasepro/admin": "0.8.0"
+    "@rebasepro/admin": "0.9.0"
   },
   "peerDependenciesMeta": {
     "@rebasepro/admin": {

package/src/components/JSEditor/JSEditor.tsx

@@ -35,9 +35,9 @@ import {
     VirtualTableColumn,
     XIcon
 } from "@rebasepro/ui";
-import { useStudioUrlController, useStudioCollectionRegistry, useStudioSideEntityController } from "@rebasepro/core";
+import { useStudioUrlController, useStudioCollectionRegistry, useStudioSidePanelController } from "@rebasepro/core";
 import { useRebaseContext, useRebaseClient, useSnackbarController, useApiConfig, useTranslation, useModeController, ErrorView, SelectableUser, IconForView } from "@rebasepro/core";
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 import { createRebaseClient } from "@rebasepro/client";
 import { JSMonacoEditor } from "./JSMonacoEditor";
 import { JSEditorSidebar, JSSnippet } from "./JSEditorSidebar";
@@ -113,7 +113,7 @@ function formatJSON(value: unknown): string {
 
 interface MatchedJSCollection {
     collectionSlug: string;
-    collection: EntityCollection;
+    collection: CollectionConfig;
     pkColumn: string;
 }
 
@@ -126,7 +126,7 @@ interface MatchedJSCollection {
 function detectCollectionsInResult(
     code: string,
     resultValue: unknown,
-    collections: EntityCollection[]
+    collections: CollectionConfig[]
 ): MatchedJSCollection[] {
     if (!resultValue || !collections?.length) return [];
 
@@ -190,7 +190,7 @@ export function JSEditor() {
     const apiConfig = useApiConfig();
     const snackbar = useSnackbarController();
     const collectionRegistry = useStudioCollectionRegistry();
-    const sideEntityController = useStudioSideEntityController();
+    const sidePanelController = useStudioSidePanelController();
     const { t } = useTranslation();
 
     // User management for the "Run as" picker
@@ -854,7 +854,7 @@ id: String(ra.entityId) })}>
                                                                                             className="text-surface-400 dark:text-surface-500 hover:text-surface-600 dark:hover:text-surface-300"
                                                                                             onClick={(e) => {
                                                                                                 e.stopPropagation();
-                                                                                                sideEntityController.open({
+                                                                                                sidePanelController.open({
                                                                                                     path: ra.collection.collectionSlug,
                                                                                                     entityId: ra.entityId,
                                                                                                     collection: ra.collection.collection,
@@ -887,7 +887,7 @@ id: String(ra.entityId) })}>
                                                                                             key={ra.collection.collectionSlug}
                                                                                             dense
                                                                                             onClick={() => {
-                                                                                                sideEntityController.open({
+                                                                                                sidePanelController.open({
                                                                                                     path: ra.collection.collectionSlug,
                                                                                                     entityId: ra.entityId,
                                                                                                     collection: ra.collection.collection,

package/src/components/JSEditor/JSMonacoEditor.tsx

@@ -23,11 +23,7 @@ interface MonacoTypeScriptApi {
 const REBASE_CLIENT_TYPES = `
 // ─── Rebase Client SDK Type Definitions ─────────────────────────────
 
-interface Entity<M extends Record<string, any> = any> {
-    id: string | number;
-    path: string;
-    values: M;
-}
+/** A flat database row with the id merged at the top level. */
 
 interface FindParams {
     limit?: number;
@@ -39,8 +35,8 @@ interface FindParams {
     searchString?: string;
 }
 
-interface FindResponse<M extends Record<string, any> = any> {
-    data: Entity<M>[];
+interface FindResult<M extends Record<string, any> = any> {
+    data: M[];
     meta: {
         total: number;
         limit: number;
@@ -57,55 +53,55 @@ interface QueryBuilder<M extends Record<string, any> = any> {
     limit(count: number): QueryBuilder<M>;
     offset(count: number): QueryBuilder<M>;
     search(searchString: string): QueryBuilder<M>;
-    find(): Promise<FindResponse<M>>;
-    findOne(): Promise<Entity<M> | undefined>;
+    find(): Promise<FindResult<M>>;
     count(): Promise<number>;
 }
 
 interface CollectionClient<M extends Record<string, any> = any> {
-    find(params?: FindParams): Promise<FindResponse<M>>;
-    findById(id: string | number): Promise<Entity<M> | undefined>;
-    create(data: Partial<M>, id?: string | number): Promise<Entity<M>>;
-    update(id: string | number, data: Partial<M>): Promise<Entity<M>>;
+    find(params?: FindParams): Promise<FindResult<M>>;
+    findById(id: string | number): Promise<M | undefined>;
+    create(data: Partial<M>, id?: string | number): Promise<M>;
+    update(id: string | number, data: Partial<M>): Promise<M>;
     delete(id: string | number): Promise<void>;
     where(column: keyof M & string, operator: WhereFilterOp, value: any): QueryBuilder<M>;
     orderBy(column: keyof M & string, direction?: "asc" | "desc"): QueryBuilder<M>;
     limit(count: number): QueryBuilder<M>;
     offset(count: number): QueryBuilder<M>;
     search(searchString: string): QueryBuilder<M>;
-    listen?(params: FindParams | undefined, onUpdate: (response: FindResponse<M>) => void, onError?: (error: Error) => void): () => void;
-    listenById?(id: string | number, onUpdate: (entity: Entity<M> | undefined) => void, onError?: (error: Error) => void): () => void;
+    listen?(params: FindParams | undefined, onUpdate: (response: FindResult<M>) => void, onError?: (error: Error) => void): () => void;
+    listenById?(id: string | number, onUpdate: (row: M | undefined) => void, onError?: (error: Error) => void): () => void;
     count?(params?: FindParams): Promise<number>;
 }
 
-interface RebaseUser {
+interface User {
     uid: string;
     email: string | null;
     displayName: string | null;
     photoURL: string | null;
-    emailVerified?: boolean;
-    roles?: string[];
     providerId: string;
     isAnonymous: boolean;
+    emailVerified?: boolean;
+    roles?: string[];
+    metadata?: Record<string, unknown>;
 }
 
 interface RebaseSession {
     accessToken: string;
     refreshToken: string;
     expiresAt: number;
-    user: RebaseUser;
+    user: User;
 }
 
 type AuthChangeEvent = 'SIGNED_IN' | 'SIGNED_OUT' | 'TOKEN_REFRESHED' | 'USER_UPDATED';
 
 interface RebaseAuth {
-    signInWithEmail(email: string, password: string): Promise<{ user: RebaseUser; accessToken: string; refreshToken: string }>;
-    signUp(email: string, password: string, displayName?: string): Promise<{ user: RebaseUser; accessToken: string; refreshToken: string }>;
-    signInWithGoogle(idToken: string): Promise<{ user: RebaseUser; accessToken: string; refreshToken: string }>;
+    signInWithEmail(email: string, password: string): Promise<{ user: User; accessToken: string; refreshToken: string }>;
+    signUp(email: string, password: string, displayName?: string): Promise<{ user: User; accessToken: string; refreshToken: string }>;
+    signInWithGoogle(idToken: string): Promise<{ user: User; accessToken: string; refreshToken: string }>;
     signOut(): Promise<void>;
     refreshSession(): Promise<RebaseSession>;
-    getUser(): Promise<RebaseUser>;
-    updateUser(updates: { displayName?: string; photoURL?: string }): Promise<RebaseUser>;
+    getUser(): Promise<User>;
+    updateUser(updates: { displayName?: string; photoURL?: string }): Promise<User>;
     resetPasswordForEmail(email: string): Promise<{ success: boolean; message: string }>;
     resetPassword(token: string, password: string): Promise<{ success: boolean; message: string }>;
     changePassword(oldPassword: string, newPassword: string): Promise<{ success: boolean; message: string }>;

package/src/components/RLSEditor/RLSEditor.tsx

@@ -26,7 +26,7 @@ import {
     Typography
 } from "@rebasepro/ui";
 import { useRebaseContext, useSnackbarController, ErrorView, useTranslation } from "@rebasepro/core";
-import { isPostgresCollection } from "@rebasepro/types";
+import { isPostgresCollectionConfig } from "@rebasepro/types";
 import { REBASE_INTERNAL_SCHEMAS, REBASE_INTERNAL_PREFIXES, JUNCTION_TABLES_SQL } from "@rebasepro/common";
 import { PolicyEditor } from "./PolicyEditor";
 
@@ -388,35 +388,22 @@ status: "live" };
         });
 
         // Merge code-based policies
-        if (activeCollection && isPostgresCollection(activeCollection) && activeCollection.securityRules) {
-            activeCollection.securityRules.forEach((rule: { name?: string, mode?: string, operation?: string, roles?: string[], using?: string, withCheck?: string }) => {
+        if (activeCollection && isPostgresCollectionConfig(activeCollection) && activeCollection.securityRules) {
+            activeCollection.securityRules.forEach((rule) => {
                 const ruleName = rule.name;
                 if (!ruleName) return;
 
-                if (policiesMap[ruleName]) {
-                    // It exists in Postgres, but we have a code definition (potentially edited)
-                    policiesMap[ruleName] = {
-                        policyname: ruleName,
-                        tablename: activeTableData.tableName,
-                        permissive: (rule.mode || "permissive").toUpperCase() as PostgresPolicy["permissive"],
-                        cmd: (rule.operation || "ALL").toUpperCase() as PostgresPolicy["cmd"],
-                        roles: rule.roles || ["public"],
-                        qual: rule.using || null,
-                        with_check: rule.withCheck || null,
-                        status: "both"
-                    };
-                } else {
-                    policiesMap[ruleName] = {
-                        policyname: ruleName,
-                        tablename: activeTableData.tableName,
-                        permissive: (rule.mode || "permissive").toUpperCase() as PostgresPolicy["permissive"],
-                        cmd: (rule.operation || "ALL").toUpperCase() as PostgresPolicy["cmd"],
-                        roles: rule.roles || ["public"],
-                        qual: rule.using || null,
-                        with_check: rule.withCheck || null,
-                        status: "code_only"
-                    };
-                }
+                policiesMap[ruleName] = {
+                    policyname: ruleName,
+                    tablename: activeTableData.tableName,
+                    permissive: (rule.mode || "permissive").toUpperCase() as PostgresPolicy["permissive"],
+                    cmd: (rule.operation || "ALL").toUpperCase() as PostgresPolicy["cmd"],
+                    roles: [...(rule.roles ?? ["public"])],
+                    qual: rule.using || null,
+                    with_check: rule.withCheck || null,
+                    // "both" = defined in code and live in Postgres (potentially edited)
+                    status: policiesMap[ruleName] ? "both" : "code_only"
+                };
             });
         }
 
@@ -734,7 +721,7 @@ message: e instanceof Error ? e.message : String(e) });
                                             roles: newPolicy.roles
                                         };
 
-                                        const existingRules = (isPostgresCollection(activeCollection) ? activeCollection.securityRules : undefined) || [];
+                                        const existingRules = (isPostgresCollectionConfig(activeCollection) ? activeCollection.securityRules : undefined) || [];
                                         let newRules;
                                         if (editingPolicy === "new") {
                                             newRules = [...existingRules, rule];
@@ -829,7 +816,7 @@ message: e instanceof Error ? e.message : String(e) });
                                                     </Typography>
                                                     <Typography variant="caption" className="opacity-80">
                                                         This is an auto-generated junction table for a many-to-many relation.
-                                                        Its access is typically managed through the related collections' policies.
+                                                        Its access is typically managed through the related collections&apos; policies.
                                                         You can still add RLS policies directly if needed.
                                                     </Typography>
                                                 </div>
@@ -845,7 +832,7 @@ message: e instanceof Error ? e.message : String(e) });
                                                         Unmapped Table
                                                     </Typography>
                                                     <Typography variant="caption" className="opacity-80">
-                                                        This table exists in the database but isn't mapped to a collection definition.
+                                                        This table exists in the database but isn&apos;t mapped to a collection definition.
                                                         Import it into a Schema configuration file to manage security policies visually.
                                                     </Typography>
                                                 </div>
@@ -926,7 +913,7 @@ message: e instanceof Error ? e.message : String(e) });
                                                                         roles: policy.roles
                                                                     };
 
-                                                                    const existingRules = (isPostgresCollection(activeCollection) ? activeCollection.securityRules : undefined) || [];
+                                                                    const existingRules = (isPostgresCollectionConfig(activeCollection) ? activeCollection.securityRules : undefined) || [];
                                                                     const newRules = [...existingRules, rule];
 
                                                                     try {

package/src/components/SQLEditor/SQLEditor.tsx

@@ -1,6 +1,6 @@
 
 import { IconForView } from "@rebasepro/core";
-import { useStudioCollectionRegistry, useStudioSideEntityController } from "@rebasepro/core";
+import { useStudioCollectionRegistry, useStudioSidePanelController } from "@rebasepro/core";
 import React, { useState, useEffect, useCallback, useRef, useMemo } from "react";
 import { createPortal } from "react-dom";
 import {
@@ -213,7 +213,7 @@ const getStoragePrefix = (baseUrl?: string) => {
 
 export const SQLEditor = () => {
     const { databaseAdmin, client } = useRebaseContext();
-    const sideEntityController = useStudioSideEntityController();
+    const sidePanelController = useStudioSidePanelController();
     const snackbarController = useSnackbarController();
     const collectionRegistry = useStudioCollectionRegistry();
 
@@ -1100,7 +1100,7 @@ id: String(ra.entityId) })}>
                                                     className="text-surface-400 dark:text-surface-500 hover:text-surface-600 dark:hover:text-surface-300 transition-colors"
                                                     onClick={(e) => {
                                                         e.stopPropagation();
-                                                        sideEntityController?.open({
+                                                        sidePanelController?.open({
                                                             path: ra.collection.collection.slug,
                                                             entityId: ra.entityId,
                                                             collection: ra.collection.collection,
@@ -1133,7 +1133,7 @@ id: String(ra.entityId) })}>
                                                     key={ra.collection.tableName}
                                                     dense
                                                     onClick={() => {
-                                                        sideEntityController?.open({
+                                                        sidePanelController?.open({
                                                             path: ra.collection.collection.slug,
                                                             entityId: ra.entityId,
                                                             collection: ra.collection.collection,

package/src/components/SchemaVisualizer/SchemaVisualizer.tsx

@@ -29,8 +29,8 @@ import {
     useStudioCollectionRegistry,
     IconForView
 } from "@rebasepro/core";
-import type { EntityCollection } from "@rebasepro/types";
-import { isPostgresCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
+import { isPostgresCollectionConfig } from "@rebasepro/types";
 import { useSchemaGraph } from "./useSchemaGraph";
 import type { TableNodeData } from "./useSchemaGraph";
 import { TableNode } from "./TableNode";
@@ -52,7 +52,7 @@ const edgeTypes = {
 function SchemaVisualizerCanvas({
     collections
 }: {
-    collections: EntityCollection[];
+    collections: CollectionConfig[];
 }) {
     const reactFlowInstance = useReactFlow();
     const {
@@ -152,7 +152,7 @@ duration: 400 }
 
     // Group collections for sidebar
     const postgresCollections = useMemo(
-        () => collections.filter(isPostgresCollection),
+        () => collections.filter(isPostgresCollectionConfig),
         [collections]
     );
 
@@ -184,7 +184,7 @@ duration: 400 }
             junctions: junctionNodes.length,
             withRls: postgresCollections.filter(
                 (c) =>
-                    isPostgresCollection(c) &&
+                    isPostgresCollectionConfig(c) &&
                     c.securityRules &&
                     c.securityRules.length > 0
             ).length
@@ -293,7 +293,7 @@ duration: 400 }
                                             )}
                                         </div>
                                         <div className="flex items-center gap-1 shrink-0 ml-1">
-                                            {isPostgresCollection(collection) &&
+                                            {isPostgresCollectionConfig(collection) &&
                                                 collection.securityRules &&
                                                 collection.securityRules
                                                     .length > 0 && (
@@ -629,7 +629,7 @@ duration: 400 }
 export const SchemaVisualizer = () => {
     const { collections: registryCollections } =
         useStudioCollectionRegistry() as {
-            collections?: EntityCollection[];
+            collections?: CollectionConfig[];
         };
 
     // Merge registry collections with any passed collections

package/src/components/SchemaVisualizer/useSchemaGraph.ts

@@ -1,8 +1,8 @@
 import { useMemo, useState, useCallback, useEffect } from "react";
 import type { Node, Edge } from "@xyflow/react";
 import { MarkerType } from "@xyflow/react";
-import { isPostgresCollection } from "@rebasepro/types";
-import type { EntityCollection, PostgresCollection, Relation } from "@rebasepro/types";
+import { isPostgresCollectionConfig } from "@rebasepro/types";
+import type { CollectionConfig, PostgresCollectionConfig, Relation } from "@rebasepro/types";
 import { resolveCollectionRelations } from "@rebasepro/common";
 import { getLayoutedElements, getCardinalityLabel, getTypeLabel, NODE_WIDTH } from "./schema-visualizer.utils";
 import type { LayoutDirection, RelationEdgeData } from "./schema-visualizer.utils";
@@ -36,9 +36,9 @@ export interface TableNodeData {
     [key: string]: unknown;
 }
 
-// ─── Extract columns from an EntityCollection ─────────────────────────
+// ─── Extract columns from a CollectionConfig ─────────────────────────
 
-const extractColumns = (collection: EntityCollection): ColumnInfo[] => {
+const extractColumns = (collection: CollectionConfig): ColumnInfo[] => {
     const columns: ColumnInfo[] = [];
     const properties = collection.properties ?? {};
 
@@ -79,7 +79,7 @@ const extractColumns = (collection: EntityCollection): ColumnInfo[] => {
     }
 
     // Add FK columns from owning relations
-    if (isPostgresCollection(collection)) {
+    if (isPostgresCollectionConfig(collection)) {
         try {
             const resolvedRelations = resolveCollectionRelations(collection);
             for (const rel of Object.values(resolvedRelations)) {
@@ -117,7 +117,7 @@ const extractColumns = (collection: EntityCollection): ColumnInfo[] => {
 // ─── Build graph from collections ─────────────────────────────────────
 
 const buildGraph = (
-    collections: EntityCollection[],
+    collections: CollectionConfig[],
     direction: LayoutDirection
 ): { nodes: Node[]; edges: Edge[] } => {
     const nodes: Node[] = [];
@@ -143,7 +143,7 @@ const buildGraph = (
 
     // 1. Create nodes for each collection
     for (const collection of collections) {
-        if (!isPostgresCollection(collection)) continue;
+        if (!isPostgresCollectionConfig(collection)) continue;
 
         const tableName = collection.table ?? collection.slug;
         const nodeId = `table-${tableName}`;
@@ -177,7 +177,7 @@ y: 0 },
     const processedJunctions = new Set<string>();
 
     for (const collection of collections) {
-        if (!isPostgresCollection(collection)) continue;
+        if (!isPostgresCollectionConfig(collection)) continue;
 
         const tableName = collection.table ?? collection.slug;
         const sourceNodeId = tableToNodeId.get(tableName);
@@ -191,14 +191,14 @@ y: 0 },
         }
 
         for (const [relationKey, rel] of Object.entries(resolvedRelations)) {
-            let targetCollection: EntityCollection;
+            let targetCollection: CollectionConfig;
             try {
                 targetCollection = rel.target();
             } catch {
                 continue;
             }
 
-            if (!isPostgresCollection(targetCollection)) continue;
+            if (!isPostgresCollectionConfig(targetCollection)) continue;
 
             const targetTable = targetCollection.table ?? targetCollection.slug;
             const targetNodeId = tableToNodeId.get(targetTable);
@@ -356,7 +356,7 @@ export interface UseSchemaGraphResult {
 }
 
 export const useSchemaGraph = (
-    collections: EntityCollection[] | undefined
+    collections: CollectionConfig[] | undefined
 ): UseSchemaGraphResult => {
     const [direction, setDirection] = useState<LayoutDirection>("LR");
     const [version, setVersion] = useState(0);

package/src/index.ts

@@ -6,7 +6,7 @@ export {
     StudioBridgeProvider,
     StudioBridgeContext,
     useStudioCollectionRegistry,
-    useStudioSideEntityController,
+    useStudioSidePanelController,
     useStudioUrlController,
     useStudioNavigationState,
     useStudioBreadcrumbs

package/src/utils/pgColumnToProperty.ts

@@ -1,4 +1,4 @@
-import type { EntityCollection, PostgresProperties, Property, StringProperty, NumberProperty, ArrayProperty, TableColumnInfo, TableMetadata, SecurityOperation, SecurityRule } from "@rebasepro/types";
+import type { CollectionConfig, PostgresProperties, Property, StringProperty, NumberProperty, ArrayProperty, TableColumnInfo, TableMetadata, SecurityOperation, SecurityRule } from "@rebasepro/types";
 
 /**
  * Maps a PostgreSQL column data type to a Rebase property type.
@@ -194,13 +194,13 @@ label: v.replace(/_/g, " ").replace(/\b\w/g, (c: string) => c.toUpperCase()) }))
 }
 
 /**
- * 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: Array<{

package/src/utils/sql_utils.test.ts

@@ -2,7 +2,7 @@
 import { describe, it, expect } from "@jest/globals";
 import { determineTableAndPK, extractTablesFromQuery, resolveQueryCollections } from "./sql_utils";
 import { TableInfo } from "../components/SQLEditor/SQLEditor";
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 
 const mockSchemas: Record<string, TableInfo[]> = {
     "public": [
@@ -81,31 +81,31 @@ isPrimaryKey: false }
     ]
 };
 
-const mockCollections: EntityCollection[] = [
+const mockCollections: CollectionConfig[] = [
     {
         slug: "users",
         name: "Users",
         table: "users",
         properties: {}
-    } as EntityCollection,
+    } as CollectionConfig,
     {
         slug: "roles",
         name: "Roles",
         table: "roles",
         properties: {}
-    } as EntityCollection,
+    } as CollectionConfig,
     {
         slug: "blogPosts",
         name: "Blog Posts",
         table: "blog_posts",
         properties: {}
-    } as EntityCollection,
+    } as CollectionConfig,
     {
         slug: "blog-entries", // slug with hyphen, no table → falls back to snake_case "blog_entries"
         name: "Blog Entries",
         table: "",
         properties: {}
-    } as EntityCollection
+    } as CollectionConfig
 ];
 
 describe("determineTableAndPK", () => {

package/src/utils/sql_utils.ts

@@ -1,6 +1,6 @@
 import { parseFirst } from "pgsql-ast-parser";
 import { TableInfo } from "../components/SQLEditor/SQLEditor";
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 
 /**
  * A table extracted from a SQL query's FROM/JOIN clauses.
@@ -19,7 +19,7 @@ export interface ResolvedQueryCollection {
     /** SQL alias if present (e.g. "bp") */
     tableAlias?: string;
     /** The matched collection */
-    collection: EntityCollection;
+    collection: CollectionConfig;
     /** Columns from this table that are present in the result set */
     columns: string[];
     /** The result column name that holds the primary key for this table (e.g. "id", "author_id") */
@@ -77,7 +77,7 @@ import { toSnakeCase } from "@rebasepro/utils";
 export function resolveQueryCollections(
     sqlString: string,
     schemas: Record<string, TableInfo[]>,
-    collections: EntityCollection[],
+    collections: CollectionConfig[],
     resultColumns?: string[]
 ): ResolvedQueryCollection[] {
     const tables = extractTablesFromQuery(sqlString);