@sqb/connect 4.12.0 → 4.12.1

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

@@ -53,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)();

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,9 +56,7 @@ class FindCommand {
             maxEagerFetch: args.maxEagerFetch,
         });
         await command.addFields({
-            pick: args.pick,
-            include: args.include,
-            omit: args.omit,
+            projection: args.projection,
             sort: args.sort,
         });
         if (args.filter)
@@ -71,22 +69,10 @@ 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 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 || '';
@@ -95,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);
@@ -125,9 +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;
@@ -145,9 +133,7 @@ class FindCommand {
                         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,9 +153,7 @@ class FindCommand {
                     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)

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

@@ -2,7 +2,12 @@
 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');
@@ -19,5 +24,4 @@ function Column(arg0) {
         }
         entity_metadata_js_1.EntityMetadata.defineColumnField(entity, propertyKey, options);
     };
-}
-exports.Column = Column;
+};

package/cjs/orm/orm.const.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.REPOSITORY_KEY = exports.ENTITY_METADATA_KEY = void 0;
+exports.DECORATOR_FACTORY = exports.REPOSITORY_KEY = exports.ENTITY_METADATA_KEY = void 0;
 exports.ENTITY_METADATA_KEY = Symbol.for('SQB_ENTITY_METADATA');
 exports.REPOSITORY_KEY = Symbol.for('SQB_REPOSITORY');
+exports.DECORATOR_FACTORY = Symbol.for('decorator.factory');

package/cjs/orm/repository.class.js

@@ -41,15 +41,16 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
             return this._exists(keyValue, { ...options, connection });
         }, options);
     }
+    existsOne(options) {
+        return this._execute(async (connection) => {
+            return this._existsOne({ ...options, connection });
+        }, options);
+    }
     count(options) {
         return this._execute(async (connection) => {
             return this._count({ ...options, connection });
         }, options);
     }
