@sqb/connect 4.1.0 → 4.1.3

package/dist/index.d.ts

@@ -30,3 +30,4 @@ export * from './orm/decorators/link.decorator';
 export * from './orm/decorators/primarykey.decorator';
 export * from './orm/decorators/transform.decorator';
 export { isColumnElement, isEmbeddedElement, isAssociationElement, isEntityClass } from './orm/util/orm.helper';
+export * from './orm/backward';

package/dist/index.js

@@ -39,3 +39,4 @@ Object.defineProperty(exports, "isColumnElement", { enumerable: true, get: funct
 Object.defineProperty(exports, "isEmbeddedElement", { enumerable: true, get: function () { return orm_helper_1.isEmbeddedElement; } });
 Object.defineProperty(exports, "isAssociationElement", { enumerable: true, get: function () { return orm_helper_1.isAssociationElement; } });
 Object.defineProperty(exports, "isEntityClass", { enumerable: true, get: function () { return orm_helper_1.isEntityClass; } });
+tslib_1.__exportStar(require("./orm/backward"), exports);

package/dist/orm/backward.d.ts

@@ -0,0 +1,13 @@
+import { PickWritable, Type } from 'ts-gems';
+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

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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);
+}
+exports.getInsertColumnNames = getInsertColumnNames;
+function getUpdateColumnNames(ctor) {
+    return entity_decorator_1.Entity.getUpdateColumnNames(ctor);
+}
+exports.getUpdateColumnNames = getUpdateColumnNames;
+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

@@ -4,25 +4,30 @@ import { ColumnElementMetadata } from '../model/column-element-metadata';
 import { EmbeddedElementMetadata } from '../model/embedded-element-metadata';
 import { AnyElementMetadata, EntityMetadata, EntityOptions } from '../model/entity-metadata';
 import { IndexMetadata } from '../model/index-metadata';
