@sqb/connect 4.15.0 → 4.16.0

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

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntityMetadata = void 0;
-const builder_1 = require("@sqb/builder");
-const orm_const_js_1 = require("../orm.const.js");
-const orm_helper_js_1 = require("../util/orm.helper.js");
-const association_js_1 = require("./association.js");
-const association_field_metadata_js_1 = require("./association-field-metadata.js");
-const column_field_metadata_js_1 = require("./column-field-metadata.js");
-const embedded_field_metadata_js_1 = require("./embedded-field-metadata.js");
-var EntityMetadata;
+import { DataType } from '@sqb/builder';
+import { ENTITY_METADATA_KEY } from '../orm.const.js';
+import { isAssociationField, isColumnField, isEmbeddedField } from '../util/orm.helper.js';
+import { Association } from './association.js';
+import { AssociationFieldMetadata } from './association-field-metadata.js';
+import { ColumnFieldMetadata } from './column-field-metadata.js';
+import { EmbeddedFieldMetadata } from './embedded-field-metadata.js';
+export var EntityMetadata;
 (function (EntityMetadata) {
     function define(ctor) {
         const own = getOwn(ctor);
@@ -23,7 +20,7 @@ var EntityMetadata;
             foreignKeys: [],
             eventListeners: {},
         };
-        Reflect.defineMetadata(orm_const_js_1.ENTITY_METADATA_KEY, meta, ctor);
+        Reflect.defineMetadata(ENTITY_METADATA_KEY, meta, ctor);
         // Merge base entity columns into this one
         if (baseMeta) {
             EntityMetadata.mixin(meta, baseMeta);
@@ -32,11 +29,11 @@ var EntityMetadata;
     }
     EntityMetadata.define = define;
     function get(ctor) {
-        return Reflect.getMetadata(orm_const_js_1.ENTITY_METADATA_KEY, ctor);
+        return Reflect.getMetadata(ENTITY_METADATA_KEY, ctor);
     }
     EntityMetadata.get = get;
     function getOwn(ctor) {
-        return Reflect.getOwnMetadata(orm_const_js_1.ENTITY_METADATA_KEY, ctor);
+        return Reflect.getOwnMetadata(ENTITY_METADATA_KEY, ctor);
     }
     EntityMetadata.getOwn = getOwn;
     function getField(entity, fieldName) {
@@ -45,21 +42,21 @@ var EntityMetadata;
     EntityMetadata.getField = getField;
     function getColumnField(entity, fieldName) {
         const el = getField(entity, fieldName);
-        if (el && !(0, orm_helper_js_1.isColumnField)(el))
+        if (el && !isColumnField(el))
             throw new Error(`"${el.name}" requested as "column" but it is "${el.kind}"`);
         return el;
     }
     EntityMetadata.getColumnField = getColumnField;
     function getEmbeddedField(entity, fieldName) {
         const el = getField(entity, fieldName);
-        if (el && !(0, orm_helper_js_1.isEmbeddedField)(el))
+        if (el && !isEmbeddedField(el))
             throw new Error(`"${el.name}" requested as "embedded" but it is "${el.kind}"`);
         return el;
     }
     EntityMetadata.getEmbeddedField = getEmbeddedField;
     function getAssociationField(entity, fieldName) {
         const el = getField(entity, fieldName);
-        if (el && !(0, orm_helper_js_1.isAssociationField)(el)) {
+        if (el && !isAssociationField(el)) {
             throw new Error(`"${el.name}" requested as "association" but it is "${el.kind}"`);
         }
         return el;
@@ -74,7 +71,7 @@ var EntityMetadata;
             return;
         fieldName = fieldName.toLowerCase();
         for (const prop of Object.values(entity.fields)) {
-            if ((0, orm_helper_js_1.isColumnField)(prop) && prop.fieldName.toLowerCase() === fieldName)
+            if (isColumnField(prop) && prop.fieldName.toLowerCase() === fieldName)
                 return prop;
         }
     }
@@ -101,27 +98,27 @@ var EntityMetadata;
     }
     EntityMetadata.getFieldNames = getFieldNames;
     function getColumnFieldNames(entity) {
-        return getFieldNames(entity, orm_helper_js_1.isColumnField);
+        return getFieldNames(entity, isColumnField);
     }
     EntityMetadata.getColumnFieldNames = getColumnFieldNames;
     function getEmbeddedFieldNames(entity) {
-        return getFieldNames(entity, orm_helper_js_1.isEmbeddedField);
+        return getFieldNames(entity, isEmbeddedField);
     }
     EntityMetadata.getEmbeddedFieldNames = getEmbeddedFieldNames;
     function getAssociationFieldNames(entity) {
-        return getFieldNames(entity, orm_helper_js_1.isAssociationField);
+        return getFieldNames(entity, isAssociationField);
     }
     EntityMetadata.getAssociationFieldNames = getAssociationFieldNames;
     function getNonAssociationFieldNames(entity) {
-        return getFieldNames(entity, x => !(0, orm_helper_js_1.isAssociationField)(x));
+        return getFieldNames(entity, x => !isAssociationField(x));
     }
     EntityMetadata.getNonAssociationFieldNames = getNonAssociationFieldNames;
     function getInsertColumnNames(entity) {
-        return getFieldNames(entity, x => (0, orm_helper_js_1.isColumnField)(x) && !x.noInsert);
+        return getFieldNames(entity, x => isColumnField(x) && !x.noInsert);
     }
     EntityMetadata.getInsertColumnNames = getInsertColumnNames;
     function getUpdateColumnNames(entity) {
-        return getFieldNames(entity, x => (0, orm_helper_js_1.isColumnField)(x) && !x.noUpdate);
+        return getFieldNames(entity, x => isColumnField(x) && !x.noUpdate);
     }
     EntityMetadata.getUpdateColumnNames = getUpdateColumnNames;
     function getPrimaryIndex(entity) {
@@ -164,7 +161,7 @@ var EntityMetadata;
     EntityMetadata.addIndex = addIndex;
     function addForeignKey(entity, propertyKey, target, targetKey) {
         entity.foreignKeys = entity.foreignKeys || [];
-        const fk = new association_js_1.Association(entity.name + '.' + propertyKey, {
+        const fk = new Association(entity.name + '.' + propertyKey, {
             source: entity.ctor,
             sourceKey: propertyKey,
             target,
@@ -184,30 +181,30 @@ var EntityMetadata;
     function defineColumnField(entity, name, options = {}) {
         delete entity._fieldNames;
         let prop = EntityMetadata.getField(entity, name);
-        if ((0, orm_helper_js_1.isColumnField)(prop))
+        if (isColumnField(prop))
             options = { ...prop, ...options };
         if (!options.type) {
             switch (options.dataType) {
-                case builder_1.DataType.BOOL:
+                case DataType.BOOL:
                     options.type = Boolean;
                     break;
-                case builder_1.DataType.VARCHAR:
-                case builder_1.DataType.CHAR:
-                case builder_1.DataType.TEXT:
+                case DataType.VARCHAR:
+                case DataType.CHAR:
+                case DataType.TEXT:
                     options.type = String;
                     break;
-                case builder_1.DataType.NUMBER:
-                case builder_1.DataType.DOUBLE:
-                case builder_1.DataType.FLOAT:
-                case builder_1.DataType.INTEGER:
-                case builder_1.DataType.SMALLINT:
+                case DataType.NUMBER:
+                case DataType.DOUBLE:
+                case DataType.FLOAT:
+                case DataType.INTEGER:
+                case DataType.SMALLINT:
                     options.type = Number;
                     break;
-                case builder_1.DataType.TIMESTAMP:
-                case builder_1.DataType.TIMESTAMPTZ:
+                case DataType.TIMESTAMP:
+                case DataType.TIMESTAMPTZ:
                     options.type = Date;
                     break;
-                case builder_1.DataType.BINARY:
+                case DataType.BINARY:
                     options.type = Buffer;
                     break;
                 default:
@@ -217,26 +214,26 @@ var EntityMetadata;
         if (!options.dataType) {
             switch (options.type) {
                 case Boolean:
-                    options.dataType = builder_1.DataType.BOOL;
+                    options.dataType = DataType.BOOL;
                     break;
                 case Number:
-                    options.dataType = builder_1.DataType.NUMBER;
+                    options.dataType = DataType.NUMBER;
                     break;
                 case Date:
-                    options.dataType = builder_1.DataType.TIMESTAMP;
+                    options.dataType = DataType.TIMESTAMP;
                     break;
                 case Array:
-                    options.dataType = builder_1.DataType.VARCHAR;
+                    options.dataType = DataType.VARCHAR;
                     options.isArray = true;
                     break;
                 case Buffer:
-                    options.dataType = builder_1.DataType.BINARY;
+                    options.dataType = DataType.BINARY;
                     break;
                 default:
-                    options.dataType = builder_1.DataType.VARCHAR;
+                    options.dataType = DataType.VARCHAR;
             }
         }
-        prop = column_field_metadata_js_1.ColumnFieldMetadata.create(entity, name, options);
+        prop = ColumnFieldMetadata.create(entity, name, options);
         entity.fields[name.toLowerCase()] = prop;
         return prop;
     }
@@ -244,16 +241,16 @@ var EntityMetadata;
     function defineEmbeddedField(entity, name, type, options) {
         delete entity._fieldNames;
         let prop = EntityMetadata.getField(entity, name);
-        if ((0, orm_helper_js_1.isEmbeddedField)(prop))
+        if (isEmbeddedField(prop))
             options = { ...prop, ...options };
-        prop = embedded_field_metadata_js_1.EmbeddedFieldMetadata.create(entity, name, type, options);
+        prop = EmbeddedFieldMetadata.create(entity, name, type, options);
         entity.fields[name.toLowerCase()] = prop;
         return prop;
     }
     EntityMetadata.defineEmbeddedField = defineEmbeddedField;
     function defineAssociationField(entity, propertyKey, association, options) {
         delete entity._fieldNames;
-        const prop = association_field_metadata_js_1.AssociationFieldMetadata.create(entity, propertyKey, association, options);
+        const prop = AssociationFieldMetadata.create(entity, propertyKey, association, options);
         let l = association;
         let i = 1;
         while (l) {
@@ -298,7 +295,7 @@ var EntityMetadata;
             derived.foreignKeys = derived.foreignKeys || [];
             for (const fk of base.foreignKeys) {
                 if (!fk.sourceKey || hasField(fk.sourceKey)) {
-                    const newFk = new association_js_1.Association(fk.name, { ...fk, source: derived.ctor });
+                    const newFk = new Association(fk.name, { ...fk, source: derived.ctor });
                     derived.foreignKeys.push(newFk);
                 }
             }
@@ -321,4 +318,4 @@ var EntityMetadata;
         }
     }
     EntityMetadata.mixin = mixin;
-})(EntityMetadata || (exports.EntityMetadata = EntityMetadata = {}));
+})(EntityMetadata || (EntityMetadata = {}));

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

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

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

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

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

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LinkChain = void 0;
-const association_node_js_1 = require("./association-node.js");
-class LinkChain {
+import { AssociationNode } from './association-node.js';
+export class LinkChain {
     constructor(target, targetKey, sourceKey, many) {
         this.target = target;
-        this.first = this.current = new association_node_js_1.AssociationNode('', {
+        this.first = this.current = new AssociationNode('', {
             many,
             target,
             source: null,
@@ -28,7 +25,7 @@ class LinkChain {
         return this._newNode(target, targetColumn, parentColumn, true);
     }
     _newNode(target, targetKey, parentKey, many = false) {
-        const child = new association_node_js_1.AssociationNode(this.current.name, {
+        const child = new AssociationNode(this.current.name, {
             many,
             source: this.current.target,
             target,
@@ -41,4 +38,3 @@ class LinkChain {
         return this;
     }
 }
-exports.LinkChain = LinkChain;

package/esm/orm/orm.const.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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');
+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/orm.type.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/esm/orm/repository.class.js

@@ -1,19 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Repository = void 0;
-const strict_typed_events_1 = require("strict-typed-events");
-const sqb_connection_js_1 = require("../client/sqb-connection.js");
-const count_command_js_1 = require("./commands/count.command.js");
-const create_command_js_1 = require("./commands/create.command.js");
-const delete_command_js_1 = require("./commands/delete.command.js");
-const find_command_js_1 = require("./commands/find.command.js");
-const update_command_js_1 = require("./commands/update.command.js");
-const extract_keyvalues_js_1 = require("./util/extract-keyvalues.js");
+import { AsyncEventEmitter, TypedEventEmitterClass } from 'strict-typed-events';
+import { SqbConnection } from '../client/sqb-connection.js';
+import { CountCommand } from './commands/count.command.js';
+import { CreateCommand } from './commands/create.command.js';
+import { DeleteCommand } from './commands/delete.command.js';
+import { FindCommand } from './commands/find.command.js';
+import { UpdateCommand } from './commands/update.command.js';
+import { extractKeyValues } from './util/extract-keyvalues.js';
 /**
  * @class Repository
  * @template T - The data type class type of the record
  */
-class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_typed_events_1.AsyncEventEmitter) {
+export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
     constructor(entityDef, executor, schema) {
         super();
         this._executor = executor;
@@ -137,7 +134,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
     }
     async _execute(fn, opts) {
         let connection = opts?.connection;
-        if (!connection && this._executor instanceof sqb_connection_js_1.SqbConnection)
+        if (!connection && this._executor instanceof SqbConnection)
             connection = this._executor;
         if (connection) {
             if (this._schema)
@@ -154,7 +151,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
     async _create(values, options) {
         if (!values)
             throw new TypeError('You must provide values');
-        const keyValues = await create_command_js_1.CreateCommand.execute({
+        const keyValues = await CreateCommand.execute({
             ...options,
             entity: this._entity,
             values,
@@ -164,7 +161,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
         return keyValues;
     }
     async _exists(keyValue, options) {
-        const filter = [(0, extract_keyvalues_js_1.extractKeyValues)(this._entity, keyValue, true)];
+        const filter = [extractKeyValues(this._entity, keyValue, true)];
         if (options && options.filter) {
             if (Array.isArray(options.filter))
                 filter.push(...options.filter);
@@ -184,7 +181,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
             else
                 filter.push(options.filter);
         }
-        const resp = await find_command_js_1.FindCommand.execute({
+        const resp = await FindCommand.execute({
             ...options,
             filter,
             entity: this._entity,
@@ -192,13 +189,13 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
         return resp.length > 0;
     }
     async _count(options) {
-        return count_command_js_1.CountCommand.execute({
+        return CountCommand.execute({
             ...options,
             entity: this._entity,
         });
     }
     async _findMany(options) {
-        return await find_command_js_1.FindCommand.execute({
+        return await FindCommand.execute({
             ...options,
             entity: this._entity,
         });
@@ -211,7 +208,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
         return rows && rows[0];
     }
     async _find(keyValue, options) {
-        const filter = [(0, extract_keyvalues_js_1.extractKeyValues)(this._entity, keyValue, true)];
+        const filter = [extractKeyValues(this._entity, keyValue, true)];
         if (options && options.filter) {
             if (Array.isArray(options.filter))
                 filter.push(...options.filter);
@@ -221,21 +218,21 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
         return await this._findOne({ ...options, filter, offset: 0 });
     }
     async _delete(keyValue, options) {
-        const filter = [(0, extract_keyvalues_js_1.extractKeyValues)(this._entity, keyValue, true)];
+        const filter = [extractKeyValues(this._entity, keyValue, true)];
         if (options && options.filter) {
             if (Array.isArray(options.filter))
                 filter.push(...options.filter);
             else
                 filter.push(options.filter);
         }
-        return !!(await delete_command_js_1.DeleteCommand.execute({
+        return !!(await DeleteCommand.execute({
             ...options,
             filter,
             entity: this._entity,
         }));
     }
     async _deleteMany(options) {
-        return delete_command_js_1.DeleteCommand.execute({
+        return DeleteCommand.execute({
             ...options,
             entity: this._entity,
             filter: options?.filter,
@@ -245,7 +242,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
     async _update(keyValue, values, options) {
         if (!values)
             throw new TypeError('You must provide values');
-        const keyValues = (0, extract_keyvalues_js_1.extractKeyValues)(this._entity, keyValue, true);
+        const keyValues = extractKeyValues(this._entity, keyValue, true);
         const filter = [keyValues];
         if (options.filter) {
             if (Array.isArray(options.filter))
@@ -255,7 +252,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
         }
         const updateValues = { ...values };
         Object.keys(keyValues).forEach(k => delete updateValues[k]);
-        const rowsAffected = await update_command_js_1.UpdateCommand.execute({
+        const rowsAffected = await UpdateCommand.execute({
             ...options,
             entity: this._entity,
             values: updateValues,
@@ -266,11 +263,10 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
     async _updateMany(values, options) {
         if (!values)
             throw new TypeError('You must provide values');
-        return await update_command_js_1.UpdateCommand.execute({
+        return await UpdateCommand.execute({
             ...options,
             entity: this._entity,
             values,
         });
     }
 }
-exports.Repository = Repository;

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

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyMixins = applyMixins;
-function applyMixins(derivedCtor, baseCtor, filter) {
+export function applyMixins(derivedCtor, baseCtor, filter) {
     for (const name of Object.getOwnPropertyNames(baseCtor.prototype)) {
         if (name === 'constructor' ||
             name === '__proto__' ||

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

@@ -1,17 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractKeyValues = extractKeyValues;
-const entity_metadata_js_1 = require("../model/entity-metadata.js");
-const orm_helper_js_1 = require("./orm.helper.js");
-function extractKeyValues(entityDef, valueOrInstance, keepOther) {
-    const primaryIndex = entity_metadata_js_1.EntityMetadata.getPrimaryIndex(entityDef);
+import { EntityMetadata } from '../model/entity-metadata.js';
+import { isColumnField } from './orm.helper.js';
+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 col = entity_metadata_js_1.EntityMetadata.getField(entityDef, k);
+        const col = EntityMetadata.getField(entityDef, k);
         if (!col)
             throw new Error(`Unknown column (${k}) defined as primary key in entity "${entityDef.name}"`);
-        if (!(0, orm_helper_js_1.isColumnField)(col)) {
+        if (!isColumnField(col)) {
             throw new Error(`Column (${k}) defined as primary key in entity "${entityDef.name}" is not a data column`);
         }
     };

package/esm/orm/util/orm.helper.js

@@ -1,26 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAssociationField = exports.isEmbeddedField = void 0;
-exports.isClass = isClass;
-exports.isEntityClass = isEntityClass;
-exports.isColumnField = isColumnField;
-exports.resolveEntity = resolveEntity;
-exports.resolveEntityMeta = resolveEntityMeta;
-const orm_const_js_1 = require("../orm.const.js");
-function isClass(fn) {
+import { ENTITY_METADATA_KEY } from '../orm.const.js';
+export function isClass(fn) {
     return typeof fn === 'function' && /^\s*class/.test(fn.toString());
 }
-function isEntityClass(fn) {
-    return isClass(fn) && Reflect.hasMetadata(orm_const_js_1.ENTITY_METADATA_KEY, fn);
+export function isEntityClass(fn) {
+    return isClass(fn) && Reflect.hasMetadata(ENTITY_METADATA_KEY, fn);
 }
-function isColumnField(f) {
+export function isColumnField(f) {
     return !!(f && f.name && f.kind === 'column');
 }
-const isEmbeddedField = (f) => !!(f && f.name && f.kind === 'object');
-exports.isEmbeddedField = isEmbeddedField;
-const isAssociationField = (f) => !!(f && f.name && f.kind === 'association');
-exports.isAssociationField = isAssociationField;
-async function resolveEntity(ctorThunk) {
+export const isEmbeddedField = (f) => !!(f && f.name && f.kind === 'object');
+export const isAssociationField = (f) => !!(f && f.name && f.kind === 'association');
+export async function resolveEntity(ctorThunk) {
     if (typeof ctorThunk !== 'function')
         return;
     if (!isClass(ctorThunk))
@@ -28,7 +18,7 @@ async function resolveEntity(ctorThunk) {
     if (isEntityClass(ctorThunk))
         return ctorThunk;
 }
-async function resolveEntityMeta(ctorThunk) {
+export async function resolveEntityMeta(ctorThunk) {
     const ctor = await resolveEntity(ctorThunk);
-    return ctor && Reflect.getMetadata(orm_const_js_1.ENTITY_METADATA_KEY, ctor);
+    return ctor && Reflect.getMetadata(ENTITY_METADATA_KEY, ctor);
 }

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

@@ -1,19 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FieldsProjection = void 0;
-exports.parseFieldsProjection = parseFieldsProjection;
-const fast_tokenizer_1 = require("fast-tokenizer");
+import { splitString } from 'fast-tokenizer';
 const FIELD_PATTERN = /^([+-])?([a-z_$]\w*)$/i;
 const NO_DOT_BRACKET_PATTERN = /[^.]\(/g;
-class FieldsProjection {
+export class FieldsProjection {
 }
-exports.FieldsProjection = FieldsProjection;
 (function (FieldsProjection) {
     class Item {
     }
     FieldsProjection.Item = Item;
-})(FieldsProjection || (exports.FieldsProjection = FieldsProjection = {}));
-function parseFieldsProjection(projection, keepCase) {
+})(FieldsProjection || (FieldsProjection = {}));
+export function parseFieldsProjection(projection, keepCase) {
     const arr = Array.isArray(projection) ? projection : [projection];
     if (!(arr && arr.length))
         return;
@@ -28,7 +23,7 @@ function parseFieldsProjection(projection, keepCase) {
 function parse(input, target) {
     /** Add dot before brackets which is required to split fields */
     input = input.replace(NO_DOT_BRACKET_PATTERN, s => s.charAt(0) + '.' + s.substring(1));
-    const fields = (0, fast_tokenizer_1.splitString)(input, {
+    const fields = splitString(input, {
         delimiters: '.',
         brackets: true,
         keepBrackets: false,
@@ -36,7 +31,7 @@ function parse(input, target) {
     for (let i = 0; i < fields.length; i++) {
         const f = fields[i];
         if (f.includes(',')) {
-            const subFields = (0, fast_tokenizer_1.splitString)(f, {
+            const subFields = splitString(f, {
                 delimiters: ',',
                 brackets: true,
                 keepBrackets: true,

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

@@ -1,16 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.serializeColumn = serializeColumn;
-const builder_1 = require("@sqb/builder");
-const orm_helper_js_1 = require("./orm.helper.js");
-function serializeColumn(col, v) {
-    if ((0, orm_helper_js_1.isColumnField)(col)) {
+import { DataType } from '@sqb/builder';
+import { isColumnField } from './orm.helper.js';
+export function serializeColumn(col, v) {
+    if (isColumnField(col)) {
         if (col.isArray) {
             if (Array.isArray(v))
-                return v.map(x => serializeDataValue(col.dataType || builder_1.DataType.VARCHAR, x));
-            return [serializeDataValue(col.dataType || builder_1.DataType.VARCHAR, v)];
+                return v.map(x => serializeDataValue(col.dataType || DataType.VARCHAR, x));
+            return [serializeDataValue(col.dataType || DataType.VARCHAR, v)];
         }
-        return serializeDataValue(col.dataType || builder_1.DataType.VARCHAR, v);
+        return serializeDataValue(col.dataType || DataType.VARCHAR, v);
     }
     if (typeof v === 'object' && typeof v.toJSON === 'function')
         return v.toJSON();
@@ -20,19 +17,19 @@ const padZero = (n) => (n < 9 ? '0' : '') + n;
 function serializeDataValue(dataType, v) {
     if (v == null)
         return;
-    if (v instanceof Date && (dataType === builder_1.DataType.DATE || dataType === builder_1.DataType.TIMESTAMP)) {
+    if (v instanceof Date && (dataType === DataType.DATE || dataType === DataType.TIMESTAMP)) {
         return (v.getFullYear() +
             '-' +
             padZero(v.getMonth() + 1) +
             '-' +
             padZero(v.getDate()) +
-            (dataType === builder_1.DataType.TIMESTAMP
+            (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 === builder_1.DataType.SMALLINT || dataType === builder_1.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.15.0",
+  "version": "4.16.0",
   "author": "Panates",
   "license": "Apache-2.0",
   "scripts": {
@@ -27,21 +27,21 @@
     "fast-tokenizer": "^1.4.0",
     "lightning-pool": "^4.5.0",
     "lodash": "^4.17.21",
-    "power-tasks": "^1.8.0",
+    "power-tasks": "^1.9.0",
     "putil-isplainobject": "^1.1.5",
     "putil-merge": "^3.13.0",
     "putil-promisify": "^1.10.1",
     "putil-varhelpers": "^1.6.5",
-    "strict-typed-events": "^2.5.0",
+    "strict-typed-events": "^2.6.0",
     "ts-gems": "^3.5.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
     "@types/lodash": "^4.17.7",
-    "postgrejs": "^2.16.0"
+    "postgrejs": "^2.17.0"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.15.0",
+    "@sqb/builder": "^4.16.0",
     "reflect-metadata": "^0.2.2"
   },
   "main": "./cjs/index.js",