@opra/sqb 1.0.7 → 1.0.8

package/cjs/sqb-entity-service.js

@@ -7,7 +7,6 @@ const connect_1 = require("@sqb/connect");
 const valgen_1 = require("valgen");
 const sqb_adapter_js_1 = require("./sqb-adapter.js");
 const sqb_service_base_js_1 = require("./sqb-service-base.js");
-const transactionKey = Symbol.for('transaction');
 /**
  * @class SqbEntityService
  * @template T - The data type class type of the resource
@@ -75,54 +74,6 @@ class SqbEntityService extends sqb_service_base_js_1.SqbServiceBase {
         }
         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.
      *
@@ -512,23 +463,6 @@ class SqbEntityService extends sqb_service_base_js_1.SqbServiceBase {
             options.filter = sqb_adapter_js_1.SQBAdapter.parseFilter(options.filter);
         return await repo.updateMany(data, options);
     }
-    /**
-     * Retrieves the database connection.
-     *
-     * @protected
-     *
-     * @throws {Error} If the context or database is not set.
-     */
-    getConnection() {
-        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.
      * This method is mostly used for security issues like securing multi-tenant applications.

package/esm/sqb-entity-service.js

@@ -1,10 +1,9 @@
 import { InternalServerError } from '@opra/common';
 import { op } from '@sqb/builder';
-import { EntityMetadata, SqbConnection } from '@sqb/connect';
+import { EntityMetadata } from '@sqb/connect';
 import { isNotNullish } from 'valgen';
 import { SQBAdapter } from './sqb-adapter.js';
 import { SqbServiceBase } from './sqb-service-base.js';
-const transactionKey = Symbol.for('transaction');
 /**
  * @class SqbEntityService
  * @template T - The data type class type of the resource
@@ -72,54 +71,6 @@ export class SqbEntityService extends SqbServiceBase {
         }
         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.
      *
@@ -509,23 +460,6 @@ export class SqbEntityService extends SqbServiceBase {
             options.filter = SQBAdapter.parseFilter(options.filter);
         return await repo.updateMany(data, options);
     }
-    /**
-     * Retrieves the database connection.
-     *
-     * @protected
-     *
-     * @throws {Error} If the context or database is not set.
-     */
-    getConnection() {
-        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.
      * This method is mostly used for security issues like securing multi-tenant applications.

package/package.json

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

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

@@ -1,6 +1,6 @@
 import { ComplexType } from '@opra/common';
 import { ExecutionContext, ServiceBase } from '@opra/core';
-import { EntityMetadata, Repository, SqbClient, SqbConnection } from '@sqb/connect';
+import { EntityMetadata, Repository } from '@sqb/connect';
 import type { Nullish, PartialDTO, PatchDTO, RequiredSome, StrictOmit, Type } from 'ts-gems';
 import { type IsObject } from 'valgen';
 import { SQBAdapter } from './sqb-adapter.js';
@@ -205,12 +205,6 @@ export declare class SqbEntityService<T extends object = object> extends SqbServ
      */
     get entityMetadata(): EntityMetadata;
     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.
      *
@@ -428,14 +422,6 @@ export declare class SqbEntityService<T extends object = object> extends SqbServ
      * @protected
      */
     protected _dbUpdateMany(data: PatchDTO<T>, options?: Repository.UpdateManyOptions): Promise<number>;
-    /**
-     * Retrieves the database connection.
-     *
-     * @protected
-     *
-     * @throws {Error} If the context or database is not set.
-     */
-    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.