-import { Ctor } from '../orm.type';
 export declare function Entity(options?: EntityOptions | string): ClassDecorator;
 export declare namespace Entity {
     const getMetadata: typeof EntityMetadata.get;
     const getOwnMetadata: typeof EntityMetadata.getOwn;
-    function getElement(ctor: Ctor, elementName: string): Maybe<AnyElementMetadata>;
-    function getColumnElement(ctor: Ctor, elementName: string): Maybe<ColumnElementMetadata>;
-    function getEmbeddedElement(ctor: Ctor, elementName: string): Maybe<EmbeddedElementMetadata>;
-    function getAssociationElement(ctor: Ctor, elementName: string): Maybe<AssociationElementMetadata>;
-    function getColumnElementByFieldName(ctor: Ctor, fieldName: string): Maybe<ColumnElementMetadata>;
-    function getElementNames(ctor: Ctor, filter?: (el: AnyElementMetadata) => boolean): string[];
-    function getColumnNames(ctor: Ctor): string[];
-    function getEmbeddedElementNames(ctor: Ctor): string[];
-    function getAssociationElementNames(ctor: Ctor): string[];
-    function getNonAssociationElementNames(ctor: Ctor): string[];
-    function getInsertColumnNames(ctor: Ctor): string[];
-    function getUpdateColumnNames(ctor: Ctor): string[];
-    function getPrimaryIndex(ctor: Ctor): Maybe<IndexMetadata>;
-    function getPrimaryIndexColumns(ctor: Ctor): ColumnElementMetadata[];
+    function getElement<T>(ctor: Type<T>, key: keyof T | string): Maybe<AnyElementMetadata>;
+    function getColumnElement<T>(ctor: Type<T>, key: keyof T | string): Maybe<ColumnElementMetadata>;
+    function getEmbeddedElement<T>(ctor: Type<T>, key: keyof T | string): Maybe<EmbeddedElementMetadata>;
+    function getAssociationElement<T>(ctor: Type<T>, key: keyof T | string): Maybe<AssociationElementMetadata>;
+    function getColumnElementByFieldName(ctor: Type, fieldName: string): Maybe<ColumnElementMetadata>;
+    function find(ctor: Type, predicate: (el: AnyElementMetadata) => boolean): Maybe<AnyElementMetadata>;
+    function getElementNames(ctor: Type, filter?: (el: AnyElementMetadata) => boolean): string[];
+    function getColumnNames(ctor: Type): string[];
+    function getEmbeddedElementNames(ctor: Type): string[];
+    function getAssociationElementNames(ctor: Type): string[];
+    function getNonAssociationElementNames(ctor: Type): string[];
+    function getInsertColumnNames(ctor: Type): string[];
+    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

@@ -19,24 +19,24 @@ exports.Entity = Entity;
 (function (Entity) {
     Entity.getMetadata = entity_metadata_1.EntityMetadata.get;
     Entity.getOwnMetadata = entity_metadata_1.EntityMetadata.getOwn;
-    function getElement(ctor, elementName) {
+    function getElement(ctor, key) {
         const model = entity_metadata_1.EntityMetadata.get(ctor);
-        return model && entity_metadata_1.EntityMetadata.getElement(model, elementName);
+        return model && entity_metadata_1.EntityMetadata.getElement(model, key);
     }
     Entity.getElement = getElement;
-    function getColumnElement(ctor, elementName) {
+    function getColumnElement(ctor, key) {
         const model = entity_metadata_1.EntityMetadata.get(ctor);
-        return model && entity_metadata_1.EntityMetadata.getColumnElement(model, elementName);
+        return model && entity_metadata_1.EntityMetadata.getColumnElement(model, key);
     }
     Entity.getColumnElement = getColumnElement;
-    function getEmbeddedElement(ctor, elementName) {
+    function getEmbeddedElement(ctor, key) {
         const model = entity_metadata_1.EntityMetadata.get(ctor);
-        return model && entity_metadata_1.EntityMetadata.getEmbeddedElement(model, elementName);
+        return model && entity_metadata_1.EntityMetadata.getEmbeddedElement(model, key);
     }
     Entity.getEmbeddedElement = getEmbeddedElement;
-    function getAssociationElement(ctor, elementName) {
+    function getAssociationElement(ctor, key) {
         const model = entity_metadata_1.EntityMetadata.get(ctor);
-        return model && entity_metadata_1.EntityMetadata.getAssociationElement(model, elementName);
+        return model && entity_metadata_1.EntityMetadata.getAssociationElement(model, key);
     }
     Entity.getAssociationElement = getAssociationElement;
     function getColumnElementByFieldName(ctor, fieldName) {
@@ -44,6 +44,11 @@ exports.Entity = Entity;
         return model && entity_metadata_1.EntityMetadata.getColumnElementByFieldName(model, fieldName);
     }
     Entity.getColumnElementByFieldName = getColumnElementByFieldName;
+    function find(ctor, predicate) {
+        const model = entity_metadata_1.EntityMetadata.get(ctor);
+        return model && entity_metadata_1.EntityMetadata.findElement(model, predicate);
+    }
+    Entity.find = find;
     function getElementNames(ctor, filter) {
         const model = entity_metadata_1.EntityMetadata.get(ctor);
         return (model && entity_metadata_1.EntityMetadata.getElementNames(model, filter)) || [];
@@ -89,18 +94,31 @@ exports.Entity = Entity;
         return entity_metadata_1.EntityMetadata.getPrimaryIndexColumns(model);
     }
     Entity.getPrimaryIndexColumns = getPrimaryIndexColumns;
+    function mixin(derivedCtor, ...bases) {
+        const trgMeta = entity_metadata_1.EntityMetadata.inject(derivedCtor);
+        for (const base of bases) {
+            (0, apply_mixins_1.applyMixins)(derivedCtor, base);
+            const srcMeta = entity_metadata_1.EntityMetadata.get(base);
+            if (srcMeta) {
+                entity_metadata_1.EntityMetadata.mixin(trgMeta, srcMeta);
+            }
+        }
+        return derivedCtor;
+    }
+    Entity.mixin = mixin;
     function Pick(classRef, keys) {
         const PickEntityClass = class {
             constructor(...args) {
                 applyConstructorProperties(this, classRef, args);
             }
         };
-        const pickKeys = keys;
-        (0, apply_mixins_1.applyMixins)(PickEntityClass, classRef, (k) => pickKeys.includes(k.toLowerCase()));
+        const pickKeys = keys.map(x => x.toLowerCase());
+        const filter = (k) => pickKeys.includes(k.toLowerCase());
+        (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);
-            entity_metadata_1.EntityMetadata.mixin(trgMeta, srcMeta, pickKeys);
+            entity_metadata_1.EntityMetadata.mixin(trgMeta, srcMeta, filter);
         }
         return PickEntityClass;
     }
@@ -112,13 +130,12 @@ exports.Entity = Entity;
             }
         };
         const omitKeys = keys.map(x => x.toLowerCase());
-        (0, apply_mixins_1.applyMixins)(OmitEntityClass, classRef, (k) => !(omitKeys && !omitKeys.includes(k.toLowerCase())));
+        const filter = (k) => !omitKeys.includes(k.toLowerCase());
+        (0, apply_mixins_1.applyMixins)(OmitEntityClass, classRef, filter);
         const srcMeta = entity_metadata_1.EntityMetadata.get(classRef);
         if (srcMeta) {
-            const elementKeys = Object.keys(srcMeta.elements)
-                .filter(x => !omitKeys.includes(x));
             const trgMeta = entity_metadata_1.EntityMetadata.inject(OmitEntityClass);
-            entity_metadata_1.EntityMetadata.mixin(trgMeta, srcMeta, elementKeys);
+            entity_metadata_1.EntityMetadata.mixin(trgMeta, srcMeta, filter);
         }
         return OmitEntityClass;
     }
@@ -130,11 +147,11 @@ exports.Entity = Entity;
                     applyConstructorProperties(this, c, args);
             }
         };
+        const trgMeta = entity_metadata_1.EntityMetadata.inject(UnionClass);
         for (const base of bases) {
             (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);
                 entity_metadata_1.EntityMetadata.mixin(trgMeta, srcMeta);
             }
         }

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

