@sqb/connect 4.12.1 → 4.14.0

package/esm/orm/model/association.js

@@ -63,17 +63,15 @@ export class Association {
                 this._targetProperty = foreign._targetProperty;
                 return;
             }
-            else {
-                // Try to determine key fields from foreign key from target to source
-                foreign = await EntityMetadata.getForeignKeyFor(target, source);
-                if (foreign && foreign !== this) {
-                    await foreign._resolveKeys();
-                    this._sourceKey = foreign._targetKey;
-                    this._sourceProperty = foreign._targetProperty;
-                    this._targetKey = foreign._sourceKey;
-                    this._targetProperty = foreign._sourceProperty;
-                    return;
-                }
+            // Try to determine key fields from foreign key from target to source
+            foreign = await EntityMetadata.getForeignKeyFor(target, source);
+            if (foreign && foreign !== this) {
+                await foreign._resolveKeys();
+                this._sourceKey = foreign._targetKey;
+                this._sourceProperty = foreign._targetProperty;
+                this._targetKey = foreign._sourceKey;
+                this._targetProperty = foreign._sourceProperty;
+                return;
             }
             if (this.many) {
                 if (!sourceKey) {

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

@@ -56,8 +56,9 @@ export var EntityMetadata;
     EntityMetadata.getEmbeddedField = getEmbeddedField;
     function getAssociationField(entity, fieldName) {
         const el = getField(entity, fieldName);
-        if (el && !isAssociationField(el))
+        if (el && !isAssociationField(el)) {
             throw new Error(`"${el.name}" requested as "association" but it is "${el.kind}"`);
+        }
         return el;
     }
     EntityMetadata.getAssociationField = getAssociationField;
@@ -85,13 +86,14 @@ export var EntityMetadata;
             return out;
         }
         // Create a cached name array
-        if (!Object.prototype.hasOwnProperty.call(entity, '_fieldNames'))
+        if (!Object.prototype.hasOwnProperty.call(entity, '_fieldNames')) {
             Object.defineProperty(entity, '_fieldNames', {
                 enumerable: false,
                 configurable: true,
                 writable: true,
                 value: Object.values(entity.fields).map(m => m.name),
             });
+        }
         return entity._fieldNames;
     }
     EntityMetadata.getFieldNames = getFieldNames;

package/esm/orm/repository.class.js

@@ -34,47 +34,31 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
         }, options);
     }
     exists(keyValue, options) {
-        return this._execute(async (connection) => {
-            return this._exists(keyValue, { ...options, connection });
-        }, options);
+        return this._execute(async (connection) => this._exists(keyValue, { ...options, connection }), options);
     }
     existsOne(options) {
-        return this._execute(async (connection) => {
-            return this._existsOne({ ...options, connection });
-        }, options);
+        return this._execute(async (connection) => this._existsOne({ ...options, connection }), options);
     }
     count(options) {
-        return this._execute(async (connection) => {
-            return this._count({ ...options, connection });
-        }, options);
+        return this._execute(async (connection) => this._count({ ...options, connection }), options);
     }
     findById(keyValue, options) {
-        return this._execute(async (connection) => {
-            return this._find(keyValue, { ...options, connection });
-        }, options);
+        return this._execute(async (connection) => this._find(keyValue, { ...options, connection }), options);
     }
     findOne(options) {
-        return this._execute(async (connection) => {
-            return await this._findOne({
-                ...options,
-                connection,
-            });
-        }, options);
+        return this._execute(async (connection) => await this._findOne({
+            ...options,
+            connection,
+        }), options);
     }
     findMany(options) {
-        return this._execute(async (connection) => {
-            return this._findMany({ ...options, connection });
-        }, options);
+        return this._execute(async (connection) => this._findMany({ ...options, connection }), options);
     }
     delete(keyValue, options) {
-        return this._execute(async (connection) => {
-            return this._delete(keyValue, { ...options, connection });
-        }, options);
+        return this._execute(async (connection) => this._delete(keyValue, { ...options, connection }), options);
     }
     deleteMany(options) {
-        return this._execute(async (connection) => {
-            return this._deleteMany({ ...options, connection });
-        }, options);
+        return this._execute(async (connection) => this._deleteMany({ ...options, connection }), options);
     }
     update(keyValue, values, options) {
         return this._execute(async (connection) => {
@@ -85,14 +69,10 @@ export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
         }, options);
     }
     updateOnly(keyValue, values, options) {
-        return this._execute(async (connection) => {
-            return !!(await this._update(keyValue, values, { ...options, connection }));
-        }, options);
+        return this._execute(async (connection) => !!(await this._update(keyValue, values, { ...options, connection })), options);
     }
     updateMany(values, options) {
-        return this._execute(async (connection) => {
-            return this._updateMany(values, { ...options, connection });
-        });
+        return this._execute(async (connection) => this._updateMany(values, { ...options, connection }));
     }
     async _execute(fn, opts) {
         let connection = opts?.connection;

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

@@ -4,8 +4,9 @@ export function applyMixins(derivedCtor, baseCtor, filter) {
             name === '__proto__' ||
             name === 'toJSON' ||
             name === 'toString' ||
-            (filter && !filter(name)))
+            (filter && !filter(name))) {
             continue;
+        }
         Object.defineProperty(derivedCtor.prototype, name, Object.getOwnPropertyDescriptor(baseCtor.prototype, name) || Object.create(null));
     }
 }

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

