@sqb/connect 4.9.0 → 4.10.0

package/cjs/client/cursor-stream.js

@@ -7,13 +7,10 @@ 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 {
-    _cursor;
-    _objectMode;
-    _limit;
-    _rowNum = -1;
-    _eof = false;
     constructor(cursor, options) {
         super(options);
+        this._rowNum = -1;
+        this._eof = false;
         this._cursor = cursor;
         this._objectMode = options?.objectMode;
         this._limit = options?.limit || Number.MAX_SAFE_INTEGER;

package/cjs/client/cursor.js

@@ -11,20 +11,13 @@ const cursor_stream_js_1 = require("./cursor-stream.js");
 const helpers_js_1 = require("./helpers.js");
 const debug = (0, debug_1.default)('sqb:cursor');
 class Cursor extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_typed_events_1.AsyncEventEmitter) {
-    _connection;
-    _fields;
-    _prefetchRows;
-    _request;
-    _intlcur;
-    _taskQueue = new power_tasks_1.TaskQueue();
-    _fetchCache = new doublylinked_1.default();
-    _rowNum = 0;
-    _fetchedAll = false;
-    _fetchedRows = 0;
-    _row;
-    _cache;
     constructor(connection, fields, adapterCursor, request) {
         super();
+        this._taskQueue = new power_tasks_1.TaskQueue();
+        this._fetchCache = new doublylinked_1.default();
+        this._rowNum = 0;
+        this._fetchedAll = false;
+        this._fetchedRows = 0;
         this._connection = connection;
         this._intlcur = adapterCursor;
         this._fields = fields;

package/cjs/client/field-info-map.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldInfoMap = void 0;
 class FieldInfoMap {
-    _obj;
-    _arr;
     constructor() {
         Object.defineProperty(this, '_obj', {
             enumerable: false,

package/cjs/client/sqb-client.js

@@ -13,12 +13,9 @@ const sqb_connection_js_1 = require("./sqb-connection.js");
 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) {
-    _adapter;
-    _pool;
-    _defaults;
-    _entities = {};
     constructor(config) {
         super();
+        this._entities = {};
         if (!(config && typeof config === 'object'))
             throw new TypeError('Configuration object required');
         let adapter;

package/cjs/client/sqb-connection.js

@@ -14,15 +14,12 @@ const cursor_js_1 = require("./cursor.js");
 const helpers_js_1 = require("./helpers.js");
 const debug = (0, debug_1.default)('sqb:connection');
 class SqbConnection extends (0, strict_typed_events_1.TypedEventEmitterClass)(strict_typed_events_1.AsyncEventEmitter) {
-    client;
-    _intlcon;
-    _tasks = new power_tasks_1.TaskQueue();
-    _options;
-    _inTransaction = false;
-    _refCount = 1;
     constructor(client, adapterConnection, options) {
         super();
         this.client = client;
+        this._tasks = new power_tasks_1.TaskQueue();
+        this._inTransaction = false;
+        this._refCount = 1;
         this._intlcon = adapterConnection;
         this._options = options || {};
     }

package/cjs/orm/base-entity.js

@@ -4,7 +4,6 @@ exports.BaseEntity = void 0;
 const entity_decorator_js_1 = require("./decorators/entity.decorator.js");
 const orm_const_js_1 = require("./orm.const.js");
 class BaseEntity {
-    [orm_const_js_1.REPOSITORY_KEY];
     constructor(partial) {
         const fields = entity_decorator_js_1.Entity.getColumnFieldNames(Object.getPrototypeOf(this).constructor);
         if (fields && partial) {

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

@@ -11,18 +11,14 @@ const command_helper_js_1 = require("./command.helper.js");
 const row_converter_js_1 = require("./row-converter.js");
 const SORT_ORDER_PATTERN = /^([-+])?(.*)$/;
 class FindCommand {
-    maxEagerFetch = 100000;
-    maxSubQueries = 5;
-    mainEntity;
-    resultEntity;
-    converter;
-    mainAlias = 'T';
-    resultAlias = 'T';
-    _joins = [];
-    _selectColumns = {};
-    _filter = (0, builder_1.And)();
-    _sort;
     constructor(selectEntity, outputEntity) {
+        this.maxEagerFetch = 100000;
+        this.maxSubQueries = 5;
+        this.mainAlias = 'T';
+        this.resultAlias = 'T';
+        this._joins = [];
+        this._selectColumns = {};
+        this._filter = (0, builder_1.And)();
         this.mainEntity = selectEntity;
         this.resultEntity = outputEntity;
         this.converter = new row_converter_js_1.RowConverter(outputEntity.ctor);

package/cjs/orm/commands/row-converter.js

@@ -12,13 +12,10 @@ const isNestedProperty = (prop) => {
     return prop.converter && prop.findCommand;
 };
 class RowConverter {
-    resultType;
-    parent;
-    _properties = {};
-    _propertyKeys;
     constructor(resultType, parent) {
         this.resultType = resultType;
         this.parent = parent;
+        this._properties = {};
     }
     addValueProperty(args) {
         this._propertyKeys = undefined;

package/cjs/orm/decorators/entity.decorator.js

@@ -160,7 +160,7 @@ exports.Entity = Entity;
         return UnionClass;
     }
     Entity.Union = Union;
-})(Entity = exports.Entity || (exports.Entity = {}));
+})(Entity || (exports.Entity = Entity = {}));
 function applyConstructorProperties(target, sourceClass, constructorArgs, isPropertyInherited) {
     try {
         const tempInstance = new sourceClass(...constructorArgs);

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

@@ -21,4 +21,4 @@ var AssociationFieldMetadata;
         Object.assign(target, lodash_1.default.omit(options, ['entity', 'name', 'kind', 'association']));
     }
     AssociationFieldMetadata.assign = assign;
-})(AssociationFieldMetadata = exports.AssociationFieldMetadata || (exports.AssociationFieldMetadata = {}));
+})(AssociationFieldMetadata || (exports.AssociationFieldMetadata = AssociationFieldMetadata = {}));

package/cjs/orm/model/association-node.js

@@ -3,9 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssociationNode = void 0;
 const association_js_1 = require("./association.js");
 class AssociationNode extends association_js_1.Association {
-    prior;
-    next;
-    conditions;
     getFirst() {
         let l = this;
         while (l.prior)

package/cjs/orm/model/association.js

@@ -5,19 +5,6 @@ const putil_varhelpers_1 = require("putil-varhelpers");
 const orm_helper_js_1 = require("../util/orm.helper.js");
 const entity_metadata_js_1 = require("./entity-metadata.js");
 class Association {
-    _resolved;
-    _source; // cached value
-    _target; // cached value
-    _sourceKey; // cached value
-    _targetKey; // cached value
-    _sourceProperty;
-    _targetProperty;
-    name;
-    source;
-    target;
-    sourceKey;
-    targetKey;
-    many;
     constructor(name, args) {
         this.name = name;
         this.source = args.source;

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

@@ -29,4 +29,4 @@ var ColumnFieldMetadata;
             throw new Error(`${col.entity.name}.${col.name} value must be one of (${enumKeys})`);
     }
     ColumnFieldMetadata.checkEnumValue = checkEnumValue;
-})(ColumnFieldMetadata = exports.ColumnFieldMetadata || (exports.ColumnFieldMetadata = {}));
+})(ColumnFieldMetadata || (exports.ColumnFieldMetadata = ColumnFieldMetadata = {}));

package/cjs/orm/model/embedded-field-metadata.js

@@ -25,4 +25,4 @@ var EmbeddedFieldMetadata;
         throw new Error(`Can't resolve type of ${meta.entity.name}.${meta.name}`);
     }
     EmbeddedFieldMetadata.resolveType = resolveType;
-})(EmbeddedFieldMetadata = exports.EmbeddedFieldMetadata || (exports.EmbeddedFieldMetadata = {}));
+})(EmbeddedFieldMetadata || (exports.EmbeddedFieldMetadata = EmbeddedFieldMetadata = {}));

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

@@ -337,4 +337,4 @@ var EntityMetadata;
         }
     }
     EntityMetadata.mixin = mixin;