-    /** @deprecated - Use findById instead */
-    find(keyValue, options) {
-        return this.findById(keyValue, options);
-    }
     findById(keyValue, options) {
         return this._execute(async (connection) => {
             return this._find(keyValue, { ...options, connection });
@@ -132,11 +133,25 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
             else
                 filter.push(options.filter);
         }
-        return !!(await count_command_js_1.CountCommand.execute({
+        return this._existsOne({
+            ...options,
+            filter,
+        });
+    }
+    async _existsOne(options) {
+        const filter = [];
+        if (options && options.filter) {
+            if (Array.isArray(options.filter))
+                filter.push(...options.filter);
+            else
+                filter.push(options.filter);
+        }
+        const resp = await find_command_js_1.FindCommand.execute({
             ...options,
             filter,
             entity: this._entity,
-        }));
+        });
+        return resp.length > 0;
     }
     async _count(options) {
         return count_command_js_1.CountCommand.execute({

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

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseFieldsProjection = exports.FieldsProjection = void 0;
+const fast_tokenizer_1 = require("fast-tokenizer");
+const FIELD_PATTERN = /^([+-])?([a-z_$]\w*)$/i;
+const NO_DOT_BRACKET_PATTERN = /[^.]\(/g;
+class FieldsProjection {
+}
+exports.FieldsProjection = FieldsProjection;
+(function (FieldsProjection) {
+    class Item {
+    }
+    FieldsProjection.Item = Item;
+})(FieldsProjection || (exports.FieldsProjection = FieldsProjection = {}));
+function parseFieldsProjection(projection, keepCase) {
+    const arr = Array.isArray(projection) ? projection : [projection];
+    if (!(arr && arr.length))
+        return;
+    const out = new FieldsProjection();
+    for (let s of arr) {
+        if (!keepCase)
+            s = s.toLowerCase();
+        parse(s, out);
+    }
+    return out;
+}
+exports.parseFieldsProjection = parseFieldsProjection;
+function parse(input, target) {
+    /** Add dot before brackets which is required to split fields */
+    input = input.replace(NO_DOT_BRACKET_PATTERN, s => {
+        return s.charAt(0) + '.' + s.substring(1);
+    });
+    const fields = (0, fast_tokenizer_1.splitString)(input, {
+        delimiters: '.',
+        brackets: true,
+        keepBrackets: false,
+    });
+    for (let i = 0; i < fields.length; i++) {
+        const f = fields[i];
+        if (f.includes(',')) {
+            const subFields = (0, fast_tokenizer_1.splitString)(f, {
+                delimiters: ',',
+                brackets: true,
+                keepBrackets: true,
+            });
+            for (const n of subFields) {
+                parse(n, target);
+            }
+            continue;
+        }
+        const m = FIELD_PATTERN.exec(f);
+        /* istanbul ignore next */
+        if (!m)
+            throw new TypeError(`Invalid field path (${input})`);
+        const fieldName = m[2];
+        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();
+        }
+    }
+}

package/esm/index.js

@@ -28,4 +28,5 @@ export * from './orm/decorators/link.decorator.js';
 export * from './orm/decorators/primarykey.decorator.js';
 export * from './orm/decorators/transform.decorator.js';
 export { isColumnField, isEmbeddedField, isAssociationField, isEntityClass } from './orm/util/orm.helper.js';
+export * from './orm/util/parse-fields-projection.js';
 export * from './orm/backward.js';

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

@@ -47,7 +47,7 @@ export async function joinAssociation(joinInfos, association, parentAlias, inner
 }
 export async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T') {
     let srcOp;
-    if (isLogicalOperator(filter))
+    if (isLogicalOperator(filter) && filter._operatorType === trgOp._operatorType)
         srcOp = filter;
     else {
         srcOp = And();

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

@@ -1,9 +1,9 @@
 import { And, In, Param, Select } from '@sqb/builder';
-import { Entity } from '../decorators/entity.decorator.js';
 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 { RowConverter } from './row-converter.js';
 const SORT_ORDER_PATTERN = /^([-+])?(.*)$/;
@@ -53,9 +53,7 @@ export class FindCommand {
             maxEagerFetch: args.maxEagerFetch,
         });
         await command.addFields({
-            pick: args.pick,
-            include: args.include,
-            omit: args.omit,
+            projection: args.projection,
             sort: args.sort,
         });
         if (args.filter)
@@ -68,22 +66,10 @@ export 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.getFieldNames(entity.ctor).reduce((a, x) => {
-                const f = Entity.getField(entity.ctor, x);
-                if (f && !f.exclusive)
-                    a.push(x.toLowerCase());
-                return a;
-            }, []);
-        }
-        if (_include)
-            requestedFields.push(..._include);
+        const projection = typeof opts.projection === 'string' || Array.isArray(opts.projection)
+            ? 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 || '';
@@ -92,12 +78,16 @@ export 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 (isColumnField(col)) {
                 const fieldAlias = this._selectColumn(tableAlias, col, prefix, suffix);
@@ -122,9 +112,7 @@ export 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;
@@ -142,9 +130,7 @@ export class FindCommand {
                         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;
@@ -164,9 +150,7 @@ export class FindCommand {
                     await findCommand.filter(In(targetCol.name, 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)

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

@@ -1,5 +1,9 @@
 import { EntityMetadata } from '../model/entity-metadata.js';
+import { DECORATOR_FACTORY } from '../orm.const.js';
 export function Column(arg0) {
+    return Column[DECORATOR_FACTORY](arg0);
+}
+Column[DECORATOR_FACTORY] = function (arg0) {
     return (target, propertyKey) => {
         if (typeof propertyKey !== 'string')
             throw new Error('Symbol properties are not accepted');
@@ -16,4 +20,4 @@ export function Column(arg0) {
         }
         EntityMetadata.defineColumnField(entity, propertyKey, options);
     };
-}
+};

package/esm/orm/orm.const.js

@@ -1,2 +1,3 @@
 export const ENTITY_METADATA_KEY = Symbol.for('SQB_ENTITY_METADATA');
 export const REPOSITORY_KEY = Symbol.for('SQB_REPOSITORY');
+export const DECORATOR_FACTORY = Symbol.for('decorator.factory');

package/esm/orm/repository.class.js

@@ -38,15 +38,16 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
             return this._exists(keyValue, { ...options, connection });
         }, options);
     }
+    existsOne(options) {
+        return this._execute(async (connection) => {
+            return this._existsOne({ ...options, connection });
+        }, options);
+    }
     count(options) {
         return this._execute(async (connection) => {
             return this._count({ ...options, connection });
         }, options);
     }
-    /** @deprecated - Use findById instead */
-    find(keyValue, options) {
-        return this.findById(keyValue, options);
-    }
     findById(keyValue, options) {
         return this._execute(async (connection) => {
             return this._find(keyValue, { ...options, connection });
@@ -129,11 +130,25 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
             else
                 filter.push(options.filter);
         }
-        return !!(await CountCommand.execute({
+        return this._existsOne({
+            ...options,
+            filter,
+        });
+    }
+    async _existsOne(options) {
+        const filter = [];
+        if (options && options.filter) {
+            if (Array.isArray(options.filter))
+                filter.push(...options.filter);
+            else
+                filter.push(options.filter);
+        }
+        const resp = await FindCommand.execute({
             ...options,
             filter,
             entity: this._entity,
-        }));
+        });
+        return resp.length > 0;
     }
     async _count(options) {
         return CountCommand.execute({

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

@@ -0,0 +1,61 @@
+import { splitString } from 'fast-tokenizer';
+const FIELD_PATTERN = /^([+-])?([a-z_$]\w*)$/i;
+const NO_DOT_BRACKET_PATTERN = /[^.]\(/g;
+export class FieldsProjection {
+}
+(function (FieldsProjection) {
+    class Item {
+    }
+    FieldsProjection.Item = Item;
+})(FieldsProjection || (FieldsProjection = {}));
+export function parseFieldsProjection(projection, keepCase) {
+    const arr = Array.isArray(projection) ? projection : [projection];
+    if (!(arr && arr.length))
+        return;
+    const out = new FieldsProjection();
+    for (let s of arr) {
+        if (!keepCase)
+            s = s.toLowerCase();
+        parse(s, out);
+    }
+    return out;
+}
+function parse(input, target) {
+    /** Add dot before brackets which is required to split fields */
+    input = input.replace(NO_DOT_BRACKET_PATTERN, s => {
+        return s.charAt(0) + '.' + s.substring(1);
+    });
+    const fields = splitString(input, {
+        delimiters: '.',
+        brackets: true,
+        keepBrackets: false,
+    });
+    for (let i = 0; i < fields.length; i++) {
+        const f = fields[i];
+        if (f.includes(',')) {
+            const subFields = splitString(f, {
+                delimiters: ',',
+                brackets: true,
+                keepBrackets: true,
+            });
+            for (const n of subFields) {
+                parse(n, target);
+            }
+            continue;
+        }
+        const m = FIELD_PATTERN.exec(f);
+        /* istanbul ignore next */
+        if (!m)
+            throw new TypeError(`Invalid field path (${input})`);
+        const fieldName = m[2];
+        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();
+        }
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/connect",
   "description": "Multi-dialect database connection framework written with TypeScript",
-  "version": "4.12.0",
+  "version": "4.12.1",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>",
@@ -25,16 +25,18 @@
     "build:esm": "tsc -b tsconfig-build-esm.json",
     "postbuild": "cp README.md package.json ../../LICENSE ../../build/connect && cp ../../package.cjs.json ../../build/connect/cjs/package.json",
     "lint": "eslint . --max-warnings=0",
+    "lint:fix": "eslint . --max-warnings=0 --fix",
+    "format": "prettier . --write --log-level=warn",
     "test": "jest",
     "cover": "jest --collect-coverage",
     "clean": "npm run clean:src | npm run clean:dist | npm run clean:cover",
     "clean:src": "ts-cleanup -s src --all",
     "clean:dist": "rimraf ../../build/connectt",
-    "clean:cover": "rimraf ../../coverage/connect",
-    "format": "prettier . --write --log-level=warn"
+    "clean:cover": "rimraf ../../coverage/connect"
   },
   "dependencies": {
     "debug": "^4.3.5",
+    "fast-tokenizer": "^1.3.0",
     "lightning-pool": "^4.2.2",
     "lodash": "^4.17.21",
     "power-tasks": "^1.7.3",
@@ -47,10 +49,11 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
-    "@types/lodash": "^4.17.4"
+    "@types/lodash": "^4.17.5",
+    "postgresql-client": "^2.11.2"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.12.0",
+    "@sqb/builder": "^4.12.1",
     "reflect-metadata": "^0.2.2"
   },
   "engines": {

package/types/index.d.ts

@@ -28,4 +28,5 @@ export * from './orm/decorators/link.decorator.js';
 export * from './orm/decorators/primarykey.decorator.js';
 export * from './orm/decorators/transform.decorator.js';
 export { isColumnField, isEmbeddedField, isAssociationField, isEntityClass } from './orm/util/orm.helper.js';
+export * from './orm/util/parse-fields-projection.js';
 export * from './orm/backward.js';

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

@@ -2,6 +2,7 @@ import { SqbConnection } from '../../client/sqb-connection.js';
 import { AssociationNode } from '../model/association-node.js';
 import { EntityMetadata } from '../model/entity-metadata.js';
 import { Repository } from '../repository.class.js';
+import { FieldsProjection } from '../util/parse-fields-projection.js';
 import { RowConverter } from './row-converter.js';
 export type FindCommandArgs = {
     entity: EntityMetadata;
@@ -29,9 +30,7 @@ export declare class FindCommand {
         tableAlias?: string;
         converter?: RowConverter;
         entity?: EntityMetadata;
-        pick?: string[];
-        omit?: string[];
-        include?: string[];
+        projection?: FieldsProjection | string | string[];
         sort?: string[];
         prefix?: string;
         suffix?: string;

package/types/orm/decorators/column.decorator.d.ts

@@ -2,3 +2,4 @@ import { DataType } from '@sqb/builder';
 import { ColumnFieldOptions } from '../model/column-field-metadata.js';
 export declare function Column(type?: DataType): PropertyDecorator;
 export declare function Column(options?: ColumnFieldOptions): PropertyDecorator;
+export declare namespace Column { }

package/types/orm/model/field-metadata.d.ts

@@ -10,7 +10,7 @@ export interface FieldMetadata {
     hidden?: boolean;
     /**
      * Indicates whether or not to include this field by default when making queries.
-     * If this set to "true" the field must be requested using "include" or "pick" option.
+     * If this set to "true" the field must be requested using "projection" option.
      */
     exclusive?: boolean;
 }

package/types/orm/orm.const.d.ts

@@ -1,2 +1,3 @@
 export declare const ENTITY_METADATA_KEY: unique symbol;
 export declare const REPOSITORY_KEY: unique symbol;
+export declare const DECORATOR_FACTORY: unique symbol;

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

@@ -6,9 +6,7 @@ import { SqbConnection } from '../client/sqb-connection.js';
 import { QueryRequest, TransactionFunction } from '../client/types.js';
 import { EntityMetadata } from './model/entity-metadata.js';
 interface Projection {
-    pick?: string[];
-    omit?: string[];
-    include?: string[];
+    projection?: string | string[];
 }
 interface Filtering {
     filter?: LogicalOperator | LogicalOperator[] | object | object[];
@@ -31,7 +29,7 @@ export declare namespace Repository {
     }
     interface FindOptions extends CommandOptions, Projection, Filtering {
     }
-    interface FindOneOptions extends CommandOptions, Projection, Filtering {
+    interface FindOneOptions extends FindOptions {
         sort?: string[];
         offset?: number;
     }
@@ -44,6 +42,8 @@ export declare namespace Repository {
     }
     interface UpdateOptions extends CommandOptions, Projection, Filtering {
     }
+    interface UpdateOnlyOptions extends CommandOptions, Filtering {
+    }
     interface UpdateManyOptions extends CommandOptions, Filtering {
     }
 }
@@ -63,16 +63,15 @@ export declare class Repository<T> extends Repository_base {
     create(values: PartialDTO<T>, options?: Repository.CreateOptions): Promise<PartialDTO<T>>;
     createOnly(values: PartialDTO<T>, options?: StrictOmit<Repository.CreateOptions, keyof Projection>): Promise<void>;
     exists(keyValue: any | Record<string, any>, options?: Repository.ExistsOptions): Promise<boolean>;
+    existsOne(options?: Repository.ExistsOptions): Promise<boolean>;
     count(options?: Repository.CountOptions): Promise<number>;
-    /** @deprecated - Use findById instead */
-    find(keyValue: any | Record<string, any>, options?: Repository.FindOptions): Promise<PartialDTO<T> | undefined>;
     findById(keyValue: any | Record<string, any>, options?: Repository.FindOptions): Promise<PartialDTO<T> | undefined>;
     findOne(options?: Repository.FindOneOptions): Promise<PartialDTO<T> | undefined>;
     findMany(options?: Repository.FindManyOptions): Promise<PartialDTO<T>[]>;
     delete(keyValue: any | Record<string, any>, options?: Repository.DeleteOptions): Promise<boolean>;
     deleteMany(options?: Repository.DeleteManyOptions): Promise<number>;
     update(keyValue: any | Record<string, any>, values: PatchDTO<T>, options?: Repository.UpdateOptions): Promise<PartialDTO<T> | undefined>;
-    updateOnly(keyValue: any | Record<string, any>, values: PatchDTO<T>, options?: StrictOmit<Repository.UpdateOptions, keyof Projection>): Promise<boolean>;
+    updateOnly(keyValue: any | Record<string, any>, values: PatchDTO<T>, options?: Repository.UpdateOnlyOptions): Promise<boolean>;
     updateMany(values: PartialDTO<T>, options?: Repository.UpdateManyOptions): Promise<number>;
     protected _execute(fn: TransactionFunction, opts?: Repository.CommandOptions): Promise<any>;
     protected _create(values: PartialDTO<T>, options: Repository.CreateOptions & {
@@ -82,6 +81,9 @@ export declare class Repository<T> extends Repository_base {
     protected _exists(keyValue: any | Record<string, any>, options: Repository.ExistsOptions & {
         connection: SqbConnection;
     }): Promise<boolean>;
+    protected _existsOne(options: Repository.ExistsOptions & {
+        connection: SqbConnection;
+    }): Promise<boolean>;
     protected _count(options: Repository.CountOptions & {
         connection: SqbConnection;
     }): Promise<number>;

package/types/orm/util/parse-fields-projection.d.ts

@@ -0,0 +1,10 @@
+export declare class FieldsProjection {
+    [key: string]: FieldsProjection.Item;
+}
+export declare namespace FieldsProjection {
+    class Item {
+        sign?: string;
+        projection?: FieldsProjection;
+    }
+}
+export declare function parseFieldsProjection(projection: string | string[], keepCase?: boolean): FieldsProjection | undefined;