@@ -8,14 +8,16 @@ export function extractKeyValues(entityDef, valueOrInstance, keepOther) {
         const col = EntityMetadata.getField(entityDef, k);
         if (!col)
             throw new Error(`Unknown column (${k}) defined as primary key in entity "${entityDef.name}"`);
-        if (!isColumnField(col))
+        if (!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
     if (primaryIndex.columns.length > 1) {
-        if (typeof valueOrInstance !== 'object')
+        if (typeof valueOrInstance !== 'object') {
             throw new Error(`"${entityDef.name}" entity` +
                 ` has more than one primary key field and you must provide all values with an key/value pair`);
+        }
         const valueKeys = Object.keys(valueOrInstance);
         const valueKeysUpper = valueKeys.map(x => x.toUpperCase());
         const out = {};
@@ -41,8 +43,9 @@ export function extractKeyValues(entityDef, valueOrInstance, keepOther) {
         const valueKeys = Object.keys(valueOrInstance);
         const valueKeysUpper = valueKeys.map(x => x.toUpperCase());
         const k = valueKeysUpper.indexOf(primaryColumnName.toUpperCase());
-        if (k < 0)
+        if (k < 0) {
             throw new Error(`Value of key field "${entityDef.name}.${primaryColumnName}" required to perform this operation`);
+        }
         const out = { [primaryColumnName]: valueOrInstance[valueKeys[k]] };
         if (keepOther) {
             for (let i = 0; i < valueKeys.length; i++) {

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

@@ -8,12 +8,8 @@ export function isEntityClass(fn) {
 export function isColumnField(f) {
     return !!(f && f.name && f.kind === 'column');
 }
-export const isEmbeddedField = (f) => {
-    return !!(f && f.name && f.kind === 'object');
-};
-export const isAssociationField = (f) => {
-    return !!(f && f.name && f.kind === 'association');
-};
+export const isEmbeddedField = (f) => !!(f && f.name && f.kind === 'object');
+export const isAssociationField = (f) => !!(f && f.name && f.kind === 'association');
 export async function resolveEntity(ctorThunk) {
     if (typeof ctorThunk !== 'function')
         return;

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

@@ -22,9 +22,7 @@ export function parseFieldsProjection(projection, keepCase) {
 }
 function parse(input, target) {
     /** Add dot before brackets which is required to split fields */
-    input = input.replace(NO_DOT_BRACKET_PATTERN, s => {
-        return s.charAt(0) + '.' + s.substring(1);
-    });
+    input = input.replace(NO_DOT_BRACKET_PATTERN, s => s.charAt(0) + '.' + s.substring(1));
     const fields = splitString(input, {
         delimiters: '.',
         brackets: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/connect",
   "description": "Multi-dialect database connection framework written with TypeScript",
-  "version": "4.12.1",
+  "version": "4.14.0",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>",
@@ -36,10 +36,11 @@
   },
   "dependencies": {
     "debug": "^4.3.5",
+    "doublylinked": "^2.5.4",
     "fast-tokenizer": "^1.3.0",
     "lightning-pool": "^4.2.2",
     "lodash": "^4.17.21",
-    "power-tasks": "^1.7.3",
+    "power-tasks": "^1.7.4",
     "putil-isplainobject": "^1.1.5",
     "putil-merge": "^3.12.1",
     "putil-promisify": "^1.10.1",
@@ -49,11 +50,11 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
-    "@types/lodash": "^4.17.5",
-    "postgresql-client": "^2.11.2"
+    "@types/lodash": "^4.17.7",
+    "postgrejs": "^2.15.1"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.12.1",
+    "@sqb/builder": "^4.14.0",
     "reflect-metadata": "^0.2.2"
   },
   "engines": {

package/types/client/adapter.d.ts

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

package/types/client/cursor-stream.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Readable } from 'stream';
 import { Cursor } from './cursor.js';
 export interface CursorStreamOptions {

package/types/client/extensions.d.ts

@@ -1,4 +1,15 @@
+import { SerializerExtension } from '@sqb/builder';
 import { Adapter } from './adapter.js';
-export declare let adapters: Adapter[];
-export declare function registerAdapter(adapter: Adapter): void;
-export declare function unRegisterAdapter(...adapter: Adapter[]): void;
+export declare class AdapterRegistry {
+    protected static adapters: Adapter[];
+    static get size(): number;
+    static register(...adapters: Adapter[]): void;
+    static forEach(callback: (value: Adapter, index: number) => void, thisArg?: any): void;
+    static items(): IterableIterator<Adapter>;
+    static unRegister(...extensions: Adapter[]): void;
+    static getAll(dialect: string): Adapter[];
+    static get(index: number): SerializerExtension | undefined;
+    static findDialect(dialect: string): SerializerExtension | undefined;
+    static findDriver(dialect: string): SerializerExtension | undefined;
+    static has(extension: Adapter): boolean;
+}

package/types/client/sqb-client.d.ts

@@ -1,6 +1,6 @@
+import { classes } from '@sqb/builder';
 import { Pool as LightningPool } from 'lightning-pool';
 import { Maybe, Type } from 'ts-gems';
-import { classes } from '@sqb/builder';
 import { Repository } from '../orm/repository.class.js';
 import { SqbConnection } from './sqb-connection.js';
 import { ClientConfiguration, ClientDefaults, ConnectionOptions, QueryExecuteOptions, QueryRequest, QueryResult, TransactionFunction } from './types.js';

package/types/client/sqb-connection.d.ts

@@ -1,5 +1,5 @@
-import { Type } from 'ts-gems';
 import { classes } from '@sqb/builder';
+import { Type } from 'ts-gems';
 import { Repository } from '../orm/repository.class.js';
 import { Adapter } from './adapter.js';
 import { SqbClient } from './sqb-client.js';

package/types/client/types.d.ts

@@ -1,6 +1,6 @@
+import { DataType, ParamOptions } from '@sqb/builder';
 import type { PoolConfiguration } from 'lightning-pool';
 import { Maybe } from 'ts-gems';
-import { DataType, ParamOptions } from '@sqb/builder';
 import type { Adapter } from './adapter';
 import type { Cursor } from './cursor';
 import type { FieldInfoMap } from './field-info-map';

package/types/index.d.ts

@@ -1,23 +1,12 @@
 import 'reflect-metadata';
-export * from './client/types.js';
 export * from './client/adapter.js';
+export * from './client/cursor.js';
+export * from './client/extensions.js';
 export * from './client/sqb-client.js';
 export * from './client/sqb-connection.js';
-export * from './client/cursor.js';
-export { registerAdapter, unRegisterAdapter } from './client/extensions.js';
-export * from './orm/orm.type.js';
-export * from './orm/orm.const.js';
+export * from './client/types.js';
+export * from './orm/backward.js';
 export * from './orm/base-entity.js';
-export * from './orm/repository.class.js';
-export * from './orm/model/entity-metadata.js';
-export * from './orm/model/field-metadata.js';
-export * from './orm/model/column-field-metadata.js';
-export * from './orm/model/embedded-field-metadata.js';
-export * from './orm/model/association-field-metadata.js';
-export * from './orm/model/association.js';
-export * from './orm/model/association-node.js';
-export * from './orm/model/index-metadata.js';
-export * from './orm/model/link-chain.js';
 export * from './orm/decorators/column.decorator.js';
 export * from './orm/decorators/embedded.decorator.js';
 export * from './orm/decorators/entity.decorator.js';
@@ -27,6 +16,17 @@ export * from './orm/decorators/index.decorator.js';
 export * from './orm/decorators/link.decorator.js';
 export * from './orm/decorators/primarykey.decorator.js';
 export * from './orm/decorators/transform.decorator.js';
-export { isColumnField, isEmbeddedField, isAssociationField, isEntityClass } from './orm/util/orm.helper.js';
+export * from './orm/model/association.js';
+export * from './orm/model/association-field-metadata.js';
+export * from './orm/model/association-node.js';
+export * from './orm/model/column-field-metadata.js';
+export * from './orm/model/embedded-field-metadata.js';
+export * from './orm/model/entity-metadata.js';
+export * from './orm/model/field-metadata.js';
+export * from './orm/model/index-metadata.js';
+export * from './orm/model/link-chain.js';
+export * from './orm/orm.const.js';
+export * from './orm/orm.type.js';
+export * from './orm/repository.class.js';
+export { isAssociationField, isColumnField, isEmbeddedField, isEntityClass } from './orm/util/orm.helper.js';
 export * from './orm/util/parse-fields-projection.js';
-export * from './orm/backward.js';

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

@@ -38,6 +38,6 @@ export declare class FindCommand {
     private _selectColumn;
     filter(filter: any): Promise<void>;
     sort(sortFields: string[]): Promise<void>;
-    execute(args: Pick<FindCommandArgs, 'connection' | 'distinct' | 'offset' | 'limit' | 'params' | 'onTransformRow'>): Promise<any[]>;
+    execute(args: Pick<FindCommandArgs, 'connection' | 'distinct' | 'offset' | 'limit' | 'params' | 'onTransformRow' | 'prettyPrint'>): Promise<any[]>;
     private _getEntityFromAlias;
 }

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

@@ -1,5 +1,5 @@
-import { Type } from 'ts-gems';
 import { DataType } from '@sqb/builder';
+import { Type } from 'ts-gems';
 import type { FieldInfoMap } from '../../client/field-info-map';
 import { SqbConnection } from '../../client/sqb-connection.js';
 import { ColumnTransformFunction } from '../orm.type.js';

package/types/orm/repository.class.d.ts

@@ -1,5 +1,5 @@
-import { PartialDTO, PatchDTO, StrictOmit, Type } from 'ts-gems';
 import { LogicalOperator } from '@sqb/builder';
+import { PartialDTO, PatchDTO, StrictOmit, Type } from 'ts-gems';
 import { FieldInfoMap } from '../client/field-info-map.js';
 import { SqbClient } from '../client/sqb-client.js';
 import { SqbConnection } from '../client/sqb-connection.js';
@@ -16,6 +16,7 @@ export declare namespace Repository {
     type TransformRowFunction = (fields: FieldInfoMap, row: object, obj: object) => void;
     interface CommandOptions {
         connection?: SqbConnection;
+        prettyPrint?: boolean;
     }
     interface CreateOptions extends CommandOptions, Projection {
     }