@spinajs/orm 2.0.180 → 2.0.181

package/lib/cjs/relation-objects.js

@@ -1,222 +1,222 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OneToManyRelationList = exports.ManyToManyRelationList = exports.SingleRelation = exports.Relation = void 0;
-/* eslint-disable prettier/prettier */
-const interfaces_js_1 = require("./interfaces.js");
-const di_1 = require("@spinajs/di");
-const builders_js_1 = require("./builders.js");
-const model_js_1 = require("./model.js");
-const orm_js_1 = require("./orm.js");
-const lodash_1 = __importDefault(require("lodash"));
-/**
- * Iterable list of populated relation entities
- *
- * It allows to add / remove objects to relation
- */
-class Relation extends Array {
-    constructor(owner, Model, Relation, objects) {
-        super();
-        this.owner = owner;
-        this.Model = Model;
-        this.Relation = Relation;
-        this.Populated = false;
-        if (objects) {
-            this.push(...objects);
-        }
-        this.TargetModelDescriptor = (0, model_js_1.extractModelDescriptor)(Model);
-        this.Orm = di_1.DI.get(orm_js_1.Orm);
-        if (this.TargetModelDescriptor) {
-            this.Driver = this.Orm.Connections.get(this.TargetModelDescriptor.Connection);
-        }
-        this.IsModelAForwardRef = !(0, di_1.isConstructor)(this.Model);
-    }
-    /**
-     * Delete all objects from relation
-     */
-    async clear() {
-        await this.remove(this);
-    }
-    empty() {
-        this.length = 0;
-    }
-    /**
-     * Populates this relation ( loads all data related to owner of this relation)
-     */
-    async populate(callback) {
-        const query = this.Relation.TargetModel.where(this.Relation.ForeignKey, this.owner.PrimaryKeyValue);
-        if (callback) {
-            callback.apply(query);
-        }
-        const result = await query;
-        if (result) {
-            this.length = 0;
-            this.push(...result);
-        }
-        this.Populated = true;
-    }
-}
-exports.Relation = Relation;
-class SingleRelation {
-    constructor(_owner, model, Relation, object) {
-        this._owner = _owner;
-        this.model = model;
-        this.Relation = Relation;
-        this.Populated = false;
-        this.TargetModelDescriptor = (0, model_js_1.extractModelDescriptor)(model);
-        this.Orm = di_1.DI.get(orm_js_1.Orm);
-        this.Value = object;
-    }
-    async set(obj) {
-        this.Value = obj;
-        await this._owner.update();
-    }
-    attach(obj) {
-        this.Value = obj;
-    }
-    detach() {
-        this.Value = null;
-    }
-    async remove() {
-        this.Value = null;
-        await this.Value.destroy();
-        await this._owner.update();
-    }
-    async populate(callback) {
-        /**
-         * Do little cheat - we construct query that loads initial model with given relation.
-         * Then we only assign relation property.
-         *
-         * TODO: create only relation query without loading its owner.
-         */
-        const query = (0, model_js_1.createQuery)(this.Relation.TargetModel, (builders_js_1.SelectQueryBuilder)).query;
-        const desc = (0, model_js_1.extractModelDescriptor)(this.Relation.TargetModel);
-        query.where({ [desc.PrimaryKey]: this._owner[this.Relation.ForeignKey] });
-        if (callback) {
-            callback.apply(query);
-        }
-        const result = await query.firstOrFail();
-        if (result) {
-            this.Value = result;
-        }
-        this.Populated = true;
-    }
-}
-exports.SingleRelation = SingleRelation;
-class ManyToManyRelationList extends Relation {
-    intersection(_obj, _callback) {
-        throw new Error('Method not implemented.');
-    }
-    union(_obj, _mode) {
-        throw new Error('Method not implemented.');
-    }
-    diff(_obj, _callback) {
-        throw new Error('Method not implemented.');
-    }
-    set(_obj, _callback) {
-        throw new Error('Method not implemented.');
-    }
-    async remove(obj) {
-        const self = this;
-        const data = (Array.isArray(obj) ? obj : [obj]).map((d) => d.PrimaryKeyValue);
-        const jmodelDescriptor = (0, model_js_1.extractModelDescriptor)(this.Relation.JunctionModel);
-        const query = this.Driver.del()
-            .from(jmodelDescriptor.TableName)
-            .where(function () {
-            this.whereIn(self.Relation.JunctionModelTargetModelFKey_Name, data);
-            this.andWhere(self.Relation.JunctionModelSourceModelFKey_Name, self.owner.PrimaryKeyValue);
-        });
-        if (this.Driver.Options.Database) {
-            query.database(this.Driver.Options.Database);
-        }
-        await query;
-        lodash_1.default.remove(this, (o) => data.indexOf(o.PrimaryKeyValue) !== -1);
-    }
-    async add(obj, mode) {
-        const data = Array.isArray(obj) ? obj : [obj];
-        const relEntities = data.map((d) => {
-            const relEntity = new this.Relation.JunctionModel();
-            relEntity[this.Relation.JunctionModelSourceModelFKey_Name] = this.owner.PrimaryKeyValue;
-            relEntity[this.Relation.JunctionModelTargetModelFKey_Name] = d.PrimaryKeyValue;
-            return relEntity;
-        });
-        for (const m of relEntities) {
-            await m.insert(mode);
-        }
-        this.push(...data);
-    }
-}
-exports.ManyToManyRelationList = ManyToManyRelationList;
-class OneToManyRelationList extends Relation {
-    async deleteRelationData(data) {
-        if (data.length === 0) {
-            return;
-        }
-        const self = this;
-        const query = this.Driver.del()
-            .from(this.TargetModelDescriptor.TableName)
-            .andWhere(function () {
-            this.whereNotIn(self.Relation.PrimaryKey, data.filter((x) => x.PrimaryKeyValue).map((x) => x.PrimaryKeyValue));
-            this.where(self.Relation.ForeignKey, self.owner.PrimaryKeyValue);
-        });
-        if (this.Driver.Options.Database) {
-            query.database(this.Driver.Options.Database);
-        }
-        await query;
-        this.empty();
-    }
-    async diff(dataset, callback) {
-        // calculate difference between this data in relation and dataset ( objects from this relation)
-        const result = callback ? lodash_1.default.differenceWith(dataset, [...this], callback) : lodash_1.default.differenceBy(dataset, [...this], this.TargetModelDescriptor.PrimaryKey);
-        // calculate difference between dataset and data in this relation ( objects from dataset )
-        const result2 = callback ? lodash_1.default.differenceWith([...this], dataset, callback) : lodash_1.default.differenceBy([...this], dataset, this.TargetModelDescriptor.PrimaryKey);
-        // combine difference from two sets
-        const finalDiff = [...result, ...result2];
-        await this.deleteRelationData(finalDiff);
-        await this.add(finalDiff, interfaces_js_1.InsertBehaviour.InsertOrUpdate);
-    }
-    async set(obj) {
-        await this.deleteRelationData(obj);
-        await this.add(obj, interfaces_js_1.InsertBehaviour.InsertOrUpdate);
-    }
-    async intersection(obj, callback) {
-        const result = callback ? lodash_1.default.intersectionWith(obj, [...this], callback) : lodash_1.default.intersectionBy(obj, [...this], this.TargetModelDescriptor.PrimaryKey);
-        await this.deleteRelationData(result);
-        await this.add(result, interfaces_js_1.InsertBehaviour.InsertOrUpdate);
-    }
-    async union(obj, mode) {
-        await this.add(obj, mode ?? interfaces_js_1.InsertBehaviour.InsertOrIgnore);
-    }
-    async remove(obj) {
-        const data = (Array.isArray(obj) ? obj : [obj]).map((d) => d.PrimaryKeyValue);
-        const query = this.Driver.del().whereIn(this.Relation.ForeignKey, data).setTable(this.TargetModelDescriptor.TableName);
-        if (this.Driver.Options.Database) {
-            query.database(this.Driver.Options.Database);
-        }
-        await query;
-        lodash_1.default.remove(this, (o) => data.indexOf(o.PrimaryKeyValue) !== -1);
-    }
-    async add(obj, mode) {
-        const data = Array.isArray(obj) ? obj : [obj];
-        const tInsert = data.map((x) => {
-            if (x instanceof model_js_1.ModelBase) {
-                return x;
-            }
-            if (this.IsModelAForwardRef) {
-                new (this.Model())(x);
-            }
-            return new this.Model(x);
-        });
-        data.forEach((d) => {
-            d[this.Relation.ForeignKey] = this.owner.PrimaryKeyValue;
-        });
-        for (const m of tInsert) {
-            await m.insertOrUpdate(mode);
-        }
-        this.push(...tInsert);
-    }
-}
-exports.OneToManyRelationList = OneToManyRelationList;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneToManyRelationList = exports.ManyToManyRelationList = exports.SingleRelation = exports.Relation = void 0;
+/* eslint-disable prettier/prettier */
+const interfaces_js_1 = require("./interfaces.js");
+const di_1 = require("@spinajs/di");
+const builders_js_1 = require("./builders.js");
+const model_js_1 = require("./model.js");
+const orm_js_1 = require("./orm.js");
+const lodash_1 = __importDefault(require("lodash"));
+/**
+ * Iterable list of populated relation entities
+ *
+ * It allows to add / remove objects to relation
+ */
+class Relation extends Array {
+    constructor(owner, Model, Relation, objects) {
+        super();
+        this.owner = owner;
+        this.Model = Model;
+        this.Relation = Relation;
+        this.Populated = false;
+        if (objects) {
+            this.push(...objects);
+        }
+        this.TargetModelDescriptor = (0, model_js_1.extractModelDescriptor)(Model);
+        this.Orm = di_1.DI.get(orm_js_1.Orm);
+        if (this.TargetModelDescriptor) {
+            this.Driver = this.Orm.Connections.get(this.TargetModelDescriptor.Connection);
+        }
+        this.IsModelAForwardRef = !(0, di_1.isConstructor)(this.Model);
+    }
+    /**
+     * Delete all objects from relation
+     */
+    async clear() {
+        await this.remove(this);
+    }
+    empty() {
+        this.length = 0;
+    }
+    /**
+     * Populates this relation ( loads all data related to owner of this relation)
+     */
+    async populate(callback) {
+        const query = this.Relation.TargetModel.where(this.Relation.ForeignKey, this.owner.PrimaryKeyValue);
+        if (callback) {
+            callback.apply(query);
+        }
+        const result = await query;
+        if (result) {
+            this.length = 0;
+            this.push(...result);
+        }
+        this.Populated = true;
+    }
+}
+exports.Relation = Relation;
+class SingleRelation {
+    constructor(_owner, model, Relation, object) {
+        this._owner = _owner;
+        this.model = model;
+        this.Relation = Relation;
+        this.Populated = false;
+        this.TargetModelDescriptor = (0, model_js_1.extractModelDescriptor)(model);
+        this.Orm = di_1.DI.get(orm_js_1.Orm);
+        this.Value = object;
+    }
+    async set(obj) {
+        this.Value = obj;
+        await this._owner.update();
+    }
+    attach(obj) {
+        this.Value = obj;
+    }
+    detach() {
+        this.Value = null;
+    }
+    async remove() {
+        this.Value = null;
+        await this.Value.destroy();
+        await this._owner.update();
+    }
+    async populate(callback) {
+        /**
+         * Do little cheat - we construct query that loads initial model with given relation.
+         * Then we only assign relation property.
+         *
+         * TODO: create only relation query without loading its owner.
+         */
+        const query = (0, model_js_1.createQuery)(this.Relation.TargetModel, (builders_js_1.SelectQueryBuilder)).query;
+        const desc = (0, model_js_1.extractModelDescriptor)(this.Relation.TargetModel);
+        query.where({ [desc.PrimaryKey]: this._owner[this.Relation.ForeignKey] });
+        if (callback) {
+            callback.apply(query);
+        }
+        const result = await query.firstOrFail();
+        if (result) {
+            this.Value = result;
+        }
+        this.Populated = true;
+    }
+}
+exports.SingleRelation = SingleRelation;
+class ManyToManyRelationList extends Relation {
+    intersection(_obj, _callback) {
+        throw new Error('Method not implemented.');
+    }
+    union(_obj, _mode) {
+        throw new Error('Method not implemented.');
+    }
+    diff(_obj, _callback) {
+        throw new Error('Method not implemented.');
+    }
+    set(_obj, _callback) {
+        throw new Error('Method not implemented.');
+    }
+    async remove(obj) {
+        const self = this;
+        const data = (Array.isArray(obj) ? obj : [obj]).map((d) => d.PrimaryKeyValue);
+        const jmodelDescriptor = (0, model_js_1.extractModelDescriptor)(this.Relation.JunctionModel);
+        const query = this.Driver.del()
+            .from(jmodelDescriptor.TableName)
+            .where(function () {
+            this.whereIn(self.Relation.JunctionModelTargetModelFKey_Name, data);
+            this.andWhere(self.Relation.JunctionModelSourceModelFKey_Name, self.owner.PrimaryKeyValue);
+        });
+        if (this.Driver.Options.Database) {
+            query.database(this.Driver.Options.Database);
+        }
+        await query;
+        lodash_1.default.remove(this, (o) => data.indexOf(o.PrimaryKeyValue) !== -1);
+    }
+    async add(obj, mode) {
+        const data = Array.isArray(obj) ? obj : [obj];
+        const relEntities = data.map((d) => {
+            const relEntity = new this.Relation.JunctionModel();
+            relEntity[this.Relation.JunctionModelSourceModelFKey_Name] = this.owner.PrimaryKeyValue;
+            relEntity[this.Relation.JunctionModelTargetModelFKey_Name] = d.PrimaryKeyValue;
+            return relEntity;
+        });
+        for (const m of relEntities) {
+            await m.insert(mode);
+        }
+        this.push(...data);
+    }
+}
+exports.ManyToManyRelationList = ManyToManyRelationList;
+class OneToManyRelationList extends Relation {
+    async deleteRelationData(data) {
+        if (data.length === 0) {
+            return;
+        }
+        const self = this;
+        const query = this.Driver.del()
+            .from(this.TargetModelDescriptor.TableName)
+            .andWhere(function () {
+            this.whereNotIn(self.Relation.PrimaryKey, data.filter((x) => x.PrimaryKeyValue).map((x) => x.PrimaryKeyValue));
+            this.where(self.Relation.ForeignKey, self.owner.PrimaryKeyValue);
+        });
+        if (this.Driver.Options.Database) {
+            query.database(this.Driver.Options.Database);
+        }
+        await query;
+        this.empty();
+    }
+    async diff(dataset, callback) {
+        // calculate difference between this data in relation and dataset ( objects from this relation)
+        const result = callback ? lodash_1.default.differenceWith(dataset, [...this], callback) : lodash_1.default.differenceBy(dataset, [...this], this.TargetModelDescriptor.PrimaryKey);
+        // calculate difference between dataset and data in this relation ( objects from dataset )
+        const result2 = callback ? lodash_1.default.differenceWith([...this], dataset, callback) : lodash_1.default.differenceBy([...this], dataset, this.TargetModelDescriptor.PrimaryKey);
+        // combine difference from two sets
+        const finalDiff = [...result, ...result2];
+        await this.deleteRelationData(finalDiff);
+        await this.add(finalDiff, interfaces_js_1.InsertBehaviour.InsertOrUpdate);
+    }
+    async set(obj) {
+        await this.deleteRelationData(obj);
+        await this.add(obj, interfaces_js_1.InsertBehaviour.InsertOrUpdate);
+    }
+    async intersection(obj, callback) {
+        const result = callback ? lodash_1.default.intersectionWith(obj, [...this], callback) : lodash_1.default.intersectionBy(obj, [...this], this.TargetModelDescriptor.PrimaryKey);
+        await this.deleteRelationData(result);
+        await this.add(result, interfaces_js_1.InsertBehaviour.InsertOrUpdate);
+    }
+    async union(obj, mode) {
+        await this.add(obj, mode ?? interfaces_js_1.InsertBehaviour.InsertOrIgnore);
+    }
+    async remove(obj) {
+        const data = (Array.isArray(obj) ? obj : [obj]).map((d) => d.PrimaryKeyValue);
+        const query = this.Driver.del().whereIn(this.Relation.ForeignKey, data).setTable(this.TargetModelDescriptor.TableName);
+        if (this.Driver.Options.Database) {
+            query.database(this.Driver.Options.Database);
+        }
+        await query;
+        lodash_1.default.remove(this, (o) => data.indexOf(o.PrimaryKeyValue) !== -1);
+    }
+    async add(obj, mode) {
+        const data = Array.isArray(obj) ? obj : [obj];
+        const tInsert = data.map((x) => {
+            if (x instanceof model_js_1.ModelBase) {
+                return x;
+            }
+            if (this.IsModelAForwardRef) {
+                new (this.Model())(x);
+            }
+            return new this.Model(x);
+        });
+        data.forEach((d) => {
+            d[this.Relation.ForeignKey] = this.owner.PrimaryKeyValue;
+        });
+        for (const m of tInsert) {
+            await m.insertOrUpdate(mode);
+        }
+        this.push(...tInsert);
+    }
+}
+exports.OneToManyRelationList = OneToManyRelationList;
 //# sourceMappingURL=relation-objects.js.map

