tspace-mysql 1.5.0 → 1.5.2

package/build/lib/connection/index.js

@@ -29,15 +29,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Pool = exports.loadOptionsEnvironment = exports.PoolConnection = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const mysql2_1 = require("mysql2");
+const events_1 = require("events");
 const options_1 = __importStar(require("./options"));
 Object.defineProperty(exports, "loadOptionsEnvironment", { enumerable: true, get: function () { return options_1.loadOptionsEnvironment; } });
-const mysql2_1 = require("mysql2");
-class PoolConnection {
+class PoolConnection extends events_1.EventEmitter {
     /**
      *
      * @Init a options connection pool
      */
     constructor(options) {
+        super();
         this.OPTIONS = this._loadOptions();
         if (options) {
             this.OPTIONS = new Map(Object.entries(Object.assign(Object.assign({}, Object.fromEntries(this.OPTIONS)), JSON.parse(JSON.stringify(options)))));
@@ -53,21 +55,35 @@ class PoolConnection {
     connection() {
         const pool = (0, mysql2_1.createPool)(Object.fromEntries(this.OPTIONS));
         pool.getConnection((err, _) => {
-            if (err == null || !err)
+            if (err == null || !err) {
+                this.emit('CONNECTION', pool);
                 return;
+            }
             const message = this._messageError.bind(this);
             process.nextTick(() => {
-                console.log(message(err === null || err === void 0 ? void 0 : err.message));
+                console.log(message(err.message == null || err.message === '' ? err.code : err.message));
                 if (options_1.default.CONNECTION_ERROR)
                     return process.exit();
             });
         });
+        pool.on('release', (connection) => {
+            this.emit('RELEASE', connection);
+        });
         return {
+            on: (event, data) => {
+                return this.on(event, data);
+            },
             query: (sql) => {
                 return new Promise((resolve, reject) => {
+                    const start = Date.now();
                     pool.query(sql, (err, results) => {
                         if (err)
                             return reject(err);
+                        this._detectEventQuery({
+                            start,
+                            sql,
+                            results
+                        });
                         return resolve(results);
                     });
                 });
@@ -78,11 +94,13 @@ class PoolConnection {
                         if (err)
                             return reject(err);
                         const query = (sql) => {
+                            const start = Date.now();
                             return new Promise((resolve, reject) => {
-                                connection.query(sql, (err, result) => {
+                                connection.query(sql, (err, results) => {
                                     if (err)
                                         return reject(err);
-                                    return resolve(result);
+                                    this._detectEventQuery({ start, sql, results });
+                                    return resolve(results);
                                 });
                             });
                         };
@@ -90,6 +108,9 @@ class PoolConnection {
                         const commit = () => query('COMMIT');
                         const rollback = () => query('ROLLBACK');
                         return resolve({
+                            on: (event, data) => {
+                                return this.on(event, data);
+                            },
                             query,
                             startTransaction,
                             commit,
@@ -100,6 +121,42 @@ class PoolConnection {
             }
         };
     }
+    _detectEventQuery({ start, sql, results }) {
+        const duration = Date.now() - start;
+        if (duration > 1000 * 5) {
+            console.log(`\n\x1b[1m\x1b[31mWARING:\x1b[0m \x1b[1m\x1b[30mSlow query detected: Execution time: ${duration} ms\x1b[0m \n\x1b[33m${sql};\x1b[0m`);
+            this.emit('SLOW_QUERY', {
+                sql,
+                results,
+                execution: duration
+            });
+        }
+        this.emit('QUERY', {
+            sql,
+            results,
+            execution: duration
+        });
+        this.emit(this._detectQueryType(sql), {
+            sql,
+            results,
+            execution: duration
+        });
+    }
+    _detectQueryType(query) {
+        const selectRegex = /^SELECT\b/i;
+        const updateRegex = /^UPDATE\b/i;
+        const insertRegex = /^INSERT\b/i;
+        const deleteRegex = /^DELETE\b/i;
+        if (selectRegex.test(query))
+            return 'SELECT';
+        if (updateRegex.test(query))
+            return 'UPDATE';
+        if (insertRegex.test(query))
+            return 'INSERT';
+        if (deleteRegex.test(query))
+            return 'DELETE';
+        return 'UNKNOWN';
+    }
     _defaultOptions() {
         return new Map(Object.entries({
             connectionLimit: Number.isNaN(Number(options_1.default.CONNECTION_LIMIT)) ? 30 : Number(options_1.default.CONNECTION_LIMIT),
@@ -197,7 +254,7 @@ class PoolConnection {
         }
         return data;
     }
-    _messageError(err) {
+    _messageError(message) {
         return `
             \x1b[1m\x1b[31m
             Connection lost to database ! \x1b[0m
@@ -209,7 +266,7 @@ class PoolConnection {
                 PASSWORD : ${this.OPTIONS.get('password')} \x1b[0m 
             -------------------------------
             \x1b[1m\x1b[31mError Message 
-            : ${err !== null && err !== void 0 ? err : ''} \x1b[0m
+            : ${message !== null && message !== void 0 ? message : ''} \x1b[0m
         `;
     }
 }

package/build/lib/connection/options.js

@@ -23,7 +23,7 @@ const ENV = process.env;
 const env = {
     HOST: ENV.DB_HOST || ENV.TSPACE_HOST,
     PORT: ENV.DB_PORT || ENV.TSPACE_PORT || 3306,
-    USERNAME: ENV.DB_USERNAME || ENV.TSPACE_USERNAME,
+    USERNAME: ENV.DB_USERNAME || ENV.TSPACE_USERNAME || ENV.DB_USER,
     PASSWORD: ENV.DB_PASSWORD || ENV.TSPACE_PASSWORD || '',
     DATABASE: ENV.DB_DATABASE || ENV.TSPACE_DATABASE,
     CONNECTION_LIMIT: ENV.DB_CONNECTION_LIMIT || ENV.TSPACE_CONNECTION_LIMIT || 30,
@@ -38,7 +38,7 @@ const env = {
     MULTIPLE_STATEMENTS: ENV.MULTIPLE_STATEMENTS || ENV.TSPACE_MULTIPLE_STATEMENTS || false
 };
 for (const [key, value] of Object.entries(env)) {
-    if (value == null)
+    if (value == null || key == null)
         continue;
     if (typeof value === 'string' && ['true', 'false'].some(v => value.toLowerCase() === v)) {
         env[key] = JSON.parse(value.toLowerCase());

package/build/lib/constants/index.js

@@ -47,7 +47,9 @@ const CONSTANTS = Object.freeze({
     NOT: 'NOT',
     DUPLICATE: 'DUPLICATE',
     KEY: 'KEY',
-    RAW: '$RAW',
+    RAW: '$RAW:',
+    OP: '$OP:',
+    IGNORE: '$IGNORE',
     WHEN: 'WHEN',
     THEN: 'THEN',
     ELSE: 'ELSE',
@@ -74,6 +76,7 @@ const CONSTANTS = Object.freeze({
     ON_DELETE: 'ON DELETE',
     ON_UPDATE: 'ON UPDATE',
     ADD: 'ADD',
+    CHANGE: 'CHANGE',
     ADD_CONSTRAINT: 'ADD CONSTRAINT',
     AFTER: 'AFTER',
     ALTER_TABLE: 'ALTER TABLE',
@@ -121,9 +124,11 @@ const CONSTANTS = Object.freeze({
         UUID: false,
         PAGE: 1,
         PER_PAGE: 1,
-        HOOKS: []
+        HOOKS: [],
+        RETURN_TYPE: null
     },
     MODEL: {
+        MODEL_NAME: 'MODEL',
         PRIMARY_KEY: 'id',
         VOID: false,
         SELECT: [],
@@ -169,13 +174,18 @@ const CONSTANTS = Object.freeze({
             CREATED_AT: 'created_at',
             UPDATED_AT: 'updated_at'
         },
+        LOGGER: false,
+        LOGGER_OPTIONS: null,
+        TABLE_LOGGER: '$loggers',
         VALIDATE_SCHEMA: false,
         VALIDATE_SCHEMA_DEFINED: null,
         FUNCTION_RELATION: false,
         SCHEMA_TABLE: null,
         RETRY: 0,
         OBSERVER: null,
-        DATA: null
+        DATA: null,
+        BEFORE_CREATING_TABLE: null,
+        RETURN_TYPE: null
     }
 });
 exports.CONSTANTS = CONSTANTS;

package/build/lib/{tspace → core}/Abstracts/AbstractBuilder.d.ts

@@ -55,7 +55,7 @@ declare abstract class AbstractBuilder {
     abstract rightJoin(pk: string, fk: string): this;
     abstract leftJoin(pk: string, fk: string): this;
     abstract crossJoin(pk: string, fk: string): this;
-    abstract orderBy(column: string, order: string): this;
+    abstract orderBy(column: string, order: 'ASC' | 'DESC'): this;
     abstract orderByRaw(column: string, order: string): this;
     abstract latest(...columns: string[]): this;
     abstract latestRaw(...columns: string[]): this;

package/build/lib/{tspace → core}/Abstracts/AbstractModel.d.ts

@@ -2,7 +2,8 @@ import { Pattern, Relation, RelationQuery, ValidateSchema } from '../../Interfac
 import { Blueprint } from '../Blueprint';
 import { Builder } from '../Builder';
 import { RelationHandler } from '../Handlers/Relation';
-declare abstract class AbstractModel extends Builder {
+import { Model } from '../Model';
+declare abstract class AbstractModel<T, R> extends Builder {
     protected $relation: RelationHandler | undefined;
     protected $schema: Record<string, Blueprint> | undefined;
     protected $validateSchema: ValidateSchema | undefined;
@@ -27,6 +28,7 @@ declare abstract class AbstractModel extends Builder {
         updated: Function;
         deleted: Function;
     }) | undefined;
+    protected abstract column<K extends keyof T>(key: K): K;
     protected abstract useUUID(): this;
     protected abstract usePrimaryKey(primaryKey: string): this;
     protected abstract useRegistry(): this;
@@ -47,7 +49,7 @@ declare abstract class AbstractModel extends Builder {
     protected abstract hasMany({ name, model, localKey, foreignKey, freezeTable, as }: Relation): this;
     protected abstract belongsTo({ name, model, localKey, foreignKey, freezeTable, as }: Relation): this;
     protected abstract belongsToMany({ name, model, localKey, foreignKey, freezeTable, as }: Relation): this;
-    protected abstract buildMethodRelation(name: string, callback?: Function): this;
+    protected abstract buildMethodRelation<K extends keyof R>(name: K, callback?: Function): this;
     protected abstract hasOneBuilder({ name, model, localKey, foreignKey, freezeTable, as }: RelationQuery, callback: Function): this;
     protected abstract hasManyBuilder({ name, model, localKey, foreignKey, freezeTable, as }: RelationQuery, callback: Function): this;
     protected abstract belongsToBuilder({ name, model, localKey, foreignKey, freezeTable, as }: RelationQuery, callback: Function): this;
@@ -58,17 +60,17 @@ declare abstract class AbstractModel extends Builder {
     abstract onlyTrashed(): this;
     abstract trashed(): this;
     abstract restore(): Promise<any[]>;
-    abstract with(...nameRelations: string[]): this;
-    abstract withQuery(nameRelations: string, callback: Function): this;
-    abstract withExists(...nameRelations: string[]): this;
-    abstract withTrashed(...nameRelations: string[]): this;
-    abstract withAll(...nameRelations: string[]): this;
-    abstract has(...nameRelations: string[]): this;
-    abstract relations(...nameRelations: string[]): this;
-    abstract relationQuery(nameRelations: string, callback: Function): this;
-    abstract relationsExists(...nameRelations: string[]): this;
-    abstract relationsAll(...nameRelations: string[]): this;
-    abstract relationsTrashed(...nameRelations: string[]): this;
+    abstract with<K extends keyof R>(...nameRelations: K[]): this;
+    abstract withQuery<K extends keyof R, TModel extends Model>(nameRelations: K, callback: (query: TModel) => TModel): this;
+    abstract withExists<K extends keyof R>(...nameRelations: K[]): this;
+    abstract withTrashed<K extends keyof R>(...nameRelations: K[]): this;
+    abstract withAll<K extends keyof R>(...nameRelations: K[]): this;
+    abstract has<K extends keyof R>(...nameRelations: K[]): this;
+    abstract relations<K extends keyof R>(...nameRelations: K[]): this;
+    abstract relationQuery<K extends keyof R, TModel extends Model>(nameRelations: K, callback: (query: TModel) => TModel): this;
+    abstract relationsExists<K extends keyof R>(...nameRelations: K[]): this;
+    abstract relationsAll<K extends keyof R>(...nameRelations: K[]): this;
+    abstract relationsTrashed<K extends keyof R>(...nameRelations: K[]): this;
 }
 export { AbstractModel };
 export default AbstractModel;

package/build/lib/{tspace → core}/Blueprint.d.ts

@@ -18,6 +18,7 @@ declare class Blueprint {
     private _type;
     private _attributes;
     private _foreignKey;
+    private _column;
     private _valueType;
     /**
      * Assign type 'int' in table
@@ -101,19 +102,16 @@ declare class Blueprint {
     mediumtext(): this;
     /**
      * Assign type 'TINYTEXT' in table
-     * @param {number} length [length = 1] length of string
      * @return {this} this
      */
     tinyText(): this;
     /**
     * Assign type 'TINYTEXT' in table
-    * @param {number} length [length = 1] length of string
     * @return {this} this
     */
     tinytext(): this;
     /**
      * Assign type 'TEXT' in table
-     * @param {number} length [length = 1] length of string
      * @return {this} this
      */
     text(): this;
@@ -163,6 +161,11 @@ declare class Blueprint {
      * @return {this} this
      */
     notNull(): this;
+    /**
+     * Assign attributes 'NOT NULL' in table
+     * @return {this} this
+     */
+    notnull(): this;
     /**
      * Assign attributes 'PRIMARY KEY' in table
      * @return {this} this
@@ -174,6 +177,12 @@ declare class Blueprint {
      * @return {this} this
      */
     default(value: string | number): this;
+    /**
+     * Assign attributes 'defaultValue' in table
+     * @param {string | number} value  default value
+     * @return {this} this
+     */
+    defaultValue(value: string | number): this;
     /**
      * Assign attributes 'default currentTimestamp' in table
      * @return {this} this
@@ -210,6 +219,8 @@ declare class Blueprint {
         onDelete?: 'CASCADE' | 'NO ACTION' | 'RESTRICT' | 'SET NULL';
         onUpdate?: 'CASCADE' | 'NO ACTION' | 'RESTRICT' | 'SET NULL';
     }): this;
+    bindColumn(column: string): this;
+    get column(): string | null;
     get type(): string;
     get attributes(): string[];
     get foreignKey(): Record<string, any> | null;

package/build/lib/{tspace → core}/Blueprint.js

@@ -21,6 +21,7 @@ class Blueprint {
         this._type = 'INT';
         this._attributes = [];
         this._foreignKey = null;
+        this._column = null;
         this._valueType = String;
     }
     /**
@@ -110,6 +111,8 @@ class Blueprint {
     varchar(length = 191) {
         if (length > 255)
             length = 255;
+        if (length <= 0)
+            length = 1;
         this._addAssignType(`VARCHAR(${length})`);
         return this;
     }
@@ -164,7 +167,6 @@ class Blueprint {
     }
     /**
      * Assign type 'TINYTEXT' in table
-     * @param {number} length [length = 1] length of string
      * @return {this} this
      */
     tinyText() {
@@ -173,7 +175,6 @@ class Blueprint {
     }
     /**
     * Assign type 'TINYTEXT' in table
-    * @param {number} length [length = 1] length of string
     * @return {this} this
     */
     tinytext() {
@@ -182,7 +183,6 @@ class Blueprint {
     }
     /**
      * Assign type 'TEXT' in table
-     * @param {number} length [length = 1] length of string
      * @return {this} this
      */
     text() {
@@ -266,6 +266,14 @@ class Blueprint {
         this._addAssignAttribute(`NOT NULL`);
         return this;
     }
+    /**
+     * Assign attributes 'NOT NULL' in table
+     * @return {this} this
+     */
+    notnull() {
+        this._addAssignAttribute(`NOT NULL`);
+        return this;
+    }
     /**
      * Assign attributes 'PRIMARY KEY' in table
      * @return {this} this
@@ -283,6 +291,15 @@ class Blueprint {
         this._addAssignAttribute(`DEFAULT '${value}'`);
         return this;
     }
+    /**
+     * Assign attributes 'defaultValue' in table
+     * @param {string | number} value  default value
+     * @return {this} this
+     */
+    defaultValue(value) {
+        this._addAssignAttribute(`DEFAULT '${value}'`);
+        return this;
+    }
     /**
      * Assign attributes 'default currentTimestamp' in table
      * @return {this} this
@@ -326,14 +343,23 @@ class Blueprint {
      * @return {this} this
      */
     foreign({ references, on, onDelete, onUpdate }) {
+        if (on == null)
+            return this;
         this._foreignKey = {
             references: references == null ? 'id' : references,
-            on: typeof on === 'string' ? on : new on(),
+            on,
             onDelete: onDelete == null ? 'CASCADE' : onDelete,
             onUpdate: onUpdate == null ? 'CASCADE' : onUpdate
         };
         return this;
     }
+    bindColumn(column) {
+        this._column = column;
+        return this;
+    }
+    get column() {
+        return this._column;
+    }
     get type() {
         return this._type;
     }