@typetron/framework 0.3.17 → 0.3.18

package/Database/Drivers/MySQL/MysqlDriver.js

@@ -1,74 +1,74 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlDriver = void 0;
-const DatabaseDriver_1 = require("../DatabaseDriver");
-const mysql_1 = require("mysql");
-const Create_1 = require("./Create");
-const Select_1 = require("../SQL/Statements/Select");
-const Insert_1 = require("../SQL/Statements/Insert");
-const Delete_1 = require("../SQL/Statements/Delete");
-const Update_1 = require("../SQL/Statements/Update");
-const Alter_1 = require("../SQL/Statements/Alter");
-const Schema_1 = require("./Schema");
-class MysqlDriver extends DatabaseDriver_1.DatabaseDriver {
-    constructor(connectionConfig) {
-        super();
-        this.schema = new Schema_1.Schema(this);
-        this.statements = {
-            create: Create_1.Create,
-            select: Select_1.Select,
-            insert: Insert_1.Insert,
-            delete: Delete_1.Delete,
-            update: Update_1.Update,
-            alter: Alter_1.Alter,
-        };
-        this.connection = mysql_1.createConnection({
-            connectTimeout: 30000,
-            ...connectionConfig,
-        });
-        this.connection.connect();
-    }
-    async truncate(table) {
-        await this.run(`TRUNCATE TABLE ${table}`);
-    }
-    runRaw(query, params = []) {
-        return new Promise((resolve, reject) => {
-            this.connection.query(query, params, (error, results, fields) => {
-                if (error) {
-                    error.message += `in SQL: "${error.sql}"`;
-                    return reject(error);
-                }
-                resolve(results);
-            });
-        });
-    }
-    async run(query, params = []) {
-        await this.runRaw(query, params);
-    }
-    async get(query, params = []) {
-        return await this.runRaw(query, params);
-    }
-    async first(query, params = []) {
-        var _a;
-        return (_a = (await this.runRaw(query, params))) === null || _a === void 0 ? void 0 : _a[0];
-    }
-    async insertOne(query, params = []) {
-        return (await this.runRaw(query, params)).insertId;
-    }
-    tables() {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MysqlDriver = void 0;
+const DatabaseDriver_1 = require("../DatabaseDriver");
+const mysql_1 = require("mysql");
+const Create_1 = require("./Create");
+const Select_1 = require("../SQL/Statements/Select");
+const Insert_1 = require("../SQL/Statements/Insert");
+const Delete_1 = require("../SQL/Statements/Delete");
+const Update_1 = require("../SQL/Statements/Update");
+const Alter_1 = require("../SQL/Statements/Alter");
+const Schema_1 = require("./Schema");
+class MysqlDriver extends DatabaseDriver_1.DatabaseDriver {
+    constructor(connectionConfig) {
+        super();
+        this.schema = new Schema_1.Schema(this);
+        this.statements = {
+            create: Create_1.Create,
+            select: Select_1.Select,
+            insert: Insert_1.Insert,
+            delete: Delete_1.Delete,
+            update: Update_1.Update,
+            alter: Alter_1.Alter,
+        };
+        this.connection = mysql_1.createConnection({
+            connectTimeout: 30000,
+            ...connectionConfig,
+        });
+        this.connection.connect();
+    }
+    async truncate(table) {
+        await this.run(`TRUNCATE TABLE ${table}`);
+    }
+    runRaw(query, params = []) {
+        return new Promise((resolve, reject) => {
+            this.connection.query(query, params, (error, results, fields) => {
+                if (error) {
+                    error.message += `in SQL: "${error.sql}"`;
+                    return reject(error);
+                }
+                resolve(results);
+            });
+        });
+    }
+    async run(query, params = []) {
+        await this.runRaw(query, params);
+    }
+    async get(query, params = []) {
+        return await this.runRaw(query, params);
+    }
+    async first(query, params = []) {
+        var _a;
+        return (_a = (await this.runRaw(query, params))) === null || _a === void 0 ? void 0 : _a[0];
+    }
+    async insertOne(query, params = []) {
+        return (await this.runRaw(query, params)).insertId;
+    }
+    tables() {
         return this.get(`select TABLE_NAME as name
              from information_schema.TABLES
              WHERE table_schema = ?
-            `, [this.connection.config.database]);
-    }
-    tableExists(table) {
+            `, [this.connection.config.database]);
+    }
+    tableExists(table) {
         return this.first(`select *
              from information_schema.tables
              where table_name = ?
                and table_schema = ?
-            `, [table, this.connection.config.database]);
-    }
-    async tableColumns(table) {
+            `, [table, this.connection.config.database]);
+    }
+    async tableColumns(table) {
         const columnsInfo = await this.get(`select cast(IS_NULLABLE = 'YES' as unsigned)      as nullable,
                     cast(EXTRA = 'auto_increment' as unsigned) as autoIncrement,
                     cast(COLUMN_KEY = 'PRI' as unsigned)       as primaryKey,
@@ -78,16 +78,16 @@ class MysqlDriver extends DatabaseDriver_1.DatabaseDriver {
              from information_schema.COLUMNS
              where table_name = ?
                and table_schema = ?
-            `, [table, this.connection.config.database]);
-        return columnsInfo.map(info => ({
-            name: info.name,
-            type: info.type,
-            nullable: Boolean(info.nullable),
-            default: info.default,
-            autoIncrement: info.autoIncrement,
-            primaryKey: Boolean(info.primaryKey)
-        }));
-    }
-}
-exports.MysqlDriver = MysqlDriver;
+            `, [table, this.connection.config.database]);
+        return columnsInfo.map(info => ({
+            name: info.name,
+            type: info.type,
+            nullable: Boolean(info.nullable),
+            default: info.default,
+            autoIncrement: info.autoIncrement,
+            primaryKey: Boolean(info.primaryKey)
+        }));
+    }
+}
+exports.MysqlDriver = MysqlDriver;
 //# sourceMappingURL=MysqlDriver.js.map

package/Database/Drivers/MySQL/Schema.d.ts

@@ -1,16 +1,16 @@
-import { ColumnField, Entity } from '../..';
-import { Schema as BaseSchema } from '../SQL/Schema';
-export declare class Schema extends BaseSchema {
-    columnMetadataToColumnDefinition(metadata: ColumnField<Entity>): {
-        name: string;
-        primaryKey: boolean;
-        autoIncrement: number;
-        type: string;
-        default: undefined;
-        nullable: boolean;
-    };
-    create(table: string, columns: ColumnField<Entity>[]): Promise<void>;
-    protected syncTableColumns(table: string, columnsMetadata: ColumnField<Entity>[]): Promise<void>;
-    private getColumnTypeBasedOnTypescriptType;
-}
+import { ColumnField, Entity } from '../..';
+import { Schema as BaseSchema } from '../SQL/Schema';
+export declare class Schema extends BaseSchema {
+    columnMetadataToColumnDefinition(metadata: ColumnField<Entity>): {
+        name: string;
+        primaryKey: boolean;
+        autoIncrement: number;
+        type: string;
+        default: undefined;
+        nullable: boolean;
+    };
+    create(table: string, columns: ColumnField<Entity>[]): Promise<void>;
+    protected syncTableColumns(table: string, columnsMetadata: ColumnField<Entity>[]): Promise<void>;
+    private getColumnTypeBasedOnTypescriptType;
+}
 //# sourceMappingURL=Schema.d.ts.map

package/Database/Drivers/MySQL/Schema.js

@@ -1,66 +1,66 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Schema = void 0;
-const __1 = require("../..");
-const Schema_1 = require("../SQL/Schema");
-const Create_1 = require("./Create");
-const _1 = require(".");
-const Alter_1 = require("./Alter");
-class Schema extends Schema_1.Schema {
-    columnMetadataToColumnDefinition(metadata) {
-        return {
-            name: metadata.column,
-            primaryKey: metadata.constructor === __1.PrimaryField,
-            autoIncrement: Number(metadata.constructor === __1.PrimaryField),
-            type: this.getColumnTypeBasedOnTypescriptType(metadata),
-            default: undefined,
-            nullable: true
-        };
-    }
-    async create(table, columns) {
-        const columnsDefinitions = columns.map(column => this.columnMetadataToColumnDefinition(column));
-        const createStatement = new Create_1.Create(table, columnsDefinitions);
-        await this.driver.run(createStatement.toSQL());
-    }
-    async syncTableColumns(table, columnsMetadata) {
-        const columns = columnsMetadata.map(metadata => this.columnMetadataToColumnDefinition(metadata));
-        const tableColumns = await this.driver.tableColumns(table);
-        let alters = [];
-        alters = alters.concat(columns
-            .whereNotIn('name', tableColumns.pluck('name'))
-            .map(column => new Alter_1.AddColumn({ ...column, autoIncrement: undefined })));
-        columns.whereIn('name', tableColumns.pluck('name'))
-            .forEach(column => {
-            var _a;
-            const typeInDB = (_a = tableColumns.findWhere('name', column.name)) === null || _a === void 0 ? void 0 : _a.type;
-            if (typeInDB !== column.type) {
-                alters.push(new Alter_1.ModifyColumn(column));
-            }
-        });
-        alters = alters.concat(tableColumns
-            .whereNotIn('name', columns.pluck('name'))
-            .map(tableColumn => new Alter_1.DropColumn(tableColumn.name)));
-        await this.driver.run(new Alter_1.Alter(table, alters).toSQL());
-        const additionalAlters = [];
-        columns.forEach(column => {
-            const dbInfo = tableColumns.findWhere('name', column.name);
-            if (column.primaryKey && !(dbInfo === null || dbInfo === void 0 ? void 0 : dbInfo.primaryKey)) {
-                additionalAlters.push(new Alter_1.AddConstraint(column, Alter_1.Constraints.PrimaryKey));
-            }
-            if (column.autoIncrement && !(dbInfo === null || dbInfo === void 0 ? void 0 : dbInfo.autoIncrement)) {
-                additionalAlters.push(new Alter_1.ModifyColumn(column));
-            }
-        });
-        if (!additionalAlters.empty()) {
-            await this.driver.run(new Alter_1.Alter(table, additionalAlters).toSQL());
-        }
-    }
-    getColumnTypeBasedOnTypescriptType(column) {
-        var _a, _b, _c;
-        const typePrototype = Array.from(_1.typesMatches.keys())
-            .find(key => column.type().prototype instanceof key) || String;
-        return (_c = (_b = (_a = _1.typesMatches.get(column.type())) !== null && _a !== void 0 ? _a : _1.typesMatches.get(column.constructor)) !== null && _b !== void 0 ? _b : _1.typesMatches.get(typePrototype)) !== null && _c !== void 0 ? _c : _1.typesMatches.get(String);
-    }
-}
-exports.Schema = Schema;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Schema = void 0;
+const __1 = require("../..");
+const Schema_1 = require("../SQL/Schema");
+const Create_1 = require("./Create");
+const _1 = require(".");
+const Alter_1 = require("./Alter");
+class Schema extends Schema_1.Schema {
+    columnMetadataToColumnDefinition(metadata) {
+        return {
+            name: metadata.column,
+            primaryKey: metadata.constructor === __1.PrimaryField,
+            autoIncrement: Number(metadata.constructor === __1.PrimaryField),
+            type: this.getColumnTypeBasedOnTypescriptType(metadata),
+            default: undefined,
+            nullable: true
+        };
+    }
+    async create(table, columns) {
+        const columnsDefinitions = columns.map(column => this.columnMetadataToColumnDefinition(column));
+        const createStatement = new Create_1.Create(table, columnsDefinitions);
+        await this.driver.run(createStatement.toSQL());
+    }
+    async syncTableColumns(table, columnsMetadata) {
+        const columns = columnsMetadata.map(metadata => this.columnMetadataToColumnDefinition(metadata));
+        const tableColumns = await this.driver.tableColumns(table);
+        let alters = [];
+        alters = alters.concat(columns
+            .whereNotIn('name', tableColumns.pluck('name'))
+            .map(column => new Alter_1.AddColumn({ ...column, autoIncrement: undefined })));
+        columns.whereIn('name', tableColumns.pluck('name'))
+            .forEach(column => {
+            var _a;
+            const typeInDB = (_a = tableColumns.findWhere('name', column.name)) === null || _a === void 0 ? void 0 : _a.type;
+            if (typeInDB !== column.type) {
+                alters.push(new Alter_1.ModifyColumn(column));
+            }
+        });
+        alters = alters.concat(tableColumns
+            .whereNotIn('name', columns.pluck('name'))
+            .map(tableColumn => new Alter_1.DropColumn(tableColumn.name)));
+        await this.driver.run(new Alter_1.Alter(table, alters).toSQL());
+        const additionalAlters = [];
+        columns.forEach(column => {
+            const dbInfo = tableColumns.findWhere('name', column.name);
+            if (column.primaryKey && !(dbInfo === null || dbInfo === void 0 ? void 0 : dbInfo.primaryKey)) {
+                additionalAlters.push(new Alter_1.AddConstraint(column, Alter_1.Constraints.PrimaryKey));
+            }
+            if (column.autoIncrement && !(dbInfo === null || dbInfo === void 0 ? void 0 : dbInfo.autoIncrement)) {
+                additionalAlters.push(new Alter_1.ModifyColumn(column));
+            }
+        });
+        if (!additionalAlters.empty()) {
+            await this.driver.run(new Alter_1.Alter(table, additionalAlters).toSQL());
+        }
+    }
+    getColumnTypeBasedOnTypescriptType(column) {
+        var _a, _b, _c;
+        const typePrototype = Array.from(_1.typesMatches.keys())
+            .find(key => column.type().prototype instanceof key) || String;
+        return (_c = (_b = (_a = _1.typesMatches.get(column.type())) !== null && _a !== void 0 ? _a : _1.typesMatches.get(column.constructor)) !== null && _b !== void 0 ? _b : _1.typesMatches.get(typePrototype)) !== null && _c !== void 0 ? _c : _1.typesMatches.get(String);
+    }
+}
+exports.Schema = Schema;
 //# sourceMappingURL=Schema.js.map

package/Database/Drivers/MySQL/index.d.ts

@@ -1,2 +1,2 @@
-export declare const typesMatches: Map<any, string>;
+export declare const typesMatches: Map<any, string>;
 //# sourceMappingURL=index.d.ts.map

package/Database/Drivers/MySQL/index.js

@@ -1,16 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.typesMatches = void 0;
-const Entity_1 = require("../../Entity");
-const Fields_1 = require("../../Fields");
-// tslint:disable-next-line:no-any
-exports.typesMatches = new Map([
-    [Entity_1.Entity, 'integer'],
-    [Fields_1.PrimaryField, `integer`],
-    [Number, 'integer'],
-    [String, 'varchar(255)'],
-    [Date, 'datetime'],
-    [Fields_1.JSONField, 'text'],
-    [Boolean, 'integer'],
-]);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.typesMatches = void 0;
+const Entity_1 = require("../../Entity");
+const Fields_1 = require("../../Fields");
+// tslint:disable-next-line:no-any
+exports.typesMatches = new Map([
+    [Entity_1.Entity, 'integer'],
+    [Fields_1.PrimaryField, `integer`],
+    [Number, 'integer'],
+    [String, 'varchar(255)'],
+    [Date, 'datetime'],
+    [Fields_1.JSONField, 'text'],
+    [Boolean, 'integer'],
+]);
 //# sourceMappingURL=index.js.map

package/Database/Drivers/SQL/Schema.d.ts

@@ -1,7 +1,7 @@
-import { SchemaContract } from '../SchemaContract';
-import { ColumnField, Entity, EntityMetadata } from '../..';
-export declare abstract class Schema extends SchemaContract {
-    synchronize(entitiesMetadata: EntityMetadata<Entity>[]): Promise<void>;
-    protected abstract syncTableColumns(table: string, columns: ColumnField<Entity>[]): Promise<void>;
-}
+import { SchemaContract } from '../SchemaContract';
+import { ColumnField, Entity, EntityMetadata } from '../..';
+export declare abstract class Schema extends SchemaContract {
+    synchronize(entitiesMetadata: EntityMetadata<Entity>[]): Promise<void>;
+    protected abstract syncTableColumns(table: string, columns: ColumnField<Entity>[]): Promise<void>;
+}
 //# sourceMappingURL=Schema.d.ts.map

package/Database/Drivers/SQL/Schema.js

@@ -1,58 +1,58 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Schema = void 0;
-const SchemaContract_1 = require("../SchemaContract");
-const __1 = require("../..");
-class Schema extends SchemaContract_1.SchemaContract {
-    // async create(table: string, columns: ColumnField<Entity>[]) {
-    //     const columnsSQLs = columns
-    //         .filter(column => column.column)
-    //         .map(columnMetadata => this.getColumnSql(columnMetadata))
-    //
-    //     // @ts-ignore
-    //     const createStatement = new Create({
-    //         table,
-    //         columns: columnsSQLs
-    //     })
-    //
-    //     await this.driver.run(createStatement.toSql())
-    // }
-    // async addColumn(table: string, column: ColumnField<Entity>) {
-    //     await this.driver.run(`ALTER TABLE ${table}
-    //         ADD ${this.getColumnSql(column)}(6)`)
-    // }
-    async synchronize(entitiesMetadata) {
-        const pivotTables = new Map();
-        for await (const metadata of entitiesMetadata) {
-            const table = metadata.table;
-            const belongsToManyFields = Object.values(metadata.inverseRelationships)
-                .filter(field => field instanceof __1.BelongsToManyField);
-            belongsToManyFields.forEach(field => {
-                const entity = __1.Entity;
-                const pivotTableColumns = [
-                    // new ColumnField(entity, 'id', () => PrimaryField, 'id'),
-                    ...[field.getParentForeignKey(), field.getRelatedForeignKey()].sort().map(columnName => {
-                        return new __1.ColumnField(entity, columnName, () => Number, columnName);
-                    })
-                ];
-                pivotTables.set(field.getPivotTable(), pivotTableColumns);
-            });
-            const tableInfo = await this.driver.tableExists(table);
-            if (!tableInfo) {
-                await this.create(table, Object.values({ ...metadata.columns, ...metadata.relationships }));
-                continue;
-            }
-            await this.syncTableColumns(table, Object.values({ ...metadata.columns, ...metadata.relationships }));
-        }
-        for await (const [name, columns] of pivotTables) {
-            const tableInfo = await this.driver.tableExists(name);
-            if (!tableInfo) {
-                await this.create(name, columns);
-                continue;
-            }
-            await this.syncTableColumns(name, columns);
-        }
-    }
-}
-exports.Schema = Schema;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Schema = void 0;
+const SchemaContract_1 = require("../SchemaContract");
+const __1 = require("../..");
+class Schema extends SchemaContract_1.SchemaContract {
+    // async create(table: string, columns: ColumnField<Entity>[]) {
+    //     const columnsSQLs = columns
+    //         .filter(column => column.column)
+    //         .map(columnMetadata => this.getColumnSql(columnMetadata))
+    //
+    //     // @ts-ignore
+    //     const createStatement = new Create({
+    //         table,
+    //         columns: columnsSQLs
+    //     })
+    //
+    //     await this.driver.run(createStatement.toSql())
+    // }
+    // async addColumn(table: string, column: ColumnField<Entity>) {
+    //     await this.driver.run(`ALTER TABLE ${table}
+    //         ADD ${this.getColumnSql(column)}(6)`)
+    // }
+    async synchronize(entitiesMetadata) {
+        const pivotTables = new Map();
+        for await (const metadata of entitiesMetadata) {
+            const table = metadata.table;
+            const belongsToManyFields = Object.values(metadata.inverseRelationships)
+                .filter(field => field instanceof __1.BelongsToManyField);
+            belongsToManyFields.forEach(field => {
+                const entity = __1.Entity;
+                const pivotTableColumns = [
+                    // new ColumnField(entity, 'id', () => PrimaryField, 'id'),
+                    ...[field.getParentForeignKey(), field.getRelatedForeignKey()].sort().map(columnName => {
+                        return new __1.ColumnField(entity, columnName, () => Number, columnName);
+                    })
+                ];
+                pivotTables.set(field.getPivotTable(), pivotTableColumns);
+            });
+            const tableInfo = await this.driver.tableExists(table);
+            if (!tableInfo) {
+                await this.create(table, Object.values({ ...metadata.columns, ...metadata.relationships }));
+                continue;
+            }
+            await this.syncTableColumns(table, Object.values({ ...metadata.columns, ...metadata.relationships }));
+        }
+        for await (const [name, columns] of pivotTables) {
+            const tableInfo = await this.driver.tableExists(name);
+            if (!tableInfo) {
+                await this.create(name, columns);
+                continue;
+            }
+            await this.syncTableColumns(name, columns);
+        }
+    }
+}
+exports.Schema = Schema;
 //# sourceMappingURL=Schema.js.map

