@sqb/connect 4.0.13 → 4.1.0

package/dist/client/Adapter.d.ts

@@ -1,6 +1,6 @@
 import { Maybe } from 'ts-gems';
 import { classes } from '@sqb/builder';
-import { ClientConfiguration, QueryRequest, RowType, DataType } from './types';
+import { ClientConfiguration, DataType, QueryRequest, RowType } from './types';
 export interface Adapter {
     driver: string;
     dialect: string;

package/dist/client/Cursor.d.ts

@@ -1,8 +1,8 @@
 import { Adapter } from './Adapter';
-import { SqbConnection } from './SqbConnection';
+import { CursorStream, CursorStreamOptions } from './CursorStream';
 import { FieldInfoMap } from './FieldInfoMap';
+import { SqbConnection } from './SqbConnection';
 import { ObjectRow, QueryRequest } from './types';
-import { CursorStream, CursorStreamOptions } from './CursorStream';
 interface CursorEvents {
     close: () => void;
     error: (error: unknown) => void;

package/dist/client/Cursor.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cursor = void 0;
 const tslib_1 = require("tslib");
-const strict_typed_events_1 = require("strict-typed-events");
+const debug_1 = tslib_1.__importDefault(require("debug"));
 const doublylinked_1 = tslib_1.__importDefault(require("doublylinked"));
 const putil_taskqueue_1 = tslib_1.__importDefault(require("putil-taskqueue"));
-const debug_1 = tslib_1.__importDefault(require("debug"));
 const putil_varhelpers_1 = require("putil-varhelpers");
-const helpers_1 = require("./helpers");
+const strict_typed_events_1 = require("strict-typed-events");
 const CursorStream_1 = require("./CursorStream");
+const helpers_1 = require("./helpers");
 const debug = (0, debug_1.default)('sqb:cursor');
 class Cursor extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_typed_events_1.AsyncEventEmitter) {
     constructor(connection, fields, adapterCursor, request) {

package/dist/client/CursorStream.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CursorStream = void 0;
 const tslib_1 = require("tslib");
-const stream_1 = require("stream");
 const debug_1 = tslib_1.__importDefault(require("debug"));
+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 {

package/dist/client/SqbClient.d.ts

@@ -1,9 +1,9 @@
 import { Pool as LightningPool } from 'lightning-pool';
 import { Maybe, Type } from 'ts-gems';
 import { classes } from '@sqb/builder';
-import { ClientConfiguration, QueryExecuteOptions, TransactionFunction, ClientDefaults, ConnectionOptions, QueryRequest, ObjectQueryResult, ArrayQueryResult } from './types';
-import { SqbConnection } from './SqbConnection';
 import { Repository } from '../orm/repository.class';
+import { SqbConnection } from './SqbConnection';
+import { ArrayQueryResult, ClientConfiguration, ClientDefaults, ConnectionOptions, ObjectQueryResult, QueryExecuteOptions, QueryRequest, TransactionFunction } from './types';
 declare const inspect: unique symbol;
 interface SqbClientEvents {
     execute: (request: QueryRequest) => void;

package/dist/client/SqbClient.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqbClient = void 0;
 const tslib_1 = require("tslib");
+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 debug_1 = tslib_1.__importDefault(require("debug"));
-const SqbConnection_1 = require("./SqbConnection");
-const extensions_1 = require("./extensions");
+const entity_metadata_1 = require("../orm/model/entity-metadata");
 const repository_class_1 = require("../orm/repository.class");
-const entity_model_1 = require("../orm/model/entity-model");
+const extensions_1 = require("./extensions");
+const SqbConnection_1 = require("./SqbConnection");
 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) {
@@ -146,7 +146,7 @@ class SqbClient extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict
         }
         else
             ctor = entity;
-        const entityDef = entity_model_1.EntityModel.get(ctor);
+        const entityDef = entity_metadata_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);

package/dist/client/SqbConnection.d.ts

@@ -1,9 +1,9 @@
-import { classes } from '@sqb/builder';
 import { Type } from 'ts-gems';
+import { classes } from '@sqb/builder';
+import { Repository } from '../orm/repository.class';
+import { Adapter } from './Adapter';
 import { SqbClient } from './SqbClient';
 import { ConnectionOptions, QueryExecuteOptions, QueryRequest } from './types';
-import { Adapter } from './Adapter';
-import { Repository } from '../orm/repository.class';
 interface SqbConnectionEvents {
     close: () => void;
     execute: (request: QueryRequest) => void;

package/dist/client/SqbConnection.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqbConnection = void 0;
 const tslib_1 = require("tslib");
-const builder_1 = require("@sqb/builder");
-const strict_typed_events_1 = require("strict-typed-events");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const debug_1 = tslib_1.__importDefault(require("debug"));
-const putil_varhelpers_1 = require("putil-varhelpers");
 const putil_taskqueue_1 = tslib_1.__importDefault(require("putil-taskqueue"));
-const helpers_1 = require("./helpers");
-const Cursor_1 = require("./Cursor");
+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 entity_model_1 = require("../orm/model/entity-model");
+const Cursor_1 = require("./Cursor");
+const helpers_1 = require("./helpers");
 const debug = (0, debug_1.default)('sqb:connection');
 class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_typed_events_1.AsyncEventEmitter) {
     constructor(client, adapterConnection, options) {
@@ -96,7 +96,7 @@ class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(st
         }
         else
             ctor = entity;
-        const entityDef = entity_model_1.EntityModel.get(ctor);
+        const entityDef = entity_metadata_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);

package/dist/client/helpers.d.ts

@@ -1,7 +1,7 @@
 import { Maybe } from 'ts-gems';
-import { ArrayRowset, FieldNaming, ObjectRowset, QueryRequest } from './types';
-import { FieldInfoMap } from './FieldInfoMap';
 import { Adapter } from './Adapter';
+import { FieldInfoMap } from './FieldInfoMap';
+import { ArrayRowset, FieldNaming, ObjectRowset, QueryRequest } from './types';
 export declare function applyNamingStrategy(value: string, namingStrategy?: FieldNaming): Maybe<string>;
 export declare function wrapAdapterFields(oldFields: Adapter.Field[], fieldNaming?: FieldNaming): FieldInfoMap;
 export declare function normalizeRowsToObjectRows(fields: FieldInfoMap, rowType: 'array' | 'object', oldRows: ObjectRowset | ArrayRowset, options?: Pick<QueryRequest, 'ignoreNulls' | 'transform'>): Record<string, any>[];

package/dist/client/types.d.ts

@@ -1,10 +1,10 @@
+import type { PoolConfiguration } from 'lightning-pool';
 import { Maybe } from 'ts-gems';
 import { DataType, ParamOptions } from '@sqb/builder';
-import type { SqbConnection } from './SqbConnection';
-import type { FieldInfoMap } from './FieldInfoMap';
-import type { Cursor } from './Cursor';
-import type { PoolConfiguration } from 'lightning-pool';
 import type { Adapter } from './Adapter';
+import type { Cursor } from './Cursor';
+import type { FieldInfoMap } from './FieldInfoMap';
+import type { SqbConnection } from './SqbConnection';
 export { DataType } from '@sqb/builder';
 export declare type ExecuteHookFunction = (connection: SqbConnection, request: QueryRequest) => Promise<void>;
 export declare type FetchFunction = (row: any, request: QueryRequest) => void;

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import 'reflect-metadata';
 export { Type, Maybe, DeepPartial, DeepPickWritable, DeepBuildable } from 'ts-gems';
 export * from './types';
 export * from './client/types';
@@ -7,22 +8,25 @@ export * from './client/SqbConnection';
 export * from './client/Cursor';
 export { registerAdapter, unRegisterAdapter } from './client/extensions';
 export * from './orm/orm.type';
-export * from './orm/base-entity.class';
-export * from './orm/decorators/entity.decorator';
-export * from './orm/decorators/primarykey.decorator';
-export * from './orm/decorators/index.decorator';
+export * from './orm/orm.const';
+export * from './orm/base-entity';
+export * from './orm/repository.class';
+export * from './orm/model/entity-metadata';
+export * from './orm/model/element-metadata';
+export * from './orm/model/column-element-metadata';
+export * from './orm/model/embedded-element-metadata';
+export * from './orm/model/association-element-metadata';
+export * from './orm/model/association';
+export * from './orm/model/association-node';
+export * from './orm/model/index-metadata';
+export * from './orm/model/link-chain';
 export * from './orm/decorators/column.decorator';
-export * from './orm/decorators/link.decorator';
 export * from './orm/decorators/embedded.decorator';
-export * from './orm/decorators/foreignkey.decorator';
+export * from './orm/decorators/entity.decorator';
 export * from './orm/decorators/events.decorator';
+export * from './orm/decorators/foreignkey.decorator';
+export * from './orm/decorators/index.decorator';
+export * from './orm/decorators/link.decorator';
+export * from './orm/decorators/primarykey.decorator';
 export * from './orm/decorators/transform.decorator';
-export * from './orm/repository.class';
-export * from './orm/model/entity-model';
-export * from './orm/model/entity-column-element';
-export * from './orm/model/entity-object-element';
-export * from './orm/model/entity-association-element';
-export * from './orm/model/association';
-export * from './orm/model/index-meta';
-export * from './orm/util/entity-mapping';
-export { isColumnElement, isObjectElement, isAssociationElement, isEntityClass } from './orm/util/orm.helper';
+export { isColumnElement, isEmbeddedElement, isAssociationElement, isEntityClass } from './orm/util/orm.helper';

package/dist/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEntityClass = exports.isAssociationElement = exports.isObjectElement = exports.isColumnElement = exports.unRegisterAdapter = exports.registerAdapter = void 0;
+exports.isEntityClass = exports.isAssociationElement = exports.isEmbeddedElement = exports.isColumnElement = exports.unRegisterAdapter = exports.registerAdapter = void 0;
 const tslib_1 = require("tslib");
+require("reflect-metadata");
 tslib_1.__exportStar(require("./types"), exports);
 tslib_1.__exportStar(require("./client/types"), exports);
 tslib_1.__exportStar(require("./client/Adapter"), exports);
@@ -12,26 +13,29 @@ var extensions_1 = require("./client/extensions");
 Object.defineProperty(exports, "registerAdapter", { enumerable: true, get: function () { return extensions_1.registerAdapter; } });
 Object.defineProperty(exports, "unRegisterAdapter", { enumerable: true, get: function () { return extensions_1.unRegisterAdapter; } });
 tslib_1.__exportStar(require("./orm/orm.type"), exports);
-tslib_1.__exportStar(require("./orm/base-entity.class"), exports);
-tslib_1.__exportStar(require("./orm/decorators/entity.decorator"), exports);
-tslib_1.__exportStar(require("./orm/decorators/primarykey.decorator"), exports);
-tslib_1.__exportStar(require("./orm/decorators/index.decorator"), exports);
+tslib_1.__exportStar(require("./orm/orm.const"), exports);
+tslib_1.__exportStar(require("./orm/base-entity"), exports);
+tslib_1.__exportStar(require("./orm/repository.class"), exports);
+tslib_1.__exportStar(require("./orm/model/entity-metadata"), exports);
+tslib_1.__exportStar(require("./orm/model/element-metadata"), exports);
+tslib_1.__exportStar(require("./orm/model/column-element-metadata"), exports);
+tslib_1.__exportStar(require("./orm/model/embedded-element-metadata"), exports);
+tslib_1.__exportStar(require("./orm/model/association-element-metadata"), exports);
+tslib_1.__exportStar(require("./orm/model/association"), exports);
+tslib_1.__exportStar(require("./orm/model/association-node"), exports);
+tslib_1.__exportStar(require("./orm/model/index-metadata"), exports);
+tslib_1.__exportStar(require("./orm/model/link-chain"), exports);
 tslib_1.__exportStar(require("./orm/decorators/column.decorator"), exports);
-tslib_1.__exportStar(require("./orm/decorators/link.decorator"), exports);
 tslib_1.__exportStar(require("./orm/decorators/embedded.decorator"), exports);
-tslib_1.__exportStar(require("./orm/decorators/foreignkey.decorator"), exports);
+tslib_1.__exportStar(require("./orm/decorators/entity.decorator"), exports);
 tslib_1.__exportStar(require("./orm/decorators/events.decorator"), exports);
+tslib_1.__exportStar(require("./orm/decorators/foreignkey.decorator"), exports);
+tslib_1.__exportStar(require("./orm/decorators/index.decorator"), exports);
+tslib_1.__exportStar(require("./orm/decorators/link.decorator"), exports);
+tslib_1.__exportStar(require("./orm/decorators/primarykey.decorator"), exports);
 tslib_1.__exportStar(require("./orm/decorators/transform.decorator"), exports);
-tslib_1.__exportStar(require("./orm/repository.class"), exports);
-tslib_1.__exportStar(require("./orm/model/entity-model"), exports);
-tslib_1.__exportStar(require("./orm/model/entity-column-element"), exports);
-tslib_1.__exportStar(require("./orm/model/entity-object-element"), exports);
-tslib_1.__exportStar(require("./orm/model/entity-association-element"), exports);
-tslib_1.__exportStar(require("./orm/model/association"), exports);
-tslib_1.__exportStar(require("./orm/model/index-meta"), exports);
-tslib_1.__exportStar(require("./orm/util/entity-mapping"), exports);
 var orm_helper_1 = require("./orm/util/orm.helper");
 Object.defineProperty(exports, "isColumnElement", { enumerable: true, get: function () { return orm_helper_1.isColumnElement; } });
-Object.defineProperty(exports, "isObjectElement", { enumerable: true, get: function () { return orm_helper_1.isObjectElement; } });
+Object.defineProperty(exports, "isEmbeddedElement", { enumerable: true, get: function () { return orm_helper_1.isEmbeddedElement; } });
 Object.defineProperty(exports, "isAssociationElement", { enumerable: true, get: function () { return orm_helper_1.isAssociationElement; } });
 Object.defineProperty(exports, "isEntityClass", { enumerable: true, get: function () { return orm_helper_1.isEntityClass; } });

package/dist/orm/base-entity.d.ts

@@ -0,0 +1,8 @@
+import { REPOSITORY_KEY } from './orm.const';
+export declare class BaseEntity {
+    private [REPOSITORY_KEY];
+    constructor(partial?: any);
+    destroy(): Promise<boolean>;
+    exists(): Promise<boolean>;
+    toJSON(): any;
+}

package/dist/orm/base-entity.js

@@ -0,0 +1,28 @@
+"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");
+class BaseEntity {
+    constructor(partial) {
+        const elements = entity_decorator_1.Entity.getColumnNames(Object.getPrototypeOf(this).constructor);
+        if (elements && partial) {
+            for (const k of elements)
+                if (partial[k] !== undefined)
+                    this[k] = partial[k];
+        }
+    }
+    async destroy() {
+        const repo = this[orm_const_1.REPOSITORY_KEY];
+        return repo.destroy(this);
+    }
+    async exists() {
+        const repo = this[orm_const_1.REPOSITORY_KEY];
+        return repo.exists(this);
+    }
+    toJSON() {
+        // this method is an placeholder an will be overwritten by declareEntity() method
+        return this;
+    }
+}
+exports.BaseEntity = BaseEntity;

package/dist/orm/commands/command.helper.d.ts

@@ -1,14 +1,14 @@
 import { JoinStatement, LogicalOperator } from '@sqb/builder';
-import { EntityModel } from '../model/entity-model';
 import { AssociationNode } from '../model/association-node';
+import { EntityMetadata } from '../model/entity-metadata';
 export interface JoinInfo {
     association: AssociationNode;
-    sourceEntity: EntityModel;
-    targetEntity: EntityModel;
+    sourceEntity: EntityMetadata;
+    targetEntity: EntityMetadata;
     joinAlias: string;
     join: JoinStatement;
 }
 export declare function joinAssociationGetFirst(joinInfos: JoinInfo[], association: AssociationNode, parentAlias: string, innerJoin?: boolean): Promise<JoinInfo>;
 export declare function joinAssociationGetLast(joinInfos: JoinInfo[], association: AssociationNode, parentAlias: string, innerJoin?: boolean): Promise<JoinInfo>;
 export declare function joinAssociation(joinInfos: JoinInfo[], association: AssociationNode, parentAlias: string, innerJoin?: boolean): Promise<JoinInfo[]>;
-export declare function prepareFilter(entityDef: EntityModel, filter: any, trgOp: LogicalOperator, tableAlias?: string): Promise<void>;
+export declare function prepareFilter(entityDef: EntityMetadata, filter: any, trgOp: LogicalOperator, tableAlias?: string): Promise<void>;

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

@@ -2,6 +2,8 @@
 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");
 async function joinAssociationGetFirst(joinInfos, association, parentAlias, innerJoin) {
     const joins = await joinAssociation(joinInfos, association, parentAlias, innerJoin);
@@ -79,7 +81,7 @@ async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T') {
                 let subSelect;
                 for (let i = 0; i < l; i++) {
                     pt = itemPath[i];
-                    const col = _curEntity.getElement(pt);
+                    const col = entity_metadata_1.EntityMetadata.getElement(_curEntity, pt);
                     if (!col)
                         throw new Error(`Unknown property (${item._left}) defined in filter`);
                     // if last item on path
@@ -92,8 +94,8 @@ async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T') {
                     else {
                         if ((0, orm_helper_1.isColumnElement)(col))
                             throw new Error(`Invalid column (${item._left}) defined in filter`);
-                        if ((0, orm_helper_1.isObjectElement)(col)) {
-                            _curEntity = await col.resolveType();
+                        if ((0, orm_helper_1.isEmbeddedElement)(col)) {
+                            _curEntity = await embedded_element_metadata_1.EmbeddedElementMetadata.resolveType(col);
                             _curPrefix = _curPrefix + (col.fieldNamePrefix || '');
                             _curSuffix = (col.fieldNameSuffix || '') + _curSuffix;
                             continue;

package/dist/orm/commands/count.command.d.ts

@@ -1,8 +1,8 @@
-import { EntityModel } from '../model/entity-model';
-import { Repository } from '../repository.class';
 import { SqbConnection } from '../../client/SqbConnection';
+import { EntityMetadata } from '../model/entity-metadata';
+import { Repository } from '../repository.class';
 export declare type CountCommandArgs = {
-    entity: EntityModel;
+    entity: EntityMetadata;
     connection: SqbConnection;
 } & Repository.CountOptions;
 export declare class CountCommand {

package/dist/orm/commands/create.command.d.ts

@@ -1,13 +1,13 @@
-import type { EntityModel } from '../model/entity-model';
 import { SqbConnection } from '../../client/SqbConnection';
+import { EntityMetadata } from '../model/entity-metadata';
 export declare type CreateCommandArgs = {
-    entity: EntityModel;
+    entity: EntityMetadata;
     connection: SqbConnection;
     values: any;
     returning?: boolean;
 };
 declare type CreateCommandContext = {
-    entity: EntityModel;
+    entity: EntityMetadata;
     queryParams: any;
     queryValues: any;
     colCount: number;
@@ -15,6 +15,6 @@ declare type CreateCommandContext = {
 export declare class CreateCommand {
     protected constructor();
     static execute(args: CreateCommandArgs): Promise<any>;
-    protected static _prepareParams(ctx: CreateCommandContext, entity: EntityModel, values: any, prefix?: string, suffix?: string): Promise<void>;
+    protected static _prepareParams(ctx: CreateCommandContext, entity: EntityMetadata, values: any, prefix?: string, suffix?: string): Promise<void>;
 }
 export {};

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

@@ -2,6 +2,9 @@
 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");
 class CreateCommand {
     // istanbul ignore next
@@ -25,8 +28,11 @@ class CreateCommand {
         if (!ctx.colCount)
             throw new Error('No element given to create new entity instance');
         const query = (0, builder_1.Insert)(tableName, ctx.queryValues);
-        if (args.returning && entity.primaryIndex)
-            query.returning(...entity.getPrimaryIndexColumns().map(col => col.fieldName));
+        if (args.returning) {
+            const primaryIndexColumns = entity_metadata_1.EntityMetadata.getPrimaryIndexColumns(entity);
+            if (primaryIndexColumns.length)
+                query.returning(...primaryIndexColumns.map(col => col.fieldName));
+        }
         const qr = await args.connection.execute(query, {
             params: ctx.queryParams,
             objectRows: false,
@@ -35,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.getColumnElementByFieldName(f.fieldName);
+                const el = entity_metadata_1.EntityMetadata.getColumnElementByFieldName(entity, f.fieldName);
                 if (el)
                     keyValues[el.name] = qr.rows[0][f.index];
             }
@@ -46,7 +52,7 @@ class CreateCommand {
         let v;
         prefix = prefix || '';
         suffix = suffix || '';
-        for (const col of entity.elements.values()) {
+        for (const col of Object.values(entity.elements)) {
             v = values[col.name];
             if ((0, orm_helper_1.isColumnElement)(col)) {
                 if (col.noInsert)
@@ -62,7 +68,7 @@ class CreateCommand {
                         throw new Error(`${entity.name}.${col.name} is required and can't be null`);
                     continue;
                 }
-                col.checkEnumValue(v);
+                column_element_metadata_1.ColumnElementMetadata.checkEnumValue(col, v);
                 const fieldName = prefix + col.fieldName + suffix;
                 const k = '$input_' + fieldName;
                 ctx.queryValues[fieldName] = (0, builder_1.Param)({
@@ -73,8 +79,8 @@ class CreateCommand {
                 ctx.queryParams[k] = v;
                 ctx.colCount++;
             }
-            else if (v != null && (0, orm_helper_1.isObjectElement)(col)) {
-                const type = await col.resolveType();
+            else if (v != null && (0, orm_helper_1.isEmbeddedElement)(col)) {
+                const type = await embedded_element_metadata_1.EmbeddedElementMetadata.resolveType(col);
                 await this._prepareParams(ctx, type, v, col.fieldNamePrefix, col.fieldNameSuffix);
             }
         }

package/dist/orm/commands/destroy.command.d.ts

@@ -1,8 +1,8 @@
-import { EntityModel } from '../model/entity-model';
-import { Repository } from '../repository.class';
 import { SqbConnection } from '../../client/SqbConnection';
+import { EntityMetadata } from '../model/entity-metadata';
+import { Repository } from '../repository.class';
 export declare type DestroyCommandArgs = {
-    entity: EntityModel;
+    entity: EntityMetadata;
     connection: SqbConnection;
 } & Repository.DestroyOptions;
 export declare class DestroyCommand {

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

@@ -1,17 +1,17 @@
+import { SqbConnection } from '../../client/SqbConnection';
+import { AssociationNode } from '../model/association-node';
+import { EntityMetadata } from '../model/entity-metadata';
 import type { Repository } from '../repository.class';
-import type { EntityModel } from '../model/entity-model';
 import { RowConverter } from './row-converter';
-import { AssociationNode } from '../model/association-node';
-import { SqbConnection } from '../../client/SqbConnection';
 export declare type FindCommandArgs = {
-    entity: EntityModel;
+    entity: EntityMetadata;
     connection: SqbConnection;
 } & Repository.FindAllOptions;
 export declare class FindCommand {
     maxEagerFetch: number;
     maxSubQueries: number;
-    readonly mainEntity: EntityModel;
-    readonly resultEntity: EntityModel;
+    readonly mainEntity: EntityMetadata;
+    readonly resultEntity: EntityMetadata;
     readonly converter: RowConverter;
     readonly mainAlias: string;
     resultAlias: string;
@@ -19,8 +19,8 @@ export declare class FindCommand {
     private _selectColumns;
     private _filter;
     private _sort?;
-    protected constructor(selectEntity: EntityModel, outputEntity: EntityModel);
-    static create(source: EntityModel | AssociationNode, opts?: {
+    protected constructor(selectEntity: EntityMetadata, outputEntity: EntityMetadata);
+    static create(source: EntityMetadata | AssociationNode, opts?: {
         maxSubQueries?: number;
         maxEagerFetch?: number;
     }): Promise<FindCommand>;
@@ -28,7 +28,7 @@ export declare class FindCommand {
     addElements(opts?: {
         tableAlias?: string;
         converter?: RowConverter;
-        entity?: EntityModel;
+        entity?: EntityMetadata;
         elements?: string[];
         include?: string[];
         exclude?: string[];

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

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FindCommand = void 0;
 const builder_1 = require("@sqb/builder");
-const row_converter_1 = require("./row-converter");
+const entity_decorator_1 = require("../decorators/entity.decorator");
 const association_node_1 = require("../model/association-node");
+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 command_helper_1 = require("./command.helper");
-const base_entity_class_1 = require("../base-entity.class");
+const row_converter_1 = require("./row-converter");
 const SORT_ORDER_PATTERN = /^([-+])?(.*)$/;
 class FindCommand {
     constructor(selectEntity, outputEntity) {
@@ -76,7 +78,7 @@ class FindCommand {
         const _exclude = opts.exclude ?
             opts.exclude.map(x => x.toLowerCase()) : undefined;
         const requestElements = _elements ? [..._elements] :
-            (0, base_entity_class_1.getNonAssociationElementNames)(entity.ctor)
+            entity_decorator_1.Entity.getNonAssociationElementNames(entity.ctor)
                 .map(x => x.toLowerCase());
         if (_include)
             requestElements.push(..._include);
@@ -84,8 +86,8 @@ class FindCommand {
             opts.sort.map(x => x.toLowerCase()) : undefined;
         const prefix = opts.prefix || '';
         const suffix = opts.suffix || '';
-        for (const key of entity.elementKeys) {
-            const col = entity.getElement(key);
+        for (const key of Object.keys(entity.elements)) {
+            const col = entity_metadata_1.EntityMetadata.getElement(entity, key);
             if (!col)
                 continue;
             const colNameLower = col.name.toLowerCase();
@@ -108,8 +110,8 @@ class FindCommand {
                     });
                 continue;
             }
-            if ((0, orm_helper_1.isObjectElement)(col)) {
-                const typ = await col.resolveType();
+            if ((0, orm_helper_1.isEmbeddedElement)(col)) {
+                const typ = await embedded_element_metadata_1.EmbeddedElementMetadata.resolveType(col);
                 const subConverter = converter.addObjectProperty({
                     name: col.name,
                     type: typ.ctor
@@ -213,9 +215,9 @@ class FindCommand {
             if (elName.includes('.')) {
                 const a = elName.split('.');
                 while (a.length > 1) {
-                    const col = _entityDef.getElement(a.shift() || '');
-                    if ((0, orm_helper_1.isObjectElement)(col)) {
-                        _entityDef = await col.resolveType();
+                    const col = entity_metadata_1.EntityMetadata.getElement(_entityDef, a.shift() || '');
+                    if ((0, orm_helper_1.isEmbeddedElement)(col)) {
+                        _entityDef = await embedded_element_metadata_1.EmbeddedElementMetadata.resolveType(col);
                         if (col.fieldNamePrefix)
                             prefix += col.fieldNamePrefix;
                         if (col.fieldNameSuffix)
@@ -237,7 +239,7 @@ class FindCommand {
                     continue;
                 elName = a.shift() || '';
             }
-            const col = _entityDef.getElement(elName);
+            const col = entity_metadata_1.EntityMetadata.getElement(_entityDef, elName);
             if (!col)
                 throw new Error(`Unknown element (${elName}) declared in sort property`);
             if (!(0, orm_helper_1.isColumnElement)(col))

package/dist/orm/commands/row-converter.d.ts

@@ -1,10 +1,10 @@
 import { Type } from 'ts-gems';
+import { DataType } from '@sqb/builder';
 import type { FieldInfoMap } from '../../client/FieldInfoMap';
-import type { FindCommand } from './find.command';
-import type { Repository } from '../repository.class';
-import { ColumnTransformFunction } from '../orm.type';
 import { SqbConnection } from '../../client/SqbConnection';
-import { DataType } from '@sqb/builder';
+import { ColumnTransformFunction } from '../orm.type';
+import type { Repository } from '../repository.class';
+import type { FindCommand } from './find.command';
 export interface ValueProperty {
     fieldAlias: string;
     dataType?: DataType;

package/dist/orm/commands/update.command.d.ts

@@ -1,13 +1,13 @@
-import { EntityModel } from '../model/entity-model';
-import { Repository } from '../repository.class';
 import { SqbConnection } from '../../client/SqbConnection';
+import { EntityMetadata } from '../model/entity-metadata';
+import { Repository } from '../repository.class';
 export declare type UpdateCommandArgs = {
-    entity: EntityModel;
+    entity: EntityMetadata;
     connection: SqbConnection;
     values: any;
 } & Repository.UpdateAllOptions;
 declare type UpdateCommandContext = {
-    entity: EntityModel;
+    entity: EntityMetadata;
     queryParams: any;
     queryValues: any;
     queryFilter: any[];
@@ -17,6 +17,6 @@ export declare class UpdateCommand {
     protected constructor();
     static execute(args: UpdateCommandArgs): Promise<number>;
     protected static _prepareFilter(ctx: UpdateCommandContext, filter: any): Promise<void>;
-    protected static _prepareParams(ctx: UpdateCommandContext, entity: EntityModel, values: any, prefix?: string, suffix?: string): Promise<void>;
+    protected static _prepareParams(ctx: UpdateCommandContext, entity: EntityMetadata, values: any, prefix?: string, suffix?: string): Promise<void>;
 }
 export {};