@sqb/connect 5.0.2 → 5.0.3

package/client/adapter.js

@@ -1 +1,2 @@
-export {};
+import { Query } from '@sqb/builder';
+import { DataType, } from './types.js';

package/client/sqb-client.js

@@ -1,5 +1,5 @@
 import _debug from 'debug';
-import { createPool, PoolState, } from 'lightning-pool';
+import { createPool, Pool as LightningPool, PoolState, } from 'lightning-pool';
 import { coerceToBoolean, coerceToInt } from 'putil-varhelpers';
 import { AsyncEventEmitter, TypedEventEmitterClass } from 'strict-typed-events';
 import { EntityMetadata } from '../orm/model/entity-metadata.js';

package/client/sqb-error.js

@@ -1,3 +1,4 @@
+import { Query } from '@sqb/builder';
 export class SQBError extends Error {
     cause;
     queryOptions;

package/client/types.js

@@ -1 +1,2 @@
+import { DataType } from '@sqb/builder';
 export { DataType } from '@sqb/builder';

package/orm/commands/command.helper.js

@@ -1,4 +1,5 @@
-import { And, Eq, Exists, Field, InnerJoin, isCompOperator, isLogicalOperator, LeftOuterJoin, OperatorType, Or, Raw, Select, } from '@sqb/builder';
+import { And, Eq, Exists, Field, InnerJoin, isCompOperator, isLogicalOperator, LeftOuterJoin, LogicalOperator, OperatorType, Or, Raw, Select, } from '@sqb/builder';
+import { AssociationNode } from '../model/association-node.js';
 import { EntityMetadata } from '../model/entity-metadata.js';
 import { isAssociationField, isColumnField, isEmbeddedField, resolveEntityForEmbeddedField, } from '../util/orm.helper.js';
 export async function joinAssociationGetFirst(joinInfos, association, parentAlias, innerJoin) {

package/orm/commands/count.command.js

@@ -1,4 +1,5 @@
-import { And, Count, Select, TableName } from '@sqb/builder';
+import { And, Count, LogicalOperator, Select, TableName } from '@sqb/builder';
+import { EntityMetadata } from '../model/entity-metadata.js';
 import { prepareFilter } from './command.helper.js';
 export class CountCommand {
     // istanbul ignore next

package/orm/commands/delete.command.js

@@ -1,4 +1,5 @@
-import { And, Delete, TableName } from '@sqb/builder';
+import { And, Delete, LogicalOperator, TableName } from '@sqb/builder';
+import { EntityMetadata } from '../model/entity-metadata.js';
 import { prepareFilter } from './command.helper.js';
 export class DeleteCommand {
     // istanbul ignore next

package/orm/commands/find.command.js

@@ -2,7 +2,7 @@ import { And, In, Param, Select, TableName } from '@sqb/builder';
 import { AssociationNode } from '../model/association-node.js';
 import { EntityMetadata } from '../model/entity-metadata.js';
 import { isAssociationField, isColumnField, isEmbeddedField, resolveEntityForEmbeddedField, } from '../util/orm.helper.js';
-import { parseFieldsProjection, } from '../util/parse-fields-projection.js';
+import { FieldsProjection, parseFieldsProjection, } from '../util/parse-fields-projection.js';
 import { joinAssociationGetLast, prepareFilter, } from './command.helper.js';
 import { RowConverter } from './row-converter.js';
 const SORT_ORDER_PATTERN = /^([-+])?(.*)$/;
@@ -151,7 +151,7 @@ export class FindCommand {
                         maxSubQueries: this.maxSubQueries - 1,
                         maxEagerFetch: this.maxEagerFetch,
                     });
-                    findCommand.converter.parent = this.converter;
+                    findCommand.converter.parent = converter;
                     await findCommand.filter(In(targetCol.name, Param(parentField)));
                     const sort = sortFields && extractSubFields(colNameLower, sortFields);
                     await findCommand.addFields({

package/orm/commands/row-converter.js

@@ -65,7 +65,7 @@ export class RowConverter {
         if (!this.keys)
             return result;
         await this._iterateForNested(this, connection, fields, rows, result);
-        // Return only non empty objects
+        // Return only non-empty objects
         return result.filter(x => !!x);
     }
     _rowToObject(executor, fields, row) {
@@ -123,7 +123,7 @@ export class RowConverter {
                 if (!(prop.paramValues && prop.paramValues.length))
                     continue;
                 const resultType = this.resultType;
-                const promise = (async function (p) {
+                const promise = Promise.resolve(prop).then(async (p) => {
                     const findCommand = p.findCommand;
                     let fld;
                     const map = new Map();
@@ -168,11 +168,12 @@ export class RowConverter {
                             }
                         }
                     }
-                })(prop);
+                });
                 promises.push(promise);
             }
             else if (isObjectProperty(prop)) {
-                promises.push(this._iterateForNested(prop.converter, connection, fields, rows, result));
+                const subResult = result.map(r => r[propKey]).filter(x => x);
+                promises.push(this._iterateForNested(prop.converter, connection, fields, rows, subResult));
             }
         }
         await Promise.all(promises);

package/orm/commands/update.command.js

@@ -1,4 +1,5 @@
 import { And, Param, SqlElement, TableName, Update } from '@sqb/builder';
+import { EntityMetadata } from '../model/entity-metadata.js';
 import { checkEnumValue, isColumnField, isEmbeddedField, resolveEntityForEmbeddedField, } from '../util/orm.helper.js';
 import { prepareFilter } from './command.helper.js';
 export class UpdateCommand {

package/orm/decorators/entity.decorator.js

@@ -1,3 +1,4 @@
+import { EmbeddedFieldMetadata } from '../model/embedded-field-metadata.js';
 import { EntityMetadata, } from '../model/entity-metadata.js';
 import { applyMixins } from '../util/apply-mixins.js';
 export function Entity(options) {

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

@@ -1 +1 @@
-export {};
+import { AssociationNode } from './association-node.js';

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

@@ -1 +1 @@
-export {};
+import { DataType } from '@sqb/builder';

package/orm/model/entity-metadata.js

@@ -2,6 +2,7 @@ import { DataType } from '@sqb/builder';
 import { ENTITY_METADATA_KEY } from '../orm.const.js';
 import { isAssociationField, isColumnField, isEmbeddedField, } from '../util/orm.helper.js';
 import { Association } from './association.js';
+import { AssociationNode } from './association-node.js';
 export var EntityMetadata;
 (function (EntityMetadata) {
     function define(ctor) {

package/orm/repository.class.js

@@ -1,4 +1,6 @@
+import { LogicalOperator } from '@sqb/builder';
 import { AsyncEventEmitter, TypedEventEmitterClass } from 'strict-typed-events';
+import { FieldInfoMap } from '../client/field-info-map.js';
 import { CountCommand } from './commands/count.command.js';
 import { CreateCommand } from './commands/create.command.js';
 import { DeleteCommand } from './commands/delete.command.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/connect",
   "description": "Multi-dialect database connection framework written with TypeScript",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "author": "Panates",
   "license": "Apache-2.0",
   "dependencies": {
@@ -21,7 +21,7 @@
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@sqb/builder": "^5.0.2",
+    "@sqb/builder": "^5.0.3",
     "reflect-metadata": "^0.2.2"
   },
   "type": "module",