@rebasepro/common 0.8.0 → 0.9.0

package/dist/util/builders.d.ts

@@ -1,11 +1,14 @@
-import { AdditionalFieldDelegate, ArrayProperty, BooleanProperty, DateProperty, EntityCallbacks, EntityCollection, EnumValueConfig, EnumValues, FirebaseCollection, FirebaseProperties, GeopointProperty, InferEntityType, MapProperty, MongoDBCollection, MongoProperties, NumberProperty, PostgresCollection, PostgresProperties, Properties, Property, ReferenceProperty, StringProperty, User } from "@rebasepro/types";
+import { ArrayProperty, BooleanProperty, DateProperty, CollectionConfig, FirebaseCollectionConfig, FirebaseProperties, GeopointProperty, InferEntityType, MapProperty, MongoDBCollectionConfig, MongoProperties, NumberProperty, PostgresCollectionConfig, PostgresProperties, Property, ReferenceProperty, StringProperty, User } from "@rebasepro/types";
 /**
- * Identity function we use to defeat the type system of Typescript and build
- * collection views with all its properties
- * @param collection
+ * @deprecated Use {@link defineCollection} instead — it infers property
+ * types automatically (autocomplete on `titleProperty`, `sort`,
+ * `propertiesOrder`, callbacks) without manual generics.
+ * `buildCollection` is kept for FireCMS migration compatibility and will
+ * be removed before 1.0.
+ *
  * @group Builder
  */
-export declare function buildCollection<M extends Record<string, unknown> = Record<string, unknown>, USER extends User = User>(collection: EntityCollection<M, USER>): EntityCollection<M, USER>;
+export declare function buildCollection<M extends Record<string, unknown> = Record<string, unknown>, USER extends User = User>(collection: CollectionConfig<M, USER>): CollectionConfig<M, USER>;
 /**
  * Define a PostgreSQL-backed collection with full type inference.
  *
@@ -30,75 +33,35 @@ export declare function buildCollection<M extends Record<string, unknown> = Reco
  *
  * @group Builder
  */
