@sqb/connect 4.2.1 → 4.5.0

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

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityMetadata = void 0;
 const builder_1 = require("@sqb/builder");
-const orm_const_1 = require("../orm.const");
-const orm_helper_1 = require("../util/orm.helper");
-const serialize_element_1 = require("../util/serialize-element");
-const association_1 = require("./association");
-const association_element_metadata_1 = require("./association-element-metadata");
-const column_element_metadata_1 = require("./column-element-metadata");
-const embedded_element_metadata_1 = require("./embedded-element-metadata");
+const orm_const_js_1 = require("../orm.const.js");
+const orm_helper_js_1 = require("../util/orm.helper.js");
+const serialize_field_js_1 = require("../util/serialize-field.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;
 (function (EntityMetadata) {
     function define(ctor) {
@@ -19,29 +19,29 @@ var EntityMetadata;
         const meta = {
             ctor: ctor,
             name: ctor.name,
-            elements: {},
+            fields: {},
             indexes: [],
             foreignKeys: [],
             eventListeners: {}
         };
-        Reflect.defineMetadata(orm_const_1.ENTITY_METADATA_KEY, meta, ctor);
+        Reflect.defineMetadata(orm_const_js_1.ENTITY_METADATA_KEY, meta, ctor);
         // Merge base entity columns into this one
         if (baseMeta) {
             EntityMetadata.mixin(meta, baseMeta);
         }
         ctor.prototype.toJSON = function () {
             const obj = {};
-            const elementKeys = Object.keys(meta.elements);
-            const l = elementKeys.length;
+            const fieldKeys = Object.keys(meta.fields);
+            const l = fieldKeys.length;
             let key;
             let v;
             for (let i = 0; i < l; i++) {
-                key = elementKeys[i];
-                const col = EntityMetadata.getElement(meta, key);
+                key = fieldKeys[i];
+                const col = EntityMetadata.getField(meta, key);
                 if (col) {
                     v = this[col.name];
                     if (v !== undefined)
-                        obj[col.name] = (0, serialize_element_1.serializeColumn)(col, v);
+                        obj[col.name] = (0, serialize_field_js_1.serializeColumn)(col, v);
                 }
             }
             return obj;
@@ -50,94 +50,94 @@ var EntityMetadata;
     }
     EntityMetadata.define = define;
     function get(ctor) {
-        return Reflect.getMetadata(orm_const_1.ENTITY_METADATA_KEY, ctor);
+        return Reflect.getMetadata(orm_const_js_1.ENTITY_METADATA_KEY, ctor);
     }
     EntityMetadata.get = get;
     function getOwn(ctor) {
-        return Reflect.getOwnMetadata(orm_const_1.ENTITY_METADATA_KEY, ctor);
+        return Reflect.getOwnMetadata(orm_const_js_1.ENTITY_METADATA_KEY, ctor);
     }
     EntityMetadata.getOwn = getOwn;
-    function getElement(entity, elementName) {
-        return elementName ? entity.elements[elementName.toLowerCase()] : undefined;
+    function getField(entity, fieldName) {
+        return fieldName ? entity.fields[fieldName.toLowerCase()] : undefined;
     }
-    EntityMetadata.getElement = getElement;
-    function getColumnElement(entity, elementName) {
-        const el = getElement(entity, elementName);
-        if (el && !(0, orm_helper_1.isColumnElement)(el))
+    EntityMetadata.getField = getField;
+    function getColumnField(entity, fieldName) {
+        const el = getField(entity, fieldName);
+        if (el && !(0, orm_helper_js_1.isColumnField)(el))
             throw new Error(`"${el.name}" requested as "column" but it is "${el.kind}"`);
         return el;
     }
-    EntityMetadata.getColumnElement = getColumnElement;
-    function getEmbeddedElement(entity, elementName) {
-        const el = getElement(entity, elementName);
-        if (el && !(0, orm_helper_1.isEmbeddedElement)(el))
+    EntityMetadata.getColumnField = getColumnField;
+    function getEmbeddedField(entity, fieldName) {
+        const el = getField(entity, fieldName);
+        if (el && !(0, orm_helper_js_1.isEmbeddedField)(el))
             throw new Error(`"${el.name}" requested as "embedded" but it is "${el.kind}"`);
         return el;
     }
-    EntityMetadata.getEmbeddedElement = getEmbeddedElement;
-    function getAssociationElement(entity, elementName) {
-        const el = getElement(entity, elementName);
-        if (el && !(0, orm_helper_1.isAssociationElement)(el))
+    EntityMetadata.getEmbeddedField = getEmbeddedField;
+    function getAssociationField(entity, fieldName) {
+        const el = getField(entity, fieldName);
+        if (el && !(0, orm_helper_js_1.isAssociationField)(el))
             throw new Error(`"${el.name}" requested as "association" but it is "${el.kind}"`);
         return el;
     }
-    EntityMetadata.getAssociationElement = getAssociationElement;
-    function findElement(entity, predicate) {
-        return Object.values(entity.elements).find(predicate);
+    EntityMetadata.getAssociationField = getAssociationField;
+    function findField(entity, predicate) {
+        return Object.values(entity.fields).find(predicate);
     }
-    EntityMetadata.findElement = findElement;
-    function getColumnElementByFieldName(entity, fieldName) {
+    EntityMetadata.findField = findField;
+    function getColumnFieldByFieldName(entity, fieldName) {
         if (!fieldName)
             return;
         fieldName = fieldName.toLowerCase();
-        for (const prop of Object.values(entity.elements)) {
-            if ((0, orm_helper_1.isColumnElement)(prop) && prop.fieldName.toLowerCase() === fieldName)
+        for (const prop of Object.values(entity.fields)) {
+            if ((0, orm_helper_js_1.isColumnField)(prop) && prop.fieldName.toLowerCase() === fieldName)
                 return prop;
         }
     }
-    EntityMetadata.getColumnElementByFieldName = getColumnElementByFieldName;
-    function getElementNames(entity, filter) {
+    EntityMetadata.getColumnFieldByFieldName = getColumnFieldByFieldName;
+    function getFieldNames(entity, filter) {
         if (filter) {
             const out = [];
-            for (const el of Object.values(entity.elements)) {
+            for (const el of Object.values(entity.fields)) {
                 if (el && (!filter || filter(el)))
                     out.push(el.name);
             }
             return out;
         }
         // Create a cached name array
-        if (!Object.prototype.hasOwnProperty.call(entity, '_elementNames'))
-            Object.defineProperty(entity, '_elementNames', {
+        if (!Object.prototype.hasOwnProperty.call(entity, '_fieldNames'))
+            Object.defineProperty(entity, '_fieldNames', {
                 enumerable: false,
                 configurable: true,
                 writable: true,
-                value: Object.values(entity.elements).map(m => m.name)
+                value: Object.values(entity.fields).map(m => m.name)
             });
-        return entity._elementNames;
+        return entity._fieldNames;
     }
-    EntityMetadata.getElementNames = getElementNames;
-    function getColumnNames(entity) {
-        return getElementNames(entity, orm_helper_1.isColumnElement);
+    EntityMetadata.getFieldNames = getFieldNames;
+    function getColumnFieldNames(entity) {
+        return getFieldNames(entity, orm_helper_js_1.isColumnField);
     }
-    EntityMetadata.getColumnNames = getColumnNames;
-    function getEmbeddedElementNames(entity) {
-        return getElementNames(entity, orm_helper_1.isEmbeddedElement);
+    EntityMetadata.getColumnFieldNames = getColumnFieldNames;
+    function getEmbeddedFieldNames(entity) {
+        return getFieldNames(entity, orm_helper_js_1.isEmbeddedField);
     }
-    EntityMetadata.getEmbeddedElementNames = getEmbeddedElementNames;
-    function getAssociationElementNames(entity) {
-        return getElementNames(entity, orm_helper_1.isAssociationElement);
+    EntityMetadata.getEmbeddedFieldNames = getEmbeddedFieldNames;
+    function getAssociationFieldNames(entity) {
+        return getFieldNames(entity, orm_helper_js_1.isAssociationField);
     }
-    EntityMetadata.getAssociationElementNames = getAssociationElementNames;
-    function getNonAssociationElementNames(entity) {
-        return getElementNames(entity, x => !(0, orm_helper_1.isAssociationElement)(x));
+    EntityMetadata.getAssociationFieldNames = getAssociationFieldNames;
+    function getNonAssociationFieldNames(entity) {
+        return getFieldNames(entity, x => !(0, orm_helper_js_1.isAssociationField)(x));
     }
-    EntityMetadata.getNonAssociationElementNames = getNonAssociationElementNames;
+    EntityMetadata.getNonAssociationFieldNames = getNonAssociationFieldNames;
     function getInsertColumnNames(entity) {
-        return getElementNames(entity, x => (0, orm_helper_1.isColumnElement)(x) && !x.noInsert);
+        return getFieldNames(entity, x => (0, orm_helper_js_1.isColumnField)(x) && !x.noInsert);
     }
     EntityMetadata.getInsertColumnNames = getInsertColumnNames;
     function getUpdateColumnNames(entity) {
-        return getElementNames(entity, x => (0, orm_helper_1.isColumnElement)(x) && !x.noUpdate);
+        return getFieldNames(entity, x => (0, orm_helper_js_1.isColumnField)(x) && !x.noUpdate);
     }
     EntityMetadata.getUpdateColumnNames = getUpdateColumnNames;
     function getPrimaryIndex(entity) {
@@ -149,7 +149,7 @@ var EntityMetadata;
         const out = [];
         if (idx) {
             for (const k of idx.columns) {
-                const col = getColumnElement(entity, k);
+                const col = getColumnField(entity, k);
                 if (!col)
                     throw new Error(`Data column "${k}" in primary index of ${entity.name} does not exists`);
                 out.push(col);
@@ -180,7 +180,7 @@ var EntityMetadata;
     EntityMetadata.addIndex = addIndex;
     function addForeignKey(entity, propertyKey, target, targetKey) {
         entity.foreignKeys = entity.foreignKeys || [];
-        const fk = new association_1.Association(entity.name + '.' + propertyKey, {
+        const fk = new association_js_1.Association(entity.name + '.' + propertyKey, {
             source: entity.ctor,
             sourceKey: propertyKey,
             target,
@@ -197,10 +197,10 @@ var EntityMetadata;
         entity.eventListeners[event].push(fn);
     }
     EntityMetadata.addEventListener = addEventListener;
-    function defineColumnElement(entity, name, options = {}) {
-        delete entity._elementNames;
-        let prop = EntityMetadata.getElement(entity, name);
-        if ((0, orm_helper_1.isColumnElement)(prop))
+    function defineColumnField(entity, name, options = {}) {
+        delete entity._fieldNames;
+        let prop = EntityMetadata.getField(entity, name);
+        if ((0, orm_helper_js_1.isColumnField)(prop))
             options = { ...prop, ...options };
         if (!options.type) {
             switch (options.dataType) {
@@ -252,34 +252,34 @@ var EntityMetadata;
                     options.dataType = builder_1.DataType.VARCHAR;
             }
         }
-        prop = column_element_metadata_1.ColumnElementMetadata.create(entity, name, options);
-        entity.elements[name.toLowerCase()] = prop;
+        prop = column_field_metadata_js_1.ColumnFieldMetadata.create(entity, name, options);
+        entity.fields[name.toLowerCase()] = prop;
         return prop;
     }
-    EntityMetadata.defineColumnElement = defineColumnElement;
-    function defineEmbeddedElement(entity, name, type, options) {
-        delete entity._elementNames;
-        let prop = EntityMetadata.getElement(entity, name);
-        if ((0, orm_helper_1.isEmbeddedElement)(prop))
+    EntityMetadata.defineColumnField = defineColumnField;
+    function defineEmbeddedField(entity, name, type, options) {
+        delete entity._fieldNames;
+        let prop = EntityMetadata.getField(entity, name);
+        if ((0, orm_helper_js_1.isEmbeddedField)(prop))
             options = { ...prop, ...options };
-        prop = embedded_element_metadata_1.EmbeddedElementMetadata.create(entity, name, type, options);
-        entity.elements[name.toLowerCase()] = prop;
+        prop = embedded_field_metadata_js_1.EmbeddedFieldMetadata.create(entity, name, type, options);
+        entity.fields[name.toLowerCase()] = prop;
         return prop;
     }
-    EntityMetadata.defineEmbeddedElement = defineEmbeddedElement;
-    function defineAssociationElement(entity, propertyKey, association) {
-        delete entity._elementNames;
-        const prop = association_element_metadata_1.AssociationElementMetadata.create(entity, propertyKey, association);
+    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);
         let l = association;
         let i = 1;
         while (l) {
             l.name = entity.name + '.' + propertyKey + '#' + (i++);
             l = l.next;
         }
-        entity.elements[propertyKey.toLowerCase()] = prop;
+        entity.fields[propertyKey.toLowerCase()] = prop;
         return prop;
     }
-    EntityMetadata.defineAssociationElement = defineAssociationElement;
+    EntityMetadata.defineAssociationField = defineAssociationField;
     function setPrimaryKeys(entity, column, options) {
         addIndex(entity, {
             ...options,
@@ -290,9 +290,8 @@ var EntityMetadata;
     }
     EntityMetadata.setPrimaryKeys = setPrimaryKeys;
     function mixin(derived, base, filter) {
-        // const elementKeys = elements && elements.map(x => x.toLowerCase());
-        const hasElement = (k) => !filter || filter(k);
-        delete derived._elementNames;
+        const hasField = (k) => !filter || filter(k);
+        delete derived._fieldNames;
         if (!derived.tableName) {
             derived.tableName = base.tableName;
             derived.schema = base.schema;
@@ -302,7 +301,7 @@ var EntityMetadata;
         if (base.indexes && base.indexes.length) {
             const hasPrimaryIndex = !!getPrimaryIndex(derived);
             for (const idx of base.indexes) {
-                if (!idx.columns.find(x => !hasElement(x))) {
+                if (!idx.columns.find(x => !hasField(x))) {
                     if (hasPrimaryIndex)
                         addIndex(derived, { ...idx, primary: undefined });
                     else
@@ -314,8 +313,8 @@ var EntityMetadata;
         if (base.foreignKeys && base.foreignKeys.length) {
             derived.foreignKeys = derived.foreignKeys || [];
             for (const fk of base.foreignKeys) {
-                if (!fk.sourceKey || hasElement(fk.sourceKey)) {
-                    const newFk = new association_1.Association(fk.name, { ...fk, source: derived.ctor });
+                if (!fk.sourceKey || hasField(fk.sourceKey)) {
+                    const newFk = new association_js_1.Association(fk.name, { ...fk, source: derived.ctor });
                     derived.foreignKeys.push(newFk);
                 }
             }
@@ -326,15 +325,15 @@ var EntityMetadata;
                 arr.forEach(fn => EntityMetadata.addEventListener(derived, event, fn));
             }
         }
-        // Copy elements
-        derived.elements = derived.elements || {};
-        for (const [n, p] of Object.entries(base.elements)) {
-            if (!hasElement(n))
+        // Copy fields
+        derived.fields = derived.fields || {};
+        for (const [n, p] of Object.entries(base.fields)) {
+            if (!hasField(n))
                 continue;
             const o = Object.assign({}, p);
             o.entity = derived;
             Object.setPrototypeOf(o, Object.getPrototypeOf(p));
-            derived.elements[n] = o;
+            derived.fields[n] = o;
         }
     }
     EntityMetadata.mixin = mixin;

package/{dist → cjs}/orm/model/link-chain.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LinkChain = void 0;
-const association_node_1 = require("./association-node");
+const association_node_js_1 = require("./association-node.js");
 class LinkChain {
-    constructor(target, kind, targetKey, sourceKey) {
+    target;
+    first;
+    current;
+    constructor(target, targetKey, sourceKey, many) {
         this.target = target;
-        this.first = this.current = new association_node_1.AssociationNode('', {
-            kind,
+        this.first = this.current = new association_node_js_1.AssociationNode('', {
+            many,
             target,
             source: null,
             sourceKey,
@@ -22,20 +25,14 @@ class LinkChain {
         return this;
     }
     linkToOne(target, targetColumn, parentColumn) {
-        return this._newNode(target, 'to', targetColumn, parentColumn);
+        return this._newNode(target, targetColumn, parentColumn);
     }
     linkToMany(target, targetColumn, parentColumn) {
-        return this._newNode(target, 'to-many', targetColumn, parentColumn);
+        return this._newNode(target, targetColumn, parentColumn, true);
     }
-    linkFromOne(target, targetColumn, parentColumn) {
-        return this._newNode(target, 'from', targetColumn, parentColumn);
-    }
-    linkFromMany(target, targetColumn, parentColumn) {
-        return this._newNode(target, 'from-many', targetColumn, parentColumn);
-    }
-    _newNode(target, kind, targetKey, parentKey) {
-        const child = new association_node_1.AssociationNode(this.current.name, {
-            kind,
+    _newNode(target, targetKey, parentKey, many = false) {
+        const child = new association_node_js_1.AssociationNode(this.current.name, {
+            many,
             source: this.current.target,
             target,
             sourceKey: parentKey,

package/{dist → cjs}/orm/repository.class.js

@@ -2,14 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Repository = void 0;
 const strict_typed_events_1 = require("strict-typed-events");
-const SqbConnection_1 = require("../client/SqbConnection");
-const count_command_1 = require("./commands/count.command");
-const create_command_1 = require("./commands/create.command");
-const destroy_command_1 = require("./commands/destroy.command");
-const find_command_1 = require("./commands/find.command");
-const update_command_1 = require("./commands/update.command");
-const extract_keyvalues_1 = require("./util/extract-keyvalues");
+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 destroy_command_js_1 = require("./commands/destroy.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");
 class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_typed_events_1.AsyncEventEmitter) {
+    _executor;
+    _entity;
+    _schema;
     constructor(entityDef, executor, schema) {
         super();
         this._executor = executor;
@@ -87,7 +90,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
     }
     async _execute(fn, opts) {
         let connection = opts?.connection;
-        if (!connection && this._executor instanceof SqbConnection_1.SqbConnection)
+        if (!connection && this._executor instanceof sqb_connection_js_1.SqbConnection)
             connection = this._executor;
         if (connection) {
             if (this._schema)
@@ -103,7 +106,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
     }
     async _create(values, options) {
         await this._emit('before-create', values, options);
-        const keyValues = await create_command_1.CreateCommand.execute({
+        const keyValues = await create_command_js_1.CreateCommand.execute({
             ...options,
             entity: this._entity,
             values,
@@ -117,7 +120,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
     }
     async _createOnly(values, options) {
         await this._emit('before-create', values, options);
-        await create_command_1.CreateCommand.execute({
+        await create_command_js_1.CreateCommand.execute({
             ...options,
             entity: this._entity,
             values,
@@ -125,33 +128,33 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
         });
     }
     async _exists(keyValue, options) {
-        const filter = [(0, extract_keyvalues_1.extractKeyValues)(this._entity, keyValue, true)];
+        const filter = [(0, extract_keyvalues_js_1.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 count_command_1.CountCommand.execute({
+        return !!(await count_command_js_1.CountCommand.execute({
             ...options,
             filter,
             entity: this._entity
         }));
     }
     async _count(options) {
-        return count_command_1.CountCommand.execute({
+        return count_command_js_1.CountCommand.execute({
             ...options,
             entity: this._entity
         });
     }
     async _findAll(options) {
-        return await find_command_1.FindCommand.execute({
+        return await find_command_js_1.FindCommand.execute({
             ...options,
             entity: this._entity,
         });
     }
     async _findOne(options) {
-        const rows = await find_command_1.FindCommand.execute({
+        const rows = await find_command_js_1.FindCommand.execute({
             ...options,
             entity: this._entity,
             limit: 1
@@ -159,7 +162,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
         return rows && rows[0];
     }
     async _findByPk(keyValue, options) {
-        const filter = [(0, extract_keyvalues_1.extractKeyValues)(this._entity, keyValue, true)];
+        const filter = [(0, extract_keyvalues_js_1.extractKeyValues)(this._entity, keyValue, true)];
         if (options && options.filter) {
             if (Array.isArray(options.filter))
                 filter.push(...options.filter);
@@ -170,14 +173,14 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
     }
     async _destroy(keyValue, options) {
         await this._emit('before-destroy', keyValue, options);
-        const filter = [(0, extract_keyvalues_1.extractKeyValues)(this._entity, keyValue, true)];
+        const filter = [(0, extract_keyvalues_js_1.extractKeyValues)(this._entity, keyValue, true)];
         if (options && options.filter) {
             if (Array.isArray(options.filter))
                 filter.push(...options.filter);
             else
                 filter.push(options.filter);
         }
-        const result = !!(await destroy_command_1.DestroyCommand.execute({
+        const result = !!(await destroy_command_js_1.DestroyCommand.execute({
             ...options,
             filter,
             entity: this._entity,
@@ -187,7 +190,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
     }
     async _destroyAll(options) {
         await this._emit('before-destroy-all', options);
-        const rowsAffected = destroy_command_1.DestroyCommand.execute({
+        const rowsAffected = destroy_command_js_1.DestroyCommand.execute({
             ...options,
             entity: this._entity,
             filter: options?.filter,
@@ -198,7 +201,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
     }
     async _update(keyValue, values, options) {
         await this._emit('before-update', keyValue, values, options);
-        const keyValues = (0, extract_keyvalues_1.extractKeyValues)(this._entity, keyValue, true);
+        const keyValues = (0, extract_keyvalues_js_1.extractKeyValues)(this._entity, keyValue, true);
         const filter = [keyValues];
         if (options.filter) {
             if (Array.isArray(options.filter))
@@ -208,7 +211,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_1.UpdateCommand.execute({
+        const rowsAffected = await update_command_js_1.UpdateCommand.execute({
             ...options,
             entity: this._entity,
             values: updateValues,
@@ -219,7 +222,7 @@ class Repository extends (0, strict_typed_events_1.TypedEventEmitterClass)(stric
     }
     async _updateAll(values, options) {
         await this._emit('before-update-all', values, options);
-        const rowsAffected = await update_command_1.UpdateCommand.execute({
+        const rowsAffected = await update_command_js_1.UpdateCommand.execute({
             ...options,
             entity: this._entity,
             values

package/{dist → cjs}/orm/util/extract-keyvalues.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractKeyValues = void 0;
-const entity_metadata_1 = require("../model/entity-metadata");
-const orm_helper_1 = require("./orm.helper");
+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_1.EntityMetadata.getPrimaryIndex(entityDef);
+    const primaryIndex = entity_metadata_js_1.EntityMetadata.getPrimaryIndex(entityDef);
     if (!primaryIndex)
         throw new Error(`No primary fields defined for "${entityDef.name}" entity`);
     const validateCol = (k) => {
-        const col = entity_metadata_1.EntityMetadata.getElement(entityDef, k);
+        const col = entity_metadata_js_1.EntityMetadata.getField(entityDef, k);
         if (!col)
             throw new Error(`Unknown column (${k}) defined as primary key in entity "${entityDef.name}"`);
-        if (!(0, orm_helper_1.isColumnElement)(col))
+        if (!(0, orm_helper_js_1.isColumnField)(col))
             throw new Error(`Column (${k}) defined as primary key in entity "${entityDef.name}" is not a data column`);
     };
     // if entity's primary key has more than one key field

package/{dist → cjs}/orm/util/orm.helper.js

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

package/{dist/orm/util/serialize-element.js → cjs/orm/util/serialize-field.js}

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeColumn = void 0;
 const builder_1 = require("@sqb/builder");
-const orm_helper_1 = require("./orm.helper");
+const orm_helper_js_1 = require("./orm.helper.js");
 function serializeColumn(col, v) {
-    if ((0, orm_helper_1.isColumnElement)(col)) {
+    if ((0, orm_helper_js_1.isColumnField)(col)) {
         if (col.isArray) {
             if (Array.isArray(v))
                 return v.map(x => serializeDataValue(col.dataType || builder_1.DataType.VARCHAR, x));

package/cjs/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

package/{dist/client/Adapter.d.ts → esm/client/adapter.d.ts}

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

package/esm/client/adapter.js

@@ -0,0 +1 @@
+export {};