tspace-mysql 1.3.6 → 1.3.8

package/README.md

@@ -189,7 +189,8 @@ const users = await new DB('users')
             name :'tspace6',
             email : 'tspace6@gmail.com'
         },
-    ]).save()
+    ])
+    .save()
 
 const users = await new DB('users')
     .where('name','tspace4')
@@ -275,7 +276,8 @@ try {
         .bind(connection)
         .save()
 
-    const posts = await new Post().createMultiple([
+    const posts = await new Post()
+    .createMultiple([
         {
             user_id : user.id,
             title : `tspace-post1`
@@ -412,7 +414,7 @@ class User extends Model {
      * this.useRegistry() // => build-in functions registry
      * this.useLoadRelationsInRegistry() // => auto generated results from relationship to results
      * this.useBuiltInRelationFunctions() // => build-in functions relationships to results
-     * this.useSchema({
+     * this.useValidationSchema({
      *   id : Number,
      *   username : String
      *   created_at : Date,
@@ -853,23 +855,32 @@ hook((result) => ...) // callback result to function
 /** 
  * registry relation in your models
  * @relationship
-*/
-hasOne({ name , model , localKey , foreignKey , freezeTable , as })
-hasMany({ name , model , localKey , foreignKey , freezeTable , as })
-belongsTo({ name , model , localKey , foreignKey , freezeTable , as })
-belongsToMany({ name , model , localKey , foreignKey , freezeTable , as , pivot })
+ */
+hasOne({ name, model, localKey, foreignKey, freezeTable , as })
+hasMany({ name, model, localKey, foreignKey, freezeTable , as })
+belongsTo({ name, model, localKey, foreignKey, freezeTable , as })
+belongsToMany({ name, model, localKey, foreignKey, freezeTable, as, pivot })
 /** 
  * @relation using registry in your models
-*/
+ */
 relations(name1 , name2,...nameN)
+/** 
+ * @relation using registry in your models ignore soft delete
+ */
+relationsAll(name1 , name2,...nameN) 
 /** 
  * @relation using registry in your models. if exists child data remove this data
-*/
+ */
 relationsExists(name1 , name2,...nameN) 
 /** 
  * @relation call a name of relation in registry, callback query of data
-*/
+ */
 relationQuery(name, (callback) )
+/** 
+ * @relation using registry in your models return only in trash (soft delete)
+ */
+relationsTrashed(name1 , name2,...nameN) 
+
 
 /**
  * queries statements

package/dist/cli/generate/model.js

@@ -9,8 +9,8 @@ class ${model} extends Model {
      * 
      * Assign setting global in your model
      * @useMethod
-     *
-     * this.useDebug() // => runing a uuid (universally unique identifier) when insert new data
+     * this.useUUID() // => runing a uuid (universally unique identifier) when insert new data
+     * this.useDebug() // debug raw query
      * this.usePrimaryKey('id')
      * this.useTimestamp({ createdAt : 'created_at' , updatedAt : 'updated_at' }) // runing a timestamp when insert or update
      * this.useSoftDelete()

package/dist/lib/constants/index.js

@@ -11,6 +11,7 @@ const CONSTANTS = Object.freeze({
     BETWEEN: 'BETWEEN',
     NOT_BETWEEN: 'NOT BETWEEN',
     AND: 'AND',
+    NULL: 'NULL',
     IS_NULL: 'IS NULL',
     IS_NOT_NULL: 'IS NOT NULL',
     OR: 'OR',

package/dist/lib/tspace/{AbstractBuilder.d.ts → Abstract/AbstractBuilder.d.ts}

@@ -1,5 +1,5 @@
-import { Pagination } from './Interface';
-import { StateHandler } from './StateHandler';
+import { Pagination } from '../Interface';
+import { StateHandler } from '../StateHandler';
 declare abstract class AbstractBuilder {
     protected $setters: string[];
     protected $utils: {

package/dist/lib/tspace/{AbstractBuilder.js → Abstract/AbstractBuilder.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractBuilder = void 0;
-const StateHandler_1 = require("./StateHandler");
+const StateHandler_1 = require("../StateHandler");
 class AbstractBuilder {
     constructor() {
         this.$setters = [

package/dist/lib/tspace/{AbstractDB.d.ts → Abstract/AbstractDB.d.ts}

@@ -1,5 +1,5 @@
-import Builder from './Builder';
-import { Connection, ConnectionOptions } from './Interface';
+import Builder from '../Builder';
+import { Connection, ConnectionOptions } from '../Interface';
 declare abstract class AbstractDB extends Builder {
     abstract table(tableName: string): void;
     abstract beginTransaction(): Promise<any>;

package/dist/lib/tspace/{AbstractDB.js → Abstract/AbstractDB.js}

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractDB = void 0;
-const Builder_1 = __importDefault(require("./Builder"));
+const Builder_1 = __importDefault(require("../Builder"));
 class AbstractDB extends Builder_1.default {
 }
 exports.AbstractDB = AbstractDB;

package/dist/lib/tspace/{AbstractModel.d.ts → Abstract/AbstractModel.d.ts}

@@ -1,5 +1,5 @@
-import { Relation, RelationQuery } from './Interface';
-import Builder from './Builder';
+import { Relation, RelationQuery } from '../Interface';
+import Builder from '../Builder';
 declare abstract class AbstractModel extends Builder {
     protected abstract useUUID(): this;
     protected abstract usePrimaryKey(primaryKey: string): this;
@@ -34,12 +34,14 @@ declare abstract class AbstractModel extends Builder {
     abstract with(...nameRelations: string[]): this;
     abstract withQuery(nameRelations: string, callback: Function): this;
     abstract withExists(...nameRelations: string[]): this;
-    abstract withAndTrashed(...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 relationsAndTrashed(...nameRelations: string[]): this;
+    abstract relationsAll(...nameRelations: string[]): this;
+    abstract relationsTrashed(...nameRelations: string[]): this;
 }
 export { AbstractModel };
 export default AbstractModel;

package/dist/lib/tspace/{AbstractModel.js → Abstract/AbstractModel.js}

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractModel = void 0;
-const Builder_1 = __importDefault(require("./Builder"));
+const Builder_1 = __importDefault(require("../Builder"));
 class AbstractModel extends Builder_1.default {
 }
 exports.AbstractModel = AbstractModel;

package/dist/lib/tspace/Blueprint.d.ts

@@ -1,3 +1,17 @@
+/**
+ * make schema for table with Blueprint
+ * @example
+ *   import { Schema , Blueprint }  from 'tspace-mysql'
+ *   await new Schema().table('persos1',{
+ *      id :  new Blueprint().int().notNull().primary().autoIncrement(),
+ *      name : new Blueprint().varchar(255).default('my name ...'),
+ *      email : new Blueprint().varchar(255).unique(),
+ *      verify : new Blueprint().tinyInt(1).notNull(),
+ *      created_at  : new Blueprint().timestamp().null(),
+ *      updated_at  : new Blueprint().timestamp().null(),
+ *      deleted_at  : new Blueprint().timestamp().null()
+ *   })
+ */
 declare class Blueprint {
     protected type: string;
     protected attrbuites: Array<string>;
@@ -115,10 +129,10 @@ declare class Blueprint {
     primary(): this;
     /**
      * Assign attrbuites 'default' in table
-     * @param {string | number} n  default value
+     * @param {string | number} value  default value
      * @return {this} this
      */
-    default(n: string | number): this;
+    default(value: string | number): this;
     /**
      * Assign attrbuites 'default currentTimestamp' in table
      * @return {this} this

package/dist/lib/tspace/Blueprint.js

@@ -1,6 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Blueprint = void 0;
+/**
+ * make schema for table with Blueprint
+ * @example
+ *   import { Schema , Blueprint }  from 'tspace-mysql'
+ *   await new Schema().table('persos1',{
+ *      id :  new Blueprint().int().notNull().primary().autoIncrement(),
+ *      name : new Blueprint().varchar(255).default('my name ...'),
+ *      email : new Blueprint().varchar(255).unique(),
+ *      verify : new Blueprint().tinyInt(1).notNull(),
+ *      created_at  : new Blueprint().timestamp().null(),
+ *      updated_at  : new Blueprint().timestamp().null(),
+ *      deleted_at  : new Blueprint().timestamp().null()
+ *   })
+ */
 class Blueprint {
     constructor() {
         this.type = '';
@@ -190,11 +204,11 @@ class Blueprint {
     }
     /**
      * Assign attrbuites 'default' in table
-     * @param {string | number} n  default value
+     * @param {string | number} value  default value
      * @return {this} this
      */
-    default(n) {
-        this._addAssignAttrbuite(`DEFAULT '${n}'`);
+    default(value) {
+        this._addAssignAttrbuite(`DEFAULT '${value}'`);
         return this;
     }
     /**

package/dist/lib/tspace/Builder.d.ts

@@ -1,4 +1,4 @@
-import { AbstractBuilder } from './AbstractBuilder';
+import { AbstractBuilder } from './Abstract/AbstractBuilder';
 import { Pagination, Backup, ConnectionOptions, BackupToFile, Connection, ConnectionTransaction } from './Interface';
 declare class Builder extends AbstractBuilder {
     constructor();
@@ -189,6 +189,13 @@ declare class Builder extends AbstractBuilder {
      * @return {this}
      */
     whereNotBetween(column: string, array: Array<any>): this;
+    /**
+     * where not between using [value1, value2]
+     * @param {string} column
+     * @param {array} array
+     * @return {this}
+     */
+    orWhereNotBetween(column: string, array: Array<any>): this;
     /**
      * where null using NULL
      * @param {string} column

package/dist/lib/tspace/Builder.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Builder = void 0;
 const fs_1 = __importDefault(require("fs"));
 const sql_formatter_1 = require("sql-formatter");
-const AbstractBuilder_1 = require("./AbstractBuilder");
+const AbstractBuilder_1 = require("./Abstract/AbstractBuilder");
 const utils_1 = require("../utils");
 const constants_1 = require("../constants");
 const DB_1 = require("./DB");
@@ -52,7 +52,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {this} this
      */
     except(...columns) {
-        this.$state.set('EXCEPT', columns.length ? columns : ['id']);
+        this.$state.set('EXCEPT', columns.length ? columns : []);
         return this;
     }
     /**
@@ -300,9 +300,9 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     whereIn(column, array) {
         if (!Array.isArray(array))
             throw new Error(`[${array}] is't array`);
-        if (!array.length)
-            return this;
-        const values = `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`;
+        const values = array.length
+            ? `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`
+            : this.$constants('NULL');
         this.$state.set('WHERE', [
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('AND')}`
@@ -322,9 +322,9 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     orWhereIn(column, array) {
         if (!Array.isArray(array))
             throw new Error(`[${array}] is't array`);
-        if (!array.length)
-            return this;
-        const values = `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`;
+        const values = array.length
+            ? `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`
+            : this.$constants('NULL');
         this.$state.set('WHERE', [
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('OR')}`
@@ -345,9 +345,9 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         const sql = this.$state.get('WHERE');
         if (!Array.isArray(array))
             throw new Error(`[${array}] is't array`);
-        if (!array.length)
-            return this;
-        const values = `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`;
+        const values = array.length
+            ? `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`
+            : this.$constants('NULL');
         this.$state.set('WHERE', [
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('AND')}`
@@ -367,9 +367,9 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     orWhereNotIn(column, array) {
         if (!Array.isArray(array))
             throw new Error(`[${array}] is't array`);
-        if (!array.length)
-            return this;
-        const values = `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`;
+        const values = array.length
+            ? `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`
+            : this.$constants('NULL');
         this.$state.set('WHERE', [
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('OR')}`
@@ -387,6 +387,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {this}
      */
     whereSubQuery(column, subQuery) {
+        if (!this.$utils.isQuery(subQuery))
+            throw new Error(`This "${subQuery}" is invalid sub query`);
         this.$state.set('WHERE', [
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('AND')}`
@@ -404,6 +406,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {this}
      */
     whereNotSubQuery(column, subQuery) {
+        if (!this.$utils.isQuery(subQuery))
+            throw new Error(`This "${subQuery}" is invalid sub query`);
         this.$state.set('WHERE', [
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('AND')}`
@@ -421,6 +425,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {this}
      */
     orWhereSubQuery(column, subQuery) {
+        if (!this.$utils.isQuery(subQuery))
+            throw new Error(`This "${subQuery}" is invalid sub query`);
         this.$state.set('WHERE', [
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('OR')}`
@@ -438,6 +444,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {this}
      */
     orWhereNotSubQuery(column, subQuery) {
+        if (!this.$utils.isQuery(subQuery))
+            throw new Error(`This "${subQuery}" is invalid sub query`);
         this.$state.set('WHERE', [
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('OR')}`
@@ -457,8 +465,16 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     whereBetween(column, array) {
         if (!Array.isArray(array))
             throw new Error("Value is't array");
-        if (!array.length)
+        if (!array.length) {
+            this.$state.set('WHERE', [
+                this._queryWhereIsExists()
+                    ? `${this.$state.get('WHERE')} ${this.$constants('AND')}`
+                    : `${this.$constants('WHERE')}`,
+                `${this._bindTableAndColumnInQueryWhere(column)} ${this.$constants('BETWEEN')}`,
+                `${this.$constants('NULL')} ${this.$constants('AND')} ${this.$constants('NULL')}`
+            ].join(' '));
             return this;
+        }
         const [value1, value2] = array;
         this.$state.set('WHERE', [
             this._queryWhereIsExists()
@@ -478,8 +494,16 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     orWhereBetween(column, array) {
         if (!Array.isArray(array))
             throw new Error("Value is't array");
-        if (!array.length)
+        if (!array.length) {
+            this.$state.set('WHERE', [
+                this._queryWhereIsExists()
+                    ? `${this.$state.get('WHERE')} ${this.$constants('OR')}`
+                    : `${this.$constants('WHERE')}`,
+                `${this._bindTableAndColumnInQueryWhere(column)} ${this.$constants('BETWEEN')}`,
+                `${this.$constants('NULL')} ${this.$constants('AND')} ${this.$constants('NULL')}`
+            ].join(' '));
             return this;
+        }
         const [value1, value2] = array;
         this.$state.set('WHERE', [
             this._queryWhereIsExists()
@@ -499,8 +523,16 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     whereNotBetween(column, array) {
         if (!Array.isArray(array))
             throw new Error("Value is't array");
-        if (!array.length)
+        if (!array.length) {
+            this.$state.set('WHERE', [
+                this._queryWhereIsExists()
+                    ? `${this.$state.get('WHERE')} ${this.$constants('AND')}`
+                    : `${this.$constants('WHERE')}`,
+                `${this._bindTableAndColumnInQueryWhere(column)} ${this.$constants('NOT_BETWEEN')}`,
+                `${this.$constants('NULL')} ${this.$constants('AND')} ${this.$constants('NULL')}`
+            ].join(' '));
             return this;
+        }
         const [value1, value2] = array;
         this.$state.set('WHERE', [
             this._queryWhereIsExists()
@@ -511,6 +543,35 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         ].join(' '));
         return this;
     }
+    /**
+     * where not between using [value1, value2]
+     * @param {string} column
+     * @param {array} array
+     * @return {this}
+     */
+    orWhereNotBetween(column, array) {
+        if (!Array.isArray(array))
+            throw new Error("Value is't array");
+        if (!array.length) {
+            this.$state.set('WHERE', [
+                this._queryWhereIsExists()
+                    ? `${this.$state.get('WHERE')} ${this.$constants('OR')}`
+                    : `${this.$constants('WHERE')}`,
+                `${this._bindTableAndColumnInQueryWhere(column)} ${this.$constants('NOT_BETWEEN')}`,
+                `${this.$constants('NULL')} ${this.$constants('AND')} ${this.$constants('NULL')}`
+            ].join(' '));
+            return this;
+        }
+        const [value1, value2] = array;
+        this.$state.set('WHERE', [
+            this._queryWhereIsExists()
+                ? `${this.$state.get('WHERE')} ${this.$constants('OR')}`
+                : `${this.$constants('WHERE')}`,
+            `${this._bindTableAndColumnInQueryWhere(column)} ${this.$constants('NOT_BETWEEN')}`,
+            `${this._checkValueHasRaw(this.$utils.escape(value1))} ${this.$constants('AND')} ${this._checkValueHasRaw(this.$utils.escape(value2))}`
+        ].join(' '));
+        return this;
+    }
     /**
      * where null using NULL
      * @param {string} column
@@ -1343,7 +1404,10 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             ].join(' ');
             const rawColumns = yield this.queryStatement(sql);
             const columns = rawColumns.map((column) => column.Field);
-            const removeExcept = columns.filter((column) => !String(this.$state.get('EXCEPT')).includes(column));
+            const removeExcept = columns.filter((column) => {
+                const excepts = this.$state.get('EXCEPT');
+                return excepts.every((except) => except !== column);
+            });
             return removeExcept;
         });
     }
@@ -2162,6 +2226,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 tabWidth: 2,
                 linesBetweenQueries: 1,
             }));
+            // fs.writeFileSync(filePath, [...sql,'COMMIT;'].join('\n')) 
+            console.log(sql);
             return;
         });
     }

package/dist/lib/tspace/DB.d.ts

@@ -1,4 +1,4 @@
-import { AbstractDB } from './AbstractDB';
+import { AbstractDB } from './Abstract/AbstractDB';
 import { Connection, ConnectionOptions, ConnectionTransaction } from './Interface';
 /**
  * Assign table name

package/dist/lib/tspace/DB.js

@@ -24,7 +24,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DB = void 0;
-const AbstractDB_1 = require("./AbstractDB");
+const AbstractDB_1 = require("./Abstract/AbstractDB");
 const ProxyHandler_1 = require("./ProxyHandler");
 const connection_1 = require("../connection");
 const StateHandler_1 = __importDefault(require("./StateHandler"));

package/dist/lib/tspace/Interface.d.ts

@@ -9,6 +9,7 @@ export interface Relation {
     query?: any | undefined;
     relation?: Object | undefined;
     exists?: boolean | undefined;
+    all?: boolean | undefined;
     trashed?: boolean | undefined;
     oldVersion?: boolean | undefined;
 }

package/dist/lib/tspace/Model.d.ts

@@ -1,4 +1,4 @@
-import { AbstractModel } from './AbstractModel';
+import { AbstractModel } from './Abstract/AbstractModel';
 import { Relation, Pagination, RelationQuery } from './Interface';
 declare class Model extends AbstractModel {
     constructor();
@@ -211,7 +211,7 @@ declare class Model extends AbstractModel {
      * @example
      * class User extends Model {
      *   constructor() {
-     *     this.useSchema({
+     *     this.useValidationSchema({
      *        id       : Number,
      *        email    : String,
      *        name     : String,
@@ -221,7 +221,7 @@ declare class Model extends AbstractModel {
      * }
      * @return {this} this
      */
-    protected useSchema(schema: Record<string, NumberConstructor | StringConstructor | DateConstructor>): this;
+    protected useValidationSchema(schema: Record<string, NumberConstructor | StringConstructor | DateConstructor>): this;
     /**
      * Assign hook function when execute returned results to callback function
      * @param {Array<Function>} arrayFunctions functions for callback result
@@ -342,11 +342,18 @@ declare class Model extends AbstractModel {
     with(...nameRelations: Array<string>): this;
     /**
      *
-     * Use relations in registry of model return normal and in trash
+     * Use relations in registry of model return ignore soft delete
      * @param {...string} nameRelations if data exists return blank
      * @return {this} this
      */
-    withAndTrashed(...nameRelations: Array<string>): this;
+    withAll(...nameRelations: Array<string>): this;
+    /**
+     *
+     * Use relations in registry of model return only in trash (soft delete)
+     * @param {...string} nameRelations if data exists return blank
+     * @return {this} this
+     */
+    withTrashed(...nameRelations: Array<string>): this;
     /**
      *
      * Use relations in registry of model return only exists result of relation query
@@ -547,7 +554,14 @@ declare class Model extends AbstractModel {
      * @param {...string} nameRelations if data exists return blank
      * @return {this} this
      */
-    relationsAndTrashed(...nameRelations: Array<string>): this;
+    relationsAll(...nameRelations: Array<string>): this;
+    /**
+     *
+     * Use relations in registry of model return only in trash (soft delete)
+     * @param {...string} nameRelations if data exists return blank
+     * @return {this} this
+     */
+    relationsTrashed(...nameRelations: Array<string>): this;
     /**
      * Assign the relation in model Objects
      * @param    {object} relations registry relation in your model
@@ -654,6 +668,12 @@ declare class Model extends AbstractModel {
      * @return   {this} this
      */
     protected belongsToManyBuilder({ name, as, model, localKey, foreignKey, freezeTable, pivot }: RelationQuery, callback?: Function): this;
+    /**
+     * where not null using NULL
+     * @override
+     * @return {this}
+     */
+    whereTrashed(): this;
     /**
      * return only in trashed (data has been remove)
      * @return {promise}

package/dist/lib/tspace/Model.js

@@ -16,7 +16,7 @@ exports.Model = void 0;
 const pluralize_1 = __importDefault(require("pluralize"));
 const DB_1 = require("./DB");
 const Schema_1 = require("./Schema");
-const AbstractModel_1 = require("./AbstractModel");
+const AbstractModel_1 = require("./Abstract/AbstractModel");
 const ProxyHandler_1 = require("./ProxyHandler");
 const StateHandler_1 = require("./StateHandler");
 class Model extends AbstractModel_1.AbstractModel {
@@ -194,7 +194,7 @@ class Model extends AbstractModel_1.AbstractModel {
             this.$constants('PATTERN').snake_case,
             this.$constants('PATTERN').camelCase
         ];
-        this._assertError(!allowPattern.includes(pattern), `tspace-mysql support only pattern [${allowPattern}]`);
+        this._assertError(!allowPattern.includes(pattern), `tspace-mysql support only pattern ["${this.$constants('PATTERN').snake_case}","${this.$constants('PATTERN').camelCase}"]`);
         this.$state.set('PATTERN', pattern);
         return this;
     }
@@ -301,7 +301,7 @@ class Model extends AbstractModel_1.AbstractModel {
      * @example
      * class User extends Model {
      *   constructor() {
-     *     this.useSchema({
+     *     this.useValidationSchema({
      *        id       : Number,
      *        email    : String,
      *        name     : String,
@@ -311,7 +311,7 @@ class Model extends AbstractModel_1.AbstractModel {
      * }
      * @return {this} this
      */
-    useSchema(schema) {
+    useValidationSchema(schema) {
         this.$state.set('SCHEMA', schema);
         return this;
     }
@@ -342,7 +342,10 @@ class Model extends AbstractModel_1.AbstractModel {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.$state.get('SCHEMA')) {
                 const columns = Object.keys(this.$state.get('SCHEMA'));
-                const removeExcept = columns.filter((column) => !String(this.$state.get('EXCEPT')).includes(column));
+                const removeExcept = columns.filter((column) => {
+                    const excepts = this.$state.get('EXCEPT');
+                    return excepts.every((except) => except !== column);
+                });
                 return removeExcept;
             }
             const rawColumns = yield this.queryStatement([
@@ -352,7 +355,10 @@ class Model extends AbstractModel_1.AbstractModel {
                 `${this.$state.get('TABLE_NAME')}`
             ].join(' '));
             const columns = rawColumns.map((column) => column.Field);
-            const removeExcept = columns.filter((column) => !String(this.$state.get('EXCEPT')).includes(column));
+            const removeExcept = columns.filter((column) => {
+                const excepts = this.$state.get('EXCEPT');
+                return excepts.every((except) => except !== column);
+            });
             return removeExcept;
         });
     }
@@ -543,11 +549,32 @@ class Model extends AbstractModel_1.AbstractModel {
     }
     /**
      *
-     * Use relations in registry of model return normal and in trash
+     * Use relations in registry of model return ignore soft delete
      * @param {...string} nameRelations if data exists return blank
      * @return {this} this
      */
-    withAndTrashed(...nameRelations) {
+    withAll(...nameRelations) {
+        const relations = this._handleRelations(nameRelations);
+        relations.forEach(relation => relation.all = true);
+        const setRelations = this.$state.get('RELATIONS').length
+            ? [...relations.map((w) => {
+                    const exists = this.$state.get('RELATIONS').find((r) => r.name === w.name);
+                    if (exists)
+                        return null;
+                    return w;
+                }).filter((d) => d != null),
+                ...this.$state.get('RELATIONS')]
+            : relations;
+        this.$state.set('RELATIONS', setRelations);
+        return this;
+    }
+    /**
+     *
+     * Use relations in registry of model return only in trash (soft delete)
+     * @param {...string} nameRelations if data exists return blank
+     * @return {this} this
+     */
+    withTrashed(...nameRelations) {
         const relations = this._handleRelations(nameRelations);
         relations.forEach(relation => relation.trashed = true);
         const setRelations = this.$state.get('RELATIONS').length
@@ -793,8 +820,17 @@ class Model extends AbstractModel_1.AbstractModel {
      * @param {...string} nameRelations if data exists return blank
      * @return {this} this
      */
-    relationsAndTrashed(...nameRelations) {
-        return this.withAndTrashed(...nameRelations);
+    relationsAll(...nameRelations) {
+        return this.withAll(...nameRelations);
+    }
+    /**
+     *
+     * Use relations in registry of model return only in trash (soft delete)
+     * @param {...string} nameRelations if data exists return blank
+     * @return {this} this
+     */
+    relationsTrashed(...nameRelations) {
+        return this.withTrashed(...nameRelations);
     }
     /**
      * Assign the relation in model Objects
@@ -1041,6 +1077,16 @@ class Model extends AbstractModel_1.AbstractModel {
         r.query = callback(new r.model());
         return this;
     }
+    /**
+     * where not null using NULL
+     * @override
+     * @return {this}
+     */
+    whereTrashed() {
+        this.disableSoftDelete();
+        this.whereNotNull(this._valuePattern(this.$state.get('SOFT_DELETE_FORMAT')));
+        return this;
+    }
     /**
      * return only in trashed (data has been remove)
      * @return {promise}
@@ -2146,7 +2192,8 @@ class Model extends AbstractModel_1.AbstractModel {
                 .bind(this.$pool.get())
                 .whereIn(foreignKey, dataPerentId)
                 .debug(this.$state.get('DEBUG'))
-                .when(relation.trashed, (query) => query.disableSoftDelete())
+                .when(relation.trashed, (query) => query.whereTrashed())
+                .when(relation.all, (query) => query.disableSoftDelete())
                 .get();
             return dataFromRelation;
         });
@@ -2179,7 +2226,8 @@ class Model extends AbstractModel_1.AbstractModel {
             const sqldataChilds = queryChildModel
                 .whereIn(localKeyPivotTable, dataPerentId)
                 .when(relation.exists, (query) => query.whereExists(sql))
-                .when(relation.trashed, (query) => query.disableSoftDelete())
+                .when(relation.trashed, (query) => query.whereTrashed())
+                .when(relation.all, (query) => query.disableSoftDelete())
                 .toString();
             const dataChilds = yield this.queryStatement(sqldataChilds);
             const otherId = dataChilds.map((sub) => sub[otherforeignKey]).filter((data) => data != null);

package/dist/lib/tspace/Schema.d.ts

@@ -1,13 +1,7 @@
 import { Builder } from "./Builder";
 declare class Schema extends Builder {
-    table: (table: string, schemas: Record<string, {
-        type: string;
-        attrbuites: string[];
-    }>) => Promise<void>;
-    createTable: (table: string, schemas: Record<string, {
-        type: string;
-        attrbuites: string[];
-    }>) => Promise<any>;
+    table: (table: string, schemas: Record<string, any>) => Promise<void>;
+    createTable: (table: string, schemas: Record<string, any>) => Promise<any>;
 }
 export { Schema };
 export default Schema;

package/dist/lib/utils/index.d.ts

@@ -5,6 +5,7 @@ declare const utils: {
     timestamp: () => string;
     date: () => string;
     escape: (str: any) => any;
+    isQuery: (str: string) => boolean;
     generateUUID: () => string;
     covertBooleanToNumber: (data: any) => any;
     snakeCase: (data: any) => any;

package/dist/lib/utils/index.js

@@ -34,6 +34,7 @@ const escape = (str) => {
         return str;
     return str.replace(/[\0\b\t\n\r\x1a\'\\]/g, '');
 };
+const isQuery = (str) => /\b(?:SELECT|FROM|WHERE|JOIN|INNER JOIN|LEFT JOIN|RIGHT JOIN|OUTER JOIN|AND|OR|ORDER BY|GROUP BY|LIMIT)\b/i.test(str);
 const columnRelation = (name) => {
     var _a;
     const matches = (_a = name === null || name === void 0 ? void 0 : name.match(/[A-Z]/g)) !== null && _a !== void 0 ? _a : [];
@@ -145,6 +146,7 @@ const utils = {
     timestamp,
     date,
     escape,
+    isQuery,
     generateUUID,
     covertBooleanToNumber,
     snakeCase,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tspace-mysql",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "description": "mysql query builder object relational mapping",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",