@spinajs/orm 1.0.60 → 1.2.26

package/lib/orm.js

@@ -8,26 +8,34 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Orm = void 0;
+/* eslint-disable prettier/prettier */
 const configuration_1 = require("@spinajs/configuration");
 const di_1 = require("@spinajs/di");
-const di_2 = require("@spinajs/di");
 const log_1 = require("@spinajs/log");
 const reflection_1 = require("@spinajs/reflection");
-const lodash_1 = __importDefault(require("lodash"));
+const _ = require("lodash");
 const interfaces_1 = require("./interfaces");
 const model_1 = require("./model");
 const decorators_1 = require("./decorators");
 const exceptions_1 = require("@spinajs/exceptions");
+const luxon_1 = require("luxon");
+const exceptions_2 = require("./exceptions");
 /**
  * Used to exclude sensitive data to others. eg. removed password field from cfg
  */
 const CFG_PROPS = ['Database', 'User', 'Host', 'Port', 'Filename', 'Driver', 'Name'];
 const MIGRATION_TABLE_NAME = 'spinajs_migration';
+const MIGRATION_FILE_REGEXP = /(.*)_([0-9]{4}_[0-9]{2}_[0-9]{2}_[0-9]{2}_[0-9]{2}_[0-9]{2})\.(.*)/;
+const MIGRATION_TYPE_REGEXP = /(.*)_([0-9]{4}_[0-9]{2}_[0-9]{2}_[0-9]{2}_[0-9]{2}_[0-9]{2})/;
+function migrationFileTypeMatcher(name) {
+    const match = name.match(MIGRATION_TYPE_REGEXP);
+    if (match === null || match.length !== 3) {
+        throw new exceptions_2.OrmException(`Invalid migration file name ${name}, expected: ${name}_YYYY_MM_DD_HH_mm_ss`);
+    }
+    return match[1];
+}
 class Orm extends di_1.AsyncModule {
     constructor() {
         super(...arguments);
@@ -37,7 +45,7 @@ class Orm extends di_1.AsyncModule {
      *
      * Migrates schema up ( fill function is not executed )
      *
-     * @param name migration file name
+     * @param name - migration file name
      */
     async migrateUp(name) {
         const self = this;
@@ -67,7 +75,7 @@ class Orm extends di_1.AsyncModule {
      *
      * Migrates schema up ( fill function is not executed )
      *
-     * @param name migration file name
+     * @param name - migration file name
      */
     async migrateDown(name) {
         const self = this;
@@ -98,18 +106,18 @@ class Orm extends di_1.AsyncModule {
      */
     async reloadTableInfo() {
         for (const m of this.Models) {
-            const descriptor = model_1.extractModelDescriptor(m.type);
+            const descriptor = (0, model_1.extractModelDescriptor)(m.type);
             if (descriptor) {
                 const connection = this.Connections.get(descriptor.Connection);
                 if (connection) {
                     const columns = await connection.tableInfo(descriptor.TableName, connection.Options.Database);
                     if (columns) {
-                        m.type[decorators_1.MODEL_DESCTRIPTION_SYMBOL].Columns = lodash_1.default.uniqBy(lodash_1.default.map(columns, c => {
-                            return lodash_1.default.assign(c, lodash_1.default.find(descriptor.Columns, { Name: c.Name }));
+                        m.type[decorators_1.MODEL_DESCTRIPTION_SYMBOL].Columns = _.uniqBy(_.map(columns, (c) => {
+                            return _.assign(c, _.find(descriptor.Columns, { Name: c.Name }));
                         }), 'Name');
                     }
                     for (const [key, val] of descriptor.Converters) {
-                        const column = m.type[decorators_1.MODEL_DESCTRIPTION_SYMBOL].Columns.find(c => c.Name === key);
+                        const column = m.type[decorators_1.MODEL_DESCTRIPTION_SYMBOL].Columns.find((c) => c.Name === key);
                         if (column) {
                             column.Converter = connection.Container.hasRegistered(val) ? connection.Container.resolve(val) : null;
                         }
@@ -118,8 +126,7 @@ class Orm extends di_1.AsyncModule {
             }
         }
     }
-    async resolveAsync(container) {
-        this.Container = container;
+    async resolveAsync() {
         const migrateOnStartup = this.Configuration.get('db.Migration.Startup', false);
         await this.createConnections();
         if (migrateOnStartup) {
@@ -136,7 +143,7 @@ class Orm extends di_1.AsyncModule {
      *
      * NOTE: use it in ORM constructor before ORM is resolved & model list used.
      *
-     * @param model model to register
+     * @param model - model to register
      */
     registerModel(model) {
         this.Models.push({
@@ -152,25 +159,26 @@ class Orm extends di_1.AsyncModule {
      *
      * NOTE: use it in ORM constructor before ORM is resolved & migrate function used.
      *
-     * @param model model to register
+     * @param model - model to register
      */
     registerMigration(migration) {
+        const date = luxon_1.DateTime.now().toFormat('yyyy_MM_dd_HH_mm_ss');
         this.Migrations.push({
-            file: `${migration.name}.registered`,
-            name: migration.name,
+            file: `${migration.name}_${date}.registered`,
+            name: `${migration.name}_${date}`,
             type: migration,
         });
     }
     async createConnections() {
         const connections = await Promise.all(this.Configuration.get('db.Connections', [])
-            .map(c => {
+            .map((c) => {
             return this.Container.resolve(c.Driver, [c]);
         })
-            .filter(c => c !== null)
-            .map(c => c.connect()));
-        connections.forEach(c => {
+            .filter((c) => c !== null)
+            .map((c) => c.connect()));
+        connections.forEach((c) => {
             this.Connections.set(c.Options.Name, c);
-            this.Log.info(`Found ORM driver ${c.Options.Name} with parameters ${JSON.stringify(lodash_1.default.pick(c.Options, CFG_PROPS))}`);
+            this.Log.info(`Found ORM driver ${c.Options.Name} with parameters ${JSON.stringify(_.pick(c.Options, CFG_PROPS))}`);
         });
         const defaultConnection = this.Configuration.get('db.DefaultConnection');
         if (defaultConnection) {
@@ -181,7 +189,7 @@ class Orm extends di_1.AsyncModule {
         }
     }
     applyModelMixins() {
-        this.Models.forEach(m => {
+        this.Models.forEach((m) => {
             // tslint:disable-next-line: forin
             for (const mixin in model_1.MODEL_STATIC_MIXINS) {
                 m.type[mixin] = model_1.MODEL_STATIC_MIXINS[mixin].bind(m.type);
@@ -190,7 +198,26 @@ class Orm extends di_1.AsyncModule {
     }
     async executeAvaibleMigrations(name, callback, down) {
         var _a, _b;
-        let migrations = name ? this.Migrations.filter(m => m.name === name) : this.Migrations;
+        const toMigrate = name ? this.Migrations.filter((m) => m.name === name) : this.Migrations;
+        let migrations = toMigrate
+            .map((x) => {
+            const match = x.file.match(MIGRATION_FILE_REGEXP);
+            if (match === null || match.length !== 4) {
+                throw new exceptions_2.OrmException(`Migration file name have invalid format ( expected: some_name_yyyy_MM_dd_HH_mm_ss got ${x.file})`);
+            }
+            const created = luxon_1.DateTime.fromFormat(match[2], 'yyyy_MM_dd_HH_mm_ss');
+            if (!created.isValid) {
+                throw new exceptions_2.OrmException(`Migration file ${x.file} have invalid name format ( invalid migration date )`);
+            }
+            return Object.assign({ created }, x);
+        })
+            .filter((x) => x !== null)
+            .sort((a, b) => {
+            if (a.created < b.created) {
+                return -1;
+            }
+            return 1;
+        });
         if (down) {
             migrations = migrations.reverse();
         }
@@ -198,13 +225,10 @@ class Orm extends di_1.AsyncModule {
             const md = m.type[decorators_1.MIGRATION_DESCRIPTION_SYMBOL];
             const cn = this.Connections.get(md.Connection);
             const migrationTableName = (_b = (_a = cn.Options.Migration) === null || _a === void 0 ? void 0 : _a.Table) !== null && _b !== void 0 ? _b : MIGRATION_TABLE_NAME;
-            const exists = await cn
-                .select()
-                .from(migrationTableName)
-                .where({ Migration: m.name })
-                .first();
+            const exists = await cn.select().from(migrationTableName).where({ Migration: m.name }).first();
             if (!exists) {
-                const migration = (await this.Container.resolve(m.type, [cn]));
+                const migration = await this.Container.resolve(m.type, [cn]);
+                this.Log.info(`Setting up migration ${m.name} from file ${m.file} created at ${m.created} mode: ${down ? 'migrate down' : 'migrate up'}`);
                 await callback(migration, cn);
             }
         }
@@ -221,11 +245,9 @@ class Orm extends di_1.AsyncModule {
             }
             catch (_c) { }
             if (!migrationTable) {
-                await connection.schema().createTable(migrationTableName, table => {
-                    table
-                        .string('Migration')
-                        .unique()
-                        .notNull();
+                this.Log.info(`No migration table in database, recreating migration information ...`);
+                await connection.schema().createTable(migrationTableName, (table) => {
+                    table.string('Migration').unique().notNull();
                     table.dateTime('CreatedAt').notNull();
                 });
             }
@@ -233,19 +255,23 @@ class Orm extends di_1.AsyncModule {
     }
 }
 __decorate([
-    reflection_1.ListFromFiles('/**/!(*.d).{ts,js}', 'system.dirs.models'),
+    (0, reflection_1.ListFromFiles)('/**/!(*.d).{ts,js}', 'system.dirs.models'),
     __metadata("design:type", Array)
 ], Orm.prototype, "Models", void 0);
 __decorate([
-    reflection_1.ListFromFiles('/**/!(*.d).{ts,js}', 'system.dirs.migrations'),
+    (0, reflection_1.ListFromFiles)('/**/!(*.d).{ts,js}', 'system.dirs.migrations', migrationFileTypeMatcher),
     __metadata("design:type", Array)
 ], Orm.prototype, "Migrations", void 0);
 __decorate([
-    log_1.Logger({ module: 'ORM' }),
-    __metadata("design:type", Object)
+    (0, di_1.Autoinject)(),
+    __metadata("design:type", di_1.Container)
+], Orm.prototype, "Container", void 0);
+__decorate([
+    (0, log_1.Logger)('ORM'),
+    __metadata("design:type", log_1.Log)
 ], Orm.prototype, "Log", void 0);
 __decorate([
-    di_2.Autoinject(),
+    (0, di_1.Autoinject)(),
     __metadata("design:type", configuration_1.Configuration)
 ], Orm.prototype, "Configuration", void 0);
 exports.Orm = Orm;

package/lib/orm.js.map

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

package/lib/relations.d.ts

@@ -1,4 +1,5 @@
 import { IRelationDescriptor, IModelDescrtiptor, IBuilderMiddleware, InsertBehaviour, ForwardRefFunction } from './interfaces';
+import { Constructor } from '@spinajs/di';
 import { SelectQueryBuilder } from './builders';
 import { ModelBase } from './model';
 import { Orm } from './orm';
@@ -10,7 +11,7 @@ export declare abstract class OrmRelation implements IOrmRelation {
     protected _query: SelectQueryBuilder<any>;
     _description: IRelationDescriptor;
     parentRelation?: OrmRelation;
-    protected _targetModel: Constructor<ModelBase<any>> | ForwardRefFunction;
+    protected _targetModel: Constructor<ModelBase> | ForwardRefFunction;
     protected _targetModelDescriptor: IModelDescrtiptor;
     protected _relationQuery: SelectQueryBuilder;
     get Alias(): string;
@@ -21,18 +22,18 @@ export declare class DiscriminationMapMiddleware implements IBuilderMiddleware {
     protected _description: IModelDescrtiptor;
     constructor(_description: IModelDescrtiptor);
     afterData(data: any[]): any[];
-    modelCreation(data: any): ModelBase<any>;
-    afterHydration(_data: Array<ModelBase<any>>): Promise<void>;
+    modelCreation(data: any): ModelBase;
+    afterHydration(_data: ModelBase[]): Promise<void>;
 }
 export declare class BelongsToRelation extends OrmRelation {
-    protected _targetModel: Constructor<ModelBase<any>>;
+    protected _targetModel: Constructor<ModelBase>;
     protected _targetModelDescriptor: IModelDescrtiptor;
     protected _relationQuery: SelectQueryBuilder;
     constructor(_orm: Orm, _query: SelectQueryBuilder<any>, _description: IRelationDescriptor, _parentRelation?: OrmRelation);
     execute(callback: (this: SelectQueryBuilder, relation: OrmRelation) => void): void;
 }
 export declare class BelongsToRecursiveRelation extends OrmRelation {
-    protected _targetModel: Constructor<ModelBase<any>>;
+    protected _targetModel: Constructor<ModelBase>;
     protected _targetModelDescriptor: IModelDescrtiptor;
     protected _relationQuery: SelectQueryBuilder;
     constructor(_orm: Orm, _query: SelectQueryBuilder<any>, _description: IRelationDescriptor, _parentRelation?: OrmRelation);
@@ -43,7 +44,7 @@ export declare class OneToManyRelation extends OrmRelation {
     execute(callback?: (this: SelectQueryBuilder<any>, relation: OrmRelation) => void): void;
 }
 export declare class ManyToManyRelation extends OrmRelation {
-    protected _joinModel: Constructor<ModelBase<any>>;
+    protected _joinModel: Constructor<ModelBase>;
     protected _joinModelDescriptor: IModelDescrtiptor;
     protected _joinQuery: SelectQueryBuilder;
     get TableJoinQuery(): SelectQueryBuilder<any>;
@@ -56,24 +57,24 @@ export declare class ManyToManyRelation extends OrmRelation {
  *
  * It allows to add / remove objects to relation
  */
-export declare abstract class Relation<R extends ModelBase<any>> extends Array<R> {
-    protected owner: ModelBase<any>;
+export declare abstract class Relation<R extends ModelBase> extends Array<R> {
+    protected owner: ModelBase;
     protected model: Constructor<R> | ForwardRefFunction;
     protected Relation: IRelationDescriptor;
     protected TargetModelDescriptor: IModelDescrtiptor;
     protected Orm: Orm;
-    constructor(owner: ModelBase<any>, model: Constructor<R> | ForwardRefFunction, Relation: IRelationDescriptor, objects?: R[]);
+    constructor(owner: ModelBase, model: Constructor<R> | ForwardRefFunction, Relation: IRelationDescriptor, objects?: R[]);
     /**
      * Removes from relation & deletes from db
      *
-     * @param obj data to remove
+     * @param obj - data to remove
      */
     abstract remove(obj: R | R[]): Promise<void>;
     /**
      *
      * Add to relation & saves to db
      *
-     * @param obj data to add
+     * @param obj - data to add
      */
     abstract add(obj: R | R[], mode?: InsertBehaviour): Promise<void>;
     /**
@@ -85,11 +86,11 @@ export declare abstract class Relation<R extends ModelBase<any>> extends Array<R
      */
     populate(callback?: (this: SelectQueryBuilder<this>, relation: OrmRelation) => void): Promise<void>;
 }
-export declare class ManyToManyRelationList<T extends ModelBase<any>> extends Relation<T> {
+export declare class ManyToManyRelationList<T extends ModelBase> extends Relation<T> {
     remove(obj: T | T[]): Promise<void>;
     add(obj: T | T[], mode?: InsertBehaviour): Promise<void>;
 }
-export declare class OneToManyRelationList<T extends ModelBase<any>> extends Relation<T> {
+export declare class OneToManyRelationList<T extends ModelBase> extends Relation<T> {
     remove(obj: T | T[]): Promise<void>;
     add(obj: T | T[], mode?: InsertBehaviour): Promise<void>;
 }