@sqb/connect 4.11.2 → 4.12.0

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

@@ -56,7 +56,7 @@ export class FindCommand {
             pick: args.pick,
             include: args.include,
             omit: args.omit,
-            sort: args.sort
+            sort: args.sort,
         });
         if (args.filter)
             await command.filter(args.filter);
@@ -68,12 +68,9 @@ 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;
+        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];
@@ -87,8 +84,7 @@ export class FindCommand {
         }
         if (_include)
             requestedFields.push(..._include);
-        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)) {
@@ -110,7 +106,7 @@ export class FindCommand {
                     name: col.name,
                     fieldAlias,
                     dataType: col.dataType,
-                    parse: col.parse
+                    parse: col.parse,
                 });
                 continue;
             }
@@ -118,7 +114,7 @@ export class FindCommand {
                 const typ = await EmbeddedFieldMetadata.resolveType(col);
                 const subConverter = converter.addObjectProperty({
                     name: col.name,
-                    type: typ.ctor
+                    type: typ.ctor,
                 }).converter;
                 await this.addFields({
                     tableAlias,
@@ -126,8 +122,7 @@ export class FindCommand {
                     entity: typ,
                     prefix: col.fieldNamePrefix,
                     suffix: col.fieldNameSuffix,
-                    pick: _pick?.includes(colNameLower) ? undefined :
-                        extractSubFields(colNameLower, _pick),
+                    pick: _pick?.includes(colNameLower) ? undefined : extractSubFields(colNameLower, _pick),
                     include: extractSubFields(colNameLower, _include),
                     omit: extractSubFields(colNameLower, _omit),
                     sort: extractSubFields(colNameLower, sortFields),
@@ -140,15 +135,14 @@ export class FindCommand {
                     const joinInfo = await 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),
+                        pick: _pick?.includes(colNameLower) ? undefined : extractSubFields(colNameLower, _pick),
                         include: extractSubFields(colNameLower, _include),
                         omit: extractSubFields(colNameLower, _omit),
                         sort: extractSubFields(colNameLower, sortFields),
@@ -164,14 +158,13 @@ export 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(In(targetCol.name, Param(parentField)));
                     const sort = sortFields && extractSubFields(colNameLower, sortFields);
                     await findCommand.addFields({
-                        pick: _pick?.includes(colNameLower) ? undefined :
-                            extractSubFields(colNameLower, _pick),
+                        pick: _pick?.includes(colNameLower) ? undefined : extractSubFields(colNameLower, _pick),
                         include: extractSubFields(colNameLower, _include),
                         omit: extractSubFields(colNameLower, _omit),
                         sort,
@@ -186,20 +179,18 @@ export 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 fieldAlias = tableAlias + '_' + fieldName;
+        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;
     }
@@ -256,12 +247,10 @@ export 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 = Select(...columnSqls)
-            .from(this.mainEntity.tableName + ' as ' + this.mainAlias);
+        const query = Select(...columnSqls).from(this.mainEntity.tableName + ' as ' + this.mainAlias);
         if (args.distinct)
             query.distinct();
         query.where(...this._filter._items);
@@ -280,7 +269,7 @@ export class FindCommand {
             params: args?.params,
             fetchRows: args?.limit,
             objectRows: false,
-            cursor: false
+            cursor: false,
         });
         // Create objects
         if (resp.rows && resp.fields) {

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

@@ -19,7 +19,7 @@ export class RowConverter {
         const item = {
             fieldAlias: args.fieldAlias,
             dataType: args.dataType,
-            parse: args.parse
+            parse: args.parse,
         };
         this._properties[args.name] = item;
         return item;
@@ -30,7 +30,7 @@ export 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;
@@ -45,7 +45,7 @@ export class RowConverter {
             keyField: args.keyField,
             findCommand: args.findCommand,
             sort: args.sort,
-            paramValues: []
+            paramValues: [],
         };
         this._properties[args.name] = item;
         return item;
@@ -126,7 +126,7 @@ export 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();
@@ -148,7 +148,7 @@ export class RowConverter {
                                     arr.push(obj);
                                 });
                             }
-                        }
+                        },
                     });
                     if (r.length > findCommand.maxEagerFetch)
                         throw new Error(`Number of returning rows for "${propKey}" exceeds maxEagerFetch limit`);
