@sqb/connect 4.11.3 → 4.12.1

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,40 +39,25 @@ $ npm install @sqb/connect --save
 
 ## Node Compatibility
 
-- node >= 16.x
+-   node >= 16.x
 
 ### License
 
 SQB is available under [MIT](LICENSE) license.
 
 [npm-image]: https://img.shields.io/npm/v/@sqb/connect.svg
-
 [npm-url]: https://npmjs.org/package/@sqb/connect
-
 [travis-image]: https://img.shields.io/travis/sqbjs/@sqb/connect/master.svg
-
 [travis-url]: https://travis-ci.org/sqbjs/@sqb/connect
-
 [coveralls-image]: https://img.shields.io/coveralls/sqbjs/@sqb/connect/master.svg
-
 [coveralls-url]: https://coveralls.io/r/sqbjs/@sqb/connect
-
 [downloads-image]: https://img.shields.io/npm/dm/@sqb/connect.svg
-
 [downloads-url]: https://npmjs.org/package/@sqb/connect
-
 [gitter-image]: https://badges.gitter.im/sqbjs/@sqb/connect.svg
-
 [gitter-url]: https://gitter.im/sqbjs/@sqb/connect?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
-
 [dependencies-image]: https://david-dm.org/sqbjs/@sqb/connect/status.svg
-
-[dependencies-url]:https://david-dm.org/sqbjs/@sqb/connect
-
+[dependencies-url]: https://david-dm.org/sqbjs/@sqb/connect
 [devdependencies-image]: https://david-dm.org/sqbjs/@sqb/connect/dev-status.svg
-
-[devdependencies-url]:https://david-dm.org/sqbjs/@sqb/connect?type=dev
-
+[devdependencies-url]: https://david-dm.org/sqbjs/@sqb/connect?type=dev
 [quality-image]: http://npm.packagequality.com/shield/@sqb/connect.png
-
 [quality-url]: http://packagequality.com/#?package=@sqb/connect

package/cjs/client/cursor-stream.js

@@ -18,7 +18,7 @@ class CursorStream extends stream_1.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.
@@ -47,7 +47,9 @@ class CursorStream extends stream_1.Readable {
             this.emit('end');
             return;
         }
-        this._cursor.next().then(row => {
+        this._cursor
+            .next()
+            .then(row => {
             if (this._eof)
                 return this.push(null);
             let buf = '';
@@ -74,7 +76,8 @@ class CursorStream extends stream_1.Readable {
                     buf += ',';
                 this.push(buf + JSON.stringify(row));
             }
-        }).catch(err => {
+        })
+            .catch(err => {
             /* istanbul ignore next */
             if (typeof this.destroy == 'function')
                 this.destroy(err);

package/cjs/client/cursor.js

@@ -179,7 +179,8 @@ class Cursor extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_ty
         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 */
@@ -212,7 +213,8 @@ class Cursor extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_ty
                     return;
                 await _this._fetchRows();
             }
-        }).toPromise();
+        })
+            .toPromise();
         if (!silent)
             this.emit('move', this.row, this._rowNum);
         return this._rowNum;
@@ -227,12 +229,12 @@ class Cursor extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_ty
         if (rows && rows.length) {
             debug('Fetched %d rows from database', rows.length);
             // Normalize rows
-            rows = this._request.objectRows ?
-                (0, helpers_js_1.normalizeRowsToObjectRows)(this._fields, this._intlcur.rowType, rows, this._request) :
-                (0, helpers_js_1.normalizeRowsToArrayRows)(this._fields, this._intlcur.rowType, rows, this._request);
+            rows = this._request.objectRows
+                ? (0, helpers_js_1.normalizeRowsToObjectRows)(this._fields, this._intlcur.rowType, rows, this._request)
+                : (0, helpers_js_1.normalizeRowsToArrayRows)(this._fields, this._intlcur.rowType, rows, this._request);
             (0, helpers_js_1.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/cjs/client/field-info-map.js

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

package/cjs/client/sqb-client.js

@@ -50,7 +50,7 @@ class SqbClient extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict
             create: () => adapter.connect(cfg),
             destroy: instance => instance.close(),
             reset: async (instance) => instance.reset(),
-            validate: instance => instance.test()
+            validate: instance => instance.test(),
         };
         this._pool = (0, lightning_pool_1.createPool)(poolFactory, poolOptions);
         this._pool.on('closing', () => this.emit('closing'));
@@ -159,8 +159,7 @@ 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/client/sqb-connection.js

@@ -78,7 +78,7 @@ class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(st
         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);
         });
