@entity-access/entity-access 1.0.157 → 1.0.159

package/src/common/IDisposable.ts

@@ -1,12 +1,4 @@
 /* eslint-disable no-console */
-/* eslint-disable @typescript-eslint/naming-convention */
-declare global {
-    interface SymbolConstructor {
-        readonly dispose?: unique symbol;
-        readonly asyncDispose?: unique symbol;
-    }
-}
-
 // @ts-expect-error readonly
 Symbol.dispose ??= Symbol("@@disposable");
 // @ts-expect-error readonly

package/src/common/Logger.ts

@@ -26,7 +26,7 @@ export default class Logger implements IDisposable {
         return new SessionLogger(this);
     }
 
-    dispose() {
+    [Symbol.dispose]() {
         // do nothing...
     }
 }
@@ -47,7 +47,7 @@ export class ConsoleLogger extends Logger {
         return new SessionLogger(this);
     }
 
-    dispose() {
+    [Symbol.dispose]() {
         // do nothing...
     }
 }
@@ -69,7 +69,7 @@ class SessionLogger extends Logger {
         return this;
     }
 
-    dispose(): void {
+    [Symbol.dispose](): void {
         for (const { log, error } of this.items) {
             if (log) {
                 this.parent.log(log);

package/src/common/ObjectPool.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-base-to-string */
 /* eslint-disable no-console */
 import EntityAccessError from "./EntityAccessError.js";
 import TimedCache from "./cache/TimedCache.js";

package/src/common/usingAsync.ts

@@ -1,5 +1,7 @@
 import { IDisposable } from "./IDisposable.js";
 
+import "./IDisposable.js";
+
 export type IDisposableObject = IDisposable & { end?(): any; close?():any };
 
 export type IDisposableObjectType = IDisposableObject | IDisposableObject[];
@@ -39,7 +41,7 @@ export default async function usingAsync<T>(fx: (registry: IDisposableObject[])
     }
 }
 
-export class DisposableScope {
+export class AsyncDisposableScope {
 
     private disposables: IDisposableObject[] = [];
 
@@ -51,4 +53,8 @@ export class DisposableScope {
         await disposeAll(this.disposables);
     }
 
+    async [Symbol.asyncDispose]() {
+        await disposeAll(this.disposables);
+    }
+
 }

package/src/drivers/base/BaseDriver.ts

@@ -5,12 +5,6 @@ import Migrations from "../../migrations/Migrations.js";
 import ChangeEntry from "../../model/changes/ChangeEntry.js";
 import { BinaryExpression, Constant, DeleteStatement, ExistsExpression, Expression, Identifier, InsertStatement, NotExits, ReturnUpdated, SelectStatement, TableLiteral, UnionAllStatement, UpdateStatement, ValuesStatement } from "../../query/ast/Expressions.js";
 
-export const disposableSymbol: unique symbol = (Symbol as any).dispose ??= Symbol("disposable");
-
-interface IDisposable {
-    [disposableSymbol]?(): void;
-}
-
 export interface IRecord {
     [key: string]: string | boolean | number | Date | Uint8Array | Blob;
 }
@@ -24,9 +18,10 @@ export interface IDbConnectionString {
     poolSize?: number;
 }
 
-export interface IDbReader extends IDisposable {
+export interface IDbReader {
     next(min?: number, signal?: AbortSignal): AsyncGenerator<IRecord, any, any>;
     dispose(): Promise<any>;
+    [Symbol.asyncDispose](): Promise<void>;
 }
 
 export const toQuery = (text: IQuery): { text: string, values?: any[]} => typeof text === "string"
@@ -51,7 +46,38 @@ export interface IQueryResult {
 export interface IBaseTransaction {
     commit(): Promise<any>;
     rollback(): Promise<any>;
-    dispose(): Promise<any>;
+    dispose(): Promise<void>;
+}
+
+export class EntityTransaction {
+
+    committedOrRolledBack = false;
+
+    constructor(private tx: IBaseTransaction) {}
+
+    commit() {
+        this.committedOrRolledBack = true;
+        return this.tx.commit();
+    }
+
+    rollback() {
+        this.committedOrRolledBack = true;
+        return this.tx.rollback();
+    }
+
+    async dispose() {
+        if(!this.committedOrRolledBack) {
+            await this.tx.commit();
+        }
+        await this.tx.dispose();
+    }
+
+    async [Symbol.asyncDispose]() {
+        if(!this.committedOrRolledBack) {
+            await this.tx.commit();
+        }
+        await this.tx.dispose();
+    }
 }
 
 export abstract class BaseConnection {
@@ -60,7 +86,7 @@ export abstract class BaseConnection {
 
     protected connectionString: IDbConnectionString;
 
-    private currentTransaction: IBaseTransaction;
+    private currentTransaction: EntityTransaction;
 
 
     constructor(public driver: BaseDriver) {
@@ -81,7 +107,7 @@ export abstract class BaseConnection {
 
     public abstract executeQuery(command: IQuery, signal?: AbortSignal): Promise<IQueryResult>;
 
-    public abstract createTransaction(): Promise<IBaseTransaction>;
+    public abstract createTransaction(): Promise<EntityTransaction>;
 
     public async runInTransaction<T = any>(fx?: () => Promise<T>) {
         if(this.currentTransaction) {
@@ -90,7 +116,7 @@ export abstract class BaseConnection {
             return await fx();
         }
         let failed = true;
-        let tx: IBaseTransaction;
+        let tx: EntityTransaction;
         try {
             tx = this.currentTransaction = await this.createTransaction();
             const result = await fx();
@@ -101,7 +127,7 @@ export abstract class BaseConnection {
             if (failed) {
                 await tx?.rollback();
             }
-            await tx?.dispose();
+            await tx?.[Symbol.asyncDispose]();
             this.currentTransaction = null;
         }
     }

package/src/drivers/postgres/PostgreSqlDriver.ts

@@ -3,7 +3,7 @@ import ObjectPool, { IPooledObject } from "../../common/ObjectPool.js";
 import QueryCompiler from "../../compiler/QueryCompiler.js";
 import Migrations from "../../migrations/Migrations.js";
 import PostgresAutomaticMigrations from "../../migrations/postgres/PostgresAutomaticMigrations.js";
-import { BaseConnection, BaseDriver, IBaseTransaction, IDbConnectionString, IDbReader, IQuery, IRecord, toQuery } from "../base/BaseDriver.js";
+import { BaseConnection, BaseDriver, EntityTransaction, IBaseTransaction, IDbConnectionString, IDbReader, IQuery, IRecord, toQuery } from "../base/BaseDriver.js";
 import pg from "pg";
 import Cursor from "pg-cursor";
 export interface IPgSqlConnectionString extends IDbConnectionString {
@@ -69,6 +69,10 @@ class DbReader implements IDbReader {
             console.error(error.stack ?? error);
         }
     }
+
+    [Symbol.asyncDispose]() {
+        return this.dispose();
+    }
 }
 
 export default class PostgreSqlDriver extends BaseDriver {
@@ -128,17 +132,17 @@ class PostgreSqlConnection extends BaseConnection {
         super(driver);
     }
 
-    public async createTransaction(): Promise<IBaseTransaction> {
+    public async createTransaction(): Promise<EntityTransaction> {
         const tx = await this.getConnection();
         await tx.query("BEGIN");
-        return {
+        return new EntityTransaction({
             commit: () => tx.query("COMMIT"),
             rollback: () => tx.query("ROLLBACK"),
             dispose: () => {
                 this.transaction = null;
                 return tx[Symbol.asyncDispose]();
             }
-        };
+        });
     }
 
     public automaticMigrations(): Migrations {

package/src/drivers/sql-server/SqlServerDriver.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import QueryCompiler from "../../compiler/QueryCompiler.js";
 import Migrations from "../../migrations/Migrations.js";
-import { BaseConnection, BaseDriver, IBaseTransaction, IDbConnectionString, IDbReader, IQuery, IRecord, disposableSymbol, toQuery } from "../base/BaseDriver.js";
+import { BaseConnection, BaseDriver, EntityTransaction, IBaseTransaction, IDbConnectionString, IDbReader, IQuery, IRecord, toQuery } from "../base/BaseDriver.js";
 import sql from "mssql";
 import SqlServerQueryCompiler from "./SqlServerQueryCompiler.js";
 import SqlServerAutomaticMigrations from "../../migrations/sql-server/SqlServerAutomaticMigrations.js";
@@ -105,41 +105,18 @@ export class SqlServerConnection extends BaseConnection {
         return value;
     }
 
-    public async createTransaction(): Promise<IBaseTransaction> {
+    public async createTransaction(): Promise<EntityTransaction> {
         this.transaction = new sql.Transaction(await this.newConnection());
         let rolledBack = false;
         this.transaction.on("rollback", (aborted) => rolledBack = aborted);
         await this.transaction.begin();
-        return {
+        return new EntityTransaction({
             commit: () => this.transaction.commit(),
             rollback: async () => !rolledBack && await this.transaction.rollback(),
             dispose: () => this.transaction = void 0
-        };
+        });
     }
 
-    // public async runInTransaction<T = any>(fx?: () => Promise<T>): Promise<T> {
-    //     this.transaction = new sql.Transaction(await this.newConnection());
-    //     let rolledBack = false;
-    //     try {
-    //         this.transaction.on("rollback", (aborted) => rolledBack = aborted);
-    //         await this.transaction.begin();
-    //         const r = await fx();
-    //         await this.transaction.commit();
-    //         return r;
-    //     } catch (error) {
-    //         if (!rolledBack) {
-    //             try {
-    //                 await this.transaction.rollback();
-    //             } catch {
-    //                 // rolledBack isn't true sometimes...
-    //             }
-    //         }
-    //         throw new Error(error.stack ?? error);
-    //     } finally {
-    //         this.transaction = void 0;
-    //     }
-    // }
-
     public automaticMigrations(): Migrations {
         return new SqlServerAutomaticMigrations(this.sqlQueryCompiler);
     }
@@ -151,6 +128,7 @@ export class SqlServerConnection extends BaseConnection {
         } else {
             request = (await this.newConnection()).request();
         }
+        // request.verbose = true;
         if (signal) {
             if (signal.aborted) {
                 request.cancel();
@@ -232,10 +210,13 @@ class SqlReader implements IDbReader {
         }  while(true);
     }
     dispose(): Promise<any> {
+        // if (!this.ended) {
+        //     this.rq.cancel();
+        // }
         return Promise.resolve();
     }
-    [disposableSymbol]?(): void {
-        this.dispose()?.catch((error) => console.error(error));
+    [Symbol.asyncDispose]() {
+        return this.dispose()?.catch((error) => console.error(error));
     }
 
 }

package/src/eternity/EternityContext.ts

@@ -328,68 +328,63 @@ export default class EternityContext {
             return;
         }
 
-        const scope = ServiceProvider.from(this).createScope();
+        using scope = ServiceProvider.from(this).createScope();
 
-        try {
-
-            this.log(`Run workflow ${workflow.id} -----------------------------------`);
+        this.log(`Run workflow ${workflow.id} -----------------------------------`);
 
-            const schema = WorkflowRegistry.getByName(workflow.name);
-            const { eta, id, queued } = workflow;
-            const input = JSON.parse(workflow.input);
-            const instance = new (schema.type)({ input, eta, id, currentTime: DateTime.from(queued) }, this);
-            for (const iterator of schema.activities) {
-                instance[iterator] = bindStep(this, workflow, iterator, instance[iterator]);
-            }
-            for (const iterator of schema.uniqueActivities) {
-                instance[iterator] = bindStep(this, workflow, iterator, instance[iterator], true);
-            }
-            scope.add( schema.type, instance);
-            try {
-                const result = await instance.run();
-                workflow.output = JSON.stringify(result ?? 0);
-                workflow.state = "done";
-                workflow.eta = clock.utcNow.add(instance.preserveTime);
-            } catch (error) {
-                if (error instanceof ActivitySuspendedError) {
-                    // this will update last id...
-                    workflow.eta = clock.utcNow.add(error.ttl);
-                    workflow.lockedTTL = null;
-                    workflow.lockToken = null;
-                    await this.storage.save(workflow);
-                    return;
-                }
-                workflow.error = JSON.stringify(error.stack ?? error);
-                console.error(error);
-                workflow.state = "failed";
-                workflow.eta = clock.utcNow.add(instance.failedPreserveTime);
+        const schema = WorkflowRegistry.getByName(workflow.name);
+        const { eta, id, queued } = workflow;
+        const input = JSON.parse(workflow.input);
+        const instance = new (schema.type)({ input, eta, id, currentTime: DateTime.from(queued) }, this);
+        for (const iterator of schema.activities) {
+            instance[iterator] = bindStep(this, workflow, iterator, instance[iterator]);
+        }
+        for (const iterator of schema.uniqueActivities) {
+            instance[iterator] = bindStep(this, workflow, iterator, instance[iterator], true);
+        }
+        scope.add( schema.type, instance);
+        try {
+            const result = await instance.run();
+            workflow.output = JSON.stringify(result ?? 0);
+            workflow.state = "done";
+            workflow.eta = clock.utcNow.add(instance.preserveTime);
+        } catch (error) {
+            if (error instanceof ActivitySuspendedError) {
+                // this will update last id...
+                workflow.eta = clock.utcNow.add(error.ttl);
+                workflow.lockedTTL = null;
+                workflow.lockToken = null;
+                await this.storage.save(workflow);
+                return;
             }
+            workflow.error = JSON.stringify(error.stack ?? error);
+            console.error(error);
+            workflow.state = "failed";
+            workflow.eta = clock.utcNow.add(instance.failedPreserveTime);
+        }
 
-            // in case of child workflow...
-            // eta will be set to one year...
-            if (workflow.parentID) {
-                workflow.eta = clock.utcNow.addYears(1);
-                // since we have finished.. we should
-                // make parent's eta approach now sooner..
-            }
+        // in case of child workflow...
+        // eta will be set to one year...
+        if (workflow.parentID) {
+            workflow.eta = clock.utcNow.addYears(1);
+            // since we have finished.. we should
+            // make parent's eta approach now sooner..
+        }
 
-            workflow.lockedTTL = null;
-            workflow.lockToken = null;
-            await this.storage.save(workflow);
-
-            if (workflow.parentID) {
-                const parent = await this.storage.getWorkflow(workflow.parentID);
-                if (parent) {
-                    parent.lockTTL = null;
-                    parent.lockToken = null;
-                    parent.eta = clock.utcNow;
-                    await this.storage.save(parent);
-                }
+        workflow.lockedTTL = null;
+        workflow.lockToken = null;
+        await this.storage.save(workflow);
+
+        if (workflow.parentID) {
+            const parent = await this.storage.getWorkflow(workflow.parentID);
+            if (parent) {
+                parent.lockTTL = null;
+                parent.lockToken = null;
+                parent.eta = clock.utcNow;
+                await this.storage.save(parent);
             }
-            // workflow finished successfully...
-
-        } finally {
-            scope.dispose();
         }
+        // workflow finished successfully...
+
     }
 }

package/src/model/EntityQuery.ts

@@ -1,6 +1,6 @@
 import EntityAccessError from "../common/EntityAccessError.js";
 import Logger from "../common/Logger.js";
-import { DisposableScope } from "../common/usingAsync.js";
+import { AsyncDisposableScope } from "../common/usingAsync.js";
 import { ServiceProvider } from "../di/di.js";
 import { IDbReader } from "../drivers/base/BaseDriver.js";
 import EntityType from "../entity-query/EntityType.js";
@@ -91,7 +91,7 @@ export default class EntityQuery<T = any>
 
     async *enumerate(): AsyncGenerator<T, any, unknown> {
 
-        const scope = new DisposableScope();
+        await using scope = new AsyncDisposableScope();
         const session = this.context.logger?.newSession() ?? Logger.nullLogger;
         let query: { text: string, values: any[]};
         try {
@@ -131,8 +131,6 @@ export default class EntityQuery<T = any>
         } catch(error) {
             session.error(`Failed executing ${query?.text}\n${error.stack ?? error}`);
             throw error;
-        } finally {
-            await scope.dispose();
         }
     }
 
@@ -221,7 +219,7 @@ export default class EntityQuery<T = any>
 
         const nq = new EntityQuery({ ... this, selectStatement: select });
 
-        const scope = new DisposableScope();
+        await using scope = new AsyncDisposableScope();
         const session = this.context.logger?.newSession() ?? Logger.nullLogger;
         let query;
         try {
@@ -237,8 +235,6 @@ export default class EntityQuery<T = any>
         } catch (error) {
             session.error(`Failed executing ${query?.text}\r\n${error.stack ?? error}`);
             throw error;
-        } finally {
-            await scope.dispose();
         }
 
     }
@@ -262,7 +258,7 @@ export default class EntityQuery<T = any>
 
         const nq = new EntityQuery({ ... this, selectStatement: select });
 
-        const scope = new DisposableScope();
+        await using scope = new AsyncDisposableScope();
         const session = this.context.logger?.newSession() ?? Logger.nullLogger;
         let query;
         try {
@@ -278,8 +274,6 @@ export default class EntityQuery<T = any>
         } catch (error) {
             session.error(`Failed executing ${query?.text}\r\n${error.stack ?? error}`);
             throw error;
-        } finally {
-            await scope.dispose();
         }
 
     }

package/src/model/verification/VerificationSession.ts

@@ -158,15 +158,11 @@ export default class VerificationSession {
         const compiler = this.context.driver.compiler;
         const query = compiler.compileExpression(null, this.select);
         const logger = ServiceProvider.resolve(this.context, Logger);
-        const session = logger.newSession();
-        try {
-            const { rows: [ { error }]} = await this.context.connection.executeQuery(query);
-            if (error) {
-                session.error(`Failed executing ${query.text}\n[${query.values.join(",")}]\n${error?.stack ?? error}`);
-                EntityAccessError.throw(error);
-            }
-        } finally {
-            session.dispose();
+        using session = logger.newSession();
+        const { rows: [ { error }]} = await this.context.connection.executeQuery(query);
+        if (error) {
+            session.error(`Failed executing ${query.text}\n[${query.values.join(",")}]\n${error?.stack ?? error}`);
+            EntityAccessError.throw(error);
         }
     }
 

package/src/query/ast/ExpressionToSql.ts

@@ -1,5 +1,3 @@
-import EntityAccessError from "../../common/EntityAccessError.js";
-import { DisposableScope } from "../../common/usingAsync.js";
 import QueryCompiler from "../../compiler/QueryCompiler.js";
 import EntityType, { IEntityProperty } from "../../entity-query/EntityType.js";
 import EntityQuery from "../../model/EntityQuery.js";