@sqb/connect 4.8.0 → 4.9.0

package/cjs/client/cursor.js

@@ -4,7 +4,7 @@ exports.Cursor = void 0;
 const tslib_1 = require("tslib");
 const debug_1 = tslib_1.__importDefault(require("debug"));
 const doublylinked_1 = tslib_1.__importDefault(require("doublylinked"));
-const putil_taskqueue_1 = tslib_1.__importDefault(require("putil-taskqueue"));
+const power_tasks_1 = require("power-tasks");
 const putil_varhelpers_1 = require("putil-varhelpers");
 const strict_typed_events_1 = require("strict-typed-events");
 const cursor_stream_js_1 = require("./cursor-stream.js");
@@ -16,7 +16,7 @@ class Cursor extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_ty
     _prefetchRows;
     _request;
     _intlcur;
-    _taskQueue = new putil_taskqueue_1.default();
+    _taskQueue = new power_tasks_1.TaskQueue();
     _fetchCache = new doublylinked_1.default();
     _rowNum = 0;
     _fetchedAll = false;
@@ -219,7 +219,7 @@ class Cursor extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_ty
                     return;
                 await _this._fetchRows();
             }
-        });
+        }).toPromise();
         if (!silent)
             this.emit('move', this.row, this._rowNum);
         return this._rowNum;

package/cjs/client/sqb-connection.js

@@ -4,7 +4,7 @@ exports.SqbConnection = void 0;
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const debug_1 = tslib_1.__importDefault(require("debug"));
-const putil_taskqueue_1 = tslib_1.__importDefault(require("putil-taskqueue"));
+const power_tasks_1 = require("power-tasks");
 const putil_varhelpers_1 = require("putil-varhelpers");
 const strict_typed_events_1 = require("strict-typed-events");
 const builder_1 = require("@sqb/builder");