@@ -135,7 +135,7 @@ class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(st
             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;
@@ -147,13 +147,13 @@ class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(st
                 result.fields = (0, helpers_js_1.wrapAdapterFields)(response.fields, request.fieldNaming);
                 result.rowType = response.rowType;
                 if (response.rows) {
-                    result.rows = request.objectRows ?
-                        (0, helpers_js_1.normalizeRowsToObjectRows)(result.fields, response.rowType, response.rows, request) :
-                        (0, helpers_js_1.normalizeRowsToArrayRows)(result.fields, response.rowType, response.rows, request);
+                    result.rows = request.objectRows
+                        ? (0, helpers_js_1.normalizeRowsToObjectRows)(result.fields, response.rowType, response.rows, request)
+                        : (0, helpers_js_1.normalizeRowsToArrayRows)(result.fields, response.rowType, response.rows, request);
                     (0, helpers_js_1.callFetchHooks)(result.rows, request);
                 }
                 else if (response.cursor) {
-                    const cursor = result.cursor = new cursor_js_1.Cursor(this, result.fields, response.cursor, request);
+                    const cursor = (result.cursor = new cursor_js_1.Cursor(this, result.fields, response.cursor, request));
                     const hook = () => cursor.close();
                     cursor.once('close', () => this.off('close', hook));
                     this.on('close', hook);
@@ -226,8 +226,9 @@ class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(st
         const request = {
             dialect: this.client.dialect,
             sql: '',
-            autoCommit: this.inTransaction ? false :
-                (0, putil_varhelpers_1.coerceToBoolean)((0, putil_varhelpers_1.coalesce)(options.autoCommit, this._options?.autoCommit, defaults.autoCommit), true),
+            autoCommit: this.inTransaction
+                ? false
+                : (0, putil_varhelpers_1.coerceToBoolean)((0, putil_varhelpers_1.coalesce)(options.autoCommit, this._options?.autoCommit, defaults.autoCommit), true),
             cursor: (0, putil_varhelpers_1.coerceToBoolean)((0, putil_varhelpers_1.coalesce)(options.cursor, defaults.cursor), false),
             objectRows: (0, putil_varhelpers_1.coerceToBoolean)((0, putil_varhelpers_1.coalesce)(options.objectRows, defaults.objectRows), true),
             ignoreNulls: (0, putil_varhelpers_1.coerceToBoolean)((0, putil_varhelpers_1.coalesce)(options.ignoreNulls, defaults.ignoreNulls), false),
@@ -237,19 +238,18 @@ class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(st
             showSql: (0, putil_varhelpers_1.coerceToBoolean)((0, putil_varhelpers_1.coalesce)(options.showSql, defaults.showSql), false),
             prettyPrint: (0, putil_varhelpers_1.coerceToBoolean)((0, putil_varhelpers_1.coalesce)(options.prettyPrint, defaults.prettyPrint), false),
             action: (0, putil_varhelpers_1.coerceToString)(options.action),
-            fetchAsString: options.fetchAsString
+            fetchAsString: options.fetchAsString,
         };
         request.ignoreNulls = request.ignoreNulls && request.objectRows;
         if (query instanceof builder_1.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;
@@ -261,7 +261,8 @@ class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(st
             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/cjs/index.js

@@ -38,4 +38,5 @@ Object.defineProperty(exports, "isColumnField", { enumerable: true, get: functio
 Object.defineProperty(exports, "isEmbeddedField", { enumerable: true, get: function () { return orm_helper_js_1.isEmbeddedField; } });
 Object.defineProperty(exports, "isAssociationField", { enumerable: true, get: function () { return orm_helper_js_1.isAssociationField; } });
 Object.defineProperty(exports, "isEntityClass", { enumerable: true, get: function () { return orm_helper_js_1.isEntityClass; } });
+tslib_1.__exportStar(require("./orm/util/parse-fields-projection.js"), exports);
 tslib_1.__exportStar(require("./orm/backward.js"), exports);

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

@@ -27,8 +27,9 @@ async function joinAssociation(joinInfos, association, parentAlias, innerJoin) {
             const keyCol = await node.resolveSourceProperty();
             const targetCol = await node.resolveTargetProperty();
             const joinAlias = 'J' + (joinInfos.length + 1);
-            const join = innerJoin ? (0, builder_1.InnerJoin)(targetEntity.tableName + ' as ' + joinAlias) :
-                (0, builder_1.LeftOuterJoin)(targetEntity.tableName + ' as ' + joinAlias);
+            const join = innerJoin
+                ? (0, builder_1.InnerJoin)(targetEntity.tableName + ' as ' + joinAlias)
+                : (0, builder_1.LeftOuterJoin)(targetEntity.tableName + ' as ' + joinAlias);
             join.on((0, builder_1.Eq)((0, builder_1.Field)(joinAlias + '.' + targetCol.fieldName, targetCol.dataType, targetCol.isArray), (0, builder_1.Field)(parentAlias + '.' + keyCol.fieldName, keyCol.dataType, keyCol.isArray)));
             if (node.conditions)
                 await prepareFilter(targetEntity, node.conditions, join._conditions, joinAlias);
@@ -37,7 +38,7 @@ async function joinAssociation(joinInfos, association, parentAlias, innerJoin) {
                 sourceEntity,
                 targetEntity,
                 joinAlias,
-                join
+                join,
             };
             joinInfos.push(joinInfo);
         }
@@ -52,7 +53,7 @@ async function joinAssociation(joinInfos, association, parentAlias, innerJoin) {
 exports.joinAssociation = joinAssociation;
 async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T') {
     let srcOp;
-    if ((0, builder_1.isLogicalOperator)(filter))
+    if ((0, builder_1.isLogicalOperator)(filter) && filter._operatorType === trgOp._operatorType)
         srcOp = filter;
     else {
         srcOp = (0, builder_1.And)();
@@ -107,8 +108,7 @@ async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T') {
                         if (!subSelect) {
                             const keyCol = await col.association.resolveSourceProperty();
                             const targetCol = await col.association.resolveTargetProperty();
-                            subSelect = (0, builder_1.Select)((0, builder_1.Raw)('1'))
-                                .from(_curEntity.tableName + ' K');
+                            subSelect = (0, builder_1.Select)((0, builder_1.Raw)('1')).from(_curEntity.tableName + ' K');
                             subSelect.where((0, builder_1.Eq)((0, builder_1.Field)('K.' + targetCol.fieldName, targetCol.dataType, targetCol.isArray), (0, builder_1.Field)(tableAlias + '.' + keyCol.fieldName, keyCol.dataType, keyCol.isArray)));
                             trgOp.add((0, builder_1.Exists)(subSelect));
                             trgOp = subSelect._where;
@@ -124,9 +124,8 @@ 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((0, builder_1.InnerJoin)(targetEntity.tableName + ' ' + joinAlias)
-                                .on((0, builder_1.Eq)((0, builder_1.Field)(joinAlias + '.' + targetColumn.fieldName, targetColumn.dataType, targetColumn.isArray), (0, builder_1.Field)(_curAlias + '.' + sourceColumn.fieldName, sourceColumn.dataType, sourceColumn.isArray))));
+                            const joinAlias = 'J' + ((subSelect?._joins?.length || 0) + 1);
+                            subSelect.join((0, builder_1.InnerJoin)(targetEntity.tableName + ' ' + joinAlias).on((0, builder_1.Eq)((0, builder_1.Field)(joinAlias + '.' + targetColumn.fieldName, targetColumn.dataType, targetColumn.isArray), (0, builder_1.Field)(_curAlias + '.' + sourceColumn.fieldName, sourceColumn.dataType, sourceColumn.isArray))));
                             _curEntity = targetEntity;
                             _curAlias = joinAlias;
                             node = node.next;

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

@@ -21,7 +21,7 @@ class CreateCommand {
             entity,
             queryParams: {},
             queryValues: {},
-            colCount: 0
+            colCount: 0,
         };
         // Prepare
         await this._prepareParams(ctx, entity, args.values);
@@ -36,7 +36,7 @@ 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 = {};
@@ -58,8 +58,7 @@ 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);
@@ -74,7 +73,7 @@ class CreateCommand {
                 ctx.queryValues[fieldName] = (0, builder_1.Param)({
                     name: k,
                     dataType: col.dataType,
-                    isArray: col.isArray
+                    isArray: col.isArray,
                 });
                 ctx.queryParams[k] = v;
                 ctx.colCount++;

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

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FindCommand = void 0;
 const builder_1 = require("@sqb/builder");
-const entity_decorator_js_1 = require("../decorators/entity.decorator.js");
 const association_node_js_1 = require("../model/association-node.js");
 const embedded_field_metadata_js_1 = require("../model/embedded-field-metadata.js");
 const entity_metadata_js_1 = require("../model/entity-metadata.js");
 const orm_helper_js_1 = require("../util/orm.helper.js");
+const parse_fields_projection_js_1 = require("../util/parse-fields-projection.js");
 const command_helper_js_1 = require("./command.helper.js");
 const row_converter_js_1 = require("./row-converter.js");
 const SORT_ORDER_PATTERN = /^([-+])?(.*)$/;
@@ -56,10 +56,8 @@ class FindCommand {
             maxEagerFetch: args.maxEagerFetch,
         });
         await command.addFields({
-            pick: args.pick,
-            include: args.include,
-            omit: args.omit,
-            sort: args.sort
+            projection: args.projection,
+            sort: args.sort,
         });
         if (args.filter)
             await command.filter(args.filter);
@@ -71,27 +69,11 @@ class FindCommand {
         const tableAlias = opts.tableAlias || this.resultAlias;
         const entity = opts.entity || this._getEntityFromAlias(tableAlias);
         const converter = opts.converter || this.converter;
-        const _pick = opts.pick ?
-            opts.pick.map(x => x.toLowerCase()) : undefined;
-        const _omit = opts.omit ?
-            opts.omit.map(x => x.toLowerCase()) : undefined;
-        const _include = opts.include ?
-            opts.include.map(x => x.toLowerCase()) : undefined;
-        let requestedFields;
-        if (_pick)
-            requestedFields = [..._pick];
-        else {
-            requestedFields = entity_decorator_js_1.Entity.getFieldNames(entity.ctor).reduce((a, x) => {
-                const f = entity_decorator_js_1.Entity.getField(entity.ctor, x);
-                if (f && !f.exclusive)
-                    a.push(x.toLowerCase());
-                return a;
-            }, []);
-        }
-        if (_include)
-            requestedFields.push(..._include);
-        const sortFields = opts.sort && opts.sort.length ?
-            opts.sort.map(x => x.toLowerCase()) : undefined;
+        const projection = typeof opts.projection === 'string' || Array.isArray(opts.projection)
+            ? (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 prefix = opts.prefix || '';
         const suffix = opts.suffix || '';
         for (const key of Object.keys(entity.fields)) {
@@ -99,12 +81,16 @@ class FindCommand {
             if (!col || col.hidden)
                 continue;
             const colNameLower = col.name.toLowerCase();
-            // Ignore field if in excluded list
-            if (_omit && _omit.includes(colNameLower))
-                continue;
-            // Check if field request list
-            if (!requestedFields.find((x) => x === colNameLower || x.startsWith(colNameLower + '.')))
+            const p = projection?.[colNameLower];
+            if (
+            /** Ignore if field is omitted */
+            p?.sign === '-' ||
+                /** Ignore if default fields and field is not in projection */
+                (!defaultFields && !p) ||
+                /** Ignore if default fields enabled and fields is exclusive */
+                (defaultFields && col.exclusive && !p)) {
                 continue;
+            }
             // Add field to select list if field is a column
             if ((0, orm_helper_js_1.isColumnField)(col)) {
                 const fieldAlias = this._selectColumn(tableAlias, col, prefix, suffix);
@@ -113,7 +99,7 @@ class FindCommand {
                     name: col.name,
                     fieldAlias,
                     dataType: col.dataType,
-                    parse: col.parse
+                    parse: col.parse,
                 });
                 continue;
             }
@@ -121,7 +107,7 @@ class FindCommand {
                 const typ = await embedded_field_metadata_js_1.EmbeddedFieldMetadata.resolveType(col);
                 const subConverter = converter.addObjectProperty({
                     name: col.name,
-                    type: typ.ctor
+                    type: typ.ctor,
                 }).converter;
                 await this.addFields({
                     tableAlias,
@@ -129,10 +115,7 @@ class FindCommand {
                     entity: typ,
                     prefix: col.fieldNamePrefix,
                     suffix: col.fieldNameSuffix,
-                    pick: _pick?.includes(colNameLower) ? undefined :
-                        extractSubFields(colNameLower, _pick),
-                    include: extractSubFields(colNameLower, _include),
-                    omit: extractSubFields(colNameLower, _omit),
+                    projection: p?.projection,
                     sort: extractSubFields(colNameLower, sortFields),
                 });
                 continue;
@@ -143,17 +126,14 @@ class FindCommand {
                     const joinInfo = await (0, command_helper_js_1.joinAssociationGetLast)(this._joins, col.association, tableAlias);
                     const subConverter = converter.addObjectProperty({
                         name: col.name,
-                        type: joinInfo.targetEntity.ctor
+                        type: joinInfo.targetEntity.ctor,
                     }).converter;
                     // Add join fields to select columns list
                     await this.addFields({
                         tableAlias: joinInfo.joinAlias,
                         converter: subConverter,
                         entity: joinInfo.targetEntity,
-                        pick: _pick?.includes(colNameLower) ? undefined :
-                            extractSubFields(colNameLower, _pick),
-                        include: extractSubFields(colNameLower, _include),
-                        omit: extractSubFields(colNameLower, _omit),
+                        projection: p?.projection,
                         sort: extractSubFields(colNameLower, sortFields),
                     });
                     continue;
@@ -167,16 +147,13 @@ class FindCommand {
                     const parentField = this._selectColumn(tableAlias, sourceCol);
                     const findCommand = await FindCommand.create(col.association, {
                         maxSubQueries: this.maxSubQueries - 1,
-                        maxEagerFetch: this.maxEagerFetch
+                        maxEagerFetch: this.maxEagerFetch,
                     });
                     findCommand.converter.parent = this.converter;
                     await findCommand.filter((0, builder_1.In)(targetCol.name, (0, builder_1.Param)(parentField)));
                     const sort = sortFields && extractSubFields(colNameLower, sortFields);
                     await findCommand.addFields({
-                        pick: _pick?.includes(colNameLower) ? undefined :
-                            extractSubFields(colNameLower, _pick),
-                        include: extractSubFields(colNameLower, _include),
-                        omit: extractSubFields(colNameLower, _omit),
+                        projection: p?.projection,
                         sort,
                     });
                     if (sort)
@@ -189,20 +166,18 @@ class FindCommand {
                         findCommand,
                         parentField,
                         keyField,
-                        sort: extractSubFields(colNameLower, sortFields)
+                        sort: extractSubFields(colNameLower, sortFields),
                     });
                 }
             }
         }
     }
     _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,
-            statement: tableAlias + '.' + fieldName + ' as ' + fieldAlias
+            statement: tableAlias + '.' + fieldName + ' as ' + fieldAlias,
         };
         return fieldAlias;
     }
@@ -259,12 +234,10 @@ class FindCommand {
     }
     async execute(args) {
         // Generate select query
-        const columnSqls = Object.keys(this._selectColumns)
-            .map(x => this._selectColumns[x].statement);
+        const columnSqls = Object.keys(this._selectColumns).map(x => this._selectColumns[x].statement);
         if (!columnSqls.length)
             columnSqls.push('1');
-        const query = (0, builder_1.Select)(...columnSqls)
-            .from(this.mainEntity.tableName + ' as ' + this.mainAlias);
+        const query = (0, builder_1.Select)(...columnSqls).from(this.mainEntity.tableName + ' as ' + this.mainAlias);
         if (args.distinct)
             query.distinct();
         query.where(...this._filter._items);
@@ -283,7 +256,7 @@ class FindCommand {
             params: args?.params,
             fetchRows: args?.limit,
             objectRows: false,
-            cursor: false
+            cursor: false,
         });
         // Create objects
         if (resp.rows && resp.fields) {

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

@@ -22,7 +22,7 @@ class RowConverter {
         const item = {
             fieldAlias: args.fieldAlias,
             dataType: args.dataType,
-            parse: args.parse
+            parse: args.parse,
         };
         this._properties[args.name] = item;
         return item;
@@ -33,7 +33,7 @@ class RowConverter {
         const converter = new RowConverter(args.type, this);
         const item = {
             converter,
-            type: args.type
+            type: args.type,
         };
         this._properties[args.name] = item;
         return item;
@@ -48,7 +48,7 @@ class RowConverter {
             keyField: args.keyField,
             findCommand: args.findCommand,
             sort: args.sort,
-            paramValues: []
+            paramValues: [],
         };
         this._properties[args.name] = item;
         return item;
@@ -129,7 +129,7 @@ class RowConverter {
                 if (!(prop.paramValues && prop.paramValues.length))
                     continue;
                 const resultType = this.resultType;
-                const promise = async function (p) {
+                const promise = (async function (p) {
                     const findCommand = p.findCommand;
                     let fld;
                     const map = new Map();
@@ -151,7 +151,7 @@ class RowConverter {
                                     arr.push(obj);
                                 });
                             }
-                        }
+                        },
                     });
                     if (r.length > findCommand.maxEagerFetch)
                         throw new Error(`Number of returning rows for "${propKey}" exceeds maxEagerFetch limit`);
@@ -171,7 +171,7 @@ class RowConverter {
                             }
                         }
                     }
-                }(prop);
+                })(prop);
                 promises.push(promise);
             }
             else if (isObjectProperty(prop)) {

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

@@ -30,12 +30,11 @@ class UpdateCommand {
             return 0;
         if (args.filter)
             await this._prepareFilter(ctx, args.filter);
-        const query = (0, builder_1.Update)(tableName + ' as T', ctx.queryValues)
-            .where(...ctx.queryFilter);
+        const query = (0, builder_1.Update)(tableName + ' as T', ctx.queryValues).where(...ctx.queryFilter);
         const qr = await args.connection.execute(query, {
             params: args.params ? [...args.params, ctx.queryParams] : ctx.queryParams,
             objectRows: false,
-            cursor: false
+            cursor: false,
         });
         return qr.rowsAffected || 0;
     }
@@ -69,7 +68,7 @@ class UpdateCommand {
                 ctx.queryValues[fieldName] = (0, builder_1.Param)({
                     name: k,
                     dataType: col.dataType,
-                    isArray: col.isArray
+                    isArray: col.isArray,
                 });
                 ctx.queryParams[k] = v;
                 ctx.colCount++;

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

@@ -2,14 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Column = void 0;
 const entity_metadata_js_1 = require("../model/entity-metadata.js");
+const orm_const_js_1 = require("../orm.const.js");
 function Column(arg0) {
+    return Column[orm_const_js_1.DECORATOR_FACTORY](arg0);
+}
+exports.Column = Column;
+Column[orm_const_js_1.DECORATOR_FACTORY] = function (arg0) {
     return (target, propertyKey) => {
         if (typeof propertyKey !== 'string')
             throw new Error('Symbol properties are not accepted');
         const options = (typeof arg0 === 'string' ? { dataType: arg0 } : arg0) || {};
         const entity = entity_metadata_js_1.EntityMetadata.define(target.constructor);
         if (!options.type) {
-            const typ = Reflect.getMetadata("design:type", entity.ctor.prototype, propertyKey);
+            const typ = Reflect.getMetadata('design:type', entity.ctor.prototype, propertyKey);
             if (typ === Array) {
                 options.type = String;
                 options.isArray = true;
@@ -19,5 +24,4 @@ function Column(arg0) {
         }
         entity_metadata_js_1.EntityMetadata.defineColumnField(entity, propertyKey, options);
     };
-}
-exports.Column = Column;
+};