@@ -27,6 +27,7 @@ export declare namespace EntityMetadata {
     function getColumnElement(entity: EntityMetadata, elementName: string): Maybe<ColumnElementMetadata>;
     function getEmbeddedElement(entity: EntityMetadata, elementName: string): Maybe<EmbeddedElementMetadata>;
     function getAssociationElement(entity: EntityMetadata, elementName: string): Maybe<AssociationElementMetadata>;
+    function findElement(entity: EntityMetadata, predicate: (el: AnyElementMetadata) => boolean): Maybe<AnyElementMetadata>;
     function getColumnElementByFieldName(entity: EntityMetadata, fieldName: string): Maybe<ColumnElementMetadata>;
     function getElementNames(entity: EntityMetadata, filter?: (el: AnyElementMetadata) => boolean): string[];
     function getColumnNames(entity: EntityMetadata): string[];
@@ -45,5 +46,5 @@ export declare namespace EntityMetadata {
     function defineEmbeddedElement(entity: EntityMetadata, name: string, type: TypeThunk, options?: EmbeddedElementOptions): EmbeddedElementMetadata;
     function defineAssociationElement(entity: EntityMetadata, propertyKey: string, association: AssociationNode): AssociationElementMetadata;
     function setPrimaryKeys(entity: EntityMetadata, column: string | string[], options?: Omit<IndexMetadata, 'columns' | 'unique' | 'primary'>): void;
-    function mixin(derived: EntityMetadata, base: EntityMetadata, elements?: string[]): void;
+    function mixin(derived: EntityMetadata, base: EntityMetadata, filter?: (n: string) => boolean): void;
 }

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

@@ -63,19 +63,29 @@ var EntityMetadata;
     EntityMetadata.getElement = getElement;
     function getColumnElement(entity, elementName) {
         const el = getElement(entity, elementName);
-        return (0, orm_helper_1.isColumnElement)(el) ? el : undefined;
+        if (el && !(0, orm_helper_1.isColumnElement)(el))
+            throw new Error(`"${el.name}" requested as "column" but it is "${el.kind}"`);
+        return el;
     }
     EntityMetadata.getColumnElement = getColumnElement;
     function getEmbeddedElement(entity, elementName) {
         const el = getElement(entity, elementName);
-        return (0, orm_helper_1.isEmbeddedElement)(el) ? el : undefined;
+        if (el && !(0, orm_helper_1.isEmbeddedElement)(el))
+            throw new Error(`"${el.name}" requested as "embedded" but it is "${el.kind}"`);
+        return el;
     }
     EntityMetadata.getEmbeddedElement = getEmbeddedElement;
     function getAssociationElement(entity, elementName) {
         const el = getElement(entity, elementName);
-        return (0, orm_helper_1.isAssociationElement)(el) ? el : undefined;
+        if (el && !(0, orm_helper_1.isAssociationElement)(el))
+            throw new Error(`"${el.name}" requested as "association" but it is "${el.kind}"`);
+        return el;
     }
     EntityMetadata.getAssociationElement = getAssociationElement;
+    function findElement(entity, predicate) {
+        return Object.values(entity.elements).find(predicate);
+    }
+    EntityMetadata.findElement = findElement;
     function getColumnElementByFieldName(entity, fieldName) {
         if (!fieldName)
             return;
@@ -131,7 +141,7 @@ var EntityMetadata;
     }
     EntityMetadata.getUpdateColumnNames = getUpdateColumnNames;
     function getPrimaryIndex(entity) {
-        return entity.indexes.find(idx => idx.primary);
+        return entity.indexes && entity.indexes.find(idx => idx.primary);
     }
     EntityMetadata.getPrimaryIndex = getPrimaryIndex;
     function getPrimaryIndexColumns(entity) {
@@ -149,6 +159,8 @@ var EntityMetadata;
     }
     EntityMetadata.getPrimaryIndexColumns = getPrimaryIndexColumns;
     async function getForeignKeyFor(src, trg) {
+        if (!src.foreignKeys)
+            return;
         for (const f of src.foreignKeys) {
             if (await f.resolveTarget() === trg)
                 return f;
@@ -277,10 +289,9 @@ var EntityMetadata;
         });
     }
     EntityMetadata.setPrimaryKeys = setPrimaryKeys;
-    function mixin(derived, base, elements) {
-        const elementKeys = elements && elements.map(x => x.toLowerCase());
-        const hasElement = (k) => !(elementKeys && !elementKeys.includes(k.toLowerCase()));
-        // applyMixins(derived, baseCtor, hasElement);
+    function mixin(derived, base, filter) {
+        // const elementKeys = elements && elements.map(x => x.toLowerCase());
+        const hasElement = (k) => !filter || filter(k);
         delete derived._elementNames;
         if (!derived.tableName) {
             derived.tableName = base.tableName;
@@ -316,6 +327,7 @@ var EntityMetadata;
             }
         }
         // Copy elements
+        derived.elements = derived.elements || {};
         for (const [n, p] of Object.entries(base.elements)) {
             if (!hasElement(n))
                 continue;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/connect",
   "description": "Multi-dialect database connection framework written with TypeScript",
-  "version": "4.1.0",
+  "version": "4.1.3",
   "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",