-})(EntityMetadata = exports.EntityMetadata || (exports.EntityMetadata = {}));
+})(EntityMetadata || (exports.EntityMetadata = EntityMetadata = {}));

package/cjs/orm/model/link-chain.js

@@ -3,9 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LinkChain = void 0;
 const association_node_js_1 = require("./association-node.js");
 class LinkChain {
-    target;
-    first;
-    current;
     constructor(target, targetKey, sourceKey, many) {
         this.target = target;
         this.first = this.current = new association_node_js_1.AssociationNode('', {

package/cjs/orm/repository.class.js

@@ -10,9 +10,6 @@ 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;

package/esm/client/cursor-stream.js

@@ -3,13 +3,10 @@ import { Readable } from 'stream';
 const inspect = Symbol.for('nodejs.util.inspect.custom');
 const debug = _debug('sqb:cursorstream');
 export class CursorStream extends Readable {
-    _cursor;
-    _objectMode;
-    _limit;
-    _rowNum = -1;
-    _eof = false;
     constructor(cursor, options) {
         super(options);
+        this._rowNum = -1;
+        this._eof = false;
         this._cursor = cursor;
         this._objectMode = options?.objectMode;
         this._limit = options?.limit || Number.MAX_SAFE_INTEGER;

package/esm/client/cursor.js

@@ -7,20 +7,13 @@ import { CursorStream } from './cursor-stream.js';
 import { callFetchHooks, normalizeRowsToArrayRows, normalizeRowsToObjectRows } from './helpers.js';
 const debug = _debug('sqb:cursor');
 export class Cursor extends TypedEventEmitterClass(AsyncEventEmitter) {
-    _connection;
-    _fields;
-    _prefetchRows;
-    _request;
-    _intlcur;
-    _taskQueue = new TaskQueue();
-    _fetchCache = new DoublyLinked();
-    _rowNum = 0;
-    _fetchedAll = false;
-    _fetchedRows = 0;
-    _row;
-    _cache;
     constructor(connection, fields, adapterCursor, request) {
         super();
+        this._taskQueue = new TaskQueue();
+        this._fetchCache = new DoublyLinked();
+        this._rowNum = 0;
+        this._fetchedAll = false;
+        this._fetchedRows = 0;
         this._connection = connection;
         this._intlcur = adapterCursor;
         this._fields = fields;

package/esm/client/field-info-map.js

@@ -1,6 +1,4 @@
 export class FieldInfoMap {
-    _obj;
-    _arr;
     constructor() {
         Object.defineProperty(this, '_obj', {
             enumerable: false,

package/esm/client/sqb-client.js

@@ -9,12 +9,9 @@ import { SqbConnection } from './sqb-connection.js';
 const debug = _debug('sqb:client');
 const inspect = Symbol.for('nodejs.util.inspect.custom');
 export class SqbClient extends TypedEventEmitterClass(AsyncEventEmitter) {
-    _adapter;
-    _pool;
-    _defaults;
-    _entities = {};
     constructor(config) {
         super();
+        this._entities = {};
         if (!(config && typeof config === 'object'))
             throw new TypeError('Configuration object required');
         let adapter;

package/esm/client/sqb-connection.js

@@ -10,15 +10,12 @@ import { Cursor } from './cursor.js';
 import { callFetchHooks, normalizeRowsToArrayRows, normalizeRowsToObjectRows, wrapAdapterFields } from './helpers.js';
 const debug = _debug('sqb:connection');
 export class SqbConnection extends TypedEventEmitterClass(AsyncEventEmitter) {
-    client;
-    _intlcon;
-    _tasks = new TaskQueue();
-    _options;
-    _inTransaction = false;
-    _refCount = 1;
     constructor(client, adapterConnection, options) {
         super();
         this.client = client;
+        this._tasks = new TaskQueue();
+        this._inTransaction = false;
+        this._refCount = 1;
         this._intlcon = adapterConnection;
         this._options = options || {};
     }

package/esm/orm/base-entity.js

@@ -1,7 +1,6 @@
 import { Entity } from './decorators/entity.decorator.js';
 import { REPOSITORY_KEY } from './orm.const.js';
 export class BaseEntity {
-    [REPOSITORY_KEY];
     constructor(partial) {
         const fields = Entity.getColumnFieldNames(Object.getPrototypeOf(this).constructor);
         if (fields && partial) {

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

@@ -8,18 +8,14 @@ import { joinAssociationGetLast, prepareFilter } from './command.helper.js';
 import { RowConverter } from './row-converter.js';
 const SORT_ORDER_PATTERN = /^([-+])?(.*)$/;
 export class FindCommand {
-    maxEagerFetch = 100000;
-    maxSubQueries = 5;
-    mainEntity;
-    resultEntity;
-    converter;
-    mainAlias = 'T';
-    resultAlias = 'T';
-    _joins = [];
-    _selectColumns = {};
-    _filter = And();
-    _sort;
     constructor(selectEntity, outputEntity) {
+        this.maxEagerFetch = 100000;
+        this.maxSubQueries = 5;
+        this.mainAlias = 'T';
+        this.resultAlias = 'T';
+        this._joins = [];
+        this._selectColumns = {};
+        this._filter = And();
         this.mainEntity = selectEntity;
         this.resultEntity = outputEntity;
         this.converter = new RowConverter(outputEntity.ctor);

package/esm/orm/commands/row-converter.js

@@ -9,13 +9,10 @@ const isNestedProperty = (prop) => {
     return prop.converter && prop.findCommand;
 };
 export class RowConverter {
-    resultType;
-    parent;
-    _properties = {};
-    _propertyKeys;
     constructor(resultType, parent) {
         this.resultType = resultType;
         this.parent = parent;
+        this._properties = {};
     }
     addValueProperty(args) {
         this._propertyKeys = undefined;

package/esm/orm/model/association-node.js

@@ -1,8 +1,5 @@
 import { Association } from './association.js';
 export class AssociationNode extends Association {
-    prior;
-    next;
-    conditions;
     getFirst() {
         let l = this;
         while (l.prior)

package/esm/orm/model/association.js

@@ -2,19 +2,6 @@ import { camelCase } from 'putil-varhelpers';
 import { resolveEntityMeta } from '../util/orm.helper.js';
 import { EntityMetadata } from './entity-metadata.js';
 export class Association {
-    _resolved;
-    _source; // cached value
-    _target; // cached value
-    _sourceKey; // cached value
-    _targetKey; // cached value
-    _sourceProperty;
-    _targetProperty;
-    name;
-    source;
-    target;
-    sourceKey;
-    targetKey;
-    many;
     constructor(name, args) {
         this.name = name;
         this.source = args.source;

package/esm/orm/model/link-chain.js

@@ -1,8 +1,5 @@
 import { AssociationNode } from './association-node.js';
 export class LinkChain {
-    target;
-    first;
-    current;
     constructor(target, targetKey, sourceKey, many) {
         this.target = target;
         this.first = this.current = new AssociationNode('', {

package/esm/orm/repository.class.js

@@ -7,9 +7,6 @@ import { FindCommand } from './commands/find.command.js';
 import { UpdateCommand } from './commands/update.command.js';
 import { extractKeyValues } from './util/extract-keyvalues.js';
 export class Repository extends TypedEventEmitterClass(AsyncEventEmitter) {
-    _executor;
-    _entity;
-    _schema;
     constructor(entityDef, executor, schema) {
         super();
         this._executor = executor;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/connect",
   "description": "Multi-dialect database connection framework written with TypeScript",
-  "version": "4.9.0",
+  "version": "4.10.0",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>",
@@ -13,6 +13,10 @@
     "url": "https://github.com/sqbjs/sqb.git",
     "directory": "packages/connect"
   },
+  "type": "module",
+  "module": "./esm/index.js",
+  "main": "./cjs/index.js",
+  "types": "./types/index.d.ts",
   "scripts": {
     "compile": "tsc",
     "prebuild": "npm run lint && npm run clean",
@@ -30,33 +34,23 @@
   },
   "dependencies": {
     "debug": "^4.3.4",
-    "lightning-pool": "^4.2.1",
+    "lightning-pool": "^4.2.2",
     "lodash": "^4.17.21",
-    "power-tasks": "^1.6.4",
+    "power-tasks": "^1.7.2",
     "putil-isplainobject": "^1.1.5",
-    "putil-merge": "^3.10.3",
-    "putil-promisify": "^1.10.0",
+    "putil-merge": "^3.12.1",
+    "putil-promisify": "^1.10.1",
     "putil-varhelpers": "^1.6.5",
     "reflect-metadata": "^0.1.13",
-    "strict-typed-events": "^2.3.1",
-    "ts-gems": "^2.3.0"
+    "strict-typed-events": "^2.3.2",
+    "ts-gems": "^2.5.0"
   },
   "devDependencies": {
-    "@types/debug": "^4.1.7",
-    "@types/lodash": "^4.14.194"
+    "@types/debug": "^4.1.12",
+    "@types/lodash": "^4.14.201"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.9.0"
-  },
-  "type": "module",
-  "types": "esm/index.d.ts",
-  "exports": {
-    ".": {
-      "require": "./cjs/index.js",
-      "default": "./esm/index.js"
-    },
-    "./cjs": "./cjs/index.js",
-    "./esm": "./esm/index.js"
+    "@sqb/builder": "^4.10.0"
   },
   "engines": {
     "node": ">=16.0",

package/esm/client/adapter.d.ts

@@ -1,57 +0,0 @@
-import { Maybe } from 'ts-gems';
-import { classes } from '@sqb/builder';
-import { ClientConfiguration, DataType, QueryRequest, RowType } from './types.js';
-export interface Adapter {
-    driver: string;
-    dialect: string;
-    features?: {
-        cursor?: boolean;
-        schema?: boolean;
-        fetchAsString?: DataType[];
-    };
-    connect: (config: ClientConfiguration) => Promise<Adapter.Connection>;
-}
-export declare namespace Adapter {
-    interface Connection {
-        sessionId: any;
-        execute: (request: QueryRequest) => Promise<Response>;
-        close: () => Promise<void>;
-        reset: () => Promise<void>;
-        test: () => Promise<void>;
-        startTransaction: () => Promise<void>;
-        setSavepoint?: (savepoint: string) => Promise<void>;
-        releaseSavepoint?: (savepoint: string) => Promise<void>;
-        rollbackSavepoint?: (savepoint: string) => Promise<void>;
-        commit: () => Promise<void>;
-        rollback: () => Promise<void>;
-        setSchema?: (schema: string) => Promise<void>;
-        getSchema?: () => Promise<string>;
-        onGenerateQuery?: (request: QueryRequest, query: classes.Query) => void;
-        getInTransaction?: () => boolean;
-    }
-    interface Cursor {
-        readonly isClosed: boolean;
-        readonly rowType: RowType;
-        close: () => Promise<void>;
-        fetch: (rows: number) => Promise<Maybe<any[]>>;
-    }
-    interface Response {
-        fields?: Field[];
-        rows?: Record<string, any>[] | any[][];
-        rowType?: RowType;
-        cursor?: Adapter.Cursor;
-        rowsAffected?: number;
-    }
-    interface Field {
-        fieldName: string;
-        dataType: string;
-        jsType: string;
-        isArray?: boolean;
-        elementDataType?: string;
-        nullable?: boolean;
-        fixedLength?: boolean;
-        size?: number;
-        precision?: number;
-        _inf: any;
-    }
-}

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

@@ -1,29 +0,0 @@
-/// <reference types="node" />
-import { Readable } from 'stream';
-import { Cursor } from './cursor.js';
-export interface CursorStreamOptions {
-    objectMode?: boolean;
-    limit?: number;
-}
-declare const inspect: unique symbol;
-export declare class CursorStream extends Readable {
-    private readonly _cursor;
-    private readonly _objectMode?;
-    private readonly _limit;
-    private _rowNum;
-    private _eof;
-    constructor(cursor: Cursor, options?: CursorStreamOptions);
-    /**
-     * Returns if stream is closed.
-     */
-    get isClosed(): boolean;
-    /**
-     * Closes stream and releases the cursor
-     */
-    close(): Promise<void>;
-    toString(): string;
-    [inspect](): string;
-    _read(): void;
-    emit(event: string | symbol, ...args: any[]): boolean;
-}
-export {};