@sqb/connect 4.2.1 → 4.5.1

package/README.md

@@ -0,0 +1,67 @@
+
+<p style="text-align:center">
+  <img src="https://user-images.githubusercontent.com/3836517/32965280-1a2b63ce-cbe7-11e7-8ee1-ba47313503c5.png" width="500px" alt="SQB Logo"/>
+</p>
+
+<br>
+  
+[![NPM Version][npm-image]][npm-url]
+[![NPM Downloads][downloads-image]][downloads-url]
+[![Build Status][travis-image]][travis-url]
+[![Test Coverage][coveralls-image]][coveralls-url]
+[![Dependencies][dependencies-image]][dependencies-url]
+[![DevDependencies][devdependencies-image]][devdependencies-url]
+[![Package Quality][quality-image]][quality-url]
+
+
+## About SQB
+
+SQB is an extensible, multi-dialect SQL query builder and Database connection wrapper for NodeJS.
+
+## 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. 
+
+
+You can report bugs and discuss features on the [GitHub issues](https://github.com/sqbjs/sqb/issues) page
+
+Thanks to all of the great [contributions](https://github.com/sqbjs/sqb/graphs/contributors) to the project.
+
+You may want to check detailed [DOCUMENTATION](https://sqbjs.github.io/sqb/)
+
+
+## Installation
+
+```bash
+$ npm install @sqb/connect --save
+```
+
+## Node Compatibility
+
+  - 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
+[devdependencies-image]: https://david-dm.org/sqbjs/@sqb/connect/dev-status.svg
+[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/{dist/client/CursorStream.js → cjs/client/cursor-stream.js}

@@ -7,10 +7,13 @@ const stream_1 = require("stream");
 const inspect = Symbol.for('nodejs.util.inspect.custom');
 const debug = (0, debug_1.default)('sqb:cursorstream');
 class CursorStream extends stream_1.Readable {
+    _cursor;
+    _objectMode;
+    _limit;
+    _rowNum = -1;
+    _eof = false;
     constructor(cursor, options) {
         super(options);
-        this._rowNum = -1;
-        this._eof = false;
         this._cursor = cursor;
         this._objectMode = options?.objectMode;
         this._limit = options?.limit || Number.MAX_SAFE_INTEGER;

package/{dist/client/Cursor.js → cjs/client/cursor.js}

@@ -7,17 +7,24 @@ const doublylinked_1 = tslib_1.__importDefault(require("doublylinked"));
 const putil_taskqueue_1 = tslib_1.__importDefault(require("putil-taskqueue"));
 const putil_varhelpers_1 = require("putil-varhelpers");
 const strict_typed_events_1 = require("strict-typed-events");
-const CursorStream_1 = require("./CursorStream");
-const helpers_1 = require("./helpers");
+const cursor_stream_js_1 = require("./cursor-stream.js");
+const helpers_js_1 = require("./helpers.js");
 const debug = (0, debug_1.default)('sqb:cursor');
 class Cursor extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_typed_events_1.AsyncEventEmitter) {
+    _connection;
+    _fields;
+    _prefetchRows;
+    _request;
+    _intlcur;
+    _taskQueue = new putil_taskqueue_1.default();
+    _fetchCache = new doublylinked_1.default();
+    _rowNum = 0;
+    _fetchedAll = false;
+    _fetchedRows = 0;
+    _row;
+    _cache;
     constructor(connection, fields, adapterCursor, request) {
         super();
-        this._taskQueue = new putil_taskqueue_1.default();
-        this._fetchCache = new doublylinked_1.default();
-        this._rowNum = 0;
-        this._fetchedAll = false;
-        this._fetchedRows = 0;
         this._connection = connection;
         this._intlcur = adapterCursor;
         this._fields = fields;
@@ -161,7 +168,7 @@ class Cursor extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_ty
      * Creates and returns a readable stream.
      */
     toStream(options) {
-        return new CursorStream_1.CursorStream(this, options);
+        return new cursor_stream_js_1.CursorStream(this, options);
     }
     toString() {
         return '[object ' + Object.getPrototypeOf(this).constructor.name + ']';
@@ -228,9 +235,9 @@ class Cursor extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_ty
             debug('Fetched %d rows from database', rows.length);
             // Normalize rows
             rows = this._request.objectRows ?
-                (0, helpers_1.normalizeRowsToObjectRows)(this._fields, this._intlcur.rowType, rows, this._request) :
-                (0, helpers_1.normalizeRowsToArrayRows)(this._fields, this._intlcur.rowType, rows, this._request);
-            (0, helpers_1.callFetchHooks)(rows, this._request);
+                (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));
             }

package/{dist/client/FieldInfoMap.js → cjs/client/field-info-map.js}

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldInfoMap = void 0;
 class FieldInfoMap {
+    _obj;
+    _arr;
     constructor() {
         Object.defineProperty(this, '_obj', {
             enumerable: false,

package/{dist → cjs}/client/helpers.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.callFetchHooks = exports.normalizeRowsToArrayRows = exports.normalizeRowsToObjectRows = exports.wrapAdapterFields = exports.applyNamingStrategy = void 0;
 const putil_varhelpers_1 = require("putil-varhelpers");
-const FieldInfoMap_1 = require("./FieldInfoMap");
+const field_info_map_js_1 = require("./field-info-map.js");
 function applyNamingStrategy(value, namingStrategy) {
     if (typeof namingStrategy === 'string' && namingStrategy !== 'original') {
         switch (namingStrategy.toLowerCase()) {
@@ -32,7 +32,7 @@ function wrapAdapterFields(oldFields, fieldNaming) {
         if (name)
             return { ...f, name, index };
     };
-    const result = new FieldInfoMap_1.FieldInfoMap();
+    const result = new field_info_map_js_1.FieldInfoMap();
     let i = 0;
     oldFields.forEach(f => {
         const x = mapFieldInfo(f, i);

package/{dist/client/SqbClient.js → cjs/client/sqb-client.js}

@@ -6,26 +6,29 @@ const debug_1 = tslib_1.__importDefault(require("debug"));
 const lightning_pool_1 = require("lightning-pool");
 const putil_varhelpers_1 = require("putil-varhelpers");
 const strict_typed_events_1 = require("strict-typed-events");
-const entity_metadata_1 = require("../orm/model/entity-metadata");
-const repository_class_1 = require("../orm/repository.class");
-const extensions_1 = require("./extensions");
-const SqbConnection_1 = require("./SqbConnection");
+const entity_metadata_js_1 = require("../orm/model/entity-metadata.js");
+const repository_class_js_1 = require("../orm/repository.class.js");
+const extensions_js_1 = require("./extensions.js");
+const sqb_connection_js_1 = require("./sqb-connection.js");
 const debug = (0, debug_1.default)('sqb:client');
 const inspect = Symbol.for('nodejs.util.inspect.custom');
 class SqbClient extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_typed_events_1.AsyncEventEmitter) {
+    _adapter;
+    _pool;
+    _defaults;
+    _entities = {};
     constructor(config) {
         super();
-        this._entities = {};
         if (!(config && typeof config === 'object'))
             throw new TypeError('Configuration object required');
         let adapter;
         if (config.driver) {
-            adapter = extensions_1.adapters.find(x => x.driver === config.driver);
+            adapter = extensions_js_1.adapters.find(x => x.driver === config.driver);
             if (!adapter)
                 throw new Error(`No database adapter registered for "${config.driver}" driver`);
         }
         else if (config.dialect) {
-            adapter = extensions_1.adapters.find(x => x.dialect === config.dialect);
+            adapter = extensions_js_1.adapters.find(x => x.dialect === config.dialect);
             if (!adapter)
                 throw new Error(`No database adapter registered for "${config.dialect}" dialect`);
         }
@@ -97,7 +100,7 @@ class SqbClient extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict
         const options = arg1;
         const adapterConnection = await this._pool.acquire();
         const opts = { autoCommit: this.defaults.autoCommit, ...options };
-        const connection = new SqbConnection_1.SqbConnection(this, adapterConnection, opts);
+        const connection = new sqb_connection_js_1.SqbConnection(this, adapterConnection, opts);
         await this.emitAsyncSerial('acquire', connection);
         connection.on('execute', (request) => this.emit('execute', request));
         connection.on('error', (error) => this.emit('error', error));
@@ -110,6 +113,9 @@ class SqbClient extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict
         const ms = terminateWait == null ? Infinity : 0;
         return this._pool.close(ms);
     }
+    /**
+     * Executes a query or callback with a new acquired connection.
+     */
     async execute(query, options) {
         debug('execute');
         const connection = await this.acquire();
@@ -146,10 +152,10 @@ class SqbClient extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict
         }
         else
             ctor = entity;
-        const entityDef = entity_metadata_1.EntityMetadata.get(ctor);
+        const entityDef = entity_metadata_js_1.EntityMetadata.get(ctor);
         if (!entityDef)
             throw new Error(`You must provide an @Entity annotated constructor`);
-        return new repository_class_1.Repository(entityDef, this, opts?.schema);
+        return new repository_class_js_1.Repository(entityDef, this, opts?.schema);
     }
     getEntity(name) {
         return this._entities[name];

package/{dist/client/SqbConnection.js → cjs/client/sqb-connection.js}

@@ -8,18 +8,21 @@ const putil_taskqueue_1 = tslib_1.__importDefault(require("putil-taskqueue"));
 const putil_varhelpers_1 = require("putil-varhelpers");
 const strict_typed_events_1 = require("strict-typed-events");
 const builder_1 = require("@sqb/builder");
-const entity_metadata_1 = require("../orm/model/entity-metadata");
-const repository_class_1 = require("../orm/repository.class");
-const Cursor_1 = require("./Cursor");
-const helpers_1 = require("./helpers");
+const entity_metadata_js_1 = require("../orm/model/entity-metadata.js");
+const repository_class_js_1 = require("../orm/repository.class.js");
+const cursor_js_1 = require("./cursor.js");
+const helpers_js_1 = require("./helpers.js");
 const debug = (0, debug_1.default)('sqb:connection');
 class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_typed_events_1.AsyncEventEmitter) {
+    client;
+    _intlcon;
+    _tasks = new putil_taskqueue_1.default();
+    _options;
+    _inTransaction = false;
+    _refCount = 1;
     constructor(client, adapterConnection, options) {
         super();
         this.client = client;
-        this._tasks = new putil_taskqueue_1.default();
-        this._inTransaction = false;
-        this._refCount = 1;
         this._intlcon = adapterConnection;
         this._options = options || {};
     }
@@ -96,10 +99,10 @@ class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(st
         }
         else
             ctor = entity;
-        const entityDef = entity_metadata_1.EntityMetadata.get(ctor);
+        const entityDef = entity_metadata_js_1.EntityMetadata.get(ctor);
         if (!entityDef)
             throw new Error(`You must provide an @Entity annotated constructor`);
-        return new repository_class_1.Repository(entityDef, this, opts?.schema);
+        return new repository_class_js_1.Repository(entityDef, this, opts?.schema);
     }
     async getSchema() {
         assert_1.default.ok(this._intlcon, `Can't set schema, because connection is released`);
@@ -142,16 +145,16 @@ class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(st
                     throw new Error('Adapter did not returned fields info');
                 if (!response.rowType)
                     throw new Error('Adapter did not returned rowType');
-                result.fields = (0, helpers_1.wrapAdapterFields)(response.fields, request.fieldNaming);
+                result.fields = (0, helpers_js_1.wrapAdapterFields)(response.fields, request.fieldNaming);
                 result.rowType = response.rowType;
                 if (response.rows) {
                     result.rows = request.objectRows ?
-                        (0, helpers_1.normalizeRowsToObjectRows)(result.fields, response.rowType, response.rows, request) :
-                        (0, helpers_1.normalizeRowsToArrayRows)(result.fields, response.rowType, response.rows, request);
-                    (0, helpers_1.callFetchHooks)(result.rows, request);
+                        (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_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);

package/cjs/index.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEntityClass = exports.isAssociationField = exports.isEmbeddedField = exports.isColumnField = exports.unRegisterAdapter = exports.registerAdapter = void 0;
+const tslib_1 = require("tslib");
+require("reflect-metadata");
+tslib_1.__exportStar(require("./types.js"), exports);
+tslib_1.__exportStar(require("./client/types.js"), exports);
+tslib_1.__exportStar(require("./client/adapter.js"), exports);
+tslib_1.__exportStar(require("./client/sqb-client.js"), exports);
+tslib_1.__exportStar(require("./client/sqb-connection.js"), exports);
+tslib_1.__exportStar(require("./client/cursor.js"), exports);
+var extensions_js_1 = require("./client/extensions.js");
+Object.defineProperty(exports, "registerAdapter", { enumerable: true, get: function () { return extensions_js_1.registerAdapter; } });
+Object.defineProperty(exports, "unRegisterAdapter", { enumerable: true, get: function () { return extensions_js_1.unRegisterAdapter; } });
+tslib_1.__exportStar(require("./orm/orm.type.js"), exports);
+tslib_1.__exportStar(require("./orm/orm.const.js"), exports);
+tslib_1.__exportStar(require("./orm/base-entity.js"), exports);
+tslib_1.__exportStar(require("./orm/repository.class.js"), exports);
+tslib_1.__exportStar(require("./orm/model/entity-metadata.js"), exports);
+tslib_1.__exportStar(require("./orm/model/field-metadata.js"), exports);
+tslib_1.__exportStar(require("./orm/model/column-field-metadata.js"), exports);
+tslib_1.__exportStar(require("./orm/model/embedded-field-metadata.js"), exports);
+tslib_1.__exportStar(require("./orm/model/association-field-metadata.js"), exports);
+tslib_1.__exportStar(require("./orm/model/association.js"), exports);
+tslib_1.__exportStar(require("./orm/model/association-node.js"), exports);
+tslib_1.__exportStar(require("./orm/model/index-metadata.js"), exports);
+tslib_1.__exportStar(require("./orm/model/link-chain.js"), exports);
+tslib_1.__exportStar(require("./orm/decorators/column.decorator.js"), exports);
+tslib_1.__exportStar(require("./orm/decorators/embedded.decorator.js"), exports);
+tslib_1.__exportStar(require("./orm/decorators/entity.decorator.js"), exports);
+tslib_1.__exportStar(require("./orm/decorators/events.decorator.js"), exports);
+tslib_1.__exportStar(require("./orm/decorators/foreignkey.decorator.js"), exports);
+tslib_1.__exportStar(require("./orm/decorators/index.decorator.js"), exports);
+tslib_1.__exportStar(require("./orm/decorators/link.decorator.js"), exports);
+tslib_1.__exportStar(require("./orm/decorators/primarykey.decorator.js"), exports);
+tslib_1.__exportStar(require("./orm/decorators/transform.decorator.js"), exports);
+var orm_helper_js_1 = require("./orm/util/orm.helper.js");
+Object.defineProperty(exports, "isColumnField", { enumerable: true, get: function () { return orm_helper_js_1.isColumnField; } });
+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/backward.js"), exports);

package/{dist → cjs}/orm/backward.js

@@ -1,24 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnionEntity = exports.PickEntity = exports.OmitEntity = exports.mixinEntities = exports.getNonAssociationElementNames = exports.getUpdateColumnNames = exports.getInsertColumnNames = void 0;
-const entity_decorator_1 = require("./decorators/entity.decorator");
+const entity_decorator_js_1 = require("./decorators/entity.decorator.js");
 function getInsertColumnNames(ctor) {
-    return entity_decorator_1.Entity.getInsertColumnNames(ctor);
+    return entity_decorator_js_1.Entity.getInsertColumnNames(ctor);
 }
 exports.getInsertColumnNames = getInsertColumnNames;
 function getUpdateColumnNames(ctor) {
-    return entity_decorator_1.Entity.getUpdateColumnNames(ctor);
+    return entity_decorator_js_1.Entity.getUpdateColumnNames(ctor);
 }
 exports.getUpdateColumnNames = getUpdateColumnNames;
 function getNonAssociationElementNames(ctor) {
-    return entity_decorator_1.Entity.getNonAssociationElementNames(ctor);
+    return entity_decorator_js_1.Entity.getNonAssociationFieldNames(ctor);
 }
 exports.getNonAssociationElementNames = getNonAssociationElementNames;
 function mixinEntities(derivedCtor, ...bases) {
     // @ts-ignore
-    return entity_decorator_1.Entity.mixin(derivedCtor, ...bases);
+    return entity_decorator_js_1.Entity.mixin(derivedCtor, ...bases);
 }
 exports.mixinEntities = mixinEntities;
-exports.OmitEntity = entity_decorator_1.Entity.Omit;
-exports.PickEntity = entity_decorator_1.Entity.Pick;
-exports.UnionEntity = entity_decorator_1.Entity.Union;
+exports.OmitEntity = entity_decorator_js_1.Entity.Omit;
+exports.PickEntity = entity_decorator_js_1.Entity.Pick;
+exports.UnionEntity = entity_decorator_js_1.Entity.Union;

package/{dist → cjs}/orm/base-entity.js

@@ -1,23 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseEntity = void 0;
-const entity_decorator_1 = require("./decorators/entity.decorator");
-const orm_const_1 = require("./orm.const");
+const entity_decorator_js_1 = require("./decorators/entity.decorator.js");
+const orm_const_js_1 = require("./orm.const.js");
 class BaseEntity {
+    [orm_const_js_1.REPOSITORY_KEY];
     constructor(partial) {
-        const elements = entity_decorator_1.Entity.getColumnNames(Object.getPrototypeOf(this).constructor);
-        if (elements && partial) {
-            for (const k of elements)
+        const fields = entity_decorator_js_1.Entity.getColumnFieldNames(Object.getPrototypeOf(this).constructor);
+        if (fields && partial) {
+            for (const k of fields)
                 if (partial[k] !== undefined)
                     this[k] = partial[k];
         }
     }
     async destroy() {
-        const repo = this[orm_const_1.REPOSITORY_KEY];
+        const repo = this[orm_const_js_1.REPOSITORY_KEY];
         return !!(repo && repo.destroy(this));
     }
     async exists() {
-        const repo = this[orm_const_1.REPOSITORY_KEY];
+        const repo = this[orm_const_js_1.REPOSITORY_KEY];
         return !!(repo && repo.exists(this));
     }
     toJSON() {

package/{dist → cjs}/orm/commands/command.helper.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareFilter = exports.joinAssociation = exports.joinAssociationGetLast = exports.joinAssociationGetFirst = void 0;
 const builder_1 = require("@sqb/builder");
-const embedded_element_metadata_1 = require("../model/embedded-element-metadata");
-const entity_metadata_1 = require("../model/entity-metadata");
-const orm_helper_1 = require("../util/orm.helper");
+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");
 async function joinAssociationGetFirst(joinInfos, association, parentAlias, innerJoin) {
     const joins = await joinAssociation(joinInfos, association, parentAlias, innerJoin);
     return joins[0];
@@ -81,26 +81,26 @@ async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T') {
                 let subSelect;
                 for (let i = 0; i < l; i++) {
                     pt = itemPath[i];
-                    const col = entity_metadata_1.EntityMetadata.getElement(_curEntity, pt);
+                    const col = entity_metadata_js_1.EntityMetadata.getField(_curEntity, pt);
                     if (!col)
                         throw new Error(`Unknown property (${item._left}) defined in filter`);
                     // if last item on path
                     if (i === l - 1) {
-                        if (!(0, orm_helper_1.isColumnElement)(col))
+                        if (!(0, orm_helper_js_1.isColumnField)(col))
                             throw new Error(`Invalid column expression (${item._left}) defined in filter`);
                         const ctor = Object.getPrototypeOf(item).constructor;
                         trgOp.add(new ctor((0, builder_1.Field)(_curAlias + '.' + _curPrefix + col.fieldName + _curSuffix, col.dataType, col.isArray), item._right));
                     }
                     else {
-                        if ((0, orm_helper_1.isColumnElement)(col))
+                        if ((0, orm_helper_js_1.isColumnField)(col))
                             throw new Error(`Invalid column (${item._left}) defined in filter`);
-                        if ((0, orm_helper_1.isEmbeddedElement)(col)) {
-                            _curEntity = await embedded_element_metadata_1.EmbeddedElementMetadata.resolveType(col);
+                        if ((0, orm_helper_js_1.isEmbeddedField)(col)) {
+                            _curEntity = await embedded_field_metadata_js_1.EmbeddedFieldMetadata.resolveType(col);
                             _curPrefix = _curPrefix + (col.fieldNamePrefix || '');
                             _curSuffix = (col.fieldNameSuffix || '') + _curSuffix;
                             continue;
                         }
-                        if (!(0, orm_helper_1.isAssociationElement)(col))
+                        if (!(0, orm_helper_js_1.isAssociationField)(col))
                             throw new Error(`Invalid column (${item._left}) defined in filter`);
                         let node;
                         _curEntity = await col.association.resolveTarget();

package/{dist → cjs}/orm/commands/count.command.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CountCommand = void 0;
 const builder_1 = require("@sqb/builder");
-const command_helper_1 = require("./command.helper");
+const command_helper_js_1 = require("./command.helper.js");
 class CountCommand {
     // istanbul ignore next
     constructor() {
@@ -13,7 +13,7 @@ class CountCommand {
         let where;
         if (filter) {
             where = (0, builder_1.And)();
-            await (0, command_helper_1.prepareFilter)(entity, filter, where, 'T');
+            await (0, command_helper_js_1.prepareFilter)(entity, filter, where, 'T');
         }
         const query = (0, builder_1.Select)((0, builder_1.Count)()).from(entity.tableName + ' T');
         if (where)

package/{dist → cjs}/orm/commands/create.command.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateCommand = void 0;
 const builder_1 = require("@sqb/builder");
-const column_element_metadata_1 = require("../model/column-element-metadata");
-const embedded_element_metadata_1 = require("../model/embedded-element-metadata");
-const entity_metadata_1 = require("../model/entity-metadata");
-const orm_helper_1 = require("../util/orm.helper");
+const column_field_metadata_js_1 = require("../model/column-field-metadata.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");
 class CreateCommand {
     // istanbul ignore next
     constructor() {
@@ -26,10 +26,10 @@ class CreateCommand {
         // Prepare
         await this._prepareParams(ctx, entity, args.values);
         if (!ctx.colCount)
-            throw new Error('No element given to create new entity instance');
+            throw new Error('No field given to create new entity instance');
         const query = (0, builder_1.Insert)(tableName, ctx.queryValues);
         if (args.returning) {
-            const primaryIndexColumns = entity_metadata_1.EntityMetadata.getPrimaryIndexColumns(entity);
+            const primaryIndexColumns = entity_metadata_js_1.EntityMetadata.getPrimaryIndexColumns(entity);
             if (primaryIndexColumns.length)
                 query.returning(...primaryIndexColumns.map(col => col.fieldName));
         }
@@ -41,7 +41,7 @@ class CreateCommand {
         if (args.returning && qr.fields && qr.rows?.length) {
             const keyValues = {};
             for (const f of qr.fields.values()) {
-                const el = entity_metadata_1.EntityMetadata.getColumnElementByFieldName(entity, f.fieldName);
+                const el = entity_metadata_js_1.EntityMetadata.getColumnFieldByFieldName(entity, f.fieldName);
                 if (el)
                     keyValues[el.name] = qr.rows[0][f.index];
             }
@@ -52,9 +52,9 @@ class CreateCommand {
         let v;
         prefix = prefix || '';
         suffix = suffix || '';
-        for (const col of Object.values(entity.elements)) {
+        for (const col of Object.values(entity.fields)) {
             v = values[col.name];
-            if ((0, orm_helper_1.isColumnElement)(col)) {
+            if ((0, orm_helper_js_1.isColumnField)(col)) {
                 if (col.noInsert)
                     continue;
                 if (v == null && col.default !== undefined) {
@@ -68,7 +68,7 @@ class CreateCommand {
                         throw new Error(`${entity.name}.${col.name} is required and can't be null`);
                     continue;
                 }
-                column_element_metadata_1.ColumnElementMetadata.checkEnumValue(col, v);
+                column_field_metadata_js_1.ColumnFieldMetadata.checkEnumValue(col, v);
                 const fieldName = prefix + col.fieldName + suffix;
                 const k = '$input_' + fieldName;
                 ctx.queryValues[fieldName] = (0, builder_1.Param)({
@@ -79,8 +79,8 @@ class CreateCommand {
                 ctx.queryParams[k] = v;
                 ctx.colCount++;
             }
-            else if (v != null && (0, orm_helper_1.isEmbeddedElement)(col)) {
-                const type = await embedded_element_metadata_1.EmbeddedElementMetadata.resolveType(col);
+            else if (v != null && (0, orm_helper_js_1.isEmbeddedField)(col)) {
+                const type = await embedded_field_metadata_js_1.EmbeddedFieldMetadata.resolveType(col);
                 await this._prepareParams(ctx, type, v, col.fieldNamePrefix, col.fieldNameSuffix);
             }
         }

package/{dist → cjs}/orm/commands/destroy.command.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DestroyCommand = void 0;
 const builder_1 = require("@sqb/builder");
-const command_helper_1 = require("./command.helper");
+const command_helper_js_1 = require("./command.helper.js");
 class DestroyCommand {
     // istanbul ignore next
     constructor() {
@@ -13,7 +13,7 @@ class DestroyCommand {
         let where;
         if (filter) {
             where = (0, builder_1.And)();
-            await (0, command_helper_1.prepareFilter)(entity, filter, where);
+            await (0, command_helper_js_1.prepareFilter)(entity, filter, where);
         }
         const query = (0, builder_1.Delete)(entity.tableName + ' T');
         if (where)