package/Database/Drivers/SQL/Statements/Alter.d.ts

@@ -1,8 +1,8 @@
-import { BaseStatement } from './BaseStatement';
-import { ColumnField, Entity } from '../../..';
-export declare class Alter extends BaseStatement {
-    columns: ColumnField<Entity>[];
-    getColumns(): string;
-    toSQL(): string;
-}
+import { BaseStatement } from './BaseStatement';
+import { ColumnField, Entity } from '../../..';
+export declare class Alter extends BaseStatement {
+    columns: ColumnField<Entity>[];
+    getColumns(): string;
+    toSQL(): string;
+}
 //# sourceMappingURL=Alter.d.ts.map

package/Database/Drivers/SQL/Statements/Alter.js

@@ -1,16 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Alter = void 0;
-const BaseStatement_1 = require("./BaseStatement");
-class Alter extends BaseStatement_1.BaseStatement {
-    constructor() {
-        super(...arguments);
-        this.columns = [];
-    }
-    getColumns() {
-        return '';
-    }
-    toSQL() {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Alter = void 0;
+const BaseStatement_1 = require("./BaseStatement");
+class Alter extends BaseStatement_1.BaseStatement {
+    constructor() {
+        super(...arguments);
+        this.columns = [];
+    }
+    getColumns() {
+        return '';
+    }
+    toSQL() {
         return `
             ALTER
                 TABLE
@@ -18,8 +18,8 @@ class Alter extends BaseStatement_1.BaseStatement {
                 (
                 ${this.getColumns()}
                 )
-        `;
-    }
-}
-exports.Alter = Alter;
+        `;
+    }
+}
+exports.Alter = Alter;
 //# sourceMappingURL=Alter.js.map

package/Database/Drivers/SQL/Statements/BaseStatement.d.ts

@@ -1,13 +1,13 @@
-import { Statement } from '../../Statement';
-export declare abstract class BaseStatement extends Statement {
-    get table(): string;
-    get wheres(): string;
-    get limit(): string;
-    get joins(): string;
-    get groups(): string;
-    get having(): string;
-    get orders(): string;
-    abstract toSQL(): string;
-    toString(): string;
-}
+import { Statement } from '../../Statement';
+export declare abstract class BaseStatement extends Statement {
+    get table(): string;
+    get wheres(): string;
+    get limit(): string;
+    get joins(): string;
+    get groups(): string;
+    get having(): string;
+    get orders(): string;
+    abstract toSQL(): string;
+    toString(): string;
+}
 //# sourceMappingURL=BaseStatement.d.ts.map