@opra/sqb 1.0.0-beta.3 → 1.0.0-beta.5

package/cjs/sqb-adapter.js

@@ -47,7 +47,7 @@ var SQBAdapter;
                         filter: SQBAdapter.parseFilter(ctx.queryParams.filter),
                         projection: ctx.queryParams.projection || operation.compositionOptions.defaultProjection,
                         limit: ctx.queryParams.limit || operation.compositionOptions.defaultLimit,
-                        offset: ctx.queryParams.skip,
+                        skip: ctx.queryParams.skip,
                         sort: ctx.queryParams.sort || operation.compositionOptions.defaultSort,
                     };
                     return { method: 'findMany', options };

package/cjs/sqb-entity-service.js

@@ -7,6 +7,7 @@ const builder_1 = require("@sqb/builder");
 const connect_1 = require("@sqb/connect");
 const valgen_1 = require("valgen");
 const sqb_adapter_js_1 = require("./sqb-adapter.js");
+const transactionKey = Symbol.for('transaction');
 /**
  * @class SqbEntityService
  * @template T - The data type class type of the resource
@@ -75,6 +76,54 @@ class SqbEntityService extends core_1.ServiceBase {
         }
         return super.for(context, overwriteProperties, overwriteContext);
     }
+    /**
+     * Executes the provided function within a transaction.
+     *
+     * @param callback - The function to be executed within the transaction.
+     */
+    async withTransaction(callback) {
+        const ctx = this.context;
+        let closeSessionOnFinish = false;
+        let connection = ctx[transactionKey];
+        if (!connection) {
+            /** Determine the SqbClient or SqbConnection instance */
+            const db = await this.getConnection();
+            if (db instanceof connect_1.SqbConnection) {
+                connection = db;
+            }
+            else {
+                /** Acquire a connection. New connection should be at the end */
+                connection = await db.acquire({ autoCommit: false });
+                closeSessionOnFinish = true;
+            }
+            /** Store transaction connection in current context */
+            ctx[transactionKey] = connection;
+        }
+        const oldInTransaction = connection.inTransaction;
+        connection.retain();
+        try {
+            if (!oldInTransaction)
+                await connection.startTransaction();
+            const out = await callback(connection, this);
+            if (!oldInTransaction && connection.inTransaction)
+                await connection.commit();
+            return out;
+        }
+        catch (e) {
+            if (!oldInTransaction && connection.inTransaction)
+                await connection.rollback();
+            throw e;
+        }
+        finally {
+            delete ctx[transactionKey];
+            /** Release connection */
+            if (closeSessionOnFinish) {
+                await connection.close();
+            }
+            else
+                connection.release();
+        }
+    }
     /**
      * Retrieves the resource name.
      *
@@ -161,7 +210,8 @@ class SqbEntityService extends core_1.ServiceBase {
      * @protected
      */
     async _count(command) {
-        return this._dbCount(command.options);
+        const filter = command.options?.filter ? sqb_adapter_js_1.SQBAdapter.parseFilter(command.options.filter) : undefined;
+        return this._dbCount({ ...command.options, filter });
     }
     /**
      * Deletes a record from the collection.
@@ -172,7 +222,8 @@ class SqbEntityService extends core_1.ServiceBase {
      */
     async _delete(command) {
         (0, valgen_1.isNotNullish)(command.documentId, { label: 'documentId' });
-        return this._dbDelete(command.documentId, command.options);
+        const filter = command.options?.filter ? sqb_adapter_js_1.SQBAdapter.parseFilter(command.options.filter) : undefined;
+        return this._dbDelete(command.documentId, { ...command.options, filter });
     }
     /**
      * Deletes multiple documents from the collection that meet the specified filter criteria.
@@ -182,7 +233,8 @@ class SqbEntityService extends core_1.ServiceBase {
      * @protected
      */
     async _deleteMany(command) {
-        return await this._dbDeleteMany(command.options);
+        const filter = command.options?.filter ? sqb_adapter_js_1.SQBAdapter.parseFilter(command.options.filter) : undefined;
+        return await this._dbDeleteMany({ ...command.options, filter });
     }
     /**
      * Checks if a record with the given id exists.
@@ -192,7 +244,8 @@ class SqbEntityService extends core_1.ServiceBase {
      */
     async _exists(command) {
         (0, valgen_1.isNotNullish)(command.documentId, { label: 'documentId' });
-        return await this._dbExists(command.documentId, command.options);
+        const filter = command.options?.filter ? sqb_adapter_js_1.SQBAdapter.parseFilter(command.options.filter) : undefined;
+        return await this._dbExists(command.documentId, { ...command.options, filter });
     }
     /**
      * Checks if a record with the given arguments exists.
@@ -202,7 +255,8 @@ class SqbEntityService extends core_1.ServiceBase {
      * @protected
      */
     async _existsOne(command) {
-        return await this._dbExistsOne(command.options);
+        const filter = command.options?.filter ? sqb_adapter_js_1.SQBAdapter.parseFilter(command.options.filter) : undefined;
+        return await this._dbExistsOne({ ...command.options, filter });
     }
     /**
      * Finds a record by ID.
@@ -214,7 +268,8 @@ class SqbEntityService extends core_1.ServiceBase {
     async _findById(command) {
         (0, valgen_1.isNotNullish)(command.documentId, { label: 'documentId' });
         const decode = this.getOutputCodec('find');
-        const out = await this._dbFindById(command.documentId, command.options);
+        const filter = command.options?.filter ? sqb_adapter_js_1.SQBAdapter.parseFilter(command.options.filter) : undefined;
+        const out = await this._dbFindById(command.documentId, { ...command.options, filter });
         return out ? decode(out) : undefined;
     }
     /**
@@ -226,7 +281,8 @@ class SqbEntityService extends core_1.ServiceBase {
      */
     async _findOne(command) {
         const decode = this.getOutputCodec('find');
-        const out = await this._dbFindOne(command.options);
+        const filter = command.options?.filter ? sqb_adapter_js_1.SQBAdapter.parseFilter(command.options.filter) : undefined;
+        const out = await this._dbFindOne({ ...command.options, filter });
         return out ? decode(out) : undefined;
     }
     /**
@@ -238,7 +294,8 @@ class SqbEntityService extends core_1.ServiceBase {
      */
     async _findMany(command) {
         const decode = this.getOutputCodec('find');
-        const out = await this._dbFindMany(command.options);
+        const filter = command.options?.filter ? sqb_adapter_js_1.SQBAdapter.parseFilter(command.options.filter) : undefined;
+        const out = await this._dbFindMany({ ...command.options, filter });
         if (out?.length) {
             return out.map(x => decode(x));
         }
@@ -257,7 +314,8 @@ class SqbEntityService extends core_1.ServiceBase {
         const { documentId, input, options } = command;
         const inputCodec = this.getInputCodec('update');
         const data = inputCodec(input);
-        const out = await this._dbUpdate(documentId, data, options);
+        const filter = command.options?.filter ? sqb_adapter_js_1.SQBAdapter.parseFilter(command.options.filter) : undefined;
+        const out = await this._dbUpdate(documentId, data, { ...options, filter });
         const outputCodec = this.getOutputCodec('update');
         if (out)
             return outputCodec(out);
@@ -275,7 +333,8 @@ class SqbEntityService extends core_1.ServiceBase {
         const { documentId, input, options } = command;
         const inputCodec = this.getInputCodec('update');
         const data = inputCodec(input);
-        return await this._dbUpdateOnly(documentId, data, options);
+        const filter = command.options?.filter ? sqb_adapter_js_1.SQBAdapter.parseFilter(command.options.filter) : undefined;
+        return await this._dbUpdateOnly(documentId, data, { ...options, filter });
     }
     /**
      * Updates multiple records in the collection based on the specified input and options.
@@ -288,7 +347,8 @@ class SqbEntityService extends core_1.ServiceBase {
         (0, valgen_1.isNotNullish)(command.input, { label: 'input' });
         const inputCodec = this.getInputCodec('update');
         const data = inputCodec(command.input);
-        return await this._dbUpdateMany(data, command.options);
+        const filter = command.options?.filter ? sqb_adapter_js_1.SQBAdapter.parseFilter(command.options.filter) : undefined;
+        return await this._dbUpdateMany(data, { ...command.options, filter });
     }
     /**
      * Acquires a connection and performs Repository.create operation
@@ -394,7 +454,7 @@ class SqbEntityService extends core_1.ServiceBase {
         const repo = conn.getRepository(this.dataTypeClass);
         if (options?.filter)
             options.filter = sqb_adapter_js_1.SQBAdapter.parseFilter(options.filter);
-        return await repo.findOne(options);
+        return await repo.findOne({ ...options, offset: options?.skip });
     }
     /**
      * Acquires a connection and performs Repository.findMany operation
@@ -407,7 +467,7 @@ class SqbEntityService extends core_1.ServiceBase {
         const repo = conn.getRepository(this.dataTypeClass);
         if (options?.filter)
             options.filter = sqb_adapter_js_1.SQBAdapter.parseFilter(options.filter);
-        return await repo.findMany(options);
+        return await repo.findMany({ ...options, offset: options?.skip });
     }
     /**
      * Acquires a connection and performs Repository.update operation
@@ -437,7 +497,7 @@ class SqbEntityService extends core_1.ServiceBase {
         const repo = conn.getRepository(this.dataTypeClass);
         if (options?.filter)
             options.filter = sqb_adapter_js_1.SQBAdapter.parseFilter(options.filter);
-        return await repo.updateOnly(id, data, options);
+        return (await repo.updateOnly(id, data, options)) ? 1 : 0;
     }
     /**
      * Acquires a connection and performs Repository.updateMany operation
@@ -461,10 +521,14 @@ class SqbEntityService extends core_1.ServiceBase {
      * @throws {Error} If the context or database is not set.
      */
     getConnection() {
-        const db = typeof this.db === 'function' ? this.db(this) : this.db;
-        if (!db)
-            throw new Error(`Database not set!`);
-        return db;
+        const ctx = this.context;
+        let db = ctx[transactionKey];
+        if (db)
+            return db;
+        db = typeof this.db === 'function' ? this.db(this) : this.db;
+        if (db)
+            return db;
+        throw new Error(`Database not set!`);
     }
     /**
      * Retrieves the common filter used for querying documents.

package/esm/sqb-adapter.js

@@ -43,7 +43,7 @@ export var SQBAdapter;
                         filter: SQBAdapter.parseFilter(ctx.queryParams.filter),
                         projection: ctx.queryParams.projection || operation.compositionOptions.defaultProjection,
                         limit: ctx.queryParams.limit || operation.compositionOptions.defaultLimit,
-                        offset: ctx.queryParams.skip,
+                        skip: ctx.queryParams.skip,
                         sort: ctx.queryParams.sort || operation.compositionOptions.defaultSort,
                     };
                     return { method: 'findMany', options };

package/esm/sqb-entity-service.js

@@ -1,9 +1,10 @@
 import { InternalServerError } from '@opra/common';
 import { ServiceBase } from '@opra/core';
 import { op } from '@sqb/builder';
-import { EntityMetadata } from '@sqb/connect';
+import { EntityMetadata, SqbConnection } from '@sqb/connect';
 import { isNotNullish } from 'valgen';
 import { SQBAdapter } from './sqb-adapter.js';
+const transactionKey = Symbol.for('transaction');
 /**
  * @class SqbEntityService
  * @template T - The data type class type of the resource
@@ -72,6 +73,54 @@ export class SqbEntityService extends ServiceBase {
         }
         return super.for(context, overwriteProperties, overwriteContext);
     }
+    /**
+     * Executes the provided function within a transaction.
+     *
+     * @param callback - The function to be executed within the transaction.
+     */
+    async withTransaction(callback) {
+        const ctx = this.context;
+        let closeSessionOnFinish = false;
+        let connection = ctx[transactionKey];
+        if (!connection) {
+            /** Determine the SqbClient or SqbConnection instance */
+            const db = await this.getConnection();
+            if (db instanceof SqbConnection) {
+                connection = db;
+            }
+            else {
+                /** Acquire a connection. New connection should be at the end */
+                connection = await db.acquire({ autoCommit: false });
+                closeSessionOnFinish = true;
+            }
+            /** Store transaction connection in current context */
+            ctx[transactionKey] = connection;
+        }
+        const oldInTransaction = connection.inTransaction;
+        connection.retain();
+        try {
+            if (!oldInTransaction)
+                await connection.startTransaction();
+            const out = await callback(connection, this);
+            if (!oldInTransaction && connection.inTransaction)
+                await connection.commit();
+            return out;
+        }
+        catch (e) {
+            if (!oldInTransaction && connection.inTransaction)
+                await connection.rollback();
+            throw e;
+        }
+        finally {
+            delete ctx[transactionKey];
+            /** Release connection */
+            if (closeSessionOnFinish) {
+                await connection.close();
+            }
+            else
+                connection.release();
+        }
+    }
     /**
      * Retrieves the resource name.
      *
@@ -158,7 +207,8 @@ export class SqbEntityService extends ServiceBase {
      * @protected
      */
     async _count(command) {
-        return this._dbCount(command.options);
+        const filter = command.options?.filter ? SQBAdapter.parseFilter(command.options.filter) : undefined;
+        return this._dbCount({ ...command.options, filter });
     }
     /**
      * Deletes a record from the collection.
@@ -169,7 +219,8 @@ export class SqbEntityService extends ServiceBase {
      */
     async _delete(command) {
         isNotNullish(command.documentId, { label: 'documentId' });
-        return this._dbDelete(command.documentId, command.options);
+        const filter = command.options?.filter ? SQBAdapter.parseFilter(command.options.filter) : undefined;
+        return this._dbDelete(command.documentId, { ...command.options, filter });
     }
     /**
      * Deletes multiple documents from the collection that meet the specified filter criteria.
@@ -179,7 +230,8 @@ export class SqbEntityService extends ServiceBase {
      * @protected
      */
     async _deleteMany(command) {
-        return await this._dbDeleteMany(command.options);
+        const filter = command.options?.filter ? SQBAdapter.parseFilter(command.options.filter) : undefined;
+        return await this._dbDeleteMany({ ...command.options, filter });
     }
     /**
      * Checks if a record with the given id exists.
@@ -189,7 +241,8 @@ export class SqbEntityService extends ServiceBase {
      */
     async _exists(command) {
         isNotNullish(command.documentId, { label: 'documentId' });
-        return await this._dbExists(command.documentId, command.options);
+        const filter = command.options?.filter ? SQBAdapter.parseFilter(command.options.filter) : undefined;
+        return await this._dbExists(command.documentId, { ...command.options, filter });
     }
     /**
      * Checks if a record with the given arguments exists.
@@ -199,7 +252,8 @@ export class SqbEntityService extends ServiceBase {
      * @protected
      */
     async _existsOne(command) {
-        return await this._dbExistsOne(command.options);
+        const filter = command.options?.filter ? SQBAdapter.parseFilter(command.options.filter) : undefined;
+        return await this._dbExistsOne({ ...command.options, filter });
     }
     /**
      * Finds a record by ID.
@@ -211,7 +265,8 @@ export class SqbEntityService extends ServiceBase {
     async _findById(command) {
         isNotNullish(command.documentId, { label: 'documentId' });
         const decode = this.getOutputCodec('find');
-        const out = await this._dbFindById(command.documentId, command.options);
+        const filter = command.options?.filter ? SQBAdapter.parseFilter(command.options.filter) : undefined;
+        const out = await this._dbFindById(command.documentId, { ...command.options, filter });
         return out ? decode(out) : undefined;
     }
     /**
@@ -223,7 +278,8 @@ export class SqbEntityService extends ServiceBase {
      */
     async _findOne(command) {
         const decode = this.getOutputCodec('find');
-        const out = await this._dbFindOne(command.options);
+        const filter = command.options?.filter ? SQBAdapter.parseFilter(command.options.filter) : undefined;
+        const out = await this._dbFindOne({ ...command.options, filter });
         return out ? decode(out) : undefined;
     }
     /**
@@ -235,7 +291,8 @@ export class SqbEntityService extends ServiceBase {
      */
     async _findMany(command) {
         const decode = this.getOutputCodec('find');
-        const out = await this._dbFindMany(command.options);
+        const filter = command.options?.filter ? SQBAdapter.parseFilter(command.options.filter) : undefined;
+        const out = await this._dbFindMany({ ...command.options, filter });
         if (out?.length) {
             return out.map(x => decode(x));
         }
@@ -254,7 +311,8 @@ export class SqbEntityService extends ServiceBase {
         const { documentId, input, options } = command;
         const inputCodec = this.getInputCodec('update');
         const data = inputCodec(input);
-        const out = await this._dbUpdate(documentId, data, options);
+        const filter = command.options?.filter ? SQBAdapter.parseFilter(command.options.filter) : undefined;
+        const out = await this._dbUpdate(documentId, data, { ...options, filter });
         const outputCodec = this.getOutputCodec('update');
         if (out)
             return outputCodec(out);
@@ -272,7 +330,8 @@ export class SqbEntityService extends ServiceBase {
         const { documentId, input, options } = command;
         const inputCodec = this.getInputCodec('update');
         const data = inputCodec(input);
-        return await this._dbUpdateOnly(documentId, data, options);
+        const filter = command.options?.filter ? SQBAdapter.parseFilter(command.options.filter) : undefined;
+        return await this._dbUpdateOnly(documentId, data, { ...options, filter });
     }
     /**
      * Updates multiple records in the collection based on the specified input and options.
@@ -285,7 +344,8 @@ export class SqbEntityService extends ServiceBase {
         isNotNullish(command.input, { label: 'input' });
         const inputCodec = this.getInputCodec('update');
         const data = inputCodec(command.input);
-        return await this._dbUpdateMany(data, command.options);
+        const filter = command.options?.filter ? SQBAdapter.parseFilter(command.options.filter) : undefined;
+        return await this._dbUpdateMany(data, { ...command.options, filter });
     }
     /**
      * Acquires a connection and performs Repository.create operation
@@ -391,7 +451,7 @@ export class SqbEntityService extends ServiceBase {
         const repo = conn.getRepository(this.dataTypeClass);
         if (options?.filter)
             options.filter = SQBAdapter.parseFilter(options.filter);
-        return await repo.findOne(options);
+        return await repo.findOne({ ...options, offset: options?.skip });
     }
     /**
      * Acquires a connection and performs Repository.findMany operation
@@ -404,7 +464,7 @@ export class SqbEntityService extends ServiceBase {
         const repo = conn.getRepository(this.dataTypeClass);
         if (options?.filter)
             options.filter = SQBAdapter.parseFilter(options.filter);
-        return await repo.findMany(options);
+        return await repo.findMany({ ...options, offset: options?.skip });
     }
     /**
      * Acquires a connection and performs Repository.update operation
@@ -434,7 +494,7 @@ export class SqbEntityService extends ServiceBase {
         const repo = conn.getRepository(this.dataTypeClass);
         if (options?.filter)
             options.filter = SQBAdapter.parseFilter(options.filter);
-        return await repo.updateOnly(id, data, options);
+        return (await repo.updateOnly(id, data, options)) ? 1 : 0;
     }
     /**
      * Acquires a connection and performs Repository.updateMany operation
@@ -458,10 +518,14 @@ export class SqbEntityService extends ServiceBase {
      * @throws {Error} If the context or database is not set.
      */
     getConnection() {
-        const db = typeof this.db === 'function' ? this.db(this) : this.db;
-        if (!db)
-            throw new Error(`Database not set!`);
-        return db;
+        const ctx = this.context;
+        let db = ctx[transactionKey];
+        if (db)
+            return db;
+        db = typeof this.db === 'function' ? this.db(this) : this.db;
+        if (db)
+            return db;
+        throw new Error(`Database not set!`);
     }
     /**
      * Retrieves the common filter used for querying documents.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/sqb",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.5",
   "description": "Opra SQB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -10,8 +10,8 @@
     "valgen": "^5.10.0"
   },
   "peerDependencies": {
-    "@opra/core": "^1.0.0-beta.3",
-    "@opra/http": "^1.0.0-beta.3",
+    "@opra/core": "^1.0.0-beta.5",
+    "@opra/http": "^1.0.0-beta.5",
     "@sqb/connect": ">= 4.18.0"
   },
   "type": "module",

package/types/sqb-collection-service.d.ts

@@ -91,7 +91,7 @@ export declare namespace SqbCollectionService {
  * @class SqbCollectionService
  * @template T - The data type class type of the resource
  */
-export declare abstract class SqbCollectionService<T extends object = object> extends SqbEntityService {
+export declare class SqbCollectionService<T extends object = object> extends SqbEntityService {
     /**
      * Represents default limit for findMany operation
      */

package/types/sqb-entity-service.d.ts

@@ -37,63 +37,66 @@ export declare namespace SqbEntityService {
      *
      * @interface
      */
-    interface CountOptions extends Repository.CountOptions {
+    interface CountOptions extends StrictOmit<Repository.CountOptions, 'filter'> {
+        filter?: Repository.CountOptions['filter'] | string;
     }
     /**
      * Represents options for "delete" operation
      *
      * @interface
      */
-    interface DeleteOptions extends Repository.DeleteOptions {
+    interface DeleteOptions extends StrictOmit<Repository.DeleteOptions, 'filter'> {
+        filter?: Repository.DeleteOptions['filter'] | string;
     }
     /**
      * Represents options for "deleteMany" operation
      *
      * @interface
      */
-    interface DeleteManyOptions extends Repository.DeleteManyOptions {
+    interface DeleteManyOptions extends StrictOmit<Repository.DeleteManyOptions, 'filter'> {
+        filter?: Repository.DeleteManyOptions['filter'] | string;
     }
     /**
      * Represents options for "exists" operation
      *
      * @interface
      */
-    interface ExistsOptions extends Repository.ExistsOptions {
-    }
-    /**
-     * Represents options for "existsOne" operation
-     *
-     * @interface
-     */
-    interface ExistsOneOptions extends Repository.ExistsOptions {
+    interface ExistsOptions extends StrictOmit<Repository.ExistsOptions, 'filter'> {
+        filter?: Repository.ExistsOptions['filter'] | string;
     }
     /**
      * Represents options for "findOne" operation
      *
      * @interface
      */
-    interface FindOneOptions extends Repository.FindOneOptions {
+    interface FindOneOptions extends StrictOmit<Repository.FindOneOptions, 'filter' | 'offset'> {
+        filter?: Repository.FindOneOptions['filter'] | string;
+        skip?: number;
     }
     /**
      * Represents options for "findMany" operation
      *
      * @interface
      */
-    interface FindManyOptions extends Repository.FindManyOptions {
+    interface FindManyOptions extends StrictOmit<Repository.FindManyOptions, 'filter' | 'offset'> {
+        filter?: Repository.FindManyOptions['filter'] | string;
+        skip?: number;
     }
     /**
      * Represents options for "update" operation
      *
      * @interface
      */
-    interface UpdateOneOptions extends Repository.UpdateOptions {
+    interface UpdateOneOptions extends StrictOmit<Repository.UpdateOptions, 'filter'> {
+        filter?: Repository.UpdateOptions['filter'] | string;
     }
     /**
      * Represents options for "updateMany" operation
      *
      * @interface
      */
-    interface UpdateManyOptions extends Repository.UpdateManyOptions {
+    interface UpdateManyOptions extends StrictOmit<Repository.UpdateManyOptions, 'filter'> {
+        filter?: Repository.UpdateManyOptions['filter'] | string;
     }
     interface CreateCommand<T> extends StrictOmit<RequiredSome<CommandInfo, 'input'>, 'documentId'> {
         crud: 'create';
@@ -205,7 +208,13 @@ export declare class SqbEntityService<T extends object = object> extends Service
      * @throws {TypeError} If metadata is not available
      */
     get entityMetadata(): EntityMetadata;
-    for<C extends ExecutionContext, P extends Partial<this>>(context: C, overwriteProperties?: Nullish<P>, overwriteContext?: Partial<C>): this & Required<P>;
+    for<C extends ExecutionContext, P extends Partial<this>>(context: C | ServiceBase, overwriteProperties?: Nullish<P>, overwriteContext?: Partial<C>): this & Required<P>;
+    /**
+     * Executes the provided function within a transaction.
+     *
+     * @param callback - The function to be executed within the transaction.
+     */
+    withTransaction(callback: (connection: SqbConnection, _this: this) => any): Promise<any>;
     /**
      * Retrieves the resource name.
      *
@@ -317,7 +326,7 @@ export declare class SqbEntityService<T extends object = object> extends Service
      * @returns - A promise that resolves to the number of documents modified.
      * @protected
      */
-    protected _updateOnly(command: SqbEntityService.UpdateOneCommand<T>): Promise<boolean>;
+    protected _updateOnly(command: SqbEntityService.UpdateOneCommand<T>): Promise<number>;
     /**
      * Updates multiple records in the collection based on the specified input and options.
      *
@@ -385,14 +394,18 @@ export declare class SqbEntityService<T extends object = object> extends Service
      * @param options - Optional settings for the command
      * @protected
      */
-    protected _dbFindOne(options?: Repository.FindOneOptions): Promise<PartialDTO<T> | undefined>;
+    protected _dbFindOne(options?: StrictOmit<Repository.FindOneOptions, 'offset'> & {
+        skip?: number;
+    }): Promise<PartialDTO<T> | undefined>;
     /**
      * Acquires a connection and performs Repository.findMany operation
      *
      * @param options - Optional settings for the command
      * @protected
      */
-    protected _dbFindMany(options?: Repository.FindManyOptions): Promise<PartialDTO<T>[]>;
+    protected _dbFindMany(options?: StrictOmit<Repository.FindManyOptions, 'offset'> & {
+        skip?: number;
+    }): Promise<PartialDTO<T>[]>;
     /**
      * Acquires a connection and performs Repository.update operation
      *
@@ -410,7 +423,7 @@ export declare class SqbEntityService<T extends object = object> extends Service
      * @param options - Optional settings for the command
      * @protected
      */
-    protected _dbUpdateOnly(id: SQBAdapter.IdOrIds, data: PatchDTO<T>, options?: Repository.UpdateOptions): Promise<boolean>;
+    protected _dbUpdateOnly(id: SQBAdapter.IdOrIds, data: PatchDTO<T>, options?: Repository.UpdateOptions): Promise<number>;
     /**
      * Acquires a connection and performs Repository.updateMany operation
      *
@@ -426,7 +439,7 @@ export declare class SqbEntityService<T extends object = object> extends Service
      *
      * @throws {Error} If the context or database is not set.
      */
-    protected getConnection(): SqbConnection | SqbClient | Promise<SqbConnection | SqbClient>;
+    getConnection(): SqbConnection | SqbClient | Promise<SqbConnection | SqbClient>;
     /**
      * Retrieves the common filter used for querying documents.
      * This method is mostly used for security issues like securing multi-tenant applications.

package/types/sqb-singleton-service.d.ts

@@ -55,7 +55,7 @@ export declare namespace SqbSingletonService {
  * @class SqbSingletonService
  * @template T - The data type class type of the resource
  */
-export declare abstract class SqbSingletonService<T extends object = object> extends SqbEntityService {
+export declare class SqbSingletonService<T extends object = object> extends SqbEntityService {
     /**
      * Represents a unique identifier for singleton record
      * @property {SQBAdapter.IdOrIds}