@@ -168,7 +168,7 @@ export class RowConverter {
                             }
                         }
                     }
-                }(prop);
+                })(prop);
                 promises.push(promise);
             }
             else if (isObjectProperty(prop)) {

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

@@ -27,12 +27,11 @@ export class UpdateCommand {
             return 0;
         if (args.filter)
             await this._prepareFilter(ctx, args.filter);
-        const query = Update(tableName + ' as T', ctx.queryValues)
-            .where(...ctx.queryFilter);
+        const query = 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;
     }
@@ -66,7 +65,7 @@ export class UpdateCommand {
                 ctx.queryValues[fieldName] = Param({
                     name: k,
                     dataType: col.dataType,
-                    isArray: col.isArray
+                    isArray: col.isArray,
                 });
                 ctx.queryParams[k] = v;
                 ctx.colCount++;

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

@@ -6,7 +6,7 @@ export function Column(arg0) {
         const options = (typeof arg0 === 'string' ? { dataType: arg0 } : arg0) || {};
         const entity = 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;

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

@@ -3,7 +3,7 @@ export function Embedded(type, options) {
     return (target, propertyKey) => {
         if (typeof propertyKey !== 'string')
             throw new Error('Symbol properties are not accepted');
-        type = type || Reflect.getMetadata("design:type", target, propertyKey);
+        type = type || Reflect.getMetadata('design:type', target, propertyKey);
         if (typeof type !== 'function')
             throw new Error('"type" must be defined');
         const entity = EntityMetadata.define(target.constructor);

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

@@ -111,7 +111,7 @@ export function Entity(options) {
             }
         };
         const pickKeys = keys.map(x => x.toLowerCase());
-        const filter = (k) => pickKeys.includes(k.toLowerCase());
+        const filter = k => pickKeys.includes(k.toLowerCase());
         applyMixins(PickEntityClass, classRef, filter);
         const srcMeta = EntityMetadata.get(classRef);
         if (srcMeta) {
@@ -128,7 +128,7 @@ export function Entity(options) {
             }
         };
         const omitKeys = keys.map(x => x.toLowerCase());
-        const filter = (k) => !omitKeys.includes(k.toLowerCase());
+        const filter = k => !omitKeys.includes(k.toLowerCase());
         applyMixins(OmitEntityClass, classRef, filter);
         const srcMeta = EntityMetadata.get(classRef);
         if (srcMeta) {

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

@@ -6,7 +6,7 @@ export function Link(options) {
     const fn = (target, propertyKey) => {
         if (typeof propertyKey !== 'string')
             throw new TypeError('Symbol properties are not allowed');
-        const reflectType = Reflect.getMetadata("design:type", target, propertyKey);
+        const reflectType = Reflect.getMetadata('design:type', target, propertyKey);
         if (!root) {
             if (reflectType === Array)
                 throw new TypeError(`Can't get type information while it is an array. Please define entity type`);

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

@@ -4,8 +4,7 @@ export function Parse(fn) {
         if (typeof propertyKey !== 'string')
             throw new Error('You can define a Column for only string properties');
         const entity = EntityMetadata.define(target.constructor);
-        EntityMetadata.defineColumnField(entity, propertyKey)
-            .parse = fn;
+        EntityMetadata.defineColumnField(entity, propertyKey).parse = fn;
     };
 }
 export function Serialize(fn) {
@@ -13,7 +12,6 @@ export function Serialize(fn) {
         if (typeof propertyKey !== 'string')
             throw new Error('You can define a Column for only string properties');
         const entity = EntityMetadata.define(target.constructor);
-        EntityMetadata.defineColumnField(entity, propertyKey)
-            .serialize = fn;
+        EntityMetadata.defineColumnField(entity, propertyKey).serialize = fn;
     };
 }

package/esm/orm/model/association-field-metadata.js

@@ -6,7 +6,7 @@ export var AssociationFieldMetadata;
             kind: 'association',
             entity,
             name,
-            association
+            association,
         };
         if (options)
             AssociationFieldMetadata.assign(result, options);

package/esm/orm/model/association.js

@@ -78,8 +78,7 @@ 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
@@ -92,8 +91,7 @@ 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

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

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

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

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

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

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

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

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

package/esm/orm/repository.class.js

@@ -22,8 +22,7 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
     create(values, options) {
         return this._execute(async (connection) => {
             const keyValue = await this._create(values, { ...options, connection, returning: true });
-            const result = keyValue &&
-                await this._find(keyValue, { ...options, connection });
+            const result = keyValue && (await this._find(keyValue, { ...options, connection }));
             if (!result)
                 throw new Error('Unable to insert new row');
             return result;
@@ -116,7 +115,7 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
         const keyValues = await CreateCommand.execute({
             ...options,
             entity: this._entity,
-            values
+            values,
         });
         if (options.returning && !keyValues)
             throw new Error('Unable to insert new row');
@@ -133,13 +132,13 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
         return !!(await CountCommand.execute({
             ...options,
             filter,
-            entity: this._entity
+            entity: this._entity,
         }));
     }
     async _count(options) {
         return CountCommand.execute({
             ...options,
-            entity: this._entity
+            entity: this._entity,
         });
     }
     async _findMany(options) {
@@ -151,7 +150,7 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
     async _findOne(options) {
         const rows = await this._findMany({
             ...options,
-            limit: 1
+            limit: 1,
         });
         return rows && rows[0];
     }
@@ -184,7 +183,7 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
             ...options,
             entity: this._entity,
             filter: options?.filter,
-            params: options?.params
+            params: options?.params,
         });
     }
     async _update(keyValue, values, options) {
@@ -204,7 +203,7 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
             ...options,
             entity: this._entity,
             values: updateValues,
-            filter
+            filter,
         });
         return rowsAffected ? keyValues : undefined;
     }
@@ -214,7 +213,7 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
         return await UpdateCommand.execute({
             ...options,
             entity: this._entity,
-            values
+            values,
         });
     }
 }

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

@@ -1,9 +1,11 @@
 export function applyMixins(derivedCtor, baseCtor, filter) {
     for (const name of Object.getOwnPropertyNames(baseCtor.prototype)) {
-        if ((name === 'constructor' || name === '__proto__' || name === 'toJSON' || name === 'toString') ||
-            filter && !filter(name))
+        if (name === 'constructor' ||
+            name === '__proto__' ||
+            name === 'toJSON' ||
+            name === 'toString' ||
+            (filter && !filter(name)))
             continue;
-        Object.defineProperty(derivedCtor.prototype, name, Object.getOwnPropertyDescriptor(baseCtor.prototype, name) ||
-            Object.create(null));
+        Object.defineProperty(derivedCtor.prototype, name, Object.getOwnPropertyDescriptor(baseCtor.prototype, name) || Object.create(null));
     }
 }

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

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

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

@@ -17,19 +17,19 @@ 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)) {
-        return v.getFullYear() + '-' +
-            padZero(v.getMonth() + 1) + '-' +
-            padZero(v.getDate()) + (dataType === DataType.TIMESTAMP ?
-            'T' + padZero(v.getHours()) + ':' +
-                padZero(v.getMinutes()) + ':' +
-                padZero(v.getSeconds()) : '');
+    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())
+                : ''));
     }
     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.11.2",
