@rebasepro/server-postgresql 0.0.1-canary.4d4fb3e

package/src/services/entity-helpers.ts

@@ -0,0 +1,121 @@
+import { PgTable, AnyPgColumn } from "drizzle-orm/pg-core";
+import { EntityCollection, Property } from "@rebasepro/types";
+import { PostgresCollectionRegistry } from "../collections/PostgresCollectionRegistry";
+import { getTableName } from "@rebasepro/common";
+
+/**
+ * Shared helper functions for entity operations.
+ * These are used by EntityFetchService, EntityPersistService, and RelationService.
+ *
+ * All functions that need collection/table lookups require an explicit
+ * `PostgresCollectionRegistry` instance — there is no global singleton.
+ */
+
+export function getCollectionByPath(collectionPath: string, registry: PostgresCollectionRegistry): EntityCollection {
+    const collection = registry.getCollectionByPath(collectionPath);
+    if (!collection) {
+        throw new Error(`Collection not found: ${collectionPath}`);
+    }
+    return collection;
+}
+
+export function getTableForCollection(collection: EntityCollection, registry: PostgresCollectionRegistry): PgTable<any> {
+    const tableName = getTableName(collection);
+    const table = registry.getTable(tableName);
+    if (!table) {
+        throw new Error(`Table not found for collection '${collection.slug}' (table: ${tableName})`);
+    }
+    return table;
+}
+
+export function getPrimaryKeys(collection: EntityCollection, registry: PostgresCollectionRegistry): { fieldName: string; type: "string" | "number" }[] {
+    const table = getTableForCollection(collection, registry);
+
+    // Fallback to explicitly defined isId properties
+    if (collection.properties) {
+        const idProps = Object.entries(collection.properties)
+            .filter(([_, prop]) => "isId" in (prop as object) && Boolean((prop as unknown as Record<string, unknown>).isId))
+            .map(([key, prop]) => ({
+                fieldName: key,
+                type: prop.type === "number" ? "number" as const : "string" as const
+            }));
+
+        if (idProps.length > 0) {
+            return idProps;
+        }
+    }
+
+    // Otherwise infer from Drizzle schema
+    const keys: { fieldName: string; type: "string" | "number" }[] = [];
+    for (const [key, colRaw] of Object.entries(table)) {
+        const col = colRaw as AnyPgColumn;
+        if (col && typeof col === "object" && "primary" in col && col.primary) {
+            const type = col.dataType === "number" || (col as unknown as Record<string, unknown>).columnType === "PgSerial" || (col as unknown as Record<string, unknown>).columnType === "PgInteger" ? "number" : "string";
+            keys.push({ fieldName: key, type });
+        }
+    }
+
+    // Default to 'id' if no primary keys are found and it exists in the schema
+    // This maintains backwards compatibility
+    if (keys.length === 0 && "id" in table) {
+        const idCol = table["id" as keyof typeof table] as AnyPgColumn;
+        const type = idCol.dataType === "number" || (idCol as unknown as Record<string, unknown>).columnType === "PgSerial" || (idCol as unknown as Record<string, unknown>).columnType === "PgInteger" ? "number" : "string";
+        keys.push({ fieldName: "id", type });
+    }
+
+    return keys;
+}
+
+export function parseIdValues(idValue: string | number, primaryKeys: { fieldName: string; type: "string" | "number" }[]): Record<string, string | number> {
+    const result: Record<string, string | number> = {};
+
+    if (primaryKeys.length === 0) {
+        return result;
+    }
+
+    if (primaryKeys.length === 1) {
+        const pk = primaryKeys[0];
+        if (pk.type === "number") {
+            const parsed = typeof idValue === "number" ? idValue : parseInt(String(idValue), 10);
+            if (isNaN(parsed)) {
+                throw new Error(`Invalid numeric ID: ${idValue}`);
+            }
+            result[pk.fieldName] = parsed;
+        } else {
+            result[pk.fieldName] = String(idValue);
+        }
+        return result;
+    }
+
+    // Composite key - split by :::
+    const parts = String(idValue).split(":::");
+    if (parts.length !== primaryKeys.length) {
+        throw new Error(`Composite ID parts mismatch. Expected ${primaryKeys.length}, got ${parts.length} for ID: ${idValue}`);
+    }
+
+    for (let i = 0; i < primaryKeys.length; i++) {
+        const pk = primaryKeys[i];
+        const val = parts[i];
+        if (pk.type === "number") {
+            const parsed = parseInt(val, 10);
+            if (isNaN(parsed)) {
+                throw new Error(`Invalid numeric ID component: ${val}`);
+            }
+            result[pk.fieldName] = parsed;
+        } else {
+            result[pk.fieldName] = val;
+        }
+    }
+
+    return result;
+}
+
+export function buildCompositeId(values: Record<string, any>, primaryKeys: { fieldName: string; type: "string" | "number" }[]): string {
+    if (primaryKeys.length === 0) {
+        return "";
+    }
+    if (primaryKeys.length === 1) {
+        return String(values[primaryKeys[0].fieldName] ?? "");
+    }
+    return primaryKeys.map(pk => String(values[pk.fieldName] ?? "")).join(":::");
+}

