@spinajs/orm 1.0.60 → 1.2.26

package/lib/index.d.ts

@@ -1,7 +1,6 @@
 export * from './interfaces';
 export * from './statements';
 export * from './builders';
-export * from './helpers';
 export * from './model';
 export * from './relations';
 export * from './orm';

package/lib/index.js

@@ -7,13 +7,12 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./interfaces"), exports);
 __exportStar(require("./statements"), exports);
 __exportStar(require("./builders"), exports);
-__exportStar(require("./helpers"), exports);
 __exportStar(require("./model"), exports);
 __exportStar(require("./relations"), exports);
 __exportStar(require("./orm"), exports);

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA6B;AAC7B,+CAA6B;AAC7B,6CAA2B;AAC3B,4CAA0B;AAC1B,0CAAwB;AACxB,8CAA4B;AAC5B,wCAAsB;AACtB,0CAAwB;AACxB,+CAA6B;AAC7B,8CAA4B;AAC5B,2CAAyB;AACzB,+CAA6B;AAC7B,6CAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA6B;AAC7B,+CAA6B;AAC7B,6CAA2B;AAC3B,0CAAwB;AACxB,8CAA4B;AAC5B,wCAAsB;AACtB,0CAAwB;AACxB,+CAA6B;AAC7B,8CAA4B;AAC5B,2CAAyB;AACzB,+CAA6B;AAC7B,6CAA2B"}

package/lib/interfaces.d.ts

@@ -3,6 +3,7 @@ import { SORT_ORDER, WhereBoolean } from './enums';
 import { IQueryStatement, WrapStatement } from './statements';
 import { WhereFunction } from './types';
 import { OrmDriver } from './driver';
+import { Constructor } from '@spinajs/di';
 import { ModelBase } from './model';
 export declare enum QueryContext {
     Insert = 0,
@@ -113,12 +114,6 @@ export interface IDriverOptions {
         };
     };
     DefaultConnection: boolean;
-    /**
-     * Debug queries sent to orm driver. It writes raw queries queries to log for debug purposes
-     */
-    Debug?: {
-        Queries?: boolean;
-    };
 }
 export interface IMigrationDescriptor {
     /**
@@ -189,18 +184,18 @@ export interface IDiscriminationMap {
     /**
      * Field values mapped for proper models
      */
-    Models: Map<string, Constructor<ModelBase<any>>>;
+    Models: Map<string, Constructor<ModelBase>>;
 }
 export interface IDiscriminationEntry {
     Key: string;
-    Value: Constructor<ModelBase<any>>;
+    Value: Constructor<ModelBase>;
 }
 export declare enum RelationType {
     One = 0,
     Many = 1,
     ManyToMany = 2
 }
