@cheetah.js/orm 0.1.109 → 0.1.115

package/README.md

@@ -375,6 +375,19 @@ const user = await User.findOne({
 });
 ```
 
+#### Transactions
+```typescript
+import { Orm } from '@cheetah.js/orm';
+
+const orm = Orm.getInstance();
+
+await orm.transaction(async (tx) => {
+  await tx`INSERT INTO users (name) VALUES (${ 'Jane Doe' })`;
+  await tx`UPDATE accounts SET balance = balance - 100 WHERE user_id = ${ 1 }`;
+});
+```
+The `transaction` method leverages the active driver implementation, ensuring consistent transactional semantics across supported databases.
+
 #### List of supported operators
 | Operator |Name | Description |
 | ------ | ---- |--------------------------------------------------------------------------------------------|

package/dist/driver/bun-driver.base.d.ts

@@ -12,6 +12,7 @@ export declare abstract class BunDriverBase implements Partial<DriverInterface>
     protected validateConnection(): Promise<void>;
     disconnect(): Promise<void>;
     executeSql(sqlString: string): Promise<any>;
+    private getExecutionContext;
     transaction<T>(callback: (tx: SQL) => Promise<T>): Promise<T>;
     protected toDatabaseValue(value: unknown): string | number | boolean;
     protected escapeString(value: string): string;

package/dist/driver/bun-driver.base.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BunDriverBase = void 0;
 const bun_1 = require("bun");
+const transaction_context_1 = require("../transaction/transaction-context");
 class BunDriverBase {
     constructor(options) {
         this.connectionString = this.buildConnectionString(options);
@@ -31,10 +32,18 @@ class BunDriverBase {
         await this.sql.close();
     }
     async executeSql(sqlString) {
+        const context = this.getExecutionContext();
+        return await context.unsafe(sqlString);
+    }
+    getExecutionContext() {
+        const txContext = transaction_context_1.transactionContext.getContext();
+        if (txContext) {
+            return txContext;
+        }
         if (!this.sql) {
             throw new Error('Database not connected');
         }
-        return await this.sql.unsafe(sqlString);
+        return this.sql;
     }
     async transaction(callback) {
         if (!this.sql) {
@@ -119,13 +128,14 @@ class BunDriverBase {
     }
     async executeStatement(statement) {
         const startTime = Date.now();
+        const context = this.getExecutionContext();
         if (statement.statement === 'insert') {
             const sql = this.buildInsertSqlWithReturn(statement);
-            const result = await this.sql.unsafe(sql);
+            const result = await context.unsafe(sql);
             return this.handleInsertReturn(statement, result, sql, startTime);
         }
         const sql = this.buildStatementSql(statement);
-        const result = await this.sql.unsafe(sql);
+        const result = await context.unsafe(sql);
         return {
             query: { rows: Array.isArray(result) ? result : [] },
             startTime,

package/dist/index.d.ts

@@ -22,3 +22,4 @@ export * from './common/value-object';
 export * from './common/email.vo';
 export * from './common/uuid';
 export * from './repository/Repository';
+export { transactionContext } from './transaction/transaction-context';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntityStorage = void 0;
+exports.transactionContext = exports.EntityStorage = void 0;
 __exportStar(require("./decorators/entity.decorator"), exports);
 __exportStar(require("./decorators/property.decorator"), exports);
 __exportStar(require("./decorators/primary-key.decorator"), exports);
@@ -39,3 +39,5 @@ __exportStar(require("./common/value-object"), exports);
 __exportStar(require("./common/email.vo"), exports);
 __exportStar(require("./common/uuid"), exports);
 __exportStar(require("./repository/Repository"), exports);
+var transaction_context_1 = require("./transaction/transaction-context");
+Object.defineProperty(exports, "transactionContext", { enumerable: true, get: function () { return transaction_context_1.transactionContext; } });

package/dist/orm.d.ts

@@ -16,4 +16,5 @@ export declare class Orm<T extends DriverInterface = DriverInterface> {
     createQueryBuilder<Model>(model: new () => Model): SqlBuilder<Model>;
     connect(): Promise<void>;
     disconnect(): Promise<void>;
+    transaction<ResultType>(operation: (tx: unknown) => Promise<ResultType>): Promise<ResultType>;
 }

package/dist/orm.js

@@ -14,6 +14,7 @@ exports.Orm = void 0;
 const core_1 = require("@cheetah.js/core");
 const SqlBuilder_1 = require("./SqlBuilder");
 const query_cache_manager_1 = require("./cache/query-cache-manager");
+const transaction_context_1 = require("./transaction/transaction-context");
 let Orm = Orm_1 = class Orm {
     constructor(logger, cacheService) {
         this.logger = logger;
@@ -43,6 +44,14 @@ let Orm = Orm_1 = class Orm {
     disconnect() {
         return this.driverInstance.disconnect();
     }
+    async transaction(operation) {
+        if (!this.driverInstance) {
+            throw new Error('Driver instance not initialized');
+        }
+        return this.driverInstance.transaction(async (tx) => {
+            return transaction_context_1.transactionContext.run(tx, () => operation(tx));
+        });
+    }
 };
 exports.Orm = Orm;
 exports.Orm = Orm = Orm_1 = __decorate([

package/dist/transaction/transaction-context.d.ts

@@ -0,0 +1,10 @@
+import { SQL } from 'bun';
+declare class TransactionContextManager {
+    private storage;
+    constructor();
+    run<T>(tx: SQL, callback: () => Promise<T>): Promise<T>;
+    getContext(): SQL | undefined;
+    hasContext(): boolean;
+}
+export declare const transactionContext: TransactionContextManager;
+export {};

package/dist/transaction/transaction-context.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transactionContext = void 0;
+const async_hooks_1 = require("async_hooks");
+class TransactionContextManager {
+    constructor() {
+        this.storage = new async_hooks_1.AsyncLocalStorage();
+    }
+    run(tx, callback) {
+        return this.storage.run({ tx }, callback);
+    }
+    getContext() {
+        return this.storage.getStore()?.tx;
+    }
+    hasContext() {
+        return this.storage.getStore() !== undefined;
+    }
+}
+exports.transactionContext = new TransactionContextManager();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheetah.js/orm",
-  "version": "0.1.109",
+  "version": "0.1.115",
   "description": "A simple ORM for Cheetah.js",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -55,5 +55,5 @@
     "bun",
     "value-object"
   ],
-  "gitHead": "43c90312ee0ad4bfd40b4a4d2686e32cd2282477"
+  "gitHead": "90003dc77de481a78a13fa7dedd8f62bde43b4cc"
 }