node-cqrs 1.2.0-beta.1 → 1.3.0-alpha.0

package/dist/esm/postgresql/PostgresqlViewLocker.js

@@ -0,0 +1,147 @@
+import { assertNonNegativeInteger, assertString, Deferred } from "../utils/index.js";
+import { promisify } from 'util';
+import { randomUUID } from 'node:crypto';
+import { AbstractPostgresqlAccessor } from "./AbstractPostgresqlAccessor.js";
+import { quoteIdentifier } from "./utils/index.js";
+const delay = promisify(setTimeout);
+/**
+ * PostgreSQL-backed implementation of IViewLocker.
+ *
+ * Uses a row with token + locked_till semantics to acquire a distributed view lock.
+ * The lock is automatically prolonged at half the TTL interval to prevent expiration
+ * while processing is in progress.
+ */
+export class PostgresqlViewLocker extends AbstractPostgresqlAccessor {
+    static DEFAULT_VIEW_LOCK_TTL = 120_000;
+    static DEFAULT_TABLE = 'ncqrs_view_locks';
+    #projectionName;
+    #schemaVersion;
+    #viewLockTableName;
+    #viewLockTtl;
+    #logger;
+    #lockToken;
+    #lockMarker;
+    #lockProlongationTimeout;
+    constructor(o) {
+        super(o);
+        assertString(o.projectionName, 'o.projectionName');
+        assertString(o.schemaVersion, 'o.schemaVersion');
+        if (o.viewLockTableName !== undefined)
+            assertString(o.viewLockTableName, 'o.viewLockTableName');
+        if (o.viewLockTtl !== undefined)
+            assertNonNegativeInteger(o.viewLockTtl, 'o.viewLockTtl');
+        this.#projectionName = o.projectionName;
+        this.#schemaVersion = o.schemaVersion;
+        this.#viewLockTableName = quoteIdentifier(o.viewLockTableName ?? PostgresqlViewLocker.DEFAULT_TABLE);
+        this.#viewLockTtl = o.viewLockTtl ?? PostgresqlViewLocker.DEFAULT_VIEW_LOCK_TTL;
+        this.#logger = o.logger && 'child' in o.logger ?
+            o.logger.child({ service: this.constructor.name }) :
+            o.logger;
+    }
+    async initialize(db) {
+        await db.query(`
+			CREATE TABLE IF NOT EXISTS ${this.#viewLockTableName} (
+				projection_name text NOT NULL,
+				schema_version text NOT NULL,
+				locked_till timestamptz NULL,
+				lock_token text NULL,
+				last_event text NULL,
+				PRIMARY KEY (projection_name, schema_version)
+			)
+		`);
+        await db.query(`
+			CREATE INDEX IF NOT EXISTS ${quoteIdentifier(`${this.#tableNameForIndex()}_locked_till_idx`)}
+			ON ${this.#viewLockTableName} (locked_till)
+		`);
+    }
+    get ready() {
+        return !this.#lockMarker;
+    }
+    async lock() {
+        this.#lockMarker = new Deferred();
+        this.#lockToken = randomUUID();
+        await this.assertConnection();
+        let lockAcquired = false;
+        while (!lockAcquired) {
+            const lockedTill = new Date(Date.now() + this.#viewLockTtl);
+            const upsertResult = await this.connection.query(`
+				INSERT INTO ${this.#viewLockTableName} AS view_lock
+					(projection_name, schema_version, locked_till, lock_token)
+				VALUES ($1, $2, $3, $4)
+				ON CONFLICT (projection_name, schema_version)
+				DO UPDATE SET
+					locked_till = excluded.locked_till,
+					lock_token = excluded.lock_token
+				WHERE
+					view_lock.locked_till IS NULL
+					OR view_lock.locked_till < NOW()
+			`, [this.#projectionName, this.#schemaVersion, lockedTill, this.#lockToken]);
+            lockAcquired = upsertResult.rowCount === 1;
+            if (!lockAcquired) {
+                this.#logger?.debug(`"${this.#projectionName}" is locked by another process`);
+                await delay(this.#viewLockTtl / 2);
+            }
+        }
+        this.#logger?.debug(`"${this.#projectionName}" lock obtained for ${this.#viewLockTtl}ms`);
+        this.scheduleLockProlongation();
+        return true;
+    }
+    scheduleLockProlongation() {
+        const ms = this.#viewLockTtl / 2;
+        this.#lockProlongationTimeout = setTimeout(() => this.prolongLock(), ms);
+        this.#lockProlongationTimeout.unref();
+        this.#logger?.debug(`"${this.#projectionName}" lock refresh scheduled in ${ms}ms`);
+    }
+    cancelLockProlongation() {
+        clearTimeout(this.#lockProlongationTimeout);
+        this.#logger?.debug(`"${this.#projectionName}" lock refresh canceled`);
+    }
+    async prolongLock() {
+        await this.assertConnection();
+        const lockedTill = new Date(Date.now() + this.#viewLockTtl);
+        const result = await this.connection.query(`
+			UPDATE ${this.#viewLockTableName}
+			SET
+				locked_till = $1
+			WHERE
+				projection_name = $2
+				AND schema_version = $3
+				AND lock_token = $4
+				AND locked_till IS NOT NULL
+		`, [lockedTill, this.#projectionName, this.#schemaVersion, this.#lockToken]);
+        if (result.rowCount !== 1)
+            throw new Error(`"${this.#projectionName}" lock could not be prolonged`);
+        this.#logger?.debug(`"${this.#projectionName}" lock prolonged for ${this.#viewLockTtl}ms`);
+        this.scheduleLockProlongation();
+    }
+    async unlock() {
+        this.#lockMarker?.resolve();
+        this.#lockMarker = undefined;
+        this.cancelLockProlongation();
+        await this.assertConnection();
+        const result = await this.connection.query(`
+			UPDATE ${this.#viewLockTableName}
+			SET
+				locked_till = NULL,
+				lock_token = NULL
+			WHERE
+				projection_name = $1
+				AND schema_version = $2
+				AND lock_token = $3
+		`, [this.#projectionName, this.#schemaVersion, this.#lockToken]);
+        this.#lockToken = undefined;
+        if (result.rowCount === 1)
+            this.#logger?.debug(`"${this.#projectionName}" lock released`);
+        else
+            this.#logger?.warn(`"${this.#projectionName}" lock didn't exist`);
+    }
+    once(event) {
+        if (event !== 'ready')
+            throw new TypeError(`Unexpected event: ${event}`);
+        return this.#lockMarker?.promise ?? Promise.resolve();
+    }
+    #tableNameForIndex() {
+        return this.#viewLockTableName.replaceAll('"', '').replaceAll('.', '_');
+    }
+}
+//# sourceMappingURL=PostgresqlViewLocker.js.map

package/dist/esm/postgresql/PostgresqlViewLocker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PostgresqlViewLocker.js","sourceRoot":"","sources":["../../../src/postgresql/PostgresqlViewLocker.ts"],"names":[],"mappings":"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"}

package/dist/esm/postgresql/index.js

@@ -0,0 +1,13 @@
+import "./IContainer.js";
+export * from "./AbstractPostgresqlAccessor.js";
+export * from "./AbstractPostgresqlObjectProjection.js";
+export * from "./AbstractPostgresqlView.js";
+export * from "./PostgresqlConnection.js";
+export * from "./PostgresqlEventStorage.js";
+export * from "./PostgresqlEventLocker.js";
+export * from "./PostgresqlObjectStorage.js";
+export * from "./PostgresqlObjectView.js";
+export * from "./PostgresqlProjectionDataParams.js";
+export * from "./PostgresqlViewLocker.js";
+export * from "./utils/index.js";
+//# sourceMappingURL=index.js.map

package/dist/esm/postgresql/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/postgresql/index.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC;AAEzB,cAAc,iCAAiC,CAAC;AAChD,cAAc,yCAAyC,CAAC;AACxD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qCAAqC,CAAC;AACpD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC"}

package/dist/esm/postgresql/utils/getEventId.js

@@ -0,0 +1,10 @@
+import { createHash } from 'node:crypto';
+/**
+ * Get assigned or generate a deterministic event ID as a hex string.
+ */
+export const getEventId = (event) => {
+    if (typeof event.id === 'string')
+        return event.id;
+    return createHash('md5').update(JSON.stringify(event)).digest('hex');
+};
+//# sourceMappingURL=getEventId.js.map

package/dist/esm/postgresql/utils/getEventId.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getEventId.js","sourceRoot":"","sources":["../../../../src/postgresql/utils/getEventId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAa,EAAU,EAAE;IACnD,IAAI,OAAO,KAAK,CAAC,EAAE,KAAK,QAAQ;QAC/B,OAAO,KAAK,CAAC,EAAE,CAAC;IAEjB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACtE,CAAC,CAAC"}

package/dist/esm/postgresql/utils/index.js

@@ -0,0 +1,3 @@
+export * from "./getEventId.js";
+export * from "./quoteIdentifier.js";
+//# sourceMappingURL=index.js.map

package/dist/esm/postgresql/utils/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/postgresql/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC"}

package/dist/esm/postgresql/utils/quoteIdentifier.js

@@ -0,0 +1,11 @@
+import { assertString } from "../../utils/assert.js";
+const IDENTIFIER_PART_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
+export function quoteIdentifier(identifier) {
+    assertString(identifier, 'identifier');
+    return identifier.split('.').map(part => {
+        if (!IDENTIFIER_PART_PATTERN.test(part))
+            throw new TypeError(`Invalid PostgreSQL identifier: ${identifier}`);
+        return `"${part}"`;
+    }).join('.');
+}
+//# sourceMappingURL=quoteIdentifier.js.map

package/dist/esm/postgresql/utils/quoteIdentifier.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"quoteIdentifier.js","sourceRoot":"","sources":["../../../../src/postgresql/utils/quoteIdentifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,uBAAuB,GAAG,0BAA0B,CAAC;AAE3D,MAAM,UAAU,eAAe,CAAC,UAAkB;IACjD,YAAY,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAEvC,OAAO,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACvC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC;YACtC,MAAM,IAAI,SAAS,CAAC,kCAAkC,UAAU,EAAE,CAAC,CAAC;QAErE,OAAO,IAAI,IAAI,GAAG,CAAC;IACpB,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC"}

package/dist/esm/sqlite/SqliteEventStorage.js

@@ -9,6 +9,16 @@ function extractMeta(envelope) {
         return null;
     return rest;
 }
+function reconstructEvent(row) {
+    const data = JSON.parse(row.data);
+    const event = {
+        id: bufferToGuid(row.id),
+        ...data
+    };
+    if (row.saga_origins)
+        event.sagaOrigins = JSON.parse(row.saga_origins);
+    return event;
+}
 export class SqliteEventStorage extends AbstractSqliteAccessor {
     #insertEventQuery;
     #insertSagaRefQuery;
@@ -16,7 +26,6 @@ export class SqliteEventStorage extends AbstractSqliteAccessor {
     #getRowidQuery;
     #getAggregateEventsQuery;
     #getSagaEventsQuery;
-    #getSagaRefsQuery;
     #getEventsByTypesQuery;
     initialize(db) {
         db.pragma('foreign_keys = ON');
@@ -62,8 +71,23 @@ export class SqliteEventStorage extends AbstractSqliteAccessor {
 				ORDER BY rowid DESC
 				LIMIT 1
 			)
-			SELECT e.id, e.aggregate_id, e.aggregate_version, e.type, e.data, e.meta, e.rowid
-			FROM tbl_events e, tail
+			SELECT
+				e.id,
+				e.aggregate_id,
+				e.aggregate_version,
+				e.type,
+				e.data,
+				e.meta,
+				e.rowid,
+				NULLIF(
+					json_group_object(sr.saga_descriptor, lower(hex(sr.origin_id)))
+						FILTER (WHERE sr.saga_descriptor IS NOT NULL),
+					'{}'
+				) AS saga_origins
+			FROM tbl_events e
+			CROSS JOIN tail
+			LEFT JOIN tbl_event_sagas sr
+				ON sr.event_id = e.id
 			WHERE e.aggregate_id = @aggregateId
 				AND (@afterVersion IS NULL OR e.aggregate_version > @afterVersion)
 				AND (
@@ -71,29 +95,55 @@ export class SqliteEventStorage extends AbstractSqliteAccessor {
 					OR e.type IN (SELECT value FROM json_each(@eventTypes))
 					OR (@tail = 'last' AND e.id = tail.tail_id)
 				)
+			GROUP BY e.id, e.aggregate_id, e.aggregate_version, e.type, e.data, e.meta, e.rowid
 			ORDER BY e.rowid
 		`);
         this.#getSagaEventsQuery = db.prepare(`
-			SELECT e.id, e.aggregate_id, e.aggregate_version, e.type, e.data, e.meta, e.rowid
+			SELECT
+				e.id,
+				e.aggregate_id,
+				e.aggregate_version,
+				e.type,
+				e.data,
+				e.meta,
+				e.rowid,
+				NULLIF(
+					json_group_object(all_sr.saga_descriptor, lower(hex(all_sr.origin_id)))
+						FILTER (WHERE all_sr.saga_descriptor IS NOT NULL),
+					'{}'
+				) AS saga_origins
 			FROM tbl_events e
 			LEFT JOIN tbl_event_sagas sr
 				ON sr.event_id = e.id
 				AND sr.saga_descriptor = @sagaDescriptor
 				AND sr.origin_id = @originId
+			LEFT JOIN tbl_event_sagas all_sr
+				ON all_sr.event_id = e.id
 			WHERE e.rowid >= @originRowid AND e.rowid < @beforeRowid
 				AND (e.id = @originId OR sr.event_id IS NOT NULL)
+			GROUP BY e.id, e.aggregate_id, e.aggregate_version, e.type, e.data, e.meta, e.rowid
 			ORDER BY e.rowid
 		`);
-        this.#getSagaRefsQuery = db.prepare(`
-			SELECT saga_descriptor, origin_id
-			FROM tbl_event_sagas
-			WHERE event_id = ?
-		`);
         this.#getEventsByTypesQuery = db.prepare(`
-			SELECT id, aggregate_id, aggregate_version, type, data, meta, rowid
-			FROM tbl_events
-			WHERE rowid > ?
-			ORDER BY rowid
+			SELECT
+				e.id,
+				e.aggregate_id,
+				e.aggregate_version,
+				e.type,
+				e.data,
+				e.meta,
+				e.rowid,
+				NULLIF(
+					json_group_object(sr.saga_descriptor, lower(hex(sr.origin_id)))
+						FILTER (WHERE sr.saga_descriptor IS NOT NULL),
+					'{}'
+				) AS saga_origins
+			FROM tbl_events e
+			LEFT JOIN tbl_event_sagas sr
+				ON sr.event_id = e.id
+			WHERE e.rowid > ?
+			GROUP BY e.id, e.aggregate_id, e.aggregate_version, e.type, e.data, e.meta, e.rowid
+			ORDER BY e.rowid
 		`);
     }
     // eslint-disable-next-line class-methods-use-this
@@ -134,7 +184,7 @@ export class SqliteEventStorage extends AbstractSqliteAccessor {
             tail: options?.tail ?? null
         });
         for (const row of rows)
-            yield this.#reconstructEvent(row);
+            yield reconstructEvent(row);
     }
     async *getSagaEvents(sagaId, { beforeEvent }) {
         await this.assertConnection();
@@ -155,7 +205,7 @@ export class SqliteEventStorage extends AbstractSqliteAccessor {
             beforeRowid: beforeRowid.rowid
         });
         for (const row of rows)
-            yield this.#reconstructEvent(row);
+            yield reconstructEvent(row);
     }
     async *getEventsByTypes(eventTypes, options) {
         await this.assertConnection();
@@ -172,7 +222,7 @@ export class SqliteEventStorage extends AbstractSqliteAccessor {
         const rows = this.#getEventsByTypesQuery.all(afterRowid);
         for (const row of rows) {
             if (eventTypes.includes(row.type))
-                yield this.#reconstructEvent(row);
+                yield reconstructEvent(row);
         }
     }
     async process(batch) {
@@ -187,25 +237,5 @@ export class SqliteEventStorage extends AbstractSqliteAccessor {
         await this.commitEvents(events, { ignoreConcurrencyError, meta });
         return batch;
     }
-    #getSagaOriginsForEvent(eventIdBuf) {
-        const refs = this.#getSagaRefsQuery.all(eventIdBuf);
-        if (refs.length === 0)
-            return {};
-        const sagaOrigins = {};
-        for (const ref of refs)
-            sagaOrigins[ref.saga_descriptor] = bufferToGuid(ref.origin_id);
-        return sagaOrigins;
-    }
-    #reconstructEvent(row) {
-        const data = JSON.parse(row.data);
-        const sagaOrigins = this.#getSagaOriginsForEvent(row.id);
-        const event = {
-            id: bufferToGuid(row.id),
-            ...data
-        };
-        if (Object.keys(sagaOrigins).length > 0)
-            event.sagaOrigins = sagaOrigins;
-        return event;
-    }
 }
 //# sourceMappingURL=SqliteEventStorage.js.map

package/dist/esm/sqlite/SqliteEventStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"SqliteEventStorage.js","sourceRoot":"","sources":["../../../src/sqlite/SqliteEventStorage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SqliteEventStorage.js","sourceRoot":"","sources":["../../../src/sqlite/SqliteEventStorage.ts"],"names":[],"mappings":"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"}

package/dist/types/postgresql/AbstractPostgresqlAccessor.d.ts

@@ -0,0 +1,29 @@
+import type { IContainer } from 'node-cqrs';
+import type { PostgresqlConnection } from './PostgresqlConnection.ts';
+/**
+ * Abstract base class for accessing a PostgreSQL connection.
+ *
+ * Manages the connection lifecycle, ensuring initialization via `assertConnection`.
+ * Supports providing a query-capable connection directly or a factory function for lazy initialization.
+ *
+ * Subclasses must implement the `initialize` method for specific setup tasks.
+ */
+export declare abstract class AbstractPostgresqlAccessor {
+    #private;
+    protected db: PostgresqlConnection | undefined;
+    constructor(c: Partial<Pick<IContainer, 'viewModelPostgresqlDb' | 'viewModelPostgresqlDbFactory'>>);
+    protected abstract initialize(db: PostgresqlConnection): Promise<void> | void;
+    protected get connection(): PostgresqlConnection;
+    /**
+     * Ensures that the PostgreSQL connection is initialized.
+     * Uses a lock to prevent race conditions during concurrent initialization attempts.
+     * If the connection is not already set, it creates one using the provided factory
+     * and then calls the `initialize` method.
+     *
+     * This method is idempotent and safe to call multiple times.
+     */
+    assertConnection(): Promise<void>;
+    runInTransaction<T>(callback: () => Promise<T> | T): Promise<T>;
+    private getTransactionConnection;
+    private static isConnectionPool;
+}

package/dist/types/postgresql/AbstractPostgresqlObjectProjection.d.ts

@@ -0,0 +1,12 @@
+import type { IContainer } from 'node-cqrs';
+import { AbstractProjection } from '../AbstractProjection.ts';
+import type { IEvent } from '../interfaces/index.ts';
+import { PostgresqlObjectView } from './PostgresqlObjectView.ts';
+type PostgresqlObjectProjectionParams = Partial<Pick<IContainer, 'viewModelPostgresqlDb' | 'viewModelPostgresqlDbFactory' | 'logger' | 'postgresqlObjectStorageMaxRetries'>> & Partial<Pick<ConstructorParameters<typeof PostgresqlObjectView>[0], 'eventLockTableName' | 'eventLockTtl' | 'viewLockTableName' | 'viewLockTtl'>>;
+export declare abstract class AbstractPostgresqlObjectProjection<T> extends AbstractProjection<PostgresqlObjectView<T>> {
+    static get tableName(): string;
+    static get schemaVersion(): string;
+    constructor({ eventLockTableName, eventLockTtl, logger, postgresqlObjectStorageMaxRetries, viewLockTableName, viewLockTtl, viewModelPostgresqlDb, viewModelPostgresqlDbFactory }: PostgresqlObjectProjectionParams);
+    project(event: IEvent, meta?: Record<string, any>): Promise<void>;
+}
+export {};

package/dist/types/postgresql/AbstractPostgresqlView.d.ts

@@ -0,0 +1,23 @@
+import type { IContainer } from 'node-cqrs';
+import type { IEvent, IEventLocker, ILogger, IViewLocker } from '../interfaces/index.ts';
+import { AbstractPostgresqlAccessor } from './AbstractPostgresqlAccessor.ts';
+import { PostgresqlEventLocker, type PostgresqlEventLockerParams } from './PostgresqlEventLocker.ts';
+import { PostgresqlViewLocker, type PostgresqlViewLockerParams } from './PostgresqlViewLocker.ts';
+/**
+ * Base class for PostgreSQL-backed projection views with restore locking and last-processed-event tracking.
+ */
+export declare abstract class AbstractPostgresqlView extends AbstractPostgresqlAccessor implements IViewLocker, IEventLocker {
+    protected readonly schemaVersion: string;
+    protected readonly viewLocker: PostgresqlViewLocker;
+    protected readonly eventLocker: PostgresqlEventLocker;
+    protected logger: ILogger | undefined;
+    get ready(): boolean;
+    constructor(options: Partial<Pick<IContainer, 'viewModelPostgresqlDb' | 'viewModelPostgresqlDbFactory' | 'logger'>> & PostgresqlEventLockerParams & PostgresqlViewLockerParams);
+    lock(): Promise<boolean>;
+    unlock(): Promise<void>;
+    once(event: 'ready'): Promise<void>;
+    getLastEvent(): Promise<IEvent | undefined>;
+    tryMarkAsProjecting(event: IEvent): Promise<boolean>;
+    markAsProjected(event: IEvent): Promise<void>;
+    markAsLastEvent(event: IEvent): Promise<void>;
+}

package/dist/types/postgresql/IContainer.d.ts

@@ -0,0 +1,12 @@
+import type { PostgresqlConnection } from './PostgresqlConnection.ts';
+declare module 'node-cqrs' {
+    interface IContainer {
+        viewModelPostgresqlDb?: PostgresqlConnection;
+        viewModelPostgresqlDbFactory?: () => Promise<PostgresqlConnection> | PostgresqlConnection;
+        postgresqlEventStorageConfig?: {
+            eventsTableName?: string;
+            eventSagasTableName?: string;
+        };
+        postgresqlObjectStorageMaxRetries?: number;
+    }
+}

package/dist/types/postgresql/PostgresqlConnection.d.ts

@@ -0,0 +1,7 @@
+export type PostgresqlQueryResult<TRow extends Record<string, unknown> = Record<string, unknown>> = {
+    rows: TRow[];
+    rowCount: number | null;
+};
+export type PostgresqlConnection = {
+    query<TRow extends Record<string, unknown> = Record<string, unknown>>(text: string, values?: readonly unknown[]): Promise<PostgresqlQueryResult<TRow>>;
+};

package/dist/types/postgresql/PostgresqlEventLocker.d.ts

@@ -0,0 +1,39 @@
+import type { IContainer } from 'node-cqrs';
+import type { IEvent, IEventLocker } from '../interfaces/index.ts';
+import type { PostgresqlConnection } from './PostgresqlConnection.ts';
+import type { PostgresqlProjectionDataParams } from './PostgresqlProjectionDataParams.ts';
+import type { PostgresqlViewLockerParams } from './PostgresqlViewLocker.ts';
+import { AbstractPostgresqlAccessor } from './AbstractPostgresqlAccessor.ts';
+export type PostgresqlEventLockerParams = PostgresqlProjectionDataParams & Pick<PostgresqlViewLockerParams, 'viewLockTableName'> & {
+    /**
+     * (Optional) PostgreSQL table name where event locks are stored.
+     *
+     * @default PostgresqlEventLocker.DEFAULT_EVENT_LOCK_TABLE
+     */
+    eventLockTableName?: string;
+    /**
+     * (Optional) Time-to-live (TTL) duration in milliseconds
+     * for which an event remains in the "processing" state until released.
+     *
+     * @default PostgresqlEventLocker.DEFAULT_EVENT_LOCK_TTL
+     */
+    eventLockTtl?: number;
+};
+/**
+ * PostgreSQL-backed implementation of IEventLocker.
+ *
+ * Uses one table for per-event processing locks and the view lock table for the
+ * last processed event checkpoint.
+ */
+export declare class PostgresqlEventLocker extends AbstractPostgresqlAccessor implements IEventLocker {
+    #private;
+    static DEFAULT_EVENT_LOCK_TTL: number;
+    static DEFAULT_EVENT_LOCK_TABLE: string;
+    static DEFAULT_VIEW_LOCK_TABLE: string;
+    constructor(o: Partial<Pick<IContainer, 'viewModelPostgresqlDb' | 'viewModelPostgresqlDbFactory'>> & PostgresqlEventLockerParams);
+    protected initialize(db: PostgresqlConnection): Promise<void>;
+    tryMarkAsProjecting(event: IEvent): Promise<boolean>;
+    markAsProjected(event: IEvent): Promise<void>;
+    markAsLastEvent(event: IEvent): Promise<void>;
+    getLastEvent(): Promise<IEvent | undefined>;
+}

package/dist/types/postgresql/PostgresqlEventStorage.d.ts

@@ -0,0 +1,23 @@
+import type { IContainer } from 'node-cqrs';
+import type { AggregateEventsQueryParams, DispatchPipelineBatch, EventQueryAfter, IDispatchPipelineProcessor, IEvent, IEventSet, IEventStorageReader, IEventStream, IIdentifierProvider, Identifier } from '../interfaces/index.ts';
+import { AbstractPostgresqlAccessor } from './AbstractPostgresqlAccessor.ts';
+import type { PostgresqlConnection } from './PostgresqlConnection.ts';
+export declare class PostgresqlEventStorage extends AbstractPostgresqlAccessor implements IEventStorageReader, IIdentifierProvider, IDispatchPipelineProcessor {
+    #private;
+    static readonly EVENTS_TABLE = "tbl_events";
+    static readonly EVENT_SAGAS_TABLE = "tbl_event_sagas";
+    constructor({ postgresqlEventStorageConfig, viewModelPostgresqlDb, viewModelPostgresqlDbFactory }: Partial<Pick<IContainer, 'postgresqlEventStorageConfig' | 'viewModelPostgresqlDb' | 'viewModelPostgresqlDbFactory'>>);
+    protected initialize(db: PostgresqlConnection): Promise<void>;
+    getNewId(): string;
+    commitEvents(events: IEventSet, options?: {
+        ignoreConcurrencyError?: boolean;
+        meta?: Record<string, unknown> | null;
+    }): Promise<IEventSet>;
+    getAggregateEvents(aggregateId: Identifier, options?: AggregateEventsQueryParams): IEventStream;
+    getSagaEvents(sagaId: Identifier, { beforeEvent }: {
+        beforeEvent: IEvent;
+    }): IEventStream;
+    getEventsByTypes(eventTypes: Readonly<string[]>, options?: EventQueryAfter): IEventStream;
+    process(batch: DispatchPipelineBatch): Promise<DispatchPipelineBatch>;
+    private isAggregateVersionUniqueViolation;
+}

package/dist/types/postgresql/PostgresqlObjectStorage.d.ts

@@ -0,0 +1,29 @@
+import type { IContainer } from 'node-cqrs';
+import type { Identifier, IObjectStorage } from '../interfaces/index.ts';
+import { AbstractPostgresqlAccessor } from './AbstractPostgresqlAccessor.ts';
+import type { PostgresqlConnection } from './PostgresqlConnection.ts';
+/**
+ * PostgreSQL-backed implementation of IObjectStorage.
+ *
+ * Each record is stored as a row `{ id, data, version }`.
+ * The version field enables optimistic concurrency control: `update` and
+ * `updateEnforcingNew` re-read the record after the user callback runs and
+ * atomically commit only when the version still matches.
+ * On mismatch the operation retries up to `maxRetries` times.
+ */
+export declare class PostgresqlObjectStorage<TRecord> extends AbstractPostgresqlAccessor implements IObjectStorage<TRecord> {
+    #private;
+    constructor(o: Partial<Pick<IContainer, 'viewModelPostgresqlDb' | 'viewModelPostgresqlDbFactory'>> & {
+        tableName: string;
+        maxRetries?: number;
+    });
+    protected initialize(db: PostgresqlConnection): Promise<void>;
+    get(id: Identifier): Promise<TRecord | undefined>;
+    create(id: Identifier, data: TRecord): Promise<void>;
+    update(id: Identifier, update: (r: TRecord) => TRecord): Promise<void>;
+    updateEnforcingNew(id: Identifier, update: (r?: TRecord) => TRecord): Promise<void>;
+    delete(id: Identifier): Promise<boolean>;
+    private getRow;
+    private updateByVersion;
+    private static parseData;
+}

package/dist/types/postgresql/PostgresqlObjectView.d.ts

@@ -0,0 +1,19 @@
+import type { IEventLocker, Identifier, IObjectStorage } from '../interfaces/index.ts';
+import { AbstractPostgresqlView } from './AbstractPostgresqlView.ts';
+import type { PostgresqlConnection } from './PostgresqlConnection.ts';
+/**
+ * PostgreSQL-backed object view with restore locking and last-processed-event tracking.
+ */
+export declare class PostgresqlObjectView<TRecord> extends AbstractPostgresqlView implements IObjectStorage<TRecord>, IEventLocker {
+    #private;
+    constructor(options: ConstructorParameters<typeof AbstractPostgresqlView>[0] & {
+        tableNamePrefix: string;
+        postgresqlObjectStorageMaxRetries?: number;
+    });
+    protected initialize(_db: PostgresqlConnection): Promise<void> | void;
+    get(id: Identifier): Promise<TRecord | undefined>;
+    create(id: Identifier, data: TRecord): Promise<void>;
+    update(id: Identifier, update: (r: TRecord) => TRecord): Promise<void>;
+    updateEnforcingNew(id: Identifier, update: (r?: TRecord) => TRecord): Promise<void>;
+    delete(id: Identifier): Promise<boolean>;
+}

package/dist/types/postgresql/PostgresqlProjectionDataParams.d.ts

@@ -0,0 +1,14 @@
+export type PostgresqlProjectionDataParams = {
+    /**
+     * Unique identifier for the projection, used with the schema version to distinguish data ownership.
+     */
+    projectionName: string;
+    /**
+     * The version of the schema used for data produced by the projection.
+     * When the projection's output format changes, this version should be incremented.
+     * A version change indicates that previously stored data is obsolete and must be rebuilt.
+     *
+     * @example "20250519", "1.0.0"
+     */
+    schemaVersion: string;
+};