package/lib/cjs/relations.d.ts

@@ -1,62 +1,62 @@
-import { IRelationDescriptor, IModelDescriptor, ForwardRefFunction, ISelectQueryBuilder } from './interfaces.js';
-import { Constructor, Container } from '@spinajs/di';
-import { ModelBase } from './model.js';
-import { Orm } from './orm.js';
-import { OrmDriver } from './driver.js';
-export interface IOrmRelation {
-    /**
-     * Executes relation, should be called only once.
-     *
-     * @param callback - optional callback to perform actions on relations eg. populate more, filter relational data etc.
-     */
-    execute(callback?: (this: ISelectQueryBuilder, relation: OrmRelation) => void): void;
-    /**
-     * Execute actions on relation query, does not initialize relation. Use it only AFTER execute was called.
-     *
-     * @param callback - execute callback to perform actions on relations eg. populate more, filter relational data etc.
-     */
-    executeOnQuery(callback: (this: ISelectQueryBuilder, relation: OrmRelation) => void): void;
-    /**
-     * Relation name
-     */
-    Name: string;
-}
-export declare abstract class OrmRelation implements IOrmRelation {
-    protected _container: Container;
-    protected _query: ISelectQueryBuilder;
-    protected _description: IRelationDescriptor;
-    parentRelation?: OrmRelation;
-    protected _targetModel: Constructor<ModelBase> | ForwardRefFunction;
-    protected _targetModelDescriptor: IModelDescriptor;
-    protected _relationQuery: ISelectQueryBuilder;
-    protected _separator: string;
-    protected _driver: OrmDriver;
-    Name: string;
-    get Alias(): string;
-    constructor(_container: Container, _query: ISelectQueryBuilder, _description: IRelationDescriptor, parentRelation?: OrmRelation);
-    abstract execute(callback?: (this: ISelectQueryBuilder, relation: OrmRelation) => void): void;
-    executeOnQuery(callback: (this: ISelectQueryBuilder<any>, relation: OrmRelation) => void): void;
-}
-export declare class BelongsToRelation extends OrmRelation {
-    constructor(_container: Container, _query: ISelectQueryBuilder<any>, _description: IRelationDescriptor, _parentRelation?: OrmRelation);
-    execute(callback: (this: ISelectQueryBuilder, relation: OrmRelation) => void): void;
-}
-export declare class BelongsToRecursiveRelation extends OrmRelation {
-    constructor(_container: Container, _query: ISelectQueryBuilder<any>, _description: IRelationDescriptor, _parentRelation?: OrmRelation);
-    execute(callback: (this: ISelectQueryBuilder, relation: OrmRelation) => void): void;
-}
-export declare class OneToManyRelation extends OrmRelation {
-    constructor(_container: Container, _query: ISelectQueryBuilder<any>, _description: IRelationDescriptor, _parentRelation?: OrmRelation);
-    execute(callback?: (this: ISelectQueryBuilder<any>, relation: OrmRelation) => void): void;
-}
-export declare class ManyToManyRelation extends OrmRelation {
-    protected _orm: Orm;
-    protected _joinModel: Constructor<ModelBase>;
-    protected _joinModelDescriptor: IModelDescriptor;
-    protected _joinQuery: ISelectQueryBuilder;
-    get TableJoinQuery(): ISelectQueryBuilder<unknown>;
-    get RelationQuery(): ISelectQueryBuilder<unknown>;
-    constructor(_container: Container, _orm: Orm, _query: ISelectQueryBuilder<any>, _description: IRelationDescriptor, _parentRelation?: OrmRelation);
-    execute(callback?: (this: ISelectQueryBuilder<any>, relation: OrmRelation) => void): void;
-}
+import { IRelationDescriptor, IModelDescriptor, ForwardRefFunction, ISelectQueryBuilder } from './interfaces.js';
+import { Constructor, Container } from '@spinajs/di';
+import { ModelBase } from './model.js';
+import { Orm } from './orm.js';
+import { OrmDriver } from './driver.js';
+export interface IOrmRelation {
+    /**
+     * Executes relation, should be called only once.
+     *
+     * @param callback - optional callback to perform actions on relations eg. populate more, filter relational data etc.
+     */
+    execute(callback?: (this: ISelectQueryBuilder, relation: OrmRelation) => void): void;
+    /**
+     * Execute actions on relation query, does not initialize relation. Use it only AFTER execute was called.
+     *
+     * @param callback - execute callback to perform actions on relations eg. populate more, filter relational data etc.
+     */
+    executeOnQuery(callback: (this: ISelectQueryBuilder, relation: OrmRelation) => void): void;
+    /**
+     * Relation name
+     */
+    Name: string;
+}
+export declare abstract class OrmRelation implements IOrmRelation {
+    protected _container: Container;
+    protected _query: ISelectQueryBuilder;
+    protected _description: IRelationDescriptor;
+    parentRelation?: OrmRelation;
+    protected _targetModel: Constructor<ModelBase> | ForwardRefFunction;
+    protected _targetModelDescriptor: IModelDescriptor;
+    protected _relationQuery: ISelectQueryBuilder;
+    protected _separator: string;
+    protected _driver: OrmDriver;
+    Name: string;
+    get Alias(): string;
+    constructor(_container: Container, _query: ISelectQueryBuilder, _description: IRelationDescriptor, parentRelation?: OrmRelation);
+    abstract execute(callback?: (this: ISelectQueryBuilder, relation: OrmRelation) => void): void;
+    executeOnQuery(callback: (this: ISelectQueryBuilder<any>, relation: OrmRelation) => void): void;
+}
+export declare class BelongsToRelation extends OrmRelation {
+    constructor(_container: Container, _query: ISelectQueryBuilder<any>, _description: IRelationDescriptor, _parentRelation?: OrmRelation);
+    execute(callback: (this: ISelectQueryBuilder, relation: OrmRelation) => void): void;
+}
+export declare class BelongsToRecursiveRelation extends OrmRelation {
+    constructor(_container: Container, _query: ISelectQueryBuilder<any>, _description: IRelationDescriptor, _parentRelation?: OrmRelation);
+    execute(callback: (this: ISelectQueryBuilder, relation: OrmRelation) => void): void;
+}
+export declare class OneToManyRelation extends OrmRelation {
+    constructor(_container: Container, _query: ISelectQueryBuilder<any>, _description: IRelationDescriptor, _parentRelation?: OrmRelation);
+    execute(callback?: (this: ISelectQueryBuilder<any>, relation: OrmRelation) => void): void;
+}
+export declare class ManyToManyRelation extends OrmRelation {
+    protected _orm: Orm;
+    protected _joinModel: Constructor<ModelBase>;
+    protected _joinModelDescriptor: IModelDescriptor;
+    protected _joinQuery: ISelectQueryBuilder;
+    get TableJoinQuery(): ISelectQueryBuilder<unknown>;
+    get RelationQuery(): ISelectQueryBuilder<unknown>;
+    constructor(_container: Container, _orm: Orm, _query: ISelectQueryBuilder<any>, _description: IRelationDescriptor, _parentRelation?: OrmRelation);
+    execute(callback?: (this: ISelectQueryBuilder<any>, relation: OrmRelation) => void): void;
+}
 //# sourceMappingURL=relations.d.ts.map