-export declare function defineCollection<const P extends PostgresProperties, USER extends User = User>(collection: Omit<PostgresCollection<InferEntityType<P>, USER>, "properties"> & {
+export declare function defineCollection<const P extends PostgresProperties, USER extends User = User>(collection: Omit<PostgresCollectionConfig<InferEntityType<P>, USER>, "properties"> & {
     properties: P;
-}): PostgresCollection<InferEntityType<P>, USER> & {
+}): PostgresCollectionConfig<InferEntityType<P>, USER> & {
     properties: P;
 };
 /**
  * Define a Firestore-backed collection with full type inference.
  * @group Builder
  */
-export declare function defineCollection<const P extends FirebaseProperties, USER extends User = User>(collection: Omit<FirebaseCollection<InferEntityType<P>, USER>, "properties"> & {
+export declare function defineCollection<const P extends FirebaseProperties, USER extends User = User>(collection: Omit<FirebaseCollectionConfig<InferEntityType<P>, USER>, "properties"> & {
     properties: P;
-}): FirebaseCollection<InferEntityType<P>, USER> & {
+}): FirebaseCollectionConfig<InferEntityType<P>, USER> & {
     properties: P;
 };
 /**
  * Define a MongoDB-backed collection with full type inference.
  * @group Builder
  */
-export declare function defineCollection<const P extends MongoProperties, USER extends User = User>(collection: Omit<MongoDBCollection<InferEntityType<P>, USER>, "properties"> & {
+export declare function defineCollection<const P extends MongoProperties, USER extends User = User>(collection: Omit<MongoDBCollectionConfig<InferEntityType<P>, USER>, "properties"> & {
     properties: P;
-}): MongoDBCollection<InferEntityType<P>, USER> & {
+}): MongoDBCollectionConfig<InferEntityType<P>, USER> & {
     properties: P;
 };
 /**
- * Identity function we use to defeat the type system of Typescript and preserve
- * the property keys.
- * @param property
+ * @deprecated Use plain typed property objects with {@link defineCollection}
+ * instead — `defineCollection` infers property types automatically, making
+ * this wrapper unnecessary. `buildProperty` is kept for FireCMS migration
+ * compatibility and will be removed before 1.0.
+ *
  * @group Builder
  */
 export declare function buildProperty<T, P extends Property = Property>(property: P): P extends StringProperty ? StringProperty : P extends NumberProperty ? NumberProperty : P extends BooleanProperty ? BooleanProperty : P extends DateProperty ? DateProperty : P extends GeopointProperty ? GeopointProperty : P extends ReferenceProperty ? ReferenceProperty : P extends ArrayProperty ? ArrayProperty : P extends MapProperty ? MapProperty : never;
-/**
- * Identity function we use to defeat the type system of Typescript and preserve
- * the properties keys.
- * @param properties
- * @group Builder
- */
-export declare function buildProperties<M extends Record<string, unknown>>(properties: Properties): Properties;
-/**
- * Identity function we use to defeat the type system of Typescript and preserve
- * the properties keys.
- * @param propertiesOrBuilder
- * @group Builder
- */
-export declare function buildPropertiesOrBuilder<M extends Record<string, unknown>>(propertiesOrBuilder: Properties): Properties;
-/**
- * Identity function we use to defeat the type system of Typescript and preserve
- * the properties keys.
- * @param enumValues
- * @group Builder
- */
-export declare function buildEnum(enumValues: EnumValues): EnumValues;
-/**
- * Identity function we use to defeat the type system of Typescript and preserve
- * the properties keys.
- * @param enumValueConfig
- * @group Builder
- */
-export declare function buildEnumValueConfig(enumValueConfig: EnumValueConfig): EnumValueConfig;
-/**
- * Identity function we use to defeat the type system of Typescript and preserve
- * the properties keys.
- * @param callbacks
- * @group Builder
- */
-export declare function buildEntityCallbacks<M extends Record<string, unknown> = Record<string, unknown>>(callbacks: EntityCallbacks<M>): EntityCallbacks<M>;
-/**
- * Identity function we use to defeat the type system of Typescript and build
- * additional field delegates views with all its properties
- * @param additionalFieldDelegate
- * @group Builder
- */
-export declare function buildAdditionalFieldDelegate<M extends Record<string, unknown>, USER extends User = User>(additionalFieldDelegate: AdditionalFieldDelegate<M, USER>): AdditionalFieldDelegate<M, USER>;

package/dist/util/callbacks.d.ts

@@ -1,4 +1,4 @@
-import { EntityCallbacks, Properties, RebaseCallContext } from "@rebasepro/types";
+import { CollectionCallbacks, Properties, RebaseCallContext } from "@rebasepro/types";
 /**
  * Context passed to entity lifecycle callbacks.
  * @group Models
@@ -6,6 +6,6 @@ import { EntityCallbacks, Properties, RebaseCallContext } from "@rebasepro/types
 export type EntityCallbackContext = RebaseCallContext;
 /**
  * Helper function to extract field-level PropertyCallbacks from a properties schema
- * and wrap them into an EntityCallbacks object recursively.
+ * and wrap them into an CollectionCallbacks object recursively.
  */
-export declare const buildPropertyCallbacks: (properties: Properties) => EntityCallbacks | undefined;
+export declare const buildPropertyCallbacks: (properties: Properties) => CollectionCallbacks | undefined;

package/dist/util/collections.d.ts

@@ -1,11 +1,11 @@
-import { DefaultSelectedViewBuilder, DefaultSelectedViewParams, EntityCollection, Properties } from "@rebasepro/types";
+import { DefaultSelectedViewBuilder, DefaultSelectedViewParams, CollectionConfig, Properties } from "@rebasepro/types";
 export declare function sortProperties<M extends Record<string, unknown>>(properties: Properties, propertiesOrder?: string[]): Properties;
 export declare function resolveDefaultSelectedView(defaultSelectedView: string | DefaultSelectedViewBuilder | undefined, params: DefaultSelectedViewParams): string | undefined;
-export declare function getLocalChangesBackup(collection: EntityCollection): "manual_apply" | "auto_apply";
+export declare function getLocalChangesBackup(collection: CollectionConfig): "manual_apply" | "auto_apply";
 /**
- * Returns the primary keys for an entity collection by inspecting the properties
+ * Returns the primary keys for a entity collection by inspecting the properties
  * and finding any properties with `isId`.
  * Fallbacks to `["id"]` if no properties are marked as `isId: true`.
  * @param collection
  */
-export declare function getPrimaryKeys<M extends Record<string, unknown>>(collection: EntityCollection<M>): Extract<keyof M, string>[];
+export declare function getPrimaryKeys<M extends Record<string, unknown>>(collection: CollectionConfig<M>): Extract<keyof M, string>[];

package/dist/util/entities.d.ts

@@ -6,7 +6,7 @@ export declare function getDefaultValuesFor<M extends Record<string, unknown>>(p
 export declare function getDefaultValueFor(property?: Property): unknown;
 export declare function getDefaultValueFortype(type: DataType): unknown;
 /**
- * Update the automatic values in an entity before save
+ * Update the automatic values in a entity before save
  * @group Driver
  */
 export declare function updateDateAutoValues<M extends Record<string, unknown>>({ inputValues, properties, status, timestampNowValue }: {
@@ -16,7 +16,7 @@ export declare function updateDateAutoValues<M extends Record<string, unknown>>(
     timestampNowValue: unknown;
 }): EntityValues<M>;
 /**
- * Add missing required fields, expected in the collection, to the values of an entity
+ * Add missing required fields, expected in the collection, to the values of a entity
  * @param values
  * @param properties
  * @group Driver

package/dist/util/filter-operator-resolution.d.ts

@@ -0,0 +1,32 @@
+import { Property, WhereFilterOp } from "@rebasepro/types";
+export interface ResolveFilterOperatorsParams {
+    /**
+     * The property to filter on. For array properties, pass the **item**
+     * property (`property.of`) together with `isArray: true` — the same
+     * convention the filter field dispatchers use.
+     */
+    property: Property;
+    /** True when filtering an array of `property`. */
+    isArray?: boolean;
+    /**
+     * The engine backing the collection (`collection.engine`, e.g.
+     * `"postgres"`, `"firestore"`). Falls back to the default engine's
+     * capabilities when omitted.
+     */
+    engine?: string;
+}
+/**
+ * Resolve which filter operators the UI should offer for a property.
+ *
+ * The result is the **intersection** of three sets:
+ * 1. what the engine can execute — {@link DataSourceCapabilities.filterOperators}
+ *    (e.g. Firestore cannot run the LIKE family);
+ * 2. what makes sense for the property type (e.g. no `>` on booleans);
+ * 3. the developer's optional narrowing — `property.ui.filterOperators`.
+ *
+ * Returns an empty array when the property is not filterable (either by
+ * type, or because the developer disabled it with `filterOperators: []`).
+ *
+ * @group Models
+ */
+export declare function resolveFilterOperators({ property, isArray, engine }: ResolveFilterOperatorsParams): WhereFilterOp[];

package/dist/util/index.d.ts

@@ -15,3 +15,4 @@ export * from "./callbacks";
 export * from "./relations";
 export * from "./conditions";
 export * from "./navigation_utils";
+export * from "./filter-operator-resolution";

package/dist/util/navigation_from_path.d.ts

@@ -1,4 +1,4 @@
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 type EntityCustomView<M extends Record<string, unknown> = Record<string, unknown>> = {
     key: string;
     [key: string]: unknown;
@@ -9,14 +9,14 @@ export interface NavigationViewEntityInternal<M extends Record<string, unknown>>
     entityId: string | number;
     slug: string;
     path: string;
-    parentCollection: EntityCollection<M>;
+    parentCollection: CollectionConfig<M>;
 }
 export interface NavigationViewCollectionInternal<M extends Record<string, unknown>> {
     type: "collection";
     id: string;
     slug: string;
     path: string;
-    collection: EntityCollection<M>;
+    collection: CollectionConfig<M>;
 }
 export interface NavigationViewEntityCustomInternal<M extends Record<string, unknown>> {
     type: "custom_view";
@@ -27,7 +27,7 @@ export interface NavigationViewEntityCustomInternal<M extends Record<string, unk
 }
 export declare function getNavigationEntriesFromPath(props: {
     path: string;
-    collections: EntityCollection[] | undefined;
+    collections: CollectionConfig[] | undefined;
     currentFullPath?: string;
     contextEntityViews?: EntityCustomView[];
 }): NavigationViewInternal[];

package/dist/util/navigation_utils.d.ts

@@ -1,17 +1,17 @@
-import { EntityCollection } from "@rebasepro/types";
+import { CollectionConfig } from "@rebasepro/types";
 export declare function removeInitialAndTrailingSlashes(s: string): string;
 export declare function removeInitialSlash(s: string): string;
 export declare function removeTrailingSlash(s: string): string;
 export declare function addInitialSlash(s: string): string;
 export declare function getLastSegment(path: string): string;
-export declare function resolveCollectionPathIds(path: string, allCollections: EntityCollection[]): string;
+export declare function resolveCollectionPathIds(path: string, allCollections: CollectionConfig[]): string;
 /**
  * Find the corresponding view at any depth for a given path.
  * Note that path or segments of the paths can be collection aliases.
  * @param slugOrPath
  * @param collections
  */
-export declare function getCollectionBySlugWithin(slugOrPath: string, collections: EntityCollection[]): EntityCollection | undefined;
+export declare function getCollectionBySlugWithin(slugOrPath: string, collections: CollectionConfig[]): CollectionConfig | undefined;
 /**
  * Get the subcollection combinations from a path:
  * "sites/es/locales" => ["sites/es/locales", "sites"]

package/dist/util/parent_references_from_path.d.ts

@@ -1,6 +1,6 @@
-import { EntityCollection, EntityReference } from "@rebasepro/types";
+import { CollectionConfig, EntityReference } from "@rebasepro/types";
 export declare function getParentReferencesFromPath(props: {
     path: string;
-    collections: EntityCollection[] | undefined;
+    collections: CollectionConfig[] | undefined;
     currentFullPath?: string;
 }): EntityReference[];

package/dist/util/permissions.d.ts

@@ -1,4 +1,4 @@
-import { Entity, EntityCollection, SecurityOperation, User } from "@rebasepro/types";
+import { Entity, CollectionConfig, SecurityOperation, User } from "@rebasepro/types";
 /**
  * Minimal auth context for permission checking.
  * Only requires the user object — avoids forcing callers to construct
@@ -31,8 +31,8 @@ export interface CheckOperationOptions {
  *   client-side (raw SQL, or row predicates with no row). Defaults to `"allow"`
  *   for optimistic UI gating; enforcement callers should pass `"deny"`.
  */
-export declare function checkOperation<M extends Record<string, unknown>, USER extends User>(collection: EntityCollection<M>, authContext: AuthContext<USER>, entity: Entity<M> | null, targetOperation: SecurityOperation, options?: CheckOperationOptions): boolean;
-export declare function canReadCollection<M extends Record<string, unknown>, USER extends User>(collection: EntityCollection<M>, authContext: AuthContext<USER>): boolean;
-export declare function canEditEntity<M extends Record<string, unknown>, USER extends User>(collection: EntityCollection<M>, authContext: AuthContext<USER>, path: string, entity: Entity<M> | null): boolean;
-export declare function canCreateEntity<M extends Record<string, unknown>, USER extends User>(collection: EntityCollection<M>, authContext: AuthContext<USER>, path: string, entity: Entity<M> | null): boolean;
-export declare function canDeleteEntity<M extends Record<string, unknown>, USER extends User>(collection: EntityCollection<M>, authContext: AuthContext<USER>, path: string, entity: Entity<M> | null): boolean;
+export declare function checkOperation<M extends Record<string, unknown>, USER extends User>(collection: CollectionConfig<M>, authContext: AuthContext<USER>, entity: Entity<M> | null, targetOperation: SecurityOperation, options?: CheckOperationOptions): boolean;
+export declare function canReadCollection<M extends Record<string, unknown>, USER extends User>(collection: CollectionConfig<M>, authContext: AuthContext<USER>): boolean;
+export declare function canEditEntity<M extends Record<string, unknown>, USER extends User>(collection: CollectionConfig<M>, authContext: AuthContext<USER>, path: string, entity: Entity<M> | null): boolean;
+export declare function canCreateEntity<M extends Record<string, unknown>, USER extends User>(collection: CollectionConfig<M>, authContext: AuthContext<USER>, path: string, entity: Entity<M> | null): boolean;
+export declare function canDeleteEntity<M extends Record<string, unknown>, USER extends User>(collection: CollectionConfig<M>, authContext: AuthContext<USER>, path: string, entity: Entity<M> | null): boolean;

package/dist/util/policy/policyToPostgres.d.ts

@@ -1,4 +1,16 @@
-import { EntityCollection, PolicyExpression } from "@rebasepro/types";
+import { CollectionConfig, PolicyExpression } from "@rebasepro/types";
+/**
+ * Options for {@link policyToPostgres}.
+ */
+export interface PolicyCompileOptions {
+    /**
+     * Resolve a collection by slug. Required to compile
+     * {@link ExistsInPolicyExpression} (`policy.existsIn`) — the compiler needs
+     * the joined collection to derive its table name / schema. When omitted, the
+     * join table falls back to a snake_cased slug.
+     */
+    resolveCollection?: (slug: string) => CollectionConfig | undefined;
+}
 /**
  * Compiles a {@link PolicyExpression} to a PostgreSQL boolean SQL string,
  * suitable for a `USING (...)` / `WITH CHECK (...)` clause.
@@ -7,4 +19,4 @@ import { EntityCollection, PolicyExpression } from "@rebasepro/types";
  * {@link evaluatePolicy}); the Postgres schema generators call it so that DDL
  * and the admin UI derive from the exact same expression.
  */
-export declare function policyToPostgres(expr: PolicyExpression, collection?: EntityCollection): string;
+export declare function policyToPostgres(expr: PolicyExpression, collection?: CollectionConfig, options?: PolicyCompileOptions): string;

package/dist/util/references.d.ts

@@ -1,2 +1,2 @@
-import { EntityCollection } from "@rebasepro/types";
-export declare function getEntityImagePreviewPropertyKey<M extends Record<string, unknown>>(collection: EntityCollection<M>): string | undefined;
+import { CollectionConfig } from "@rebasepro/types";
+export declare function getEntityImagePreviewPropertyKey<M extends Record<string, unknown>>(collection: CollectionConfig<M>): string | undefined;

package/dist/util/relations.d.ts

@@ -1,12 +1,12 @@
-import { EntityCollection, Property, Relation } from "@rebasepro/types";
-export declare function sanitizeRelation(relation: Partial<Relation>, sourceCollection: EntityCollection, resolveCollection?: (slugOrTable: string) => EntityCollection | undefined): Relation;
-export declare function resolveCollectionRelations(collection: EntityCollection): Record<string, Relation>;
+import { CollectionConfig, Property, Relation } from "@rebasepro/types";
+export declare function sanitizeRelation(relation: Partial<Relation>, sourceCollection: CollectionConfig, resolveCollection?: (slugOrTable: string) => CollectionConfig | undefined): Relation;
+export declare function resolveCollectionRelations(collection: CollectionConfig): Record<string, Relation>;
 export declare function resolvePropertyRelation({ propertyKey, property, sourceCollection }: {
     propertyKey: string;
     property: Property;
-    sourceCollection: EntityCollection;
+    sourceCollection: CollectionConfig;
 }): Relation | undefined;
-export declare function getTableName(collection: EntityCollection): string;
+export declare function getTableName(collection: CollectionConfig): string;
 export declare function getTableVarName(tableName: string): string;
 export declare function getEnumVarName(tableName: string, propName: string): string;
 export declare function getColumnName(fullColumn: string): string;

package/dist/util/resolutions.d.ts

@@ -1,4 +1,4 @@
-import { ArrayProperty, AuthController, EntityCollection, EnumValueConfig, EnumValues, NumberProperty, Properties, Property, Relation, RelationProperty, StringProperty } from "@rebasepro/types";
+import { ArrayProperty, AuthController, CollectionConfig, EnumValueConfig, EnumValues, NumberProperty, Properties, Property, Relation, RelationProperty, StringProperty } from "@rebasepro/types";
 type PropertyConfig = {
     property: unknown;
     [key: string]: unknown;
@@ -68,5 +68,5 @@ export declare function getArrayResolvedProperties({ propertyKey, propertyValue,
     authController: AuthController;
 }): Property[];
 export declare function resolveEnumValues(input: EnumValues): EnumValueConfig[] | undefined;
-export declare function getSubcollections<M extends Record<string, unknown> = Record<string, unknown>>(collection: EntityCollection<M>): EntityCollection<Record<string, unknown>>[];
+export declare function getSubcollections<M extends Record<string, unknown> = Record<string, unknown>>(collection: CollectionConfig<M>): CollectionConfig<Record<string, unknown>>[];
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/common",
   "type": "module",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/rebaseco"
@@ -41,8 +41,8 @@
   "dependencies": {
     "fast-equals": "6.0.0",
     "json-logic-js": "^2.0.5",
-    "@rebasepro/utils": "0.8.0",
-    "@rebasepro/types": "0.8.0"
+    "@rebasepro/types": "0.9.0",
+    "@rebasepro/utils": "0.9.0"
   },
   "devDependencies": {
     "@jest/globals": "^30.4.1",

package/src/collections/CollectionRegistry.ts

@@ -1,8 +1,8 @@
 import {
     ArrayProperty,
-    EntityCallbacks,
+    CollectionCallbacks,
     EngineProperties,
-    EntityCollection,
+    CollectionConfig,
     getDataSourceCapabilities,
     getDeclaredSubcollections,
     NumberProperty,
@@ -39,40 +39,40 @@ export class CollectionRegistry {
      * Runs on all data paths (REST, WebSocket, `rebase.data`).
      * Execution order: global → collection → property callbacks.
      */
-    private _globalCallbacks?: EntityCallbacks;
+    private _globalCallbacks?: CollectionCallbacks;
 
     /**
      * Set global lifecycle callbacks that apply to every collection.
      * Typically called once during backend initialization.
      */
-    setGlobalCallbacks(callbacks: EntityCallbacks): void {
+    setGlobalCallbacks(callbacks: CollectionCallbacks): void {
         this._globalCallbacks = callbacks;
     }
 
     /**
      * Get the currently registered global callbacks, if any.
      */
-    getGlobalCallbacks(): EntityCallbacks | undefined {
+    getGlobalCallbacks(): CollectionCallbacks | undefined {
         return this._globalCallbacks;
     }
 
     // Normalized runtime layer (used by Data Grid / UI)
-    private collectionsByTableName = new Map<string, EntityCollection>();
-    private collectionsBySlug = new Map<string, EntityCollection>();
-    private rootCollections: EntityCollection[] = [];
-    private cachedCollectionsList: EntityCollection[] | null = null;
+    private collectionsByTableName = new Map<string, CollectionConfig>();
+    private collectionsBySlug = new Map<string, CollectionConfig>();
+    private rootCollections: CollectionConfig[] = [];
+    private cachedCollectionsList: CollectionConfig[] | null = null;
 
     // Raw configuration layer (used by Collection Editor AST generator)
-    private rawCollectionsByTableName = new Map<string, EntityCollection>();
-    private rawCollectionsBySlug = new Map<string, EntityCollection>();
-    private rawRootCollections: EntityCollection[] = [];
-    private cachedRawCollectionsList: EntityCollection[] | null = null;
+    private rawCollectionsByTableName = new Map<string, CollectionConfig>();
+    private rawCollectionsBySlug = new Map<string, CollectionConfig>();
+    private rawRootCollections: CollectionConfig[] = [];
+    private cachedRawCollectionsList: CollectionConfig[] | null = null;
 
-    // Snapshot of raw input for idempotency check — compared BEFORE normalization
+    // Entity of raw input for idempotency check — compared BEFORE normalization
     // to avoid the issue where normalization creates new objects that always fail equality.
-    private lastRawInputSnapshot: ReturnType<typeof removeFunctions>[] | null = null;
+    private lastRawInputEntity: ReturnType<typeof removeFunctions>[] | null = null;
 
-    constructor(collections?: EntityCollection[], dataSources?: DataSourceRegistry) {
+    constructor(collections?: CollectionConfig[], dataSources?: DataSourceRegistry) {
         if (dataSources) this.dataSources = dataSources;
         if (collections) {
             this.registerMultiple(collections);
@@ -107,15 +107,15 @@ export class CollectionRegistry {
      * Returns true if the collections have changed, false otherwise.
      *
      * Idempotent: compares the raw input (before normalization) against a stored
-     * snapshot. Only re-normalizes and re-registers when the raw input actually changed.
+     * entity. Only re-normalizes and re-registers when the raw input actually changed.
      * @param collections
      */
-    registerMultiple(collections: EntityCollection[]): boolean {
+    registerMultiple(collections: CollectionConfig[]): boolean {
         // Compare raw input BEFORE normalization to detect actual changes.
         // This avoids the old issue where normalization creates new objects
         // that always fail deep-equal even when the source data is identical.
-        const rawSnapshot = collections.map(c => removeFunctions(c));
-        if (this.lastRawInputSnapshot && deepEqual(this.lastRawInputSnapshot, rawSnapshot)) {
+        const rawEntity = collections.map(c => removeFunctions(c));
+        if (this.lastRawInputEntity && deepEqual(this.lastRawInputEntity, rawEntity)) {
             return false;
         }
 
@@ -163,13 +163,13 @@ export class CollectionRegistry {
             }
         });
 
-        // Store the snapshot for future comparisons
-        this.lastRawInputSnapshot = rawSnapshot;
+        // Store the entity for future comparisons
+        this.lastRawInputEntity = rawEntity;
 
         return true;
     }
 
-    register(collection: EntityCollection, rawCollection?: EntityCollection) {
+    register(collection: CollectionConfig, rawCollection?: CollectionConfig) {
         const raw = rawCollection ? deepClone(rawCollection) : deepClone(collection);
 
         this.rootCollections.push(collection);
@@ -178,7 +178,7 @@ export class CollectionRegistry {
         this._registerRecursively(collection, raw);
     }
 
-    private _registerRecursively(collection: EntityCollection, rawCollection: EntityCollection) {
+    private _registerRecursively(collection: CollectionConfig, rawCollection: CollectionConfig) {
         if (this.collectionsByTableName.has(getTableName(collection))) {
             return;
         }
@@ -207,11 +207,11 @@ export class CollectionRegistry {
         }
     }
 
-    public normalizeCollection(collection: EntityCollection): EntityCollection {
+    public normalizeCollection(collection: CollectionConfig): CollectionConfig {
         // Work on a shallow copy to avoid mutating the caller's reference.
         // This is critical for idempotency (the raw input must not be changed)
         // and for preventing mutation of module-level collection singletons.
-        const result = { ...collection } as EntityCollection;
+        const result = { ...collection } as CollectionConfig;
 
         // 0. Resolve and stamp `dataSource` and `engine` on the normalized copy.
         //    After this block every normalized collection has both fields set,
@@ -378,7 +378,7 @@ export class CollectionRegistry {
         return newProperty;
     }
 
-    get(path: string): EntityCollection | undefined {
+    get(path: string): CollectionConfig | undefined {
         // First try slug lookup
         const bySlug = this.collectionsBySlug.get(path);
         if (bySlug) return bySlug;
@@ -398,7 +398,7 @@ export class CollectionRegistry {
      * Gets the pristine, un-normalized collection exactly as it was provided.
      * Useful for the AST editor so it doesn't accidentally serialize injected metadata back to disk.
      */
-    getRaw(path: string): EntityCollection | undefined {
+    getRaw(path: string): CollectionConfig | undefined {
         const bySlug = this.rawCollectionsBySlug.get(path);
         if (bySlug) return bySlug;
 
@@ -416,7 +416,7 @@ export class CollectionRegistry {
      * Get collection by resolving multi-segment paths through relations
      * e.g., "authors/70/posts" resolves to the posts collection
      */
-    getCollectionByPath(collectionPath: string): EntityCollection | undefined {
+    getCollectionByPath(collectionPath: string): CollectionConfig | undefined {
         // Handle simple single collection path
         if (!collectionPath.includes("/")) {
             return this.get(collectionPath);
@@ -467,14 +467,14 @@ export class CollectionRegistry {
         return currentCollection;
     }
 
-    getCollections(): EntityCollection[] {
+    getCollections(): CollectionConfig[] {
         if (!this.cachedCollectionsList) {
             this.cachedCollectionsList = Array.from(this.collectionsByTableName.values());
         }
         return this.cachedCollectionsList;
     }
 
-    getRawCollections(): EntityCollection[] {
+    getRawCollections(): CollectionConfig[] {
         if (!this.cachedRawCollectionsList) {
             this.cachedRawCollectionsList = Array.from(this.rawCollectionsByTableName.values());
         }
@@ -486,9 +486,9 @@ export class CollectionRegistry {
      * information about the collections and entity IDs along the path
      */
     resolvePathToCollections(path: string): {
-        collections: EntityCollection[],
+        collections: CollectionConfig[],
         entityIds: (string | number)[],
-        finalCollection: EntityCollection
+        finalCollection: CollectionConfig
     } {
         const pathSegments = path.split("/").filter(p => p);
 
@@ -500,7 +500,7 @@ export class CollectionRegistry {
             throw new Error(`Invalid collection path: ${path}. It must have an odd number of segments.`);
         }
 
-        const collections: EntityCollection[] = [];
+        const collections: CollectionConfig[] = [];
         const entityIds: (string | number)[] = [];
 
         // Start with the first collection
@@ -519,12 +519,12 @@ export class CollectionRegistry {
 
             if (i + 1 < pathSegments.length) {
                 const subcollectionSlug = pathSegments[i + 1];
-                const subcollections: EntityCollection[] | undefined = getSubcollections(currentCollection);
+                const subcollections: CollectionConfig[] | undefined = getSubcollections(currentCollection);
                 if (!subcollections || subcollections.length === 0) {
                     throw new Error(`No subcollections found for ${currentCollection.slug} in path: ${path}`);
                 }
 
-                const subcollection: EntityCollection | undefined = subcollections.find(c => c.slug === subcollectionSlug);
+                const subcollection: CollectionConfig | undefined = subcollections.find(c => c.slug === subcollectionSlug);
                 if (!subcollection) {
                     throw new Error(`Subcollection '${subcollectionSlug}' not found in ${currentCollection.slug}`);
                 }