@sqb/connect 4.1.1 → 4.1.4

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/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

@@ -94,6 +94,20 @@ exports.Entity = Entity;
         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.inject(derivedCtor);
+                entity_metadata_1.EntityMetadata.mixin(trgMeta, srcMeta);
+            }
+        }
+        return derivedCtor;
+    }
+    Entity.mixin = mixin;
     function Pick(classRef, keys) {
         const PickEntityClass = class {
             constructor(...args) {

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.1",
+  "version": "4.1.4",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>"
@@ -36,17 +36,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"
   },
   "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.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -72,4 +72,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"
   }
-}
+}