@sqb/connect 4.5.0 → 4.5.2

package/cjs/client/sqb-client.js

@@ -52,7 +52,10 @@ class SqbClient extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict
         const poolFactory = {
             create: () => adapter.connect(cfg),
             destroy: instance => instance.close(),
-            reset: instance => instance.reset(),
+            reset: async (instance) => {
+                await this.emitAsyncSerial('connection-return').catch();
+                return instance.reset();
+            },
             validate: instance => instance.test()
         };
         this._pool = (0, lightning_pool_1.createPool)(poolFactory, poolOptions);

package/esm/client/sqb-client.d.ts

@@ -12,6 +12,7 @@ interface SqbClientEvents {
     close: () => void;
     acquire: (connection: SqbConnection) => Promise<void>;
     terminate: () => void;
+    'connection-return': () => Promise<void>;
 }
 declare const SqbClient_base: Type<import("strict-typed-events").TypedEventEmitter<any, SqbClientEvents, SqbClientEvents>>;
 export declare class SqbClient extends SqbClient_base {

package/esm/client/sqb-client.js

@@ -48,7 +48,10 @@ export class SqbClient extends TypedEventEmitterClass(AsyncEventEmitter) {
         const poolFactory = {
             create: () => adapter.connect(cfg),
             destroy: instance => instance.close(),
-            reset: instance => instance.reset(),
+            reset: async (instance) => {
+                await this.emitAsyncSerial('connection-return').catch();
+                return instance.reset();
+            },
             validate: instance => instance.test()
         };
         this._pool = createPool(poolFactory, poolOptions);

package/esm/orm/repository.class.d.ts

@@ -1,9 +1,9 @@
-import { DeepPartial, Type } from 'ts-gems';
+import { Type } from 'ts-gems';
 import { FieldInfoMap } from '../client/field-info-map.js';
 import { SqbClient } from '../client/sqb-client.js';
 import { SqbConnection } from '../client/sqb-connection.js';
 import { QueryRequest, TransactionFunction } from '../client/types.js';
-import { EntityData } from '../types.js';
+import { EntityInput, EntityOutput } from '../types.js';
 import { EntityMetadata } from './model/entity-metadata.js';
 export declare namespace Repository {
     type TransformRowFunction = (fields: FieldInfoMap, row: object, obj: object) => void;
@@ -75,23 +75,23 @@ export declare class Repository<T> extends Repository_base {
     constructor(entityDef: EntityMetadata, executor: SqbClient | SqbConnection, schema?: string);
     get entity(): EntityMetadata;
     get type(): Type<T>;
-    create(values: EntityData<T>, options?: Repository.CreateOptions): Promise<DeepPartial<T>>;
-    createOnly(values: EntityData<T>, options?: Repository.CreateOptions): Promise<void>;
+    create(values: EntityInput<T>, options?: Repository.CreateOptions): Promise<EntityOutput<T>>;
+    createOnly(values: EntityInput<T>, options?: Repository.CreateOptions): Promise<void>;
     exists(keyValue: any | Record<string, any>, options?: Repository.ExistsOptions): Promise<boolean>;
     count(options?: Repository.CountOptions): Promise<number>;
-    findAll(options?: Repository.FindAllOptions): Promise<DeepPartial<T>[]>;
-    findOne(options?: Repository.FindOneOptions): Promise<DeepPartial<T> | undefined>;
-    findByPk(keyValue: any | Record<string, any>, options?: Repository.GetOptions): Promise<DeepPartial<T> | undefined>;
+    findAll(options?: Repository.FindAllOptions): Promise<EntityOutput<T>[]>;
+    findOne(options?: Repository.FindOneOptions): Promise<EntityOutput<T> | undefined>;
+    findByPk(keyValue: any | Record<string, any>, options?: Repository.GetOptions): Promise<EntityOutput<T> | undefined>;
     destroy(keyValue: any | Record<string, any>, options?: Repository.DestroyOptions): Promise<boolean>;
     destroyAll(options?: Repository.DestroyOptions): Promise<number>;
-    update(keyValue: any | Record<string, any>, values: EntityData<T>, options?: Repository.UpdateOptions): Promise<DeepPartial<T> | undefined>;
-    updateOnly(keyValue: any | Record<string, any>, values: EntityData<T>, options?: Repository.UpdateOptions): Promise<DeepPartial<T>>;
-    updateAll(values: EntityData<T>, options?: Repository.UpdateAllOptions): Promise<number>;
+    update(keyValue: any | Record<string, any>, values: EntityInput<T>, options?: Repository.UpdateOptions): Promise<EntityOutput<T> | undefined>;
+    updateOnly(keyValue: any | Record<string, any>, values: EntityInput<T>, options?: Repository.UpdateOptions): Promise<EntityOutput<T>>;
+    updateAll(values: EntityInput<T>, options?: Repository.UpdateAllOptions): Promise<number>;
     protected _execute(fn: TransactionFunction, opts?: Repository.CommandOptions): Promise<any>;
-    protected _create(values: EntityData<T>, options: Repository.CreateOptions & {
+    protected _create(values: EntityInput<T>, options: Repository.CreateOptions & {
         connection: SqbConnection;
-    }): Promise<DeepPartial<T>>;
-    protected _createOnly(values: EntityData<T>, options: Repository.CreateOptions & {
+    }): Promise<EntityOutput<T>>;
+    protected _createOnly(values: EntityInput<T>, options: Repository.CreateOptions & {
         connection: SqbConnection;
     }): Promise<void>;
     protected _exists(keyValue: any | Record<string, any>, options: Repository.ExistsOptions & {
@@ -102,23 +102,23 @@ export declare class Repository<T> extends Repository_base {
     }): Promise<number>;
     protected _findAll(options: Repository.FindAllOptions & {
         connection: SqbConnection;
-    }): Promise<DeepPartial<T>[]>;
+    }): Promise<EntityOutput<T>[]>;
     protected _findOne(options: Repository.FindOneOptions & {
         connection: SqbConnection;
-    }): Promise<DeepPartial<T> | undefined>;
+    }): Promise<EntityOutput<T> | undefined>;
     protected _findByPk(keyValue: any | Record<string, any>, options: Repository.GetOptions & {
         connection: SqbConnection;
-    }): Promise<DeepPartial<T> | undefined>;
+    }): Promise<EntityOutput<T> | undefined>;
     protected _destroy(keyValue: any | Record<string, any>, options: Repository.DestroyOptions & {
         connection: SqbConnection;
     }): Promise<boolean>;
     protected _destroyAll(options: Repository.DestroyOptions & {
         connection: SqbConnection;
     }): Promise<number>;
-    protected _update(keyValue: any | Record<string, any>, values: EntityData<T>, options: Repository.UpdateOptions & {
+    protected _update(keyValue: any | Record<string, any>, values: EntityInput<T>, options: Repository.UpdateOptions & {
         connection: SqbConnection;
     }): Promise<Record<string, any> | undefined>;
-    protected _updateAll(values: EntityData<T>, options: Repository.UpdateAllOptions & {
+    protected _updateAll(values: EntityInput<T>, options: Repository.UpdateAllOptions & {
         connection: SqbConnection;
     }): Promise<number>;
     protected _emit(event: string, ...args: any[]): Promise<void>;

package/esm/types.d.ts

@@ -1,7 +1,8 @@
 import { Builtin, DeepPickWritable } from 'ts-gems';
-export declare type EntityData<T> = DeepNullableIfPartial<DeepPickWritable<T>>;
+export declare type EntityInput<T> = DeepNullableIfPartial<DeepPickWritable<T>>;
+export declare type EntityOutput<T> = DeepNullableIfPartial<T>;
 export declare type DeepNullableIfPartial<T> = _DeepNullableIfPartial<T>;
 declare type _DeepNullableIfPartial<T> = T extends Builtin ? T : T extends Promise<infer U> ? Promise<DeepNullableIfPartial<U>> : T extends (infer U)[] ? DeepNullableIfPartial<U>[] : {
-    [P in keyof T]?: DeepNullableIfPartial<Exclude<T[P], undefined> | null>;
+    [P in keyof T]?: DeepNullableIfPartial<Exclude<T[P], undefined>> | null;
 };
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/connect",
   "description": "Multi-dialect database connection framework written with TypeScript",
-  "version": "4.5.0",
+  "version": "4.5.2",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "debug": "^4.3.4",
-    "lightning-pool": "^3.1.4",
+    "lightning-pool": "^4.0.0",
     "lodash": "^4.17.21",
     "putil-isplainobject": "^1.1.4",
     "putil-merge": "^3.8.0",
@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/lodash": "^4.14.184"
+    "@types/lodash": "^4.14.185"
   },
   "peerDependencies": {
     "@sqb/builder": "^4.5.0"