@sqb/connect 4.19.4 → 4.19.6

package/README.md

@@ -18,12 +18,12 @@ SQB is an extensible, multi-dialect SQL query builder and Database connection wr
 
 ## Main goals
 
--   Single code base for any sql based database
--   Powerful and simplified query coding scheme
--   Fast applications with low memory requirements
--   Let applications work with large data tables efficiently
--   Support latest JavaScript language standards
--   Lightweight and extensible framework.
+- Single code base for any sql based database
+- Powerful and simplified query coding scheme
+- Fast applications with low memory requirements
+- Let applications work with large data tables efficiently
+- Support latest JavaScript language standards
+- Lightweight and extensible framework.
 
 You can report bugs and discuss features on the [GitHub issues](https://github.com/sqbjs/sqb/issues) page
 
@@ -39,7 +39,7 @@ $ npm install @sqb/connect --save
 
 ## Node Compatibility
 
--   node >= 16.x
+- node >= 16.x
 
 ### License
 

package/cjs/client/cursor.js

@@ -195,7 +195,9 @@ class Cursor extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_ty
                 if (_this.isEof)
                     return;
                 /* Seek cache */
-                while (step > 0 && _this._cache && (_this._row = _this._cache.next())) {
+                while (step > 0 &&
+                    _this._cache &&
+                    (_this._row = _this._cache.next())) {
                     _this._rowNum++;
                     step--;
                 }

package/cjs/client/helpers.js

@@ -49,10 +49,16 @@ function wrapAdapterFields(oldFields, fieldNaming) {
     return result;
 }
 function normalizeRowsToObjectRows(fields, rowType, oldRows, options) {
-    return normalizeRows(fields, rowType, oldRows, { ...options, objectRows: true });
+    return normalizeRows(fields, rowType, oldRows, {
+        ...options,
+        objectRows: true,
+    });
 }
 function normalizeRowsToArrayRows(fields, rowType, oldRows, options) {
-    return normalizeRows(fields, rowType, oldRows, { ...options, objectRows: false });
+    return normalizeRows(fields, rowType, oldRows, {
+        ...options,
+        objectRows: false,
+    });
 }
 function normalizeRows(fields, rowType, oldRows, options) {
     const ignoreNulls = options.ignoreNulls && options.objectRows;

package/cjs/client/sqb-client.js

@@ -159,7 +159,11 @@ class SqbClient extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict
         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/cjs/orm/commands/command.helper.js

@@ -21,7 +21,7 @@ async function joinAssociation(joinInfos, association, parentAlias, innerJoin) {
     let node = association;
     const result = [];
     while (node) {
-        joinInfo = joinInfos.find(j => j.association === node);
+        joinInfo = joinInfos.find(j => j.association === node && j.parentAlias === parentAlias);
         if (!joinInfo) {
             const targetEntity = await node.resolveTarget();
             const sourceEntity = await node.resolveSource();
@@ -38,6 +38,7 @@ async function joinAssociation(joinInfos, association, parentAlias, innerJoin) {
                 association: node,
                 sourceEntity,
                 targetEntity,
+                parentAlias,
                 joinAlias,
                 join,
             };

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

@@ -58,7 +58,10 @@ 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);

package/cjs/orm/commands/find.command.js

@@ -73,7 +73,9 @@ class FindCommand {
             ? (0, parse_fields_projection_js_1.parseFieldsProjection)(opts.projection)
             : opts.projection;
         const defaultFields = !projection || !Object.values(projection).find(p => !p.sign);
-        const sortFields = opts.sort && opts.sort.length ? opts.sort.map(x => x.toLowerCase()) : undefined;
+        const sortFields = opts.sort && opts.sort.length
+            ? opts.sort.map(x => x.toLowerCase())
+            : undefined;
         const prefix = opts.prefix || '';
         const suffix = opts.suffix || '';
         for (const key of Object.keys(entity.fields)) {
@@ -173,7 +175,9 @@ class FindCommand {
         }
     }
     _selectColumn(tableAlias, el, prefix, suffix) {
-        const fieldName = (prefix || '').toLowerCase() + el.fieldName.toUpperCase() + (suffix || '').toLowerCase();
+        const fieldName = (prefix || '').toLowerCase() +
+            el.fieldName.toUpperCase() +
+            (suffix || '').toLowerCase();
         const fieldAlias = (tableAlias + '_' + fieldName).substring(0, 30);
         this._selectColumns[fieldAlias] = {
             field: el,

package/cjs/orm/commands/row-converter.js

@@ -135,7 +135,9 @@ class RowConverter {
                             fld = fld || _fields.get('' + p.keyField);
                             const keyValue = fld && row[fld.index];
                             if (keyValue != null) {
-                                const keyValues = Array.isArray(keyValue) ? keyValue : [keyValue];
+                                const keyValues = Array.isArray(keyValue)
+                                    ? keyValue
+                                    : [keyValue];
                                 keyValues.forEach(k => {
                                     let arr = map.get(k);
                                     if (!arr) {

package/cjs/orm/decorators/column.decorator.js

@@ -22,7 +22,9 @@ Column[orm_const_js_1.DECORATOR_FACTORY] = function (arg0) {
             else
                 options.type = typ;
         }
-        if (!options.dataType && typeof options.type === 'function' && entity_metadata_js_1.EntityMetadata.get(options.type)) {
+        if (!options.dataType &&
+            typeof options.type === 'function' &&
+            entity_metadata_js_1.EntityMetadata.get(options.type)) {
             options.dataType = builder_1.DataType.JSON;
         }
         entity_metadata_js_1.EntityMetadata.defineColumnField(entity, propertyKey, options);

package/cjs/orm/decorators/entity.decorator.js

@@ -167,7 +167,9 @@ function applyConstructorProperties(target, sourceClass, constructorArgs, isProp
         for (const key of keys) {
             const srcDesc = Object.getOwnPropertyDescriptor(tempInstance, key);
             const trgDesc = Object.getOwnPropertyDescriptor(target, key);
-            if (!srcDesc || trgDesc || (isPropertyInherited && !isPropertyInherited(key)))
+            if (!srcDesc ||
+                trgDesc ||
+                (isPropertyInherited && !isPropertyInherited(key)))
                 continue;
             Object.defineProperty(target, key, srcDesc);
         }

package/cjs/orm/model/association.js

@@ -79,11 +79,17 @@ 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
-                    let s = source.name[0].toLowerCase() + source.name.substring(1) + '_' + sourceKey;
+                    let s = source.name[0].toLowerCase() +
+                        source.name.substring(1) +
+                        '_' +
+                        sourceKey;
                     if (!entity_metadata_js_1.EntityMetadata.getColumnField(target, s))
                         s = (0, putil_varhelpers_1.camelCase)(s);
                     targetKey = s;
@@ -92,11 +98,17 @@ 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
-                    let s = target.name[0].toLowerCase() + target.name.substring(1) + '_' + targetKey;
+                    let s = target.name[0].toLowerCase() +
+                        target.name.substring(1) +
+                        '_' +
+                        targetKey;
                     if (!entity_metadata_js_1.EntityMetadata.getColumnField(source, s))
                         s = (0, putil_varhelpers_1.camelCase)(s);
                     sourceKey = s;

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

@@ -298,7 +298,10 @@ var EntityMetadata;
             derived.foreignKeys = derived.foreignKeys || [];
             for (const fk of base.foreignKeys) {
                 if (!fk.sourceKey || hasField(fk.sourceKey)) {
-                    const newFk = new association_js_1.Association(fk.name, { ...fk, source: derived.ctor });
+                    const newFk = new association_js_1.Association(fk.name, {
+                        ...fk,
+                        source: derived.ctor,
+                    });
                     derived.foreignKeys.push(newFk);
                 }
             }

package/cjs/orm/repository.class.js

@@ -29,7 +29,11 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
     }
     create(input, options) {
         return this._execute(async (connection) => {
-            const keyValue = await this._create(input, { ...options, connection, returning: true });
+            const keyValue = await this._create(input, {
+                ...options,
+                connection,
+                returning: true,
+            });
             const result = keyValue && (await this._find(keyValue, { ...options, connection }));
             if (!result)
                 throw new Error('Unable to insert new row');
@@ -46,7 +50,11 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
      */
     createOnly(input, options) {
         return this._execute(async (connection) => {
-            const r = await this._create(input, { ...options, connection, returning: true });
+            const r = await this._create(input, {
+                ...options,
+                connection,
+                returning: true,
+            });
             const primaryIndex = entity_metadata_js_1.EntityMetadata.getPrimaryIndex(this.entity);
             if (!primaryIndex || primaryIndex.columns.length > 1)
                 return r;

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

@@ -10,6 +10,7 @@ function applyMixins(derivedCtor, baseCtor, filter) {
             (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));
     }
 }

package/cjs/orm/util/parse-fields-projection.js

@@ -51,14 +51,16 @@ function parse(input, target) {
         if (!m)
             throw new TypeError(`Invalid field path (${input})`);
         const fieldName = m[2];
-        const treeItem = (target[fieldName] = target[fieldName] || new FieldsProjection.Item());
+        const treeItem = (target[fieldName] =
+            target[fieldName] || new FieldsProjection.Item());
         if (m[1])
             treeItem.sign = m[1];
         if (i === fields.length - 1) {
             delete treeItem.projection;
         }
         else {
-            target = treeItem.projection = treeItem.projection || new FieldsProjection();
+            target = treeItem.projection =
+                treeItem.projection || new FieldsProjection();
         }
     }
 }

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

@@ -20,19 +20,26 @@ 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)) {
+    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())
+                ? '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.js

@@ -4,7 +4,7 @@ import { TaskQueue } from 'power-tasks';
 import { coerceToInt } from 'putil-varhelpers';
 import { AsyncEventEmitter, TypedEventEmitterClass } from 'strict-typed-events';
 import { CursorStream } from './cursor-stream.js';
-import { callFetchHooks, normalizeRowsToArrayRows, normalizeRowsToObjectRows } from './helpers.js';
+import { callFetchHooks, normalizeRowsToArrayRows, normalizeRowsToObjectRows, } from './helpers.js';
 const debug = _debug('sqb:cursor');
 export class Cursor extends TypedEventEmitterClass(AsyncEventEmitter) {
     constructor(connection, fields, adapterCursor, request) {
@@ -191,7 +191,9 @@ export class Cursor extends TypedEventEmitterClass(AsyncEventEmitter) {
                 if (_this.isEof)
                     return;
                 /* Seek cache */
-                while (step > 0 && _this._cache && (_this._row = _this._cache.next())) {
+                while (step > 0 &&
+                    _this._cache &&
+                    (_this._row = _this._cache.next())) {
                     _this._rowNum++;
                     step--;
                 }

package/esm/client/helpers.js

@@ -42,10 +42,16 @@ export function wrapAdapterFields(oldFields, fieldNaming) {
     return result;
 }
 export function normalizeRowsToObjectRows(fields, rowType, oldRows, options) {
-    return normalizeRows(fields, rowType, oldRows, { ...options, objectRows: true });
+    return normalizeRows(fields, rowType, oldRows, {
+        ...options,
+        objectRows: true,
+    });
 }
 export function normalizeRowsToArrayRows(fields, rowType, oldRows, options) {
-    return normalizeRows(fields, rowType, oldRows, { ...options, objectRows: false });
+    return normalizeRows(fields, rowType, oldRows, {
+        ...options,
+        objectRows: false,
+    });
 }
 function normalizeRows(fields, rowType, oldRows, options) {
     const ignoreNulls = options.ignoreNulls && options.objectRows;

package/esm/client/sqb-client.js

@@ -1,5 +1,5 @@
 import _debug from 'debug';
-import { createPool, PoolState } from 'lightning-pool';
+import { createPool, PoolState, } from 'lightning-pool';
 import { coerceToBoolean, coerceToInt } from 'putil-varhelpers';
 import { AsyncEventEmitter, TypedEventEmitterClass } from 'strict-typed-events';
 import { EntityMetadata } from '../orm/model/entity-metadata.js';
@@ -155,7 +155,11 @@ 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

@@ -2,12 +2,12 @@ import { classes } from '@sqb/builder';
 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 { EntityMetadata } from '../orm/model/entity-metadata.js';
 import { Repository } from '../orm/repository.class.js';
 import { Cursor } from './cursor.js';
-import { callFetchHooks, normalizeRowsToArrayRows, normalizeRowsToObjectRows, wrapAdapterFields } from './helpers.js';
+import { callFetchHooks, normalizeRowsToArrayRows, normalizeRowsToObjectRows, wrapAdapterFields, } from './helpers.js';
 const debug = _debug('sqb:connection');
 export class SqbConnection extends TypedEventEmitterClass(AsyncEventEmitter) {
     constructor(client, adapterConnection, options) {

package/esm/index.js

@@ -28,5 +28,5 @@ export * from './orm/model/link-chain.js';
 export * from './orm/orm.const.js';
 export * from './orm/orm.type.js';
 export * from './orm/repository.class.js';
-export { isAssociationField, isColumnField, isEmbeddedField, isEntityClass } from './orm/util/orm.helper.js';
+export { isAssociationField, isColumnField, isEmbeddedField, isEntityClass, } from './orm/util/orm.helper.js';
 export * from './orm/util/parse-fields-projection.js';

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

@@ -1,7 +1,7 @@
 import { And, Eq, Exists, Field, InnerJoin, isCompOperator, isLogicalOperator, LeftOuterJoin, op, OperatorType, 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';
+import { isAssociationField, isColumnField, isEmbeddedField, } from '../util/orm.helper.js';
 export async function joinAssociationGetFirst(joinInfos, association, parentAlias, innerJoin) {
     const joins = await joinAssociation(joinInfos, association, parentAlias, innerJoin);
     return joins[0];
@@ -15,7 +15,7 @@ export async function joinAssociation(joinInfos, association, parentAlias, inner
     let node = association;
     const result = [];
     while (node) {
-        joinInfo = joinInfos.find(j => j.association === node);
+        joinInfo = joinInfos.find(j => j.association === node && j.parentAlias === parentAlias);
         if (!joinInfo) {
             const targetEntity = await node.resolveTarget();
             const sourceEntity = await node.resolveSource();
@@ -32,6 +32,7 @@ export async function joinAssociation(joinInfos, association, parentAlias, inner
                 association: node,
                 sourceEntity,
                 targetEntity,
+                parentAlias,
                 joinAlias,
                 join,
             };

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

@@ -55,7 +55,10 @@ 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);

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

@@ -2,9 +2,9 @@ import { And, In, Param, Select } from '@sqb/builder';
 import { AssociationNode } from '../model/association-node.js';
 import { EmbeddedFieldMetadata } from '../model/embedded-field-metadata.js';
 import { EntityMetadata } from '../model/entity-metadata.js';
-import { isAssociationField, isColumnField, isEmbeddedField } from '../util/orm.helper.js';
-import { parseFieldsProjection } from '../util/parse-fields-projection.js';
-import { joinAssociationGetLast, prepareFilter } from './command.helper.js';
+import { isAssociationField, isColumnField, isEmbeddedField, } from '../util/orm.helper.js';
+import { parseFieldsProjection, } from '../util/parse-fields-projection.js';
+import { joinAssociationGetLast, prepareFilter, } from './command.helper.js';
 import { RowConverter } from './row-converter.js';
 const SORT_ORDER_PATTERN = /^([-+])?(.*)$/;
 export class FindCommand {
@@ -70,7 +70,9 @@ export class FindCommand {
             ? parseFieldsProjection(opts.projection)
             : opts.projection;
         const defaultFields = !projection || !Object.values(projection).find(p => !p.sign);
-        const sortFields = opts.sort && opts.sort.length ? opts.sort.map(x => x.toLowerCase()) : undefined;
+        const sortFields = opts.sort && opts.sort.length
+            ? opts.sort.map(x => x.toLowerCase())
+            : undefined;
         const prefix = opts.prefix || '';
         const suffix = opts.suffix || '';
         for (const key of Object.keys(entity.fields)) {
@@ -170,7 +172,9 @@ export class FindCommand {
         }
     }
     _selectColumn(tableAlias, el, prefix, suffix) {
-        const fieldName = (prefix || '').toLowerCase() + el.fieldName.toUpperCase() + (suffix || '').toLowerCase();
+        const fieldName = (prefix || '').toLowerCase() +
+            el.fieldName.toUpperCase() +
+            (suffix || '').toLowerCase();
         const fieldAlias = (tableAlias + '_' + fieldName).substring(0, 30);
         this._selectColumns[fieldAlias] = {
             field: el,

package/esm/orm/commands/row-converter.js

@@ -132,7 +132,9 @@ export class RowConverter {
                             fld = fld || _fields.get('' + p.keyField);
                             const keyValue = fld && row[fld.index];
                             if (keyValue != null) {
-                                const keyValues = Array.isArray(keyValue) ? keyValue : [keyValue];
+                                const keyValues = Array.isArray(keyValue)
+                                    ? keyValue
+                                    : [keyValue];
                                 keyValues.forEach(k => {
                                     let arr = map.get(k);
                                     if (!arr) {

package/esm/orm/decorators/column.decorator.js

@@ -19,7 +19,9 @@ Column[DECORATOR_FACTORY] = function (arg0) {
             else
                 options.type = typ;
         }
-        if (!options.dataType && typeof options.type === 'function' && EntityMetadata.get(options.type)) {
+        if (!options.dataType &&
+            typeof options.type === 'function' &&
+            EntityMetadata.get(options.type)) {
             options.dataType = DataType.JSON;
         }
         EntityMetadata.defineColumnField(entity, propertyKey, options);

package/esm/orm/decorators/entity.decorator.js

@@ -1,4 +1,4 @@
-import { EntityMetadata } from '../model/entity-metadata.js';
+import { EntityMetadata, } from '../model/entity-metadata.js';
 import { applyMixins } from '../util/apply-mixins.js';
 export function Entity(options) {
     return function (target) {
@@ -164,7 +164,9 @@ function applyConstructorProperties(target, sourceClass, constructorArgs, isProp
         for (const key of keys) {
             const srcDesc = Object.getOwnPropertyDescriptor(tempInstance, key);
             const trgDesc = Object.getOwnPropertyDescriptor(target, key);
-            if (!srcDesc || trgDesc || (isPropertyInherited && !isPropertyInherited(key)))
+            if (!srcDesc ||
+                trgDesc ||
+                (isPropertyInherited && !isPropertyInherited(key)))
                 continue;
             Object.defineProperty(target, key, srcDesc);
         }

package/esm/orm/model/association.js

@@ -76,11 +76,17 @@ export class Association {
             if (this.many) {
                 if (!sourceKey) {
                     const primaryIndexColumns = 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
-                    let s = source.name[0].toLowerCase() + source.name.substring(1) + '_' + sourceKey;
+                    let s = source.name[0].toLowerCase() +
+                        source.name.substring(1) +
+                        '_' +
+                        sourceKey;
                     if (!EntityMetadata.getColumnField(target, s))
                         s = camelCase(s);
                     targetKey = s;
@@ -89,11 +95,17 @@ export class Association {
             else {
                 if (!targetKey) {
                     const primaryIndexColumns = 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
-                    let s = target.name[0].toLowerCase() + target.name.substring(1) + '_' + targetKey;
+                    let s = target.name[0].toLowerCase() +
+                        target.name.substring(1) +
+                        '_' +
+                        targetKey;
                     if (!EntityMetadata.getColumnField(source, s))
                         s = camelCase(s);
                     sourceKey = s;

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

@@ -1,10 +1,10 @@
 import { DataType } from '@sqb/builder';
 import { ENTITY_METADATA_KEY } from '../orm.const.js';
-import { isAssociationField, isColumnField, isEmbeddedField } from '../util/orm.helper.js';
+import { isAssociationField, isColumnField, isEmbeddedField, } from '../util/orm.helper.js';
 import { Association } from './association.js';
-import { AssociationFieldMetadata } from './association-field-metadata.js';
-import { ColumnFieldMetadata } from './column-field-metadata.js';
-import { EmbeddedFieldMetadata } from './embedded-field-metadata.js';
+import { AssociationFieldMetadata, } from './association-field-metadata.js';
+import { ColumnFieldMetadata, } from './column-field-metadata.js';
+import { EmbeddedFieldMetadata, } from './embedded-field-metadata.js';
 export var EntityMetadata;
 (function (EntityMetadata) {
     function define(ctor) {
@@ -295,7 +295,10 @@ export var EntityMetadata;
             derived.foreignKeys = derived.foreignKeys || [];
             for (const fk of base.foreignKeys) {
                 if (!fk.sourceKey || hasField(fk.sourceKey)) {
-                    const newFk = new Association(fk.name, { ...fk, source: derived.ctor });
+                    const newFk = new Association(fk.name, {
+                        ...fk,
+                        source: derived.ctor,
+                    });
                     derived.foreignKeys.push(newFk);
                 }
             }

package/esm/orm/repository.class.js

@@ -26,7 +26,11 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
     }
     create(input, options) {
         return this._execute(async (connection) => {
-            const keyValue = await this._create(input, { ...options, connection, returning: true });
+            const keyValue = await this._create(input, {
+                ...options,
+                connection,
+                returning: true,
+            });
             const result = keyValue && (await this._find(keyValue, { ...options, connection }));
             if (!result)
                 throw new Error('Unable to insert new row');
@@ -43,7 +47,11 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
      */
     createOnly(input, options) {
         return this._execute(async (connection) => {
-            const r = await this._create(input, { ...options, connection, returning: true });
+            const r = await this._create(input, {
+                ...options,
+                connection,
+                returning: true,
+            });
             const primaryIndex = EntityMetadata.getPrimaryIndex(this.entity);
             if (!primaryIndex || primaryIndex.columns.length > 1)
                 return r;

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

@@ -7,6 +7,7 @@ export function applyMixins(derivedCtor, baseCtor, filter) {
             (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));
     }
 }

package/esm/orm/util/parse-fields-projection.js

@@ -46,14 +46,16 @@ function parse(input, target) {
         if (!m)
             throw new TypeError(`Invalid field path (${input})`);
         const fieldName = m[2];
-        const treeItem = (target[fieldName] = target[fieldName] || new FieldsProjection.Item());
+        const treeItem = (target[fieldName] =
+            target[fieldName] || new FieldsProjection.Item());
         if (m[1])
             treeItem.sign = m[1];
         if (i === fields.length - 1) {
             delete treeItem.projection;
         }
         else {
-            target = treeItem.projection = treeItem.projection || new FieldsProjection();
+            target = treeItem.projection =
+                treeItem.projection || new FieldsProjection();
         }
     }
 }

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

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/connect",
   "description": "Multi-dialect database connection framework written with TypeScript",
-  "version": "4.19.4",
+  "version": "4.19.6",
   "author": "Panates",
   "license": "Apache-2.0",
   "dependencies": {
@@ -16,11 +16,11 @@
     "putil-promisify": "^1.10.1",
     "putil-varhelpers": "^1.6.5",
     "strict-typed-events": "^2.8.0",
-    "ts-gems": "^3.5.1",
-    "tslib": "^2.8.0"
+    "ts-gems": "^3.6.0",
+    "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.19.4",
+    "@sqb/builder": "^4.19.6",
     "reflect-metadata": "^0.2.2"
   },
   "type": "module",
@@ -76,5 +76,8 @@
     "mssql",
     "sqlite",
     "mysql"
-  ]
+  ],
+  "publishConfig": {
+    "access": "public"
+  }
 }

package/types/index.d.cts

@@ -28,5 +28,5 @@ export * from './orm/model/link-chain.js';
 export * from './orm/orm.const.js';
 export * from './orm/orm.type.js';
 export * from './orm/repository.class.js';
-export { isAssociationField, isColumnField, isEmbeddedField, isEntityClass } from './orm/util/orm.helper.js';
+export { isAssociationField, isColumnField, isEmbeddedField, isEntityClass, } from './orm/util/orm.helper.js';
 export * from './orm/util/parse-fields-projection.js';

package/types/index.d.ts

@@ -28,5 +28,5 @@ export * from './orm/model/link-chain.js';
 export * from './orm/orm.const.js';
 export * from './orm/orm.type.js';
 export * from './orm/repository.class.js';
-export { isAssociationField, isColumnField, isEmbeddedField, isEntityClass } from './orm/util/orm.helper.js';
+export { isAssociationField, isColumnField, isEmbeddedField, isEntityClass, } from './orm/util/orm.helper.js';
 export * from './orm/util/parse-fields-projection.js';

package/types/orm/commands/command.helper.d.ts

@@ -6,6 +6,7 @@ export interface JoinInfo {
     sourceEntity: EntityMetadata;
     targetEntity: EntityMetadata;
     joinAlias: string;
+    parentAlias: string;
     join: JoinStatement;
 }
 export declare function joinAssociationGetFirst(joinInfos: JoinInfo[], association: AssociationNode, parentAlias: string, innerJoin?: boolean): Promise<JoinInfo>;