@sqb/connect 4.11.3 → 4.12.0

package/cjs/orm/model/association.js

@@ -81,8 +81,7 @@ class Association {
             if (this.many) {
                 if (!sourceKey) {
                     const primaryIndexColumns = entity_metadata_js_1.EntityMetadata.getPrimaryIndexColumns(source);
-                    sourceKey = primaryIndexColumns && primaryIndexColumns.length === 1 ?
-                        primaryIndexColumns[0].name : 'id';
+                    sourceKey = primaryIndexColumns && primaryIndexColumns.length === 1 ? primaryIndexColumns[0].name : 'id';
                 }
                 if (!targetKey && sourceKey) {
                     // snake-case
@@ -95,8 +94,7 @@ class Association {
             else {
                 if (!targetKey) {
                     const primaryIndexColumns = entity_metadata_js_1.EntityMetadata.getPrimaryIndexColumns(target);
-                    targetKey = primaryIndexColumns && primaryIndexColumns.length === 1 ?
-                        primaryIndexColumns[0].name : 'id';
+                    targetKey = primaryIndexColumns && primaryIndexColumns.length === 1 ? primaryIndexColumns[0].name : 'id';
                 }
                 if (!sourceKey && targetKey) {
                     // snake-case

package/cjs/orm/model/column-field-metadata.js

@@ -10,7 +10,7 @@ var ColumnFieldMetadata;
             kind: 'column',
             entity,
             name,
-            fieldName: name
+            fieldName: name,
         };
         if (options)
             ColumnFieldMetadata.assign(result, options);

package/cjs/orm/model/embedded-field-metadata.js

@@ -9,7 +9,7 @@ var EmbeddedFieldMetadata;
             kind: 'object',
             entity,
             name,
-            type
+            type,
         };
         if (options?.fieldNamePrefix)
             result.fieldNamePrefix = options.fieldNamePrefix;

package/cjs/orm/model/entity-metadata.js

@@ -21,7 +21,7 @@ var EntityMetadata;
             fields: {},
             indexes: [],
             foreignKeys: [],
-            eventListeners: {}
+            eventListeners: {},
         };
         Reflect.defineMetadata(orm_const_js_1.ENTITY_METADATA_KEY, meta, ctor);
         // Merge base entity columns into this one
@@ -93,7 +93,7 @@ var EntityMetadata;
                 enumerable: false,
                 configurable: true,
                 writable: true,
-                value: Object.values(entity.fields).map(m => m.name)
+                value: Object.values(entity.fields).map(m => m.name),
             });
         return entity._fieldNames;
     }
@@ -144,7 +144,7 @@ var EntityMetadata;
         if (!src.foreignKeys)
             return;
         for (const f of src.foreignKeys) {
-            if (await f.resolveTarget() === trg)
+            if ((await f.resolveTarget()) === trg)
                 return f;
         }
     }
@@ -153,7 +153,7 @@ var EntityMetadata;
         entity.indexes = entity.indexes || [];
         index = {
             ...index,
-            columns: Array.isArray(index.columns) ? index.columns : [index.columns]
+            columns: Array.isArray(index.columns) ? index.columns : [index.columns],
         };
         if (index.primary)
             entity.indexes.forEach(idx => delete idx.primary);
@@ -166,7 +166,7 @@ var EntityMetadata;
             source: entity.ctor,
             sourceKey: propertyKey,
             target,
-            targetKey
+            targetKey,
         });
         entity.foreignKeys.push(fk);
     }
@@ -255,7 +255,7 @@ var EntityMetadata;
         let l = association;
         let i = 1;
         while (l) {
-            l.name = entity.name + '.' + propertyKey + '#' + (i++);
+            l.name = entity.name + '.' + propertyKey + '#' + i++;
             l = l.next;
         }
         entity.fields[propertyKey.toLowerCase()] = prop;
@@ -267,7 +267,7 @@ var EntityMetadata;
             ...options,
             columns: Array.isArray(column) ? column : [column],
             unique: true,
-            primary: true
+            primary: true,
         });
     }
     EntityMetadata.setPrimaryKeys = setPrimaryKeys;