+  "version": "4.12.0",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>",
@@ -30,10 +30,11 @@
     "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"
+    "clean:cover": "rimraf ../../coverage/connect",
+    "format": "prettier . --write --log-level=warn"
   },
   "dependencies": {
-    "debug": "^4.3.4",
+    "debug": "^4.3.5",
     "lightning-pool": "^4.2.2",
     "lodash": "^4.17.21",
     "power-tasks": "^1.7.3",
@@ -41,16 +42,16 @@
     "putil-merge": "^3.12.1",
     "putil-promisify": "^1.10.1",
     "putil-varhelpers": "^1.6.5",
-    "reflect-metadata": "^0.2.1",
     "strict-typed-events": "^2.3.3",
-    "ts-gems": "^3.2.1"
+    "ts-gems": "^3.4.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
-    "@types/lodash": "^4.17.0"
+    "@types/lodash": "^4.17.4"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.11.2"
+    "@sqb/builder": "^4.12.0",
+    "reflect-metadata": "^0.2.2"
   },
   "engines": {
     "node": ">=16.0",

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

@@ -28,8 +28,8 @@ export declare namespace Entity {
     function mixin<A, B, C, D>(derivedCtor: Type<A>, baseB: Type<B>, baseC: Type<C>, baseD: Type<D>): Type<A & B & C & D>;
     function mixin<A, B, C, D, E>(derivedCtor: Type<A>, baseB: Type<B>, baseC: Type<C>, baseD: Type<D>, baseE: Type<E>): Type<A & B & C & D & E>;
     function mixin<A, B, C, D, E, F>(derivedCtor: Type<A>, baseB: Type<B>, baseC: Type<C>, baseD: Type<D>, baseE: Type<E>, baseF: Type<F>): Type<A & B & C & D & E & F>;
-    function Pick<T, K extends keyof T>(classRef: Type<T>, keys: readonly K[]): Type<Pick<T, typeof keys[number]>>;
-    function Omit<T, K extends keyof T>(classRef: Type<T>, keys: readonly K[]): Type<Omit<T, typeof keys[number]>>;
+    function Pick<T, K extends keyof T>(classRef: Type<T>, keys: readonly K[]): Type<Pick<T, (typeof keys)[number]>>;
+    function Omit<T, K extends keyof T>(classRef: Type<T>, keys: readonly K[]): Type<Omit<T, (typeof keys)[number]>>;
     function Union<A, B>(baseA: Type<A>, baseB: Type<B>): Type<A & B>;
     function Union<A, B, C>(baseA: Type<A>, baseB: Type<B>, baseC: Type<C>): Type<A & B & C>;
     function Union<A, B, C, D>(baseA: Type<A>, baseB: Type<B>, baseC: Type<C>, baseD: Type<D>): Type<A & B & C & D>;

package/types/orm/orm.type.d.ts

@@ -8,7 +8,7 @@ export type ColumnAutoGenerationStrategy = 'increment' | 'uuid' | 'rowid' | 'tim
 export type ColumnTransformFunction = (value: any, name: string) => any;
 export type TypeResolver<T> = () => Type<T> | Promise<Type<T>>;
 export type TypeThunk<T = any> = Type<T> | TypeResolver<T>;
-export type EnumValue = (FieldValue)[] | Object;
+export type EnumValue = FieldValue[] | Object;
 export type FieldValue = string | number | boolean | Date | null;
 export type DefaultValueGetter = (obj?: any) => FieldValue | undefined;
 export interface AssociationSettings {

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

@@ -1,4 +1,5 @@
 import { PartialDTO, PatchDTO, StrictOmit, Type } from 'ts-gems';
+import { LogicalOperator } from '@sqb/builder';
 import { FieldInfoMap } from '../client/field-info-map.js';
 import { SqbClient } from '../client/sqb-client.js';
 import { SqbConnection } from '../client/sqb-connection.js';
@@ -10,7 +11,7 @@ interface Projection {
     include?: string[];
 }
 interface Filtering {
-    filter?: any;
+    filter?: LogicalOperator | LogicalOperator[] | object | object[];
     params?: any;
 }
 export declare namespace Repository {