@sqb/connect 5.0.4 → 5.0.5

package/client/sqb-connection.js

@@ -1,4 +1,4 @@
-import { Query } from '@sqb/builder';
+import { isQuery, Query } from '@sqb/builder';
 import assert from 'assert';
 import _debug from 'debug';
 import { TaskQueue } from 'power-tasks';
@@ -87,7 +87,22 @@ 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)).toPromise();
+        try {
+            return await this._tasks
+                .enqueue(() => this._execute(query, options))
+                .toPromise();
+        }
+        catch (err) {
+            if (err.stack)
+                err.stack = err.stack
+                    .split('\n')
+                    .filter((line) => !(line.includes('/power-tasks/') ||
+                    line.includes(':internal') ||
+                    line.includes('Task._executeFn') ||
+                    line.includes('SqbConnection._')))
+                    .join('\n');
+            throw err;
+        }
     }
     getRepository(entity, opts) {
         let ctor;
@@ -253,7 +268,7 @@ export class SqbConnection extends TypedEventEmitterClass(AsyncEventEmitter) {
             fetchAsString: options.fetchAsString,
         };
         request.ignoreNulls = request.ignoreNulls && request.objectRows;
-        if (query instanceof Query) {
+        if (isQuery(query)) {
             if (this._intlcon.onGenerateQuery)
                 this._intlcon.onGenerateQuery(request, query);
             const q = query.generate({

package/orm/commands/find.command.js

@@ -1,4 +1,5 @@
 import { And, In, Param, Select, TableName } from '@sqb/builder';
+import { isAssociationNode } from '../../type-guards.js';
 import { AssociationNode } from '../model/association-node.js';
 import { EntityMetadata } from '../model/entity-metadata.js';
 import { isAssociationField, isColumnField, isEmbeddedField, resolveEntityForEmbeddedField, } from '../util/orm.helper.js';
@@ -26,7 +27,7 @@ export class FindCommand {
     static async create(source, opts = {}) {
         let command;
         let listingEntity;
-        if (source instanceof AssociationNode) {
+        if (isAssociationNode(source)) {
             const node = source;
             listingEntity = await node.resolveTarget();
             const resultEntity = await node.getLast().resolveTarget();

package/orm/commands/update.command.js

@@ -1,4 +1,4 @@
-import { And, Param, SqlElement, TableName, Update } from '@sqb/builder';
+import { And, isSqlElement, Param, TableName, Update } from '@sqb/builder';
 import { EntityMetadata } from '../model/entity-metadata.js';
 import { checkEnumValue, isColumnField, isEmbeddedField, resolveEntityForEmbeddedField, } from '../util/orm.helper.js';
 import { prepareFilter } from './command.helper.js';
@@ -63,7 +63,7 @@ export class UpdateCommand {
                 if (col.noUpdate)
                     continue;
                 const fieldName = prefix + col.fieldName + suffix;
-                if (v instanceof SqlElement) {
+                if (isSqlElement(v)) {
                     ctx.queryValues[fieldName] = v;
                     continue;
                 }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@sqb/connect",
   "description": "Multi-dialect database connection framework written with TypeScript",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "author": "Panates",
   "license": "Apache-2.0",
   "dependencies": {
-    "@jsopen/objects": "^2.2.2",
+    "@jsopen/objects": "^2.2.3",
     "debug": "^4.4.3",
     "doublylinked": "^2.5.6",
     "fast-tokenizer": "^1.9.0",
@@ -21,7 +21,7 @@
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@sqb/builder": "^5.0.4",
+    "@sqb/builder": "^5.0.5",
     "reflect-metadata": "^0.2.2"
   },
   "type": "module",

package/type-guards.d.ts

@@ -0,0 +1,2 @@
+import { AssociationNode } from './orm/model/association-node.js';
+export declare function isAssociationNode(v: any): v is AssociationNode;

package/type-guards.js

@@ -0,0 +1,9 @@
+import { AssociationNode } from './orm/model/association-node.js';
+export function isAssociationNode(v) {
+    if (!(v && typeof v === 'object'))
+        return false;
+    const proto = Object.getPrototypeOf(v);
+    return (typeof proto.getFirst === 'function' &&
+        typeof proto.getLast === 'function' &&
+        typeof proto.returnsMany === 'function');
+}