@sqb/connect 4.26.1 → 5.0.1

package/client/adapter.d.ts

@@ -1,5 +1,5 @@
-import { classes } from '@sqb/builder';
-import { Maybe } from 'ts-gems';
+import { Query } from '@sqb/builder';
+import type { Maybe } from 'ts-gems';
 import { type ClientConfiguration, DataType, type QueryRequest, type RowType } from './types.js';
 export interface Adapter {
     driver: string;
@@ -26,7 +26,7 @@ export declare namespace Adapter {
         rollback: () => Promise<void>;
         setSchema?: (schema: string) => Promise<void>;
         getSchema?: () => Promise<string>;
-        onGenerateQuery?: (request: QueryRequest, query: classes.Query) => void;
+        onGenerateQuery?: (request: QueryRequest, query: Query) => void;
         getInTransaction?: () => boolean;
     }
     interface Cursor {

package/client/cursor.d.ts

@@ -1,5 +1,5 @@
 import type { Adapter } from './adapter.js';
-import { CursorStream, CursorStreamOptions } from './cursor-stream.js';
+import { CursorStream, type CursorStreamOptions } from './cursor-stream.js';
 import type { FieldInfoMap } from './field-info-map.js';
 import type { SqbConnection } from './sqb-connection.js';
 import type { ObjectRow, QueryRequest } from './types.js';

package/client/field-info-map.d.ts

@@ -1,4 +1,4 @@
-import { FieldInfo } from './types.js';
+import type { FieldInfo } from './types.js';
 export declare class FieldInfoMap {
     private _obj;
     private _arr;

package/client/helpers.d.ts

@@ -1,4 +1,4 @@
-import { Maybe } from 'ts-gems';
+import type { Maybe } from 'ts-gems';
 import type { Adapter } from './adapter.js';
 import { FieldInfoMap } from './field-info-map.js';
 import type { ArrayRowset, FieldNaming, ObjectRowset, QueryRequest } from './types.js';

package/client/sqb-client.d.ts

@@ -1,6 +1,6 @@
-import { classes } from '@sqb/builder';
+import type { Query } from '@sqb/builder';
 import { Pool as LightningPool } from 'lightning-pool';
-import { Maybe, Type } from 'ts-gems';
+import type { Maybe, Type } from 'ts-gems';
 import { Repository } from '../orm/repository.class.js';
 import { SqbConnection } from './sqb-connection.js';
 import type { ClientConfiguration, ClientDefaults, ConnectionOptions, QueryExecuteOptions, QueryRequest, QueryResult, TransactionFunction } from './types.js';
@@ -50,7 +50,7 @@ export declare class SqbClient extends SqbClient_base {
     /**
      * Executes a query or callback with a new acquired connection.
      */
-    execute(query: string | classes.Query, options?: QueryExecuteOptions): Promise<QueryResult>;
+    execute(query: string | Query, options?: QueryExecuteOptions): Promise<QueryResult>;
     /**
      * Tests the pool
      */

package/client/sqb-connection.d.ts

@@ -1,4 +1,4 @@
-import { classes } from '@sqb/builder';
+import { Query } from '@sqb/builder';
 import type { Type } from 'ts-gems';
 import { Repository } from '../orm/repository.class.js';
 import type { Adapter } from './adapter.js';
@@ -52,7 +52,7 @@ export declare class SqbConnection extends SqbConnection_base {
      * Immediately releases the connection.
      */
     close(): Promise<void>;
-    execute(query: string | classes.Query, options?: QueryExecuteOptions): Promise<any>;
+    execute(query: string | Query, options?: QueryExecuteOptions): Promise<any>;
     getRepository<T>(entity: Type<T> | string, opts?: {
         schema?: string;
     }): Repository<T>;
@@ -61,7 +61,7 @@ export declare class SqbConnection extends SqbConnection_base {
     /**
      * Executes a query
      */
-    protected _execute(query: string | classes.Query, options?: QueryExecuteOptions): Promise<any>;
+    protected _execute(query: string | Query, options?: QueryExecuteOptions): Promise<any>;
     startTransaction(): Promise<void>;
     commit(): Promise<void>;
     rollback(): Promise<void>;

package/client/sqb-connection.js

@@ -1,4 +1,4 @@
-import { classes } from '@sqb/builder';
+import { Query } from '@sqb/builder';
 import assert from 'assert';
 import _debug from 'debug';
 import { TaskQueue } from 'power-tasks';
@@ -253,7 +253,7 @@ export class SqbConnection extends TypedEventEmitterClass(AsyncEventEmitter) {
             fetchAsString: options.fetchAsString,
         };
         request.ignoreNulls = request.ignoreNulls && request.objectRows;
-        if (query instanceof classes.Query) {
+        if (query instanceof Query) {
             if (this._intlcon.onGenerateQuery)
                 this._intlcon.onGenerateQuery(request, query);
             const q = query.generate({

package/client/sqb-error.d.ts

@@ -1,5 +1,5 @@
 import { Query } from '@sqb/builder';
-import { QueryExecuteOptions, QueryRequest } from './types.js';
+import type { QueryExecuteOptions, QueryRequest } from './types.js';
 export declare class SQBError extends Error {
     cause?: Error;
     query: string | Query;

package/client/types.d.ts

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

package/index.d.ts

@@ -6,7 +6,6 @@ export * from './client/sqb-client.js';
 export * from './client/sqb-connection.js';
 export * from './client/sqb-error.js';
 export * from './client/types.js';
-export * from './orm/backward.js';
 export * from './orm/base-entity.js';
 export * from './orm/decorators/column.decorator.js';
 export * from './orm/decorators/embedded.decorator.js';

package/index.js

@@ -6,7 +6,6 @@ export * from './client/sqb-client.js';
 export * from './client/sqb-connection.js';
 export * from './client/sqb-error.js';
 export * from './client/types.js';
-export * from './orm/backward.js';
 export * from './orm/base-entity.js';
 export * from './orm/decorators/column.decorator.js';
 export * from './orm/decorators/embedded.decorator.js';

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

@@ -1,4 +1,4 @@
-import { JoinStatement, LogicalOperator } from '@sqb/builder';
+import { type Join, LogicalOperator } from '@sqb/builder';
 import { AssociationNode } from '../model/association-node.js';
 import { EntityMetadata } from '../model/entity-metadata.js';
 export interface JoinInfo {
@@ -7,7 +7,7 @@ export interface JoinInfo {
     targetEntity: EntityMetadata;
     joinAlias: string;
     parentAlias: string;
-    join: JoinStatement;
+    join: Join;
 }
 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>;

package/orm/commands/command.helper.js

@@ -1,4 +1,4 @@
-import { And, Eq, Exists, Field, InnerJoin, isCompOperator, isLogicalOperator, LeftOuterJoin, op, OperatorType, Raw, Select, } from '@sqb/builder';
+import { And, Eq, Exists, Field, InnerJoin, isCompOperator, isLogicalOperator, LeftOuterJoin, OperatorType, Or, Raw, Select, } from '@sqb/builder';
 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) {
@@ -122,7 +122,7 @@ export async function prepareFilter(entityDef, filter, trgOp, tableAlias = 'T')
                             subSelect.where(Eq(Field('K.' + targetCol.fieldName, targetCol.dataType, targetCol.isArray), Field(tableAlias + '.' + keyCol.fieldName, keyCol.dataType, keyCol.isArray)));
                             currentOp.add(Exists(subSelect));
                             if (currentOp._operatorType !== OperatorType.and) {
-                                currentOp = op.or();
+                                currentOp = Or();
                                 subSelect.where(currentOp);
                             }
                             else

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

@@ -1,8 +1,8 @@
 import { DataType } from '@sqb/builder';
-import { Type } from 'ts-gems';
+import type { Type } from 'ts-gems';
 import type { FieldInfoMap } from '../../client/field-info-map.js';
 import type { SqbConnection } from '../../client/sqb-connection.js';
-import { ColumnTransformFunction } from '../orm.type.js';
+import type { ColumnTransformFunction } from '../orm.type.js';
 import type { Repository } from '../repository.class.js';
 import type { FindCommand } from './find.command.js';
 export interface ValueProperty {

package/orm/decorators/column.decorator.d.ts

@@ -1,5 +1,5 @@
 import { DataType } from '@sqb/builder';
-import { ColumnFieldOptions } from '../model/column-field-metadata.js';
+import type { ColumnFieldOptions } from '../model/column-field-metadata.js';
 export declare function Column(type?: DataType): PropertyDecorator;
 export declare function Column(options?: ColumnFieldOptions): PropertyDecorator;
 export declare namespace Column { }

package/orm/decorators/embedded.decorator.d.ts

@@ -1,3 +1,3 @@
-import { EmbeddedFieldOptions } from '../model/embedded-field-metadata.js';
-import { TypeThunk } from '../orm.type.js';
+import type { EmbeddedFieldOptions } from '../model/embedded-field-metadata.js';
+import type { TypeThunk } from '../orm.type.js';
 export declare function Embedded(type?: TypeThunk, options?: EmbeddedFieldOptions): PropertyDecorator;

package/orm/decorators/entity.decorator.d.ts

@@ -1,9 +1,9 @@
-import { Maybe, Type } from 'ts-gems';
-import { AssociationFieldMetadata } from '../model/association-field-metadata.js';
-import { ColumnFieldMetadata } from '../model/column-field-metadata.js';
+import type { Maybe, Type } from 'ts-gems';
+import type { AssociationFieldMetadata } from '../model/association-field-metadata.js';
+import type { ColumnFieldMetadata } from '../model/column-field-metadata.js';
 import { EmbeddedFieldMetadata } from '../model/embedded-field-metadata.js';
-import { AnyFieldMetadata, EntityMetadata, EntityOptions } from '../model/entity-metadata.js';
-import { IndexMetadata } from '../model/index-metadata.js';
+import { type AnyFieldMetadata, EntityMetadata, type EntityOptions } from '../model/entity-metadata.js';
+import type { IndexMetadata } from '../model/index-metadata.js';
 export declare function Entity(options?: EntityOptions | string): ClassDecorator;
 export declare namespace Entity {
     const getMetadata: typeof EntityMetadata.get;

package/orm/decorators/foreignkey.decorator.d.ts

@@ -1,2 +1,2 @@
-import { TypeThunk } from '../orm.type.js';
+import type { TypeThunk } from '../orm.type.js';
 export declare function ForeignKey(type: TypeThunk, targetKey?: string): PropertyDecorator;

package/orm/decorators/index.decorator.d.ts

@@ -1,3 +1,3 @@
-import { IndexMetadata } from '../model/index-metadata.js';
+import type { IndexMetadata } from '../model/index-metadata.js';
 export declare function Index(fields: string | string[], options?: Omit<IndexMetadata, 'columns'>): ClassDecorator;
 export declare function Index(options?: Omit<IndexMetadata, 'columns'>): PropertyDecorator;

package/orm/decorators/link.decorator.d.ts

@@ -1,5 +1,5 @@
-import { AssociationFieldOptions } from '../model/association-field-metadata.js';
-import { TypeThunk } from '../orm.type.js';
+import type { AssociationFieldOptions } from '../model/association-field-metadata.js';
+import type { TypeThunk } from '../orm.type.js';
 type LinkArgs<T> = {
     sourceKey?: string;
     targetKey?: keyof T;

package/orm/decorators/primarykey.decorator.d.ts

@@ -1,3 +1,3 @@
-import { IndexMetadata } from '../model/index-metadata.js';
+import type { IndexMetadata } from '../model/index-metadata.js';
 export declare function PrimaryKey(fields: string | string[], options?: Omit<IndexMetadata, 'columns' | 'unique' | 'primary'>): ClassDecorator;
 export declare function PrimaryKey(options?: Omit<IndexMetadata, 'columns' | 'unique' | 'primary'>): PropertyDecorator;

package/orm/decorators/transform.decorator.d.ts

@@ -1,3 +1,3 @@
-import { ColumnTransformFunction } from '../orm.type.js';
+import type { ColumnTransformFunction } from '../orm.type.js';
 export declare function Parse(fn: ColumnTransformFunction): PropertyDecorator;
 export declare function Serialize(fn: ColumnTransformFunction): PropertyDecorator;

package/orm/model/association-field-metadata.d.ts

@@ -1,5 +1,5 @@
 import { AssociationNode } from './association-node.js';
-import { FieldMetadata } from './field-metadata.js';
+import type { FieldMetadata } from './field-metadata.js';
 export type AssociationFieldOptions = Partial<Omit<AssociationFieldMetadata, 'entity' | 'name' | 'kind' | 'association'>>;
 export interface AssociationFieldMetadata extends FieldMetadata {
     readonly kind: 'association';

package/orm/model/column-field-metadata.d.ts

@@ -1,6 +1,6 @@
 import { DataType } from '@sqb/builder';
 import type { ColumnAutoGenerationStrategy, ColumnTransformFunction, DefaultValueGetter, EnumValue, FieldValue } from '../orm.type.js';
-import { FieldMetadata } from './field-metadata.js';
+import type { FieldMetadata } from './field-metadata.js';
 export type ColumnFieldOptions = Partial<Omit<ColumnFieldMetadata, 'entity' | 'name' | 'kind'>>;
 export interface ColumnFieldMetadata extends FieldMetadata {
     readonly kind: 'column';

package/orm/model/embedded-field-metadata.d.ts

@@ -1,6 +1,6 @@
-import { TypeThunk } from '../orm.type.js';
+import type { TypeThunk } from '../orm.type.js';
 import type { EntityMetadata } from './entity-metadata.js';
-import { FieldMetadata } from './field-metadata.js';
+import type { FieldMetadata } from './field-metadata.js';
 export type EmbeddedFieldOptions = Partial<Omit<EmbeddedFieldMetadata, 'entity' | 'name' | 'kind' | 'type'>>;
 export interface EmbeddedFieldMetadata extends FieldMetadata {
     readonly kind: 'object';

package/orm/model/entity-metadata.d.ts

@@ -1,11 +1,11 @@
-import { Maybe, Type } from 'ts-gems';
-import { Ctor, TypeThunk } from '../orm.type.js';
+import type { Maybe, Type } from 'ts-gems';
+import type { Ctor, TypeThunk } from '../orm.type.js';
 import { Association } from './association.js';
 import type { AssociationFieldMetadata, AssociationFieldOptions } from './association-field-metadata.js';
 import { AssociationNode } from './association-node.js';
 import type { ColumnFieldMetadata, ColumnFieldOptions } from './column-field-metadata.js';
 import type { EmbeddedFieldMetadata, EmbeddedFieldOptions } from './embedded-field-metadata.js';
-import { IndexMetadata } from './index-metadata.js';
+import type { IndexMetadata } from './index-metadata.js';
 export type AnyFieldMetadata = ColumnFieldMetadata | EmbeddedFieldMetadata | AssociationFieldMetadata;
 export type EntityOptions = Partial<Pick<EntityMetadata, 'name' | 'schema' | 'comment' | 'tableName'>>;
 export interface EntityMetadata {

package/orm/model/link-chain.d.ts

@@ -1,5 +1,5 @@
-import { Type } from 'ts-gems';
-import { TypeResolver, TypeThunk } from '../orm.type.js';
+import type { Type } from 'ts-gems';
+import type { TypeResolver, TypeThunk } from '../orm.type.js';
 import { AssociationNode } from './association-node.js';
 export declare class LinkChain<T> {
     target: TypeThunk<T>;

package/orm/orm.type.d.ts

@@ -1,4 +1,4 @@
-import { Type } from 'ts-gems';
+import type { Type } from 'ts-gems';
 export type Ctor = Type | Function;
 export type FieldKind = 'column' | 'object' | 'association';
 /**

package/orm/repository.class.d.ts

@@ -1,10 +1,9 @@
-import { LogicalOperator } from '@sqb/builder';
-import { OptimizerHintArgs } from '@sqb/builder/build/sql-objects/table-name';
-import { PartialDTO, PatchDTO, RequiredSome, StrictOmit, Type } from 'ts-gems';
+import { LogicalOperator, type TableName } from '@sqb/builder';
+import type { PartialDTO, PatchDTO, RequiredSome, StrictOmit, Type } from 'ts-gems';
 import { FieldInfoMap } from '../client/field-info-map.js';
 import type { SqbClient } from '../client/sqb-client.js';
 import type { SqbConnection } from '../client/sqb-connection.js';
-import { QueryRequest, TransactionFunction } from '../client/types.js';
+import type { QueryRequest, TransactionFunction } from '../client/types.js';
 import { EntityMetadata } from './model/entity-metadata.js';
 interface Projection {
     projection?: string | string[];
@@ -25,7 +24,7 @@ export declare namespace Repository {
             comment: string;
             dialect?: string[];
         }[];
-        optimizerHint?: string | string[] | OptimizerHintArgs | OptimizerHintArgs[];
+        optimizerHint?: string | string[] | TableName.OptimizerHint | TableName.OptimizerHint[];
     }
     interface CreateOptions extends CommandOptions, Projection {
     }

package/orm/util/orm.helper.d.ts

@@ -1,4 +1,4 @@
-import { Type } from 'ts-gems';
+import type { Type } from 'ts-gems';
 import type { AssociationFieldMetadata } from '../model/association-field-metadata.js';
 import type { ColumnFieldMetadata } from '../model/column-field-metadata.js';
 import type { EmbeddedFieldMetadata } from '../model/embedded-field-metadata.js';

package/orm/util/serialize-field.d.ts

@@ -1,2 +1,2 @@
-import { FieldMetadata } from '../model/field-metadata.js';
+import type { FieldMetadata } from '../model/field-metadata.js';
 export declare function serializeColumn(col: FieldMetadata, v: any): any;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/connect",
   "description": "Multi-dialect database connection framework written with TypeScript",
-  "version": "4.26.1",
+  "version": "5.0.1",
   "author": "Panates",
   "license": "Apache-2.0",
   "dependencies": {
@@ -17,11 +17,11 @@
     "putil-promisify": "^1.10.1",
     "putil-varhelpers": "^1.7.0",
     "strict-typed-events": "^2.8.0",
-    "ts-gems": "^3.11.6",
+    "ts-gems": "^3.12.0",
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.26.1",
+    "@sqb/builder": "^5.0.1",
     "reflect-metadata": "^0.2.2"
   },
   "type": "module",

package/orm/backward.d.ts

@@ -1,13 +0,0 @@
-import { MutableKeys, Type } from 'ts-gems';
-import { Entity } from './decorators/entity.decorator.js';
-export declare function getInsertColumnNames<T, K extends MutableKeys<T>>(ctor: Type<T>): K[];
-export declare function getUpdateColumnNames<T, K extends MutableKeys<T>>(ctor: Type<T>): K[];
-export declare function getNonAssociationElementNames<T, K extends MutableKeys<T>>(ctor: Type<T>): K[];
-export declare function mixinEntities<A, B>(derivedCtor: Type<A>, baseB: Type<B>): Type<A & B>;
-export declare function mixinEntities<A, B, C>(derivedCtor: Type<A>, baseB: Type<B>, baseC: Type<C>): Type<A & B & C>;
-export declare function mixinEntities<A, B, C, D>(derivedCtor: Type<A>, baseB: Type<B>, baseC: Type<C>, baseD: Type<D>): Type<A & B & C & D>;
-export declare function mixinEntities<A, B, C, D, E>(derivedCtor: Type<A>, baseB: Type<B>, baseC: Type<C>, baseD: Type<D>, baseE: Type<E>): Type<A & B & C & D & E>;
-export declare function mixinEntities<A, B, C, D, E, F>(derivedCtor: Type<A>, baseB: Type<B>, baseC: Type<C>, baseD: Type<D>, baseE: Type<E>, baseF: Type<F>): Type<A & B & C & D & E & F>;
-export declare const OmitEntity: typeof Entity.Omit;
-export declare const PickEntity: typeof Entity.Pick;
-export declare const UnionEntity: typeof Entity.Union;

package/orm/backward.js

@@ -1,17 +0,0 @@
-import { Entity } from './decorators/entity.decorator.js';
-export function getInsertColumnNames(ctor) {
-    return Entity.getInsertColumnNames(ctor);
-}
-export function getUpdateColumnNames(ctor) {
-    return Entity.getUpdateColumnNames(ctor);
-}
-export function getNonAssociationElementNames(ctor) {
-    return Entity.getNonAssociationFieldNames(ctor);
-}
-export function mixinEntities(derivedCtor, ...bases) {
-    // @ts-ignore
-    return Entity.mixin(derivedCtor, ...bases);
-}
-export const OmitEntity = Entity.Omit;
-export const PickEntity = Entity.Pick;
-export const UnionEntity = Entity.Union;