package/cjs/orm/model/link-chain.js

@@ -10,7 +10,7 @@ class LinkChain {
             target,
             source: null,
             sourceKey,
-            targetKey: targetKey
+            targetKey: targetKey,
         });
     }
     where(conditions) {
@@ -33,7 +33,7 @@ class LinkChain {
             source: this.current.target,
             target,
             sourceKey: parentKey,
-            targetKey: targetKey
+            targetKey: targetKey,
         });
         child.prior = this.current;
         this.current.next = child;

package/cjs/orm/repository.class.js

@@ -25,8 +25,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
     create(values, options) {
         return this._execute(async (connection) => {
             const keyValue = await this._create(values, { ...options, connection, returning: true });
-            const result = keyValue &&
-                await this._find(keyValue, { ...options, connection });
+            const result = keyValue && (await this._find(keyValue, { ...options, connection }));
             if (!result)
                 throw new Error('Unable to insert new row');
             return result;
@@ -119,7 +118,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
         const keyValues = await create_command_js_1.CreateCommand.execute({
             ...options,
             entity: this._entity,
-            values
+            values,
         });
         if (options.returning && !keyValues)
             throw new Error('Unable to insert new row');
@@ -136,13 +135,13 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
         return !!(await count_command_js_1.CountCommand.execute({
             ...options,
             filter,
-            entity: this._entity
+            entity: this._entity,
         }));
     }
     async _count(options) {
         return count_command_js_1.CountCommand.execute({
             ...options,
-            entity: this._entity
+            entity: this._entity,
         });
     }
     async _findMany(options) {
@@ -154,7 +153,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
     async _findOne(options) {
         const rows = await this._findMany({
             ...options,
-            limit: 1
+            limit: 1,
         });
         return rows && rows[0];
     }
@@ -187,7 +186,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
             ...options,
             entity: this._entity,
             filter: options?.filter,
-            params: options?.params
+            params: options?.params,
         });
     }
     async _update(keyValue, values, options) {
@@ -207,7 +206,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
             ...options,
             entity: this._entity,
             values: updateValues,
-            filter
+            filter,
         });
         return rowsAffected ? keyValues : undefined;
     }
@@ -217,7 +216,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
         return await update_command_js_1.UpdateCommand.execute({
             ...options,
             entity: this._entity,
-            values
+            values,
         });
     }
 }

package/cjs/orm/util/apply-mixins.js

@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyMixins = void 0;
 function applyMixins(derivedCtor, baseCtor, filter) {
     for (const name of Object.getOwnPropertyNames(baseCtor.prototype)) {
-        if ((name === 'constructor' || name === '__proto__' || name === 'toJSON' || name === 'toString') ||
-            filter && !filter(name))
+        if (name === 'constructor' ||
+            name === '__proto__' ||
+            name === 'toJSON' ||
+            name === 'toString' ||
+            (filter && !filter(name)))
             continue;
-        Object.defineProperty(derivedCtor.prototype, name, Object.getOwnPropertyDescriptor(baseCtor.prototype, name) ||
-            Object.create(null));
+        Object.defineProperty(derivedCtor.prototype, name, Object.getOwnPropertyDescriptor(baseCtor.prototype, name) || Object.create(null));
     }
 }
 exports.applyMixins = applyMixins;

package/cjs/orm/util/extract-keyvalues.js