package/src/services/entityService.ts

@@ -0,0 +1,209 @@
+// import { NodePgDatabase } from "drizzle-orm/node-postgres";
+import { Entity, FilterValues } from "@rebasepro/types";
+import { EntityFetchService } from "./EntityFetchService";
+import { EntityPersistService } from "./EntityPersistService";
+import { RelationService } from "./RelationService";
+import { EntityRepository, FetchCollectionOptions, SearchOptions, CountOptions, DrizzleClient } from "../interfaces";
+import { PostgresCollectionRegistry } from "../collections/PostgresCollectionRegistry";
+
+// Re-export data transformer functions for external use
+export { sanitizeAndConvertDates, serializeDataToServer, parseDataFromServer } from "../data-transformer";
+
+// Re-export service classes for direct use
+export { EntityFetchService } from "./EntityFetchService";
+export { EntityPersistService } from "./EntityPersistService";
+export { RelationService } from "./RelationService";
+
+// Re-export interfaces
+export * from "../interfaces";
+
+/**
+ * EntityService - Facade for entity operations.
+ * 
+ * This class provides a unified API for entity CRUD operations by delegating
+ * to specialized services:
+ * - EntityFetchService: Read operations (fetch, search, count)
+ * - EntityPersistService: Write operations (save, delete)
+ * - RelationService: Relation operations (fetch related, update relations)
+ * 
+ * Implements the EntityRepository interface for database abstraction.
+ */
+export class EntityService implements EntityRepository {
+    private fetchService: EntityFetchService;
+    private persistService: EntityPersistService;
+
+    constructor(private db: DrizzleClient, private registry: PostgresCollectionRegistry) {
+        this.fetchService = new EntityFetchService(db, registry);
+        this.persistService = new EntityPersistService(db, registry);
+    }
+
+    // =============================================================
+    // READ OPERATIONS - Delegated to EntityFetchService
+    // =============================================================
+
+    /**
+     * Fetch a single entity by ID
+     */
+    async fetchEntity<M extends Record<string, any>>(
+        collectionPath: string,
+        entityId: string | number,
+        databaseId?: string
+    ): Promise<Entity<M> | undefined> {
+        return this.fetchService.fetchEntity<M>(collectionPath, entityId, databaseId);
+    }
+
+    /**
+     * Fetch a collection of entities with optional filtering, ordering, and pagination
+     */
+    async fetchCollection<M extends Record<string, any>>(
+        collectionPath: string,
+        options: {
+            filter?: FilterValues<Extract<keyof M, string>>;
+            orderBy?: string;
+            order?: "desc" | "asc";
+            limit?: number;
+            startAfter?: Record<string, unknown>;
+            searchString?: string;
+            databaseId?: string;
+        } = {}
+    ): Promise<Entity<M>[]> {
+        return this.fetchService.fetchCollection<M>(collectionPath, options);
+    }
+
+    /**
+     * Search entities by text
+     */
+    async searchEntities<M extends Record<string, any>>(
+        collectionPath: string,
+        searchString: string,
+        options: {
+            filter?: FilterValues<Extract<keyof M, string>>;
+            orderBy?: string;
+            order?: "desc" | "asc";
+            limit?: number;
+            databaseId?: string;
+        } = {}
+    ): Promise<Entity<M>[]> {
+        return this.fetchService.searchEntities<M>(collectionPath, searchString, options);
+    }
+
+    /**
+     * Count entities in a collection
+     */
+    async countEntities<M extends Record<string, any>>(
+        collectionPath: string,
+        options: {
+            filter?: FilterValues<Extract<keyof M, string>>;
+            databaseId?: string;
+        } = {}
+    ): Promise<number> {
+        return this.fetchService.countEntities<M>(collectionPath, options);
+    }
+
+    /**
+     * Check if a field value is unique in a collection
+     */
+    async checkUniqueField(
+        collectionPath: string,
+        fieldName: string,
+        value: unknown,
+        excludeEntityId?: string,
+        databaseId?: string
+    ): Promise<boolean> {
+        return this.fetchService.checkUniqueField(collectionPath, fieldName, value, excludeEntityId, databaseId);
+    }
+
+    /**
+     * Fetch entities related to a parent entity
+     */
+    async fetchRelatedEntities<M extends Record<string, any>>(
+        parentCollectionPath: string,
+        parentEntityId: string | number,
+        relationKey: string,
+        options: {
+            filter?: FilterValues<Extract<keyof M, string>>;
+            orderBy?: string;
+            order?: "desc" | "asc";
+            limit?: number;
+            startAfter?: Record<string, unknown>;
+            searchString?: string;
+            databaseId?: string;
+        } = {}
+    ): Promise<Entity<M>[]> {
+        return this.fetchService.getRelationService().fetchRelatedEntities<M>(
+            parentCollectionPath,
+            parentEntityId,
+            relationKey,
+            options
+        );
+    }
+
+    // =============================================================
+    // WRITE OPERATIONS - Delegated to EntityPersistService
+    // =============================================================
+
+    /**
+     * Save an entity (create or update)
+     */
+    async saveEntity<M extends Record<string, any>>(
+        collectionPath: string,
+        values: Partial<M>,
+        entityId?: string | number,
+        databaseId?: string
+    ): Promise<Entity<M>> {
+        return this.persistService.saveEntity<M>(collectionPath, values, entityId, databaseId);
+    }
+
+    /**
+     * Delete an entity by ID
+     */
+    async deleteEntity(
+        collectionPath: string,
+        entityId: string | number,
+        databaseId?: string
+    ): Promise<void> {
+        return this.persistService.deleteEntity(collectionPath, entityId, databaseId);
+    }
+
+
+    /**
+     * Execute raw SQL
+     */
+    async executeSql(sqlText: string): Promise<Record<string, unknown>[]> {
+        if (process.env.NODE_ENV !== "production") {
+            console.debug("Executing raw SQL:", sqlText);
+        }
+        const { sql } = await import("drizzle-orm");
+        const result = await this.db.execute(sql.raw(sqlText));
+        const rows = result.rows;
+        if (process.env.NODE_ENV !== "production") {
+            console.debug(`SQL executed successfully. Returned ${Array.isArray(rows) ? rows.length : 'non-array'} rows.`);
+        }
+        return rows as Record<string, unknown>[];
+    }
+
+    // =============================================================
+    // SERVICE ACCESSORS
+    // =============================================================
+
+    /**
+     * Get the underlying EntityFetchService for advanced use
+     */
+    getFetchService(): EntityFetchService {
+        return this.fetchService;
+    }
+
+    /**
+     * Get the underlying EntityPersistService for advanced use
+     */
+    getPersistService(): EntityPersistService {
+        return this.persistService;
+    }
+
+    /**
+     * Get the underlying RelationService for advanced use
+     */
+    getRelationService(): RelationService {
+        return this.fetchService.getRelationService();
+    }
+}

package/src/services/index.ts

@@ -0,0 +1,13 @@
+// Re-export all service classes
+export { EntityFetchService } from "./EntityFetchService";
+export { EntityPersistService } from "./EntityPersistService";
+export { RelationService } from "./RelationService";
+
+// Re-export helper functions
+export {
+    getCollectionByPath,
+    getTableForCollection,
+    getPrimaryKeys,
+    parseIdValues,
+    buildCompositeId
+} from "./entity-helpers";