-export declare type ForwardRefFunction = () => Constructor<ModelBase<any>>;
+export declare type ForwardRefFunction = () => Constructor<ModelBase>;
 export interface IRelationDescriptor {
     /**
      * Name of relations, defaults for property name in model that owns relation
@@ -213,11 +208,11 @@ export interface IRelationDescriptor {
     /**
      * Relation model (  foreign )
      */
-    TargetModel: Constructor<ModelBase<any>> | ForwardRefFunction;
+    TargetModel: Constructor<ModelBase> | ForwardRefFunction;
     /**
      * Relation owner
      */
-    SourceModel: Constructor<ModelBase<any>>;
+    SourceModel: Constructor<ModelBase>;
     /**
      * Relation foreign key (one to one, one to many)
      */
@@ -229,7 +224,7 @@ export interface IRelationDescriptor {
     /**
      * Used in many to many relations, model for join table
      */
-    JunctionModel?: Constructor<ModelBase<any>>;
+    JunctionModel?: Constructor<ModelBase>;
     /**
      * Join table foreign keys, defaults to auto generated field names. Can be override.
      */
@@ -242,7 +237,7 @@ export interface IRelationDescriptor {
 }
 export interface IJunctionProperty {
     Name: string;
-    Model: Constructor<ModelBase<any>>;
+    Model: Constructor<ModelBase>;
 }
 /**
  * Table column description, used in models to build schema, validate & other stuff
@@ -351,13 +346,10 @@ export declare abstract class OrmMigration {
      * Migrate up - create tables, indices etc.
      * Be aware that model function are not avaible yet. To fill tables with
      * data use fill function
-     *
-     * @param connection
      */
     abstract up(connection: OrmDriver): Promise<void>;
     /**
      * Migrate down - undo changes made in up
-     * @param connection
      */
     abstract down(connection: OrmDriver): Promise<void>;
 }
@@ -408,7 +400,7 @@ export interface IColumnsBuilder {
      *
      * Select columns from db result ( multiple at once )
      *
-     * @param names column names to select
+     * @param names - column names to select
      */
     columns(names: string[]): this;
     /**
@@ -419,20 +411,20 @@ export interface IColumnsBuilder {
      * Selects single column from DB result with optional alias
      * Can be used multiple times
      *
-     * @param column column to select
-     * @param alias column alias ( optional )
+     * @param column - column to select
+     * @param alias - column alias ( optional )
      */
     select(column: string, alias?: string): this;
     /**
      * Selects custom values from DB. eg. Count(*)
      *
-     * @param rawQuery  raw query to be executed
+     * @param rawQuery - raw query to be executed
      */
     select(rawQuery: RawQuery): this;
     /**
      * Selects multiple columns at once with aliases. Map key property is column name, value is its alias
      *
-     * @param columns column list with aliases
+     * @param columns - column list with aliases
      */
     select(columns: Map<string, string>): this;
 }
@@ -576,10 +568,10 @@ export declare abstract class GroupByQueryCompiler implements IQueryCompiler {
 export interface IBuilderMiddleware {
     /**
      *
-     * Executed AFTER query is executed in DB and fetcher raw data
+     * Executed AFTER query is executed in DB and raw data is fetched
      * Use it to transform DB data before everything else
      *
-     * @param data raw data fetched from DB
+     * @param data - raw data fetched from DB
      */
     afterData(data: any[]): any[];
     /**
@@ -587,15 +579,15 @@ export interface IBuilderMiddleware {
      * override model creation logic. If null is returned, default model
      * is executed
      *
-     * @param data raw data to create
+     * @param data - raw data to create
      */
-    modelCreation(data: any): ModelBase<any>;
+    modelCreation(data: any): ModelBase;
     /**
      * executed after model was created ( all returned data by query is executed)
      *
-     * @param data hydrated data. Models are created and hydrated with data
+     * @param data - hydrated data. Models are created and hydrated with data
      */
-    afterHydration(data: Array<ModelBase<any>>): Promise<any[] | void>;
+    afterHydration(data: ModelBase[]): Promise<any[] | void>;
 }
 export declare class ValueConverter implements IValueConverter {
     /**

package/lib/interfaces.js

@@ -67,7 +67,7 @@ var RelationType;
 let OrmMigration = class OrmMigration {
 };
 OrmMigration = __decorate([
-    di_1.NewInstance()
+    (0, di_1.NewInstance)()
 ], OrmMigration);
 exports.OrmMigration = OrmMigration;
 /**
@@ -77,79 +77,79 @@ exports.OrmMigration = OrmMigration;
 let RecursiveQueryCompiler = class RecursiveQueryCompiler {
 };
 RecursiveQueryCompiler = __decorate([
-    di_1.NewInstance()
+    (0, di_1.NewInstance)()
 ], RecursiveQueryCompiler);
 exports.RecursiveQueryCompiler = RecursiveQueryCompiler;
 let SelectQueryCompiler = class SelectQueryCompiler {
 };
 SelectQueryCompiler = __decorate([
-    di_1.NewInstance()
+    (0, di_1.NewInstance)()
 ], SelectQueryCompiler);
 exports.SelectQueryCompiler = SelectQueryCompiler;
 let JoinQueryCompiler = class JoinQueryCompiler {
 };
 JoinQueryCompiler = __decorate([
-    di_1.NewInstance()
+    (0, di_1.NewInstance)()
 ], JoinQueryCompiler);
 exports.JoinQueryCompiler = JoinQueryCompiler;
 let IndexQueryCompiler = class IndexQueryCompiler {
 };
 IndexQueryCompiler = __decorate([
-    di_1.NewInstance()
+    (0, di_1.NewInstance)()
 ], IndexQueryCompiler);
 exports.IndexQueryCompiler = IndexQueryCompiler;
 let ForeignKeyQueryCompiler = class ForeignKeyQueryCompiler {
 };
 ForeignKeyQueryCompiler = __decorate([
-    di_1.NewInstance()
+    (0, di_1.NewInstance)()
 ], ForeignKeyQueryCompiler);
 exports.ForeignKeyQueryCompiler = ForeignKeyQueryCompiler;
 let DeleteQueryCompiler = class DeleteQueryCompiler {
 };
 DeleteQueryCompiler = __decorate([
-    di_1.NewInstance()
+    (0, di_1.NewInstance)()
 ], DeleteQueryCompiler);
 exports.DeleteQueryCompiler = DeleteQueryCompiler;
 let UpdateQueryCompiler = class UpdateQueryCompiler {
 };
 UpdateQueryCompiler = __decorate([
-    di_1.NewInstance()
+    (0, di_1.NewInstance)()
 ], UpdateQueryCompiler);
 exports.UpdateQueryCompiler = UpdateQueryCompiler;
 let InsertQueryCompiler = class InsertQueryCompiler {
 };
 InsertQueryCompiler = __decorate([
-    di_1.NewInstance()
+    (0, di_1.NewInstance)()
 ], InsertQueryCompiler);
 exports.InsertQueryCompiler = InsertQueryCompiler;
 let OnDuplicateQueryCompiler = class OnDuplicateQueryCompiler {
 };
 OnDuplicateQueryCompiler = __decorate([
-    di_1.NewInstance()
+    (0, di_1.NewInstance)()
 ], OnDuplicateQueryCompiler);
 exports.OnDuplicateQueryCompiler = OnDuplicateQueryCompiler;
 let TableQueryCompiler = class TableQueryCompiler {
 };
 TableQueryCompiler = __decorate([
-    di_1.NewInstance()
+    (0, di_1.NewInstance)()
 ], TableQueryCompiler);
 exports.TableQueryCompiler = TableQueryCompiler;
 let ColumnQueryCompiler = class ColumnQueryCompiler {
 };
 ColumnQueryCompiler = __decorate([
-    di_1.NewInstance()
+    (0, di_1.NewInstance)()
 ], ColumnQueryCompiler);
 exports.ColumnQueryCompiler = ColumnQueryCompiler;
 let OrderByQueryCompiler = class OrderByQueryCompiler {
 };
 OrderByQueryCompiler = __decorate([
-    di_1.NewInstance()
+    (0, di_1.NewInstance)()
 ], OrderByQueryCompiler);
 exports.OrderByQueryCompiler = OrderByQueryCompiler;
 let GroupByQueryCompiler = class GroupByQueryCompiler {
 };
 GroupByQueryCompiler = __decorate([
-    di_1.NewInstance()
+    (0, di_1.NewInstance)()
 ], GroupByQueryCompiler);
 exports.GroupByQueryCompiler = GroupByQueryCompiler;
 class ValueConverter {

package/lib/interfaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"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"}

package/lib/model.d.ts

@@ -1,9 +1,9 @@
 import { IModelDescrtiptor, InsertBehaviour } from './interfaces';
 import { WhereFunction } from './types';
-import { RawQuery, UpdateQueryBuilder, SelectQueryBuilder, DeleteQueryBuilder, InsertQueryBuilder } from './builders';
+import { RawQuery, UpdateQueryBuilder, SelectQueryBuilder, InsertQueryBuilder } from './builders';
 import { WhereOperators } from './enums';
 export declare function extractModelDescriptor(targetOrForward: any): IModelDescrtiptor;
-export declare abstract class ModelBase<T> {
+export declare class ModelBase {
     /**
      * Gets descriptor for this model. It contains information about relations, orm driver, connection properties,
      * db table attached, column information and others.
@@ -15,119 +15,121 @@ export declare abstract class ModelBase<T> {
     /**
      * Get all data from db
      */
-    static all<T>(_page?: number, _perPage?: number): SelectQueryBuilder<T>;
+    static all<T extends typeof ModelBase>(this: T, _page?: number, _perPage?: number): SelectQueryBuilder<Array<InstanceType<T>>>;
     /**
-     * Inserts data to DB
+     * Inserts data to DB.
      *
-     * @param _data data to insert
+     * @param _data - data to insert
      */
-    static insert<T extends ModelBase<T>>(_data: T | object): InsertQueryBuilder;
+    static insert<T extends typeof ModelBase>(this: T, _data: InstanceType<T> | Partial<InstanceType<T>> | Array<InstanceType<T>> | Array<Partial<InstanceType<T>>>): Promise<void>;
     /**
-     * Inserts multiple data at once to DB
+     * Search entities in db
      *
-     * @param _data data to insert
+     * @param column - column to search or function
+     * @param operator - boolean operator
+     * @param value - value to compare
      */
-    static insertBulk<T extends ModelBase<T>>(_data: T[] | object[]): Promise<void>;
+    static where<T extends typeof ModelBase>(this: T, _column: string | boolean | WhereFunction | RawQuery | object, _operator?: WhereOperators | any, _value?: any): SelectQueryBuilder<Array<InstanceType<T>>>;
     /**
-     * Search entities in db
+     * Updates single or multiple records at once with provided value based on condition
      *
-     * @param column column to search or function
-     * @param operator boolean operator
-     * @param value value to compare
+     * @param _data - data to set
+     */
+    static update<T extends typeof ModelBase>(this: T, _data: Partial<InstanceType<T>>): UpdateQueryBuilder;
+    /**
+     * Tries to find all models with given primary keys
+     */
+    static find<T extends typeof ModelBase>(this: T, _pks: any[]): Promise<Array<InstanceType<T>>>;
+    /**
+     * Tries to find all models in db. If not all exists, throws exception
+     */
+    static findOrFail<T extends typeof ModelBase>(this: T, _pks: any[]): Promise<Array<InstanceType<T>>>;
+    /**
+     * gets model by specified pk, if not exists, returns null
      *
-     * @returns {SelectQueryBuilder} fluent query builder to add more conditions if needed
      */
-    static where<T>(_column: string | boolean | WhereFunction | RawQuery | {}, _operator?: WhereOperators | any, _value?: any): SelectQueryBuilder<T>;
+    static get<T extends typeof ModelBase>(this: T, _pk: any): Promise<Array<InstanceType<T>>>;
     /**
-     * Updates single or multiple records at once with provided value based on condition
+     * Finds model by specified pk. If model not exists in db throws exception
      *
-     * @param _data data to set
      */
-    static update(_data: object): UpdateQueryBuilder;
-    static find<T>(pks: any[]): Promise<T[]>;
-    static find<T>(pks: any): Promise<T>;
+    static getOrFail<T extends typeof ModelBase>(this: T, _pk: any): Promise<Array<InstanceType<T>>>;
     /**
-     * Finds model by specified pk
      *
-     * @param _pk pk to find
+     * Checks if model with pk key or unique fields exists and if not creates one AND NOT save in db
+     * NOTE: it checks for unique fields constraint
      */
-    static findOrFail<T>(_pk: any): Promise<T>;
+    static getOrNew<T extends typeof ModelBase>(this: T, _pk?: any, _data?: Partial<InstanceType<T>>): Promise<InstanceType<T>>;
     /**
      * Creates raw query on this model. used for quering db for partial data or to perform some kind of operations
      * that dont need full ORM model to involve
      */
-    static query<T>(): SelectQueryBuilder<T>;
+    static query<T>(this: T): SelectQueryBuilder<T>;
     /**
      *
      * Checks if model with pk key / unique fields exists and if not creates one and saves to db
      * NOTE: it checks for unique fields too.
      *
-     * @param {any} data - model width data to check
+     * @param data - model width data to check
      */
-    static firstOrCreate<T>(_pk: any, _data?: any): Promise<T>;
+    static getOrCreate<T extends typeof ModelBase>(this: T, _pk: any, _data?: Partial<InstanceType<T>>): Promise<InstanceType<T>>;
     /**
      * Creates new model & saves is to db
      *
-     * @param {any} data - initial model data
-     */
-    static create<T>(_data?: any): Promise<T>;
-    /**
-     *
-     * Checks if model with pk key or unique fields exists and if not creates one AND NOT save in db
-     * NOTE: it checks for unique fields constraint
-     *
-     * @param {any} data - model to check
+     * @param  data - initial model data
      */
-    static firstOrNew<T>(_data?: any): Promise<T>;
+    static create<T extends typeof ModelBase>(this: T, _data: Partial<InstanceType<T>>): Promise<InstanceType<T>>;
     /**
      * Deletes model from db
      *
-     * @param pk? primary key
+     * @param pk - primary key
      */
-    static destroy(): DeleteQueryBuilder;
+    static destroy(_pk?: any | any[]): Promise<void>;
     constructor(data?: any);
     /**
      * Fills model with data. It only fills properties that exists in database
      *
-     * @param data data to fill
+     * @param data - data to fill
      */
-    hydrate(data: any): void;
+    hydrate(data: Partial<this>): void;
     /**
      * Extracts all data from model. It takes only properties that exists in DB
      */
-    dehydrate(): {};
+    dehydrate(): Partial<this>;
     /**
      * deletes enitt from db. If model have SoftDelete decorator, model is marked as deleted
      */
     destroy(): Promise<void>;
+    update(): Promise<void>;
     /**
      * Save all changes to db. It creates new entry id db or updates existing one if
      * primary key exists
      */
-    save(insertBehaviour?: InsertBehaviour): Promise<void>;
+    insert(insertBehaviour?: InsertBehaviour): Promise<void>;
     /**
      * Gets model data from database and returns as fresh instance.
      */
-    fresh(): Promise<T>;
+    fresh(): Promise<this>;
     /**
      * sets default values for model. values are taken from DB default column prop
      */
-    protected defaults(): void;
+    protected setDefaults(): void;
 }
 export declare const MODEL_STATIC_MIXINS: {
     query(): SelectQueryBuilder;
     where(column: string | boolean | WhereFunction | RawQuery | {}, operator?: WhereOperators | any, value?: any): SelectQueryBuilder;
-    update(data: object): UpdateQueryBuilder;
+    update<T extends typeof ModelBase>(data: Partial<InstanceType<T>>): UpdateQueryBuilder;
     all(page: number, perPage: number): SelectQueryBuilder;
-    insertBulk<T>(data: (object | ModelBase<T>)[]): InsertQueryBuilder;
     /**
      * Try to insert new value
      */
-    insert<T_1>(data: object | ModelBase<T_1>): InsertQueryBuilder;
-    find(pks: any | any[]): Promise<any>;
-    findOrFail<T_2>(pks: any | any[]): Promise<T_2 | T_2[]>;
-    destroy(pks?: any | any[]): Promise<any> | DeleteQueryBuilder | UpdateQueryBuilder;
-    create(data?: any): Promise<any>;
-    firstOrCreate(data?: any): Promise<any>;
-    firstOrNew(data?: any): Promise<any>;
+    insert<T_1 extends typeof ModelBase>(this: T_1, data: InstanceType<T_1> | Partial<InstanceType<T_1>> | InstanceType<T_1>[] | Partial<InstanceType<T_1>>[]): InsertQueryBuilder;
+    find<T_2 extends typeof ModelBase>(this: T_2, pks: any[]): Promise<InstanceType<T_2>[]>;
+    findOrFail<T_3 extends typeof ModelBase>(this: T_3, pks: any[]): Promise<InstanceType<T_3>[]>;
+    get<T_4 extends typeof ModelBase>(this: T_4, pk: any): Promise<InstanceType<T_4>>;
+    getOrFail<T_5 extends typeof ModelBase>(this: T_5, pk: any): Promise<InstanceType<T_5>>;
+    destroy(pks: any | any[]): Promise<void>;
+    create<T_6 extends typeof ModelBase>(this: T_6, data: Partial<InstanceType<T_6>>): Promise<InstanceType<T_6>>;
+    getOrCreate<T_7 extends typeof ModelBase>(this: T_7, pk: any, data: Partial<InstanceType<T_7>>): Promise<InstanceType<T_7>>;
+    getOrNew<T_8 extends typeof ModelBase>(this: T_8, pk: any, data?: Partial<InstanceType<T_8>>): Promise<InstanceType<T_8>>;
 };