@sqb/connect 4.1.2 → 4.1.5

package/dist/client/FieldInfoMap.d.ts

@@ -2,9 +2,11 @@ import { FieldInfo } from './types';
 export declare class FieldInfoMap {
     private _obj;
     private _arr;
+    constructor();
     add(field: FieldInfo): void;
     get(k: string | number): FieldInfo;
     entries(): [string, FieldInfo][];
     keys(): string[];
     values(): FieldInfo[];
+    toJSON(): Record<string, FieldInfo>;
 }

package/dist/client/FieldInfoMap.js

@@ -3,17 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldInfoMap = void 0;
 class FieldInfoMap {
     constructor() {
-        this._obj = {};
-        this._arr = [];
+        Object.defineProperty(this, '_obj', {
+            enumerable: false,
+            configurable: false,
+            writable: true,
+            value: {}
+        });
+        Object.defineProperty(this, '_arr', {
+            enumerable: false,
+            configurable: false,
+            writable: true,
+            value: []
+        });
     }
     add(field) {
         const idx = field.index != null ? field.index : this._arr.length;
         this._arr[idx] = field;
         field.index = idx;
-        this._obj = this._arr.reduce((a, f) => {
+        const _obj = this._arr.reduce((a, f) => {
             a[f.name.toUpperCase()] = f;
             return a;
         }, {});
+        Object.defineProperty(this, '_obj', {
+            enumerable: false,
+            configurable: false,
+            writable: true,
+            value: _obj
+        });
     }
     get(k) {
         if (typeof k === 'number')
@@ -29,5 +45,8 @@ class FieldInfoMap {
     values() {
         return [...this._arr];
     }
+    toJSON() {
+        return { ...this._obj };
+    }
 }
 exports.FieldInfoMap = FieldInfoMap;

package/dist/orm/backward.d.ts

@@ -3,6 +3,11 @@ import { Entity } from './decorators/entity.decorator';
 export declare function getInsertColumnNames<T, K extends keyof PickWritable<T>>(ctor: Type<T>): K[];
 export declare function getUpdateColumnNames<T, K extends keyof PickWritable<T>>(ctor: Type<T>): K[];
 export declare function getNonAssociationElementNames<T, K extends keyof PickWritable<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/dist/orm/backward.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UnionEntity = exports.PickEntity = exports.OmitEntity = exports.getNonAssociationElementNames = exports.getUpdateColumnNames = exports.getInsertColumnNames = void 0;
+exports.UnionEntity = exports.PickEntity = exports.OmitEntity = exports.mixinEntities = exports.getNonAssociationElementNames = exports.getUpdateColumnNames = exports.getInsertColumnNames = void 0;
 const entity_decorator_1 = require("./decorators/entity.decorator");
 function getInsertColumnNames(ctor) {
     return entity_decorator_1.Entity.getInsertColumnNames(ctor);
@@ -14,6 +14,11 @@ function getNonAssociationElementNames(ctor) {
     return entity_decorator_1.Entity.getNonAssociationElementNames(ctor);
 }
 exports.getNonAssociationElementNames = getNonAssociationElementNames;
+function mixinEntities(derivedCtor, ...bases) {
+    // @ts-ignore
+    return entity_decorator_1.Entity.mixin(derivedCtor, ...bases);
+}
+exports.mixinEntities = mixinEntities;
 exports.OmitEntity = entity_decorator_1.Entity.Omit;
 exports.PickEntity = entity_decorator_1.Entity.Pick;
 exports.UnionEntity = entity_decorator_1.Entity.Union;

package/dist/orm/base-entity.d.ts

@@ -1,6 +1,6 @@
 import { REPOSITORY_KEY } from './orm.const';
 export declare class BaseEntity {
-    private [REPOSITORY_KEY];
+    private [REPOSITORY_KEY]?;
     constructor(partial?: any);
     destroy(): Promise<boolean>;
     exists(): Promise<boolean>;

package/dist/orm/base-entity.js

@@ -14,11 +14,11 @@ class BaseEntity {
     }
     async destroy() {
         const repo = this[orm_const_1.REPOSITORY_KEY];
-        return repo.destroy(this);
+        return !!(repo && repo.destroy(this));
     }
     async exists() {
         const repo = this[orm_const_1.REPOSITORY_KEY];
-        return repo.exists(this);
+        return !!(repo && repo.exists(this));
     }
     toJSON() {
         // this method is an placeholder an will be overwritten by declareEntity() method

package/dist/orm/decorators/column.decorator.js

@@ -7,7 +7,7 @@ function Column(arg0) {
         if (typeof propertyKey !== 'string')
             throw new Error('Symbol properties are not accepted');
         const options = (typeof arg0 === 'string' ? { dataType: arg0 } : arg0) || {};
-        const entity = entity_metadata_1.EntityMetadata.inject(target.constructor);
+        const entity = entity_metadata_1.EntityMetadata.define(target.constructor);
         if (!options.type) {
             const typ = Reflect.getMetadata("design:type", entity.ctor.prototype, propertyKey);
             if (typ === Array) {

package/dist/orm/decorators/embedded.decorator.js

@@ -9,7 +9,7 @@ function Embedded(type, options) {
         type = type || Reflect.getMetadata("design:type", target, propertyKey);
         if (typeof type !== 'function')
             throw new Error('"type" must be defined');
-        const entity = entity_metadata_1.EntityMetadata.inject(target.constructor);
+        const entity = entity_metadata_1.EntityMetadata.define(target.constructor);
         entity_metadata_1.EntityMetadata.defineEmbeddedElement(entity, propertyKey, type, options);
     };
 }

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

@@ -23,6 +23,11 @@ export declare namespace Entity {
     function getUpdateColumnNames(ctor: Type): string[];
     function getPrimaryIndex(ctor: Type): Maybe<IndexMetadata>;
     function getPrimaryIndexColumns(ctor: Type): ColumnElementMetadata[];
+    function mixin<A, B>(derivedCtor: Type<A>, baseB: Type<B>): Type<A & B>;
+    function mixin<A, B, C>(derivedCtor: Type<A>, baseB: Type<B>, baseC: Type<C>): Type<A & B & C>;
+    function mixin<A, B, C, D>(derivedCtor: Type<A>, baseB: Type<B>, baseC: Type<C>, baseD: Type<D>): Type<A & B & C & D>;
+    function mixin<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>;
+    function mixin<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>;
     function Pick<T, K extends keyof T>(classRef: Type<T>, keys: readonly K[]): Type<Pick<T, typeof keys[number]>>;
     function Omit<T, K extends keyof T>(classRef: Type<T>, keys: readonly K[]): Type<Omit<T, typeof keys[number]>>;
     function Union<A, B>(baseA: Type<A>, baseB: Type<B>): Type<A & B>;

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

@@ -7,7 +7,7 @@ function Entity(options) {
     return function (target) {
         const opts = typeof options === 'object' ? options : {};
         const tableName = typeof options === 'string' ? options : opts.tableName;
-        const entity = entity_metadata_1.EntityMetadata.inject(target);
+        const entity = entity_metadata_1.EntityMetadata.define(target);
         entity.tableName = tableName || target.name;
         if (opts.schema)
             entity.schema = opts.schema;
@@ -85,15 +85,29 @@ exports.Entity = Entity;
     }
     Entity.getUpdateColumnNames = getUpdateColumnNames;
     function getPrimaryIndex(ctor) {
-        const model = entity_metadata_1.EntityMetadata.inject(ctor);
+        const model = entity_metadata_1.EntityMetadata.define(ctor);
         return entity_metadata_1.EntityMetadata.getPrimaryIndex(model);
     }
     Entity.getPrimaryIndex = getPrimaryIndex;
     function getPrimaryIndexColumns(ctor) {
-        const model = entity_metadata_1.EntityMetadata.inject(ctor);
+        const model = entity_metadata_1.EntityMetadata.define(ctor);
         return entity_metadata_1.EntityMetadata.getPrimaryIndexColumns(model);
     }
     Entity.getPrimaryIndexColumns = getPrimaryIndexColumns;
+    function mixin(derivedCtor, ...bases) {
+        for (const base of bases) {
+            if (!base)
+                continue;
+            (0, apply_mixins_1.applyMixins)(derivedCtor, base);
+            const srcMeta = entity_metadata_1.EntityMetadata.get(base);
+            if (srcMeta) {
+                const trgMeta = entity_metadata_1.EntityMetadata.define(derivedCtor);
+                entity_metadata_1.EntityMetadata.mixin(trgMeta, srcMeta);
+            }
+        }
+        return derivedCtor;
+    }
+    Entity.mixin = mixin;
     function Pick(classRef, keys) {
         const PickEntityClass = class {
             constructor(...args) {
@@ -105,7 +119,7 @@ exports.Entity = Entity;
         (0, apply_mixins_1.applyMixins)(PickEntityClass, classRef, filter);
         const srcMeta = entity_metadata_1.EntityMetadata.get(classRef);
         if (srcMeta) {
-            const trgMeta = entity_metadata_1.EntityMetadata.inject(PickEntityClass);
+            const trgMeta = entity_metadata_1.EntityMetadata.define(PickEntityClass);
             entity_metadata_1.EntityMetadata.mixin(trgMeta, srcMeta, filter);
         }
         return PickEntityClass;
@@ -122,7 +136,7 @@ exports.Entity = Entity;
         (0, apply_mixins_1.applyMixins)(OmitEntityClass, classRef, filter);
         const srcMeta = entity_metadata_1.EntityMetadata.get(classRef);
         if (srcMeta) {
-            const trgMeta = entity_metadata_1.EntityMetadata.inject(OmitEntityClass);
+            const trgMeta = entity_metadata_1.EntityMetadata.define(OmitEntityClass);
             entity_metadata_1.EntityMetadata.mixin(trgMeta, srcMeta, filter);
         }
         return OmitEntityClass;
@@ -139,7 +153,7 @@ exports.Entity = Entity;
             (0, apply_mixins_1.applyMixins)(UnionClass, base);
             const srcMeta = entity_metadata_1.EntityMetadata.get(base);
             if (srcMeta) {
-                const trgMeta = entity_metadata_1.EntityMetadata.inject(UnionClass);
+                const trgMeta = entity_metadata_1.EntityMetadata.define(UnionClass);
                 entity_metadata_1.EntityMetadata.mixin(trgMeta, srcMeta);
             }
         }

package/dist/orm/decorators/events.decorator.js

@@ -6,7 +6,7 @@ function BeforeInsert() {
     return (target, propertyKey) => {
         if (typeof propertyKey !== 'string')
             throw new Error('You can define a Column for only string properties');
-        const model = entity_metadata_1.EntityMetadata.inject(target.constructor);
+        const model = entity_metadata_1.EntityMetadata.define(target.constructor);
         const fn = target.constructor.prototype[propertyKey];
         entity_metadata_1.EntityMetadata.addEventListener(model, 'before-insert', fn);
     };
@@ -16,7 +16,7 @@ function BeforeUpdate() {
     return (target, propertyKey) => {
         if (typeof propertyKey !== 'string')
             throw new Error('You can define a Column for only string properties');
-        const model = entity_metadata_1.EntityMetadata.inject(target.constructor);
+        const model = entity_metadata_1.EntityMetadata.define(target.constructor);
         const fn = target.constructor.prototype[propertyKey];
         entity_metadata_1.EntityMetadata.addEventListener(model, 'before-update', fn);
     };
@@ -26,7 +26,7 @@ function BeforeDestroy() {
     return (target, propertyKey) => {
         if (typeof propertyKey !== 'string')
             throw new Error('You can define a Column for only string properties');
-        const model = entity_metadata_1.EntityMetadata.inject(target.constructor);
+        const model = entity_metadata_1.EntityMetadata.define(target.constructor);
         const fn = target.constructor.prototype[propertyKey];
         entity_metadata_1.EntityMetadata.addEventListener(model, 'before-destroy', fn);
     };
@@ -36,7 +36,7 @@ function AfterInsert() {
     return (target, propertyKey) => {
         if (typeof propertyKey !== 'string')
             throw new Error('You can define a Column for only string properties');
-        const model = entity_metadata_1.EntityMetadata.inject(target.constructor);
+        const model = entity_metadata_1.EntityMetadata.define(target.constructor);
         const fn = target.constructor.prototype[propertyKey];
         entity_metadata_1.EntityMetadata.addEventListener(model, 'after-insert', fn);
     };
@@ -46,7 +46,7 @@ function AfterUpdate() {
     return (target, propertyKey) => {
         if (typeof propertyKey !== 'string')
             throw new Error('You can define a Column for only string properties');
-        const model = entity_metadata_1.EntityMetadata.inject(target.constructor);
+        const model = entity_metadata_1.EntityMetadata.define(target.constructor);
         const fn = target.constructor.prototype[propertyKey];
         entity_metadata_1.EntityMetadata.addEventListener(model, 'after-update', fn);
     };
@@ -56,7 +56,7 @@ function AfterDestroy() {
     return (target, propertyKey) => {
         if (typeof propertyKey !== 'string')
             throw new Error('You can define a Column for only string properties');
-        const model = entity_metadata_1.EntityMetadata.inject(target.constructor);
+        const model = entity_metadata_1.EntityMetadata.define(target.constructor);
         const fn = target.constructor.prototype[propertyKey];
         entity_metadata_1.EntityMetadata.addEventListener(model, 'after-destroy', fn);
     };

package/dist/orm/decorators/foreignkey.decorator.js

@@ -6,7 +6,7 @@ function ForeignKey(type, targetKey) {
     return function (target, propertyKey) {
         if (typeof propertyKey !== 'string')
             throw new Error('Symbol properties are not accepted');
-        const entity = entity_metadata_1.EntityMetadata.inject(target.constructor);
+        const entity = entity_metadata_1.EntityMetadata.define(target.constructor);
         entity_metadata_1.EntityMetadata.addForeignKey(entity, propertyKey, type, targetKey);
     };
 }

package/dist/orm/decorators/index.decorator.js

@@ -7,14 +7,14 @@ function Index(arg0, arg1) {
         if (typeof target === 'function') {
             if (!(typeof arg0 === 'string' || Array.isArray(arg0)))
                 throw new Error(`You must specify index column(s)`);
-            const model = entity_metadata_1.EntityMetadata.inject(target);
+            const model = entity_metadata_1.EntityMetadata.define(target);
             return entity_metadata_1.EntityMetadata.addIndex(model, { ...arg1, columns: arg0 });
         }
         if (!target.constructor)
             throw new Error('Property decorators can be used for class properties only');
         if (typeof propertyKey !== 'string')
             throw new Error('Index() decorator can be used for string property keys only');
-        const model = entity_metadata_1.EntityMetadata.inject(target.constructor);
+        const model = entity_metadata_1.EntityMetadata.define(target.constructor);
         entity_metadata_1.EntityMetadata.addIndex(model, { ...arg0, columns: [propertyKey] });
     };
 }

package/dist/orm/decorators/link.decorator.js

@@ -10,7 +10,7 @@ function Link(chain) {
         if (chain.first.returnsMany() &&
             Reflect.getMetadata("design:type", target, propertyKey) !== Array)
             throw new Error(`Returning type of property (${propertyKey}) must be an array`);
-        const entity = entity_metadata_1.EntityMetadata.inject(target.constructor);
+        const entity = entity_metadata_1.EntityMetadata.define(target.constructor);
         // @ts-ignore
         // noinspection JSConstantReassignment
         chain.first.source = entity.ctor;

package/dist/orm/decorators/primarykey.decorator.js

@@ -8,7 +8,7 @@ function PrimaryKey(arg0, arg1) {
         if (arguments.length === 1) {
             if (!(typeof arg0 === 'string' || Array.isArray(arg0)))
                 throw new Error(`You must specify primary index column(s)`);
-            const meta = entity_metadata_1.EntityMetadata.inject(target);
+            const meta = entity_metadata_1.EntityMetadata.define(target);
             entity_metadata_1.EntityMetadata.setPrimaryKeys(meta, arg0, arg1);
             return;
         }
@@ -16,7 +16,7 @@ function PrimaryKey(arg0, arg1) {
             throw new Error('Property decorators can be used for class properties only');
         if (typeof propertyKey !== 'string')
             throw new Error('Index() decorator can be used for string property keys only');
-        const meta = entity_metadata_1.EntityMetadata.inject(target.constructor);
+        const meta = entity_metadata_1.EntityMetadata.define(target.constructor);
         (0, column_decorator_1.Column)({ notNull: true })(target, propertyKey);
         entity_metadata_1.EntityMetadata.setPrimaryKeys(meta, propertyKey, arg0);
     };

package/dist/orm/decorators/transform.decorator.js

@@ -6,7 +6,7 @@ function Parse(fn) {
     return (target, propertyKey) => {
         if (typeof propertyKey !== 'string')
             throw new Error('You can define a Column for only string properties');
-        const entity = entity_metadata_1.EntityMetadata.inject(target.constructor);
+        const entity = entity_metadata_1.EntityMetadata.define(target.constructor);
         entity_metadata_1.EntityMetadata.defineColumnElement(entity, propertyKey)
             .parse = fn;
     };
@@ -16,7 +16,7 @@ function Serialize(fn) {
     return (target, propertyKey) => {
         if (typeof propertyKey !== 'string')
             throw new Error('You can define a Column for only string properties');
-        const entity = entity_metadata_1.EntityMetadata.inject(target.constructor);
+        const entity = entity_metadata_1.EntityMetadata.define(target.constructor);
         entity_metadata_1.EntityMetadata.defineColumnElement(entity, propertyKey)
             .serialize = fn;
     };

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

@@ -20,7 +20,7 @@ export interface EntityMetadata {
     eventListeners: Record<string, Function[]>;
 }
 export declare namespace EntityMetadata {
-    function inject(ctor: Ctor): EntityMetadata;
+    function define(ctor: Ctor): EntityMetadata;
     function get(ctor: Ctor): Maybe<EntityMetadata>;
     function getOwn(ctor: Ctor): Maybe<EntityMetadata>;
     function getElement(entity: EntityMetadata, elementName: string): Maybe<AnyElementMetadata>;

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

@@ -11,7 +11,7 @@ const column_element_metadata_1 = require("./column-element-metadata");
 const embedded_element_metadata_1 = require("./embedded-element-metadata");
 var EntityMetadata;
 (function (EntityMetadata) {
-    function inject(ctor) {
+    function define(ctor) {
         const own = getOwn(ctor);
         if (own)
             return own;
@@ -48,7 +48,7 @@ var EntityMetadata;
         };
         return meta;
     }
-    EntityMetadata.inject = inject;
+    EntityMetadata.define = define;
     function get(ctor) {
         return Reflect.getMetadata(orm_const_1.ENTITY_METADATA_KEY, ctor);
     }

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

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyMixins = void 0;
 function applyMixins(derivedCtor, baseCtor, filter) {
     for (const name of Object.getOwnPropertyNames(baseCtor.prototype)) {
-        if (filter && !filter(name))
+        if ((name === 'constructor' || name === '__proto__' || name === 'toJSON' || name === 'toString') ||
+            filter && !filter(name))
             continue;
         Object.defineProperty(derivedCtor.prototype, name, Object.getOwnPropertyDescriptor(baseCtor.prototype, name) ||
             Object.create(null));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/connect",
   "description": "Multi-dialect database connection framework written with TypeScript",
-  "version": "4.1.2",
+  "version": "4.1.5",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>"
@@ -9,7 +9,8 @@
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "https://github.com/sqbjs/sqb.git"
+    "url": "https://github.com/sqbjs/sqb.git",
+    "directory": "packages/connect"
   },
   "keywords": [
     "javascript",
@@ -36,17 +37,17 @@
     "putil-merge": "^3.8.0",
     "putil-promisify": "^1.8.5",
     "putil-taskqueue": "^2.5.4",
-    "putil-varhelpers": "^1.6.3",
+    "putil-varhelpers": "^1.6.4",
     "reflect-metadata": "^0.1.13",
-    "strict-typed-events": "^2.1.0",
-    "ts-gems": "^1.5.2"
+    "strict-typed-events": "^2.2.0",
+    "ts-gems": "^2.1.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/lodash": "^4.14.180"
+    "@types/lodash": "^4.14.182"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.x.x"
+    "@sqb/builder": "^4.1.4"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -72,4 +73,4 @@
     "lint": "eslint src/** --no-error-on-unmatched-pattern",
     "test": "TS_NODE_PROJECT='./test/tsconfig.json' mocha -r ts-node/register -r tsconfig-paths/register --reporter spec test/**/*.spec.ts"
   }
-}
+}