@@ -7,7 +7,7 @@ function extractKeyValues(entityDef, valueOrInstance, keepOther) {
     const primaryIndex = entity_metadata_js_1.EntityMetadata.getPrimaryIndex(entityDef);
     if (!primaryIndex)
         throw new Error(`No primary fields defined for "${entityDef.name}" entity`);
-    const validateCol = (k) => {
+    const validateCol = k => {
         const col = entity_metadata_js_1.EntityMetadata.getField(entityDef, k);
         if (!col)
             throw new Error(`Unknown column (${k}) defined as primary key in entity "${entityDef.name}"`);

package/cjs/orm/util/serialize-field.js

@@ -21,19 +21,19 @@ const padZero = (n) => (n < 9 ? '0' : '') + n;
 function serializeDataValue(dataType, v) {
     if (v == null)
         return;
-    if (v instanceof Date &&
-        (dataType === builder_1.DataType.DATE || dataType === builder_1.DataType.TIMESTAMP)) {
-        return v.getFullYear() + '-' +
-            padZero(v.getMonth() + 1) + '-' +
-            padZero(v.getDate()) + (dataType === builder_1.DataType.TIMESTAMP ?
-            'T' + padZero(v.getHours()) + ':' +
-                padZero(v.getMinutes()) + ':' +
-                padZero(v.getSeconds()) : '');
+    if (v instanceof Date && (dataType === builder_1.DataType.DATE || dataType === builder_1.DataType.TIMESTAMP)) {
+        return (v.getFullYear() +
+            '-' +
+            padZero(v.getMonth() + 1) +
+            '-' +
+            padZero(v.getDate()) +
+            (dataType === builder_1.DataType.TIMESTAMP
+                ? 'T' + padZero(v.getHours()) + ':' + padZero(v.getMinutes()) + ':' + padZero(v.getSeconds())
+                : ''));
     }
     if (v instanceof Buffer)
         return v.toString('base64');
-    if (typeof v === 'number' && (dataType === builder_1.DataType.SMALLINT ||
-        dataType === builder_1.DataType.INTEGER))
+    if (typeof v === 'number' && (dataType === builder_1.DataType.SMALLINT || dataType === builder_1.DataType.INTEGER))
         return Math.trunc(v);
     if (typeof v === 'bigint')
         return v.toString();

package/esm/client/cursor-stream.js

@@ -14,7 +14,7 @@ export class CursorStream extends Readable {
             this.close().catch(() => false);
         });
         cursor.once('close', () => this.emit('close'));
-        cursor.on('error', (err) => this.emit('error', err));
+        cursor.on('error', err => this.emit('error', err));
     }
     /**
      * Returns if stream is closed.
@@ -43,7 +43,9 @@ export class CursorStream extends Readable {
             this.emit('end');
             return;
         }
-        this._cursor.next().then(row => {
+        this._cursor
+            .next()
+            .then(row => {
             if (this._eof)
                 return this.push(null);
             let buf = '';
@@ -70,7 +72,8 @@ export class CursorStream extends Readable {
                     buf += ',';
                 this.push(buf + JSON.stringify(row));
             }
-        }).catch(err => {
+        })
+            .catch(err => {
             /* istanbul ignore next */
             if (typeof this.destroy == 'function')
                 this.destroy(err);

package/esm/client/cursor.js

@@ -175,7 +175,8 @@ export class Cursor extends TypedEventEmitterClass(AsyncEventEmitter) {
         if (step < 0 && !this._cache)
             throw new Error('To move cursor back, it needs cache to be enabled');
         const _this = this;
-        await this._taskQueue.enqueue(async function () {
+        await this._taskQueue
+            .enqueue(async function () {
             /* If moving backward */
             if (step < 0) {
                 /* Seek cache */
@@ -208,7 +209,8 @@ export class Cursor extends TypedEventEmitterClass(AsyncEventEmitter) {
                     return;
                 await _this._fetchRows();
             }
-        }).toPromise();
+        })
+            .toPromise();
         if (!silent)
             this.emit('move', this.row, this._rowNum);
         return this._rowNum;
@@ -223,12 +225,12 @@ export class Cursor extends TypedEventEmitterClass(AsyncEventEmitter) {
         if (rows && rows.length) {
             debug('Fetched %d rows from database', rows.length);
             // Normalize rows
-            rows = this._request.objectRows ?
-                normalizeRowsToObjectRows(this._fields, this._intlcur.rowType, rows, this._request) :
-                normalizeRowsToArrayRows(this._fields, this._intlcur.rowType, rows, this._request);
+            rows = this._request.objectRows
+                ? normalizeRowsToObjectRows(this._fields, this._intlcur.rowType, rows, this._request)
+                : normalizeRowsToArrayRows(this._fields, this._intlcur.rowType, rows, this._request);
             callFetchHooks(rows, this._request);
             for (const [idx, row] of rows.entries()) {
-                this.emit('fetch', row, (this._rowNum + idx + 1));
+                this.emit('fetch', row, this._rowNum + idx + 1);
             }
             /* Add rows to cache */
             if (this._cache) {

package/esm/client/field-info-map.js

@@ -4,13 +4,13 @@ export class FieldInfoMap {
             enumerable: false,
             configurable: false,
             writable: true,
-            value: {}
+            value: {},
         });
         Object.defineProperty(this, '_arr', {
             enumerable: false,
             configurable: false,
             writable: true,
-            value: []
+            value: [],
         });
     }
     add(field) {
@@ -25,7 +25,7 @@ export class FieldInfoMap {
             enumerable: false,
             configurable: false,
             writable: true,
-            value: _obj
+            value: _obj,
         });
     }
     get(k) {

package/esm/client/helpers.js

@@ -1,4 +1,4 @@
-import { camelCase, pascalCase } from "putil-varhelpers";
+import { camelCase, pascalCase } from 'putil-varhelpers';
 import { FieldInfoMap } from './field-info-map.js';
 export function applyNamingStrategy(value, namingStrategy) {
     if (typeof namingStrategy === 'string' && namingStrategy !== 'original') {

package/esm/client/sqb-client.js

@@ -46,7 +46,7 @@ export class SqbClient extends TypedEventEmitterClass(AsyncEventEmitter) {
             create: () => adapter.connect(cfg),
             destroy: instance => instance.close(),
             reset: async (instance) => instance.reset(),
-            validate: instance => instance.test()
+            validate: instance => instance.test(),
         };
         this._pool = createPool(poolFactory, poolOptions);
         this._pool.on('closing', () => this.emit('closing'));
@@ -155,8 +155,7 @@ export class SqbClient extends TypedEventEmitterClass(AsyncEventEmitter) {
         return this._entities[name];
     }
     toString() {
-        return '[object ' + Object.getPrototypeOf(this).constructor.name + '(' +
-            this.dialect + ')]';
+        return '[object ' + Object.getPrototypeOf(this).constructor.name + '(' + this.dialect + ')]';
     }
     [inspect]() {
         return this.toString();

package/esm/client/sqb-connection.js

@@ -1,7 +1,7 @@
 import assert from 'assert';
 import _debug from 'debug';
 import { TaskQueue } from 'power-tasks';
-import { coalesce, coerceToBoolean, coerceToInt, coerceToString } from "putil-varhelpers";
+import { coalesce, coerceToBoolean, coerceToInt, coerceToString } from 'putil-varhelpers';
 import { AsyncEventEmitter, TypedEventEmitterClass } from 'strict-typed-events';
 import { classes } from '@sqb/builder';
 import { EntityMetadata } from '../orm/model/entity-metadata.js';
@@ -74,7 +74,7 @@ export class SqbConnection extends TypedEventEmitterClass(AsyncEventEmitter) {
         await this.emitAsyncSerial('close');
         const intlcon = this._intlcon;
         this._intlcon = undefined;
-        this.client.pool.release(intlcon, (e) => {
+        this.client.pool.release(intlcon, e => {
             if (e)
                 this.client.emit('error', e);
         });
@@ -131,7 +131,7 @@ export class SqbConnection extends TypedEventEmitterClass(AsyncEventEmitter) {
             if (!response)
                 throw new Error('Database adapter returned an empty response');
             const result = {
-                executeTime: Date.now() - startTime
+                executeTime: Date.now() - startTime,
             };
             if (request.showSql)
                 result.query = request;
@@ -143,13 +143,13 @@ export class SqbConnection extends TypedEventEmitterClass(AsyncEventEmitter) {
                 result.fields = wrapAdapterFields(response.fields, request.fieldNaming);
                 result.rowType = response.rowType;
                 if (response.rows) {
-                    result.rows = request.objectRows ?
-                        normalizeRowsToObjectRows(result.fields, response.rowType, response.rows, request) :
-                        normalizeRowsToArrayRows(result.fields, response.rowType, response.rows, request);
+                    result.rows = request.objectRows
+                        ? normalizeRowsToObjectRows(result.fields, response.rowType, response.rows, request)
+                        : normalizeRowsToArrayRows(result.fields, response.rowType, response.rows, request);
                     callFetchHooks(result.rows, request);
                 }
                 else if (response.cursor) {
-                    const cursor = result.cursor = new Cursor(this, result.fields, response.cursor, request);
+                    const cursor = (result.cursor = new Cursor(this, result.fields, response.cursor, request));
                     const hook = () => cursor.close();
                     cursor.once('close', () => this.off('close', hook));
                     this.on('close', hook);
@@ -222,8 +222,9 @@ export class SqbConnection extends TypedEventEmitterClass(AsyncEventEmitter) {
         const request = {
             dialect: this.client.dialect,
             sql: '',
-            autoCommit: this.inTransaction ? false :
-                coerceToBoolean(coalesce(options.autoCommit, this._options?.autoCommit, defaults.autoCommit), true),
+            autoCommit: this.inTransaction
+                ? false
+                : coerceToBoolean(coalesce(options.autoCommit, this._options?.autoCommit, defaults.autoCommit), true),
             cursor: coerceToBoolean(coalesce(options.cursor, defaults.cursor), false),
             objectRows: coerceToBoolean(coalesce(options.objectRows, defaults.objectRows), true),
             ignoreNulls: coerceToBoolean(coalesce(options.ignoreNulls, defaults.ignoreNulls), false),
@@ -233,19 +234,18 @@ export class SqbConnection extends TypedEventEmitterClass(AsyncEventEmitter) {
             showSql: coerceToBoolean(coalesce(options.showSql, defaults.showSql), false),
             prettyPrint: coerceToBoolean(coalesce(options.prettyPrint, defaults.prettyPrint), false),
             action: coerceToString(options.action),
-            fetchAsString: options.fetchAsString
+            fetchAsString: options.fetchAsString,
         };
         request.ignoreNulls = request.ignoreNulls && request.objectRows;
         if (query instanceof classes.Query) {
             if (this._intlcon.onGenerateQuery)
                 this._intlcon.onGenerateQuery(request, query);
-            const q = query
-                .generate({
+            const q = query.generate({
                 dialect: request.dialect,
                 dialectVersion: request.dialectVersion,
                 params: options.params,
                 strictParams: true,
-                prettyPrint: request.prettyPrint
+                prettyPrint: request.prettyPrint,
             });
             request.sql = q.sql;
             request.params = q.params;
@@ -257,7 +257,8 @@ export class SqbConnection extends TypedEventEmitterClass(AsyncEventEmitter) {
             if (query.listenerCount('fetch'))
                 request.fetchHooks = query.listeners('fetch');
         }
-        else { // noinspection SuspiciousTypeOfGuard
+        else {
+            // noinspection SuspiciousTypeOfGuard
             if (typeof query === 'string') {
                 request.sql = query;
                 request.params = options.params;

package/esm/orm/commands/command.helper.js

@@ -1,4 +1,4 @@
-import { And, Eq, Exists, Field, InnerJoin, isCompOperator, isLogicalOperator, LeftOuterJoin, Raw, Select } from '@sqb/builder';
+import { And, Eq, Exists, Field, InnerJoin, isCompOperator, isLogicalOperator, LeftOuterJoin, Raw, Select, } from '@sqb/builder';
 import { EmbeddedFieldMetadata } from '../model/embedded-field-metadata.js';
 import { EntityMetadata } from '../model/entity-metadata.js';
 import { isAssociationField, isColumnField, isEmbeddedField } from '../util/orm.helper.js';
@@ -22,8 +22,9 @@ export async function joinAssociation(joinInfos, association, parentAlias, inner
             const keyCol = await node.resolveSourceProperty();
             const targetCol = await node.resolveTargetProperty();
             const joinAlias = 'J' + (joinInfos.length + 1);
-            const join = innerJoin ? InnerJoin(targetEntity.tableName + ' as ' + joinAlias) :
-                LeftOuterJoin(targetEntity.tableName + ' as ' + joinAlias);
+            const join = innerJoin
+                ? InnerJoin(targetEntity.tableName + ' as ' + joinAlias)
+                : LeftOuterJoin(targetEntity.tableName + ' as ' + joinAlias);
             join.on(Eq(Field(joinAlias + '.' + targetCol.fieldName, targetCol.dataType, targetCol.isArray), Field(parentAlias + '.' + keyCol.fieldName, keyCol.dataType, keyCol.isArray)));
             if (node.conditions)
                 await prepareFilter(targetEntity, node.conditions, join._conditions, joinAlias);
@@ -32,7 +33,7 @@ export async function joinAssociation(joinInfos, association, parentAlias, inner
                 sourceEntity,
                 targetEntity,
                 joinAlias,
-                join
+                join,
             };
             joinInfos.push(joinInfo);
         }
@@ -101,8 +102,7 @@ export async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T')
                         if (!subSelect) {
                             const keyCol = await col.association.resolveSourceProperty();
                             const targetCol = await col.association.resolveTargetProperty();
-                            subSelect = Select(Raw('1'))
-                                .from(_curEntity.tableName + ' K');
+                            subSelect = Select(Raw('1')).from(_curEntity.tableName + ' K');
                             subSelect.where(Eq(Field('K.' + targetCol.fieldName, targetCol.dataType, targetCol.isArray), Field(tableAlias + '.' + keyCol.fieldName, keyCol.dataType, keyCol.isArray)));
                             trgOp.add(Exists(subSelect));
                             trgOp = subSelect._where;
@@ -118,9 +118,8 @@ export async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T')
                             const targetEntity = await node.resolveTarget();
                             const sourceColumn = await node.resolveSourceProperty();
                             const targetColumn = await node.resolveTargetProperty();
-                            const joinAlias = 'J' + (((subSelect?._joins?.length) || 0) + 1);
-                            subSelect.join(InnerJoin(targetEntity.tableName + ' ' + joinAlias)
-                                .on(Eq(Field(joinAlias + '.' + targetColumn.fieldName, targetColumn.dataType, targetColumn.isArray), Field(_curAlias + '.' + sourceColumn.fieldName, sourceColumn.dataType, sourceColumn.isArray))));
+                            const joinAlias = 'J' + ((subSelect?._joins?.length || 0) + 1);
+                            subSelect.join(InnerJoin(targetEntity.tableName + ' ' + joinAlias).on(Eq(Field(joinAlias + '.' + targetColumn.fieldName, targetColumn.dataType, targetColumn.isArray), Field(_curAlias + '.' + sourceColumn.fieldName, sourceColumn.dataType, sourceColumn.isArray))));
                             _curEntity = targetEntity;
                             _curAlias = joinAlias;
                             node = node.next;

package/esm/orm/commands/create.command.js

@@ -18,7 +18,7 @@ export class CreateCommand {
             entity,
             queryParams: {},
             queryValues: {},
-            colCount: 0
+            colCount: 0,
         };
         // Prepare
         await this._prepareParams(ctx, entity, args.values);
@@ -33,7 +33,7 @@ export class CreateCommand {
         const qr = await args.connection.execute(query, {
             params: ctx.queryParams,
             objectRows: false,
-            cursor: false
+            cursor: false,
         });
         if (args.returning && qr.fields && qr.rows?.length) {
             const keyValues = {};
@@ -55,8 +55,7 @@ export class CreateCommand {
                 if (col.noInsert)
                     continue;
                 if (v == null && col.default !== undefined) {
-                    v = typeof col.default === 'function' ?
-                        col.default(values) : col.default;
+                    v = typeof col.default === 'function' ? col.default(values) : col.default;
                 }
                 if (typeof col.serialize === 'function')
                     v = col.serialize(v, col.name);
@@ -71,7 +70,7 @@ export class CreateCommand {
                 ctx.queryValues[fieldName] = Param({
                     name: k,
                     dataType: col.dataType,
-                    isArray: col.isArray
+                    isArray: col.isArray,
                 });
                 ctx.queryParams[k] = v;
                 ctx.colCount++;