@@ -16,7 +16,7 @@ const debug = (0, debug_1.default)('sqb:connection');
 class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_typed_events_1.AsyncEventEmitter) {
     client;
     _intlcon;
-    _tasks = new putil_taskqueue_1.default();
+    _tasks = new power_tasks_1.TaskQueue();
     _options;
     _inTransaction = false;
     _refCount = 1;
@@ -90,7 +90,7 @@ class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(st
     async execute(query, options) {
         if (!this._intlcon)
             throw new Error(`Can't execute query, because connection is released`);
-        return this._tasks.enqueue(() => this._execute(query, options));
+        return this._tasks.enqueue(() => this._execute(query, options)).toPromise();
     }
     getRepository(entity, opts) {
         let ctor;
@@ -264,9 +264,11 @@ class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(st
             if (query.listenerCount('fetch'))
                 request.fetchHooks = query.listeners('fetch');
         }
-        else if (typeof query === 'string') {
-            request.sql = query;
-            request.params = options.params;
+        else { // noinspection SuspiciousTypeOfGuard
+            if (typeof query === 'string') {
+                request.sql = query;
+                request.params = options.params;
+            }
         }
         // @ts-ignore
         if (!request.sql)

package/cjs/orm/repository.class.js

@@ -81,19 +81,19 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
     update(keyValue, values, options) {
         return this._execute(async (connection) => {
             const opts = { ...options, connection };
-            const keyValues = await this._updateByPk(keyValue, values, opts);
+            const keyValues = await this._update(keyValue, values, opts);
             if (keyValues)
                 return this._find(keyValues, opts);
         }, options);
     }
     updateOnly(keyValue, values, options) {
         return this._execute(async (connection) => {
-            return !!(await this._updateByPk(keyValue, values, { ...options, connection }));
+            return !!(await this._update(keyValue, values, { ...options, connection }));
         }, options);
     }
     updateMany(values, options) {
         return this._execute(async (connection) => {
-            return this._updateAll(values, { ...options, connection });
+            return this._updateMany(values, { ...options, connection });
         });
     }
     /**
@@ -217,7 +217,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
             params: options?.params
         });
     }
-    async _updateByPk(keyValue, values, options) {
+    async _update(keyValue, values, options) {
         if (!values)
             throw new TypeError('You must provide values');
         const keyValues = (0, extract_keyvalues_js_1.extractKeyValues)(this._entity, keyValue, true);
@@ -238,7 +238,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
         });
         return rowsAffected ? keyValues : undefined;
     }
-    async _updateAll(values, options) {
+    async _updateMany(values, options) {
         if (!values)
             throw new TypeError('You must provide values');
         return await update_command_js_1.UpdateCommand.execute({

package/esm/client/cursor.js

@@ -1,6 +1,6 @@
 import _debug from 'debug';
 import DoublyLinked from 'doublylinked';
-import TaskQueue from 'putil-taskqueue';
+import { TaskQueue } from 'power-tasks';
 import { coerceToInt } from 'putil-varhelpers';
 import { AsyncEventEmitter, TypedEventEmitterClass } from 'strict-typed-events';
 import { CursorStream } from './cursor-stream.js';
@@ -215,7 +215,7 @@ export class Cursor extends TypedEventEmitterClass(AsyncEventEmitter) {
                     return;
                 await _this._fetchRows();
             }
-        });
+        }).toPromise();
         if (!silent)
             this.emit('move', this.row, this._rowNum);
         return this._rowNum;

package/esm/client/sqb-connection.js

@@ -1,6 +1,6 @@
 import assert from 'assert';
 import _debug from 'debug';
-import TaskQueue from 'putil-taskqueue';
+import { TaskQueue } from 'power-tasks';
 import { coalesce, coerceToBoolean, coerceToInt, coerceToString } from "putil-varhelpers";
 import { AsyncEventEmitter, TypedEventEmitterClass } from 'strict-typed-events';
 import { classes } from '@sqb/builder';
@@ -86,7 +86,7 @@ export class SqbConnection extends TypedEventEmitterClass(AsyncEventEmitter) {
     async execute(query, options) {
         if (!this._intlcon)
             throw new Error(`Can't execute query, because connection is released`);
-        return this._tasks.enqueue(() => this._execute(query, options));
+        return this._tasks.enqueue(() => this._execute(query, options)).toPromise();
     }
     getRepository(entity, opts) {
         let ctor;
@@ -260,9 +260,11 @@ export class SqbConnection extends TypedEventEmitterClass(AsyncEventEmitter) {
             if (query.listenerCount('fetch'))
                 request.fetchHooks = query.listeners('fetch');
         }
-        else if (typeof query === 'string') {
-            request.sql = query;
-            request.params = options.params;
+        else { // noinspection SuspiciousTypeOfGuard
+            if (typeof query === 'string') {
+                request.sql = query;
+                request.params = options.params;
+            }
         }
         // @ts-ignore
         if (!request.sql)

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

@@ -130,10 +130,10 @@ export declare class Repository<T> extends Repository_base {
     protected _deleteMany(options: Repository.DeleteManyOptions & {
         connection: SqbConnection;
     }): Promise<number>;
-    protected _updateByPk(keyValue: any | Record<string, any>, values: EntityInput<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: EntityInput<T>, options: Repository.UpdateManyOptions & {
+    protected _updateMany(values: EntityInput<T>, options: Repository.UpdateManyOptions & {
         connection: SqbConnection;
     }): Promise<number>;
 }

package/esm/orm/repository.class.js

@@ -78,19 +78,19 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
     update(keyValue, values, options) {
         return this._execute(async (connection) => {
             const opts = { ...options, connection };
-            const keyValues = await this._updateByPk(keyValue, values, opts);
+            const keyValues = await this._update(keyValue, values, opts);
             if (keyValues)
                 return this._find(keyValues, opts);
         }, options);
     }
     updateOnly(keyValue, values, options) {
         return this._execute(async (connection) => {
-            return !!(await this._updateByPk(keyValue, values, { ...options, connection }));
+            return !!(await this._update(keyValue, values, { ...options, connection }));
         }, options);
     }
     updateMany(values, options) {
         return this._execute(async (connection) => {
-            return this._updateAll(values, { ...options, connection });
+            return this._updateMany(values, { ...options, connection });
         });
     }
     /**
@@ -214,7 +214,7 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
             params: options?.params
         });
     }
-    async _updateByPk(keyValue, values, options) {
+    async _update(keyValue, values, options) {
         if (!values)
             throw new TypeError('You must provide values');
         const keyValues = extractKeyValues(this._entity, keyValue, true);
@@ -235,7 +235,7 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
         });
         return rowsAffected ? keyValues : undefined;
     }
-    async _updateAll(values, options) {
+    async _updateMany(values, options) {
         if (!values)
             throw new TypeError('You must provide values');
         return await UpdateCommand.execute({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/connect",
   "description": "Multi-dialect database connection framework written with TypeScript",
-  "version": "4.8.0",
+  "version": "4.9.0",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>",
@@ -32,10 +32,10 @@
     "debug": "^4.3.4",
     "lightning-pool": "^4.2.1",
     "lodash": "^4.17.21",
+    "power-tasks": "^1.6.4",
     "putil-isplainobject": "^1.1.5",
     "putil-merge": "^3.10.3",
     "putil-promisify": "^1.10.0",
-    "putil-taskqueue": "^2.5.5",
     "putil-varhelpers": "^1.6.5",
     "reflect-metadata": "^0.1.13",
     "strict-typed-events": "^2.3.1",
@@ -46,7 +46,7 @@
     "@types/lodash": "^4.14.194"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.8.0"
+    "@sqb/builder": "^4.9.0"
   },
   "type": "module",
   "types": "esm/index.d.ts",