tspace-mysql 1.9.0 → 1.9.1

package/dist/lib/core/StateManager.d.ts

@@ -1,5 +1,5 @@
 import { Blueprint } from "./Blueprint";
-import type { TPattern, TSave, TValidateSchema } from "../types";
+import type { TPattern, TRelationOptions, TSave, TStateWhereCondition, TValidateSchema } from "../types";
 declare const STATE_DEFAULT: {
     readonly PRIMARY_KEY: string;
     readonly VOID: boolean;
@@ -17,7 +17,7 @@ declare const STATE_DEFAULT: {
     readonly EXCEPTS: string[];
     readonly FROM: string[];
     readonly JOIN: string[];
-    readonly WHERE: string[];
+    readonly WHERE: TStateWhereCondition[];
     readonly GROUP_BY: string[];
     readonly ORDER_BY: string[];
     readonly LIMIT: number | null;
@@ -27,14 +27,18 @@ declare const STATE_DEFAULT: {
     readonly HIDDEN: string[];
     readonly DEBUG: boolean;
     readonly CTE: string[];
-    readonly PAGE: number;
+    readonly PAGE: number | null;
     readonly AFTER_SAVE: number;
     readonly HOOKS: Function[];
     readonly ALIAS: string | null;
     readonly RAW_ALIAS: string | null;
     readonly UNION: string[];
     readonly UNION_ALL: string[];
-    readonly ROW_LEVEL_LOCK: "FOR_UPDATE" | "FOR_SHARE" | null;
+    readonly ROW_LEVEL_LOCK: {
+        readonly mode: "FOR_UPDATE" | "FOR_SHARE" | null;
+        readonly skipLocked: boolean | null;
+        readonly nowait: boolean | null;
+    };
 };
 declare const STATE_DB: {
     readonly PRIMARY_KEY: string;
@@ -53,7 +57,7 @@ declare const STATE_DB: {
     readonly EXCEPTS: string[];
     readonly FROM: string[];
     readonly JOIN: string[];
-    readonly WHERE: string[];
+    readonly WHERE: TStateWhereCondition[];
     readonly GROUP_BY: string[];
     readonly ORDER_BY: string[];
     readonly LIMIT: number | null;
@@ -63,14 +67,18 @@ declare const STATE_DB: {
     readonly HIDDEN: string[];
     readonly DEBUG: boolean;
     readonly CTE: string[];
-    readonly PAGE: number;
+    readonly PAGE: number | null;
     readonly AFTER_SAVE: number;
     readonly HOOKS: Function[];
     readonly ALIAS: string | null;
     readonly RAW_ALIAS: string | null;
     readonly UNION: string[];
     readonly UNION_ALL: string[];
-    readonly ROW_LEVEL_LOCK: "FOR_UPDATE" | "FOR_SHARE" | null;
+    readonly ROW_LEVEL_LOCK: {
+        readonly mode: "FOR_UPDATE" | "FOR_SHARE" | null;
+        readonly skipLocked: boolean | null;
+        readonly nowait: boolean | null;
+    };
 };
 declare const STATE_MODEL: {
     readonly AUDIT: number | null;
@@ -83,8 +91,8 @@ declare const STATE_MODEL: {
     readonly SOFT_DELETE_RELATIONS: boolean;
     readonly REGISTRY: Record<string, string>;
     readonly PATTERN: TPattern;
-    readonly RELATION: any[];
-    readonly RELATIONS: any[];
+    readonly APPLY_RELATIONS: TRelationOptions[];
+    readonly RELATIONS: TRelationOptions[];
     readonly RELATIONS_TRASHED: boolean;
     readonly RELATIONS_EXISTS: boolean;
     readonly TIMESTAMP: boolean;
@@ -101,6 +109,7 @@ declare const STATE_MODEL: {
     } | null;
     readonly TABLE_LOGGER: string;
     readonly TABLE_AUDIT: string;
+    readonly TABLE_JOB: string;
     readonly VALIDATE_SCHEMA: boolean;
     readonly VALIDATE_SCHEMA_DEFINED: TValidateSchema | null;
     readonly FUNCTION_RELATION: boolean;
@@ -145,7 +154,7 @@ declare const STATE_MODEL: {
     readonly EXCEPTS: string[];
     readonly FROM: string[];
     readonly JOIN: string[];
-    readonly WHERE: string[];
+    readonly WHERE: TStateWhereCondition[];
     readonly GROUP_BY: string[];
     readonly ORDER_BY: string[];
     readonly LIMIT: number | null;
@@ -155,14 +164,18 @@ declare const STATE_MODEL: {
     readonly HIDDEN: string[];
     readonly DEBUG: boolean;
     readonly CTE: string[];
-    readonly PAGE: number;
+    readonly PAGE: number | null;
     readonly AFTER_SAVE: number;
     readonly HOOKS: Function[];
     readonly ALIAS: string | null;
     readonly RAW_ALIAS: string | null;
     readonly UNION: string[];
     readonly UNION_ALL: string[];
-    readonly ROW_LEVEL_LOCK: "FOR_UPDATE" | "FOR_SHARE" | null;
+    readonly ROW_LEVEL_LOCK: {
+        readonly mode: "FOR_UPDATE" | "FOR_SHARE" | null;
+        readonly skipLocked: boolean | null;
+        readonly nowait: boolean | null;
+    };
 };
 type State = typeof STATE_MODEL & typeof STATE_DB & typeof STATE_DEFAULT;
 declare class StateManager {

package/dist/lib/core/StateManager.js

@@ -25,14 +25,18 @@ const STATE_DEFAULT = {
     HIDDEN: [],
     DEBUG: false,
     CTE: [],
-    PAGE: 1,
+    PAGE: null,
     AFTER_SAVE: 100,
     HOOKS: [],
     ALIAS: null,
     RAW_ALIAS: null,
     UNION: [],
     UNION_ALL: [],
-    ROW_LEVEL_LOCK: null
+    ROW_LEVEL_LOCK: {
+        mode: null,
+        skipLocked: false,
+        nowait: false
+    }
 };
 const STATE_DB = {
     ...STATE_DEFAULT,
@@ -49,7 +53,7 @@ const STATE_MODEL = {
     SOFT_DELETE_RELATIONS: false,
     REGISTRY: {},
     PATTERN: 'default',
-    RELATION: [],
+    APPLY_RELATIONS: [],
     RELATIONS: [],
     RELATIONS_TRASHED: false,
     RELATIONS_EXISTS: false,
@@ -60,8 +64,9 @@ const STATE_MODEL = {
     },
     LOGGER: false,
     LOGGER_OPTIONS: null,
-    TABLE_LOGGER: '$loggers',
-    TABLE_AUDIT: '$audits',
+    TABLE_LOGGER: 'tspace_loggers',
+    TABLE_AUDIT: 'tspace_audits',
+    TABLE_JOB: 'tspace_jobs',
     VALIDATE_SCHEMA: false,
     VALIDATE_SCHEMA_DEFINED: null,
     FUNCTION_RELATION: false,

package/dist/lib/core/StateManager.js.map

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

package/dist/lib/core/UtilityTypes.d.ts

@@ -1,38 +1,10 @@
 import { Blueprint } from "./Blueprint";
 import { Model } from "./Model";
 import { Repository } from "./Repository";
-import type { TDeepExpand, TResultFilterResolved, TResultResolved, TSelectionMerger, TFreezeStringQuery, TIsEnum, TOperatorQuery, TPagination, TRawStringQuery, TRelationKeys, TRelationResults } from "../types";
+import type { TDeepExpand, TResultResolved, TFreezeStringQuery, TIsEnum, TOperatorQuery, TPagination, TRawStringQuery, TRelationKeys, TRelationResults, TSelectionMerger, TDeepOmit, TConflictKeys } from "../types";
 import type { TColumnsDecorator, TRelationsDecorator } from "../types/decorator";
-import type { TRepositoryCreate, TRepositoryCreateMultiple, TRepositoryCreateOrThings, TRepositoryDelete, TRepositoryExcept, TRepositoryGroupBy, TRepositoryOrderBy, TRepositoryRelation, TRepositoryRequest, TRepositorySelect, TRepositoryUpdate, TRepositoryUpdateMultiple, TRepositoryWhere } from "../types/repository";
-/**
- * The 'TSchemaStrict' type is used to specify the type of the schema.
- *
- * @param {type} T typeof the schema
- * @param {type} S override type in the schema
- * @example
- * import { Blueprint, TSchema, Model, Schema } from 'tspace-mysql';
- * const schemaUser = {
- *    id :new Blueprint().int().notNull().primary().autoIncrement(),
- *    uuid :new Blueprint().varchar(50).null(),
- *    email :new Blueprint().varchar(50).null(),
- *    name :new Blueprint().varchar(255).null(),
- *    username : new Blueprint().varchar(255).null(),
- *    password : new Blueprint().varchar(255).null(),
- *    createdAt :new Blueprint().timestamp().null(),
- *    updatedAt :new Blueprint().timestamp().null()
- *   }
- *
- *   type TSchemaUser = TSchemaStrict<typeof schemaUser , {
- *      id : number,
- *      uuid : string,
- *      ........
- *   }>
- *
- *   class User<TSchemaUser> {}
- */
-export type TSchemaStrict<T, S = {}> = {
-    [K in keyof T]: K extends keyof S ? S[K] : T[K] extends Blueprint<infer U> ? U : any;
-};
+import type { TRepositoryCreate, TRepositoryCreateMultiple, TRepositoryCreateOrThings, TRepositoryDelete, TRepositoryExcept, TRepositoryExtendType, TRepositoryGroupBy, TRepositoryOrderBy, TRepositoryPrimitiveExtendType, TRepositoryRelation, TRepositoryRequest, TRepositorySelect, TRepositoryUpdate, TRepositoryUpdateMultiple, TRepositoryWhere } from "../types/repository";
+import { z } from "zod";
 /**
  * The 'TSchema' type is used to specify the type of the schema.
  *
@@ -63,8 +35,6 @@ export type TSchemaStrict<T, S = {}> = {
  */
 export type TSchema<T, S = {}> = {
     [K in keyof T]: K extends keyof S ? S[K] : T[K] extends Blueprint<infer U> ? U : any;
-} & {
-    [key: string]: any;
 };
 /**
  * The 'TRelation' type is used to specify the type of the relation.
@@ -156,37 +126,95 @@ export type TSchemaKeyOf<M extends Model, T = TSchemaModel<M>> = keyof {
     [K in keyof T as string extends K ? never : K]: T[K];
 };
 export declare namespace T {
-    type Schema<T, S = {}> = TSchema<T, S>;
-    type SchemaStrict<T, S = {}> = TSchemaStrict<T, S>;
+    type Schema<T, S = {}> = T extends Model ? TSchemaModel<T> : TSchema<T, S>;
     type Relation<R> = TRelation<R>;
     type SchemaModel<M extends Model> = keyof TColumnsDecorator<M> extends never ? TDeepExpand<TSchemaModel<M>> : TDeepExpand<TColumnsDecorator<M>>;
     type RelationModel<M extends Model> = keyof TColumnsDecorator<M> extends never ? TDeepExpand<TRelationModel<M>> : TDeepExpand<TRelationsDecorator<M>>;
     type Repository<M extends Model> = ReturnType<typeof Repository<M>>;
-    type Result<M extends Model, K = {}> = TDeepExpand<TResultResolved<M, K>>;
-    type ResultFiltered<M extends Model, K = {}, S = undefined, // selected by columns
+    type ResultFiltered<M extends Model, S = undefined, // selected by columns
     SR = undefined, // selected by relations
-    E = undefined> = ([
+    E = undefined, // excepted by omit columns
+    SRS = undefined, // selected by raw select
+    G = {}> = ([
         S,
         SR
-    ] extends [undefined, undefined] ? T.Columns<M> : TResultFilterResolved<T.Result<M, K>, TSelectionMerger<S extends undefined ? {
+    ] extends [undefined, undefined] ? SRS extends undefined ? E extends undefined ? T.Columns<M> & TRepositoryPrimitiveExtendType<G> : T.Result<M> & TRepositoryPrimitiveExtendType<G> : E extends undefined ? T.Columns<M> & {
+        [K in keyof SRS]: any;
+    } & TRepositoryPrimitiveExtendType<G> : T.Result<M> & {
+        [K in keyof SRS]: any;
+    } & TRepositoryPrimitiveExtendType<G> : TDeepExpand<TSelectionMerger<SRS extends undefined ? T.Result<M> : T.Result<M> & {
+        [K in keyof SRS]: any;
+    }, S extends undefined ? SRS extends undefined ? {
         [K in keyof T.Columns<M>]: true;
-    } : S, SR>>) extends infer $Resolved ? S extends undefined ? E extends undefined ? $Resolved : TDeepExpand<Omit<$Resolved, E extends object ? {
-        [K in keyof E]: E[K] extends true ? K : never;
-    }[keyof E] : never>> : $Resolved : never;
-    type PaginateResultFiltered<M extends Model, K = {}, S = undefined, SR = undefined, E = undefined> = TDeepExpand<TPagination<ResultFiltered<M, K, S, SR, E>>>;
+    } : {
+        [K in keyof T.Columns<M>]: true;
+    } & {
+        [K in keyof SRS]: true;
+    } : SRS extends undefined ? S : S & {
+        [K in keyof SRS]: true;
+    }, SR>> & TRepositoryPrimitiveExtendType<G>) extends infer $Resolved ? S extends undefined ? E extends undefined ? TDeepExpand<$Resolved> : TDeepExpand<TDeepOmit<$Resolved, E>> : TDeepExpand<$Resolved> : never;
+    type PaginateResultFiltered<M extends Model, K = {}, S = undefined, SR = undefined, E = undefined, SRS = undefined> = TDeepExpand<TPagination<ResultFiltered<M, K, S, SR, E, SRS>>>;
+    type Result<M extends Model, K = {}> = TDeepExpand<TResultResolved<M> & K> & {
+        [customKey: string]: unknown;
+    };
     type PaginateResult<M extends Model, K = {}> = TDeepExpand<TPagination<Result<M, K>>>;
-    type InsertResult<M extends Model, K = {}> = TDeepExpand<TResultResolved<M, K>>;
-    type InsertManyResult<M extends Model, K = {}> = TDeepExpand<TResultResolved<M, K>>[];
-    type InsertNotExistsResult<M extends Model, K = {}> = TDeepExpand<TResultResolved<M, K>> | null;
-    type UpdateResult<M extends Model, K = {}> = TDeepExpand<TResultResolved<M, K>> | null;
-    type UpdateManyResult<M extends Model, K = {}> = TDeepExpand<TResultResolved<M, K>>[];
+    type InsertResult<M extends Model> = TDeepExpand<TResultResolved<M>>;
+    type InsertManyResult<M extends Model> = TDeepExpand<TResultResolved<M>>[];
+    type InsertNotExistsResult<M extends Model> = TDeepExpand<TResultResolved<M>> | null;
+    type UpdateResult<M extends Model> = TDeepExpand<TResultResolved<M>> | null;
+    type UpdateManyResult<M extends Model> = TDeepExpand<TResultResolved<M>>[];
     type DeleteResult = boolean;
+    type InsertInput<K, C> = {
+        [P in Exclude<K & keyof C, "id" | "_id" | "uuid"> as null extends C[P] ? never : P]: C[P] extends Date ? any : C[P] extends Record<string, unknown> ? string : C[P];
+    } & {
+        [P in Exclude<K & keyof C, "id" | "_id" | "uuid"> as null extends C[P] ? P : never]?: C[P] extends Date ? any : C[P] extends Record<string, unknown> ? string : C[P];
+    } & {
+        [P in Extract<K & keyof C, "id" | "_id" | "uuid">]?: C[P] extends Date ? any : C[P] extends Record<string, unknown> ? string : C[P];
+    };
+    type UpdateInput<K, C> = {
+        [P in Exclude<K & keyof C, "id" | "_id">]: {
+            [Q in P]-?: Q extends "uuid" ? string : C[Q] extends Date ? any : C[Q] extends Record<string, unknown> ? string : C[Q];
+        } & {
+            [Q in Exclude<K & keyof C, "id" | "_id" | P>]?: Q extends "uuid" ? string : C[Q] extends Date ? any : C[Q] extends Record<string, unknown> ? string : C[Q];
+        };
+    }[Exclude<K & keyof C, "id" | "_id">];
+    type NoConflict<R extends readonly PropertyKey[], O extends readonly PropertyKey[]> = TConflictKeys<R, O> extends never ? {} : {
+        ERROR_DUPLICATE_KEYS: TConflictKeys<R, O>;
+    };
+    type ZodShapeCreate<M extends Model, O extends T.ColumnKeys<M, {
+        OnlyColumn: true;
+    }>[] = [], Opt extends T.ColumnKeys<M, {
+        OnlyColumn: true;
+    }>[] = []> = {
+        [K in Extract<T.ColumnKeys<M, {
+            OnlyColumn: true;
+        }>, keyof Columns<M>> as K extends O[number] ? K extends Opt[number] ? K : never : K]: K extends Opt[number] ? z.ZodOptional<BlueprintToZod<Columns<M>[K]>> : BlueprintToZod<Columns<M>[K]>;
+    };
+    type ZodShapeUpdate<M extends Model, R extends T.ColumnKeys<M, {
+        OnlyColumn: true;
+    }>[] = [], O extends T.ColumnKeys<M, {
+        OnlyColumn: true;
+    }>[] = []> = {
+        [K in Extract<T.ColumnKeys<M, {
+            OnlyColumn: true;
+        }>, keyof Columns<M>> as K extends O[number] ? never : K]: K extends R[number] ? BlueprintToZod<Columns<M>[K]> : z.ZodOptional<BlueprintToZod<Columns<M>[K]>>;
+    };
+    type BlueprintToZod<T> = T extends number ? z.ZodNumber : T extends string ? z.ZodString : T extends Date ? z.ZodDate : T extends null ? z.ZodNull : z.ZodTypeAny;
+    type ColumnBlueprints<M extends Model> = {
+        [K in keyof Columns<M, {
+            InputQuery: true;
+        }>]: Blueprint<Columns<M, {
+            InputQuery: true;
+        }>[K]>;
+    };
     type Columns<M extends Model, Options extends {
         InputQuery?: boolean;
     } = {}> = TDeepExpand<keyof TColumnsDecorator<M> extends never ? {
         [K in keyof TSchemaModel<M>]: Options['InputQuery'] extends true ? TSchemaModel<M>[K] | TOperatorQuery | TRawStringQuery | TFreezeStringQuery : TSchemaModel<M>[K];
     } : TColumnsDecorator<M, Options>>;
-    type ColumnKeys<M extends Model> = (keyof TColumnsDecorator<M> extends never ? TSchemaKeyOf<M> : keyof TColumnsDecorator<M>) | `${string}.${string}` | TRawStringQuery | TFreezeStringQuery;
+    type ColumnKeys<M extends Model, Options extends {
+        OnlyColumn?: boolean;
+    } = {}> = (keyof TColumnsDecorator<M> extends never ? TSchemaKeyOf<M> : keyof TColumnsDecorator<M>) | (Options["OnlyColumn"] extends true ? never : `${string}.${string}` | TRawStringQuery | TFreezeStringQuery);
     type ColumnEnumMap<M extends Model> = keyof TColumnsDecorator<M> extends never ? {
         [K in keyof TSchemaModel<M> as TIsEnum<NonNullable<TSchemaModel<M>[K]>> extends true ? K : never]: TSchemaModel<M>[K];
     } : {
@@ -204,15 +232,16 @@ export declare namespace T {
     }>;
     type WhereOptions<M extends Model> = TRepositoryWhere<TSchemaModel<M>, TRelationModel<M>, M>;
     type SelectOptions<M extends Model> = TRepositorySelect<TSchemaModel<M>, TRelationModel<M>, M>;
-    type ExceptOptions<M extends Model> = TRepositoryExcept<TSchemaModel<M>, M>;
+    type ExceptOptions<M extends Model> = TRepositoryExcept<TSchemaModel<M>, TRelationModel<M>, M>;
     type OrderByOptions<M extends Model> = TRepositoryOrderBy<TSchemaModel<M>, TRelationModel<M>, M>;
     type GroupByOptions<M extends Model> = TRepositoryGroupBy<TSchemaModel<M>, TRelationModel<M>, M>;
     type RelationOptions<M extends Model> = TRepositoryRelation<TRelationModel<M>, M>;
-    type RepositoryOptions<M extends Model, S = undefined, SR = undefined, E = undefined> = TRepositoryRequest<TSchemaModel<M>, TRelationModel<M>, M, S, SR, E>;
-    type RepositoryCreate<M extends Model> = TRepositoryCreate<M>;
-    type RepositoryCreateMultiple<M extends Model> = TRepositoryCreateMultiple<M>;
-    type RepositoryUpdate<M extends Model> = TRepositoryUpdate<M>;
-    type RepositoryUpdateMultiple<M extends Model> = TRepositoryUpdateMultiple<M>;
-    type RepositoryCreateOrThings<M extends Model> = TRepositoryCreateOrThings<M>;
+    type RepositoryOptions<M extends Model, S = undefined, SR = undefined, E = undefined, SRS = undefined, G = undefined> = TRepositoryRequest<TSchemaModel<M>, TRelationModel<M>, M, S, SR, E, SRS, G>;
+    type RepositoryCreate<M extends Model, NR extends boolean | undefined = false> = TRepositoryCreate<M, NR>;
+    type RepositoryCreateMultiple<M extends Model, NR extends boolean | undefined = false> = TRepositoryCreateMultiple<M, NR>;
+    type RepositoryUpdate<M extends Model, NR extends boolean | undefined = false> = TRepositoryUpdate<M, NR>;
+    type RepositoryUpdateMultiple<M extends Model, NR extends boolean | undefined = false> = TRepositoryUpdateMultiple<M, NR>;
+    type RepositoryCreateOrThings<M extends Model, NR extends boolean | undefined = false> = TRepositoryCreateOrThings<M, NR>;
     type RepositoryDelete<M extends Model> = TRepositoryDelete<M>;
+    type RepositoryGenericTypeOptions = TRepositoryExtendType;
 }

package/dist/lib/core/UtilityTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"UtilityTypes.js","sourceRoot":"","sources":["../../../src/lib/core/UtilityTypes.ts"],"names":[],"mappings":";;AAiYC,CAAC"}
+{"version":3,"file":"UtilityTypes.js","sourceRoot":"","sources":["../../../src/lib/core/UtilityTypes.ts"],"names":[],"mappings":";;AAmeC,CAAC"}

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

@@ -6,6 +6,7 @@ import Pool from "./Pool";
 import sql from "./SqlLike";
 import Meta from "./Meta";
 import View from './View';
+import Queue from "./Queue";
 export { View };
 export { Meta };
 export { sql };
@@ -13,6 +14,7 @@ export { DB };
 export { Model };
 export { Blueprint };
 export { Pool };
+export { Queue };
 export * from "./Decorator";
 export * from "./Schema";
 export * from "./UtilityTypes";
@@ -20,11 +22,13 @@ export * from "./Repository";
 export * from "./Operator";
 export * from "./Nest";
 export * from './StoredProcedure';
+export * from "./Queue";
 declare const _default: {
     DB: typeof DB;
     Model: typeof Model;
     Schema: typeof Schema;
     Blueprint: typeof Blueprint;
     Pool: import("./Pool").PoolConnection;
+    Queue: typeof Queue;
 };
 export default _default;

package/dist/lib/core/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Pool = exports.Blueprint = exports.Model = exports.DB = exports.sql = exports.Meta = exports.View = void 0;
+exports.Queue = exports.Pool = exports.Blueprint = exports.Model = exports.DB = exports.sql = exports.Meta = exports.View = void 0;
 const DB_1 = __importDefault(require("./DB"));
 exports.DB = DB_1.default;
 const Model_1 = __importDefault(require("./Model"));
@@ -33,6 +33,8 @@ const Meta_1 = __importDefault(require("./Meta"));
 exports.Meta = Meta_1.default;
 const View_1 = __importDefault(require("./View"));
 exports.View = View_1.default;
+const Queue_1 = __importDefault(require("./Queue"));
+exports.Queue = Queue_1.default;
 __exportStar(require("./Decorator"), exports);
 __exportStar(require("./Schema"), exports);
 __exportStar(require("./UtilityTypes"), exports);
@@ -40,11 +42,13 @@ __exportStar(require("./Repository"), exports);
 __exportStar(require("./Operator"), exports);
 __exportStar(require("./Nest"), exports);
 __exportStar(require("./StoredProcedure"), exports);
+__exportStar(require("./Queue"), exports);
 exports.default = {
     DB: DB_1.default,
     Model: Model_1.default,
     Schema: Schema_1.default,
     Blueprint: Blueprint_1.default,
-    Pool: Pool_1.default
+    Pool: Pool_1.default,
+    Queue: Queue_1.default
 };
 //# sourceMappingURL=index.js.map

package/dist/lib/core/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/core/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,8CAA8B;AAYrB,aAZF,YAAE,CAYE;AAXX,oDAAiC;AAYxB,gBAZF,eAAK,CAYE;AAXd,sDAAkC;AAClC,4DAAqC;AAW5B,oBAXF,mBAAS,CAWE;AAVlB,kDAAgC;AAWvB,eAXF,cAAI,CAWE;AAVb,wDAAmC;AAM1B,cANF,iBAAG,CAME;AALZ,kDAAgC;AAIvB,eAJF,cAAI,CAIE;AAHb,kDAAgC;AAEvB,eAFF,cAAI,CAEE;AAOb,8CAA4B;AAC5B,2CAAyB;AACzB,iDAA+B;AAC/B,+CAA6B;AAC7B,6CAA2B;AAC3B,yCAAuB;AACvB,oDAAiC;AAEjC,kBAAe;IACb,EAAE,EAAF,YAAE;IACF,KAAK,EAAL,eAAK;IACL,MAAM,EAAN,gBAAM;IACN,SAAS,EAAT,mBAAS;IACT,IAAI,EAAJ,cAAI;CACL,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/core/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,8CAA8B;AAarB,aAbF,YAAE,CAaE;AAZX,oDAAiC;AAaxB,gBAbF,eAAK,CAaE;AAZd,sDAAkC;AAClC,4DAAqC;AAY5B,oBAZF,mBAAS,CAYE;AAXlB,kDAAgC;AAYvB,eAZF,cAAI,CAYE;AAXb,wDAAmC;AAO1B,cAPF,iBAAG,CAOE;AANZ,kDAAgC;AAKvB,eALF,cAAI,CAKE;AAJb,kDAAgC;AAGvB,eAHF,cAAI,CAGE;AAFb,oDAAiC;AASxB,gBATF,eAAK,CASE;AACd,8CAA4B;AAC5B,2CAAyB;AACzB,iDAA+B;AAC/B,+CAA6B;AAC7B,6CAA2B;AAC3B,yCAAuB;AACvB,oDAAiC;AACjC,0CAAuB;AAEvB,kBAAe;IACb,EAAE,EAAF,YAAE;IACF,KAAK,EAAL,eAAK;IACL,MAAM,EAAN,gBAAM;IACN,SAAS,EAAT,mBAAS;IACT,IAAI,EAAJ,cAAI;IACJ,KAAK,EAAL,eAAK;CACN,CAAC"}

package/dist/lib/types/decorator/index.d.ts

@@ -20,7 +20,7 @@ export type TRelationOptionsDecorator<K = any> = {
 export type TColumnsDecorator<T, Options extends {
     InputQuery?: boolean;
 } = {}> = {
-    [K in keyof T as T[K] extends string | number | null | boolean | Date ? K : never]: Options['InputQuery'] extends true ? T[K] | TOperatorQuery | TRawStringQuery | TFreezeStringQuery : T[K];
+    [K in keyof T as T[K] extends string | number | null | boolean | Date | Record<string, unknown> ? K : never]: Options['InputQuery'] extends true ? T[K] | TOperatorQuery | TRawStringQuery | TFreezeStringQuery : T[K];
 };
 export type TRelationsDecorator<T> = Pick<T, {
     [K in keyof T]: T[K] extends Model | Model[] ? K : never;

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

@@ -6,6 +6,24 @@ import { QueryBuilder } from "../core/Driver";
 import { TResult } from "../core";
 import { TResultDecorator } from "./decorator";
 export type TCache = Cache;
+export type TCacheModel = {
+    provider: () => string;
+    driver: (driver: "db" | "memory" | "redis") => any;
+    all: () => Promise<any[]>;
+    clear: () => Promise<void>;
+    get: (key: string, options?: {
+        namespace?: boolean;
+    }) => Promise<any>;
+    exists: (key: string, options?: {
+        namespace?: boolean;
+    }) => Promise<boolean>;
+    set: (key: string, value: unknown, ms: number, options?: {
+        namespace?: boolean;
+    }) => Promise<void>;
+    delete: (key: string, options?: {
+        namespace?: boolean;
+    }) => Promise<void>;
+};
 export type TConstant = typeof CONSTANTS;
 export type TRelationOptions<K = any> = {
     name: K;
@@ -17,7 +35,7 @@ export type TRelationOptions<K = any> = {
     pivot?: string;
     query?: any;
     queryPivot?: any;
-    relation?: Object;
+    relation?: string;
     exists?: boolean;
     notExists?: boolean;
     all?: boolean;
@@ -58,10 +76,12 @@ export type TPagination<K = any> = {
         last_page: number;
         next_page: number;
         prev_page: number;
-        currentPage: number;
-        lastPage: number;
-        nextPage: number;
-        prevPage: number;
+        page: {
+            prev: number;
+            next: number;
+            current: number;
+            last: number;
+        };
     };
     data: K[];
 };
@@ -113,7 +133,6 @@ export type TPoolCallback = {
     release: () => void;
 };
 export type TConnectionTransaction = {
-    on: (event: TPoolEvent, data: any) => void;
     query: (sql: string) => Promise<any[]>;
     /**
      * The 'startTransaction' method is used when need to started the transaction
@@ -135,6 +154,11 @@ export type TConnectionTransaction = {
      * @returns {Promise<void>}
      */
     end: () => Promise<void>;
+    /**
+     * The 'release' method is used to release connection
+     * @returns {Promise<void>}
+     */
+    release: () => Promise<void>;
 };
 export type TConnection = {
     on: (event: TPoolEvent, data: any) => void;
@@ -144,6 +168,7 @@ export type TConnection = {
     commit: () => Promise<void>;
     rollback: () => Promise<void>;
     end: () => Promise<void>;
+    release: () => Promise<void>;
 };
 export type TPoolConnected = {
     database: () => string;
@@ -291,7 +316,7 @@ export type TLiteralStringKeys<T> = {
     [K in keyof T]: T[K] extends string ? (string extends T[K] ? never : K) : never;
 }[keyof T];
 export type TLiteralEnumKeys<T> = TLiteralStringKeys<TRemoveIndexSignature<T>>;
-export type TDriver = 'pg' | 'postgres' | 'mysql' | 'mysql2' | 'mariadb' | 'mssql' | 'sqlite3';
+export type TDriver = 'pg' | 'postgres' | 'mysql' | 'mysql2' | 'mariadb' | 'mssql' | 'sqlite' | 'mongodb';
 export type TPoolCusterOptions = {
     writer: {
         host: string;
@@ -330,23 +355,45 @@ export type TIsEnum<T> = string extends T ? false : number extends T ? false : b
     T
 ] extends [string | number] ? true : false;
 export type TLifecycle = "beforeInsert" | "afterInsert" | "beforeUpdate" | "afterUpdate" | "beforeRemove" | "afterRemove";
+export type TDeepOmit<T, Filter> = T extends infer ObjectType ? {
+    [K in keyof ObjectType as K extends keyof Filter ? Filter[K] extends true ? never : K : NonNullable<ObjectType[K]> extends object ? (NonNullable<ObjectType[K]> extends Date ? K : never) : K]: K extends keyof Filter ? Filter[K] extends object ? TDeepOmit<NonNullable<ObjectType[K]>, Filter[K]> : ObjectType[K] : ObjectType[K];
+} : never;
 export type TDeepExpand<T> = T extends Date ? T : T extends Function ? T : T extends Model ? T : T extends (infer U)[] ? TDeepExpand<U>[] : T extends object ? {
     [K in keyof T]: TDeepExpand<T[K]>;
 } : T;
-export type TResultResolved<M extends Model, K = {}> = (unknown extends TResult<M> ? unknown extends TResultDecorator<M> ? Record<K & string, any> : {} extends TResultDecorator<M> ? Record<K & string, any> : TResultDecorator<K & M> : TResult<K & M>);
-export type TFilter<T, S> = {
-    [K in keyof T & keyof S]: S[K] extends true ? NonNullable<T[K]> : S[K] extends object ? NonNullable<T[K]> extends (infer U)[] ? TDeepExpand<TFilter<U, S[K]>>[] : NonNullable<T[K]> extends object ? TDeepExpand<TFilter<NonNullable<T[K]>, S[K]>> : never : never;
-};
-export type TResultFilterResolved<T, S> = S extends undefined ? T : TDeepExpand<TFilter<T, S>>;
-export type TSelectionMerger<T1, T2> = {
-    [K in keyof T1 | Exclude<keyof T2, keyof T1>]: K extends keyof T1 ? K extends keyof T2 ? T1[K] extends true ? true : T1[K] extends object ? T2[K] extends object ? TSelectionMerger<T1[K], ((T2[K] extends {
-        select: infer S;
-    } ? S : {}) & (T2[K] extends {
-        relations: infer R;
-    } ? R : {}) & Omit<T2[K], 'select' | 'relations'>)> : T1[K] : T1[K] : T1[K] : K extends keyof T2 ? T2[K] extends object ? TSelectionMerger<{}, ((T2[K] extends {
-        select: infer S;
-    } ? S : {}) & (T2[K] extends {
-        relations: infer R;
-    } ? R : {}) & Omit<T2[K], 'select' | 'relations'>)> : T2[K] : never;
+export type TResultResolved<M extends Model> = (unknown extends TResult<M> ? unknown extends TResultDecorator<M> ? Record<string, any> : {} extends TResultDecorator<M> ? Record<string, any> : TResultDecorator<M> : TResult<M>);
+export type TConflictKeys<R extends readonly PropertyKey[], O extends readonly PropertyKey[]> = Extract<R[number], O[number]>;
+type Normalize<T> = T extends object ? ((T extends {
+    select: infer S;
+} ? S : {}) & (T extends {
+    relations: infer R;
+} ? R : {}) & (T extends {
+    except: infer E;
+} ? {
+    _except: E;
+} : {}) & Omit<T, 'select' | 'relations' | 'except'>) : {};
+type IsStrict<T> = T extends true ? false : T extends object ? (T extends {
+    select: any;
+} ? true : T extends {
+    except: any;
+} ? false : (keyof Omit<T, 'relations' | 'except'> extends never ? false : true)) : false;
+type RemoveUndefined<T> = T extends undefined ? never : T;
+type NonObjectKeys<T> = {
+    [K in keyof T]: RemoveUndefined<T[K]> extends Date ? K : RemoveUndefined<T[K]> extends object ? never : K;
+}[keyof T];
+type GetExceptKeys<T> = T extends {
+    _except: infer E;
+} ? keyof E : never;
+export type TSelectionMerger<IncomingResult, S1, S2> = IncomingResult extends Date | Function ? IncomingResult : IncomingResult extends (infer U)[] ? TSelectionMerger<U, S1, S2>[] : IncomingResult extends object ? (Normalize<S1> extends infer F1 ? Normalize<S2> extends infer F2 ? (F1 & F2) extends infer Merged ? {
+    [K in keyof Omit<Merged, '_except'> & keyof IncomingResult]-?: TSelectionMerger<RemoveUndefined<IncomingResult[K]>, K extends keyof F1 ? F1[K] : unknown, K extends keyof F2 ? F2[K] : unknown>;
+} & ((IsStrict<S1> extends true ? true : IsStrict<S2> extends true ? true : false) extends true ? {} : {
+    [K in Exclude<NonObjectKeys<IncomingResult>, GetExceptKeys<F1> | GetExceptKeys<F2>>]-?: IncomingResult[K];
+}) : never : never : never) : IncomingResult;
+export type TStateWhereCondition = {
+    column?: string;
+    operator?: string;
+    value?: any;
+    condition?: 'AND' | 'OR';
+    nested?: TStateWhereCondition[];
 };
 export {};